@stage-labs/metro 0.1.0-beta.303 → 0.1.0-beta.305

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stage-labs/metro",
-  "version": "0.1.0-beta.303",
+  "version": "0.1.0-beta.305",
   "description": "The metro command line: run your agent on this machine, relaying its chat channels and connectors to Claude Code.",
   "license": "MIT",
   "repository": {

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

@@ -1,7 +1,7 @@
 {
   "name": "metro",
-  "version": "0.1.0-beta.303",
-  "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.",
+  "version": "0.1.0-beta.305",
+  "description": "Metro for Claude Code, installed by the metro daemon on this machine: one `mcp` server on mcp.metro.box for the organization connectors (find_tools, call_tool), the orchestrator-only guard on the main thread, and the standing rules loaded at each session start. No vendor credential ever reaches this machine.",
   "author": {
     "name": "Bonustrack",
     "url": "https://metro.box"
@@ -11,7 +11,6 @@
   "keywords": [
     "metro",
     "mcp",
-    "connectors",
-    "relay"
+    "connectors"
   ]
 }

package/runtime/marketplace/plugin/METRO.md

@@ -15,6 +15,8 @@ You are the main thread of a Claude Code session that is connected to chat throu
 
 **Calls that need the owner's approval run in a worker.** The owner can make a metro tool on a channel wait for approval. On the main thread such a call is refused, because waiting for the answer would stop the whole session: hand that exact call to a background worker (`run_in_background: true`) and keep answering. The worker waits for the owner's answer on its own.
 
+**Connectors through the `mcp` server.** Every connector the organization gave this agent sits behind the `mcp` server's two tools. Find what you need with `find_tools`: `select:notion.search,linear.create_issue` for exact names, keywords (`notion page update`) to rank, or `+slack send` to require `slack` in the tool name. Have a worker run them with `call_tool`, up to 10 independent calls in one go. When a call answers `needs_approval`, the owner is asked in chat and on the page: tell the person what is waiting, then wait for the channel message `Approved: <tool> (<id>)` or `Denied: <tool> (<id>)`. After an approval, have a worker call `call_tool` again with the same tool and arguments and `approval: "<id>"`.
+
 **Finish what was asked.** You work on your own. Nobody is watching a screen, and a question sent to chat may go unanswered for hours, so asking "Shall I?" about work already requested simply stops it. Anything reversible that follows from the request, do. Stop only for a destructive action or a genuine change of scope. Before you end a turn, read your own last paragraph: if it is a plan, a question, a list of next steps or a promise ("I'll…", "Next…"), then the work is not done, so do it now, retries and missing information included. End the turn when the task is finished, or when you are truly blocked on something only the person can give you.
 
 The exception is a person describing a problem, asking a question or thinking out loud. There the answer IS the deliverable: reply, and change nothing until they ask.

package/runtime/marketplace/plugin/bin/guard.mjs

@@ -23,6 +23,7 @@ const ORCHESTRATION = new Set([
 const IMAGE = /\.(png|jpe?g|gif|webp|bmp)$/i;
 const MCP = /^mcp__/;
 const METRO_MCP = /^mcp__metro__/;
+const FIND_TOOLS = 'mcp__plugin_metro_mcp__find_tools';
 const VOICE = process.env.METRO_SESSION === 'voice';
 
 function answer(decision, reason) {
@@ -54,7 +55,7 @@ function verdict(payload, input) {
       : 'A foreground subagent blinds the main thread: it cannot see or acknowledge inbound metro messages until the agent finishes. Re-issue the identical Agent call with run_in_background: true, then wait for the task notification.';
   if (VOICE) return null;
   if (ORCHESTRATION.has(tool)) return null;
-  if (METRO_MCP.test(tool)) return null;
+  if (METRO_MCP.test(tool) || tool === FIND_TOOLS) return null;
   if (MCP.test(tool))
     return `A connector call is work, not orchestration: ${tool} reads somebody's files, mail or records, and its answer can be long enough to crowd out the chat you are here to follow. Only metro's own tools run on this thread. Delegate it to a subagent with the Agent tool (run_in_background: true; the worker reaches every connector) and relay what it finds.`;
   if (tool === 'Read' && typeof input.file_path === 'string' && IMAGE.test(input.file_path)) return null;

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

@@ -4,27 +4,21 @@ import { homedir } from 'node:os';
 import { join } from 'node:path';
 
 const agentsDir = () => process.env.METRO_AGENTS_DIR || join(homedir(), '.metro', 'agents');
+const MCP_TOKEN = /^mcp_[A-Za-z0-9_-]{43}$/;
 
-function readAgent() {
-  const path = join(agentsDir(), 'agent.json');
-  let parsed;
+function readMcpToken() {
   try {
-    parsed = JSON.parse(readFileSync(path, 'utf8'));
+    const token = readFileSync(join(agentsDir(), 'mcp-token'), 'utf8').trim();
+    return MCP_TOKEN.test(token) ? token : null;
   } catch {
-    throw new Error(`no agent on this machine yet (${path})`);
+    return null;
   }
-  if (typeof parsed?.key !== 'string') throw new Error(`no agent key in ${path}`);
-  return parsed;
 }
 
-if (process.argv[2] !== 'headers') {
-  process.stderr.write('usage: metro-plugin.mjs headers\n');
+if (process.argv[2] !== 'mcp-headers') {
+  process.stderr.write('usage: metro-plugin.mjs mcp-headers\n');
   process.exit(1);
 }
 
-try {
-  process.stdout.write(`${JSON.stringify({ Authorization: `Bearer ${readAgent().key}` })}\n`);
-} catch (err) {
-  process.stderr.write(`metro: ${err.message}\n`);
-  process.stdout.write('{}\n');
-}
+const token = readMcpToken();
+if (token !== null) process.stdout.write(`${JSON.stringify({ Authorization: `Bearer ${token}` })}\n`);

package/runtime/marketplace/plugin/bin/policy.mjs

@@ -56,42 +56,11 @@ function decide(policy, name, group) {
   return access in RANK ? access : 'allow';
 }
 
-const normalized = (name) => name.replace(/[^a-zA-Z0-9_-]/g, '_');
-
-function connectorCall(snap, toolName) {
-  const entries = Object.entries(isRecord(snap.connectors) ? snap.connectors : {});
-  const legacy = entries.filter(([, entry]) => isRecord(entry) && !/^org-[A-Za-z0-9][A-Za-z0-9_-]{10}$/.test(text(entry.id)) && toolName.startsWith(`mcp__${normalized(`metro.box ${text(entry.name)}`)}__`));
-  if (legacy.length > 1) return { name: 'ambiguous connector name; use its instance server key', tool: toolName, group: 'write', policy: { write: 'deny' } };
-  for (const [server, entry] of entries) {
-    if (!isRecord(entry)) continue;
-    const name = text(entry.name);
-    const prefixes = [`mcp__plugin_metro_${server}__`, `mcp__${server}__`];
-    if (!/^org-[A-Za-z0-9][A-Za-z0-9_-]{10}$/.test(text(entry.id))) prefixes.push(`mcp__${normalized(`metro.box ${name}`)}__`);
-    const prefix = prefixes.find((p) => toolName.startsWith(p) && toolName.length > p.length);
-    if (prefix === undefined) continue;
-    const called = toolName.slice(prefix.length);
-    const tools = isRecord(entry.tools) ? entry.tools : {};
-    const policy = isRecord(entry.policy) ? entry.policy : {};
-    const known = [...Object.keys(tools), ...Object.keys(isRecord(policy.tools) ? policy.tools : {})];
-    const tool = known.find((k) => k === called) ?? known.find((k) => normalized(k) === called) ?? called;
-    return { name: name || server, tool, group: tools[tool] === 'read' ? 'read' : 'write', policy };
-  }
-  return null;
-}
-
-function connectorVerdict(snap, toolName) {
-  const call = connectorCall(snap, toolName);
-  if (call === null) return null;
-  const access = decide(call.policy, call.tool, call.group);
-  return access === 'allow' ? null : { access, tool: call.tool, owner: call.name, where: `${call.tool} on ${call.name}` };
-}
-
 export function policyVerdict(toolName, input) {
   const name = METRO_TOOL.exec(toolName)?.[1];
-  if (name === undefined && !toolName.startsWith('mcp__')) return null;
+  if (name === undefined) return null;
   const snap = readSnapshot();
   if (snap === null) return null;
-  if (name === undefined) return connectorVerdict(snap, toolName);
   const tools = isRecord(snap.tools) ? snap.tools : {};
   const group = tools[name] === 'read' ? 'read' : 'write';
   const accounts = isRecord(snap.accounts) ? snap.accounts : {};

package/runtime/node_modules/@metro-labs/core/package.json

@@ -6,7 +6,6 @@
   "type": "module",
   "exports": {
     "./log": "./src/log.ts",
-    "./connector-sync": "./src/connector-sync.ts",
     "./events": "./src/events.ts",
     "./is-record": "./src/is-record.ts",
     "./runner-activity": "./src/runner-activity.ts",

package/runtime/node_modules/@metro-labs/daemon/src/agent-user/view.ts

@@ -3,6 +3,8 @@ import { join } from 'node:path';
 import { errMsg, log } from '@metro-labs/core/log';
 import { isRecord } from '@metro-labs/core/is-record';
 import { agentsDir } from '../agents/files.js';
+import { mcpServerUrl } from '../mcp-server/config.js';
+import { MCP_TOKEN_FILE } from '../mcp-server/token.js';
 import { removeHome, writeHomeText } from './home-fs.js';
 import { closeMetroHome } from './metro-home.js';
 import { agentUser, agentViewDir, type AgentUser } from './user.js';
@@ -49,7 +51,8 @@ export function viewFiles(dir = agentsDir()): Map<string, string | null> {
     ['agent.json', agentFile(dir)],
     ['model.json', modelFile(dir)],
   ]);
-  for (const name of COPIED) files.set(name, existsSync(join(dir, name)) ? readText(join(dir, name)) : null);
+  const copied = mcpServerUrl() === null ? COPIED : [...COPIED, MCP_TOKEN_FILE];
+  for (const name of copied) files.set(name, existsSync(join(dir, name)) ? readText(join(dir, name)) : null);
   return files;
 }
 

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

@@ -26,7 +26,6 @@ export interface AgentApiDeps extends AccountApiDeps {
   toolGroups?: () => Record<string, { name: string; group: string }[]>;
   attachable?: string[];
   features?: string[];
-  connectorIds: (agentIds: string[]) => Promise<Map<string, string[]>>;
 }
 
 type Routable =
@@ -51,8 +50,8 @@ export function target(path: string): Target {
   return id === null ? { kind: 'unknown' } : subTarget(id, segments.slice(1));
 }
 
-function agentPayload(agent: AgentSummary, connectors: Map<string, string[]>): Record<string, unknown> {
-  return { id: agent.id, name: agent.name, connector_ids: connectors.get(agent.id) ?? [] };
+function agentPayload(agent: AgentSummary): Record<string, unknown> {
+  return { id: agent.id, name: agent.name };
 }
 
 function wantsAccounts(req: IncomingMessage): boolean {
@@ -66,9 +65,8 @@ async function handleList(
   deps: AgentApiDeps,
 ): Promise<void> {
   const list = await deps.listAgents();
-  const connectors = await deps.connectorIds(list.map((a) => a.id));
   const base = {
-    agents: list.map((a) => agentPayload(a, connectors)),
+    agents: list.map((a) => agentPayload(a)),
     capabilities: deps.capabilities(),
     features: deps.features ?? [],
     attachable: deps.attachable ?? ATTACHABLE,

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

@@ -17,6 +17,7 @@ export interface PendingPrompt {
   line: string | undefined;
   at: number;
   call?: CallSource;
+  origin?: 'mcp-server';
 }
 
 interface Held extends PendingPrompt {
@@ -93,6 +94,8 @@ export const pendingPrompts = (): PendingPrompt[] => [...held.values()].map(show
 
 export const promptLine = (requestId: string): string | undefined => held.get(requestId)?.line;
 
+export const isPromptHeld = (requestId: string): boolean => held.has(requestId);
+
 function chatNotice(via: AnsweredVia, behavior: Behavior): string | undefined {
   if (via === 'expiry') return 'Expired, denied.';
   if (via === 'page') return behavior === 'allow' ? 'Approved on the page.' : 'Denied on the page.';
@@ -116,8 +119,12 @@ export async function answerPrompt(
   const entry = held.get(requestId);
   if (entry === undefined) return undefined;
   held.delete(requestId);
-  if (behavior === 'allow' && via !== 'expiry') grant(entry);
-  log.info({ requestId, tool: entry.tool, behavior, by: who === via ? via : `${via} ${who}` }, 'approvals: a Claude Code permission prompt answered');
+  const server = entry.origin === 'mcp-server';
+  if (behavior === 'allow' && via !== 'expiry' && !server) grant(entry);
+  log.info(
+    { requestId, tool: entry.tool, behavior, by: who === via ? via : `${via} ${who}` },
+    server ? 'approvals: an mcp.metro.box approval answered' : 'approvals: a Claude Code permission prompt answered',
+  );
   await entry.send(behavior);
   await tellChat(entry, via, behavior);
   return shown(entry);
@@ -138,21 +145,15 @@ export function cancelPrompt(requestId: string, owner: object): void {
   });
 }
 
-export function revokeToolPrompts(matches: (tool: string) => boolean): void {
-  grants = grants.filter((entry) => !matches(entry.tool));
-  for (const entry of held.values())
-    if (matches(entry.tool)) cancelPrompt(entry.requestId, entry.owner);
-}
-
 export function revokeCallPrompts(route: CallRoute): void {
   grants = grants.filter((entry) => entry.call === undefined || !sameCall(entry.call.route, route));
   for (const entry of held.values())
     if (entry.call !== undefined && sameCall(entry.call.route, route)) cancelPrompt(entry.requestId, entry.owner);
 }
 
-export function settlePrompts(toolMatches: (tool: string) => boolean, args: Record<string, unknown>): void {
+function settlePrompts(toolMatches: (tool: string) => boolean, args: Record<string, unknown>): void {
   for (const [id, entry] of held)
-    if (toolMatches(entry.tool) && previewMatches(entry.preview, args)) {
+    if (entry.origin !== 'mcp-server' && toolMatches(entry.tool) && previewMatches(entry.preview, args)) {
       held.delete(id);
       log.info({ requestId: id, tool: entry.tool }, 'approvals: the call reached metro, so Claude Code already closed the prompt');
     }

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

@@ -21,10 +21,10 @@ import {
   trainEventToMetroEvent,
 } from '../routes/http.js';
 import { agentsDir, fileSource } from '../agents/files.js';
-import { connectorsReady, publishConnectors } from '../connectors/publication.js';
-import { adoptOrgServerKeys } from '../connectors/org-adopt.js';
-import { readAgentKey } from '../connectors/agent-key.js';
-import { stopOrgConnectorSync, watchOrgConnectorSync } from '../connectors/org-sync-watch.js';
+import { syncPluginServers } from '../connectors/plugin-sync.js';
+import { stopMcpServer, watchMcpServer } from '../mcp-server/link.js';
+import { setAnnouncedFile } from '../mcp-server/announced.js';
+import { holdServerApproval } from '../mcp/server-approvals.js';
 import { ensureMetroPlugin } from '../claude/plugin-install.js';
 import { runningAsRoot } from '../metro-user/privilege.js';
 import { provisionAgentUser } from '../agent-user/provision.js';
@@ -65,6 +65,7 @@ import { isCallEvent, leaveCallsForShutdown, onCallEvent, sweepLeftoverCalls } f
 installCrashGuard();
 acquireLock(join(STATE_DIR, '.tail-lock'));
 setOwnerLineFile(join(STATE_DIR, 'approval-line.json'));
+setAnnouncedFile(join(agentsDir(), 'mcp-approvals.json'));
 
 log.info({ self: userSelf() }, 'user identity');
 
@@ -140,7 +141,6 @@ function sessionApis(setLiveEvents: (on: boolean) => void, switchModel: (model:
 async function main(): Promise<void> {
   applyLocalOwner();
 installBearerSessions(agentsDir(), localOwner);
-  adoptOrgServerKeys();
   watchPolicySnapshot();
   log.info({ agent: await ensureLocalAgent() }, 'local daemon: agent');
   await materializeFrom(fileSource);
@@ -160,7 +160,12 @@ installBearerSessions(agentsDir(), localOwner);
   startPromptExpiry();
   startUploadReaper();
   startAttachReaper();
-  watchOrgConnectorSync({ owner: localOwner, key: readAgentKey });
+  watchMcpServer({
+    owner: localOwner,
+    hold: (approval, answer) => {
+      holdServerApproval(approval, answer, emit);
+    },
+  });
   startCloudWatchPublisher();
   watchFallbackUsage();
   announceLocalEndpoint();
@@ -192,7 +197,7 @@ async function startClaude(): Promise<void> {
   ensureMetroPlugin()
     .then((outcome) => {
       log.info({ outcome }, 'plugin: metro plugin for Claude Code');
-      if (outcome !== 'skipped') publishConnectors();
+      if (outcome !== 'skipped') syncPluginServers();
     })
     .catch((err: unknown) => {
       log.warn({ err: errMsg(err) }, 'plugin: could not ensure the Claude Code plugin');
@@ -200,7 +205,7 @@ async function startClaude(): Promise<void> {
   tryClaudeSetup();
   try { githubSkills().watch(); } catch { log.warn('github-skills: saved source could not be loaded'); }
   tryMemoryJob(memoryRoutine());
-  watchSession({ connectorsReady: () => connectorsReady() });
+  watchSession();
 }
 
 const SHUTDOWN_TIMEOUT_MS = 3_000;
@@ -212,7 +217,9 @@ async function shutdown(): Promise<void> {
   if (shuttingDown) return;
   shuttingDown = true;
   log.info('dispatcher shutting down');
-  stopOrgConnectorSync(true);
+  stopMcpServer().catch((err: unknown) => {
+    log.warn({ err: errMsg(err) }, 'mcp-server: could not stop the approval relay');
+  });
   const leaving = leaveCallsForShutdown();
   unwatchSession();
   tunnel?.stop();

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

@@ -7,6 +7,7 @@ import {
   type SavedMedia,
 } from './media-note.js';
 import { buildWebhookNote } from './webhook-note.js';
+import { isMetroNotice } from './notice.js';
 import { replyMeta } from './addressed.js';
 import { reactContent, reactionEmoji } from './react-note.js';
 import {
@@ -285,7 +286,9 @@ export class InboundRelay {
     capSet(this.allowedLines, ALLOWED_LINES_MAX);
   }
 
-  private droppedSender(from: string, line: string, verified: unknown): boolean {
+  private droppedSender(ev: Record<string, unknown>, from: string, line: string): boolean {
+    if (isMetroNotice(ev)) return false;
+    const verified = ev.senderVerified;
     if (
       from.startsWith('metro://claude') ||
       from === 'metro://user' ||
@@ -311,7 +314,7 @@ export class InboundRelay {
     if (!this.deps.getStations().has(station)) return null;
     const from = str(ev.from);
     const line = str(ev.line);
-    if (this.droppedSender(from, line, ev.senderVerified)) return null;
+    if (this.droppedSender(ev, from, line)) return null;
     const text = str(ev.text);
     if (!replay && this.isDuplicate(station, line, evType, str(ev.messageId))) {
       this.deps.log(
@@ -337,7 +340,7 @@ export class InboundRelay {
     if (await this.handlePermissionReply(ev, base)) return;
     await this.notify('notifications/claude/channel', {
       content:
-        base.evType === 'system'
+        base.evType === 'system' && !isMetroNotice(ev)
           ? buildWebhookNote(base.text, str(ev.lineName), ev.payload)
           : base.text,
       meta: {

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

@@ -0,0 +1,22 @@
+import { mintId, type MetroEvent } from '@metro-labs/core/events';
+import { isRecord } from '@metro-labs/core/is-record';
+import { asLine, Line } from '@metro-labs/core/lines';
+
+const NOTICE_FROM = 'metro://metro';
+const NOTICE_SOURCE = 'metro';
+
+export function metroNotice(line: string, text: string): MetroEvent {
+  return {
+    id: mintId(),
+    ts: new Date().toISOString(),
+    station: Line.station(line) ?? '',
+    line: asLine(line),
+    from: asLine(NOTICE_FROM),
+    to: asLine(line),
+    text,
+    event: { type: 'system', source: NOTICE_SOURCE },
+  };
+}
+
+export const isMetroNotice = (ev: Record<string, unknown>): boolean =>
+  ev.from === NOTICE_FROM && isRecord(ev.event) && ev.event.type === 'system' && ev.event.source === NOTICE_SOURCE;

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

@@ -49,7 +49,6 @@ export interface SessionDeps {
   now?: () => number;
   version?: string;
   prepare?: (runner: HarnessRunner) => Promise<void>;
-  connectorsReady?: () => boolean;
 }
 
 export interface SessionStatus {
@@ -317,10 +316,9 @@ function strike(now: number): boolean {
   return true;
 }
 
-export type Ensured = 'started' | 'restarted' | 'running' | 'blocked' | 'off' | 'paused' | 'waiting';
+export type Ensured = 'started' | 'restarted' | 'running' | 'blocked' | 'off' | 'paused';
 
 function holdsBack(deps: SessionDeps, now: number): Ensured | null {
-  if (deps.connectorsReady?.() === false) return 'waiting';
   if (now < memory.pausedUntil) return 'paused';
   if (sessionBlocked(deps) !== null) return 'blocked';
   return strike(now) ? 'paused' : null;

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

@@ -151,6 +151,8 @@ const PRIOR_METRO: ReadonlySet<string> = new Set([
   'e6b59eba825b4568dfa9ace5049fd9568a2e10d731719976ad2657084fd4e5f9',
   '5ce3f76d610aae91adc922d0edc6c8be1f27aa2fec4a5e3a6d6231a04fb9310b',
   'b910597d24f31fa479b130a2545f94dd23684d802d99e36b637fc57c818a33be',
+  'd3f7ed0f5175b9a7a77f06f6204ae0020369d0c8f6e2724196bb3c5822d4d8ba',
+  '587a1334f91a8b61541573cef16eaf44fbe63049a8d8b461fa9f5cc55bacbcb8',
 ]);
 const PRIOR_STAGE: ReadonlySet<string> = new Set([
   'dd7d30474765de3865ddc87c1cf3220161ded09502027cdff18597e5df0aab43',

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

@@ -18,7 +18,6 @@ export interface EnrollApiDeps {
   owner: () => string | null;
   dir?: () => string;
   api?: MetroApi;
-  invalidate?: () => void;
 }
 
 export interface Enrolled {
@@ -89,7 +88,6 @@ async function enroll(req: IncomingMessage, session: ApiSession, deps: EnrollApi
   if (enrolling.has(dir)) throw new ApiError('This agent is already enrolling. Wait for it to finish before trying again.', 409);
   enrolling.add(dir);
   try {
-    deps.invalidate?.();
     return await exchange(ticket, owner, dir, deps);
   } finally {
     enrolling.delete(dir);

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

@@ -4,59 +4,20 @@ import { agentMarketplaceDir, agentUser } from '../agent-user/user.js';
 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 { MCP_SERVER_KEY, mcpServerUrl } from '../mcp-server/config.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;
+const MCP_HELPER = 'node "${CLAUDE_PLUGIN_ROOT}/bin/metro-plugin.mjs" mcp-headers';
 
-export interface PluginRow {
-  id: string;
-  name: string;
-}
-
-export interface PluginServer {
+interface PluginServer {
   type: 'http';
   url: string;
   headersHelper: string;
 }
 
-export function serverKey(name: string): string {
-  const slug = name
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, '-')
-    .replace(/^-+|-+$/g, '')
-    .slice(0, SLUG_MAX)
-    .replace(/-+$/, '');
-  return slug === '' ? 'connector' : slug;
-}
-
-function availableKey(wanted: string, reserved: ReadonlySet<string>): string {
-  let key = wanted;
-  let suffix = 1;
-  while (reserved.has(key)) key = `${wanted}-${String(suffix++)}`;
-  return key;
-}
-
-export function serverKeysOf(rows: PluginRow[], saved?: ReadonlyMap<string, string>): Map<string, string> {
-  const keys = new Map(saved);
-  const reserved = new Set(keys.values());
-  for (const row of [...rows].sort((a, b) => a.id.localeCompare(b.id))) {
-    if (keys.has(row.id)) continue;
-    const key = availableKey(serverKey(row.name), reserved);
-    reserved.add(key);
-    keys.set(row.id, key);
-  }
-  return keys;
-}
-
-export function pluginServers(rows: PluginRow[], base: string, keys: ReadonlyMap<string, string> = serverKeysOf(rows)): Record<string, PluginServer> {
-  const out: Record<string, PluginServer> = {};
-  const visible = new Set(rows.map((row) => row.id));
-  for (const [id, key] of keys) if (visible.has(id)) out[key] = { type: 'http', url: `${base}/relay/${id}`, headersHelper: HELPER };
-  return out;
-}
+const pluginServers = (url: string | null): Record<string, PluginServer> =>
+  url === null ? {} : { [MCP_SERVER_KEY]: { type: 'http', url, headersHelper: MCP_HELPER } };
 
 const SEARCH_DEPTH = 5;
 
@@ -108,9 +69,8 @@ function writeIfChanged(path: string, text: string): boolean {
 
 export interface PluginSyncOptions {
   dir?: string;
-  base?: string;
   staged?: string | null;
-  keys?: ReadonlyMap<string, string>;
+  url?: string | null;
 }
 
 function filesFor(opts: PluginSyncOptions): string[] {
@@ -118,23 +78,23 @@ function filesFor(opts: PluginSyncOptions): string[] {
   return installedPluginFiles(opts.dir ?? claudeDir(), staged);
 }
 
-export function syncPluginServers(rows: PluginRow[], opts: PluginSyncOptions = {}): number {
+export function syncPluginServers(opts: PluginSyncOptions = {}): number {
   const files = filesFor(opts);
   if (files.length === 0) return 0;
-  const servers = pluginServers(rows, opts.base ?? loopbackBase(), opts.keys);
+  const servers = pluginServers(opts.url === undefined ? mcpServerUrl() : opts.url);
   const text = `${JSON.stringify(servers, null, 2)}\n`;
   let written = 0;
   for (const file of files) {
     try {
       if (writeIfChanged(file, text)) written += 1;
     } catch (err) {
-      log.warn({ file, err: errMsg(err) }, 'plugin: could not write the connector servers');
+      log.warn({ file, err: errMsg(err) }, 'plugin: could not write the MCP servers');
     }
   }
   if (written > 0)
     log.info(
-      { files: written, servers: Object.keys(servers).length },
-      'plugin: connector servers written; run /reload-plugins --force to pick them up in a running session',
+      { files: written, servers: Object.keys(servers) },
+      'plugin: MCP servers written; run /reload-plugins --force to pick them up in a running session',
     );
   return written;
 }

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

@@ -19,6 +19,7 @@ import { errMsg } from '@metro-labs/core/log';
 import { channelLog, type McpSession } from './session.js';
 import { SessionSlot } from './session-slot.js';
 import { connectCallBridge } from './call-bridge.js';
+import { connectServerApprovals } from './server-approvals.js';
 import { handleIncomingDiagnostic } from './diagnostics.js';
 
 const isInitialize = (b: unknown): boolean =>
@@ -120,6 +121,7 @@ export async function createMetroMcp(options: { liveEvents?: boolean } = {}): Pr
   const voiceSlot = new SessionSlot(false, 'voice');
   activeSlots = [slot, voiceSlot];
   connectCallBridge(() => slot.current);
+  connectServerApprovals(() => slot.current);
 
   const httpHandler = async (
     req: IncomingMessage,

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

@@ -1,6 +1,5 @@
 import { str } from '@metro-labs/core/str';
 import { readPreview, shownValue } from '../approvals/preview.js';
-import { connectorGates, connectorToolOf } from '../connectors/gates.js';
 import { stationByName } from '../stations/registry.js';
 import { stationOfAccount } from './read-tool.js';
 
@@ -75,15 +74,12 @@ function metroLines(tool: string, input: Record<string, unknown>): string[] {
 
 const ARGS_MAX = 8;
 
-function connectorLines(name: string, tool: string, input: Record<string, unknown> | undefined): string[] {
-  const lines = [`Approval needed: ${tool}`, `Connector: ${name}`];
+function argLines(input: Record<string, unknown> | undefined): string[] {
   const args = Object.entries(input ?? {}).flatMap(([key, value]) => {
     const text = argText(value);
     return text === undefined ? [] : [`${key}: ${shorten(text)}`];
   });
-  lines.push(...args.slice(0, ARGS_MAX));
-  if (args.length > ARGS_MAX) lines.push(`(${String(args.length - ARGS_MAX)} more)`);
-  return lines;
+  return args.length > ARGS_MAX ? [...args.slice(0, ARGS_MAX), `(${String(args.length - ARGS_MAX)} more)`] : args;
 }
 
 function bodyLines(params: PermissionParams): string[] {
@@ -91,18 +87,29 @@ function bodyLines(params: PermissionParams): string[] {
   const { input } = readPreview(params.input_preview);
   const raw = params.input_preview.trim() === '' ? [] : [shorten(params.input_preview, RAW_MAX)];
   if (metro !== undefined) return input === undefined ? [`Approval needed: ${metro}`, ...raw] : metroLines(metro, input);
-  const connector = connectorToolOf(params.tool_name);
-  if (connector !== undefined) {
-    const { gate, tool } = connector;
-    const duplicate = connectorGates().some((entry) => entry.id !== gate.id && entry.name === gate.name);
-    return connectorLines(duplicate ? `${gate.name} (${gate.id})` : gate.name, tool, input);
-  }
   return [`Claude wants to run ${params.tool_name}: ${shorten(params.description)}`, '', ...raw];
 }
 
-export function promptBody(params: PermissionParams): string {
-  const answer = `Reply "yes ${params.request_id}" or "no ${params.request_id}"`;
-  const body = bodyLines(params).join('\n');
+function withAnswer(requestId: string, lines: string[]): string {
+  const answer = `Reply "yes ${requestId}" or "no ${requestId}"`;
+  const body = lines.join('\n');
   const room = PROMPT_MAX - answer.length - 3;
   return `${body.length > room ? `${body.slice(0, room)}…` : body}\n\n${answer}`;
 }
+
+export function promptBody(params: PermissionParams): string {
+  return withAnswer(params.request_id, bodyLines(params));
+}
+
+export interface ServerPrompt {
+  requestId: string;
+  tool: string;
+  preview: string;
+}
+
+export function serverPromptBody(prompt: ServerPrompt): string {
+  const { input } = readPreview(prompt.preview);
+  const raw = prompt.preview.trim() === '' ? [] : [shorten(prompt.preview, RAW_MAX)];
+  const args = input === undefined ? raw : argLines(input);
+  return withAnswer(prompt.requestId, [`Approval needed: ${prompt.tool}`, ...args]);
+}