@stage-labs/metro 0.1.0-beta.141 → 0.1.0-beta.142

package/dist/api.js

@@ -1,11 +1,6 @@
-import { localAgents, localDaemonUp, localMcpServers, pickLocalAgent } from './local.js';
+import { localAgents, localDaemonUp, pickLocalAgent } from './local.js';
 import { localUrl } from './runtime.js';
 const NO_DAEMON = `no metro daemon on ${localUrl()} — start one with: metro serve`;
-export async function mcpServers(wanted) {
-    if (!(await localDaemonUp()))
-        throw new Error(NO_DAEMON);
-    return localMcpServers(pickLocalAgent(localAgents(), wanted));
-}
 export async function whoisAuthorized(wanted) {
     if (!(await localDaemonUp()))
         throw new Error(NO_DAEMON);

package/dist/cli.js

@@ -1,9 +1,8 @@
 #!/usr/bin/env node
-import { mcpServers, whoisAuthorized } from './api.js';
+import { whoisAuthorized } from './api.js';
 import { stopAll } from './control.js';
 import { tailEvents } from './tail.js';
 import { launchClaude } from './claude.js';
-import { installPlugin } from './plugin.js';
 import { update } from './update.js';
 import { serve } from './serve.js';
 import { service, serviceStopHint } from './service.js';
@@ -26,9 +25,6 @@ const USAGE = `metro — run your agent on this machine
   metro tail <agent-id>
                   follow this machine's inbound events, one JSON line each
   metro whoami    print the agent this machine runs
-  metro mcp       print the mcpServers block of the agent's connectors, served through the
-                  daemon's own relay
-  metro plugin    set up the Claude Code plugin (connector servers + /metro:refresh)
   metro claude [args...]
                   open Claude Code with the metro channel; every argument is passed through
                   the same, with inference on Amazon Bedrock through a local proxy so the
@@ -36,10 +32,6 @@ const USAGE = `metro — run your agent on this machine
   metro update    update to the newest published version (--check only reports)
   metro version   print this CLI's version
 
-Start Claude Code with every connector, writing nothing to disk:
-
-  claude --mcp-config <(metro mcp)
-
   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
@@ -72,11 +64,6 @@ const COMMANDS = {
     service: () => service(process.argv.slice(3)),
     stop: stopDaemon,
     tail: () => tailEvents(process.argv.slice(3)),
-    mcp: async () => {
-        process.stdout.write(`${await mcpServers(process.argv[3])}\n`);
-        return 0;
-    },
-    plugin: installPlugin,
     claude: () => launchClaude(process.argv.slice(3)),
     update: () => update(process.argv.slice(3)),
     version: async () => {

package/dist/local.js

@@ -3,7 +3,6 @@ import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { localUrl } from './runtime.js';
 const PROBE_MS = 3_000;
-const READ_MS = 20_000;
 export function agentsDir() {
     const explicit = process.env.METRO_AGENTS_DIR?.trim();
     return explicit !== undefined && explicit !== '' ? explicit : join(homedir(), '.metro', 'agents');
@@ -76,15 +75,3 @@ export async function localDaemonUp(base = localUrl()) {
         return false;
     }
 }
-export async function localMcpServers(agent, base = localUrl()) {
-    const res = await fetch(`${base}/api/cli/mcp`, {
-        headers: { authorization: `Bearer ${agent.key}` },
-        signal: AbortSignal.timeout(READ_MS),
-    });
-    if (!res.ok)
-        throw new Error(`the local daemon answered ${String(res.status)} for the connectors`);
-    const body = (await res.json());
-    if (typeof body.json !== 'string')
-        throw new Error('the local daemon returned an unexpected response');
-    return body.json;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stage-labs/metro",
-  "version": "0.1.0-beta.141",
+  "version": "0.1.0-beta.142",
   "description": "The metro command line. Sign in once per machine, then hand your MCP connector list to Claude Code without the credentials touching disk, argv or shell history.",
   "license": "MIT",
   "repository": {

package/runtime/marketplace/plugin/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "metro",
-  "version": "0.1.0-beta.141",
-  "description": "Metro for Claude Code, installed by the metro daemon on this machine: every connector the agent holds as its own MCP server relayed through the daemon, the orchestrator-only guard on the main thread, the standing rules loaded at each session start, and a refresh skill for when the daemon could not keep the server list current. No vendor credential ever sits in a config file.",
+  "version": "0.1.0-beta.142",
+  "description": "Metro for Claude Code, installed by the metro daemon on this machine: every connector the agent holds as its own MCP server relayed through the daemon, the orchestrator-only guard on the main thread, and the standing rules loaded at each session start. No vendor credential ever sits in a config file.",
   "author": {
     "name": "Bonustrack",
     "url": "https://metro.box"

package/runtime/marketplace/plugin/bin/metro-plugin.mjs

@@ -1,127 +1,40 @@
 #!/usr/bin/env node
-import { existsSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { existsSync, readdirSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
-import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { join } from 'node:path';
 
-const pluginRoot = dirname(dirname(fileURLToPath(import.meta.url)));
-const mcpPath = join(pluginRoot, '.mcp.json');
-const NAME_PREFIX = 'metro.box ';
+const agentsDir = () => process.env.METRO_AGENTS_DIR || join(homedir(), '.metro', 'agents');
 
-const localUrl = () => `http://127.0.0.1:${Number(process.env.METRO_WEBHOOK_PORT) || 8420}`;
-
-function agentsDir() {
-  const explicit = process.env.METRO_AGENTS_DIR?.trim();
-  return explicit ? explicit : join(homedir(), '.metro', 'agents');
-}
-
-function agentFiles(dir) {
-  const fixed = join(dir, 'agent.json');
-  if (existsSync(fixed)) return [fixed];
-  if (!existsSync(dir)) return [];
-  return readdirSync(dir, { withFileTypes: true })
-    .filter((entry) => entry.isDirectory())
-    .map((entry) => join(dir, entry.name, 'agent.json'))
-    .filter((path) => existsSync(path));
-}
-
-function localAgents() {
-  const out = [];
-  for (const path of agentFiles(agentsDir())) {
-    try {
-      const file = JSON.parse(readFileSync(path, 'utf8'));
-      if (typeof file.id === 'string' && typeof file.key === 'string')
-        out.push({ id: file.id, name: typeof file.name === 'string' ? file.name : 'agent', key: file.key });
-    } catch {
-      continue;
-    }
-  }
-  return out.sort((a, b) => a.name.localeCompare(b.name));
-}
-
-function pickAgent() {
-  const agents = localAgents();
-  const wanted = process.env.METRO_AGENT?.trim();
-  if (wanted) {
-    const found = agents.find((a) => a.name === wanted || a.id === wanted);
-    if (!found) throw new Error(`no local agent named '${wanted}' in ${agentsDir()}`);
-    return found;
-  }
-  if (agents.length === 1) return agents[0];
-  throw new Error(
-    agents.length === 0
-      ? 'no agent on this machine yet — start metro serve, it creates one at boot'
-      : `several agents on this machine — set METRO_AGENT to one of: ${agents.map((a) => a.name).join(', ')}`,
-  );
-}
-
-async function api(path, key) {
-  let res;
+function readAgent(path) {
   try {
-    res = await fetch(`${localUrl()}${path}`, { headers: { authorization: `Bearer ${key}` } });
+    const parsed = JSON.parse(readFileSync(path, 'utf8'));
+    return typeof parsed?.key === 'string' ? parsed : null;
   } catch {
-    throw new Error(`no metro daemon on ${localUrl()} — start one with: metro serve`);
-  }
-  const body = await res.json().catch(() => null);
-  if (!res.ok) {
-    const detail = typeof body?.error === 'string' ? body.error : `the daemon answered ${res.status}`;
-    const err = new Error(detail);
-    err.status = res.status;
-    throw err;
-  }
-  return body;
-}
-
-function serverEntries(rawJson) {
-  const servers = JSON.parse(rawJson)?.mcpServers;
-  if (typeof servers !== 'object' || servers === null)
-    throw new Error('the daemon returned an unexpected mcpServers shape');
-  const out = {};
-  for (const [key, value] of Object.entries(servers)) {
-    const name = key.startsWith(NAME_PREFIX) ? key.slice(NAME_PREFIX.length) : key;
-    out[name] = {
-      type: value.type ?? 'http',
-      url: value.url,
-      headersHelper: 'node "${CLAUDE_PLUGIN_ROOT}/bin/metro-plugin.mjs" headers',
-    };
+    return null;
   }
-  return out;
 }
 
-async function refresh() {
-  const agent = pickAgent();
-  const body = await api('/api/cli/mcp', agent.key);
-  const servers = serverEntries(body.json);
-  writeFileSync(mcpPath, `${JSON.stringify(servers, null, 2)}\n`);
-  const names = Object.keys(servers);
-  process.stdout.write(
-    `agent '${agent.name}': ${names.length} server(s) written to the plugin\n` +
-      (names.length ? `  ${names.join('\n  ')}\n` : '') +
-      'Run /reload-plugins to apply in this session.\n',
-  );
-}
-
-function headers() {
-  let agent;
-  try {
-    agent = pickAgent();
-  } catch (err) {
-    process.stderr.write(`metro: ${err.message}\n`);
-    process.stdout.write('{}\n');
-    return;
+function pickAgent() {
+  const dir = agentsDir();
+  const fixed = readAgent(join(dir, 'agent.json'));
+  if (fixed !== null) return fixed;
+  if (!existsSync(dir)) throw new Error(`no agent on this machine yet (${dir})`);
+  for (const entry of readdirSync(dir, { withFileTypes: true })) {
+    if (!entry.isDirectory()) continue;
+    const found = readAgent(join(dir, entry.name, 'agent.json'));
+    if (found !== null) return found;
   }
-  process.stdout.write(`${JSON.stringify({ Authorization: `Bearer ${agent.key}` })}\n`);
+  throw new Error(`no agent on this machine yet (${dir})`);
 }
 
-const command = process.argv[2];
-const run = { refresh, headers: () => Promise.resolve(headers()) }[command];
-
-if (run === undefined) {
-  process.stderr.write('usage: metro-plugin.mjs <refresh|headers>\n');
+if (process.argv[2] !== 'headers') {
+  process.stderr.write('usage: metro-plugin.mjs headers\n');
   process.exit(1);
 }
 
-run().catch((err) => {
+try {
+  process.stdout.write(`${JSON.stringify({ Authorization: `Bearer ${pickAgent().key}` })}\n`);
+} catch (err) {
   process.stderr.write(`metro: ${err.message}\n`);
-  process.exit(err.status === 401 ? 2 : 1);
-});
+  process.stdout.write('{}\n');
+}

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

@@ -20,8 +20,8 @@ import {
 } from '../routes/http.js';
 import { localAgentKey } from '../stations/materialize.js';
 import { agentsDir, fileSource } from '../agents/files.js';
-import { ConnectorWatch } from '../connectors/watch.js';
 import { syncPluginServers } from '../connectors/plugin-sync.js';
+import { readLocalConnectors } from '../connectors/store.js';
 import { ensureMetroPlugin } from '../claude/plugin-install.js';
 import { sessionRunning, stopSession, unwatchSession, watchSession } from '../claude/session.js';
 import { tryClaudeSetup } from '../claude/setup.js';
@@ -129,15 +129,6 @@ function sessionApis(): SessionApis {
     });
 }
 
-let connectors: ConnectorWatch | null = null;
-
-function startConnectors(): void {
-  const watch = new ConnectorWatch(agentsDir(), () => {
-    syncPluginServers();
-  });
-  connectors = watch;
-  watch.start();
-}
 
 async function main(): Promise<void> {
   applyLocalOwner();
@@ -154,7 +145,7 @@ installBearerSessions(agentsDir(), localOwner);
     metroCall,
   );
   metroMcp.startInbound();
-  startConnectors();
+  syncPluginServers(readLocalConnectors());
   startUploadReaper();
   announceLocalEndpoint();
   tunnel?.start();
@@ -166,7 +157,7 @@ installBearerSessions(agentsDir(), localOwner);
   ensureMetroPlugin()
     .then((outcome) => {
       log.info({ outcome }, 'plugin: metro plugin for Claude Code');
-      if (outcome !== 'skipped') syncPluginServers();
+      if (outcome !== 'skipped') syncPluginServers(readLocalConnectors());
     })
     .catch((err: unknown) => {
       log.warn({ err: errMsg(err) }, 'plugin: could not ensure the Claude Code plugin');
@@ -185,7 +176,6 @@ async function shutdown(): Promise<void> {
   shuttingDown = true;
   log.info('dispatcher shutting down');
   unwatchSession();
-  connectors?.stop();
   tunnel?.stop();
   if (webhookServer) {
     const server = webhookServer;

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

@@ -1,5 +1,6 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { log } from '@metro-labs/core/log';
+import { healthOf } from './health.js';
 import {
   apiFailure,
   apiSession,
@@ -81,11 +82,7 @@ function target(path: string): Target {
   return id === null ? { kind: 'unknown' } : subTarget(id, segments.slice(1));
 }
 
-function connectorPayload(
-  row: Connector,
-  detail = false,
-): Record<string, unknown> {
-  const { catalog, ...summary } = row.verified;
+function connectorPayload(row: Connector): Record<string, unknown> {
   return {
     id: row.id,
     name: row.name,
@@ -95,7 +92,8 @@ function connectorPayload(
     header: row.header,
     clientId: row.client?.clientId ?? null,
     signIn: row.signIn,
-    verified: detail ? { ...summary, catalog } : summary,
+    verified: row.verified,
+    health: healthOf(row.id),
   };
 }
 
@@ -208,7 +206,7 @@ async function handleConnector(
     return;
   }
   const row = await deps.getConnector(session.subject, id);
-  sendJson(req, res, 200, connectorPayload(row, true));
+  sendJson(req, res, 200, connectorPayload(row));
 }
 
 async function handleRename(

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

@@ -4,7 +4,6 @@ import type {
   VerifiedRecord,
   VerifiedServer,
 } from './verify.js';
-import { readStoredTools } from './tools.js';
 import type { OAuthClient } from './oauth-client.js';
 import { isRecord } from '@metro-labs/core/is-record';
 
@@ -133,16 +132,7 @@ function readAuth(raw: unknown): ConnectorAuth {
 
 function readVerified(raw: unknown): VerifiedRecord {
   const record = isRecord(raw) ? raw : {};
-  const catalog = readStoredTools(record.catalog);
-  return {
-    at: text(record.at),
-    server: text(record.server),
-    version: text(record.version),
-    protocol: text(record.protocol),
-    icon: text(record.icon),
-    tools: typeof record.tools === 'number' ? record.tools : 0,
-    catalog,
-  };
+  return { at: text(record.at), server: text(record.server) };
 }
 
 export function readConfig(raw: unknown): ConnectorConfig {
@@ -163,13 +153,5 @@ export function signInState(config: ConnectorConfig): ConnectorSignIn {
 }
 
 export function stamp(server: VerifiedServer): VerifiedRecord {
-  return {
-    at: new Date().toISOString(),
-    server: server.server,
-    version: server.version,
-    protocol: server.protocol,
-    icon: server.icon,
-    tools: server.tools,
-    catalog: server.catalog,
-  };
+  return { at: new Date().toISOString(), server: server.server };
 }

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

@@ -0,0 +1,18 @@
+export interface ConnectorHealth {
+  ok: boolean;
+  reason: string | null;
+  at: string;
+}
+
+const seen = new Map<string, ConnectorHealth>();
+
+export function noteHealth(id: string, ok: boolean, reason: string | null = null): void {
+  seen.set(id, { ok, reason: ok ? null : reason, at: new Date().toISOString() });
+}
+
+export const healthOf = (id: string): ConnectorHealth | null => seen.get(id) ?? null;
+
+export function forgetHealth(id?: string): void {
+  if (id === undefined) seen.clear();
+  else seen.delete(id);
+}

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

@@ -66,12 +66,4 @@ export function connectorFromRow(row: ConnectorLike): Connector {
   };
 }
 
-export const UNVERIFIED = {
-  at: '',
-  server: '',
-  version: '',
-  protocol: '',
-  icon: '',
-  tools: 0,
-  catalog: [],
-};
+export const UNVERIFIED = { at: '', server: '' };

package/runtime/node_modules/@metro-labs/daemon/src/connectors/plugin-sync.ts

@@ -3,13 +3,17 @@ import { join } from 'node:path';
 import { errMsg, log } from '@metro-labs/core/log';
 import { claudeDir } from '../claude/files.js';
 import { loopbackBase } from '../files/attach-serve.js';
-import { readLocalConnectors, type LocalConnectorRow } from './store.js';
 
 const MARKER = join('bin', 'metro-plugin.mjs');
 const FILE = '.mcp.json';
 const HELPER = 'node "${CLAUDE_PLUGIN_ROOT}/bin/metro-plugin.mjs" headers';
 const SLUG_MAX = 40;
 
+export interface PluginRow {
+  id: string;
+  name: string;
+}
+
 export interface PluginServer {
   type: 'http';
   url: string;
@@ -26,7 +30,7 @@ export function serverKey(name: string): string {
   return slug === '' ? 'connector' : slug;
 }
 
-export function pluginServers(rows: LocalConnectorRow[], base: string): Record<string, PluginServer> {
+export function pluginServers(rows: PluginRow[], base: string): Record<string, PluginServer> {
   const taken = new Map<string, number>();
   const out: Record<string, PluginServer> = {};
   for (const row of rows) {
@@ -88,7 +92,6 @@ function writeIfChanged(path: string, text: string): boolean {
 export interface PluginSyncOptions {
   dir?: string;
   base?: string;
-  agents?: string;
   staged?: string | null;
 }
 
@@ -97,13 +100,10 @@ function filesFor(opts: PluginSyncOptions): string[] {
   return installedPluginFiles(opts.dir ?? claudeDir(), staged);
 }
 
-const rowsFor = (agents?: string): LocalConnectorRow[] =>
-  agents === undefined ? readLocalConnectors() : readLocalConnectors(agents);
-
-export function syncPluginServers(opts: PluginSyncOptions = {}): number {
+export function syncPluginServers(rows: PluginRow[], opts: PluginSyncOptions = {}): number {
   const files = filesFor(opts);
   if (files.length === 0) return 0;
-  const servers = pluginServers(rowsFor(opts.agents), opts.base ?? loopbackBase());
+  const servers = pluginServers(rows, opts.base ?? loopbackBase());
   const text = `${JSON.stringify(servers, null, 2)}\n`;
   let written = 0;
   for (const file of files) {

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

@@ -1,5 +1,6 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { whyUnreachable } from './reach.js';
+import { noteHealth } from './health.js';
 import type { RelayTarget } from './relay-target.js';
 import type { AgentIdentity } from '@metro-labs/http/api-http';
 import { ApiError } from '@metro-labs/http/api-error';
@@ -240,14 +241,18 @@ async function relayExchange(
     return;
   }
   if (out.kind === 'signin') {
+    noteHealth(connectorId, false, 'the sign-in has expired, connect it again');
     signinAnswer(res, connectorId);
     return;
   }
   if (out.upstream.status >= 300 && out.upstream.status < 400) {
     await out.upstream.body?.cancel();
+    noteHealth(connectorId, false, 'the connector redirected; metro does not follow');
     answer(res, 502, { error: 'the connector redirected; metro does not follow' });
     return;
   }
+  const { status } = out.upstream;
+  noteHealth(connectorId, status < 400, status < 400 ? null : `the connector answered ${String(status)}`);
   await pipe(res, out.upstream);
 }
 
@@ -268,6 +273,7 @@ function dispatch(
         answer(res, err.status, { error: err.message });
       } else {
         log.warn({ err: errMsg(err), connector: connectorId }, 'relay: failed');
+        noteHealth(connectorId, false, `metro could not reach the connector: ${whyUnreachable(err)}`);
         answer(res, 502, { error: `metro could not reach the connector: ${whyUnreachable(err)}` });
         if (!res.writableEnded) res.end();
       }

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

@@ -1,4 +1,5 @@
 import { join } from 'node:path';
+import { syncPluginServers } from './plugin-sync.js';
 import { readJson, writeSecure } from '@metro-labs/core/secure-fs';
 import { errMsg, log } from '@metro-labs/core/log';
 import {
@@ -76,6 +77,7 @@ export function readLocalConnectors(dir = agentsDir()): LocalConnectorRow[] {
 
 function writeRows(dir: string, rows: LocalConnectorRow[]): void {
   writeSecure(filePath(dir), `${JSON.stringify({ version: 1, connectors: rows }, null, 2)}\n`);
+  if (dir === agentsDir()) syncPluginServers(rows);
 }
 
 const missing = (): ConnectorError => new ConnectorError('no such connector', 404);
@@ -237,13 +239,6 @@ export async function localDeleteConnector(subject: string, id: string, dir = ag
   return Promise.resolve({ id: row.id, name: row.name });
 }
 
-const byIds = (ids: string[], dir: string): LocalConnectorRow[] =>
-  readLocalConnectors(dir).filter((r) => ids.includes(r.id));
-
-export async function localConnectorNamesByIds(ids: string[], dir = agentsDir()): Promise<{ id: string; name: string }[]> {
-  return Promise.resolve(byIds(ids, dir).map((r) => ({ id: r.id, name: r.name })));
-}
-
 const inflight = new Map<string, Promise<OAuthAuth>>();
 
 function refreshOnce(row: LocalConnectorRow, auth: OAuthAuth, dir: string): Promise<OAuthAuth> {

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

@@ -4,8 +4,6 @@ export class ConnectorVerifyError extends ApiError {}
 
 export class ConnectorUnauthorized extends ConnectorVerifyError {}
 
-export class ConnectorNotMcp extends ConnectorVerifyError {}
-
 export const POLICY_MESSAGE =
   'Metro connects from its own server, so it cannot reach a URL on your machine. localhost and private addresses are not usable as connectors.';
 
@@ -59,12 +57,3 @@ export function connectorUrlText(url: URL): string {
   if (url.pathname !== '/' || url.search !== '') return text;
   return text.endsWith('/') ? text.slice(0, -1) : text;
 }
-
-export function safeIconSrc(raw: unknown): string {
-  if (typeof raw !== 'string' || raw === '') return '';
-  try {
-    return new URL(raw).protocol === 'https:' ? raw.slice(0, 500) : '';
-  } catch {
-    return '';
-  }
-}