@adhdev/daemon-core 0.5.31 → 0.5.33

package/dist/index.d.ts

@@ -2607,6 +2607,7 @@ declare class CliProviderInstance implements ProviderInstance {
     private monitor;
     private generatingDebounceTimer;
     private generatingDebouncePending;
+    private lastApprovalEventAt;
     private historyWriter;
     readonly instanceId: string;
     constructor(provider: ProviderModule, workingDir: string, cliArgs?: string[], instanceId?: string);
@@ -2615,6 +2616,8 @@ declare class CliProviderInstance implements ProviderInstance {
     getState(): ProviderState;
     onEvent(event: string, data?: any): void;
     dispose(): void;
+    private completedDebounceTimer;
+    private completedDebouncePending;
     private detectStatusTransition;
     private pushEvent;
     private flushEvents;

package/dist/index.js

@@ -6745,7 +6745,7 @@ try {
   LOG.error("CLI", "[ProviderCliAdapter] node-pty not found. Terminal features disabled.");
 }
 function stripAnsi(str) {
-  return str.replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "").replace(/\x1B\][^\x07]*\x07/g, "").replace(/\x1B\][^\x1B]*\x1B\\/g, "");
+  return str.replace(/\x1B\[\d*[A-HJKSTfG]/g, " ").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "").replace(/\x1B\][^\x07]*\x07/g, "").replace(/\x1B\][^\x1B]*\x1B\\/g, "").replace(/  +/g, " ");
 }
 function findBinary(name) {
   const isWin = os11.platform() === "win32";
@@ -7053,6 +7053,9 @@ var ProviderCliAdapter = class {
       }
       return;
     }
+    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;
@@ -7333,6 +7336,7 @@ var CliProviderInstance = class {
   monitor;
   generatingDebounceTimer = null;
   generatingDebouncePending = null;
+  lastApprovalEventAt = 0;
   historyWriter;
   instanceId;
   // ─── Lifecycle ─────────────────────────────────
@@ -7417,7 +7421,8 @@ var CliProviderInstance = class {
     this.adapter.shutdown();
     this.monitor.reset();
   }
-  // ─── Status transition detection (moved from daemon-status.ts) ──────
+  completedDebounceTimer = null;
+  completedDebouncePending = null;
   detectStatusTransition() {
     const now = Date.now();
     const adapterStatus = this.adapter.getStatus();
@@ -7427,7 +7432,15 @@ var CliProviderInstance = class {
     if (newStatus !== this.lastStatus) {
       LOG.info("CLI", `[${this.type}] status: ${this.lastStatus} \u2192 ${newStatus}`);
       if (this.lastStatus === "idle" && newStatus === "generating") {
-        this.generatingStartedAt = now;
+        if (this.completedDebouncePending) {
+          LOG.info("CLI", `[${this.type}] cancelled pending completed (resumed generating)`);
+          if (this.completedDebounceTimer) {
+            clearTimeout(this.completedDebounceTimer);
+            this.completedDebounceTimer = null;
+          }
+          this.completedDebouncePending = null;
+        }
+        if (!this.generatingStartedAt) this.generatingStartedAt = now;
         if (this.generatingDebounceTimer) clearTimeout(this.generatingDebounceTimer);
         this.generatingDebouncePending = { chatTitle, timestamp: now };
         this.generatingDebounceTimer = setTimeout(() => {
@@ -7446,16 +7459,25 @@ var CliProviderInstance = class {
           this.pushEvent({ event: "agent:generating_started", ...this.generatingDebouncePending });
           this.generatingDebouncePending = null;
         }
+        if (this.completedDebounceTimer) {
+          clearTimeout(this.completedDebounceTimer);
+          this.completedDebounceTimer = null;
+        }
+        this.completedDebouncePending = null;
         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: modal?.message,
-          modalButtons: modal?.buttons
-        });
+        const approvalCooldown = 5e3;
+        if (this.lastStatus !== "waiting_approval" && (!this.lastApprovalEventAt || now - this.lastApprovalEventAt > approvalCooldown)) {
+          this.lastApprovalEventAt = now;
+          this.pushEvent({
+            event: "agent:waiting_approval",
+            chatTitle,
+            timestamp: now,
+            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;
         if (this.generatingDebouncePending) {
@@ -7465,17 +7487,31 @@ var CliProviderInstance = class {
             this.generatingDebounceTimer = null;
           }
           this.generatingDebouncePending = null;
+          this.generatingStartedAt = 0;
         } else {
-          LOG.info("CLI", `[${this.type}] completed in ${duration}s`);
-          this.pushEvent({ event: "agent:generating_completed", chatTitle, duration, timestamp: now });
+          if (this.completedDebounceTimer) clearTimeout(this.completedDebounceTimer);
+          this.completedDebouncePending = { chatTitle, duration, timestamp: now };
+          this.completedDebounceTimer = setTimeout(() => {
+            if (this.completedDebouncePending) {
+              LOG.info("CLI", `[${this.type}] completed in ${this.completedDebouncePending.duration}s`);
+              this.pushEvent({ event: "agent:generating_completed", ...this.completedDebouncePending });
+              this.completedDebouncePending = null;
+              this.generatingStartedAt = 0;
+            }
+            this.completedDebounceTimer = null;
+          }, 2e3);
         }
-        this.generatingStartedAt = 0;
       } else if (newStatus === "stopped") {
         if (this.generatingDebounceTimer) {
           clearTimeout(this.generatingDebounceTimer);
           this.generatingDebounceTimer = null;
         }
         this.generatingDebouncePending = null;
+        if (this.completedDebounceTimer) {
+          clearTimeout(this.completedDebounceTimer);
+          this.completedDebounceTimer = null;
+        }
+        this.completedDebouncePending = null;
         this.pushEvent({ event: "agent:stopped", chatTitle, timestamp: now });
       }
       this.lastStatus = newStatus;
@@ -8874,7 +8910,8 @@ var ProviderStreamAdapter = class {
       extensionId: this.extensionId,
       status: "error",
       messages: [],
-      inputContent: ""
+      inputContent: "",
+      _error: message
     };
   }
 };
@@ -8893,9 +8930,11 @@ var DaemonAgentStreamManager = class {
     if (providerLoader) {
       const allExtProviders = providerLoader.getByCategory("extension");
       for (const p of allExtProviders) {
-        const adapter = new ProviderStreamAdapter(p);
+        const resolved = providerLoader.resolve(p.type);
+        if (!resolved) continue;
+        const adapter = new ProviderStreamAdapter(resolved);
         this.allAdapters.push(adapter);
-        this.logFn(`[AgentStream] Adapter created: ${p.type} (${p.name})`);
+        this.logFn(`[AgentStream] Adapter created: ${p.type} (${p.name}) scripts=${Object.keys(resolved.scripts || {}).join(",") || "none"}`);
       }
     }
   }
@@ -8982,6 +9021,7 @@ var DaemonAgentStreamManager = class {
         try {
           const evaluate = (expr, timeout) => cdp.evaluateInSessionFrame(agent.sessionId, expr, timeout);
           const state = await agent.adapter.readChat(evaluate);
+          this.logFn(`[AgentStream] readChat(${type}) result: status=${state.status} msgs=${state.messages?.length || 0} model=${state.model || ""}${state.status === "error" ? " error=" + JSON.stringify(state.error || state._error || "unknown") : ""}`);
           agent.lastState = state;
           agent.lastError = null;
           if (state.status === "panel_hidden") {