@adhdev/daemon-core 0.9.12 → 0.9.14

package/dist/cli-adapters/provider-cli-adapter.d.ts

@@ -165,6 +165,8 @@ export declare class ProviderCliAdapter implements CliAdapter {
      * Uses resolveAction script if available, otherwise falls back to standard text.
      */
     resolveAction(data: any): Promise<void>;
+    private writeToPty;
+    private resetPendingSendState;
     sendMessage(text: string): Promise<void>;
     getPartialResponse(): string;
     getRuntimeMetadata(): PtyRuntimeMetadata | null;
@@ -177,7 +179,7 @@ export declare class ProviderCliAdapter implements CliAdapter {
     clearHistory(): void;
     isProcessing(): boolean;
     isReady(): boolean;
-    writeRaw(data: string): void;
+    writeRaw(data: string): Promise<void>;
     resolveModal(buttonIndex: number): void;
     resize(cols: number, rows: number): void;
     getDebugState(): Record<string, any>;

package/dist/cli-adapters/pty-transport.d.ts

@@ -30,7 +30,7 @@ export interface PtyRuntimeTransport {
     readonly pid: number;
     readonly ready: Promise<void>;
     readonly terminalQueriesHandled?: boolean;
-    write(data: string): void;
+    write(data: string): void | Promise<void>;
     resize(cols: number, rows: number): void;
     kill(): void;
     clearBuffer?(): void;

package/dist/commands/stream-commands.d.ts

@@ -5,7 +5,7 @@
 import type { CommandResult, CommandHelpers } from './handler.js';
 export declare function handleSelectSession(h: CommandHelpers, args: any): Promise<CommandResult>;
 export declare function handleOpenPanel(h: CommandHelpers, args: any): Promise<CommandResult>;
-export declare function handlePtyInput(h: CommandHelpers, args: any): CommandResult;
+export declare function handlePtyInput(h: CommandHelpers, args: any): Promise<CommandResult>;
 export declare function handlePtyResize(_h: CommandHelpers, args: any): CommandResult;
 export declare function handleGetProviderSettings(h: CommandHelpers, args: any): CommandResult;
 export declare function handleSetProviderSetting(h: CommandHelpers, args: any): Promise<CommandResult>;

package/dist/index.js

@@ -3396,6 +3396,29 @@ var init_provider_cli_adapter = __esm({
         }
         await this.sendMessage(promptText);
       }
+      async writeToPty(data) {
+        if (!this.ptyProcess) throw new Error(`${this.cliName} is not running`);
+        await this.ptyProcess.write(data);
+      }
+      resetPendingSendState(reason) {
+        this.isWaitingForResponse = false;
+        this.responseBuffer = "";
+        this.currentTurnScope = null;
+        this.submitPendingUntil = 0;
+        this.clearIdleFinishCandidate(reason);
+        if (this.responseTimeout) {
+          clearTimeout(this.responseTimeout);
+          this.responseTimeout = null;
+        }
+        if (this.submitRetryTimer) {
+          clearTimeout(this.submitRetryTimer);
+          this.submitRetryTimer = null;
+        }
+        if (this.finishRetryTimer) {
+          clearTimeout(this.finishRetryTimer);
+          this.finishRetryTimer = null;
+        }
+      }
       async sendMessage(text) {
         if (!this.ptyProcess) throw new Error(`${this.cliName} is not running`);
         const allowInputDuringGeneration = this.provider.allowInputDuringGeneration === true;
@@ -3490,19 +3513,29 @@ var init_provider_cli_adapter = __esm({
             if (this.isWaitingForResponse) this.finishResponse();
           }, this.timeouts.maxResponse);
         };
-        await new Promise((resolve12) => {
+        await new Promise((resolve12, reject) => {
           let resolved = false;
           const resolveOnce = () => {
             if (resolved) return;
             resolved = true;
             resolve12();
           };
+          const rejectOnce = (error) => {
+            if (resolved) return;
+            this.resetPendingSendState("send_write_failed");
+            resolved = true;
+            reject(error);
+          };
+          const writeRetryKey = (mode) => {
+            void this.writeToPty(this.sendKey).catch((error) => {
+              LOG.warn("CLI", `[${this.cliType}] ${mode} write failed: ${error?.message || error}`);
+            });
+          };
           const submit = () => {
             if (!this.ptyProcess) {
               resolveOnce();
               return;
             }
-            commitUserTurn();
             this.submitPendingUntil = 0;
             const screenText = this.terminalScreen.getText();
             this.recordTrace("submit_write", {
@@ -3510,7 +3543,6 @@ var init_provider_cli_adapter = __esm({
               sendKey: this.sendKey,
               screenText: summarizeCliTraceText(screenText, 500)
             });
-            this.ptyProcess.write(this.sendKey);
             const retrySubmitIfStuck = (attempt) => {
               this.submitRetryTimer = null;
               if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
@@ -3530,19 +3562,21 @@ var init_provider_cli_adapter = __esm({
                 sendKey: this.sendKey,
                 screenText: summarizeCliTraceText(screenText2, 500)
               });
-              this.ptyProcess.write(this.sendKey);
+              writeRetryKey("submit_retry");
               if (attempt >= 3) {
                 this.submitRetryUsed = true;
                 return;
               }
               this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(attempt + 1), retryDelayMs);
             };
-            this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(1), retryDelayMs);
-            startResponseTimeout();
-            resolveOnce();
+            void this.writeToPty(this.sendKey).then(() => {
+              commitUserTurn();
+              this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(1), retryDelayMs);
+              startResponseTimeout();
+              resolveOnce();
+            }, rejectOnce);
           };
           if (this.submitStrategy === "immediate") {
-            commitUserTurn();
             this.submitPendingUntil = 0;
             this.recordTrace("submit_write", {
               mode: "immediate",
@@ -3550,37 +3584,38 @@ var init_provider_cli_adapter = __esm({
               sendKey: this.sendKey,
               screenText: summarizeCliTraceText(this.terminalScreen.getText(), 500)
             });
-            this.ptyProcess.write(text + this.sendKey);
-            this.submitRetryTimer = setTimeout(() => {
-              this.submitRetryTimer = null;
-              if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
-              if (this.currentStatus === "waiting_approval") return;
-              if (this.hasMeaningfulResponseBuffer(normalizedPromptSnippet)) return;
-              const screenText = this.terminalScreen.getText();
-              if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
-              const liveApproval = this.runParseApproval(screenText) || this.runParseApproval(this.recentOutputBuffer);
-              if (liveApproval) return;
-              const liveStatus = this.runDetectStatus(screenText) || this.runDetectStatus(this.recentOutputBuffer);
-              if (liveStatus === "generating" || liveStatus === "waiting_approval") return;
-              LOG.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt 1)`);
-              this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
-              this.recordTrace("submit_write", {
-                mode: "immediate_retry",
-                attempt: 1,
-                sendKey: this.sendKey,
-                screenText: summarizeCliTraceText(screenText, 500)
-              });
-              this.ptyProcess.write(this.sendKey);
-              this.submitRetryUsed = true;
-            }, retryDelayMs);
-            startResponseTimeout();
-            resolveOnce();
+            void this.writeToPty(text + this.sendKey).then(() => {
+              commitUserTurn();
+              this.submitRetryTimer = setTimeout(() => {
+                this.submitRetryTimer = null;
+                if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
+                if (this.currentStatus === "waiting_approval") return;
+                if (this.hasMeaningfulResponseBuffer(normalizedPromptSnippet)) return;
+                const screenText = this.terminalScreen.getText();
+                if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
+                const liveApproval = this.runParseApproval(screenText) || this.runParseApproval(this.recentOutputBuffer);
+                if (liveApproval) return;
+                const liveStatus = this.runDetectStatus(screenText) || this.runDetectStatus(this.recentOutputBuffer);
+                if (liveStatus === "generating" || liveStatus === "waiting_approval") return;
+                LOG.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt 1)`);
+                this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
+                this.recordTrace("submit_write", {
+                  mode: "immediate_retry",
+                  attempt: 1,
+                  sendKey: this.sendKey,
+                  screenText: summarizeCliTraceText(screenText, 500)
+                });
+                writeRetryKey("immediate_retry");
+                this.submitRetryUsed = true;
+              }, retryDelayMs);
+              startResponseTimeout();
+              resolveOnce();
+            }, rejectOnce);
             return;
           }
           if (submitDelayMs > 0) {
             this.submitPendingUntil = Date.now() + submitDelayMs;
           }
-          this.ptyProcess.write(text);
           this.recordTrace("submit_write", {
             mode: "type_then_submit",
             text: summarizeCliTraceText(text, 500),
@@ -3617,7 +3652,7 @@ var init_provider_cli_adapter = __esm({
             }
             setTimeout(waitForEchoAndSubmit, 50);
           };
-          waitForEchoAndSubmit();
+          void this.writeToPty(text).then(() => waitForEchoAndSubmit(), rejectOnce);
         });
       }
       getPartialResponse() {
@@ -3772,12 +3807,12 @@ var init_provider_cli_adapter = __esm({
       isReady() {
         return this.ready;
       }
-      writeRaw(data) {
+      async writeRaw(data) {
         this.recordTrace("write_raw", {
           keys: JSON.stringify(data),
           length: data.length
         });
-        this.ptyProcess?.write(data);
+        await this.writeToPty(data);
       }
       resolveModal(buttonIndex) {
         let modal = this.activeModal || this.runParseApproval(this.recentOutputBuffer);
@@ -11779,14 +11814,14 @@ async function handleOpenPanel(h, args) {
     success: revealState.visible || focusState.focused
   };
 }
-function handlePtyInput(h, args) {
+async function handlePtyInput(h, args) {
   const { cliType, data, targetSessionId } = args || {};
   if (!data) return { success: false, error: "data required" };
   const adapter = h.getCliAdapter(targetSessionId || cliType);
   if (!adapter || typeof adapter.writeRaw !== "function") {
     return { success: false, error: `CLI adapter not found: ${targetSessionId || cliType || "unknown"}` };
   }
-  adapter.writeRaw(data);
+  await adapter.writeRaw(data);
   return { success: true };
 }
 function handlePtyResize(_h, args) {
@@ -11963,7 +11998,7 @@ async function executeProviderScript(h, args, scriptName) {
       if (cliCommand?.type === "send_message" && cliCommand.text) {
         await adapter.sendMessage(cliCommand.text);
       } else if (cliCommand?.type === "pty_write" && cliCommand.text && adapter.writeRaw) {
-        adapter.writeRaw(cliCommand.text + "\r");
+        await adapter.writeRaw(cliCommand.text + "\r");
       }
       applyProviderPatch(h, args, parsed.payload);
       return {
@@ -13115,7 +13150,7 @@ var CliProviderInstance = class {
     if (cliCommand?.type === "send_message" && cliCommand.text) {
       await this.adapter.sendMessage(cliCommand.text);
     } else if (cliCommand?.type === "pty_write" && cliCommand.text) {
-      this.adapter.writeRaw(cliCommand.text + "\r");
+      await this.adapter.writeRaw(cliCommand.text + "\r");
     }
     this.applyProviderResponse(parsed.payload, { phase: "immediate" });
   }
@@ -18755,10 +18790,14 @@ var DaemonCommandRouter = class {
             currentInstalled = parsed?.dependencies?.[pkgName]?.version || null;
           } catch {
           }
-          if (currentInstalled === latest) {
+          const runningVersion = typeof this.deps.statusVersion === "string" ? this.deps.statusVersion.trim().replace(/^v/, "") : null;
+          if (currentInstalled === latest && runningVersion === latest) {
             LOG.info("Upgrade", `Already on latest version v${latest}; skipping install`);
             return { success: true, upgraded: false, alreadyLatest: true, version: latest };
           }
+          if (currentInstalled === latest && runningVersion && runningVersion !== latest) {
+            LOG.info("Upgrade", `Installed package is v${latest}, but running daemon is v${runningVersion}; scheduling restart`);
+          }
           spawnDetachedDaemonUpgradeHelper({
             packageName: pkgName,
             targetVersion: latest,
@@ -22864,7 +22903,7 @@ async function handleCliRaw(ctx, req, res) {
   }
   try {
     if (typeof adapter.writeRaw === "function") {
-      adapter.writeRaw(keys);
+      await adapter.writeRaw(keys);
       ctx.json(res, 200, { sent: true, type: target.type, instanceId: target.instanceId, keysLength: keys.length });
     } else {
       ctx.json(res, 400, { error: "writeRaw not available on this adapter" });
@@ -25791,7 +25830,7 @@ var SessionHostRuntimeTransport = class {
     this.exitCallbacks.add(callback);
   }
   write(data) {
-    this.enqueue(async () => {
+    return this.enqueue(async () => {
       let response = await this.client.request({
         type: "send_input",
         payload: {
@@ -26093,9 +26132,11 @@ var SessionHostRuntimeTransport = class {
     };
   }
   enqueue(action) {
-    this.operationChain = this.operationChain.then(() => this.ready).then(action).catch((error) => {
+    const operation = this.operationChain.then(() => this.ready).then(action);
+    this.operationChain = operation.catch((error) => {
       LOG.warn("CLI", `[session-host:${this.options.runtimeId}] ${error?.message || error}`);
     });
+    return operation;
   }
   async closeClient(destroy = false) {
     if (this.closed) return;