@xrkseek/harness 0.4.12 → 0.5.2

package/node_modules/@xrkseek/server-host/dist/index.js

@@ -12,9 +12,10 @@ import { installOutboundHttpProxy } from "./http-proxy.js";
 import { mountInvariantsFailFast } from "./invariants-fail-fast.js";
 import { watchPolicyFile } from "./policy-file-watch.js";
 import { createA2aInboundPublicHandler } from "./a2a-inbound-public.js";
+import { createCronApiHandler } from "./cron-http.js";
 import { tryMountHostIsolatingWorkflowEngine } from "./workflow-engine-mount.js";
-import { applyXrkProductBootPolicy, chainPublicHandlers, ensureDshCompatHostPlugin, createLiveHostPluginsPublicHandler, createHttpServer, createXrkPluginPublicHandler, createSidebarPublicHandler, prewarmDshCompatAdapters, shutdownDshCompatServices, applyHostPackageByName, stopHostPackageFiber, listHostAppliedPackages, invokeDshCompatRpc, attachDshCompatUpgrades, DSH_SETTINGS_NAMESPACES, DSH_SETTINGS_DEFAULTS, runPluginMutate, ensureXrkPlatformClientBootEntries, injectBootIntoHtml, injectMobileAccessShellIntoHtml, loadBootManifestFromWebDist, mergeWebBootManifests, resolveWebBootManifest, createXrkWalletPort, createMobileAccessGateChecker, createMobileAccessGateHandler, loadSidebarPrefs, } from "@xrkseek/server-http";
-import { attachFaceUpgrades, bindSubagentTools, bindSessionQueryTools, createFaceRuntime, effectiveHostApiKey, isLoopbackAddress, listCredentialSlots, peekSettingsYamlSection, publishRemoteEvent, createSessionRoutingLlm, liveRouteAllowsImageInput, resolveSessionCwd, canonicalAgentPresetId, resolveAgentPresetProfile, DEFAULT_MAX_DEPTH, DEFAULT_MAX_ACTIVE_CHILDREN, tryHandleFaceHttp, isPluginSoftDisabledAt, readDisabledPluginIdsAt, readManagedPackageIndexAt, reconcileManagedProcessPlugins, snapshotSessionWorkspace, SNAPSHOT_DRAIN_BUDGET_MS, } from "@xrkseek/server-face";
+import { applyXrkProductBootPolicy, chainPublicHandlers, ensureDshCompatHostPlugin, createLiveHostPluginsPublicHandler, createHttpServer, createXrkPluginPublicHandler, createSidebarPublicHandler, prewarmDshCompatAdapters, shutdownDshCompatServices, applyHostPackageByName, stopHostPackageFiber, listHostAppliedPackages, invokeDshCompatRpc, attachDshCompatUpgrades, DSH_SETTINGS_NAMESPACES, DSH_SETTINGS_DEFAULTS, runPluginMutate, ensureXrkPlatformClientBootEntries, injectBootIntoHtml, injectBootThemeIntoHtml, injectMobileAccessShellIntoHtml, loadBootManifestFromWebDist, mergeWebBootManifests, resolveWebBootManifest, createXrkWalletPort, createMobileAccessGateChecker, createMobileAccessGateHandler, loadSidebarPrefs, } from "@xrkseek/server-http";
+import { attachFaceUpgrades, bindSubagentTools, bindSessionQueryTools, createFaceRuntime, effectiveHostApiKey, ensureMcpLiveIfIdle, isLoopbackAddress, listCredentialSlots, peekSettingsYamlSection, publishRemoteEvent, createSessionRoutingLlm, liveRouteAllowsImageInput, resolveSessionCwd, canonicalAgentPresetId, resolveAgentPresetProfile, effectiveSessionAgentPreset, DEFAULT_MAX_DEPTH, DEFAULT_MAX_ACTIVE_CHILDREN, tryHandleFaceHttp, isPluginSoftDisabledAt, readDisabledPluginIdsAt, readManagedPackageIndexAt, reconcileManagedProcessPlugins, snapshotSessionWorkspace, SNAPSHOT_DRAIN_BUDGET_MS, } from "@xrkseek/server-face";
 import { createPluginLoader, composeHostPolicyEngine, wireCompositionChannels, wireCompositionLlm, collectChannelPluginRegistrations, } from "@xrkseek/server-loader";
 import { existsSync } from "node:fs";
 import { access } from "node:fs/promises";
