@adhdev/daemon-core 0.8.96 → 0.8.98

package/dist/index.js

@@ -1789,8 +1789,8 @@ function resolveCliSpawnPlan(options) {
     isWin,
     useShell,
     ptyOptions: {
-      cols: 80,
-      rows: 24,
+      cols: import_session_host_core2.DEFAULT_SESSION_HOST_COLS,
+      rows: import_session_host_core2.DEFAULT_SESSION_HOST_ROWS,
       cwd: workingDir,
       env: buildCliSpawnEnv(process.env, spawnConfig.env)
     }
@@ -1841,12 +1841,13 @@ function respondToCliTerminalQueries(options) {
   }
   return "";
 }
-var os9, path10;
+var os9, path10, import_session_host_core2;
 var init_provider_cli_runtime = __esm({
   "src/cli-adapters/provider-cli-runtime.ts"() {
     "use strict";
     os9 = __toESM(require("os"));
     path10 = __toESM(require("path"));
+    import_session_host_core2 = require("@adhdev/session-host-core");
     init_provider_cli_shared();
   }
 });
@@ -1857,6 +1858,28 @@ __export(provider_cli_adapter_exports, {
   ProviderCliAdapter: () => ProviderCliAdapter,
   normalizeCliProviderForRuntime: () => normalizeCliProviderForRuntime
 });
+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 os10, ProviderCliAdapter;
 var init_provider_cli_adapter = __esm({
   "src/cli-adapters/provider-cli-adapter.ts"() {
@@ -3184,7 +3207,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,
@@ -12696,6 +12719,8 @@ var CliProviderInstance = class {
   generatingDebounceTimer = null;
   generatingDebouncePending = null;
   lastApprovalEventAt = 0;
+  autoApproveBusy = false;
+  autoApproveBusyTimer = null;
   controlValues = {};
   summaryMetadata = void 0;
   appliedEffectKeys = /* @__PURE__ */ new Set();
@@ -12987,7 +13012,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(() => {
@@ -25464,7 +25495,7 @@ init_provider_cli_adapter();
 init_pty_transport();
 
 // src/cli-adapters/session-host-transport.ts
-var import_session_host_core2 = require("@adhdev/session-host-core");
+var import_session_host_core3 = require("@adhdev/session-host-core");
 init_logger();
 function shouldResumeAttachedSession(record) {
   if (!record) return false;
@@ -25476,7 +25507,7 @@ function shouldResumeAttachedSession(record) {
 var SessionHostRuntimeTransport = class {
   constructor(options) {
     this.options = options;
-    this.client = new import_session_host_core2.SessionHostClient({
+    this.client = new import_session_host_core3.SessionHostClient({
       endpoint: options.endpoint,
       appName: options.appName
     });
@@ -25882,11 +25913,11 @@ function resolveSessionHostAppName(options = {}) {
 }
 
 // src/session-host/runtime-support.ts
-var import_session_host_core3 = require("@adhdev/session-host-core");
+var import_session_host_core4 = require("@adhdev/session-host-core");
 var STARTUP_TIMEOUT_MS = DEFAULT_SESSION_HOST_READY_TIMEOUT_MS;
 var STARTUP_POLL_MS = 200;
 async function canConnect(endpoint) {
-  const client = new import_session_host_core3.SessionHostClient({ endpoint });
+  const client = new import_session_host_core4.SessionHostClient({ endpoint });
   try {
     await client.connect();
     await client.close();
@@ -25904,14 +25935,14 @@ async function waitForReady(endpoint, timeoutMs = STARTUP_TIMEOUT_MS) {
   throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
 }
 async function ensureSessionHostReady(options) {
-  const endpoint = (0, import_session_host_core3.getDefaultSessionHostEndpoint)(options.appName || "adhdev");
+  const endpoint = (0, import_session_host_core4.getDefaultSessionHostEndpoint)(options.appName || "adhdev");
   if (await canConnect(endpoint)) return endpoint;
   options.spawnHost();
   await waitForReady(endpoint, options.timeoutMs);
   return endpoint;
 }
 async function listHostedCliRuntimes(endpoint) {
-  const client = new import_session_host_core3.SessionHostClient({ endpoint });
+  const client = new import_session_host_core4.SessionHostClient({ endpoint });
   try {
     const response = await client.request({
       type: "list_sessions",