@stage-labs/metro 0.1.0-beta.304 → 0.1.0-beta.306

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.304"
+  "version": "0.1.0-beta.306"
 }

package/runtime/sdk-runner/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/sdk-runner/runner.json

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

package/{runtime/marketplace/plugin → skills}/METRO.md

@@ -1,9 +1,9 @@
 ---
 name: metro
-description: How this box's agent works on metro. Acknowledge, delegate, relay, answer over chat, never block on the terminal. Loaded at every session start by the metro plugin; edit it here to change the rules on this box.
+description: How this box's agent works on metro. Acknowledge, delegate, relay, answer over chat, never block on the terminal. Loaded at every session start by a metro hook; edit it here to change the rules on this box.
 ---
 
-You are the main thread of a Claude Code session that is connected to chat through metro, on a machine nobody watches. The main thread is an orchestrator: it may only delegate and talk. A guard in the metro plugin denies every other tool on this thread, so this is the shape of the work, not a preference.
+You are the main thread of a Claude Code session that is connected to chat through metro, on a machine nobody watches. The main thread is an orchestrator: it may only delegate and talk. A guard metro installs denies every other tool on this thread, so this is the shape of the work, not a preference.
 
 **Inbound.** A message arrives as a `<channel source="metro" …>` block. Read `addressed` first: `direct`, `mention` or `reply` means it is for you; without it the message merely happened in a room you watch, so treat it as context and stay silent unless the person plainly wants you. For a message that is for you, the first tool call is `react` on it (👀, then 👍 or ✅ once done) so the person knows you saw it, and any reply goes on the same `line`, passed verbatim. Exception: when the person asks you to close something ("mark as done"), skip the reaction and the acknowledgement: close it directly and confirm once when it is finished.
 
@@ -15,7 +15,12 @@ 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.** When the `mcp` server is present, it holds every connector tool behind 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>"`.
+**Connectors.** Third-party tools the organization gave this agent (Notion, n8n, Linear, Gmail and the like) are reached only through two metro tools, in two steps:
+
+1. `tool_search` finds a tool and returns its full definition: `select:notion.search` for an exact name, words (`notion create page`) to rank, or `+linear issue` to require `linear` in the name. Each name is `<connector>.<tool>`.
+2. `tool_call` runs it, with the name exactly as found and arguments that match its schema. After `tool_search` with `select:notion.search` returned `notion.search`: `{"calls": [{"tool": "notion.search", "arguments": {"query": "roadmap"}}]}`.
+
+Put up to 10 independent calls in one `tool_call`; they run in parallel and come back in order, each under `[n] <tool>`. `tool_search` may run on this thread, but never call `tool_call` here: delegate it to a worker, as all other work. 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 repeat the same call with `"approval": "<id>"` added to it.
 
 **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.
 

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

@@ -1,12 +0,0 @@
-{
-  "name": "metro",
-  "description": "Metro — connector relay and chat bridge for agents",
-  "owner": { "name": "Bonustrack", "url": "https://metro.box" },
-  "plugins": [
-    {
-      "name": "metro",
-      "source": "./plugin",
-      "description": "Every connector on this box as its own MCP server through metro's local relay, the orchestrator guard, and the standing rules loaded at session start."
-    }
-  ]
-}

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

@@ -1,17 +0,0 @@
-{
-  "name": "metro",
-  "version": "0.1.0-beta.304",
-  "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 (or one `mcp` server on mcp.metro.box), 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",
-    "url": "https://metro.box"
-  },
-  "repository": "https://github.com/bonustrack/metro",
-  "license": "MIT",
-  "keywords": [
-    "metro",
-    "mcp",
-    "connectors",
-    "relay"
-  ]
-}

package/runtime/marketplace/plugin/.mcp.json

@@ -1 +0,0 @@
-{}

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

@@ -1,48 +0,0 @@
-#!/usr/bin/env node
-import { readFileSync } from 'node:fs';
-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;
-  try {
-    parsed = JSON.parse(readFileSync(path, 'utf8'));
-  } catch {
-    throw new Error(`no agent on this machine yet (${path})`);
-  }
-  if (typeof parsed?.key !== 'string') throw new Error(`no agent key in ${path}`);
-  return parsed;
-}
-
-function readMcpToken() {
-  try {
-    const token = readFileSync(join(agentsDir(), 'mcp-token'), 'utf8').trim();
-    return MCP_TOKEN.test(token) ? token : null;
-  } catch {
-    return null;
-  }
-}
-
-const command = process.argv[2];
-
-if (command === 'mcp-headers') {
-  const token = readMcpToken();
-  if (token !== null) process.stdout.write(`${JSON.stringify({ Authorization: `Bearer ${token}` })}\n`);
-  process.exit(0);
-}
-
-if (command !== 'headers') {
-  process.stderr.write('usage: metro-plugin.mjs headers | 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');
-}

