@moretea-labs/forge 1.7.2 → 1.8.1

package/src/cli/local-bridge/server.ts

@@ -1,12 +1,12 @@
 import { randomBytes } from "crypto";
 import { readFileSync } from "fs";
-import { spawn } from "child_process";
 import { createServer, type Server } from "http";
 import express, {
   type NextFunction,
   type Request,
   type Response,
 } from "express";
+import { describeFailure } from "../../../packages/protocols/failure";
 import {
   cancelAgentJob,
   getAgentJob,
@@ -35,11 +35,6 @@ import {
 } from "../controller/issue-store";
 import { readTaskRunEvidence } from "../controller/run-evidence";
 import { resolveEffectiveTaskState } from "../controller/task-status-resolver";
-import {
-  getControllerTimeline,
-  getProjectProgress,
-  getTaskProgressDetail,
-} from "../controller/progress";
 import { buildControllerTaskLedgerProjection } from "../controller/task-ledger";
 import { buildControllerOperationalPlan } from "../controller/operational-plan";
 import { exportControllerWorklog, listControllerWorklogEvents, parseWorklogCategory } from "../controller/worklog";
@@ -72,8 +67,6 @@ import {
   rollbackEditSession,
   verifyEditSession,
 } from "../editing/edit-session";
-import { localBridgeDashboardHtml } from "./dashboard";
-import { readConsoleAsset, type ConsoleAssetName } from "./console-assets";
 import { applyConsoleAutomationAction, listConsoleAutomations, summarizeConsoleAutomations } from "./console-automations";
 import {
   ackConsoleHandoff,
@@ -88,21 +81,17 @@ import {
   getConsolePlugin,
   listConsolePlugins,
   toConsoleOperationFeedback,
-  continueConsoleWork,
   delegateConsoleWork,
   dismissConsoleHandoff,
-  finalizeConsoleWork,
   getConsoleHandoff,
   getConsoleWork,
   listConsoleHandoffs,
   listConsoleWork,
   mapRepositoryCard,
-  previewExecutionMode,
   repairConsole,
   resolveConsoleHandoff,
   setConsoleAccessPolicy,
   startConsoleWork,
-  stopConsoleWork,
   verifyConsoleWork,
 } from "./facade-api";
 import {
@@ -112,16 +101,16 @@ import {
   forgeToolSurfaceFingerprint,
   defaultLocalAgentRunners,
 } from "../controller/runtime-config";
-import { taskExecutionPolicy, taskWriteScopesConflict } from "../controller/execution-policy";
+import { taskWriteScopesConflict } from "../controller/execution-policy";
 import { continueTaskAfterSuccessfulRun } from "../controller/execution-completion";
 import { applyCompletionDecision, completionDecisionQueues, finishCompletionBacklog, inspectCompletionBacklog } from "../controller/completion-backlog";
 import { finishEditSession, finishTaskRun } from "../controller/completion-orchestrator";
 import { prepareCodexContinuation } from "../controller/codex-continuation";
 import { applyStuckStateMigration, inspectStuckControllerStates } from "../controller/stuck-state-migration";
-import { getMcpPolicy } from "../mcp/policy";
-import type { MultiRepositoryMcpToolContext } from "../mcp/multi-repository";
-import { createMcpToolContext as createControllerMcpToolContext } from "../mcp/server";
-import { loadMcpLocalConfig, loadMcpServiceLocalConfig, loadMcpServiceRuntimeState } from "../mcp/auth";
+import { getMcpPolicy } from "../../../adapters/mcp/policy";
+import type { MultiRepositoryMcpToolContext } from "../../../adapters/mcp/multi-repository";
+import { createMcpToolContext as createControllerMcpToolContext } from "../../../adapters/mcp/server";
+import { loadMcpLocalConfig, loadMcpServiceLocalConfig, loadMcpServiceRuntimeState } from "../../../adapters/mcp/auth";
 import { loadRepositoryRegistry, registerRepository, removeRepository, resolveRepositorySelection } from "../repositories/registry";
 import { resolveControllerHome, resolveRepoPreferredControllerHome } from "../repositories/controller-home";
 import { ensureRepositoryRuntimeStorage } from "../repositories/runtime-storage";
@@ -138,7 +127,7 @@ import {
   verifyMobileIntentRequest,
 } from "./mobile-intents";
 import { buildMobileMonitorSnapshot } from "./mobile-monitor";
-import { controllerExposureSnapshot } from "../mcp/toolset";
+import { controllerExposureSnapshot } from "../../../adapters/mcp/toolset";
 import { completeGoogleOAuthLogin } from "../../runtime/safe-tooling/google-oauth-broker";
 import { completeResendOAuthLogin } from "../../runtime/safe-tooling/resend-oauth";
 import { summarizePluginForLowInterception } from "../../runtime/safe-tooling";
@@ -157,7 +146,6 @@ export interface LocalBridgeServerOptions {
   defaultRepoId?: string;
   host?: string;
   port?: number;
-  openBrowser?: boolean;
   token?: string;
   allowLanMobileIntents?: boolean;
   mode?: "standalone" | "embedded" | "remote" | "disabled" | "unknown";
@@ -217,26 +205,18 @@ function cookieValue(request: Request, name: string): string | undefined {
   return undefined;
 }
 
-function openUrl(url: string): void {
-  const command =
-    process.platform === "darwin"
-      ? "open"
-      : process.platform === "win32"
-        ? "cmd"
-        : "xdg-open";
-  const args = process.platform === "win32" ? ["/c", "start", "", url] : [url];
-  try {
-    const child = spawn(command, args, { detached: true, stdio: "ignore" });
-    child.unref();
-  } catch (_error) {
-    // The URL is still printed by the caller when a desktop opener is unavailable.
-  }
-}
-
 function errorMessage(error: unknown): string {
   return error instanceof Error ? error.message : String(error);
 }
 
+function mobileIntentFailureResponse(error: unknown): { message: string; status: number } {
+  const failure = describeFailure(error, {
+    fallbackCode: 'MOBILE_INTENT_REQUEST_FAILED',
+    fallbackHttpStatus: 400,
+  });
+  return { message: failure.message, status: failure.httpStatus ?? 400 };
+}
+
 function localBridgeExecutionRetiredPayload(): Record<string, unknown> {
   return {
     error: "LOCAL_BRIDGE_JOB_RETIRED",
@@ -254,6 +234,15 @@ function legacyControlPlaneMutationRetiredPayload(): Record<string, unknown> {
   };
 }
 
+function legacyProgressProjectionRetiredPayload(): Record<string, unknown> {
+  return {
+    error: "LEGACY_PROGRESS_PROJECTION_RETIRED",
+    message: "Legacy Issue/Task progress projections were retired with the Local Bridge web UI. Use Requirement, Plan, Work and execution evidence APIs.",
+    authority: "controller-home-sqlite",
+    deprecated: true,
+  };
+}
+
 function queryString(value: unknown): string | undefined {
   return typeof value === "string" && value.trim() ? value.trim() : undefined;
 }
@@ -536,8 +525,7 @@ export function buildLocalControllerSnapshot(repoRoot: string) {
     projectState: loadControllerProjectState(repoRoot),
     governance: inspectProjectGovernance(repoRoot),
     recovery,
-    progress: getProjectProgress(repoRoot),
-    timeline: getControllerTimeline(repoRoot, { limit: 40 }),
+    timeline: listControllerWorklogEvents(repoRoot, { limit: 40 }),
     githubPlugin: getGitHubPluginStatus(repoRoot),
     assistantPlugins,
     mobileIntents,
@@ -940,26 +928,6 @@ export async function startLocalBridgeServer(
     next();
   };
 
-  app.get("/console-assets/:asset", (request, response) => {
-    const asset = String(request.params.asset ?? "");
-    if (asset !== "app.js" && asset !== "app.css") { response.status(404).end(); return; }
-    response.setHeader("Cache-Control", "no-cache");
-    response.type(asset.endsWith(".css") ? "text/css" : "application/javascript");
-    response.send(readConsoleAsset(asset as ConsoleAssetName));
-  });
-
-  app.get("/", (_request, response) => {
-    response.setHeader("Cache-Control", "no-store, max-age=0");
-    response.setHeader("Pragma", "no-cache");
-    response.setHeader("Expires", "0");
-    response.setHeader("Referrer-Policy", "no-referrer");
-    response.setHeader(
-      "Set-Cookie",
-      `${cookieName}=${encodeURIComponent(token)}; Path=/api; HttpOnly; SameSite=Strict`,
-    );
-    response.setHeader("Content-Type", "text/html; charset=utf-8");
-    response.send(localBridgeDashboardHtml());
-  });
   app.get("/health", (_request, response) => {
     const exposure = controllerExposureSnapshot(mcpExposureContext);
     const fingerprint = exposure.fingerprint;
@@ -1007,12 +975,8 @@ export async function startLocalBridgeServer(
         signatureVerified: verified.signatureVerified,
       });
     } catch (error) {
-      const message = errorMessage(error);
-      const status = message.includes("RATE_LIMITED") ? 429
-        : message.includes("SCOPE_DENIED") ? 403
-          : message.includes("TOKEN") || message.includes("SIGNATURE") || message.includes("REPLAY") || message.includes("TIMESTAMP") || message.includes("NONCE") || message.includes("DEVICE") ? 401
-            : 400;
-      response.status(status).json({ error: message });
+      const failure = mobileIntentFailureResponse(error);
+      response.status(failure.status).json({ error: failure.message });
     }
   });
 
@@ -1031,12 +995,8 @@ export async function startLocalBridgeServer(
       sendStreamEvent(response, "ready");
       request.on("close", () => streamClients.delete(response));
     } catch (error) {
-      const message = errorMessage(error);
-      const status = message.includes("RATE_LIMITED") ? 429
-        : message.includes("SCOPE_DENIED") ? 403
-          : message.includes("TOKEN") || message.includes("SIGNATURE") || message.includes("REPLAY") || message.includes("TIMESTAMP") || message.includes("NONCE") || message.includes("DEVICE") ? 401
-            : 400;
-      response.status(status).json({ error: message });
+      const failure = mobileIntentFailureResponse(error);
+      response.status(failure.status).json({ error: failure.message });
     }
   });
 
@@ -1155,12 +1115,8 @@ export async function startLocalBridgeServer(
         job: submitted.job,
       });
     } catch (error) {
-      const message = errorMessage(error);
-      const status = message.includes("RATE_LIMITED") ? 429
-        : message.includes("SCOPE_DENIED") ? 403
-          : message.includes("TOKEN") || message.includes("SIGNATURE") || message.includes("REPLAY") || message.includes("TIMESTAMP") || message.includes("NONCE") || message.includes("DEVICE") ? 401
-            : 400;
-      response.status(status).json({ error: message });
+      const failure = mobileIntentFailureResponse(error);
+      response.status(failure.status).json({ error: failure.message });
     }
   });
 
