@songsid/agend 2.1.3-beta.6 → 2.1.3-beta.8

package/dist/daemon.js

@@ -614,12 +614,8 @@ export class Daemon extends EventEmitter {
     lastAdapterId;
     // Pending ack: react 🫡 on first transcript activity after receiving a message
     pendingAckMessage = null;
-    // Tool status tracking for channel adapter
     /** Last activity published to the fleet manager; null when nothing is running. */
     currentActivity = null;
-    toolStatusMessageId = null;
-    toolStatusLines = [];
-    toolStatusDebounce = null;
     // Session identity: map IPC socket → sessionName (from mcp_ready)
     socketSessionNames = new Map();
     // Crash recovery
@@ -940,10 +936,6 @@ export class Daemon extends EventEmitter {
                     this.logger.error({ err: err.message }, "Wake failed for scheduled delivery");
                 });
             }
-            else if (msg.type === "fleet_tool_status_ack") {
-                // Fleet manager sent us the messageId for our tool status message
-                this.toolStatusMessageId = msg.messageId;
-            }
             else if (msg.type === "query_instance_state") {
                 const snapshot = this.getInstanceStateSnapshot();
                 this.ipcServer?.send(socket, {
@@ -1779,10 +1771,6 @@ export class Daemon extends EventEmitter {
     async stop() {
         this.logger.info("Stopping daemon instance");
         this.freezeRuntimeMonitors();
-        if (this.toolStatusDebounce) {
-            clearTimeout(this.toolStatusDebounce);
-            this.toolStatusDebounce = null;
-        }
         this.pendingIpcRequests.clear();
         if (this.adapter)
             await this.adapter.stop();
@@ -2440,45 +2428,6 @@ export class Daemon extends EventEmitter {
             return ""; // skip channel tools
         return name;
     }
-    addToolStatus(name, input, state) {
-        const summary = this.summarizeTool(name, input);
-        if (!summary)
-            return; // skip empty (e.g., channel tools)
-        if (state === "running") {
-            this.toolStatusLines.push(`⏳ ${summary}`);
-        }
-        else {
-            // Mark the last matching tool as done
-            for (let i = this.toolStatusLines.length - 1; i >= 0; i--) {
-                if (this.toolStatusLines[i].includes(name) && this.toolStatusLines[i].startsWith("⏳")) {
-                    this.toolStatusLines[i] = this.toolStatusLines[i].replace("⏳", "✅");
-                    break;
-                }
-            }
-        }
-        this.debouncedSendToolStatus();
-    }
-    /** Debounce tool status updates to avoid channel rate limits */
-    debouncedSendToolStatus() {
-        if (this.toolStatusDebounce)
-            clearTimeout(this.toolStatusDebounce);
-        this.toolStatusDebounce = setTimeout(() => this.sendToolStatus(), 500);
-    }
-    sendToolStatus() {
-        const text = this.toolStatusLines.join("\n");
-        if (!text)
-            return;
-        this.ipcServer?.broadcast({
-            type: "fleet_tool_status",
-            instanceName: this.name,
-            text,
-            editMessageId: this.toolStatusMessageId,
-        });
-    }
-    /** Called by fleet manager when tool status message is sent (returns messageId) */
-    setToolStatusMessageId(messageId) {
-        this.toolStatusMessageId = messageId;
-    }
     /**
      * Push an inbound channel message to a specific MCP session.
      * If targetSession is provided, only send to the matching socket.
@@ -2656,6 +2605,16 @@ export class Daemon extends EventEmitter {
      * precisely so the lock's scope is visible at the call site rather than being
      * an invariant maintained by comments.
      */
+    async sendDeliveryEnter(phase) {
+        const sent = await this.tmux.sendSpecialKey("Enter");
+        if (!sent) {
+            this.logger.error({
+                phase,
+                tmuxError: this.tmux.getLastSendSpecialKeyError() ?? "unknown tmux send-keys failure",
+            }, "tmux send-keys Enter failed during message delivery");
+        }
+        return sent;
+    }
     async writeMessageToPane(formatted, initialWindowId, handingOffToNativeQueue, status) {
         let windowId = initialWindowId;
         // Bug A: paste with backoff. Transient failures are usually a stale window id
@@ -2693,7 +2652,11 @@ export class Daemon extends EventEmitter {
                 settle = { settleMs: fallbackMs, observedPostPasteOutput: false, capHit: false, usedFallback: true };
             }
             let enterAt = Date.now();
-            await this.tmux.sendSpecialKey("Enter");
+            if (!(await this.sendDeliveryEnter("initial-submit"))) {
+                if (status)
+                    this.emit("message_failed", status); // ❌
+                return false;
+            }
             // Kiro's legacy TUI can swallow Enter while it is still processing a large
             // paste — not only during the post-ready redraw (#479): on slower hosts it
             // happens on ordinary deliveries too (v2.1.2 stable, WSL2 + tmux 3.4).
@@ -2709,10 +2672,12 @@ export class Daemon extends EventEmitter {
             let enterRetry = false;
             if (this.backend?.requiresDeliveryEnterRetry?.() === true) {
                 await new Promise(r => setTimeout(r, 1_000));
-                enterAt = Date.now();
-                await this.tmux.sendSpecialKey("Enter");
-                enterRetry = true;
-                this.logger.debug("Sent defensive Enter retry (queue-less TUI can swallow the first)");
+                const retryAt = Date.now();
+                if (await this.sendDeliveryEnter("queue-less-defensive-retry")) {
+                    enterAt = retryAt;
+                    enterRetry = true;
+                    this.logger.debug("Sent defensive Enter retry (queue-less TUI can swallow the first)");
+                }
             }
             this.logger.debug({
                 observedPostPasteOutput: settle.observedPostPasteOutput,
@@ -2748,13 +2713,21 @@ export class Daemon extends EventEmitter {
                 }
                 await new Promise(r => setTimeout(r, NORMAL_ENTER_SETTLE_MS));
                 const retryAt = Date.now();
-                await this.tmux.sendSpecialKey("Enter");
+                if (!(await this.sendDeliveryEnter("native-queue-idle-redelivery"))) {
+                    if (status)
+                        this.emit("message_failed", status); // ❌
+                    return false;
+                }
                 if (windowId && this.controlClient) {
                     let becameBusy = await this.confirmBusyAfterEnter(windowId, retryAt);
                     if (!becameBusy) {
                         this.logger.warn("No idle→busy after idle-gated redelivery — re-sending Enter once");
                         const retry2At = Date.now();
-                        await this.tmux.sendSpecialKey("Enter");
+                        if (!(await this.sendDeliveryEnter("native-queue-idle-redelivery-retry"))) {
+                            if (status)
+                                this.emit("message_failed", status); // ❌
+                            return false;
+                        }
                         becameBusy = await this.confirmBusyAfterEnter(windowId, retry2At);
                     }
                     if (becameBusy) {
@@ -2778,7 +2751,11 @@ export class Daemon extends EventEmitter {
                 if (!becameBusy) {
                     this.logger.warn("No idle→busy transition after Enter — re-sending Enter once");
                     const retryAt = Date.now();
-                    await this.tmux.sendSpecialKey("Enter");
+                    if (!(await this.sendDeliveryEnter("idle-to-busy-retry"))) {
+                        if (status)
+                            this.emit("message_failed", status); // ❌
+                        return false;
+                    }
                     becameBusy = await this.confirmBusyAfterEnter(windowId, retryAt);
                 }
                 if (becameBusy) {
@@ -2799,7 +2776,7 @@ export class Daemon extends EventEmitter {
             else {
                 // No control client to observe output: fall back to the legacy double-Enter.
                 await new Promise(r => setTimeout(r, 1000));
-                await this.tmux.sendSpecialKey("Enter");
+                await this.sendDeliveryEnter("unobserved-defensive-retry");
                 if (status)
                     this.emit("message_confirmed", status); // ✅ (best-effort)
             }
@@ -3367,8 +3344,6 @@ export class Daemon extends EventEmitter {
         this.beginSpawn();
         let resumedSuccessfully = false;
         try {
-            this.toolStatusLines = [];
-            this.toolStatusMessageId = null;
             if (!this.backend) {
                 throw new Error("No backend configured — cannot spawn CLI window");
             }