@adhdev/daemon-core 0.5.61 → 0.5.63

package/dist/index.d.ts

@@ -2484,7 +2484,7 @@ declare const DAEMON_WS_PATH = "/ipc";
  * binary: string — binary name
  * spawn: { command, args, shell, env }
  * patterns: { prompt, generating, approval, ready }
- * timeouts?: { idleFinish, generatingIdle, maxResponse, approvalCooldown, ... }
+ * timeouts?: { idleFinish, generatingIdle, maxResponse, approvalCooldown, outputSettle, ... }
  * cleanOutput(raw, lastUserInput): string
  */
 
@@ -2534,6 +2534,8 @@ interface CliProviderModule {
         maxResponse?: number;
         /** shutdown after kill wait (default 1000ms) */
         shutdownGrace?: number;
+        /** Output settle debounce before evaluating idle/approval (default 300ms) */
+        outputSettle?: number;
     };
     cleanOutput(raw: string, lastUserInput?: string): string;
 }
@@ -2563,6 +2565,8 @@ declare class ProviderCliAdapter implements CliAdapter {
     private lastApprovalResolvedAt;
     private approvalTransitionBuffer;
     private approvalExitTimeout;
+    private settleTimer;
+    private settledBuffer;
     private resizeSuppressUntil;
     private statusHistory;
     private setStatus;
@@ -2574,6 +2578,12 @@ declare class ProviderCliAdapter implements CliAdapter {
     setOnPtyData(callback: (data: string) => void): void;
     spawn(): Promise<void>;
     private handleOutput;
+    /**
+     * Fired after output goes quiet for outputSettle ms.
+     * Evaluates the stabilised buffer for approval, prompt (idle), or timeout.
+     */
+    private scheduleSettle;
+    private evaluateSettled;
     private finishResponse;
     getStatus(): CliSessionStatus;
     sendMessage(text: string): Promise<void>;

package/dist/index.js

@@ -2236,29 +2236,18 @@ var ExtensionProviderInstance = class {
     return this.instanceId;
   }
   // ─── status transition detect ──────────────────────────────
-  detectTransition(newStatus, data) {
+  // NOTE: Extension transitions are TRACKED but NOT emitted as events.
+  // The parent IdeProviderInstance already emits identical events
+  // (generating_started, generating_completed, waiting_approval)
+  // via its own detectAgentTransitions(). Emitting here would cause
+  // duplicate toasts with slightly different content.
+  detectTransition(newStatus, _data) {
     const now = Date.now();
     const agentStatus = newStatus === "streaming" || newStatus === "generating" ? "generating" : newStatus === "waiting_approval" ? "waiting_approval" : "idle";
     if (agentStatus !== this.lastAgentStatus) {
-      const chatTitle = this.provider.name;
       if (this.lastAgentStatus === "idle" && agentStatus === "generating") {
         this.generatingStartedAt = now;
-        this.pushEvent({ event: "agent:generating_started", chatTitle, timestamp: now });
-      } else if (agentStatus === "waiting_approval") {
-        if (!this.generatingStartedAt) this.generatingStartedAt = now;
-        const msg = data?.activeModal?.message || data?.modalMessage;
-        this.pushEvent({
-          event: "agent:waiting_approval",
-          chatTitle,
-          timestamp: now,
-          ideType: this.ideType,
-          agentType: this.type,
-          modalMessage: msg,
-          modalButtons: data?.activeModal?.buttons || data?.modalButtons
-        });
       } else if (agentStatus === "idle" && (this.lastAgentStatus === "generating" || this.lastAgentStatus === "waiting_approval")) {
-        const duration = this.generatingStartedAt ? Math.round((now - this.generatingStartedAt) / 1e3) : 0;
-        this.pushEvent({ event: "agent:generating_completed", chatTitle, duration, timestamp: now });
         this.generatingStartedAt = 0;
       }
       this.lastAgentStatus = agentStatus;
@@ -7039,7 +7028,8 @@ var ProviderCliAdapter = class {
       generatingIdle: t.generatingIdle ?? 6e3,
       idleFinish: t.idleFinish ?? 5e3,
       maxResponse: t.maxResponse ?? 3e5,
-      shutdownGrace: t.shutdownGrace ?? 1e3
+      shutdownGrace: t.shutdownGrace ?? 1e3,
+      outputSettle: t.outputSettle ?? 300
     };
     const rawKeys = provider.approvalKeys;
     this.approvalKeys = rawKeys && typeof rawKeys === "object" ? rawKeys : {};
@@ -7072,6 +7062,10 @@ var ProviderCliAdapter = class {
   // Approval state machine
   approvalTransitionBuffer = "";
   approvalExitTimeout = null;
+  // Output settle debounce — fires after PTY output goes quiet
+  settleTimer = null;
+  settledBuffer = "";
+  // snapshot of recentOutputBuffer at settle time
   // Resize redraw suppression
   resizeSuppressUntil = 0;
   // Debug: status transition history
@@ -7213,39 +7207,57 @@ var ProviderCliAdapter = class {
     if (cleanData.trim().length > 5) {
       LOG.debug("CLI", `[${this.cliType}] output chunk (${cleanData.length}): ${cleanData.slice(0, 300).replace(/\n/g, "\\n")}`);
     }
-    const hasApproval = patterns.approval.some((p) => p.test(this.recentOutputBuffer));
-    if (hasApproval && this.currentStatus !== "waiting_approval") {
-      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));
+    if (!this.isWaitingForResponse) {
+      if (patterns.generating.some((p) => p.test(cleanData))) {
+        if (this.settleTimer) {
+          clearTimeout(this.settleTimer);
+          this.settleTimer = null;
+        }
         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.responseBuffer = "";
+        this.setStatus("generating", "autonomous_gen");
+        this.onStatusChange?.();
+      }
+    }
+    if (this.isWaitingForResponse) {
+      this.responseBuffer += cleanData;
+      if (this.idleTimeout) clearTimeout(this.idleTimeout);
+      if (patterns.generating.some((p) => p.test(cleanData))) {
+        this.setStatus("generating", "still_generating");
+        this.idleTimeout = setTimeout(() => {
+          if (this.isWaitingForResponse) this.finishResponse();
+        }, this.timeouts.generatingIdle);
         this.onStatusChange?.();
+        if (this.settleTimer) {
+          clearTimeout(this.settleTimer);
+          this.settleTimer = null;
+        }
         return;
       }
     }
     if (this.currentStatus === "waiting_approval") {
       this.approvalTransitionBuffer = (this.approvalTransitionBuffer + cleanData).slice(-500);
+      this.scheduleSettle();
+      return;
+    }
+    this.scheduleSettle();
+  }
+  /**
+   * Fired after output goes quiet for outputSettle ms.
+   * Evaluates the stabilised buffer for approval, prompt (idle), or timeout.
+   */
+  scheduleSettle() {
+    if (this.settleTimer) clearTimeout(this.settleTimer);
+    this.settleTimer = setTimeout(() => {
+      this.settleTimer = null;
+      this.settledBuffer = this.recentOutputBuffer;
+      this.evaluateSettled();
+    }, this.timeouts.outputSettle);
+  }
+  evaluateSettled() {
+    const { patterns } = this.provider;
+    const buf = this.settledBuffer;
+    if (this.currentStatus === "waiting_approval") {
       const genResume = patterns.generating.some((p) => p.test(this.approvalTransitionBuffer));
       const promptResume = patterns.prompt.some((p) => p.test(this.approvalTransitionBuffer));
       if (genResume) {
@@ -7272,33 +7284,43 @@ var ProviderCliAdapter = class {
       }
       return;
     }
-    if (!this.isWaitingForResponse) {
-      if (patterns.generating.some((p) => p.test(cleanData))) {
+    const hasApproval = patterns.approval.some((p) => p.test(buf));
+    if (hasApproval) {
+      const inCooldown = this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown;
+      if (!inCooldown) {
+        const ctxLines = buf.split("\n").map((l) => l.trim()).filter((l) => l && !/^[─═╭╮╰╯│]+$/.test(l));
         this.isWaitingForResponse = true;
-        this.responseBuffer = "";
-        this.setStatus("generating", "autonomous_gen");
+        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.isWaitingForResponse) {
-      this.responseBuffer += cleanData;
-      if (this.idleTimeout) clearTimeout(this.idleTimeout);
-      const stillGenerating = patterns.generating.some((p) => p.test(cleanData));
-      if (stillGenerating) {
-        this.setStatus("generating", "still_generating");
-        this.idleTimeout = setTimeout(() => {
-          if (this.isWaitingForResponse) this.finishResponse();
-        }, this.timeouts.generatingIdle);
-        this.onStatusChange?.();
-        return;
-      }
-      const trailingLines = cleanData.split("\n").slice(-2).join("\n");
-      if (patterns.prompt.some((p) => p.test(trailingLines))) {
-        const hasApprovalHere = patterns.approval.some((p) => p.test(this.recentOutputBuffer));
-        if (!hasApprovalHere) {
-          this.finishResponse();
-        }
-      } else {
+      const trailingLines = buf.split("\n").slice(-3).join("\n");
+      if (patterns.prompt.some((p) => p.test(trailingLines)) && !hasApproval) {
+        this.finishResponse();
+      } else if (!patterns.generating.some((p) => p.test(buf))) {
+        if (this.idleTimeout) clearTimeout(this.idleTimeout);
         this.idleTimeout = setTimeout(() => {
           if (this.isWaitingForResponse && this.responseBuffer.trim()) {
             this.finishResponse();
@@ -7370,6 +7392,10 @@ var ProviderCliAdapter = class {
     this.shutdown();
   }
   shutdown() {
+    if (this.settleTimer) {
+      clearTimeout(this.settleTimer);
+      this.settleTimer = null;
+    }
     if (this.approvalExitTimeout) {
       clearTimeout(this.approvalExitTimeout);
       this.approvalExitTimeout = null;
@@ -7441,6 +7467,7 @@ var ProviderCliAdapter = class {
       // Buffers
       startupBuffer: this.startupBuffer.slice(-500),
       recentOutputBuffer: this.recentOutputBuffer.slice(-500),
+      settledBuffer: this.settledBuffer.slice(-500),
       responseBuffer: this.responseBuffer.slice(-500),
       approvalTransitionBuffer: this.approvalTransitionBuffer.slice(-500),
       // State