@stage-labs/metro 0.1.0-beta.131 → 0.1.0-beta.132

package/dist/claude.js

@@ -82,7 +82,7 @@ export function agentKey(agents, wanted) {
     catch {
         return {
             skip: wanted === undefined || wanted === ''
-                ? 'several agents live here; set METRO_AGENT=<name> to route through the daemon, Claude Code talks to Anthropic directly for now'
+                ? 'this box has no agent yet (or several old ones), so Claude Code talks to Anthropic directly for now'
                 : `no agent named '${wanted}' lives here, so Claude Code talks to Anthropic directly`,
         };
     }
@@ -102,7 +102,7 @@ async function verdict() {
     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(localAgentList(), process.env.METRO_AGENT);
+    const picked = agentKey(localAgentList(), undefined);
     if ('skip' in picked)
         return picked;
     if (await daemonServing())
@@ -128,7 +128,7 @@ export function runClaude(args, env) {
 async function servedKey(decision) {
     if ('key' in decision)
         return decision.key;
-    const picked = agentKey(localAgentList(), process.env.METRO_AGENT);
+    const picked = agentKey(localAgentList(), undefined);
     if ('skip' in picked)
         return null;
     return (await daemonServing()) ? picked.key : null;

package/dist/cli.js

@@ -25,11 +25,9 @@ const USAGE = `metro — run your agent on this machine
   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 [agent]
-                  print the agent this machine runs
-  metro mcp [agent]
-                  print the mcpServers block of the agent's connectors, served through the
-                  daemon's own relay (name the agent if several live here)
+  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

package/dist/local.js

@@ -8,20 +8,24 @@ export function agentsDir() {
     const explicit = process.env.METRO_AGENTS_DIR?.trim();
     return explicit !== undefined && explicit !== '' ? explicit : join(homedir(), '.metro', 'agents');
 }
-export function localAgents(dir = agentsDir()) {
+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));
+}
+export function localAgents(dir = agentsDir()) {
     const out = [];
-    for (const entry of readdirSync(dir, { withFileTypes: true })) {
-        if (!entry.isDirectory())
-            continue;
-        const path = join(dir, entry.name, 'agent.json');
-        if (!existsSync(path))
-            continue;
+    for (const path of agentFiles(dir)) {
         try {
             const file = JSON.parse(readFileSync(path, 'utf8'));
-            if (typeof file.id === 'string' && typeof file.name === 'string' && typeof file.key === 'string')
-                out.push({ id: file.id, name: file.name, key: file.key });
+            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;
@@ -30,15 +34,8 @@ export function localAgents(dir = agentsDir()) {
     return out.sort((a, b) => a.name.localeCompare(b.name));
 }
 export function localStations(dir = agentsDir()) {
-    if (!existsSync(dir))
-        return [];
     const out = new Set();
-    for (const entry of readdirSync(dir, { withFileTypes: true })) {
-        if (!entry.isDirectory())
-            continue;
-        const path = join(dir, entry.name, 'agent.json');
-        if (!existsSync(path))
-            continue;
+    for (const path of agentFiles(dir)) {
         try {
             const file = JSON.parse(readFileSync(path, 'utf8'));
             if (!Array.isArray(file.stations))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stage-labs/metro",
-  "version": "0.1.0-beta.131",
+  "version": "0.1.0-beta.132",
   "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,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.1.0-beta.131",
+  "version": "0.1.0-beta.132",
   "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.",
   "author": {
     "name": "Bonustrack",

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

@@ -15,18 +15,23 @@ function agentsDir() {
   return explicit ? explicit : join(homedir(), '.metro', 'agents');
 }
 
-function localAgents() {
-  const dir = agentsDir();
+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 entry of readdirSync(dir, { withFileTypes: true })) {
-    if (!entry.isDirectory()) continue;
-    const path = join(dir, entry.name, 'agent.json');
-    if (!existsSync(path)) continue;
+  for (const path of agentFiles(agentsDir())) {
     try {
       const file = JSON.parse(readFileSync(path, 'utf8'));
-      if (typeof file.id === 'string' && typeof file.name === 'string' && typeof file.key === 'string')
-        out.push({ id: file.id, name: file.name, key: file.key });
+      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;
     }
@@ -45,7 +50,7 @@ function pickAgent() {
   if (agents.length === 1) return agents[0];
   throw new Error(
     agents.length === 0
-      ? 'no agent on this machine yet — start metro serve and create or restore one in the web UI'
+      ? '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(', ')}`,
   );
 }

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

@@ -6,20 +6,20 @@ export class AgentAdminError extends ApiError {}
 
 export interface AgentSummary {
   id: string;
-  name: string;
+  name: string | null;
   owned: boolean;
   key: string | null;
 }
 
 export interface CreatedAgent {
   id: string;
-  name: string;
+  name: string | null;
   key: string;
 }
 
 export interface OwnedAgent {
   id: string;
-  name: string;
+  name: string | null;
 }
 
 export type DeletedAgent = OwnedAgent;

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

@@ -7,7 +7,6 @@ import {
   apiSession,
   projectParam,
   cors,
-  readJsonBody,
   sendJson,
   type ApiSession,
 } from '@metro-labs/http/api-http';
@@ -19,7 +18,6 @@ import {
 } from './account-routes.js';
 import {
   type AgentSummary,
-  type CreatedAgent,
   type DeletedAgent,
   type ResetAgentKey,
 } from './admin.js';
@@ -29,11 +27,6 @@ const SERVER_NAME = 'metro';
 
 export interface AgentApiDeps extends AccountApiDeps {
   listAgents: (subject: string, project: string) => Promise<AgentSummary[]>;
-  createAgent: (
-    subject: string,
-    project: string,
-    name: string,
-  ) => Promise<CreatedAgent>;
   deleteAgent: (
     subject: string,
     id: string,
@@ -166,31 +159,6 @@ async function handleList(
   sendJson(req, res, 200, { ...base, accounts, unavailable });
 }
 
-async function handleCreate(
-  req: IncomingMessage,
-  res: ServerResponse,
-  deps: AgentApiDeps,
-  session: ApiSession,
-): Promise<void> {
-  const body = await readJsonBody(req);
-  const name = (body as { name?: unknown }).name;
-  const project = projectParam(req);
-  if (project === null) {
-    sendJson(req, res, 400, { error: 'a project is required' });
-    return;
-  }
-  const created = await deps.createAgent(session.subject, project, name as string);
-  log.info(
-    { agent: created.name, id: created.id, owner: session.subject },
-    'agent-api: created agent',
-  );
-  sendJson(req, res, 201, {
-    id: created.id,
-    name: created.name,
-    ...credentials(created.key),
-  });
-}
-
 async function handleResetKey(
   req: IncomingMessage,
   res: ServerResponse,
@@ -239,15 +207,14 @@ async function routeAgent(
     if (tgt.kind === 'key') await handleResetKey(req, res, deps, session, tgt.id);
     else if (tgt.kind === 'agent')
       await handleDelete(req, res, deps, session, tgt.id);
-    else if (req.method === 'GET') await handleList(req, res, deps, session);
-    else await handleCreate(req, res, deps, session);
+    else await handleList(req, res, deps, session);
   } catch (err) {
     apiFailure(req, res, err);
   }
 }
 
 const ALLOWED: Record<AgentTarget['kind'], string[]> = {
-  collection: ['GET', 'POST'],
+  collection: ['GET'],
   agent: ['DELETE'],
   key: ['POST'],
 };

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

@@ -69,9 +69,9 @@ function agentOf(raw: unknown): AgentBundle['agent'] {
   if (!isRecord(raw)) throw bad('not a v1 agent bundle');
   const { id, name, key, stations } = raw;
   if (typeof id !== 'string' || parseId(id) === null) throw bad('agent id is not an id');
-  if (typeof name !== 'string' || typeof key !== 'string' || key === '') throw bad('agent has no name or key');
+  if (typeof key !== 'string' || key === '') throw bad('agent has no key');
   if (!Array.isArray(stations)) throw bad('agent has no station list');
-  return { id, name, key, stations: stations.map(stationOf) };
+  return { id, name: typeof name === 'string' ? name : '', key, stations: stations.map(stationOf) };
 }
 
 export function parseBundle(raw: unknown): AgentBundle {

package/runtime/node_modules/@metro-labs/daemon/src/agents/file-admin.ts

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync, rmdirSync, rmSync } from 'node:fs';
+import { readFileSync, rmdirSync, rmSync } from 'node:fs';
 import { join } from 'node:path';
 import { ApiError } from '@metro-labs/http/api-error';
 import { ensureSecureDir, writeSecure } from '@metro-labs/core/secure-fs';
@@ -14,7 +14,7 @@ import {
 } from './admin.js';
 import type { AccountRef } from './account-attach.js';
 import {
-  AGENT_FILE,
+  agentFilePath,
   AgentFileError,
   agentsDir,
   listAgentFiles,
@@ -94,7 +94,7 @@ export async function localListAgents(
   return Promise.resolve(
     storedAgents(dir)
       .map(({ file }) => ({ id: file.id, name: file.name, owned: true, key: file.key }))
-      .sort((a, b) => a.name.localeCompare(b.name) || a.id.localeCompare(b.id)),
+      .sort((a, b) => a.id.localeCompare(b.id)),
   );
 }
 
@@ -109,30 +109,35 @@ function freshId(taken: Set<string>): string {
 export async function localCreateAgent(
   subject: string,
   project: string,
-  rawName: string,
+  rawName?: string,
   dir = agentsDir(),
 ): Promise<CreatedAgent> {
   if (project !== LOCAL_PROJECT_ID || !isOwner(subject, dir))
     throw new AgentAdminError('no such project', 404);
-  const name = normalizeAgentName(rawName);
-  const folder = join(dir, name);
-  if (existsSync(join(folder, AGENT_FILE)))
-    throw new AgentAdminError(
-      `an agent named '${name}' already exists on this machine`,
-      409,
-    );
+  const name = rawName === undefined ? null : normalizeAgentName(rawName);
   const existing = storedAgents(dir);
-  const id = freshId(new Set(existing.map((s) => s.file.id)));
+  if (existing.length > 0) throw new AgentAdminError('this box already has its agent', 409);
+  const id = freshId(new Set());
   const key = newApiKey();
-  ensureSecureDir(folder);
+  ensureSecureDir(dir);
   save({
-    path: join(folder, AGENT_FILE),
+    path: agentFilePath(dir),
     file: { version: 1, id, name, key, owner: localOwner(dir), stations: [], connectors: [] },
   });
   registerKey(key, id);
   return Promise.resolve({ id, name, key });
 }
 
+export type Ensured = 'created' | 'present' | 'no-owner';
+
+export async function ensureLocalAgent(dir = agentsDir()): Promise<Ensured> {
+  if (storedAgents(dir).length > 0) return 'present';
+  const owner = localOwner(dir);
+  if (owner === null) return 'no-owner';
+  await localCreateAgent(owner, LOCAL_PROJECT_ID, undefined, dir);
+  return 'created';
+}
+
 export async function localResetAgentKey(
   subject: string,
   id: string,
@@ -155,7 +160,7 @@ export async function localDeleteAgent(
   const attached = stored.file.stations.length;
   if (attached > 0)
     throw new AgentAdminError(
-      `agent '${stored.file.name}' still has ${String(attached)} station account(s) attached — detach them first`,
+      `the agent still has ${String(attached)} station account(s) attached — detach them first`,
       409,
     );
   rmSync(stored.path);
@@ -196,14 +201,10 @@ interface ImportTarget {
 function importTarget(dir: string, agent: LoadedAgent & { key: string }): ImportTarget {
   const existing = storedAgents(dir);
   const same = existing.find((s) => s.file.id === agent.id);
-  const fresh = join(dir, agent.name, AGENT_FILE);
-  if (same === undefined && existsSync(fresh))
-    throw new AgentAdminError(
-      `an agent named '${agent.name}' already exists on this machine`,
-      409,
-    );
+  if (same === undefined && existing.length > 0)
+    throw new AgentAdminError('this box already has its agent; import into it rather than bringing another', 409);
   assertUnclaimed(existing.filter((s) => s !== same), agent);
-  return { path: same?.path ?? fresh, previous: same?.file };
+  return { path: same?.path ?? agentFilePath(dir), previous: same?.file };
 }
 
 export type ImportMode = 'append' | 'overwrite';
@@ -256,7 +257,7 @@ function fileFor(
       JSON.stringify({
         version: 1,
         id: agent.id,
-        name: previous?.name ?? agent.name,
+        name: previous?.name ?? null,
         key: agent.key,
         owner,
         stations: mergedStations(agent, previous, mode),

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

@@ -1,4 +1,5 @@
-import { existsSync, readdirSync, readFileSync } from 'node:fs';
+import { existsSync, readdirSync, readFileSync, renameSync, rmdirSync } from 'node:fs';
+import { log } from '@metro-labs/core/log';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { AGENT_NAME_RE, ID_RE } from '@metro-labs/core/ids';
@@ -17,13 +18,15 @@ export class AgentFileError extends Error {}
 export interface AgentFile {
   version: 1;
   id: string;
-  name: string;
+  name: string | null;
   key: string | null;
   owner: string | null;
   stations: LoadedAccount[];
   connectors: string[];
 }
 
+export const agentFilePath = (dir = agentsDir()): string => join(dir, AGENT_FILE);
+
 export function agentsDir(): string {
   const explicit = process.env.METRO_AGENTS_DIR?.trim();
   return explicit !== undefined && explicit !== ''
@@ -73,6 +76,12 @@ function optionalMatch(
 const connectorsOf = (raw: unknown): string[] =>
   Array.isArray(raw) ? raw.filter((id): id is string => typeof id === 'string' && ID_RE.test(id)) : [];
 
+function nameOf(raw: unknown, path: string): string | null {
+  if (raw === undefined || raw === null) return null;
+  if (typeof raw !== 'string' || !AGENT_NAME_RE.test(raw)) fail(path, 'name is not a valid agent name');
+  return raw;
+}
+
 export function parseAgentFile(raw: string, path: string): AgentFile {
   let parsed: unknown;
   try {
@@ -85,8 +94,7 @@ export function parseAgentFile(raw: string, path: string): AgentFile {
   const { id, name, stations } = parsed;
   if (typeof id !== 'string' || !ID_RE.test(id))
     fail(path, 'id is not an 11-character id');
-  if (typeof name !== 'string' || !AGENT_NAME_RE.test(name))
-    fail(path, 'name is not a valid agent name');
+  const label = nameOf(name, path);
   const key = optionalMatch(parsed.key, KEY_RE, path, 'key is not an agent key');
   const owner = optionalMatch(
     parsed.owner,
@@ -98,7 +106,7 @@ export function parseAgentFile(raw: string, path: string): AgentFile {
   return {
     version: 1,
     id,
-    name,
+    name: label,
     key,
     owner,
     stations: stations.map((s, i) => stationOf(s, path, i)),
@@ -116,7 +124,7 @@ export function readAgentFile(path: string): AgentFile {
   return parseAgentFile(raw, path);
 }
 
-export function listAgentFiles(dir = agentsDir()): string[] {
+function legacyAgentFiles(dir: string): string[] {
   if (!existsSync(dir)) return [];
   return readdirSync(dir, { withFileTypes: true })
     .filter((entry) => entry.isDirectory())
@@ -125,6 +133,27 @@ export function listAgentFiles(dir = agentsDir()): string[] {
     .sort();
 }
 
+export function listAgentFiles(dir = agentsDir()): string[] {
+  const fixed = agentFilePath(dir);
+  return existsSync(fixed) ? [fixed] : legacyAgentFiles(dir);
+}
+
+export function migrateAgentLayout(dir = agentsDir()): 'moved' | 'kept' | 'none' {
+  const fixed = agentFilePath(dir);
+  if (existsSync(fixed)) return 'kept';
+  const [first, ...rest] = legacyAgentFiles(dir);
+  if (first === undefined) return 'none';
+  renameSync(first, fixed);
+  try {
+    rmdirSync(join(first, '..'));
+  } catch {
+    log.warn({ folder: join(first, '..') }, 'agent layout: the old agent folder is not empty and was left in place');
+  }
+  for (const extra of rest) log.warn({ path: extra }, 'agent layout: a second agent file is ignored; a box holds one agent');
+  log.info({ from: first, to: fixed }, 'agent layout: moved the agent file to its fixed place');
+  return 'moved';
+}
+
 function assertUnique(agents: AgentFile[], paths: string[]): void {
   const ids = new Map<string, string>();
   const keys = new Map<string, string>();
@@ -146,7 +175,7 @@ export function loadFileAgents(dir = agentsDir()): LoadedAgent[] {
   assertUnique(agents, paths);
   return agents.map((agent) => ({
     id: agent.id,
-    name: agent.name,
+    name: agent.name ?? agent.id,
     key: agent.key,
     accounts: agent.stations,
   }));

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

@@ -26,8 +26,8 @@ import { ensureMetroPlugin } from '../claude/plugin-install.js';
 import { unwatchSession, watchSession } from '../claude/session.js';
 import { tryClaudeSetup } from '../claude/setup.js';
 import { applyLocalOwner } from './local-owner.js';
-import { localOwner } from '../agents/file-admin.js';
-import { seedAgent } from '../agents/seed.js';
+import { ensureLocalAgent, localOwner } from '../agents/file-admin.js';
+import { migrateAgentLayout } from '../agents/files.js';
 import { ensureStationDeps } from '../stations/runtime-deps.js';
 import { localSessionApis } from '../routes/local-mode.js';
 import type { SessionApis } from '../routes/session-apis.js';
@@ -135,7 +135,8 @@ function startConnectors(): void {
 
 async function main(): Promise<void> {
   applyLocalOwner();
-  await seedAgent();
+  migrateAgentLayout();
+  log.info({ agent: await ensureLocalAgent() }, 'local daemon: agent');
   await materializeFrom(fileSource, { allowEmpty: true });
   supervisor.start();
   const metroMcp = await createMetroMcp();

package/runtime/node_modules/@metro-labs/daemon/src/routes/local-mode.ts

@@ -33,7 +33,6 @@ import {
   assertLocalOwner,
   LOCAL_PROJECT_ID,
   localAttachAccount,
-  localCreateAgent,
   localDeleteAgent,
   localDetachAccount,
   localSetAllowlist,
@@ -87,7 +86,6 @@ function agentApi(deps: LocalModeDeps): AgentApiDeps {
   return {
     attachSessions: attachSessions(deps),
     listAgents: localListAgents,
-    createAgent: localCreateAgent,
     deleteAgent: localDeleteAgent,
     resetKey: async (subject, id) => {
       const reset = await localResetAgentKey(subject, id);
@@ -158,10 +156,10 @@ function bundleApi(deps: LocalModeDeps): BundleApiDeps {
       const file = readLocalAgentFile(agentId);
       const bundle: AgentBundle = {
         version: 1,
-        agent: { id: file.id, name: file.name, key: file.key ?? '', stations: file.stations },
+        agent: { id: file.id, name: file.name ?? '', key: file.key ?? '', stations: file.stations },
         connectors: readLocalConnectors().map((c) => ({ id: c.id, name: c.name, url: c.url, transport: c.transport, config: { ...c.config } })),
       };
-      if (bundle.agent.key === '') throw new ApiError(`agent '${agent.name}' has no key to bundle`, 400);
+      if (bundle.agent.key === '') throw new ApiError(`agent ${agent.id} has no key to bundle`, 400);
       return bundle;
     },
     restore: async (subject, bundle, mode) => {

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.131"
+  "version": "0.1.0-beta.132"
 }

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

@@ -1,33 +0,0 @@
-import { existsSync, readFileSync, rmSync } from 'node:fs';
-import { join } from 'node:path';
-import { errMsg, log } from '@metro-labs/core/log';
-import { agentsDir } from './files.js';
-import { LOCAL_PROJECT_ID, localCreateAgent, localOwner, storedAgents } from './file-admin.js';
-
-export const SEED_FILE = '.agent';
-
-export type Seeded = 'created' | 'present' | 'none' | 'failed';
-
-export async function seedAgent(dir = agentsDir()): Promise<Seeded> {
-  const path = join(dir, SEED_FILE);
-  if (!existsSync(path)) return 'none';
-  const name = readFileSync(path, 'utf8').trim();
-  const owner = localOwner(dir);
-  if (owner === null) {
-    log.warn({ name }, 'agent seed: no owner yet, leaving the seed for the next boot');
-    return 'failed';
-  }
-  if (storedAgents(dir).length > 0) {
-    rmSync(path, { force: true });
-    return 'present';
-  }
-  try {
-    const made = await localCreateAgent(owner, LOCAL_PROJECT_ID, name, dir);
-    rmSync(path, { force: true });
-    log.info({ id: made.id, name: made.name }, 'agent seed: agent created from the launch name');
-    return 'created';
-  } catch (err) {
-    log.warn({ name, err: errMsg(err) }, 'agent seed: could not create the agent');
-    return 'failed';
-  }
-}