@moretea-labs/forge 1.7.2 → 1.8.1

package/src/cli/local-bridge/facade-api.ts

@@ -1,3 +1,4 @@
+import { randomUUID } from 'crypto';
 import type { RepositoryRecord } from '../repositories/types';
 import {
   accessModeDescriptor,
@@ -9,17 +10,20 @@ import {
 import {
   persistControllerAccessMode,
   resolveControllerAccessState,
-} from '../mcp/access-mode';
+} from '../../../adapters/mcp/access-mode';
 import { listControllerChecks } from '../controller/check-runner';
-import { createMcpToolContext, type MultiRepositoryMcpToolContext } from '../mcp/multi-repository';
+import { createMcpToolContext, type MultiRepositoryMcpToolContext } from '../../../adapters/mcp/multi-repository';
 import { readSchedulerHealthSnapshot } from '../../runtime/control-plane/global-scheduler/scheduler';
 import { observeRuntimeStatus } from '../../runtime/root/status';
+import { createSetupBootstrapControlApi } from '../commands/bootstrap-control';
+import type { BootstrapSnapshot } from '../../runtime/control-plane/bootstrap';
 import { readForgeRuntimeStatus } from '../../runtime/control-plane/runtime-status-client';
 import { evaluateActiveRuntimeSourceDrift, readRuntimeGeneration } from '../../runtime/control-plane/runtime-generation';
 import {
-  controllerPluginRepository,
   getAssistantPluginManifest,
+  getControllerPluginManifest,
   listAssistantPluginManifests,
+  listControllerPluginManifests,
 } from '../../runtime/plugins/store';
 import type { AssistantPluginManifest } from '../../runtime/plugins/types';
 import {
@@ -27,38 +31,34 @@ import {
   buildFacadeResult,
   buildSyncOperationDigest,
   classifyUserFacingError,
-  continueGoalWorkloop,
   delegateToCodexCerebellum,
   dismissHandoffItem,
-  finalizeGoalWorkloop,
   getHandoffItem,
   getWorkContract,
   listHandoffItems,
   listWorkContracts,
   normalizeCheckIds,
-  resolveHandoffItem,
-  routeWorkStart,
+  createWorkSemanticContext,
+  workSemanticView,
   runSelfHealingLoop,
-  selectExecutionMode,
-  stopGoalWorkloop,
   summarizeHandoffItem,
   summarizeWorkContract,
-  type ExecutionModeSelectionInput,
   type FacadeResult,
   type HandoffItem,
   type SuggestedNextAction,
   type WorkContract,
 } from '../../runtime/control-plane/facade';
+import { resolveHandoffAndTriggerContinuation } from '../../runtime/workflow/schedules/work-continuation';
 import { buildRuntimeMaintenanceStatus } from '../../runtime/recovery';
 import { applySafePatch } from '../repositories/safe-patch';
 import { withControllerLock } from '../repositories/locks';
-import { loadMcpServiceLocalConfig, loadMcpServiceRuntimeState } from '../mcp/auth';
+import { loadMcpServiceLocalConfig, loadMcpServiceRuntimeState } from '../../../adapters/mcp/auth';
 import {
   buildLocalConnectorStatusForRepo,
   EXPECTED_FACADE_TOOLS,
   type ConnectorFreshnessReport,
 } from './connector-freshness';
-import { controllerExposedToolNames } from '../mcp/toolset';
+import { controllerExposedToolNames } from '../../../adapters/mcp/toolset';
 import {
   statusLabelForPhase,
   type UserFacingErrorClass,
@@ -79,7 +79,6 @@ import type {
   ConnectorFreshnessViewModel,
   ConsoleErrorViewModel,
   HandoffCardViewModel,
-  ModePreviewViewModel,
   PlainStatusTone,
   PluginActionViewModel,
   AccessStateViewModel,
@@ -91,7 +90,7 @@ import type {
   VerificationViewModel,
   WorkSummaryViewModel,
 } from './console-view-models';
-import { listActiveOccurrences, listSchedules } from '../../runtime/workflow/schedules/store';
+import { listActiveOccurrences, listSchedules } from '../../../packages/kernel/scheduler/api/index';
 import { executeWorkVerification } from '../../runtime/control-plane/execution/work-verification-service';
 
 export type ConsoleFacadeContext = {
@@ -103,34 +102,6 @@ function store(ctx: ConsoleFacadeContext) {
   return { controllerHome: ctx.controllerHome, repoId: ctx.repository.repoId };
 }
 
-function plainMode(mode: ModePreviewViewModel['mode']): ModePreviewViewModel {
-  if (mode === 'direct_control') {
-    return {
-      mode,
-      label: '直接执行',
-      explanation: '小范围、目标清晰的改动；适合由 ChatGPT 直接监督完成。',
-      createWorkContract: false,
-      createHandoff: false,
-    };
-  }
-  if (mode === 'handoff_only') {
-    return {
-      mode,
-      label: '需要你先决定',
-      explanation: '目标不清、风险较高或缺少授权；执行前需要你的判断。',
-      createWorkContract: false,
-      createHandoff: true,
-    };
-  }
-  return {
-    mode: 'goal_workloop',
-    label: '可恢复的后台任务',
-    explanation: '多步骤或需要恢复/隔离的任务；会创建工作项并支持继续、验证与收尾。',
-    createWorkContract: true,
-    createHandoff: false,
-  };
-}
-
 function mapSuggested(actions: SuggestedNextAction[] = []): SuggestedActionViewModel[] {
   return actions.slice(0, 8).map((action, index) => {
     const op = action.operation;
@@ -157,17 +128,14 @@ function mapSuggested(actions: SuggestedNextAction[] = []): SuggestedActionViewM
   });
 }
 
-function workStatusLabel(status: WorkContract['status']): { label: string; tone: PlainStatusTone; phase: UserFacingPhase } {
-  switch (status) {
-    case 'running': return { label: '进行中', tone: 'blue', phase: 'running' };
-    case 'open': return { label: '待开始', tone: 'gray', phase: 'queued' };
-    case 'blocked': return { label: '已阻塞', tone: 'red', phase: 'blocked' };
-    case 'ready': return { label: '需要你审阅', tone: 'amber', phase: 'needs_attention' };
-    case 'completed': return { label: '已完成', tone: 'green', phase: 'succeeded' };
-    case 'failed': return { label: '未通过验收', tone: 'red', phase: 'failed' };
-    case 'cancelled': return { label: '已停止', tone: 'gray', phase: 'cancelled' };
-    default: return { label: String(status), tone: 'gray', phase: 'running' };
-  }
+function workStatusLabel(work: WorkContract): { label: string; tone: PlainStatusTone; phase: UserFacingPhase } {
+  if (work.semanticState === 'completed') return { label: '已完成', tone: 'green', phase: 'succeeded' };
+  if (work.semanticState === 'cancelled') return { label: '已停止', tone: 'gray', phase: 'cancelled' };
+  if (work.evidenceState === 'failed' || work.phaseEvidence[work.phase].state === 'failed') return { label: '执行失败', tone: 'red', phase: 'failed' };
+  if (work.dispatchState === 'blocked' || work.phaseEvidence[work.phase].state === 'blocked') return { label: '已阻塞', tone: 'red', phase: 'blocked' };
+  if (work.phase === 'review' && work.phaseEvidence.review.state === 'active') return { label: '需要你审阅', tone: 'amber', phase: 'needs_attention' };
+  if (['claimed', 'launching', 'running'].includes(work.dispatchState)) return { label: '进行中', tone: 'blue', phase: 'running' };
+  return { label: '待继续', tone: 'gray', phase: 'queued' };
 }
 
 const ERROR_COPY: Record<UserFacingErrorClass, { title: string; explanation: string; nextActions: string[] }> = {
@@ -308,17 +276,18 @@ function progressSteps(work: WorkContract): WorkSummaryViewModel['progressSteps'
   const hasPass = checks.some((entry) => entry.outcome === 'valid_pass');
   const hasFail = checks.some((entry) => entry.outcome === 'valid_fail');
   const hasDelegate = Boolean(work.workerRef);
-  const review = work.status === 'ready';
-  const done = work.status === 'completed';
-  const failed = work.status === 'failed';
-  const cancelled = work.status === 'cancelled';
+  const review = work.phase === 'review' && work.phaseEvidence.review.state === 'active';
+  const done = work.semanticState === 'completed';
+  const failed = work.evidenceState === 'failed' || work.phaseEvidence[work.phase].state === 'failed';
+  const cancelled = work.semanticState === 'cancelled';
+  const executing = ['claimed', 'launching', 'running'].includes(work.dispatchState);
   return [
-    { label: '已开始', done: true, active: work.status === 'running' && !hasDelegate && !hasPass },
+    { label: '已开始', done: true, active: executing && !hasDelegate && !hasPass },
     { label: '已委派助手', done: hasDelegate, active: hasDelegate && !hasPass && !review },
     { label: '已提出修改', done: hasDelegate || hasPass || hasFail, active: false },
     { label: '已验证', done: hasPass || hasFail, active: hasFail && !review },
     { label: '等待审阅', done: review || done, active: review },
-    { label: done ? '已完成' : failed ? '验收失败' : cancelled ? '已停止' : '收尾', done: done || failed || cancelled, active: false },
+    { label: done ? '已完成' : failed ? '执行失败' : cancelled ? '已停止' : '收尾', done: done || cancelled, active: false },
   ];
 }
 
@@ -352,27 +321,27 @@ export function mapWorkSummary(
   work: WorkContract,
   opts: { controllerHome?: string; repoId?: string } = {},
 ): WorkSummaryViewModel {
-  const status = workStatusLabel(work.status);
-  const mode = plainMode(work.mode === 'direct_control' || work.mode === 'handoff_only' ? work.mode : 'goal_workloop');
+  const status = workStatusLabel(work);
   const verification = latestVerification(work);
   const suggested = mapSuggested(work.suggestedNextActions);
   const nextAction = suggested[0]?.label
-    ?? (work.status === 'ready' ? '请审阅后继续或收尾'
-      : work.status === 'running' ? '继续或运行检查'
-        : work.status === 'completed' ? '任务已完成'
-          : work.status === 'failed' ? '查看失败原因并决定是否重试'
-            : '查看任务状态');
+    ?? (work.semanticState === 'completed' ? '任务已完成'
+      : work.semanticState === 'cancelled' ? '任务已停止'
+        : status.phase === 'needs_attention' ? '请审阅后继续或收尾'
+          : status.phase === 'running' ? '继续或运行检查'
+            : status.phase === 'failed' ? '查看失败原因并决定是否重试'
+              : '查看任务状态');
   const storeOpts = opts.controllerHome && opts.repoId
     ? { controllerHome: opts.controllerHome, repoId: opts.repoId }
     : null;
   const changedFiles = summarizeChangedFiles(extractChangedPathsFromWork(work, storeOpts));
   let error: ConsoleErrorViewModel | undefined;
-  if (work.status === 'failed') {
+  if (status.phase === 'failed') {
     error = describeConsoleError(
       verification?.isInfrastructureIssue ? 'infrastructure_failure' : 'acceptance_failure',
       verification?.summary,
     );
-  } else if (work.status === 'blocked' || work.status === 'ready') {
+  } else if (status.phase === 'blocked' || status.phase === 'needs_attention') {
     error = describeConsoleError(
       'handoff_required',
       work.suggestedNextActions[0]?.reason,
@@ -381,15 +350,13 @@ export function mapWorkSummary(
   const latestSummary = verification?.summary
     || work.evidenceRefs[0]?.summary
     || work.evidenceRefs[0]?.title
-    || (work.status === 'running' ? '任务执行中…' : status.label);
+    || (status.phase === 'running' ? '任务执行中…' : status.label);
   return {
     id: work.workId,
     repoId: work.repoId,
     updatedAt: work.updatedAt,
     title: work.objective.slice(0, 160) || '未命名任务',
     objective: work.objective,
-    modeLabel: mode.label,
-    mode: mode.mode,
     accessMode: work.constraints.accessMode ?? 'full_access',
     accessModeLabel: accessModeDescriptor(work.constraints.accessMode ?? 'full_access').shortLabel,
     statusLabel: status.label,
@@ -412,7 +379,9 @@ export function mapWorkSummary(
     primaryActionLabel: suggested[0]?.label,
     advanced: {
       workId: work.workId,
-      status: work.status,
+      state: work.semanticState,
+      dispatchState: work.dispatchState,
+      evidenceState: work.evidenceState,
       checkIds: work.checks,
       handoffRefs: work.handoffRefs,
     },
@@ -438,11 +407,9 @@ function describeHandoffDecision(item: HandoffItem): HandoffCardViewModel['decis
     const payload = approvalAction?.payload ?? {};
     const objective = typeof payload.objective === 'string' ? payload.objective.trim() : '';
     const allowedPaths = Array.isArray(payload.allowedPaths) ? payload.allowedPaths.map(String).filter(Boolean) : [];
-    const expectedFiles = typeof payload.expectedFiles === 'number' ? payload.expectedFiles : undefined;
     const scopeSummary = allowedPaths.length
       ? `允许修改：${allowedPaths.slice(0, 4).join('、')}${allowedPaths.length > 4 ? ' 等' : ''}`
       : '修改范围仍受原任务描述和仓库策略限制';
-    const estimate = expectedFiles === undefined ? '' : `；预计涉及约 ${expectedFiles} 个文件`;
     return {
       type: 'approval',
       typeLabel: destructive ? '高风险操作审批' : '执行授权',
@@ -454,7 +421,7 @@ function describeHandoffDecision(item: HandoffItem): HandoffCardViewModel['decis
         ? '此操作包含高风险或潜在不可逆副作用，系统不能替你默认同意。'
         : '当前安全策略要求显式授权；缩小范围或改为只读预览后可避免本次审批。',
       impact: approvalAction?.operation === 'start'
-        ? `批准后会创建正式任务。${scopeSummary}${estimate}。`
+        ? `批准后会创建正式任务。${scopeSummary}。`
         : '当前审批没有保存可安全重放的具体动作，因此不能自动续跑。',
       afterApproval: canApproveAndContinue
         ? '系统会记录批准、立即创建任务并打开任务详情；接下来会明确显示继续、委派、验证或收尾动作，不代表任务已经完成。'
@@ -537,18 +504,6 @@ export function mapHandoffCard(item: HandoffItem): HandoffCardViewModel {
   };
 }
 
-export function previewExecutionMode(input: ExecutionModeSelectionInput & { objective?: string }): ModePreviewViewModel {
-  const selection = selectExecutionMode(input);
-  return {
-    ...plainMode(selection.mode),
-    createWorkContract: selection.createWorkContract,
-    createHandoff: selection.createHandoff,
-    explanation: selection.reason.includes('Small') || selection.reason.includes('small')
-      ? plainMode(selection.mode).explanation
-      : plainMode(selection.mode).explanation,
-  };
-}
-
 function displayPath(path: string): string {
   const home = process.env.HOME?.trim();
   if (home && path.startsWith(home)) return `~${path.slice(home.length)}`;
@@ -690,11 +645,24 @@ export async function evaluateConsoleConnectorFreshness(
   });
 }
 
+export function classifyBootstrapReadiness(input: {
+  bootstrap?: BootstrapSnapshot;
+  runtimeReady: boolean;
+  repositoryEnabled: boolean;
+}): SystemReadinessViewModel['state'] {
+  const fatalBootstrap = input.bootstrap?.blockers.some((blocker) => blocker.kind === 'failed' || blocker.kind === 'unsupported') === true;
+  if (fatalBootstrap) return 'blocked';
+  if (input.bootstrap?.status === 'ready' && !input.runtimeReady) return 'blocked';
+  if (!input.bootstrap || input.bootstrap.status !== 'ready' || !input.repositoryEnabled) return 'needs_setup';
+  return 'ready';
+}
+
 export async function buildSystemReadiness(
   ctx: ConsoleFacadeContext,
   opts: { connectorToolNames?: readonly string[] | null } = {},
 ): Promise<SystemReadinessViewModel> {
   const runtime = observeRuntimeStatus(ctx.controllerHome);
+  const bootstrap = await createSetupBootstrapControlApi({ controllerHome: ctx.controllerHome }).refresh();
   const runtimeHealth = undefined;
   const freshness = await evaluateConsoleConnectorFreshness(ctx, {
     connectorToolNames: opts.connectorToolNames,
@@ -704,6 +672,15 @@ export async function buildSystemReadiness(
   const checks = listControllerChecks(ctx.repository.canonicalRoot);
   const automation = buildAutomationReadinessSection(ctx);
   const sections: SystemReadinessViewModel['sections'] = [
+    {
+      id: 'bootstrap',
+      title: 'Forge 设置',
+      statusLabel: bootstrap?.status === 'ready' ? '就绪' : bootstrap?.status === 'blocked' ? '需要处理' : '未完成',
+      tone: bootstrap?.status === 'ready' ? 'green' : bootstrap ? 'amber' : 'amber',
+      detail: bootstrap?.status === 'ready'
+        ? `Bootstrap revision ${bootstrap.revision} 已就绪。`
+        : bootstrap?.blockers[0]?.summary ?? '尚未建立实例级 bootstrap 状态，请运行 forge setup。',
+    },
     {
       id: 'controller',
       title: '控制器',
@@ -752,9 +729,11 @@ export async function buildSystemReadiness(
     },
     automation,
   ];
-  const blocked = !runtime.ready;
-  const needsSetup = ctx.repository.enabled === false;
-  const state: SystemReadinessViewModel['state'] = blocked ? 'blocked' : needsSetup ? 'needs_setup' : 'ready';
+  const state = classifyBootstrapReadiness({
+    bootstrap,
+    runtimeReady: runtime.ready,
+    repositoryEnabled: ctx.repository.enabled !== false,
+  });
   return {
     state,
     label: state === 'ready' ? '就绪' : state === 'needs_setup' ? '需要设置' : '暂不可用',
@@ -762,7 +741,7 @@ export async function buildSystemReadiness(
     description: state === 'ready'
       ? '你可以输入自然语言任务，或先处理待决定事项。'
       : state === 'needs_setup'
-        ? '请先选择或注册一个可用仓库。'
+        ? (bootstrap?.blockers[0]?.summary ?? '请先完成 Forge 实例设置，并选择或注册一个可用仓库。')
         : '请先查看系统状态并尝试诊断/修复。',
     connectorLabel: freshness.connectorLabel,
     connectorTone: freshness.connectorTone,
@@ -917,25 +896,28 @@ export function mapPluginCard(manifest: AssistantPluginManifest): PluginCardView
 }
 
 export function listConsolePlugins(ctx: ConsoleFacadeContext): PluginCardViewModel[] {
-  const repositories = [ctx.repository, controllerPluginRepository(ctx.controllerHome)];
   const byPluginId = new Map<string, PluginCardViewModel>();
-  for (const repository of repositories) {
-    for (const manifest of listAssistantPluginManifests(ctx.controllerHome, repository, { preferStored: true })) {
-      if (!byPluginId.has(manifest.pluginId)) byPluginId.set(manifest.pluginId, mapPluginCard(manifest));
-    }
+  const manifests = [
+    ...listAssistantPluginManifests(ctx.controllerHome, ctx.repository, { preferStored: true }),
+    ...listControllerPluginManifests(ctx.controllerHome, { preferStored: true }),
+  ];
+  for (const manifest of manifests) {
+    if (!byPluginId.has(manifest.pluginId)) byPluginId.set(manifest.pluginId, mapPluginCard(manifest));
   }
   return [...byPluginId.values()].sort((left, right) => left.name.localeCompare(right.name));
 }
 
 export function getConsolePlugin(ctx: ConsoleFacadeContext, pluginId: string): PluginCardViewModel | null {
-  for (const repository of [ctx.repository, controllerPluginRepository(ctx.controllerHome)]) {
-    try {
-      return mapPluginCard(getAssistantPluginManifest(ctx.controllerHome, repository, pluginId));
-    } catch {
-      // Try the other supported plugin scope before reporting an unknown plugin.
-    }
+  try {
+    return mapPluginCard(getAssistantPluginManifest(ctx.controllerHome, ctx.repository, pluginId));
+  } catch {
+    // Try controller-scoped plugins before reporting an unknown plugin.
+  }
+  try {
+    return mapPluginCard(getControllerPluginManifest(ctx.controllerHome, pluginId));
+  } catch {
+    return null;
   }
-  return null;
 }
 
 export function buildPluginSummary(plugins: PluginCardViewModel[]): PluginSummaryViewModel {
@@ -960,8 +942,8 @@ export async function buildCommandCenter(
     repoId: ctx.repository.repoId,
   });
   const currentRepository = repositories.find((entry) => entry.current) ?? mapRepositoryCard(ctx.repository, true);
-  const activeWork = listWorkContracts({ ...store(ctx), status: 'active', limit: 20 }).map(mapWork);
-  const allRecent = listWorkContracts({ ...store(ctx), status: 'all', limit: 12 }).map(mapWork);
+  const activeWork = listWorkContracts({ ...store(ctx), state: 'active', limit: 20 }).map(mapWork);
+  const allRecent = listWorkContracts({ ...store(ctx), state: 'all', limit: 12 }).map(mapWork);
   const handoffs = listHandoffItems({ ...store(ctx), status: 'pending', limit: 20 }).map(mapHandoffCard);
   const plugins = listConsolePlugins(ctx);
   const pluginSummary = buildPluginSummary(plugins);
@@ -985,7 +967,6 @@ export async function buildCommandCenter(
     handoffs,
     pluginSummary,
     plugins,
-    modePreviewDefault: plainMode('direct_control'),
     // Only surface confirmed warnings — never "maybe missing" when ChatGPT snapshot is unobserved.
     warnings: banner ? [banner] : [],
     setupGuide: needsSetup
@@ -1032,76 +1013,26 @@ export function startConsoleWork(
     acceptanceCriteria?: string[];
     allowedPaths?: string[];
     forbiddenPaths?: string[];
-    expectedFiles?: number;
-    expectedChangedLines?: number;
     scopeClear?: boolean;
-    requiresInvestigation?: boolean;
-    requiresLongRunningChecks?: boolean;
-    requiresWorker?: boolean;
     requiresApproval?: boolean;
     destructive?: boolean;
     accessMode?: AccessMode;
     workspaceMode?: 'current' | 'isolated' | 'auto';
-    requireWorktree?: boolean;
-    directMainProhibited?: boolean;
     approvalConfirmed?: boolean;
-    forceMode?: 'direct_control' | 'goal_workloop' | 'handoff_only';
     checkIds?: string[];
   },
 ): FacadeResult {
-  const checks = listControllerChecks(ctx.repository.canonicalRoot);
-  return routeWorkStart(
-    {
-      workStore: store(ctx),
-      handoffStore: store(ctx),
-      repoId: ctx.repository.repoId,
-      availableChecks: checks,
-    },
-    {
-      objective: input.objective,
-      acceptanceCriteria: input.acceptanceCriteria,
-      allowedPaths: input.allowedPaths,
-      forbiddenPaths: input.forbiddenPaths,
-      checks: input.checkIds,
-      constraints: input.accessMode !== undefined
-        || input.workspaceMode !== undefined
-        || input.requireWorktree !== undefined
-        || input.directMainProhibited !== undefined
-        ? {
-            ...(input.accessMode !== undefined ? { accessMode: input.accessMode } : {}),
-            ...(input.workspaceMode !== undefined ? { workspaceMode: input.workspaceMode } : {}),
-            ...(input.requireWorktree !== undefined ? { requireWorktree: input.requireWorktree } : {}),
-            ...(input.directMainProhibited !== undefined ? { directMainProhibited: input.directMainProhibited } : {}),
-          }
-        : undefined,
-      modeInput: {
-        objective: input.objective,
-        expectedFiles: input.expectedFiles,
-        expectedChangedLines: input.expectedChangedLines,
-        scopeClear: input.scopeClear !== false,
-        requiresInvestigation: input.requiresInvestigation === true,
-        requiresLongRunningChecks: input.requiresLongRunningChecks === true,
-        requiresWorker: input.requiresWorker === true,
-        requiresApproval: input.requiresApproval === true,
-        destructive: input.destructive === true,
-      },
-      requestedBy: 'user',
-      approvalConfirmed: input.approvalConfirmed === true,
-      forceMode: input.forceMode,
-    },
-  );
-}
-
-export function continueConsoleWork(ctx: ConsoleFacadeContext, workId: string, note?: string): FacadeResult {
-  return continueGoalWorkloop(
-    {
-      workStore: store(ctx),
-      handoffStore: store(ctx),
-      repoId: ctx.repository.repoId,
-      availableChecks: listControllerChecks(ctx.repository.canonicalRoot),
-    },
-    { workId, note },
-  );
+  const objective = input.objective.trim();
+  if (!objective) return buildFacadeResult({ status: 'blocked', summary: 'WORK_OBJECTIVE_REQUIRED', data: {} });
+  const created = createWorkSemanticContext(store(ctx), {
+    workId: `work-console-${randomUUID().slice(0, 12)}`,
+    objective,
+    requestedBy: 'user',
+  });
+  return buildFacadeResult({
+    summary: `Work ${created.workId} created as semantic context.`,
+    data: { work: workSemanticView(created) },
+  });
 }
 
 export async function verifyConsoleWork(
@@ -1124,30 +1055,6 @@ export async function verifyConsoleWork(
   return verification.facade;
 }
 
-export function finalizeConsoleWork(ctx: ConsoleFacadeContext, workId: string): FacadeResult {
-  return finalizeGoalWorkloop(
-    {
-      workStore: store(ctx),
-      handoffStore: store(ctx),
-      repoId: ctx.repository.repoId,
-      availableChecks: listControllerChecks(ctx.repository.canonicalRoot),
-    },
-    { workId },
-  );
-}
-
-export function stopConsoleWork(ctx: ConsoleFacadeContext, workId: string, reason?: string): FacadeResult {
-  return stopGoalWorkloop(
-    {
-      workStore: store(ctx),
-      handoffStore: store(ctx),
-      repoId: ctx.repository.repoId,
-      availableChecks: listControllerChecks(ctx.repository.canonicalRoot),
-    },
-    { workId, reason },
-  );
-}
-
 export function delegateConsoleWork(
   ctx: ConsoleFacadeContext,
   input: { workId?: string; target?: 'codex' | 'grok' | 'claude'; objective?: string; available?: boolean },
@@ -1229,11 +1136,12 @@ export function ackConsoleHandoff(ctx: ConsoleFacadeContext, handoffId: string)
   return mapHandoffCard(acknowledgeHandoffItem(store(ctx), handoffId));
 }
 
-export function resolveConsoleHandoff(ctx: ConsoleFacadeContext, handoffId: string, decision: string, resolver = 'user') {
-  return mapHandoffCard(resolveHandoffItem(store(ctx), handoffId, { decision, resolver }));
+export async function resolveConsoleHandoff(ctx: ConsoleFacadeContext, handoffId: string, decision: string, resolver = 'user') {
+  const { item } = await resolveHandoffAndTriggerContinuation(ctx.controllerHome, ctx.repository.repoId, handoffId, { decision, resolver });
+  return mapHandoffCard(item);
 }
 
-export function approveConsoleHandoff(ctx: ConsoleFacadeContext, handoffId: string, resolver = 'user') {
+export async function approveConsoleHandoff(ctx: ConsoleFacadeContext, handoffId: string, resolver = 'user') {
   const item = getHandoffItem(store(ctx), handoffId);
   if (!item) throw new Error(`handoff not found: ${handoffId}`);
   const decision = describeHandoffDecision(item);
@@ -1252,22 +1160,14 @@ export function approveConsoleHandoff(ctx: ConsoleFacadeContext, handoffId: stri
     acceptanceCriteria: strings(payload.acceptanceCriteria),
     allowedPaths: strings(payload.allowedPaths),
     forbiddenPaths: strings(payload.forbiddenPaths),
-    expectedFiles: typeof payload.expectedFiles === 'number' ? payload.expectedFiles : undefined,
-    expectedChangedLines: typeof payload.expectedChangedLines === 'number' ? payload.expectedChangedLines : undefined,
     scopeClear: payload.scopeClear !== false,
-    requiresInvestigation: payload.requiresInvestigation === true,
-    requiresLongRunningChecks: payload.requiresLongRunningChecks === true,
-    requiresWorker: payload.requiresWorker === true,
     requiresApproval: payload.requiresApproval === true,
     destructive: payload.destructive === true,
     accessMode: isAccessMode(payload.accessMode) ? payload.accessMode : undefined,
     workspaceMode: payload.workspaceMode === 'current' || payload.workspaceMode === 'isolated' || payload.workspaceMode === 'auto'
       ? payload.workspaceMode
       : undefined,
-    requireWorktree: typeof payload.requireWorktree === 'boolean' ? payload.requireWorktree : undefined,
-    directMainProhibited: typeof payload.directMainProhibited === 'boolean' ? payload.directMainProhibited : undefined,
     approvalConfirmed: true,
-    forceMode: 'goal_workloop',
     checkIds: strings(payload.checkIds),
   });
 
@@ -1279,7 +1179,7 @@ export function approveConsoleHandoff(ctx: ConsoleFacadeContext, handoffId: stri
       summary: `批准已收到，但后续动作未成功：${actionResult.summary}`,
     };
   }
-  const resolved = resolveHandoffItem(store(ctx), handoffId, {
+  const { item: resolved } = await resolveHandoffAndTriggerContinuation(ctx.controllerHome, ctx.repository.repoId, handoffId, {
     decision: `approved: ${item.approvalAction.label}`,
     resolver,
   });
@@ -1302,8 +1202,8 @@ export function getConsoleWork(ctx: ConsoleFacadeContext, workId: string): WorkS
     : undefined;
 }
 
-export function listConsoleWork(ctx: ConsoleFacadeContext, status: 'active' | 'all' = 'active'): WorkSummaryViewModel[] {
-  return listWorkContracts({ ...store(ctx), status, limit: 50 }).map((work) =>
+export function listConsoleWork(ctx: ConsoleFacadeContext, state: 'active' | 'all' = 'active'): WorkSummaryViewModel[] {
+  return listWorkContracts({ ...store(ctx), state, limit: 50 }).map((work) =>
     mapWorkSummary(work, { controllerHome: ctx.controllerHome, repoId: ctx.repository.repoId }));
 }
 

package/src/cli/local-bridge/job-store.ts

@@ -21,7 +21,7 @@ import {
   MAX_AGENT_TIMEOUT_MS,
   normalizeAgentTimeoutMs,
 } from "../controller/runtime-config";
-import { loadMcpLocalConfig, loadMcpServiceLocalConfig } from "../mcp/auth";
+import { loadMcpLocalConfig, loadMcpServiceLocalConfig } from "../../../adapters/mcp/auth";
 import type { ControllerTask } from "../controller/types";
 import { taskExecutionPolicy } from "../controller/execution-policy";
 import { tryAppendControllerWorklogEvent } from "../controller/worklog";