@moretea-labs/forge 1.8.0 → 1.8.1

package/adapters/mcp/server.ts

@@ -19,6 +19,7 @@ import { callExecutionTool } from './runtime-gateway/execution-tools';
 import { callProcessTool } from './runtime-gateway/process-tools';
 import { injectDurableCommandFields, isGatewayIsolatedTool, routeDurableMcpCall } from './runtime-gateway/router';
 import { controllerExposureSnapshot, isControllerToolExposed } from './toolset';
+import { settleCognitionAfterTool } from './runtime-gateway/cognition-settlement';
 import { randomUUID } from 'crypto';
 import { readFileSync } from 'fs';
 import { join } from 'path';
@@ -28,6 +29,7 @@ import { getRuntimeWriteClaim } from '../../src/runtime/root/write-fence';
 import { recordMcpIncident, recordMcpTiming, type McpTimingTrace } from '../../src/runtime/diagnostics/mcp-timing';
 import { maybeRegisterMcpIncidentRepair } from '../../src/runtime/diagnostics/incident-repair';
 import { FORGE_VERSION, forgeToolSurfaceFingerprint } from '../../src/cli/controller/runtime-config';
+import { RUNTIME_MCP_CUTOVER_OUTCOME_UNKNOWN } from '../../src/runtime/root/mcp-transport';
 
 export type { McpServerOptions } from './multi-repository';
 export { buildMultiRepositoryToolDefinitions, callMultiRepositoryTool } from './multi-repository';
@@ -45,9 +47,11 @@ function isMultiRepositoryContext(ctx: ServerToolContext): ctx is MultiRepositor
   return 'controllerHome' in ctx;
 }
 
