@adhdev/daemon-standalone 0.8.34 → 0.8.35

package/dist/index.js

@@ -30284,8 +30284,6 @@ ${data.message || ""}`.trim();
             if (blockingModal || this.currentStatus === "waiting_approval") {
               throw new Error(`${this.cliName} is awaiting confirmation before it can accept a prompt`);
             }
-            this.committedMessages.push({ role: "user", content: text, timestamp: Date.now() });
-            this.syncMessageViews();
             this.isWaitingForResponse = true;
             this.responseBuffer = "";
             this.finishRetryCount = 0;
@@ -30317,6 +30315,13 @@ ${data.message || ""}`.trim();
             const submitDelayMs = this.sendDelayMs + Math.min(2e3, Math.max(0, estimatedLines - 1) * 350);
             const maxEchoWaitMs = submitDelayMs + Math.max(1500, Math.min(5e3, estimatedLines * 500));
             const retryDelayMs = Math.max(350, Math.min(1500, Math.max(this.sendDelayMs, submitDelayMs)));
+            let didCommitUserTurn = false;
+            const commitUserTurn = () => {
+              if (didCommitUserTurn) return;
+              didCommitUserTurn = true;
+              this.committedMessages.push({ role: "user", content: text, timestamp: Date.now() });
+              this.syncMessageViews();
+            };
             if (this.settleTimer) {
               clearTimeout(this.settleTimer);
               this.settleTimer = null;
@@ -30329,109 +30334,128 @@ ${data.message || ""}`.trim();
                 if (this.isWaitingForResponse) this.finishResponse();
               }, this.timeouts.maxResponse);
             };
-            const submit = () => {
-              if (!this.ptyProcess) return;
-              this.submitPendingUntil = 0;
-              this.recordTrace("submit_write", {
-                mode: "submit_key",
-                sendKey: this.sendKey,
-                screenText: summarizeCliTraceText(this.terminalScreen.getText(), 500)
-              });
-              this.ptyProcess.write(this.sendKey);
-              const retrySubmitIfStuck = (attempt) => {
-                this.submitRetryTimer = null;
-                if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
-                if (this.currentStatus === "waiting_approval") return;
-                if ((this.responseBuffer || "").trim()) return;
+            await new Promise((resolve12) => {
+              let resolved = false;
+              const resolveOnce = () => {
+                if (resolved) return;
+                resolved = true;
+                resolve12();
+              };
+              const submit = () => {
+                if (!this.ptyProcess) {
+                  resolveOnce();
+                  return;
+                }
+                commitUserTurn();
+                this.submitPendingUntil = 0;
                 const screenText = this.terminalScreen.getText();
-                if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
-                if (/Esc to interrupt|Do you want to proceed|This command requires approval|Allow Codex to|Approve and run now|Always approve this session|Running…|Running\.\.\./i.test(screenText)) return;
-                this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
-                LOG2.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt ${attempt})`);
                 this.recordTrace("submit_write", {
-                  mode: "submit_retry",
-                  attempt,
+                  mode: "submit_key",
                   sendKey: this.sendKey,
                   screenText: summarizeCliTraceText(screenText, 500)
                 });
                 this.ptyProcess.write(this.sendKey);
