@stage-labs/metro 0.1.0-beta.307 → 0.1.0-beta.309

package/runtime/node_modules/@metro-labs/daemon/src/agent-user/view.ts

@@ -4,6 +4,7 @@ import { errMsg, log } from '@metro-labs/core/log';
 import { isRecord } from '@metro-labs/core/is-record';
 import { agentsDir } from '../agents/files.js';
 import { MCP_TOKEN_FILE } from '../mcp-server/token.js';
+import { effectiveSetup, modelViewText } from '../gateway/effective.js';
 import { removeHome, writeHomeText } from './home-fs.js';
 import { closeMetroHome } from './metro-home.js';
 import { agentUser, agentViewDir, type AgentUser } from './user.js';
@@ -39,17 +40,10 @@ function agentFile(dir: string): string | null {
   return json({ version: 1, id: file.id, key: file.key });
 }
 
-function modelFile(dir: string): string | null {
-  const cfg = readRecord(join(dir, 'model.json'));
-  if (cfg === null || !Array.isArray(cfg.connections)) return null;
-  const connections = cfg.connections.filter(isRecord).map((c) => ({ id: c.id, provider: c.provider, model: c.model }));
-  return json({ version: 2, route: cfg.route, connections });
-}
-
-export function viewFiles(dir = agentsDir()): Map<string, string | null> {
+export function viewFiles(dir = agentsDir(), model: () => string | null = () => modelViewText(effectiveSetup(dir))): Map<string, string | null> {
   const files = new Map<string, string | null>([
     ['agent.json', agentFile(dir)],
-    ['model.json', modelFile(dir)],
+    ['model.json', model()],
   ]);
   for (const name of COPIED) files.set(name, existsSync(join(dir, name)) ? readText(join(dir, name)) : null);
   for (const name of NEVER_COPIED) files.set(name, null);

package/runtime/node_modules/@metro-labs/daemon/src/boot/boot.ts

@@ -26,9 +26,8 @@ import { refreshConnectorTools, watchConnectorTools } from '../mcp-server/connec
 import { setAnnouncedFile } from '../mcp-server/announced.js';
 import { holdServerApproval } from '../mcp/server-approvals.js';
 import { removeConnectorLeftovers } from '../connectors/leftovers.js';
-import { removeMetroPlugin } from '../claude/plugin-cleanup.js';
 import { runningAsRoot } from '../metro-user/privilege.js';
-import { provisionAgentUser } from '../agent-user/provision.js';
+import { prepareAgentRunner, provisionAgentUser } from '../agent-user/provision.js';
 import { applyVault } from '../vault/index.js';
 import { blockImds } from '../metro-user/imds.js';
 import { followRelease } from '../metro-user/root-follow.js';
@@ -61,6 +60,11 @@ import { startUploadReaper } from '../files/upload-store.js';
 import { startAttachReaper } from '../files/attach-reaper.js';
 import { startCloudWatchPublisher } from '../server/cloudwatch.js';
 import { watchFallbackUsage } from '../gateway/usage-refresh.js';
+import { startOrgModels, stopOrgModels } from '../gateway/org-models.js';
+import { effectiveSetup, watchModelChanges } from '../gateway/effective.js';
+import { readClaudeLogins } from '../gateway/claude-store.js';
+import { readAgentKey } from '../connectors/agent-key.js';
+import { METRO_API } from '../connectors/metro-api.js';
 import { isCallEvent, leaveCallsForShutdown, onCallEvent, sweepLeftoverCalls } from '../voice/calls.js';
 
 installCrashGuard();
@@ -115,7 +119,7 @@ async function syncStations(station: StationName): Promise<void> {
   }
 }
 
-function sessionApis(setLiveEvents: (on: boolean) => void, switchModel: (model: string | null) => boolean): SessionApis {
+function sessionApis(setLiveEvents: (on: boolean) => void): SessionApis {
   return localSessionApis({
       syncStations,
       reloadAgents: async () => {
@@ -134,7 +138,6 @@ function sessionApis(setLiveEvents: (on: boolean) => void, switchModel: (model:
       toolGroups: stationToolGroups,
       prepareAccount,
       liveEvents: setLiveEvents,
-      switchModel,
     });
 }
 
@@ -151,10 +154,12 @@ installBearerSessions(agentsDir(), localOwner);
   syncGmailHost();
   supervisor.start();
   sweepLeftoverCalls();
+  const models = startOrgModels({ owner: localOwner, key: () => readAgentKey(), api: METRO_API, dir: agentsDir });
   const metroMcp = await createMetroMcp({ liveEvents: liveEvents() });
+  watchModelChanges(models, metroMcp.switchModel);
   webhookServer = await startWebhookServer(
     emit,
-    sessionApis(metroMcp.setLiveEvents, metroMcp.switchModel),
+    sessionApis(metroMcp.setLiveEvents),
     metroMcp.httpHandler,
     true,
   );
@@ -175,7 +180,7 @@ installBearerSessions(agentsDir(), localOwner);
   });
   watchConnectorTools();
   startCloudWatchPublisher();
-  watchFallbackUsage();
+  watchFallbackUsage(() => effectiveSetup(), () => readClaudeLogins());
   announceLocalEndpoint();
   tunnel?.start();
   log.info(
@@ -193,7 +198,7 @@ async function startClaude(): Promise<void> {
     log.error('claude: Metro runs as root, so Claude Code never starts here; reinstall Metro as the metro user');
     return;
   }
-  const agentUser = await provisionAgentUser();
+  const agentUser = provisionAgentUser();
   if (agentUser !== 'off') log.info({ agentUser }, 'agent-user: Claude Code runs as its own user');
   if (agentUser === 'failed') return;
   if (agentUser === 'ready') {
@@ -202,14 +207,10 @@ async function startClaude(): Promise<void> {
     const vault = (await applyVault()).status;
     if (vault.enabled) log.info({ running: vault.running, problem: vault.problem }, 'vault: the agent reaches the internet through the vault');
   }
-  const plugin = await removeMetroPlugin().catch((err: unknown) => {
-    log.warn({ err: errMsg(err) }, 'claude-plugin: could not check for the old metro plugin');
-    return 'failed';
-  });
-  if (plugin !== 'done') log.info({ outcome: plugin }, 'claude-plugin: checked for the old metro Claude Code plugin');
   tryClaudeSetup();
   try { githubSkills().watch(); } catch { log.warn('github-skills: saved source could not be loaded'); }
   tryMemoryJob(memoryRoutine());
+  if (agentUser === 'ready') await prepareAgentRunner();
   watchSession();
 }
 
@@ -226,6 +227,7 @@ async function shutdown(): Promise<void> {
     log.warn({ err: errMsg(err) }, 'mcp-server: could not stop the approval relay');
   });
   const leaving = leaveCallsForShutdown();
+  stopOrgModels();
   unwatchSession();
   tunnel?.stop();
   if (webhookServer) {

package/runtime/node_modules/@metro-labs/daemon/src/claude/api.ts

@@ -1,6 +1,6 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { errMsg, log } from '@metro-labs/core/log';
-import { apiFailure, apiSession, requireAdmin, cors, readJsonBody, sendJson, type ApiSession } from '@metro-labs/http/api-http';
+import { apiFailure, apiSession, requireAdmin, cors, readJsonBody, sendJson } from '@metro-labs/http/api-http';
 import { ApiError } from '@metro-labs/http/api-error';
 import { isRecord } from '@metro-labs/core/is-record';
 import { githubSkillsAnswer } from './github-api.js';
@@ -35,7 +35,6 @@ import {
   stopSession,
   type SessionDeps,
 } from './session.js';
-import { claudeVersion, updateClaude, type VersionDeps } from './version.js';
 import { receiveSessionFile, sessionFilePath } from './session-files.js';
 import { createReadStream } from '../agent-user/agent-fs.js';
 import { pipeline } from 'node:stream/promises';
@@ -61,7 +60,6 @@ export interface ClaudeApiDeps extends SetupApiDeps {
   dir?: () => string;
   login?: LoginDeps;
   claudeLogins?: ClaudeLoginDeps;
-  version?: VersionDeps;
   skillSource?: GitHubSkills;
 }
 
@@ -135,11 +133,10 @@ async function created(req: IncomingMessage, path: string, dir: string): Promise
   return createClaudeSkill(body.name, typeof body.text === 'string' ? body.text : undefined, dir);
 }
 
-const ADMIN_ONLY = /^\/api\/claude\/(login|session|version|setup|skill-source)(\/|$)/;
+const ADMIN_ONLY = /^\/api\/claude\/(login|session|setup|skill-source)(\/|$)/;
 const LOGIN = 'login';
 const SESSION = 'session';
 const SETUP = 'setup';
-const VERSION = 'version';
 
 function sessionCommand(body: Record<string, unknown>, session: SessionDeps): unknown {
   if (body.action === 'start') {
@@ -209,18 +206,9 @@ function answer(method: string, path: string, query: URLSearchParams, dir: strin
   return handler(query, dir, item);
 }
 
-function versionAnswer(req: IncomingMessage, deps: ClaudeApiDeps): Promise<unknown> {
-  const version: VersionDeps = { ...deps.version, session: deps.version?.session ?? deps.session };
-  const method = req.method ?? 'GET';
-  if (method === 'GET') return Promise.resolve(claudeVersion(version));
-  if (method !== 'POST') throw new ApiError('method not allowed', 405);
-  return Promise.resolve(updateClaude(version));
-}
-
-const SINGLETONS: Record<string, (req: IncomingMessage, deps: ClaudeApiDeps, session: ApiSession) => Promise<unknown>> = {
+const SINGLETONS: Record<string, (req: IncomingMessage, deps: ClaudeApiDeps) => Promise<unknown>> = {
   [SESSION]: sessionAnswer,
   [SETUP]: setupAnswer,
-  [VERSION]: versionAnswer,
 };
 
 function skillsAnswer(req: IncomingMessage, path: string, search: string, dir: string, source: GitHubSkills): unknown {
@@ -245,14 +233,14 @@ function fileAnswer(req: IncomingMessage, path: string, search: string, dir: str
   return answer(req.method ?? 'GET', path, new URLSearchParams(search), dir);
 }
 
-function routed(req: IncomingMessage, path: string, search: string, deps: ClaudeApiDeps, session: ApiSession): unknown {
+function routed(req: IncomingMessage, path: string, search: string, deps: ClaudeApiDeps): unknown {
   const dir = (deps.dir ?? claudeDir)();
   const [head = '', item = ''] = parts(path);
   if (head === LOGIN) return loginAnswer(req, item, deps);
   if (head === 'skill-source' && parts(path).length === 1) return githubSkillsAnswer(req, deps.skillSource);
   if (head === 'skills') return skillsAnswer(req, path, search, dir, sourceOf(deps));
   const single = item === '' ? SINGLETONS[head] : undefined;
-  if (single !== undefined) return single(req, deps, session);
+  if (single !== undefined) return single(req, deps);
   return fileAnswer(req, path, search, dir);
 }
 
@@ -303,7 +291,7 @@ export function handleClaudeRequest(
       }
       if (req.method !== 'GET' && ADMIN_ONLY.test(path.replace(/\/{2,}/g, '/'))) requireAdmin(session);
       if (await streamed(req, res, path, search, (deps.dir ?? claudeDir)())) return;
-      sendJson(req, res, 200, await routed(req, path, search, deps, session));
+      sendJson(req, res, 200, await routed(req, path, search, deps));
     })
     .catch((err: unknown) => {
       if (err instanceof ApiError) apiFailure(req, res, err, 'claude-api');

package/runtime/node_modules/@metro-labs/daemon/src/claude/github-skills.ts

@@ -10,7 +10,6 @@ import { readFileSync, statSync } from '../agent-user/agent-fs.js';
 import { receiveHomeFile, writeHomeText } from '../agent-user/home-fs.js';
 import { agentsDir } from '../agents/files.js';
 import { claudeDir } from './files.js';
-import { readSetupState } from './setup-state.js';
 import { GitHubFailure, GitHubReader } from './github-fetch.js';
 import { githubSource, validatedGeneration } from './github-validate.js';
 import type { ClaudeSkill } from './skills.js';
@@ -29,7 +28,6 @@ interface Stored {
 export interface GitHubSkillsDeps {
   agents: string;
   claude: string;
-  sdk(): boolean;
   request?: (url: string, init: RequestInit) => Promise<Response>;
 }
 const EMPTY: Stored = { source: null, prepared: null, etag: null, checkedAt: null, retryAt: 0, problem: null, rateLimit: 0, repositoryId: null };
@@ -107,7 +105,7 @@ export class GitHubSkills {
   view(activation = this.activation(), loaded = this.loaded(activation)): object {
     const { source, prepared, checkedAt, problem } = this.stored;
     return {
-      supported: this.deps.sdk(),
+      supported: true,
       source: source === null ? null : { repository: source.repository, ref: source.ref, folder: source.folder, hasToken: true },
       checking: this.busy, checkedAt, problem: this.unreadable ? 'The saved GitHub source is unreadable. Restore its configuration before changing it. Local skills are still available.' : problem,
       prepared: prepared === null ? null : { generation: prepared.id, source: prepared.source, skillCount: prepared.skills.length },
@@ -142,7 +140,6 @@ export class GitHubSkills {
   }
 
   async configure(raw: unknown): Promise<object> {
-    if (!this.deps.sdk()) throw new ApiError('GitHub skills require the Agent SDK runner. Local skills are unchanged.', 409);
     if (this.busy) throw new ApiError('A skills sync is already running. Try again when it finishes.', 409);
     const source = githubSource(raw);
     this.readable();
@@ -193,11 +190,10 @@ export class GitHubSkills {
   }
 
   async sync(force = false): Promise<void> {
-    if (force && !this.deps.sdk()) throw new ApiError('GitHub skills require the Agent SDK runner. Local skills are unchanged.', 409);
     this.readable();
     this.offer();
     const source = this.stored.source;
-    if (source === null || this.busy || !this.deps.sdk() || this.waiting(force)) return;
+    if (source === null || this.busy || this.waiting(force)) return;
     const epoch = this.epoch;
     this.busy = true;
     try { await this.fetch(source, epoch, force); }
@@ -254,6 +250,6 @@ export class GitHubSkills {
 
 let current: GitHubSkills | null = null;
 export function githubSkills(): GitHubSkills {
-  current ??= new GitHubSkills({ agents: agentsDir(), claude: claudeDir(), sdk: () => readSetupState(agentsDir()).runner === 'sdk' });
+  current ??= new GitHubSkills({ agents: agentsDir(), claude: claudeDir() });
   return current;
 }

package/runtime/node_modules/@metro-labs/daemon/src/claude/login.ts

@@ -4,7 +4,7 @@ import { markOnboardingDone } from './onboarding.js';
 import { ApiError } from '@metro-labs/http/api-error';
 import { isRecord } from '@metro-labs/core/is-record';
 import { errMsg, log } from '@metro-labs/core/log';
-import { agentCommand, asAgent, claudeBin } from '../agent-user/user.js';
+import { agentCommand, asAgent, CLAUDE_ENV, claudeBin } from '../agent-user/user.js';
 
 const LOGIN_ARGS = ['auth', 'login', '--claudeai'];
 const STATUS_COMMAND = ['auth', 'status', '--json'];
@@ -95,14 +95,14 @@ function remembered<T>(slot: Checked<T> | undefined, read: () => T, keep: (c: Ch
   return value;
 }
 
-function forgetClaudeChecks(): void {
+export function forgetClaudeChecks(): void {
   delete checks.installed;
   delete checks.account;
 }
 
 export function claudeInstalled(): boolean {
   return remembered(checks.installed, () => {
-    const run = spawnSync(...asAgent(claudeBin(), ['--version']), { stdio: 'ignore' });
+    const run = spawnSync(...asAgent(claudeBin(), ['--version'], CLAUDE_ENV), { stdio: 'ignore', env: { ...process.env, ...CLAUDE_ENV } });
     return run.error === undefined && run.status === 0;
   }, (c) => {
     checks.installed = c;
@@ -125,7 +125,8 @@ export function claudeAccount(): ClaudeAccount {
 
 const textOf = (value: unknown): string | null => (typeof value === 'string' && value !== '' ? value : null);
 
-export function claudeAccountIn(env: Record<string, string>): ClaudeAccount {
+export function claudeAccountIn(extra: Record<string, string>): ClaudeAccount {
+  const env = { ...CLAUDE_ENV, ...extra };
   const run = spawnSync(...asAgent(claudeBin(), STATUS_COMMAND, env), { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'], env: { ...process.env, ...env } });
   if (run.error !== undefined || typeof run.stdout !== 'string') return SIGNED_OUT;
   try {
@@ -165,7 +166,7 @@ export function startClaudeLogin(deps: LoginDeps = {}, now = Date.now(), target:
   sweep(now);
   const running = runningFor(target);
   if (running !== null) return view(running);
-  const env = { TERM: 'xterm-256color', ...target?.env };
+  const env = { TERM: 'xterm-256color', ...CLAUDE_ENV, ...target?.env };
   const command = deps.command ?? agentCommand([claudeBin(), ...LOGIN_ARGS], env);
   const session: Live = {
     id: randomBytes(9).toString('base64url'),

package/runtime/node_modules/@metro-labs/daemon/src/claude/onboarding.ts

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync, realpathSync } from '../agent-user/agent-fs.js';
+import { existsSync, readFileSync } from '../agent-user/agent-fs.js';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { isRecord } from '@metro-labs/core/is-record';
@@ -36,25 +36,3 @@ export function markOnboardingDone(path = claudeConfigPath()): OnboardingMark {
   writeHomeText(path, `${JSON.stringify({ ...config, [FLAG]: true }, null, 2)}\n`, 0o600);
   return 'marked';
 }
-
-const TRUST = 'hasTrustDialogAccepted';
-
-function realDir(dir: string): string {
-  try {
-    return realpathSync(dir);
-  } catch {
-    return dir;
-  }
-}
-
-export function trustFolder(dir: string, path = claudeConfigPath()): OnboardingMark {
-  const config = readConfig(path);
-  if (config === null) return 'unreadable';
-  const key = realDir(dir);
-  const projects = isRecord(config.projects) ? config.projects : {};
-  const project = isRecord(projects[key]) ? projects[key] : {};
-  if (project[TRUST] === true) return 'already';
-  const next = { ...config, projects: { ...projects, [key]: { ...project, [TRUST]: true } } };
-  writeHomeText(path, `${JSON.stringify(next, null, 2)}\n`, 0o600);
-  return 'marked';
-}

package/runtime/node_modules/@metro-labs/daemon/src/claude/session.ts

@@ -3,7 +3,6 @@ import { ApiError } from '@metro-labs/http/api-error';
 import type { RunnerActivity } from '@metro-labs/core/runner-activity';
 import { readAgentActivity } from './runner-activity.js';
 import { sdkAlive, stopSdkRunner } from './runner-process.js';
-import { continueArgs, sdkPending } from './session-continuity.js';
 import { syncAgentView } from '../agent-user/view.js';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
@@ -12,13 +11,10 @@ import { isRecord } from '@metro-labs/core/is-record';
 import { readJson, writeJson } from '@metro-labs/core/secure-fs';
 import { METRO_VERSION } from '@metro-labs/core/version';
 import { agentsDir, listAgentFiles } from '../agents/files.js';
-import { notReady, readModelConfig, routedConnection } from '../gateway/model-config.js';
-import { claudeDir } from './files.js';
-import { harnessRunner, isHarnessRunner, sdkAllowed, SDK_NEEDS_KEY, type HarnessRunner } from './runner.js';
-import { claudeAccount, claudeInstalled } from './login.js';
-import { trustFolder } from './onboarding.js';
+import { notReady, primaryRoute, type ModelSetup } from '../gateway/model-config.js';
+import { effectiveSetup } from '../gateway/effective.js';
+import { claudeAccount, claudeInstalled, forgetClaudeChecks } from './login.js';
 import { inSessionScope } from './memory.js';
-import { channelState, forgetChannelState, noteChannelState, type ChannelState } from './channel-check.js';
 import { runningAsRoot } from '../metro-user/privilege.js';
 import { agentExtraEnv, agentUser, agentUserExpected, agentViewDir, asAgent, claudeHome } from '../agent-user/user.js';
 
@@ -31,41 +27,35 @@ function sessionEnv(): Record<string, string> {
 
 const SESSION_NAME = 'metro';
 const STATE_FILE = 'claude-session.json';
-const WARNING = 'WARNING: Loading development channels';
-const CONFIRM_POLL_MS = 500;
-const CONFIRM_WAIT_MS = 60_000;
 const WATCH_MS = 15_000;
 const STRIKE_WINDOW_MS = 60_000;
 const MAX_STRIKES = 5;
 const PAUSE_MS = 30 * 60_000;
+const PREPARE_MS = 16 * 60_000;
 
 export interface SessionDeps {
   tmux?: string;
   metro?: string[];
-  runner?: string[];
   home?: string;
   agents?: string;
   signedIn?: () => boolean;
+  model?: () => ModelSetup;
   now?: () => number;
   version?: string;
-  prepare?: (runner: HarnessRunner) => Promise<void>;
 }
 
 export interface SessionStatus {
   name: string;
   running: boolean;
-  runner?: HarnessRunner;
   activity?: RunnerActivity | null;
   autostart: boolean;
   blocked: string | null;
   lastStartedAt: string | null;
   lastError: string | null;
-  channels?: ChannelState | null;
 }
 
 export interface SessionSnapshot {
   running: boolean;
-  runner: HarnessRunner | null;
   activity: RunnerActivity | null;
   lastStartedAt: string | null;
 }
@@ -120,64 +110,42 @@ export function metroCli(args: string[], fixed?: string[]): string[] {
 
 const sessionHome = (deps: SessionDeps): string => deps.home ?? claudeHome() ?? homedir();
 
-export function sessionRunner(deps: SessionDeps = {}): HarnessRunner {
-  const agents = deps.agents ?? agentsDir();
-  const runner = readState(agents).runner;
-  return isHarnessRunner(runner) ? runner : harnessRunner(agents);
-}
-
 export function assertSessionStopped(deps: SessionDeps = {}): void {
-  if (sessionLive(deps)) throw new ApiError('The session is running. Let it finish its work, stop it, then change its runner, permissions or prompt and start it again.', 409);
-}
-
-export function assertSdkDrained(deps: SessionDeps = {}): void {
-  if (sdkPending(sessionHome(deps)) !== 0)
-    throw new ApiError('The Agent SDK still has chat messages it has not answered, or its saved state cannot be read. Start it so it answers them (fix the Model page first if it cannot start), stop it, then switch runners.', 409);
-}
-
-let changing = false;
-
-export async function withSessionChange<T>(run: () => Promise<T>): Promise<T> {
-  if (changing) throw new ApiError('A session change is already being prepared. Try again when it finishes.', 409);
-  changing = true;
-  try {
-    return await run();
-  } finally {
-    changing = false;
-  }
+  if (sessionLive(deps)) throw new ApiError('The session is running. Let it finish its work, stop it, then change its permissions or prompt and start it again.', 409);
 }
 
-export async function prepareSessionRunner(runner: HarnessRunner, deps: SessionDeps = {}): Promise<void> {
-  if (deps.prepare !== undefined) return deps.prepare(runner);
-  const [bin = 'metro', ...args] = metroCli(['agent', '--prepare', runner]);
-  await new Promise<void>((resolve, reject) => {
-    const child = spawn(...asAgent(bin, args), { stdio: ['ignore', 'ignore', 'pipe'], timeout: 16 * 60_000 });
-    let error = '';
-    child.stderr.on('data', (chunk: Buffer) => { error = (error + chunk.toString()).slice(-2000); });
-    child.on('error', (err) => { reject(new ApiError(`Runner preparation failed: ${errMsg(err)}`, 503)); });
+export function prepareRunnerStore(): Promise<void> {
+  const [bin = 'metro', ...args] = metroCli(['agent', '--prepare']);
+  return new Promise<void>((resolve, reject) => {
+    const child = spawn(...asAgent(bin, args), { stdio: ['ignore', 'ignore', 'pipe'], cwd: '/', timeout: PREPARE_MS });
+    let said = '';
+    child.stderr.on('data', (chunk: Buffer) => {
+      said = (said + chunk.toString('utf8')).slice(-2000);
+    });
+    child.on('error', (err) => {
+      forgetClaudeChecks();
+      reject(err);
+    });
     child.on('close', (code) => {
+      forgetClaudeChecks();
       if (code === 0) resolve();
-      else reject(new ApiError(`Runner preparation failed. The runner choice was not changed. ${error.trim()}`, 503));
+      else reject(new Error(`metro agent --prepare failed: ${said.trim() || `exit ${String(code)}`}`));
     });
   });
 }
 
-function metroCommand(deps: SessionDeps, home: string): string[] {
-  if (harnessRunner(deps.agents ?? agentsDir()) === 'sdk') return metroCli(['agent'], deps.runner);
-  return [...metroCli(['claude'], deps.metro), ...continueArgs(home, claudeDir(), deps.agents)];
-}
+const loginNotRuledOut = (): boolean => claudeAccount().signedIn || !claudeInstalled();
 
 function credentialReady(deps: SessionDeps): string | null {
-  const signedIn = deps.signedIn ?? (() => claudeAccount().signedIn);
+  const signedIn = deps.signedIn ?? loginNotRuledOut;
   if (signedIn()) return null;
   try {
-    const cfg = readModelConfig(deps.agents ?? agentsDir());
-    const conn = routedConnection(cfg);
-    if (conn !== null && notReady(cfg) === null && (conn.provider !== 'anthropic' || conn.apiKey !== '')) return null;
+    const primary = primaryRoute((deps.model ?? (() => effectiveSetup(deps.agents ?? agentsDir())))());
+    if (primary !== null && notReady(primary) === null && (primary.connection.provider !== 'anthropic' || primary.connection.apiKey !== '')) return null;
   } catch (err) {
-    return `the Model page is not readable (${errMsg(err)})`;
+    return `the model setup is not readable (${errMsg(err)})`;
   }
-  return 'Claude Code is not signed in and the Model page routes nowhere yet';
+  return 'Claude Code is not signed in and the organization routes this agent to no model yet';
 }
 
 const agentUserMissing = (deps: SessionDeps): boolean =>
@@ -187,64 +155,26 @@ const ROOT_REFUSED = 'Metro runs as root; reinstall it as the metro user';
 
 export function sessionBlocked(deps: SessionDeps = {}): string | null {
   if (runningAsRoot()) return ROOT_REFUSED;
-  const agents = deps.agents ?? agentsDir();
-  if (harnessRunner(agents) === 'sdk' && !sdkAllowed(agents)) return SDK_NEEDS_KEY;
-  if (listAgentFiles(agents).length === 0) return 'no agent on this machine yet';
+  if (listAgentFiles(deps.agents ?? agentsDir()).length === 0) return 'no agent on this machine yet';
   return launchBlocked(deps);
 }
 
 function launchBlocked(deps: SessionDeps): string | null {
   if (agentUserMissing(deps))
     return 'Claude Code runs as the user agent here, and that user is not ready yet; see the log';
-  if (deps.metro === undefined && !claudeInstalled()) return 'Claude Code is not installed on this machine';
   if (!tmuxOk(deps.tmux ?? 'tmux', ['-V'])) return 'tmux is not installed on this machine';
   return credentialReady(deps);
 }
 
-function capturePane(tmux: string): string {
-  const run = spawnSync(...asAgent(tmux, ['capture-pane', '-p', '-t', SESSION_NAME]), { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] });
-  return run.error === undefined && run.status === 0 ? run.stdout : '';
-}
-
-function noteLaunchLines(pane: string, seen: Set<string>): void {
-  for (const line of pane.split('\n').map((l) => l.trim()))
-    if (line.startsWith('metro claude:') && !seen.has(line)) {
-      seen.add(line);
-      log.info({ line }, 'claude-session: metro claude said');
-    }
-}
-
-function confirmChannels(tmux: string, home: string, startedAt: number): void {
-  const until = startedAt + CONFIRM_WAIT_MS;
-  const seen = new Set<string>();
-  let confirmed = false;
-  let checked = false;
-  const tick = (): void => {
-    const pane = capturePane(tmux);
-    noteLaunchLines(pane, seen);
-    checked ||= noteChannelState(home, startedAt);
-    if (!confirmed && pane.includes(WARNING) && pane.includes('server:metro')) {
-      spawnSync(...asAgent(tmux, ['send-keys', '-t', SESSION_NAME, 'Enter']), { stdio: 'ignore' });
-      log.info('claude-session: confirmed the development channels dialog for server:metro');
-      confirmed = true;
-    }
-    if (Date.now() < until && sessionRunning(tmux)) setTimeout(tick, CONFIRM_POLL_MS).unref();
-  };
-  setTimeout(tick, CONFIRM_POLL_MS).unref();
-}
-
-function recordStart(deps: SessionDeps, tmux: string, now: number, run: { error?: Error; status: number | null; stderr: string }): void {
+function recordStart(deps: SessionDeps, now: number, run: { error?: Error; status: number | null; stderr: string }): void {
   memory.lastStartedAt = now;
-  forgetChannelState();
   if (run.error !== undefined || run.status !== 0) {
     memory.lastError = run.error === undefined ? `tmux new-session exited ${String(run.status)}: ${run.stderr.trim()}` : errMsg(run.error);
     log.warn({ err: memory.lastError }, 'claude-session: tmux could not start');
     return;
   }
   memory.lastError = null;
-  const agents = deps.agents ?? agentsDir();
-  writeState(agents, { version: deps.version ?? METRO_VERSION, runner: harnessRunner(agents) });
-  confirmChannels(tmux, sessionHome(deps), now);
+  writeState(deps.agents ?? agentsDir(), { version: deps.version ?? METRO_VERSION });
 }
 
 function tmuxLaunch(deps: SessionDeps, tmux: string, args: string[]): [string, string[]] {
@@ -253,7 +183,6 @@ function tmuxLaunch(deps: SessionDeps, tmux: string, args: string[]): [string, s
 }
 
 export function startSession(deps: SessionDeps = {}): SessionStatus {
-  if (changing) throw new ApiError('A runner change is being prepared. Start the session after it finishes.', 409);
   const status = sessionStatus(deps);
   if (status.running) return status;
   if (status.blocked !== null) throw new ApiError(`Cannot start the session: ${status.blocked}`, 409);
@@ -261,13 +190,12 @@ export function startSession(deps: SessionDeps = {}): SessionStatus {
   const tmux = deps.tmux ?? 'tmux';
   const home = sessionHome(deps);
   const now = (deps.now ?? Date.now)();
-  const trusted = trustFolder(home);
-  const [command = 'metro', ...args] = metroCommand(deps, home);
+  const [command = 'metro', ...args] = metroCli(['agent'], deps.metro);
   const tmuxArgs = ['new-session', '-d', '-s', SESSION_NAME, '-c', home, '-x', '200', '-y', '50', command, ...args];
   const launch = tmuxLaunch(deps, tmux, tmuxArgs);
   const run = spawnSync(...launch, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], cwd: '/' });
-  recordStart(deps, tmux, now, run);
-  if (memory.lastError === null) log.info({ home, trusted, command: [command, ...args].join(' ') }, 'claude-session: started Claude Code in tmux');
+  recordStart(deps, now, run);
+  if (memory.lastError === null) log.info({ home, command: [command, ...args].join(' ') }, 'claude-session: started the Agent SDK runner in tmux');
   return sessionStatus(deps);
 }
 
@@ -277,32 +205,26 @@ export function stopSession(deps: SessionDeps = {}, cancelActive = false): Sessi
   return sessionStatus(deps);
 }
 
-export const sessionLive = (deps: SessionDeps = {}): boolean =>
-  sessionRunning(deps.tmux ?? 'tmux') || sdkAlive(readAgentActivity(sessionHome(deps)));
+export const runnerAlive = (deps: SessionDeps = {}): boolean => sdkAlive(readAgentActivity(sessionHome(deps)));
+
+export const sessionLive = (deps: SessionDeps = {}): boolean => sessionRunning(deps.tmux ?? 'tmux') || runnerAlive(deps);
 
 export function sessionSnapshot(deps: SessionDeps = {}): SessionSnapshot {
   const activity = readAgentActivity(sessionHome(deps));
-  const sdk = sdkAlive(activity);
-  const tmux = sessionRunning(deps.tmux ?? 'tmux');
-  const runner = sdk ? 'sdk' : tmux ? readState(deps.agents ?? agentsDir()).runner : null;
   return {
-    running: tmux || sdk,
-    runner: isHarnessRunner(runner) ? runner : null,
+    running: sdkAlive(activity) || sessionRunning(deps.tmux ?? 'tmux'),
     activity,
     lastStartedAt: memory.lastStartedAt === null ? null : new Date(memory.lastStartedAt).toISOString(),
   };
 }
 
 export function sessionStatus(deps: SessionDeps = {}): SessionStatus {
-  const snapshot = sessionSnapshot(deps);
   return {
     name: SESSION_NAME,
-    ...snapshot,
-    runner: snapshot.runner ?? sessionRunner(deps),
+    ...sessionSnapshot(deps),
     autostart: autostartEnabled(deps.agents ?? agentsDir()),
     blocked: sessionBlocked(deps),
     lastError: memory.lastError,
-    channels: channelState(),
   };
 }
 
@@ -312,7 +234,7 @@ function strike(now: number): boolean {
   if (memory.strikes < MAX_STRIKES) return false;
   memory.pausedUntil = now + PAUSE_MS;
   memory.strikes = 0;
-  log.warn({ pauseMinutes: PAUSE_MS / 60_000 }, 'claude-session: Claude Code keeps exiting right after starting; not restarting it for a while');
+  log.warn({ pauseMinutes: PAUSE_MS / 60_000 }, 'claude-session: the session keeps exiting right after starting; not restarting it for a while');
   return true;
 }
 
@@ -346,7 +268,6 @@ function situation(r: Resolved): 'running' | 'stale' | 'absent' {
 export function ensureSession(deps: SessionDeps = {}): Ensured {
   const r = resolved(deps);
   if (!autostartEnabled(r.agents)) return 'off';
-  if (changing) return 'blocked';
   const found = situation(r);
   if (found === 'running' || (found === 'absent' && sessionLive(deps))) return 'running';
   const held = holdsBack(deps, r.now);
@@ -366,7 +287,7 @@ export function watchSession(deps: SessionDeps = {}, everyMs = WATCH_MS): void {
   const tick = (): void => {
     try {
       const outcome = ensureSession(deps);
-      if (outcome === 'started' || outcome === 'restarted') log.info({ outcome }, 'claude-session: Claude Code is up');
+      if (outcome === 'started' || outcome === 'restarted') log.info({ outcome }, 'claude-session: the Agent SDK runner is up');
     } catch (err) {
       log.warn({ err: errMsg(err) }, 'claude-session: check failed');
     }