@stage-labs/metro 0.1.0-beta.143 → 0.1.0-beta.145

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stage-labs/metro",
-  "version": "0.1.0-beta.143",
+  "version": "0.1.0-beta.145",
   "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.143",
+  "version": "0.1.0-beta.145",
   "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/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/connectors/relay.ts

@@ -9,6 +9,7 @@ import { errMsg, log } from '@metro-labs/core/log';
 export interface RelayApiDeps {
   target: (connectorId: string, force: boolean) => Promise<RelayTarget>;
   identify: (req: IncomingMessage) => AgentIdentity | null;
+  signedOut: (connectorId: string) => void;
 }
 
 const ID_PATH_RE = /^\/relay\/([A-Za-z0-9][A-Za-z0-9_-]{10})$/;
@@ -242,6 +243,7 @@ async function relayExchange(
   }
   if (out.kind === 'signin') {
     noteHealth(connectorId, false, 'the sign-in has expired, connect it again');
+    deps.signedOut(connectorId);
     signinAnswer(res, connectorId);
     return;
   }

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

@@ -201,10 +201,19 @@ export async function localReconnectConnector(
   return replace(dir, { ...row, config: { ...row.config, auth, verified, oauth: true } });
 }
 
+const signedOut = (row: LocalConnectorRow): LocalConnectorRow => ({ ...row, config: { ...row.config, auth: { kind: 'none' }, oauth: true } });
+
 export async function localDisconnectConnector(subject: string, id: string, dir = agentsDir()): Promise<Connector> {
   const row = rowOrThrow(subject, id, dir);
   if (row.config.auth.kind !== 'oauth') throw new ConnectorError('that connector is not signed in', 400);
-  return Promise.resolve(replace(dir, { ...row, config: { ...row.config, auth: { kind: 'none' }, oauth: true } }));
+  return Promise.resolve(replace(dir, signedOut(row)));
+}
+
+export function localMarkSignedOut(id: string, dir = agentsDir()): void {
+  const row = readLocalConnectors(dir).find((r) => r.id === id);
+  if (row?.config.auth.kind !== 'oauth') return;
+  log.info({ id, name: row.name }, 'local relay: the vendor refused the token after a refresh; the connector is signed out');
+  replace(dir, signedOut(row));
 }
 
 async function freshAuth(auth: ConnectorAuth, resource: string): Promise<ConnectorAuth> {

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

@@ -27,6 +27,7 @@ import {
   localRelayTarget,
   localRenameConnector,
   localVerifyConnector,
+  localMarkSignedOut,
   localConnectorTools,
 } from '../connectors/store.js';
 import {
@@ -142,6 +143,9 @@ const relayApi: RelayApiDeps = {
     const who = authenticate(req);
     return who?.kind === 'agent' ? { subject: 'agent-key', agentId: who.agentId } : null;
   },
+  signedOut: (id) => {
+    localMarkSignedOut(id);
+  },
 };
 
 

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.143"
+  "version": "0.1.0-beta.145"
 }