@adhdev/daemon-standalone 0.9.11 → 0.9.13

package/dist/index.js

@@ -31263,6 +31263,29 @@ var require_dist2 = __commonJS({
             }
             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;
@@ -31357,19 +31380,29 @@ var require_dist2 = __commonJS({
                 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 = (error48) => {
+                if (resolved) return;
+                this.resetPendingSendState("send_write_failed");
+                resolved = true;
+                reject(error48);
+              };
+              const writeRetryKey = (mode) => {
+                void this.writeToPty(this.sendKey).catch((error48) => {
+                  LOG2.warn("CLI", `[${this.cliType}] ${mode} write failed: ${error48?.message || error48}`);
+                });
+              };
               const submit = () => {
                 if (!this.ptyProcess) {
                   resolveOnce();
                   return;
                 }
-                commitUserTurn();
                 this.submitPendingUntil = 0;
                 const screenText = this.terminalScreen.getText();
                 this.recordTrace("submit_write", {
@@ -31377,7 +31410,6 @@ var require_dist2 = __commonJS({
                   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;
@@ -31397,19 +31429,21 @@ var require_dist2 = __commonJS({
                     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",
@@ -31417,37 +31451,38 @@ var require_dist2 = __commonJS({
                   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;
-                  LOG2.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;
+                    LOG2.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),
@@ -31484,7 +31519,7 @@ var require_dist2 = __commonJS({
                 }
                 setTimeout(waitForEchoAndSubmit, 50);
               };
-              waitForEchoAndSubmit();
+              void this.writeToPty(text).then(() => waitForEchoAndSubmit(), rejectOnce);
             });
           }
           getPartialResponse() {
@@ -31639,12 +31674,12 @@ var require_dist2 = __commonJS({
           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);
@@ -39552,14 +39587,14 @@ ${effect.notification.body || ""}`.trim();
         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) {
@@ -39736,7 +39771,7 @@ ${effect.notification.body || ""}`.trim();
           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 {
@@ -40876,7 +40911,7 @@ ${effect.notification.body || ""}`.trim();
         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" });
       }
@@ -50561,7 +50596,7 @@ async (params) => {
       }
       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" });
@@ -53480,7 +53515,7 @@ data: ${JSON.stringify(msg.data)}
         this.exitCallbacks.add(callback);
       }
       write(data) {
-        this.enqueue(async () => {
+        return this.enqueue(async () => {
           let response = await this.client.request({
             type: "send_input",
             payload: {
@@ -53782,9 +53817,11 @@ data: ${JSON.stringify(msg.data)}
         };
       }
       enqueue(action) {
-        this.operationChain = this.operationChain.then(() => this.ready).then(action).catch((error48) => {
+        const operation = this.operationChain.then(() => this.ready).then(action);
+        this.operationChain = operation.catch((error48) => {
           LOG2.warn("CLI", `[session-host:${this.options.runtimeId}] ${error48?.message || error48}`);
         });
+        return operation;
       }
       async closeClient(destroy = false) {
         if (this.closed) return;