adhdev 0.8.49 → 0.8.52

package/dist/index.js

@@ -4990,6 +4990,145 @@ var init_contracts = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/logging/debug-config.ts
+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(config2) {
+  currentConfig = {
+    ...config2,
+    traceCategories: normalizeCategories(config2.traceCategories),
+    traceBufferSize: Math.max(10, Math.floor(config2.traceBufferSize || DEFAULT_CONFIG2.traceBufferSize))
+  };
+}
+function getDebugRuntimeConfig() {
+  return { ...currentConfig, traceCategories: [...currentConfig.traceCategories] };
+}
+function resetDebugRuntimeConfig() {
+  currentConfig = { ...DEFAULT_CONFIG2 };
+}
+function shouldCollectTraceCategory(category) {
+  const config2 = currentConfig;
+  if (!config2.collectDebugTrace) return false;
+  if (!category) return true;
+  if (config2.traceCategories.length === 0) return true;
+  return config2.traceCategories.includes(category);
+}
+var NORMAL_TRACE_BUFFER_SIZE, DEV_TRACE_BUFFER_SIZE, DEFAULT_CONFIG2, currentConfig;
+var init_debug_config = __esm({
+  "../../oss/packages/daemon-core/src/logging/debug-config.ts"() {
+    "use strict";
+    NORMAL_TRACE_BUFFER_SIZE = 200;
+    DEV_TRACE_BUFFER_SIZE = 1e3;
+    DEFAULT_CONFIG2 = {
+      logLevel: "info",
+      collectDebugTrace: false,
+      traceContent: false,
+      traceBufferSize: NORMAL_TRACE_BUFFER_SIZE,
+      traceCategories: []
+    };
+    currentConfig = { ...DEFAULT_CONFIG2 };
+  }
+});
+
+// ../../oss/packages/daemon-core/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);
+    }
+  };
+}
+function configureDebugTraceStore() {
+  const config2 = getDebugRuntimeConfig();
+  globalStore = createDebugTraceStore({
+    enabled: config2.collectDebugTrace,
+    capacity: config2.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)}`;
+}
+var globalStore;
+var init_debug_trace = __esm({
+  "../../oss/packages/daemon-core/src/logging/debug-trace.ts"() {
+    "use strict";
+    init_debug_config();
+    globalStore = createDebugTraceStore({ enabled: false, capacity: getDebugRuntimeConfig().traceBufferSize });
+  }
+});
+
 // ../../oss/packages/daemon-core/src/commands/chat-commands.ts
 function hashSignatureParts(parts) {
   let hash2 = 2166136261;
@@ -5055,6 +5194,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);
@@ -5300,6 +5453,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)),
@@ -5312,6 +5475,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();
@@ -5375,27 +5544,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);
@@ -6043,6 +6230,7 @@ var init_chat_commands = __esm({
     init_contracts();
     init_chat_history();
     init_logger();
+    init_debug_trace();
     RECENT_SEND_WINDOW_MS = 1200;
     recentSendByTarget = /* @__PURE__ */ new Map();
   }
@@ -27994,6 +28182,19 @@ var init_acp_provider_instance = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/commands/hosted-runtime-restore.ts
+function shouldRestoreHostedRuntime(record2, managerTag) {
+  if (!managerTag) return true;
+  const managedBy = typeof record2.managedBy === "string" ? record2.managedBy.trim() : "";
+  if (!managedBy) return true;
+  return managedBy === managerTag;
+}
+var init_hosted_runtime_restore = __esm({
+  "../../oss/packages/daemon-core/src/commands/hosted-runtime-restore.ts"() {
+    "use strict";
+  }
+});
+
 // ../../oss/packages/daemon-core/src/commands/cli-manager.ts
 function colorize(color, text) {
   const fn = chalkApi?.[color];
@@ -28124,6 +28325,7 @@ var init_cli_manager = __esm({
     init_cli_provider_instance();
     init_acp_provider_instance();
     init_logger();
+    init_hosted_runtime_restore();
     chalkModule = import_chalk.default;
     chalkApi = typeof chalkModule.yellow === "function" ? chalkModule : chalkModule.default || null;
     DaemonCliManager = class {
@@ -28508,8 +28710,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 record2 of sessions) {
           if (!record2?.runtimeId || !record2?.cliType || !record2?.workspace) continue;
+          if (!shouldRestoreHostedRuntime(record2, managerTag)) {
+            LOG.info(
+              "CLI",
+              `\u21B7 Skipping hosted runtime restore owned by ${record2.managedBy}: ${record2.runtimeKey || record2.runtimeId}`
+            );
+            continue;
+          }
           if (this.adapters.has(record2.runtimeId) || instanceManager.getInstance(record2.runtimeId)) continue;
           const normalizedType = this.providerLoader.resolveAlias(record2.cliType);
           const providerMeta = this.providerLoader.getMeta(normalizedType);
@@ -32136,6 +32346,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 } : {},
@@ -32157,6 +32368,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,
@@ -32663,6 +32875,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(record2) {
   if (!record2 || typeof record2 !== "object") return null;
   const runtimeId = typeof record2.sessionId === "string" ? record2.sessionId : "";
@@ -32700,6 +32919,7 @@ var init_router = __esm({
     init_logger();
     init_command_log();
     init_logger();
+    init_debug_trace();
     init_builders();
     init_snapshot();
     init_snapshot();
@@ -32732,20 +32952,50 @@ var init_router = __esm({
       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;
         }
       }
@@ -32787,6 +33037,14 @@ var init_router = __esm({
               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({
@@ -40256,6 +40514,22 @@ var init_session_host_transport = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/session-host/app-name.ts
+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;
+}
+var DEFAULT_SESSION_HOST_APP_NAME, DEFAULT_STANDALONE_SESSION_HOST_APP_NAME;
+var init_app_name = __esm({
+  "../../oss/packages/daemon-core/src/session-host/app-name.ts"() {
+    "use strict";
+    DEFAULT_SESSION_HOST_APP_NAME = "adhdev";
+    DEFAULT_STANDALONE_SESSION_HOST_APP_NAME = "adhdev-standalone";
+  }
+});
+
 // ../../oss/packages/daemon-core/src/session-host/runtime-support.ts
 async function canConnect(endpoint) {
   const client = new SessionHostClient({ endpoint });
@@ -40302,7 +40576,8 @@ async function listHostedCliRuntimes(endpoint) {
       cliType: record2.providerType,
       workspace: record2.workspace,
       cliArgs: Array.isArray(record2.meta?.cliArgs) ? record2.meta.cliArgs : [],
-      providerSessionId: typeof record2.meta?.providerSessionId === "string" ? String(record2.meta.providerSessionId) : void 0
+      providerSessionId: typeof record2.meta?.providerSessionId === "string" ? String(record2.meta.providerSessionId) : void 0,
+      managedBy: typeof record2.meta?.managedBy === "string" ? String(record2.meta.managedBy) : void 0
     }));
   } finally {
     await client.close().catch(() => {
@@ -40825,6 +41100,8 @@ __export(src_exports, {
   CliProviderInstance: () => CliProviderInstance,
   DAEMON_WS_PATH: () => DAEMON_WS_PATH,
   DEFAULT_DAEMON_PORT: () => DEFAULT_DAEMON_PORT,
+  DEFAULT_SESSION_HOST_APP_NAME: () => DEFAULT_SESSION_HOST_APP_NAME,
+  DEFAULT_STANDALONE_SESSION_HOST_APP_NAME: () => DEFAULT_STANDALONE_SESSION_HOST_APP_NAME,
   DaemonAgentStreamManager: () => DaemonAgentStreamManager,
   DaemonCdpInitializer: () => DaemonCdpInitializer,
   DaemonCdpManager: () => DaemonCdpManager,
@@ -40846,7 +41123,11 @@ __export(src_exports, {
   buildMachineInfo: () => buildMachineInfo,
   buildSessionEntries: () => buildSessionEntries,
   buildStatusSnapshot: () => buildStatusSnapshot,
+  clearDebugTrace: () => clearDebugTrace,
+  configureDebugTraceStore: () => configureDebugTraceStore,
   connectCdpManager: () => connectCdpManager,
+  createDebugTraceStore: () => createDebugTraceStore,
+  createInteractionId: () => createInteractionId,
   detectAllVersions: () => detectAllVersions,
   detectCLIs: () => detectCLIs,
   detectIDEs: () => detectIDEs,
@@ -40857,10 +41138,12 @@ __export(src_exports, {
   getAvailableIdeIds: () => getAvailableIdeIds,
   getCurrentDaemonLogPath: () => getCurrentDaemonLogPath,
   getDaemonLogDir: () => getDaemonLogDir,
+  getDebugRuntimeConfig: () => getDebugRuntimeConfig,
   getHostMemorySnapshot: () => getHostMemorySnapshot,
   getLogLevel: () => getLogLevel,
   getRecentActivity: () => getRecentActivity,
   getRecentCommands: () => getRecentCommands,
+  getRecentDebugTrace: () => getRecentDebugTrace,
   getRecentLogs: () => getRecentLogs,
   getSavedProviderSessions: () => getSavedProviderSessions,
   getWorkspaceState: () => getWorkspaceState,
@@ -40887,13 +41170,19 @@ __export(src_exports, {
   normalizeManagedStatus: () => normalizeManagedStatus,
   probeCdpPort: () => probeCdpPort,
   readChatHistory: () => readChatHistory,
+  recordDebugTrace: () => recordDebugTrace,
   registerExtensionProviders: () => registerExtensionProviders,
   resetConfig: () => resetConfig,
+  resetDebugRuntimeConfig: () => resetDebugRuntimeConfig,
   resetState: () => resetState,
+  resolveDebugRuntimeConfig: () => resolveDebugRuntimeConfig,
+  resolveSessionHostAppName: () => resolveSessionHostAppName,
   saveConfig: () => saveConfig,
   saveState: () => saveState,
+  setDebugRuntimeConfig: () => setDebugRuntimeConfig,
   setLogLevel: () => setLogLevel,
   setupIdeInstance: () => setupIdeInstance,
+  shouldCollectTraceCategory: () => shouldCollectTraceCategory,
   shutdownDaemonComponents: () => shutdownDaemonComponents,
   spawnDetachedDaemonUpgradeHelper: () => spawnDetachedDaemonUpgradeHelper,
   startDaemonDevSupport: () => startDaemonDevSupport,
@@ -40924,6 +41213,8 @@ var init_src = __esm({
     init_snapshot();
     init_normalize();
     init_logger();
+    init_debug_config();
+    init_debug_trace();
     init_command_log();
     init_cli_manager();
     init_launch();
@@ -40942,6 +41233,7 @@ var init_src = __esm({
     init_provider_cli_adapter();
     init_pty_transport();
     init_session_host_transport();
+    init_app_name();
     init_runtime_support();
     init_installer();
     init_daemon_lifecycle();
@@ -49116,18 +49408,6 @@ function killPid2(pid) {
 }
 function getWindowsProcessCommandLine(pid) {
   const pidFilter = `ProcessId=${pid}`;
-  try {
-    const wmicOut = (0, import_child_process11.execFileSync)("wmic", [
-      "process",
-      "where",
-      pidFilter,
-      "get",
-      "CommandLine"
-    ], { encoding: "utf8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"], windowsHide: true });
-    const text = wmicOut.trim();
-    if (text) return text;
-  } catch {
-  }
   try {
     const psOut = (0, import_child_process11.execFileSync)("powershell.exe", [
       "-NoProfile",
@@ -49141,6 +49421,18 @@ function getWindowsProcessCommandLine(pid) {
     if (text) return text;
   } catch {
   }
+  try {
+    const wmicOut = (0, import_child_process11.execFileSync)("wmic", [
+      "process",
+      "where",
+      pidFilter,
+      "get",
+      "CommandLine"
+    ], { encoding: "utf8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"], windowsHide: true });
+    const text = wmicOut.trim();
+    if (text) return text;
+  } catch {
+  }
   return null;
 }
 function stopSessionHost() {
@@ -49149,7 +49441,7 @@ function stopSessionHost() {
   try {
     if (fs16.existsSync(pidFile)) {
       const pid = Number.parseInt(fs16.readFileSync(pidFile, "utf8").trim(), 10);
-      if (Number.isFinite(pid)) {
+      if (Number.isFinite(pid) && pid !== process.pid) {
         stopped = killPid2(pid) || stopped;
       }
     }
@@ -49185,7 +49477,7 @@ function stopSessionHost() {
       const raw = (0, import_child_process11.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)) {
+        if (Number.isFinite(pid) && pid !== process.pid && pid !== process.ppid) {
           stopped = killPid2(pid) || stopped;
         }
       }
@@ -49498,11 +49790,21 @@ function removeDaemonPid() {
 }
 function isDaemonRunning() {
   try {
-    const http3 = require("http");
-    const result = require("child_process").execSync(
-      `curl -s -o /dev/null -w "%{http_code}" --max-time 1 http://127.0.0.1:${DEFAULT_DAEMON_PORT}/health`,
-      { encoding: "utf-8", timeout: 2e3, stdio: ["ignore", "pipe", "ignore"] }
-    ).trim();
+    const { execFileSync: execFileSync3 } = require("child_process");
+    const probe = `
+            const http = require('http');
+            const req = http.get('http://127.0.0.1:${DEFAULT_DAEMON_PORT}/health', { timeout: 1500 }, (res) => {
+                process.stdout.write(String(res.statusCode));
+                res.resume();
+            });
+            req.on('error', () => process.stdout.write('0'));
+            req.on('timeout', () => { req.destroy(); process.stdout.write('0'); });
+        `;
+    const result = execFileSync3(process.execPath, ["-e", probe], {
+      encoding: "utf-8",
+      timeout: 3e3,
+      stdio: ["ignore", "pipe", "ignore"]
+    }).trim();
     if (result === "200") return true;
   } catch {
   }
