@code-yeongyu/senpi 2026.9.8 → 2026.9.9

package/dist/core/session-write-reservation.d.ts

@@ -0,0 +1,4 @@
+export declare function installSessionWriteReservation(reservation: (path: string) => void): void;
+/** Synchronous SessionManager entry points must obtain the host grant before touching a writer. */
+export declare function reserveSessionWrite(path: string): void;
+//# sourceMappingURL=session-write-reservation.d.ts.map

package/dist/core/session-write-reservation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-write-reservation.d.ts","sourceRoot":"","sources":["../../src/core/session-write-reservation.ts"],"names":[],"mappings":"AAGA,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAGxF;AAED,mGAAmG;AACnG,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAEtD"}

package/dist/core/session-write-reservation.js

@@ -0,0 +1,12 @@
+/** Installed only inside a shared-host session isolate, before constructing any writer. */
+let reserve;
+export function installSessionWriteReservation(reservation) {
+    if (reserve)
+        throw new Error("Session write reservation already installed");
+    reserve = reservation;
+}
+/** Synchronous SessionManager entry points must obtain the host grant before touching a writer. */
+export function reserveSessionWrite(path) {
+    reserve?.(path);
+}
+//# sourceMappingURL=session-write-reservation.js.map

package/dist/core/session-write-reservation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-write-reservation.js","sourceRoot":"","sources":["../../src/core/session-write-reservation.ts"],"names":[],"mappings":"AAAA,2FAA2F;AAC3F,IAAI,OAA6C,CAAC;AAElD,MAAM,UAAU,8BAA8B,CAAC,WAAmC;IACjF,IAAI,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IAC5E,OAAO,GAAG,WAAW,CAAC;AACvB,CAAC;AAED,mGAAmG;AACnG,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC/C,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC","sourcesContent":["/** Installed only inside a shared-host session isolate, before constructing any writer. */\nlet reserve: ((path: string) => void) | undefined;\n\nexport function installSessionWriteReservation(reservation: (path: string) => void): void {\n\tif (reserve) throw new Error(\"Session write reservation already installed\");\n\treserve = reservation;\n}\n\n/** Synchronous SessionManager entry points must obtain the host grant before touching a writer. */\nexport function reserveSessionWrite(path: string): void {\n\treserve?.(path);\n}\n"]}

package/dist/main.d.ts

@@ -5,6 +5,8 @@
  * createAgentSession() options. The SDK does the heavy lifting.
  */
 import { type Args } from "./cli/args.ts";
+import { createStartupLoadingIndicator } from "./cli/startup-loading-indicator.ts";
+import { type CreateAgentSessionRuntimeFactory } from "./core/agent-session-runtime.ts";
 import { type AgentSessionRuntimeDiagnostic } from "./core/agent-session-services.ts";
 import type { InlineExtension } from "./core/extensions/types.ts";
 import { type AppMode } from "./core/project-trust.ts";