package/runtime/marketplace/plugin/hooks/hooks.json

@@ -1,25 +0,0 @@
-{
-  "hooks": {
-    "PreToolUse": [
-      {
-        "hooks": [
-          {
-            "type": "command",
-            "command": "node \"${CLAUDE_PLUGIN_ROOT}/bin/guard.mjs\"",
-            "statusMessage": "Checking the orchestrator boundary"
-          }
-        ]
-      }
-    ],
-    "SessionStart": [
-      {
-        "hooks": [
-          {
-            "type": "command",
-            "command": "node \"${CLAUDE_PLUGIN_ROOT}/bin/session-start.mjs\""
-          }
-        ]
-      }
-    ]
-  }
-}

package/runtime/node_modules/@metro-labs/core/src/connector-sync.ts

@@ -1,17 +0,0 @@
-export interface ConnectorSyncReceipt {
-  state: 'waiting' | 'received' | 'expired' | 'unavailable';
-  lastReceivedAt: number | null;
-  leaseExpiresAt: number | null;
-  counts: { total: number; ready: number; unavailable: number } | null;
-}
-
-export interface ConnectorSyncStatus extends Omit<ConnectorSyncReceipt, 'state'> {
-  enabled: boolean;
-  source: 'saved' | 'environment' | 'default' | 'invalid' | 'scope_changed';
-  enrolled: boolean;
-  owner: string | null;
-  agentId: string | null;
-  scope: string;
-  liveEnabled: boolean;
-  state: 'off' | 'not_enrolled' | ConnectorSyncReceipt['state'];
-}

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

