@adhdev/daemon-core 0.9.82-rc.134 → 0.9.82-rc.136

package/dist/cli-adapter-types.d.ts

@@ -56,6 +56,7 @@ export interface CliAdapter {
     clearHistory?(): void;
     resolveAction?(data: unknown): Promise<void>;
     resolveModal?(buttonIndex: number): void;
+    isApprovalRecentlyResolved?(): boolean;
     setOnPtyData?(callback: (data: string) => void): void;
     writeRaw?(data: string): void;
     resize?(cols: number, rows: number): void;

package/dist/cli-adapters/provider-cli-adapter.d.ts

@@ -237,6 +237,8 @@ export declare class ProviderCliAdapter implements CliAdapter {
     isReady(): boolean;
     writeRaw(data: string): Promise<void>;
     resolveModal(buttonIndex: number): void;
+    /** Returns true if an approval was resolved within the adapter's cooldown window. */
+    isApprovalRecentlyResolved(): boolean;
     resize(cols: number, rows: number): void;
     private getParsedDebugState;
     getDebugState(): Record<string, any>;

package/dist/cli-adapters/provider-cli-parse.d.ts

@@ -16,6 +16,8 @@ export declare function buildCliParseInput(options: {
     recentOutputBuffer: string;
     terminalScreenText: string;
     workingDir?: string;
+    providerSessionId?: string;
+    historySessionId?: string;
     baseMessages: CliChatMessage[];
     partialResponse: string;
     isWaitingForResponse?: boolean;

package/dist/cli-adapters/provider-cli-shared.d.ts

@@ -126,6 +126,8 @@ export interface CliScriptInput {
     screenText: string;
     workspace?: string;
     workingDir?: string;
+    providerSessionId?: string;
+    historySessionId?: string;
     screen: CliScreenSnapshot;
     bufferScreen: CliScreenSnapshot;
     recentScreen: CliScreenSnapshot;

package/dist/index.js

@@ -4518,6 +4518,8 @@ function buildCliParseInput(options) {
     recentOutputBuffer,
     terminalScreenText,
     workingDir,
+    providerSessionId,
+    historySessionId,
     baseMessages,
     partialResponse,
     isWaitingForResponse,
@@ -4535,6 +4537,8 @@ function buildCliParseInput(options) {
     screenText,
     workspace: workingDir,
     workingDir,
+    providerSessionId,
+    historySessionId,
     screen: buildCliScreenSnapshot(screenText),
     bufferScreen: buildCliScreenSnapshot(buffer),
     recentScreen: buildCliScreenSnapshot(recentBuffer),
@@ -6090,6 +6094,8 @@ ${lastSnapshot}`;
             recentOutputBuffer: this.recentOutputBuffer,
             terminalScreenText: parseScreenText,
             workingDir: this.workingDir,
+            providerSessionId: this.providerSessionId || void 0,
+            historySessionId: this.providerSessionId || void 0,
             baseMessages: [],
             partialResponse: this.responseBuffer,
             isWaitingForResponse: this.isWaitingForResponse,
@@ -6314,6 +6320,8 @@ ${lastSnapshot}`;
           recentOutputBuffer: this.recentOutputBuffer,
           terminalScreenText: this.getParseScreenText(this.terminalScreen.getText()),
           workingDir: this.workingDir,
+          providerSessionId: this.providerSessionId || void 0,
+          historySessionId: this.providerSessionId || void 0,
           baseMessages: [],
           partialResponse: this.responseBuffer,
           isWaitingForResponse: this.isWaitingForResponse,
@@ -6871,6 +6879,10 @@ ${lastSnapshot}`;
         return this.ptyProcess.getMetadata();
       }
       updateRuntimeMeta(meta, replace = false) {
+        const nextProviderSessionId = typeof meta?.providerSessionId === "string" ? meta.providerSessionId.trim() : "";
+        if (nextProviderSessionId) {
+          this.providerSessionId = nextProviderSessionId;
+        }
         if (!this.ptyProcess || typeof this.ptyProcess.updateMeta !== "function") return;
         this.ptyProcess.updateMeta(meta, replace);
       }
@@ -7038,6 +7050,9 @@ ${lastSnapshot}`;
         await this.writeToPty(data);
       }
       resolveModal(buttonIndex) {
+        if (this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown) {
+          return;
+        }
         let modal = this.activeModal || this.runParseApproval(this.recentOutputBuffer);
         if (!modal && typeof this.cliScripts?.parseSession === "function") {
           try {
@@ -7079,6 +7094,10 @@ ${lastSnapshot}`;
           this.ptyProcess.write(keys);
         }
       }
+      /** Returns true if an approval was resolved within the adapter's cooldown window. */
+      isApprovalRecentlyResolved() {
+        return !!(this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown);
+      }
       resize(cols, rows) {
         if (this.ptyProcess) {
           try {
@@ -15100,6 +15119,19 @@ function formatAutoApprovalMessage(modalMessage, buttonLabel) {
   if (cleanMessage) lines.push(cleanMessage);
   return lines.join("\n");
 }
+function looksLikeActiveApprovalPromptText(content) {
+  const text = content.trim();
+  if (!text || text.length > 2e3) return false;
+  const hasApprovalQuestion = /do you want to (?:proceed|allow|run|make this edit|create)/i.test(text) || /this command requires approval/i.test(text) || /quick safety check/i.test(text) || /is this a project you trust/i.test(text);
+  const hasNumberedChoices = /^\s*[❯›>]?\s*1[.)]\s+(?:yes|allow|proceed|run)/im.test(text) || /^\s*1[.)]\s+yes\b/im.test(text);
+  if (hasApprovalQuestion && hasNumberedChoices) return true;
+  const lastLines = text.split(/\r?\n/).slice(-12).join("\n");
+  const hasDontAskAgain = /yes.*don'?t ask again/i.test(lastLines) || /yes.*always allow/i.test(lastLines);
+  const hasNoOption = /^\s*[❯›>]?\s*\d+[.)]\s+no\b/im.test(lastLines);
+  if (hasDontAskAgain && hasNoOption) return true;
+  if (/what do you want to do\?/i.test(text) && /^\s*\d+[.)]\s+\S/m.test(text)) return true;
+  return false;
+}
 
 // src/providers/ide-provider-instance.ts
 async function withTimeout(promise, timeoutMs, label) {
@@ -19109,6 +19141,10 @@ async function handleResolveAction(h, args) {
     if (buttonIndex < 0) {
       return { success: false, error: "Approval action did not match any visible button" };
     }
+    if (typeof adapter.isApprovalRecentlyResolved === "function" && adapter.isApprovalRecentlyResolved()) {
+      LOG.info("Command", `[resolveAction] CLI PTY \u2192 stale_prompt (already resolved within cooldown)`);
+      return { success: true, stalePrompt: true, buttonIndex, button: buttons[buttonIndex] ?? button };
+    }
     if (typeof adapter.resolveModal === "function") {
       adapter.resolveModal(buttonIndex);
     } else {
@@ -20913,6 +20949,9 @@ var CliProviderInstance = class {
     this.launchMode = options?.launchMode || "new";
     this.onProviderSessionResolved = options?.onProviderSessionResolved;
     this.adapter = new ProviderCliAdapter(provider, workingDir, cliArgs, options?.extraEnv || {}, transportFactory);
+    if (this.providerSessionId) {
+      this.adapter.updateRuntimeMeta({ providerSessionId: this.providerSessionId });
+    }
     this.monitor = new StatusMonitor();
     this.historyWriter = new ChatHistoryWriter();
   }
@@ -21306,7 +21345,9 @@ var CliProviderInstance = class {
     const lastVisible = visibleMessages[visibleMessages.length - 1];
     const role = typeof lastVisible?.role === "string" ? lastVisible.role.trim().toLowerCase() : "";
     const content = lastVisible ? flattenContent(lastVisible.content).trim() : "";
-    return role === "assistant" && !!content;
+    if (role !== "assistant" || !content) return false;
+    if (looksLikeActiveApprovalPromptText(content)) return false;
+    return true;
   }
   buildCompletedFinalizationDiagnostic(args) {
     let parsed = null;
@@ -21394,6 +21435,16 @@ var CliProviderInstance = class {
     }
     if (parsed?.activeModal || parsed?.modal) return { reason: "parsed_modal_active", terminal: true };
     if (!this.completionHasFinalAssistantMessage(parsed?.messages)) return { reason: "missing_final_assistant" };
+    try {
+      const screenText = typeof this.adapter.getScreenText === "function" ? String(this.adapter.getScreenText() || "") : "";
+      if (screenText) {
+        const tailLines = screenText.split(/\r?\n/).slice(-16).join("\n");
+        if (looksLikeActiveApprovalPromptText(tailLines)) {
+          return { reason: "screen_shows_approval_prompt", terminal: false };
+        }
+      }
+    } catch {
+    }
     return null;
   }
   scheduleCompletedDebounceFlush(delayMs) {
@@ -23700,7 +23751,9 @@ var DaemonCliManager = class {
         providerSessionId,
         attachExisting
       );
-      return new ProviderCliAdapter(resolvedProvider, workingDir, cliArgs, extraEnv || {}, transportFactory);
+      const adapter = new ProviderCliAdapter(resolvedProvider, workingDir, cliArgs, extraEnv || {}, transportFactory);
+      if (providerSessionId) adapter.updateRuntimeMeta({ providerSessionId });
+      return adapter;
     }
     throw new Error(`No CLI provider found for '${cliType}'. Create a provider.js in providers/cli/${cliType}/`);
   }