@moretea-labs/forge 1.8.0 → 1.8.2

package/src/cli/index.ts

@@ -15,7 +15,6 @@ import { CLI_VERSION, formatStatus, runStatus } from './commands/status';
 import { formatDoctor, runDoctor } from './commands/doctor';
 import { buildSetupCommand, formatInitHook, runInitHook } from './commands/init-hook';
 import { formatMigratePlan, runMigrate } from './commands/migrate';
-import { buildToolsCommand } from './commands/tools';
 import { buildPluginCommand } from './commands/plugin';
 import { buildComputerCommand } from './commands/computer';
 import { buildBrainCommand } from './commands/brain';
@@ -73,10 +72,7 @@ const VALID_LOCATIONS: readonly Location[] = ['global', 'local'];
 interface GlobalRuntimeCommandOptions {
   target: string;
   cli?: boolean;
-  syncSkill?: boolean;
   hooks?: string | false;
-  withExternalSkills?: boolean;
-  codegraph?: boolean;
   brainRoot?: string;
   json?: boolean;
 }
@@ -91,10 +87,7 @@ function runGlobalRuntimeBootstrap(commandName: 'init' | 'install', rawOpts: Glo
   const result = runGlobalRuntimeSetup({
     target: rawOpts.target as InstallTargetSpec,
     installCli: rawOpts.cli !== false,
-    syncSkill: rawOpts.syncSkill !== false,
     hostAdapters: rawOpts.hooks !== false,
-    externalSkills: rawOpts.withExternalSkills === true,
-    codegraph: rawOpts.codegraph !== false,
     brainRoot: rawOpts.brainRoot,
   });
   if (rawOpts.json === true) {
@@ -117,19 +110,14 @@ export function buildProgram(): Command {
   program
     .command('update')
     .description('Update the global Forge CLI and user-level managed runtime')
-    .option('--target <target>', `Host target for adapters and runtime skills: ${VALID_TARGETS.join('|')}`, 'both')
+    .option('--target <target>', `Host target for adapters: ${VALID_TARGETS.join('|')}`, 'both')
     .option('--version <version>', 'Install a specific Forge package version')
     .option('--channel <channel>', 'Install package channel: latest|next')
     .option('--check', 'Run the read-only setup check without refreshing runtime')
     .option('--check-updates', 'Include network-backed version update advisories in setup check output')
     .option('--no-runtime-refresh', 'Skip runtime refresh and run the read-only setup check only')
     .option('--no-cli', 'Skip installing the Forge CLI globally')
-    .option('--no-sync-skill', 'Skip refreshing Forge host skill aliases')
     .option('--no-hooks', 'Skip global hook adapter installation')
-    .option('--with-external-skills', 'Also bootstrap third-party Waza, Mermaid, and cross-review skills')
-    .option('--no-external-skills', 'Compatibility no-op; update no longer bootstraps third-party skills by default')
-    .option('--configure-codegraph', 'Also configure CodeGraph CLI/MCP during runtime refresh')
-    .option('--no-codegraph', 'Compatibility no-op; update no longer configures CodeGraph by default')
     .option('--brain-root <path>', 'Brain vault root for manifest sync')
     .option('--repo <path>', 'Deprecated: use forge adopt --repo <path>')
     .option('--dry-run', 'Deprecated: use forge adopt --dry-run for repo-level planning')
@@ -145,11 +133,7 @@ export function buildProgram(): Command {
       checkUpdates?: boolean;
       runtimeRefresh?: boolean;
       cli?: boolean;
-      syncSkill?: boolean;
       hooks?: string | false;
-      withExternalSkills?: boolean;
-      codegraph?: boolean;
-      configureCodegraph?: boolean;
       brainRoot?: string;
       interactive?: boolean;
       json?: boolean;
@@ -187,10 +171,7 @@ export function buildProgram(): Command {
         target: rawOpts.target as InstallTargetSpec,
         installCli: rawOpts.cli !== false,
         installSpec,
-        syncSkill: rawOpts.syncSkill !== false,
         hostAdapters: rawOpts.hooks !== false,
-        externalSkills: rawOpts.withExternalSkills === true,
-        codegraph: rawOpts.configureCodegraph === true,
         brainRoot: rawOpts.brainRoot,
       });
       if (rawOpts.json === true) {
@@ -210,16 +191,11 @@ export function buildProgram(): Command {
     .option('--transaction <path>', 'Adoption transaction manifest to restore when action is rollback')
     .option('--dry-run', 'Plan Forge changes without applying them')
     .option('--target <target>', `Host target for readiness checks and optional global bootstrap: ${VALID_TARGETS.join('|')}`, 'both')
-    .option('--no-sync-skill', 'Compatibility no-op; adopt never refreshes user-level skill aliases')
     .option('--no-host-adapters', 'Compatibility no-op; adopt never writes global Codex/Claude hook adapters')
-    .option('--no-external-skills', 'Compatibility no-op; adopt never bootstraps user-level external skills')
     .option('--no-verify', 'Skip repo workflow verification after apply')
-    .option('--no-codegraph', 'Skip building the CodeGraph index and MCP readiness check')
     .option('--reclaim-runtime', 'Reclaim generated repo-local hook/helper runtime copies after replacement paths verify')
     .option('--compact', 'Compact repo surface; includes --reclaim-runtime plus package script rewrite')
     .option('--mode <mode>', 'Adoption mode: minimal|standard|self-host', 'standard')
-    .option('--configure-codegraph', 'Deprecated: user-level MCP config belongs to Forge update/setup')
-    .option('--sync-codegraph', 'Sync the CodeGraph index after ensure')
     .option('--brain-root <path>', 'Deprecated: user-level brain config belongs to Forge update/setup')
     .option('--brain-mode <mode>', 'Deprecated: adopt does not perform user-level brain sync', 'skip')
     .option('--interactive', 'Run the numbered interactive install planner')
@@ -231,16 +207,11 @@ export function buildProgram(): Command {
       transaction?: string;
       dryRun?: boolean;
       target: string;
-      syncSkill?: boolean;
       hostAdapters?: boolean;
-      withExternalSkills?: boolean;
       verify?: boolean;
-      codegraph?: boolean;
       reclaimRuntime?: boolean;
       compact?: boolean;
       mode?: string;
-      configureCodegraph?: boolean;
-      syncCodegraph?: boolean;
       brainRoot?: string;
       brainMode?: string;
       interactive?: boolean;
@@ -294,10 +265,6 @@ export function buildProgram(): Command {
         console.error('forge adopt: invalid --mode (expected: minimal, standard, self-host)');
         process.exit(2);
       }
-      if (rawOpts.configureCodegraph === true) {
-        console.error('forge adopt: --configure-codegraph writes user-level MCP config; run forge update instead');
-        process.exit(2);
-      }
       if (rawOpts.brainRoot || rawOpts.brainMode !== 'skip') {
         console.error('forge adopt: brain configuration writes user-level state; run forge update instead');
         process.exit(2);
@@ -347,13 +314,8 @@ export function buildProgram(): Command {
         repo: rawOpts.repo,
         apply: rawOpts.dryRun !== true,
         target: rawOpts.target as InstallTargetSpec,
-        syncSkill: false,
         hostAdapters: false,
-        externalSkills: false,
         verify: rawOpts.verify !== false,
-        codegraph: rawOpts.codegraph !== false,
-        configureCodegraphMcp: false,
-        syncCodegraph: rawOpts.syncCodegraph === true,
         brainRoot: rawOpts.brainRoot,
         brainMode: rawOpts.brainMode as InitBrainMode,
       };
@@ -392,10 +354,7 @@ export function buildProgram(): Command {
     .option('--target <target>', `Target host: ${VALID_TARGETS.join('|')}`, 'both')
     .option('--location <location>', `Adapter-only install location: ${VALID_LOCATIONS.join('|')}`)
     .option('--no-cli', 'Skip installing the Forge CLI globally')
-    .option('--no-sync-skill', 'Skip refreshing Forge host skill aliases')
     .option('--no-hooks', 'Skip global hook adapter installation during full runtime install')
-    .option('--with-external-skills', 'Also install optional third-party Waza/Mermaid skills and Forge cross-review helpers')
-    .option('--no-codegraph', 'Skip CodeGraph CLI/MCP configuration')
     .option('--brain-root <path>', 'Brain vault root to persist for Forge brain commands')
     .option('--json', 'Output JSON instead of human-readable text')
     .action((rawOpts: GlobalRuntimeCommandOptions & { location?: string }) => {
@@ -509,7 +468,6 @@ export function buildProgram(): Command {
       process.exit(rawOpts.strict === true && strictFailure ? 1 : 0);
     });
 
-  program.addCommand(buildToolsCommand());
   program.addCommand(buildPluginCommand());
   program.addCommand(buildComputerCommand());
   program.addCommand(buildBrainCommand(), { hidden: true });

package/src/cli/local-bridge/connector-freshness.ts

@@ -19,7 +19,7 @@ import {
   loadMcpLocalConfig,
   loadMcpServiceLocalConfig,
 } from '../../../adapters/mcp/auth';
-import { PREFERRED_FACADE_TOOL_NAMES, DEFAULT_CONTROLLER_TOOL_NAMES } from '../../../adapters/mcp/toolset-names';
+import { PREFERRED_FACADE_TOOL_NAMES } from '../../../adapters/mcp/toolset-names';
 import { resolveRepoPreferredControllerHome } from '../repositories/controller-home';
 import type { PlainStatusTone } from './console-view-models';
 
@@ -37,8 +37,6 @@ export const OPTIONAL_INTERACTIVE_DEVELOPMENT_TOOLS = [
   'process_wait',
 ] as const;
 
-/** @deprecated Prefer ADVANCED_CONTROLLER_TOOL_NAMES; kept for import stability. */
-export const CORE_SURFACE_INTERACTIVE_TOOLS = OPTIONAL_INTERACTIVE_DEVELOPMENT_TOOLS;
 
 export type ConnectorFreshnessStatus =
   | 'local_mcp_updated'
@@ -479,15 +477,6 @@ function finalize(
   return report;
 }
 
-/**
- * Build local tool names from the in-process controller registry (not ChatGPT).
- * Uses expectedTools when provided; otherwise falls back to the stable default exposure.
- */
-export function localControllerToolNames(expectedTools?: readonly string[]): string[] {
-  if (expectedTools && expectedTools.length > 0) return uniqueSorted(expectedTools);
-  return uniqueSorted([...DEFAULT_CONTROLLER_TOOL_NAMES]);
-}
-
 export function buildLocalConnectorStatus(input: {
   expectedTools: readonly string[];
   connectorToolNames?: readonly string[] | null;

package/src/cli/local-bridge/console-automations.ts

@@ -138,7 +138,7 @@ function occurrenceHistory(occurrences: ScheduleOccurrence[]): ConsoleAutomation
 }
 
 function scheduleMode(schedule: RepositorySchedule): ConsoleAutomationMode {
-  if (schedule.action.operation === 'external_controller_wake') return 'continuation';
+  if (schedule.action.operation === 'external_controller_wake' || schedule.action.operation === 'controller_progression') return 'continuation';
   if (schedule.action.operation === 'browser_probe') return schedule.action.arguments?.keepalive_only === true ? 'browser_keepalive' : 'browser_watch';
   return 'schedule';
 }
@@ -204,32 +204,37 @@ function scheduleNeedsAttention(schedule: RepositorySchedule): boolean {
   return Boolean(schedule.pausedReason && /(?:fail|error|auth|login|block|attention|maximum)/i.test(schedule.pausedReason));
 }
 
-function scheduleStatus(schedule: RepositorySchedule, workStatus?: string): ConsoleAutomationView['status'] {
-  if (workStatus === 'completed' || /is terminal \(completed\)/i.test(schedule.pausedReason ?? '')) return 'completed';
-  if (workStatus === 'failed') return 'attention';
+function scheduleStatus(schedule: RepositorySchedule, workState?: string): ConsoleAutomationView['status'] {
+  if (workState === 'completed' || /is terminal \(completed\)/i.test(schedule.pausedReason ?? '')) return 'completed';
+  if (workState === 'cancelled') return 'paused';
   if (schedule.enabled) return scheduleNeedsAttention(schedule) ? 'attention' : 'enabled';
   return scheduleNeedsAttention(schedule) ? 'attention' : 'paused';
 }
 
-function workBinding(controllerHome: string, repoId: string, schedule: RepositorySchedule): { id?: string; objective?: string; status?: string } {
+function workBinding(controllerHome: string, repoId: string, schedule: RepositorySchedule): { id?: string; objective?: string; state?: string; failed?: boolean } {
   const value = schedule.action.arguments?.work_id;
   const workId = typeof value === 'string' && value.trim() ? value.trim() : undefined;
   if (!workId) return {};
   const work = getWorkContract({ controllerHome, repoId }, workId);
-  return { id: workId, objective: work?.objective, status: work?.status };
+  return {
+    id: workId,
+    objective: work?.objective,
+    state: work?.semanticState,
+    failed: work ? work.evidenceState === 'failed' || work.phaseEvidence[work.phase].state === 'failed' : false,
+  };
 }
 
-function displayPauseReason(schedule: RepositorySchedule, workStatus?: string): string | undefined {
-  if (workStatus === 'completed' || /is terminal \(completed\)/i.test(schedule.pausedReason ?? '')) return '关联工作已经完成，这个自动任务不会再触发。';
+function displayPauseReason(schedule: RepositorySchedule, workState?: string): string | undefined {
+  if (workState === 'completed' || /is terminal \(completed\)/i.test(schedule.pausedReason ?? '')) return '关联工作已经完成，这个自动任务不会再触发。';
   if (schedule.lastObservationStatus === 'auth_required') return '目标登录状态已失效，完成重新登录后即可恢复。';
   if (schedule.consecutiveFailures >= schedule.policy.maxFailures || /maximum consecutive failures/i.test(schedule.pausedReason ?? '')) return '连续执行失败达到上限，已自动暂停。修复问题后可以恢复任务。';
   if (/canary completed/i.test(schedule.pausedReason ?? '')) return '验收任务已经完成。';
   return schedule.pausedReason;
 }
 
-function attentionMessage(schedule: RepositorySchedule, workStatus?: string): string | undefined {
+function attentionMessage(schedule: RepositorySchedule, workFailed = false): string | undefined {
   if (schedule.lastObservationStatus === 'auth_required') return '需要重新登录后才能继续自动执行。';
-  if (workStatus === 'failed') return '关联工作执行失败，需要检查失败原因后再恢复。';
+  if (workFailed) return '关联工作执行失败，需要检查失败原因后再恢复。';
   if (schedule.consecutiveFailures >= schedule.policy.maxFailures) return '连续执行失败达到上限，任务已自动暂停。';
   return undefined;
 }
@@ -256,7 +261,7 @@ export function listConsoleAutomations(controllerHome: string, repositories: Rep
         repositoryName: repository.displayName,
         name: schedule.name,
         summary: scheduleSummary(mode),
-        status: scheduleStatus(schedule, work.status),
+        status: scheduleStatus(schedule, work.state),
         schedule: triggerLabel(schedule),
         timezone: schedule.trigger.timezone,
         delivery: scheduleDelivery(schedule, mode),
@@ -274,10 +279,10 @@ export function listConsoleAutomations(controllerHome: string, repositories: Rep
         lastRunAt: last?.updatedAt ?? schedule.lastTriggeredAt,
         lastResult: observationResult(schedule, last),
         nextRunHint: nextScheduleHint(schedule),
-        pausedReason: displayPauseReason(schedule, work.status),
-        attentionMessage: attentionMessage(schedule, work.status),
+        pausedReason: displayPauseReason(schedule, work.state),
+        attentionMessage: attentionMessage(schedule, work.failed),
         history: occurrenceHistory(occurrences),
-        actions: scheduleStatus(schedule, work.status) === 'completed' ? [] : schedule.enabled ? ['run', 'pause'] : ['resume'],
+        actions: scheduleStatus(schedule, work.state) === 'completed' ? [] : schedule.enabled ? ['run', 'pause'] : ['resume'],
       });
     }
 

package/src/cli/local-bridge/console-view-models.ts

@@ -12,14 +12,6 @@ export interface SuggestedActionViewModel {
   primary?: boolean;
 }
 
-export interface ModePreviewViewModel {
-  mode: 'direct_control' | 'goal_workloop' | 'handoff_only';
-  label: string;
-  explanation: string;
-  createWorkContract: boolean;
-  createHandoff: boolean;
-}
-
 export interface VerificationViewModel {
   label: string;
   tone: PlainStatusTone;
@@ -104,8 +96,6 @@ export interface WorkSummaryViewModel {
   updatedAt: string;
   title: string;
   objective: string;
-  modeLabel: string;
-  mode: ModePreviewViewModel['mode'];
   accessMode: 'request' | 'full_access';
   accessModeLabel: string;
   statusLabel: string;
@@ -127,7 +117,9 @@ export interface WorkSummaryViewModel {
   primaryActionLabel?: string;
   advanced?: {
     workId: string;
-    status: string;
+    state: string;
+    dispatchState: string;
+    evidenceState: string;
     checkIds: string[];
     handoffRefs: string[];
   };
@@ -251,7 +243,7 @@ export interface AccessStateViewModel {
   configuredAccessModeLabel: string;
   effectiveAccessMode: 'request' | 'full_access';
   effectiveAccessModeLabel: string;
-  effectiveToolset: 'facade' | 'core' | 'advanced' | 'full';
+  effectiveToolset: 'full';
   exposureRevision: number;
   lastAppliedAt?: string;
   source: string;
@@ -280,7 +272,6 @@ export interface CommandCenterViewModel {
   /** Assistant/plugin capabilities available to the controller (not the primary workflow). */
   pluginSummary: PluginSummaryViewModel;
   plugins: PluginCardViewModel[];
-  modePreviewDefault: ModePreviewViewModel;
   warnings: string[];
   /** Setup guidance when no usable repository is selected. */
   setupGuide?: {