@adhdev/daemon-core 0.8.83 → 0.8.85

package/dist/index.mjs

@@ -2498,6 +2498,58 @@ var init_provider_cli_adapter = __esm({
           `[${this.cliType}] Interactive prompt wait timed out after ${maxWaitMs}ms; proceeding with screen=${JSON.stringify(summarizeCliTraceText(finalScreenText, 240)).slice(0, 280)}`
         );
       }
+      clearStaleIdleResponseGuard(reason) {
+        const screenText = this.terminalScreen.getText() || "";
+        const visibleIdlePrompt = this.looksLikeVisibleIdlePrompt(screenText);
+        const blockingModal = this.activeModal || this.getStartupConfirmationModal(screenText);
+        if (!this.isWaitingForResponse || this.currentStatus !== "idle" || !visibleIdlePrompt || !!blockingModal) {
+          return false;
+        }
+        if (this.responseTimeout) {
+          clearTimeout(this.responseTimeout);
+          this.responseTimeout = null;
+        }
+        if (this.idleTimeout) {
+          clearTimeout(this.idleTimeout);
+          this.idleTimeout = null;
+        }
+        if (this.approvalExitTimeout) {
+          clearTimeout(this.approvalExitTimeout);
+          this.approvalExitTimeout = null;
+        }
+        if (this.finishRetryTimer) {
+          clearTimeout(this.finishRetryTimer);
+          this.finishRetryTimer = null;
+        }
+        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.recordTrace("stale_idle_response_cleared", {
+          reason,
+          screenText: summarizeCliTraceText(screenText, 240)
+        });
+        return true;
+      }
+      hasMeaningfulResponseBuffer(promptSnippet) {
+        const raw = String(this.responseBuffer || "").trim();
+        if (!raw) return false;
+        const normalizedPrompt = compactPromptText(promptSnippet);
+        if (!normalizedPrompt) return true;
+        const normalizedBuffer = compactPromptText(raw);
+        if (!normalizedBuffer) return false;
+        if (normalizedBuffer === normalizedPrompt) return false;
+        if (normalizedBuffer.startsWith(normalizedPrompt)) {
+          const remainder = normalizedBuffer.slice(normalizedPrompt.length).replace(/[─═\-]+/g, "").replace(/⏵⏵accepteditson\([^)]*\)/gi, "").replace(/accepteditson\([^)]*\)/gi, "").replace(/(?:◐|◑|◒|◓|◔|◕|◉|●|·)?(?:x?high|medium|low|max)·?\/effort/gi, "").replace(/updateavailable!run:[a-z0-9:._\-/]+/gi, "").replace(/esctointerrupt/gi, "").replace(/❯/g, "").replace(/^[\s\-–—:;,.!/?]+/, "").trim();
+          return remainder.length > 0;
+        }
+        return true;
+      }
       evaluateSettled() {
         const now = Date.now();
         if (this.submitPendingUntil > now || this.responseSettleIgnoreUntil > now) {
@@ -2530,7 +2582,11 @@ var init_provider_cli_adapter = __esm({
           scope: this.currentTurnScope,
           lastOutputAt: this.lastOutputAt
         }) : [];
+        if (this.maybeCommitVisibleIdleTranscript(parsedTranscript)) {
+          return;
+        }
         const lastParsedAssistant = [...parsedMessages].reverse().find((message) => message.role === "assistant");
+        const normalizedPromptSnippet = normalizePromptText(this.submitRetryPromptSnippet || this.currentTurnScope?.prompt || "");
         this.recordTrace("settled", {
           tail: summarizeCliTraceText(tail, 500),
           screenText: summarizeCliTraceText(screenText, 1200),
@@ -2548,6 +2604,24 @@ var init_provider_cli_adapter = __esm({
             scope: this.currentTurnScope
           })
         });
+        if (this.currentTurnScope && !lastParsedAssistant && !this.submitRetryUsed && this.ptyProcess && this.currentStatus !== "waiting_approval" && promptLikelyVisible(screenText, normalizedPromptSnippet) && !this.hasMeaningfulResponseBuffer(normalizedPromptSnippet)) {
+          this.submitRetryUsed = true;
+          this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
+          LOG.info("CLI", `[${this.cliType}] Retrying submit key from settled parser (no assistant yet)`);
+          this.recordTrace("submit_write", {
+            mode: "settled_retry",
+            sendKey: this.sendKey,
+            screenText: summarizeCliTraceText(screenText, 500)
+          });
+          this.ptyProcess.write(this.sendKey);
+          if (this.settleTimer) clearTimeout(this.settleTimer);
+          this.settleTimer = setTimeout(() => {
+            this.settleTimer = null;
+            this.settledBuffer = this.recentOutputBuffer;
+            this.evaluateSettled();
+          }, this.timeouts.outputSettle + 150);
+          return;
+        }
         if (this.currentTurnScope && !lastParsedAssistant) {
           LOG.info(
             "CLI",
@@ -2590,7 +2664,15 @@ var init_provider_cli_adapter = __esm({
         }
         const recentInteractiveActivity = this.hasRecentInteractiveActivity(now);
         const statusActivityHoldMs = this.getStatusActivityHoldMs();
-        const shouldHoldGenerating = scriptStatus === "idle" && this.isWaitingForResponse && !modal && recentInteractiveActivity;
+        const visibleIdlePrompt = this.looksLikeVisibleIdlePrompt(screenText);
+        const visibleAssistantCandidate = this.looksLikeVisibleAssistantCandidate(screenText);
+        if (this.currentTurnScope && this.cliType === "claude-cli") {
+          LOG.info(
+            "CLI",
+            `[${this.cliType}] settled diagnostics prompt=${JSON.stringify(this.currentTurnScope.prompt).slice(0, 140)} scriptStatus=${String(scriptStatus || "")} parsedStatus=${String(parsedTranscript?.status || "")} parsedMsgCount=${parsedMessages.length} lastParsedAssistant=${JSON.stringify(summarizeCliTraceText(lastParsedAssistant?.content || "", 120)).slice(0, 160)} visibleIdlePrompt=${String(visibleIdlePrompt)} visibleAssistantCandidate=${String(visibleAssistantCandidate)} responseBuffer=${JSON.stringify(summarizeCliTraceText(this.responseBuffer, 160)).slice(0, 220)} screen=${JSON.stringify(summarizeCliTraceText(screenText, 160)).slice(0, 220)}`
+          );
+        }
+        const shouldHoldGenerating = scriptStatus === "idle" && this.isWaitingForResponse && !modal && recentInteractiveActivity && !(visibleIdlePrompt && visibleAssistantCandidate);
         if (shouldHoldGenerating) {
           this.clearIdleFinishCandidate("hold_generating_recent_activity");
           this.setStatus("generating", "recent_activity_hold");
@@ -2621,8 +2703,8 @@ var init_provider_cli_adapter = __esm({
         if (scriptStatus === "waiting_approval") {
           this.clearIdleFinishCandidate("waiting_approval");
           const inCooldown = this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown;
-          const visibleIdlePrompt = this.looksLikeVisibleIdlePrompt(screenText);
-          if ((inCooldown || visibleIdlePrompt) && !modal) {
+          const visibleIdlePrompt2 = this.looksLikeVisibleIdlePrompt(screenText);
+          if ((inCooldown || visibleIdlePrompt2) && !modal) {
             if (this.approvalExitTimeout) {
               clearTimeout(this.approvalExitTimeout);
               this.approvalExitTimeout = null;
@@ -2694,7 +2776,7 @@ var init_provider_cli_adapter = __esm({
             this.lastApprovalResolvedAt = Date.now();
           }
           if (this.isWaitingForResponse) {
-            const visibleIdlePrompt = this.looksLikeVisibleIdlePrompt(screenText);
+            const visibleIdlePrompt2 = this.looksLikeVisibleIdlePrompt(screenText);
             const quietForMs = this.lastNonEmptyOutputAt ? now - this.lastNonEmptyOutputAt : Number.MAX_SAFE_INTEGER;
             const screenStableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : 0;
             const hasAssistantTurn = !!lastParsedAssistant;
@@ -2702,12 +2784,12 @@ var init_provider_cli_adapter = __esm({
             const idleFinishConfirmMs = this.getIdleFinishConfirmMs();
             const idleQuietThresholdMs = Math.max(idleFinishConfirmMs, this.timeouts.outputSettle);
             const idleStableThresholdMs = idleFinishConfirmMs;
-            const idleReady = visibleIdlePrompt && !modal && hasAssistantTurn && quietForMs >= idleQuietThresholdMs && screenStableMs >= idleStableThresholdMs;
+            const idleReady = visibleIdlePrompt2 && !modal && hasAssistantTurn && quietForMs >= idleQuietThresholdMs && screenStableMs >= idleStableThresholdMs;
             const candidate = this.idleFinishCandidate;
             const candidateQuiet = !!candidate && candidate.responseEpoch === this.responseEpoch && candidate.lastOutputAt === this.lastOutputAt && candidate.lastScreenChangeAt === this.lastScreenChangeAt && assistantLength >= candidate.assistantLength && now - candidate.armedAt >= idleFinishConfirmMs;
             const canFinishImmediately = idleReady && candidateQuiet;
             this.recordTrace("idle_decision", {
-              visibleIdlePrompt,
+              visibleIdlePrompt: visibleIdlePrompt2,
               quietForMs,
               screenStableMs,
               hasAssistantTurn,
@@ -2827,6 +2909,70 @@ var init_provider_cli_adapter = __esm({
         this.setStatus("idle", "response_finished");
         this.onStatusChange?.();
       }
+      maybeCommitVisibleIdleTranscript(parsed, options) {
+        const allowImmediateScriptIdleCommit = this.provider.allowInputDuringGeneration === true;
+        if (!allowImmediateScriptIdleCommit) return false;
+        if (!parsed || !Array.isArray(parsed.messages) || parsed.status !== "idle" || !this.isWaitingForResponse || !this.currentTurnScope || this.activeModal || parsed.activeModal) {
+          return false;
+        }
+        if (options?.requireVisibleAssistantCandidate) {
+          const candidateText = options.screenText || this.terminalScreen.getText() || "";
+          if (!this.looksLikeVisibleAssistantCandidate(candidateText)) {
+            return false;
+          }
+        }
+        const hydratedForIdleCommit = normalizeCliParsedMessages(parsed.messages, {
+          committedMessages: this.committedMessages,
+          scope: this.currentTurnScope,
+          lastOutputAt: this.lastOutputAt
+        });
+        const visibleAssistant = [...hydratedForIdleCommit].reverse().find((message) => message.role === "assistant" && message.content.trim());
+        if (!visibleAssistant) return false;
+        this.committedMessages = hydratedForIdleCommit;
+        const promptForTrim = this.currentTurnScope?.prompt || getLastUserPromptText(this.committedMessages);
+        if (promptForTrim) {
+          const lastAssistantForTrim = [...this.committedMessages].reverse().find((message) => message.role === "assistant");
+          if (lastAssistantForTrim) {
+            lastAssistantForTrim.content = trimPromptEchoPrefix(lastAssistantForTrim.content, promptForTrim);
+          }
+        }
+        if (this.responseTimeout) {
+          clearTimeout(this.responseTimeout);
+          this.responseTimeout = null;
+        }
+        if (this.idleTimeout) {
+          clearTimeout(this.idleTimeout);
+          this.idleTimeout = null;
+        }
+        if (this.approvalExitTimeout) {
+          clearTimeout(this.approvalExitTimeout);
+          this.approvalExitTimeout = null;
+        }
+        if (this.submitRetryTimer) {
+          clearTimeout(this.submitRetryTimer);
+          this.submitRetryTimer = null;
+        }
+        if (this.finishRetryTimer) {
+          clearTimeout(this.finishRetryTimer);
+          this.finishRetryTimer = null;
+        }
+        this.syncMessageViews();
+        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", "script_idle_commit");
+        this.onStatusChange?.();
+        this.recordTrace("script_idle_commit", {
+          messageCount: this.committedMessages.length,
+          lastAssistant: summarizeCliTraceText(visibleAssistant.content, 320)
+        });
+        return true;
+      }
       commitCurrentTranscript() {
         const parsed = this.parseCurrentTranscript(
           this.committedMessages,
@@ -2848,6 +2994,12 @@ var init_provider_cli_adapter = __esm({
           }
           this.syncMessageViews();
           const lastAssistant = [...this.committedMessages].reverse().find((message) => message.role === "assistant");
+          if (this.currentTurnScope) {
+            LOG.info(
+              "CLI",
+              `[${this.cliType}] commitCurrentTranscript committedMessages=${this.committedMessages.length} finalLastAssistant=${JSON.stringify(summarizeCliTraceText(lastAssistant?.content || "", 220)).slice(0, 260)}`
+            );
+          }
           this.recordTrace("commit_transcript", {
             parsedStatus: parsed.status || null,
             messageCount: this.committedMessages.length,
@@ -2867,11 +3019,18 @@ var init_provider_cli_adapter = __esm({
               `[${this.cliType}] Commit without assistant turn: prompt=${JSON.stringify(this.currentTurnScope.prompt).slice(0, 140)} responseBuffer=${JSON.stringify(summarizeCliTraceText(this.responseBuffer, 220)).slice(0, 260)} providerDir=${this.providerResolutionMeta.providerDir || "-"} scriptDir=${this.providerResolutionMeta.scriptDir || "-"} scriptsPath=${this.providerResolutionMeta.scriptsPath || "-"}`
             );
           }
+          const hasAssistant = !!lastAssistant;
           return {
-            hasAssistant: !!lastAssistant,
+            hasAssistant,
             assistantContent: lastAssistant?.content || ""
           };
         }
+        if (this.currentTurnScope) {
+          LOG.info(
+            "CLI",
+            `[${this.cliType}] commitCurrentTranscript parsed.messages=none responseBufferLen=${this.responseBuffer.length} accumulatedBufferLen=${this.accumulatedBuffer.length} parsedStatus=${parsed?.status || "-"} providerDir=${this.providerResolutionMeta.providerDir || "-"} scriptDir=${this.providerResolutionMeta.scriptDir || "-"}`
+          );
+        }
         return {
           hasAssistant: false,
           assistantContent: ""
@@ -2957,19 +3116,25 @@ var init_provider_cli_adapter = __esm({
           this.currentTurnScope,
           screenText
         );
-        const shouldPreferCommittedMessages = !this.currentTurnScope && this.currentStatus === "idle" && !this.activeModal;
+        if (this.maybeCommitVisibleIdleTranscript(parsed)) {
+          return this.getScriptParsedStatus();
+        }
+        const shouldPreferCommittedMessages = !this.currentTurnScope && !this.activeModal && this.currentStatus === "idle";
         let result;
         if (parsed && Array.isArray(parsed.messages)) {
-          const hydratedMessages = shouldPreferCommittedMessages ? this.committedMessages.map((message, index) => buildChatMessage({
-            ...message,
-            id: message.id || `msg_${index}`,
-            index: typeof message.index === "number" ? message.index : index,
-            receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
-          })) : hydrateCliParsedMessages(parsed.messages, {
+          const parsedHydratedMessages = hydrateCliParsedMessages(parsed.messages, {
             committedMessages: this.committedMessages,
             scope: this.currentTurnScope,
             lastOutputAt: this.lastOutputAt
           });
+          const committedHydratedMessages = this.committedMessages.map((message, index) => buildChatMessage({
+            ...message,
+            id: message.id || `msg_${index}`,
+            index: typeof message.index === "number" ? message.index : index,
+            receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
+          }));
+          const shouldPreferCommittedHistoryReplay = !this.currentTurnScope && !this.activeModal && committedHydratedMessages.length > parsedHydratedMessages.length;
+          const hydratedMessages = shouldPreferCommittedMessages || shouldPreferCommittedHistoryReplay ? committedHydratedMessages : parsedHydratedMessages;
           result = {
             id: parsed.id || "cli_session",
             status: parsed.status || this.currentStatus,
@@ -2993,6 +3158,23 @@ var init_provider_cli_adapter = __esm({
             activeModal: this.activeModal
           };
         }
+        const hasVisibleAssistantMessage = Array.isArray(result?.messages) && result.messages.some((message) => message?.role === "assistant" && typeof message?.content === "string" && message.content.trim());
+        const shouldClampStaleGeneratingToIdle = result?.status === "generating" && this.currentStatus === "idle" && !this.currentTurnScope && !result?.activeModal && hasVisibleAssistantMessage;
+        if (shouldClampStaleGeneratingToIdle) {
+          result = {
+            ...result,
+            status: "idle",
+            messages: Array.isArray(result.messages) ? result.messages.map((message) => {
+              if (message?.role !== "assistant" || !message?.meta?.streaming) return message;
+              const nextMeta = { ...message.meta || {} };
+              delete nextMeta.streaming;
+              return {
+                ...message,
+                ...Object.keys(nextMeta).length > 0 ? { meta: nextMeta } : { meta: void 0 }
+              };
+            }) : result.messages
+          };
+        }
         this.parsedStatusCache = {
           committedMessagesRef: this.committedMessages,
           responseBuffer: this.responseBuffer,
@@ -3125,9 +3307,27 @@ ${data.message || ""}`.trim();
           }
         }
         if (!this.ready) throw new Error(`${this.cliName} not ready (status: ${this.currentStatus})`);
-        if (this.isWaitingForResponse && !allowInputDuringGeneration) {
+        const parsedStatusBeforeSend = !allowInputDuringGeneration ? (() => {
+          try {
+            return this.getScriptParsedStatus?.() || null;
+          } catch {
+            return null;
+          }
+        })() : null;
+        const parsedSessionStatus = typeof parsedStatusBeforeSend?.status === "string" ? String(parsedStatusBeforeSend.status) : "";
+        const parsedMessagesBeforeSend = Array.isArray(parsedStatusBeforeSend?.messages) ? parsedStatusBeforeSend.messages.filter((message) => message && (message.role === "user" || message.role === "assistant")) : [];
+        const shouldCommitParsedIdleBeforeSend = !allowInputDuringGeneration && parsedSessionStatus === "idle" && parsedMessagesBeforeSend.length > this.committedMessages.length && parsedMessagesBeforeSend.some((message) => message?.role === "assistant" && typeof message?.content === "string" && message.content.trim());
+        if (shouldCommitParsedIdleBeforeSend) {
+          this.commitCurrentTranscript();
+        }
+        if (!allowInputDuringGeneration && (parsedSessionStatus === "generating" || parsedSessionStatus === "long_generating")) {
           throw new Error(`${this.cliName} is still processing the previous prompt`);
         }
+        if (this.isWaitingForResponse && !allowInputDuringGeneration) {
+          if (!this.clearStaleIdleResponseGuard("send_message_guard")) {
+            throw new Error(`${this.cliName} is still processing the previous prompt`);
+          }
+        }
         const blockingModal = this.activeModal || this.getStartupConfirmationModal(this.terminalScreen.getText() || "");
         if (blockingModal || this.currentStatus === "waiting_approval") {
           throw new Error(`${this.cliName} is awaiting confirmation before it can accept a prompt`);
@@ -3207,7 +3407,7 @@ ${data.message || ""}`.trim();
               this.submitRetryTimer = null;
               if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
               if (this.currentStatus === "waiting_approval") return;
-              if ((this.responseBuffer || "").trim()) return;
+              if (this.hasMeaningfulResponseBuffer(normalizedPromptSnippet)) 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;
@@ -3244,7 +3444,7 @@ ${data.message || ""}`.trim();
               this.submitRetryTimer = null;
               if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
               if (this.currentStatus === "waiting_approval") return;
-              if ((this.responseBuffer || "").trim()) return;
+              if (this.hasMeaningfulResponseBuffer(normalizedPromptSnippet)) return;
               const screenText = this.terminalScreen.getText();
               if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
               LOG.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt 1)`);
@@ -9609,6 +9809,7 @@ function normalizeReadChatCommandStatus(status, activeModal) {
 }
 function buildReadChatCommandResult(payload, args) {
   let validatedPayload;
+  const debugReadChat = payload?.debugReadChat && typeof payload.debugReadChat === "object" ? payload.debugReadChat : void 0;
   try {
     validatedPayload = validateReadChatResultPayload({
       ...payload,
@@ -9629,7 +9830,8 @@ function buildReadChatCommandResult(payload, args) {
       syncMode: "full",
       replaceFrom: 0,
       totalMessages: messages.length,
-      lastMessageSignature
+      lastMessageSignature,
+      ...debugReadChat ? { debugReadChat } : {}
     };
   }
   const sync = computeReadChatSync(messages, cursor);
@@ -9640,7 +9842,8 @@ function buildReadChatCommandResult(payload, args) {
     syncMode: sync.syncMode,
     replaceFrom: sync.replaceFrom,
     totalMessages: sync.totalMessages,
-    lastMessageSignature: sync.lastMessageSignature
+    lastMessageSignature: sync.lastMessageSignature,
+    ...debugReadChat ? { debugReadChat } : {}
   };
 }
 function didProviderConfirmSend(result) {
@@ -9731,14 +9934,33 @@ async function handleReadChat(h, args) {
         }
       }
       const parsedRecord = parsedStatus && typeof parsedStatus === "object" ? parsedStatus : null;
-      const status = parsedRecord || adapter.getStatus();
+      const adapterStatus = adapter.getStatus();
+      const shouldPreferAdapterMessages = Array.isArray(adapterStatus.messages) && adapterStatus.messages.length > 0 && Array.isArray(parsedRecord?.messages) && adapterStatus.messages.length > parsedRecord.messages.length;
+      const status = parsedRecord ? {
+        ...parsedRecord,
+        messages: shouldPreferAdapterMessages ? adapterStatus.messages : parsedRecord.messages,
+        status: adapterStatus.status !== "idle" ? adapterStatus.status : parsedRecord.status || adapterStatus.status,
+        activeModal: parsedRecord.activeModal || adapterStatus.activeModal
+      } : adapterStatus;
       const title = typeof parsedRecord?.title === "string" ? parsedRecord.title : void 0;
       const providerSessionId = typeof parsedRecord?.providerSessionId === "string" ? parsedRecord.providerSessionId : void 0;
       if (status) {
+        LOG.info("Command", `[read_chat] cli-like resolved provider=${adapter.cliType} target=${String(args?.targetSessionId || "")} adapterStatus=${String(adapterStatus.status || "")} parsedStatus=${String(parsedRecord?.status || "")} shouldPreferAdapterMessages=${String(shouldPreferAdapterMessages)} adapterMsgCount=${Array.isArray(adapterStatus.messages) ? adapterStatus.messages.length : 0} parsedMsgCount=${Array.isArray(parsedRecord?.messages) ? parsedRecord.messages.length : 0} returnedMsgCount=${Array.isArray(status.messages) ? status.messages.length : 0}`);
         return buildReadChatCommandResult({
           messages: status.messages || [],
           status: status.status,
           activeModal: status.activeModal,
+          debugReadChat: {
+            provider: adapter.cliType,
+            targetSessionId: String(args?.targetSessionId || ""),
+            adapterStatus: String(adapterStatus.status || ""),
+            parsedStatus: String(parsedRecord?.status || ""),
+            returnedStatus: String(status.status || ""),
+            shouldPreferAdapterMessages,
+            adapterMsgCount: Array.isArray(adapterStatus.messages) ? adapterStatus.messages.length : 0,
+            parsedMsgCount: Array.isArray(parsedRecord?.messages) ? parsedRecord.messages.length : 0,
+            returnedMsgCount: Array.isArray(status.messages) ? status.messages.length : 0
+          },
           ...title ? { title } : {},
           ...providerSessionId ? { providerSessionId } : {}
         }, args);
@@ -11984,6 +12206,30 @@ import { createRequire } from "module";
 init_provider_cli_adapter();
 init_logger();
 init_chat_message_normalization();
+function normalizePersistableCliHistoryContent(content) {
+  return flattenContent(content).replace(/\s+/g, " ").trim();
+}
+function buildPersistableCliHistorySignature(message) {
+  return [
+    String(message.role || ""),
+    String(message.kind || ""),
+    String(message.senderName || ""),
+    normalizePersistableCliHistoryContent(message.content)
+  ].join("|");
+}
+function buildIncrementalHistoryAppendMessages(previousMessages, currentMessages) {
+  if (!Array.isArray(currentMessages) || currentMessages.length === 0) return [];
+  if (!Array.isArray(previousMessages) || previousMessages.length === 0) return currentMessages;
+  const previousSignatures = previousMessages.map(buildPersistableCliHistorySignature);
+  const currentSignatures = currentMessages.map(buildPersistableCliHistorySignature);
+  let sharedPrefixLength = 0;
+  while (sharedPrefixLength < previousSignatures.length && sharedPrefixLength < currentSignatures.length && previousSignatures[sharedPrefixLength] === currentSignatures[sharedPrefixLength]) {
+    sharedPrefixLength += 1;
+  }
+  if (sharedPrefixLength === currentSignatures.length) return [];
+  if (sharedPrefixLength === previousSignatures.length) return currentMessages.slice(sharedPrefixLength);
+  return currentMessages;
+}
 var CachedDatabaseSync = null;
 function getDatabaseSync() {
   if (CachedDatabaseSync) return CachedDatabaseSync;
@@ -12061,6 +12307,7 @@ var CliProviderInstance = class {
   appliedEffectKeys = /* @__PURE__ */ new Set();
   historyWriter;
   runtimeMessages = [];
+  lastPersistedHistoryMessages = [];
   instanceId;
   suppressIdleHistoryReplay = false;
   errorMessage = void 0;
@@ -12101,6 +12348,13 @@ var CliProviderInstance = class {
         this.providerSessionId,
         this.instanceId
       );
+      this.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
+        role: message.role,
+        content: message.content,
+        kind: message.kind,
+        senderName: message.senderName,
+        receivedAt: message.receivedAt
+      }));
       this.suppressIdleHistoryReplay = restoredHistory.messages.length > 0;
       if (restoredHistory.messages.length > 0) {
         this.adapter.seedCommittedMessages(
@@ -12232,15 +12486,24 @@ var CliProviderInstance = class {
           messagesToSave = messagesToSave.slice(0, lastIdx);
         }
       }
-      if (!shouldSkipReplayPersist && messagesToSave.length > 0) {
+      const normalizedMessagesToSave = messagesToSave.map((message) => ({
+        role: message.role,
+        content: flattenContent(message.content),
+        kind: typeof message.kind === "string" ? message.kind : void 0,
+        senderName: typeof message.senderName === "string" ? message.senderName : void 0,
+        receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
+      }));
+      if (!shouldSkipReplayPersist && normalizedMessagesToSave.length > 0) {
+        const incrementalMessages = buildIncrementalHistoryAppendMessages(this.lastPersistedHistoryMessages, normalizedMessagesToSave);
         this.historyWriter.appendNewMessages(
           this.type,
-          messagesToSave,
+          incrementalMessages,
           parsedStatus?.title || dirName,
           this.instanceId,
           this.providerSessionId
         );
       }
+      this.lastPersistedHistoryMessages = normalizedMessagesToSave;
     }
     this.applyProviderResponse(parsedStatus, { phase: "immediate" });
     const surface = resolveProviderStateSurface({
@@ -12256,7 +12519,7 @@ var CliProviderInstance = class {
       activeChat: {
         id: `${this.type}_${this.workingDir}`,
         title: parsedStatus?.title || dirName,
-        status: parseErrorMessage ? "error" : autoApproveActive && parsedStatus?.status === "waiting_approval" ? "generating" : parsedStatus?.status || visibleStatus,
+        status: parseErrorMessage ? "error" : autoApproveActive && parsedStatus?.status === "waiting_approval" ? "generating" : adapterStatus.status !== "idle" ? visibleStatus : parsedStatus?.status || visibleStatus,
         messages: mergedMessages,
         activeModal: autoApproveActive ? null : parsedStatus?.activeModal ?? adapterStatus.activeModal,
         inputContent: ""
@@ -12488,6 +12751,7 @@ var CliProviderInstance = class {
     }
     if (data.sessionEvent === "new_session") {
       this.runtimeMessages = [];
+      this.lastPersistedHistoryMessages = [];
       this.suppressIdleHistoryReplay = false;
       this.adapter.clearHistory();
     }
@@ -24702,6 +24966,13 @@ init_logger();
 import {
   SessionHostClient
 } from "@adhdev/session-host-core";
+function shouldResumeAttachedSession(record) {
+  if (!record) return false;
+  if (record.lifecycle === "interrupted") return true;
+  if (record.lifecycle !== "stopped") return false;
+  if (record.meta?.restoredFromStorage === true) return true;
+  return typeof record.meta?.runtimeRecoveryState === "string" && String(record.meta.runtimeRecoveryState).trim().length > 0;
+}
 var SessionHostRuntimeTransport = class {
   constructor(options) {
     this.options = options;
@@ -24875,7 +25146,7 @@ var SessionHostRuntimeTransport = class {
         payload: {}
       });
       const existingRecord = existingRecords.success && existingRecords.result ? existingRecords.result.find((item) => item.sessionId === this.options.runtimeId) || null : null;
-      if (existingRecord?.lifecycle === "interrupted") {
+      if (shouldResumeAttachedSession(existingRecord)) {
         const resumeResponse = await this.client.request({
           type: "resume_session",
           payload: {
@@ -25174,6 +25445,8 @@ async function listHostedCliRuntimes(endpoint) {
 // src/session-host/startup-restore-policy.js
 function shouldAutoRestoreHostedSessionsOnStartup(env = process.env) {
   const raw = typeof env.ADHDEV_RESTORE_HOSTED_SESSIONS_ON_STARTUP === "string" ? env.ADHDEV_RESTORE_HOSTED_SESSIONS_ON_STARTUP.trim().toLowerCase() : "";
+  if (!raw) return true;
+  if (raw === "0" || raw === "false" || raw === "no") return false;
   return raw === "1" || raw === "true" || raw === "yes";
 }