@adhdev/daemon-standalone 0.9.82-rc.69 → 0.9.82-rc.70

package/dist/index.js

@@ -26378,6 +26378,7 @@ Do NOT retry on this node. Consider reassigning to a different node or asking th
         accumulatedRawBuffer,
         recentOutputBuffer,
         terminalScreenText,
+        workingDir,
         baseMessages,
         partialResponse,
         isWaitingForResponse,
@@ -26393,6 +26394,8 @@ Do NOT retry on this node. Consider reassigning to a different node or asking th
         rawBuffer,
         recentBuffer,
         screenText,
+        workspace: workingDir,
+        workingDir,
         screen: buildCliScreenSnapshot(screenText),
         bufferScreen: buildCliScreenSnapshot(buffer),
         recentScreen: buildCliScreenSnapshot(recentBuffer),
@@ -27115,6 +27118,17 @@ ${lastSnapshot}`;
             const stableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : 0;
             if (stableMs < 2e3) return;
             const startupModal = this.runParseApproval(this.recentOutputBuffer);
+            const startupStatus = this.runDetectStatus(screenText || this.recentOutputBuffer);
+            if (!startupModal && startupStatus !== "idle") {
+              this.recordTrace("startup_settle_deferred", {
+                trigger,
+                startupStatus,
+                stableMs,
+                screenText: summarizeCliTraceText(screenText, 500)
+              });
+              this.scheduleStartupSettleCheck();
+              return;
+            }
             this.startupParseGate = false;
             if (this.startupSettleTimer) {
               clearTimeout(this.startupSettleTimer);
@@ -27313,6 +27327,31 @@ ${lastSnapshot}`;
             this.recordTrace("stale_idle_response_cleared", { reason });
             return true;
           }
