Wait until the view has no pending summary

[onechat] / daemon.go

diff --git a/daemon.go b/daemon.go
index 5486843771dbb1a3f92ba2be473a5120d6aae530..2a23dc28a4405380137213b21f9c25566c575844 100644 (file)
--- a/daemon.go
+++ b/daemon.go
@@ -16,41 +16,15 @@ import (
 )
 
 const (
 )
 
 const (

-       // agentDirName is the directory of the root agent in the data directory.
-       agentDirName = "agent"
-
-       // socketFileName is the Unix socket of the daemon in the data directory.
-       socketFileName = "onechat.sock"
-
-       // tokenLockFileName is the lock file of the token file in the data
+       // daemonAgentDirName is the directory of the root agent in the data

        // directory.
        // directory.

-       tokenLockFileName = "auth.lock"
-
-       // requestBytes is the most bytes of one request line of a client.
-       requestBytes = 16 << 20
+       daemonAgentDirName = "agent"

 
 

-       // clientEvents is the number of events that can wait for a slow client
-       // before the daemon drops it.
-       clientEvents = 1024
-
-       // socketPathBytes is the longest path of a Unix socket on Linux.
-       socketPathBytes = 107
-
-       // terminalSource is the source of the user messages from the clients of
-       // the socket.
-       terminalSource = "terminal"
+       // daemonClientEvents is the number of events that can wait for a slow
+       // client before the daemon drops it.
+       daemonClientEvents = 1024

 )
 
 )
 

-// errTokensInUse tells that another onechat process uses the token file.
-var errTokensInUse = errors.New("another onechat process uses the token file, such as the daemon")
-
-// clientRequest is one line from a client: "send" with the text of a user
-// message, or "interrupt".
-type clientRequest struct {
-       Type string `json:"type"`
-       Text string `json:"text,omitempty"`
-}
-

 // daemon runs "onechat daemon": it owns the root agent and its files and serves
 // the clients on the Unix socket in the data directory until ctx ends. When
 // telegram.json exists, it also runs the Telegram bot. It holds the lock of the
 // daemon runs "onechat daemon": it owns the root agent and its files and serves
 // the clients on the Unix socket in the data directory until ctx ends. When
 // telegram.json exists, it also runs the Telegram bot. It holds the lock of the


@@ -93,12 +67,12 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
                return err
        }
 
                return err
        }
 

-       agent, err := openAgent(filepath.Join(dir, agentDirName))
+       agent, err := openAgent(filepath.Join(dir, daemonAgentDirName))

        if err != nil {
                return err
        }
 
        if err != nil {
                return err
        }
 

-       client := newClient(address, auth, agent.CacheKey(), filepath.Join(agent.dir, "usage.jsonl"))
+       client := newModelClient(address, auth, agent.CacheKey(), filepath.Join(agent.dir, "usage.jsonl"))

        memory, err := openMemory(ctx, agent.dir, time.Now, newCompactor(client, agent.Prompt, config.Compactor))
        if err != nil {
                return err
        memory, err := openMemory(ctx, agent.dir, time.Now, newCompactor(client, agent.Prompt, config.Compactor))
        if err != nil {
                return err


@@ -108,7 +82,7 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
                err = errors.Join(err, memory.Close())
        }()
 
                err = errors.Join(err, memory.Close())
        }()
 

-       listener, err := listenSocket(socket)
+       listener, err := daemonListenSocket(socket)

        if err != nil {
                return err
        }
        if err != nil {
                return err
        }


@@ -127,95 +101,31 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
                }
        }
 
                }
        }
 

-       return serveAgent(ctx, listener, telegram, func(notify func(Event)) (*loop, error) {
-               return newLoop(agent, memory, client, time.Now, notify)
+       return daemonServe(ctx, listener, telegram, func(notify func(Event)) (*TurnLoop, error) {
+               return newTurnLoop(agent, memory, client, time.Now, notify)

        })
 }
 
        })
 }
 

