@stage-labs/metro 0.1.0-beta.32 → 0.1.0-beta.321

package/runtime/node_modules/@metro-labs/{mcp/src/daemon/oauth-discovery.ts → http/src/connector-discovery.ts}

@@ -1,4 +1,7 @@
-import { ConnectorVerifyError, parseConnectorUrl } from './connector-verify.js';
+import { isRecord } from '@metro-labs/core/is-record';
+import type { FetchLike } from '@metro-labs/core/stations/oauth';
+import { stringOf } from './api-http.js';
+import { parseConnectorUrl, refused } from './connector-url.js';
 
 const DISCOVERY_TIMEOUT_MS = 10_000;
 
@@ -8,23 +11,18 @@ export interface OAuthServer {
   tokenEndpoint: string;
   registrationEndpoint: string | null;
   supportsS256: boolean;
+  scopes: string[];
 }
 
-function refused(message: string): ConnectorVerifyError {
-  return new ConnectorVerifyError(message, 400);
+interface ResourceMetadata {
+  issuer: URL;
+  scopes: string[];
 }
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-
-const str = (value: unknown): string =>
-  typeof value === 'string' ? value : '';
-
-async function getJson(url: URL): Promise<Record<string, unknown> | null> {
+async function getJson(url: URL, fetchImpl: FetchLike): Promise<Record<string, unknown> | null> {
   let res: Response;
   try {
-    res = await fetch(url, {
+    res = await fetchImpl(url.toString(), {
       redirect: 'manual',
       signal: AbortSignal.timeout(DISCOVERY_TIMEOUT_MS),
       headers: { accept: 'application/json' },
@@ -58,9 +56,9 @@ export function resourceMetadataUrls(resource: URL): URL[] {
   return urls;
 }
 
-export async function advertisesOAuth(resource: URL): Promise<boolean> {
+export async function advertisesOAuth(resource: URL, fetchImpl: FetchLike = fetch): Promise<boolean> {
   for (const candidate of resourceMetadataUrls(resource)) {
-    const body = await getJson(candidate);
+    const body = await getJson(candidate, fetchImpl);
     const servers: unknown = body?.authorization_servers;
     const first: unknown = Array.isArray(servers) ? servers[0] : undefined;
     if (typeof first === 'string' && first !== '') return true;
@@ -68,32 +66,64 @@ export async function advertisesOAuth(resource: URL): Promise<boolean> {
   return false;
 }
 
-async function authServerFor(resource: URL): Promise<URL> {
+function scopesOf(body: Record<string, unknown> | null): string[] {
+  const raw: unknown = body?.scopes_supported;
+  if (!Array.isArray(raw)) return [];
+  const out: string[] = [];
+  for (const entry of raw) {
+    const scope = stringOf(entry).trim();
+    if (scope !== '' && !/\s/.test(scope) && !out.includes(scope)) out.push(scope);
+  }
+  return out;
+}
+
+async function resourceMetadata(resource: URL, fetchImpl: FetchLike): Promise<ResourceMetadata> {
   for (const candidate of resourceMetadataUrls(resource)) {
-    const body = await getJson(candidate);
+    const body = await getJson(candidate, fetchImpl);
     const servers: unknown = body?.authorization_servers;
     const first: unknown = Array.isArray(servers) ? servers[0] : undefined;
     if (typeof first === 'string' && first !== '')
-      return parseConnectorUrl(first);
+      return { issuer: parseConnectorUrl(first), scopes: scopesOf(body) };
   }
-  return parseConnectorUrl(resource.origin);
+  return { issuer: parseConnectorUrl(resource.origin), scopes: [] };
+}
+
+const webAddress = (text: string): boolean => {
+  try {
+    parseConnectorUrl(text);
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+function endpointOf(raw: unknown, issuer: URL): string {
+  const text = stringOf(raw);
+  if (text !== '' && !webAddress(text)) throw refused(`${issuer.hostname} advertises a sign-in address Metro will not open.`);
+  return text;
 }
 
-function toServer(body: Record<string, unknown>, issuer: URL): OAuthServer {
-  const authorizationEndpoint = str(body.authorization_endpoint);
-  const tokenEndpoint = str(body.token_endpoint);
+function toServer(
+  body: Record<string, unknown>,
+  issuer: URL,
+  scopes: string[],
+): OAuthServer {
+  const authorizationEndpoint = endpointOf(body.authorization_endpoint, issuer);
+  const tokenEndpoint = endpointOf(body.token_endpoint, issuer);
   if (authorizationEndpoint === '' || tokenEndpoint === '')
     throw refused(
       `${issuer.hostname} advertises OAuth but not where to sign in.`,
     );
   const methods = body.code_challenge_methods_supported;
-  const registration = str(body.registration_endpoint);
+  const offered = stringOf(body.registration_endpoint);
+  const registration = webAddress(offered) ? offered : '';
   return {
-    issuer: str(body.issuer) === '' ? issuer.origin : str(body.issuer),
+    issuer: stringOf(body.issuer) === '' ? issuer.origin : stringOf(body.issuer),
     authorizationEndpoint,
     tokenEndpoint,
     registrationEndpoint: registration === '' ? null : registration,
     supportsS256: Array.isArray(methods) ? methods.includes('S256') : false,
+    scopes,
   };
 }
 
@@ -108,11 +138,11 @@ export function authServerMetadataUrls(issuer: URL): URL[] {
   return [...aware, new URL(`${path}/.well-known/openid-configuration`, issuer.origin), ...urls];
 }
 
-export async function discoverOAuth(resource: URL): Promise<OAuthServer> {
-  const issuer = await authServerFor(resource);
+export async function discoverOAuth(resource: URL, fetchImpl: FetchLike = fetch): Promise<OAuthServer> {
+  const { issuer, scopes } = await resourceMetadata(resource, fetchImpl);
   for (const candidate of authServerMetadataUrls(issuer)) {
-    const body = await getJson(candidate);
-    if (body !== null) return toServer(body, issuer);
+    const body = await getJson(candidate, fetchImpl);
+    if (body !== null) return toServer(body, issuer, scopes);
   }
   throw refused(
     `${resource.hostname} needs authorization, but publishes no OAuth metadata Metro can use.`,

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

@@ -0,0 +1,8 @@
+import { boundOAuthResource, parsePublicConnectorUrl } from './connector-public-url.js';
+
+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);
+}

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

@@ -0,0 +1,73 @@
+import { ApiError } from './api-error.js';
+import { stringOf } from './api-http.js';
+import type { ConnectorAuth } from './connector-mcp.js';
+import type { OAuthClient } from './connector-oauth.js';
+
+const CONNECTOR_NAME_MAX = 64;
+const HEADER_NAME_RE = /^[A-Za-z0-9!#$%&'*+.^_`|~-]{1,64}$/;
+const HEADER_VALUE_RE = /^[\x20-\x7e]{1,4096}$/;
+const CLIENT_ID_RE = /^[\x21-\x7e]{1,256}$/;
+const CLIENT_SECRET_RE = /^[\x21-\x7e]{1,1024}$/;
+const DEFAULT_HEADER = 'Authorization';
+
+export class ConnectorError extends ApiError {}
+
+function hasControlChar(value: string): boolean {
+  for (const ch of value) {
+    const code = ch.codePointAt(0) ?? 0;
+    if (code < 0x20 || code === 0x7f) return true;
+  }
+  return false;
+}
+
+export function connectorName(raw: unknown): string {
+  const name = typeof raw === 'string' ? raw.trim() : '';
+  if (name === '') throw new ConnectorError('a connector needs a name', 400);
+  if (name.length > CONNECTOR_NAME_MAX)
+    throw new ConnectorError(
+      `a connector name must be ${String(CONNECTOR_NAME_MAX)} characters or fewer`,
+      400,
+    );
+  if (hasControlChar(name))
+    throw new ConnectorError(
+      'a connector name must not contain control characters',
+      400,
+    );
+  return name;
+}
+
+export function connectorAuth(
+  rawHeader: unknown,
+  rawValue: unknown,
+): ConnectorAuth {
+  const header = stringOf(rawHeader).trim();
+  const value = stringOf(rawValue).trim();
+  if (header === '' && value === '') return { kind: 'none' };
+  if (value === '')
+    throw new ConnectorError(
+      'that header has no value. Give both a header name and its value, or neither.',
+      400,
+    );
+  const name = header === '' ? DEFAULT_HEADER : header;
+  if (!HEADER_NAME_RE.test(name) || ['__proto__', 'constructor', 'prototype'].includes(name))
+    throw new ConnectorError('that is not a valid HTTP header name', 400);
+  if (!HEADER_VALUE_RE.test(value))
+    throw new ConnectorError('that header value is not sendable', 400);
+  return { kind: 'header', name, value };
+}
+
+export function connectorClient(
+  rawId: unknown,
+  rawSecret: unknown,
+): OAuthClient | null {
+  const clientId = stringOf(rawId).trim();
+  const clientSecret = stringOf(rawSecret).trim();
+  if (clientId === '' && clientSecret === '') return null;
+  if (clientId === '')
+    throw new ConnectorError('a client secret needs the client ID it belongs to', 400);
+  if (!CLIENT_ID_RE.test(clientId))
+    throw new ConnectorError('that is not a client ID Metro can send', 400);
+  if (clientSecret !== '' && !CLIENT_SECRET_RE.test(clientSecret))
+    throw new ConnectorError('that client secret is not sendable', 400);
+  return { clientId, ...(clientSecret === '' ? {} : { clientSecret }) };
+}

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

@@ -0,0 +1,108 @@
+import { isRecord } from '@metro-labs/core/is-record';
+import type { FetchLike } from '@metro-labs/core/stations/oauth';
+import { ApiError } from './api-error.js';
+import { whyUnreachable } from './connector-reach.js';
+import { ConnectorUnauthorized, refused } from './connector-url.js';
+
+export interface OAuthTokens {
+  accessToken: string;
+  refreshToken?: string;
+  expiresAt?: number;
+}
+
+export interface OAuthAuth extends OAuthTokens {
+  kind: 'oauth';
+  issuer: string;
+  tokenEndpoint: string;
+  clientId: string;
+  clientSecret?: string;
+  scope?: string;
+  resource?: string;
+  tokenEndpointAuthMethod?: string;
+}
+
+export type ConnectorAuth =
+  | { kind: 'none' }
+  | { kind: 'header'; name: string; value: string }
+  | OAuthAuth;
+
+export interface VerifiedServer {
+  server: string;
+}
+
+export interface VerifiedRecord extends VerifiedServer {
+  at: string;
+}
+
+const PROBE_TIMEOUT_MS = 10_000;
+
+export const INITIALIZE = {
+  jsonrpc: '2.0',
+  id: 1,
+  method: 'initialize',
+  params: { protocolVersion: '2025-11-25', capabilities: {}, clientInfo: { name: 'metro', version: '0.1.0' } },
+};
+
+export function authHeaders(auth: ConnectorAuth): Record<string, string> {
+  if (auth.kind === 'header') return { [auth.name]: auth.value };
+  if (auth.kind === 'oauth') return { Authorization: `Bearer ${auth.accessToken}` };
+  return {};
+}
+
+export function payloadOf(text: string, contentType: string): string {
+  if (!contentType.includes('text/event-stream')) return text;
+  for (const line of text.replace(/\r\n/g, '\n').split('\n')) if (line.startsWith('data:')) return line.slice(5).trim();
+  return '';
+}
+
+export async function mcpPost(
+  url: URL,
+  auth: ConnectorAuth,
+  body: unknown,
+  opts: { timeoutMs: number; headers?: Record<string, string>; fetch?: FetchLike },
+): Promise<Response> {
+  const send = opts.fetch ?? fetch;
+  try {
+    return await send(url.toString(), {
+      method: 'POST',
+      redirect: 'manual',
+      signal: AbortSignal.timeout(opts.timeoutMs),
+      headers: { 'content-type': 'application/json', accept: 'application/json, text/event-stream', ...authHeaders(auth), ...opts.headers },
+      body: JSON.stringify(body),
+    });
+  } catch (err) {
+    if (err instanceof ApiError) throw err;
+    throw refused(`Metro could not reach ${url.hostname}: ${whyUnreachable(err)}`);
+  }
+}
+
+function serverNameOf(url: URL, text: string, contentType: string): string {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(payloadOf(text, contentType));
+  } catch {
+    throw refused(`${url.hostname} answered, but it does not speak MCP.`);
+  }
+  const result = isRecord(parsed) && isRecord(parsed.result) ? parsed.result : null;
+  if (result === null || typeof result.protocolVersion !== 'string') throw refused(`${url.hostname} answered, but it does not speak MCP.`);
+  const info = isRecord(result.serverInfo) ? result.serverInfo : {};
+  const title = typeof info.title === 'string' ? info.title : '';
+  if (title !== '') return title;
+  return typeof info.name === 'string' ? info.name : url.hostname;
+}
+
+function refuseStatus(res: Response, url: URL, auth: ConnectorAuth): void {
+  if (res.status >= 300 && res.status < 400) throw refused('that url redirects. Use the url it redirects to.');
+  if (res.status === 401 || res.status === 403)
+    throw new ConnectorUnauthorized(auth.kind === 'none' ? `${url.hostname} requires authorization.` : `${url.hostname} rejected that credential.`, 400);
+  if (res.status === 404 || res.status === 405)
+    throw refused(`${url.hostname} did not accept an MCP initialize over HTTP POST. If it is a legacy SSE server, Metro cannot verify it yet.`);
+  if (!res.ok) throw refused(`${url.hostname} answered ${String(res.status)} instead of an MCP initialize.`);
+}
+
+export async function verifyRemoteMcp(url: URL, auth: ConnectorAuth, fetchImpl: FetchLike = fetch): Promise<VerifiedServer> {
+  const res = await mcpPost(url, auth, INITIALIZE, { timeoutMs: PROBE_TIMEOUT_MS, fetch: fetchImpl });
+  const text = await res.text().catch(() => '');
+  refuseStatus(res, url, auth);
+  return { server: serverNameOf(url, text, res.headers.get('content-type') ?? '') };
+}

package/runtime/node_modules/@metro-labs/{mcp/src/daemon/oauth-client.ts → http/src/connector-oauth.ts}

@@ -1,26 +1,23 @@
 import { createHash, randomBytes } from 'node:crypto';
-import {
-  ConnectorVerifyError,
-  type OAuthTokens,
-} from './connector-verify.js';
-import type { OAuthServer } from './oauth-discovery.js';
+import { isRecord } from '@metro-labs/core/is-record';
+import type { FetchLike } from '@metro-labs/core/stations/oauth';
+import { whyUnreachable } from './connector-reach.js';
+import { ConnectorVerifyError, refused } from './connector-url.js';
+import type { OAuthTokens } from './connector-mcp.js';
+import type { OAuthServer } from './connector-discovery.js';
 
 const TOKEN_TIMEOUT_MS = 15_000;
 const CLIENT_NAME = 'Metro';
 
+export class OAuthInvalidGrant extends ConnectorVerifyError {}
+
+const SIGN_IN_AGAIN = new Set(['invalid_grant', 'invalid_client', 'unauthorized_client']);
+
 export interface OAuthClient {
   clientId: string;
   clientSecret?: string;
 }
 
-function refused(message: string): ConnectorVerifyError {
-  return new ConnectorVerifyError(message, 400);
-}
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-
 export function newVerifier(): string {
   return randomBytes(32).toString('base64url');
 }
@@ -32,14 +29,17 @@ export function challengeOf(verifier: string): string {
 export async function registerClient(
   server: OAuthServer,
   redirectUri: string,
+  fetchImpl: FetchLike = fetch,
 ): Promise<OAuthClient> {
   if (server.registrationEndpoint === null)
     throw refused(
-      'That server requires OAuth but does not accept client registration, so Metro cannot sign in to it.',
+      'That server signs in with OAuth but registers no clients on its own. ' +
+        `Register an app with it yourself, with ${redirectUri} as its redirect URL, ` +
+        "and add the connector again with that app's client ID.",
     );
   let res: Response;
   try {
-    res = await fetch(server.registrationEndpoint, {
+    res = await fetchImpl(server.registrationEndpoint, {
       method: 'POST',
       redirect: 'manual',
       signal: AbortSignal.timeout(TOKEN_TIMEOUT_MS),
@@ -52,8 +52,8 @@ export async function registerClient(
         token_endpoint_auth_method: 'none',
       }),
     });
-  } catch {
-    throw refused('Metro could not reach that server to register.');
+  } catch (err) {
+    throw refused(`Metro could not reach that server to register: ${whyUnreachable(err)}`);
   }
   const body: unknown = await res.json().catch(() => null);
   if (!res.ok || !isRecord(body) || typeof body.client_id !== 'string')
@@ -83,21 +83,37 @@ export function authorizeUrl(input: AuthorizeInput): string {
   url.searchParams.set('code_challenge', challengeOf(input.verifier));
   url.searchParams.set('code_challenge_method', 'S256');
   url.searchParams.set('resource', input.resource);
+  if (input.server.scopes.length > 0)
+    url.searchParams.set('scope', input.server.scopes.join(' '));
   return url.toString();
 }
 
+function validateOptionalTokens(body: Record<string, unknown>): void {
+  const refresh = body.refresh_token;
+  if (Object.hasOwn(body, 'refresh_token') && (typeof refresh !== 'string' || !/^[\x21-\x7e]{1,16384}$/.test(refresh))) throw refused('That server returned an invalid refresh token.');
+  if (Object.hasOwn(body, 'token_type') && (typeof body.token_type !== 'string' || body.token_type.toLowerCase() !== 'bearer')) throw refused('That server returned an unsupported token type.');
+}
+
+function expiryFrom(body: Record<string, unknown>): number | undefined {
+  if (!Object.hasOwn(body, 'expires_in')) return undefined;
+  const expires = body.expires_in;
+  if (typeof expires !== 'number' || !Number.isFinite(expires) || expires <= 0) throw refused('That server returned an invalid token expiry.');
+  const at = Date.now() + expires * 1000;
+  if (!Number.isSafeInteger(at)) throw refused('That server returned an invalid token expiry.');
+  return at;
+}
+
 function tokensFrom(body: Record<string, unknown>): OAuthTokens {
   const access = body.access_token;
-  if (typeof access !== 'string' || access === '')
-    throw refused('That server did not return an access token.');
+  if (typeof access !== 'string' || !/^[\x21-\x7e]{1,16377}$/.test(access))
+    throw refused('That server did not return a sendable access token.');
+  validateOptionalTokens(body);
+  const expiresAt = expiryFrom(body);
   const refresh = body.refresh_token;
-  const expires = body.expires_in;
   return {
     accessToken: access,
     ...(typeof refresh === 'string' ? { refreshToken: refresh } : {}),
-    ...(typeof expires === 'number'
-      ? { expiresAt: Date.now() + expires * 1000 }
-      : {}),
+    ...(expiresAt === undefined ? {} : { expiresAt }),
   };
 }
 
@@ -105,6 +121,7 @@ async function postToken(
   server: OAuthServer,
   client: OAuthClient,
   form: Record<string, string>,
+  fetchImpl: FetchLike,
 ): Promise<OAuthTokens> {
   const params = new URLSearchParams({
     ...form,
@@ -115,7 +132,7 @@ async function postToken(
   });
   let res: Response;
   try {
-    res = await fetch(server.tokenEndpoint, {
+    res = await fetchImpl(server.tokenEndpoint, {
       method: 'POST',
       redirect: 'manual',
       signal: AbortSignal.timeout(TOKEN_TIMEOUT_MS),
@@ -125,12 +142,20 @@ async function postToken(
       },
       body: params.toString(),
     });
-  } catch {
-    throw refused('Metro could not reach that server to finish signing in.');
+  } catch (err) {
+    throw refused(`Metro could not reach that server to finish signing in: ${whyUnreachable(err)}`);
   }
-  const body: unknown = await res.json().catch(() => null);
-  if (!res.ok || !isRecord(body))
-    throw refused('That server refused to complete the sign-in.');
+  return tokenAnswer(form.grant_type === 'refresh_token', res.status, res.ok, await res.json().catch(() => null));
+}
+
+const errorCode = (body: unknown): string | null => (isRecord(body) && typeof body.error === 'string' && /^[a-z_]{1,64}$/.test(body.error) ? body.error : null);
+
+const grantGone = (refreshing: boolean, status: number, code: string | null): boolean => refreshing && (status === 400 || status === 401) && code !== null && SIGN_IN_AGAIN.has(code);
+
+function tokenAnswer(refreshing: boolean, status: number, ok: boolean, body: unknown): OAuthTokens {
+  const code = errorCode(body);
+  if (grantGone(refreshing, status, code)) throw new OAuthInvalidGrant('That server requires a new sign-in.', 400);
+  if (!ok || !isRecord(body)) throw refused(`That server refused to complete the sign-in (${String(status)}${code === null ? '' : ` ${code}`}).`);
   return tokensFrom(body);
 }
 
@@ -138,6 +163,7 @@ export function exchangeCode(
   server: OAuthServer,
   client: OAuthClient,
   input: { code: string; redirectUri: string; verifier: string; resource: string },
+  fetchImpl: FetchLike = fetch,
 ): Promise<OAuthTokens> {
   return postToken(server, client, {
     grant_type: 'authorization_code',
@@ -145,7 +171,7 @@ export function exchangeCode(
     redirect_uri: input.redirectUri,
     code_verifier: input.verifier,
     resource: input.resource,
-  });
+  }, fetchImpl);
 }
 
 export function refreshTokens(
@@ -153,10 +179,13 @@ export function refreshTokens(
   client: OAuthClient,
   refreshToken: string,
   resource: string,
+  scope?: string,
+  fetchImpl: FetchLike = fetch,
 ): Promise<OAuthTokens> {
   return postToken(server, client, {
     grant_type: 'refresh_token',
     refresh_token: refreshToken,
     resource,
-  });
+    ...(scope === undefined ? {} : { scope }),
+  }, fetchImpl);
 }

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

@@ -0,0 +1,92 @@
+import { isRecord } from '@metro-labs/core/is-record';
+
+export type ConnectorDecision = 'allow' | 'ask' | 'deny';
+
+type ToolGroup = 'read' | 'write';
+
+export interface ConnectorPolicy {
+  read?: ConnectorDecision;
+  write?: ConnectorDecision;
+  tools?: Record<string, ConnectorDecision>;
+}
+
+export interface ConnectorPolicyLayers {
+  organization: ConnectorPolicy;
+  agent: ConnectorPolicy;
+}
+
+const RANK: Record<ConnectorDecision, number> = { allow: 0, ask: 1, deny: 2 };
+const TOOL_RE = /^[A-Za-z0-9_.:/-]{1,256}$/;
+
+export const validConnectorToolName = (name: string): boolean => TOOL_RE.test(name) && !['__proto__', 'constructor', 'prototype'].includes(name);
+
+const decision = (value: unknown): value is ConnectorDecision => value === 'allow' || value === 'ask' || value === 'deny';
+
+export function connectorPolicyOf(value: unknown): ConnectorPolicy {
+  if (!isRecord(value) || Object.keys(value).some((key) => !['read', 'write', 'tools'].includes(key))) throw new Error('Invalid connector policy.');
+  const out: ConnectorPolicy = {};
+  for (const group of ['read', 'write'] as const) {
+    if (!Object.hasOwn(value, group)) continue;
+    const field = value[group];
+    if (!decision(field)) throw new Error('Invalid connector policy.');
+    out[group] = field;
+  }
+  if (Object.hasOwn(value, 'tools')) out.tools = toolPolicyOf(value.tools);
+  return out;
+}
+
+function toolPolicyOf(value: unknown): Record<string, ConnectorDecision> {
+  if (!isRecord(value) || Object.keys(value).length > 2000) throw new Error('Invalid connector policy.');
+  const out: Record<string, ConnectorDecision> = {};
+  for (const [name, rule] of Object.entries(value)) {
+    if (!validConnectorToolName(name) || !decision(rule)) throw new Error('Invalid connector policy.');
+    out[name] = rule;
+  }
+  return out;
+}
+
+export function connectorPolicyLayersOf(value: unknown): ConnectorPolicyLayers {
+  if (!isRecord(value) || Object.keys(value).some((key) => !['organization', 'agent'].includes(key))) throw new Error('Invalid connector policy layers.');
+  return { organization: connectorPolicyOf(value.organization), agent: connectorPolicyOf(value.agent) };
+}
+
+const strictest = (...values: (ConnectorDecision | undefined)[]): ConnectorDecision => values.reduce<ConnectorDecision>((held, next) => next !== undefined && RANK[next] > RANK[held] ? next : held, 'allow');
+const toolRule = (policy: ConnectorPolicy, name: string): ConnectorDecision | undefined => policy.tools !== undefined && Object.hasOwn(policy.tools, name) ? policy.tools[name] : undefined;
+const toolGroup = (groups: Record<string, ToolGroup>, name: string): ToolGroup => Object.hasOwn(groups, name) && groups[name] === 'read' ? 'read' : 'write';
+const access = (policy: ConnectorPolicy, name: string, group: ToolGroup): ConnectorDecision => toolRule(policy, name) ?? policy[group] ?? 'allow';
+
+export function combineConnectorPolicies(global: ConnectorPolicy, assignment: ConnectorPolicy, groups?: Record<string, ToolGroup>): ConnectorPolicy {
+  const policies = [connectorPolicyOf(global), connectorPolicyOf(assignment)];
+  const neutral = (policy: ConnectorPolicy): boolean => (policy.read ?? 'allow') === 'allow' && (policy.write ?? 'allow') === 'allow' && Object.keys(policy.tools ?? {}).length === 0;
+  if (neutral(assignment)) return connectorPolicyOf(global);
+  if (neutral(global)) return connectorPolicyOf(assignment);
+  const out: ConnectorPolicy = {
+    read: strictest(...policies.map((policy) => policy.read)),
+    write: strictest(...policies.map((policy) => policy.write)),
+  };
+  const names = new Set(policies.flatMap((policy) => Object.keys(policy.tools ?? {})));
+  if (groups === undefined && names.size > 2000) return { read: 'deny', write: 'deny' };
+  if (names.size > 0) {
+    out.tools = {};
+    for (const name of names) {
+      out.tools[name] = groups === undefined
+        ? strictest(...policies.flatMap((policy) => [policy.read, policy.write, toolRule(policy, name)]))
+        : strictest(...policies.map((policy) => access(policy, name, toolGroup(groups, name))));
+    }
+  }
+  return out;
+}
+
+export function effectiveConnectorPolicy(row: { policy: ConnectorPolicy; policyLayers?: ConnectorPolicyLayers }, groups: Record<string, ToolGroup>): ConnectorPolicy {
+  const layers = row.policyLayers;
+  return layers === undefined ? connectorPolicyOf(row.policy) : combineConnectorPolicies(layers.organization, layers.agent, groups);
+}
+
+export function connectorPoliciesBlocked(layers: ConnectorPolicyLayers): boolean {
+  const policies = [layers.organization, layers.agent];
+  const names = new Set(policies.flatMap((policy) => Object.keys(policy.tools ?? {})));
+  return (['read', 'write'] as const).every((group) =>
+    strictest(...policies.map((policy) => policy[group])) === 'deny' &&
+    [...names].every((name) => strictest(...policies.map((policy) => access(policy, name, group))) === 'deny'),
+  );
+}

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

@@ -0,0 +1,64 @@
+import { BlockList, isIP } from 'node:net';
+import { parseConnectorUrl, refused } from './connector-url.js';
+
+const blocked = new BlockList();
+for (const [address, prefix] of [
+  ['0.0.0.0', 8], ['10.0.0.0', 8], ['100.64.0.0', 10], ['127.0.0.0', 8], ['169.254.0.0', 16], ['172.16.0.0', 12],
+  ['192.0.0.0', 24], ['192.0.2.0', 24], ['192.88.99.0', 24], ['192.168.0.0', 16], ['198.18.0.0', 15],
+  ['198.51.100.0', 24], ['203.0.113.0', 24], ['224.0.0.0', 4], ['240.0.0.0', 4],
+] as const) blocked.addSubnet(address, prefix, 'ipv4');
+for (const [address, prefix] of [
+  ['2001::', 32], ['2001:10::', 28], ['2001:20::', 28], ['2001:db8::', 32], ['2002::', 16],
+] as const) blocked.addSubnet(address, prefix, 'ipv6');
+const globalV6 = new BlockList();
+globalV6.addSubnet('2000::', 3, 'ipv6');
+
+export function publicConnectorAddress(address: string, family: number): boolean {
+  if (family === 4) return isIP(address) === 4 && !blocked.check(address, 'ipv4');
+  return isIP(address) === 6 && globalV6.check(address, 'ipv6') && !blocked.check(address, 'ipv6');
+}
+
+function publicHost(host: string): boolean {
+  const family = isIP(host);
+  if (family !== 0) return publicConnectorAddress(host, family);
+  if (/(^|\.)(localhost|local|internal|lan|home|invalid|test|onion)$/.test(host)) return false;
+  return host.includes('.') && host.split('.').every((label) => /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(label));
+}
+
+function invalidText(raw: string): boolean {
+  return raw.length > 2048 || /[\s\\#]/.test(raw) || /%(?![0-9a-f]{2})/i.test(raw);
+}
+
+export function parsePublicConnectorUrl(raw: unknown): URL {
+  const invalid = (): never => { throw refused('An organization endpoint must be a public HTTPS URL without user information or a fragment.'); };
+  if (typeof raw !== 'string' || invalidText(raw)) return invalid();
+  const authority = /^https:\/\/([^/ ?#]+)/i.exec(raw)?.[1];
+  if (authority === undefined || authority.includes('@')) return invalid();
+  let url: URL;
+  try { url = parseConnectorUrl(raw); } catch { return invalid(); }
+  if (url.toString().length > 2048 || !publicHost(url.hostname.replace(/^\[|\]$/g, ''))) return invalid();
+  return url;
+}
+
+export function publicOAuthResource(raw: unknown): string {
+  try {
+    const url = parsePublicConnectorUrl(raw);
+    if (typeof raw === 'string' && !raw.includes('?') && url.search === '') return raw;
+  } catch {
+    throw refused('The public OAuth resource must be a public HTTPS identifier without a query, user information or a fragment. Do not enter credentials.');
+  }
+  throw refused('The public OAuth resource must be a public HTTPS identifier without a query, user information or a fragment. Do not enter credentials.');
+}
+
+export function optionalOAuthResource(raw: unknown): string | undefined {
+  return raw === undefined || raw === '' ? undefined : publicOAuthResource(raw);
+}
+
+export function boundOAuthResource(target: string, raw: unknown): string {
+  const resource = publicOAuthResource(raw);
+  const transport = parsePublicConnectorUrl(target);
+  const url = new URL(resource);
+  const path = url.pathname.replace(/\/$/, '');
+  if (url.origin !== transport.origin || !(path === '' || transport.pathname === path || transport.pathname.startsWith(`${path}/`))) throw refused('The public OAuth resource does not identify this endpoint. Check the provider’s documented resource.');
+  return resource;
+}