@adhdev/daemon-standalone 0.9.82-rc.92 → 0.9.82-rc.94

package/dist/index.js

@@ -26803,6 +26803,9 @@ Next step: ${nextStep}`;
           idleFinishCandidate = null;
           finishRetryTimer = null;
           finishRetryCount = 0;
+          pendingOutboundQueue = [];
+          pendingOutboundFlushTimer = null;
+          pendingOutboundFlushInFlight = false;
           // Resize redraw suppression
           resizeSuppressUntil = 0;
           // Debug: status transition history
@@ -27823,6 +27826,7 @@ ${lastSnapshot}`;
             this.activeModal = null;
             this.setStatus("idle", "response_finished");
             this.onStatusChange?.();
+            this.schedulePendingOutboundFlush();
           }
           maybeCommitVisibleIdleTranscript(session, parsedMessages) {
             const allowImmediateScriptIdleCommit = this.provider.allowInputDuringGeneration === true;
@@ -27843,6 +27847,7 @@ ${lastSnapshot}`;
             this.activeModal = null;
             this.setStatus("idle", "script_idle_commit");
             this.onStatusChange?.();
+            this.schedulePendingOutboundFlush();
             this.recordTrace("script_idle_commit", {
               messageCount: parsedMessages.length,
               lastAssistant: summarizeCliTraceText(visibleAssistant.content, 320)
@@ -28025,6 +28030,14 @@ ${lastSnapshot}`;
               messages: [],
               workingDir: this.workingDir,
               activeModal: effectiveModal,
+              pendingOutboundCount: this.pendingOutboundQueue.length,
+              pendingOutboundMessages: this.pendingOutboundQueue.map((message) => ({
+                id: message.id,
+                role: message.role,
+                content: message.content,
+                queuedAt: message.queuedAt,
+                source: message.source
+              })),
               errorMessage: this.parseErrorMessage || void 0,
               errorReason: this.parseErrorMessage ? "parse_error" : void 0,
               ...bufferState ? { bufferState } : {}
@@ -28039,7 +28052,7 @@ ${lastSnapshot}`;
             const parseScreenText = this.getParseScreenText(screenText);
             const cached2 = this.parsedStatusCache;
             const accumulatedRawBufferKey = this.getAccumulatedRawBufferCacheKey();
-            if (cached2 && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.accumulatedRawBufferKey === accumulatedRawBufferKey && cached2.screenText === parseScreenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName) {
+            if (!this.providerOwnsTranscript() && cached2 && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.accumulatedRawBufferKey === accumulatedRawBufferKey && cached2.screenText === parseScreenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName) {
               return cached2.result;
             }
             const parsed = this.runParseSession();
@@ -28321,6 +28334,90 @@ ${lastSnapshot}`;
             ), 50);
           }
           async sendMessage(text) {
+            await this.sendMessageNow(text, true);
+          }
+          enqueuePendingOutboundMessage(text, reason) {
+            const content = String(text || "");
+            const duplicate = this.pendingOutboundQueue.some((message2) => message2.content === content);
+            if (duplicate) {
+              this.recordTrace("send_message_queued_duplicate_suppressed", {
+                reason,
+                queueLength: this.pendingOutboundQueue.length,
+                text: summarizeCliTraceText(content, 500)
+              });
+              return;
+            }
+            const queuedAt = Date.now();
+            const message = {
+              id: `${queuedAt}:${this.pendingOutboundQueue.length}:${Math.random().toString(36).slice(2, 10)}`,
+              role: "user",
+              content,
+              queuedAt,
+              source: "sendMessage"
+            };
+            this.pendingOutboundQueue.push(message);
+            this.recordTrace("send_message_queued", {
+              reason,
+              queueLength: this.pendingOutboundQueue.length,
+              queuedAt,
+              text: summarizeCliTraceText(content, 500)
+            });
+            LOG2.info("CLI", `[${this.cliType}] queued outbound message while busy (${reason}); queue=${this.pendingOutboundQueue.length}`);
+            this.onStatusChange?.();
+          }
+          shouldQueuePendingOutboundMessage(parsedStatusBeforeSend = null) {
+            if (this.provider.allowInputDuringGeneration === true) return null;
+            if (this.hasActionableApproval()) return null;
+            const parsedSessionStatus = typeof parsedStatusBeforeSend?.status === "string" ? String(parsedStatusBeforeSend.status) : "";
+            if (parsedSessionStatus === "idle" && this.parsedStatusHasFinalAssistantMessage(parsedStatusBeforeSend)) return null;
+            if (this.currentStatus === "generating") return "current_status_generating";
+            if (parsedSessionStatus === "generating" || parsedSessionStatus === "long_generating") {
+              const parsedModal = parsedStatusBeforeSend?.activeModal ?? parsedStatusBeforeSend?.modal ?? null;
+              const parsedHasActionableModal = Boolean(
+                parsedModal && Array.isArray(parsedModal.buttons) && parsedModal.buttons.some((candidate) => typeof candidate === "string" && candidate.trim())
+              );
+              const terminalLooksIdle = this.currentStatus === "idle" && this.runDetectStatus(this.recentOutputBuffer) === "idle" && !this.isWaitingForResponse && !this.currentTurnScope && !this.hasActionableApproval() && !parsedHasActionableModal;
+              return terminalLooksIdle ? null : `parsed_status_${parsedSessionStatus}`;
+            }
+            if (this.isWaitingForResponse && this.currentTurnScope) return "active_turn_in_progress";
+            return null;
+          }
+          schedulePendingOutboundFlush(delayMs = 0) {
+            if (this.pendingOutboundFlushTimer) clearTimeout(this.pendingOutboundFlushTimer);
+            this.pendingOutboundFlushTimer = setTimeout(() => {
+              this.pendingOutboundFlushTimer = null;
+              void this.flushPendingOutboundQueue();
+            }, Math.max(0, delayMs));
+          }
+          async flushPendingOutboundQueue() {
+            if (this.pendingOutboundFlushInFlight || this.pendingOutboundQueue.length === 0) return;
+            if (this.currentStatus !== "idle" || this.isWaitingForResponse || this.hasActionableApproval()) return;
+            this.pendingOutboundFlushInFlight = true;
+            try {
+              while (this.pendingOutboundQueue.length > 0) {
+                if (this.currentStatus !== "idle" || this.isWaitingForResponse || this.hasActionableApproval()) break;
+                const next = this.pendingOutboundQueue[0];
+                this.recordTrace("send_message_queue_flush", {
+                  id: next.id,
+                  queuedAt: next.queuedAt,
+                  queueLength: this.pendingOutboundQueue.length,
+                  text: summarizeCliTraceText(next.content, 500)
+                });
+                try {
+                  await this.sendMessageNow(next.content, false);
+                  this.pendingOutboundQueue.shift();
+                  this.onStatusChange?.();
+                } catch (error48) {
+                  LOG2.warn("CLI", `[${this.cliType}] queued outbound flush failed: ${error48?.message || error48}`);
+                  this.schedulePendingOutboundFlush(1e3);
+                  break;
+                }
+              }
+            } finally {
+              this.pendingOutboundFlushInFlight = false;
+            }
+          }
+          async sendMessageNow(text, allowQueue) {
             if (!this.ptyProcess) throw new Error(`${this.cliName} is not running`);
             const allowInputDuringGeneration = this.provider.allowInputDuringGeneration === true;
             const allowInterventionPrompt = allowInputDuringGeneration && this.isWaitingForResponse && !this.hasActionableApproval();
@@ -28331,6 +28428,18 @@ ${lastSnapshot}`;
                 await new Promise((resolve16) => setTimeout(resolve16, 50));
               }
             }
+            const parsedStatusBeforeSend = !allowInputDuringGeneration ? (() => {
+              try {
+                return this.getScriptParsedStatus?.() || null;
+              } catch {
+                return null;
+              }
+            })() : null;
+            const queueReason = this.shouldQueuePendingOutboundMessage(parsedStatusBeforeSend);
+            if (allowQueue && queueReason) {
+              this.enqueuePendingOutboundMessage(text, queueReason);
+              return;
+            }
             if (!allowInterventionPrompt) {
               await this.waitForInteractivePrompt();
             }
@@ -28343,13 +28452,6 @@ ${lastSnapshot}`;
               }
             }
             if (!this.ready) throw new Error(`${this.cliName} not ready (status: ${this.currentStatus})`);