@@ -1245,15 +1201,15 @@ export async function startLocalBridgeServer(
           repositoryName: repository.displayName,
         })),
       ).sort((left, right) => right.updatedAt.localeCompare(left.updatedAt));
-      const statusOf = (item: (typeof items)[number]) => String(item.advanced?.status ?? "");
+      const stateOf = (item: (typeof items)[number]) => String(item.advanced?.state ?? "");
       response.json({
         schemaVersion: 1,
         generatedAt: new Date().toISOString(),
         summary: {
           total: items.length,
-          open: items.filter((item) => ["open", "running", "ready"].includes(statusOf(item))).length,
-          needsAttention: items.filter((item) => ["blocked", "failed"].includes(statusOf(item))).length,
-          completed: items.filter((item) => ["completed", "cancelled"].includes(statusOf(item))).length,
+          open: items.filter((item) => stateOf(item) === "open").length,
+          needsAttention: items.filter((item) => ["blocked", "failed", "needs_attention"].includes(item.phase)).length,
+          completed: items.filter((item) => ["completed", "cancelled"].includes(stateOf(item))).length,
         },
         repositories: repositories.map((repository) => ({ repoId: repository.repoId, repositoryName: repository.displayName })),
         items,
@@ -1391,28 +1347,6 @@ export async function startLocalBridgeServer(
     }
   });
 
