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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stage-labs/metro",
-  "version": "0.1.0-beta.291",
+  "version": "0.1.0-beta.293",
   "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,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.1.0-beta.291",
+  "version": "0.1.0-beta.293",
   "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/marketplace/plugin/bin/policy.mjs

@@ -59,7 +59,10 @@ function decide(policy, name, group) {
 const normalized = (name) => name.replace(/[^a-zA-Z0-9_-]/g, '_');
 
 function connectorCall(snap, toolName) {
-  for (const [server, entry] of Object.entries(isRecord(snap.connectors) ? snap.connectors : {})) {
+  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}__`];

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

@@ -44,6 +44,8 @@ function readOAuth(raw: Record<string, unknown>): ConnectorAuth {
     clientId,
     tokenEndpoint,
     issuer: stringOf(raw.issuer),
+    ...(typeof raw.resource === 'string' ? { resource: raw.resource } : {}),
+    ...(typeof raw.tokenEndpointAuthMethod === 'string' ? { tokenEndpointAuthMethod: raw.tokenEndpointAuthMethod } : {}),
     ...(refreshToken === '' ? {} : { refreshToken }),
     ...(clientSecret === '' ? {} : { clientSecret }),
     ...(scope === '' ? {} : { scope }),

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

@@ -20,7 +20,6 @@ export interface ConnectorGate {
 }
 
 let gates: ConnectorGate[] = [];
-let managed = new Set<string>();
 
 const normalized = (name: string): string => name.replace(/[^a-zA-Z0-9_-]/g, '_');
 
@@ -31,21 +30,21 @@ function approvalChanged(gate: ConnectorGate, tool: string, next: GateRow | unde
   return before !== after;
 }
 
-export function registerConnectors(rows: readonly GateRow[], managedIds: readonly string[] = [], keys: ReadonlyMap<string, string> = serverKeysOf([...rows])): void {
-  const nextManaged = new Set(managedIds);
-  revokeToolPrompts((tool) => {
-    const found = connectorToolOf(tool);
-    if (found === undefined || (!isOrgRelayId(found.gate.id) && !managed.has(found.gate.id) && !nextManaged.has(found.gate.id))) return false;
-    return approvalChanged(found.gate, found.tool, rows.find((row) => row.id === found.gate.id), keys);
-  });
-  managed = nextManaged;
-  gates = rows.map((row) => ({
+export function registerConnectors(rows: readonly GateRow[], keys: ReadonlyMap<string, string> = serverKeysOf([...rows])): void {
+  const next = rows.map((row) => ({
     id: row.id,
     name: row.name,
     server: keys.get(row.id) ?? '',
     policy: row.config.policy ?? {},
     tools: row.config.toolGroups ?? {},
   }));
+  revokeToolPrompts((tool) => {
+    const before = connectorToolOf(tool);
+    const after = connectorToolOf(tool, next);
+    if (before?.gate.id !== after?.gate.id) return true;
+    return before !== undefined && approvalChanged(before.gate, before.tool, rows.find((row) => row.id === before.gate.id), keys);
+  });
+  gates = next;
   const entries = rows.flatMap((row): [PolicyTarget, ToolPolicy][] =>
     row.config.policy === undefined ? [] : [[{ kind: 'connector', id: row.id }, row.config.policy]],
   );
@@ -63,7 +62,7 @@ const promptFor = (connectorId: string, tool: string) => (asked: string): boolea
 
 export function blockedReason(connectorId: string, tool: string, args: Record<string, unknown> = {}): string | null {
   const gate = gates.find((g) => g.id === connectorId);
-  if (gate === undefined) return null;
+  if (gate === undefined) return 'This connector is not available.';
   settlePrompts(promptFor(connectorId, tool), args);
   const access = policyFor({ kind: 'connector', id: connectorId }, { name: tool, group: toolGroupOf(gate, tool) });
   if (access === 'deny') return `Blocked by the owner's policy for ${gate.name} (${tool}).`;
@@ -92,19 +91,24 @@ export function requestConnectorBlocker(): () => BlockedReason {
   };
 }
 
-function prefixesOf(gate: ConnectorGate): string[] {
-  const prefixes = [`mcp__plugin_metro_${gate.server}__`, `mcp__${gate.server}__`];
-  return isOrgRelayId(gate.id) ? prefixes : [...prefixes, `mcp__${normalized(`metro.box ${gate.name}`)}__`];
+function resolvedTool(gate: ConnectorGate, called: string): { gate: ConnectorGate; tool: string } {
+  const known = [...Object.keys(gate.tools), ...Object.keys(gate.policy.tools ?? {})];
+  return { gate, tool: known.find((name) => name === called) ?? known.find((name) => normalized(name) === called) ?? called };
 }
 
-export function connectorToolOf(toolName: string): { gate: ConnectorGate; tool: string } | undefined {
+export function connectorToolOf(toolName: string, entries: readonly ConnectorGate[] = gates): { gate: ConnectorGate; tool: string } | undefined {
   if (toolName.startsWith('mcp__metro__')) return undefined;
-  for (const gate of gates)
-    for (const prefix of prefixesOf(gate))
-      if (toolName.startsWith(prefix) && toolName.length > prefix.length) {
-        const called = toolName.slice(prefix.length);
-        const known = [...Object.keys(gate.tools), ...Object.keys(gate.policy.tools ?? {})];
-        return { gate, tool: known.find((name) => name === called) ?? known.find((name) => normalized(name) === called) ?? called };
-      }
-  return undefined;
+  for (const gate of entries)
+    for (const prefix of [`mcp__plugin_metro_${gate.server}__`, `mcp__${gate.server}__`])
+      if (toolName.startsWith(prefix) && toolName.length > prefix.length) return resolvedTool(gate, toolName.slice(prefix.length));
+  return legacyToolOf(toolName, entries);
+}
+
+function legacyToolOf(toolName: string, entries: readonly ConnectorGate[]): { gate: ConnectorGate; tool: string } | undefined {
+  if (!toolName.startsWith('mcp__metro_box_')) return undefined;
+  const legacy = entries.filter((gate) => !isOrgRelayId(gate.id) && toolName.startsWith(`mcp__${normalized(`metro.box ${gate.name}`)}__`));
+  const gate = legacy.length === 1 ? legacy[0] : undefined;
+  if (gate === undefined) return undefined;
+  const called = toolName.slice(`mcp__${normalized(`metro.box ${gate.name}`)}__`.length);
+  return called === '' ? undefined : resolvedTool(gate, called);
 }

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

@@ -7,7 +7,7 @@ import { publicOAuthResource } from '@metro-labs/http/connector-public-url';
 import type { ConnectorMigrations, MigrationAction } from './migration-control.js';
 
 const PATH = '/api/connectors/migrations';
-const actions: readonly MigrationAction[] = ['prepare', 'reconcile', 'cutover', 'rollback', 'resolve'];
+const actions: readonly MigrationAction[] = ['move', 'prepare', 'reconcile', 'cutover', 'rollback', 'resolve'];
 export type MigrationApiDeps = Pick<ConnectorMigrations, 'status' | 'run'>;
 
 interface MigrationInput {

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

@@ -9,17 +9,19 @@ import { agentsDir } from '../agents/files.js';
 import { readAgentKey, type AgentKey } from './agent-key.js';
 import { agentCall, METRO_API, MetroApiRefusal, type MetroApi } from './metro-api.js';
 import { migrationSource } from './migration-preview.js';
-import { migrationPayload } from './migration-source.js';
+import { MigrationBlocked, migrationPayload } from './migration-source.js';
 import { localMigrationIdle } from './migration-guard.js';
-import { migrationUncertaintyReceipt, resolveMigrationUncertainty } from './migration-operations.js';
-import { localRollbackMigrationSource } from './store.js';
+import { migrationUncertaintyReceipt, migrationRefreshUncertain, migrationOperationsIdle, resolveMigrationUncertainty } from './migration-operations.js';
+import { flushMigrationSource, localRollbackMigrationSource } from './store.js';
 import { freshOrgConnectors, orgConnectorMigrationIdle, orgConnectorSyncStatus, refreshOrgConnectorRuntime } from './org-sync-watch.js';
 import { migrationRecord, migrationRecords, saveMigration, type MigrationRecord } from './migration-state.js';
 
-export type MigrationAction = 'prepare' | 'reconcile' | 'cutover' | 'rollback' | 'resolve';
+export type MigrationAction = 'move' | 'prepare' | 'reconcile' | 'cutover' | 'rollback' | 'resolve';
 interface Context { key: AgentKey; owner: string; agentId: string; scope: string }
 export interface MigrationView extends Pick<MigrationRecord, 'id' | 'sourceId' | 'name' | 'destinationId' | 'phase' | 'auth' | 'reason'> {
   uncertainty: string | null;
+  move: boolean;
+  grantImported: boolean;
 }
 export interface MigrationStatus {
   scope: string;
@@ -44,12 +46,23 @@ interface MigrationDeps {
 
 const conflict = (message: string): ApiError => new ApiError(message, 409);
 const uncertain = (): ApiError => new ApiError('The migration request was not confirmed. Refresh and reconcile this connector before trying another action; an interrupted request may already have reached Metro.', 503);
-const viewOf = ({ id, sourceId, name, destinationId, phase, auth, reason }: MigrationRecord, uncertainty: string | null): MigrationView => ({ id, sourceId, name, destinationId, phase, auth, reason, uncertainty });
-const reasons: Record<RemoteMigration['readiness'], string | null> = { pending: 'not_verified', ready: null, signin: 'sign_in', changed: 'destination_changed', unavailable: 'unavailable' };
+const viewOf = ({ id, sourceId, name, destinationId, phase, auth, reason, move, grantImported }: MigrationRecord, uncertainty: string | null): MigrationView => ({ id, sourceId, name, destinationId, phase, auth, reason, uncertainty, move: move === true, grantImported: grantImported === true });
+const reasons: Record<RemoteMigration['readiness'], string | null> = { pending: 'not_verified', ready: null, signin: 'sign_in', changed: 'destination_changed', unavailable: 'unavailable', refresh_uncertain: 'refresh_uncertain' };
 const samePolicy = (a: MigrationRecord['policy'], b: MigrationRecord['policy']): boolean =>
   (a.read ?? 'allow') === (b.read ?? 'allow') && (a.write ?? 'allow') === (b.write ?? 'allow') && JSON.stringify(Object.entries(a.tools ?? {}).sort()) === JSON.stringify(Object.entries(b.tools ?? {}).sort());
 
+const grantTransfer = (record: MigrationRecord): boolean => record.move === true && record.auth === 'oauth';
+const upgrading = (record: MigrationRecord, remote: RemoteMigration): boolean => grantTransfer(record) && remote.grantImported !== true;
+const canUpgrade = (record: MigrationRecord): boolean => record.move !== true && ['preparing', 'prepared'].includes(record.phase);
+
+function checkResponse(record: MigrationRecord, remote: RemoteMigration): void {
+  if (remote.operationId !== record.id || remote.sourceId !== record.sourceId || (record.destinationId !== null && remote.destinationId !== record.destinationId)) throw uncertain();
+  if (remote.sourceStamp === null || remote.sourceStamp === record.sourceStamp || upgrading(record, remote)) return;
+  throw conflict('The prepared destination no longer matches this local connector. Reconcile its current operation before continuing.');
+}
+
 function callFailure(error: unknown, action: string): ApiError {
+  if (error instanceof MetroApiRefusal && error.code === 'migration_conflict') return new MigrationBlocked('destination_changed', 'The mapped destination already has credentials or changed settings. Inspect it and reconcile; Metro will not overwrite credentials or create a duplicate.');
   if (action === 'prepare' && error instanceof MetroApiRefusal && error.upstreamStatus === 400 && error.code === 'oauth_resource_required') {
     return new ApiError("Enter the provider's public OAuth resource. Roll back this preparation, then prepare again with that public value; never enter credentials.", 400);
   }
@@ -82,7 +95,7 @@ export class ConnectorMigrations {
     const keyId = this.key()?.keyId;
     const migrations = migrationRecords(this.dir).filter((row) => row.owner === owner).map((row) => {
       const uncertainty = migrationUncertaintyReceipt(row.sourceId, this.dir);
-      const reason = uncertainty === null ? row.reason : 'requests_uncertain';
+      const reason = uncertainty === null ? row.reason : migrationRefreshUncertain(row.sourceId, this.dir) ? 'local_refresh_uncertain' : 'requests_uncertain';
       return viewOf({ ...row, reason: row.agentId !== agentId || row.keyId !== keyId ? 'identity_changed' : reason }, uncertainty);
     });
     return { scope, owner, agentId, enabled, enrolled, migrations };
@@ -111,12 +124,12 @@ export class ConnectorMigrations {
   }
 
   private source(record: MigrationRecord): ReturnType<typeof migrationPayload> {
-    const payload = migrationPayload(migrationSource(record.sourceId, this.dir), record.oauthResource);
+    const payload = migrationPayload(migrationSource(record.sourceId, this.dir, record.move === true && record.captured === true), record.oauthResource, record.move === true && record.captured === true);
     if (payload.sourceStamp !== record.sourceStamp) throw conflict('The retained local connector changed. Restore its original settings before continuing; Metro will not overwrite it.');
     return payload;
   }
 
-  private async call(context: Context, record: MigrationRecord, action: 'begin' | 'prepare' | 'status' | 'activate' | 'rollback', sealed?: ReturnType<typeof sealConnectorMigration>): Promise<MigrationResponse> {
+  private async call(context: Context, record: MigrationRecord, action: 'begin' | 'prepare' | 'handover' | 'status' | 'activate' | 'rollback', sealed?: ReturnType<typeof sealConnectorMigration>): Promise<MigrationResponse> {
     this.check(context, record);
     let response: MigrationResponse;
     try {
@@ -127,9 +140,7 @@ export class ConnectorMigrations {
       throw callFailure(error, action);
     }
     this.check(context, record);
-    const remote = response.migration;
-    if (remote.operationId !== record.id || remote.sourceId !== record.sourceId || (record.destinationId !== null && remote.destinationId !== record.destinationId)) throw uncertain();
-    if (remote.sourceStamp !== null && remote.sourceStamp !== record.sourceStamp) throw conflict('The prepared destination no longer matches this local connector. Roll back this preparation before trying again.');
+    checkResponse(record, response.migration);
     return response;
   }
 
@@ -137,14 +148,14 @@ export class ConnectorMigrations {
     if (remote.phase !== 'preparing' && remote.phase !== 'rolled_back' && (remote.name !== record.name || remote.auth !== record.auth || remote.policy === null || !samePolicy(record.policy, remote.policy))) {
       return this.save(context, { ...record, destinationId: remote.destinationId, reason: 'destination_changed' });
     }
-    return this.save(context, { ...record, destinationId: remote.destinationId, reason: reasons[remote.readiness] });
+    return this.save(context, { ...record, destinationId: remote.destinationId, grantImported: remote.grantImported === true, reason: reasons[remote.readiness] });
   }
 
-  private create(context: Context, id: string, oauthResource?: string): MigrationRecord {
+  private create(context: Context, id: string, oauthResource?: string, move = false): MigrationRecord {
     const payload = migrationPayload(migrationSource(id, this.dir), oauthResource);
     return this.save(context, {
       id: newId(), owner: context.owner, agentId: context.agentId, keyId: context.key.keyId,
-      sourceId: id, name: payload.name, destinationId: null, phase: 'preparing', auth: payload.auth.kind,
+      sourceId: id, name: payload.name, destinationId: null, phase: move ? 'freezing' : 'preparing', move, auth: payload.auth.kind,
       sourceStamp: payload.sourceStamp, policy: payload.policy, reason: null,
       ...(payload.oauthResource === undefined ? {} : { oauthResource: payload.oauthResource }),
     });
@@ -154,25 +165,54 @@ export class ConnectorMigrations {
     const payload = this.source(record);
     const begun = await this.call(context, record, 'begin');
     record = this.accept(context, record, begun.migration);
-    if (begun.migration.phase === 'prepared') {
+    if (begun.migration.phase === 'prepared' && !upgrading(record, begun.migration)) {
       this.save(context, { ...record, phase: 'prepared' });
       return;
     }
-    if (begun.migration.phase !== 'preparing' || begun.receiving === undefined) throw uncertain();
+    if (!['preparing', 'prepared'].includes(begun.migration.phase) || begun.receiving === undefined) throw uncertain();
     const receiving = begun.receiving;
     const expected = { owner: context.owner, agent: context.agentId, keyId: context.key.keyId, operationId: record.id, sourceId: record.sourceId, destinationId: record.destinationId };
     for (const [key, value] of Object.entries(expected)) if (receiving.context[key as keyof typeof receiving.context] !== value) throw uncertain();
     const sealed = sealConnectorMigration(receiving.publicKey, receiving.context, payload);
-    const { migration } = await this.call(context, record, 'prepare', sealed);
+    const { migration } = await this.call(context, record, grantTransfer(record) ? 'handover' : 'prepare', sealed);
     record = this.accept(context, record, migration);
     if (migration.phase !== 'prepared') throw uncertain();
     this.save(context, { ...record, phase: 'prepared' });
   }
 
+  private async freeze(context: Context, record: MigrationRecord): Promise<MigrationRecord | null> {
+    const until = Date.now() + 10_000;
+    while (!this.localIdle(record.sourceId) && migrationUncertaintyReceipt(record.sourceId, this.dir) === null && Date.now() < until) {
+      await new Promise((resolve) => { setTimeout(resolve, 100); });
+      this.check(context, record);
+    }
+    if (this.waiting(context, record)) return null;
+    flushMigrationSource(this.dir);
+    const payload = migrationPayload(migrationSource(record.sourceId, this.dir, true), record.oauthResource, true);
+    return this.save(context, { ...record, sourceStamp: payload.sourceStamp, captured: true, phase: 'preparing', reason: null });
+  }
+
+  private async move(context: Context, record: MigrationRecord): Promise<void> {
+    if (record.phase === 'recovering') return this.finishRecovery(context, record);
+    if (['active', 'rolled_back'].includes(record.phase)) return this.reconcile(context, record);
+    if (record.phase === 'rollback') return this.rollback(context, record);
+    if (record.phase === 'freezing') {
+      const captured = await this.freeze(context, record);
+      if (captured === null) return;
+      record = captured;
+    }
+    if (record.phase === 'preparing') {
+      await this.prepare(context, record);
+      record = migrationRecord(record.sourceId, this.dir) ?? record;
+    }
+    if (record.phase === 'prepared' || record.phase === 'cutover') await this.cutover(context, record);
+  }
+
   private waiting(context: Context, record: MigrationRecord, includeOrganization = false): boolean {
     const uncertain = migrationUncertaintyReceipt(record.sourceId, this.dir) !== null;
-    if (!uncertain && this.localIdle(record.sourceId) && (!includeOrganization || this.orgIdle(record.sourceId))) return false;
-    this.save(context, { ...record, reason: uncertain ? 'requests_uncertain' : 'waiting_for_local' });
+    const localIdle = this.localIdle(record.sourceId);
+    if (!uncertain && localIdle && (!includeOrganization || this.orgIdle(record.sourceId))) return false;
+    this.save(context, { ...record, reason: uncertain ? migrationRefreshUncertain(record.sourceId, this.dir) ? 'local_refresh_uncertain' : 'requests_uncertain' : 'waiting_for_local' });
     return true;
   }
 
@@ -202,7 +242,15 @@ export class ConnectorMigrations {
   }
 
   private async rollback(context: Context, record: MigrationRecord): Promise<void> {
-    this.source(record);
+    if (record.phase === 'recovering') return this.finishRecovery(context, record);
+    if (record.grantImported === true) throw new MigrationBlocked('finish_forward', 'Central owns this OAuth grant. Finish forward or sign in centrally; the old local tokens cannot be restored.');
+    const begun = await this.call(context, record, 'begin');
+    if (begun.migration.grantImported === true) {
+      record = this.accept(context, record, begun.migration);
+      this.save(context, { ...record, phase: begun.migration.phase === 'active' ? 'cutover' : 'prepared', reason: 'finish_forward' });
+      return;
+    }
+    if (record.phase !== 'freezing') this.source(record);
     record = this.save(context, { ...record, phase: 'rollback' });
     if (this.waiting(context, record, true)) return;
     const { migration } = await this.call(context, record, 'rollback');
@@ -211,15 +259,23 @@ export class ConnectorMigrations {
       return;
     }
     this.check(context, record);
-    if (this.deps.restore !== undefined) this.deps.restore(record.sourceId, record.auth === 'oauth');
-    else localRollbackMigrationSource(record.sourceId, record.auth === 'oauth', this.dir);
-    this.save(context, { ...record, phase: 'rolled_back', reason: record.auth === 'oauth' ? 'sign_in' : null });
+    this.restore(context, record);
+
+  }
+
+  private restore(context: Context, record: MigrationRecord): void {
+    const signOut = record.auth === 'oauth' && record.move !== true;
+    if (this.deps.restore !== undefined) this.deps.restore(record.sourceId, signOut);
+    else localRollbackMigrationSource(record.sourceId, signOut, this.dir);
+    this.save(context, { ...record, phase: 'rolled_back', reason: signOut ? 'sign_in' : null });
   }
 
   private async reconcile(context: Context, record: MigrationRecord): Promise<void> {
+    if (record.phase === 'recovering') return this.finishRecovery(context, record);
+    if (record.phase === 'rollback') return this.rollback(context, record);
+    if (record.move === true && record.phase !== 'active' && record.phase !== 'rolled_back') return this.move(context, record);
     if (record.phase === 'preparing') return this.prepare(context, record);
     if (record.phase === 'cutover') return this.cutover(context, record);
-    if (record.phase === 'rollback') return this.rollback(context, record);
     if (record.phase === 'rolled_back') return;
     const { migration } = await this.call(context, record, 'status');
     this.accept(context, record, migration);
@@ -228,25 +284,46 @@ export class ConnectorMigrations {
   private obtain(context: Context, sourceId: string, action: MigrationAction, oauthResource?: string): MigrationRecord | null {
     const record = migrationRecord(sourceId, this.dir);
     if (record !== null) this.check(context, record);
-    if (action === 'prepare' && (record === null || record.phase === 'rolled_back')) return this.create(context, sourceId, oauthResource);
+    if (['prepare', 'move'].includes(action) && (record === null || record.phase === 'rolled_back')) return this.create(context, sourceId, oauthResource, action === 'move');
+    if (action === 'move' && record !== null && canUpgrade(record)) return this.save(context, { ...record, move: true, phase: 'freezing' });
     if (record === null && action !== 'reconcile') throw conflict('Prepare this connector before moving it.');
     return record;
   }
 
   private perform(context: Context, record: MigrationRecord, action: MigrationAction): Promise<void> {
+    if (action === 'move') return this.move(context, record);
     if (action === 'prepare' && record.phase === 'preparing') return this.prepare(context, record);
     if (action === 'cutover' && (record.phase === 'prepared' || record.phase === 'cutover')) return this.cutover(context, record);
     if (action === 'rollback' && record.phase !== 'rolled_back') return this.rollback(context, record);
     return this.reconcile(context, record);
   }
 
-  private resolve(context: Context, record: MigrationRecord, receipt: string | null): void {
+  private async resolve(context: Context, record: MigrationRecord, receipt: string | null): Promise<void> {
     this.check(context, record);
     if (receipt === null || receipt !== migrationUncertaintyReceipt(record.sourceId, this.dir)) throw conflict('The outstanding request receipt changed. Refresh before confirming that vendor requests have settled.');
+    localMigrationIdle(record.sourceId, this.dir, true);
+    if (migrationRefreshUncertain(record.sourceId, this.dir)) return this.recoverRefresh(context, record, receipt);
     if (!resolveMigrationUncertainty(record.sourceId, receipt, this.dir)) throw conflict('Requests are still running or their receipt changed. Wait for vendor completion, then refresh before confirming settlement.');
     this.save(context, { ...record, reason: record.phase === 'prepared' ? 'not_verified' : null });
   }
 
+  private async recoverRefresh(context: Context, record: MigrationRecord, receipt: string): Promise<void> {
+    if (record.move !== true || !['freezing', 'rollback'].includes(record.phase) || !migrationOperationsIdle(record.sourceId, this.dir, false)) throw conflict('The uncertain local refresh must stop before aborting the handover.');
+    const { migration } = await this.call(context, record, 'rollback');
+    if (migration.phase !== 'rolled_back') throw uncertain();
+    record = this.save(context, { ...record, phase: 'recovering', recoveryReceipt: receipt });
+    await this.finishRecovery(context, record);
+  }
+
+  private async finishRecovery(context: Context, record: MigrationRecord): Promise<void> {
+    const { migration } = await this.call(context, record, 'rollback');
+    if (migration.phase !== 'rolled_back' || record.recoveryReceipt === undefined) throw uncertain();
+    localRollbackMigrationSource(record.sourceId, true, this.dir, true);
+    const receipt = migrationUncertaintyReceipt(record.sourceId, this.dir);
+    if (receipt !== null && !resolveMigrationUncertainty(record.sourceId, record.recoveryReceipt, this.dir)) throw uncertain();
+    this.save(context, { ...record, phase: 'rolled_back', recoveryReceipt: undefined, reason: 'sign_in' });
+  }
+
   private validateResource(sourceId: string, action: MigrationAction, oauthResource: string | undefined): void {
     if (oauthResource === undefined) return;
     const resource = publicOAuthResource(oauthResource);
@@ -262,14 +339,14 @@ export class ConnectorMigrations {
 
   async run(sourceId: string, action: MigrationAction, scope: string, operationId: string | null, uncertainty: string | null = null, oauthResource?: string): Promise<MigrationStatus> {
     if (this.running) throw conflict('Another migration request is still running on this agent. Refresh after it finishes.');
-    const context = this.context(scope, action === 'prepare' || action === 'cutover');
+    const context = this.context(scope, ['move', 'prepare', 'cutover'].includes(action));
     this.validateIntent(sourceId, action, operationId, uncertainty);
     this.validateResource(sourceId, action, oauthResource);
     this.running = true;
     try {
       const record = this.obtain(context, sourceId, action, oauthResource);
       if (record !== null) {
-        if (action === 'resolve') this.resolve(context, record, uncertainty);
+        if (action === 'resolve') await this.resolve(context, record, uncertainty);
         else await this.perform(context, record, action);
       }
       this.check(context);
@@ -277,7 +354,7 @@ export class ConnectorMigrations {
     } catch (error) {
       const record = migrationRecord(sourceId, this.dir);
       if (record !== null) {
-        try { this.save(context, { ...record, reason: 'unavailable' }); } catch {
+        try { this.save(context, { ...record, reason: error instanceof MigrationBlocked ? error.reason : 'unavailable' }); } catch {
           log.warn('connector migration: the interrupted operation needs reconciliation in its original enrollment');
         }
       }

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

@@ -3,10 +3,10 @@ import type { FetchLike } from '@metro-labs/core/stations/oauth';
 import { agentsDir } from '../agents/files.js';
 import type { AgentKey } from './agent-key.js';
 import { migrationRecord, migrationRecords } from './migration-state.js';
-import { assertMigrationOutcomeKnown, beginMigrationOperation, migrationOperationsIdle, migrationRequestEffectful, type MigrationOperation } from './migration-operations.js';
+import { assertMigrationOutcomeKnown, beginMigrationOperation, drainMigrationListeners, migrationOperationsIdle, migrationRequestEffectful, type MigrationOperation } from './migration-operations.js';
 
 const locked = (phase: string): boolean => phase !== 'rolled_back';
-const retired = (phase: string): boolean => phase === 'cutover' || phase === 'active' || phase === 'rollback';
+const retired = (record: NonNullable<ReturnType<typeof migrationRecord>>): boolean => record.move === true || record.phase === 'cutover' || record.phase === 'active' || record.phase === 'rollback';
 const refused = (): ApiError => new ApiError('This local connector is locked while it moves to the organization.', 409);
 
 export function migrationSource(id: string, dir = agentsDir()): ReturnType<typeof migrationRecords>[number] | null {
@@ -16,27 +16,29 @@ export function migrationSource(id: string, dir = agentsDir()): ReturnType<typeo
 
 export function localMigrationEnabled(id: string, dir = agentsDir()): boolean {
   const record = migrationSource(id, dir);
-  return record === null || !retired(record.phase);
+  return record === null || !retired(record);
 }
 
 export function assertLocalMigrationUse(id: string, dir = agentsDir()): void {
   const record = migrationSource(id, dir);
   if (record === null) return;
-  if (retired(record.phase)) throw refused();
+  if (retired(record)) throw refused();
   assertMigrationOutcomeKnown(id, dir);
 }
 
-export function assertLocalMigrationEdit(id: string, name: string | undefined, dir = agentsDir()): void {
-  if (migrationRecords(dir).some((record) => locked(record.phase) && (record.sourceId === id || record.name === name))) throw refused();
+export function assertLocalMigrationEdit(id: string, dir = agentsDir()): void {
+  if (migrationRecords(dir).some((record) => locked(record.phase) && record.sourceId === id)) throw refused();
 }
 
 export function migrationExportableRows<T extends { id: string; name: string }>(rows: readonly T[], dir = agentsDir()): T[] {
   const records = migrationRecords(dir).filter((record) => locked(record.phase));
-  return rows.filter((row) => !records.some((record) => record.sourceId === row.id || record.name === row.name));
+  return rows.filter((row) => !records.some((record) => record.sourceId === row.id));
 }
 
-export function localMigrationIdle(id: string, dir = agentsDir()): boolean {
-  return migrationOperationsIdle(id, dir, migrationSource(id, dir) !== null);
+export function localMigrationIdle(id: string, dir = agentsDir(), allowUncertain = false): boolean {
+  const record = migrationSource(id, dir);
+  if (record !== null && retired(record)) drainMigrationListeners(id, dir);
+  return migrationOperationsIdle(id, dir, !allowUncertain && record !== null);
 }
 
 export interface LocalMigrationOperation extends MigrationOperation {
@@ -45,11 +47,11 @@ export interface LocalMigrationOperation extends MigrationOperation {
   close: () => void;
 }
 
-export function beginLocalMigrationOperation(id: string, dir = agentsDir(), edit = false, name?: string): LocalMigrationOperation {
+export function beginLocalMigrationOperation(id: string, dir = agentsDir(), edit = false): LocalMigrationOperation {
   let closed = false;
   const check = (): void => {
     if (closed) throw refused();
-    if (edit) assertLocalMigrationEdit(id, name, dir);
+    if (edit) assertLocalMigrationEdit(id, dir);
     else assertLocalMigrationUse(id, dir);
   };
   check();
@@ -61,13 +63,15 @@ export function beginLocalMigrationOperation(id: string, dir = agentsDir(), edit
   return {
     check,
     dispatch,
+    passiveListener: tracked.passiveListener,
+    persistedRefresh: tracked.persistedRefresh,
     fetch: (input, init) => dispatch(() => fetch(input, init), { effectful: migrationRequestEffectful(init?.method, init?.body) }),
     close: () => { closed = true; tracked.close(); },
   };
 }
 
-export async function withLocalMigrationOperation<T>(id: string, dir: string, run: (operation: LocalMigrationOperation) => Promise<T>, edit = false, name?: string): Promise<T> {
-  const operation = beginLocalMigrationOperation(id, dir, edit, name);
+export async function withLocalMigrationOperation<T>(id: string, dir: string, run: (operation: LocalMigrationOperation) => Promise<T>, edit = false): Promise<T> {
+  const operation = beginLocalMigrationOperation(id, dir, edit);
   try { return await run(operation); }
   finally { operation.close(); }
 }

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

@@ -14,14 +14,23 @@ interface RequestOperation {
   lease: string;
   durable: boolean;
   abandoned: boolean;
+  refresh: boolean;
+}
+
+interface PassiveListener {
+  idle: () => boolean;
+  stop: () => void;
 }
 
 export interface MigrationOperation {
-  dispatch: (send: () => Promise<Response>, options?: { protectedSource?: boolean; effectful?: boolean }) => Promise<Response>;
+  passiveListener: (listener: PassiveListener) => void;
+  dispatch: (send: () => Promise<Response>, options?: { protectedSource?: boolean; effectful?: boolean; refresh?: boolean }) => Promise<Response>;
   close: () => void;
+  persistedRefresh: () => void;
 }
 
 const leases = new Map<string, Set<string>>();
+const listeners = new Map<string, PassiveListener>();
 const requests = new Map<string, RequestOperation>();
 const held = new Map<string, RequestOperation>();
 const keyOf = (source: string, dir: string): string => JSON.stringify([resolve(dir), source]);
@@ -57,7 +66,7 @@ function pendingOf(text: string): string[] {
   const value: unknown = JSON.parse(text);
   if (!isRecord(value) || value.version !== 1 || !Array.isArray(value.pending) || value.pending.length > 10_000) throw unavailable();
   const ids: unknown[] = value.pending;
-  if (!ids.every((id): id is string => typeof id === 'string' && /^[a-f0-9]{32}$/.test(id))) throw unavailable();
+  if (!ids.every((id): id is string => typeof id === 'string' && /^r?[a-f0-9]{32}$/.test(id))) throw unavailable();
   if (new Set(ids).size !== ids.length) throw unavailable();
   return ids;
 }
@@ -101,6 +110,17 @@ export function assertMigrationOutcomeKnown(source: string, dir = agentsDir()):
   if (migrationUncertaintyReceipt(source, dir) !== null) throw uncertain();
 }
 
+export function drainMigrationListeners(source: string, dir: string): void {
+  const active = [...(leases.get(keyOf(source, dir)) ?? [])];
+  if (active.length === 0 || active.some((lease) => listeners.get(lease)?.idle() !== true)) return;
+  if (readPending(source, dir).some((id) => requests.has(id))) return;
+  for (const lease of active) {
+    const listener = listeners.get(lease);
+    listeners.delete(lease);
+    listener?.stop();
+  }
+}
+
 export function migrationOperationsIdle(source: string, dir: string, protectedSource: boolean): boolean {
   if (leases.has(keyOf(source, dir))) return false;
   return !protectedSource || readPending(source, dir).length === 0;
@@ -114,7 +134,8 @@ export function resolveMigrationUncertainty(source: string, expectedReceipt: str
   return true;
 }
 
-function finish(request: RequestOperation, completed: boolean): void {
+function finish(request: RequestOperation, completed: boolean, persisted = false): void {
+  if (request.refresh && completed && !persisted) return;
   if (request.abandoned) return;
   requests.delete(request.id);
   if (completed) held.delete(request.id);
@@ -153,10 +174,10 @@ function observed(response: Response, request: RequestOperation): Response {
   return new Response(body, { status: response.status, statusText: response.statusText, headers: response.headers });
 }
 
-async function dispatch(source: string, dir: string, lease: string, protectedSource: boolean, effectful: boolean, send: () => Promise<Response>): Promise<Response> {
+async function dispatch(source: string, dir: string, lease: string, protectedSource: boolean, effectful: boolean, refresh: boolean, send: () => Promise<Response>): Promise<Response> {
   if (protectedSource) assertMigrationOutcomeKnown(source, dir);
   if (!effectful) return send();
-  const request: RequestOperation = { id: randomBytes(16).toString('hex'), source, dir, lease, durable: false, abandoned: false };
+  const request: RequestOperation = { id: `${refresh ? 'r' : ''}${randomBytes(16).toString('hex')}`, source, dir, lease, durable: false, abandoned: false, refresh };
   if (protectedSource) {
     const pending = readPending(source, dir);
     if (pending.length >= 10_000) throw unavailable();
@@ -178,13 +199,18 @@ export function beginMigrationOperation(source: string, dir: string, protectedSo
   leases.set(key, active);
   let closed = false;
   return {
+    passiveListener: (listener) => { if (!closed) listeners.set(lease, listener); },
     dispatch: (send, options = {}) => {
       if (closed) return Promise.reject(uncertain());
-      return dispatch(source, dir, lease, options.protectedSource ?? protectedSource, options.effectful ?? true, send);
+      return dispatch(source, dir, lease, options.protectedSource ?? protectedSource, options.effectful ?? true, options.refresh ?? false, send);
+    },
+    persistedRefresh: () => {
+      for (const request of held.values()) if (request.lease === lease && request.refresh) finish(request, true, true);
     },
     close: () => {
       if (closed) return;
       closed = true;
+      listeners.delete(lease);
       for (const request of held.values()) if (request.lease === lease) {
         finish(request, false);
         held.delete(request.id);
@@ -194,3 +220,7 @@ export function beginMigrationOperation(source: string, dir: string, protectedSo
     },
   };
 }
+
+export function migrationRefreshUncertain(source: string, dir = agentsDir()): boolean {
+  return readPending(source, dir).some((id) => id.startsWith('r') && !requests.has(id));
+}