@adhdev/daemon-core 0.8.96 → 0.8.98

package/dist/index.mjs

@@ -1756,6 +1756,7 @@ var init_provider_cli_config = __esm({
 // src/cli-adapters/provider-cli-runtime.ts
 import * as os9 from "os";
 import * as path10 from "path";
+import { DEFAULT_SESSION_HOST_COLS, DEFAULT_SESSION_HOST_ROWS } from "@adhdev/session-host-core";
 function resolveCliSpawnPlan(options) {
   const { provider, runtimeSettings, workingDir, extraArgs } = options;
   const { spawn: spawnConfig } = provider;
@@ -1789,8 +1790,8 @@ function resolveCliSpawnPlan(options) {
     isWin,
     useShell,
     ptyOptions: {
-      cols: 80,
-      rows: 24,
+      cols: DEFAULT_SESSION_HOST_COLS,
+      rows: DEFAULT_SESSION_HOST_ROWS,
       cwd: workingDir,
       env: buildCliSpawnEnv(process.env, spawnConfig.env)
     }
@@ -1855,6 +1856,28 @@ __export(provider_cli_adapter_exports, {
   normalizeCliProviderForRuntime: () => normalizeCliProviderForRuntime
 });
 import * as os10 from "os";
+function normalizeComparableTranscriptText(value) {
+  return sanitizeTerminalText(String(value || "")).replace(/\s+/g, " ").trim();
+}
+function parsedTranscriptIsRicherThanCommitted(parsedMessages, committedMessages) {
+  if (!Array.isArray(parsedMessages) || !Array.isArray(committedMessages)) return false;
+  if (parsedMessages.length > committedMessages.length) return true;
+  if (parsedMessages.length !== committedMessages.length) return false;
+  for (let index = 0; index < parsedMessages.length; index += 1) {
+    const parsed = parsedMessages[index];
+    const committed = committedMessages[index];
+    if (!parsed || !committed) return false;
+    if ((parsed.role || "") !== (committed.role || "")) return false;
+    if (parsed.id && committed.id && String(parsed.id) !== String(committed.id)) return false;
+    if (typeof parsed.index === "number" && typeof committed.index === "number" && parsed.index !== committed.index) return false;
+    const parsedText = normalizeComparableTranscriptText(parsed.content);
+    const committedText = normalizeComparableTranscriptText(committed.content);
+    if (!parsedText || !committedText || parsedText === committedText) continue;
+    if (parsedText.length > committedText.length && parsedText.startsWith(committedText)) return true;
+    return false;
+  }
+  return false;
+}
 var ProviderCliAdapter;
 var init_provider_cli_adapter = __esm({
   "src/cli-adapters/provider-cli-adapter.ts"() {
@@ -3181,7 +3204,7 @@ var init_provider_cli_adapter = __esm({
           }));
           const parsedLastAssistant = [...parsedHydratedMessages].reverse().find((message) => message.role === "assistant" && typeof message.content === "string" && message.content.trim());
           const visibleIdlePrompt = this.looksLikeVisibleIdlePrompt(screenText);
-          const shouldAdoptParsedIdleReplay = !this.currentTurnScope && !this.activeModal && !!parsedLastAssistant && parsedHydratedMessages.length > committedHydratedMessages.length && (this.currentStatus === "idle" || this.currentStatus === "generating" && this.isWaitingForResponse && parsed.status === "idle" && visibleIdlePrompt);
+          const shouldAdoptParsedIdleReplay = !this.currentTurnScope && !this.activeModal && !!parsedLastAssistant && parsedTranscriptIsRicherThanCommitted(parsedHydratedMessages, committedHydratedMessages) && (this.currentStatus === "idle" || this.currentStatus === "generating" && this.isWaitingForResponse && parsed.status === "idle" && visibleIdlePrompt);
           if (shouldAdoptParsedIdleReplay) {
             this.committedMessages = normalizeCliParsedMessages(parsed.messages, {
               committedMessages: this.committedMessages,
@@ -12545,6 +12568,8 @@ var CliProviderInstance = class {
   generatingDebounceTimer = null;
   generatingDebouncePending = null;
   lastApprovalEventAt = 0;
+  autoApproveBusy = false;
+  autoApproveBusyTimer = null;
   controlValues = {};
   summaryMetadata = void 0;
   appliedEffectKeys = /* @__PURE__ */ new Set();
@@ -12836,7 +12861,13 @@ var CliProviderInstance = class {
     const parsedStatus = this.adapter.getScriptParsedStatus?.() || null;
     const rawStatus = adapterStatus.status;
     const autoApproveActive = rawStatus === "waiting_approval" && this.shouldAutoApprove();
-    if (autoApproveActive) {
+    if (autoApproveActive && !this.autoApproveBusy) {
+      this.autoApproveBusy = true;
+      if (this.autoApproveBusyTimer) clearTimeout(this.autoApproveBusyTimer);
+      this.autoApproveBusyTimer = setTimeout(() => {
+        this.autoApproveBusy = false;
+        this.autoApproveBusyTimer = null;
+      }, 2e3);
       const { index: buttonIndex, label: buttonLabel } = pickApprovalButton(adapterStatus.activeModal?.buttons, this.provider);
       this.recordAutoApproval(adapterStatus.activeModal?.message, buttonLabel, now);
       setTimeout(() => {