@stage-labs/metro 0.1.0-beta.22 → 0.1.0-beta.220

package/dist/api.js

@@ -1,103 +1,11 @@
-import { metroUrl, readToken } from './store.js';
-export class NotSignedIn extends Error {
-}
-const TIMEOUT_MS = 20_000;
-const LOOPBACK = new Set(['localhost', '127.0.0.1', '::1', '[::1]']);
-export function carriesSecretsSafely(base) {
-    let url;
-    try {
-        url = new URL(base);
-    }
-    catch {
-        return false;
-    }
-    if (url.protocol === 'https:')
-        return true;
-    return url.protocol === 'http:' && LOOPBACK.has(url.hostname);
-}
-function tokenOrThrow() {
-    if (!carriesSecretsSafely(metroUrl()))
-        throw new Error(`refusing to send your session to ${metroUrl()} in the clear — use https, or a loopback address`);
-    const token = readToken();
-    if (token === null)
-        throw new NotSignedIn('not signed in — run `metro login` first');
-    return token;
-}
-async function get(path) {
-    const auth = tokenOrThrow();
-    let res;
-    try {
-        res = await fetch(`${metroUrl()}${path}`, {
-            headers: { authorization: `Bearer ${auth}` },
-            signal: AbortSignal.timeout(TIMEOUT_MS),
-        });
-    }
-    catch {
-        throw new Error(`could not reach ${metroUrl()}`);
-    }
-    if (res.status === 401)
-        throw new NotSignedIn('that sign-in has expired — run `metro login` again');
-    if (!res.ok)
-        throw new Error(`metro answered ${String(res.status)}`);
-    return res.json();
-}
-function isRecord(value) {
-    return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-async function post(path, body) {
-    if (!carriesSecretsSafely(metroUrl()))
-        throw new Error(`refusing to send your code to ${metroUrl()} in the clear — use https, or a loopback address`);
-    let res;
-    try {
-        res = await fetch(`${metroUrl()}${path}`, {
-            method: 'POST',
-            headers: { 'content-type': 'application/json' },
-            body: JSON.stringify(body),
-            signal: AbortSignal.timeout(TIMEOUT_MS),
-        });
-    }
-    catch {
-        throw new Error(`could not reach ${metroUrl()}`);
-    }
-    const parsed = await res.json().catch(() => null);
-    if (res.ok)
-        return parsed;
-    const detail = isRecord(parsed) ? parsed.error : undefined;
-    throw new Error(typeof detail === 'string' ? detail : `metro answered ${String(res.status)}`);
-}
-export async function claimCode(code) {
-    const body = await post('/api/cli/claim', { code });
-    if (!isRecord(body) ||
-        typeof body.token !== 'string' ||
-        typeof body.email !== 'string' ||
-        typeof body.collection !== 'string')
-        throw new Error('metro returned an unexpected response');
-    return {
-        token: body.token,
-        email: body.email,
-        collection: body.collection,
-    };
-}
-export async function claimRuntime(code, label) {
-    const body = await post('/api/run/claim', { code, label });
-    if (!isRecord(body) ||
-        typeof body.token !== 'string' ||
-        typeof body.agent !== 'string' ||
-        typeof body.label !== 'string')
-        throw new Error('metro returned an unexpected response');
-    return { token: body.token, agent: body.agent, label: body.label };
-}
-export async function mcpServers() {
-    const body = await get('/api/cli/mcp');
-    if (!isRecord(body) || typeof body.json !== 'string')
-        throw new Error('metro returned an unexpected response');
-    return body.json;
-}
+import { localAgent, localDaemonUp } from './local.js';
+import { localUrl } from './runtime.js';
+const NO_DAEMON = `no metro daemon on ${localUrl()} — start one with: metro serve`;
 export async function whoisAuthorized() {
-    const body = await get('/api/cli/session');
-    if (!isRecord(body) ||
-        typeof body.email !== 'string' ||
-        typeof body.collection !== 'string')
-        throw new Error('metro returned an unexpected response');
-    return { email: body.email, collection: body.collection };
+    if (!(await localDaemonUp()))
+        throw new Error(NO_DAEMON);
+    const agent = localAgent();
+    if (agent === null)
+        throw new Error('no agent on this machine yet');
+    return { agent: agent.id, where: localUrl() };
 }

package/dist/background.js

@@ -0,0 +1,123 @@
+import { spawnSync } from 'node:child_process';
+import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { basename, join } from 'node:path';
+export const AGENT_VIEW_OFF = 'CLAUDE_CODE_DISABLE_AGENT_VIEW';
+const STOP_MS = 30_000;
+const SETTLE_MS = 5_000;
+const POLL_MS = 250;
+const given = (value) => value !== undefined && value.trim() !== '' ? value.trim() : undefined;
+const isRecord = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
+export const keepInSession = (env) => given(env[AGENT_VIEW_OFF]) === undefined ? { ...env, [AGENT_VIEW_OFF]: '1' } : env;
+const claudeDir = (env = process.env) => given(env.CLAUDE_CONFIG_DIR) ?? join(given(env.HOME) ?? homedir(), '.claude');
+export const projectDir = (dir, cwd) => join(dir, 'projects', cwd.replace(/[^A-Za-z0-9]/g, '-'));
+function startTime(pid) {
+    try {
+        const stat = readFileSync(`/proc/${String(pid)}/stat`, 'utf8');
+        return stat.slice(stat.lastIndexOf(')') + 2).split(' ')[19] ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+export function processAlive(pid, procStart) {
+    try {
+        process.kill(pid, 0);
+    }
+    catch (err) {
+        if (err.code !== 'EPERM')
+            return false;
+    }
+    const started = procStart === undefined ? null : startTime(pid);
+    return started === null || started === procStart;
+}
+function backgroundEntry(file, alive) {
+    try {
+        const raw = JSON.parse(readFileSync(file, 'utf8'));
+        if (!isRecord(raw) || typeof raw.pid !== 'number' || typeof raw.sessionId !== 'string')
+            return null;
+        if (raw.kind === 'interactive' || typeof raw.kind !== 'string')
+            return null;
+        return alive(raw.pid, typeof raw.procStart === 'string' ? raw.procStart : undefined) ? raw.sessionId : null;
+    }
+    catch {
+        return null;
+    }
+}
+export function liveBackground(sessions, alive = processAlive) {
+    if (!existsSync(sessions))
+        return new Set();
+    const ids = readdirSync(sessions)
+        .filter((name) => name.endsWith('.json'))
+        .map((name) => backgroundEntry(join(sessions, name), alive));
+    return new Set(ids.filter((id) => id !== null));
+}
+function newestFirst(dir) {
+    if (!existsSync(dir))
+        return [];
+    return readdirSync(dir)
+        .filter((name) => name.endsWith('.jsonl'))
+        .map((name) => ({ path: join(dir, name), at: statSync(join(dir, name)).mtimeMs }))
+        .sort((a, b) => b.at - a.at)
+        .map((file) => file.path);
+}
+function continuedIn(text) {
+    const last = text.split('\n').findLast((line) => line.includes('"type":"continued-in"'));
+    if (last === undefined)
+        return null;
+    try {
+        const record = JSON.parse(last);
+        return isRecord(record) && typeof record.continuedInSessionId === 'string' ? record.continuedInSessionId : null;
+    }
+    catch {
+        return null;
+    }
+}
+const HAS_TURN = /"type":"(user|assistant)"/;
+export function heldConversation(dir, live) {
+    if (live.size === 0)
+        return null;
+    for (const file of newestFirst(dir)) {
+        const text = readFileSync(file, 'utf8');
+        if (!HAS_TURN.test(text))
+            continue;
+        const moved = continuedIn(text);
+        if (moved !== null && live.has(moved))
+            return moved;
+        if (!live.has(basename(file, '.jsonl')))
+            return null;
+    }
+    return null;
+}
+function stopBackground(id, env = process.env) {
+    const run = spawnSync('claude', ['stop', id], { env, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], timeout: STOP_MS });
+    if (run.error !== undefined)
+        return { ok: false, detail: run.error.message };
+    const said = `${run.stdout}${run.stderr}`.trim().split('\n').at(-1) ?? '';
+    return { ok: run.status === 0, detail: said === '' ? `exit ${String(run.status)}` : said };
+}
+const sleep = (ms) => new Promise((resolve) => {
+    setTimeout(resolve, ms);
+});
+async function settled(sessions, held, alive, ms) {
+    if (!liveBackground(sessions, alive).has(held))
+        return true;
+    if (ms <= 0)
+        return false;
+    await sleep(POLL_MS);
+    return settled(sessions, held, alive, ms - POLL_MS);
+}
+export async function takeBackConversation(deps = {}) {
+    const env = deps.env ?? process.env;
+    const alive = deps.alive ?? processAlive;
+    const dir = claudeDir(env);
+    const sessions = join(dir, 'sessions');
+    const held = heldConversation(projectDir(dir, deps.cwd ?? process.cwd()), liveBackground(sessions, alive));
+    if (held === null)
+        return null;
+    const id = held.slice(0, 8);
+    const stopped = (deps.stop ?? stopBackground)(id, env);
+    if (!stopped.ok || !(await settled(sessions, held, alive, deps.settleMs ?? SETTLE_MS)))
+        return `the conversation is held by the Claude Code background session ${id} and it could not be stopped (${stopped.detail}), so Claude Code will refuse to continue it: run claude stop ${id}`;
+    return `the conversation had moved to the Claude Code background session ${id}, where no chat reaches it; stopped that session (its conversation is kept) and continuing it here`;
+}

package/dist/claude-settings.js

@@ -0,0 +1,40 @@
+import { existsSync, readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import { PROVIDER_FLAGS } from './provider-flags.js';
+const CONFLICTING = [...PROVIDER_FLAGS, 'ANTHROPIC_BASE_URL', 'ANTHROPIC_API_KEY', 'ANTHROPIC_AUTH_TOKEN'];
+export function settingsFiles(cwd = process.cwd(), env = process.env) {
+    const explicit = env.CLAUDE_CONFIG_DIR?.trim() ?? '';
+    const configDir = explicit === '' ? join(homedir(), '.claude') : explicit;
+    return [
+        ...new Set([
+            join(configDir, 'settings.json'),
+            join(cwd, '.claude', 'settings.json'),
+            join(cwd, '.claude', 'settings.local.json'),
+        ]),
+    ];
+}
+function envBlock(file) {
+    if (!existsSync(file))
+        return {};
+    try {
+        const parsed = JSON.parse(readFileSync(file, 'utf8'));
+        const block = parsed.env;
+        return typeof block === 'object' && block !== null ? block : {};
+    }
+    catch {
+        return {};
+    }
+}
+export function settingsConflicts(files) {
+    const out = [];
+    for (const file of files) {
+        const block = envBlock(file);
+        for (const key of CONFLICTING) {
+            const value = block[key];
+            if (typeof value === 'string' && value.trim() !== '')
+                out.push(`${file}: ${key}`);
+        }
+    }
+    return out;
+}

package/dist/claude.js

@@ -0,0 +1,173 @@
+import { spawn, spawnSync } from 'node:child_process';
+import { markOnboardingDone, seedChannels } from './onboarding.js';
+import { writeMcpConfig } from './mcp-config.js';
+import { currentRoute, permissionMode, routeModelEnv, systemPrompt } from './route.js';
+import { settingsConflicts, settingsFiles } from './claude-settings.js';
+import { localAgent } from './local.js';
+import { PROVIDER_FLAGS } from './provider-flags.js';
+import { localPort, localUrl } from './runtime.js';
+import { keepInSession, takeBackConversation } from './background.js';
+const CHANNEL_FLAGS = ['--dangerously-load-development-channels', 'server:metro'];
+const FRESH_PROMPT_FLAGS = ['--system-prompt-snapshot', 'off'];
+const PERMISSION_MODE_FLAG = { auto: 'auto', bypass: 'bypassPermissions' };
+const KEY_HEADER = 'x-metro-key';
+const PROBE_MS = 3_000;
+export const claudeArgs = (extra, mcpConfig, mode = 'auto', prompt = null) => [
+    ...CHANNEL_FLAGS,
+    '--permission-mode',
+    PERMISSION_MODE_FLAG[mode],
+    ...FRESH_PROMPT_FLAGS,
+    ...(mcpConfig === undefined ? [] : ['--mcp-config', mcpConfig]),
+    ...(prompt === null ? [] : ['--append-system-prompt', prompt]),
+    ...extra,
+];
+const set = (env, name) => (env[name] ?? '').trim() !== '';
+export function pinnedBy(env) {
+    if (set(env, 'ANTHROPIC_BASE_URL'))
+        return 'ANTHROPIC_BASE_URL';
+    return PROVIDER_FLAGS.find((flag) => set(env, flag)) ?? null;
+}
+export function gatewayEnv(base, agentKey, port) {
+    if (agentKey === null || pinnedBy(base) !== null)
+        return base;
+    const own = (base.ANTHROPIC_CUSTOM_HEADERS ?? '').trim();
+    const mine = `${KEY_HEADER}: ${agentKey}`;
+    return {
+        ...base,
+        ANTHROPIC_BASE_URL: `http://127.0.0.1:${String(port)}/gateway`,
+        ANTHROPIC_CUSTOM_HEADERS: own === '' ? mine : `${own}\n${mine}`,
+        CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY: '1',
+    };
+}
+export const channelEnv = (env) => set(env, 'MCP_PROTOCOL_NEGOTIATION') ? env : { ...env, MCP_PROTOCOL_NEGOTIATION: 'legacy' };
+export const toolSearchEnv = (env) => set(env, 'ENABLE_TOOL_SEARCH') ? env : { ...env, ENABLE_TOOL_SEARCH: 'true' };
+const OWN_CREDENTIALS = ['ANTHROPIC_API_KEY', 'ANTHROPIC_AUTH_TOKEN'];
+export function credentialEnv(env, agentKey, signedIn) {
+    if (signedIn || OWN_CREDENTIALS.some((name) => set(env, name)))
+        return env;
+    return { ...env, ANTHROPIC_AUTH_TOKEN: agentKey };
+}
+function claudeSignedIn() {
+    const run = spawnSync('claude', ['auth', 'status', '--json'], { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] });
+    if (run.error !== undefined || typeof run.stdout !== 'string')
+        return false;
+    try {
+        const parsed = JSON.parse(run.stdout);
+        return parsed.authenticated === true || parsed.loggedIn === true || typeof parsed.email === 'string' || typeof parsed.organization === 'string';
+    }
+    catch {
+        return false;
+    }
+}
+export function servingDaemon(body) {
+    if (typeof body !== 'object' || body === null)
+        return false;
+    const mode = body;
+    return mode.mode === 'local' && mode.stopped !== true;
+}
+async function daemonServing(base = localUrl()) {
+    try {
+        const res = await fetch(`${base}/api/mode`, { signal: AbortSignal.timeout(PROBE_MS) });
+        return res.ok && servingDaemon(await res.json());
+    }
+    catch {
+        return false;
+    }
+}
+export function agentKey(agent) {
+    return agent === null ? { skip: 'no agent lives on this machine yet, so Claude Code talks to Anthropic directly' } : { key: agent.key };
+}
+async function verdict() {
+    const pinned = pinnedBy(process.env);
+    if (pinned !== null)
+        return { skip: `${pinned} is set, so Claude Code keeps talking to it` };
+    const conflicts = settingsConflicts(settingsFiles());
+    if (conflicts.length > 0)
+        return { skip: `a settings file pins the provider (${conflicts.join(', ')}), so Claude Code keeps it` };
+    const picked = agentKey(localAgent());
+    if ('skip' in picked)
+        return picked;
+    if (await daemonServing())
+        return picked;
+    return { skip: 'the daemon is not serving here (stopped, or not running), so Claude Code talks to Anthropic directly' };
+}
+function runClaude(args, env) {
+    return new Promise((resolve, reject) => {
+        const leaveToChild = () => undefined;
+        process.on('SIGINT', leaveToChild);
+        process.on('SIGTERM', leaveToChild);
+        const child = spawn('claude', args, { stdio: 'inherit', env });
+        child.on('error', (err) => {
+            reject(new Error(err.code === 'ENOENT'
+                ? 'the `claude` command is not on PATH — install Claude Code first'
+                : err.message));
+        });
+        child.on('exit', (code) => {
+            resolve(code ?? 1);
+        });
+    });
+}
+async function servedKey(decision) {
+    if ('key' in decision)
+        return decision.key;
+    const picked = agentKey(localAgent());
+    if ('skip' in picked)
+        return null;
+    return (await daemonServing()) ? picked.key : null;
+}
+function mcpConfigFor(key, port) {
+    if (key === null)
+        return null;
+    const file = writeMcpConfig(key, port);
+    process.stderr.write(`metro claude: the metro MCP server is loaded for this session from the daemon at http://127.0.0.1:${String(port)}/mcp, nothing to add by hand\n`);
+    return file;
+}
+function gatewayLaunchEnv(key, port) {
+    process.stderr.write(`metro claude: inference goes through the daemon at http://127.0.0.1:${String(port)}/gateway (the Model page decides where)\n`);
+    const pointed = routeModelEnv(gatewayEnv(process.env, key, port), currentRoute());
+    const routed = toolSearchEnv(pointed);
+    if (routed !== pointed)
+        process.stderr.write('metro claude: MCP tool search is on, so connector tools load when Claude needs them instead of all at start\n');
+    const env = credentialEnv(routed, key, claudeSignedIn());
+    if (env !== routed)
+        process.stderr.write("metro claude: Claude Code has no login of its own here, so metro's key stands in as its credential; the Model page must route to Bedrock, OpenRouter or Codex\n");
+    if (seedChannels() === 'marked')
+        process.stderr.write('metro claude: marked Channels as available in Claude Code cached flags, since a box that sends no telemetry never fetches them\n');
+    if (markOnboardingDone() === 'marked')
+        process.stderr.write("metro claude: skipped Claude Code's first-run setup, since it already has a credential here\n");
+    return env;
+}
+const continues = (args) => args.includes('-c') || args.includes('--continue');
+async function reclaimConversation(extra) {
+    if (!continues(extra))
+        return;
+    try {
+        const note = await takeBackConversation();
+        if (note !== null)
+            process.stderr.write(`metro claude: ${note}\n`);
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        process.stderr.write(`metro claude: could not check for a Claude Code background session holding the conversation (${message})\n`);
+    }
+}
+export async function launchClaude(extra) {
+    await reclaimConversation(extra);
+    const decision = await verdict();
+    const port = localPort();
+    const mcp = mcpConfigFor(await servedKey(decision), port);
+    const mode = permissionMode();
+    const prompt = systemPrompt();
+    if (prompt !== null)
+        process.stderr.write('metro claude: the system prompt from the Harness page is appended to this session\n');
+    try {
+        if ('skip' in decision) {
+            process.stderr.write(`metro claude: ${decision.skip}\n`);
+            return await runClaude(claudeArgs(extra, mcp?.path, mode, prompt), keepInSession(channelEnv(process.env)));
+        }
+        return await runClaude(claudeArgs(extra, mcp?.path, mode, prompt), keepInSession(channelEnv(gatewayLaunchEnv(decision.key, port))));
+    }
+    finally {
+        mcp?.cleanup();
+    }
+}

package/dist/cli.js

@@ -1,127 +1,70 @@
 #!/usr/bin/env node
-import { hostname } from 'node:os';
-import { claimCode, claimRuntime, mcpServers, NotSignedIn, whoisAuthorized, } from './api.js';
-import { askLine } from './prompt.js';
-import { clearToken, credentialsPath, metroUrl, metroWebUrl, writeToken, } from './store.js';
-import { detach, probe, runningPid, stop, tail } from './control.js';
-import { assertAgentId, daemonPlan, localUrl, readRunToken, runDaemon, runtimeDir, writeRunToken, } from './runtime.js';
+import { whoisAuthorized } from './api.js';
+import { stopAll } from './control.js';
+import { tailEvents } from './tail.js';
+import { launchClaude } from './claude.js';
 import { update } from './update.js';
+import { serve } from './serve.js';
+import { service, serviceStopHint } from './service.js';
 import { currentVersion } from './version.js';
-const USAGE = `metro — the command line for your MCP connectors
+const USAGE = `metro: run your agent on this machine
 
-  metro start <agent-id> [--detach]
-                  run that agent's stations on this machine
-  metro stop <agent-id>
-                  stop the daemon started with --detach
-  metro status <agent-id>
-                  is it running, and is it healthy
-  metro logs <agent-id> [-f]
-                  show the detached daemon's log
-  metro login     authorize a connector collection with a code from the web UI
-  metro logout    forget this machine's sign-in
-  metro whoami    print the account and collection this machine may read
-  metro mcp       print the mcpServers block for the authorized collection
-  metro update    update to the newest published version
+  metro serve [--port <n>] [--owner <organization id>]
+                  run the daemon: the agent, its channels and its connectors live in
+                  ~/.metro/agents here, and it is published through Tailscale Funnel at a
+                  permanent https://<machine>.<tailnet>.ts.net (Tailscale installed and
+                  signed in on this machine); the page at metro.box manages it through the
+                  link it prints; --owner names the organization whose members may sign
+                  in, needed on the first start only; Stop on the page parks the daemon and keeps the
+                  address, so Start works from the page too
+  metro service install [--port <n>] [--owner <organization id>] [--user metro]
+                  run metro serve as a service (systemd on Linux, launchd on macOS): it
+                  starts at boot and after a crash, so the page can stop, start and
+                  restart it with no shell; on Linux, root passes --user metro so Metro
+                  runs as its own user and Claude Code as the user agent;
+                  metro service uninstall and status as well
+  metro stop      stop metro on this machine, metro serve included
+  metro tail [agent-id]
+                  follow this machine's inbound events, one JSON line each
+  metro whoami    print the agent this machine runs
+  metro claude [args...]
+                  open Claude Code with the metro channel and the metro MCP server, its
+                  inference routed through the daemon's model gateway (the Model page);
+                  every argument is passed through the same
+  metro update    update to the newest published version (--check only reports)
   metro version   print this CLI's version
 
-Start Claude Code with all of them, without writing them to disk:
-
-  claude --mcp-config <(metro mcp)
-
-  METRO_URL          the metro to talk to (default https://mcp.metro.box)
-  METRO_UI_URL       where the web UI lives (default https://metro.box)
-  METRO_TOKEN        use this connector sign-in instead of the stored one
-  METRO_RUN_TOKEN    use this runtime authorization instead of the stored one
+  METRO_WEBHOOK_PORT the daemon's port (default 8420)
+  METRO_AGENTS_DIR   where the agents live (default ~/.metro/agents)
+  METRO_AGENT_KEY    the key metro tail presents, instead of the agent file's
   METRO_RUNTIME_DIR  run the daemon from this directory instead of the bundled one
 `;
-function hostLabel() {
-    const name = hostname().trim();
-    return name === '' ? 'unnamed machine' : name;
-}
-async function authorizeRuntime(agentId) {
-    process.stderr.write(`Authorize this machine at ${metroWebUrl()}/#/authorize/${agentId}\n`);
-    const code = (await askLine('Paste the code: ')).trim();
-    if (code === '')
-        throw new Error('no code given');
-    const claimed = await claimRuntime(code, hostLabel());
-    writeRunToken(claimed.agent, claimed.token);
-    process.stderr.write(`Authorized as '${claimed.label}'.\n`);
-    return claimed.token;
-}
-async function start(argv) {
-    const agentId = assertAgentId(argv[0]);
-    if (runningPid(agentId) !== null)
-        throw new Error(`metro is already running for ${agentId} — stop it first`);
-    const dir = runtimeDir();
-    const token = readRunToken(agentId) ?? (await authorizeRuntime(agentId));
-    const detached = argv.includes('--detach');
-    const plan = daemonPlan({ agentId, token, dir });
-    if (!detached)
-        return runDaemon(agentId, plan);
-    const pid = detach({ agentId, ...plan });
-    process.stderr.write(`metro is running for ${agentId} (pid ${String(pid)})\n` +
-        `  logs:  metro logs ${agentId} -f\n` +
-        `  stop:  metro stop ${agentId}\n`);
-    return 0;
-}
-async function stopDaemon(argv) {
-    const agentId = assertAgentId(argv[0]);
-    const stopped = await stop(agentId);
-    process.stderr.write(stopped ? `Stopped metro for ${agentId}\n` : `metro is not running for ${agentId}\n`);
-    return stopped ? 0 : 1;
-}
-async function status(argv) {
-    const agentId = assertAgentId(argv[0]);
-    const pid = runningPid(agentId);
-    if (pid === null) {
-        process.stdout.write(`${agentId}: not running\n`);
+async function stopDaemon() {
+    const stopped = await stopAll();
+    if (stopped.length === 0) {
+        process.stderr.write('no metro daemon is running on this machine\n');
         return 1;
     }
-    const health = await probe(localUrl());
-    process.stdout.write(`${agentId}: running (pid ${String(pid)}) · ` +
-        (health === null
-            ? `not answering on ${localUrl()}\n`
-            : `healthy, up ${String(health.uptime)}s\n`));
-    return health === null ? 1 : 0;
-}
-function logs(argv) {
-    const agentId = assertAgentId(argv[0]);
-    return tail(agentId, argv.includes('-f') || argv.includes('--follow'));
-}
-async function login() {
-    process.stderr.write(`Choose a connector collection at ${metroWebUrl()}/#/authorize\n`);
-    const { token, email, collection } = await claimCode(await askLine('Paste the code here: '));
-    writeToken(token);
-    process.stderr.write(`Authorized '${collection}' for ${email}. Stored in ${credentialsPath()}\n`);
-}
-async function whoami() {
-    const { email, collection } = await whoisAuthorized();
-    process.stdout.write(`${email} · collection '${collection}' on ${metroUrl()}\n`);
+    for (const d of stopped)
+        process.stderr.write(`Stopped metro (pid ${String(d.pid)}, via ${d.via})\n`);
+    const hint = serviceStopHint();
+    if (hint !== null)
+        process.stderr.write(`${hint}\n`);
+    return 0;
 }
 const HELP = new Set([undefined, 'help', '--help', '-h']);
 const COMMANDS = {
-    login: async () => {
-        await login();
-        return 0;
-    },
-    logout: async () => {
-        clearToken();
-        process.stderr.write('Signed out.\n');
-        return Promise.resolve(0);
-    },
     whoami: async () => {
-        await whoami();
-        return 0;
-    },
-    start: () => start(process.argv.slice(3)),
-    stop: () => stopDaemon(process.argv.slice(3)),
-    status: () => status(process.argv.slice(3)),
-    logs: () => logs(process.argv.slice(3)),
-    mcp: async () => {
-        process.stdout.write(`${await mcpServers()}\n`);
+        const { agent, where } = await whoisAuthorized();
+        process.stdout.write(`agent ${agent} on ${where}\n`);
         return 0;
     },
-    update,
+    serve: () => serve(process.argv.slice(3)),
+    service: () => service(process.argv.slice(3)),
+    stop: stopDaemon,
+    tail: () => tailEvents(process.argv.slice(3)),
+    claude: () => launchClaude(process.argv.slice(3)),
+    update: () => update(process.argv.slice(3)),
     version: async () => {
         process.stdout.write(`${currentVersion()}\n`);
         return Promise.resolve(0);
@@ -137,6 +80,6 @@ async function run(command) {
 const code = await run(process.argv[2]).catch((err) => {
     const message = err instanceof Error ? err.message : String(err);
     process.stderr.write(`metro: ${message}\n`);
-    return err instanceof NotSignedIn ? 2 : 1;
+    return 1;
 });
 process.exit(code);