@adhdev/daemon-core 0.5.25 → 0.5.26

package/dist/index.js

@@ -6800,7 +6800,7 @@ var ProviderCliAdapter = class {
     this.timeouts = {
       ptyFlush: t.ptyFlush ?? 50,
       dialogAccept: t.dialogAccept ?? 300,
-      approvalCooldown: t.approvalCooldown ?? 2e3,
+      approvalCooldown: t.approvalCooldown ?? 500,
       generatingIdle: t.generatingIdle ?? 6e3,
       idleFinish: t.idleFinish ?? 5e3,
       maxResponse: t.maxResponse ?? 3e5,
@@ -6977,32 +6977,34 @@ 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.setStatus("waiting_approval", "approval_pattern");
-      this.recentOutputBuffer = "";
-      this.approvalTransitionBuffer = "";
-      this.activeModal = {
-        message: ctxLines.slice(-5).join(" ").slice(0, 200) || "Approval required",
-        buttons: this.cliType === "claude-cli" ? ["Yes (y)", "Always allow (a)", "Deny (Esc)"] : ["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.setStatus(this.isWaitingForResponse ? "generating" : "idle", "approval_cleared");
-          this.onStatusChange?.();
-        }
-      }, 6e4);
-      this.onStatusChange?.();
-      return;
+      const inCooldown = this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown;
+      if (!inCooldown) {
+        const ctxLines = this.recentOutputBuffer.split("\n").map((l) => l.trim()).filter((l) => l && !/^[─═╭╮╰╯│]+$/.test(l));
+        this.isWaitingForResponse = true;
+        this.setStatus("waiting_approval", "approval_pattern");
+        this.recentOutputBuffer = "";
+        this.approvalTransitionBuffer = "";
+        this.activeModal = {
+          message: ctxLines.slice(-5).join(" ").slice(0, 200) || "Approval required",
+          buttons: this.cliType === "claude-cli" ? ["Yes (y)", "Always allow (a)", "Deny (Esc)"] : ["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.setStatus(this.isWaitingForResponse ? "generating" : "idle", "approval_cleared");
+            this.onStatusChange?.();
+          }
+        }, 6e4);
+        this.onStatusChange?.();
+        return;
+      }
     }
     if (this.currentStatus === "waiting_approval") {
       this.approvalTransitionBuffer = (this.approvalTransitionBuffer + cleanData).slice(-500);
@@ -7054,7 +7056,10 @@ var ProviderCliAdapter = class {
       }
       const trailingLines = cleanData.split("\n").slice(-2).join("\n");
       if (patterns.prompt.some((p) => p.test(trailingLines))) {
-        this.finishResponse();
+        const hasApprovalHere = patterns.approval.some((p) => p.test(this.recentOutputBuffer));
+        if (!hasApprovalHere) {
+          this.finishResponse();
+        }
       } else {
         this.idleTimeout = setTimeout(() => {
           if (this.isWaitingForResponse && this.responseBuffer.trim()) {