@rynx-ai/server 0.1.11-beta.1 → 0.1.11-beta.3

package/dist/remote-runtime-dispatcher.js

@@ -1,4 +1,5 @@
 import { encodeRemoteRuntimeRpcResponse, parseRemoteRuntimeRpcResponseForMethod, REMOTE_RUNTIME_RPC_METHOD_METADATA, } from "@rynx-ai/protocol/remote-runtime-rpc";
+import { RuntimeProjectInputError } from "@rynx-ai/core";
 import { encodeDaemonStatus } from "./remote-runtime.js";
 import { MachineSessionServiceFailure, MachineSessionServiceInputError, } from "./machine-session-service.js";
 import { SessionBrowserServiceError, } from "./session-browser-service.js";
@@ -35,6 +36,30 @@ export class RemoteRuntimeDispatcher {
                     return this.options.providerClis
                         ? rpcResult(request, await this.options.providerClis.listStatuses())
                         : rpcError(request.id, "method_not_found", "Provider CLI status is unavailable");
+                case "project.list":
+                    return await this.withProjects(request, async (projects) => ({
+                        projects: await projects.list(),
+                    }));
+                case "project.get":
+                    return await this.withProjects(request, async (projects) => ({
+                        project: requireProject(await projects.get(request.params.projectId)),
+                    }));
+                case "project.create":
+                    return await this.withProjects(request, async (projects) => ({
+                        project: await projects.create(request.params),
+                    }));
+                case "project.update": {
+                    const { projectId, ...input } = request.params;
+                    return await this.withProjects(request, async (projects) => ({
+                        project: requireProject(await projects.update(projectId, input)),
+                    }));
+                }
+                case "project.delete":
+                    return await this.withProjects(request, async (projects) => {
+                        if (!await projects.remove(request.params.projectId))
+                            throw new ProjectNotFoundError();
+                        return { deleted: true };
+                    });
                 case "emulator.devices.list":
                     return await this.withEmulator(request, (emulator) => emulator.devices());
                 case "emulator.active.get":
@@ -102,6 +127,8 @@ export class RemoteRuntimeDispatcher {
                     return await this.withSessions(request, (sessions) => sessions.launchOptions());
                 case "session.create":
                     return await this.withSessions(request, (sessions) => sessions.create(request.params));
+                case "session.fork":
+                    return await this.withSessions(request, (sessions) => sessions.fork(request.params));
                 case "session.message.send":
                     return await this.withSessions(request, (sessions) => {
                         const { sessionId, ...input } = request.params;
@@ -234,6 +261,13 @@ export class RemoteRuntimeDispatcher {
         }
         return rpcResult(request, await invoke(emulator));
     }
+    async withProjects(request, invoke) {
+        const projects = this.options.projects;
+        if (!projects) {
+            return rpcError(request.id, "method_not_found", "Runtime Projects are unavailable");
+        }
+        return rpcResult(request, await invoke(projects));
+    }
     async withSessions(request, invoke) {
         const sessions = this.options.sessions;
         if (!sessions) {
@@ -257,6 +291,17 @@ export class RemoteRuntimeDispatcher {
     }
 }
 function mapHostError(request, error) {
+    if (error instanceof ProjectNotFoundError) {
+        return { code: "not_found", message: "Runtime Project was not found" };
+    }
+    if (error instanceof RuntimeProjectInputError) {
+        return {
+            code: error.code,
+            message: error.code === "invalid_request"
+                ? "Runtime Project configuration is invalid"
+                : "Runtime Project directory is unavailable",
+        };
+    }
     if (error instanceof SessionBrowserServiceError) {
         switch (error.code) {
             case "invalid_request":
@@ -340,6 +385,13 @@ function mapHostError(request, error) {
     }
     return { code: "internal", message: "Remote Runtime request failed" };
 }
+class ProjectNotFoundError extends Error {
+}
+function requireProject(project) {
+    if (!project)
+        throw new ProjectNotFoundError();
+    return project;
+}
 function idempotentCancel(watch) {
     let pending;
     return () => {

package/dist/remote-runtime-session-projection.js

@@ -64,6 +64,7 @@ function projectRuntimeSnapshot(value) {
     const originalActive = runtime.activeResponseIds;
     const projected = {
         status: runtime.status,
+        ...(runtime.statusKind === undefined ? {} : { statusKind: runtime.statusKind }),
         activeResponseIds: [],
         pendingInteractions: [],
     };

package/dist/server.d.ts

@@ -1,9 +1,10 @@
 import type { Server as HttpServer } from "node:http";
 import Koa from "koa";
-import { ConversationRuntime, type AgentCapabilities, type AgentSessionStore, type AppConfig, type ChannelInstanceDescriptor, type SessionEvent, type SessionBus, type SessionLogStore, type SessionRegistry } from "@rynx-ai/core";
+import { ConversationRuntime, type AdmissionReservation, type AgentCapabilities, type AgentSessionStore, type AppConfig, type SessionEvent, type SessionBus, type SessionLogStore, type SessionRegistry } from "@rynx-ai/core";
 import type { SessionInteractionResolution } from "@rynx-ai/protocol";
 import type { ControlRuntimeShareAddress, DaemonBrowserArtifactCleanResult, DaemonBrowserArtifactInstallInput, DaemonBrowserArtifactInstallResult, DaemonBrowserArtifactUpdateInput, DaemonBrowserArtifactVersionResult, DaemonCleanupSessionsInput, DaemonCleanupSessionsResult, DaemonChromeInspectionConfigureInput, DaemonChromeInspectionStatus, DaemonShutdownIfIdleResult } from "@rynx-ai/protocol/control";
-import type { PluginInstallCommitInput, PluginInstallCommitResult, PluginInstallPreparation, PluginInstallPrepareInput, PluginManagementItem } from "@rynx-ai/protocol/plugin-management";
+import type { PluginInstallCommitInput, PluginInstallCommitResult, PluginInstallPreparation, PluginInstallPrepareInput, PluginManagementItem, PluginMarketplaceAddInput, PluginMarketplaceItem } from "@rynx-ai/protocol/plugin-management";
+import type { PluginJsonValue } from "@rynx-ai/plugin-sdk";
 import type { PairingOffer } from "@rynx-ai/protocol/direct-runtime";
 import type { DaemonStatus } from "@rynx-ai/protocol/remote-runtime";
 import type { RuntimeBrowserBootstrapCredential, RuntimeBrowserEndpointDescriptor } from "@rynx-ai/protocol/runtime-browser-bootstrap";
@@ -13,8 +14,8 @@ import type { RuntimeEmulatorSurfaceImageFrame, RuntimeEmulatorSurfaceReadyFrame
 import type { RemoteRuntimeRpcMethod, RemoteRuntimeRpcParams, RemoteRuntimeRpcResultFor, RemoteRuntimeSequencedSessionEvent } from "@rynx-ai/protocol/remote-runtime-rpc";
 import type { PluginAgentSummary, PluginResolvedSessionExecution, PluginSessionExecutionSnapshot } from "@rynx-ai/plugin-sdk";
 import { RunnerManager, type CodexSessionStore, type RunnerSessionContextProvider } from "@rynx-ai/runtime";
-import { ChannelManager } from "./channel-manager.js";
 import { type ControlPlaneDeps, type LocalSessionResourceHost, type SessionResourceLifecycle } from "./control-api.js";
+import type { MachineSessionService } from "./machine-session-service.js";
 import type { DaemonRuntimeHost } from "./remote-runtime.js";
 import { type AttachDesktopBrowserHostServerOptions } from "./desktop-browser-host.js";
 import { SessionRuntimeIndex } from "./session-runtime-index.js";
@@ -22,11 +23,9 @@ import type { SessionEmulatorService } from "./session-emulator-service.js";
 import { type SessionTerminalHost } from "./session-terminal-host.js";
 import type { ProviderCliManagementHost } from "./provider-cli-host.js";
 import { type RuntimeWebAccessPolicy } from "./runtime-web-auth.js";
-export { ChannelManager } from "./channel-manager.js";
-export type { ChannelInstanceStatus } from "./channel-manager.js";
 export type { ProviderCliManagementHost, ProviderCliStatusHost, } from "./provider-cli-host.js";
 export { MachineSessionService, MachineSessionServiceFailure, MachineSessionServiceInputError, synthesizeSessionTitle, } from "./machine-session-service.js";
-export type { MachineSessionAgentCatalogPort, MachineSessionCreateInput, MachineSessionCreateResult, MachineSessionDeleteResult, MachineSessionInterruptPort, MachineSessionInterruptResult, MachineSessionInteractionResult, MachineSessionListInput, MachineSessionListPage, MachineSessionMessageResult, MachineSessionMessageEnqueueResult, MachineSessionMessageInput, MachineSessionMessageOperationState, MachineSessionPendingMessage, MachineSessionPendingMessagePort, MachineSessionPreparedInput, MachineSessionResourcePort, MachineSessionRunnerPort, MachineSessionRuntimeStatePort, MachineSessionServiceFailureCode, MachineSessionServiceOptions, MachineSessionServicePorts, MachineSessionSnapshotInput, MachineSessionSnapshotPage, MachineSessionWatch, } from "./machine-session-service.js";
+export type { MachineSessionAgentCatalogPort, MachineSessionCreateInput, MachineSessionCreateResult, MachineSessionDeleteResult, MachineSessionForkInput, MachineSessionForkOperationRecord, MachineSessionForkOperationState, MachineSessionForkResult, MachineSessionForkStorePort, MachineSessionNativeRotationInput, MachineSessionInterruptPort, MachineSessionInterruptResult, MachineSessionInteractionResult, MachineSessionListInput, MachineSessionListPage, MachineSessionMessageResult, MachineSessionMessageEnqueueResult, MachineSessionMessageInput, MachineSessionMessageOperationState, MachineSessionPendingMessage, MachineSessionPendingMessagePort, MachineSessionPreparedInput, MachineSessionResourcePort, MachineSessionRunnerPort, MachineSessionRuntimeStatePort, MachineSessionServiceFailureCode, MachineSessionServiceOptions, MachineSessionServicePorts, MachineSessionSnapshotInput, MachineSessionSnapshotPage, MachineSessionWatch, } from "./machine-session-service.js";
 export { SessionBrowserHostError, SessionBrowserService, SessionBrowserServiceError, SessionBrowserSurfaceUnsupportedError, } from "./session-browser-service.js";
 export type { SessionBrowserHost, SessionBrowserHostCreateInput, SessionBrowserHostErrorCode, SessionBrowserHostEvent, SessionBrowserHostHandle, SessionBrowserHostPage, SessionBrowserHostSurfaceFrame, SessionBrowserHostSurfaceOpenInput, SessionBrowserHostSurfaceSource, SessionBrowserHostSurfaceTrustedInput, SessionBrowserHostSurfaceViewport, SessionBrowserHostSnapshot, SessionBrowserInspectionEndpoint, SessionBrowserInspectionTarget, SessionBrowserRegistryPort, SessionBrowserServiceErrorCode, SessionBrowserServiceOptions, SessionBrowserServicePorts, SessionBrowserSurfaceOpenInput, SessionBrowserSurfaceSource, } from "./session-browser-service.js";
 export { SessionEmulatorBindingConflictError, SessionEmulatorService, SessionEmulatorServiceError, } from "./session-emulator-service.js";
@@ -48,14 +47,14 @@ export { RemoteRuntimeDispatcher } from "./remote-runtime-dispatcher.js";
 export type { AuthenticatedRuntimeSubject, RemoteRuntimeEmulatorHost, RemoteRuntimeSessionEmulatorHost, RemoteRuntimeDispatchContext, RemoteRuntimeDispatcherOptions, } from "./remote-runtime-dispatcher.js";
 export { createRunnerSessionTerminalHost, SessionTerminalOpenError, SessionTerminalStreamError, } from "./session-terminal-host.js";
 export type { RunnerSessionTerminalHostOptions, RunnerSessionTerminalHost, SessionTerminalAttachment, SessionTerminalCloseInfo, SessionTerminalCloseReason, SessionTerminalHost, SessionTerminalOpenErrorCode, SessionTerminalOpenOptions, SessionTerminalRole, } from "./session-terminal-host.js";
-export type { ControlChannel, ControlChannelType, ControlInstanceConfig, ControlInstanceStatus, ControlAgentSummary, } from "@rynx-ai/protocol/control";
+export type { ControlAgentSummary } from "@rynx-ai/protocol/control";
+export { listRuntimeModels } from "@rynx-ai/runtime";
 export interface CreateAppOptions {
     config?: AppConfig;
     /** When present, mount the control plane (page + JSON API) beside `/health`.
      *  `runtime`/`sessionBus`/`sessionLog`/`runnerManager` (from `startServer`'s
      *  scope) enable the channel-agnostic `/api/sessions` agent-run endpoints. */
     control?: {
-        manager: ChannelManager;
         deps: ControlPlaneDeps;
         runtime?: ConversationRuntime;
         sessionBus?: SessionBus;
@@ -63,8 +62,6 @@ export interface CreateAppOptions {
         runnerManager?: RunnerManager;
         sessionStore?: CodexSessionStore;
         pluginRuntimeStatus?: () => unknown;
-        pluginRuntimeReload?: (pluginId: string) => Promise<unknown>;
-        pluginRuntimeEnsure?: (pluginId: string) => Promise<unknown>;
         daemonManagement?: DaemonManagementHost;
         remoteRuntime?: DaemonRuntimeHost;
         remoteRuntimeAdmin?: RemoteRuntimeAdminHost;
@@ -72,6 +69,7 @@ export interface CreateAppOptions {
         runtimeWebAccess?: RuntimeWebAccessPolicy;
         runtimeConnectionResolver?: RuntimeConnectionResolverHost;
         localSessionResources?: LocalSessionResourceHost;
+        localMachineSessions?: MachineSessionService;
         sessionEmulators?: SessionEmulatorService;
         /** Host lifecycle signal for ending SSE/video streams before drain. */
         shutdownSignal?: AbortSignal;
@@ -83,29 +81,20 @@ export interface CreateAppOptions {
 }
 export interface StartServerOptions {
     config?: AppConfig;
-    /** Static set of channel instances to mount, each with its own context. */
-    channelInstances?: ChannelInstanceDescriptor[];
     /**
-     * Dynamic source of channel instance descriptors, re-read on reloads. When
-     * provided, the server mounts them via a {@link ChannelManager} (the seam the
-     * control plane drives). Takes precedence over `channelInstances`.
-     */
-    loadInstances?: () => Promise<ChannelInstanceDescriptor[]>;
-    /**
-     * Control-plane deps (config + agent-spec mutators + log tail) injected by the
-     * daemon. When present (and instances are managed), the server serves the
-     * control page + JSON API. Requires `loadInstances`/`channelInstances`.
+     * Control-plane deps injected by the daemon. Plugin/channel management is
+     * exposed through the plugin host rather than generic channel instances.
      */
     control?: ControlPlaneDeps;
     /**
      * Durable canonical session log (the daemon injects the SQLite-backed store).
-     * Absent ⇒ channels render from the live stream without persisting.
+     * Absent means live session events are not persisted by this server.
      */
     sessionLog?: SessionLogStore;
     /**
-     * Unified machine-session registry (the daemon injects the SQLite-backed store
-     * over `sessions`). Handed to mounted channels so they register an identity row
-     * per session; the control plane lists every session uniformly from it.
+     * Unified machine-session registry (the daemon injects the SQLite-backed
+     * store over `sessions`). Plugins reach it through Host RPC; the control plane
+     * lists every session uniformly from it.
      */
     sessionRegistry?: SessionRegistry;
     /** Trusted daemon-side bridge for isolated plugin runners. Installed plugin
@@ -124,6 +113,8 @@ export interface StartServerOptions {
     runtimeConnectionResolver?: RuntimeConnectionResolverHost;
     /** In-process resource authority used only by the Local Runtime BFF. */
     localSessionResources?: LocalSessionResourceHost;
+    /** Canonical same-daemon Session service used by Local compatibility routes. */
+    localMachineSessions?: MachineSessionService;
     /** Runtime-owned Session Emulator binding authority for Local compatibility routes. */
     sessionEmulators?: SessionEmulatorService;
     /** Pre-composed daemon-owned Session runtime. Supplying this lets the daemon
@@ -148,6 +139,7 @@ export interface SessionRuntimeServices {
     sessionBus: SessionBus;
     sessionRuntimeIndex: SessionRuntimeIndex;
     conversationRuntime: ConversationRuntime;
+    publishSessionEvent: (sessionId: string, event: SessionEvent) => Promise<void>;
 }
 export interface PluginRuntimeHostServices {
     conversationRuntime: ConversationRuntime;
@@ -163,15 +155,18 @@ export interface PluginRuntimeHostServices {
         }): Promise<PluginResolvedSessionExecution>;
     };
     interruptSession(sessionId: string): Promise<boolean>;
+    terminateSession?(sessionId: string): Promise<boolean>;
     resolveSessionInteraction(sessionId: string, interactionId: string, resolution: SessionInteractionResolution): Promise<{
         disposition: "applied" | "already_resolved" | "not_found" | "invalid";
     }>;
+    /** Dynamic daemon-wide admission state. Plugin runtimes may start while this is
+     * closed, but cannot provision Sessions or begin Turns. */
+    admissionOpen?: () => boolean;
+    admissionReserve?: () => AdmissionReservation | undefined;
 }
 export interface PluginRuntimeLifecycle {
     bindHostServices(services: PluginRuntimeHostServices): void;
     startPluginRuntimes(): Promise<void>;
-    reloadPluginRuntime(pluginId: string): Promise<unknown>;
-    ensurePluginRuntime(pluginId: string): Promise<unknown>;
     /** Cached process/contribution health; must not block on plugin RPC. */
     statusSnapshot(): unknown;
     dispose(): Promise<void>;
@@ -206,8 +201,24 @@ export interface PluginManagementHost {
     prepareInstallation(input: PluginInstallPrepareInput, context: DaemonManagementInvocationContext): Promise<PluginInstallPreparation>;
     commitInstallation(token: string, input: PluginInstallCommitInput, context: DaemonManagementInvocationContext): Promise<PluginInstallCommitResult>;
     cancelPreparation(token: string): boolean | Promise<boolean>;
+    settingsUi(pluginId: string): {
+        generation: string;
+        assetGeneration: string;
+        html: string;
+    } | undefined;
+    settingsUiAsset(pluginId: string, assetGeneration: string, assetPath: string): {
+        contentType: string;
+        data: Buffer;
+    } | undefined;
+    callSettings(pluginId: string, generation: string, method: string, params: PluginJsonValue | undefined, context: DaemonManagementInvocationContext): Promise<PluginJsonValue>;
     dispose?(): void | Promise<void>;
 }
+export interface PluginMarketplaceManagementHost {
+    list(): PluginMarketplaceItem[] | Promise<PluginMarketplaceItem[]>;
+    add(input: PluginMarketplaceAddInput, context: DaemonManagementInvocationContext): Promise<PluginMarketplaceItem>;
+    refresh(id: string, context: DaemonManagementInvocationContext): Promise<PluginMarketplaceItem>;
+    remove(id: string): boolean | Promise<boolean>;
+}
 export interface BrowserArtifactManagementHost {
     install(input: DaemonBrowserArtifactInstallInput, context: DaemonManagementInvocationContext): Promise<DaemonBrowserArtifactInstallResult>;
     update(input: DaemonBrowserArtifactUpdateInput, context: DaemonManagementInvocationContext): Promise<DaemonBrowserArtifactInstallResult>;
@@ -230,9 +241,15 @@ export interface DaemonManagementHost {
         restartRequired: boolean;
     };
     /** Perform one final activity check and schedule shutdown only when idle. */
-    shutdownIfIdle?(): DaemonShutdownIfIdleResult;
+    shutdownIfIdle?(maintenanceLeaseToken?: string): DaemonShutdownIfIdleResult | Promise<DaemonShutdownIfIdleResult>;
+    /** Release a cross-process maintenance fence after a verified cutover. */
+    releaseMaintenanceLease?(maintenanceLeaseToken: string): {
+        outcome: "released" | "not_active" | "denied";
+    };
     /** Stateful plugin registry operations owned by the resident daemon. */
     pluginManagement?: PluginManagementHost;
+    /** Registered Git/local plugin catalogs. */
+    pluginMarketplaces?: PluginMarketplaceManagementHost;
     /** Stateful Chrome for Testing artifact operations owned by the daemon. */
     browserArtifacts?: BrowserArtifactManagementHost;
     /** Destructive maintenance operations over daemon-owned state. */
@@ -407,6 +424,8 @@ export declare function createSessionRuntimeServices(input: {
     sessionLog?: SessionLogStore;
     onMirrorError?: (error: unknown, sessionId: string) => void;
     sessionContextProvider?: RunnerSessionContextProvider;
+    admissionOpen?: () => boolean;
+    admissionReserve?: () => AdmissionReservation | undefined;
 }): SessionRuntimeServices;
 /**
  * The HTTP surface is just a liveness probe for container orchestration — all
@@ -415,4 +434,4 @@ export declare function createSessionRuntimeServices(input: {
  * no agent request / response / SSE endpoints are exposed here.
  */
 export declare function createApp({ config, control }?: CreateAppOptions): Koa<Koa.DefaultState, Koa.DefaultContext>;
-export declare function startServer({ config, channelInstances, loadInstances, control, sessionLog, sessionRegistry, pluginRuntime, daemonManagement, remoteRuntime, remoteRuntimeAdmin, runtimeTargetControl, runtimeConnectionResolver, localSessionResources, sessionEmulators, sessionRuntimeServices, sessionLifecycle, sessionTerminals, runtimeLocalBrowser, providerClis, desktopBrowserHost, }?: StartServerOptions): Promise<RynxServer>;
+export declare function startServer({ config, control, sessionLog, sessionRegistry, pluginRuntime, daemonManagement, remoteRuntime, remoteRuntimeAdmin, runtimeTargetControl, runtimeConnectionResolver, localSessionResources, localMachineSessions, sessionEmulators, sessionRuntimeServices, sessionLifecycle, sessionTerminals, runtimeLocalBrowser, providerClis, desktopBrowserHost, }?: StartServerOptions): Promise<RynxServer>;

package/dist/server.js

@@ -3,7 +3,6 @@ import Koa from "koa";
 import Router from "@koa/router";
 import { loadConfig, listAgentSpecs, loadAgentSpec, resolveSessionExecution, resolveRuntimeModel, ConversationRuntime, InMemorySessionBus, persistSessionEvent, } from "@rynx-ai/core";
 import { RunnerManager, FileCodexSessionStore, resolveCodexSessionStorePath, } from "@rynx-ai/runtime";
-import { ChannelManager } from "./channel-manager.js";
 import { createControlRouter, } from "./control-api.js";
 import { attachEmulatorTouchWs } from "./emulator-touch-ws.js";
 import { attachTerminalWs } from "./terminal-ws.js";
@@ -14,7 +13,6 @@ import { resolveControlWebDist, sendSpaFile } from "./control-web-dist.js";
 import { SessionRuntimeIndex } from "./session-runtime-index.js";
 import { createRunnerSessionTerminalHost, } from "./session-terminal-host.js";
 import { runtimeWebAccessPolicyForBindHost, } from "./runtime-web-auth.js";
-export { ChannelManager } from "./channel-manager.js";
 export { MachineSessionService, MachineSessionServiceFailure, MachineSessionServiceInputError, synthesizeSessionTitle, } from "./machine-session-service.js";
 export { SessionBrowserHostError, SessionBrowserService, SessionBrowserServiceError, SessionBrowserSurfaceUnsupportedError, } from "./session-browser-service.js";
 export { SessionEmulatorBindingConflictError, SessionEmulatorService, SessionEmulatorServiceError, } from "./session-emulator-service.js";
@@ -26,6 +24,7 @@ export { attachDirectRuntimeBrowserSurfaceServer, DirectRuntimeBrowserSurfaceHos
 export { attachDirectRuntimeBrowserInspectServer, DirectRuntimeBrowserInspectHostError, } from "./direct-runtime-browser-inspect-server.js";
 export { RemoteRuntimeDispatcher } from "./remote-runtime-dispatcher.js";
 export { createRunnerSessionTerminalHost, SessionTerminalOpenError, SessionTerminalStreamError, } from "./session-terminal-host.js";
+export { listRuntimeModels } from "@rynx-ai/runtime";
 /** Preserve one session's mirror order without serializing unrelated sessions. */
 export class SessionMirrorQueue {
     persist;
@@ -60,18 +59,24 @@ export function createSessionRuntimeServices(input) {
         ...(input.sessionContextProvider
             ? { sessionContextProvider: input.sessionContextProvider }
             : {}),
+        ...(input.admissionOpen ? { admissionOpen: input.admissionOpen } : {}),
+        ...(input.admissionReserve ? { admissionReserve: input.admissionReserve } : {}),
     });
     const sessionBus = new InMemorySessionBus();
     const sessionRuntimeIndex = new SessionRuntimeIndex();
+    const sessionMirrorQueue = new SessionMirrorQueue((sessionId, event) => persistSessionEvent(sessionId, event, { sessionLog: input.sessionLog, sessionBus }));
+    const mirrorSessionEvent = (sessionId, event) => {
+        sessionRuntimeIndex.observe(sessionId, event);
+        return sessionMirrorQueue.enqueue(sessionId, event);
+    };
     const conversationRuntime = new ConversationRuntime({
         config: input.config,
         executor: runnerManager,
         sessionBus,
+        sessionEventSink: mirrorSessionEvent,
     });
-    const sessionMirrorQueue = new SessionMirrorQueue((sessionId, event) => persistSessionEvent(sessionId, event, { sessionLog: input.sessionLog, sessionBus }));
     runnerManager.onMirror((sessionId, event) => {
-        sessionRuntimeIndex.observe(sessionId, event);
-        void sessionMirrorQueue.enqueue(sessionId, event).catch((error) => {
+        void mirrorSessionEvent(sessionId, event).catch((error) => {
             input.onMirrorError?.(error, sessionId);
         });
     });
@@ -81,6 +86,7 @@ export function createSessionRuntimeServices(input) {
         sessionBus,
         sessionRuntimeIndex,
         conversationRuntime,
+        publishSessionEvent: mirrorSessionEvent,
     };
 }
 /**
@@ -131,7 +137,7 @@ export function createApp({ config = loadConfig(), control } = {}) {
     }
     return app;
 }
-export async function startServer({ config = loadConfig(), channelInstances, loadInstances, control, sessionLog, sessionRegistry, pluginRuntime, daemonManagement, remoteRuntime, remoteRuntimeAdmin, runtimeTargetControl, runtimeConnectionResolver, localSessionResources, sessionEmulators, sessionRuntimeServices, sessionLifecycle, sessionTerminals, runtimeLocalBrowser, providerClis, desktopBrowserHost, } = {}) {
+export async function startServer({ config = loadConfig(), control, sessionLog, sessionRegistry, pluginRuntime, daemonManagement, remoteRuntime, remoteRuntimeAdmin, runtimeTargetControl, runtimeConnectionResolver, localSessionResources, localMachineSessions, sessionEmulators, sessionRuntimeServices, sessionLifecycle, sessionTerminals, runtimeLocalBrowser, providerClis, desktopBrowserHost, } = {}) {
     const runtimeWebAccess = runtimeWebAccessPolicyForBindHost(config.HOST);
     const desktopBrowserManagementToken = desktopBrowserHost
         ? requireDaemonManagementToken(daemonManagement)
@@ -148,10 +154,10 @@ export async function startServer({ config = loadConfig(), channelInstances, loa
         createRunnerSessionTerminalHost({
             runnerManager,
             resolveLiveSession: async (sessionId) => {
-                const session = await sessionStore.get(sessionId);
+                const session = sessionRegistry?.get(sessionId);
                 if (!session || !runnerManager.hasLiveSession(sessionId))
                     return undefined;
-                return { cwd: session.cwd };
+                return { cwd: session.workspace.cwd };
             },
         });
     if (pluginRuntime) {
@@ -175,139 +181,53 @@ export async function startServer({ config = loadConfig(), channelInstances, loa
                 }),
             },
             interruptSession: (sessionId) => runnerManager.interruptLiveSession(sessionId),
+            terminateSession: (sessionId) => runnerManager.terminateLiveSession(sessionId),
             resolveSessionInteraction: (sessionId, interactionId, resolution) => runnerManager.resolveInteraction(sessionId, interactionId, resolution),
         });
     }
-    // claude `/clear`·`/fork` rotates to a fresh machine-session; record its meta so
-    // the console list shows it with the carried-over launch target/model + a source tag.
-    // (It also surfaces via the log-merge once its first turn mirrors.)
+    // Provider TUI `/clear`·`/fork` uses the same publication boundary as an
+    // explicit Rynx fork. The manager exposes the transferred terminal only after
+    // this resolves, so no target can appear with missing history or metadata.
     runnerManager.onRotate((r) => {
-        const source = control?.getSessionMeta(r.from);
-        control?.createSessionMeta({
-            id: r.to,
-            source: r.kind === "fork" ? "fork" : "clear",
-            ...(r.agent
-                ? { agent: r.agent }
-                : source?.provider
-                    ? { provider: source.provider }
-                    : {}),
-            ...(r.model ? { model: r.model } : {}),
-            createdAt: new Date().toISOString(),
+        if (!localMachineSessions) {
+            throw new Error("native Session rotation requires the machine Session service");
+        }
+        return localMachineSessions.recordNativeRotation({
+            sourceSessionId: r.from,
+            targetSessionId: r.to,
+            kind: r.kind,
         });
     });
-    // New path: per-instance contexts via the ChannelManager (the daemon supplies
-    // `loadInstances`; the control plane drives live start/stop/reload).
-    const resolveInstances = loadInstances ?? (channelInstances ? async () => channelInstances : null);
-    if (resolveInstances) {
-        const controlShutdown = new AbortController();
-        const manager = new ChannelManager({
-            config,
-            conversationRuntime,
-            capabilities: runnerManager,
-            sessionStore,
-            sessionLog,
-            sessionBus,
-            sessionRegistry,
-            loadInstances: resolveInstances,
-        });
-        const app = createApp({
-            config,
-            control: control
-                ? {
-                    manager,
-                    deps: control,
-                    runtime: conversationRuntime,
-                    sessionBus,
-                    sessionLog,
-                    runnerManager,
-                    sessionStore,
-                    pluginRuntimeStatus: pluginRuntime
-                        ? () => pluginRuntime.statusSnapshot()
-                        : undefined,
-                    pluginRuntimeReload: pluginRuntime
-                        ? (pluginId) => pluginRuntime.reloadPluginRuntime(pluginId)
-                        : undefined,
-                    pluginRuntimeEnsure: pluginRuntime
-                        ? (pluginId) => pluginRuntime.ensurePluginRuntime(pluginId)
-                        : undefined,
-                    daemonManagement,
-                    remoteRuntime,
-                    remoteRuntimeAdmin,
-                    runtimeTargetControl,
-                    runtimeConnectionResolver,
-                    localSessionResources,
-                    sessionEmulators,
-                    shutdownSignal: controlShutdown.signal,
-                    sessionRuntimeIndex,
-                    sessionLifecycle,
-                    runtimeLocalBrowser,
-                    providerClis,
-                }
-                : undefined,
-        });
-        return new Promise((resolve) => {
-            const server = app.listen(config.PORT, config.HOST, () => {
-                console.log(JSON.stringify({
-                    level: config.LOG_LEVEL,
-                    msg: "Harness agent server listening",
-                    host: config.HOST,
-                    port: config.PORT,
-                    runtime: config.AGENT_RUNTIME,
-                    model: resolveRuntimeModel(config, config.AGENT_RUNTIME),
-                }));
-                const startup = (async () => {
-                    await pluginRuntime?.startPluginRuntimes();
-                    await manager.startAll();
-                })();
-                void startup.catch((error) => {
-                    console.error(JSON.stringify({
-                        level: "error",
-                        type: "plugin-runtime",
-                        event: "startup_failed",
-                        error: error instanceof Error ? error.message : String(error),
-                    }));
-                });
-                // Live WS bridges share this http.Server (no second port).
-                const webSocketServers = [
-                    attachTerminalWs(server, {
-                        runtimeConnectionResolver,
-                        legacyLocalTerminalHost,
-                        runtimeWebAccess,
-                    }),
-                    attachBrowserSurfaceWs(server, { runtimeConnectionResolver, runtimeWebAccess }),
-                    attachEmulatorSurfaceWs(server, { runtimeConnectionResolver, runtimeWebAccess }),
-                ];
-                if (desktopBrowserHost && desktopBrowserManagementToken) {
-                    webSocketServers.push(attachDesktopBrowserHostServer(server, {
-                        ...desktopBrowserHost,
-                        managementToken: desktopBrowserManagementToken,
-                    }));
-                }
-                if (control?.emulator) {
-                    webSocketServers.push(attachEmulatorTouchWs(server, { emulator: control.emulator }));
-                }
-                resolve(bindServerLifecycle(server, {
-                    fence: () => {
-                        controlShutdown.abort(new Error("Rynx server is shutting down"));
-                    },
-                    closeUpgrades: async () => {
-                        await closeWebSocketServers(webSocketServers);
-                    },
-                    cleanup: async () => {
-                        await runCleanupSteps([
-                            () => startup.catch(() => undefined),
-                            () => manager.stopAll(),
-                            () => Promise.resolve(daemonManagement?.pluginManagement?.dispose?.()),
-                            () => pluginRuntime?.dispose() ?? Promise.resolve(),
-                            () => runnerManager.stop(),
-                        ]);
-                    },
-                }));
-            });
-        });
-    }
-    // Core-only mode: no chat instances and no plugin code are required.
-    const app = createApp();
+    const controlShutdown = new AbortController();
+    const app = createApp({
+        config,
+        control: control
+            ? {
+                deps: control,
+                runtime: conversationRuntime,
+                sessionBus,
+                sessionLog,
+                runnerManager,
+                sessionStore,
+                pluginRuntimeStatus: pluginRuntime
+                    ? () => pluginRuntime.statusSnapshot()
+                    : undefined,
+                daemonManagement,
+                remoteRuntime,
+                remoteRuntimeAdmin,
+                runtimeTargetControl,
+                runtimeConnectionResolver,
+                localSessionResources,
+                localMachineSessions,
+                sessionEmulators,
+                shutdownSignal: controlShutdown.signal,
+                sessionRuntimeIndex,
+                sessionLifecycle,
+                runtimeLocalBrowser,
+                providerClis,
+            }
+            : undefined,
+    });
     return new Promise((resolve) => {
         const server = app.listen(config.PORT, config.HOST, () => {
             console.log(JSON.stringify({
@@ -315,21 +235,45 @@ export async function startServer({ config = loadConfig(), channelInstances, loa
                 msg: "Harness agent server listening",
                 host: config.HOST,
                 port: config.PORT,
-                runtime: config.AGENT_RUNTIME,
-                model: resolveRuntimeModel(config, config.AGENT_RUNTIME),
+                runtime: config.DEFAULT_RUNTIME,
+                model: resolveRuntimeModel(config, config.DEFAULT_RUNTIME),
             }));
-            const webSocketServers = [];
+            const startup = pluginRuntime?.startPluginRuntimes() ?? Promise.resolve();
+            void startup.catch((error) => {
+                console.error(JSON.stringify({
+                    level: "error",
+                    type: "plugin-runtime",
+                    event: "startup_failed",
+                    error: error instanceof Error ? error.message : String(error),
+                }));
+            });
+            const webSocketServers = [
+                attachTerminalWs(server, {
+                    runtimeConnectionResolver,
+                    legacyLocalTerminalHost,
+                    runtimeWebAccess,
+                }),
+                attachBrowserSurfaceWs(server, { runtimeConnectionResolver, runtimeWebAccess }),
+                attachEmulatorSurfaceWs(server, { runtimeConnectionResolver, runtimeWebAccess }),
+            ];
             if (desktopBrowserHost && desktopBrowserManagementToken) {
                 webSocketServers.push(attachDesktopBrowserHostServer(server, {
                     ...desktopBrowserHost,
                     managementToken: desktopBrowserManagementToken,
                 }));
             }
+            if (control?.emulator) {
+                webSocketServers.push(attachEmulatorTouchWs(server, { emulator: control.emulator }));
+            }
             resolve(bindServerLifecycle(server, {
-                ...(webSocketServers.length > 0
-                    ? { closeUpgrades: () => closeWebSocketServers(webSocketServers) }
-                    : {}),
-                cleanup: () => runnerManager.stop(),
+                fence: () => controlShutdown.abort(new Error("Rynx server is shutting down")),
+                closeUpgrades: () => closeWebSocketServers(webSocketServers),
+                cleanup: async () => runCleanupSteps([
+                    () => startup.catch(() => undefined),
+                    () => Promise.resolve(daemonManagement?.pluginManagement?.dispose?.()),
+                    () => pluginRuntime?.dispose() ?? Promise.resolve(),
+                    () => runnerManager.stop(),
+                ]),
             }));
         });
     });

package/dist/session-browser-service.d.ts

@@ -1,3 +1,4 @@
+import type { AdmissionReservation } from "@rynx-ai/core";
 import { type RuntimeBrowserCloseParams, type RuntimeBrowserCloseResult, type RuntimeBrowserExecutionBackend, type RuntimeBrowserOpenParams, type RuntimeBrowserPageCreateParams, type RuntimeBrowserPageMutationParams, type RuntimeBrowserPageNavigateParams, type RuntimeBrowserState, type RuntimeBrowserStateGetParams } from "@rynx-ai/protocol/runtime-browser";
 import type { RuntimeBrowserSurfaceFormat, RuntimeBrowserSurfaceInputEvent } from "@rynx-ai/protocol/runtime-browser-surface";
 import { type RuntimeBrowserEndpointDescriptor } from "@rynx-ai/protocol/runtime-browser-bootstrap";
@@ -155,6 +156,11 @@ export interface SessionBrowserServiceOptions {
     pageIdFactory?: () => string;
     /** Injectable boot nonce; production randomization fences stale pre-restart mutations. */
     bootGenerationSeed?: number;
+    /**
+     * Synchronous daemon admission fence. A successful reservation is held until
+     * Browser open has either failed or registered the physical Host handle.
+     */
+    admissionReserve?: () => AdmissionReservation | undefined;
 }
 export type SessionBrowserHostErrorCode = "unavailable" | "page_not_found" | "capacity" | "outcome_unknown";
 /** Expected failure reported by a Browser Host implementation. */
@@ -181,6 +187,7 @@ export declare class SessionBrowserService {
     private readonly observers;
     private readonly pageIdFactory;
     private readonly bootGenerationSeed;
+    private readonly admissionReserve?;
     private shuttingDown;
     private closeAllPromise?;
     constructor(ports: SessionBrowserServicePorts, options?: SessionBrowserServiceOptions);
@@ -225,6 +232,7 @@ export declare class SessionBrowserService {
     closeAll(): Promise<void>;
     private closeEveryRecord;
     private createBrowser;
+    private reserveOpenAdmission;
     private closeUnavailableForRecreate;
     private pageMutation;
     private pageMutationParsed;