Bind external events to permanent agent IDs

[onechat] / daemon.go

diff --git a/daemon.go b/daemon.go
index b6595c7624a12ef316f0c01a892584791a5b4637..a6b08b6305b3e1b1254b22fa6554bc430a76d013 100644 (file)
--- a/daemon.go
+++ b/daemon.go
@@ -2,6 +2,7 @@ package main
 
 import (
        "bufio"
+       "bytes"
        "context"
        "encoding/json"
        "errors"
@@ -108,7 +109,22 @@ func (h *DaemonHub) read(ctx context.Context, client *DaemonClient, l *TurnLoop)
 
                err := json.Unmarshal(scanner.Bytes(), &request)
                if err == nil {
-                       if request.Type == "backup" {
+                       switch request.Type {
+                       case "notify":
+                               var receipt Event
+
+                               decoder := json.NewDecoder(bytes.NewReader(scanner.Bytes()))
+                               decoder.DisallowUnknownFields()
+
+                               err = decoder.Decode(&request)
+                               if err == nil {
+                                       receipt, err = l.messages.Notify(request.Notify)
+                               }
+
+                               if err == nil {
+                                       h.Send(client, receipt)
+                               }
+                       case "backup":
                                var size int64
 
                                size, err = backupData(ctx, filepath.Dir(l.agent.dir), request.Text, h.whatsapp, h.snapshot)
@@ -118,7 +134,7 @@ func (h *DaemonHub) read(ctx context.Context, client *DaemonClient, l *TurnLoop)
                                                Text: fmt.Sprintf("%s (%d bytes)", request.Text, size),
                                        })
                                }
-                       } else {
+                       default:
                                err = daemonRunRequest(l, h.whatsapp, request, func(text string) {
                                        h.Send(client, Event{
                                                Kind: "notice",
@@ -174,7 +190,9 @@ func (h *DaemonHub) remove(client *DaemonClient) {
        client.once.Do(func() {
                close(client.events)
 
-               _ = client.conn.Close()
+               // The client is removed already, so a close failure cannot
+               // restore it.
+               client.conn.Close() // nolint: errcheck
        })
 }
 
@@ -211,8 +229,11 @@ func daemonRunRequest(l *TurnLoop, whatsapp *WhatsApp, request SocketRequest, an
                }
 
                _, err := l.Submit(terminalSource, request.Text)
+               if err != nil {
+                       return fmt.Errorf("submit terminal message: %w", err)
+               }
 
-               return err
+               return nil
        case "image":
                if !filepath.IsAbs(request.Path) {
                        return errors.New("use /image PATH [caption]")
@@ -250,7 +271,11 @@ func daemonRunRequest(l *TurnLoop, whatsapp *WhatsApp, request SocketRequest, an
                        err = fmt.Errorf("no subagent %s runs", request.Text)
                }
 
-               return err
+               if err != nil {
+                       return fmt.Errorf("stop subagent: %w", err)
+               }
+
+               return nil
        default:
                return fmt.Errorf("unknown request %q", request.Type)
        }
@@ -266,7 +291,7 @@ func daemonRunRequest(l *TurnLoop, whatsapp *WhatsApp, request SocketRequest, an
 func daemon(ctx context.Context, out io.Writer) (err error) {
        dir, err := dataDir()
        if err != nil {
-               return err
+               return fmt.Errorf("find data directory: %w", err)
        }
 
        // Check the socket path before the daemon writes a file, so that a data
@@ -274,22 +299,22 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
        socket := filepath.Join(dir, socketFileName)
        err = checkSocketPath(socket)
        if err != nil {
-               return err
+               return fmt.Errorf("check daemon socket path: %w", err)
        }
 
        config, err := loadConfig(dir)
        if err != nil {
-               return err
+               return fmt.Errorf("load daemon config: %w", err)
        }
 
        botSettings, hasBot, err := loadTelegramConfig(dir)
        if err != nil {
-               return err
+               return fmt.Errorf("load Telegram config: %w", err)
        }
 
        tokens, err := lockTokens(dir)
        if err != nil {
-               return err
+               return fmt.Errorf("lock login tokens: %w", err)
        }
 
        defer func() {
@@ -301,7 +326,7 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
        logger := daemonLogger(out, "onechat: ")
        whatsapp, err := openWhatsApp(ctx, dir, time.Now, daemonLogger(out, "whatsapp: "), whatsappNewClient)
        if err != nil {
-               return err
+               return fmt.Errorf("open WhatsApp: %w", err)
        }
 
        defer func() {
@@ -310,12 +335,12 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 
        address, auth, err := modelEndpoint(config, dir)
        if err != nil {
-               return err
+               return fmt.Errorf("configure model endpoint: %w", err)
        }
 
        agents, err := openDaemonAgents(ctx, dir, address, auth, config.Compactor, time.Now, logger)
        if err != nil {
-               return err
+               return fmt.Errorf("open daemon agents: %w", err)
        }
 
        defer func() {
@@ -330,7 +355,7 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 
        listener, err := daemonListenSocket(socket)
        if err != nil {
-               return err
+               return fmt.Errorf("listen for daemon clients: %w", err)
        }
 
        linked := "not linked"
@@ -350,9 +375,14 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
                logger.Info("Telegram bot started")
        }
 
-       return daemonServe(ctx, listener, telegram, whatsapp, schedules, func(notify func(Event)) (*TurnLoop, error) {
+       err = daemonServe(ctx, listener, telegram, whatsapp, schedules, func(notify func(Event)) (*TurnLoop, error) {
                return root.Loop(whatsapp, notify)
        }, agents[1:]...)
+       if err != nil {
+               return fmt.Errorf("serve daemon: %w", err)
+       }
+
+       return nil
 }
 
 // daemonListenSocket listens on the Unix socket at path, with mode 0600. The
@@ -361,7 +391,7 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 func daemonListenSocket(path string) (net.Listener, error) {
        err := checkSocketPath(path)
        if err != nil {
-               return nil, err
+               return nil, fmt.Errorf("check daemon socket path: %w", err)
        }
 
        err = os.Remove(path)