@@ -148,6 +149,19 @@ export function createHostShellPrepareArgv(options) {
         return confined;
     };
 }
+/** Face `removeUserPlugin` / `updateUserPlugin` — prefer composed mutate error over bare stderr. */
+function facePluginMutateResult(result) {
+    return {
+        ok: result.ok,
+        ...(result.error
+            ? { error: result.error }
+            : !result.ok && result.stderr
+                ? { error: result.stderr }
+                : {}),
+        stdout: result.stdout,
+        stderr: result.stderr,
+    };
+}
 export function createHostManager() {
     const instances = new Map();
     let seq = 0;
@@ -189,16 +203,25 @@ export function createHostManager() {
                 ? path.resolve(configuredPluginsDir)
                 : path.join(resolveXrkHome(), "plugins");
             const managedPluginsRootReady = () => existsSync(resolvedPluginsDir);
+            // Desktop shell: listen + IPC ready first; process plugins catch up in
+            // background so Electron can remount onto loopback without waiting for
+            // every extension ESM graph (Cursor-like first paint).
+            const deferManagedPlugins = String(process.env.XRK_SURFACE ?? "").trim() === "desktop";
             let loadedPluginIds = [];
-            if (managedPluginsRootReady()) {
-                // Single path with Settings soft-disable: discover+load enabled,
-                // skip soft-disabled (never mcp:*). Optional load failures warn;
-                // required failures throw (abort spawn).
+            const loadManagedPlugins = async () => {
+                if (!managedPluginsRootReady())
+                    return;
                 const bootPlugins = await reconcileManagedProcessPlugins(loader, resolvedPluginsDir);
                 loadedPluginIds = [...bootPlugins.ids];
                 for (const failure of bootPlugins.failures) {
                     log?.warn(`plugin load failed (${failure.id}): ${failure.message}`);
                 }
+            };
+            if (!deferManagedPlugins) {
+                await loadManagedPlugins();
+            }
+            else if (managedPluginsRootReady()) {
+                log?.info("desktop surface: deferring process-plugin reconcile until after HTTP listen");
             }
             // File rules first, then kind:policy plugins. Delegate so a later
             // plugin refresh / policy-file watch rebuilds without swapping captures.
@@ -250,7 +273,7 @@ export function createHostManager() {
             const mcpFileSourced = configuredMcpSpecs(config).length === 0;
             let mcpAllowConnect = resolveMcpAllowConnect(config);
             if (mcpSpecs.length > 0) {
-                log?.info(`mcp desired ${mcpSpecs.length} (source=${mcpFileSourced ? "host-settings" : "env/config"}; allow=${mcpAllowConnect ? "on" : "off"})`);
+                log?.info(`mcp desired ${mcpSpecs.length} (source=${mcpFileSourced ? "host-settings" : "env/config"}; allow=${mcpAllowConnect ? "on" : "off"}; connect after HTTP ready)`);
             }
             let invalidateAgents = async () => { };
             /** Sessions skipped mid-turn; invalidate once drain goes idle. */
@@ -306,26 +329,75 @@ export function createHostManager() {
                     notifyMcpOverlay();
                 },
             };
-            if (mcpSpecs.length > 0) {
-                const boot = await reconcileMcpToolPlugins({
-                    desired: mcpSpecs,
-                    list: () => loader.list(),
-                    register: (plugin) => {
-                        loader.register(plugin);
-                        if (!loadedPluginIds.includes(plugin.id)) {
-                            loadedPluginIds = [...loadedPluginIds, plugin.id];
-                        }
-                    },
-                    unregister: mcpUnregister,
-                    retained: () => mcpDeferred.retained(),
-                    policy,
-                    allowConnect: mcpAllowConnect,
-                    workspaceRoot: config.runtime.workspaceRoot,
-                    imageAdmission: mcpImageAdmission,
-                    ...mcpHooks,
+            const registerMcpPlugin = (plugin) => {
+                loader.register(plugin);
+                if (!loadedPluginIds.includes(plugin.id)) {
+                    loadedPluginIds = [...loadedPluginIds, plugin.id];
+                }
+            };
+            const mcpReconcileOptions = (desired, allowConnect) => ({
+                desired,
+                list: () => loader.list(),
+                register: registerMcpPlugin,
+                unregister: mcpUnregister,
+                retained: () => mcpDeferred.retained(),
+                policy,
+                allowConnect,
+                workspaceRoot: config.runtime.workspaceRoot,
+                imageAdmission: mcpImageAdmission,
+                ...mcpHooks,
+            });
+            let mcpClosed = false;
+            let mcpSyncTail = Promise.resolve();
+            /** Last reconcile overlay — applied when `notifyMcpOverlay` is wired to Face. */
+            let lastMcpReconcileOverlay;
+            const enqueueMcpReconcile = (label, desired, allowConnect) => {
+                const run = mcpSyncTail.then(async () => {
+                    if (mcpClosed) {
+                        return { failures: [], parked: [], added: [], removed: [], kept: [] };
+                    }
+                    const result = await reconcileMcpToolPlugins({
+                        ...mcpReconcileOptions(desired, allowConnect),
+                        onConnectProgress: async ({ phase, serverName }) => {
+                            if (mcpClosed)
+                                return;
+                            const prev = lastMcpReconcileOverlay;
+                            const connecting = new Set(prev?.connecting ?? []);
+                            if (phase === "connecting")
+                                connecting.add(serverName);
+                            else
+                                connecting.delete(serverName);
+                            lastMcpReconcileOverlay = {
+                                connectFailures: prev?.connectFailures ?? [],
+                                parked: prev?.parked ?? [],
+                                connecting: [...connecting],
+                            };
+                            // Live row badges: refresh connected plugins + push overlay mid-serial.
+                            notifyMcpOverlay();
+                            if (phase === "connecting") {
+                                log?.info(`mcp ${label}: connecting ${serverName}`);
+                            }
+                        },
+                    });
+                    if (mcpClosed)
+                        return result;
+                    logMcpReconcile(log, label, result);
+                    lastMcpReconcileOverlay = {
+                        connectFailures: result.failures,
+                        parked: result.parked,
+                        connecting: [],
+                    };
+                    // Boot/reconcile used to refresh plugins only — Settings MCP card kept
+                    // stale `parked` until a manual save. Push the same overlay event as
+                    // health changes so connected/parked badges update live.
+                    notifyMcpOverlay();
+                    await invalidateAgents();
+                    return result;
                 });
-                logMcpReconcile(log, "boot", boot);
-            }
+                mcpSyncTail = run.then(() => undefined, () => undefined);
+                return run;
+            };
+            // Face/HTTP first (Codex-style): MCP stdio/HTTP handshake must not block spawn.
             refreshFacePlugins();
             const agentCache = createHostAgentCache(loader.list(), { hostId: id });
             // MCP remount / settings_mutate runs inside an active drain. Aborting that
@@ -343,14 +415,13 @@ export function createHostManager() {
                 });
                 await mcpDeferred.flush();
             };
-            let mcpSyncTail = Promise.resolve();
             const lastDrainResult = new Map();
             // Local Host + remote cwd: swap fs/shell (Hermes/DSH provider pattern).
             // Env `XRK_SSH_HOST` CI-bypasses Face; else peek settings.yaml before Face
             // (SSH world must own workspaceRoot before createFaceRuntime).
-            // Optional HTTP ExecEnvironment (Modal/e2b-style sidecar) when SSH is off.
+            // Optional pluggable ExecEnvironment (HTTP sidecar · memory CI world) when SSH is off.
             let sshWorld;
-            let httpWorld;
+            let envWorld;
             /** Local Host cwd before SSH workspace swap (browse/settings anchor). */
             let localHostRoot;
             let execWorldKind;
@@ -365,21 +436,26 @@ export function createHostManager() {
                     config.runtime.workspaceRoot =
                         sshWorld.workspaceRoot;
                 }
-                else if (String(process.env.XRK_EXEC_ENVIRONMENT ?? "")
-                    .trim()
-                    .toLowerCase() === "http") {
-                    execWorldKind = "http";
-                    const provider = resolveExecEnvironment({ env: process.env });
-                    httpWorld = await provider.createWorld({
-                        workspaceRoot: config.runtime.workspaceRoot,
-                    });
+                else {
+                    const envKind = String(process.env.XRK_EXEC_ENVIRONMENT ?? "")
+                        .trim()
+                        .toLowerCase();
+                    if (envKind === "http" || envKind === "memory") {
+                        execWorldKind = envKind;
+                        const provider = resolveExecEnvironment({ env: process.env });
+                        envWorld = await provider.createWorld({
+                            workspaceRoot: config.runtime.workspaceRoot,
+                        });
+                    }
                 }
             }
             catch (err) {
                 const message = err instanceof Error ? err.message : String(err);
                 throw new Error(execWorldKind === "http"
                     ? `HTTP exec environment: ${message}`
-                    : `SSH remote workspace: ${message}`, { cause: err });
+                    : execWorldKind === "memory"
+                        ? `Memory exec environment: ${message}`
+                        : `SSH remote workspace: ${message}`, { cause: err });
             }
             // Codex-shaped outbound allowlist audit → Host logger (not MITM).
             setOutboundAllowlistAuditObserver((ev) => {
@@ -396,8 +472,8 @@ export function createHostManager() {
                 ? createLocalShell({
                     subprocess: sshWorld
                         ? sshWorld.subprocess
-                        : httpWorld
-                            ? httpWorld.subprocess
+                        : envWorld
+                            ? envWorld.subprocess
                             : createLocalSubprocess(),
                     defaultCwd: config.runtime.workspaceRoot,
                     // Host-wide shared registry — sandbox confine resolves lazily so
@@ -535,12 +611,18 @@ export function createHostManager() {
             // Sidebar agent-opens / agent-terminals — Host registries (not plugin host.mjs).
             const agentOpenRegistry = new AgentOpenRegistry();
             const agentPtyRegistry = new AgentPtyRegistry();
+            // Filled in attachExtras — Desktop HTTP PTY (no WS upgrade when listen:false).
+            const sidebarPtyHttp = {};
             const cronBox = {};
             const resolveAgent = async (sessionId) => {
                 // Cache composition binding only — never treat AgentHandle as transcript source (ADR-0003).
                 const parentSessionId = lineage.parentOf(sessionId);
                 const sessionRoot = sessionCwdBox.get?.(sessionId) ?? config.runtime.workspaceRoot;
-                const agentPreset = sessionPresetBox.get?.(sessionId);
+                const agentPreset = sessionPresetBox.get?.(sessionId) ??
+                    (faceBox.runtime
+                        ? effectiveSessionAgentPreset(faceBox.runtime, sessionId)
+                        : undefined) ??
+                    config.runtime.preset;
                 const wsId = faceRuntime.workspaces.workspaceIdOf(sessionId);
                 const wsRow = wsId ? faceRuntime.workspaces.get(wsId) : undefined;
                 return agentCache.resolve(sessionId, async () => {
@@ -582,8 +664,8 @@ export function createHostManager() {
                                 remoteExecution: true,
                                 codeRuntime: sshWorld.codeRuntime,
                             }
-                            : httpWorld
-                                ? { fs: httpWorld.fs }
+                            : envWorld
+                                ? { fs: envWorld.fs }
                                 : {}),
                         ...(faceBox.runtime
                             ? {
@@ -702,7 +784,7 @@ export function createHostManager() {
                     }
                     // ask_user / exit_plan_mode: Face resolveAgent rebinds once.
                     if (agent.tools && faceBox.runtime) {
-                        const profile = resolveAgentPresetProfile(agentPreset ?? config.runtime.preset, config.runtime.preset);
+                        const profile = resolveAgentPresetProfile(agentPreset, config.runtime.preset);
                         if (profile.subagents.mode === "on") {
                             const faceDepth = pluginSettings.maxSubagentDepth ?? DEFAULT_MAX_DEPTH;
                             const faceActive = pluginSettings.maxActiveSubagents ??
@@ -907,16 +989,31 @@ export function createHostManager() {
                     rev: overlayBoot.rev,
                     entries: overlayBoot.entries.filter((e) => !isPluginSoftDisabledAt(e.id, disabledIds, packageIndex)),
                 };
-            const boot = applyXrkProductBootPolicy(ensureXrkPlatformClientBootEntries(mergeWebBootManifests(resolveWebBootManifest(config.runtime.webDist), filteredOverlay), config.runtime.webDist));
-            // Mutable like facePlugins: soft-disable / remove rewrite boot.json, so
-            // inventory must re-read overlay or removed clients stay as active ghosts.
+            // Mutable live boot: soft-disable / install rewrites pluginsDir web/boot.json.
+            // HTML inject and inventory must re-read the overlay, or a browser reload
+            // after install still serves the start-of-process graph (needsRestart ghost).
+            const liveBoot = {
+                current: applyXrkProductBootPolicy(ensureXrkPlatformClientBootEntries(mergeWebBootManifests(resolveWebBootManifest(config.runtime.webDist), filteredOverlay), config.runtime.webDist)),
+            };
+            // Same array reference is passed to webStatic.extraRoots — must update in
+            // place when the first client install creates `{pluginsDir}/web` mid-process,
+            // or reload injects the new boot row while `/plugins/<id>/client.js` 404s.
+            const liveExtraRoots = webOverlay ? [webOverlay] : [];
             const faceWebPlugins = [];
             const refreshFaceWebPlugins = async () => {
                 if (!config.runtime.webDist) {
                     faceWebPlugins.splice(0, faceWebPlugins.length);
+                    liveExtraRoots.splice(0, liveExtraRoots.length);
+                    liveBoot.current = {
+                        rev: liveBoot.current.rev,
+                        entries: [],
+                    };
                     return;
                 }
                 const overlayRoot = await resolveWebPluginOverlay(resolvedPluginsDir);
+                liveExtraRoots.splice(0, liveExtraRoots.length);
+                if (overlayRoot)
+                    liveExtraRoots.push(overlayRoot);
                 const nextOverlay = overlayRoot
                     ? loadBootManifestFromWebDist(overlayRoot)
                     : undefined;
@@ -929,9 +1026,10 @@ export function createHostManager() {
                         entries: nextOverlay.entries.filter((e) => !isPluginSoftDisabledAt(e.id, disabled, index)),
                     };
                 const nextBoot = applyXrkProductBootPolicy(ensureXrkPlatformClientBootEntries(mergeWebBootManifests(resolveWebBootManifest(config.runtime.webDist), filtered), config.runtime.webDist));
+                liveBoot.current = nextBoot;
                 faceWebPlugins.splice(0, faceWebPlugins.length, ...nextBoot.entries.map((e) => ({ id: e.id })));
             };
-            faceWebPlugins.push(...boot.entries.map((e) => ({ id: e.id })));
+            faceWebPlugins.push(...liveBoot.current.entries.map((e) => ({ id: e.id })));
             const hostWireRef = {};
             const syncCordisHostApplied = () => {
                 hostPublic.cordisHostApplied = listHostAppliedPackages().map((row) => row.packageName);
@@ -982,24 +1080,26 @@ export function createHostManager() {
                         spec,
                         pluginsDir: resolvedPluginsDir,
                     });
-                    return result.ok
-                        ? { ok: true }
-                        : { ok: false, error: result.error ?? result.stderr };
+                    return facePluginMutateResult(result);
                 },
-                updateUserPlugin: async (spec) => {
+                updateUserPlugin: async (spec, options) => {
                     const result = await runPluginMutate({
                         action: "add",
                         spec,
                         pluginsDir: resolvedPluginsDir,
+                        ...(options?.registry?.trim()
+                            ? { registry: options.registry.trim() }
+                            : {}),
+                        ...(options?.onChunk !== undefined
+                            ? { onChunk: options.onChunk }
+                            : {}),
                     });
-                    return result.ok
-                        ? { ok: true }
-                        : { ok: false, error: result.error ?? result.stderr };
+                    return facePluginMutateResult(result);
                 },
-                syncManagedProcessPlugins: async () => {
+                syncManagedProcessPlugins: async (options) => {
                     if (!managedPluginsRootReady())
                         return;
-                    const synced = await reconcileManagedProcessPlugins(loader, resolvedPluginsDir);
+                    const synced = await reconcileManagedProcessPlugins(loader, resolvedPluginsDir, options);
                     loadedPluginIds = [...synced.ids];
                     for (const failure of synced.failures) {
                         log?.warn(`plugin load failed (${failure.id}): ${failure.message}`);
@@ -1011,36 +1111,12 @@ export function createHostManager() {
                 ...(mcpFileSourced
                     ? {
                         syncMcpServers: async (servers, options) => {
-                            const run = mcpSyncTail.then(async () => {
-                                mcpAllowConnect = resolveMcpAllowConnect(config, options?.allowConnect);
-                                const result = await reconcileMcpToolPlugins({
-                                    desired: mcpDraftsToSpecs(servers),
-                                    list: () => loader.list(),
-                                    register: (plugin) => {
-                                        loader.register(plugin);
-                                        if (!loadedPluginIds.includes(plugin.id)) {
-                                            loadedPluginIds = [...loadedPluginIds, plugin.id];
-                                        }
-                                    },
-                                    unregister: mcpUnregister,
-                                    retained: () => mcpDeferred.retained(),
-                                    policy,
-                                    allowConnect: mcpAllowConnect,
-                                    workspaceRoot: config.runtime.workspaceRoot,
-                                    imageAdmission: mcpImageAdmission,
-                                    ...mcpHooks,
-                                });
-                                logMcpReconcile(log, "reconcile", result);
-                                refreshFacePlugins();
-                                await invalidateAgents();
-                                return {
-                                    failures: result.failures,
-                                    parked: result.parked,
-                                };
-                            });
-                            // Keep the chain alive even if one reconcile rejects.
-                            mcpSyncTail = run.then(() => undefined, () => undefined);
-                            return run;
+                            mcpAllowConnect = resolveMcpAllowConnect(config, options?.allowConnect);
+                            const result = await enqueueMcpReconcile("reconcile", mcpDraftsToSpecs(servers), mcpAllowConnect);
+                            return {
+                                failures: result.failures,
+                                parked: result.parked,
+                            };
                         },
                     }
                     : {}),
@@ -1126,38 +1202,6 @@ export function createHostManager() {
             else {
                 log?.warn("Isolating WorkflowEngine not mounted (Cordis stub unavailable under this install)");
             }
-            // Face hydrate may migrate legacy settings.yaml mcp → host-settings after
-            // boot reconcile already ran with []. Remount once when file-sourced.
-            if (mcpFileSourced && mcpSpecs.length === 0) {
-                const mcpUser = faceRuntime.settingsNamespaces.ensure("mcp").user;
-                const drafts = Array.isArray(mcpUser.servers)
-                    ? mcpUser.servers
-                    : [];
-                const desired = mcpDraftsToSpecs(drafts);
-                if (desired.length > 0) {
-                    mcpAllowConnect = resolveMcpAllowConnect(config, mcpUser.allowConnect === true);
-                    const migrated = await reconcileMcpToolPlugins({
-                        desired,
-                        list: () => loader.list(),
-                        register: (plugin) => {
-                            loader.register(plugin);
-                            if (!loadedPluginIds.includes(plugin.id)) {
-                                loadedPluginIds = [...loadedPluginIds, plugin.id];
-                            }
-                        },
-                        unregister: mcpUnregister,
-                        retained: () => mcpDeferred.retained(),
-                        policy,
-                        allowConnect: mcpAllowConnect,
-                        workspaceRoot: config.runtime.workspaceRoot,
-                        imageAdmission: mcpImageAdmission,
-                        ...mcpHooks,
-                    });
-                    logMcpReconcile(log, "yaml-migrate", migrated);
-                    refreshFacePlugins();
-                    await invalidateAgents();
-                }
-            }
             sessionCwdBox.get = (sessionId) => resolveSessionCwd(faceRuntime, sessionId);
             sessionPresetBox.get = (sessionId) => faceRuntime.sessionAgentPresets.get(sessionId);
             hostStatusBox.publish = (sessionId, running) => {
@@ -1188,7 +1232,8 @@ export function createHostManager() {
                     loop.maxSteps > 0
                     ? Math.floor(loop.maxSteps)
                     : undefined;
-                const autoContinueOnMaxTokens = loop.autoContinueOnMaxTokens === true;
+                // Schema default is true; treat omit as on so Settings UI "开" matches Host.
+                const autoContinueOnMaxTokens = loop.autoContinueOnMaxTokens !== false;
                 const autoContinueMaxRoundsRaw = loop.autoContinueMaxRounds;
                 const autoContinueMaxRounds = typeof autoContinueMaxRoundsRaw === "number" &&
                     Number.isFinite(autoContinueMaxRoundsRaw) &&
@@ -1660,6 +1705,13 @@ export function createHostManager() {
             lineage.parentOf = (sessionId) => faceRuntime.subagents.getByChild(sessionId)?.parentSessionId;
             notifyMcpOverlay = () => {
                 refreshFacePlugins();
+                if (lastMcpReconcileOverlay) {
+                    faceRuntime.mcpSyncOverlay = {
+                        connectFailures: lastMcpReconcileOverlay.connectFailures,
+                        parked: lastMcpReconcileOverlay.parked,
+                        connecting: lastMcpReconcileOverlay.connecting,
+                    };
+                }
                 const slot = faceRuntime.settingsNamespaces.ensure("mcp");
                 publishRemoteEvent(faceRuntime.bus, "settings/document-updated", [
                     "mcp",
@@ -1763,7 +1815,10 @@ export function createHostManager() {
                 ensureSession,
                 resolveAgent,
                 drain,
-                tryHandlePublic: chainPublicHandlers(createA2aInboundPublicHandler({
+                tryHandlePublic: chainPublicHandlers(
+                // Desktop PTY SSE must run before createSidebarPublicHandler — the
+                // sidebar JSON-RPC surface would otherwise 405 GET /sidebar/api/pty/stream.
+                (req, res) => sidebarPtyHttp.handle?.(req, res) === true, createA2aInboundPublicHandler({
                     host: config.runtime.host,
                     port: config.runtime.port,
                     face: faceRuntime,
@@ -1817,15 +1872,40 @@ export function createHostManager() {
                     ? {
                         webStatic: {
                             root: config.runtime.webDist,
-                            ...(webOverlay ? { extraRoots: [webOverlay] } : {}),
-                            transformIndex: (html) => injectMobileAccessShellIntoHtml(injectBootIntoHtml(html, boot)),
+                            // Live array: refreshFaceWebPlugins mutates after first client install.
+                            extraRoots: liveExtraRoots,
+                            transformIndex: (html) => {
+                                // Match client-ui-theme / Face ui-theme fontSize bounds (12–17).
+                                const themeNs = faceRuntime.settingsNamespaces.view("ui-theme").value;
+                                const fontRaw = themeNs?.fontSize;
+                                const fontSize = typeof fontRaw === "number" &&
+                                    Number.isInteger(fontRaw) &&
+                                    fontRaw >= 12 &&
+                                    fontRaw <= 17
+                                    ? fontRaw
+                                    : 14;
+                                return injectMobileAccessShellIntoHtml(injectBootThemeIntoHtml(injectBootIntoHtml(html, liveBoot.current), faceRuntime.uiSettings.theme, fontSize));
+                            },
                         },
                     }
                     : {}),
-                tryHandleExtraApi: (req, res) => tryHandleFaceHttp(req, res, faceRuntime, {
-                    apiKey: effectiveHostApiKey(faceRuntime),
-                    checkAuth: faceCheckAuth,
-                }),
+                tryHandleExtraApi: (req, res) => {
+                    // Backup if a future reorder puts SPA before public PTY (primary is
+                    // the tryHandlePublic head hook above).
+                    if (sidebarPtyHttp.handle?.(req, res) === true)
+                        return true;
+                    // Host cron read API first (`/api/cron/*`), then Face extras.
+                    const cronApi = createCronApiHandler({
+                        resolveScheduler: () => cronBox.scheduler,
+                        checkAuth: faceCheckAuth,
+                    });
+                    if (cronApi(req, res))
+                        return true;
+                    return tryHandleFaceHttp(req, res, faceRuntime, {
+                        apiKey: effectiveHostApiKey(faceRuntime),
+                        checkAuth: faceCheckAuth,
+                    });
+                },
                 attachExtras: (server) => {
                     const face = attachFaceUpgrades(server, faceRuntime, {
                         apiKey: effectiveHostApiKey(faceRuntime),
@@ -1837,15 +1917,22 @@ export function createHostManager() {
                     // Sidebar interactive PTY is Host-local node-pty — not SSH. Skip when
                     // remote so defaultCwd is never a remote POSIX path on the Host disk.
                     const sidebarPty = sshWorld
-                        ? { close() { } }
+                        ? {
+                            close() { },
+                            tryHandleHttp() {
+                                return false;
+                            },
+                        }
                         : attachSidebarPtyUpgrades(server, {
                             defaultCwd: faceRuntime.workspaceRoot,
                             checkAuth: faceCheckAuth,
                             agentPty: agentPtyRegistry,
                             agentOpens: agentOpenRegistry,
                         });
+                    sidebarPtyHttp.handle = (req, res) => sidebarPty.tryHandleHttp(req, res);
                     return {
                         close() {
+                            delete sidebarPtyHttp.handle;
                             sidebarPty.close();
                             agentPtyRegistry.disposeAll();
                             agentOpenRegistry.dispose();
@@ -1866,6 +1953,40 @@ export function createHostManager() {
             else {
                 log?.info("http stack ready (listen disabled — pipe / fetch transport)");
             }
+            if (deferManagedPlugins) {
+                void loadManagedPlugins()
+                    .then(() => {
+                    rebuildPolicyEngine();
+                    log?.info(`desktop process plugins ready (${String(loadedPluginIds.length)})`);
+                })
+                    .catch((err) => {
+                    const message = err instanceof Error ? err.message : String(err);
+                    log?.warn(`desktop process-plugin reconcile failed: ${message}`);
+                });
+            }
+            {
+                // Env/config specs auto-connect after HTTP (CI/headless).
+                // File-sourced Settings share Face `ensureMcpLiveIfIdle` with
+                // settings.describe — Allow on remounts without Desktop restart.
+                if (mcpFileSourced) {
+                    const mcpUser = faceRuntime.settingsNamespaces.ensure("mcp").user;
+                    const n = Array.isArray(mcpUser.servers) ? mcpUser.servers.length : 0;
+                    mcpAllowConnect = resolveMcpAllowConnect(config, mcpUser.allowConnect === true);
+                    if (n > 0 && !mcpAllowConnect) {
+                        log?.info(`mcp file-sourced ${n} deferred until Settings save (allow=off)`);
+                    }
+                    else if (n > 0) {
+                        log?.info(`mcp file-sourced ${n} connecting (allow already on)`);
+                    }
+                    ensureMcpLiveIfIdle(faceRuntime);
+                }
+                else if (mcpSpecs.length > 0) {
+                    void enqueueMcpReconcile("boot", mcpSpecs, mcpAllowConnect).catch((err) => {
+                        const message = err instanceof Error ? err.message : String(err);
+                        log?.warn(`mcp background connect failed: ${message}`);
+                    });
+                }
+            }
             let status = "running";
             let stopPromise;
             const instance = {
@@ -1897,6 +2018,7 @@ export function createHostManager() {
                         return stopPromise;
                     status = "stopped";
                     stopPromise = (async () => {
+                        mcpClosed = true;
                         cronBox.scheduler?.stop();
                         policyFileWatch?.dispose();
                         // Phase1 consolidate before agents/store go away (Hermes finalize).
@@ -1936,6 +2058,14 @@ export function createHostManager() {
                                 // Host stop must continue even if SSH ControlMaster exit fails.
                             }
                         }
+                        if (envWorld) {
+                            try {
+                                envWorld.dispose();
+                            }
+                            catch {
+                                // Host stop must continue even if pluggable exec world teardown fails.
+                            }
+                        }
                         if (sharedPty) {
                             try {
                                 await sharedPty.service.dispose();