@@ -1,149 +0,0 @@
-import { execFile } from 'node:child_process';
-import { existsSync, readFileSync, realpathSync } from '../agent-user/agent-fs.js';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-import { isRecord } from '@metro-labs/core/is-record';
-import { log } from '@metro-labs/core/log';
-import { agentMarketplaceDir, agentUser, asAgent, claudeBin } from '../agent-user/user.js';
-
-const MARKETPLACE = 'metro';
-const PLUGIN = 'metro@metro';
-const STEP_MS = 120_000;
-const SAID_MAX = 300;
-
-export interface Answer {
-  status: number;
-  stdout: string;
-  stderr: string;
-}
-
-export type Run = (args: string[]) => Promise<Answer>;
-
-export interface PluginInstallDeps {
-  run: Run | null;
-  marketplaceDir: string | null;
-}
-
-export type PluginOutcome = 'skipped' | 'unchanged' | 'installed' | 'updated' | 'failed';
-
-function storeMarketplaceDir(env: NodeJS.ProcessEnv = process.env): string | null {
-  const store = env.METRO_RUNTIME_STORE?.trim() ?? '';
-  if (store === '') return null;
-  const dir = join(store, 'marketplace');
-  return existsSync(join(dir, '.claude-plugin', 'marketplace.json')) ? dir : null;
-}
-
-export function stagedMarketplaceDir(env: NodeJS.ProcessEnv = process.env): string | null {
-  const store = storeMarketplaceDir(env);
-  const user = agentUser();
-  if (store === null || user === null) return store;
-  const copy = agentMarketplaceDir(user);
-  return existsSync(join(copy, '.claude-plugin', 'marketplace.json')) ? copy : null;
-}
-
-export function stagedPluginVersion(dir: string): string | null {
-  try {
-    const parsed: unknown = JSON.parse(readFileSync(join(dir, 'plugin', '.claude-plugin', 'plugin.json'), 'utf8'));
-    return isRecord(parsed) && typeof parsed.version === 'string' ? parsed.version : null;
-  } catch {
-    return null;
-  }
-}
-
-const runner =
-  (bin: string): Run =>
-  (args) =>
-    new Promise((resolve) => {
-      execFile(...asAgent(bin, args), { encoding: 'utf8', timeout: STEP_MS, maxBuffer: 4 * 1024 * 1024 }, (err, stdout, stderr) => {
-        const status = err === null ? 0 : typeof (err as { code?: unknown }).code === 'number' ? (err as { code: number }).code : 1;
-        resolve({ status, stdout, stderr });
-      });
-    });
-
-async function findClaude(candidates = agentUser() === null ? ['claude', join(homedir(), '.local', 'bin', 'claude')] : [claudeBin()]): Promise<Run | null> {
-  for (const bin of candidates) {
-    const run = runner(bin);
-    if ((await run(['--version'])).status === 0) return run;
-  }
-  return null;
-}
-
-function listOf(stdout: string): Record<string, unknown>[] {
-  try {
-    const parsed: unknown = JSON.parse(stdout);
-    return Array.isArray(parsed) ? parsed.filter(isRecord) : [];
-  } catch {
-    return [];
-  }
-}
-
-const realish = (path: string): string => {
-  try {
-    return realpathSync(path);
-  } catch {
-    return path;
-  }
-};
-
-const samePath = (a: string | null, b: string): boolean => a !== null && realish(a) === realish(b);
-
-async function step(run: Run, args: string[]): Promise<boolean> {
-  const answer = await run(args);
-  if (answer.status === 0) {
-    log.info({ args }, 'plugin: claude');
-    return true;
-  }
-  log.warn({ args, said: `${answer.stderr}${answer.stdout}`.trim().slice(0, SAID_MAX) }, 'plugin: claude refused');
-  return false;
-}
-
-async function marketplacePath(run: Run): Promise<string | null | undefined> {
-  const mine = listOf((await run(['plugin', 'marketplace', 'list', '--json'])).stdout).find((m) => m.name === MARKETPLACE);
-  if (mine === undefined) return undefined;
-  const at = mine.installLocation ?? mine.path;
-  return typeof at === 'string' ? at : null;
-}
-
-async function ensureMarketplace(run: Run, dir: string): Promise<boolean> {
-  const at = await marketplacePath(run);
-  if (at !== undefined && samePath(at, dir)) return true;
-  if (at !== undefined) await step(run, ['plugin', 'marketplace', 'remove', MARKETPLACE]);
-  return step(run, ['plugin', 'marketplace', 'add', dir]);
-}
-
-async function installedVersion(run: Run): Promise<string | null> {
-  const mine = listOf((await run(['plugin', 'list', '--json'])).stdout).find((p) => p.id === PLUGIN);
-  return mine !== undefined && typeof mine.version === 'string' ? mine.version : null;
-}
-
-async function ensureInstalled(run: Run, wanted: string | null): Promise<PluginOutcome> {
-  const have = await installedVersion(run);
-  if (have === null) return (await step(run, ['plugin', 'install', PLUGIN, '-y', '--scope', 'user'])) ? 'installed' : 'failed';
-  if (wanted === null || have === wanted) return 'unchanged';
-  await step(run, ['plugin', 'marketplace', 'update', MARKETPLACE]);
-  return (await step(run, ['plugin', 'update', PLUGIN, '-y'])) ? 'updated' : 'failed';
-}
-
-function explainMissingMarketplace(env: NodeJS.ProcessEnv = process.env): void {
-  const store = env.METRO_RUNTIME_STORE?.trim() ?? '';
-  if (store === '') return;
-  log.warn(
-    { store },
-    'plugin: the runtime store holds no plugin marketplace, so metro cannot install its Claude Code plugin; restart the metro service once so `metro serve` stages it again',
-  );
-}
-
-export async function ensureMetroPlugin(deps?: Partial<PluginInstallDeps>): Promise<PluginOutcome> {
-  const dir = deps?.marketplaceDir === undefined ? stagedMarketplaceDir() : deps.marketplaceDir;
-  if (dir === null) {
-    if (deps?.marketplaceDir === undefined) explainMissingMarketplace();
-    return 'skipped';
-  }
-  const run = deps?.run === undefined ? await findClaude() : deps.run;
-  if (run === null) {
-    log.info('plugin: claude is not on this machine, so metro leaves its Claude Code plugin alone');
-    return 'skipped';
-  }
-  if (!(await ensureMarketplace(run, dir))) return 'failed';
-  return ensureInstalled(run, stagedPluginVersion(dir));
-}

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

