@stage-labs/metro 0.1.0-beta.144 → 0.1.0-beta.146

package/package.json

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

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

@@ -24,10 +24,6 @@ export interface OwnedAgent {
 
 export type DeletedAgent = OwnedAgent;
 
-export interface ResetAgentKey extends OwnedAgent {
-  key: string;
-}
-
 export function normalizeAgentName(raw: unknown): string {
   const name = typeof raw === 'string' ? raw.trim() : '';
   if (!AGENT_NAME_RE.test(name))

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

@@ -19,7 +19,6 @@ import {
 import {
   type AgentSummary,
   type DeletedAgent,
-  type ResetAgentKey,
 } from './admin.js';
 
 const PREFIX = '/api/agents';
@@ -30,10 +29,6 @@ export interface AgentApiDeps extends AccountApiDeps {
     subject: string,
     id: string,
   ) => Promise<DeletedAgent>;
-  resetKey: (
-    subject: string,
-    id: string,
-  ) => Promise<ResetAgentKey>;
   gatherAccounts: (allowed: Set<string>) => Promise<{
     accounts: Record<string, unknown[]>;
     unavailable: string[];
@@ -47,14 +42,12 @@ export interface AgentApiDeps extends AccountApiDeps {
 type Routable =
   | { kind: 'collection' }
   | { kind: 'agent'; id: string }
-  | { kind: 'key'; id: string }
   | { kind: 'accounts'; id: string; route: AccountRoute };
 
 type Target = Routable | { kind: 'unknown' } | null;
 
 function subTarget(id: string, rest: string[]): Target {
   if (rest.length === 0) return { kind: 'agent', id };
-  if (rest.length === 1 && rest[0] === 'key') return { kind: 'key', id };
   if (rest[0] !== 'accounts') return { kind: 'unknown' };
   const route = accountRoute(rest.slice(1));
   return route === null ? { kind: 'unknown' } : { kind: 'accounts', id, route };
@@ -145,26 +138,6 @@ async function handleList(
   sendJson(req, res, 200, { ...base, accounts, unavailable });
 }
 
-async function handleResetKey(
-  req: IncomingMessage,
-  res: ServerResponse,
-  deps: AgentApiDeps,
-  session: ApiSession,
-  id: string,
-): Promise<void> {
-  const reset = await deps.resetKey(session.subject, id);
-  log.info(
-    { agent: reset.name, id: reset.id, owner: session.subject },
-    'agent-api: reset agent key',
-  );
-  sendJson(req, res, 200, {
-    id: reset.id,
-    name: reset.name,
-    reset: true,
-    ...credentials(reset.key),
-  });
-}
-
 async function handleDelete(
   req: IncomingMessage,
   res: ServerResponse,
@@ -190,11 +163,10 @@ async function routeAgent(
   tgt: AgentTarget,
 ): Promise<void> {
   try {
-    if (tgt.kind !== 'collection') requireAdmin(session);
-    if (tgt.kind === 'key') await handleResetKey(req, res, deps, session, tgt.id);
-    else if (tgt.kind === 'agent')
+    if (tgt.kind === 'agent') {
+      requireAdmin(session);
       await handleDelete(req, res, deps, session, tgt.id);
-    else await handleList(req, res, deps, session);
+    } else await handleList(req, res, deps, session);
   } catch (err) {
     apiFailure(req, res, err);
   }
@@ -203,7 +175,6 @@ async function routeAgent(
 const ALLOWED: Record<AgentTarget['kind'], string[]> = {
   collection: ['GET'],
   agent: ['DELETE'],
-  key: ['POST'],
 };
 
 function methodAllowed(tgt: Routable, method: string | undefined): boolean {

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

@@ -4,14 +4,13 @@ import { ApiError } from '@metro-labs/http/api-error';
 import { isOrganizationId } from '@metro-labs/http/workos-token';
 import { ensureSecureDir, writeSecure } from '@metro-labs/core/secure-fs';
 import {
-  AgentAdminError,
   newApiKey,
+  AgentAdminError,
   normalizeAgentName,
   type AgentSummary,
   type CreatedAgent,
   type DeletedAgent,
   type OwnedAgent,
-  type ResetAgentKey,
 } from './admin.js';
 import type { AccountRef } from './account-attach.js';
 import {
@@ -24,7 +23,7 @@ import {
   type AgentFile,
 } from './files.js';
 import { newId } from '@metro-labs/core/ids';
-import { registerKey, rotateAgentKey, unregisterAgentKey } from './keys.js';
+import { registerKey, unregisterAgentKey } from './keys.js';
 import { MOVABLE_STATIONS, type LoadedAgent } from '../stations/materialize.js';
 import type { StationName } from '@metro-labs/core/station-names';
 import { normalizeAddress } from '@metro-labs/core/address';
@@ -144,19 +143,6 @@ export async function ensureLocalAgent(dir = agentsDir()): Promise<Ensured> {
   return 'created';
 }
 
-export async function localResetAgentKey(
-  subject: string,
-  id: string,
-  dir = agentsDir(),
-): Promise<ResetAgentKey> {
-  const stored = ownedOrThrow(subject, id, dir);
-  const key = newApiKey();
-  stored.file.key = key;
-  save(stored);
-  rotateAgentKey(id, key);
-  return Promise.resolve({ id, name: stored.file.name, key });
-}
-
 export async function localDeleteAgent(
   subject: string,
   id: string,

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

@@ -30,11 +30,6 @@ export function unregisterAgentKey(agentId: string): void {
     if (id === agentId) agentIdByKeyHash.delete(hash);
 }
 
-export function rotateAgentKey(agentId: string, key: string | null): void {
-  unregisterAgentKey(agentId);
-  if (key !== null) registerKey(key, agentId);
-}
-
 export function agentIdForKey(token: string): string | undefined {
   if (token === '') return undefined;
   return agentIdByKeyHash.get(digest(token));

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

@@ -23,7 +23,7 @@ import { agentsDir, fileSource } from '../agents/files.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 { unwatchSession, watchSession } from '../claude/session.js';
 import { tryClaudeSetup } from '../claude/setup.js';
 import { applyLocalOwner } from './local-owner.js';
 import { installBearerSessions } from '../routes/bearer.js';
@@ -34,7 +34,6 @@ import { localSessionApis } from '../routes/local-mode.js';
 import type { SessionApis } from '../routes/session-apis.js';
 import {
   agentLiveness,
-  closeAgentSession,
   createMetroMcp,
 } from '../mcp/index.js';
 import { metroCall } from '../mcp/ctx.js';
@@ -116,12 +115,6 @@ function sessionApis(): SessionApis {
         exitCode = HOLD_EXIT;
         onShutdown();
       },
-      closeAgentSession,
-      restartClaudeSession: () => {
-        if (!sessionRunning()) return false;
-        stopSession();
-        return true;
-      },
       gatherAccounts: gatherAccountsForAgents,
       capabilities: accountStationCapabilities,
       liveness: agentLiveness,

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

@@ -9,7 +9,6 @@ import {
   deleteClaudeSkill,
   listClaudeSkills,
   readClaudeSkill,
-  skillHomes,
   writeClaudeSkill,
 } from './skills.js';
 import {
@@ -93,10 +92,7 @@ const COLLECTIONS: Record<string, Handler> = {
   sessions: (query, dir) => ({ sessions: listClaudeSessions(projectOf(query), dir) }),
   memory: (query, dir) => listMemory(projectOf(query), dir),
   settings: (_query, dir) => ({ files: listClaudeSettings(dir) }),
-  skills: (_query, dir) => ({
-    skills: listClaudeSkills(dir),
-    places: skillHomes(dir).map((home) => ({ id: home.prefix, scope: home.scope, where: home.where })),
-  }),
+  skills: (_query, dir) => ({ skills: listClaudeSkills(dir) }),
 };
 
 const ITEMS: Record<string, Handler> = {
@@ -143,8 +139,7 @@ async function created(req: IncomingMessage, path: string, dir: string): Promise
   if (rest.length !== 1 || rest[0] !== 'skills') throw new ApiError('method not allowed', 405);
   const body = await readJsonBody(req, BODY_MAX);
   if (!isRecord(body) || typeof body.name !== 'string') throw new ApiError('name is required', 400);
-  const scope = typeof body.scope === 'string' ? body.scope : undefined;
-  return createClaudeSkill(body.name, scope, typeof body.text === 'string' ? body.text : undefined, dir);
+  return createClaudeSkill(body.name, typeof body.text === 'string' ? body.text : undefined, dir);
 }
 
 const ADMIN_ONLY = /^\/(login|session|version|setup)(\/|$)/;

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

@@ -1,24 +1,19 @@
 import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from 'node:fs';
 import { basename, dirname, join } from 'node:path';
 import { ApiError } from '@metro-labs/http/api-error';
-import { claudeDir, listClaudeProjects } from './files.js';
+import { claudeDir } from './files.js';
 
 export const SKILL_MAX = 256 * 1024;
 export const SKILL_NAME_RE = /^[a-z0-9][a-z0-9-]{0,63}$/;
-const USER_SCOPE = 'user';
 const FILE = 'SKILL.md';
 const DEFAULT_MODE = 0o644;
 const SUMMARY_MAX = 300;
 
-export type SkillScope = 'user' | 'project';
-
 export interface ClaudeSkill {
   id: string;
   name: string;
   title: string;
   description: string;
-  scope: SkillScope;
-  where: string;
   path: string;
   editable: boolean;
   updatedAt: string | null;
@@ -33,55 +28,32 @@ const frontmatterField = (text: string, field: string): string => {
   return '';
 };
 
-function entryOf(id: string, name: string, scope: SkillScope, where: string, path: string): ClaudeSkill {
+function entryOf(name: string, path: string): ClaudeSkill {
   const stat = statSync(path);
   const editable = stat.size <= SKILL_MAX;
   const text = editable ? readFileSync(path, 'utf8') : '';
   return {
-    id,
+    id: `user:${name}`,
     name,
     title: frontmatterField(text, 'name') || name,
     description: frontmatterField(text, 'description'),
-    scope,
-    where,
     path,
     editable,
     updatedAt: stat.mtime.toISOString(),
   };
 }
 
-function skillsIn(root: string, prefix: string, scope: SkillScope, where: string): ClaudeSkill[] {
+export const userSkillsRoot = (dir: string): string => join(dir, 'skills');
+
+export function listClaudeSkills(dir = claudeDir()): ClaudeSkill[] {
+  const root = userSkillsRoot(dir);
   if (!existsSync(root)) return [];
   const out: ClaudeSkill[] = [];
   for (const entry of readdirSync(root, { withFileTypes: true })) {
     if (!entry.isDirectory() || !SKILL_NAME_RE.test(entry.name)) continue;
     const path = join(root, entry.name, FILE);
-    if (existsSync(path)) out.push(entryOf(`${prefix}:${entry.name}`, entry.name, scope, where, path));
-  }
-  return out;
-}
-
-export const userSkillsRoot = (dir: string): string => join(dir, 'skills');
-
-export interface SkillHome {
-  prefix: string;
-  scope: SkillScope;
-  where: string;
-  root: string;
-}
-
-export function skillHomes(dir = claudeDir()): SkillHome[] {
-  const homes: SkillHome[] = [{ prefix: USER_SCOPE, scope: USER_SCOPE, where: 'This machine', root: userSkillsRoot(dir) }];
-  for (const project of listClaudeProjects(dir)) {
-    const cwd = project.cwd;
-    if (cwd === null || !existsSync(cwd)) continue;
-    homes.push({ prefix: project.id, scope: 'project', where: cwd, root: join(cwd, '.claude', 'skills') });
+    if (existsSync(path)) out.push(entryOf(entry.name, path));
   }
-  return homes;
-}
-
-export function listClaudeSkills(dir = claudeDir()): ClaudeSkill[] {
-  const out = skillHomes(dir).flatMap((home) => skillsIn(home.root, home.prefix, home.scope, home.where));
   return out.sort((a, b) => (b.updatedAt ?? '').localeCompare(a.updatedAt ?? '') || a.name.localeCompare(b.name));
 }
 
@@ -120,29 +92,21 @@ export function writeClaudeSkill(
   if (seenAt !== undefined && seenAt !== skill.updatedAt)
     throw new ApiError('that skill changed on disk since you opened it; reload it before saving', 409);
   writeAtomic(skill.path, text);
-  return entryOf(skill.id, skill.name, skill.scope, skill.where, skill.path);
+  return entryOf(skill.name, skill.path);
 }
 
 export const skillTemplate = (name: string): string =>
   ['---', `name: ${name}`, 'description: what this skill does, and when Claude should reach for it', '---', '', `# ${name}`, '', 'Write the instructions here.', ''].join('\n');
 
-export function createClaudeSkill(
-  name: string,
-  scope: string | undefined,
-  text: string | undefined,
-  dir = claudeDir(),
-): ClaudeSkill {
+export function createClaudeSkill(name: string, text: string | undefined, dir = claudeDir()): ClaudeSkill {
   if (typeof name !== 'string' || !SKILL_NAME_RE.test(name))
     throw new ApiError('a skill name is lowercase letters, digits and dashes, up to 64 characters', 400);
-  const prefix = scope === undefined || scope === '' ? USER_SCOPE : scope;
-  const home = skillHomes(dir).find((h) => h.prefix === prefix);
-  if (home === undefined) throw new ApiError('no such place to keep a skill', 404);
-  const path = join(home.root, name, FILE);
+  const path = join(userSkillsRoot(dir), name, FILE);
   if (existsSync(path)) throw new ApiError('a skill by that name already lives there', 409);
   const body = text === undefined || text.trim() === '' ? skillTemplate(name) : text;
   assertText(body);
   writeAtomic(path, body);
-  return entryOf(`${home.prefix}:${name}`, name, home.scope, home.where, path);
+  return entryOf(name, path);
 }
 
 export function deleteClaudeSkill(id: string, dir = claudeDir()): string {

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

@@ -138,11 +138,6 @@ export function agentLiveness(): Map<string, AgentLiveness> {
   return activeRegistry?.liveness() ?? new Map<string, AgentLiveness>();
 }
 
-export async function closeAgentSession(agentId: string): Promise<boolean> {
-  const scopeKey = sessionScopeKey({ kind: 'agent', agentId });
-  return (await activeRegistry?.closeScope(scopeKey)) ?? false;
-}
-
 export async function createMetroMcp(): Promise<{
   httpHandler: (req: IncomingMessage, res: ServerResponse) => Promise<void>;
   startInbound: () => void;

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

@@ -43,7 +43,6 @@ import {
   localListAgents,
   localOwnedAgentOrThrow,
   localOwner,
-  localResetAgentKey,
   readLocalAgentFile,
 } from '../agents/file-admin.js';
 import { readModelConfig } from '../gateway/model-config.js';
@@ -54,8 +53,6 @@ export interface LocalModeDeps {
   reloadAgents: () => Promise<void>;
   restart: () => void;
   stop: () => void;
-  closeAgentSession: (id: string) => Promise<boolean>;
-  restartClaudeSession: () => boolean;
   gatherAccounts: AgentApiDeps['gatherAccounts'];
   capabilities: AgentApiDeps['capabilities'];
   liveness: AgentApiDeps['liveness'];
@@ -89,13 +86,6 @@ function agentApi(deps: LocalModeDeps): AgentApiDeps {
     attachSessions: attachSessions(deps),
     listAgents: localListAgents,
     deleteAgent: localDeleteAgent,
-    resetKey: async (subject, id) => {
-      const reset = await localResetAgentKey(subject, id);
-      const closed = await deps.closeAgentSession(id);
-      const restarted = deps.restartClaudeSession();
-      log.info({ agent: reset.name, id, sessionClosed: closed, claudeRestarted: restarted }, 'local: key rotated');
-      return reset;
-    },
     gatherAccounts: deps.gatherAccounts,
     capabilities: deps.capabilities,
     attachable: ATTACHABLE.filter((s) => s !== 'webhook'),

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.144"
+  "version": "0.1.0-beta.146"
 }