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

package/runtime/node_modules/@metro-labs/{mcp → daemon}/src/mcp/session.ts

@@ -1,20 +1,21 @@
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { InboundRelay } from '../channels/inbound.js';
+import { answerPrompt, forgetPromptsOf, promptLine } from '../approvals/pending.js';
+import { noteOwnerLine } from '../approvals/owner-line.js';
 import { ChannelRelay, type ReplayLedger } from '../channels/relay.js';
-import { errMsg } from '../daemon/log.js';
-import {
-  allowlistForLine,
-  senderMatchesAllowlist,
-} from '../db/agent-map.js';
-import { accountStationNames } from '../stations/registry.js';
-import { MCP_INSTRUCTIONS } from './tool-schemas.js';
-import { ChannelOwner } from './channel-owner.js';
+import { errMsg } from '@metro-labs/core/log';
+import { allowlistForLine, mayApprove, senderPermitted } from '../agents/map.js';
+import { accountStationNames, stationByName } from '../stations/registry.js';
+import { eventInScope } from '../agents/scope.js';
+import { MCP_INSTRUCTIONS } from './instructions.js';
 import { BoundedEventStore } from './event-store.js';
 import { registerPermissionRelay } from './permission-relay.js';
 import { registerToolHandlers, toolSchemaSignature } from './tool-dispatch.js';
 import { web, type RawGetSink } from './raw-get-stream.js';