-// serveAgent runs the loop that start makes and serves the clients of
-// listener until ctx ends or the loop fails. It closes listener. When bot is
-// not nil, it runs the bot too, and a failure of the bot stops the agent.
-func serveAgent(ctx context.Context, listener net.Listener, bot *TelegramBot, start func(notify func(Event)) (*loop, error)) error {
-       ctx, cancel := context.WithCancel(ctx)
-       defer cancel()
-
-       hub := &hub{
-               clients: make(map[*hubClient]bool),
-       }
-
-       notify := hub.Broadcast
-       if bot != nil {
-               notify = func(event Event) {
-                       hub.Broadcast(event)
-                       bot.Notify(event)
-               }
-       }
-
-       l, err := start(notify)
-       if err != nil {
-               return errors.Join(err, listener.Close())
-       }
-
-       var workers sync.WaitGroup
-       workers.Add(1)
-       go func() {
-               defer workers.Done()
-
-               hub.Accept(ctx, listener, l)
-       }()
-
-       var botErr error
-       if bot != nil {
-               workers.Add(1)
-               go func() {
-                       defer workers.Done()
-
-                       botErr = bot.Run(ctx, l)
-                       cancel()
-               }()
-       }
-
-       err = l.Run(ctx)
-       if errors.Is(err, context.Canceled) {
-               err = nil
-       }
-
-       cancel()
-       err = errors.Join(err, listener.Close())
-       hub.CloseAll()
-       workers.Wait()
-
-       return errors.Join(err, botErr)
-}
-
-// hub holds the connected clients and sends each event to all of them.
-type hub struct {
+// DaemonHub holds the connected clients and sends each event to all of them.
+type DaemonHub struct {

        mutex   sync.Mutex
        mutex   sync.Mutex

-       clients map[*hubClient]bool
+       clients map[*DaemonClient]bool

        workers sync.WaitGroup
 }
 
        workers sync.WaitGroup
 }
 

-// hubClient is one connected client. Its events wait in a channel for the
-// writer, so a slow client does not stop the agent.
-type hubClient struct {
-       conn   net.Conn
-       events chan Event
-       once   sync.Once
-}
-

 // Accept serves each client of listener until the listener closes. A new
 // client gets a ready event with the name of the agent, and a busy event when a
 // turn runs.
 // Accept serves each client of listener until the listener closes. A new
 // client gets a ready event with the name of the agent, and a busy event when a
 // turn runs.

