@adhdev/daemon-standalone 0.9.33 → 0.9.34

package/dist/index.js

@@ -29560,13 +29560,14 @@ var require_dist2 = __commonJS({
     function hydrateCliParsedMessages(parsedMessages, options) {
       const { committedMessages, scope, lastOutputAt } = options;
       const referenceMessages = [...committedMessages];
+      const referenceComparables = referenceMessages.map((message) => normalizeComparableMessageContent(message?.content || ""));
       const usedReferenceIndexes = /* @__PURE__ */ new Set();
       const now = options.now ?? Date.now();
       const findReferenceTimestamp = (role, content, parsedIndex) => {
         const normalizedContent = normalizeComparableMessageContent(content);
         if (!normalizedContent) return void 0;
         const sameIndex = referenceMessages[parsedIndex];
-        if (sameIndex && !usedReferenceIndexes.has(parsedIndex) && sameIndex.role === role && normalizeComparableMessageContent(sameIndex.content) === normalizedContent && typeof sameIndex.timestamp === "number" && Number.isFinite(sameIndex.timestamp)) {
+        if (sameIndex && !usedReferenceIndexes.has(parsedIndex) && sameIndex.role === role && referenceComparables[parsedIndex] === normalizedContent && typeof sameIndex.timestamp === "number" && Number.isFinite(sameIndex.timestamp)) {
           usedReferenceIndexes.add(parsedIndex);
           return sameIndex.timestamp;
         }
@@ -29574,7 +29575,7 @@ var require_dist2 = __commonJS({
           if (usedReferenceIndexes.has(i)) continue;
           const candidate = referenceMessages[i];
           if (!candidate || candidate.role !== role) continue;
-          const candidateContent = normalizeComparableMessageContent(candidate.content);
+          const candidateContent = referenceComparables[i];
           if (!candidateContent) continue;
           const exactMatch = candidateContent === normalizedContent;
           const fuzzyMatch = candidateContent.includes(normalizedContent) || normalizedContent.includes(candidateContent);
@@ -30663,7 +30664,7 @@ var require_dist2 = __commonJS({
               return;
             }
             if (this.currentTurnScope && !lastParsedAssistant) {
-              LOG2.info(
+              LOG2.debug(
                 "CLI",
                 `[${this.cliType}] Settled without assistant: prompt=${JSON.stringify(this.currentTurnScope.prompt).slice(0, 140)} responseBuffer=${JSON.stringify(summarizeCliTraceText(this.responseBuffer, 220)).slice(0, 260)} screen=${JSON.stringify(summarizeCliTraceText(screenText, 220)).slice(0, 260)} providerDir=${this.providerResolutionMeta.providerDir || "-"} scriptDir=${this.providerResolutionMeta.scriptDir || "-"}`
               );
@@ -31479,9 +31480,43 @@ var require_dist2 = __commonJS({
           }
           armResponseTimeout() {
             if (this.responseTimeout) clearTimeout(this.responseTimeout);
+            const timeoutMs = this.timeouts.maxResponse;
+            if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) {
+              this.responseTimeout = null;
+              return;
+            }
             this.responseTimeout = setTimeout(() => {
-              if (this.isWaitingForResponse) this.finishResponse();
-            }, this.timeouts.maxResponse);
+              this.responseTimeout = null;
+              if (!this.isWaitingForResponse) return;
+              const detectedStatusBeforeEval = this.runDetectStatus(this.recentOutputBuffer);
+              this.recordTrace("response_timeout_check", {
+                timeoutMs,
+                detectedStatus: detectedStatusBeforeEval,
+                currentStatus: this.currentStatus,
+                isWaitingForResponse: this.isWaitingForResponse,
+                hasActionableApproval: this.hasActionableApproval(),
+                ...buildCliTraceParseSnapshot({
+                  accumulatedBuffer: this.accumulatedBuffer,
+                  accumulatedRawBuffer: this.accumulatedRawBuffer,
+                  responseBuffer: this.responseBuffer,
+                  partialResponse: this.responseBuffer,
+                  scope: this.currentTurnScope
+                })
+              });
+              this.settledBuffer = this.recentOutputBuffer;
+              this.evaluateSettled();
+              if (this.isWaitingForResponse && !this.hasActionableApproval()) {
+                const detectedStatusAfterEval = this.runDetectStatus(this.recentOutputBuffer);
+                this.recordTrace("response_timeout_kept_open", {
+                  timeoutMs,
+                  detectedStatusBeforeEval,
+                  detectedStatusAfterEval,
+                  currentStatus: this.currentStatus,
+                  isWaitingForResponse: this.isWaitingForResponse
+                });
+                this.armResponseTimeout();
+              }
+            }, timeoutMs);
           }
           writeSubmitKeyForRetry(mode) {
             void this.writeToPty(this.sendKey).catch((error48) => {
@@ -41164,6 +41199,20 @@ ${effect.notification.body || ""}`.trim();
       getPresentationMode() {
         return this.presentationMode;
       }
+      getHotChatSessionState() {
+        const adapterStatus = this.adapter.getStatus();
+        const autoApproveActive = adapterStatus.status === "waiting_approval" && this.shouldAutoApprove();
+        const visibleStatus = autoApproveActive ? "generating" : adapterStatus.status;
+        const runtime = this.adapter.getRuntimeMetadata();
+        return {
+          id: this.instanceId,
+          status: visibleStatus,
+          runtimeLifecycle: runtime?.lifecycle ?? null,
+          runtimeSurfaceKind: runtime?.surfaceKind,
+          runtimeRestoredFromStorage: runtime?.restoredFromStorage === true,
+          runtimeRecoveryState: runtime?.recoveryState ?? null
+        };
+      }
       updateSettings(newSettings) {
         this.settings = { ...newSettings };
         this.adapter.updateRuntimeSettings?.(this.settings);
@@ -41319,6 +41368,15 @@ ${effect.notification.body || ""}`.trim();
               this.completedDebouncePending = { chatTitle, duration: duration3, timestamp: now };
               this.completedDebounceTimer = setTimeout(() => {
                 if (this.completedDebouncePending) {
+                  const latestStatus = this.adapter.getStatus();
+                  const latestAutoApproveActive = latestStatus.status === "waiting_approval" && this.shouldAutoApprove();
+                  const latestVisibleStatus = latestAutoApproveActive ? "generating" : latestStatus.status;
+                  if (latestVisibleStatus !== "idle") {
+                    LOG2.info("CLI", `[${this.type}] cancelled pending completed (resumed ${latestVisibleStatus})`);
+                    this.completedDebouncePending = null;
+                    this.completedDebounceTimer = null;
+                    return;
+                  }
                   LOG2.info("CLI", `[${this.type}] completed in ${this.completedDebouncePending.duration}s`);
                   this.pushEvent({ event: "agent:generating_completed", ...this.completedDebouncePending });
                   this.completedDebouncePending = null;
@@ -46297,6 +46355,51 @@ Run 'adhdev doctor' for detailed diagnostics.`
         return false;
       }
     }
+    function getWindowsProcessCommandLine(pid) {
+      const pidFilter = `ProcessId=${pid}`;
+      try {
+        const psOut = (0, import_child_process8.execFileSync)("powershell.exe", [
+          "-NoProfile",
+          "-NonInteractive",
+          "-ExecutionPolicy",
+          "Bypass",
+          "-Command",
+          `(Get-CimInstance Win32_Process -Filter "${pidFilter}").CommandLine`
+        ], { encoding: "utf8", timeout: 5e3, stdio: ["ignore", "pipe", "ignore"] }).trim();
+        if (psOut) return psOut;
+      } catch {
+      }
+      try {
+        const wmicOut = (0, import_child_process8.execFileSync)("wmic", [
+          "process",
+          "where",
+          pidFilter,
+          "get",
+          "CommandLine"
+        ], { encoding: "utf8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"] }).trim();
+        if (wmicOut) return wmicOut;
+      } catch {
+      }
+      return null;
+    }
+    function getProcessCommandLine(pid) {
+      if (!Number.isFinite(pid) || pid <= 0) return null;
+      if (process.platform === "win32") return getWindowsProcessCommandLine(pid);
+      try {
+        const text = (0, import_child_process8.execFileSync)("ps", ["-o", "command=", "-p", String(pid)], {
+          encoding: "utf8",
+          timeout: 3e3,
+          stdio: ["ignore", "pipe", "ignore"]
+        }).trim();
+        return text || null;
+      } catch {
+        return null;
+      }
+    }
+    function isManagedSessionHostPid(pid) {
+      const commandLine = getProcessCommandLine(pid);
+      return !!commandLine && /session-host-daemon/i.test(commandLine);
+    }
     async function waitForPidExit(pid, timeoutMs) {
       const start = Date.now();
       while (Date.now() - start < timeoutMs) {
@@ -46313,7 +46416,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       try {
         if (fs8.existsSync(pidFile)) {
           const pid = Number.parseInt(fs8.readFileSync(pidFile, "utf8").trim(), 10);
-          if (Number.isFinite(pid)) {
+          if (Number.isFinite(pid) && pid !== process.pid && isManagedSessionHostPid(pid)) {
             killPid2(pid);
           }
         }
@@ -46324,18 +46427,6 @@ Run 'adhdev doctor' for detailed diagnostics.`
         } catch {
         }
       }
-      if (process.platform !== "win32") {
-        try {
-          const raw = (0, import_child_process8.execFileSync)("pgrep", ["-f", "session-host-daemon"], { encoding: "utf8" }).trim();
-          for (const line of raw.split("\n")) {
-            const pid = Number.parseInt(line.trim(), 10);
-            if (Number.isFinite(pid)) {
-              killPid2(pid);
-            }
-          }
-        } catch {
-        }
-      }
     }
     function removeDaemonPidFile() {
       const pidFile = path16.join(os17.homedir(), ".adhdev", "daemon.pid");
@@ -48548,6 +48639,20 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
     }
     init_logger();
+    function projectHotChatSessionStatesFromProviderState(state) {
+      const project = (item) => ({
+        id: item.instanceId,
+        status: item.activeChat?.status || item.status,
+        runtimeLifecycle: item.runtime?.lifecycle ?? null,
+        runtimeSurfaceKind: item.runtime?.surfaceKind,
+        runtimeRestoredFromStorage: item.runtime?.restoredFromStorage === true,
+        runtimeRecoveryState: item.runtime?.recoveryState ?? null
+      });
+      if (state.category === "ide") {
+        return [project(state), ...state.extensions.map(project)];
+      }
+      return [project(state)];
+    }
     var ProviderInstanceManager = class {
       instances = /* @__PURE__ */ new Map();
       tickTimer = null;
@@ -48643,6 +48748,27 @@ Run 'adhdev doctor' for detailed diagnostics.`
         }
         return states;
       }
+      collectHotChatSessionStates() {
+        const sessions = [];
+        for (const [id, instance] of this.instances) {
+          try {
+            const projected = instance.getHotChatSessionState?.();
+            if (Array.isArray(projected)) {
+              sessions.push(...projected.filter((session) => !!session?.id));
+              continue;
+            }
+            if (projected?.id) {
+              sessions.push(projected);
+              continue;
+            }
+            const state = instance.getState();
+            sessions.push(...projectHotChatSessionStatesFromProviderState(state));
+          } catch (e) {
+            LOG2.warn("InstanceMgr", `[InstanceManager] Failed to collect hot chat metadata from ${id}: ${e.message}`);
+          }
+        }
+        return sessions;
+      }
       /**
       * Per-category status collect
       */