initial commit
This commit is contained in:
Levi Neely
commit
4c754ee659
|
|
@ -0,0 +1,5 @@
|
|||
module ollie-acme
|
||||
|
||||
go 1.25.7
|
||||
|
||||
require 9fans.net/go v0.0.7
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
9fans.net/go v0.0.7 h1:H5CsYJTf99C8EYAQr+uSoEJnLP/iZU8RmDuhyk30iSM=
|
||||
9fans.net/go v0.0.7/go.mod h1:Rxvbbc1e+1TyGMjAvLthGTyO97t+6JMQ6ly+Lcs9Uf0=
|
||||
dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
|
||||
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
|
||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
|
||||
golang.org/x/exp v0.0.0-20210405174845-4513512abef3/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4=
|
||||
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
|
||||
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
|
||||
golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
|
||||
golang.org/x/mobile v0.0.0-20210220033013-bdb1ca9a1e08/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
|
||||
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
|
||||
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
||||
golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210415045647-66c3f260301c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
|
|
@ -0,0 +1,300 @@
|
|||
// ollie-acme: acme interface for ollie AI sessions
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sort"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"9fans.net/go/acme"
|
||||
)
|
||||
|
||||
var ollie string
|
||||
|
||||
func init() {
|
||||
ollie = os.Getenv("OLLIE")
|
||||
if ollie == "" {
|
||||
ollie = filepath.Join(os.Getenv("HOME"), "mnt", "ollie")
|
||||
}
|
||||
}
|
||||
|
||||
func main() {
|
||||
acme.AutoExit(true)
|
||||
if err := newSessionList(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
select {}
|
||||
}
|
||||
|
||||
// --- session list window ---
|
||||
|
||||
type sessionList struct {
|
||||
win *acme.Win
|
||||
collapsed map[string]bool
|
||||
allSIDs []string
|
||||
mu sync.Mutex
|
||||
}
|
||||
|
||||
func newSessionList() error {
|
||||
w, err := acme.New()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
w.Name("ollie/sessions")
|
||||
sl := &sessionList{win: w, collapsed: make(map[string]bool)}
|
||||
sl.refresh()
|
||||
w.Ctl("cleartag")
|
||||
w.Write("tag", []byte(" New Kill Refresh"))
|
||||
go sl.eventLoop()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (sl *sessionList) refresh() {
|
||||
data, err := os.ReadFile(filepath.Join(ollie, "s", "idx"))
|
||||
if err != nil {
|
||||
sl.win.Errf("read idx: %v", err)
|
||||
return
|
||||
}
|
||||
sl.win.Addr(",")
|
||||
sl.win.Write("data", nil)
|
||||
|
||||
raw := strings.TrimSpace(string(data))
|
||||
if raw == "" {
|
||||
sl.win.Ctl("clean")
|
||||
return
|
||||
}
|
||||
|
||||
lines := strings.Split(raw, "\n")
|
||||
sort.Strings(lines)
|
||||
|
||||
sl.mu.Lock()
|
||||
sl.allSIDs = nil
|
||||
for _, l := range lines {
|
||||
if s := strings.TrimSpace(l); s != "" {
|
||||
sl.allSIDs = append(sl.allSIDs, s)
|
||||
}
|
||||
}
|
||||
|
||||
var buf strings.Builder
|
||||
for _, sid := range sl.allSIDs {
|
||||
parts := strings.Split(sid, "__")
|
||||
hidden := false
|
||||
for i := 1; i < len(parts); i++ {
|
||||
if sl.collapsed[strings.Join(parts[:i], "__")] {
|
||||
hidden = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if hidden {
|
||||
continue
|
||||
}
|
||||
indent := strings.Repeat(" ", len(parts)-1)
|
||||
leaf := parts[len(parts)-1]
|
||||
hasChildren := false
|
||||
for _, other := range sl.allSIDs {
|
||||
if strings.HasPrefix(other, sid+"__") {
|
||||
hasChildren = true
|
||||
break
|
||||
}
|
||||
}
|
||||
marker := ""
|
||||
if hasChildren {
|
||||
if sl.collapsed[sid] {
|
||||
marker = "▸ "
|
||||
} else {
|
||||
marker = "▾ "
|
||||
}
|
||||
}
|
||||
fmt.Fprintf(&buf, "%s%s%s\n", indent, marker, leaf)
|
||||
}
|
||||
sl.mu.Unlock()
|
||||
|
||||
sl.win.Write("body", []byte(buf.String()))
|
||||
sl.win.Ctl("clean")
|
||||
}
|
||||
|
||||
func (sl *sessionList) resolveFullSID(text string) string {
|
||||
text = strings.TrimLeft(text, " \t")
|
||||
text = strings.TrimPrefix(text, "▸ ")
|
||||
text = strings.TrimPrefix(text, "▾ ")
|
||||
text = strings.TrimSpace(text)
|
||||
if text == "" {
|
||||
return ""
|
||||
}
|
||||
sl.mu.Lock()
|
||||
defer sl.mu.Unlock()
|
||||
for _, sid := range sl.allSIDs {
|
||||
parts := strings.Split(sid, "__")
|
||||
if parts[len(parts)-1] == text {
|
||||
return sid
|
||||
}
|
||||
}
|
||||
return text
|
||||
}
|
||||
|
||||
func (sl *sessionList) eventLoop() {
|
||||
for e := range sl.win.EventChan() {
|
||||
switch e.C2 {
|
||||
case 'x', 'X':
|
||||
cmd := strings.TrimSpace(string(e.Text))
|
||||
if cmd == "New" {
|
||||
openFile(filepath.Join(ollie, "s", "new"))
|
||||
continue
|
||||
}
|
||||
if cmd == "Kill" {
|
||||
arg := strings.TrimSpace(string(e.Arg))
|
||||
sid := sl.resolveFullSID(arg)
|
||||
if sid != "" {
|
||||
os.WriteFile(filepath.Join(ollie, "s", sid, "ctl"), []byte("kill"), 0644)
|
||||
sl.refresh()
|
||||
}
|
||||
continue
|
||||
}
|
||||
if cmd == "Refresh" {
|
||||
sl.refresh()
|
||||
continue
|
||||
}
|
||||
sid := sl.resolveFullSID(cmd)
|
||||
if sid != "" && sessionExists(sid) {
|
||||
openChat(sid)
|
||||
} else {
|
||||
sl.win.WriteEvent(e)
|
||||
}
|
||||
case 'l', 'L':
|
||||
text := strings.TrimSpace(string(e.Text))
|
||||
if text == "" {
|
||||
sl.win.WriteEvent(e)
|
||||
continue
|
||||
}
|
||||
sid := sl.resolveFullSID(text)
|
||||
if sid == "" {
|
||||
sl.win.WriteEvent(e)
|
||||
continue
|
||||
}
|
||||
sl.mu.Lock()
|
||||
sl.collapsed[sid] = !sl.collapsed[sid]
|
||||
sl.mu.Unlock()
|
||||
sl.refresh()
|
||||
}
|
||||
}
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
func sessionExists(sid string) bool {
|
||||
_, err := os.Stat(filepath.Join(ollie, "s", sid))
|
||||
return err == nil
|
||||
}
|
||||
|
||||
// --- chat window ---
|
||||
|
||||
type chatWin struct {
|
||||
win *acme.Win
|
||||
sid string
|
||||
offset int
|
||||
mu sync.Mutex
|
||||
}
|
||||
|
||||
var chatWindows sync.Map
|
||||
|
||||
func openChat(sid string) {
|
||||
if v, ok := chatWindows.Load(sid); ok {
|
||||
v.(*chatWin).win.Ctl("show")
|
||||
return
|
||||
}
|
||||
|
||||
w, err := acme.New()
|
||||
if err != nil {
|
||||
log.Printf("open chat %s: %v", sid, err)
|
||||
return
|
||||
}
|
||||
w.Name("%s", "ollie/sessions/"+sid)
|
||||
w.Ctl("cleartag")
|
||||
w.Fprintf("tag", " Prompt Stop Ctl")
|
||||
|
||||
cw := &chatWin{win: w, sid: sid}
|
||||
chatWindows.Store(sid, cw)
|
||||
|
||||
// Load existing chat.
|
||||
chatPath := filepath.Join(ollie, "s", sid, "chat")
|
||||
if data, err := os.ReadFile(chatPath); err == nil && len(data) > 0 {
|
||||
w.Write("body", data)
|
||||
cw.offset = len(data)
|
||||
}
|
||||
w.Ctl("clean")
|
||||
|
||||
go cw.tail()
|
||||
go cw.eventLoop()
|
||||
}
|
||||
|
||||
func (cw *chatWin) eventLoop() {
|
||||
defer chatWindows.Delete(cw.sid)
|
||||
for e := range cw.win.EventChan() {
|
||||
switch e.C2 {
|
||||
case 'x', 'X':
|
||||
cmd := strings.TrimSpace(string(e.Text))
|
||||
switch cmd {
|
||||
case "Prompt":
|
||||
openFile(filepath.Join(ollie, "s", cw.sid, "prompt"))
|
||||
case "Stop":
|
||||
os.WriteFile(filepath.Join(ollie, "s", cw.sid, "ctl"), []byte("stop"), 0644)
|
||||
case "Ctl":
|
||||
openFile(filepath.Join(ollie, "s", cw.sid, "ctl"))
|
||||
default:
|
||||
cw.win.WriteEvent(e)
|
||||
}
|
||||
case 'l', 'L':
|
||||
cw.win.WriteEvent(e)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// tail polls the chat file and appends new content to the window.
|
||||
func (cw *chatWin) tail() {
|
||||
chatPath := filepath.Join(ollie, "s", cw.sid, "chat")
|
||||
swPath := filepath.Join(ollie, "s", cw.sid, "statewait")
|
||||
|
||||
for {
|
||||
// statewait blocks until a state transition.
|
||||
_, err := os.ReadFile(swPath)
|
||||
if err != nil {
|
||||
// Session gone — stop tailing.
|
||||
if os.IsNotExist(err) {
|
||||
return
|
||||
}
|
||||
time.Sleep(500 * time.Millisecond)
|
||||
continue
|
||||
}
|
||||
cw.flush(chatPath)
|
||||
}
|
||||
}
|
||||
|
||||
func (cw *chatWin) flush(chatPath string) {
|
||||
data, err := os.ReadFile(chatPath)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
cw.mu.Lock()
|
||||
defer cw.mu.Unlock()
|
||||
if len(data) > cw.offset {
|
||||
cw.win.Addr("$")
|
||||
cw.win.Write("data", data[cw.offset:])
|
||||
cw.offset = len(data)
|
||||
cw.win.Ctl("clean")
|
||||
}
|
||||
}
|
||||
|
||||
// openFile opens a 9P/filesystem path as a plain acme editor window.
|
||||
func openFile(path string) {
|
||||
w, err := acme.New()
|
||||
if err != nil {
|
||||
log.Printf("open %s: %v", path, err)
|
||||
return
|
||||
}
|
||||
w.Name("%s", path)
|
||||
w.Ctl("get")
|
||||
}
|
||||
Reference in New Issue