-func (h *hub) Accept(ctx context.Context, listener net.Listener, l *loop) {
+func (h *DaemonHub) Accept(ctx context.Context, listener net.Listener, l *TurnLoop) {

        for {
                conn, err := listener.Accept()
                if err != nil {
                        return
                }
 
        for {
                conn, err := listener.Accept()
                if err != nil {
                        return
                }
 

-               client := &hubClient{
+               client := &DaemonClient{

                        conn:   conn,
                        conn:   conn,

-                       events: make(chan Event, clientEvents),
+                       events: make(chan Event, daemonClientEvents),

                }
 
                h.mutex.Lock()
                }
 
                h.mutex.Lock()


@@ -240,7 +150,7 @@ func (h *hub) Accept(ctx context.Context, listener net.Listener, l *loop) {
 }
 
 // write sends the events of client as JSON lines until its channel closes.
 }
 
 // write sends the events of client as JSON lines until its channel closes.

-func (h *hub) write(client *hubClient) {
+func (h *DaemonHub) write(client *DaemonClient) {

        defer h.workers.Done()
 
        encoder := json.NewEncoder(client.conn)
        defer h.workers.Done()
 
        encoder := json.NewEncoder(client.conn)


@@ -253,17 +163,17 @@ func (h *hub) write(client *hubClient) {
 }
 
 // read runs the requests of client until it closes its connection.
 }
 
 // read runs the requests of client until it closes its connection.

-func (h *hub) read(ctx context.Context, client *hubClient, l *loop) {
+func (h *DaemonHub) read(ctx context.Context, client *DaemonClient, l *TurnLoop) {

        defer h.workers.Done()
        defer h.drop(client)
 
        scanner := bufio.NewScanner(client.conn)
        defer h.workers.Done()
        defer h.drop(client)
 
        scanner := bufio.NewScanner(client.conn)

-       scanner.Buffer(make([]byte, 64*1024), requestBytes)
+       scanner.Buffer(make([]byte, 64*1024), socketRequestBytes)

        for ctx.Err() == nil && scanner.Scan() {
        for ctx.Err() == nil && scanner.Scan() {

-               var request clientRequest
+               var request SocketRequest

                err := json.Unmarshal(scanner.Bytes(), &request)
                if err == nil {
                err := json.Unmarshal(scanner.Bytes(), &request)
                if err == nil {

-                       err = runRequest(l, request)
+                       err = daemonRunRequest(l, request)

                }
 
                if err != nil {
                }
 
                if err != nil {


@@ -277,15 +187,23 @@ func (h *hub) read(ctx context.Context, client *hubClient, l *loop) {
 
 // Send gives event to one client, or drops the client when its events do not
 // fit.
 
 // Send gives event to one client, or drops the client when its events do not
 // fit.

-func (h *hub) Send(client *hubClient, event Event) {
+func (h *DaemonHub) Send(client *DaemonClient, event Event) {

        h.mutex.Lock()
        defer h.mutex.Unlock()
 
        h.send(client, event)
 }
 
        h.mutex.Lock()
        defer h.mutex.Unlock()
 
        h.send(client, event)
 }
 

+// drop removes client and closes its connection.
+func (h *DaemonHub) drop(client *DaemonClient) {
+       h.mutex.Lock()
+       defer h.mutex.Unlock()
+
+       h.remove(client)
+}
+

 // send gives event to client. The caller holds the mutex.
 // send gives event to client. The caller holds the mutex.

-func (h *hub) send(client *hubClient, event Event) {
+func (h *DaemonHub) send(client *DaemonClient, event Event) {

        if !h.clients[client] {
                return
        }
        if !h.clients[client] {
                return
        }


@@ -297,27 +215,9 @@ func (h *hub) send(client *hubClient, event Event) {
        }
 }
 
        }
 }
 

-// Broadcast gives event to every client.
-func (h *hub) Broadcast(event Event) {
-       h.mutex.Lock()
-       defer h.mutex.Unlock()
-
-       for client := range h.clients {
-               h.send(client, event)
-       }
-}
-
-// drop removes client and closes its connection.
-func (h *hub) drop(client *hubClient) {
-       h.mutex.Lock()
-       defer h.mutex.Unlock()
-
-       h.remove(client)
-}
-

 // remove removes client, closes its connection, and ends its writer. The
 // caller holds the mutex.
 // remove removes client, closes its connection, and ends its writer. The
 // caller holds the mutex.

-func (h *hub) remove(client *hubClient) {
+func (h *DaemonHub) remove(client *DaemonClient) {

        delete(h.clients, client)
        client.once.Do(func() {
                close(client.events)
        delete(h.clients, client)
        client.once.Do(func() {
                close(client.events)


@@ -325,8 +225,18 @@ func (h *hub) remove(client *hubClient) {
        })
 }
 
        })
 }
 

+// Broadcast gives event to every client.
+func (h *DaemonHub) Broadcast(event Event) {
+       h.mutex.Lock()
+       defer h.mutex.Unlock()
+
+       for client := range h.clients {
+               h.send(client, event)
+       }
+}
+

 // CloseAll drops every client and waits for their readers and writers.
 // CloseAll drops every client and waits for their readers and writers.

-func (h *hub) CloseAll() {
+func (h *DaemonHub) CloseAll() {

        h.mutex.Lock()
        for client := range h.clients {
                h.remove(client)
        h.mutex.Lock()
        for client := range h.clients {
                h.remove(client)


@@ -336,32 +246,18 @@ func (h *hub) CloseAll() {
        h.workers.Wait()
 }
 
        h.workers.Wait()
 }
 

-// runRequest runs one request of a client.
-func runRequest(l *loop, request clientRequest) error {
-       switch request.Type {
-       case "send":
-               if request.Text == "" {
-                       return errors.New("empty message")
-               }
-
-               _, err := l.Submit(terminalSource, request.Text)
-
-               return err
-       case "interrupt":
-               if !l.Interrupt() {
-                       return errors.New("no turn runs")
-               }
-
-               return nil
-       default:
-               return fmt.Errorf("unknown request %q", request.Type)
-       }
+// DaemonClient is one connected client. Its events wait in a channel for the
+// writer, so a slow client does not stop the agent.
+type DaemonClient struct {
+       conn   net.Conn
+       events chan Event
+       once   sync.Once

 }
 
 }
 

-// listenSocket listens on the Unix socket at path, with mode 0600. The caller
-// owns the chat, so a socket file at path is left from a daemon that ended,
-// and listenSocket removes it.
-func listenSocket(path string) (net.Listener, error) {
+// daemonListenSocket listens on the Unix socket at path, with mode 0600. The
+// caller owns the chat, so a socket file at path is left from a daemon that
+// ended, and daemonListenSocket removes it.
+func daemonListenSocket(path string) (net.Listener, error) {

        err := checkSocketPath(path)
        if err != nil {
                return nil, err
        err := checkSocketPath(path)
        if err != nil {
                return nil, err


@@ -385,23 +281,80 @@ func listenSocket(path string) (net.Listener, error) {
        return listener, nil
 }
 
        return listener, nil
 }
 

-// checkSocketPath makes sure that path fits in the address of a Unix socket.
-func checkSocketPath(path string) error {
-       if len(path) > socketPathBytes {
-               return fmt.Errorf("socket path %s is longer than %d bytes: set ONECHAT_DIR to a shorter path", path, socketPathBytes)
+// daemonServe runs the loop that start makes and serves the clients of listener
+// until ctx ends or the loop fails. It closes listener. When bot is not nil, it
+// runs the bot too, and a failure of the bot stops the agent.
+func daemonServe(ctx context.Context, listener net.Listener, bot *TelegramBot, start func(notify func(Event)) (*TurnLoop, error)) error {
+       ctx, cancel := context.WithCancel(ctx)
+       defer cancel()
+
+       hub := &DaemonHub{
+               clients: make(map[*DaemonClient]bool),

        }
 
        }
 

-       return nil
-}
+       notify := hub.Broadcast
+       if bot != nil {
+               notify = func(event Event) {
+                       hub.Broadcast(event)
+                       bot.Notify(event)
+               }
+       }

 
 

-// lockTokens takes the lock of the token file in dir. Each process that reads
-// or refreshes the tokens holds it, because a refresh in one process rotates
-// the refresh token of the other and logs it out.
-func lockTokens(dir string) (*os.File, error) {
-       lock, err := lockFile(filepath.Join(dir, tokenLockFileName))
-       if errors.Is(err, errLocked) {
-               return nil, errTokensInUse
+       l, err := start(notify)
+       if err != nil {
+               return errors.Join(err, listener.Close())

        }
 
        }
 

-       return lock, err
+       var workers sync.WaitGroup
+       workers.Add(1)
+       go func() {
+               defer workers.Done()
+
+               hub.Accept(ctx, listener, l)
+       }()
+
+       var botErr error
+       if bot != nil {
+               workers.Add(1)
+               go func() {
+                       defer workers.Done()
+
+                       botErr = bot.Run(ctx, l)
+                       cancel()
+               }()
+       }
+
+       err = l.Run(ctx)
+       if errors.Is(err, context.Canceled) {
+               err = nil
+       }
+
+       cancel()
+       err = errors.Join(err, listener.Close())
+       hub.CloseAll()
+       workers.Wait()
+
+       return errors.Join(err, botErr)
+}
+
+// daemonRunRequest runs one request of a client.
+func daemonRunRequest(l *TurnLoop, request SocketRequest) error {
+       switch request.Type {
+       case "send":
+               if request.Text == "" {
+                       return errors.New("empty message")
+               }
+
+               _, err := l.Submit(terminalSource, request.Text)
+
+               return err
+       case "interrupt":
+               if !l.Interrupt() {
+                       return errors.New("no turn runs")
+               }
+
+               return nil
+       default:
+               return fmt.Errorf("unknown request %q", request.Type)
+       }

 }
 }