@stage-labs/metro 0.1.0-beta.291 → 0.1.0-beta.293

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

@@ -1,6 +1,7 @@
 import { join } from 'node:path';
 import { closeSync, fsyncSync, openSync } from 'node:fs';
 import { publishLocalConnectors } from './publication.js';
+import { persistentServerKeys } from './server-keys.js';
 import { assertLocalMigrationEdit, localMigrationEnabled, localMigrationIdle, migrationSource, withLocalMigrationOperation } from './migration-guard.js';
 import type { FetchLike } from '@metro-labs/core/stations/oauth';
 import type { RelayTarget } from './relay-target.js';
@@ -116,6 +117,8 @@ export function readLocalConnectors(dir = agentsDir()): LocalConnectorRow[] {
 }
 
 function writeRows(dir: string, rows: LocalConnectorRow[]): void {
+  persistentServerKeys(readLocalConnectors(dir), dir);
+  persistentServerKeys(rows, dir);
   writeSecure(filePath(dir), `${JSON.stringify({ version: 1, connectors: rows }, null, 2)}\n`);
   if (dir !== agentsDir()) return;
   publishLocalConnectors(rows);
@@ -130,7 +133,7 @@ function rowOrThrow(id: string, dir: string): LocalConnectorRow {
 }
 
 function replace(dir: string, row: LocalConnectorRow, refresh = false): Connector {
-  if (!refresh) assertLocalMigrationEdit(row.id, row.name, dir);
+  if (!refresh) assertLocalMigrationEdit(row.id, dir);
   writeRows(dir, readLocalConnectors(dir).map((r) => (r.id === row.id ? row : r)));
   return connectorFromRow(row);
 }
@@ -150,17 +153,17 @@ export function localImportConnectors(
   const fresh =
     mode === 'overwrite'
       ? rows
-      : rows.filter((row) => !current.some((r) => r.id === row.id || r.name === row.name));
+      : rows.filter((row) => !current.some((r) => r.id === row.id));
   const imported: LocalConnectorRow[] = fresh.map((row) => ({
     id: row.id,
     name: row.name,
     url: row.url,
     config: readConfig(row.config),
   }));
-  for (const row of imported) assertLocalMigrationEdit(row.id, row.name, dir);
+  for (const row of imported) assertLocalMigrationEdit(row.id, dir);
   const ids = new Set(imported.map((r) => r.id));
-  const names = new Set(imported.map((r) => r.name));
-  writeRows(dir, [...current.filter((r) => !ids.has(r.id) && !names.has(r.name)), ...imported]);
+  if (ids.size !== imported.length) throw new ConnectorError('The import contains duplicate connector IDs.', 400);
+  writeRows(dir, [...current.filter((r) => !ids.has(r.id)), ...imported]);
   return imported.length;
 }
 
@@ -172,14 +175,7 @@ export async function localGetConnector(id: string, dir = agentsDir()): Promise<
   return Promise.resolve(connectorFromRow(rowOrThrow(id, dir)));
 }
 
