@adhdev/daemon-core 0.8.96 → 0.8.97

package/dist/providers/cli-provider-instance.d.ts

@@ -42,6 +42,8 @@ export declare class CliProviderInstance implements ProviderInstance {
     private generatingDebounceTimer;
     private generatingDebouncePending;
     private lastApprovalEventAt;
+    private autoApproveBusy;
+    private autoApproveBusyTimer;
     private controlValues;
     private summaryMetadata;
     private appliedEffectKeys;

package/node_modules/@adhdev/session-host-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/session-host-core",
-  "version": "0.8.96",
+  "version": "0.8.97",
   "description": "ADHDev local session host core \u2014 session registry, protocol, buffers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.8.96",
+  "version": "0.8.97",
   "description": "ADHDev daemon core \u2014 CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/cli-adapters/provider-cli-adapter.ts

@@ -94,6 +94,38 @@ interface IdleFinishCandidate {
     assistantLength: number;
 }
 
+function normalizeComparableTranscriptText(value: unknown): string {
+    return sanitizeTerminalText(String(value || ''))
+        .replace(/\s+/g, ' ')
+        .trim();
+}
+
+function parsedTranscriptIsRicherThanCommitted(
+    parsedMessages: Array<{ role?: string; content?: unknown; id?: string; index?: number }> | null | undefined,
+    committedMessages: Array<{ role?: string; content?: unknown; id?: string; index?: number }> | null | undefined,
+): boolean {
+    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;
+}
+
 // ─── Adapter ────────────────────────────────────────
 
 export class ProviderCliAdapter implements CliAdapter {
@@ -1621,7 +1653,7 @@ export class ProviderCliAdapter implements CliAdapter {
                 !this.currentTurnScope
                 && !this.activeModal
                 && !!parsedLastAssistant
-                && parsedHydratedMessages.length > committedHydratedMessages.length
+                && parsedTranscriptIsRicherThanCommitted(parsedHydratedMessages, committedHydratedMessages)
                 && (
                     this.currentStatus === 'idle'
                     || (

package/src/providers/cli-provider-instance.ts

@@ -152,6 +152,8 @@ export class CliProviderInstance implements ProviderInstance {
     private generatingDebounceTimer: NodeJS.Timeout | null = null;
     private generatingDebouncePending: { chatTitle: string; timestamp: number } | null = null;
     private lastApprovalEventAt = 0;
+    private autoApproveBusy = false;
+    private autoApproveBusyTimer: NodeJS.Timeout | null = null;
     private controlValues: Record<string, string | number | boolean> = {};
     private summaryMetadata: unknown = undefined;
     private appliedEffectKeys = new Set<string>();
@@ -542,7 +544,17 @@ export class CliProviderInstance implements ProviderInstance {
         const parsedStatus = this.adapter.getScriptParsedStatus?.() || null;
         const rawStatus = adapterStatus.status;
         const autoApproveActive = rawStatus === 'waiting_approval' && this.shouldAutoApprove();
-        if (autoApproveActive) {
+        // Guard re-entry: onStatusChange can fire multiple times while the modal
+        // is still on screen (before the PTY absorbs the approval key). Without this
+        // flag, we'd write the approval key repeatedly — stray keys then leak into
+        // the text input once Claude Code dismisses the modal.
+        if (autoApproveActive && !this.autoApproveBusy) {
+            this.autoApproveBusy = true;
+            if (this.autoApproveBusyTimer) clearTimeout(this.autoApproveBusyTimer);
+            this.autoApproveBusyTimer = setTimeout(() => {
+                this.autoApproveBusy = false;
+                this.autoApproveBusyTimer = null;
+            }, 2000);
             const { index: buttonIndex, label: buttonLabel } = pickApprovalButton(adapterStatus.activeModal?.buttons, this.provider);
             this.recordAutoApproval(adapterStatus.activeModal?.message, buttonLabel, now);
             setTimeout(() => {