@@ -30,5 +32,17 @@ export interface MainOptions {
  * a theme. Existing settings are always returned first.
  */
 export declare function applyGrokNeoThemeFallback(settingsManager: SettingsManager): void;
+export interface CliRuntimeConfiguration {
+    parsed: Args;
+    cwd: string;
+    agentDir: string;
+    appMode: AppMode;
+}
+/** Fixed launch data is cloneable; UI callbacks and extension factories stay in their isolate. */
+export declare function createCliRuntimeFactory(configuration: CliRuntimeConfiguration, local?: {
+    extensionFactories?: InlineExtension[];
+    startupSettingsManager?: SettingsManager;
+    startupLoadingIndicator?: ReturnType<typeof createStartupLoadingIndicator>;
+}): CreateAgentSessionRuntimeFactory;
 export declare function main(args: string[], options?: MainOptions): Promise<void>;
 //# sourceMappingURL=main.d.ts.map

package/dist/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AACA;;;;;GAKG;AAQH,OAAO,EAAE,KAAK,IAAI,EAAyD,MAAM,eAAe,CAAC;AAgCjG,OAAO,EACN,KAAK,6BAA6B,EAGlC,MAAM,kCAAkC,CAAC;AAM1C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAUlE,OAAO,EAAE,KAAK,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAQ9E,OAAO,EAAwB,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AA4D7D,wBAAgB,+BAA+B,CAC9C,MAAM,EAAE,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,GAChD,6BAA6B,EAAE,CAKjC;AAuCD;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACvC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,IAAI,EACZ,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,GAAE,SAAS,MAAM,EAAiE,GAClG,OAAO,CAOT;AAsPD,wBAAsB,oBAAoB,CACzC,MAAM,EAAE,IAAI,EACZ,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,OAAO,GACd,OAAO,CAAC,cAAc,CAAC,CAoGzB;AA0HD,MAAM,WAAW,WAAW;IAC3B,kBAAkB,CAAC,EAAE,eAAe,EAAE,CAAC;CACvC;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI,CAYhF;AAED,wBAAsB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,WAAW,iBAqkB/D"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AACA;;;;;GAKG;AAQH,OAAO,EAAE,KAAK,IAAI,EAAyD,MAAM,eAAe,CAAC;AAwBjG,OAAO,EACN,6BAA6B,EAG7B,MAAM,oCAAoC,CAAC;AAG5C,OAAO,EAAE,KAAK,gCAAgC,EAA6B,MAAM,iCAAiC,CAAC;AACnH,OAAO,EACN,KAAK,6BAA6B,EAGlC,MAAM,kCAAkC,CAAC;AAM1C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAUlE,OAAO,EAAE,KAAK,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAQ9E,OAAO,EAAwB,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AA4D7D,wBAAgB,+BAA+B,CAC9C,MAAM,EAAE,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,GAChD,6BAA6B,EAAE,CAKjC;AAuCD;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACvC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,IAAI,EACZ,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,GAAE,SAAS,MAAM,EAAiE,GAClG,OAAO,CAOT;AAsPD,wBAAsB,oBAAoB,CACzC,MAAM,EAAE,IAAI,EACZ,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,OAAO,GACd,OAAO,CAAC,cAAc,CAAC,CAoGzB;AA0HD,MAAM,WAAW,WAAW;IAC3B,kBAAkB,CAAC,EAAE,eAAe,EAAE,CAAC;CACvC;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI,CAYhF;AAED,MAAM,WAAW,uBAAuB;IACvC,MAAM,EAAE,IAAI,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;CACjB;AAED,kGAAkG;AAClG,wBAAgB,uBAAuB,CACtC,aAAa,EAAE,uBAAuB,EACtC,KAAK,GAAE;IACN,kBAAkB,CAAC,EAAE,eAAe,EAAE,CAAC;IACvC,sBAAsB,CAAC,EAAE,eAAe,CAAC;IACzC,uBAAuB,CAAC,EAAE,UAAU,CAAC,OAAO,6BAA6B,CAAC,CAAC;CACtE,GACJ,gCAAgC,CA2KlC;AAED,wBAAsB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,WAAW,iBAqa/D"}

package/dist/main.js

@@ -533,6 +533,152 @@ export function applyGrokNeoThemeFallback(settingsManager) {
         setTheme(theme);
     };
 }
