@adhdev/daemon-core 0.6.46 → 0.6.48

package/dist/index.js

@@ -703,16 +703,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]/,
@@ -729,12 +728,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 = []) {
@@ -2761,6 +2756,9 @@ var StatusMonitor = class {
   config;
   lastAlertTime = /* @__PURE__ */ new Map();
   generatingStartTimes = /* @__PURE__ */ new Map();
+  longGeneratingAlerted = /* @__PURE__ */ new Map();
+  lastProgressFingerprint = /* @__PURE__ */ new Map();
+  lastProgressChangeAt = /* @__PURE__ */ new Map();
   constructor(config) {
     this.config = { ...DEFAULT_MONITOR_CONFIG, ...config };
   }
@@ -2776,7 +2774,7 @@ var StatusMonitor = class {
    * 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)) {
@@ -2791,24 +2789,40 @@ var StatusMonitor = class {
     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;
   }
@@ -2825,11 +2839,17 @@ var StatusMonitor = class {
   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();
     }
   }
@@ -2929,9 +2949,11 @@ var ExtensionProviderInstance = class {
   // (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;
@@ -2941,7 +2963,7 @@ var ExtensionProviderInstance = class {
       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 });
     }
@@ -3359,6 +3381,8 @@ var IdeProviderInstance = class {
     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) {
@@ -3388,7 +3412,7 @@ var IdeProviderInstance = class {
     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 });
     }
@@ -7787,6 +7811,8 @@ var CliProviderInstance = class {
     const newStatus = adapterStatus.status;
     const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
     const chatTitle = `${this.provider.name} \xB7 ${dirName}`;
+    const partial = this.adapter.getPartialResponse();
+    const progressFingerprint = newStatus === "generating" ? `${partial || ""}::${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") {
@@ -7875,7 +7901,7 @@ var CliProviderInstance = class {
       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 });
     }
@@ -8740,6 +8766,7 @@ var AcpProviderInstance = class {
     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;
@@ -8762,7 +8789,7 @@ var AcpProviderInstance = class {
       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 });
     }