@moretea-labs/forge 1.7.1 → 1.8.0

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

@@ -9,11 +9,13 @@ 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 {
@@ -36,7 +38,6 @@ import {
   listHandoffItems,
   listWorkContracts,
   normalizeCheckIds,
-  resolveHandoffItem,
   routeWorkStart,
   runSelfHealingLoop,
   selectExecutionMode,
@@ -49,16 +50,17 @@ import {
   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,
@@ -91,7 +93,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 = {
@@ -690,11 +692,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 +719,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 +776,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 +788,7 @@ export async function buildSystemReadiness(
     description: state === 'ready'
       ? '你可以输入自然语言任务，或先处理待决定事项。'
       : state === 'needs_setup'
-        ? '请先选择或注册一个可用仓库。'
+        ? (bootstrap?.blockers[0]?.summary ?? '请先完成 Forge 实例设置，并选择或注册一个可用仓库。')
         : '请先查看系统状态并尝试诊断/修复。',
     connectorLabel: freshness.connectorLabel,
     connectorTone: freshness.connectorTone,
@@ -1229,11 +1255,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);
@@ -1279,7 +1306,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,
   });

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";

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

@@ -7,6 +7,7 @@ import express, {
   type Request,
   type Response,
 } from "express";
+import { describeFailure } from "../../../packages/protocols/failure";
 import {
   cancelAgentJob,
   getAgentJob,
@@ -118,10 +119,10 @@ import { applyCompletionDecision, completionDecisionQueues, finishCompletionBack
 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 +139,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";
@@ -237,6 +238,14 @@ 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",
@@ -1007,12 +1016,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 +1036,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 +1156,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 });
     }
   });
 
@@ -1445,9 +1442,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 +1461,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",

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';