@moretea-labs/forge 1.8.1 → 1.8.2

package/src/cli/commands/global-runtime.ts

@@ -2,10 +2,9 @@ import { existsSync, readFileSync } from "fs";
 import { dirname, join, resolve } from "path";
 import { fileURLToPath } from "url";
 import { configureBrainRoot, defaultBrainRootChoice, expandHomePath } from "./brain-root";
-import { syncCrossReviewSkills } from "./init";
 import { runInstall, type InstallTargetSpec } from "./install";
-import { configureCodegraph } from "../tools/codegraph";
 import { runProcess as runBoundedProcess } from "../../effects/process-runner";
+import { runSetupProcess as runProcess, withProcessEnv, type SetupExecutionStep } from './setup-execution';
 
 export interface GlobalRuntimeOptions {
   sourceRoot?: string;
@@ -14,22 +13,11 @@ export interface GlobalRuntimeOptions {
   target?: InstallTargetSpec;
   installCli?: boolean;
   installSpec?: string;
-  syncSkill?: boolean;
   hostAdapters?: boolean;
-  externalSkills?: boolean;
-  codegraph?: boolean;
   brainRoot?: string;
-  platform?: NodeJS.Platform;
 }
 
-export interface GlobalRuntimeStep {
-  step: string;
-  status: "ok" | "skipped" | "failed";
-  command?: string[];
-  detail?: string;
-  stdout?: string;
-  stderr?: string;
-}
+export type GlobalRuntimeStep = SetupExecutionStep;
 
 export interface GlobalRuntimeResult {
   exitCode: number;
@@ -40,25 +28,11 @@ export interface GlobalRuntimeResult {
 }
 
 const SCRIPT_DIR = dirname(fileURLToPath(import.meta.url));
-const CODEGRAPH_PACKAGE = "@colbymchenry/codegraph";
-const WAZA_SKILLS = ["think", "hunt", "check", "health"] as const;
 
 function defaultSourceRoot(): string {
   return join(SCRIPT_DIR, "..", "..", "..");
 }
 
-function runProcess(command: string, args: string[], cwd: string, env?: NodeJS.ProcessEnv): GlobalRuntimeStep {
-  const result = runBoundedProcess(command, args, { cwd, env });
-
-  return {
-    step: "",
-    status: result.ok ? "ok" : "failed",
-    command: [...result.command],
-    stdout: result.stdout,
-    stderr: result.stderr || result.error,
-  };
-}
-
 function withStepName(step: GlobalRuntimeStep, name: string, detail?: string): GlobalRuntimeStep {
   return { ...step, step: name, detail: detail ?? step.detail };
 }
@@ -69,42 +43,6 @@ function renderStep(step: GlobalRuntimeStep): string[] {
   return lines;
 }
 
-function withProcessEnv<T>(env: NodeJS.ProcessEnv | undefined, fn: () => T): T {
-  if (!env) return fn();
-  const previous = new Map<string, string | undefined>();
-  for (const [key, value] of Object.entries(env)) {
-    previous.set(key, process.env[key]);
-    if (value === undefined) delete process.env[key];
-    else process.env[key] = value;
-  }
-  try {
-    return fn();
-  } finally {
-    for (const [key, value] of previous) {
-      if (value === undefined) delete process.env[key];
-      else process.env[key] = value;
-    }
-  }
-}
-
-function hostAgents(target: InstallTargetSpec): string[] {
-  if (target === "codex") return ["codex"];
-  if (target === "claude") return ["claude-code"];
-  return ["claude-code", "codex"];
-}
-
-function isNpxCacheSource(sourceRoot: string): boolean {
-  return /[\\/]_npx[\\/]/.test(sourceRoot);
-}
-
-function commandEnv(sourceRoot: string, env?: NodeJS.ProcessEnv): NodeJS.ProcessEnv | undefined {
-  const next = { ...(env ?? {}) };
-  if (isNpxCacheSource(sourceRoot) && next.AGENTIC_DEV_LINK_INSTALLED_COPIES === undefined) {
-    next.AGENTIC_DEV_LINK_INSTALLED_COPIES = "0";
-  }
-  return Object.keys(next).length > 0 ? next : env;
-}
-
 function packageVersion(sourceRoot: string): string | null {
   try {
     const pkg = JSON.parse(readFileSync(join(sourceRoot, "package.json"), "utf-8"));
@@ -136,28 +74,6 @@ function installCli(sourceRoot: string, cwd: string, env?: NodeJS.ProcessEnv, in
   );
 }
 
-function syncRuntimeSkill(sourceRoot: string, env?: NodeJS.ProcessEnv, platform: NodeJS.Platform = process.platform): GlobalRuntimeStep {
-  const script = join(sourceRoot, "scripts", "sync-codex-installed-copies.sh");
-  if (!existsSync(script)) {
-    return {
-      step: "sync forge skill runtime",
-      status: "skipped",
-      detail: `script not found: ${script}`,
-    };
-  }
-  if (platform === "win32") {
-    return {
-      step: "sync forge skill runtime",
-      status: "skipped",
-      detail: "native Windows skips the Bash-owned skill sync; use WSL2 for the complete shell workflow",
-    };
-  }
-  return withStepName(
-    runProcess("bash", [script], sourceRoot, env),
-    "sync forge skill runtime",
-  );
-}
-
 function installHostAdapters(target: InstallTargetSpec, env?: NodeJS.ProcessEnv): GlobalRuntimeStep {
   const installed = withProcessEnv(env, () => runInstall({ target, location: "global" }));
   return {
@@ -167,50 +83,6 @@ function installHostAdapters(target: InstallTargetSpec, env?: NodeJS.ProcessEnv)
   };
 }
 
-function installWazaSkills(sourceRoot: string, target: InstallTargetSpec, env?: NodeJS.ProcessEnv): GlobalRuntimeStep {
-  const agents = hostAgents(target);
-  const step = runProcess(
-    "npx",
-    [
-      "-y",
-      "skills",
-      "add",
-      "tw93/Waza",
-      "-g",
-      "-a",
-      ...agents,
-      "-s",
-      ...WAZA_SKILLS,
-      "-y",
-    ],
-    sourceRoot,
-    env,
-  );
-  return withStepName(step, "configure Waza skills", `target=${target}`);
-}
-
-function installMermaidSkill(sourceRoot: string, target: InstallTargetSpec, env?: NodeJS.ProcessEnv): GlobalRuntimeStep {
-  const agents = hostAgents(target);
-  const step = runProcess(
-    "npx",
-    [
-      "-y",
-      "skills",
-      "add",
-      "BfdCampos/dotfiles",
-      "-g",
-      "-a",
-      ...agents,
-      "-s",
-      "mermaid",
-      "-y",
-    ],
-    sourceRoot,
-    env,
-  );
-  return withStepName(step, "configure Mermaid skill", `target=${target}`);
-}
-
 function configureBrain(root: string | undefined, env?: NodeJS.ProcessEnv): GlobalRuntimeStep {
   try {
     const selected = root
@@ -231,86 +103,21 @@ function configureBrain(root: string | undefined, env?: NodeJS.ProcessEnv): Glob
   }
 }
 
-function ensureCodegraphCli(cwd: string, env?: NodeJS.ProcessEnv): GlobalRuntimeStep {
-  const check = runProcess("codegraph", ["--version"], cwd, env);
-  if (check.status === "ok") return withStepName(check, "ensure CodeGraph CLI", "present");
-  const install = commandAvailable("bun", cwd, env)
-    ? runProcess("bun", ["add", "-g", CODEGRAPH_PACKAGE], cwd, env)
-    : runProcess("npm", ["install", "-g", CODEGRAPH_PACKAGE, "--omit=optional", "--no-audit", "--no-fund"], cwd, env);
-  if (install.status !== "ok") return withStepName(install, "ensure CodeGraph CLI", CODEGRAPH_PACKAGE);
-  const recheck = runProcess("codegraph", ["--version"], cwd, env);
-  if (recheck.status === "ok") return withStepName(recheck, "ensure CodeGraph CLI", "installed");
-  return {
-    ...recheck,
-    step: "ensure CodeGraph CLI",
-    status: "failed",
-    detail: `${CODEGRAPH_PACKAGE} installed, but codegraph is not on PATH`,
-  };
-}
-
-function configureCodegraphMcp(cwd: string, target: InstallTargetSpec, env?: NodeJS.ProcessEnv): GlobalRuntimeStep {
-  try {
-    const result = configureCodegraph({ repoRoot: cwd, target, location: "global", env });
-    return {
-      step: "configure CodeGraph MCP",
-      status: result.actions.some((entry) => entry.status === "failed") ? "failed" : "ok",
-      detail: result.actions.map((entry) => `${entry.action}:${entry.status}`).join(", "),
-    };
-  } catch (error) {
-    return {
-      step: "configure CodeGraph MCP",
-      status: "failed",
-      stderr: String((error as Error).message ?? error),
-    };
-  }
-}
-
 export function runGlobalRuntimeSetup(opts: GlobalRuntimeOptions = {}): GlobalRuntimeResult {
   const sourceRoot = opts.sourceRoot ?? defaultSourceRoot();
   const cwd = opts.cwd ?? process.cwd();
   const target = opts.target ?? "both";
-  const env = commandEnv(sourceRoot, opts.env);
-  const platform = opts.platform ?? process.platform;
+  const env = opts.env;
   const steps: GlobalRuntimeStep[] = [];
 
   if (opts.installCli !== false) steps.push(installCli(sourceRoot, cwd, env, opts.installSpec));
   else steps.push({ step: "install forge CLI", status: "skipped", detail: "disabled" });
 
-  if (opts.syncSkill !== false) steps.push(syncRuntimeSkill(sourceRoot, env, platform));
-  else steps.push({ step: "sync forge skill runtime", status: "skipped", detail: "disabled" });
-
   if (opts.hostAdapters !== false) steps.push(installHostAdapters(target, env));
   else steps.push({ step: "install host adapters", status: "skipped", detail: "disabled" });
 
-  if (opts.externalSkills !== false) {
-    steps.push(installWazaSkills(sourceRoot, target, env));
-    steps.push(installMermaidSkill(sourceRoot, target, env));
-    steps.push(...syncCrossReviewSkills(sourceRoot, target, env));
-  } else {
-    steps.push({ step: "configure Waza skills", status: "skipped", detail: "disabled" });
-    steps.push({ step: "configure Mermaid skill", status: "skipped", detail: "disabled" });
-    steps.push({ step: "cross-review skills", status: "skipped", detail: "disabled" });
-  }
-
   steps.push(configureBrain(opts.brainRoot, env));
 
-  if (platform === "win32" && opts.codegraph !== false) {
-    steps.push({
-      step: "ensure CodeGraph CLI",
-      status: "skipped",
-      detail: "native Windows automatic CodeGraph setup is not release-validated; use WSL2 or configure it manually",
-    });
-    steps.push({ step: "configure CodeGraph MCP", status: "skipped", detail: "native Windows default" });
-  } else if (opts.codegraph !== false) {
-    const ensure = ensureCodegraphCli(cwd, env);
-    steps.push(ensure);
-    if (ensure.status === "ok") steps.push(configureCodegraphMcp(cwd, target, env));
-    else steps.push({ step: "configure CodeGraph MCP", status: "skipped", detail: "CodeGraph CLI install failed" });
-  } else {
-    steps.push({ step: "ensure CodeGraph CLI", status: "skipped", detail: "disabled" });
-    steps.push({ step: "configure CodeGraph MCP", status: "skipped", detail: "disabled" });
-  }
-
   const lines = steps.flatMap(renderStep);
   const failed = steps.some((step) => step.status === "failed");
   return {

package/src/cli/commands/init-hook.ts

@@ -15,6 +15,7 @@ import { dirname, join, resolve } from 'path';
 import { fileURLToPath } from 'url';
 import { Command } from 'commander';
 import { runDoctor, type CheckStatus, type DoctorReport } from './doctor';
+import { withProcessEnv } from './setup-execution';
 import { runStatus, type StatusReport } from './status';
 import { runMcpSetupChatgpt } from '../../../adapters/mcp/setup';
 import { resolveControllerHome } from '../repositories/controller-home';
@@ -124,24 +125,6 @@ const UPDATE_CHECK_ENV = 'FORGE_CHECK_UPDATES';
 const GLOBAL_RULES_BEGIN = '<!-- BEGIN: forge global-working-rules -->';
 const VALID_TARGETS: readonly InitHookTarget[] = ['none', 'codex', 'claude', 'both'];
 
-function withProcessEnv<T>(env: NodeJS.ProcessEnv | undefined, fn: () => T): T {
-  if (!env) return fn();
-  const previous = new Map<string, string | undefined>();
-  for (const [key, value] of Object.entries(env)) {
-    previous.set(key, process.env[key]);
-    if (value === undefined) delete process.env[key];
-    else process.env[key] = value;
-  }
-  try {
-    return fn();
-  } finally {
-    for (const [key, value] of previous) {
-      if (value === undefined) delete process.env[key];
-      else process.env[key] = value;
-    }
-  }
-}
-
 function selectedTargets(target: InitHookTarget): Array<'codex' | 'claude'> {
   if (target === 'none') return [];
   if (target === 'both') return ['codex', 'claude'];
@@ -248,12 +231,12 @@ function parseActionCommand(detail: string): string | undefined {
 function doctorEntryRelevant(id: string, target: InitHookTarget): boolean {
   if (id === 'cli-on-path' || id === 'cli-version' || id === 'cli-update' || id === 'security-config') return true;
   if (target === 'none') return false;
-  if (id === 'repo-hook-scripts' || id === 'codegraph-readiness' || id === 'codegraph-index') return true;
+  if (id === 'repo-hook-scripts') return true;
   if (target === 'codex' || target === 'both') {
-    if (id === 'codex-adapter' || id === 'codex-trust-state' || id === 'codex-codegraph-mcp') return true;
+    if (id === 'codex-adapter' || id === 'codex-trust-state') return true;
   }
   if (target === 'claude' || target === 'both') {
-    if (id === 'claude-adapter' || id === 'claude-codegraph-mcp') return true;
+    if (id === 'claude-adapter') return true;
   }
   return false;
 }
@@ -296,7 +279,7 @@ function doctorChecks(
         verification: 'forge security scan --json',
       });
     } else if (
-      (entry.id === 'repo-hook-scripts' || entry.id.startsWith('codegraph-')) &&
+      entry.id === 'repo-hook-scripts' &&
       (entry.status === 'warn' || entry.status === 'fail')
     ) {
       const command = parseActionCommand(entry.detail);
@@ -454,7 +437,7 @@ function commandForToolGap(toolName: string, tool: ToolingTool, target: InitHook
     return normalizeToolCommand(tool.install_command, target);
   }
   if (toolName === 'codex_automation_profile') {
-    return 'forge install --target codex --no-cli --no-hooks --no-codegraph';
+    return 'forge install --target codex --no-cli --no-hooks';
   }
   return normalizeToolCommand(
     tool.sync_command ?? tool.ensure_command ?? tool.mcp_install_command ?? tool.install_command ?? tool.upgrade_command,

package/src/cli/commands/init.ts

@@ -10,12 +10,10 @@ import { createInterface } from "readline/promises";
 import { stdin, stdout } from "process";
 import { homedir } from "os";
 import {
-  cpSync,
   existsSync,
   mkdirSync,
   readFileSync,
   realpathSync,
-  rmSync,
   writeFileSync,
 } from "fs";
 import { dirname, join, resolve } from "path";
@@ -28,12 +26,11 @@ import {
   expandHomePath,
   type BrainRootChoice,
 } from "./brain-root";
-import { configureCodegraph, ensureCodegraph } from "../tools/codegraph";
 import { runProcess as runBoundedProcess } from "../../effects/process-runner";
+import { runSetupProcess as runProcess, withProcessEnv, type SetupExecutionStep } from './setup-execution';
 
 const SCRIPT_DIR = dirname(fileURLToPath(import.meta.url));
 const REPO_ROOT = resolve(SCRIPT_DIR, "..", "..", "..");
-const WAZA_SKILLS = ["think", "hunt", "check", "health"];
 const GBRAIN_INSTALL_ARGS = ["install", "-g", "github:garrytan/gbrain"] as const;
 const GLOBAL_RULES_BEGIN = "<!-- BEGIN: forge global-working-rules -->";
 const GLOBAL_RULES_END = "<!-- END: forge global-working-rules -->";
@@ -45,30 +42,12 @@ export interface GlobalContextOptions {
   reportLanguageInstruction: string;
 }
 
-/**
- * Cross-review skills bundled in this package under `assets/skills/<skill>` and
- * installed host-aware: `codex-review` (Claude host) lets a Claude session get an
- * independent Codex review; `claude-review` (Codex host) lets a Codex session get
- * an independent Claude review. They are self-contained (no gstack runtime), so
- * init bootstraps them as workflow-owned runtime skills alongside Waza and
- * Mermaid, not as an unrelated plugin marketplace stack.
- */
-const CROSS_REVIEW_SKILLS: ReadonlyArray<{ skill: string; host: "claude" | "codex" }> = [
-  { skill: "codex-review", host: "claude" },
-  { skill: "claude-review", host: "codex" },
-];
-
 export interface InitCommandOptions {
   repo?: string;
   sourceRoot?: string;
   apply?: boolean;
   verify?: boolean;
-  syncSkill?: boolean;
   hostAdapters?: boolean;
-  externalSkills?: boolean;
-  codegraph?: boolean;
-  configureCodegraphMcp?: boolean;
-  syncCodegraph?: boolean;
   globalContext?: GlobalContextOptions;
   brainRoot?: string;
   brainMode?: InitBrainMode;
@@ -76,14 +55,7 @@ export interface InitCommandOptions {
   env?: NodeJS.ProcessEnv;
 }
 
-export interface InitStep {
-  step: string;
-  status: "ok" | "skipped" | "failed";
-  command?: string[];
-  detail?: string;
-  stdout?: string;
-  stderr?: string;
-}
+export type InitStep = SetupExecutionStep;
 
 export interface InitCommandResult {
   exitCode: number;
@@ -103,28 +75,6 @@ interface Choice<T> {
   detail?: string;
 }
 
-function runProcess(command: string, args: string[], cwd: string, env?: NodeJS.ProcessEnv): InitStep {
-  const result = runBoundedProcess(command, args, { cwd, env });
-
-  return {
-    step: "",
-    status: result.ok ? "ok" : "failed",
-    command: [...result.command],
-    stdout: result.stdout,
-    stderr: result.stderr || result.error,
-  };
-}
-
-function isNpxCacheSource(sourceRoot: string): boolean {
-  return /[\\/]_npx[\\/]/.test(sourceRoot);
-}
-
-function initCommandEnv(sourceRoot: string, env?: NodeJS.ProcessEnv): NodeJS.ProcessEnv | undefined {
-  if (!isNpxCacheSource(sourceRoot)) return env;
-  if (env?.AGENTIC_DEV_LINK_INSTALLED_COPIES !== undefined) return env;
-  return { ...(env ?? {}), AGENTIC_DEV_LINK_INSTALLED_COPIES: "0" };
-}
-
 function withStepName(step: InitStep, name: string, detail?: string): InitStep {
   return { ...step, step: name, detail: detail ?? step.detail };
 }
@@ -137,24 +87,6 @@ function renderStep(step: InitStep): string[] {
   return lines;
 }
 
-function withProcessEnv<T>(env: NodeJS.ProcessEnv | undefined, fn: () => T): T {
-  if (!env) return fn();
-  const previous = new Map<string, string | undefined>();
-  for (const [key, value] of Object.entries(env)) {
-    previous.set(key, process.env[key]);
-    if (value === undefined) delete process.env[key];
-    else process.env[key] = value;
-  }
-  try {
-    return fn();
-  } finally {
-    for (const [key, value] of previous) {
-      if (value === undefined) delete process.env[key];
-      else process.env[key] = value;
-    }
-  }
-}
-
 function hostAgents(target: InstallTargetSpec): string[] {
   if (target === "codex") return ["codex"];
   if (target === "claude") return ["claude-code"];
@@ -282,111 +214,13 @@ export function writeGlobalContextFiles(
   return { step: "global working rules", status: "ok", detail: changes.join(", ") };
 }
 
-/**
- * Install the bundled cross-review skills, each into the host where it is useful:
- * `codex-review` → `~/.claude/skills` (Claude calls Codex), `claude-review` →
- * `~/.codex/skills` (Codex calls Claude). Respects `target`, is idempotent
- * (identical SKILL.md → "already present"), and treats a missing bundled source
- * as `skipped` (never fails init).
- */
-export function syncCrossReviewSkills(
-  sourceRoot: string,
-  target: InstallTargetSpec,
-  env?: NodeJS.ProcessEnv,
-): InitStep[] {
-  const home = homeDir(env);
-  const steps: InitStep[] = [];
-  for (const { skill, host } of CROSS_REVIEW_SKILLS) {
-    const step = `cross-review skill ${skill}`;
-    if (target !== "both" && target !== host) continue;
-    if (!home) {
-      steps.push({ step, status: "failed", detail: "HOME is required to resolve host skill roots" });
-      continue;
-    }
-    const source = join(sourceRoot, "assets", "skills", skill);
-    const srcSkill = join(source, "SKILL.md");
-    if (!existsSync(srcSkill)) {
-      steps.push({ step, status: "skipped", detail: `bundled source not found at ${source}` });
-      continue;
-    }
-    const root = join(home, host === "claude" ? ".claude" : ".codex", "skills");
-    const dest = join(root, skill);
-    const destSkill = join(dest, "SKILL.md");
-    mkdirSync(root, { recursive: true });
-    if (
-      existsSync(dest) &&
-      (samePath(source, dest) ||
-        (existsSync(destSkill) && readFileSync(destSkill, "utf-8") === readFileSync(srcSkill, "utf-8")))
-    ) {
-      steps.push({ step, status: "ok", detail: "already present" });
-      continue;
-    }
-    if (existsSync(dest)) {
-      rmSync(dest, { recursive: true, force: true });
-    }
-    cpSync(source, dest, { recursive: true });
-    steps.push({ step, status: "ok", detail: `synced ${dest}` });
-  }
-  return steps;
-}
-
-function installExternalSkills(sourceRoot: string, target: InstallTargetSpec, env?: NodeJS.ProcessEnv): InitStep[] {
-  const steps: InitStep[] = [];
-  const agents = hostAgents(target);
-  const waza = runProcess(
-    "npx",
-    [
-      "-y",
-      "skills",
-      "add",
-      "tw93/Waza",
-      "-g",
-      "-a",
-      ...agents,
-      "-s",
-      ...WAZA_SKILLS,
-      "-y",
-    ],
-    sourceRoot,
-    env,
-  );
-  steps.push(withStepName(waza, "external skills Waza", `target=${target}`));
-  const mermaid = runProcess(
-    "npx",
-    [
-      "-y",
-      "skills",
-      "add",
-      "BfdCampos/dotfiles",
-      "-g",
-      "-a",
-      ...agents,
-      "-s",
-      "mermaid",
-      "-y",
-    ],
-    sourceRoot,
-    env,
-  );
-  steps.push(withStepName(mermaid, "external skill mermaid", `target=${target}`));
-  steps.push(...syncCrossReviewSkills(sourceRoot, target, env));
-  return steps;
-}
-
 export function runInit(opts: InitCommandOptions = {}): InitCommandResult {
   const sourceRoot = resolve(opts.sourceRoot ?? REPO_ROOT);
   const repoRoot = resolve(opts.repo ?? process.cwd());
-  let commandEnv = initCommandEnv(sourceRoot, opts.env);
+  let commandEnv = opts.env;
   const apply = opts.apply !== false;
   const verify = opts.verify !== false;
-  const syncSkill = opts.syncSkill !== false;
   const hostAdapters = opts.hostAdapters !== false;
-  const externalSkills = opts.externalSkills === true;
-  const configureCgMcp = opts.configureCodegraphMcp === true;
-  const syncCodegraph = opts.syncCodegraph === true;
-  // CodeGraph is an optional rebuildable tool cache. Ordinary adoption leaves it
-  // disabled; any explicit CodeGraph operation opts in and uses the Controller Home-backed compatibility link.
-  const codegraph = opts.codegraph === true || configureCgMcp || syncCodegraph;
   const brainMode = opts.brainMode ?? "skip";
   const target = opts.target ?? "both";
   const steps: InitStep[] = [];
@@ -406,17 +240,6 @@ export function runInit(opts: InitCommandOptions = {}): InitCommandResult {
     };
   }
 
-  if (syncSkill && apply) {
-    const step = runProcess("bash", [join(sourceRoot, "scripts", "sync-codex-installed-copies.sh")], sourceRoot, commandEnv);
-    steps.push(withStepName(step, "sync forge skills", `target=${target}`));
-  } else {
-    steps.push({
-      step: "sync forge skills",
-      status: "skipped",
-      detail: syncSkill ? "dry-run" : "disabled",
-    });
-  }
-
   if (hostAdapters && apply) {
     const installed = withProcessEnv(commandEnv, () => runInstall({ target, location: "global" }));
     steps.push({
@@ -463,74 +286,6 @@ export function runInit(opts: InitCommandOptions = {}): InitCommandResult {
   );
   steps.push(withStepName(migrate, apply ? "apply Forge" : "plan Forge", repoRoot));
 
-  if (externalSkills && apply && migrate.status === "ok") {
-    steps.push(...installExternalSkills(sourceRoot, target, commandEnv));
-  } else {
-    steps.push({
-      step: "external skills",
-      status: "skipped",
-      detail: !externalSkills
-        ? "disabled"
-        : apply
-          ? "Forge did not apply cleanly"
-          : "dry-run",
-    });
-  }
-
-  if (codegraph && apply) {
-    try {
-      const cg = ensureCodegraph({ repoRoot, init: true, sync: syncCodegraph, env: commandEnv, host: target });
-      const cgFailed = cg.actions.some((entry) => entry.status === "failed");
-      steps.push({
-        step: "ensure codegraph index",
-        status: cg.actions.length === 0 ? "skipped" : cgFailed ? "failed" : "ok",
-        detail:
-          cg.resolution.source === "missing"
-            ? "codegraph CLI not found; skipped (install via: forge tools ensure codegraph)"
-            : cg.actions.length > 0
-              ? cg.actions.map((entry) => `${entry.action}:${entry.status}`).join(", ")
-              : `index ${cg.status}`,
-      });
-
-      const mcpHosts =
-        (cg.raw as { mcp_hosts?: Record<string, { status?: string }> }).mcp_hosts ?? {};
-      const mcpConfigured =
-        cg.resolution.source !== "missing" &&
-        ["codex", "claude"].every((host) => mcpHosts[host]?.status === "configured");
-
-      if (cg.resolution.source !== "missing" && !mcpConfigured) {
-        if (configureCgMcp) {
-          const conf = configureCodegraph({ repoRoot, target, location: "global", env: commandEnv });
-          steps.push({
-            step: "configure codegraph mcp",
-            status: conf.actions.some((entry) => entry.status === "failed") ? "failed" : "ok",
-            detail: conf.actions.map((entry) => `${entry.action}:${entry.status}`).join(", "),
-          });
-        } else {
-          steps.push({
-            step: "codegraph mcp",
-            status: "skipped",
-            detail:
-              "not registered; run: forge tools configure codegraph --target both --location global",
-          });
-        }
-      }
-    } catch (error) {
-      steps.push({
-        step: "ensure codegraph index",
-        status: "failed",
-        detail: "CodeGraph readiness check failed",
-        stderr: error instanceof Error ? error.message : String(error),
-      });
-    }
-  } else {
-    steps.push({
-      step: "ensure codegraph index",
-      status: "skipped",
-      detail: codegraph ? "dry-run" : "disabled",
-    });
-  }
-
   if (brainMode !== "skip" && apply && migrate.status === "ok") {
     const root = opts.brainRoot ?? commandEnv?.FORGE_BRAIN_ROOT;
     if (root) {
@@ -795,7 +550,6 @@ export async function runInteractiveInit(opts: InteractiveInitOptions = {}): Pro
       `reporting=${reportLanguageInstruction}`,
       `brainRoot=${resolvedBrainChoice.root}`,
       `brainMode=${brainMode}`,
-      "CodeGraph=required ensure --init --sync plus global MCP configure",
       `apply=${opts.apply === false ? "false" : "true"}`,
       `verify=${opts.verify === false ? "false" : "true"}`,
     ]));
@@ -817,9 +571,6 @@ export async function runInteractiveInit(opts: InteractiveInitOptions = {}): Pro
       repo: repoRoot,
       sourceRoot,
       target,
-      codegraph: true,
-      configureCodegraphMcp: true,
-      syncCodegraph: true,
       globalContext: { reportLanguageInstruction },
       brainRoot: resolvedBrainChoice.root,
       brainMode,