-function recordRequestId(args: Record<string, unknown>, rpcId: string | number | undefined): string {
+function recordRequestId(args: Record<string, unknown>, _rpcId: string | number | undefined): string {
   const explicit = typeof args.request_id === 'string' ? args.request_id.trim() : '';
-  return explicit || `mcp-rpc:${rpcId === undefined ? randomUUID() : String(rpcId)}`;
+  // Transport RPC ids are connection-local correlation only. They are not a
+  // semantic idempotency authority and may be recycled across unrelated calls.
+  return explicit || `mcp-call:${randomUUID()}`;
 }
 
 function firstTimingString(...values: unknown[]): string | undefined {
@@ -208,6 +212,7 @@ async function traceControllerMcpRequest(
       ...(rpcId === undefined ? {} : { rpcId }),
       layer: ctx.runtimeSourceRoot ? 'canonical_runtime' : 'public_gateway',
       startedAt: startedAtWall,
+      ...(ctx.hostConversationSessionId?.trim() ? { hostConversationSessionId: ctx.hostConversationSessionId.trim() } : {}),
       outcome,
       ...(errorCode ? { errorCode } : {}),
       ...executionIdentity,
@@ -414,6 +419,7 @@ interface CanonicalRuntimeForwardingIdentity {
   principalId?: string;
   sessionId?: string;
   controllerType?: ForwardedControllerType;
+  hostConversationSessionId?: string;
 }
 
 function boundedForwardedIdentity(value: unknown): string | undefined {
@@ -422,18 +428,26 @@ function boundedForwardedIdentity(value: unknown): string | undefined {
   return normalized ? normalized.slice(0, 512) : undefined;
 }
 
+/** ChatGPT supplies this as an anonymized same-conversation correlation fact. It is not an auth token or URL. */
+export function chatgptHostSessionIdFromMcpMeta(meta: unknown): string | undefined {
+  if (!meta || typeof meta !== 'object' || Array.isArray(meta)) return undefined;
+  return boundedForwardedIdentity((meta as Record<string, unknown>)['openai/session']);
+}
+
 export function canonicalRuntimeForwardingIdentity(meta: unknown): CanonicalRuntimeForwardingIdentity {
   if (!meta || typeof meta !== 'object' || Array.isArray(meta)) return {};
   const envelope = (meta as Record<string, unknown>)[CANONICAL_RUNTIME_FORWARD_META_KEY];
   if (!envelope || typeof envelope !== 'object' || Array.isArray(envelope)) return {};
   const record = envelope as Record<string, unknown>;
   const controllerType = boundedForwardedIdentity(record.controllerType);
+  const hostConversationSessionId = boundedForwardedIdentity(record.hostConversationSessionId);
   return {
     principalId: boundedForwardedIdentity(record.principalId),
     sessionId: boundedForwardedIdentity(record.sessionId),
     ...(controllerType && ['chatgpt', 'codex', 'claude', 'grok', 'human'].includes(controllerType)
       ? { controllerType: controllerType as ForwardedControllerType }
       : {}),
+    ...(hostConversationSessionId ? { hostConversationSessionId } : {}),
   };
 }
 
@@ -443,18 +457,27 @@ function canonicalRuntimeForwardingMeta(ctx: MultiRepositoryMcpToolContext): Rec
       ...(ctx.principalId?.trim() ? { principalId: ctx.principalId.trim() } : {}),
       ...(ctx.sessionId?.trim() ? { sessionId: ctx.sessionId.trim() } : {}),
       ...(ctx.controllerType ? { controllerType: ctx.controllerType } : {}),
+      ...(ctx.hostConversationSessionId?.trim() ? { hostConversationSessionId: ctx.hostConversationSessionId.trim() } : {}),
     },
   };
 }
 
 function canonicalRuntimeRequestContext(baseContext: ServerToolContext, meta: unknown): ServerToolContext {
-  if (!isMultiRepositoryContext(baseContext) || !baseContext.runtimeSourceRoot) return baseContext;
+  if (!isMultiRepositoryContext(baseContext)) return baseContext;
+  // Host metadata is request-scoped correlation only. The public Gateway carries
+  // it through its private forwarding envelope so Canonical Runtime does not lose
+  // the ChatGPT conversation scope during the proxy hop.
+  const hostConversationSessionId = chatgptHostSessionIdFromMcpMeta(meta);
+  if (!baseContext.runtimeSourceRoot) {
+    return hostConversationSessionId ? { ...baseContext, hostConversationSessionId } : baseContext;
+  }
   const forwarded = canonicalRuntimeForwardingIdentity(meta);
   return {
     ...baseContext,
     ...(forwarded.principalId ? { principalId: forwarded.principalId } : {}),
     ...(forwarded.sessionId ? { sessionId: forwarded.sessionId } : {}),
     ...(forwarded.controllerType ? { controllerType: forwarded.controllerType } : {}),
+    ...(forwarded.hostConversationSessionId ? { hostConversationSessionId: forwarded.hostConversationSessionId } : {}),
   };
 }
 
@@ -490,6 +513,20 @@ export function canonicalRuntimeToolCallIsReplaySafe(name: string, args: Record<
   return Boolean(workId && requestId);
 }
 
+export function canonicalRuntimeToolCallFailureIsCutoverOutcomeUnknown(error: unknown): boolean {
+  if (!error || typeof error !== 'object') return false;
+  const record = error as { code?: unknown; message?: unknown; data?: unknown };
+  const message = typeof record.message === 'string' ? record.message : '';
+  if (SdkHttpError.isInstance(error)) {
+    return error.status === 409 && (
+      message.includes(RUNTIME_MCP_CUTOVER_OUTCOME_UNKNOWN)
+      || message.toLowerCase().includes('runtime cutover outcome unknown')
+      || JSON.stringify(record.data ?? '').includes(RUNTIME_MCP_CUTOVER_OUTCOME_UNKNOWN)
+    );
+  }
+  return record.code === -32000 && message === RUNTIME_MCP_CUTOVER_OUTCOME_UNKNOWN;
+}
+
 export function canonicalRuntimeToolCallFailureIsTransient(error: unknown): boolean {
   if (SdkHttpError.isInstance(error)) return error.status === 404;
   if (SdkError.isInstance(error)) {
@@ -516,6 +553,9 @@ export async function callCanonicalRuntimeToolWithReplay<T>(input: {
   try {
     return await input.call();
   } catch (error) {
+    if (canonicalRuntimeToolCallFailureIsCutoverOutcomeUnknown(error)) {
+      throw new Error(`${RUNTIME_MCP_CUTOVER_OUTCOME_UNKNOWN}: Canonical Runtime entered cutover after request admission; reconcile the original request/effect identity before retrying.`);
+    }
     if (!canonicalRuntimeToolCallIsReplaySafe(input.name, input.args)
       || !canonicalRuntimeToolCallFailureIsTransient(error)) {
       throw error;
@@ -1013,29 +1053,33 @@ export function createForgeMcpServerFromContext(
         // Gateway processes from acquiring Process Runtime leases or evaluating
         // Runtime source coherence against their own checkout.
         if (!getRuntimeWriteClaim()) {
-          const forwardedArgs = typeof args.request_id === 'string' && args.request_id.trim()
-            ? args
-            : { ...args, request_id: requestId };
+          // Keep trace correlation separate from Tool Contract idempotency. Only
+          // a caller-supplied request_id may authorize semantic replay/dedup.
+          const forwardedArgs = args;
           if (runtimeProxy && runtimeSchema) return runtimeProxy.callTool(ctx, name, forwardedArgs, phaseTimings);
           if (runtimeProxy && observeRuntimeStatus(ctx.controllerHome).ready) return runtimeProxy.callTool(ctx, name, forwardedArgs, phaseTimings);
         }
-        const accessResult = callAccessTool(ctx, name, args);
-        if (accessResult) return accessResult;
-        const executionResult = await callExecutionTool(ctx, name, args);
-        if (executionResult) return executionResult;
-        const processResult = await callProcessTool(ctx, name, args);
-        if (processResult) return processResult;
-        if (isGatewayIsolatedTool(name)) {
-          const isolatedResult = await routeDurableMcpCall(ctx, name, args, { allowReadOnly: true, forceDurable: true });
-          if (isolatedResult) return isolatedResult;
-        }
-        const runtimeResult = await callRuntimeTool(ctx, name, args);
-        if (runtimeResult) return runtimeResult;
-        const durableResult = await routeDurableMcpCall(ctx, name, args);
-        if (durableResult) return durableResult;
-        const repositoryResult = await callRepositoryToolWithPostFinalizeAttribution(ctx.controllerHome, name, args, ctx);
-        if (repositoryResult) return repositoryResult;
-        return callMultiRepositoryTool(ctx, name, args);
+        const executeLocalTool = async (): Promise<CallToolResult> => {
+          const accessResult = callAccessTool(ctx, name, args);
+          if (accessResult) return accessResult;
+          const executionResult = await callExecutionTool(ctx, name, args);
+          if (executionResult) return executionResult;
+          const processResult = await callProcessTool(ctx, name, args);
+          if (processResult) return processResult;
+          if (isGatewayIsolatedTool(name)) {
+            const isolatedResult = await routeDurableMcpCall(ctx, name, args, { allowReadOnly: true, forceDurable: true });
+            if (isolatedResult) return isolatedResult;
+          }
+          const runtimeResult = await callRuntimeTool(ctx, name, args);
+          if (runtimeResult) return runtimeResult;
+          const durableResult = await routeDurableMcpCall(ctx, name, args);
+          if (durableResult) return durableResult;
+          const repositoryResult = await callRepositoryToolWithPostFinalizeAttribution(ctx.controllerHome, name, args, ctx);
+          if (repositoryResult) return repositoryResult;
+          return await callMultiRepositoryTool(ctx, name, args);
+        };
+        const localResult = await executeLocalTool();
+        return settleCognitionAfterTool(ctx, name, args, localResult) ?? localResult;
       });
     }
     return callMcpTool(ctx, name, args);

package/adapters/mcp/setup.ts

@@ -419,11 +419,10 @@ export function runMcpSetupChatgpt(opts: {
           enabled: false,
           host: existingConfig?.localController?.host ?? "127.0.0.1",
           port: localControllerPort,
-          autoOpen: false,
           mode: "disabled",
         }
       : {
-          ...(existingConfig?.localController ?? { enabled: true, host: "127.0.0.1", autoOpen: false }),
+          ...(existingConfig?.localController ?? { enabled: true, host: "127.0.0.1" }),
           port: localControllerPort,
         },
     devMode: {
@@ -701,7 +700,6 @@ export function runMcpDoctor(opts: {
         enabled: localConfig?.localController?.enabled ?? true,
         host: localConfig?.localController?.host ?? "127.0.0.1",
         port: localConfig?.localController?.port ?? 8766,
-        autoOpen: localConfig?.localController?.autoOpen ?? false,
       },
       devMode: {
         agentRunner: localConfig?.devMode?.agentRunner === true,

package/adapters/mcp/tool-mapping/legacy-tool-service.ts

@@ -68,30 +68,23 @@ import {
   updateTask,
 } from "../../../src/cli/controller/issue-store";
 import { applyMigratedIssueDecision } from '../../../src/cli/controller/migrated-issue-decision';
-import { legacyIssueAuthorityRetired } from '../../../src/cli/controller/legacy-issue-cutover';
 import {
   listControllerChecks,
 } from "../../../src/cli/controller/check-runner";
 import { normalizeCheckIds } from '../../../src/runtime/control-plane/facade/check-normalization';
 import { buildExecutionDiagnostics, buildRequirementBoard } from '../../../src/runtime/control-plane/facade/requirement-board';
-import { acceptVerifiedTaskFromControllerWork } from '../../../src/runtime/control-plane/execution/work-task-receipt';
 import { getWorkContract } from '../../../packages/kernel/work/api';
 import { admitDirectEditWorkContract } from '../../../src/runtime/control-plane/facade/repository-work-admission';
-import { decideRoute } from '../../../src/runtime/control-plane/routing/route-policy';
 import { listCapabilityDescriptors, summarizeCapabilityGroups } from '../../../src/runtime/control-plane/facade/capability-registry';
 import {
-  getControllerTimeline,
-  getProjectProgress,
-  getTaskProgressDetail,
-  getTaskProgressReadView,
-} from "../../../src/cli/controller/progress";
-import { exportControllerWorklog, parseWorklogCategory } from "../../../src/cli/controller/worklog";
+  exportControllerWorklog,
+  listControllerWorklogEvents,
+  parseWorklogCategory,
+} from "../../../src/cli/controller/worklog";
 import { inspectProjectGovernance, reconcileProjectGovernance } from "../../../src/cli/controller/governance";
-import { assessWorkMode, parseExplicitTaskMode } from "../../../src/cli/controller/work-mode";
 import { taskExecutionPolicy } from "../../../src/cli/controller/execution-policy";
 import { finishEditSession, finishTaskRun } from "../../../src/cli/controller/completion-orchestrator";
 import { buildControllerTaskLedgerProjection } from "../../../src/cli/controller/task-ledger";
-import { buildControllerContextPack } from "../../../src/cli/controller/context-pack";
 import { loadControllerProjectState, saveControllerProjectState } from "../../../src/cli/controller/project-state";
 import {
   FORGE_MCP_SCHEMA_VERSION,
@@ -179,6 +172,8 @@ export interface McpToolContext {
   principalId?: string;
   /** Authenticated transport controller/provider type. */
   controllerType?: 'chatgpt' | 'codex' | 'claude' | 'grok' | 'human';
+  /** Host-provided ChatGPT session correlation. Never authorization and never a canonical conversation URL. */
+  hostConversationSessionId?: string;
   controllerInstanceId?: string;
   /** Bound repository identity for session cache keys. */
   repoId?: string;
@@ -737,10 +732,7 @@ function taskExecutorHealth(
   githubRepo?: string,
 ): ExecutorHealth | null {
   if (agent === "github-copilot") {
-    return classifyGitHubCopilotPreflight(
-      getGitHubStatus(ctx.repoRoot, githubRepo),
-      task,
-    );
+    return classifyGitHubCopilotPreflight(getGitHubStatus(ctx.repoRoot, githubRepo));
   }
   return classifyLocalExecutorHealth(
     agent,
@@ -748,7 +740,6 @@ function taskExecutorHealth(
       agentRunner: ctx.policy.execution.agentRunner,
       allowedAgents: ctx.policy.execution.allowedAgents,
     },
-    task,
   );
 }
 
@@ -1575,18 +1566,12 @@ export function buildMcpToolDefinitions(
       {
         name: "controller_context",
         description:
-          "Return one compact controller start-work context: Git status, current Issue focus, active Runs and Jobs, recommended execution mode, and available checks.",
+          "Return one compact controller start-work context: Git status, current Issue focus, active Runs and Jobs, and available checks.",
         inputSchema: {
           type: "object",
           properties: {
             description: { type: "string" },
-            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" },
-            requires_investigation: { type: "boolean" },
-            requires_parallelism: { type: "boolean" },
-            requires_long_running_checks: { type: "boolean" },
             needs_dependencies: { type: "boolean" },
             risk: { type: "string", enum: ["readonly", "low", "medium", "high", "destructive"] },
           },
@@ -1784,13 +1769,6 @@ export function buildMcpToolDefinitions(
         },
         annotations: readOnly,
       },
-      {
-        name: "get_project_progress",
-        description:
-          "Return evidence-gate completion, effective status, blockers, throughput, current-focus progress, and attention items without lifecycle-percentage estimates.",
-        inputSchema: EMPTY_SCHEMA,
-        annotations: readOnly,
-      },
       {
         name: "get_project_governance",
         description:
@@ -1844,22 +1822,6 @@ export function buildMcpToolDefinitions(
         },
         annotations: write,
       },
-      {
-        name: "get_task_progress_detail",
-        description:
-          "Return one Task with effective progress, bounded Run and timeline summaries by default, and full detail on demand.",
-        inputSchema: {
-          type: "object",
-          properties: {
-            issue_id: { type: "string" },
-            task_id: { type: "string" },
-            detail_level: { type: "string", enum: ["summary", "full"] },
-          },
-          required: ["issue_id", "task_id"],
-          additionalProperties: false,
-        },
-        annotations: readOnly,
-      },
       {
         name: "get_worklog_timeline",
         description:
@@ -2045,29 +2007,6 @@ export function buildMcpToolDefinitions(
         },
         annotations: readOnly,
       },
-      {
-        name: "assess_work_request",
-        description:
-          "Choose direct_edit, quick_agent, or issue_task before creating work. Prefer repository search plus bounded direct edits for low/medium-risk changes, even when exact files need discovery; use an Agent only when direct patches are not safe or practical.",
-        inputSchema: {
-          type: "object",
-          properties: {
-            description: { type: "string" },
-            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" },
-            requires_investigation: { type: "boolean" },
-            requires_parallelism: { type: "boolean" },
-            requires_long_running_checks: { type: "boolean" },
-            needs_dependencies: { type: "boolean" },
-            risk: { type: "string", enum: ["readonly", "low", "medium", "high", "destructive"] },
-          },
-          required: ["description"],
-          additionalProperties: false,
-        },
-        annotations: readOnly,
-      },
       {
         name: "create_issue",
         description:
@@ -2403,7 +2342,7 @@ export function buildMcpToolDefinitions(
       {
         name: "integrate_task_run",
         description:
-          "Integrate one reviewed isolated Task Run into the main working tree through a rollback-capable edit session.",
+          "Explicitly integrate one completed isolated Task Run into this dispatch checkout through a rollback-capable edit session.",
         inputSchema: {
           type: "object",
           properties: { run_id: { type: "string" } },
@@ -2821,7 +2760,7 @@ export function buildMcpToolDefinitions(
       },
     );
   }
-  return tools;
+  return tools.filter((tool) => !RETIRED_LEGACY_PUBLIC_TOOLS.has(tool.name));
 }
 
 export function controllerExpectedToolNames(
@@ -2835,24 +2774,48 @@ export function controllerExpectedToolNames(
   return [...DEFAULT_CONTROLLER_TOOL_NAMES];
 }
 
-const RETIRED_LEGACY_MUTATION_TOOLS = new Set([
+const RETIRED_LEGACY_PUBLIC_TOOLS = new Set([
+  "list_issues",
+  "get_project_board",
+  "get_project_governance",
   "reconcile_project_governance",
+  "get_project_state",
   "set_current_issue",
   "archive_issue",
   "restore_issue",
+  "get_issue",
   "publish_issue_to_github",
   "refresh_github_issue",
   "close_github_issue",
+  "inspect_issue_readiness",
+  "inspect_task_readiness",
   "prepare_issue_launch",
   "create_issue",
+  "update_issue",
   "plan_issue",
   "append_task",
   "split_task",
   "supersede_task",
   "set_task_dependencies",
   "update_task",
+  "dispatch_task",
+  "launch_issue",
+  "dispatch_ready_tasks",
+  "get_task_run",
+  "get_task_run_events",
+  "get_task_run_log",
+  "get_task_diff",
+  "integrate_task_run",
+  "finish_task_run",
+  "list_task_runs",
+  "cancel_task_run",
+  "retry_task_run",
+  "verify_task",
+  "accept_task",
+  "request_task_changes",
   "record_task_verification",
   "accept_verified_task",
+  "finish_edit_session",
 ]);
 
 export async function callMcpTool(
@@ -2861,12 +2824,9 @@ export async function callMcpTool(
   args: Record<string, unknown> = {},
 ): Promise<CallToolResult> {
   try {
-    if (RETIRED_LEGACY_MUTATION_TOOLS.has(name) && legacyIssueAuthorityRetired(ctx.repoRoot)) {
+    if (RETIRED_LEGACY_PUBLIC_TOOLS.has(name)) {
       audit(ctx, name, "blocked", args);
-      return errorResult(
-        "LEGACY_CONTROL_PLANE_MUTATION_RETIRED",
-        `${name} cannot mutate frozen Issue/Task/currentIssue/project-board compatibility files after SQLite cutover. Use Requirement, Plan and Work APIs.`,
-      );
+      return errorResult("UNKNOWN_TOOL", `unknown tool: ${name}`);
     }
     switch (name) {
       case "harness_status": {
@@ -3202,30 +3162,6 @@ export async function callMcpTool(
           timeoutMs: check.timeoutMs,
           source: check.source,
         }));
-        const assessment = assessWorkMode({
-          description: typeof args.description === "string" && args.description.trim()
-            ? String(args.description)
-            : "Inspect the selected repository context.",
-          knownPaths: stringList(args.known_paths),
-          expectedFiles: typeof args.expected_files === "number" ? args.expected_files : undefined,
-          expectedChangedLines: typeof args.expected_changed_lines === "number" ? args.expected_changed_lines : undefined,
-          requiresInvestigation: args.requires_investigation === true,
-          requiresParallelism: args.requires_parallelism === true,
-          requiresLongRunningChecks: args.requires_long_running_checks === true,
-          needsDependencies: args.needs_dependencies === true,
-          risk: typeof args.risk === "string" ? args.risk as TaskRisk : undefined,
-          explicitMode: parseExplicitTaskMode(args.mode)
-            ?? (typeof args.description === "string" && args.description.trim() ? undefined : "direct"),
-        });
-        const modeContextPack = assessment.modeBehavior.structuralContext === "required"
-          ? buildControllerContextPack(ctx.repoRoot, ctx.policy, {
-              description: typeof args.description === "string" ? args.description : undefined,
-              knownPaths: stringList(args.known_paths),
-              structuralContext: "required",
-              maxFiles: 8,
-              maxSnippets: 20,
-            })
-          : undefined;
         const payload = {
           git: gitSnapshot(ctx.repoRoot),
           requirementBoard,
@@ -3260,8 +3196,6 @@ export async function callMcpTool(
             })),
           },
           checks,
-          recommendedExecution: assessment,
-          ...(modeContextPack ? { modeContextPack } : {}),
         };
         audit(ctx, name, "ok", args);
         return textResult(payload);
@@ -3525,13 +3459,6 @@ export async function callMcpTool(
         response.responseMeta.structuredPayloadBytes = Buffer.byteLength(JSON.stringify(response), "utf8");
         return textResult(response);
       }
-      case "get_project_progress": {
-        if (ctx.policy.profile !== "controller")
-          return errorResult("TOOL_DISABLED", "get_project_progress requires the controller profile");
-        const progress = getProjectProgress(ctx.repoRoot);
-        audit(ctx, name, "ok", args);
-        return textResult(progress);
-      }
       case "get_project_governance": {
         if (ctx.policy.profile !== "controller")
           return errorResult("TOOL_DISABLED", "get_project_governance requires the controller profile");
@@ -3577,22 +3504,10 @@ export async function callMcpTool(
         audit(ctx, name, "ok", args, `tasks/issues/${issue.id}`);
         return textResult(projectIssueEffectiveView(ctx.repoRoot, issue));
       }
-      case "get_task_progress_detail": {
-        if (ctx.policy.profile !== "controller")
-          return errorResult("TOOL_DISABLED", "get_task_progress_detail requires the controller profile");
-        const result = getTaskProgressReadView(
-          ctx.repoRoot,
-          String(args.issue_id ?? ""),
-          String(args.task_id ?? ""),
-          args.detail_level === "full" ? "full" : "summary",
-        );
-        audit(ctx, name, "ok", args, `tasks/issues/${result.issue.id}`);
-        return textResult(result);
-      }
       case "get_worklog_timeline": {
         if (ctx.policy.profile !== "controller")
           return errorResult("TOOL_DISABLED", "get_worklog_timeline requires the controller profile");
-        const events = getControllerTimeline(ctx.repoRoot, {
+        const events = listControllerWorklogEvents(ctx.repoRoot, {
           category: parseWorklogCategory(args.category),
           issueId: typeof args.issue_id === "string" ? args.issue_id : undefined,
           taskId: typeof args.task_id === "string" ? args.task_id : undefined,
@@ -3826,24 +3741,6 @@ export async function callMcpTool(
         );
         return textResult(preview);
       }
-      case "assess_work_request": {
-        if (ctx.policy.profile !== "controller")
-          return errorResult("TOOL_DISABLED", "assess_work_request requires the controller profile");
-        const assessment = assessWorkMode({
-          description: String(args.description ?? ""),
-          knownPaths: stringList(args.known_paths),
-          expectedFiles: typeof args.expected_files === "number" ? args.expected_files : undefined,
-          expectedChangedLines: typeof args.expected_changed_lines === "number" ? args.expected_changed_lines : undefined,
-          requiresInvestigation: args.requires_investigation === true,
-          requiresParallelism: args.requires_parallelism === true,
-          requiresLongRunningChecks: args.requires_long_running_checks === true,
-          needsDependencies: args.needs_dependencies === true,
-          risk: typeof args.risk === "string" ? args.risk as TaskRisk : undefined,
-          explicitMode: parseExplicitTaskMode(args.mode),
-        });
-        audit(ctx, name, "ok", args);
-        return textResult(assessment);
-      }
       case "create_issue": {
         if (ctx.policy.profile !== "controller")
           return errorResult(
@@ -4427,18 +4324,12 @@ export async function callMcpTool(
         if (!task) return errorResult("TASK_NOT_FOUND", `task not found: ${issueId}/${taskId}`);
         if (task.status === "done") return textResult(projectIssueEffectiveView(ctx.repoRoot, current));
         if (task.status !== "verified" || !task.verification) return errorResult("TASK_NOT_VERIFIED", `task has not passed its risk-adaptive verification requirements (current: ${task.status})`);
-        const workId = typeof args.work_id === "string" ? args.work_id.trim() : "";
-        const issue = workId
-          ? acceptVerifiedTaskFromControllerWork({
-              controllerHome: resolveRepoPreferredControllerHome(ctx.repoRoot),
-              repoId: ctx.repoId ?? String(args.repo_id ?? "").trim(),
-              repoRoot: ctx.repoRoot,
-              issueId,
-              taskId,
-              workId,
-              note: typeof args.note === "string" ? args.note : undefined,
-            }).issue
-          : acceptVerifiedTask(ctx.repoRoot, issueId, taskId, typeof args.note === "string" ? args.note : "Accepted after required verification evidence.");
+        const issue = acceptVerifiedTask(
+          ctx.repoRoot,
+          issueId,
+          taskId,
+          typeof args.note === "string" ? args.note : "Accepted after required verification evidence.",
+        );
         audit(ctx, name, "ok", args, `tasks/issues/${issue.id}`);
         return textResult(projectIssueEffectiveView(ctx.repoRoot, issue));
       }
@@ -4487,19 +4378,6 @@ export async function callMcpTool(
         const checks = stringList(args.checks);
         const git = gitSnapshot(ctx.repoRoot);
         const workspaceIdentity = createHash("sha256").update(JSON.stringify(git)).digest("hex");
-        const routeDecision = decideRoute({
-          intent: {
-            objective: purpose,
-            scopeClear: allowedPaths.length > 0,
-            mutation: true,
-            expectedFiles: typeof args.max_files === "number" ? args.max_files : allowedPaths.length,
-            expectedChangedLines: typeof args.max_changed_lines === "number" ? args.max_changed_lines : undefined,
-          },
-          workspace: { knownPaths: allowedPaths, checkoutId: identity.checkoutId, fingerprint: workspaceIdentity },
-          policy: { risk: "local_repo_write", approvalConfirmed: true },
-          capabilities: {},
-          recovery: {},
-        });
         const requestedWorkId = typeof args.work_id === "string" ? args.work_id.trim() : "";
         const workId = requestedWorkId || `work-direct-${createHash("sha256").update(`${repoId}\0${purpose}\0${Date.now()}`).digest("hex").slice(0, 16)}`;
         const workStore = { controllerHome, repoId };
@@ -4514,7 +4392,6 @@ export async function callMcpTool(
             controllerInstanceId: identity.controllerInstanceId,
             baseRevision: git.head ?? undefined,
             workspaceFingerprint: workspaceIdentity,
-            routeDecision,
             objective: purpose,
             issueId: typeof args.issue_id === "string" ? args.issue_id : undefined,
             taskId: typeof args.task_id === "string" ? args.task_id : undefined,
@@ -4546,7 +4423,6 @@ export async function callMcpTool(
             checkoutId: identity.checkoutId,
             principalId: identity.principalId,
             controllerInstanceId: identity.controllerInstanceId,
-            routeDecisionFingerprint: routeDecision.inputFingerprint,
           },
         });
         audit(
@@ -4585,7 +4461,6 @@ export async function callMcpTool(
                 checkoutId: identity.checkoutId,
                 principalId: identity.principalId,
                 controllerInstanceId: identity.controllerInstanceId,
-                routeDecisionFingerprint: current.routeDecisionFingerprint,
               },
             },
           );
@@ -4705,7 +4580,6 @@ export async function callMcpTool(
               checkoutId: identity.checkoutId,
               principalId: identity.principalId,
               controllerInstanceId: identity.controllerInstanceId,
-              routeDecisionFingerprint: current.routeDecisionFingerprint,
             },
           },
         );

package/adapters/mcp/tool-mapping/post-finalize-work-attribution.ts

@@ -1,8 +1,7 @@
 import { classifyRepositoryCommand } from '../../../src/cli/repositories/command-classifier';
 import { resolveRepositorySelection } from '../../../src/cli/repositories/registry';
 import { executionIdentityForRepository } from '../../../src/runtime/control-plane/execution/execution-identity';
-import { getWorkContract } from '../../../packages/kernel/work/api';
-import { isTerminalWorkContractStatus } from '../../../src/runtime/control-plane/facade/types';
+import { getWorkContract, semanticWorkState } from '../../../packages/kernel/work/api';
 import {
   classifyRepositoryCommandRoute,
   executeRepositoryCommandViaProcessRuntime,
@@ -69,10 +68,7 @@ export async function callPostFinalizeWorkReadOnlyCommand(
   const work = getWorkContract({ controllerHome, repoId: repository.repoId }, requestedWorkId);
   if (
     !work
-    || !isTerminalWorkContractStatus(work.status)
-    || work.status !== 'completed'
-    || !work.completionReceipt
-    || work.completionReceipt.workId !== requestedWorkId
+    || semanticWorkState(work) !== 'completed'
     || !work.principalId?.trim()
     || work.principalId.trim() !== principalId
   ) {
@@ -110,7 +106,7 @@ export async function callPostFinalizeWorkReadOnlyCommand(
       repoId: repository.repoId,
       checkoutId: repository.activeCheckoutId,
       workId: requestedWorkId,
-      lifecycleClosed: true,
+      semanticWorkState: 'completed',
       error: {
         code: 'POST_FINALIZE_READONLY_ROUTE_MISMATCH',
         message: 'Post-finalize Work attribution may execute only through the bounded readonly direct lane.',
@@ -127,9 +123,8 @@ export async function callPostFinalizeWorkReadOnlyCommand(
     repoId: repository.repoId,
     checkoutId: repository.activeCheckoutId,
     workId: requestedWorkId,
-    lifecycleClosed: true,
+    semanticWorkState: 'completed',
     postFinalizeAttribution: 'readonly_followup',
-    completed: true,
     ok: execution.ok === true,
     exitCode: execution.exitCode,
     stdout: execution.stdout,