@@ -49511,12 +49813,46 @@ function isDaemonRunning() {
     if (!fs17.existsSync(pidFile)) return false;
     const pid = parseInt(fs17.readFileSync(pidFile, "utf-8").trim());
     process.kill(pid, 0);
+    if (!isAdhdevProcess(pid)) {
+      removeDaemonPid();
+      return false;
+    }
     return true;
   } catch {
     removeDaemonPid();
     return false;
   }
 }
+function isAdhdevProcess(pid) {
+  try {
+    if (process.platform === "win32") {
+      const { execFileSync: execFileSync3 } = require("child_process");
+      try {
+        const psOut = execFileSync3("powershell.exe", [
+          "-NoProfile",
+          "-NonInteractive",
+          "-ExecutionPolicy",
+          "Bypass",
+          "-Command",
+          `(Get-CimInstance Win32_Process -Filter "ProcessId=${pid}").CommandLine`
+        ], { encoding: "utf8", timeout: 5e3, stdio: ["ignore", "pipe", "ignore"] }).trim();
+        return /adhdev|daemon/i.test(psOut);
+      } catch {
+        return true;
+      }
+    } else {
+      const { execFileSync: execFileSync3 } = require("child_process");
+      const cmdline = execFileSync3("ps", ["-o", "command=", "-p", String(pid)], {
+        encoding: "utf-8",
+        timeout: 2e3,
+        stdio: ["ignore", "pipe", "ignore"]
+      }).trim();
+      return /adhdev|daemon/i.test(cmdline);
+    }
+  } catch {
+    return true;
+  }
+}
 function getDaemonPid() {
   const pidFile = getDaemonPidFile();
   try {
@@ -49558,7 +49894,7 @@ var init_adhdev_daemon = __esm({
     import_ws3 = require("ws");
     import_chalk2 = __toESM(require("chalk"));
     init_version();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.49" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.52" });
     ACTIVE_CHAT_POLL_STATUSES = /* @__PURE__ */ new Set([
       "generating",
       "waiting_approval",
@@ -49585,6 +49921,8 @@ var init_adhdev_daemon = __esm({
       ideType = "unknown";
       pendingMandatoryUpdate = null;
       mandatoryUpgradeInFlight = false;
+      debugConfig = resolveDebugRuntimeConfig();
+      recentInteractionIdsBySession = /* @__PURE__ */ new Map();
       static MANDATORY_UPDATE_BLOCKED_COMMANDS = /* @__PURE__ */ new Set([
         "launch_ide",
         "launch_cli",
@@ -49595,6 +49933,36 @@ var init_adhdev_daemon = __esm({
       constructor() {
         this.localPort = 19222;
       }
+      applyDebugRuntime(options) {
+        this.debugConfig = resolveDebugRuntimeConfig({
+          dev: options.dev,
+          logLevel: options.logLevel,
+          trace: options.trace,
+          traceContent: options.traceContent,
+          traceBufferSize: options.traceBufferSize,
+          traceCategories: options.traceCategories
+        });
+        setDebugRuntimeConfig(this.debugConfig);
+        configureDebugTraceStore();
+        setLogLevel(this.debugConfig.logLevel);
+        LOG.info("Daemon", `Debug runtime configured: level=${this.debugConfig.logLevel} trace=${this.debugConfig.collectDebugTrace ? "on" : "off"} traceContent=${this.debugConfig.traceContent ? "on" : "off"} traceBuffer=${this.debugConfig.traceBufferSize}`);
+      }
+      ensureInteractionContext(args) {
+        const normalized = args && typeof args === "object" ? { ...args } : {};
+        if (typeof normalized._interactionId !== "string" || !String(normalized._interactionId).trim()) {
+          normalized._interactionId = createInteractionId();
+        }
+        const interactionId = String(normalized._interactionId);
+        const targetSessionId = typeof normalized.targetSessionId === "string" ? normalized.targetSessionId : "";
+        if (targetSessionId) {
+          this.recentInteractionIdsBySession.set(targetSessionId, interactionId);
+        }
+        return normalized;
+      }
+      getSessionInteractionId(sessionId) {
+        if (!sessionId) return void 0;
+        return this.recentInteractionIdsBySession.get(sessionId);
+      }
       getCliPresentationMode(sessionId) {
         if (!sessionId || !this.components) return null;
         const instance = this.components.instanceManager.getInstance(sessionId);
@@ -49709,11 +50077,27 @@ var init_adhdev_daemon = __esm({
           return null;
         }
         subscription.lastDeliveredSignature = deliverySignature;
+        const interactionId = this.getSessionInteractionId(subscription.params.targetSessionId);
+        recordDebugTrace({
+          interactionId,
+          category: "topic",
+          stage: "session.chat_tail_published",
+          level: "info",
+          sessionId: subscription.params.targetSessionId,
+          payload: {
+            syncMode,
+            totalMessages: Number(result.totalMessages || 0),
+            replaceFrom: Number(result.replaceFrom || 0),
+            hasModal: !!activeModal,
+            hasTitle: typeof result.title === "string"
+          }
+        });
         return {
           topic: "session.chat_tail",
           key: subscription.key,
           sessionId: subscription.params.targetSessionId,
           ...subscription.params.historySessionId ? { historySessionId: subscription.params.historySessionId } : {},
+          ...interactionId ? { interactionId } : {},
           seq: subscription.seq,
           timestamp: Date.now(),
           messages: Array.isArray(result.messages) ? result.messages : [],
@@ -49859,6 +50243,20 @@ var init_adhdev_daemon = __esm({
         subscription.lastDeliveredSignature = deliverySignature;
         subscription.seq += 1;
         subscription.lastSentAt = now;
+        const interactionId = this.getSessionInteractionId(subscription.params.targetSessionId);
+        recordDebugTrace({
+          interactionId,
+          category: "topic",
+          stage: "session.modal_published",
+          level: "info",
+          sessionId: subscription.params.targetSessionId,
+          payload: {
+            status,
+            hasTitle: !!title,
+            modalMessage: modalMessage ? modalMessage.slice(0, 140) : void 0,
+            modalButtonCount: modalButtons.length
+          }
+        });
         return {
           topic: "session.modal",
           key: subscription.key,
@@ -49867,6 +50265,7 @@ var init_adhdev_daemon = __esm({
           ...title ? { title } : {},
           ...modalMessage ? { modalMessage } : {},
           ...modalButtons.length > 0 ? { modalButtons } : {},
+          ...interactionId ? { interactionId } : {},
           seq: subscription.seq,
           timestamp: now
         };
@@ -49912,6 +50311,7 @@ var init_adhdev_daemon = __esm({
       }
       async start(options = {}) {
         installGlobalInterceptor();
+        this.applyDebugRuntime(options);
         process.on("uncaughtException", (err) => {
           LOG.error("Daemon", `Uncaught exception: ${err?.message}
 ${err?.stack || ""}`);
@@ -49938,6 +50338,7 @@ ${err?.stack || ""}`);
             console.log(import_chalk2.default.gray("  Run `adhdev setup` first.\n"));
             process.exit(1);
           }
+          await this.startLocalIpcServer();
           const sessionHostEndpoint = await ensureSessionHostReady2();
           this.sessionHostEndpoint = sessionHostEndpoint;
           this.sessionHostController = new SessionHostController(
@@ -49962,6 +50363,7 @@ ${err?.stack || ""}`);
               }),
               onStatusChange: () => this.statusReporter?.onStatusChange(),
               removeAgentTracking: (key) => this.statusReporter?.removeAgentTracking(key),
+              hostedRuntimeManagerTag: "adhdev-cloud",
               createPtyTransportFactory: ({ runtimeId, providerType, workspace, cliArgs, providerSessionId, attachExisting }) => new SessionHostPtyTransportFactory({
                 endpoint: sessionHostEndpoint,
                 ensureReady: async () => {
@@ -49972,12 +50374,13 @@ ${err?.stack || ""}`);
                 runtimeId,
                 providerType,
                 workspace,
+                attachExisting,
                 appName: process.env.ADHDEV_SESSION_HOST_NAME || "adhdev",
                 meta: {
                   cliArgs,
-                  providerSessionId
-                },
-                attachExisting
+                  providerSessionId,
+                  managedBy: "adhdev-cloud"
+                }
               }),
               listHostedCliRuntimes: async () => listHostedCliRuntimes2(sessionHostEndpoint)
             },
@@ -50000,7 +50403,6 @@ ${err?.stack || ""}`);
             }
           });
           await this.components.cliManager.restoreHostedSessions();
-          await this.startLocalIpcServer();
           this.components.providerLoader.fetchLatest().then(({ updated }) => {
             if (updated) {
               this.components.providerLoader.reload();
@@ -50214,7 +50616,9 @@ ${err?.stack || ""}`);
         });
       }
       async handleCommand(msg, cmd, args) {
-        LOG.info("Command", `${cmd}${args?.targetSessionId ? ` \u2192 session:${String(args.targetSessionId).split("_")[0]}` : ""}`);
+        const normalizedArgs = this.ensureInteractionContext(args);
+        const interactionId = String(normalizedArgs._interactionId);
+        LOG.info("Command", `${cmd}${normalizedArgs?.targetSessionId ? ` \u2192 session:${String(normalizedArgs.targetSessionId).split("_")[0]}` : ""} [${interactionId}]`);
         const cmdStart = Date.now();
         const source = msg.ipcWs ? "ext" : typeof msg.source === "string" && msg.source.trim() ? msg.source : "ws";
         try {
@@ -50224,18 +50628,20 @@ ${err?.stack || ""}`);
               code: "DAEMON_UPDATE_REQUIRED",
               required: true,
               latest: this.pendingMandatoryUpdate.targetVersion,
-              reason: this.pendingMandatoryUpdate.reason
+              reason: this.pendingMandatoryUpdate.reason,
+              interactionId
             });
             return;
           }
           if (source === "api" && !loadConfig().allowServerApiProxy) {
             this.sendResult(msg, false, {
               error: "Server API relay is disabled on this daemon. Enable it explicitly with `adhdev daemon:api enable`.",
-              code: "SERVER_API_DISABLED"
+              code: "SERVER_API_DISABLED",
+              interactionId
             });
             return;
           }
-          const result = await this.components.router.execute(cmd, args, source);
+          const result = await this.components.router.execute(cmd, normalizedArgs, source);
           if (cmd.startsWith("workspace_")) this.statusReporter?.throttledReport();
           if (cmd === "get_status_metadata" || cmd.startsWith("workspace_") || cmd.startsWith("session_host_")) {
             void this.flushP2PDaemonMetadataSubscriptions();
@@ -50246,24 +50652,34 @@ ${err?.stack || ""}`);
           if (cmd === "resolve_action" || cmd === "send_chat" || cmd === "read_chat") {
             void this.flushP2PSessionModalSubscriptions();
           }
-          this.sendResult(msg, result.success, result);
+          this.sendResult(msg, result.success, { ...result, interactionId });
+          recordDebugTrace({
+            interactionId,
+            category: "command",
+            stage: "result_sent",
+            level: result.success ? "info" : "warn",
+            sessionId: typeof normalizedArgs.targetSessionId === "string" ? normalizedArgs.targetSessionId : void 0,
+            payload: { cmd, source, durationMs: Date.now() - cmdStart, success: result.success }
+          });
         } catch (e) {
           console.error(import_chalk2.default.red(`  \u2717 Command failed: ${e.message}`));
-          this.sendResult(msg, false, { error: e.message });
+          this.sendResult(msg, false, { error: e.message, interactionId });
         }
       }
       /** P2P command processing — P2P-only commands + unified router */
       async handleP2PCommand(cmdType, data) {
+        const normalizedData = this.ensureInteractionContext(data);
+        const interactionId = String(normalizedData._interactionId);
         const cmdStart = Date.now();
         try {
           switch (cmdType) {
             case "get_runtime_snapshot": {
-              const sessionId = typeof data.sessionId === "string" ? data.sessionId : "";
-              if (!sessionId) return { success: false, error: "sessionId is required" };
+              const sessionId = typeof normalizedData.sessionId === "string" ? normalizedData.sessionId : "";
+              if (!sessionId) return { success: false, error: "sessionId is required", interactionId };
               if (!this.isCliSession(sessionId)) {
-                return { success: false, error: "CLI session runtime unavailable", code: "CLI_RUNTIME_UNAVAILABLE" };
+                return { success: false, error: "CLI session runtime unavailable", code: "CLI_RUNTIME_UNAVAILABLE", interactionId };
               }
-              if (!this.sessionHostEndpoint) return { success: false, error: "Session host unavailable" };
+              if (!this.sessionHostEndpoint) return { success: false, error: "Session host unavailable", interactionId };
               const client = new SessionHostClient({ endpoint: this.sessionHostEndpoint });
               try {
                 await client.connect();
@@ -50272,31 +50688,30 @@ ${err?.stack || ""}`);
                   payload: { sessionId }
                 });
                 if (!snapshot.success || !snapshot.result) {
-                  return { success: false, error: snapshot.error || "Runtime snapshot unavailable" };
+                  return { success: false, error: snapshot.error || "Runtime snapshot unavailable", interactionId };
                 }
-                return { success: true, result: snapshot.result };
+                return { success: true, result: snapshot.result, interactionId };
               } finally {
                 await client.close().catch(() => {
                 });
               }
             }
             case "set_machine_nickname": {
-              const nickname = data.nickname?.trim() || null;
+              const nickname = normalizedData.nickname?.trim() || null;
               const config2 = loadConfig();
               config2.machineNickname = nickname;
               saveConfig(config2);
               void this.flushP2PDaemonMetadataSubscriptions();
-              logCommand({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd: cmdType, source: "p2p", args: { nickname }, success: true, durationMs: Date.now() - cmdStart });
-              return { success: true, nickname };
+              logCommand({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd: cmdType, source: "p2p", interactionId, args: { nickname }, success: true, durationMs: Date.now() - cmdStart });
+              return { success: true, nickname, interactionId };
             }
             case "get_command_history": {
-              const { getRecentCommands: getRecentCommands2 } = require("./logging/command-log");
-              const count = parseInt(data.count) || 50;
-              const history = getRecentCommands2(count);
-              return { success: true, history };
+              const count = parseInt(normalizedData.count) || 50;
+              const history = getRecentCommands(count);
+              return { success: true, history, interactionId };
             }
           }
-          const routed = await this.components.router.execute(cmdType, data, "p2p");
+          const routed = await this.components.router.execute(cmdType, normalizedData, "p2p");
           if (cmdType.startsWith("workspace_")) this.statusReporter?.throttledReport();
           if (cmdType === "get_status_metadata" || cmdType.startsWith("workspace_") || cmdType.startsWith("session_host_")) {
             void this.flushP2PDaemonMetadataSubscriptions();
@@ -50307,10 +50722,10 @@ ${err?.stack || ""}`);
           if (cmdType === "resolve_action" || cmdType === "send_chat" || cmdType === "read_chat") {
             void this.flushP2PSessionModalSubscriptions();
           }
-          return routed;
+          return { ...routed, interactionId };
         } catch (e) {
-          logCommand({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd: cmdType, source: "p2p", success: false, error: e.message, durationMs: Date.now() - cmdStart });
-          return { success: false, error: e.message };
+          logCommand({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd: cmdType, source: "p2p", interactionId, success: false, error: e.message, durationMs: Date.now() - cmdStart });
+          return { success: false, error: e.message, interactionId };
         }
       }
       async startLocalIpcServer() {