@adhdev/daemon-core 0.9.82-rc.197 → 0.9.82-rc.199

package/dist/index.js

@@ -15005,8 +15005,8 @@ async function detectIDEs(providerLoader) {
       if ((0, import_fs11.existsSync)(bundledCli)) resolvedCli = bundledCli;
     }
     if (!resolvedCli && appPath && os29 === "win32") {
-      const { dirname: dirname11 } = await import("path");
-      const appDir = dirname11(appPath);
+      const { dirname: dirname12 } = await import("path");
+      const appDir = dirname12(appPath);
       const candidates = [
         `${appDir}\\\\bin\\\\${def.cli}.cmd`,
         `${appDir}\\\\bin\\\\${def.cli}`,
@@ -27489,7 +27489,15 @@ var SpecDriver = class {
    *  explicit wake-up there's nothing to trigger the busy → idle
    *  downshift. */
   busyExpiryTimer = null;
+  /** Pending idle-commit timer. Armed when the evaluator first returns idle;
+   *  fires after idle_hold_ms if no non-idle reading has cancelled it. */
+  idleHoldTimer = null;
+  /** State snapshot captured when the idle hold was armed — emitted on commit. */
+  pendingIdleState = null;
   specWatcher = null;
+  /** Ring buffer of committed state transitions (max 50). */
+  stateHistory = [];
+  prevStateAt = 0;
   /** Subscribe to outbound events. Returns an unsubscribe fn. */
   subscribe(listener) {
     this.listeners.add(listener);
@@ -27540,9 +27548,40 @@ var SpecDriver = class {
   shutdown() {
     for (const t of this.delegateTimers.values()) clearTimeout(t);
     this.delegateTimers.clear();
+    this.cancelIdleHold();
+    if (this.busyExpiryTimer) {
+      clearTimeout(this.busyExpiryTimer);
+      this.busyExpiryTimer = null;
+    }
     this.specWatcher?.close();
     this.adapter.kill();
   }
+  cancelIdleHold() {
+    if (this.idleHoldTimer) {
+      clearTimeout(this.idleHoldTimer);
+      this.idleHoldTimer = null;
+    }
+    this.pendingIdleState = null;
+  }
+  pushHistory(stateId, label) {
+    const now = Date.now();
+    const durationMs = this.prevStateAt > 0 ? now - this.prevStateAt : 0;
+    this.prevStateAt = now;
+    this.stateHistory.push({ stateId, label, at: now, durationMs });
+    if (this.stateHistory.length > 50) this.stateHistory.shift();
+  }
+  getStateHistory() {
+    return this.stateHistory;
+  }
+  getLastBusyAt() {
+    return this.lastBusyAt;
+  }
+  hasIdleHoldPending() {
+    return this.idleHoldTimer !== null;
+  }
+  getSpecPath() {
+    return this.opts.specPath;
+  }
   // ────────────────────────────────────────────────────────────────────
   // Loading & adapter wiring
   // ────────────────────────────────────────────────────────────────────
@@ -27566,7 +27605,10 @@ var SpecDriver = class {
   }
   armSpecWatcher() {
     try {
-      this.specWatcher = fs10.watch(this.opts.specPath, { persistent: false }, () => {
+      const dir = path19.dirname(this.opts.specPath);
+      const base = path19.basename(this.opts.specPath);
+      this.specWatcher = fs10.watch(dir, { persistent: false }, (_event, filename) => {
+        if (filename && filename !== base) return;
         const res = loadSpec(this.opts.specPath);
         if (!res.ok) {
           this.emit({ kind: "spec_error", errors: res.errors });
@@ -27650,7 +27692,46 @@ var SpecDriver = class {
     if (evState.id === "busy") {
       this.lastBusyAt = Date.now();
       this.lastBusyState = evState;
+      this.cancelIdleHold();
       this.scheduleBusyExpiry(busyWakeMs);
+    } else if (evState.id !== this.currentStateId && evState.id !== "busy") {
+      if (evState.id !== (this.spec.default_state ?? "idle")) {
+        this.cancelIdleHold();
+      }
+    }
+    const idleHoldMs = this.spec.debounce?.idle_hold_ms ?? 0;
+    const isIdleState = evState.id === (this.spec.default_state ?? "idle");
+    if (isIdleState && idleHoldMs > 0 && this.currentStateId !== evState.id) {
+      if (!this.idleHoldTimer) {
+        this.pendingIdleState = evState;
+        this.idleHoldTimer = setTimeout(() => {
+          this.idleHoldTimer = null;
+          const committed = this.pendingIdleState;
+          this.pendingIdleState = null;
+          if (!committed) return;
+          LOG.debug("SpecDriver", `[${this.opts.specPath.split("/").slice(-3).join("/")}] idleHold committed after ${idleHoldMs}ms`);
+          this.currentStateId = committed.id;
+          this.currentEval = ev;
+          this.pushHistory(committed.id, committed.label);
+          this.emit({
+            kind: "state_changed",
+            state: committed,
+            modal: null,
+            controls: ev.controls.map((c) => ({ id: c.id, label: c.label, action_type: c.actionType }))
+          });
+          this.armOrCancelDelegateTimers(committed.id);
+          if (this.opts.emitTrace) this.emit({ kind: "spec_trace", entries: ev.trace });
+        }, idleHoldMs);
+      }
+      this.currentEval = ev;
+      const graceMs2 = this.spec.debounce?.startup_grace_ms ?? STARTUP_GRACE_MS;
+      if (!this.idleSeenOnce && Date.now() - this.startedAtMs >= graceMs2) {
+        this.idleSeenOnce = true;
+        const queued = this.pendingSends.splice(0);
+        for (const text of queued) setTimeout(() => this.actuallySendMessage(text), 50);
+      }
+      if (this.pickerInProgress) this.tryAdvancePicker(screen);
+      return;
     }
     const changed = forceEmit || evState.id !== this.currentStateId || !shallowSameModal(ev, this.currentEval) || !shallowSameControls(ev, this.currentEval);
     if (this.pickerInProgress) this.tryAdvancePicker(screen);
@@ -27666,6 +27747,7 @@ var SpecDriver = class {
     }
     if (changed) {
       this.currentStateId = evState.id;
+      this.pushHistory(evState.id, evState.label);
       this.emit({
         kind: "state_changed",
         state: evState,
@@ -28099,7 +28181,11 @@ var SpecCliAdapter = class {
       activeInteractivePrompt: this.activeInteractivePrompt,
       exited: this.exited,
       screen,
-      sections
+      sections,
+      stateHistory: this.driver.getStateHistory(),
+      idleHoldPending: this.driver.hasIdleHoldPending(),
+      lastBusyAt: this.driver.getLastBusyAt(),
+      specPath: this.driver.getSpecPath()
     };
   }
   getRuntimeMetadata() {
@@ -33638,17 +33724,17 @@ function parseTranscriptFile(filePath, sessionId, workspaceFallback) {
 }
 function readSession(sessionPath) {
   if (!sessionPath || !path25.isAbsolute(sessionPath)) return null;
-  const basename13 = path25.basename(sessionPath, ".jsonl");
-  if (!isSafeSessionId(basename13)) return null;
+  const basename14 = path25.basename(sessionPath, ".jsonl");
+  if (!isSafeSessionId(basename14)) return null;
   if (!fs14.existsSync(sessionPath)) return null;
   const sourceMtimeMs = statMtimeMs(sessionPath);
-  const messages = parseTranscriptFile(sessionPath, basename13);
+  const messages = parseTranscriptFile(sessionPath, basename14);
   if (messages.length === 0) return null;
   const firstSystem = messages.find((m) => m.kind === "session_start");
   const workspace = firstSystem?.workspace || firstSystem?.content || void 0;
   return {
     messages,
-    providerSessionId: basename13,
+    providerSessionId: basename14,
     source: "provider-native",
     sourcePath: sessionPath,
     sourceMtimeMs,
@@ -33850,8 +33936,8 @@ function readSession2(sessionPath) {
   if (!fs15.existsSync(sessionPath)) return null;
   const meta = readSessionMeta(sessionPath);
   const metaId = String(meta?.id ?? "").trim();
-  const basename13 = path26.basename(sessionPath, ".jsonl");
-  const uuidMatch = basename13.match(/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/i);
+  const basename14 = path26.basename(sessionPath, ".jsonl");
+  const uuidMatch = basename14.match(/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/i);
   const filenameUuid2 = uuidMatch ? uuidMatch[1] : "";
   if (metaId && filenameUuid2 && metaId !== filenameUuid2) return null;
   const sessionId = metaId || filenameUuid2;
@@ -41063,6 +41149,21 @@ var DaemonCommandRouter = class {
           } : null
         };
       }
+      case "get_spec_debug": {
+        const sessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : typeof args?.sessionId === "string" ? args.sessionId.trim() : "";
+        if (!sessionId) return { success: false, error: "targetSessionId required" };
+        const target = this.deps.sessionRegistry.get(sessionId);
+        if (!target) return { success: false, error: "Session not found", sessionId };
+        const adapter = this.deps.cliManager.findAdapter(target.providerType, { instanceKey: sessionId })?.adapter;
+        const snapshot = adapter && typeof adapter.getDebugSnapshot === "function" ? adapter.getDebugSnapshot() : null;
+        return {
+          success: true,
+          sessionId,
+          providerType: target.providerType,
+          isSpecProvider: snapshot !== null,
+          snapshot
+        };
+      }
       // ── User-level coordinator-prompt files (~/.adhdev/coordinator-prompts/).
       //    These live on this daemon's filesystem and never sync to the
       //    cloud / other daemons — they're per-machine config. The
@@ -42390,7 +42491,7 @@ ${ptyResult.output.slice(-2e3)}`);
             };
           }
           const { existsSync: existsSync39, readFileSync: readFileSync33, writeFileSync: writeFileSync21, copyFileSync: copyFileSync4, mkdirSync: mkdirSync19 } = await import("fs");
-          const { dirname: dirname11 } = await import("path");
+          const { dirname: dirname12 } = await import("path");
           const mcpConfigPath = coordinatorSetup.configPath;
           const hermesManualFallback = cliType === "hermes-cli" && configFormat === "hermes_config_yaml" ? createHermesManualMeshCoordinatorSetup(meshId, workspace) : null;
           let hermesBaseConfig = null;
@@ -42425,7 +42526,7 @@ ${ptyResult.output.slice(-2e3)}`);
             };
           }
           try {
-            mkdirSync19(dirname11(mcpConfigPath), { recursive: true });
+            mkdirSync19(dirname12(mcpConfigPath), { recursive: true });
           } catch (error) {
             const message = `Could not prepare MCP config path for automatic setup: ${error?.message || error}`;
             LOG.error("MeshCoordinator", message);
@@ -42435,7 +42536,7 @@ ${ptyResult.output.slice(-2e3)}`);
           const hadExistingMcpConfig = existsSync39(mcpConfigPath);
           let existingMcpConfig = hermesBaseConfig?.config || {};
           if (hermesBaseConfig) {
-            copyHermesCoordinatorCredentialFiles(hermesBaseConfig.sourceHome, dirname11(mcpConfigPath));
+            copyHermesCoordinatorCredentialFiles(hermesBaseConfig.sourceHome, dirname12(mcpConfigPath));
           }
           if (hadExistingMcpConfig) {
             try {
@@ -42473,7 +42574,7 @@ ${ptyResult.output.slice(-2e3)}`);
           const cliArgs = [];
           const launchEnv = {};
           if (configFormat === "hermes_config_yaml") {
-            launchEnv.HERMES_HOME = dirname11(mcpConfigPath);
+            launchEnv.HERMES_HOME = dirname12(mcpConfigPath);
             launchEnv.HERMES_IGNORE_USER_CONFIG = "";
           }
           let autoImportContextFilePath;