@moretea-labs/forge 1.5.0-rc.1 → 1.5.1

package/src/cli/mcp/auth.ts

@@ -21,6 +21,8 @@ export interface McpLocalConfig {
   chatgpt?: {
     serverName?: string;
     endpoint?: string;
+    /** Loopback OAuth MCP endpoint used by ChatGPT tunnels/connectors. */
+    localEndpoint?: string;
   };
   profile?: string;
   toolset?: 'core' | 'advanced' | 'full';

package/src/cli/mcp/instructions.ts

@@ -10,11 +10,11 @@ export function mcpServerInstructions(profile: McpProfileName): string {
     return [
       ...common,
       'Use the shortest valid execution path. Investigation or parallelism alone must not create durable Work, Issues, Plans, Agents, isolation, or worktrees; escalate only for actual recovery, dependency, risk, scope, external-effect, or long-running requirements.',
-      'For bounded work, gather only task-relevant context once, then act through the exposed surface. When an exact code path is unknown, use rh_context(operation=search) once as the default code retrieval router, then read_repository_file for exact current ranges; do not fall back to shell grep unless retrieval is unavailable or raw Git semantics are explicitly needed. CodeGraph is optional structural augmentation behind rh_context.search for planning/debugging, not a default Direct-edit latency tax. The low-level search_repository handler is compatibility/internal surface, not a second default search path. Prefer repository_command_execute for ordinary local Git and shell operations, repository_safe_patch_apply for bounded source changes, and rh_work only when the task genuinely requires durable orchestration.',
+      'For bounded implementation, use rh_context(operation=search, retrieval_mode=implementation) once as the default code retrieval router when the exact path is unknown. Its current raw snippets and file SHA identities are valid implementation evidence; ChatGPT decides semantic sufficiency and should request wider exact ranges only when impact ambiguity, truncation, drift, or an expansion signal can materially change the edit. For cross-cutting state/time/schema/cache/API/event/concurrency changes, ChatGPT should select relevant impact_domains in that first search so Forge expands those evidence dimensions mechanically in the same call; Forge never infers that the selected domains are semantically complete. Use retrieval_mode=plan|debug|review when the task intentionally needs a broader evidence surface. Do not fall back to shell grep unless retrieval is unavailable or raw Git semantics are explicitly needed. The low-level search_repository handler is compatibility/internal surface, not a second default search path. Prefer repository_command_execute for ordinary local Git and shell operations, repository_safe_patch_apply for bounded source changes, and rh_work only when the task genuinely requires durable orchestration.',
       'Do not preflight unrelated Git history, prior Work, plugins, permissions, TCC, browser mode, maintenance, or recovery state. Inspect them only when the requested operation depends on them or a real failure points there.',
       'Run independent reads, searches, diagnostics, checks, repositories, checkouts, and tasks concurrently by default. Serialize only on a real dependency or Resource Claim conflict, and reuse existing projections, process handles, and check evidence instead of repeating successful observations.',
-      'Validation must be proportional to the change: run focused checks first and expand only when risk or failure evidence justifies it. Do not perform maintenance or deep runtime diagnosis before ordinary work unless execution is actually blocked.',
-      'After a bounded successful change, finish the requested delivery directly. Avoid additional investigation whose result cannot change implementation or acceptance, and do not invoke hidden atomic compatibility tools merely because they exist in the full profile.',
+      'Validation must be proportional to the change: cheap patch-safety checks belong to every coherent edit batch, focused tests run after that batch is stable, and expensive full-suite checks belong at candidate/release or explicitly high-risk boundaries. When a Direct Edit batch is stable, repository_safe_patch_apply may receive explicit check_ids to start revision-bound validation; omit check_ids during intermediate edits. Long checks return managed Processes: continue independent read/review work, then use validation_only with the returned edit-session/validation ids as the synchronization join instead of polling repeatedly. Do not perform maintenance or deep runtime diagnosis before ordinary work unless execution is actually blocked.',
+      'repository_safe_patch_apply returns bounded edit-session diff evidence for semantic review. Review that evidence directly instead of issuing a mandatory follow-up diff/status call; expand it only when truncated or semantically ambiguous. After a bounded successful change, finish the requested delivery directly. Avoid additional investigation whose result cannot change implementation or acceptance, and do not invoke hidden atomic compatibility tools merely because they exist in the full profile.',
     ].join(' ');
   }
   if (profile === 'orchestrator') {

package/src/cli/mcp/legacy-tool-service.ts

@@ -164,6 +164,8 @@ export interface McpToolContext {
   sessionId?: string;
   /** Authenticated or controller-issued principal used to scope session state. */
   principalId?: string;
+  /** Authenticated transport controller/provider type. */
+  controllerType?: 'chatgpt' | 'codex' | 'claude' | 'grok' | 'human';
   controllerInstanceId?: string;
   /** Bound repository identity for session cache keys. */
   repoId?: string;
@@ -790,7 +792,9 @@ function workflowFileCandidates(repoRoot: string): string[] {
     "plans",
     "tasks",
     ".ai/context",
-    ".ai/harness/handoff",
+    ".ai/harness/session",
+    ".ai/harness/controller/packets",
+    ".ai/harness/projections",
     ".ai/harness/checks",
   ];
   const files: string[] = [];
@@ -1466,8 +1470,8 @@ export function buildMcpToolDefinitions(
       annotations: readOnly,
     },
     {
-      name: "latest_handoff",
-      description: "Return latest forge handoff artifacts.",
+      name: "latest_session_context",
+      description: "Return the latest rebuildable Forge session continuation context.",
       inputSchema: EMPTY_SCHEMA,
       annotations: readOnly,
     },
@@ -1530,14 +1534,14 @@ export function buildMcpToolDefinitions(
     {
       name: "prepare_codex_goal_from_sprint",
       description:
-        "Prepare .ai/harness/handoff/codex-goal.md and a host-native /goal prompt from PRD + checklist Sprint.",
+        "Prepare .ai/harness/controller/packets/codex-goal.md and a host-native /goal prompt from PRD + checklist Sprint.",
       inputSchema: goalFromSprintSchema,
       annotations: write,
     },
     {
       name: "write_codex_goal",
       description:
-        "Write .ai/harness/handoff/codex-goal.md after required section validation.",
+        "Write .ai/harness/controller/packets/codex-goal.md after required section validation.",
       inputSchema: {
         type: "object",
         properties: {
@@ -1550,8 +1554,8 @@ export function buildMcpToolDefinitions(
       annotations: write,
     },
     {
-      name: "append_handoff_note",
-      description: "Append a timestamped planner handoff note.",
+      name: "append_controller_plan_note",
+      description: "Append a timestamped ChatGPT planning note to the controller packet cache.",
       inputSchema: {
         type: "object",
         properties: { actor: { type: "string" }, body: { type: "string" } },
@@ -1616,7 +1620,7 @@ export function buildMcpToolDefinitions(
           type: "object",
           properties: {
             description: { type: "string" },
-            mode: { type: "string", enum: ["direct", "plan", "debug", "review", "campaign", "release", "scale", "-direct", "-plan", "-debug", "-review", "-campaign", "-release", "-scale"] },
+            mode: { type: "string", enum: ["direct", "plan", "debug", "review", "release", "scale", "-direct", "-plan", "-debug", "-review", "-release", "-scale"] },
             known_paths: { type: "array", items: { type: "string" } },
             expected_files: { type: "number" },
             expected_changed_lines: { type: "number" },
@@ -2147,7 +2151,7 @@ export function buildMcpToolDefinitions(
           type: "object",
           properties: {
             description: { type: "string" },
-            mode: { type: "string", enum: ["direct", "plan", "debug", "review", "campaign", "release", "scale", "-direct", "-plan", "-debug", "-review", "-campaign", "-release", "-scale"] },
+            mode: { type: "string", enum: ["direct", "plan", "debug", "review", "release", "scale", "-direct", "-plan", "-debug", "-review", "-release", "-scale"] },
             known_paths: { type: "array", items: { type: "string" } },
             expected_files: { type: "number" },
             expected_changed_lines: { type: "number" },
@@ -2996,7 +3000,9 @@ export async function callMcpTool(
           "docs/spec.md",
           "plans",
           "tasks/current.md",
-          ".ai/harness/handoff",
+          ".ai/harness/session",
+    ".ai/harness/controller/packets",
+    ".ai/harness/projections",
           ".ai/harness/checks",
         ];
         audit(ctx, name, "ok", args);
@@ -3174,7 +3180,7 @@ export async function callMcpTool(
           },
           toolExposure: {
             preferred: preferredTools,
-            note: "Prefer the five rh_* workflow facades for orchestration. Typed repository, Git, Issue/Task, Campaign, plugin, browser, iOS, artifact, and recovery tools remain available because the current MCP transport cannot load domain schemas per conversation.",
+            note: "Prefer the five rh_* workflow facades for orchestration. Typed repository, Git, Issue/Task, plugin, browser, iOS, artifact, and recovery tools remain available because the current MCP transport cannot load domain schemas per conversation.",
             advanced: expectedTools.filter((tool) => !preferredTools.includes(tool)).slice(0, 40),
             compatibilityRetained: true,
           },
@@ -5055,12 +5061,10 @@ export async function callMcpTool(
           redactions: payload.redactions,
         });
       }
-      case "latest_handoff": {
+      case "latest_session_context": {
         const paths = [
-          ".ai/harness/handoff/resume.md",
-          ".ai/harness/handoff/controller-current.md",
-          ".ai/harness/handoff/codex-goal.md",
-          ".ai/harness/handoff/chatgpt-plan.md",
+          ".ai/harness/session/resume.md",
+          ".ai/harness/session/continuation.md",
         ];
         const handoff = paths.map((path) => {
           const decision = resolveMcpPath(
@@ -5085,7 +5089,7 @@ export async function callMcpTool(
           };
         });
         audit(ctx, name, "ok", args);
-        return textResult({ handoff });
+        return textResult({ sessionContext: handoff });
       }
       case "latest_checks": {
         const files = workflowFileCandidates(ctx.repoRoot)
@@ -5269,7 +5273,7 @@ export async function callMcpTool(
             name,
             "blocked",
             args,
-            ".ai/harness/handoff/codex-goal.md",
+            ".ai/harness/controller/packets/codex-goal.md",
             `missing required goal sections: ${missing.join(", ")}`,
           );
           return errorResult(
@@ -5281,7 +5285,7 @@ export async function callMcpTool(
         return writeMarkdownArtifact(
           ctx,
           name,
-          ".ai/harness/handoff/codex-goal.md",
+          ".ai/harness/controller/packets/codex-goal.md",
           "Codex Goal",
           "codex-goal",
           goal.body,
@@ -5301,7 +5305,7 @@ export async function callMcpTool(
             name,
             "blocked",
             args,
-            ".ai/harness/handoff/codex-goal.md",
+            ".ai/harness/controller/packets/codex-goal.md",
             `missing required goal sections: ${missing.join(", ")}`,
           );
           return errorResult(
@@ -5313,7 +5317,7 @@ export async function callMcpTool(
         return writeMarkdownArtifact(
           ctx,
           name,
-          ".ai/harness/handoff/codex-goal.md",
+          ".ai/harness/controller/packets/codex-goal.md",
           "Codex Goal",
           "codex-goal",
           body,
@@ -5321,8 +5325,8 @@ export async function callMcpTool(
           args,
         );
       }
-      case "append_handoff_note": {
-        const path = ".ai/harness/handoff/chatgpt-plan.md";
+      case "append_controller_plan_note": {
+        const path = ".ai/harness/controller/packets/chatgpt-plan.md";
         const decision = resolveMcpPath(
           ctx.repoRoot,
           path,

package/src/cli/mcp/multi-repository.ts

@@ -31,6 +31,7 @@ export interface McpServerOptions {
   toolset?: McpToolset | string;
   sessionId?: string;
   principalId?: string;
+  controllerType?: McpToolContext['controllerType'];
   controllerInstanceId?: string;
   /** Canonical Runtime source authority. Internal Runtime MCP only; never an execution repository. */
   runtimeSourceRoot?: string;
@@ -359,6 +360,7 @@ export function createMcpToolContext(opts: McpServerOptions): MultiRepositoryMcp
     enableChatgptBrowser: opts.enableChatgptBrowser === true,
     sessionId: opts.sessionId,
     principalId: opts.principalId,
+    controllerType: opts.controllerType,
     controllerInstanceId: opts.controllerInstanceId,
     runtimeSourceRoot: opts.runtimeSourceRoot,
   };

package/src/cli/mcp/policy.ts

@@ -35,7 +35,9 @@ export const PLANNER_READ_GLOBS = [
   'tasks/reviews/**',
   'tasks/notes/**',
   '.ai/context/**',
-  '.ai/harness/handoff/**',
+  '.ai/harness/session/**',
+  '.ai/harness/controller/packets/**',
+  '.ai/harness/projections/**',
   '.ai/harness/checks/**',
 ];
 
@@ -43,8 +45,8 @@ export const PLANNER_WRITE_GLOBS = [
   'plans/prds/**',
   'plans/sprints/**',
   'plans/plan-*.md',
-  '.ai/harness/handoff/codex-goal.md',
-  '.ai/harness/handoff/chatgpt-plan.md',
+  '.ai/harness/controller/packets/codex-goal.md',
+  '.ai/harness/controller/packets/chatgpt-plan.md',
 ];
 
 export interface McpPolicyOptions {
@@ -164,7 +166,7 @@ export function getMcpPolicy(profile: McpProfileName, opts: McpPolicyOptions = {
     return applyPolicyOverrides({
       profile,
       readGlobs: ['plans/**', 'tasks/**', 'docs/spec.md', '.ai/context/**', '.ai/harness/**'],
-      writeGlobs: ['tasks/reviews/**', '.ai/harness/checks/**', '.ai/harness/handoff/**'],
+      writeGlobs: ['tasks/reviews/**', '.ai/harness/checks/**', '.ai/harness/session/**', '.ai/harness/controller/packets/**'],
       denyGlobs: COMMON_DENY_GLOBS,
       maxFileBytes: 512 * 1024,
       execution: executionPolicy({
@@ -207,7 +209,7 @@ export function getMcpPolicy(profile: McpProfileName, opts: McpPolicyOptions = {
     const devRunner = opts.devAgentRunner === true;
     return applyPolicyOverrides({
       profile,
-      readGlobs: devRunner ? ['.ai/harness/handoff/codex-goal.md'] : [],
+      readGlobs: devRunner ? ['.ai/harness/controller/packets/codex-goal.md'] : [],
       writeGlobs: [],
       denyGlobs: devRunner ? COMMON_DENY_GLOBS : ['**'],
       maxFileBytes: devRunner ? 512 * 1024 : 0,

package/src/cli/mcp/repository-tools.ts

@@ -19,6 +19,7 @@ import {
 } from '../repositories/registry';
 import { buildControllerWorkbench } from '../repositories/workbench';
 import { applySafePatch, buildSafePatchPlan } from '../repositories/safe-patch';
+import { getEditSessionDiff } from '../editing/edit-session';
 import { buildSyncOperationDigest, classifyUserFacingError } from '../../runtime/control-plane/facade/operation-digest';
 import { diagnoseRepositoryStuckState, listRepositoryGoalRuns, readRepositoryGoalRegistry, runRepositoryGoal, upsertRepositoryGoal } from '../repositories/goal-registry';
 import {
@@ -50,6 +51,7 @@ import {
 import { assessWorkMode, parseExplicitTaskMode } from '../controller/work-mode';
 import type { CallToolResult, McpToolDefinition } from './tools';
 import {
+  boundUtf8,
   compactCommandOutput,
   compactErrorMessage,
   compactRoutingSummary,
@@ -136,7 +138,7 @@ export const repositoryToolDefinitions: McpToolDefinition[] = [
     operation: {
       type: 'string',
       enum: ['summary', 'batch_execute', 'lanes_execute', 'lanes_integrate', 'fast_receipt_get', 'fast_receipt_list', 'execution_route', 'assess_work_mode'],
-      description: 'Defaults to summary. Use batch_execute for multi-step Fast Path (one parent receipt). Use lanes_execute for limited parallel reads. Use assess_work_mode for Fast/Durable/Campaign routing advice.',
+      description: 'Defaults to summary. Use batch_execute for multi-step Fast Path (one parent receipt). Use lanes_execute for limited parallel reads. Use assess_work_mode for Fast/Durable routing advice.',
     },
     payload: {
       type: 'object',
@@ -235,20 +237,25 @@ export const repositoryToolDefinitions: McpToolDefinition[] = [
     operations: { type: 'array', items: { type: 'object' }, description: 'Edit operations using the same shape as apply_patch.' },
     chunk_size: { type: 'number', description: 'Maximum operations per deterministic chunk. Capped at 100.' },
   }, ['operations'], true),
-  definition('repository_safe_patch_apply', 'Apply a deterministic chunked repository patch through edit sessions, refreshing missing file fingerprints before each chunk. Defaults to synchronous interactive apply.', {
+  definition('repository_safe_patch_apply', 'Apply one coherent deterministic edit batch and return bounded review evidence. Checks are opt-in: pass check_ids only when the batch is stable. Long checks return managed Process handles instead of blocking the MCP call; use validation_only with the returned session/request ids to join later without replaying the patch.', {
     repo_id: repoId,
     checkout_id: { type: 'string', description: 'Optional checkout identity for repositories with multiple local clones.' },
-    session_id: { type: 'string', description: 'Existing edit session id. Omit to create one.' },
+    session_id: { type: 'string', description: 'Existing edit session id. Required for validation_only; otherwise omit to create one.' },
     purpose: { type: 'string', description: 'Purpose for a newly created edit session.' },
-    operations: { type: 'array', items: { type: 'object' }, description: 'Edit operations using the same shape as apply_patch. create/write create parent dirs as needed.' },
+    operations: { type: 'array', items: { type: 'object' }, description: 'Edit operations using the same shape as apply_patch. Required unless validation_only=true.' },
     chunk_size: { type: 'number', description: 'Maximum operations per deterministic chunk. Capped at 100.' },
     expected_revision: { type: 'number', description: 'Expected starting edit-session revision.' },
     allowed_paths: { type: 'array', items: { type: 'string' }, description: 'Optional allowed path globs for a newly created session.' },
     continue_on_error: { type: 'boolean', description: 'Continue applying later independent chunks after a failed chunk. Defaults to false.' },
     refresh_fingerprints: { type: 'boolean', description: 'Refresh file fingerprints before every chunk. Defaults to true.' },
     recover_stale_session: { type: 'boolean', description: 'For new sessions, recover stale edit-session fingerprints into a fresh session. Defaults to true.' },
-    apply_mode: { type: 'string', enum: ['sync', 'async'], description: 'Defaults to sync for interactive development. Set async to queue a durable Job.' },
-  }, ['operations']),
+    check_ids: { type: 'array', items: { type: 'string' }, description: 'Optional focused validation for this stable coherent edit batch. Omit to edit without running tests.' },
+    check_timeout_ms: { type: 'number', description: 'Per-check execution budget. Long checks still return managed handles immediately.' },
+    lease_wait_ms: { type: 'number', description: 'Bounded resource-lease wait for conflicting validation lanes.' },
+    validation_request_id: { type: 'string', description: 'Stable validation identity returned by a prior edit+validation call; reuse with validation_only to join without replaying edits.' },
+    validation_only: { type: 'boolean', description: 'When true, do not edit. Reconcile/reuse the existing session validation Processes identified by session_id/check_ids/validation_request_id.' },
+    apply_mode: { type: 'string', enum: ['sync', 'async'], description: 'Defaults to sync for interactive development. Set async only for a separately durable operation.' },
+  }),
   definition('repository_command_preview', 'Preview one repository-scoped local command with classification, approval token, and Git snapshots.', {
     repo_id: repoId,
     checkout_id: { type: 'string', description: 'Optional checkout identity for repositories with multiple local clones.' },
@@ -688,7 +695,6 @@ export async function callRepositoryTool(
               reasons: assessment.reasons,
               recommendedMode: assessment.recommendedMode,
               issueRequired: assessment.issueRequired,
-              campaignRequired: assessment.campaignRequired,
             },
             nextTools: assessment.nextTools,
           });
@@ -833,6 +839,27 @@ export async function callRepositoryTool(
         ];
         const ok = applied.status === 'applied';
         const firstFailure = applied.failures?.[0];
+        const editDiff = applied.appliedChunks.length > 0
+          ? getEditSessionDiff(repository.canonicalRoot, applied.session.sessionId)
+          : undefined;
+        const boundedEditDiff = editDiff
+          ? boundUtf8(editDiff.patch, RESPONSE_BUDGET.inlineOutputBytes)
+          : undefined;
+        const reviewEvidence = editDiff && boundedEditDiff
+          ? {
+              source: 'edit_session' as const,
+              sessionId: editDiff.sessionId,
+              revision: editDiff.revision,
+              sha256: editDiff.sha256,
+              patchPreview: boundedEditDiff.text,
+              truncated: boundedEditDiff.truncated,
+              byteLength: boundedEditDiff.byteLength,
+              semanticReviewAuthority: 'chatgpt' as const,
+              next: boundedEditDiff.truncated
+                ? 'The edit diff exceeds the inline budget. Expand only the affected ranges or diff needed for semantic review.'
+                : 'Review this exact edit-session diff before deciding whether more edits or focused validation are needed.',
+            }
+          : undefined;
         const digest = buildSyncOperationDigest({
           ok,
           operation: 'repository_safe_patch_apply',
@@ -859,6 +886,7 @@ export async function callRepositoryTool(
           terminal: true,
           applyMode: 'sync',
           digest,
+          ...(reviewEvidence ? { reviewEvidence } : {}),
           suggestedNextActions: digest.suggestedNextActions,
         };
         return ok ? result(payload) : { ...result(payload), isError: true };
@@ -900,24 +928,31 @@ export async function callRepositoryTool(
         // nested ExecutionJob. Local Job remains the worker settlement surface.
         const fromDurableWorker = args.__from_durable_worker === true
           || typeof args.__execution_job_id === 'string';
-        // Thin Harness: short readonly / focused-check commands skip Local Job when eligible.
-        const forceDurable = fromDurableWorker
-          || args.apply_mode === 'async'
-          || args.mode === 'durable'
+        // Process Runtime owns local async execution. apply_mode=async means
+        // return its Process handle immediately; it must not promote a local
+        // command into the retired ExecutionJob path. Explicit mode=durable
+        // remains a separate external-Controller boundary.
+        const returnHandleImmediately = args.apply_mode === 'async'
+          || args.mode === 'async'
           || args.async === true
           || args.background === true;
+        const forceDurable = fromDurableWorker
+          || args.mode === 'durable'
+          || args.force_durable === true;
         const routingDecision = routeExecution({
           operation: 'repository_command_execute',
           mode: forceDurable ? 'durable' : args.mode === 'fast' ? 'fast' : 'auto',
           command: args.command as string | string[] | undefined,
           timeoutMs,
-          background: args.background === true || args.async === true,
+          background: forceDurable && (args.background === true || args.async === true),
           defaultBranch: repository.defaultBranch,
           approvalContinuation: typeof args.approval_request_id === 'string'
             || typeof args.approval_token === 'string',
         });
         // Unified Process Runtime for local commands (Direct/Managed) when not forced durable.
-        if (!forceDurable && !fromDurableWorker) {
+        // Ephemeral workspaces cannot persist a recoverable async Process handle,
+        // so their async requests remain promotion-required below.
+        if (!forceDurable && !fromDurableWorker && !(target.workspace && returnHandleImmediately)) {
           try {
             const routeClass = classifyRepositoryCommandRoute(args.command as string | string[], {
               forceDurable: false,
@@ -931,7 +966,11 @@ export async function callRepositoryTool(
                 command: args.command as string | string[],
                 cwd: typeof args.cwd === 'string' ? args.cwd : undefined,
                 timeoutMs,
+                interactiveWaitMs: returnHandleImmediately
+                  ? 0
+                  : typeof args.interactive_wait_ms === 'number' ? args.interactive_wait_ms : undefined,
                 maxOutputBytes,
+                returnHandleImmediately,
                 requestId: typeof args.request_id === 'string' ? args.request_id : undefined,
                 executionIdentity,
                 allowNonGitWorkspace: target.workspace !== undefined,
@@ -1040,7 +1079,7 @@ export async function callRepositoryTool(
             return failure(error);
           }
         }
-        if (target.workspace && forceDurable) {
+        if (target.workspace && (forceDurable || returnHandleImmediately)) {
           return result({
             accepted: false,
             mode: 'durable',

package/src/cli/mcp/server.ts

@@ -219,17 +219,12 @@ async function proxyRuntimeToolCall(
   ctx: MultiRepositoryMcpToolContext,
   name: string,
   args: Record<string, unknown>,
-  expectedSchema?: CanonicalRuntimeToolSchema,
 ): Promise<CallToolResult> {
   return withCanonicalRuntimeClient(ctx, async (client) => {
-    if (expectedSchema) {
-      const listed = await client.listTools();
-      const definitions = listed.tools as Tool[];
-      const fingerprint = forgeToolSurfaceFingerprint(definitions);
-      if (fingerprint !== expectedSchema.fingerprint || !definitions.some((tool) => tool.name === name)) {
-        return toolSurfaceMismatchResult();
-      }
-    }
+    // The outer Connector session is already bound to the Canonical Runtime
+    // schema and fenced by the Runtime-published fingerprint before dispatch.
+    // Re-listing tools here creates a second discovery round trip for every
+    // tool call without strengthening that fence.
     const response = await client.callTool({ name, arguments: args });
     return response as unknown as CallToolResult;
   });
@@ -309,7 +304,7 @@ export function createForgeMcpServerFromContext(
         // Gateway processes from acquiring Process Runtime leases or evaluating
         // Runtime source coherence against their own checkout.
         if (!getRuntimeWriteClaim()) {
-          if (runtimeSchema) return proxyRuntimeToolCall(ctx, name, args, runtimeSchema);
+          if (runtimeSchema) return proxyRuntimeToolCall(ctx, name, args);
           if (observeRuntimeStatus(ctx.controllerHome).ready) return proxyRuntimeToolCall(ctx, name, args);
         }
         const accessResult = callAccessTool(ctx, name, args);