-            const parsedStatusBeforeSend = !allowInputDuringGeneration ? (() => {
-              try {
-                return this.getScriptParsedStatus?.() || null;
-              } catch {
-                return null;
-              }
-            })() : null;
             const parsedSessionStatus = typeof parsedStatusBeforeSend?.status === "string" ? String(parsedStatusBeforeSend.status) : "";
             if (!allowInputDuringGeneration && (parsedSessionStatus === "generating" || parsedSessionStatus === "long_generating")) {
               const parsedModal = parsedStatusBeforeSend?.activeModal ?? parsedStatusBeforeSend?.modal ?? null;
@@ -28358,11 +28460,19 @@ ${lastSnapshot}`;
               );
               const terminalLooksIdle = this.currentStatus === "idle" && this.runDetectStatus(this.recentOutputBuffer) === "idle" && !this.isWaitingForResponse && !this.currentTurnScope && !this.hasActionableApproval() && !parsedHasActionableModal;
               if (!terminalLooksIdle) {
+                if (allowQueue) {
+                  this.enqueuePendingOutboundMessage(text, `parsed_status_${parsedSessionStatus}`);
+                  return;
+                }
                 throw new Error(`${this.cliName} is still processing the previous prompt`);
               }
             }
             if (this.isWaitingForResponse && !allowInputDuringGeneration) {
               if (!this.clearStaleIdleResponseGuard("send_message_guard") && !this.clearParsedIdleResponseGuard("send_message_parsed_idle_guard", parsedStatusBeforeSend)) {
+                if (allowQueue) {
+                  this.enqueuePendingOutboundMessage(text, "waiting_for_response");
+                  return;
+                }
                 throw new Error(`${this.cliName} is still processing the previous prompt`);
               }
             }
@@ -28597,6 +28707,12 @@ ${lastSnapshot}`;
             this.pendingTerminalQueryTail = "";
             this.ptyOutputChunks = [];
             this.finishRetryCount = 0;
+            if (this.pendingOutboundFlushTimer) {
+              clearTimeout(this.pendingOutboundFlushTimer);
+              this.pendingOutboundFlushTimer = null;
+            }
+            this.pendingOutboundQueue = [];
+            this.pendingOutboundFlushInFlight = false;
             if (this.ptyProcess) {
               this.ptyProcess.write("");
               setTimeout(() => {
@@ -28620,6 +28736,12 @@ ${lastSnapshot}`;
             this.pendingTerminalQueryTail = "";
             this.ptyOutputChunks = [];
             this.finishRetryCount = 0;
+            if (this.pendingOutboundFlushTimer) {
+              clearTimeout(this.pendingOutboundFlushTimer);
+              this.pendingOutboundFlushTimer = null;
+            }
+            this.pendingOutboundQueue = [];
+            this.pendingOutboundFlushInFlight = false;
             if (this.ptyProcess) {
               try {
                 if (typeof this.ptyProcess.detach === "function") {
@@ -28659,6 +28781,12 @@ ${lastSnapshot}`;
               this.finishRetryTimer = null;
             }
             this.finishRetryCount = 0;
+            if (this.pendingOutboundFlushTimer) {
+              clearTimeout(this.pendingOutboundFlushTimer);
+              this.pendingOutboundFlushTimer = null;
+            }
+            this.pendingOutboundQueue = [];
+            this.pendingOutboundFlushInFlight = false;
             this.resetTerminalScreen();
             this.ptyProcess?.clearBuffer?.();
             this.onStatusChange?.();
@@ -28785,6 +28913,14 @@ ${lastSnapshot}`;
               rawBufferPreview: this.accumulatedRawBuffer.slice(-1e3),
               sanitizedRawPreview: sanitizeTerminalText(this.accumulatedRawBuffer).slice(-1e3),
               responseBuffer: this.responseBuffer.slice(-1e3),
+              pendingOutboundQueue: this.pendingOutboundQueue.map((message) => ({
+                id: message.id,
+                role: message.role,
+                content: message.content,
+                queuedAt: message.queuedAt,
+                source: message.source
+              })),
+              pendingOutboundCount: this.pendingOutboundQueue.length,
               lastOutputAt: this.lastOutputAt,
               lastNonEmptyOutputAt: this.lastNonEmptyOutputAt,
               lastScreenChangeAt: this.lastScreenChangeAt,
@@ -38018,7 +38154,7 @@ ${effect.notification.body || ""}`.trim();
     var READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS = 25e3;
     var HERMES_CLI_STARTING_SEND_SETTLE_MS = 2e3;
     var CLI_NATIVE_HISTORY_FRESH_MS = 5 * 6e4;
-    var CLI_NATIVE_TRANSCRIPT_PROVIDERS = /* @__PURE__ */ new Set(["codex-cli", "claude-cli"]);
+    var CLI_NATIVE_TRANSCRIPT_PROVIDERS = /* @__PURE__ */ new Set(["codex-cli", "claude-cli", "hermes-cli"]);
     var recentSendByTarget = /* @__PURE__ */ new Map();
     function getCurrentProviderType(h, fallback = "") {
       return h.currentSession?.providerType || h.currentProviderType || fallback;
@@ -44868,18 +45004,6 @@ Run 'adhdev doctor' for detailed diagnostics.`
               } else if (currentStatus === "starting") {
                 currentStatus = getEffectiveAgentSendStatus(adapter);
               }
-              if (BUSY_AGENT_STATUSES.has(currentStatus)) {
-                return {
-                  success: false,
-                  code: "agent_runtime_busy",
-                  reason: "agent_runtime_busy",
-                  retryable: true,
-                  retryRecommended: true,
-                  status: currentStatus,
-                  targetSessionId: args?.targetSessionId,
-                  error: `CLI agent '${agentType}' is currently ${currentStatus}; retry after the current turn finishes.`
-                };
-              }
               const input = normalizeInputEnvelope(args?.input ? { input: args.input } : args);
               const provider = this.providerLoader.resolve(agentType) || this.providerLoader.getMeta(agentType);
               if (provider?.category === "acp") {
@@ -44890,7 +45014,11 @@ Run 'adhdev doctor' for detailed diagnostics.`
               const message = input.textFallback;
               if (!message) throw new Error("message required for send_chat");
               await adapter.sendMessage(message);
-              return { success: true, status: "generating" };
+              return {
+                success: true,
+                status: BUSY_AGENT_STATUSES.has(currentStatus) ? currentStatus : "generating",
+                ...BUSY_AGENT_STATUSES.has(currentStatus) ? { queued: true, queuedReason: "agent_runtime_busy" } : {}
+              };
             } else if (action === "clear_history") {
               if (typeof adapter.clearHistory === "function") adapter.clearHistory();
               return { success: true, cleared: true };