Add local context to chat operation failures

[onechat] / daemon.go

diff --git a/daemon.go b/daemon.go
index ea253180228d342a5343a3915a6efcbdb88afe18..962070a11e7f38b84709173e96b3c17395b13a6c 100644 (file)
--- a/daemon.go
+++ b/daemon.go
@@ -174,7 +174,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
        })
 }
 
@@ -201,6 +203,68 @@ func (h *DaemonHub) CloseAll() {
        h.workers.Wait()
 }
 
+// daemonRunRequest runs one request of a client. The answers of a WhatsApp
+// command go to answer.
+func daemonRunRequest(l *TurnLoop, whatsapp *WhatsApp, request SocketRequest, answer func(text string)) error {
+       switch request.Type {
+       case "send":
+               if request.Text == "" {
+                       return errors.New("empty message")
+               }
+
+               _, err := l.Submit(terminalSource, request.Text)
+               if err != nil {
+                       return fmt.Errorf("submit terminal message: %w", err)
+               }
+
+               return nil
+       case "image":
+               if !filepath.IsAbs(request.Path) {
+                       return errors.New("use /image PATH [caption]")
+               }
+
+               data, err := imageReadFile(request.Path)
+               if err != nil {
+                       return fmt.Errorf("read terminal image: %w", err)
+               }
+
+               name, err := l.agent.Images().Save(data)
+               if err != nil {
+                       return fmt.Errorf("store terminal image: %w", err)
+               }
+
+               _, err = l.Submit(terminalSource, imageText([]string{name}, request.Text))
+               if err != nil {
+                       return fmt.Errorf("submit terminal image: %w", err)
+               }
+
+               return nil
+       case "interrupt":
+               if !l.Interrupt() {
+                       return errors.New("no turn runs")
+               }
+
+               return nil
+       case "whatsapp":
+               whatsapp.Command(request.Text, answer)
+
+               return nil
+       case "stop":
+               found, err := l.StopSubagent(request.Text)
+               if err == nil && !found {
+                       err = fmt.Errorf("no subagent %s runs", request.Text)
+               }
+
+               if err != nil {
+                       return fmt.Errorf("stop subagent: %w", err)
+               }
+
+               return nil
+       default:
+               return fmt.Errorf("unknown request %q", request.Type)
+       }
+}
+
 // daemon runs "onechat daemon": it owns the root, its children, and their
 // 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 also
@@ -211,7 +275,7 @@ func (h *DaemonHub) CloseAll() {
 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
@@ -219,22 +283,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() {
@@ -246,7 +310,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() {
@@ -255,12 +319,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() {
@@ -275,7 +339,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"
@@ -306,7 +370,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)
@@ -489,58 +553,3 @@ func daemonRunChild(ctx context.Context, loop *TurnLoop, schedules *Schedules) e
 
        return errors.Join(err, <-done)
 }
-
-// daemonRunRequest runs one request of a client. The answers of a WhatsApp
-// command go to answer.
-func daemonRunRequest(l *TurnLoop, whatsapp *WhatsApp, request SocketRequest, answer func(text string)) error {
-       switch request.Type {
-       case "send":
-               if request.Text == "" {
-                       return errors.New("empty message")
-               }
-
-               _, err := l.Submit(terminalSource, request.Text)
-
-               return err
-       case "image":
-               if !filepath.IsAbs(request.Path) {
-                       return errors.New("use /image PATH [caption]")
-               }
-
-               data, err := imageReadFile(request.Path)
-               if err != nil {
-                       return fmt.Errorf("read terminal image: %w", err)
-               }
-
-               name, err := l.agent.Images().Save(data)
-               if err != nil {
-                       return fmt.Errorf("store terminal image: %w", err)
-               }
-
-               _, err = l.Submit(terminalSource, imageText([]string{name}, request.Text))
-               if err != nil {
-                       return fmt.Errorf("submit terminal image: %w", err)
-               }
-
-               return nil
-       case "interrupt":
-               if !l.Interrupt() {
-                       return errors.New("no turn runs")
-               }
-
-               return nil
-       case "whatsapp":
-               whatsapp.Command(request.Text, answer)
-
-               return nil
-       case "stop":
-               found, err := l.StopSubagent(request.Text)
-               if err == nil && !found {
-                       err = fmt.Errorf("no subagent %s runs", request.Text)
-               }
-
-               return err
-       default:
-               return fmt.Errorf("unknown request %q", request.Type)
-       }
-}