adhdev 0.8.96 → 0.8.98

package/dist/index.js

@@ -10615,7 +10615,7 @@ function ensureNodePtySpawnHelperPermissions(logFn) {
   } catch {
   }
 }
-var os8, path22, net, import_crypto3, os22, path32, __require, SessionHostClient;
+var os8, path22, net, import_crypto3, os22, path32, __require, DEFAULT_SESSION_HOST_COLS, DEFAULT_SESSION_HOST_ROWS, SessionHostClient;
 var init_dist = __esm({
   "../../oss/packages/session-host-core/dist/index.mjs"() {
     "use strict";
@@ -10631,6 +10631,8 @@ var init_dist = __esm({
       if (typeof require !== "undefined") return require.apply(this, arguments);
       throw Error('Dynamic require of "' + x + '" is not supported');
     });
+    DEFAULT_SESSION_HOST_COLS = 80;
+    DEFAULT_SESSION_HOST_ROWS = 48;
     SessionHostClient = class {
       endpoint;
       socket = null;
@@ -11253,8 +11255,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)
     }
@@ -11311,6 +11313,7 @@ var init_provider_cli_runtime = __esm({
     "use strict";
     os11 = __toESM(require("os"));
     path10 = __toESM(require("path"));
+    init_dist();
     init_provider_cli_shared();
   }
 });
@@ -11321,6 +11324,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 os12, ProviderCliAdapter;
 var init_provider_cli_adapter = __esm({
   "../../oss/packages/daemon-core/src/cli-adapters/provider-cli-adapter.ts"() {
@@ -12648,7 +12673,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,
@@ -13526,6 +13551,8 @@ var init_cli_provider_instance = __esm({
       generatingDebounceTimer = null;
       generatingDebouncePending = null;
       lastApprovalEventAt = 0;
+      autoApproveBusy = false;
+      autoApproveBusyTimer = null;
       controlValues = {};
       summaryMetadata = void 0;
       appliedEffectKeys = /* @__PURE__ */ new Set();
@@ -13817,7 +13844,13 @@ var init_cli_provider_instance = __esm({
         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(() => {
@@ -55097,7 +55130,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.96" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.98" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;