+/** Fixed launch data is cloneable; UI callbacks and extension factories stay in their isolate. */
+export function createCliRuntimeFactory(configuration, local = {}) {
+    const { parsed, cwd, agentDir, appMode } = configuration;
+    const extensionFactories = local.extensionFactories ?? builtInExtensions;
+    const startupSettingsManager = local.startupSettingsManager ?? SettingsManager.create(cwd, agentDir);
+    const startupLoadingIndicator = local.startupLoadingIndicator ??
+        createStartupLoadingIndicator({
+            writer: () => { },
+            isTTY: false,
+            label: `Loading ${APP_NAME}`,
+        });
+    const trustStore = new ProjectTrustStore(agentDir);
+    const projectTrustByCwd = new Map();
+    const trustPromptMode = parsed.help || parsed.listModels !== undefined || parsed.listTips ? "print" : toProjectTrustMode(appMode);
+    const resolvedExtensionPaths = resolveCliPaths(cwd, parsed.extensions);
+    const resolvedSkillPaths = resolveCliPaths(cwd, parsed.skills);
+    const resolvedPromptTemplatePaths = resolveCliPaths(cwd, parsed.promptTemplates);
+    const resolvedThemePaths = resolveCliPaths(cwd, parsed.themes);
+    return async ({ cwd, agentDir, sessionManager, sessionStartEvent, projectTrustContext, launchProfile }) => {
+        const isInitialRuntime = sessionStartEvent === undefined;
+        const projectTrustDiagnostics = [];
+        const cachedProjectTrust = projectTrustByCwd.get(cwd);
+        const hasTrustRequiringResources = hasTrustRequiringProjectResources(cwd);
+        const shouldResolveProjectTrust = parsed.projectTrustOverride === undefined && cachedProjectTrust === undefined && hasTrustRequiringResources;
+        const projectTrusted = shouldResolveProjectTrust
+            ? false
+            : (cachedProjectTrust ??
+                parsed.projectTrustOverride ??
+                (!hasTrustRequiringResources || trustStore.get(cwd) === true));
+        const runtimeSettingsManager = SettingsManager.create(cwd, agentDir, { projectTrusted });
+        const services = await createAgentSessionServices({
+            cwd,
+            agentDir,
+            settingsManager: runtimeSettingsManager,
+            modelRuntimeSignal: AbortSignal.timeout(15_000),
+            extensionFlagValues: parsed.unknownFlags,
+            resourceLoaderReloadOptions: shouldResolveProjectTrust
+                ? {
+                    resolveProjectTrust: async ({ extensionsResult }) => {
+                        const trusted = await resolveProjectTrusted({
+                            cwd,
+                            trustStore,
+                            trustOverride: parsed.projectTrustOverride,
+                            defaultProjectTrust: startupSettingsManager.getDefaultProjectTrust(),
+                            extensionsResult,
+                            projectTrustContext: projectTrustContext ??
+                                pauseIndicatorDuringPrompts(createProjectTrustContext({
+                                    cwd,
+                                    mode: isInitialRuntime ? trustPromptMode : toProjectTrustMode(appMode),
+                                    settingsManager: startupSettingsManager,
+                                    hasUI: isInitialRuntime && trustPromptMode === "interactive",
+                                }), startupLoadingIndicator),
+                            onExtensionError: (message) => projectTrustDiagnostics.push({ type: "warning", message }),
+                        });
+                        projectTrustByCwd.set(cwd, trusted);
+                        return trusted;
+                    },
+                }
+                : undefined,
+            resourceLoaderOptions: {
+                additionalExtensionPaths: resolvedExtensionPaths,
+                additionalSkillPaths: resolvedSkillPaths,
+                additionalPromptTemplatePaths: resolvedPromptTemplatePaths,
+                additionalThemePaths: resolvedThemePaths,
+                noExtensions: parsed.noExtensions,
+                noSkills: parsed.noSkills,
+                noPromptTemplates: parsed.noPromptTemplates,
+                noThemes: parsed.noThemes,
+                noContextFiles: parsed.noContextFiles,
+                systemPrompt: parsed.systemPrompt,
+                appendSystemPrompt: parsed.appendSystemPrompt,
+                extensionFactories,
+            },
+        });
+        const { settingsManager, modelRuntime, resourceLoader } = services;
+        const diagnostics = [
+            ...projectTrustDiagnostics,
+            ...services.diagnostics,
+            ...collectSettingsDiagnostics(settingsManager, "runtime creation"),
+            ...collectExtensionLoadDiagnostics(resourceLoader.getExtensions().errors),
+        ];
+        const modelPatterns = getModelNarrowingPatterns({
+            cliPatterns: parsed.models,
+            legacyEnabledPatterns: settingsManager.getEnabledModels(),
+        });
+        const scopedModels = modelPatterns && modelPatterns.length > 0
+            ? await resolveModelScope(modelPatterns, modelRuntime, { signal: AbortSignal.timeout(15_000) })
+            : [];
+        // Multi-session opens carry their per-session startup choices here rather
+        // than through process argv. This deliberately feeds the same resolver as
+        // --provider/--model/--thinking, preserving classic flag semantics.
+        const runtimeParsed = launchProfile === undefined
+            ? parsed
+            : {
+                ...parsed,
+                ...(launchProfile.creationModel === undefined
+                    ? {}
+                    : {
+                        provider: launchProfile.creationModel.provider,
+                        model: launchProfile.creationModel.modelId,
+                    }),
+                ...(launchProfile.initialThinkingLevel === undefined
+                    ? {}
+                    : { thinking: launchProfile.initialThinkingLevel }),
+            };
+        const { options: sessionOptions, cliThinkingFromModel, diagnostics: sessionOptionDiagnostics, } = buildSessionOptions(runtimeParsed, scopedModels, sessionManager.hasContextMessages(), modelRuntime, settingsManager);
+        diagnostics.push(...sessionOptionDiagnostics);
+        if (parsed.apiKey) {
+            if (!sessionOptions.model) {
+                diagnostics.push({
+                    type: "error",
+                    message: "--api-key requires a model to be specified via --model, --provider/--model, or --models",
+                });
+            }
+            else {
+                await modelRuntime.setRuntimeApiKey(sessionOptions.model.provider, parsed.apiKey);
+            }
+        }
+        if (isInitialRuntime) {
+            startupLoadingIndicator.setPhase("opening session");
+        }
+        const created = await createAgentSessionFromServices({
+            services,
+            sessionManager,
+            sessionStartEvent,
+            model: sessionOptions.model,
+            thinkingLevel: sessionOptions.thinkingLevel,
+            thinkingSelection: sessionOptions.thinkingSelection,
+            scopedModels: sessionOptions.scopedModels,
+            tools: sessionOptions.tools,
+            excludeTools: sessionOptions.excludeTools,
+            noTools: sessionOptions.noTools,
+            customTools: sessionOptions.customTools,
+            autoTitleSessions: resolveAutoTitleSessions(appMode, parsed, sessionManager.hasContextMessages(), parseClientCapabilities(envValue("RPC_CLIENT_CAPABILITIES"))),
+        });
+        const cliThinkingOverride = runtimeParsed.thinking !== undefined || cliThinkingFromModel;
+        if (created.session.model && cliThinkingOverride) {
+            created.session.setThinkingLevel(created.session.thinkingLevel);
+        }
+        return {
+            ...created,
+            services,
+            diagnostics,
+        };
+    };
+}
 export async function main(args, options) {
     resetTimings();
     const extensionFactories = [...builtInExtensions, ...(options?.extensionFactories ?? [])];
@@ -691,6 +837,21 @@ export async function main(args, options) {
     if (appMode === "interactive" && parsed.useTheme !== undefined) {
         startupSettingsManager.applyOverrides({ theme: parsed.useTheme });
     }
+    if (appMode === "rpc" && parsed.multiSession) {
+        if (options?.extensionFactories?.length)
+            throw new Error("Shared RPC workers require file-backed extensions; inline factories cannot cross isolates");
+        const workerConfiguration = { parsed, cwd, agentDir, appMode };
+        printTimings();
+        await runMultiSessionHost({
+            agentDir,
+            createRuntime: createCliRuntimeFactory(workerConfiguration),
+            workerConfiguration,
+            cwd,
+            creationModel: parsed.provider && parsed.model ? { provider: parsed.provider, modelId: parsed.model } : undefined,
+            initialThinkingLevel: parsed.thinking,
+            listen: parsed.listen,
+        });
+    }
     // Decide the final runtime cwd before creating cwd-bound runtime services.
     // --session and --resume may select a session from another project, so project-local
     // settings, resources, provider registrations, and models must be resolved only after
@@ -724,13 +885,10 @@ export async function main(args, options) {
         sessionManager.appendSessionInfo(name);
     }
     time("createSessionManager");
-    const trustStore = new ProjectTrustStore(agentDir);
     const sessionCwd = sessionManager.getCwd();
     const autoTrustOnReloadCwd = parsed.projectTrustOverride === undefined && !hasTrustRequiringProjectResources(sessionCwd)
         ? sessionCwd
         : undefined;
-    const trustPromptMode = parsed.help || parsed.listModels !== undefined || parsed.listTips ? "print" : toProjectTrustMode(appMode);
-    const projectTrustByCwd = new Map();
     // Immediate feedback while the heavy runtime (extensions, models, trust) is
     // created; without it the terminal stays blank and looks stuck (codex-style
     // UI-first startup). Stopped before any other surface writes to stdout.
@@ -747,151 +905,8 @@ export async function main(args, options) {
         startupLoadingIndicator.start();
         startupLoadingIndicator.setPhase("extensions & models");
     }
-    const createRuntime = async ({ cwd, agentDir, sessionManager, sessionStartEvent, projectTrustContext, launchProfile, }) => {
-        const isInitialRuntime = sessionStartEvent === undefined;
-        const projectTrustDiagnostics = [];
-        const cachedProjectTrust = projectTrustByCwd.get(cwd);
-        const hasTrustRequiringResources = hasTrustRequiringProjectResources(cwd);
-        const shouldResolveProjectTrust = parsed.projectTrustOverride === undefined && cachedProjectTrust === undefined && hasTrustRequiringResources;
-        const projectTrusted = shouldResolveProjectTrust
-            ? false
-            : (cachedProjectTrust ??
-                parsed.projectTrustOverride ??
-                (!hasTrustRequiringResources || trustStore.get(cwd) === true));
-        const runtimeSettingsManager = SettingsManager.create(cwd, agentDir, { projectTrusted });
-        const services = await createAgentSessionServices({
-            cwd,
-            agentDir,
-            settingsManager: runtimeSettingsManager,
-            modelRuntimeSignal: AbortSignal.timeout(15_000),
-            extensionFlagValues: parsed.unknownFlags,
-            resourceLoaderReloadOptions: shouldResolveProjectTrust
-                ? {
-                    resolveProjectTrust: async ({ extensionsResult }) => {
-                        const trusted = await resolveProjectTrusted({
-                            cwd,
-                            trustStore,
-                            trustOverride: parsed.projectTrustOverride,
-                            defaultProjectTrust: startupSettingsManager.getDefaultProjectTrust(),
-                            extensionsResult,
-                            projectTrustContext: projectTrustContext ??
-                                pauseIndicatorDuringPrompts(createProjectTrustContext({
-                                    cwd,
-                                    mode: isInitialRuntime ? trustPromptMode : toProjectTrustMode(appMode),
-                                    settingsManager: startupSettingsManager,
-                                    hasUI: isInitialRuntime && trustPromptMode === "interactive",
-                                }), startupLoadingIndicator),
-                            onExtensionError: (message) => projectTrustDiagnostics.push({ type: "warning", message }),
-                        });
-                        projectTrustByCwd.set(cwd, trusted);
-                        return trusted;
-                    },
-                }
-                : undefined,
-            resourceLoaderOptions: {
-                additionalExtensionPaths: resolvedExtensionPaths,
-                additionalSkillPaths: resolvedSkillPaths,
-                additionalPromptTemplatePaths: resolvedPromptTemplatePaths,
-                additionalThemePaths: resolvedThemePaths,
-                noExtensions: parsed.noExtensions,
-                noSkills: parsed.noSkills,
-                noPromptTemplates: parsed.noPromptTemplates,
-                noThemes: parsed.noThemes,
-                noContextFiles: parsed.noContextFiles,
-                systemPrompt: parsed.systemPrompt,
-                appendSystemPrompt: parsed.appendSystemPrompt,
-                extensionFactories,
-            },
-        });
-        const { settingsManager, modelRuntime, resourceLoader } = services;
-        const diagnostics = [
-            ...projectTrustDiagnostics,
-            ...services.diagnostics,
-            ...collectSettingsDiagnostics(settingsManager, "runtime creation"),
-            ...collectExtensionLoadDiagnostics(resourceLoader.getExtensions().errors),
-        ];
-        const modelPatterns = getModelNarrowingPatterns({
-            cliPatterns: parsed.models,
-            legacyEnabledPatterns: settingsManager.getEnabledModels(),
-        });
-        const scopedModels = modelPatterns && modelPatterns.length > 0
-            ? await resolveModelScope(modelPatterns, modelRuntime, { signal: AbortSignal.timeout(15_000) })
-            : [];
-        // Multi-session opens carry their per-session startup choices here rather
-        // than through process argv. This deliberately feeds the same resolver as
-        // --provider/--model/--thinking, preserving classic flag semantics.
-        const runtimeParsed = launchProfile === undefined
-            ? parsed
-            : {
-                ...parsed,
-                ...(launchProfile.creationModel === undefined
-                    ? {}
-                    : {
-                        provider: launchProfile.creationModel.provider,
-                        model: launchProfile.creationModel.modelId,
-                    }),
-                ...(launchProfile.initialThinkingLevel === undefined
-                    ? {}
-                    : { thinking: launchProfile.initialThinkingLevel }),
-            };
-        const { options: sessionOptions, cliThinkingFromModel, diagnostics: sessionOptionDiagnostics, } = buildSessionOptions(runtimeParsed, scopedModels, sessionManager.hasContextMessages(), modelRuntime, settingsManager);
-        diagnostics.push(...sessionOptionDiagnostics);
-        if (parsed.apiKey) {
-            if (!sessionOptions.model) {
-                diagnostics.push({
-                    type: "error",
-                    message: "--api-key requires a model to be specified via --model, --provider/--model, or --models",
-                });
-            }
-            else {
-                await modelRuntime.setRuntimeApiKey(sessionOptions.model.provider, parsed.apiKey);
-            }
-        }
-        if (isInitialRuntime) {
-            startupLoadingIndicator.setPhase("opening session");
-        }
-        const created = await createAgentSessionFromServices({
-            services,
-            sessionManager,
-            sessionStartEvent,
-            model: sessionOptions.model,
-            thinkingLevel: sessionOptions.thinkingLevel,
-            thinkingSelection: sessionOptions.thinkingSelection,
-            scopedModels: sessionOptions.scopedModels,
-            tools: sessionOptions.tools,
-            excludeTools: sessionOptions.excludeTools,
-            noTools: sessionOptions.noTools,
-            customTools: sessionOptions.customTools,
-            autoTitleSessions: resolveAutoTitleSessions(appMode, parsed, sessionManager.hasContextMessages(), parseClientCapabilities(envValue("RPC_CLIENT_CAPABILITIES"))),
-        });
-        const cliThinkingOverride = runtimeParsed.thinking !== undefined || cliThinkingFromModel;
-        if (created.session.model && cliThinkingOverride) {
-            created.session.setThinkingLevel(created.session.thinkingLevel);
-        }
-        return {
-            ...created,
-            services,
-            diagnostics,
-        };
-    };
+    const createRuntime = createCliRuntimeFactory({ parsed, cwd, agentDir, appMode }, { extensionFactories, startupSettingsManager, startupLoadingIndicator });
     time("createRuntime");
-    if (appMode === "rpc" && parsed.multiSession) {
-        // The multi-session host never returns, so the initTheme() call further down
-        // is unreachable on this path. Extensions loaded per open_session (and any
-        // tool render helper) read the theme proxy and would otherwise crash with
-        // "Theme not initialized. Call initTheme() first." (surfaced in embedders
-        // like T3 Code as transcript errors).
-        initTheme(startupSettingsManager.getTheme(), false);
-        printTimings();
-        await runMultiSessionHost({
-            agentDir,
-            createRuntime,
-            cwd,
-            creationModel: parsed.provider && parsed.model ? { provider: parsed.provider, modelId: parsed.model } : undefined,
-            initialThinkingLevel: parsed.thinking,
-            listen: parsed.listen,
-        });
-    }
     const runtime = await createAgentSessionRuntime(createRuntime, {
         cwd: sessionManager.getCwd(),
         agentDir,