@adhdev/daemon-core 0.8.49 → 0.8.51

package/dist/index.mjs

@@ -7398,6 +7398,134 @@ function flattenContent(content) {
 
 // src/commands/chat-commands.ts
 init_logger();
+
+// src/logging/debug-config.ts
+var NORMAL_TRACE_BUFFER_SIZE = 200;
+var DEV_TRACE_BUFFER_SIZE = 1e3;
+var DEFAULT_CONFIG2 = {
+  logLevel: "info",
+  collectDebugTrace: false,
+  traceContent: false,
+  traceBufferSize: NORMAL_TRACE_BUFFER_SIZE,
+  traceCategories: []
+};
+var currentConfig = { ...DEFAULT_CONFIG2 };
+function normalizeCategories(categories) {
+  if (!Array.isArray(categories)) return [];
+  return categories.map((category) => String(category || "").trim()).filter(Boolean);
+}
+function resolveDebugRuntimeConfig(options = {}) {
+  const dev = options.dev === true;
+  return {
+    logLevel: options.logLevel || (dev ? "debug" : DEFAULT_CONFIG2.logLevel),
+    collectDebugTrace: typeof options.trace === "boolean" ? options.trace : dev,
+    traceContent: options.traceContent === true,
+    traceBufferSize: Number.isFinite(options.traceBufferSize) ? Math.max(10, Math.floor(options.traceBufferSize)) : dev ? DEV_TRACE_BUFFER_SIZE : DEFAULT_CONFIG2.traceBufferSize,
+    traceCategories: normalizeCategories(options.traceCategories)
+  };
+}
+function setDebugRuntimeConfig(config) {
+  currentConfig = {
+    ...config,
+    traceCategories: normalizeCategories(config.traceCategories),
+    traceBufferSize: Math.max(10, Math.floor(config.traceBufferSize || DEFAULT_CONFIG2.traceBufferSize))
+  };
+}
+function getDebugRuntimeConfig() {
+  return { ...currentConfig, traceCategories: [...currentConfig.traceCategories] };
+}
+function resetDebugRuntimeConfig() {
+  currentConfig = { ...DEFAULT_CONFIG2 };
+}
+function shouldCollectTraceCategory(category) {
+  const config = currentConfig;
+  if (!config.collectDebugTrace) return false;
+  if (!category) return true;
+  if (config.traceCategories.length === 0) return true;
+  return config.traceCategories.includes(category);
+}
+
+// src/logging/debug-trace.ts
+function summarizeString(value) {
+  return `[${value.length} chars]`;
+}
+function sanitizeTraceValue(value, traceContent) {
+  if (traceContent) {
+    if (Array.isArray(value)) return value.map((entry) => sanitizeTraceValue(entry, traceContent));
+    if (value && typeof value === "object") {
+      return Object.fromEntries(
+        Object.entries(value).map(([key, nested]) => [key, sanitizeTraceValue(nested, traceContent)])
+      );
+    }
+    return value;
+  }
+  if (typeof value === "string") return summarizeString(value);
+  if (Array.isArray(value)) return value.map((entry) => sanitizeTraceValue(entry, traceContent));
+  if (value && typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value).map(([key, nested]) => [key, sanitizeTraceValue(nested, traceContent)])
+    );
+  }
+  return value;
+}
+function sanitizeTracePayload(payload) {
+  if (!payload) return {};
+  const { traceContent } = getDebugRuntimeConfig();
+  return sanitizeTraceValue(payload, traceContent);
+}
+function createEntry(event) {
+  return {
+    id: `trace_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`,
+    ts: Date.now(),
+    ...event,
+    payload: sanitizeTracePayload(event.payload)
+  };
+}
+function createDebugTraceStore(options) {
+  const entries = [];
+  const capacity = Math.max(1, Math.floor(options.capacity || 100));
+  return {
+    record(event) {
+      if (!options.enabled) return null;
+      const entry = createEntry(event);
+      entries.push(entry);
+      if (entries.length > capacity) {
+        entries.splice(0, entries.length - capacity);
+      }
+      return entry;
+    },
+    list(query = {}) {
+      const limit = Math.max(1, Math.floor(query.limit || 100));
+      return entries.filter((entry) => !query.interactionId || entry.interactionId === query.interactionId).filter((entry) => !query.category || entry.category === query.category).slice(-limit).map((entry) => ({ ...entry, payload: entry.payload ? { ...entry.payload } : {} }));
+    },
+    clear() {
+      entries.splice(0, entries.length);
+    }
+  };
+}
+var globalStore = createDebugTraceStore({ enabled: false, capacity: getDebugRuntimeConfig().traceBufferSize });
+function configureDebugTraceStore() {
+  const config = getDebugRuntimeConfig();
+  globalStore = createDebugTraceStore({
+    enabled: config.collectDebugTrace,
+    capacity: config.traceBufferSize
+  });
+}
+function recordDebugTrace(event) {
+  if (!shouldCollectTraceCategory(event.category)) return null;
+  return globalStore.record(event);
+}
+function getRecentDebugTrace(query = {}) {
+  return globalStore.list(query);
+}
+function clearDebugTrace() {
+  globalStore.clear();
+}
+function createInteractionId(prefix = "ix") {
+  return `${prefix}_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
+}
+
+// src/commands/chat-commands.ts
 var RECENT_SEND_WINDOW_MS = 1200;
 var recentSendByTarget = /* @__PURE__ */ new Map();
 function hashSignatureParts(parts) {
@@ -7464,6 +7592,20 @@ function getHistorySessionId(h, args) {
   const providerSessionId = typeof state?.providerSessionId === "string" ? state.providerSessionId.trim() : "";
   return providerSessionId || targetSessionId;
 }
+function getInteractionId(args) {
+  return typeof args?._interactionId === "string" && args._interactionId.trim() ? args._interactionId.trim() : void 0;
+}
+function traceProviderEvent(args, category, stage, options) {
+  recordDebugTrace({
+    interactionId: getInteractionId(args),
+    category,
+    stage,
+    level: options.level || "info",
+    sessionId: typeof args?.targetSessionId === "string" ? args.targetSessionId : options.h.currentSession?.sessionId,
+    providerType: options.provider?.type || options.h.currentProviderType || options.h.currentSession?.providerType,
+    payload: options.payload
+  });
+}
 function callLegacyTextScript(script, text) {
   if (typeof script !== "function") return null;
   return script(text);
@@ -7709,6 +7851,16 @@ async function handleReadChat(h, args) {
         }
         if (parsed && typeof parsed === "object") {
           _log(`Extension OK: ${parsed.messages?.length || 0} msgs`);
+          traceProviderEvent(args, "provider", "extension.read_chat.success", {
+            h,
+            provider,
+            payload: {
+              method: "evaluateProviderScript",
+              result: evalResult.result,
+              parsed,
+              messageCount: Array.isArray(parsed.messages) ? parsed.messages.length : 0
+            }
+          });
           h.historyWriter.appendNewMessages(
             provider?.type || "unknown_extension",
             toHistoryPersistedMessages(normalizeReadChatMessages(parsed)),
@@ -7721,6 +7873,12 @@ async function handleReadChat(h, args) {
       }
     } catch (e) {
       _log(`Extension error: ${e.message}`);
+      traceProviderEvent(args, "provider", "extension.read_chat.error", {
+        h,
+        provider,
+        level: "warn",
+        payload: { method: "evaluateProviderScript", error: e.message }
+      });
     }
     if (h.agentStream) {
       const cdp2 = h.getCdp();
@@ -7784,27 +7942,45 @@ async function handleReadChat(h, args) {
   const script = h.getProviderScript("readChat") || h.getProviderScript("read_chat");
   if (script) {
     try {
-      const result = await cdp.evaluate(script, 5e4);
-      let parsed = result;
-      if (typeof parsed === "string") {
-        try {
-          parsed = JSON.parse(parsed);
-        } catch {
+      const evalResult = await h.evaluateProviderScript("readChat", void 0, 5e4);
+      if (evalResult?.result) {
+        let parsed = evalResult.result;
+        if (typeof parsed === "string") {
+          try {
+            parsed = JSON.parse(parsed);
+          } catch {
+          }
+        }
+        if (parsed && typeof parsed === "object" && parsed.messages?.length > 0) {
+          _log(`OK: ${parsed.messages?.length} msgs`);
+          traceProviderEvent(args, "provider", "ide.read_chat.success", {
+            h,
+            provider,
+            payload: {
+              method: "evaluate",
+              result: evalResult.result,
+              parsed,
+              messageCount: Array.isArray(parsed.messages) ? parsed.messages.length : 0
+            }
+          });
+          h.historyWriter.appendNewMessages(
+            provider?.type || getCurrentProviderType(h, "unknown_ide"),
+            toHistoryPersistedMessages(normalizeReadChatMessages(parsed)),
+            parsed.title,
+            args?.targetSessionId,
+            historySessionId
+          );
+          return buildReadChatCommandResult(parsed, args);
         }
-      }
-      if (parsed && typeof parsed === "object" && parsed.messages?.length > 0) {
-        _log(`OK: ${parsed.messages?.length} msgs`);
-        h.historyWriter.appendNewMessages(
-          provider?.type || getCurrentProviderType(h, "unknown_ide"),
-          toHistoryPersistedMessages(normalizeReadChatMessages(parsed)),
-          parsed.title,
-          args?.targetSessionId,
-          historySessionId
-        );
-        return buildReadChatCommandResult(parsed, args);
       }
     } catch (e) {
       LOG.info("Command", `[read_chat] Script error: ${e.message}`);
+      traceProviderEvent(args, "provider", "ide.read_chat.error", {
+        h,
+        provider,
+        level: "warn",
+        payload: { method: "evaluate", error: e.message }
+      });
     }
   }
   return buildReadChatCommandResult({ messages: [], status: "idle" }, args);
@@ -11306,6 +11482,16 @@ var AcpProviderInstance = class {
 
 // src/commands/cli-manager.ts
 init_logger();
+
+// src/commands/hosted-runtime-restore.ts
+function shouldRestoreHostedRuntime(record, managerTag) {
+  if (!managerTag) return true;
+  const managedBy = typeof record.managedBy === "string" ? record.managedBy.trim() : "";
+  if (!managedBy) return true;
+  return managedBy === managerTag;
+}
+
+// src/commands/cli-manager.ts
 var chalkModule = chalk;
 var chalkApi = typeof chalkModule.yellow === "function" ? chalkModule : chalkModule.default || null;
 function colorize(color, text) {
@@ -11801,8 +11987,16 @@ Run 'adhdev doctor' for detailed diagnostics.`
     const sessions = records || await this.deps.listHostedCliRuntimes?.() || [];
     let restored = 0;
     const restoredBindings = /* @__PURE__ */ new Set();
+    const managerTag = this.deps.hostedRuntimeManagerTag;
     for (const record of sessions) {
       if (!record?.runtimeId || !record?.cliType || !record?.workspace) continue;
+      if (!shouldRestoreHostedRuntime(record, managerTag)) {
+        LOG.info(
+          "CLI",
+          `\u21B7 Skipping hosted runtime restore owned by ${record.managedBy}: ${record.runtimeKey || record.runtimeId}`
+        );
+        continue;
+      }
       if (this.adapters.has(record.runtimeId) || instanceManager.getInstance(record.runtimeId)) continue;
       const normalizedType = this.providerLoader.resolveAlias(record.cliType);
       const providerMeta = this.providerLoader.getMeta(normalizedType);
@@ -13697,6 +13891,7 @@ function logCommand(entry) {
       ts: entry.ts,
       cmd: entry.cmd,
       src: entry.source,
+      ...entry.interactionId ? { interactionId: entry.interactionId } : {},
       ...entry.args ? { args: maskArgs(entry.args) } : {},
       ...entry.success !== void 0 ? { ok: entry.success } : {},
       ...entry.error ? { err: entry.error } : {},
@@ -13718,6 +13913,7 @@ function getRecentCommands(count = 50) {
           ts: parsed.ts,
           cmd: parsed.cmd,
           source: parsed.src,
+          interactionId: parsed.interactionId,
           args: parsed.args,
           success: parsed.ok,
           error: parsed.err,
@@ -14185,6 +14381,13 @@ function normalizeCommandSource(source) {
       return "unknown";
   }
 }
+function normalizeCommandArgsWithInteractionId(args) {
+  const base = args && typeof args === "object" ? { ...args } : {};
+  if (typeof base._interactionId !== "string" || !String(base._interactionId).trim()) {
+    base._interactionId = createInteractionId();
+  }
+  return base;
+}
 function toHostedCliRuntimeDescriptor(record) {
   if (!record || typeof record !== "object") return null;
   const runtimeId = typeof record.sessionId === "string" ? record.sessionId : "";
@@ -14223,20 +14426,50 @@ var DaemonCommandRouter = class {
   async execute(cmd, args, source = "unknown") {
     const cmdStart = Date.now();
     const logSource = normalizeCommandSource(source);
+    const normalizedArgs = normalizeCommandArgsWithInteractionId(args);
+    const interactionId = typeof normalizedArgs._interactionId === "string" ? normalizedArgs._interactionId : void 0;
+    recordDebugTrace({
+      interactionId,
+      category: "command",
+      stage: "received",
+      level: "info",
+      payload: { cmd, source: logSource }
+    });
     try {
-      const daemonResult = await this.executeDaemonCommand(cmd, args);
+      const daemonResult = await this.executeDaemonCommand(cmd, normalizedArgs);
       if (daemonResult) {
-        logCommand({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd, source: logSource, args, success: daemonResult.success, durationMs: Date.now() - cmdStart });
+        logCommand({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd, source: logSource, interactionId, args: normalizedArgs, success: daemonResult.success, durationMs: Date.now() - cmdStart });
+        recordDebugTrace({
+          interactionId,
+          category: "command",
+          stage: "completed",
+          level: daemonResult.success ? "info" : "warn",
+          payload: { cmd, source: logSource, success: daemonResult.success, durationMs: Date.now() - cmdStart }
+        });
         return daemonResult;
       }
-      const handlerResult = await this.deps.commandHandler.handle(cmd, args);
-      logCommand({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd, source: logSource, args, success: handlerResult.success, durationMs: Date.now() - cmdStart });
+      const handlerResult = await this.deps.commandHandler.handle(cmd, normalizedArgs);
+      logCommand({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd, source: logSource, interactionId, args: normalizedArgs, success: handlerResult.success, durationMs: Date.now() - cmdStart });
+      recordDebugTrace({
+        interactionId,
+        category: "command",
+        stage: "completed",
+        level: handlerResult.success ? "info" : "warn",
+        payload: { cmd, source: logSource, success: handlerResult.success, durationMs: Date.now() - cmdStart }
+      });
       if (CHAT_COMMANDS.includes(cmd) && this.deps.onPostChatCommand) {
         this.deps.onPostChatCommand();
       }
       return handlerResult;
     } catch (e) {
-      logCommand({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd, source: logSource, args, success: false, error: e.message, durationMs: Date.now() - cmdStart });
+      logCommand({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd, source: logSource, interactionId, args: normalizedArgs, success: false, error: e.message, durationMs: Date.now() - cmdStart });
+      recordDebugTrace({
+        interactionId,
+        category: "command",
+        stage: "failed",
+        level: "error",
+        payload: { cmd, source: logSource, error: e?.message || String(e), durationMs: Date.now() - cmdStart }
+      });
       throw e;
     }
   }
@@ -14278,6 +14511,14 @@ var DaemonCommandRouter = class {
           return { success: false, error: e.message };
         }
       }
+      case "get_debug_trace": {
+        const count = parseInt(args?.count) || parseInt(args?.limit) || 100;
+        const sinceTs = Number(args?.since) || 0;
+        const interactionId = typeof args?.interactionId === "string" ? args.interactionId : void 0;
+        const category = typeof args?.category === "string" ? args.category : void 0;
+        const trace = getRecentDebugTrace({ interactionId, category, limit: count }).filter((entry) => !sinceTs || entry.ts > sinceTs);
+        return { success: true, trace, count: trace.length };
+      }
       case "session_host_get_diagnostics": {
         if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
         const diagnostics = await this.deps.sessionHostControl.getDiagnostics({
@@ -21643,6 +21884,16 @@ var SessionHostPtyTransportFactory = class {
   }
 };
 
+// src/session-host/app-name.ts
+var DEFAULT_SESSION_HOST_APP_NAME = "adhdev";
+var DEFAULT_STANDALONE_SESSION_HOST_APP_NAME = "adhdev-standalone";
+function resolveSessionHostAppName(options = {}) {
+  const env = options.env || process.env;
+  const explicit = typeof env.ADHDEV_SESSION_HOST_NAME === "string" ? env.ADHDEV_SESSION_HOST_NAME.trim() : "";
+  if (explicit) return explicit;
+  return options.standalone ? DEFAULT_STANDALONE_SESSION_HOST_APP_NAME : DEFAULT_SESSION_HOST_APP_NAME;
+}
+
 // src/session-host/runtime-support.ts
 import {
   SessionHostClient as SessionHostClient2,
@@ -21695,7 +21946,8 @@ async function listHostedCliRuntimes(endpoint) {
       cliType: record.providerType,
       workspace: record.workspace,
       cliArgs: Array.isArray(record.meta?.cliArgs) ? record.meta.cliArgs : [],
-      providerSessionId: typeof record.meta?.providerSessionId === "string" ? String(record.meta.providerSessionId) : void 0
+      providerSessionId: typeof record.meta?.providerSessionId === "string" ? String(record.meta.providerSessionId) : void 0,
+      managedBy: typeof record.meta?.managedBy === "string" ? String(record.meta.managedBy) : void 0
     }));
   } finally {
     await client.close().catch(() => {
@@ -22175,6 +22427,8 @@ export {
   CliProviderInstance,
   DAEMON_WS_PATH,
   DEFAULT_DAEMON_PORT,
+  DEFAULT_SESSION_HOST_APP_NAME,
+  DEFAULT_STANDALONE_SESSION_HOST_APP_NAME,
   DaemonAgentStreamManager,
   DaemonCdpInitializer,
   DaemonCdpManager,
@@ -22196,7 +22450,11 @@ export {
   buildMachineInfo,
   buildSessionEntries,
   buildStatusSnapshot,
+  clearDebugTrace,
+  configureDebugTraceStore,
   connectCdpManager,
+  createDebugTraceStore,
+  createInteractionId,
   detectAllVersions,
   detectCLIs,
   detectIDEs,
@@ -22207,10 +22465,12 @@ export {
   getAvailableIdeIds,
   getCurrentDaemonLogPath,
   getDaemonLogDir,
+  getDebugRuntimeConfig,
   getHostMemorySnapshot,
   getLogLevel,
   getRecentActivity,
   getRecentCommands,
+  getRecentDebugTrace,
   getRecentLogs,
   getSavedProviderSessions,
   getWorkspaceState,
@@ -22237,13 +22497,19 @@ export {
   normalizeManagedStatus,
   probeCdpPort,
   readChatHistory,
+  recordDebugTrace,
   registerExtensionProviders,
   resetConfig,
+  resetDebugRuntimeConfig,
   resetState,
+  resolveDebugRuntimeConfig,
+  resolveSessionHostAppName,
   saveConfig,
   saveState,
+  setDebugRuntimeConfig,
   setLogLevel,
   setupIdeInstance,
+  shouldCollectTraceCategory,
   shutdownDaemonComponents,
   spawnDetachedDaemonUpgradeHelper,
   startDaemonDevSupport,