-function assertNameFree(name: string, exceptId: string | null, dir: string): void {
-  if (readLocalConnectors(dir).some((r) => r.id !== exceptId && r.name === name))
-    throw new ConnectorError(`a connector named '${name}' already exists on this daemon`, 409);
-}
-
 function insert(dir: string, name: string, url: URL, config: ConnectorConfig): Connector {
-  assertLocalMigrationEdit('', name, dir);
-  assertNameFree(name, null, dir);
   const row: LocalConnectorRow = { id: newId(), name, url: connectorUrlText(url), config };
   writeRows(dir, [...readLocalConnectors(dir), row]);
   return connectorFromRow(row);
@@ -193,7 +189,7 @@ export async function localCreateConnector(input: ConnectorInput, dir = agentsDi
   return withLocalMigrationOperation('', dir, async (operation) => {
     const verified = stamp(await verifyRemoteMcp(url, auth, operation.fetch));
     return insert(dir, name, url, { auth, createdAt: new Date().toISOString(), verified, oauth: await oauthCapable(url, auth, operation.fetch), client });
-  }, true, name);
+  }, true);
 }
 
 export async function localCreatePendingConnector(input: PendingConnectorInput, dir = agentsDir()): Promise<Connector> {
@@ -309,13 +305,12 @@ export async function loadConnectorPolicies(dir = agentsDir()): Promise<void> {
 export async function localRenameConnector(id: string, raw: string, dir = agentsDir()): Promise<Connector> {
   const name = connectorName(raw);
   const row = rowOrThrow(id, dir);
-  assertNameFree(name, id, dir);
   return Promise.resolve(replace(dir, { ...row, name }));
 }
 
 export async function localDeleteConnector(id: string, dir = agentsDir()): Promise<DeletedConnector> {
   const row = rowOrThrow(id, dir);
-  assertLocalMigrationEdit(id, row.name, dir);
+  assertLocalMigrationEdit(id, dir);
   writeRows(dir, readLocalConnectors(dir).filter((r) => r.id !== id));
   return Promise.resolve({ id: row.id, name: row.name });
 }
@@ -327,8 +322,10 @@ function refreshOnce(row: LocalConnectorRow, auth: OAuthAuth, dir: string): Prom
   const running = inflight.get(key);
   if (running !== undefined) return running;
   const job = withLocalMigrationOperation(row.id, dir, async (operation) => {
-    const fresh = await refreshOAuth(auth, parseConnectorUrl(row.url).toString(), operation.fetch);
+    const fresh = await refreshOAuth(auth, parseConnectorUrl(row.url).toString(), (input, init) => operation.dispatch(() => fetch(input, init), { refresh: true }));
     updateRow(dir, row.id, { auth: fresh }, true);
+    flushMigrationSource(dir);
+    operation.persistedRefresh();
     return fresh;
   }).finally(() => { inflight.delete(key); });
   inflight.set(key, job);
@@ -369,11 +366,7 @@ async function oauthTarget(row: LocalConnectorRow, auth: OAuthAuth, force: boole
   }
 }
 
-export async function localRelayTarget(
-  connectorId: string,
-  force: boolean,
-  dir = agentsDir(),
-): Promise<RelayTarget> {
+export async function localRelayTarget(connectorId: string, force: boolean, dir = agentsDir()): Promise<RelayTarget> {
   return withLocalMigrationOperation(connectorId, dir, async (operation) => {
     const row = readLocalConnectors(dir).find((r) => r.id === connectorId);
     if (row === undefined) return { kind: 'missing' };
@@ -385,11 +378,15 @@ export async function localRelayTarget(
   });
 }
 
-export function localRollbackMigrationSource(id: string, signOutOAuth: boolean, dir = agentsDir()): void {
-  if (migrationSource(id, dir)?.phase !== 'rollback' || !localMigrationIdle(id, dir)) throw new ConnectorError('The connector migration is not ready to roll back.', 409);
+export function localRollbackMigrationSource(id: string, signOutOAuth: boolean, dir = agentsDir(), discardUncertain = false): void {
+  if (!['rollback', 'recovering'].includes(migrationSource(id, dir)?.phase ?? '') || !localMigrationIdle(id, dir, discardUncertain && signOutOAuth)) throw new ConnectorError('The connector migration is not ready to roll back.', 409);
   const row = rowOrThrow(id, dir);
   if (signOutOAuth) replace(dir, signedOut(row), true);
-  if (signOutOAuth) for (const path of [filePath(dir), dir]) {
+  if (signOutOAuth) flushMigrationSource(dir);
+}
+
+export function flushMigrationSource(dir = agentsDir()): void {
+  for (const path of [filePath(dir), dir]) {
     const fd = openSync(path, 'r');
     try { fsyncSync(fd); } finally { closeSync(fd); }
   }

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

@@ -6,7 +6,7 @@ import { connectorAuth, connectorName } from '@metro-labs/http/connector-input';
 import { readConfig } from './config.js';
 import { parseConnectorUrl } from '@metro-labs/http/connector-url';
 import { normalizePolicy } from '../policy/policy.js';
-import { localImportConnectors, readLocalConnectors, type LocalConnectorRow } from './store.js';
+import { localImportConnectors, type LocalConnectorRow } from './store.js';
 
 export interface ConnectorCopyResult {
   sourceId: string | null;
@@ -28,7 +28,6 @@ function copyRow(raw: unknown): LocalConnectorRow {
 export function copyConnectorRows(value: unknown, dir?: string): ConnectorCopyResult[] {
   if (!isRecord(value) || value.version !== 1 || !Array.isArray(value.connectors) || value.connectors.length > 500)
     throw new ApiError('invalid connector transfer', 400);
-  const names = new Set(readLocalConnectors(dir).map((row) => row.name));
   const imported: LocalConnectorRow[] = [];
   const results: ConnectorCopyResult[] = value.connectors.map((raw: unknown) => {
     const sourceId = isRecord(raw) && typeof raw.id === 'string' ? parseId(raw.id) : null;
@@ -38,8 +37,6 @@ export function copyConnectorRows(value: unknown, dir?: string): ConnectorCopyRe
     } catch {
       return { sourceId, status: 'invalid' };
     }
-    if (names.has(row.name)) return { sourceId, status: 'skipped' };
-    names.add(row.name);
     const id = newId();
     imported.push({ ...row, id });
     return { sourceId, id, status: 'copied' };

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

@@ -1,6 +1,6 @@
 import { str } from '@metro-labs/core/str';
 import { readPreview, shownValue } from '../approvals/preview.js';
-import { connectorToolOf } from '../connectors/gates.js';
+import { connectorGates, connectorToolOf } from '../connectors/gates.js';
 import { stationByName } from '../stations/registry.js';
 import { stationOfAccount } from './read-tool.js';
 
@@ -92,7 +92,11 @@ function bodyLines(params: PermissionParams): string[] {
   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) return connectorLines(connector.gate.name, connector.tool, input);
+  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];
 }
 

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

@@ -4,7 +4,6 @@ import { accountFromLine, knownAccounts } from '../agents/map.js';
 import { policyFor, storedPolicy, strictest, type Access, type PolicyTarget } from '../policy/policy.js';
 import { errResult } from './ctx.js';
 import { NEEDS_APPROVAL, takeGrant } from '../approvals/pending.js';
-import { connectorToolOf } from '../connectors/gates.js';
 import { profileScopeLine } from './profile-lookup.js';
 import { stationOfAccount } from './read-tool.js';
 import { stationForTool, toolGroupOf } from './tool-catalog.js';
@@ -56,7 +55,7 @@ export function channelDecision(name: string, a: Record<string, unknown>): Polic
   return verdict;
 }
 
-const isChannelTool = (name: string) => (tool: string): boolean => tool.endsWith(`__${name}`) && connectorToolOf(tool) === undefined;
+const isChannelTool = (name: string) => (tool: string): boolean => tool === `mcp__metro__${name}`;
 
 export function policyGate(name: string, a: Record<string, unknown>): ToolResult | undefined {
   const { access, target } = channelDecision(name, a);

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

@@ -22,7 +22,8 @@
     "./connector-oauth": "./src/connector-oauth.ts",
     "./connector-input": "./src/connector-input.ts",
     "./connector-delivery": "./src/connector-delivery.ts",
-    "./connector-migration": "./src/connector-migration.ts"
+    "./connector-migration": "./src/connector-migration.ts",
+    "./connector-grant": "./src/connector-grant.ts"
   },
   "scripts": {
     "build": "tsc",

package/runtime/node_modules/@metro-labs/http/src/connector-grant.ts

@@ -0,0 +1,59 @@
+import { deliveryRecord } from './connector-delivery-validation.js';
+import type { OAuthAuth } from './connector-mcp.js';
+import { boundOAuthResource, parsePublicConnectorUrl } from './connector-public-url.js';
+
+export interface PortableGrant extends OAuthAuth {
+  resource: string;
+  tokenEndpointAuthMethod: 'none' | 'client_secret_post';
+}
+
+const invalid = (): never => { throw new Error('This OAuth grant cannot be transferred. Its client authentication or provider binding is unsupported. Sign in separately.'); };
+
+function text(raw: unknown, max = 16384): string {
+  if (typeof raw !== 'string' || raw.length === 0 || raw.length > max || /[^\x21-\x7e]/.test(raw)) return invalid();
+  return raw;
+}
+
+function endpoint(raw: unknown): string {
+  const value = text(raw, 2048);
+  parsePublicConnectorUrl(value);
+  return value;
+}
+
+export function grantResource(target: string, raw: unknown): string {
+  const transport = parsePublicConnectorUrl(target);
+  const resource = parsePublicConnectorUrl(raw);
+  if (resource.toString() === transport.toString() && typeof raw === 'string') return raw;
+  return boundOAuthResource(target, raw);
+}
+
+function binding(value: Record<string, unknown>): Pick<PortableGrant, 'clientId' | 'clientSecret' | 'tokenEndpointAuthMethod'> {
+  const clientSecret = value.clientSecret === undefined ? undefined : text(value.clientSecret);
+  const method = value.tokenEndpointAuthMethod ?? (clientSecret === undefined ? 'none' : 'client_secret_post');
+  if (method !== 'none' && method !== 'client_secret_post') return invalid();
+  if ((method === 'client_secret_post') !== (clientSecret !== undefined)) return invalid();
+  return { clientId: text(value.clientId), tokenEndpointAuthMethod: method, ...(clientSecret === undefined ? {} : { clientSecret }) };
+}
+
+function expiry(raw: unknown): Pick<PortableGrant, 'expiresAt'> {
+  if (raw === undefined) return {};
+  if (typeof raw !== 'number' || !Number.isSafeInteger(raw) || raw < 0) return invalid();
+  return { expiresAt: raw };
+}
+
+function scopeOf(raw: unknown): Pick<PortableGrant, 'scope'> {
+  if (raw === undefined) return {};
+  if (typeof raw !== 'string' || raw.length > 16384 || /[^\x20-\x7e]/.test(raw)) return invalid();
+  return { scope: raw };
+}
+
+export function portableGrant(raw: unknown, target: string): PortableGrant {
+  const value = deliveryRecord(raw, ['kind', 'accessToken', 'refreshToken', 'expiresAt', 'clientId', 'clientSecret', 'issuer', 'tokenEndpoint', 'scope', 'resource', 'tokenEndpointAuthMethod']);
+  if (value.kind !== 'oauth') return invalid();
+  return {
+    kind: 'oauth', accessToken: text(value.accessToken, 16377), issuer: endpoint(value.issuer), tokenEndpoint: endpoint(value.tokenEndpoint),
+    resource: grantResource(target, value.resource ?? parsePublicConnectorUrl(target).toString()),
+    ...binding(value), ...expiry(value.expiresAt), ...scopeOf(value.scope),
+    ...(value.refreshToken === undefined ? {} : { refreshToken: text(value.refreshToken) }),
+  };
+}

package/runtime/node_modules/@metro-labs/http/src/connector-mcp.ts

@@ -17,6 +17,8 @@ export interface OAuthAuth extends OAuthTokens {
   clientId: string;
   clientSecret?: string;
   scope?: string;
+  resource?: string;
+  tokenEndpointAuthMethod?: string;
 }
 
 export type ConnectorAuth =

package/runtime/node_modules/@metro-labs/http/src/connector-migration.ts

@@ -4,6 +4,7 @@ import { sealingKeyOf } from './agent-signature.js';
 import { deliveryBytes, deliveryRecord } from './connector-delivery-validation.js';
 import { connectorAuth, connectorClient, connectorName } from './connector-input.js';
 import type { OAuthClient } from './connector-oauth.js';
+import { portableGrant, type PortableGrant } from './connector-grant.js';
 import { connectorPolicyOf, type ConnectorPolicy } from './connector-policy.js';
 import { boundOAuthResource, parsePublicConnectorUrl } from './connector-public-url.js';
 import { openTransfer, sealTransfer, type SealedTransfer } from './transfer-crypto.js';
@@ -24,7 +25,7 @@ export interface MigrationContext {
 export interface MigrationPayload {
   name: string;
   url: string;
-  auth: { kind: 'none' } | { kind: 'header'; name: string; value: string } | { kind: 'oauth' };
+  auth: { kind: 'none' } | { kind: 'header'; name: string; value: string } | { kind: 'oauth'; grant?: PortableGrant };
   client: OAuthClient | null;
   oauthResource?: string;
   policy: ConnectorPolicy;
@@ -36,7 +37,8 @@ export interface MigrationView {
   sourceId: string;
   destinationId: string;
   phase: 'preparing' | 'prepared' | 'active' | 'rolled_back';
-  readiness: 'pending' | 'ready' | 'signin' | 'changed' | 'unavailable';
+  readiness: 'pending' | 'ready' | 'signin' | 'changed' | 'unavailable' | 'refresh_uncertain';
+  grantImported?: boolean;
   name: string | null;
   auth: 'none' | 'header' | 'oauth' | null;
   policy: ConnectorPolicy | null;
@@ -48,7 +50,7 @@ export interface MigrationResponse {
   receiving?: { publicKey: string; context: MigrationContext };
 }
 
-export type MigrationRequest = { action: 'begin' | 'status' | 'activate' | 'rollback'; operationId: string; sourceId: string } | { action: 'prepare'; operationId: string; sourceId: string; sealed: unknown };
+export type MigrationRequest = { action: 'begin' | 'status' | 'activate' | 'rollback'; operationId: string; sourceId: string } | { action: 'prepare' | 'handover'; operationId: string; sourceId: string; sealed: unknown };
 
 const invalid = (): Error => new Error('Invalid connector migration.');
 const idOf = (value: unknown): string => {
@@ -61,7 +63,7 @@ export function migrationRequestOf(raw: unknown): MigrationRequest {
   const value = deliveryRecord(raw, ['action', 'operationId', 'sourceId', 'sealed']);
   const operationId = idOf(value.operationId);
   const sourceId = idOf(value.sourceId);
-  if (value.action === 'prepare' && Object.hasOwn(value, 'sealed')) return { action: 'prepare', operationId, sourceId, sealed: value.sealed };
+  if ((value.action === 'prepare' || value.action === 'handover') && Object.hasOwn(value, 'sealed')) return { action: value.action, operationId, sourceId, sealed: value.sealed };
   if (Object.hasOwn(value, 'sealed')) throw invalid();
   if (value.action !== 'begin' && value.action !== 'status' && value.action !== 'activate' && value.action !== 'rollback') throw invalid();
   return { action: value.action, operationId, sourceId };
@@ -79,15 +81,19 @@ function contextBytes(context: MigrationContext): Buffer {
   return Buffer.from(JSON.stringify(['metro-connector-migration/v1', value.owner, value.agent, value.keyId, value.operationId, value.sourceId, value.destinationId]));
 }
 
-function authOf(raw: unknown): MigrationPayload['auth'] {
-  const value = deliveryRecord(raw, ['kind', 'name', 'value']);
-  if (value.kind === 'header') {
-    const auth = connectorAuth(value.name, value.value);
-    if (auth.kind !== 'header' || auth.name !== value.name || auth.value !== value.value || ['__proto__', 'constructor', 'prototype'].includes(auth.name)) throw invalid();
-    return auth;
-  }
+function headerOf(value: Record<string, unknown>): MigrationPayload['auth'] {
+  const auth = connectorAuth(value.name, value.value);
+  if (auth.kind !== 'header' || auth.name !== value.name || auth.value !== value.value || ['__proto__', 'constructor', 'prototype'].includes(auth.name)) throw invalid();
+  return auth;
+}
+
+function authOf(raw: unknown, target: string): MigrationPayload['auth'] {
+  const value = deliveryRecord(raw, ['kind', 'name', 'value', 'grant']);
+  if (value.kind !== 'oauth' && Object.hasOwn(value, 'grant')) throw invalid();
+  if (value.kind === 'header') return headerOf(value);
   if ((value.kind !== 'none' && value.kind !== 'oauth') || Object.hasOwn(value, 'name') || Object.hasOwn(value, 'value')) throw invalid();
-  return { kind: value.kind };
+  if (value.kind === 'none' || value.grant === undefined) return { kind: value.kind };
+  return { kind: 'oauth', grant: portableGrant(value.grant, target) };
 }
 
 function clientOf(raw: unknown): OAuthClient | null {
@@ -109,7 +115,7 @@ export function migrationPayloadOf(raw: unknown): MigrationPayload {
   if (typeof value.name !== 'string' || connectorName(value.name) !== value.name || typeof value.url !== 'string' || typeof value.sourceStamp !== 'string') throw invalid();
   parsePublicConnectorUrl(value.url);
   deliveryBytes(value.sourceStamp, 32);
-  const auth = authOf(value.auth);
+  const auth = authOf(value.auth, value.url);
   const client = migrationClient(auth, value);
   const payload = { name: value.name, url: value.url, auth, client, ...(Object.hasOwn(value, 'oauthResource') ? { oauthResource: boundOAuthResource(value.url, value.oauthResource) } : {}), policy: connectorPolicyOf(value.policy), sourceStamp: value.sourceStamp };
   if (Buffer.byteLength(JSON.stringify(payload)) > PAYLOAD_MAX) throw invalid();
@@ -122,7 +128,7 @@ function phaseOf(value: unknown): MigrationView['phase'] {
 }
 
 function readinessOf(value: unknown): MigrationView['readiness'] {
-  if (value !== 'pending' && value !== 'ready' && value !== 'signin' && value !== 'changed' && value !== 'unavailable') throw invalid();
+  if (value !== 'pending' && value !== 'ready' && value !== 'signin' && value !== 'changed' && value !== 'unavailable' && value !== 'refresh_uncertain') throw invalid();
   return value;
 }
 
@@ -145,8 +151,9 @@ function nullableStamp(value: unknown): string | null {
 }
 
 function viewOf(raw: unknown): MigrationView {
-  const view = deliveryRecord(raw, ['operationId', 'sourceId', 'destinationId', 'phase', 'readiness', 'name', 'auth', 'policy', 'sourceStamp']);
-  return { operationId: idOf(view.operationId), sourceId: idOf(view.sourceId), destinationId: idOf(view.destinationId), phase: phaseOf(view.phase), readiness: readinessOf(view.readiness), name: nullableName(view.name), auth: authKindOf(view.auth), policy: view.policy === null ? null : connectorPolicyOf(view.policy), sourceStamp: nullableStamp(view.sourceStamp) };
+  const view = deliveryRecord(raw, ['operationId', 'sourceId', 'destinationId', 'phase', 'readiness', 'name', 'auth', 'policy', 'sourceStamp', 'grantImported']);
+  if (view.grantImported !== undefined && typeof view.grantImported !== 'boolean') throw invalid();
+  return { ...(view.grantImported === undefined ? {} : { grantImported: view.grantImported }), operationId: idOf(view.operationId), sourceId: idOf(view.sourceId), destinationId: idOf(view.destinationId), phase: phaseOf(view.phase), readiness: readinessOf(view.readiness), name: nullableName(view.name), auth: authKindOf(view.auth), policy: view.policy === null ? null : connectorPolicyOf(view.policy), sourceStamp: nullableStamp(view.sourceStamp) };
 }
 
 export function migrationResponseOf(raw: unknown): MigrationResponse {

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.291"
+  "version": "0.1.0-beta.293"
 }

package/runtime/sdk-runner/runner.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.0-beta.291",
+  "version": "0.1.0-beta.293",
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "0.3.287",
     "@modelcontextprotocol/sdk": "^1.29.0",