adhdev 0.6.47 → 0.6.48

package/dist/cli/index.js

@@ -2091,6 +2091,9 @@ var init_status_monitor = __esm({
       config;
       lastAlertTime = /* @__PURE__ */ new Map();
       generatingStartTimes = /* @__PURE__ */ new Map();
+      longGeneratingAlerted = /* @__PURE__ */ new Map();
+      lastProgressFingerprint = /* @__PURE__ */ new Map();
+      lastProgressChangeAt = /* @__PURE__ */ new Map();
       constructor(config2) {
         this.config = { ...DEFAULT_MONITOR_CONFIG, ...config2 };
       }
@@ -2106,7 +2109,7 @@ var init_status_monitor = __esm({
        * Check status transition → return notification event array.
        * Called from each onTick() or detectStatusTransition().
        */
-      check(agentKey, status, now) {
+      check(agentKey, status, now, progressFingerprint) {
         const events = [];
         if (this.config.approvalAlert && status === "waiting_approval") {
           if (this.shouldAlert(agentKey + ":approval", now)) {
@@ -2121,24 +2124,40 @@ var init_status_monitor = __esm({
         if (status === "generating" || status === "streaming") {
           if (!this.generatingStartTimes.has(agentKey)) {
             this.generatingStartTimes.set(agentKey, now);
+            this.longGeneratingAlerted.set(agentKey, false);
+            const initialFingerprint = progressFingerprint ?? "";
+            this.lastProgressFingerprint.set(agentKey, initialFingerprint);
+            this.lastProgressChangeAt.set(agentKey, now);
+          }
+          const currentFingerprint = progressFingerprint ?? "";
+          const previousFingerprint = this.lastProgressFingerprint.get(agentKey);
+          if (previousFingerprint !== currentFingerprint) {
+            this.lastProgressFingerprint.set(agentKey, currentFingerprint);
+            this.lastProgressChangeAt.set(agentKey, now);
+            this.longGeneratingAlerted.set(agentKey, false);
           }
           if (this.config.longGeneratingAlert) {
-            const startedAt = this.generatingStartTimes.get(agentKey);
-            const elapsedSec = Math.round((now - startedAt) / 1e3);
-            if (elapsedSec > this.config.longGeneratingThresholdSec) {
+            const progressChangedAt = this.lastProgressChangeAt.get(agentKey) || this.generatingStartTimes.get(agentKey);
+            const elapsedSec = Math.round((now - progressChangedAt) / 1e3);
+            const alreadyAlerted = this.longGeneratingAlerted.get(agentKey) === true;
+            if (elapsedSec > this.config.longGeneratingThresholdSec && !alreadyAlerted) {
               if (this.shouldAlert(agentKey + ":long_gen", now)) {
+                this.longGeneratingAlerted.set(agentKey, true);
                 events.push({
                   type: "monitor:long_generating",
                   agentKey,
                   elapsedSec,
                   timestamp: now,
-                  message: `${agentKey} has been generating for ${Math.round(elapsedSec / 60)}min`
+                  message: `${agentKey} output appears stuck for ${Math.round(elapsedSec / 60)}min`
                 });
               }
             }
           }
         } else {
           this.generatingStartTimes.delete(agentKey);
+          this.longGeneratingAlerted.delete(agentKey);
+          this.lastProgressFingerprint.delete(agentKey);
+          this.lastProgressChangeAt.delete(agentKey);
         }
         return events;
       }
@@ -2155,11 +2174,17 @@ var init_status_monitor = __esm({
       reset(agentKey) {
         if (agentKey) {
           this.generatingStartTimes.delete(agentKey);
+          this.longGeneratingAlerted.delete(agentKey);
+          this.lastProgressFingerprint.delete(agentKey);
+          this.lastProgressChangeAt.delete(agentKey);
           for (const k of this.lastAlertTime.keys()) {
             if (k.startsWith(agentKey)) this.lastAlertTime.delete(k);
           }
         } else {
           this.generatingStartTimes.clear();
+          this.longGeneratingAlerted.clear();
+          this.lastProgressFingerprint.clear();
+          this.lastProgressChangeAt.clear();
           this.lastAlertTime.clear();
         }
       }
@@ -2266,9 +2291,11 @@ var init_extension_provider_instance = __esm({
       // (generating_started, generating_completed, waiting_approval)
       // via its own detectAgentTransitions(). Emitting here would cause
       // duplicate toasts with slightly different content.
-      detectTransition(newStatus, _data) {
+      detectTransition(newStatus, data) {
         const now = Date.now();
         const agentStatus = newStatus === "streaming" || newStatus === "generating" ? "generating" : newStatus === "waiting_approval" ? "waiting_approval" : "idle";
+        const lastMsg = Array.isArray(data?.messages) && data.messages.length > 0 ? data.messages[data.messages.length - 1] : null;
+        const progressFingerprint = agentStatus === "generating" ? `${lastMsg?.role || ""}:${typeof lastMsg?.content === "string" ? lastMsg.content : JSON.stringify(lastMsg?.content || "")}`.slice(-2e3) : void 0;
         if (agentStatus !== this.lastAgentStatus) {
           if (this.lastAgentStatus === "idle" && agentStatus === "generating") {
             this.generatingStartedAt = now;
@@ -2278,7 +2305,7 @@ var init_extension_provider_instance = __esm({
           this.lastAgentStatus = agentStatus;
         }
         const agentKey = `${this.type}:ext`;
-        const monitorEvents = this.monitor.check(agentKey, agentStatus, now);
+        const monitorEvents = this.monitor.check(agentKey, agentStatus, now, progressFingerprint);
         for (const me of monitorEvents) {
           this.pushEvent({ event: me.type, agentKey: me.agentKey, message: me.message, elapsedSec: me.elapsedSec, timestamp: me.timestamp });
         }
@@ -2712,6 +2739,8 @@ var init_ide_provider_instance = __esm({
         if (!chatStatus) return;
         const agentKey = `${this.type}:native`;
         const agentStatus = chatStatus === "streaming" || chatStatus === "generating" ? "generating" : chatStatus === "waiting_approval" ? "waiting_approval" : "idle";
+        const lastMsg = Array.isArray(chatData?.messages) && chatData.messages.length > 0 ? chatData.messages[chatData.messages.length - 1] : null;
+        const progressFingerprint = agentStatus === "generating" ? `${lastMsg?.role || ""}:${typeof lastMsg?.content === "string" ? lastMsg.content : JSON.stringify(lastMsg?.content || "")}`.slice(-2e3) : void 0;
         this.currentStatus = agentStatus;
         const lastStatus = this.lastAgentStatuses.get(agentKey) || "idle";
         if (agentStatus !== lastStatus) {
@@ -2741,7 +2770,7 @@ var init_ide_provider_instance = __esm({
         if (agentStatus === "waiting_approval" && this.settings.autoApprove && !this.autoApproveBusy) {
           this.autoApproveViaScript(chatData);
         }
-        const monitorEvents = this.monitor.check(agentKey, agentStatus, now);
+        const monitorEvents = this.monitor.check(agentKey, agentStatus, now, progressFingerprint);
         for (const me of monitorEvents) {
           this.pushEvent({ event: me.type, agentKey: me.agentKey, message: me.message, elapsedSec: me.elapsedSec, timestamp: me.timestamp });
         }
@@ -7237,16 +7266,15 @@ var init_provider_cli_adapter = __esm({
     }
     FALLBACK_PROMPT = [
       /Type your message/i,
-      /^>\s*$/m,
-      // '>' alone on its own line
-      /[›❯]\s*[\r\n]/,
-      // prompt char followed by line ending (ANSI-stripped may not have $ at end)
-      /[›❯]\s*$/m,
-      // prompt char at end of line (multiline)
       /for\s*shortcuts/i,
-      // Claude Code prompt (ANSI strip may remove spaces → 'forshortcuts')
+      // Claude Code prompt
       /\?\s*for\s*help/i,
-      /Press enter/i
+      // Claude Code help prompt
+      /Press enter/i,
+      /^[>›❯]\s*$/i,
+      // Prompt char as the complete evaluated string
+      /[>›❯]\s*$/
+      // Prompt char at the very end of evaluated string
     ];
     FALLBACK_GENERATING = [
       /[\u2800-\u28ff]/,
@@ -7263,12 +7291,8 @@ var init_provider_cli_adapter = __esm({
       /Always\s*allow/i,
       /\(y\/n\)/i,
       /\[Y\/n\]/i,
-      /Run\s+\w+\s+command/i,
-      // "Run bash command" etc — requires surrounding words to avoid false matches
-      /Yes,?\s*don'?t\s*ask/i,
+      /Yes,?\s*don'?t\s*ask/i
       // "Yes, don't ask again" (Claude Code)
-      /\bDeny\b/i
-      // Word-boundary match — avoids "allow & deny" in /permissions menu text
     ];
     ProviderCliAdapter = class {
       constructor(provider, workingDir, extraArgs = []) {
@@ -7876,6 +7900,8 @@ var init_cli_provider_instance = __esm({
         const newStatus = adapterStatus.status;
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
         const chatTitle = `${this.provider.name} \xB7 ${dirName}`;
+        const partial2 = this.adapter.getPartialResponse();
+        const progressFingerprint = newStatus === "generating" ? `${partial2 || ""}::${adapterStatus.messages.at(-1)?.content || ""}`.slice(-2e3) : void 0;
         if (newStatus !== this.lastStatus) {
           LOG.info("CLI", `[${this.type}] status: ${this.lastStatus} \u2192 ${newStatus}`);
           if (this.lastStatus === "idle" && newStatus === "generating") {
@@ -7964,7 +7990,7 @@ var init_cli_provider_instance = __esm({
           this.lastStatus = newStatus;
         }
         const agentKey = `${this.type}:cli`;
-        const monitorEvents = this.monitor.check(agentKey, newStatus, now);
+        const monitorEvents = this.monitor.check(agentKey, newStatus, now, progressFingerprint);
         for (const me of monitorEvents) {
           this.pushEvent({ event: me.type, agentKey: me.agentKey, message: me.message, elapsedSec: me.elapsedSec, timestamp: me.timestamp });
         }
@@ -25141,6 +25167,7 @@ var init_acp_provider_instance = __esm({
         const newStatus = this.currentStatus;
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
         const chatTitle = `${this.provider.name} \xB7 ${dirName}`;
+        const progressFingerprint = newStatus === "generating" ? `${this.partialContent}::${JSON.stringify(this.partialBlocks)}::${JSON.stringify(this.activeToolCalls.map((t) => ({ name: t.name, status: t.status })))}`.slice(-2e3) : void 0;
         if (newStatus !== this.lastStatus) {
           if (this.lastStatus === "idle" && newStatus === "generating") {
             this.generatingStartedAt = now;
@@ -25163,7 +25190,7 @@ var init_acp_provider_instance = __esm({
           this.lastStatus = newStatus;
         }
         const agentKey = `${this.type}:acp`;
-        const monitorEvents = this.monitor.check(agentKey, newStatus, now);
+        const monitorEvents = this.monitor.check(agentKey, newStatus, now, progressFingerprint);
         for (const me of monitorEvents) {
           this.pushEvent({ event: me.type, agentKey: me.agentKey, message: me.message, elapsedSec: me.elapsedSec, timestamp: me.timestamp });
         }
@@ -31302,7 +31329,7 @@ var init_adhdev_daemon = __esm({
     fs11 = __toESM(require("fs"));
     path14 = __toESM(require("path"));
     import_chalk2 = __toESM(require("chalk"));
-    pkgVersion = "0.6.47";
+    pkgVersion = "0.6.48";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [