@adhdev/daemon-standalone 0.8.24 → 0.8.27

package/dist/index.js

@@ -28512,18 +28512,18 @@ var require_dist2 = __commonJS({
         };
       }
     });
-    var import_session_host_core2;
+    var import_session_host_core3;
     var init_spawn_env = __esm2({
       "src/cli-adapters/spawn-env.ts"() {
         "use strict";
-        import_session_host_core2 = require_dist();
+        import_session_host_core3 = require_dist();
       }
     });
     function loadNodePty() {
       if (cachedPty !== void 0) return cachedPty;
       try {
         cachedPty = require("node-pty");
-        (0, import_session_host_core2.ensureNodePtySpawnHelperPermissions)();
+        (0, import_session_host_core3.ensureNodePtySpawnHelperPermissions)();
       } catch {
         cachedPty = null;
       }
@@ -28830,7 +28830,7 @@ var require_dist2 = __commonJS({
         init_terminal_screen();
         init_pty_transport();
         init_spawn_env();
-        buildCliSpawnEnv = import_session_host_core2.sanitizeSpawnEnv;
+        buildCliSpawnEnv = import_session_host_core3.sanitizeSpawnEnv;
         ProviderCliAdapter = class _ProviderCliAdapter {
           constructor(provider, workingDir, extraArgs = [], transportFactory = new NodePtyTransportFactory()) {
             this.extraArgs = extraArgs;
@@ -32969,6 +32969,7 @@ ${data.message || ""}`.trim();
       currentStatus = "idle";
       agentStreams = [];
       messages = [];
+      prevMessageHashes = /* @__PURE__ */ new Map();
       activeModal = null;
       currentModel = "";
       currentMode = "";
@@ -33034,7 +33035,7 @@ ${data.message || ""}`.trim();
       onEvent(event, data) {
         if (event === "stream_update") {
           if (data?.streams) this.agentStreams = data.streams;
-          if (data?.messages) this.messages = data.messages;
+          if (data?.messages) this.messages = this.assignReceivedAt(data.messages);
           if (data?.activeModal !== void 0) this.activeModal = data.activeModal;
           if (data?.model) this.currentModel = data.model;
           if (data?.mode) this.currentMode = data.mode;
@@ -33060,6 +33061,7 @@ ${data.message || ""}`.trim();
       dispose() {
         this.agentStreams = [];
         this.messages = [];
+        this.prevMessageHashes.clear();
         this.monitor.reset();
         this.appliedEffectKeys.clear();
         this.runtimeMessages = [];
@@ -33215,6 +33217,23 @@ ${data.message || ""}`.trim();
           this.chatId || this.instanceId
         );
       }
+      /**
+       * Assign stable receivedAt to extension messages.
+       * Same pattern as IdeProviderInstance.readChat() prevByHash —
+       * preserves first-seen timestamp across polling cycles.
+       */
+      assignReceivedAt(messages) {
+        const now = Date.now();
+        const nextHashes = /* @__PURE__ */ new Map();
+        for (const msg of messages) {
+          const hash2 = `${msg.role}:${(msg.content || "").slice(0, 100)}`;
+          const prevTime = this.prevMessageHashes.get(hash2);
+          msg.receivedAt = prevTime || now;
+          nextHashes.set(hash2, msg.receivedAt);
+        }
+        this.prevMessageHashes = nextHashes;
+        return messages;
+      }
       mergeConversationMessages(messages) {
         if (this.runtimeMessages.length === 0) return messages;
         return [...messages, ...this.runtimeMessages.map((entry) => entry.message)].map((message, index) => ({ message, index })).sort((a, b2) => {
@@ -33271,6 +33290,7 @@ ${effect.notification.body || ""}`.trim();
         }
         this.agentStreams = [];
         this.messages = [];
+        this.prevMessageHashes.clear();
         this.activeModal = null;
         this.currentModel = "";
         this.currentMode = "";
@@ -34246,16 +34266,28 @@ ${effect.notification.body || ""}`.trim();
       if (!message || typeof message !== "object") return message;
       return trimStructuredStrings(message, stringLimit);
     }
+    function normalizeMessageTime(message) {
+      if (!message || typeof message !== "object") return message;
+      const msg = message;
+      if (msg.receivedAt == null) {
+        const fallback = msg.timestamp ?? msg.createdAt;
+        if (fallback != null) {
+          const ts22 = typeof fallback === "string" ? Date.parse(fallback) : Number(fallback);
+          if (Number.isFinite(ts22) && ts22 > 0) msg.receivedAt = ts22;
+        }
+      }
+      return msg;
+    }
     function trimMessagesForStatus(messages) {
       if (!Array.isArray(messages) || messages.length === 0) return [];
       const recent = messages.slice(-STATUS_ACTIVE_CHAT_MESSAGE_LIMIT);
       const kept = [];
       let totalBytes = 0;
       for (let i = recent.length - 1; i >= 0; i -= 1) {
-        let normalized = trimMessageForStatus(recent[i], STATUS_ACTIVE_CHAT_STRING_LIMIT);
+        let normalized = normalizeMessageTime(trimMessageForStatus(recent[i], STATUS_ACTIVE_CHAT_STRING_LIMIT));
         let size = estimateBytes(normalized);
         if (size > STATUS_ACTIVE_CHAT_TOTAL_BYTES_LIMIT) {
-          normalized = trimMessageForStatus(recent[i], STATUS_ACTIVE_CHAT_FALLBACK_STRING_LIMIT);
+          normalized = normalizeMessageTime(trimMessageForStatus(recent[i], STATUS_ACTIVE_CHAT_FALLBACK_STRING_LIMIT));
           size = estimateBytes(normalized);
         }
         if (kept.length > 0 && totalBytes + size > STATUS_ACTIVE_CHAT_TOTAL_BYTES_LIMIT) {
@@ -34564,6 +34596,49 @@ ${effect.notification.body || ""}`.trim();
       }
       return sessions;
     }
+    function upsertSessionTarget(sessionRegistry, target) {
+      const existing = sessionRegistry.get(target.sessionId);
+      if (existing && existing.parentSessionId === target.parentSessionId && existing.providerType === target.providerType && existing.transport === target.transport && existing.cdpManagerKey === target.cdpManagerKey && existing.instanceKey === target.instanceKey) {
+        return;
+      }
+      sessionRegistry.register(target);
+    }
+    function reconcileIdeRuntimeSessions(instanceManager, sessionRegistry) {
+      if (!instanceManager || !sessionRegistry) return;
+      for (const instanceKey of instanceManager.listInstanceIds()) {
+        if (!instanceKey.startsWith("ide:")) continue;
+        const ideInstance = instanceManager.getInstance(instanceKey);
+        if (!ideInstance || ideInstance.category !== "ide" || typeof ideInstance.getInstanceId !== "function") {
+          continue;
+        }
+        const managerKey = instanceKey.slice(4);
+        const ideType = typeof ideInstance.type === "string" && ideInstance.type.trim() ? ideInstance.type.trim() : managerKey.split("_")[0];
+        const parentSessionId = ideInstance.getInstanceId();
+        if (!parentSessionId) continue;
+        upsertSessionTarget(sessionRegistry, {
+          sessionId: parentSessionId,
+          parentSessionId: null,
+          providerType: ideType,
+          transport: "cdp-page",
+          cdpManagerKey: managerKey,
+          instanceKey
+        });
+        const extensions = ideInstance.getExtensionInstances?.() || [];
+        for (const ext of extensions) {
+          const extType = typeof ext?.type === "string" ? ext.type.trim() : "";
+          const extSessionId = ext?.getInstanceId?.();
+          if (!extType || !extSessionId) continue;
+          upsertSessionTarget(sessionRegistry, {
+            sessionId: extSessionId,
+            parentSessionId,
+            providerType: extType,
+            transport: "cdp-webview",
+            cdpManagerKey: managerKey,
+            instanceKey
+          });
+        }
+      }
+    }
     init_logger();
     init_logger();
     var RECENT_SEND_WINDOW_MS = 1200;
@@ -34827,7 +34902,7 @@ ${effect.notification.body || ""}`.trim();
       if (isExtensionTransport(transport)) {
         _log(`Extension: ${provider?.type || "unknown_extension"}`);
         try {
-          const evalResult = await h.evaluateProviderScript("sendMessage", { MESSAGE: text }, 3e4);
+          const evalResult = await h.evaluateProviderScript("sendMessage", { message: text }, 3e4);
           if (evalResult?.result) {
             const parsed = parseMaybeJson(evalResult.result);
             if (didProviderConfirmSend(parsed)) {
@@ -34858,7 +34933,7 @@ ${effect.notification.body || ""}`.trim();
         return { success: false, error: `CDP for ${managerKey || "unknown"} not connected` };
       }
       _log(`Targeting IDE: ${getCurrentManagerKey(h)}`);
-      const sendScript = h.getProviderScript("sendMessage", { MESSAGE: text });
+      const sendScript = h.getProviderScript("sendMessage", { message: text });
       if (sendScript) {
         try {
           const result = await targetCdp.evaluate(sendScript, 3e4);
@@ -36252,9 +36327,26 @@ ${effect.notification.body || ""}`.trim();
         if (provider?.scripts) {
           const fn2 = provider.scripts[scriptName];
           if (typeof fn2 === "function") {
-            const firstVal = params ? Object.values(params)[0] : void 0;
-            const script = firstVal ? fn2(firstVal) : fn2();
-            if (script) return script;
+            if (params && Object.keys(params).length > 0) {
+              const firstVal = Object.values(params)[0];
+              if (scriptName === "sendMessage" && typeof firstVal === "string") {
+                const legacyScript = fn2(firstVal);
+                if (legacyScript) return legacyScript;
+              }
+              const script = fn2(params);
+              if (script) {
+                const likelyLegacyObjectLeak = typeof script === "string" && script.includes("[object Object]") && typeof firstVal === "string";
+                if (!likelyLegacyObjectLeak) return script;
+              }
+              if (firstVal !== void 0) {
+                const legacyScript = fn2(firstVal);
+                if (legacyScript) return legacyScript;
+              }
+              if (script) return script;
+            } else {
+              const script = fn2();
+              if (script) return script;
+            }
           }
         }
         return null;
@@ -36310,17 +36402,27 @@ ${effect.notification.body || ""}`.trim();
         return key.split("_")[0];
       }
       resolveRoute(args) {
-        const session = this._ctx.sessionRegistry?.get(args?.targetSessionId);
-        const managerKey = this.extractIdeType(args);
-        const providerType = args?.agentType || args?.providerType || session?.providerType || this.inferProviderType(managerKey);
-        return { session, managerKey, providerType };
+        const targetSessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : "";
+        let session = targetSessionId ? this._ctx.sessionRegistry?.get(targetSessionId) : void 0;
+        if (targetSessionId && !session) {
+          reconcileIdeRuntimeSessions(this._ctx.instanceManager, this._ctx.sessionRegistry);
+          session = this._ctx.sessionRegistry?.get(targetSessionId);
+        }
+        const sessionLookupFailed = !!targetSessionId && !session;
+        const managerKey = this.extractIdeType(args, sessionLookupFailed);
+        let providerType;
+        if (!sessionLookupFailed) {
+          providerType = session?.providerType || args?.agentType || args?.providerType || this.inferProviderType(managerKey);
+        }
+        return { session, managerKey, providerType, sessionLookupFailed };
       }
       /** Extract CDP scope key from target session or explicit ideType */
-      extractIdeType(args) {
+      extractIdeType(args, sessionLookupFailed = false) {
         if (args?.targetSessionId) {
           const target = this._ctx.sessionRegistry?.get(args.targetSessionId);
           if (target?.cdpManagerKey) return target.cdpManagerKey;
           if (this._ctx.cdpManagers.has(args.targetSessionId)) return args.targetSessionId;
+          if (sessionLookupFailed) return void 0;
         }
         if (args?.ideType) {
           const target = this._ctx.sessionRegistry?.get(args.ideType);
@@ -36367,6 +36469,33 @@ ${effect.notification.body || ""}`.trim();
         this._currentRoute = this.resolveRoute(args);
         const startedAt = Date.now();
         this.logCommandStart(cmd, args);
+        const sessionScopedCommands = /* @__PURE__ */ new Set([
+          "read_chat",
+          "send_chat",
+          "list_chats",
+          "new_chat",
+          "switch_chat",
+          "set_mode",
+          "change_model",
+          "set_thought_level",
+          "resolve_action",
+          "focus_session",
+          "pty_input",
+          "pty_resize",
+          "invoke_provider_script",
+          "list_extension_models",
+          "set_extension_model",
+          "list_extension_modes",
+          "set_extension_mode"
+        ]);
+        if (this._currentRoute.sessionLookupFailed && sessionScopedCommands.has(cmd)) {
+          const result2 = {
+            success: false,
+            error: `Live session not found for targetSessionId: ${String(args?.targetSessionId || "").trim() || "unknown"}`
+          };
+          this.logCommandEnd(cmd, result2, startedAt);
+          return result2;
+        }
         let result;
         if (!this._currentRoute.session && !this._currentRoute.managerKey && !this._currentRoute.providerType) {
           const cdpCommands = ["send_chat", "read_chat", "list_chats", "new_chat", "switch_chat", "set_mode", "change_model", "set_thought_level", "resolve_action"];
@@ -36674,6 +36803,7 @@ ${effect.notification.body || ""}`.trim();
           this.detectStatusTransition();
         });
         await this.adapter.spawn();
+        this.maybeAppendRuntimeRecoveryMessage(this.adapter.getRuntimeMetadata());
         if (this.providerSessionId) {
           const restoredHistory = readChatHistory(this.type, 0, 200, this.providerSessionId);
           if (restoredHistory.messages.length > 0) {
@@ -36768,6 +36898,7 @@ ${effect.notification.body || ""}`.trim();
           this.promoteProviderSessionId(parsedProviderSessionId);
         }
         const runtime = this.adapter.getRuntimeMetadata();
+        this.maybeAppendRuntimeRecoveryMessage(runtime);
         const parsedMessages = Array.isArray(parsedStatus?.messages) ? parsedStatus.messages : [];
         const controlValues = extractProviderControlValues(this.provider.controls, parsedStatus);
         if (controlValues) {
@@ -37094,6 +37225,28 @@ ${effect.notification.body || ""}`.trim();
         const pad = (value) => String(value).padStart(2, "0");
         return `${date5.getFullYear()}-${pad(date5.getMonth() + 1)}-${pad(date5.getDate())} ${pad(date5.getHours())}:${pad(date5.getMinutes())}:${pad(date5.getSeconds())}`;
       }
+      maybeAppendRuntimeRecoveryMessage(runtime) {
+        if (!runtime?.restoredFromStorage || !runtime.runtimeId) return;
+        const recoveryState = String(runtime.recoveryState || "").trim();
+        if (!recoveryState) return;
+        let content = "";
+        if (recoveryState === "auto_resumed") {
+          content = "Session host restored this CLI after restart and reattached it from a saved snapshot.";
+        } else if (recoveryState === "resume_failed") {
+          const errorSuffix = runtime.recoveryError ? ` Resume failed: ${runtime.recoveryError}` : "";
+          content = `Session host found this CLI after restart, but automatic resume failed.${errorSuffix}`;
+        } else if (recoveryState === "host_restart_interrupted") {
+          content = "Session host found this CLI in interrupted state after restart and is attempting to resume it.";
+        } else if (recoveryState === "orphan_snapshot") {
+          content = "Session host restored the last snapshot for this CLI, but the original runtime was not resumed automatically.";
+        } else {
+          content = `Session host restored this CLI after restart (${recoveryState}).`;
+        }
+        this.appendRuntimeSystemMessage(
+          content,
+          `runtime_recovery:${runtime.runtimeId}:${recoveryState}`
+        );
+      }
       appendRuntimeSystemMessage(content, dedupKey, receivedAt = Date.now()) {
         const normalizedContent = String(content || "").trim();
         if (!normalizedContent) return;
@@ -40360,17 +40513,17 @@ Run 'adhdev doctor' for detailed diagnostics.`
     function getSessionMessageUpdatedAt(session) {
       const lastMessage = session.activeChat?.messages?.at?.(-1);
       if (!lastMessage) return 0;
-      return parseMessageTime(lastMessage.timestamp) || parseMessageTime(lastMessage.receivedAt) || parseMessageTime(lastMessage.createdAt) || 0;
+      return parseMessageTime(lastMessage.receivedAt) || 0;
     }
     function getSessionCompletionMarker(session) {
       const lastMessage = session.activeChat?.messages?.at?.(-1);
       if (!lastMessage) return "";
       const role = typeof lastMessage.role === "string" ? lastMessage.role : "";
-      if (role === "user" || role === "human") return "";
+      if (role === "user" || role === "human" || role === "system") return "";
       if (typeof lastMessage._turnKey === "string" && lastMessage._turnKey) return `turn:${lastMessage._turnKey}`;
       if (typeof lastMessage.id === "string" && lastMessage.id) return `id:${lastMessage.id}`;
       if (typeof lastMessage.index === "number" && Number.isFinite(lastMessage.index)) return `idx:${lastMessage.index}`;
-      const timestamp = parseMessageTime(lastMessage.timestamp) || parseMessageTime(lastMessage.receivedAt) || parseMessageTime(lastMessage.createdAt);
+      const timestamp = parseMessageTime(lastMessage.receivedAt);
       return timestamp > 0 ? `ts:${timestamp}` : "";
     }
     function getSessionLastUsedAt(session) {
@@ -40387,7 +40540,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       if (status === "generating" || status === "starting") {
         return { unread: false, inboxBucket: "working" };
       }
-      const unread = completionMarker ? completionMarker !== seenCompletionMarker : hasContentChange && lastUsedAt > lastSeenAt && lastRole !== "user" && lastRole !== "human";
+      const unread = completionMarker ? completionMarker !== seenCompletionMarker : hasContentChange && lastUsedAt > lastSeenAt && lastRole !== "user" && lastRole !== "human" && lastRole !== "system";
       return { unread, inboxBucket: unread ? "task_complete" : "idle" };
     }
     function buildRecentLaunches(recentActivity) {
@@ -40668,6 +40821,25 @@ Run 'adhdev doctor' for detailed diagnostics.`
       "change_model"
     ];
     var READ_DEBUG_ENABLED2 = process.argv.includes("--dev") || process.env.ADHDEV_READ_DEBUG === "1";
+    function toHostedCliRuntimeDescriptor(record2) {
+      if (!record2 || typeof record2 !== "object") return null;
+      const runtimeId = typeof record2.sessionId === "string" ? record2.sessionId : "";
+      const cliType = typeof record2.providerType === "string" ? record2.providerType : "";
+      const workspace = typeof record2.workspace === "string" ? record2.workspace : "";
+      if (!runtimeId || !cliType || !workspace) return null;
+      return {
+        runtimeId,
+        runtimeKey: typeof record2.runtimeKey === "string" ? record2.runtimeKey : void 0,
+        displayName: typeof record2.displayName === "string" ? record2.displayName : void 0,
+        workspaceLabel: typeof record2.workspaceLabel === "string" ? record2.workspaceLabel : void 0,
+        lifecycle: typeof record2.lifecycle === "string" ? record2.lifecycle : void 0,
+        recoveryState: typeof record2.meta?.runtimeRecoveryState === "string" ? String(record2.meta.runtimeRecoveryState) : null,
+        cliType,
+        workspace,
+        cliArgs: Array.isArray(record2.meta?.cliArgs) ? record2.meta.cliArgs : [],
+        providerSessionId: typeof record2.meta?.providerSessionId === "string" ? String(record2.meta.providerSessionId) : void 0
+      };
+    }
     var DaemonCommandRouter = class {
       deps;
       constructor(deps) {
@@ -40741,6 +40913,90 @@ Run 'adhdev doctor' for detailed diagnostics.`
               return { success: false, error: e.message };
             }
           }
+          case "session_host_get_diagnostics": {
+            if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+            const diagnostics = await this.deps.sessionHostControl.getDiagnostics({
+              includeSessions: args?.includeSessions !== false,
+              limit: Number(args?.limit) || void 0
+            });
+            return { success: true, diagnostics };
+          }
+          case "session_host_list_sessions": {
+            if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+            const sessions = await this.deps.sessionHostControl.listSessions();
+            return { success: true, sessions };
+          }
+          case "session_host_stop_session": {
+            if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+            const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
+            if (!sessionId) return { success: false, error: "sessionId required" };
+            const record2 = await this.deps.sessionHostControl.stopSession(sessionId);
+            return { success: true, record: record2 };
+          }
+          case "session_host_resume_session": {
+            if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+            const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
+            if (!sessionId) return { success: false, error: "sessionId required" };
+            const record2 = await this.deps.sessionHostControl.resumeSession(sessionId);
+            const hosted = toHostedCliRuntimeDescriptor(record2);
+            if (hosted) {
+              await this.deps.cliManager.restoreHostedSessions([hosted]);
+            }
+            return { success: true, record: record2 };
+          }
+          case "session_host_restart_session": {
+            if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+            const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
+            if (!sessionId) return { success: false, error: "sessionId required" };
+            const record2 = await this.deps.sessionHostControl.restartSession(sessionId);
+            const hosted = toHostedCliRuntimeDescriptor(record2);
+            if (hosted) {
+              await this.deps.cliManager.restoreHostedSessions([hosted]);
+            }
+            return { success: true, record: record2 };
+          }
+          case "session_host_send_signal": {
+            if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+            const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
+            const signal = typeof args?.signal === "string" ? args.signal : "";
+            if (!sessionId) return { success: false, error: "sessionId required" };
+            if (!signal) return { success: false, error: "signal required" };
+            const record2 = await this.deps.sessionHostControl.sendSignal(sessionId, signal);
+            return { success: true, record: record2 };
+          }
+          case "session_host_force_detach_client": {
+            if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+            const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
+            const clientId = typeof args?.clientId === "string" ? args.clientId : "";
+            if (!sessionId) return { success: false, error: "sessionId required" };
+            if (!clientId) return { success: false, error: "clientId required" };
+            const record2 = await this.deps.sessionHostControl.forceDetachClient(sessionId, clientId);
+            return { success: true, record: record2 };
+          }
+          case "session_host_acquire_write": {
+            if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+            const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
+            const clientId = typeof args?.clientId === "string" ? args.clientId : "";
+            const ownerType = args?.ownerType === "agent" ? "agent" : "user";
+            if (!sessionId) return { success: false, error: "sessionId required" };
+            if (!clientId) return { success: false, error: "clientId required" };
+            const record2 = await this.deps.sessionHostControl.acquireWrite({
+              sessionId,
+              clientId,
+              ownerType,
+              force: args?.force !== false
+            });
+            return { success: true, record: record2 };
+          }
+          case "session_host_release_write": {
+            if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+            const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
+            const clientId = typeof args?.clientId === "string" ? args.clientId : "";
+            if (!sessionId) return { success: false, error: "sessionId required" };
+            if (!clientId) return { success: false, error: "clientId required" };
+            const record2 = await this.deps.sessionHostControl.releaseWrite({ sessionId, clientId });
+            return { success: true, record: record2 };
+          }
           case "list_saved_sessions": {
             const providerType = typeof args?.providerType === "string" ? args.providerType.trim() : typeof args?.agentType === "string" ? args.agentType.trim() : "";
             const kind = args?.kind === "acp" ? "acp" : "cli";
@@ -41261,6 +41517,14 @@ Run 'adhdev doctor' for detailed diagnostics.`
       hasScript(name) {
         return typeof this.provider.scripts?.[name] === "function";
       }
+      parseMaybeJson(raw) {
+        if (typeof raw !== "string") return raw;
+        try {
+          return JSON.parse(raw);
+        } catch {
+          return raw;
+        }
+      }
       summarizeRaw(raw) {
         try {
           if (typeof raw === "string") return raw.replace(/\s+/g, " ").trim().slice(0, 240);
@@ -41321,12 +41585,30 @@ Run 'adhdev doctor' for detailed diagnostics.`
         }
       }
       async sendMessage(evaluate, text) {
-        const script = this.callScript("sendMessage", text);
+        const params = { message: text };
+        const script = this.callScript("sendMessage", params) || this.callScript("sendMessage", text);
         if (!script) throw new Error(`[${this.agentName}] sendMessage script not available`);
         const result = await evaluate(script);
         if (result && typeof result === "string" && result.startsWith("error:")) {
           throw new Error(`[${this.agentName}] sendMessage failed: ${result}`);
         }
+        const parsed = this.parseMaybeJson(result);
+        if (parsed === true) return;
+        if (typeof parsed === "string") {
+          const normalized = parsed.trim().toLowerCase();
+          if (normalized === "ok" || normalized === "sent" || normalized === "success" || normalized === "true") {
+            return;
+          }
+        }
+        if (parsed && typeof parsed === "object") {
+          if (parsed.sent === true || parsed.success === true || parsed.ok === true || parsed.submitted === true || parsed.dispatched === true) {
+            return;
+          }
+          if (typeof parsed.error === "string" && parsed.error.trim()) {
+            throw new Error(`[${this.agentName}] sendMessage failed: ${parsed.error}`);
+          }
+        }
+        throw new Error(`[${this.agentName}] sendMessage was not confirmed`);
       }
       async resolveAction(evaluate, action, button) {
         const script = this.callScript("resolveAction", { action, button });
@@ -41707,6 +41989,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           sessionRegistry
         } = this.deps;
         if (!agentStreamManager || cdpManagers.size === 0) return;
+        reconcileIdeRuntimeSessions(instanceManager, sessionRegistry);
         for (const [ideType, cdp] of cdpManagers) {
           registerExtensionProviders(providerLoader, cdp, ideType);
           const ideInstance = instanceManager.getInstance(`ide:${ideType}`);
@@ -47548,6 +47831,7 @@ data: ${JSON.stringify(msg.data)}
         }
       }
       handleEvent(event) {
+        if (!("sessionId" in event)) return;
         if (event.sessionId !== this.options.runtimeId) return;
         if ((event.type === "session_started" || event.type === "session_resumed") && typeof event.pid === "number") {
           this.currentPid = event.pid;
@@ -47623,7 +47907,10 @@ data: ${JSON.stringify(msg.data)}
             clientId: client.clientId,
             type: client.type,
             readOnly: client.readOnly
-          }))
+          })),
+          restoredFromStorage: record2.meta?.restoredFromStorage === true,
+          recoveryState: typeof record2.meta?.runtimeRecoveryState === "string" ? String(record2.meta.runtimeRecoveryState) : null,
+          recoveryError: typeof record2.meta?.runtimeRecoveryError === "string" ? String(record2.meta.runtimeRecoveryError) : null
         };
       }
       enqueue(action) {
@@ -47659,11 +47946,11 @@ data: ${JSON.stringify(msg.data)}
         });
       }
     };
-    var import_session_host_core3 = require_dist();
+    var import_session_host_core32 = require_dist();
     var STARTUP_TIMEOUT_MS = 8e3;
     var STARTUP_POLL_MS = 200;
     async function canConnect(endpoint) {
-      const client = new import_session_host_core3.SessionHostClient({ endpoint });
+      const client = new import_session_host_core32.SessionHostClient({ endpoint });
       try {
         await client.connect();
         await client.close();
@@ -47681,14 +47968,14 @@ data: ${JSON.stringify(msg.data)}
       throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
     }
     async function ensureSessionHostReady2(options) {
-      const endpoint = (0, import_session_host_core3.getDefaultSessionHostEndpoint)(options.appName || "adhdev");
+      const endpoint = (0, import_session_host_core32.getDefaultSessionHostEndpoint)(options.appName || "adhdev");
       if (await canConnect(endpoint)) return endpoint;
       options.spawnHost();
       await waitForReady(endpoint, options.timeoutMs);
       return endpoint;
     }
     async function listHostedCliRuntimes2(endpoint) {
-      const client = new import_session_host_core3.SessionHostClient({ endpoint });
+      const client = new import_session_host_core32.SessionHostClient({ endpoint });
       try {
         const response = await client.request({
           type: "list_sessions",
@@ -48059,6 +48346,7 @@ data: ${JSON.stringify(msg.data)}
         onIdeConnected: () => poller?.start(),
         onStatusChange: config2.onStatusChange,
         onPostChatCommand: config2.onPostChatCommand,
+        sessionHostControl: config2.sessionHostControl,
         getCdpLogFn: config2.getCdpLogFn || ((ideType) => LOG2.forComponent(`CDP:${ideType}`).asLogFn())
       });
       poller = new AgentStreamPoller({
@@ -48433,6 +48721,58 @@ var SessionHostClient = class {
   }
 };
 
+// src/session-host-control.ts
+var StandaloneSessionHostControlPlane = class {
+  constructor(getEndpoint) {
+    this.getEndpoint = getEndpoint;
+  }
+  async getDiagnostics(payload = {}) {
+    return this.request("get_host_diagnostics", payload);
+  }
+  async listSessions() {
+    return this.request("list_sessions", {});
+  }
+  async stopSession(sessionId) {
+    return this.request("stop_session", { sessionId });
+  }
+  async resumeSession(sessionId) {
+    return this.request("resume_session", { sessionId });
+  }
+  async restartSession(sessionId) {
+    return this.request("restart_session", { sessionId });
+  }
+  async sendSignal(sessionId, signal) {
+    return this.request("send_signal", { sessionId, signal });
+  }
+  async forceDetachClient(sessionId, clientId) {
+    return this.request("force_detach_client", { sessionId, clientId });
+  }
+  async acquireWrite(payload) {
+    return this.request("acquire_write", payload);
+  }
+  async releaseWrite(payload) {
+    return this.request("release_write", payload);
+  }
+  async request(type, payload) {
+    const endpoint = await this.getEndpoint();
+    const client = new SessionHostClient({ endpoint });
+    try {
+      await client.connect();
+      const response = await client.request({
+        type,
+        payload
+      });
+      if (!response.success) {
+        throw new Error(response.error || `Session host request failed: ${type}`);
+      }
+      return response.result ?? null;
+    } finally {
+      await client.close().catch(() => {
+      });
+    }
+  }
+};
+
 // ../terminal-mux-control/dist/chunk-7RNMRPVZ.mjs
 var import_os = __toESM(require("os"), 1);
 var import_path = __toESM(require("path"), 1);
@@ -48692,6 +49032,9 @@ var StandaloneServer = class {
     const host = options.host || "127.0.0.1";
     const sessionHostEndpoint = await ensureSessionHostReady();
     this.sessionHostEndpoint = sessionHostEndpoint;
+    const sessionHostControl = new StandaloneSessionHostControlPlane(
+      async () => this.ensureActiveSessionHostEndpoint()
+    );
     this.authToken = options.token || process.env.ADHDEV_TOKEN || null;
     this.components = await (0, import_daemon_core2.initDaemonComponents)({
       cliManagerDeps: {
@@ -48730,6 +49073,7 @@ var StandaloneServer = class {
         listHostedCliRuntimes: async () => listHostedCliRuntimes(sessionHostEndpoint)
       },
       onStatusChange: () => this.scheduleBroadcastStatus(),
+      sessionHostControl,
       onStreamsUpdated: (ideType, streams) => {
         if (!this.components) return;
         (0, import_daemon_core2.forwardAgentStreamsToIdeInstance)(this.components.instanceManager, ideType, streams);
@@ -49068,6 +49412,7 @@ var StandaloneServer = class {
 `);
     }
     const writeEvent = (event) => {
+      if (!("sessionId" in event)) return;
       if (event.sessionId !== sessionId) return;
       if (!this.isCliSession(sessionId)) return;
       res.write(`event: ${event.type}
@@ -49220,7 +49565,7 @@ var StandaloneServer = class {
       return { success: false, error: "command type required" };
     }
     const result = await this.components.router.execute(type, args, "standalone");
-    if (type.startsWith("workspace_")) this.scheduleBroadcastStatus();
+    if (type.startsWith("workspace_") || type.startsWith("session_host_")) this.scheduleBroadcastStatus();
     return result;
   }
   scheduleBroadcastStatus() {