@stage-labs/metro 0.1.0-beta.29 → 0.1.0-beta.291

package/dist/claude.js

@@ -1,15 +1,204 @@
-import { spawnSync } from 'node:child_process';
+import { spawn, spawnSync } from 'node:child_process';
+import { markOnboardingDone, seedChannels } from './onboarding.js';
+import { writeMcpConfig } from './mcp-config.js';
+import { currentRoute, harnessRunner, 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, resumeSessionId, takeBackConversation } from './background.js';
+import { nativeRecoveryArgs } from './native-recovery.js';
 const CHANNEL_FLAGS = ['--dangerously-load-development-channels', 'server:metro'];
-export const claudeArgs = (extra) => [
+const FRESH_PROMPT_FLAGS = ['--system-prompt-snapshot', 'off'];
+export const PERMISSION_MODE_FLAG = { auto: 'auto', bypass: 'bypassPermissions' };
+const KEY_HEADER = 'x-metro-key';
+const PROBE_MS = 3_000;
+const AUTH_STATUS_MS = 20_000;
+const KILL_GRACE_MS = 30_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,
 ];
-export function launchClaude(extra) {
-    const leaveToChild = () => undefined;
-    process.on('SIGINT', leaveToChild);
-    process.on('SIGTERM', leaveToChild);
-    const res = spawnSync('claude', claudeArgs(extra), { stdio: 'inherit' });
-    if (res.error !== undefined)
-        throw new Error('the `claude` command is not on PATH — install Claude Code first');
-    return Promise.resolve(res.status ?? 1);
+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 RM_PROMPT_OFF = 'CLAUDE_CODE_DISABLE_INLINE_SHELL_RM_PROMPT';
+export const rmPromptEnv = (env) => set(env, RM_PROMPT_OFF) ? env : { ...env, [RM_PROMPT_OFF]: '1' };
+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'], timeout: AUTH_STATUS_MS });
+    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 deadline(child, timeoutMs) {
+    if (timeoutMs === undefined)
+        return () => undefined;
+    let kill;
+    const term = setTimeout(() => {
+        child.kill('SIGTERM');
+        kill = setTimeout(() => {
+            child.kill('SIGKILL');
+        }, KILL_GRACE_MS);
+    }, timeoutMs);
+    return () => {
+        clearTimeout(term);
+        clearTimeout(kill);
+    };
+}
+export function runClaude(args, env, headless, command = 'claude') {
+    return new Promise((resolve, reject) => {
+        const leaveToChild = () => undefined;
+        process.on('SIGINT', leaveToChild);
+        process.on('SIGTERM', leaveToChild);
+        const child = spawn(command, args, { stdio: [headless === undefined ? 'inherit' : 'ignore', 'inherit', 'inherit'], env });
+        const stop = deadline(child, headless?.timeoutMs);
+        child.on('error', (err) => {
+            reject(new Error(err.code === 'ENOENT'
+                ? `the \`${command}\` command is not on PATH${command === 'claude' ? ' — install Claude Code first' : ''}`
+                : err.message));
+        });
+        child.on('exit', (code) => {
+            stop();
+            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;
+}
+function inferenceEnv(decision, port) {
+    if ('key' in decision)
+        return gatewayLaunchEnv(decision.key, port);
+    process.stderr.write(`metro claude: ${decision.skip}\n`);
+    return process.env;
+}
+export async function headlessEnv() {
+    return keepInSession(rmPromptEnv(inferenceEnv(await verdict(), localPort())));
+}
+const continues = (args) => args.includes('-c') || args.includes('--continue');
+async function reclaimConversation(extra) {
+    const sessionId = resumeSessionId(extra);
+    if (sessionId === undefined && !continues(extra))
+        return;
+    try {
+        const note = await takeBackConversation({ sessionId });
+        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`);
+    }
+}
+const SDK_HOLDS_CHAT = 'the Harness runs this agent as an Agent SDK session (metro agent), which holds the metro chat; a metro claude session would take it away. Switch the Harness runner back to the Claude Code session first, or open the conversation with plain claude --resume <session id>';
+export async function launchClaude(extra) {
+    if (harnessRunner() === 'sdk')
+        throw new Error(SDK_HOLDS_CHAT);
+    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 {
+        return await runClaude(claudeArgs(nativeRecoveryArgs(extra), mcp?.path, mode, prompt), keepInSession(rmPromptEnv(channelEnv(inferenceEnv(decision, port)))));
+    }
+    finally {
+        mcp?.cleanup();
+    }
 }

package/dist/cli.js

@@ -1,155 +1,102 @@
 #!/usr/bin/env node
-import { hostname } from 'node:os';
-import { claimCode, claimRuntime, mcpServers, NotSignedIn, whoisAuthorized, } from './api.js';
-import { askSecret } from './prompt.js';
-import { clearToken, credentialsPath, metroUrl, metroWebUrl, writeToken, } from './store.js';
-import { detach, lockedBy, probe, runningPid, stopAll, tail } from './control.js';
+import { whoisAuthorized } from './api.js';
+import { stopAll } from './control.js';
 import { tailEvents } from './tail.js';
-import { assertAgentId, daemonPlan, localUrl, readRunToken, runDaemon, runtimeDir, writeRunToken, } from './runtime.js';
+import { agentSession } from './agent.js';
+import { automationCommand } from './automation.js';
 import { launchClaude } from './claude.js';
-import { bedrock } from './bedrock.js';
-import { installPlugin, syncPluginServers } from './plugin.js';
+import { memoryPaths, memoryRoutine } from './memory.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
+import { voiceSession } from './voice.js';
+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 every metro daemon on this machine, however it was started
-  metro status <agent-id>
-                  is it running, and is it healthy
-  metro logs <agent-id> [-f]
-                  show the detached daemon's log
-  metro tail <agent-id>
+  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 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 plugin    set up the Claude Code plugin (connector servers + /metro:login)
+  metro whoami    print the agent this machine runs
   metro claude [args...]
-                  open Claude Code with the metro channel; every argument is passed through
-  metro bedrock [args...]
-                  the same, with inference on Amazon Bedrock through a local proxy so the
-                  channel still works (needs AWS_BEARER_TOKEN_BEDROCK and AWS_REGION)
-  metro update    update to the newest published version
+                  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 agent     run chat, calls and background workers in one Agent SDK conversation,
+                  when the Harness runner is Agent SDK, using the Model page's model;
+                  resume it after a restart; call audio runs independently
+  metro agent --prepare [cli|sdk]
+                  check the runner before selecting it; install the SDK runtime if needed,
+                  without starting a session or connecting to chat
+  metro task submit <routine> <prompt-file> [--slot <UTC ISO timestamp>] [--dry-run]
+  metro task status [routine]
+  metro task finish <uuid> <token> completed|blocked
+                  queue work without starting a session, or read safe local task metadata;
+                  default slot is the current UTC hour; use --slot for other cadences;
+                  accepted is saved, not executed; finish awaits runner verification;
+                  --dry-run writes nothing; local authorization is not fresh owner approval
+  metro memory [skill file]
+                  run the memory routine once: when Claude Code transcripts changed since
+                  the last run, Claude Code reads the memory skill (or the file given) and
+                  files them into its memory, with no metro tools and writes only inside
+                  the memory folder
+  metro voice --model <model>
+                  the agent's side of a voice call, which the daemon starts when a call
+                  comes in: Claude Code reads the call's words as stream-json on stdin and
+                  streams its replies on stdout, with the agent's memory, skills, plugin,
+                  connectors and metro tools (on /mcp/voice, so the chat session keeps its
+                  slot) but no metro channel; tool approvals come back on stdout
+  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_BEDROCK_MODEL
-                     send every request to this Bedrock model id (default: derive from the
-                     model Claude Code asks for, e.g. eu.anthropic.claude-sonnet-4-6)
+  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 askSecret('Paste the code (input is hidden): ')).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 || lockedBy() !== null)
-        throw new Error('a metro daemon is already running on this machine. ' +
-            'Stop it first: metro stop');
-    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 = argv[0] === undefined ? undefined : assertAgentId(argv[0]);
-    const stopped = await stopAll(agentId);
+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;
     }
     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;
 }
-async function status(argv) {
-    const agentId = assertAgentId(argv[0]);
-    const pid = runningPid(agentId);
-    if (pid === null) {
-        process.stdout.write(`${agentId}: not running\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 askSecret('Paste the code here (input is hidden): '));
-    writeToken(token);
-    process.stderr.write(`Authorized '${collection}' for ${email}. Stored in ${credentialsPath()}\n`);
-    if (syncPluginServers())
-        process.stderr.write('Claude Code plugin refreshed — new sessions have the connectors; ' +
-            'run /reload-plugins in any session already open.\n');
-}
-async function whoami() {
-    const { email, collection } = await whoisAuthorized();
-    process.stdout.write(`${email} · collection '${collection}' on ${metroUrl()}\n`);
-}
 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();
+        const { agent, where } = await whoisAuthorized();
+        process.stdout.write(`agent ${agent} on ${where}\n`);
         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)),
+    serve: () => serve(process.argv.slice(3)),
+    service: () => service(process.argv.slice(3)),
+    stop: stopDaemon,
     tail: () => tailEvents(process.argv.slice(3)),
-    mcp: async () => {
-        process.stdout.write(`${await mcpServers()}\n`);
-        return 0;
-    },
-    plugin: installPlugin,
     claude: () => launchClaude(process.argv.slice(3)),
-    bedrock: () => bedrock(process.argv.slice(3)),
-    update,
+    agent: () => agentSession(process.argv.slice(3)),
+    task: () => automationCommand(process.argv.slice(3)),
+    memory: () => memoryRoutine(memoryPaths(process.env, process.argv[3])),
+    voice: () => voiceSession(process.argv.slice(3)),
+    update: () => update(process.argv.slice(3)),
     version: async () => {
         process.stdout.write(`${currentVersion()}\n`);
         return Promise.resolve(0);
@@ -165,6 +112,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);

package/dist/control.js

@@ -1,23 +1,13 @@
-import { execFileSync, spawn } from 'node:child_process';
-import { existsSync, mkdirSync, openSync, readdirSync, readFileSync, rmSync, writeFileSync, } from 'node:fs';
+import { execFileSync } from 'node:child_process';
+import { readFileSync, rmSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
-const STATE = () => join(homedir(), '.metro');
-const pidPath = (agentId) => join(STATE(), `run-${agentId}.pid`);
-export const logPath = (agentId) => join(STATE(), 'logs', `${agentId}.log`);
-function ensureStateDirs() {
-    mkdirSync(STATE(), { recursive: true, mode: 0o700 });
-    mkdirSync(join(STATE(), 'logs'), { recursive: true, mode: 0o700 });
-}
-function readPid(agentId) {
-    try {
-        const pid = Number(readFileSync(pidPath(agentId), 'utf8').trim());
-        return Number.isInteger(pid) && pid > 0 ? pid : null;
-    }
-    catch {
-        return null;
-    }
+export function serveStateDir() {
+    const xdg = process.env.XDG_CACHE_HOME?.trim();
+    const base = xdg === undefined || xdg === '' ? join(homedir(), '.cache') : xdg;
+    return join(base, 'metro', 'serve');
 }
+const serveLockPath = () => join(serveStateDir(), '.tail-lock');
 function isAlive(pid) {
     try {
         process.kill(pid, 0);
@@ -27,37 +17,6 @@ function isAlive(pid) {
         return false;
     }
 }
-export function runningPid(agentId) {
-    const pid = readPid(agentId);
-    if (pid === null)
-        return null;
-    if (isAlive(pid))
-        return pid;
-    rmSync(pidPath(agentId), { force: true });
-    return null;
-}
-function writePid(agentId, pid) {
-    writeFileSync(pidPath(agentId), String(pid));
-}
-function clearPid(agentId) {
-    rmSync(pidPath(agentId), { force: true });
-}
-export function detach(opts) {
-    ensureStateDirs();
-    const out = openSync(logPath(opts.agentId), 'a');
-    const child = spawn(opts.command, opts.args, {
-        cwd: opts.cwd,
-        env: opts.env,
-        detached: true,
-        stdio: ['ignore', out, out],
-    });
-    child.unref();
-    const pid = child.pid ?? 0;
-    if (pid === 0)
-        throw new Error('could not start the metro daemon');
-    writePid(opts.agentId, pid);
-    return pid;
-}
 async function stopPid(pid, waitMs) {
     process.kill(pid, 'SIGTERM');
     const until = Date.now() + waitMs;
@@ -83,10 +42,10 @@ function commandOf(pid) {
     }
 }
 const looksLikeMetro = (command) => command.includes('server.ts') || command.includes('metro');
-export function lockedBy() {
+function holderOf(lockFile) {
     let pid;
     try {
-        pid = Number(readFileSync(lockPath(), 'utf8').trim());
+        pid = Number(readFileSync(lockFile, 'utf8').trim());
     }
     catch {
         return null;
@@ -95,64 +54,21 @@ export function lockedBy() {
         return null;
     return looksLikeMetro(commandOf(pid)) ? pid : null;
 }
-function trackedAgents(agentId) {
-    const tracked = new Set();
-    if (agentId !== undefined)
-        tracked.add(agentId);
-    try {
-        for (const name of readdirSync(STATE())) {
-            const found = /^run-(.+)\.pid$/.exec(name);
-            if (found?.[1] !== undefined)
-                tracked.add(found[1]);
-        }
-    }
-    catch {
-        return tracked;
-    }
-    return tracked;
-}
-export async function stopAll(agentId, waitMs = 10_000) {
+export const lockedBy = () => holderOf(lockPath());
+export const serveLockedBy = () => holderOf(serveLockPath());
+export async function stopAll(waitMs = 10_000) {
     const stopped = [];
-    const seen = new Set();
-    for (const id of trackedAgents(agentId)) {
-        const pid = runningPid(id);
-        if (pid === null || seen.has(pid))
-            continue;
-        seen.add(pid);
-        await stopPid(pid, waitMs);
-        clearPid(id);
-        stopped.push({ pid, via: id });
-    }
     const holder = lockedBy();
-    if (holder !== null && !seen.has(holder)) {
+    if (holder !== null) {
         await stopPid(holder, waitMs);
         rmSync(lockPath(), { force: true });
         stopped.push({ pid: holder, via: 'the machine lock' });
     }
-    return stopped;
-}
-export function tail(agentId, follow) {
-    const path = logPath(agentId);
-    if (!existsSync(path))
-        throw new Error(`no log for ${agentId} yet — it is only written when started with --detach`);
-    const args = follow ? ['-n', '200', '-f', path] : ['-n', '200', path];
-    const child = spawn('tail', args, { stdio: ['ignore', 'inherit', 'inherit'] });
-    return new Promise((resolve) => {
-        child.on('exit', (code) => {
-            resolve(code ?? 0);
-        });
-    });
-}
-export async function probe(url) {
-    try {
-        const res = await fetch(`${url}/health`, {
-            signal: AbortSignal.timeout(3_000),
-        });
-        if (!res.ok)
-            return null;
-        return (await res.json());
-    }
-    catch {
-        return null;
+    const served = serveLockedBy();
+    if (served !== null && served !== holder) {
+        await stopPid(served, waitMs);
+        rmSync(serveLockPath(), { force: true });
+        stopped.push({ pid: served, via: 'metro serve' });
     }
+    return stopped;
 }