+          clearParsedIdleResponseGuard(reason, parsedStatus) {
+            const parsedRawStatus = typeof parsedStatus?.status === "string" ? parsedStatus.status.trim() : "";
+            const parsedModal = parsedStatus?.activeModal ?? parsedStatus?.modal ?? null;
+            const blockingModal = this.activeModal || this.runParseApproval(this.recentOutputBuffer);
+            if (!this.isWaitingForResponse || parsedRawStatus !== "idle" || !!parsedModal || !!blockingModal || !this.parsedStatusHasFinalAssistantMessage(parsedStatus)) {
+              return false;
+            }
+            this.clearAllTimers();
+            this.clearIdleFinishCandidate(reason);
+            this.responseBuffer = "";
+            this.isWaitingForResponse = false;
+            this.responseSettleIgnoreUntil = 0;
+            this.submitRetryUsed = false;
+            this.submitRetryPromptSnippet = "";
+            this.finishRetryCount = 0;
+            this.currentTurnScope = null;
+            this.activeModal = null;
+            this.setStatus("idle", reason);
+            this.recordTrace("parsed_idle_response_cleared", {
+              reason,
+              parsedStatus: parsedRawStatus,
+              parsedMessageCount: Array.isArray(parsedStatus?.messages) ? parsedStatus.messages.length : 0
+            });
+            return true;
+          }
           hasMeaningfulResponseBuffer(promptSnippet) {
             const raw = String(this.responseBuffer || "").trim();
             if (!raw) return false;
@@ -27782,6 +27821,7 @@ ${lastSnapshot}`;
                 accumulatedRawBuffer: this.accumulatedRawBuffer,
                 recentOutputBuffer: this.recentOutputBuffer,
                 terminalScreenText: parseScreenText,
+                workingDir: this.workingDir,
                 baseMessages: [],
                 partialResponse: this.responseBuffer,
                 isWaitingForResponse: this.isWaitingForResponse,
@@ -27841,6 +27881,14 @@ ${lastSnapshot}`;
           hasActionableApproval(startupModal = null) {
             return !!(startupModal || this.activeModal);
           }
+          parsedStatusHasFinalAssistantMessage(parsed) {
+            const messages = Array.isArray(parsed?.messages) ? parsed.messages : [];
+            const lastAssistant = [...messages].reverse().find((message) => {
+              if (!message || message.role !== "assistant") return false;
+              return typeof message.content === "string" && message.content.trim().length > 0;
+            });
+            return !!lastAssistant;
+          }
           projectEffectiveStatus(startupModal = null) {
             if (this.parseErrorMessage) return "error";
             if (this.hasActionableApproval(startupModal)) return "waiting_approval";
@@ -27851,14 +27899,22 @@ ${lastSnapshot}`;
           getStatus(options = {}) {
             const allowParse = options.allowParse !== false;
             const startupModal = allowParse && this.startupParseGate ? this.runParseApproval(this.recentOutputBuffer) : null;
+            const startupDetectedStatus = allowParse && this.startupParseGate && !startupModal ? this.runDetectStatus(this.recentOutputBuffer || this.terminalScreen.getText()) : null;
             let effectiveStatus = this.projectEffectiveStatus(startupModal);
             let effectiveModal = startupModal || this.activeModal;
+            if (startupDetectedStatus === "waiting_approval") {
+              effectiveStatus = "waiting_approval";
+            }
             if (allowParse && !startupModal && !effectiveModal) {
               const parsed = this.getFreshParsedStatusCache();
               const parsedModal = parsed?.activeModal && Array.isArray(parsed.activeModal.buttons) && parsed.activeModal.buttons.some((button) => typeof button === "string" && button.trim()) ? parsed.activeModal : null;
               if (parsed?.status === "waiting_approval" && parsedModal) {
                 effectiveStatus = "waiting_approval";
                 effectiveModal = parsedModal;
+              } else if (effectiveStatus === "idle" && parsed?.status === "generating" && !this.parsedStatusHasFinalAssistantMessage(parsed)) {
+                effectiveStatus = "generating";
+              } else if (effectiveStatus === "generating" && parsed?.status === "idle" && this.parsedStatusHasFinalAssistantMessage(parsed)) {
+                effectiveStatus = "idle";
               }
             }
             const bufferState = this.getBufferState();
@@ -27928,6 +27984,7 @@ ${lastSnapshot}`;
               accumulatedRawBuffer: this.accumulatedRawBuffer,
               recentOutputBuffer: this.recentOutputBuffer,
               terminalScreenText: this.getParseScreenText(this.terminalScreen.getText()),
+              workingDir: this.workingDir,
               baseMessages: [],
               partialResponse: this.responseBuffer,
               isWaitingForResponse: this.isWaitingForResponse,
@@ -28203,7 +28260,7 @@ ${lastSnapshot}`;
               }
             }
             if (this.isWaitingForResponse && !allowInputDuringGeneration) {
-              if (!this.clearStaleIdleResponseGuard("send_message_guard")) {
+              if (!this.clearStaleIdleResponseGuard("send_message_guard") && !this.clearParsedIdleResponseGuard("send_message_parsed_idle_guard", parsedStatusBeforeSend)) {
                 throw new Error(`${this.cliName} is still processing the previous prompt`);
               }
             }
@@ -28581,10 +28638,17 @@ ${lastSnapshot}`;
           getDebugState() {
             const screenText = sanitizeTerminalText(this.terminalScreen.getText());
             const startupModal = this.startupParseGate ? this.runParseApproval(this.recentOutputBuffer) : null;
-            const effectiveStatus = this.projectEffectiveStatus(startupModal);
-            const effectiveReady = this.ready || !!startupModal;
+            const startupDetectedStatus = this.startupParseGate && !startupModal ? this.runDetectStatus(this.recentOutputBuffer || screenText) : null;
+            const effectiveReady = this.ready || !!startupModal || startupDetectedStatus === "waiting_approval";
             const parsedDebugState = this.getParsedDebugState();
             const parsedMessages = Array.isArray(parsedDebugState?.messages) ? parsedDebugState.messages : [];
+            let effectiveStatus = this.projectEffectiveStatus(startupModal);
+            if (startupDetectedStatus === "waiting_approval") {
+              effectiveStatus = "waiting_approval";
+            }
+            if (effectiveStatus === "idle" && parsedDebugState?.status === "generating" && !this.parsedStatusHasFinalAssistantMessage(parsedDebugState)) {
+              effectiveStatus = "generating";
+            }
             return {
               type: this.cliType,
               name: this.cliName,
@@ -35206,17 +35270,18 @@ ${cleanBody}`;
     function callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, historySessionId, workspace) {
       const fn = getProviderNativeHistoryScript(scripts, canonicalHistory, "readSession");
       if (!fn) return null;
+      const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId || "");
       const result = fn({
         agentType,
-        sessionId: historySessionId,
-        historySessionId,
+        sessionId: normalizedSessionId,
+        historySessionId: normalizedSessionId,
         workspace,
         format: canonicalHistory?.format,
         watchPath: canonicalHistory?.watchPath,
-        args: { sessionId: historySessionId, historySessionId, workspace }
+        args: { sessionId: normalizedSessionId, historySessionId: normalizedSessionId, workspace }
       });
       if (!result || typeof result !== "object") return null;
-      const records = normalizeProviderNativeHistoryRecords(agentType, historySessionId, result.messages || result.records);
+      const records = normalizeProviderNativeHistoryRecords(agentType, normalizedSessionId, result.messages || result.records);
       if (records.length === 0) return null;
       return {
         records,
@@ -35226,7 +35291,8 @@ ${cleanBody}`;
     }
     function buildNativeHistoryReadResult(agentType, canonicalHistory, scripts, historySessionId, workspace) {
       const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId || "");
-      if (!canonicalHistory || !normalizedSessionId || !isNativeSourceCanonicalHistory(canonicalHistory)) return null;
+      const normalizedWorkspace = typeof workspace === "string" ? workspace.trim() : "";
+      if (!canonicalHistory || !normalizedSessionId && !normalizedWorkspace || !isNativeSourceCanonicalHistory(canonicalHistory)) return null;
       return callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, normalizedSessionId, workspace);
     }
     function materializeNativeHistoryToMirror(agentType, canonicalHistory, historySessionId, workspace, scripts) {
@@ -35255,7 +35321,7 @@ ${cleanBody}`;
       return true;
     }
     function readProviderChatHistory(agentType, options = {}) {
-      if (isNativeSourceCanonicalHistory(options.canonicalHistory) && options.historySessionId) {
+      if (isNativeSourceCanonicalHistory(options.canonicalHistory) && (options.historySessionId || options.workspace)) {
         const nativeResult = buildNativeHistoryReadResult(agentType, options.canonicalHistory, options.scripts, options.historySessionId, options.workspace);
         if (!nativeResult) return { messages: [], hasMore: false, source: "native-unavailable" };
         return {
@@ -40560,7 +40626,8 @@ ${effect.notification.body || ""}`.trim();
           "pty_resize",
           "invoke_provider_script"
         ]);
