adhdev 0.8.96 → 0.8.98

package/dist/cli/index.js

@@ -11061,6 +11061,8 @@ var init_terminal_screen = __esm({
 // ../../oss/packages/session-host-core/dist/index.mjs
 var dist_exports = {};
 __export(dist_exports, {
+  DEFAULT_SESSION_HOST_COLS: () => DEFAULT_SESSION_HOST_COLS,
+  DEFAULT_SESSION_HOST_ROWS: () => DEFAULT_SESSION_HOST_ROWS,
   SessionHostClient: () => SessionHostClient,
   SessionHostRegistry: () => SessionHostRegistry,
   SessionRingBuffer: () => SessionRingBuffer,
@@ -11079,9 +11081,22 @@ __export(dist_exports, {
   isSessionHostRecoverySnapshot: () => isSessionHostRecoverySnapshot2,
   resolveAttachableRuntimeRecord: () => resolveAttachableRuntimeRecord,
   resolveRuntimeRecord: () => resolveRuntimeRecord,
+  resolveSessionHostCols: () => resolveSessionHostCols,
+  resolveSessionHostRows: () => resolveSessionHostRows,
   sanitizeSpawnEnv: () => sanitizeSpawnEnv,
   writeEnvelope: () => writeEnvelope
 });
+function normalizeSessionHostDimension(value, fallback2) {
+  if (typeof value !== "number" || !Number.isFinite(value)) return fallback2;
+  const rounded = Math.floor(value);
+  return rounded > 0 ? rounded : fallback2;
+}
+function resolveSessionHostCols(value) {
+  return normalizeSessionHostDimension(value, DEFAULT_SESSION_HOST_COLS);
+}
+function resolveSessionHostRows(value) {
+  return normalizeSessionHostDimension(value, DEFAULT_SESSION_HOST_ROWS);
+}
 function normalizeSlug(input) {
   return input.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48);
 }
@@ -11278,7 +11293,7 @@ function ensureNodePtySpawnHelperPermissions(logFn) {
   } catch {
   }
 }
-var import_crypto3, path9, os9, path22, net, import_crypto4, os22, path32, __require, SessionRingBuffer, LIVE_LIFECYCLES2, SessionHostRegistry, SessionHostClient;
+var import_crypto3, path9, os9, path22, net, import_crypto4, os22, path32, __require, SessionRingBuffer, DEFAULT_SESSION_HOST_COLS, DEFAULT_SESSION_HOST_ROWS, LIVE_LIFECYCLES2, SessionHostRegistry, SessionHostClient;
 var init_dist = __esm({
   "../../oss/packages/session-host-core/dist/index.mjs"() {
     "use strict";
@@ -11356,6 +11371,8 @@ var init_dist = __esm({
         }
       }
     };
+    DEFAULT_SESSION_HOST_COLS = 80;
+    DEFAULT_SESSION_HOST_ROWS = 48;
     LIVE_LIFECYCLES2 = /* @__PURE__ */ new Set(["starting", "running", "stopping", "interrupted"]);
     SessionHostRegistry = class {
       sessions = /* @__PURE__ */ new Map();
@@ -11397,8 +11414,8 @@ var init_dist = __esm({
           meta: payload.meta || {}
         };
         record2.meta = {
-          sessionHostCols: payload.cols || 80,
-          sessionHostRows: payload.rows || 24,
+          sessionHostCols: resolveSessionHostCols(payload.cols),
+          sessionHostRows: resolveSessionHostRows(payload.rows),
           ...record2.meta
         };
         this.sessions.set(sessionId, {
@@ -12194,8 +12211,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)
     }
@@ -12252,6 +12269,7 @@ var init_provider_cli_runtime = __esm({
     "use strict";
     os12 = __toESM(require("os"));
     path11 = __toESM(require("path"));
+    init_dist();
     init_provider_cli_shared();
   }
 });
@@ -12262,6 +12280,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 os13, ProviderCliAdapter;
 var init_provider_cli_adapter = __esm({
   "../../oss/packages/daemon-core/src/cli-adapters/provider-cli-adapter.ts"() {
@@ -13589,7 +13629,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,
@@ -14467,6 +14507,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();
@@ -14758,7 +14800,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(() => {
@@ -86802,7 +86850,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;