adhdev 0.7.28 → 0.7.30

package/dist/cli/index.js

@@ -3051,7 +3051,6 @@ async function setupIdeInstance(ctx, opts) {
     sessionId: ideInstance.getInstanceId(),
     parentSessionId: null,
     providerType: ideType,
-    providerCategory: "ide",
     transport: "cdp-page",
     cdpManagerKey: managerKey,
     instanceKey: `ide:${managerKey}`
@@ -3066,7 +3065,6 @@ async function setupIdeInstance(ctx, opts) {
       sessionId: ext.getInstanceId(),
       parentSessionId: ideInstance.getInstanceId(),
       providerType: ext.type,
-      providerCategory: "extension",
       transport: "cdp-webview",
       cdpManagerKey: managerKey,
       instanceKey: `ide:${managerKey}`
@@ -3672,9 +3670,31 @@ function getCurrentManagerKey(h) {
 function getTargetedCliAdapter(h, args, providerType) {
   return h.getCliAdapter(args?.targetSessionId || providerType || h.currentSession?.providerType || h.currentManagerKey);
 }
+function getTargetTransport(h, provider) {
+  if (h.currentSession?.transport) return h.currentSession.transport;
+  switch (provider?.category) {
+    case "cli":
+      return "pty";
+    case "acp":
+      return "acp";
+    case "extension":
+      return "cdp-webview";
+    case "ide":
+      return "cdp-page";
+    default:
+      return null;
+  }
+}
+function isCliLikeTransport(transport) {
+  return transport === "pty" || transport === "acp";
+}
+function isExtensionTransport(transport) {
+  return transport === "cdp-webview";
+}
 function buildRecentSendKey(h, args, provider, text) {
+  const transport = getTargetTransport(h, provider) || "unknown";
   const target = args?.targetSessionId || args?.agentType || h.currentSession?.providerType || h.currentProviderType || h.currentManagerKey || "unknown";
-  return `${provider?.category || "unknown"}:${target}:${text.trim()}`;
+  return `${transport}:${target}:${text.trim()}`;
 }
 function isRecentDuplicateSend(key) {
   const now = Date.now();
@@ -3700,25 +3720,25 @@ async function handleChatHistory(h, args) {
 }
 async function handleReadChat(h, args) {
   const provider = h.getProvider(args?.agentType);
+  const transport = getTargetTransport(h, provider);
   const _log = (msg) => LOG.debug("Command", `[read_chat] ${msg}`);
-  if (provider?.category === "cli" || provider?.category === "acp") {
-    const adapter = getTargetedCliAdapter(h, args, provider.type);
+  if (isCliLikeTransport(transport)) {
+    const adapter = getTargetedCliAdapter(h, args, provider?.type);
     if (adapter) {
-      _log(`${provider.category} adapter: ${adapter.cliType}`);
+      _log(`${transport} adapter: ${adapter.cliType}`);
       const status = adapter.getStatus?.();
       if (status) {
         return {
           success: true,
           messages: status.messages || [],
           status: status.status,
-          activeModal: status.activeModal,
-          terminalHistory: status.terminalHistory || ""
+          activeModal: status.activeModal
         };
       }
     }
-    return { success: false, error: `${provider.category} adapter not found` };
+    return { success: false, error: `${transport} adapter not found` };
   }
-  if (provider?.category === "extension") {
+  if (isExtensionTransport(transport)) {
     try {
       const evalResult = await h.evaluateProviderScript("readChat", void 0, 5e4);
       if (evalResult?.result) {
@@ -3732,7 +3752,7 @@ async function handleReadChat(h, args) {
         if (parsed && typeof parsed === "object") {
           _log(`Extension OK: ${parsed.messages?.length || 0} msgs`);
           h.historyWriter.appendNewMessages(
-            provider.type || "unknown_extension",
+            provider?.type || "unknown_extension",
             parsed.messages || [],
             parsed.title,
             args?.targetSessionId
@@ -3748,7 +3768,7 @@ async function handleReadChat(h, args) {
       const parentSessionId = h.currentSession?.parentSessionId;
       if (cdp2 && parentSessionId) {
         const stream = await h.agentStream.collectActiveSession(cdp2, parentSessionId);
-        if (stream?.agentType !== provider.type) {
+        if (stream?.agentType !== provider?.type) {
           return { success: true, messages: [], status: "idle" };
         }
         if (stream) {
@@ -3828,6 +3848,7 @@ async function handleSendChat(h, args) {
   if (!text) return { success: false, error: "text required" };
   const _log = (msg) => LOG.debug("Command", `[send_chat] ${msg}`);
   const provider = h.getProvider(args?.agentType);
+  const transport = getTargetTransport(h, provider);
   const dedupeKey = buildRecentSendKey(h, args, provider, text);
   const _logSendSuccess = (method, targetAgent) => {
     h.historyWriter.appendNewMessages(
@@ -3843,20 +3864,20 @@ async function handleSendChat(h, args) {
     _log(`Suppressed duplicate send for ${dedupeKey}`);
     return { success: true, sent: false, deduplicated: true };
   }
-  if (provider?.category === "cli" || provider?.category === "acp") {
-    const adapter = getTargetedCliAdapter(h, args, provider.type);
+  if (isCliLikeTransport(transport)) {
+    const adapter = getTargetedCliAdapter(h, args, provider?.type);
     if (adapter) {
-      _log(`${provider.category} adapter: ${adapter.cliType}`);
+      _log(`${transport} adapter: ${adapter.cliType}`);
       try {
         await adapter.sendMessage(text);
-        return _logSendSuccess(`${provider.category}-adapter`, adapter.cliType);
+        return _logSendSuccess(`${transport}-adapter`, adapter.cliType);
       } catch (e) {
-        return { success: false, error: `${provider.category} send failed: ${e.message}` };
+        return { success: false, error: `${transport} send failed: ${e.message}` };
       }
     }
   }
-  if (provider?.category === "extension") {
-    _log(`Extension: ${provider.type}`);
+  if (isExtensionTransport(transport)) {
+    _log(`Extension: ${provider?.type || "unknown_extension"}`);
     try {
       const evalResult = await h.evaluateProviderScript("sendMessage", { MESSAGE: text }, 3e4);
       if (evalResult?.result) {
@@ -3886,7 +3907,7 @@ async function handleSendChat(h, args) {
         return _logSendSuccess("agent-stream");
       }
     }
-    return { success: false, error: `Extension '${provider.type}' send failed` };
+    return { success: false, error: `Extension '${provider?.type || "unknown_extension"}' send failed` };
   }
   const targetCdp = h.getCdp();
   if (!targetCdp?.isConnected) {
@@ -4012,7 +4033,8 @@ async function handleSendChat(h, args) {
 }
 async function handleListChats(h, args) {
   const provider = h.getProvider(args?.agentType);
-  if (provider?.category === "extension" && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
+  const transport = getTargetTransport(h, provider);
+  if (isExtensionTransport(transport) && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
     try {
       const chats = await h.agentStream.listSessionChats(h.getCdp(), h.currentSession.sessionId);
       LOG.info("Command", `[list_chats] Extension: ${chats.length} chats`);
@@ -4064,8 +4086,9 @@ async function handleListChats(h, args) {
 }
 async function handleNewChat(h, args) {
   const provider = h.getProvider(args?.agentType);
-  if (provider?.category === "cli") {
-    const adapter = getTargetedCliAdapter(h, args, provider.type);
+  const transport = getTargetTransport(h, provider);
+  if (transport === "pty") {
+    const adapter = getTargetedCliAdapter(h, args, provider?.type);
     if (!adapter) return { success: false, error: "CLI adapter not running" };
     if (typeof adapter.clearHistory === "function") {
       adapter.clearHistory();
@@ -4073,7 +4096,7 @@ async function handleNewChat(h, args) {
     }
     return { success: false, error: "new_chat not supported by this CLI provider" };
   }
-  if (provider?.category === "extension" && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
+  if (isExtensionTransport(transport) && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
     const ok = await h.agentStream.newSession(h.getCdp(), h.currentSession.sessionId);
     return { success: ok };
   }
@@ -4098,11 +4121,12 @@ async function handleNewChat(h, args) {
 }
 async function handleSwitchChat(h, args) {
   const provider = h.getProvider(args?.agentType);
+  const transport = getTargetTransport(h, provider);
   const managerKey = getCurrentManagerKey(h);
   const sessionId = args?.sessionId || args?.id || args?.chatId;
   if (!sessionId) return { success: false, error: "sessionId required" };
   LOG.info("Command", `[switch_chat] sessionId=${sessionId}, manager=${managerKey}`);
-  if (provider?.category === "extension" && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
+  if (isExtensionTransport(transport) && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
     const ok = await h.agentStream.switchConversation(h.getCdp(), h.currentSession.sessionId, sessionId);
     return { success: ok, result: ok ? "switched" : "failed" };
   }
@@ -4192,9 +4216,10 @@ async function handleSwitchChat(h, args) {
 }
 async function handleSetMode(h, args) {
   const provider = h.getProvider(args?.agentType);
+  const transport = getTargetTransport(h, provider);
   const mode = args?.mode || "agent";
-  if (provider?.category === "acp") {
-    const adapter = getTargetedCliAdapter(h, args, provider.type);
+  if (transport === "acp") {
+    const adapter = getTargetedCliAdapter(h, args, provider?.type);
     if (adapter) {
       const acpInstance = adapter._acpInstance;
       if (acpInstance && typeof acpInstance.onEvent === "function") {
@@ -4247,10 +4272,11 @@ async function handleSetMode(h, args) {
 }
 async function handleChangeModel(h, args) {
   const provider = h.getProvider(args?.agentType);
+  const transport = getTargetTransport(h, provider);
   const model = args?.model;
-  LOG.info("Command", `[change_model] model=${model} provider=${provider?.type} category=${provider?.category} manager=${getCurrentManagerKey(h)} providerType=${getCurrentProviderType(h)}`);
-  if (provider?.category === "acp") {
-    const adapter = getTargetedCliAdapter(h, args, provider.type);
+  LOG.info("Command", `[change_model] model=${model} provider=${provider?.type} transport=${transport} manager=${getCurrentManagerKey(h)} providerType=${getCurrentProviderType(h)}`);
+  if (transport === "acp") {
+    const adapter = getTargetedCliAdapter(h, args, provider?.type);
     LOG.info("Command", `[change_model] ACP adapter found: ${!!adapter}, type=${adapter?.cliType}, hasAcpInstance=${!!adapter?._acpInstance}`);
     if (adapter) {
       const acpInstance = adapter._acpInstance;
@@ -4308,15 +4334,16 @@ async function handleSetThoughtLevel(h, args) {
   const value = args?.value;
   if (!configId || !value) return { success: false, error: "configId and value required" };
   const provider = h.getProvider(args?.agentType);
-  if (!provider || provider.category !== "acp") {
+  const transport = getTargetTransport(h, provider);
+  if (transport !== "acp") {
     return { success: false, error: "set_thought_level only for ACP providers" };
   }
-  const adapter = getTargetedCliAdapter(h, args, provider.type);
+  const adapter = getTargetedCliAdapter(h, args, provider?.type);
   const acpInstance = adapter?._acpInstance;
   if (!acpInstance) return { success: false, error: "ACP instance not found" };
   try {
     await acpInstance.setConfigOption(configId, value);
-    LOG.info("Command", `[set_thought_level] ${configId}=${value} for ${provider.type}`);
+    LOG.info("Command", `[set_thought_level] ${configId}=${value} for ${provider?.type || "unknown_acp"}`);
     return { success: true, configId, value };
   } catch (e) {
     return { success: false, error: e?.message };
@@ -4324,11 +4351,12 @@ async function handleSetThoughtLevel(h, args) {
 }
 async function handleResolveAction(h, args) {
   const provider = h.getProvider(args?.agentType);
+  const transport = getTargetTransport(h, provider);
   const action = args?.action || "approve";
   const button = args?.button || args?.buttonText || (action === "approve" ? "Accept" : action === "reject" ? "Reject" : "Accept");
   LOG.info("Command", `[resolveAction] action=${action} button="${button}" provider=${provider?.type}`);
-  if (provider?.category === "cli") {
-    const adapter = getTargetedCliAdapter(h, args, provider.type);
+  if (transport === "pty") {
+    const adapter = getTargetedCliAdapter(h, args, provider?.type);
     if (!adapter) return { success: false, error: "CLI adapter not running" };
     if (args?.data && typeof adapter.resolveAction === "function") {
       try {
@@ -4369,7 +4397,7 @@ async function handleResolveAction(h, args) {
     LOG.info("Command", `[resolveAction] CLI PTY \u2192 buttonIndex=${buttonIndex} "${buttons[buttonIndex] ?? "?"}"`);
     return { success: true, buttonIndex, button: buttons[buttonIndex] ?? button };
   }
-  if (provider?.category === "extension" && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
+  if (isExtensionTransport(transport) && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
     const ok = await h.agentStream.resolveSessionAction(h.getCdp(), h.currentSession.sessionId, action);
     return { success: ok };
   }
@@ -18630,21 +18658,39 @@ var init_xterm_backend = __esm({
 
 // ../../oss/packages/daemon-core/src/cli-adapters/terminal-screen.ts
 function createTerminalBackend(options, preference) {
+  const ghosttyAvailable = isGhosttyVtBackendAvailable();
   if (preference === "ghostty-vt") {
-    return new GhosttyVtTerminalBackend(options);
-  }
-  if (preference === "auto" && isGhosttyVtBackendAvailable()) {
-    return new GhosttyVtTerminalBackend(options);
-  }
-  return new XtermTerminalBackend(options);
+    const backend2 = new GhosttyVtTerminalBackend(options);
+    logTerminalBackendSelection(preference, ghosttyAvailable, backend2.kind);
+    return backend2;
+  }
+  if (preference === "auto" && ghosttyAvailable) {
+    const backend2 = new GhosttyVtTerminalBackend(options);
+    logTerminalBackendSelection(preference, ghosttyAvailable, backend2.kind);
+    return backend2;
+  }
+  const backend = new XtermTerminalBackend(options);
+  logTerminalBackendSelection(preference, ghosttyAvailable, backend.kind);
+  return backend;
+}
+function logTerminalBackendSelection(preference, ghosttyAvailable, backendKind) {
+  const key = `${preference}:${ghosttyAvailable}:${backendKind}`;
+  if (loggedTerminalBackends.has(key)) return;
+  loggedTerminalBackends.add(key);
+  LOG.info(
+    "Terminal",
+    `[terminal-screen] backend=${backendKind} preference=${preference} ghosttyAvailable=${ghosttyAvailable}`
+  );
 }
-var DEFAULT_SCROLLBACK, TerminalScreen;
+var DEFAULT_SCROLLBACK, loggedTerminalBackends, TerminalScreen;
 var init_terminal_screen = __esm({
   "../../oss/packages/daemon-core/src/cli-adapters/terminal-screen.ts"() {
     "use strict";
+    init_logger();
     init_ghostty_vt_backend();
     init_xterm_backend();
     DEFAULT_SCROLLBACK = 2e3;
+    loggedTerminalBackends = /* @__PURE__ */ new Set();
     TerminalScreen = class {
       backendKind;
       rows;
@@ -37459,7 +37505,6 @@ var init_cli_manager = __esm({
             sessionId: cliInstance.instanceId,
             parentSessionId: null,
             providerType: normalizedType,
-            providerCategory: "cli",
             transport: "pty",
             adapterKey: key,
             instanceKey: key
@@ -37509,7 +37554,6 @@ ${installInfo}`
             sessionId,
             parentSessionId: null,
             providerType: normalizedType,
-            providerCategory: "acp",
             transport: "acp",
             adapterKey: key,
             instanceKey: key
@@ -38040,12 +38084,12 @@ var init_manager2 = __esm({
         this.logFn(`[AgentStream] Active session (${parentSessionId}): ${sessionId || "none"}`);
       }
       resolveSessionIdForTarget(parentSessionId, agentType) {
-        const child = (this.sessionRegistry?.listChildren(parentSessionId) || []).find((entry) => entry.providerCategory === "extension" && entry.providerType === agentType);
+        const child = (this.sessionRegistry?.listChildren(parentSessionId) || []).find((entry) => entry.transport === "cdp-webview" && entry.providerType === agentType);
         return child?.sessionId || null;
       }
       async connectManagedSession(cdp, parentSessionId, runtimeSessionId) {
         const target = this.getSessionTarget(runtimeSessionId);
-        if (!target || target.providerCategory !== "extension") return null;
+        if (!target || target.transport !== "cdp-webview") return null;
         const adapter = this.adaptersByType.get(target.providerType);
         if (!adapter) return null;
         const targets = await cdp.discoverAgentWebviews();
@@ -38344,7 +38388,6 @@ var init_poller = __esm({
                       sessionId: extInstance.getInstanceId(),
                       parentSessionId,
                       providerType: extType,
-                      providerCategory: "extension",
                       transport: "cdp-webview",
                       cdpManagerKey: ideType,
                       instanceKey: `ide:${ideType}`
@@ -38582,7 +38625,6 @@ var init_provider_instance_manager = __esm({
               providerType,
               instanceId: state.instanceId,
               targetSessionId: state.instanceId,
-              providerCategory: state.category,
               workspaceName: state.workspace || void 0,
               ...extra
             });
@@ -44300,10 +44342,6 @@ var init_daemon_p2p = __esm({
       ptyResizeHandler = null;
       screenshotStartHandler = null;
       _ssDebugDone = false;
-      // PTY scrollback buffer per cliType (send recent output on reconnect)
-      ptyScrollback = /* @__PURE__ */ new Map();
-      PTY_SCROLLBACK_MAX = 64 * 1024;
-      // 64KB per CLI
       get screenshotActive() {
         for (const peer of this.peers.values()) {
           if (peer.screenshotActive && peer.state === "connected") return true;
@@ -44650,7 +44688,6 @@ ${e?.stack || ""}`);
                 log(`Screenshots auto-starting for peer ${pid} (was waiting for channel open)`);
               }
             }
-            setTimeout(() => this.sendPtyScrollback(pid), 100);
           });
           dataCh.onClosed(() => {
             log(`Data channel CLOSED for peer ${pid}`);
@@ -44781,12 +44818,6 @@ ${e?.stack || ""}`);
       }
       /** Broadcast PTY output to all connected peers */
       broadcastPtyOutput(cliType, data) {
-        const prev = this.ptyScrollback.get(cliType) || "";
-        const updated = prev + data;
-        this.ptyScrollback.set(
-          cliType,
-          updated.length > this.PTY_SCROLLBACK_MAX ? updated.slice(-this.PTY_SCROLLBACK_MAX) : updated
-        );
         const msg = JSON.stringify({ type: "pty_output", cliType, data });
         let sentAny = false;
         for (const peer of this.peers.values()) {
@@ -44799,24 +44830,6 @@ ${e?.stack || ""}`);
         }
         return sentAny;
       }
-      /** Send scrollback on peer connect */
-      sendPtyScrollback(peerId) {
-        const peer = this.peers.get(peerId);
-        if (!peer?.dataChannel) return;
-        for (const [cliType, buffer] of this.ptyScrollback) {
-          if (!buffer) continue;
-          try {
-            peer.dataChannel.sendMessage(JSON.stringify({
-              type: "pty_output",
-              cliType,
-              data: buffer,
-              scrollback: true
-            }));
-            logDebug(`Sent PTY scrollback to peer ${peerId}: ${cliType} (${buffer.length} bytes)`);
-          } catch {
-          }
-        }
-      }
       sendScreenshot(base64Data) {
         const buffer = Buffer.from(base64Data, "base64");
         return this.sendScreenshotBuffer(buffer);
@@ -45381,11 +45394,12 @@ var init_adhdev_daemon = __esm({
     init_daemon_p2p();
     init_screenshot_controller();
     init_session_host();
+    init_dist();
     os19 = __toESM(require("os"));
     fs14 = __toESM(require("fs"));
     path17 = __toESM(require("path"));
     import_chalk2 = __toESM(require("chalk"));
-    pkgVersion = "0.7.28";
+    pkgVersion = "0.7.30";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [
@@ -45423,6 +45437,7 @@ var init_adhdev_daemon = __esm({
       screenshotController = null;
       statusReporter = null;
       components = null;
+      sessionHostEndpoint = null;
       running = false;
       localPort;
       ideType = "unknown";
@@ -45444,200 +45459,210 @@ ${err?.stack || ""}`);
         });
         this.localPort = options.localPort || DEFAULT_DAEMON_PORT;
         const workingDir = options.workingDir || process.cwd();
-        if (isDaemonRunning()) {
-          console.log(import_chalk2.default.yellow("\n\u26A0 ADHDev Daemon is already running."));
-          console.log(import_chalk2.default.gray(`  Stop with: adhdev daemon:stop
+        let pidWritten = false;
+        try {
+          if (isDaemonRunning()) {
+            console.log(import_chalk2.default.yellow("\n\u26A0 ADHDev Daemon is already running."));
+            console.log(import_chalk2.default.gray(`  Stop with: adhdev daemon:stop
 `));
-          return;
-        }
-        writeDaemonPid(process.pid);
-        const config2 = loadConfig();
-        const authToken = config2.machineSecret;
-        if (!authToken) {
-          console.log(import_chalk2.default.red("\n\u2717 No machine secret found."));
-          if (config2.connectionToken) {
-            console.log(import_chalk2.default.yellow("  Legacy connectionToken detected \u2014 please re-run setup."));
-          }
-          console.log(import_chalk2.default.gray("  Run `adhdev setup` first.\n"));
-          process.exit(1);
-        }
-        const sessionHostEndpoint = await ensureSessionHostReady2();
-        this.components = await initDaemonComponents({
-          providerLogFn: LOG.forComponent("Provider").asLogFn(),
-          cliManagerDeps: {
-            getServerConn: () => this.serverConn,
-            getP2p: () => this.p2p,
-            onStatusChange: () => this.statusReporter?.onStatusChange(),
-            removeAgentTracking: (key) => this.statusReporter?.removeAgentTracking(key),
-            createPtyTransportFactory: ({ runtimeId, providerType, workspace, cliArgs, attachExisting }) => new SessionHostPtyTransportFactory({
-              endpoint: sessionHostEndpoint,
-              clientId: `daemon_${config2.machineId}`,
-              runtimeId,
-              providerType,
-              workspace,
-              appName: process.env.ADHDEV_SESSION_HOST_NAME || "adhdev",
-              meta: {
-                cliArgs
-              },
-              attachExisting
-            }),
-            listHostedCliRuntimes: async () => listHostedCliRuntimes2(sessionHostEndpoint)
-          },
-          enabledIdes: config2.enabledIdes,
-          onStatusChange: () => this.statusReporter?.onStatusChange(),
-          onPostChatCommand: () => {
-            setTimeout(() => this.statusReporter?.throttledReport(), 1e3);
-            setTimeout(() => this.statusReporter?.throttledReport(), 3e3);
-          },
-          getCdpLogFn: (ideType) => LOG.forComponent(`CDP:${ideType}`).asLogFn(),
-          onCdpManagerSetup: (ideType) => {
-            if (this.ideType === "unknown") this.ideType = ideType;
-          },
-          onStreamsUpdated: (ideType, streams) => {
-            if (!this.components) return;
-            forwardAgentStreamsToIdeInstance(this.components.instanceManager, ideType, streams);
+            return;
           }
-        });
-        await this.components.cliManager.restoreHostedSessions();
-        this.components.providerLoader.fetchLatest().then(({ updated }) => {
-          if (updated) {
-            this.components.providerLoader.reload();
-            this.components.providerLoader.registerToDetector();
-            LOG.info("Provider", "Providers auto-updated from upstream");
-          }
-        }).catch(() => {
-        });
-        const instanceId = `daemon_${config2.machineId}`;
-        this.serverConn = new ServerConnection({
-          serverUrl: options.serverUrl || config2.serverUrl,
-          token: authToken,
-          daemonVersion: pkgVersion,
-          cliInfo: {
-            type: "adhdev-daemon",
-            version: pkgVersion,
-            platform: os19.platform(),
-            hostname: os19.hostname(),
-            machineId: config2.machineId,
-            instanceId
+          writeDaemonPid(process.pid);
+          pidWritten = true;
+          const config2 = loadConfig();
+          const authToken = config2.machineSecret;
+          if (!authToken) {
+            console.log(import_chalk2.default.red("\n\u2717 No machine secret found."));
+            if (config2.connectionToken) {
+              console.log(import_chalk2.default.yellow("  Legacy connectionToken detected \u2014 please re-run setup."));
+            }
+            console.log(import_chalk2.default.gray("  Run `adhdev setup` first.\n"));
+            process.exit(1);
           }
-        });
-        this.p2p = new DaemonP2PSender(this.serverConn);
-        if (this.p2p.isAvailable) {
-          console.log(import_chalk2.default.green("  \u{1F517} P2P available (node-datachannel)"));
-          this.p2p.onInput(async (event) => {
-            return this.components.commandHandler.handle("cdp_remote_action", event);
-          });
-          this.p2p.onCommand(async (cmdType, data, id) => {
-            return this.handleP2PCommand(cmdType, data);
-          });
-          this.p2p.onFileRequest(async (req) => {
-            const handler = this.components.commandHandler;
-            if (req.type === "read") {
-              const result = await handler.handle("file_read", { path: req.path });
-              return { id: req.id, success: result.success, content: result.content, error: result.error };
-            } else if (req.type === "write") {
-              const result = await handler.handle("file_write", { path: req.path, content: req.content });
-              return { id: req.id, success: result.success, error: result.error };
-            } else {
-              const result = await handler.handle("file_list", { path: req.path });
-              return { id: req.id, success: result.success, entries: result.files, error: result.error };
+          const sessionHostEndpoint = await ensureSessionHostReady2();
+          this.sessionHostEndpoint = sessionHostEndpoint;
+          this.components = await initDaemonComponents({
+            providerLogFn: LOG.forComponent("Provider").asLogFn(),
+            cliManagerDeps: {
+              getServerConn: () => this.serverConn,
+              getP2p: () => this.p2p,
+              onStatusChange: () => this.statusReporter?.onStatusChange(),
+              removeAgentTracking: (key) => this.statusReporter?.removeAgentTracking(key),
+              createPtyTransportFactory: ({ runtimeId, providerType, workspace, cliArgs, attachExisting }) => new SessionHostPtyTransportFactory({
+                endpoint: sessionHostEndpoint,
+                clientId: `daemon_${config2.machineId}`,
+                runtimeId,
+                providerType,
+                workspace,
+                appName: process.env.ADHDEV_SESSION_HOST_NAME || "adhdev",
+                meta: {
+                  cliArgs
+                },
+                attachExisting
+              }),
+              listHostedCliRuntimes: async () => listHostedCliRuntimes2(sessionHostEndpoint)
+            },
+            enabledIdes: config2.enabledIdes,
+            onStatusChange: () => this.statusReporter?.onStatusChange(),
+            onPostChatCommand: () => {
+              setTimeout(() => this.statusReporter?.throttledReport(), 1e3);
+              setTimeout(() => this.statusReporter?.throttledReport(), 3e3);
+            },
+            getCdpLogFn: (ideType) => LOG.forComponent(`CDP:${ideType}`).asLogFn(),
+            onCdpManagerSetup: (ideType) => {
+              if (this.ideType === "unknown") this.ideType = ideType;
+            },
+            onStreamsUpdated: (ideType, streams) => {
+              if (!this.components) return;
+              forwardAgentStreamsToIdeInstance(this.components.instanceManager, ideType, streams);
             }
           });
-          this.p2p.onPtyInput((cliId, data) => {
-            const found = this.components.cliManager.findAdapter(cliId, { instanceKey: cliId });
-            if (found && typeof found.adapter.writeRaw === "function") {
-              found.adapter.writeRaw(data);
-            }
+          await this.components.cliManager.restoreHostedSessions();
+          this.components.providerLoader.fetchLatest().then(({ updated }) => {
+            if (updated) {
+              this.components.providerLoader.reload();
+              this.components.providerLoader.registerToDetector();
+              LOG.info("Provider", "Providers auto-updated from upstream");
+            }
+          }).catch(() => {
           });
-          this.p2p.onPtyResize((cliId, cols, rows) => {
-            const found = this.components.cliManager.findAdapter(cliId, { instanceKey: cliId });
-            if (found && typeof found.adapter.resize === "function") {
-              found.adapter.resize(cols, rows);
+          const instanceId = `daemon_${config2.machineId}`;
+          this.serverConn = new ServerConnection({
+            serverUrl: options.serverUrl || config2.serverUrl,
+            token: authToken,
+            daemonVersion: pkgVersion,
+            cliInfo: {
+              type: "adhdev-daemon",
+              version: pkgVersion,
+              platform: os19.platform(),
+              hostname: os19.hostname(),
+              machineId: config2.machineId,
+              instanceId
             }
           });
-          this.p2p.onStateChange((state) => {
-            if (state === "connected") {
-              LOG.info("P2P", "Peer connected \u2192 sending immediate full status report");
-              this.statusReporter?.resetP2PHash();
-              this.statusReporter?.sendUnifiedStatusReport().catch((e) => LOG.warn("P2P", `Immediate status report failed: ${e?.message}`));
-              setTimeout(() => {
+          this.p2p = new DaemonP2PSender(this.serverConn);
+          if (this.p2p.isAvailable) {
+            console.log(import_chalk2.default.green("  \u{1F517} P2P available (node-datachannel)"));
+            this.p2p.onInput(async (event) => {
+              return this.components.commandHandler.handle("cdp_remote_action", event);
+            });
+            this.p2p.onCommand(async (cmdType, data, id) => {
+              return this.handleP2PCommand(cmdType, data);
+            });
+            this.p2p.onFileRequest(async (req) => {
+              const handler = this.components.commandHandler;
+              if (req.type === "read") {
+                const result = await handler.handle("file_read", { path: req.path });
+                return { id: req.id, success: result.success, content: result.content, error: result.error };
+              } else if (req.type === "write") {
+                const result = await handler.handle("file_write", { path: req.path, content: req.content });
+                return { id: req.id, success: result.success, error: result.error };
+              } else {
+                const result = await handler.handle("file_list", { path: req.path });
+                return { id: req.id, success: result.success, entries: result.files, error: result.error };
+              }
+            });
+            this.p2p.onPtyInput((cliId, data) => {
+              const found = this.components.cliManager.findAdapter(cliId, { instanceKey: cliId });
+              if (found && typeof found.adapter.writeRaw === "function") {
+                found.adapter.writeRaw(data);
+              }
+            });
+            this.p2p.onPtyResize((cliId, cols, rows) => {
+              const found = this.components.cliManager.findAdapter(cliId, { instanceKey: cliId });
+              if (found && typeof found.adapter.resize === "function") {
+                found.adapter.resize(cols, rows);
+              }
+            });
+            this.p2p.onStateChange((state) => {
+              if (state === "connected") {
+                LOG.info("P2P", "Peer connected \u2192 sending immediate full status report");
                 this.statusReporter?.resetP2PHash();
-                this.statusReporter?.sendUnifiedStatusReport().catch(() => {
-                });
-              }, 2e3);
+                this.statusReporter?.sendUnifiedStatusReport().catch((e) => LOG.warn("P2P", `Immediate status report failed: ${e?.message}`));
+                setTimeout(() => {
+                  this.statusReporter?.resetP2PHash();
+                  this.statusReporter?.sendUnifiedStatusReport().catch(() => {
+                  });
+                }, 2e3);
+              }
+            });
+            const planLimits = this.serverConn.getPlanLimits();
+            this.screenshotController = new ScreenshotController({
+              isRunning: () => this.running,
+              isScreenshotActive: () => this.p2p?.screenshotActive ?? false,
+              getScreenshotIdeType: () => this.p2p?.screenshotIdeType,
+              isUsingRelay: () => this.p2p?.isUsingRelay ?? false,
+              hasAnyNeedingFirstFrame: () => this.p2p?.hasAnyNeedingFirstFrame() ?? false,
+              getCdp: (ideType) => {
+                if (ideType) return this.getCdpFor(ideType);
+                LOG.warn("P2P", "Screenshot requested without ideType \u2014 cannot determine target IDE. Skipping frame.");
+                return null;
+              },
+              sendScreenshotBuffer: (buf) => this.p2p.sendScreenshotBuffer(buf)
+            }, planLimits ?? void 0);
+            this.screenshotController.start();
+            this.p2p.onScreenshotStart(() => this.screenshotController?.triggerImmediate());
+          } else {
+            console.log(import_chalk2.default.gray("  \u26A0 P2P unavailable \u2014 using server relay"));
+          }
+          this.registerServerHandlers();
+          this.serverConn.on("auth_ok", (msg) => {
+            const serverNickname = msg.payload?.machineNickname;
+            if (serverNickname === void 0) return;
+            const nextNickname = typeof serverNickname === "string" && serverNickname.trim() ? serverNickname.trim() : null;
+            const latestConfig = loadConfig();
+            if ((latestConfig.machineNickname || null) === nextNickname) return;
+            latestConfig.machineNickname = nextNickname;
+            saveConfig(latestConfig);
+            LOG.info("Server", `[ServerConn] Synced machine nickname from server: ${nextNickname || "(cleared)"}`);
+            this.statusReporter?.throttledReport();
+          });
+          this.serverConn.onStateChange((state) => {
+            if (state === "connected") {
+              console.log(import_chalk2.default.green("  \u{1F4E1} Connected to ADHDev server"));
+              this.statusReporter?.sendUnifiedStatusReport();
+            } else if (state === "disconnected") {
+              console.log(import_chalk2.default.yellow("  \u26A0 Server disconnected, will reconnect..."));
             }
           });
-          const planLimits = this.serverConn.getPlanLimits();
-          this.screenshotController = new ScreenshotController({
-            isRunning: () => this.running,
-            isScreenshotActive: () => this.p2p?.screenshotActive ?? false,
-            getScreenshotIdeType: () => this.p2p?.screenshotIdeType,
-            isUsingRelay: () => this.p2p?.isUsingRelay ?? false,
-            hasAnyNeedingFirstFrame: () => this.p2p?.hasAnyNeedingFirstFrame() ?? false,
-            getCdp: (ideType) => {
-              if (ideType) return this.getCdpFor(ideType);
-              LOG.warn("P2P", "Screenshot requested without ideType \u2014 cannot determine target IDE. Skipping frame.");
-              return null;
-            },
-            sendScreenshotBuffer: (buf) => this.p2p.sendScreenshotBuffer(buf)
-          }, planLimits ?? void 0);
-          this.screenshotController.start();
-          this.p2p.onScreenshotStart(() => this.screenshotController?.triggerImmediate());
-        } else {
-          console.log(import_chalk2.default.gray("  \u26A0 P2P unavailable \u2014 using server relay"));
-        }
-        this.registerServerHandlers();
-        this.serverConn.on("auth_ok", (msg) => {
-          const serverNickname = msg.payload?.machineNickname;
-          if (serverNickname === void 0) return;
-          const nextNickname = typeof serverNickname === "string" && serverNickname.trim() ? serverNickname.trim() : null;
-          const latestConfig = loadConfig();
-          if ((latestConfig.machineNickname || null) === nextNickname) return;
-          latestConfig.machineNickname = nextNickname;
-          saveConfig(latestConfig);
-          LOG.info("Server", `[ServerConn] Synced machine nickname from server: ${nextNickname || "(cleared)"}`);
-          this.statusReporter?.throttledReport();
-        });
-        this.serverConn.onStateChange((state) => {
-          if (state === "connected") {
-            console.log(import_chalk2.default.green("  \u{1F4E1} Connected to ADHDev server"));
-            this.statusReporter?.sendUnifiedStatusReport();
-          } else if (state === "disconnected") {
-            console.log(import_chalk2.default.yellow("  \u26A0 Server disconnected, will reconnect..."));
-          }
-        });
-        await this.serverConn.connect();
-        this.statusReporter = new DaemonStatusReporter({
-          serverConn: this.serverConn,
-          cdpManagers: this.components.cdpManagers,
-          p2p: this.p2p,
-          providerLoader: this.components.providerLoader,
-          detectedIdes: this.components.detectedIdes.value,
-          instanceId,
-          daemonVersion: pkgVersion,
-          instanceManager: this.components.instanceManager,
-          getScreenshotUsage: () => this.screenshotController?.getUsageStats() || null
-        });
-        this.statusReporter.startReporting();
-        this.components.instanceManager.onEvent((event) => {
-          this.statusReporter?.emitStatusEvent(event);
-        });
-        this.running = true;
-        process.on("SIGINT", () => this.stop());
-        process.on("SIGTERM", () => this.stop());
-        if (options.dev && this.components) {
-          const devServer = new DevServer({
-            providerLoader: this.components.providerLoader,
+          await this.serverConn.connect();
+          this.statusReporter = new DaemonStatusReporter({
+            serverConn: this.serverConn,
             cdpManagers: this.components.cdpManagers,
+            p2p: this.p2p,
+            providerLoader: this.components.providerLoader,
+            detectedIdes: this.components.detectedIdes.value,
+            instanceId,
+            daemonVersion: pkgVersion,
             instanceManager: this.components.instanceManager,
-            cliManager: this.components.cliManager
+            getScreenshotUsage: () => this.screenshotController?.getUsageStats() || null
           });
-          await devServer.start();
-        }
-        this.printBanner(options, config2.serverUrl);
-        if (options.foreground) {
-          await new Promise(() => {
+          this.statusReporter.startReporting();
+          this.components.instanceManager.onEvent((event) => {
+            this.statusReporter?.emitStatusEvent(event);
           });
+          this.running = true;
+          process.on("SIGINT", () => this.stop());
+          process.on("SIGTERM", () => this.stop());
+          if (options.dev && this.components) {
+            const devServer = new DevServer({
+              providerLoader: this.components.providerLoader,
+              cdpManagers: this.components.cdpManagers,
+              instanceManager: this.components.instanceManager,
+              cliManager: this.components.cliManager
+            });
+            await devServer.start();
+          }
+          this.printBanner(options, config2.serverUrl);
+          if (options.foreground) {
+            await new Promise(() => {
+            });
+          }
+        } catch (error48) {
+          if (!this.running && pidWritten) {
+            removeDaemonPid();
+          }
+          throw error48;
         }
       }
       printBanner(options, serverUrl) {
@@ -45717,6 +45742,26 @@ ${err?.stack || ""}`);
         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" };
+              if (!this.sessionHostEndpoint) return { success: false, error: "Session host unavailable" };
+              const client = new SessionHostClient({ endpoint: this.sessionHostEndpoint });
+              try {
+                await client.connect();
+                const snapshot = await client.request({
+                  type: "get_snapshot",
+                  payload: { sessionId }
+                });
+                if (!snapshot.success || !snapshot.result) {
+                  return { success: false, error: snapshot.error || "Runtime snapshot unavailable" };
+                }
+                return { success: true, result: snapshot.result };
+              } finally {
+                await client.close().catch(() => {
+                });
+              }
+            }
             case "get_cli_history": {
               const config2 = loadConfig();
               logCommand({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd: cmdType, source: "p2p", success: true, durationMs: Date.now() - cmdStart });