adhdev 0.5.31 → 0.5.33

package/dist/cli/index.js

@@ -23022,7 +23022,7 @@ var require_dist = __commonJS({
       LOG5.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";
@@ -23330,6 +23330,9 @@ var require_dist = __commonJS({
           }
           return;
         }
+        if (cleanData.trim().length > 5) {
+          LOG5.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;
@@ -23606,6 +23609,7 @@ var require_dist = __commonJS({
       monitor;
       generatingDebounceTimer = null;
       generatingDebouncePending = null;
+      lastApprovalEventAt = 0;
       historyWriter;
       instanceId;
       // ─── Lifecycle ─────────────────────────────────
@@ -23690,7 +23694,8 @@ var require_dist = __commonJS({
         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();
@@ -23700,7 +23705,15 @@ var require_dist = __commonJS({
         if (newStatus !== this.lastStatus) {
           LOG5.info("CLI", `[${this.type}] status: ${this.lastStatus} \u2192 ${newStatus}`);
           if (this.lastStatus === "idle" && newStatus === "generating") {
-            this.generatingStartedAt = now;
+            if (this.completedDebouncePending) {
+              LOG5.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(() => {
@@ -23719,16 +23732,25 @@ var require_dist = __commonJS({
               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;
             LOG5.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 duration3 = this.generatingStartedAt ? Math.round((now - this.generatingStartedAt) / 1e3) : 0;
             if (this.generatingDebouncePending) {
@@ -23738,17 +23760,31 @@ var require_dist = __commonJS({
                 this.generatingDebounceTimer = null;
               }
               this.generatingDebouncePending = null;
+              this.generatingStartedAt = 0;
             } else {
-              LOG5.info("CLI", `[${this.type}] completed in ${duration3}s`);
-              this.pushEvent({ event: "agent:generating_completed", chatTitle, duration: duration3, timestamp: now });
+              if (this.completedDebounceTimer) clearTimeout(this.completedDebounceTimer);
+              this.completedDebouncePending = { chatTitle, duration: duration3, timestamp: now };
+              this.completedDebounceTimer = setTimeout(() => {
+                if (this.completedDebouncePending) {
+                  LOG5.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;
@@ -25135,7 +25171,8 @@ ${installInfo}`
           extensionId: this.extensionId,
           status: "error",
           messages: [],
-          inputContent: ""
+          inputContent: "",
+          _error: message
         };
       }
     };
@@ -25152,9 +25189,11 @@ ${installInfo}`
         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"}`);
           }
         }
       }
@@ -25241,6 +25280,7 @@ ${installInfo}`
             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") {
@@ -30282,7 +30322,7 @@ var init_adhdev_daemon = __esm({
     path2 = __toESM(require("path"));
     crypto2 = __toESM(require("crypto"));
     import_chalk = __toESM(require("chalk"));
-    pkgVersion = "0.5.31";
+    pkgVersion = "0.5.33";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [