@adhdev/daemon-core 0.5.5 → 0.5.7

package/dist/index.d.ts

@@ -2367,6 +2367,9 @@ declare class ProviderCliAdapter implements CliAdapter {
     private serverConn;
     private logBuffer;
     private lastApprovalResolvedAt;
+    private approvalTransitionBuffer;
+    private approvalExitTimeout;
+    private resizeSuppressUntil;
     private readonly timeouts;
     constructor(provider: CliProviderModule, workingDir: string, extraArgs?: string[]);
     setServerConn(serverConn: any): void;
@@ -2384,6 +2387,12 @@ declare class ProviderCliAdapter implements CliAdapter {
     isProcessing(): boolean;
     isReady(): boolean;
     writeRaw(data: string): void;
+    /**
+    * Resolve an approval modal by navigating to the button at `buttonIndex` and pressing Enter.
+    * Index 0 = first option (already selected by default — just Enter).
+    * Index N = press Arrow Down N times, then Enter.
+    */
+    resolveModal(buttonIndex: number): void;
     resize(cols: number, rows: number): void;
 }
 

package/dist/index.js

@@ -3568,6 +3568,39 @@ async function handleResolveAction(h, args) {
   const action = args?.action || "approve";
   const button = args?.button || args?.buttonText || (action === "approve" ? "Accept" : action === "reject" ? "Reject" : "Accept");
   LOG.info("Command", `[resolveAction] action=${action} button="${button}" provider=${provider?.type}`);
+  if (provider?.category === "cli") {
+    const adapter = h.getCliAdapter(provider.type);
+    if (!adapter) return { success: false, error: "CLI adapter not running" };
+    const status = adapter.getStatus?.();
+    if (status?.status !== "waiting_approval") {
+      return { success: false, error: "Not in approval state" };
+    }
+    const buttons = status.activeModal?.buttons || ["Allow once", "Always allow", "Deny"];
+    let buttonIndex = typeof args?.buttonIndex === "number" ? args.buttonIndex : -1;
+    if (buttonIndex < 0) {
+      const btnLower = button.toLowerCase();
+      buttonIndex = buttons.findIndex((b) => b.toLowerCase().includes(btnLower));
+    }
+    if (buttonIndex < 0) {
+      if (action === "reject" || action === "deny") {
+        buttonIndex = buttons.findIndex((b) => /deny|reject|no/i.test(b));
+        if (buttonIndex < 0) buttonIndex = buttons.length - 1;
+      } else if (action === "always" || /always/i.test(button)) {
+        buttonIndex = buttons.findIndex((b) => /always/i.test(b));
+        if (buttonIndex < 0) buttonIndex = 1;
+      } else {
+        buttonIndex = 0;
+      }
+    }
+    if (typeof adapter.resolveModal === "function") {
+      adapter.resolveModal(buttonIndex);
+    } else {
+      const keys = "\x1B[B".repeat(Math.max(0, buttonIndex)) + "\r";
+      adapter.writeRaw?.(keys);
+    }
+    LOG.info("Command", `[resolveAction] CLI PTY \u2192 buttonIndex=${buttonIndex} "${buttons[buttonIndex] ?? "?"}"`);
+    return { success: true, buttonIndex, button: buttons[buttonIndex] ?? button };
+  }
   if (provider?.category === "extension" && h.agentStream && h.getCdp()) {
     const ok = await h.agentStream.resolveAgentAction(
       h.getCdp(),
@@ -6472,28 +6505,32 @@ function coercePatternArray(raw, fallbacks) {
 }
 var FALLBACK_PROMPT = [
   /Type your message/i,
-  />\s*$/,
+  /^>\s*$/m,
+  // '>' alone on its own line
   /[›➤]\s*$/,
   /for shortcuts/i,
   /\?\s*for help/i,
-  /Press enter/i,
-  /^[\s\u2500-\u257f]*>\s*$/m
+  /Press enter/i
+  // NOTE: removed /^[\s\u2500-\u257f]*>\s*$/m — the box-drawing char range is too wide and
+  // can match dialog-clearing ANSI output, causing false prompt detection in approval state.
 ];
 var FALLBACK_GENERATING = [
-  /thinking/i,
-  /writing/i,
-  /Claude is/i,
-  /Opus|Sonnet|Haiku/i,
-  /[\u2800-\u28ff]/
-  // Braille spinner blocks
+  /[\u2800-\u28ff]/,
+  // Braille spinner blocks (universal TUI)
+  /esc to (cancel|interrupt|stop)/i,
+  // Common TUI generation status line
+  /generating\.\.\./i,
+  /Claude is (?:thinking|processing|working)/i
+  // Specific Claude Code status
 ];
 var FALLBACK_APPROVAL = [
-  /approve/i,
-  /Allow( once)?/i,
+  /Allow\s+once/i,
+  /Always\s+allow/i,
   /\(y\/n\)/i,
   /\[Y\/n\]/i,
-  /continue\?/i,
-  /Run this command/i
+  /Run\s+this\s+command/i
+  // NOTE: removed /Do you want to (?:run|execute|allow)/i — too broad, matches AI explanation
+  // text like "Do you want to allow this feature?" causing false approval notifications.
 ];
 function defaultCleanOutput(raw, _lastUserInput) {
   return stripAnsi(raw).trim();
@@ -6554,6 +6591,11 @@ var ProviderCliAdapter = class {
   logBuffer = [];
   // Approval cooldown
   lastApprovalResolvedAt = 0;
+  // Approval state machine
+  approvalTransitionBuffer = "";
+  approvalExitTimeout = null;
+  // Resize redraw suppression
+  resizeSuppressUntil = 0;
   // Resolved timeouts (provider defaults + overrides)
   timeouts;
   // ─── Lifecycle ─────────────────────────────────
@@ -6644,6 +6686,7 @@ var ProviderCliAdapter = class {
   }
   // ─── Output state machine ────────────────────────────
   handleOutput(rawData) {
+    if (Date.now() < this.resizeSuppressUntil) return;
     const cleanData = stripAnsi(rawData);
     const { patterns } = this.provider;
     if (cleanData.trim()) {
@@ -6676,30 +6719,55 @@ var ProviderCliAdapter = class {
     const hasApproval = patterns.approval.some((p) => p.test(this.recentOutputBuffer));
     if (hasApproval && this.currentStatus !== "waiting_approval") {
       if (this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown) return;
+      const ctxLines = this.recentOutputBuffer.split("\n").map((l) => l.trim()).filter((l) => l && !/^[─═╭╮╰╯│]+$/.test(l));
       this.isWaitingForResponse = true;
       this.currentStatus = "waiting_approval";
       this.recentOutputBuffer = "";
-      const ctxLines = cleanData.split("\n").map((l) => l.trim()).filter((l) => l && !/^[─═╭╮╰╯│]+$/.test(l));
+      this.approvalTransitionBuffer = "";
       this.activeModal = {
         message: ctxLines.slice(-5).join(" ").slice(0, 200) || "Approval required",
         buttons: ["Allow once", "Always allow", "Deny"]
       };
       if (this.idleTimeout) clearTimeout(this.idleTimeout);
+      if (this.approvalExitTimeout) clearTimeout(this.approvalExitTimeout);
+      this.approvalExitTimeout = setTimeout(() => {
+        if (this.currentStatus === "waiting_approval") {
+          LOG.warn("CLI", `[${this.cliType}] Approval timeout \u2014 auto-exiting waiting_approval`);
+          this.activeModal = null;
+          this.lastApprovalResolvedAt = Date.now();
+          this.recentOutputBuffer = "";
+          this.approvalTransitionBuffer = "";
+          this.approvalExitTimeout = null;
+          this.currentStatus = this.isWaitingForResponse ? "generating" : "idle";
+          this.onStatusChange?.();
+        }
+      }, 6e4);
       this.onStatusChange?.();
       return;
     }
     if (this.currentStatus === "waiting_approval") {
-      const genResume = patterns.generating.some((p) => p.test(cleanData));
-      const promptResume = patterns.prompt.some((p) => p.test(cleanData));
+      this.approvalTransitionBuffer = (this.approvalTransitionBuffer + cleanData).slice(-500);
+      const genResume = patterns.generating.some((p) => p.test(this.approvalTransitionBuffer));
+      const promptResume = patterns.prompt.some((p) => p.test(this.approvalTransitionBuffer));
       if (genResume) {
+        if (this.approvalExitTimeout) {
+          clearTimeout(this.approvalExitTimeout);
+          this.approvalExitTimeout = null;
+        }
         this.currentStatus = "generating";
         this.activeModal = null;
         this.recentOutputBuffer = "";
+        this.approvalTransitionBuffer = "";
         this.lastApprovalResolvedAt = Date.now();
         this.onStatusChange?.();
       } else if (promptResume) {
+        if (this.approvalExitTimeout) {
+          clearTimeout(this.approvalExitTimeout);
+          this.approvalExitTimeout = null;
+        }
         this.activeModal = null;
         this.recentOutputBuffer = "";
+        this.approvalTransitionBuffer = "";
         this.lastApprovalResolvedAt = Date.now();
         this.finishResponse();
       }
@@ -6725,7 +6793,8 @@ var ProviderCliAdapter = class {
         this.onStatusChange?.();
         return;
       }
-      if (patterns.prompt.some((p) => p.test(this.responseBuffer))) {
+      const trailingLines = cleanData.split("\n").slice(-2).join("\n");
+      if (patterns.prompt.some((p) => p.test(trailingLines))) {
         this.finishResponse();
       } else {
         this.idleTimeout = setTimeout(() => {
@@ -6746,6 +6815,10 @@ var ProviderCliAdapter = class {
       clearTimeout(this.idleTimeout);
       this.idleTimeout = null;
     }
+    if (this.approvalExitTimeout) {
+      clearTimeout(this.approvalExitTimeout);
+      this.approvalExitTimeout = null;
+    }
     const lastUserText = this.messages.filter((m) => m.role === "user").pop()?.content;
     let response = this.provider.cleanOutput(this.responseBuffer, lastUserText);
     if (lastUserText && response) {
@@ -6795,6 +6868,10 @@ var ProviderCliAdapter = class {
     this.shutdown();
   }
   shutdown() {
+    if (this.approvalExitTimeout) {
+      clearTimeout(this.approvalExitTimeout);
+      this.approvalExitTimeout = null;
+    }
     if (this.ptyProcess) {
       this.ptyProcess.write("");
       setTimeout(() => {
@@ -6822,10 +6899,22 @@ var ProviderCliAdapter = class {
   writeRaw(data) {
     this.ptyProcess?.write(data);
   }
+  /**
+  * Resolve an approval modal by navigating to the button at `buttonIndex` and pressing Enter.
+  * Index 0 = first option (already selected by default — just Enter).
+  * Index N = press Arrow Down N times, then Enter.
+  */
+  resolveModal(buttonIndex) {
+    if (!this.ptyProcess || this.currentStatus !== "waiting_approval") return;
+    const DOWN = "\x1B[B";
+    const keys = DOWN.repeat(Math.max(0, buttonIndex)) + "\r";
+    this.ptyProcess.write(keys);
+  }
   resize(cols, rows) {
     if (this.ptyProcess) {
       try {
         this.ptyProcess.resize(cols, rows);
+        this.resizeSuppressUntil = Date.now() + 300;
       } catch {
       }
     }
@@ -6950,20 +7039,24 @@ var CliProviderInstance = class {
     const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
     const chatTitle = `${this.provider.name} \xB7 ${dirName}`;
     if (newStatus !== this.lastStatus) {
+      LOG.info("CLI", `[${this.type}] status: ${this.lastStatus} \u2192 ${newStatus}`);
       if (this.lastStatus === "idle" && newStatus === "generating") {
         this.generatingStartedAt = now;
         this.pushEvent({ event: "agent:generating_started", chatTitle, timestamp: now });
       } else if (newStatus === "waiting_approval") {
         if (!this.generatingStartedAt) this.generatingStartedAt = now;
+        const modal = adapterStatus.activeModal;
+        LOG.info("CLI", `[${this.type}] approval modal: "${modal?.message?.slice(0, 80) ?? "none"}"`);
         this.pushEvent({
           event: "agent:waiting_approval",
           chatTitle,
           timestamp: now,
-          modalMessage: adapterStatus.activeModal?.message,
-          modalButtons: adapterStatus.activeModal?.buttons
+          modalMessage: modal?.message,
+          modalButtons: modal?.buttons
         });
       } else if (newStatus === "idle" && (this.lastStatus === "generating" || this.lastStatus === "waiting_approval")) {
         const duration = this.generatingStartedAt ? Math.round((now - this.generatingStartedAt) / 1e3) : 0;
+        LOG.info("CLI", `[${this.type}] completed in ${duration}s`);
         this.pushEvent({ event: "agent:generating_completed", chatTitle, duration, timestamp: now });
         this.generatingStartedAt = 0;
       } else if (newStatus === "stopped") {