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

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

@@ -154,6 +154,7 @@ export declare class ProviderCliAdapter implements CliAdapter {
     private waitForInteractivePrompt;
     private clearAllTimers;
     private clearStaleIdleResponseGuard;
+    private clearParsedIdleResponseGuard;
     private hasMeaningfulResponseBuffer;
     private evaluateSettled;
     private applyPendingScriptStatusDebounce;
@@ -169,6 +170,7 @@ export declare class ProviderCliAdapter implements CliAdapter {
     private runDetectStatus;
     private runParseApproval;
     private hasActionableApproval;
+    private parsedStatusHasFinalAssistantMessage;
     private projectEffectiveStatus;
     getStatus(options?: {
         allowParse?: boolean;

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

@@ -15,6 +15,7 @@ export declare function buildCliParseInput(options: {
     accumulatedRawBuffer: string;
     recentOutputBuffer: string;
     terminalScreenText: string;
+    workingDir?: string;
     baseMessages: CliChatMessage[];
     partialResponse: string;
     isWaitingForResponse?: boolean;

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

@@ -112,6 +112,8 @@ export interface CliScriptInput {
     rawBuffer: string;
     recentBuffer: string;
     screenText: string;
+    workspace?: string;
+    workingDir?: string;
     screen: CliScreenSnapshot;
     bufferScreen: CliScreenSnapshot;
     recentScreen: CliScreenSnapshot;

package/dist/index.js

@@ -4217,6 +4217,7 @@ function buildCliParseInput(options) {
     accumulatedRawBuffer,
     recentOutputBuffer,
     terminalScreenText,
+    workingDir,
     baseMessages,
     partialResponse,
     isWaitingForResponse,
@@ -4232,6 +4233,8 @@ function buildCliParseInput(options) {
     rawBuffer,
     recentBuffer,
     screenText,
+    workspace: workingDir,
+    workingDir,
     screen: buildCliScreenSnapshot(screenText),
     bufferScreen: buildCliScreenSnapshot(buffer),
     recentScreen: buildCliScreenSnapshot(recentBuffer),
@@ -4957,6 +4960,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);
@@ -5155,6 +5169,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;
@@ -5624,6 +5663,7 @@ ${lastSnapshot}`;
             accumulatedRawBuffer: this.accumulatedRawBuffer,
             recentOutputBuffer: this.recentOutputBuffer,
             terminalScreenText: parseScreenText,
+            workingDir: this.workingDir,
             baseMessages: [],
             partialResponse: this.responseBuffer,
             isWaitingForResponse: this.isWaitingForResponse,
@@ -5683,6 +5723,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";
@@ -5693,14 +5741,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();
@@ -5770,6 +5826,7 @@ ${lastSnapshot}`;
           accumulatedRawBuffer: this.accumulatedRawBuffer,
           recentOutputBuffer: this.recentOutputBuffer,
           terminalScreenText: this.getParseScreenText(this.terminalScreen.getText()),
+          workingDir: this.workingDir,
           baseMessages: [],
           partialResponse: this.responseBuffer,
           isWaitingForResponse: this.isWaitingForResponse,
@@ -6045,7 +6102,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`);
           }
         }
@@ -6423,10 +6480,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,
@@ -13130,17 +13194,18 @@ function normalizeProviderNativeHistoryRecords(agentType, historySessionId, reco
 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,
@@ -13150,7 +13215,8 @@ function callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, his
 }
 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) {
@@ -13179,7 +13245,7 @@ function isNativeSourceCanonicalHistory(canonicalHistory) {
   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 {
@@ -18544,7 +18610,8 @@ var DaemonCommandHandler = class {
       "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,
@@ -33450,7 +33517,16 @@ async function handleCliSend(ctx, req, res) {
     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}` });