@@ -1,104 +0,0 @@
-import type { ToolGroup } from '@metro-labs/core/stations/types';
-import { decide, policyFor, setPolicies, type PolicyTarget, type ToolPolicy } from '../policy/policy.js';
-import { serverKeysOf } from './plugin-sync.js';
-import { NEEDS_APPROVAL, revokeToolPrompts, settlePrompts, takeGrant } from '../approvals/pending.js';
-import type { BlockedReason } from './relay-policy.js';
-
-export interface GateRow {
-  id: string;
-  name: string;
-  config: { policy?: ToolPolicy; toolGroups?: Record<string, ToolGroup> };
-}
-
-export interface ConnectorGate {
-  id: string;
-  name: string;
-  server: string;
-  policy: ToolPolicy;
-  tools: Record<string, ToolGroup>;
-}
-
-let gates: ConnectorGate[] = [];
-
-const normalized = (name: string): string => name.replace(/[^a-zA-Z0-9_-]/g, '_');
-
-function approvalChanged(gate: ConnectorGate, tool: string, next: GateRow | undefined, keys: ReadonlyMap<string, string>): boolean {
-  if (next === undefined || gate.server !== keys.get(gate.id) || JSON.stringify([gate.name, gate.policy]) !== JSON.stringify([next.name, next.config.policy ?? {}])) return true;
-  const before = decide(gate.policy, { name: tool, group: toolGroupOf(gate, tool) });
-  const after = decide(next.config.policy, { name: tool, group: next.config.toolGroups?.[tool] === 'read' ? 'read' : 'write' });
-  return before !== after;
-}
-
-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]],
-  );
-  setPolicies('connector', entries);
-}
-
-export const connectorGates = (): readonly ConnectorGate[] => gates;
-
-export const toolGroupOf = (gate: ConnectorGate, tool: string): ToolGroup => (gate.tools[tool] === 'read' ? 'read' : 'write');
-
-const promptFor = (connectorId: string, tool: string) => (asked: string): boolean => {
-  const found = connectorToolOf(asked);
-  return found?.gate.id === connectorId && found.tool === tool;
-};
-
-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 '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}).`;
-  if (access === 'allow' || takeGrant(promptFor(connectorId, tool), args)) return null;
-  return NEEDS_APPROVAL(gate.name, tool);
-}
-
-export function requestConnectorBlocker(): () => BlockedReason {
-  const permits = new Map<string, number>();
-  return () => {
-    const seen = new Map<string, number>();
-    return (id, tool, args) => {
-      const gate = gates.find((entry) => entry.id === id);
-      if (gate === undefined) return 'This organization connector is not available.';
-      const group = toolGroupOf(gate, tool);
-      const access = policyFor({ kind: 'connector', id }, { name: tool, group });
-      if (access !== 'ask') return blockedReason(id, tool, args);
-      const key = JSON.stringify([id, gate.server, gate.policy, group, tool, args]);
-      const occurrence = seen.get(key) ?? 0;
-      seen.set(key, occurrence + 1);
-      if (occurrence < (permits.get(key) ?? 0)) return null;
-      const reason = blockedReason(id, tool, args);
-      if (reason === null) permits.set(key, (permits.get(key) ?? 0) + 1);
-      return reason;
-    };
-  };
-}
-
-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, entries: readonly ConnectorGate[] = gates): { gate: ConnectorGate; tool: string } | undefined {
-  if (toolName.startsWith('mcp__metro__')) 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 undefined;
-}

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

@@ -1,57 +0,0 @@
-import { readFileSync } from 'node:fs';
-import { join } from 'node:path';
-import { isRecord } from '@metro-labs/core/is-record';
-import { errMsg, log } from '@metro-labs/core/log';
-import { agentsDir } from '../agents/files.js';
-import { isOrgRelayId, orgRelayId } from './relay-id.js';
-import { readServerKeys, writeServerKeys } from './server-keys.js';
-
-interface Alias {
-  sourceId: string;
-  relayId: string;
-}
-
-function recordsOf(dir: string): unknown[] {
-  let raw: unknown;
-  try {
-    raw = JSON.parse(readFileSync(join(dir, 'connector-migrations.json'), 'utf8'));
-  } catch (err) {
-    if (isRecord(err) && err.code === 'ENOENT') return [];
-    log.warn({ err: errMsg(err) }, 'connectors: the old migration records could not be read; server keys left as they are');
-    return [];
-  }
-  if (isRecord(raw) && raw.version === 1 && Array.isArray(raw.records)) return raw.records;
-  log.warn('connectors: the old migration records are not valid; server keys left as they are');
-  return [];
-}
-
-function aliasOf(record: unknown): Alias[] {
-  if (!isRecord(record) || record.phase !== 'active' || typeof record.sourceId !== 'string' || typeof record.destinationId !== 'string') return [];
-  const relayId = orgRelayId(record.destinationId);
-  return isOrgRelayId(relayId) && record.sourceId !== relayId ? [{ sourceId: record.sourceId, relayId }] : [];
-}
-
-export function adoptOrgServerKeys(dir = agentsDir()): number {
-  try {
-    const aliases = recordsOf(dir).flatMap(aliasOf);
-    if (aliases.length === 0) return 0;
-    const keys = readServerKeys(dir);
-    if (keys === undefined) return 0;
-    let moved = 0;
-    for (const { sourceId, relayId } of aliases) {
-      const key = keys.get(sourceId);
-      if (key === undefined || keys.has(relayId)) continue;
-      keys.delete(sourceId);
-      keys.set(relayId, key);
-      moved += 1;
-    }
-    if (moved > 0) {
-      writeServerKeys(keys, dir);
-      log.info({ moved }, 'connectors: server keys moved to organization connector ids, tool names unchanged');
-    }
-    return moved;
-  } catch (err) {
-    log.warn({ err: errMsg(err) }, 'connectors: the server keys could not be moved to organization connector ids');
-    return 0;
-  }
-}

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