-                if (attempt >= 3) {
-                  this.submitRetryUsed = true;
-                  return;
-                }
-                this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(attempt + 1), retryDelayMs);
+                const retrySubmitIfStuck = (attempt) => {
+                  this.submitRetryTimer = null;
+                  if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
+                  if (this.currentStatus === "waiting_approval") return;
+                  if ((this.responseBuffer || "").trim()) return;
+                  const screenText2 = this.terminalScreen.getText();
+                  if (!promptLikelyVisible(screenText2, normalizedPromptSnippet)) return;
+                  if (/Esc to interrupt|Do you want to proceed|This command requires approval|Allow Codex to|Approve and run now|Always approve this session|Running…|Running\.\.\./i.test(screenText2)) return;
+                  this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
+                  LOG2.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt ${attempt})`);
+                  this.recordTrace("submit_write", {
+                    mode: "submit_retry",
+                    attempt,
+                    sendKey: this.sendKey,
+                    screenText: summarizeCliTraceText(screenText2, 500)
+                  });
+                  this.ptyProcess.write(this.sendKey);
+                  if (attempt >= 3) {
+                    this.submitRetryUsed = true;
+                    return;
+                  }
+                  this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(attempt + 1), retryDelayMs);
+                };
+                this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(1), retryDelayMs);
+                startResponseTimeout();
+                resolveOnce();
               };
-              this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(1), retryDelayMs);
-              startResponseTimeout();
-            };
-            if (this.submitStrategy === "immediate") {
-              this.submitPendingUntil = 0;
+              if (this.submitStrategy === "immediate") {
+                commitUserTurn();
+                this.submitPendingUntil = 0;
+                this.recordTrace("submit_write", {
+                  mode: "immediate",
+                  text: summarizeCliTraceText(text, 500),
+                  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.responseBuffer || "").trim()) return;
+                  const screenText = this.terminalScreen.getText();
+                  if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) 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();
+                return;
+              }
+              if (submitDelayMs > 0) {
+                this.submitPendingUntil = Date.now() + submitDelayMs;
+              }
+              this.ptyProcess.write(text);
               this.recordTrace("submit_write", {
-                mode: "immediate",
+                mode: "type_then_submit",
                 text: summarizeCliTraceText(text, 500),
                 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.responseBuffer || "").trim()) return;
+              const submitStartedAt = Date.now();
+              let lastNormalizedScreen = "";
+              let lastScreenChangeAt = submitStartedAt;
+              const waitForEchoAndSubmit = () => {
+                if (!this.ptyProcess) {
+                  resolveOnce();
+                  return;
+                }
+                const now = Date.now();
+                const elapsed = now - submitStartedAt;
                 const screenText = this.terminalScreen.getText();
-                if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) 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();
-              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),
-              sendKey: this.sendKey,
-              screenText: summarizeCliTraceText(this.terminalScreen.getText(), 500)
-            });
-            const submitStartedAt = Date.now();
-            let lastNormalizedScreen = "";
-            let lastScreenChangeAt = submitStartedAt;
-            const waitForEchoAndSubmit = () => {
-              if (!this.ptyProcess) return;
-              const now = Date.now();
-              const elapsed = now - submitStartedAt;
-              const screenText = this.terminalScreen.getText();
-              const normalizedScreen = normalizePromptText(screenText);
-              if (normalizedScreen !== lastNormalizedScreen) {
-                lastNormalizedScreen = normalizedScreen;
-                lastScreenChangeAt = now;
-              }
-              const echoVisible = !normalizedPromptSnippet || promptLikelyVisible(screenText, normalizedPromptSnippet);
-              if (echoVisible) {
-                const screenSettled = now - lastScreenChangeAt >= 500;
-                if (elapsed >= submitDelayMs && screenSettled) {
+                const normalizedScreen = normalizePromptText(screenText);
+                if (normalizedScreen !== lastNormalizedScreen) {
+                  lastNormalizedScreen = normalizedScreen;
+                  lastScreenChangeAt = now;
+                }
+                const echoVisible = !normalizedPromptSnippet || promptLikelyVisible(screenText, normalizedPromptSnippet);
+                if (echoVisible) {
+                  const screenSettled = now - lastScreenChangeAt >= 500;
+                  if (elapsed >= submitDelayMs && screenSettled) {
+                    submit();
+                    return;
+                  }
+                }
+                if (elapsed >= maxEchoWaitMs) {
                   submit();
                   return;
                 }
-              }
-              if (elapsed >= maxEchoWaitMs) {
-                submit();
-                return;
-              }
-              setTimeout(waitForEchoAndSubmit, 50);
-            };
-            waitForEchoAndSubmit();
+                setTimeout(waitForEchoAndSubmit, 50);
+              };
+              waitForEchoAndSubmit();
+            });
           }
           getPartialResponse() {
             if (!this.isWaitingForResponse) return "";
@@ -42121,6 +42145,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       lastStatusSentAt = 0;
       statusPendingThrottle = false;
       lastP2PStatusHash = "";
+      lastServerStatusHash = "";
       lastStatusSummary = "";
       statusTimer = null;
       p2pTimer = null;
@@ -42131,11 +42156,11 @@ Run 'adhdev doctor' for detailed diagnostics.`
       // ─── Lifecycle ───────────────────────────────────
       startReporting() {
         setTimeout(() => {
-          this.sendUnifiedStatusReport().catch((e) => LOG2.warn("Status", `Initial report failed: ${e?.message}`));
+          this.sendUnifiedStatusReport({ forceServer: true, reason: "initial" }).catch((e) => LOG2.warn("Status", `Initial report failed: ${e?.message}`));
         }, 2e3);
         const scheduleServerReport = () => {
           this.statusTimer = setTimeout(() => {
-            this.sendUnifiedStatusReport().catch((e) => LOG2.warn("Status", `Periodic report failed: ${e?.message}`));
+            this.sendUnifiedStatusReport({ forceServer: true, reason: "periodic" }).catch((e) => LOG2.warn("Status", `Periodic report failed: ${e?.message}`));
             scheduleServerReport();
           }, 3e4);
         };
@@ -42282,24 +42307,24 @@ Run 'adhdev doctor' for detailed diagnostics.`
             cdpConnected: session.cdpConnected,
             currentModel: session.currentModel,
             currentPlan: session.currentPlan,
-            currentAutoApprove: session.currentAutoApprove,
-            lastUpdated: session.lastUpdated,
-            unread: session.unread,
-            lastSeenAt: session.lastSeenAt,
-            inboxBucket: session.inboxBucket,
-            surfaceHidden: session.surfaceHidden,
-            controlValues: session.controlValues,
-            providerControls: session.providerControls,
-            acpConfigOptions: session.acpConfigOptions,
-            acpModes: session.acpModes
+            currentAutoApprove: session.currentAutoApprove
           })),
           p2p: payload.p2p,
           timestamp: now,
           detectedIdes: payload.detectedIdes,
           availableProviders: payload.availableProviders
         };
+        const wsHash = this.simpleHash(JSON.stringify({
+          ...wsPayload,
+          timestamp: void 0
+        }));
+        if (!opts?.forceServer && wsHash === this.lastServerStatusHash) {
+          LOG2.debug("Server", `skip duplicate status_report${opts?.reason ? ` (${opts.reason})` : ""}`);
+          return;
+        }
+        this.lastServerStatusHash = wsHash;
         serverConn.sendMessage("status_report", wsPayload);
-        LOG2.debug("Server", `sent status_report (${JSON.stringify(wsPayload).length} bytes)`);
+        LOG2.debug("Server", `sent status_report (${JSON.stringify(wsPayload).length} bytes)${opts?.reason ? ` [${opts.reason}]` : ""}`);
       }
       // ─── P2P ─────────────────────────────────────────
       sendP2PPayload(payload) {