-        const allowsInactiveReadChatFallback = cmd === "read_chat" && !!this._currentRoute.providerType && (typeof args?.providerSessionId === "string" && args.providerSessionId.trim().length > 0 || typeof args?.historySessionId === "string" && args.historySessionId.trim().length > 0);
+        const isReadOrDebugCmd = cmd === "read_chat" || cmd === "get_chat_debug_bundle";
+        const allowsInactiveReadChatFallback = isReadOrDebugCmd && !!this._currentRoute.providerType && (typeof args?.providerSessionId === "string" && args.providerSessionId.trim().length > 0 || typeof args?.historySessionId === "string" && args.historySessionId.trim().length > 0 || typeof args?.targetSessionId === "string" && args.targetSessionId.trim().length > 0);
         if (this._currentRoute.sessionLookupFailed && sessionScopedCommands.has(cmd) && !allowsInactiveReadChatFallback) {
           const result2 = {
             success: false,
@@ -55390,7 +55457,16 @@ async (params) => {
         return;
       }
       try {
-        ctx.instanceManager.sendEvent(target.instanceId, "send_message", { text });
+        if (target.category === "cli") {
+          const bundle = getCliTargetBundle(ctx, type, instanceId);
+          if (!bundle) {
+            ctx.json(res, 404, { error: `No running CLI adapter found for: ${type || instanceId}` });
+            return;
+          }
+          await bundle.adapter.sendMessage(text);
+        } else {
+          ctx.instanceManager.sendEvent(target.instanceId, "send_message", { text });
+        }
         ctx.json(res, 200, { sent: true, type: target.type, instanceId: target.instanceId });
       } catch (e) {
         ctx.json(res, 500, { error: `Send failed: ${e.message}` });