@@ -1,61 +0,0 @@
-import { isRecord } from '@metro-labs/core/is-record';
-import { ApiError } from '@metro-labs/http/api-error';
-import { screenCalls, type Screened } from './relay-policy.js';
-import type { RelaySession } from './relay-session.js';
-import type { RelayTarget } from './relay-target.js';
-
-type Ready = Extract<RelayTarget, { kind: 'ok' }>;
-type Forward = (target: Ready, body: Uint8Array<ArrayBuffer> | null, signal: AbortSignal) => Promise<Response>;
-type OrgExchange =
-  | { kind: 'response'; upstream: Response; answers: Record<string, unknown>[] }
-  | { kind: 'blocked'; screened: Screened };
-
-const METHODS = new Set(['initialize', 'ping', 'tools/list', 'tools/call', 'notifications/initialized', 'notifications/cancelled']);
-
-function requestBatch(body: Uint8Array | null): boolean {
-  if (body === null) return false;
-  let parsed: unknown;
-  try { parsed = JSON.parse(new TextDecoder().decode(body)); }
-  catch { throw new ApiError('Invalid organization connector request.', 400); }
-  const batch = Array.isArray(parsed);
-  const entries: unknown[] = Array.isArray(parsed) ? parsed : [parsed];
-  if (entries.length === 0 || entries.some((item) => !validMessage(item))) throw new ApiError('This organization connector accepts MCP tool requests only.', 400);
-  return batch;
-}
-
-function validMessage(item: unknown): boolean {
-  if (!isRecord(item) || item.jsonrpc !== '2.0' || typeof item.method !== 'string' || !METHODS.has(item.method)) return false;
-  if (item.method !== 'tools/call') return true;
-  if (!isRecord(item.params) || typeof item.params.name !== 'string' || item.params.name === '') return false;
-  return item.params.arguments === undefined || isRecord(item.params.arguments);
-}
-
-function ready(session: RelaySession, signal: AbortSignal): Ready {
-  if (signal.aborted) throw new ApiError('This organization connector is no longer available.', 503);
-  const target = session.current();
-  if (target.kind === 'missing') throw new ApiError('No such organization connector.', 404);
-  if (target.kind === 'signin') throw new ApiError('This organization connector needs signing in again.', 424);
-  return target;
-}
-
-export async function exchangeOrg(id: string, session: RelaySession, body: Uint8Array<ArrayBuffer> | null, clientSignal: AbortSignal, forward: Forward): Promise<OrgExchange> {
-  const signal = AbortSignal.any([clientSignal, session.signal]);
-  const batch = requestBatch(body);
-  let pending = body;
-  const answers: Record<string, unknown>[] = [];
-  for (let attempt = 0; attempt < 2; attempt += 1) {
-    await session.target(attempt > 0);
-    ready(session, signal);
-    const screened = pending === null ? null : screenCalls(pending, id, session.blocker());
-    if (screened !== null) {
-      answers.push(...screened.answers);
-      pending = screened.forward;
-      if (pending === null) return { kind: 'blocked', screened: { forward: null, answers, batch } };
-    }
-    const target = ready(session, signal);
-    const upstream = await forward(target, pending, signal);
-    if (upstream.status !== 401 && upstream.status !== 403) return { kind: 'response', upstream, answers };
-    await upstream.body?.cancel();
-  }
-  throw new ApiError('The organization connector rejected its credential. Check its sign-in in the organization settings.', 424);
-}