-import type { RequestIdentity } from './request-identity.js';
+import { sharedCalls } from '../voice/shared.js';
+import { CALL_STATE } from '@metro-labs/core/call';
+import { clientDiagnostic, diagnosticTag, type SessionDiagnostic } from './diagnostics.js';
 
 export const channelLog = (...a: unknown[]): void => {
   console.error('[metro-mcp]', ...a);
@@ -22,11 +23,20 @@ export const channelLog = (...a: unknown[]): void => {
 
 const getStations = (): Set<string> => new Set(accountStationNames());
 
-const senderAllowed = (from: string, line: string): boolean => {
-  const allowlist = allowlistForLine(line);
-  return allowlist ? senderMatchesAllowlist(allowlist, from) : true;
+const senderAllowed = (from: string, line: string, verified?: boolean): boolean =>
+  senderPermitted(allowlistForLine(line), from, verified);
+
+const approves = (station: string): boolean => stationByName(station)?.approvals !== false;
+
+const noteDirect = (line: string, from: string): void => {
+  if (mayApprove(line, from)) noteOwnerLine(line, from);
 };
 
+async function answerPermission(requestId: string, behavior: 'allow' | 'deny', line: string, from: string): Promise<boolean> {
+  if (promptLine(requestId) !== line || !mayApprove(line, from)) return false;
+  return (await answerPrompt(requestId, behavior, 'chat', line)) !== undefined;
+}
+
 function makeTransport(
   id: string,
   eventStore: BoundedEventStore,
@@ -47,51 +57,48 @@ function makeTransport(
 
 export interface SessionInit {
   id: string;
-  scopeKey: string;
+  scope: Set<string>;
   adopted: boolean;
   ledger: ReplayLedger;
+  live: () => boolean;
   onClosed: (session: McpSession) => void;
 }
 
 export class McpSession {
   readonly id: string;
-  readonly scopeKey: string;
-  readonly owner = new ChannelOwner();
+  readonly scope: Set<string>;
   readonly eventStore: BoundedEventStore;
   readonly transport: StreamableHTTPServerTransport;
   readonly server: Server;
   readonly relay: InboundRelay;
   readonly channel: ChannelRelay;
-  lastSeenAt = Date.now();
+  readonly live: () => boolean;
   private sink: RawGetSink | undefined;
   private unsubscribe: (() => void) | undefined;
   private closed = false;
   private issuedSchema: string | undefined;
   private announcing = false;
   private readonly onClosed: (session: McpSession) => void;
+  private readonly openedAt = new Date().toISOString();
+  private clientInitializedAt: string | null = null;
+  private lastStreamAttachedAt: string | null = null;
+  private lastStreamDetachedAt: string | null = null;
 
   private constructor(init: SessionInit) {
     this.id = init.id;
-    this.scopeKey = init.scopeKey;
+    this.scope = init.scope;
+    this.live = init.live;
     this.issuedSchema = init.adopted ? undefined : toolSchemaSignature();
     this.onClosed = init.onClosed;
-    this.eventStore = new BoundedEventStore({
-      scopeOf: () => this.owner.scope(),
-    });
+    this.eventStore = new BoundedEventStore();
     this.transport = makeTransport(init.id, this.eventStore, init.adopted);
     this.server = new Server(
       { name: 'metro', version: '0.1.0' },
-      {
-        capabilities: {
-          experimental: {
-            'claude/channel': {},
-            'claude/channel/permission': {},
-          },
-          tools: { listChanged: true },
-        },
-        instructions: MCP_INSTRUCTIONS,
-      },
+      { capabilities: { tools: { listChanged: true } }, instructions: MCP_INSTRUCTIONS },
     );
+    this.server.oninitialized = (): void => {
+      this.clientInitializedAt = new Date().toISOString();
+    };
     registerToolHandlers(this.server, {
       markCurrent: (): void => {
         this.issuedSchema = toolSchemaSignature();
@@ -99,23 +106,32 @@ export class McpSession {
       deliver: (send): void => {
         this.deliverSchemaNotice(send, 'request');
       },
+    }, {
+      onSent: (id): void => {
+        this.relay.noteSent(id);
+      },
     });
     this.relay = new InboundRelay({
       mcp: this.server,
       log: channelLog,
       getStations,
       senderAllowed,
+      approves,
+      noteDirect,
+      answerPermission,
+      callMeta: (event) => sharedCalls.bindChat(event, this.scope),
     });
     registerPermissionRelay({
       mcp: this.server,
       relay: this.relay,
-      owner: this.owner,
+      inScope: (line) => this.inScope(line),
+      live: this.live,
       log: channelLog,
     });
     this.channel = new ChannelRelay({
       relay: this.relay,
       log: channelLog,
-      inScope: (line) => this.owner.inScope(line),
+      inScope: (line) => this.live() && this.inScope(line),
       ledger: init.ledger,
     });
   }
@@ -139,28 +155,70 @@ export class McpSession {
     return this.sink;
   }
 
-  touch(): void {
-    this.lastSeenAt = Date.now();
+  diagnostics(): SessionDiagnostic {
+    return {
+      tag: diagnosticTag(this.id),
+      openedAt: this.openedAt,
+      transportInitialized: web(this.transport)?._initialized === true,
+      clientInitializedAt: this.clientInitializedAt,
+      client: clientDiagnostic(this.server.getClientVersion()),
+      subscribed: this.unsubscribe !== undefined,
+      streamAttached: this.streamAttached,
+      lastStreamAttachedAt: this.lastStreamAttachedAt,
+      lastStreamDetachedAt: this.lastStreamDetachedAt,
+      stream: this.sink?.diagnostics() ?? null,
+    };
+  }
+
+  inScope(line: string): boolean {
+    return this.streamAttached && eventInScope(this.scope, line);
   }
 
   startChannel(): void {
     this.unsubscribe ??= this.channel.start();
   }
 
-  bindSink(sink: RawGetSink | undefined, identity: RequestIdentity): void {
-    this.sink = sink;
-    if (sink === undefined) {
-      this.owner.releaseStream();
+  stopChannel(): void {
+    this.unsubscribe?.();
+    this.unsubscribe = undefined;
+  }
+
+  replayMissed(): void {
+    if (this.live()) this.channel.replayMissed();
+  }
+
+  bindSink(sink: RawGetSink | undefined): void {
+    if (this.closed) {
+      sink?.close();
       return;
     }
-    this.owner.bindStream(identity);
-    this.announceToolSchema();
+    if (sink === undefined && this.sink !== undefined) this.lastStreamDetachedAt = new Date().toISOString();
+    this.sink = sink;
+    if (sink !== undefined) {
+      this.lastStreamAttachedAt = new Date().toISOString();
+      this.announceCallState();
+      this.announceToolSchema();
+    }
+  }
+
+  private announceCallState(): void {
+    if (!this.streamAttached || this.server.getClientVersion()?.name !== 'metro-sdk-runner') return;
+    const active = sharedCalls.snapshot();
+    const route = active !== null && this.scope.has(active.agentId) && eventInScope(this.scope, active.line) ? active : null;
+    this.server.notification({ method: CALL_STATE, params: { route, ...(route === null ? {} : { meta: { line: route.line } }) } }).catch((err: unknown) => {
+      channelLog('session: call state notification failed', errMsg(err));
+      if (route !== null) sharedCalls.end(route);
+    });
   }
 
   private get schemaNoticeDue(): boolean {
     return this.issuedSchema !== toolSchemaSignature();
   }
 
+  toolsChanged(): void {
+    this.announceToolSchema();
+  }
+
   private announceToolSchema(): void {
     if (!this.streamAttached) return;
     this.deliverSchemaNotice(
@@ -172,15 +230,7 @@ export class McpSession {
   private deliverSchemaNotice(send: () => Promise<void>, via: string): void {
     if (!this.schemaNoticeDue || this.announcing) return;
     this.announcing = true;
-    channelLog(
-      'session: tool list changed',
-      'id',
-      this.id,
-      'scope',
-      this.scopeKey,
-      'via',
-      via,
-    );
+    channelLog('session: tool list changed', 'id', this.id, 'via', via);
     send()
       .then(() => {
         this.issuedSchema = toolSchemaSignature();
@@ -194,18 +244,19 @@ export class McpSession {
 
   dropStream(): void {
     const sink = this.sink;
+    if (sink !== undefined) this.lastStreamDetachedAt = new Date().toISOString();
     this.sink = undefined;
-    this.owner.releaseStream();
     sink?.close();
   }
 
   async close(): Promise<void> {
     if (this.closed) return;
     this.closed = true;
+    sharedCalls.revoke();
     this.onClosed(this);
+    forgetPromptsOf(this.server);
     this.dropStream();
-    this.unsubscribe?.();
-    this.unsubscribe = undefined;
+    this.stopChannel();
     await this.server.close().catch(() => undefined);
   }
 }

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

@@ -0,0 +1,11 @@
+export const speechSchema = {
+  type: 'object',
+  description: 'Speak text only in the exact active Stage call, without posting it in chat. Copy callId, generation and sourceId from its authenticated call input or call_id, call_generation and call_source_id from the requesting channel message. Use only for a call reply or an explicit owner request to speak in that call. Normal chat and worker results stay silent. One action per source; retries do not repeat speech. Accepted or queued is not heard. Completed means audio transport drained, not proof the caller heard it.',
+  properties: {
+    callId: { type: 'string' },
+    generation: { type: 'string' },
+    sourceId: { type: 'string' },
+  },
+  required: ['callId', 'generation', 'sourceId'],
+  additionalProperties: false,
+} as const;

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

@@ -0,0 +1,15 @@
+import { speechTarget } from '@metro-labs/core/call';
+import type { ToolResult } from '@metro-labs/core/stations/types';
+import { sharedCalls } from '../voice/shared.js';
+import { allowedAgents, currentIdentity } from './request-identity.js';
+import { errResult, okJson } from './ctx.js';
+
+export function sendSpeech(line: string, args: Record<string, unknown>): ToolResult {
+  const target = speechTarget(args.speech);
+  if (target === null) return errResult('Call speech needs callId, generation and sourceId from its authenticated source.');
+  if (['reply_to', 'subject', 'attachments', 'frame', 'wallet', 'account'].some((key) => args[key] !== undefined))
+    return errResult('Call speech cannot include chat content, media or an account override. Nothing was sent.');
+  if (typeof args.text !== 'string') return errResult('Call speech needs text.');
+  const receipt = sharedCalls.speak(line, target, args.text, allowedAgents(currentIdentity()));
+  return okJson({ speech: receipt, delivery: 'Audio transport status only. No proof the caller heard it. No chat message was posted.' });
+}

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

@@ -0,0 +1,108 @@
+import type { GroupOp, Station, StationTool, ToolGroup } from '@metro-labs/core/stations/types';
+import { TOOL_CALL, TOOL_SEARCH } from '@metro-labs/http/mcp-server-protocol';
+import { connectorTools } from '../mcp-server/connector-tools.js';
+import { STATIONS } from '../stations/registry.js';
+import { COMMON_TOOLS, LIST_ACCOUNTS_TOOL } from './tool-schemas.js';
+import { SET_PROFILE_TOOL } from './profile-tool.js';
+import { GET_PROFILE_TOOL } from './profile-lookup.js';
+import { LIST_CHANNELS_TOOL } from './channel-tool.js';
+import type { ToolDef } from './tool-def.js';
+
+const defOf = (tool: StationTool): ToolDef => ({
+  name: tool.name,
+  description: tool.description,
+  inputSchema: tool.inputSchema,
+  ...(tool.group === undefined ? {} : { group: tool.group }),
+  ...(tool.destructive === true ? { destructive: true } : {}),
+});
+
+const LOCAL_DEFS: ToolDef[] = [
+  ...COMMON_TOOLS,
+  ...STATIONS.flatMap((s) => s.tools.map(defOf)),
+  LIST_ACCOUNTS_TOOL,
+  LIST_CHANNELS_TOOL,
+  SET_PROFILE_TOOL,
+  GET_PROFILE_TOOL,
+];
+
+const CONNECTOR_GROUPS: Record<string, Pick<ToolDef, 'group' | 'destructive'>> = {
+  [TOOL_SEARCH]: { group: 'read' },
+  [TOOL_CALL]: { group: 'write', destructive: true },
+};
+
+export const TOOL_DEFS: ToolDef[] = [
+  ...LOCAL_DEFS,
+  ...connectorTools().map((tool) => ({ name: tool.name, description: tool.description, inputSchema: tool.inputSchema, ...CONNECTOR_GROUPS[tool.name] })),
+];
+
+const BY_NAME = new Map(TOOL_DEFS.map((d) => [d.name, d] as const));
+
+export const declaredGroup = (name: string): ToolGroup | undefined => BY_NAME.get(name)?.group;
+
+export const toolGroupOf = (name: string): ToolGroup => declaredGroup(name) ?? 'write';
+
+export type ToolAnnotations = Record<string, unknown>;
+
+export interface PublishedTool {
+  name: string;
+  title?: string;
+  description: string;
+  inputSchema: Record<string, unknown>;
+  annotations: ToolAnnotations;
+  _meta?: Record<string, boolean>;
+}
+
+const ALWAYS_LOADED = new Set(['react', 'typing', 'send', 'reply']);
+const ALWAYS_LOAD = { 'anthropic/alwaysLoad': true };
+
+const annotationsOf = (def: ToolDef): ToolAnnotations =>
+  toolGroupOf(def.name) === 'read'
+    ? { readOnlyHint: true }
+    : { readOnlyHint: false, destructiveHint: def.destructive === true };
+
+export const listedTools = (): PublishedTool[] => [
+  ...LOCAL_DEFS.map((def) => ({
+    name: def.name,
+    description: def.description,
+    inputSchema: def.inputSchema,
+    annotations: annotationsOf(def),
+    ...(ALWAYS_LOADED.has(def.name) ? { _meta: ALWAYS_LOAD } : {}),
+  })),
+  ...connectorTools().map((tool) => ({ ...tool, _meta: ALWAYS_LOAD })),
+];
+
+const STATION_OF_TOOL = new Map(STATIONS.flatMap((s) => s.tools.map((t) => [t.name, s.name] as const)));
+
+export const stationToolOwners = (): Record<string, string> => Object.fromEntries(STATION_OF_TOOL);
+
+export function stationForTool(name: string, args: Record<string, unknown>): string | undefined {
+  if (name === 'create_group' || name === 'set_profile')
+    return typeof args.station === 'string' && args.station !== '' ? args.station : undefined;
+  return STATION_OF_TOOL.get(name);
+}
+
+const GROUP_OP_TOOLS: Record<GroupOp, string> = {
+  create_group: 'create_group',
+  add_members: 'add_members',
+  remove_members: 'remove_members',
+  invite_link: 'export_invite',
+};
+
+export interface GroupedTool {
+  name: string;
+  group: ToolGroup;
+}
+
+export const stationToolGroups = (): Record<string, GroupedTool[]> =>
+  Object.fromEntries(STATIONS.filter((s) => s.hasAccounts).map((s) => [s.name, channelToolsOf(s)]));
+
+export function channelToolsOf(station: Station): GroupedTool[] {
+  const names: string[] = [...station.messageVerbs];
+  if (station.hasTrain && station.hasAccounts) names.push('list_members');
+  if (station.hasTrain && station.discoversChannels === true) names.push('list_channels');
+  names.push(...Array.from(station.groupOps ?? [], (op) => GROUP_OP_TOOLS[op]));
+  if ((station.profileFields?.size ?? 0) > 0) names.push('set_profile');
+  if (station.readsProfiles === true) names.push('get_profile');
+  names.push(...station.tools.map((t) => t.name));
+  return names.map((name) => ({ name, group: toolGroupOf(name) }));
+}

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

@@ -0,0 +1,9 @@
+import type { ToolGroup } from '@metro-labs/core/stations/types';
+
+export interface ToolDef {
+  name: string;
+  description: string;
+  inputSchema: Record<string, unknown>;
+  group?: ToolGroup;
+  destructive?: boolean;
+}

package/runtime/node_modules/@metro-labs/{mcp → daemon}/src/mcp/tool-dispatch.ts

@@ -1,4 +1,5 @@
 import { createHash } from 'node:crypto';
+import { Line } from '@metro-labs/core/lines';
 import type { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import {
   ListToolsRequestSchema,
@@ -9,10 +10,12 @@ import {
   STATIONS,
   accountStationCapabilities,
 } from '../stations/registry.js';
-import type { Station, StationTool, ToolResult } from '../stations/types.js';
-import { COMMON_TOOLS, LIST_ACCOUNTS_TOOL } from './tool-schemas.js';
+import type { Station, StationTool, ToolResult } from '@metro-labs/core/stations/types';
+import { listedTools, stationForTool, type PublishedTool } from './tool-catalog.js';
+import { policyGate, withEffectivePolicy } from './policy-gate.js';
+import { settlePromptsFor } from '../approvals/pending.js';
 import { errResult, makeCtx, okJson, toErr } from './ctx.js';
-import { dispatchMessageTool } from './call-tools.js';
+import { dispatchMessageTool, type ToolHooks } from './call-tools.js';
 import { dispatchListMembers } from './member-tools.js';
 import {
   dispatchAddMembers,
@@ -21,16 +24,21 @@ import {
   dispatchRemoveMembers,
 } from './group-tools.js';
 import { dispatchCreateUpload } from './upload-tool.js';
-import { callTargetDenied, lineTargetDenied } from '../db/agent-scope.js';
+import { dispatchSetProfile, profileCapabilities } from './profile-tool.js';
+import { dispatchGetProfile, profileScopeLine } from './profile-lookup.js';
+import { callTargetDenied, lineTargetDenied } from '../agents/scope.js';
 import { SOURCE_KEYS } from '../stations/attach-resolve.js';
 import { decodedLengthOf } from '../stations/attach-inline.js';
-import { log } from '../daemon/log.js';
+import { log } from '@metro-labs/core/log';
 import {
   allowedAgents,
   currentIdentity,
   type RequestIdentity,
 } from './request-identity.js';
-import { str } from './str.js';
+import { str } from '@metro-labs/core/str';
+import { linelessRead, stationOfAccount } from './read-tool.js';
+import { channelArgsError, channelScopeDenied, dispatchListChannels } from './channel-tool.js';
+import { callConnectorTool, CONNECTOR_TOOLS, connectorToolsVersion, type ConnectorResult } from '../mcp-server/connector-tools.js';
 
 const STATION_TOOLS = new Map<
   string,
@@ -44,35 +52,25 @@ const CORE_DISPATCH: Record<
   (a: Record<string, unknown>) => Promise<ToolResult>
 > = {
   list_members: dispatchListMembers,
+  list_channels: dispatchListChannels,
   create_group: dispatchCreateGroup,
   add_members: dispatchAddMembers,
   remove_members: dispatchRemoveMembers,
   export_invite: dispatchInviteLink,
   create_upload: dispatchCreateUpload,
+  set_profile: dispatchSetProfile,
+  get_profile: dispatchGetProfile,
 };
 
-const toolList = (): { tools: unknown[] } => ({
-  tools: [
-    ...COMMON_TOOLS,
-    ...STATIONS.flatMap((s) =>
-      s.tools.map((t) => ({
-        name: t.name,
-        description: t.description,
-        inputSchema: t.inputSchema,
-      })),
-    ),
-    LIST_ACCOUNTS_TOOL,
-  ],
-});
-
-let schemaSignature: string | undefined;
+export const toolList = (): { tools: PublishedTool[] } => ({ tools: listedTools() });
+
+let schemaSignature: { version: number; value: string } | undefined;
 
 export const toolSchemaSignature = (): string => {
-  schemaSignature ??= createHash('sha256')
-    .update(JSON.stringify(toolList()))
-    .digest('hex')
-    .slice(0, 16);
-  return schemaSignature;
+  const version = connectorToolsVersion();
+  if (schemaSignature?.version !== version)
+    schemaSignature = { version, value: createHash('sha256').update(JSON.stringify(toolList())).digest('hex').slice(0, 16) };
+  return schemaSignature.value;
 };
 
 async function handleListAccounts(
@@ -80,28 +78,32 @@ async function handleListAccounts(
 ): Promise<ToolResult> {
   try {
     return okJson({
-      accounts: await gatherAccounts(allowedAgents(identity)),
+      accounts: withEffectivePolicy(await gatherAccounts(allowedAgents(identity))),
       capabilities: accountStationCapabilities(),
+      profiles: profileCapabilities(),
     });
   } catch (e) {
     return errResult(`metro list_accounts failed: ${String(e)}`);
   }
 }
 
-function stationForTool(
-  name: string,
-  args: Record<string, unknown>,
-): string | undefined {
-  if (name === 'create_group') return str(args.station) || undefined;
-  return STATION_TOOLS.get(name)?.station.name;
-}
-
 export function scopeDenied(
   identity: RequestIdentity | undefined,
   name: string,
   args: Record<string, unknown>,
 ): boolean {
   const allowed = allowedAgents(identity);
+  if (name === 'list_channels') return channelScopeDenied(allowed, args);
+  if (name === 'read' && !str(args.line)) {
+    const account = str(args.account);
+    if (!account) return false;
+    const station = stationOfAccount(account);
+    return station === undefined || callTargetDenied(allowed, station, args);
+  }
+  if (name === 'get_profile') {
+    const line = profileScopeLine(args);
+    return line === undefined || callTargetDenied(allowed, Line.station(line) ?? '', { line });
+  }
   const station = stationForTool(name, args);
   if (station !== undefined) return callTargetDenied(allowed, station, args);
   return lineTargetDenied(allowed, args);
@@ -142,16 +144,34 @@ function logToolFailure(
   );
 }
 
-async function runTool(req: {
-  params: { name: string; arguments?: Record<string, unknown> };
-}): Promise<ToolResult> {
+async function runTool(
+  req: { params: { name: string; arguments?: Record<string, unknown> } },
+  hooks: ToolHooks,
+): Promise<ToolResult> {
   const name = req.params.name;
   const a = req.params.arguments ?? {};
+  if (name === 'list_channels') {
+    const invalid = channelArgsError(a);
+    if (invalid) return invalid;
+  }
 
   const identity = currentIdentity();
   if (name !== 'list_accounts' && scopeDenied(identity, name, a))
     return errResult('metro: this account is outside your authorized scope');
 
+  settlePromptsFor(name, a);
+  const blocked = policyGate(name, a);
+  if (blocked) return blocked;
+
+  return dispatchTool(name, a, identity, hooks);
+}
+
+async function dispatchTool(
+  name: string,
+  a: Record<string, unknown>,
+  identity: RequestIdentity | undefined,
+  hooks: ToolHooks,
+): Promise<ToolResult> {
   const owned = STATION_TOOLS.get(name);
   if (owned) {
     try {
@@ -160,24 +180,29 @@ async function runTool(req: {
       return toErr(name, e);
     }
   }
-
   const core = CORE_DISPATCH[name];
   if (core) return core(a);
-
   if (name === 'list_accounts') return handleListAccounts(identity);
-
-  return dispatchMessageTool(name, a);
+  if (name === 'read' && !str(a.line)) return linelessRead(a);
+  return dispatchMessageTool(name, a, hooks);
 }
 
-export async function callToolHandler(req: {
-  params: { name: string; arguments?: Record<string, unknown> };
-}): Promise<ToolResult> {
-  const result = await runTool(req);
+export async function callToolHandler(
+  req: { params: { name: string; arguments?: Record<string, unknown> } },
+  hooks: ToolHooks = {},
+): Promise<ToolResult> {
+  const result = await runTool(req, hooks);
   if (result.isError === true)
     logToolFailure(req.params.name, req.params.arguments ?? {}, result);
   return result;
 }
 
+function connectorToolHandler(req: { params: { name: string; arguments?: Record<string, unknown> } }): Promise<ConnectorResult> {
+  const args = req.params.arguments ?? {};
+  settlePromptsFor(req.params.name, args);
+  return callConnectorTool(req.params.name, args);
+}
+
 const TOOL_LIST_CHANGED = 'notifications/tools/list_changed';
 
 export interface SchemaNotice {
@@ -192,6 +217,7 @@ interface NotifyingExtra {
 export function registerToolHandlers(
   server: Server,
   notice?: SchemaNotice,
+  hooks: ToolHooks = {},
 ): void {
   server.setRequestHandler(ListToolsRequestSchema, () => {
     notice?.markCurrent();
@@ -202,11 +228,11 @@ export function registerToolHandlers(
     ((
       req: { params: { name: string; arguments?: Record<string, unknown> } },
       extra: NotifyingExtra,
-    ): Promise<ToolResult> => {
+    ): Promise<ToolResult | ConnectorResult> => {
       notice?.deliver(() =>
         extra.sendNotification({ method: TOOL_LIST_CHANGED }),
       );
-      return callToolHandler(req);
+      return CONNECTOR_TOOLS.has(req.params.name) ? connectorToolHandler(req) : callToolHandler(req, hooks);
     }) as Parameters<typeof server.setRequestHandler>[1],
   );
 }