-  app.post("/api/console/mode-preview", (request, response) => {
-    try {
-      const body = request.body && typeof request.body === "object" && !Array.isArray(request.body)
-        ? request.body as Record<string, unknown>
-        : {};
-      const modePreview = previewExecutionMode({
-        objective: queryString(body.objective) ?? "",
-        expectedFiles: typeof body.expectedFiles === "number" ? body.expectedFiles : undefined,
-        expectedChangedLines: typeof body.expectedChangedLines === "number" ? body.expectedChangedLines : undefined,
-        scopeClear: body.scopeClear !== false,
-        requiresInvestigation: body.requiresInvestigation === true,
-        requiresLongRunningChecks: body.requiresLongRunningChecks === true,
-        requiresWorker: body.requiresWorker === true,
-        requiresApproval: body.requiresApproval === true,
-        destructive: body.destructive === true,
-      });
-      response.json({ modePreview });
-    } catch (error) {
-      response.status(400).json({ error: errorMessage(error) });
-    }
-  });
-
   app.get("/api/console/inbox", (request, response) => {
     try {
       const status = queryString(request.query.status) === "all" ? "all"
@@ -1445,9 +1379,9 @@ export async function startLocalBridgeServer(
     }
   });
 
-  app.post("/api/console/inbox/:handoffId/approve", (request, response) => {
+  app.post("/api/console/inbox/:handoffId/approve", async (request, response) => {
     try {
-      const result = approveConsoleHandoff(
+      const result = await approveConsoleHandoff(
         consoleCtx(request),
         String(request.params.handoffId ?? ""),
         "user",
@@ -1464,13 +1398,13 @@ export async function startLocalBridgeServer(
     }
   });
 
-  app.post("/api/console/inbox/:handoffId/resolve", (request, response) => {
+  app.post("/api/console/inbox/:handoffId/resolve", async (request, response) => {
     try {
       const body = request.body && typeof request.body === "object" && !Array.isArray(request.body)
         ? request.body as Record<string, unknown>
         : {};
       response.json({
-        item: resolveConsoleHandoff(
+        item: await resolveConsoleHandoff(
           consoleCtx(request),
           String(request.params.handoffId ?? ""),
           queryString(body.decision) ?? "resolved",
@@ -1532,19 +1466,11 @@ export async function startLocalBridgeServer(
         acceptanceCriteria: Array.isArray(body.acceptanceCriteria) ? body.acceptanceCriteria.map(String) : undefined,
         allowedPaths: Array.isArray(body.allowedPaths) ? body.allowedPaths.map(String) : undefined,
         forbiddenPaths: Array.isArray(body.forbiddenPaths) ? body.forbiddenPaths.map(String) : undefined,
-        expectedFiles: typeof body.expectedFiles === "number" ? body.expectedFiles : undefined,
-        expectedChangedLines: typeof body.expectedChangedLines === "number" ? body.expectedChangedLines : undefined,
         scopeClear: body.scopeClear !== false,
-        requiresInvestigation: body.requiresInvestigation === true,
-        requiresLongRunningChecks: body.requiresLongRunningChecks === true,
-        requiresWorker: body.requiresWorker === true,
         requiresApproval: body.requiresApproval === true,
         destructive: body.destructive === true,
         accessMode: body.accessMode === 'full_access' ? 'full_access' : body.accessMode === 'request' ? 'request' : undefined,
         approvalConfirmed: body.approvalConfirmed === true,
-        forceMode: body.forceMode === "direct_control" || body.forceMode === "goal_workloop" || body.forceMode === "handoff_only"
-          ? body.forceMode
-          : undefined,
         checkIds: Array.isArray(body.checkIds) ? body.checkIds.map(String) : undefined,
       });
       const feedback = toConsoleOperationFeedback(result);
@@ -1563,18 +1489,6 @@ export async function startLocalBridgeServer(
     return { ...result, ...feedback, feedback };
   };
 
-  app.post("/api/console/work/continue", (request, response) => {
-    try {
-      const body = request.body && typeof request.body === "object" && !Array.isArray(request.body)
-        ? request.body as Record<string, unknown>
-        : {};
-      const result = continueConsoleWork(consoleCtx(request), queryString(body.workId) ?? "", queryString(body.note));
-      response.status(result.status === "not_found" ? 404 : result.status === "blocked" || result.status === "failed" ? 409 : 200).json(withFeedback(result));
-    } catch (error) {
-      response.status(400).json({ error: errorMessage(error) });
-    }
-  });
-
   app.post("/api/console/work/verify", async (request, response) => {
     try {
       const body = request.body && typeof request.body === "object" && !Array.isArray(request.body)
@@ -1593,30 +1507,6 @@ export async function startLocalBridgeServer(
     }
   });
 
-  app.post("/api/console/work/finalize", (request, response) => {
-    try {
-      const body = request.body && typeof request.body === "object" && !Array.isArray(request.body)
-        ? request.body as Record<string, unknown>
-        : {};
-      const result = finalizeConsoleWork(consoleCtx(request), queryString(body.workId) ?? "");
-      response.status(result.status === "not_found" ? 404 : result.status === "failed" || result.status === "blocked" ? 409 : 200).json(withFeedback(result));
-    } catch (error) {
-      response.status(400).json({ error: errorMessage(error) });
-    }
-  });
-
-  app.post("/api/console/work/stop", (request, response) => {
-    try {
-      const body = request.body && typeof request.body === "object" && !Array.isArray(request.body)
-        ? request.body as Record<string, unknown>
-        : {};
-      const result = stopConsoleWork(consoleCtx(request), queryString(body.workId) ?? "", queryString(body.reason));
-      response.status(result.status === "not_found" ? 404 : 200).json(withFeedback(result));
-    } catch (error) {
-      response.status(400).json({ error: errorMessage(error) });
-    }
-  });
-
   app.post("/api/console/work/delegate", (request, response) => {
     try {
       const body = request.body && typeof request.body === "object" && !Array.isArray(request.body)
@@ -1893,13 +1783,6 @@ export async function startLocalBridgeServer(
       response.status(400).json({ error: errorMessage(error) });
     }
   });
-  app.get("/api/progress", (request, response) => {
-    try {
-      response.json(getProjectProgress(requestRepositoryRoot(request, options, controllerHome)));
-    } catch (error) {
-      response.status(400).json({ error: errorMessage(error) });
-    }
-  });
   app.get("/api/governance", (request, response) => {
     try {
       response.json(inspectProjectGovernance(requestRepositoryRoot(request, options, controllerHome)));
@@ -2010,6 +1893,12 @@ export async function startLocalBridgeServer(
       response.status(400).json({ error: errorMessage(error) });
     }
   });
+  app.get("/api/progress", (_request, response) => {
+    response.status(410).json(legacyProgressProjectionRetiredPayload());
+  });
+  app.get("/api/issues/:issueId/tasks/:taskId", (_request, response) => {
+    response.status(410).json(legacyProgressProjectionRetiredPayload());
+  });
   app.patch("/api/project-state", (request, response) => {
     try {
       const body = request.body ?? {};
@@ -2096,7 +1985,6 @@ export async function startLocalBridgeServer(
         response.json(issue);
         return;
       }
-      const policy = taskExecutionPolicy(task);
       const confirmAcceptance = request.body?.confirmAcceptance === true;
       const reviewer = queryString(request.body?.reviewer) ?? "local-controller-human";
       const latestRunId = task.runIds.at(-1);
@@ -2143,8 +2031,8 @@ export async function startLocalBridgeServer(
           return { checkId, ok: false, summary: errorMessage(error) };
         }
       }));
-      if (policy.requiresAcceptanceEvidence && !confirmAcceptance) {
-        throw new Error(`${policy.executionClass} requires explicit acceptance evidence when no successful Run is linked`);
+      if (task.acceptanceCriteria.length > 0 && !confirmAcceptance) {
+        throw new Error('Explicit Task acceptance criteria require acceptance evidence when no successful Run is linked');
       }
       const at = new Date().toISOString();
       response.json(recordTaskVerification(repoRoot, issue.id, task.id, {
@@ -2281,7 +2169,7 @@ export async function startLocalBridgeServer(
   app.get("/api/timeline", (request, response) => {
     try {
       response.json({
-        events: getControllerTimeline(requestRepositoryRoot(request, options, controllerHome), {
+        events: listControllerWorklogEvents(requestRepositoryRoot(request, options, controllerHome), {
           category: parseWorklogCategory(queryString(request.query.category)),
           issueId: queryString(request.query.issueId),
           taskId: queryString(request.query.taskId),
@@ -2296,19 +2184,6 @@ export async function startLocalBridgeServer(
       response.status(400).json({ error: errorMessage(error) });
     }
   });
-  app.get("/api/issues/:issueId/tasks/:taskId", (request, response) => {
-    try {
-      response.json(
-        getTaskProgressDetail(
-          requestRepositoryRoot(request, options, controllerHome),
-          request.params.issueId,
-          request.params.taskId,
-        ),
-      );
-    } catch (error) {
-      response.status(404).json({ error: errorMessage(error) });
-    }
-  });
   app.post("/api/worklog/export", (request, response) => {
     try {
       response.json(
@@ -2706,7 +2581,6 @@ export async function startLocalBridgeServer(
   const port =
     typeof address === "object" && address ? address.port : requestedPort;
   const url = `http://${host === "::1" ? "[::1]" : host}:${port}/`;
-  if (options.openBrowser) openUrl(url);
   return {
     host,
     port,

package/src/cli/local-bridge/types.ts

@@ -167,7 +167,6 @@ export interface LocalBridgeConfig {
   version: 1;
   host?: string;
   port?: number;
-  autoOpen?: boolean;
   /** Allow only authenticated /mobile/intent requests on a wildcard/LAN bind. */
   allowLanMobileIntents?: boolean;
   approvals?: Partial<Record<LocalBridgeJobAction, LocalBridgeApproval>>;

package/src/cli/mcp/access-mode.ts

@@ -1,132 +1,2 @@
-import { existsSync } from 'fs';
-import {
-  loadMcpServiceLocalConfig,
-  mcpControllerHomeLocalConfigPath,
-  mcpLocalConfigPath,
-  type McpLocalConfig,
-  writeMcpServiceLocalConfig,
-} from './auth';
-import type { McpToolset } from './types';
-import {
-  migrateControllerToolsetConfig,
-  normalizeConfiguredMcpToolset,
-  resolveControllerToolsetSelection,
-} from './toolset-selection';
-import {
-  isAccessMode,
-  type AccessMode,
-} from '../../runtime/control-plane/governance/access-policy';
-
-export type ControllerAccessConfigSource =
-  | 'controller_home.access_mode'
-  | 'repo_local_fallback.access_mode'
-  | 'controller_home.legacy_toolset'
-  | 'repo_local_fallback.legacy_toolset'
-  | 'default';
-
-export interface ControllerAccessState {
-  configuredAccessMode: AccessMode;
-  effectiveAccessMode: AccessMode;
-  /** Selected schema profile; access mode never changes this value. */
-  effectiveToolset: McpToolset;
-  source: ControllerAccessConfigSource;
-  lastAppliedAt?: string;
-  exposureRevision: number;
-  configPathSource: 'controller_home' | 'repo_local_fallback' | 'default';
-  legacyToolset?: McpToolset;
-  schemaStableAcrossAccessModes: true;
-}
-
-export interface ResolveControllerAccessStateInput {
-  controllerHome: string;
-  repoRoot?: string;
-  toolsetOverride?: McpToolset;
-  toolsetLocked?: boolean;
-}
-
-export interface PersistControllerAccessModeResult {
-  configPath: string;
-  config: McpLocalConfig;
-  state: ControllerAccessState;
-}
-
-export function accessModeForLegacyToolset(toolset: McpToolset): AccessMode {
-  return toolset === 'core' ? 'request' : 'full_access';
-}
-
-/** Retained for compatibility only; access mode no longer changes schema. */
-export function legacyToolsetForAccessMode(_mode: AccessMode): McpToolset {
-  return 'core';
-}
-
-function configLocation(controllerHome: string, repoRoot?: string): 'controller_home' | 'repo_local_fallback' | 'default' {
-  if (existsSync(mcpControllerHomeLocalConfigPath(controllerHome))) return 'controller_home';
-  if (repoRoot && existsSync(mcpLocalConfigPath(repoRoot))) return 'repo_local_fallback';
-  return 'default';
-}
-
-function normalizedRevision(value: unknown): number {
-  if (typeof value !== 'number' || !Number.isFinite(value)) return 0;
-  return Math.max(0, Math.trunc(value));
-}
-
-export function resolveControllerAccessState(input: ResolveControllerAccessStateInput): ControllerAccessState {
-  const location = configLocation(input.controllerHome, input.repoRoot);
-  const config = loadMcpServiceLocalConfig(input.controllerHome, input.repoRoot);
-  const lastAppliedAt = typeof config?.accessModeUpdatedAt === 'string' && config.accessModeUpdatedAt.trim()
-    ? config.accessModeUpdatedAt
-    : undefined;
-  const exposureRevision = normalizedRevision(config?.accessModeRevision);
-  const rawLegacyToolset = normalizeConfiguredMcpToolset(config?.toolset);
-  const selectedToolset = resolveControllerToolsetSelection(config, input.toolsetOverride);
-  const configuredAccessMode = isAccessMode(config?.accessMode)
-    ? config.accessMode
-    : rawLegacyToolset
-      ? accessModeForLegacyToolset(rawLegacyToolset)
-      : 'full_access';
-  const source: ControllerAccessConfigSource = isAccessMode(config?.accessMode)
-    ? (location === 'controller_home' ? 'controller_home.access_mode' : 'repo_local_fallback.access_mode')
-    : rawLegacyToolset
-      ? (location === 'controller_home' ? 'controller_home.legacy_toolset' : 'repo_local_fallback.legacy_toolset')
-      : 'default';
-  return {
-    configuredAccessMode,
-    effectiveAccessMode: configuredAccessMode,
-    effectiveToolset: selectedToolset.toolset,
-    source,
-    lastAppliedAt,
-    exposureRevision,
-    configPathSource: location,
-    legacyToolset: rawLegacyToolset,
-    schemaStableAcrossAccessModes: true,
-  };
-}
-
-export function persistControllerAccessMode(
-  controllerHome: string,
-  mode: AccessMode,
-  repoRoot?: string,
-): PersistControllerAccessModeResult {
-  const existing = loadMcpServiceLocalConfig(controllerHome, repoRoot) ?? {};
-  const accessModeUpdatedAt = new Date().toISOString();
-  const accessModeRevision = normalizedRevision(existing.accessModeRevision) + 1;
-  const migratedToolset = migrateControllerToolsetConfig(existing);
-  const config: McpLocalConfig = {
-    ...existing,
-    version: Math.max(existing.version ?? 1, 2),
-    profile: existing.profile ?? 'controller',
-    accessMode: mode,
-    accessModeUpdatedAt,
-    accessModeRevision,
-    // Access changes preserve an explicit profile and migrate the old implicit
-    // Advanced label to Core; they never expand or shrink schema themselves.
-    toolset: migratedToolset.toolset,
-    toolsetExplicit: migratedToolset.toolsetExplicit,
-  };
-  const configPath = writeMcpServiceLocalConfig(controllerHome, config);
-  return {
-    configPath,
-    config,
-    state: resolveControllerAccessState({ controllerHome, repoRoot }),
-  };
-}
+/** @deprecated Kernel V2 compatibility shim. MCP adapter owns this surface. */
+export * from '../../../adapters/mcp/access-mode';