Prove direct cancellation during a pending sync

[onechat] / daemon.go

diff --git a/daemon.go b/daemon.go
index d6aa6aaa8cf247cb2ec4a613fab3344cf0b7eaaf..7945c2b5638a49f81aa4f1369bca67ea0327cadd 100644 (file)
--- a/daemon.go
+++ b/daemon.go
@@ -213,8 +213,11 @@ func daemonRunRequest(l *TurnLoop, whatsapp *WhatsApp, request SocketRequest, an
                }
 
                _, err := l.Submit(terminalSource, request.Text)
                }
 
                _, 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]")
        case "image":
                if !filepath.IsAbs(request.Path) {
                        return errors.New("use /image PATH [caption]")


@@ -252,7 +255,11 @@ func daemonRunRequest(l *TurnLoop, whatsapp *WhatsApp, request SocketRequest, an
                        err = fmt.Errorf("no subagent %s runs", request.Text)
                }
 
                        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)
        }
        default:
                return fmt.Errorf("unknown request %q", request.Type)
        }


@@ -268,7 +275,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 {
 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
        }
 
        // Check the socket path before the daemon writes a file, so that a data


@@ -276,22 +283,22 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
        socket := filepath.Join(dir, socketFileName)
        err = checkSocketPath(socket)
        if err != nil {
        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 {
        }
 
        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 {
        }
 
        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 {
        }
 
        tokens, err := lockTokens(dir)
        if err != nil {

-               return err
+               return fmt.Errorf("lock login tokens: %w", err)

        }
 
        defer func() {
        }
 
        defer func() {


@@ -303,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 {
        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() {
        }
 
        defer func() {


@@ -312,12 +319,12 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 
        address, auth, err := modelEndpoint(config, dir)
        if err != nil {
 
        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 {
        }
 
        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() {
        }
 
        defer func() {


@@ -332,7 +339,7 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 
        listener, err := daemonListenSocket(socket)
        if err != nil {
 
        listener, err := daemonListenSocket(socket)
        if err != nil {

-               return err
+               return fmt.Errorf("listen for daemon clients: %w", err)

        }
 
        linked := "not linked"
        }
 
        linked := "not linked"


@@ -352,9 +359,14 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
                logger.Info("Telegram bot started")
        }
 
                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:]...)
                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
 }
 
 // daemonListenSocket listens on the Unix socket at path, with mode 0600. The


@@ -363,7 +375,7 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 func daemonListenSocket(path string) (net.Listener, error) {
        err := checkSocketPath(path)
        if err != nil {
 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)
        }
 
        err = os.Remove(path)