phasegate 0.335.0 → 0.341.0

package/scripts/harness/main.ts

@@ -25,6 +25,8 @@
  * @work-item-id WI-300
  * @work-item-id WI-306
  * @work-item-id WI-308
+ * @work-item-id WI-384
+ * @work-item-id WI-385
  *
  * Phasegate CLI エントリポイント。
  * 各Unitの Composition Root からハンドラーを取得し、コマンドに応じてディスパッチする。
@@ -43,9 +45,8 @@ import {
 } from "node:fs/promises";
 import { basename, dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import { createAdrFoundationModule } from "./adr-foundation/composition-root.js";
 import { createBiomeAstEngineModule } from "./biome-ast-engine/composition-root.js";
-import { buildCiGovernance, type CiGovernanceDocPaths } from "./ci-governance/composition-root.js";
+import type { CiGovernanceDocPaths } from "./ci-governance/composition-root.js";
 import { toPhaseConfigSection } from "./config-foundation/application/mappers/phase-config-section-mapper.js";
 import { toValidatorSystemConfig } from "./config-foundation/application/mappers/validator-system-config-mapper.js";
 import { toWorldModelConfig } from "./config-foundation/application/mappers/world-model-config-mapper.js";
@@ -57,15 +58,13 @@ import {
   ConfigPersistenceError,
 } from "./config-foundation/infrastructure/repositories/file-system-config-repository.js";
 import { createHarnessApiModule } from "./harness-api/composition-root.js";
-import { createHarnessErrorModule } from "./harness-error/composition-root.js";
 import {
   type DeployManifestRecord,
   SkillDeployerManifestBuilder,
 } from "./installation/application/wrappers/skill-deployer-manifest-builder.js";
-import { createInstallationModule } from "./installation/composition-root.js";
+import { type AgentTarget, isAgentTarget } from "./installation/domain/agent-target.js";
 import { NodeCryptoHashAdapter } from "./installation/infrastructure/adapters/node-crypto-hash-adapter.js";
 import { CheckStoryReflectionUseCase } from "./phase-dependency-model/application/usecases/check-story-reflection-usecase.js";
-import { createPhaseDependencyModelModule } from "./phase-dependency-model/composition-root.js";
 import { StoryReflectionChecker } from "./phase-dependency-model/domain/services/story-reflection-checker.js";
 import { StoryReflectionResult } from "./phase-dependency-model/domain/values/story-reflection-result.js";
 import {
@@ -74,10 +73,9 @@ import {
 } from "./phase-dependency-model/infrastructure/config/harness-config-phase-config-provider.js";
 import { FileSystemStoryReflectionAdapter } from "./phase-dependency-model/infrastructure/filesystem/file-system-story-reflection-adapter.js";
 import { StoryReflectionStatusPresenter } from "./phase-dependency-model/presentation/cli/story-reflection-status-presenter.js";
-import { buildPhase2Extensions } from "./phase2-extensions/composition-root.js";
-import { createQuickModeCompositionRoot, type QuickModeCompositionRootOptions } from "./quick-mode/composition-root.js";
-import { buildRegressionSuite } from "./regression-suite/composition-root.js";
+import type { QuickModeCompositionRootOptions } from "./quick-mode/composition-root.js";
 import type { SkillSet } from "./setup/skill-deployer.js";
+import { isSkillSet } from "./installation/application/bundled-skill-selection.js";
 import {
   deployAgentSkillLinks,
   deployCiWorkflows,
@@ -94,11 +92,7 @@ import {
   initHarnessConfig,
   listAvailableSkillNames,
 } from "./setup/skill-deployer.js";
-import { createSkillQualityHandlers } from "./skill-quality/composition-root.js";
-import { createTraceabilityModelModule } from "./traceability-model/composition-root.js";
-import { createValidatorSystemModule } from "./validator-system/composition-root.js";
-import {
-  createWorldModelModule,
+import type {
   WorldDeriveCommandHandler,
   WorldInspectCommandHandler,
   WorldPinCommandHandler,
@@ -207,14 +201,14 @@ Usage: phasegate <command> [options]
 Setup:
   init                         Initialize project: deploy skills + design docs + phasegate.config.json
                                (--name <project-name>, --preset <full|standard|minimal|custom>,
-                                --skills <core|all>, --agent <claude|codex|both>, --workflow <standard|strict>,
+                                --skills <core|consumer|all>, --agent <claude|codex|both|grok|antigravity|all>, --workflow <standard|strict>,
                                 --language <language>, --with-husky, --with-ci, --yes)
   update-skills                Alias for reconcile (kept for compatibility)
-  doctor                       Diagnose silent installation failures (--json, --strict, --personal, --agent <claude|codex|both>, --report-out <path>)
+  doctor                       Diagnose silent installation failures (--json, --strict, --personal, --agent <claude|codex|both|grok|antigravity|all>, --report-out <path>)
   scaffold-wi <unit|_cross> <story|issue|fix|refactor|chore>
                                Create docs/inception/{unit}/WI-XXX/description.md
   emit-agent-rules             Print AGENTS.md / CLAUDE.md WI workflow rules block
-  install                      Install phasegate managed files (--dry-run|--apply, --force, --personal, --agent <claude|codex|both>)
+  install                      Install phasegate managed files (--dry-run|--apply, --force, --personal, --agent <claude|codex|both|grok|antigravity|all>)
   uninstall                    Uninstall phasegate managed files (--dry-run|--apply, --force)
   reconcile                    Reconcile phasegate managed files (--dry-run|--apply, --force)
   setup:agent                  Diagnose repo setup and produce/apply an agent-readable setup plan
@@ -271,7 +265,7 @@ Gate semantics:
   ci:auto-refresh-agent-context Refresh AGENTS.md / CLAUDE.md (--dry-run, --apply, --json)
   refresh-claude-md            Refresh CLAUDE.md standard sections (--dry-run, --apply, --json)
   p2:check-agent-context       Check AGENTS.md / CLAUDE.md freshness (--threshold-days <n>, --json)
-  setup:agent                  Plan agent-driven setup (--intent <minimal|recommended|strict|ci-only|agent-hooks|retrofit>, --agent <claude|codex|both>, --dry-run|--apply, --json)
+  setup:agent                  Plan agent-driven setup (--intent <minimal|recommended|strict|ci-only|agent-hooks|retrofit>, --agent <claude|codex|both|grok|antigravity|all>, --dry-run|--apply, --json)
   config:plan                  Plan safe config changes (--intent <l4-strict|codex-hooks|ci-fail-on-warning|baseline-reset|quick-mode-strict|quick-mode-relax|retrofit-bootstrap|planning-mode-relax>, --dry-run|--apply, --json)
   ci:check-repetition          Check error repetition (--code <errorCode>, --reset, --json)
   baseline                     Create retrofit baseline snapshot (--dry-run, --force, --paths <glob,glob,...>, --json)
@@ -280,7 +274,7 @@ Gate semantics:
   session begin                Start a Full Mode session (--mode full, --unit, --work-item, --reason, --duration)
   session end                  End a Full Mode session (--work-item)
 
-  skill:execute-tdd-cycle      Execute TDD cycle (--unit, --story, --desc, --phase RED|GREEN|REFACTOR, --passed)
+  skill:execute-tdd-cycle      Execute TDD cycle (--unit, --story, --desc, --phase RED|GREEN|REFACTOR, --passed, optional --configured-validation)
   skill:check-coverage         Check coverage (--story <storyId>, --json)
   skill:collect-lessons        Collect lessons (--story <storyId>, --sources <paths>, --write-artifact)
   skill:apply-cascade-update   Apply cascade update (--story <storyId>, --dry-run)
@@ -492,7 +486,7 @@ async function saveInstallationManifest(
 ): Promise<void> {
   const filteredRecords = (await Promise.all(records)).filter((record) => record !== null);
   if (filteredRecords.length === 0) return;
-  const mod = createInstallationModule();
+  const mod = (await import("./installation/composition-root.js")).createInstallationModule();
   const builder = new SkillDeployerManifestBuilder(new NodeCryptoHashAdapter());
   await mod.manifestRepository.save(rootDir, builder.build(version, filteredRecords));
 }
@@ -704,8 +698,8 @@ Initialize phasegate in the current project: deploy skills + design docs + phase
 Options:
   --name <project-name>           Project name (default: "my-project")
   --preset <full|standard|minimal|custom>   Phase dependency preset (default: "standard")
-  --skills <core|all>             Skill set to deploy (default: "all")
-  --agent <claude|codex|both>     Agent integration target (default: "claude")
+  --skills <core|consumer|all>    Skill set to deploy (default: "all"; consumer excludes maintainer skills)
+  --agent <claude|codex|both|grok|antigravity|all>     Agent integration target (default: "claude")
   --workflow <standard|strict>    Workflow enforcement defaults (default: "standard")
   --language <language>           Project language declaration (default: "typescript")
   --with-husky                    Install Husky pre-commit hooks
@@ -731,8 +725,8 @@ Options:
   --dry-run                       Preview target actions without writing (default)
   --apply                         Write merge results and manifest
   --force                         Force ai-assisted/manual targets after backing up existing files
-  --agent <claude|codex|both>     Agent context and hook targets (default: both)
-  --skills <core|all>             Rendered agent context skill mode (default: all)
+  --agent <claude|codex|both|grok|antigravity|all>     Agent context and hook targets (default: both)
+  --skills <core|consumer|all>    Skill set to deploy (default: all; consumer excludes maintainer skills)
   --workflow <standard|strict>    Rendered agent context workflow mode (default: standard)
   --with-husky                    Include Husky hook targets (opt-in; omitted by default)
   --with-ci                       Include GitHub Actions target (opt-in; omitted by default)
@@ -740,13 +734,24 @@ Options:
                                   With --agent claude, initializes .phasegate-local config/settings/skills and ignored .claude shims.
   --json                          Output machine-readable JSON
   --help, -h                      Show this help`,
+  doctor: `Usage: phasegate doctor [options]
+
+Diagnose silent installation failures for the selected runtime scope.
+
+Options:
+  --json                          Output machine-readable JSON
+  --strict                        Treat warnings as failures
+  --personal                      Diagnose a personal installation
+  --agent <claude|codex|both|grok|antigravity|all>     Diagnostic scope (default: both)
+  --report-out <path>             Write the JSON report to a file
+  --help, -h                      Show this help`,
   "setup:agent": `Usage: phasegate setup:agent [options]
 
 Diagnose repository setup and produce an agent-readable setup plan.
 
 Options:
   --intent <minimal|recommended|strict|ci-only|agent-hooks|retrofit>
-  --agent <claude|codex|both>
+  --agent <claude|codex|both|grok|antigravity|all>
   --workflow <standard|strict>
   --with-husky
   --with-ci
@@ -888,6 +893,7 @@ Options:
   --paths <csv>              Comma-separated file paths to classify.
   --format <human|json>      Output format. Default: human.
   --fail-on-full-required    Exit with code 1 when Full Mode is required.
+  --risk-snapshots <json>    Optional before/after snapshots for advisory review; does not change gates.
   --help, -h                 Show this help.
 
 Examples:
@@ -1075,7 +1081,7 @@ function parseCoverageThreshold(raw: string | undefined): number {
 }
 
 type InitPhasePreset = "full" | "standard" | "minimal" | "custom";
-type AgentTarget = "claude" | "codex" | "both";
+const AGENT_TARGET_USAGE = "claude|codex|both|grok|antigravity|all";
 type SetupIntent = "minimal" | "recommended" | "strict" | "ci-only" | "agent-hooks" | "retrofit";
 type ConfigChangeIntent =
   | "l4-strict"
@@ -1097,7 +1103,7 @@ interface SetupCompletenessEntry {
 }
 
 interface AgentReadinessEntry {
-  readonly agent: "claude" | "codex" | "shared";
+  readonly agent: "claude" | "codex" | "grok" | "antigravity" | "shared";
   readonly status: SetupCompletenessStatus;
   readonly evidence: readonly string[];
   readonly nextAction: string | null;
@@ -1134,14 +1140,9 @@ function parseInitPhasePreset(value: string | undefined): InitPhasePreset | unde
   return undefined;
 }
 
-function parseAgentTarget(value: string | undefined, fallback: AgentTarget = "both"): AgentTarget {
-  if (value === "claude" || value === "codex" || value === "both") return value;
-  return fallback;
-}
-
 function parseRequiredAgentTarget(value: string | undefined, fallback: AgentTarget = "both"): AgentTarget | null {
   if (value === undefined) return fallback;
-  if (value === "claude" || value === "codex" || value === "both") return value;
+  if (isAgentTarget(value)) return value;
   return null;
 }
 
@@ -1234,6 +1235,7 @@ function buildSetupCompleteness(input: {
     readonly phasegateConfig: boolean;
     readonly claudeSettings: boolean;
     readonly codexHooks: boolean;
+    readonly antigravityHooks: boolean;
     readonly agentsMd: boolean;
     readonly claudeMd: boolean;
     readonly huskyPreCommit: boolean;
@@ -1241,12 +1243,19 @@ function buildSetupCompleteness(input: {
     readonly skillsVersion: boolean;
   };
 }): readonly SetupCompletenessEntry[] {
-  const includeClaude = input.agent === "claude" || input.agent === "both";
-  const includeCodex = input.agent === "codex" || input.agent === "both";
+  const includeClaude = input.agent === "claude" || input.agent === "both" || input.agent === "all";
+  const includeCodex = input.agent === "codex" || input.agent === "both" || input.agent === "all";
+  const includeGrok = input.agent === "grok" || input.agent === "all";
+  const includeAntigravity = input.agent === "antigravity" || input.agent === "all";
+  const includeClaudeHook = includeClaude || includeGrok;
+  const includeAgentsContext = includeCodex || includeGrok || includeAntigravity;
   const doctorCommand = doctorValidationCommand(input.agent);
   const agentHooksConfigured =
-    (!includeClaude || input.checks.claudeSettings) && (!includeCodex || input.checks.codexHooks);
-  const agentContextConfigured = (!includeClaude || input.checks.claudeMd) && (!includeCodex || input.checks.agentsMd);
+    (!includeClaudeHook || input.checks.claudeSettings) &&
+    (!includeCodex || input.checks.codexHooks) &&
+    (!includeAntigravity || input.checks.antigravityHooks);
+  const agentContextConfigured =
+    (!includeClaude || input.checks.claudeMd) && (!includeAgentsContext || input.checks.agentsMd);
   const entries: SetupCompletenessEntry[] = [
     setupCompletenessEntry({
       area: "local-config",
@@ -1258,16 +1267,22 @@ function buildSetupCompleteness(input: {
     }),
     setupCompletenessEntry({
       area: "agent-hooks",
-      included: includeClaude || includeCodex,
+      included: includeClaudeHook || includeCodex || includeAntigravity,
       configured: agentHooksConfigured,
       configuredEvidence: "Selected agent hook settings are present.",
       plannedEvidence: "setup:agent will create or refresh selected agent hook settings.",
       nextAction: "Run setup:agent --apply for selected agents.",
-      risk: includeCodex ? "Codex user-level hook feature enablement remains a manual external check." : undefined,
+      risk: includeCodex
+        ? "Codex user-level hook feature enablement remains a manual external check."
+        : includeGrok
+          ? "Grok project-hook trust remains a manual external check."
+          : includeAntigravity
+            ? "Antigravity hard blocking is CLI-only; IDE/desktop relies on L2 pre-commit."
+            : undefined,
     }),
     setupCompletenessEntry({
       area: "agent-context",
-      included: includeClaude || includeCodex,
+      included: includeClaude || includeAgentsContext,
       configured: agentContextConfigured,
       configuredEvidence: "Selected AGENTS.md / CLAUDE.md managed context files are present.",
       plannedEvidence: "setup:agent will create or refresh selected managed agent context sections.",
@@ -1371,6 +1386,7 @@ function buildAgentReadiness(input: {
     readonly phasegateConfig: boolean;
     readonly claudeSettings: boolean;
     readonly codexHooks: boolean;
+    readonly antigravityHooks: boolean;
     readonly agentsMd: boolean;
     readonly claudeMd: boolean;
     readonly huskyPreCommit: boolean;
@@ -1378,8 +1394,10 @@ function buildAgentReadiness(input: {
     readonly skillsVersion: boolean;
   };
 }): readonly AgentReadinessEntry[] {
-  const includeClaude = input.agent === "claude" || input.agent === "both";
-  const includeCodex = input.agent === "codex" || input.agent === "both";
+  const includeClaude = input.agent === "claude" || input.agent === "both" || input.agent === "all";
+  const includeCodex = input.agent === "codex" || input.agent === "both" || input.agent === "all";
+  const includeGrok = input.agent === "grok" || input.agent === "all";
+  const includeAntigravity = input.agent === "antigravity" || input.agent === "all";
   const doctorCommand = doctorValidationCommand(input.agent);
   const sharedConfigured =
     input.checks.packageJson &&
@@ -1423,6 +1441,24 @@ function buildAgentReadiness(input: {
       nextAction: "Run setup:agent --agent codex --apply, then enable hooks at user level if needed.",
       risk: "Codex user-level hook feature enablement remains a manual external check.",
     }),
+    setupReadinessEntry({
+      agent: "grok",
+      included: includeGrok,
+      configured: input.checks.claudeSettings && input.checks.agentsMd,
+      configuredEvidence: [".claude/settings.json and AGENTS.md are present for Grok compatibility."],
+      plannedEvidence: ["setup:agent will deploy the Claude-compatible hook and AGENTS.md without .grok duplication."],
+      nextAction: "Run setup:agent --agent grok --apply, then verify grok inspect and /hooks trust.",
+      risk: "Grok project-hook trust cannot be verified by Phasegate.",
+    }),
+    setupReadinessEntry({
+      agent: "antigravity",
+      included: includeAntigravity,
+      configured: input.checks.antigravityHooks && input.checks.agentsMd,
+      configuredEvidence: [".agents/hooks.json and AGENTS.md are present for Antigravity CLI."],
+      plannedEvidence: ["setup:agent will deploy the Antigravity named hook map and AGENTS.md."],
+      nextAction: "Run setup:agent --agent antigravity --apply, then inspect /hooks in agy.",
+      risk: "IDE/desktop hook execution is not guaranteed; keep the L2 pre-commit backstop.",
+    }),
     setupReadinessEntry({
       agent: "shared",
       included: true,
@@ -1452,14 +1488,17 @@ async function buildAgentSetupPlan(
     phasegateConfig: await projectFileExists(rootDir, "phasegate.config.json"),
     claudeSettings: await projectFileExists(rootDir, ".claude/settings.json"),
     codexHooks: await projectFileExists(rootDir, ".codex/hooks.json"),
+    antigravityHooks: await projectFileExists(rootDir, ".agents/hooks.json"),
     agentsMd: await projectFileExists(rootDir, "AGENTS.md"),
     claudeMd: await projectFileExists(rootDir, "CLAUDE.md"),
     huskyPreCommit: await projectFileExists(rootDir, ".husky/pre-commit"),
     ciWorkflow: await projectFileExists(rootDir, ".github/workflows/phasegate-aidlc-gate.yml"),
     skillsVersion: await projectFileExists(rootDir, "skills/.harness-version"),
   };
-  const includeClaude = input.agent === "claude" || input.agent === "both";
-  const includeCodex = input.agent === "codex" || input.agent === "both";
+  const includeClaude = input.agent === "claude" || input.agent === "both" || input.agent === "all";
+  const includeCodex = input.agent === "codex" || input.agent === "both" || input.agent === "all";
+  const includeGrok = input.agent === "grok" || input.agent === "all";
+  const includeAntigravity = input.agent === "antigravity" || input.agent === "all";
   const changes = [
     !checks.packageJson
       ? "Add phasegate devDependency and phasegate scripts to package.json."
@@ -1469,6 +1508,8 @@ async function buildAgentSetupPlan(
       : "Keep existing phasegate.config.json; review config:plan before changing policy.",
     includeClaude ? "Create or refresh .claude/settings.json and CLAUDE.md managed section." : null,
     includeCodex ? "Create or refresh .codex/hooks.json and AGENTS.md managed section." : null,
+    includeGrok ? "Create or refresh the Claude-compatible hook and AGENTS.md without a .grok hook duplicate." : null,
+    includeAntigravity ? "Create or refresh .agents/hooks.json named hook and AGENTS.md managed section." : null,
     input.withHusky
       ? "Create or refresh Husky pre-commit, commit-msg, and pre-push backstops."
       : "Leave Husky hooks unmanaged in this setup run.",
@@ -1518,11 +1559,7 @@ function isPlainRecord(value: unknown): value is Record<string, unknown> {
 }
 
 async function readProjectJson(rootDir: string, relativePath: string): Promise<unknown | null> {
-  try {
-    return JSON.parse(await fsReadFile(join(rootDir, relativePath), "utf8")) as unknown;
-  } catch {
-    return null;
-  }
+  return JSON.parse(await fsReadFile(join(rootDir, relativePath), "utf8")) as unknown;
 }
 
 function withNestedValue(source: unknown, path: readonly string[], value: unknown): Record<string, unknown> {
@@ -1546,7 +1583,7 @@ function getNestedValue(source: unknown, path: readonly string[]): unknown {
   return cursor;
 }
 
-function buildConfigPatchPreview(intent: ConfigChangeIntent, before: unknown | null): ConfigPatchPreview {
+function buildConfigPatchPreview(intent: ConfigChangeIntent, before: unknown | null, missing = false): ConfigPatchPreview {
   const configIntents: Record<
     ConfigChangeIntent,
     readonly { readonly pointer: string; readonly path: readonly string[]; readonly value: unknown }[]
@@ -1590,6 +1627,16 @@ function buildConfigPatchPreview(intent: ConfigChangeIntent, before: unknown | n
       operations: [],
     };
   }
+  if (!isPlainRecord(before) && !missing) {
+    return {
+      path: "phasegate.config.json",
+      applicability: "blocked",
+      blockedReason: "An existing JSON object configuration is required. Review phasegate install --dry-run before initialization, or restore a valid configuration before retrying.",
+      before,
+      after: before,
+      operations: [],
+    };
+  }
   let after: unknown = before;
   const operations: ConfigPatchOperation[] = [];
   for (const change of changes) {
@@ -1625,6 +1672,9 @@ async function applyConfigPlan(
   if (patch.applicability !== "applicable") {
     throw new Error(`config plan is not applicable: ${patch.blockedReason ?? patch.applicability}`);
   }
+  if (!isPlainRecord(patch.before)) {
+    throw new Error("phasegate.config.json is missing. Review phasegate install --dry-run before initialization; config:plan does not create a partial configuration.");
+  }
   if (patch.operations.length === 0) {
     throw new Error("config plan has no operations to apply.");
   }
@@ -1633,13 +1683,16 @@ async function applyConfigPlan(
   }
 
   const configPath = join(rootDir, patch.path);
+  const beforeText = await fsReadFile(configPath, "utf8");
+  if (JSON.stringify(JSON.parse(beforeText)) !== JSON.stringify(patch.before)) {
+    throw new Error("phasegate.config.json changed after planning. Review config:plan --dry-run again before applying; no configuration was changed.");
+  }
   const backupPath = configPlanBackupPath(rootDir, new Date());
   await fsMkdir(dirname(backupPath), { recursive: true });
-  const beforeText = patch.before === null ? "" : `${JSON.stringify(patch.before, null, 2)}\n`;
-  await fsWriteFile(backupPath, beforeText, "utf8");
+  await fsWriteFile(backupPath, beforeText, { encoding: "utf8", flag: "wx" });
 
   const tempPath = `${configPath}.tmp-${process.pid}-${Date.now()}`;
-  await fsWriteFile(tempPath, `${JSON.stringify(patch.after, null, 2)}\n`, "utf8");
+  await fsWriteFile(tempPath, `${JSON.stringify(patch.after, null, 2)}\n`, { encoding: "utf8", flag: "wx" });
   await fsRename(tempPath, configPath);
 
   return {
@@ -1780,11 +1833,31 @@ async function buildConfigChangePlan(rootDir: string, intent: ConfigChangeIntent
       ],
     },
   };
-  const before = await readProjectJson(rootDir, "phasegate.config.json");
+  let before: unknown = null;
+  let readFailure: string | undefined;
+  let missing = false;
+  try {
+    before = await readProjectJson(rootDir, "phasegate.config.json");
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") {
+      missing = true;
+    } else if (error instanceof SyntaxError) {
+      readFailure = "Cannot parse phasegate.config.json. Restore valid JSON from version control or a known-good backup through an authorized recovery path, then preview again. The original file has not been changed.";
+    } else {
+      readFailure = `Cannot read phasegate.config.json. Check file access permissions before retrying. The original file has not been changed. ${error instanceof Error ? error.message : String(error)}`;
+    }
+  }
+  let configPatch = buildConfigPatchPreview(intent, before, missing);
+  if (readFailure && configPatch.applicability !== "not-applicable") {
+    configPatch = { ...configPatch, applicability: "blocked", blockedReason: readFailure, after: before, operations: [] };
+  }
   return {
     intent,
     ...catalog[intent],
-    configPatch: buildConfigPatchPreview(intent, before),
+    commands: missing && configPatch.applicability === "applicable"
+      ? ["phasegate install --dry-run", ...catalog[intent].commands]
+      : catalog[intent].commands,
+    configPatch,
     diffExplanation:
       "Review the listed targets first, apply through PhaseGate managed commands where possible, then run the validations in order.",
     rollback: "Use git diff for config changes; use phasegate uninstall/reconcile dry-runs for managed setup targets.",
@@ -2094,14 +2167,14 @@ async function main(): Promise<void> {
         }
         const phasePreset = parseInitPhasePreset(rawPhasePreset);
         const skillSetRaw = parseFlag(args, "--skills") ?? "all";
-        if (skillSetRaw !== "core" && skillSetRaw !== "all") {
-          console.error(`Invalid --skills value: "${skillSetRaw}". Use "core" or "all".`);
+        if (!isSkillSet(skillSetRaw)) {
+          console.error(`Invalid --skills value: "${skillSetRaw}". Use "core", "consumer", or "all".`);
           process.exit(2);
         }
         const skillSet: SkillSet = skillSetRaw;
         const agentRaw = parseFlag(args, "--agent") ?? "claude";
-        if (agentRaw !== "claude" && agentRaw !== "codex" && agentRaw !== "both") {
-          console.error(`Invalid --agent value: "${agentRaw}". Use "claude", "codex", or "both".`);
+        if (!isAgentTarget(agentRaw)) {
+          console.error(`Invalid --agent value: "${agentRaw}". Use <${AGENT_TARGET_USAGE}>.`);
           process.exit(2);
         }
         const agent = agentRaw;
@@ -2116,8 +2189,8 @@ async function main(): Promise<void> {
           console.error("Invalid --language value: value must not be empty.");
           process.exit(2);
         }
-        const deployClaude = agent === "claude" || agent === "both";
-        const deployCodex = agent === "codex" || agent === "both";
+        const deployClaude = agent === "claude" || agent === "both" || agent === "grok" || agent === "all";
+        const deployCodex = agent === "codex" || agent === "both" || agent === "all";
         const result = await deploySkills(harnessRoot, rootDir, skillSet);
         const packageResult = await ensurePhasegatePackageDependency(rootDir, result.version);
         const skillLinkResult = await deployAgentSkillLinks(rootDir, {
@@ -2177,7 +2250,7 @@ async function main(): Promise<void> {
           huskyPrePushResult?.created ? await createFileManifestRecord(rootDir, join(".husky", "pre-push")) : null,
           ...(ciWorkflowResult?.copiedFiles.map((path) => createFileManifestRecord(rootDir, path)) ?? []),
         ]);
-        const installModule = createInstallationModule();
+        const installModule = (await import("./installation/composition-root.js")).createInstallationModule();
         const installResult = await installModule.runInstallUseCase.execute({
           projectRoot: rootDir,
           harnessRoot,
@@ -2312,11 +2385,15 @@ async function main(): Promise<void> {
           console.log("  3. Edit .claude/scripts/hook-config.json to set target directories");
         }
         if (deployCodex) {
-          console.log(`  ${deployClaude ? "4" : "3"}. Enable Codex hooks: codex features enable hooks`);
+          console.log(
+            `  ${deployClaude ? "4" : "3"}. Use Codex CLI >= 0.124.0, then open /hooks and trust the current hook definition hash`,
+          );
           console.log(
             `  ${deployClaude ? "5" : "4"}. (Recommended) Install pre-commit backstop: rerun with --with-husky or set up husky manually`,
           );
-          console.log(`     See docs/guide/codex-integration.md for the native apply_patch limitation.`);
+          console.log(
+            `     See docs/guide/codex-integration.md for native apply_patch coverage and trust troubleshooting.`,
+          );
         }
         if (skillSet !== "core") {
           console.log("");
@@ -2337,7 +2414,7 @@ async function main(): Promise<void> {
         }
         const apply = hasFlag(args, "--apply");
         const dryRun = hasFlag(args, "--dry-run") || !apply;
-        const mod = createInstallationModule();
+        const mod = (await import("./installation/composition-root.js")).createInstallationModule();
         const phasegateVersion = await getHarnessVersion(harnessRoot);
         const result = await mod.reconcileHandler.execute({
           projectRoot: rootDir,
@@ -2363,10 +2440,10 @@ async function main(): Promise<void> {
         }
         const agent = parseRequiredAgentTarget(parseFlag(args, "--agent"), "both");
         if (agent === null) {
-          console.error(`Invalid --agent value: "${parseFlag(args, "--agent")}". Use "claude", "codex", or "both".`);
+          console.error(`Invalid --agent value: "${parseFlag(args, "--agent")}". Use <${AGENT_TARGET_USAGE}>.`);
           process.exit(2);
         }
-        const mod = createInstallationModule();
+        const mod = (await import("./installation/composition-root.js")).createInstallationModule();
         const phasegateVersion = await getHarnessVersion(harnessRoot);
         const result = await mod.doctorHandler.execute({
           projectRoot: rootDir,
@@ -2434,10 +2511,14 @@ async function main(): Promise<void> {
         }
         const apply = hasFlag(args, "--apply");
         const dryRun = hasFlag(args, "--dry-run") || !apply;
-        const agent = parseAgentTarget(parseFlag(args, "--agent"), "both");
+        const agent = parseRequiredAgentTarget(parseFlag(args, "--agent"), "both");
+        if (agent === null) {
+          console.error(`Invalid --agent value: "${parseFlag(args, "--agent")}". Use <${AGENT_TARGET_USAGE}>.`);
+          process.exit(2);
+        }
         const skillSetRaw = parseFlag(args, "--skills") ?? "all";
-        if (skillSetRaw !== "core" && skillSetRaw !== "all") {
-          console.error(`Invalid --skills value: "${skillSetRaw}". Use "core" or "all".`);
+        if (!isSkillSet(skillSetRaw)) {
+          console.error(`Invalid --skills value: "${skillSetRaw}". Use "core", "consumer", or "all".`);
           process.exit(2);
         }
         const workflowRaw = parseFlag(args, "--workflow");
@@ -2445,10 +2526,10 @@ async function main(): Promise<void> {
           console.error(`Invalid --workflow value: "${workflowRaw}". Use "standard" or "strict".`);
           process.exit(2);
         }
-        const includeClaude = agent === "claude" || agent === "both";
-        const includeCodex = agent === "codex" || agent === "both";
+        const includeClaude = agent === "claude" || agent === "both" || agent === "grok" || agent === "all";
+        const includeCodex = agent === "codex" || agent === "both" || agent === "all";
         const personal = hasFlag(args, "--personal");
-        const mod = createInstallationModule();
+        const mod = (await import("./installation/composition-root.js")).createInstallationModule();
         const phasegateVersion = await getHarnessVersion(harnessRoot);
         const result = await mod.installHandler.execute({
           projectRoot: rootDir,
@@ -2490,7 +2571,11 @@ async function main(): Promise<void> {
           process.exit(2);
         }
         const intent = parseSetupIntent(parseFlag(args, "--intent"));
-        const agent = parseAgentTarget(parseFlag(args, "--agent"), "both");
+        const agent = parseRequiredAgentTarget(parseFlag(args, "--agent"), "both");
+        if (agent === null) {
+          console.error(`Invalid --agent value: "${parseFlag(args, "--agent")}". Use <${AGENT_TARGET_USAGE}>.`);
+          process.exit(2);
+        }
         const workflow = parseWorkflowMode(
           parseFlag(args, "--workflow") ?? (intent === "strict" ? "strict" : "standard"),
         );
@@ -2517,7 +2602,7 @@ async function main(): Promise<void> {
             packageDependency: packageResult,
             configCreated: configResult.created,
           };
-          const mod = createInstallationModule();
+          const mod = (await import("./installation/composition-root.js")).createInstallationModule();
           const phasegateVersion = await getHarnessVersion(harnessRoot);
           installResult = await mod.runInstallUseCase.execute({
             projectRoot: rootDir,
@@ -2526,8 +2611,8 @@ async function main(): Promise<void> {
             dryRun: false,
             apply: true,
             force: hasFlag(args, "--force"),
-            includeClaude: agent === "claude" || agent === "both",
-            includeCodex: agent === "codex" || agent === "both",
+            includeClaude: agent === "claude" || agent === "both" || agent === "grok" || agent === "all",
+            includeCodex: agent === "codex" || agent === "both" || agent === "all",
             includeHusky: withHusky,
             includeCi: withCi,
             skillSet: "all",
@@ -2684,7 +2769,7 @@ async function main(): Promise<void> {
         }
         const apply = hasFlag(args, "--apply");
         const dryRun = hasFlag(args, "--dry-run") || !apply;
-        const mod = createInstallationModule();
+        const mod = (await import("./installation/composition-root.js")).createInstallationModule();
         const result = await mod.uninstallHandler.execute({
           projectRoot: rootDir,
           harnessRoot,
@@ -2707,7 +2792,7 @@ async function main(): Promise<void> {
         }
         const apply = hasFlag(args, "--apply");
         const dryRun = hasFlag(args, "--dry-run") || !apply;
-        const mod = createInstallationModule();
+        const mod = (await import("./installation/composition-root.js")).createInstallationModule();
         const phasegateVersion = await getHarnessVersion(harnessRoot);
         const result = await mod.reconcileHandler.execute({
           projectRoot: rootDir,
@@ -2766,7 +2851,7 @@ async function main(): Promise<void> {
 
       case "migrate": {
         if (args[1] === "work-items") {
-          const mod = createTraceabilityModelModule(rootDir, toTraceabilityModelOptions(resolvedConfig));
+          const mod = (await import("./traceability-model/composition-root.js")).createTraceabilityModelModule(rootDir, toTraceabilityModelOptions(resolvedConfig));
           const result = await mod.migrateWorkItemsCommandHandler.execute({
             dryRun: hasFlag(args, "--dry-run"),
             apply: hasFlag(args, "--apply"),
@@ -2790,7 +2875,7 @@ async function main(): Promise<void> {
 
       // ── harness-error ──
       case "render-errors": {
-        const mod = createHarnessErrorModule(rootDir);
+        const mod = (await import("./harness-error/composition-root.js")).createHarnessErrorModule(rootDir);
         const format = toRenderFormat(parseFlag(args, "--format") ?? "human");
         const failOnError = hasFlag(args, "--fail-on-error");
         const result = mod.renderHarnessErrorsHandler.execute({
@@ -2804,7 +2889,7 @@ async function main(): Promise<void> {
       }
 
       case "validate-fix": {
-        const mod = createHarnessErrorModule(rootDir);
+        const mod = (await import("./harness-error/composition-root.js")).createHarnessErrorModule(rootDir);
         const code = parseFlag(args, "--code");
         const failFast = hasFlag(args, "--fail-fast");
         const format = toListFormat(parseFlag(args, "--format") ?? "human");
@@ -2819,7 +2904,7 @@ async function main(): Promise<void> {
       }
 
       case "list-errors": {
-        const mod = createHarnessErrorModule(rootDir);
+        const mod = (await import("./harness-error/composition-root.js")).createHarnessErrorModule(rootDir);
         const format = toListFormat(parseFlag(args, "--format") ?? "human");
         const layer = toLayerFilter(parseFlag(args, "--layer"));
         const result = await mod.listErrorDefinitionsHandler.execute({
@@ -2833,7 +2918,7 @@ async function main(): Promise<void> {
 
       // ── traceability-model ──
       case "validate-metadata": {
-        const mod = createTraceabilityModelModule(rootDir, toTraceabilityModelOptions(resolvedConfig));
+        const mod = (await import("./traceability-model/composition-root.js")).createTraceabilityModelModule(rootDir, toTraceabilityModelOptions(resolvedConfig));
         const filePaths = parsePositionalArgs(args.slice(1));
         const result = await mod.validateMetadataCommandHandler.execute({
           filePaths,
@@ -2845,7 +2930,7 @@ async function main(): Promise<void> {
       }
 
       case "work-items:status": {
-        const mod = createTraceabilityModelModule(rootDir, toTraceabilityModelOptions(resolvedConfig));
+        const mod = (await import("./traceability-model/composition-root.js")).createTraceabilityModelModule(rootDir, toTraceabilityModelOptions(resolvedConfig));
         const result = await mod.workItemStatusCommandHandler.execute({
           dryRun: hasFlag(args, "--dry-run"),
           apply: hasFlag(args, "--apply"),
@@ -2864,12 +2949,12 @@ async function main(): Promise<void> {
       case "world:inspect": {
         let handler: WorldInspectCommandHandler;
         try {
-          handler = createWorldModelModule({
+          handler = (await import("./world-model/index.js")).createWorldModelModule({
             rootDir,
             resolvedConfig: await loadWorldResolvedConfig(),
           }).worldInspectCommandHandler;
         } catch (error) {
-          handler = WorldInspectCommandHandler.fromFailure(error);
+          handler = (await import("./world-model/index.js")).WorldInspectCommandHandler.fromFailure(error);
         }
         const result = await handler.execute(args.slice(1));
         if (result.stdout.length > 0) process.stdout.write(result.stdout);
@@ -2881,12 +2966,12 @@ async function main(): Promise<void> {
       case "world:pin": {
         let handler: WorldPinCommandHandler;
         try {
-          handler = createWorldModelModule({
+          handler = (await import("./world-model/index.js")).createWorldModelModule({
             rootDir,
             resolvedConfig: await loadWorldResolvedConfig(),
           }).worldPinCommandHandler;
         } catch (error) {
-          handler = WorldPinCommandHandler.fromFailure(error);
+          handler = (await import("./world-model/index.js")).WorldPinCommandHandler.fromFailure(error);
         }
         const result = await handler.execute(args.slice(1));
         if (result.stdout.length > 0) process.stdout.write(result.stdout);
@@ -2898,12 +2983,12 @@ async function main(): Promise<void> {
       case "world:derive": {
         let handler: WorldDeriveCommandHandler;
         try {
-          handler = createWorldModelModule({
+          handler = (await import("./world-model/index.js")).createWorldModelModule({
             rootDir,
             resolvedConfig: await loadWorldResolvedConfig(),
           }).worldDeriveCommandHandler;
         } catch (error) {
-          handler = WorldDeriveCommandHandler.fromFailure(error);
+          handler = (await import("./world-model/index.js")).WorldDeriveCommandHandler.fromFailure(error);
         }
         const result = await handler.execute(args.slice(1));
         if (result.stdout.length > 0) process.stdout.write(result.stdout);
@@ -2916,7 +3001,7 @@ async function main(): Promise<void> {
       case "check-phase-gate": {
         const phaseConfig = resolvedConfig ? toPhaseConfigSection(resolvedConfig) : undefined;
         const reportOutputDir = resolvedConfig?.reporting.outputDir;
-        const mod = createPhaseDependencyModelModule({
+        const mod = (await import("./phase-dependency-model/composition-root.js")).createPhaseDependencyModelModule({
           rootDir,
           phaseConfig,
           reportOutputDir,
@@ -2942,7 +3027,7 @@ async function main(): Promise<void> {
       // ADR ディレクトリを rootDir として渡す（project root を渡すと readdir が ADR を
       // 一切発見できず vacuous な valid を返す phantom gate になる）。
       case "list-adrs": {
-        const mod = createAdrFoundationModule(join(rootDir, "docs", "ADR"));
+        const mod = (await import("./adr-foundation/composition-root.js")).createAdrFoundationModule(join(rootDir, "docs", "ADR"));
         const statuses = toAdrStatuses(parseFlag(args, "--status"));
         const result = await mod.listAdrsCommandHandler.execute({
           statuses,
@@ -2954,7 +3039,7 @@ async function main(): Promise<void> {
       }
 
       case "validate-adr": {
-        const mod = createAdrFoundationModule(join(rootDir, "docs", "ADR"));
+        const mod = (await import("./adr-foundation/composition-root.js")).createAdrFoundationModule(join(rootDir, "docs", "ADR"));
         const all = hasFlag(args, "--all");
         const adrRef = args.find((a) => !a.startsWith("--") && a !== command);
         const result = await mod.validateAdrCommandHandler.execute({
@@ -2980,7 +3065,7 @@ async function main(): Promise<void> {
 
       // ── validator-system ──
       case "validate": {
-        const mod = createValidatorSystemModule(toValidatorSystemConfig(resolvedConfig));
+        const mod = (await import("./validator-system/composition-root.js")).createValidatorSystemModule(toValidatorSystemConfig(resolvedConfig));
         const layer = parseValidateLayer(args);
         const unit = parseFlag(args, "--unit");
         const phase = parseFlag(args, "--phase");
@@ -3013,7 +3098,7 @@ async function main(): Promise<void> {
           // WI-364: check-change-category (WI-351) と同様に解決済み configPath / rootDir を注入する。
           // 無指定だと quickMode 設定を cwd 基準でしか探せず、サブディレクトリ実行で
           // HarnessConfigNotFoundError → exit 2 になっていた。
-          const mod = createQuickModeCompositionRoot(await resolveQuickModeCompositionOptions());
+          const mod = (await import("./quick-mode/composition-root.js")).createQuickModeCompositionRoot(await resolveQuickModeCompositionOptions());
           const failOnReject = hasFlag(args, "--fail-on-reject");
           const dryRun = hasFlag(args, "--dry-run");
           const files = parseFlag(args, "--files");
@@ -3042,6 +3127,7 @@ async function main(): Promise<void> {
               "  --paths <csv>              Comma-separated file paths to classify.",
               "  --format <human|json>      Output format. Default: human.",
               "  --fail-on-full-required    Exit with code 1 when Full Mode is required.",
+              "  --risk-snapshots <json>    Optional before/after snapshots for advisory review; does not change gates.",
               "  --help                     Show this help.",
               "",
               "Examples:",
@@ -3052,14 +3138,19 @@ async function main(): Promise<void> {
           );
           return;
         }
-        const mod = createQuickModeCompositionRoot(await resolveQuickModeCompositionOptions());
+        const mod = (await import("./quick-mode/composition-root.js")).createQuickModeCompositionRoot(await resolveQuickModeCompositionOptions());
         const paths = parseFlag(args, "--paths");
         const format = parseFlag(args, "--format") as "human" | "json" | undefined;
         const failOnFullRequired = hasFlag(args, "--fail-on-full-required");
+        const riskSnapshots = parseFlag(args, "--risk-snapshots");
+        if (hasFlag(args, "--risk-snapshots") && !riskSnapshots) {
+          throw new Error("--risk-snapshots requires a JSON file path.");
+        }
         const result = await mod.checkChangeCategoryHandler.handle({
           paths,
           format,
           failOnFullRequired,
+          riskSnapshots,
         });
         await finishCliExit(result.exitCode);
         return;
@@ -3145,9 +3236,8 @@ async function main(): Promise<void> {
         const mod = createHarnessApiModule();
         const flags: Record<string, boolean | string> = {};
         if (json) flags.json = true;
-        const target = parseFlag(args, "--target");
-        if (target) flags.target = target;
-        await mod.handlers.lint.handle({}, flags);
+        const targets = args.flatMap((arg, index) => arg === '--target' && args[index + 1] !== undefined ? [args[index + 1]] : []);
+        await mod.handlers.lint.handle(targets.length > 0 ? { reportTargets: JSON.stringify(targets) } : {}, flags);
         break;
       }
 
@@ -3222,7 +3312,7 @@ async function main(): Promise<void> {
         }
         const { createAttestationModule } = await import("./attestation/index.js");
         const pkgVersion = await getHarnessVersion(harnessRoot);
-        const worldModule = createWorldModelModule({
+        const worldModule = (await import("./world-model/index.js")).createWorldModelModule({
           rootDir,
           resolvedConfig: await loadWorldResolvedConfig(),
         });
@@ -3289,7 +3379,7 @@ Examples:
           console.error(flagError);
           process.exit(2);
         }
-        const mod = buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
+        const mod = (await import("./ci-governance/composition-root.js")).buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
         const presetId = parseFlag(args, "--preset") ?? "standard";
         const templateType = parseFlag(args, "--type") ?? "aidlc-gate";
         const render = hasFlag(args, "--render");
@@ -3301,7 +3391,7 @@ Examples:
       }
 
       case "ci:migrate-agents-md": {
-        const mod = buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
+        const mod = (await import("./ci-governance/composition-root.js")).buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
         const dryRun = hasFlag(args, "--dry-run");
         const validateOnly = hasFlag(args, "--validate-only");
         const format = json ? "json" : "human";
@@ -3312,7 +3402,7 @@ Examples:
       }
 
       case "ci:auto-refresh-agent-context": {
-        const mod = buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
+        const mod = (await import("./ci-governance/composition-root.js")).buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
         const dryRun = hasFlag(args, "--dry-run");
         const apply = hasFlag(args, "--apply");
         const format = json ? "json" : "human";
@@ -3323,7 +3413,7 @@ Examples:
       }
 
       case "refresh-claude-md": {
-        const mod = buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
+        const mod = (await import("./ci-governance/composition-root.js")).buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
         const dryRun = hasFlag(args, "--dry-run");
         const apply = hasFlag(args, "--apply");
         const format = json ? "json" : "human";
@@ -3334,7 +3424,7 @@ Examples:
       }
 
       case "p2:check-agent-context": {
-        const mod = buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
+        const mod = (await import("./ci-governance/composition-root.js")).buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
         const thresholdRaw = parseFlag(args, "--threshold-days");
         const thresholdDays = thresholdRaw === undefined ? undefined : Number(thresholdRaw);
         const format = json ? "json" : "human";
@@ -3345,7 +3435,7 @@ Examples:
       }
 
       case "ci:check-repetition": {
-        const mod = buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
+        const mod = (await import("./ci-governance/composition-root.js")).buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
         const errorCode = parseFlag(args, "--code") ?? "";
         const reset = hasFlag(args, "--reset");
         const format = json ? "json" : "human";
@@ -3356,7 +3446,7 @@ Examples:
       }
 
       case "baseline": {
-        const mod = buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
+        const mod = (await import("./ci-governance/composition-root.js")).buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
         const dryRun = hasFlag(args, "--dry-run");
         const force = hasFlag(args, "--force");
         const pathsFlag = parseFlag(args, "--paths");
@@ -3379,7 +3469,7 @@ Examples:
       }
 
       case "scaffold-design": {
-        const mod = buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
+        const mod = (await import("./ci-governance/composition-root.js")).buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
         const unit = parseFlag(args, "--unit") ?? "";
         const phase = parseFlag(args, "--phase") ?? "";
         const dryRun = hasFlag(args, "--dry-run");
@@ -3400,7 +3490,7 @@ Examples:
       }
 
       case "scaffold-inception": {
-        const mod = buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
+        const mod = (await import("./ci-governance/composition-root.js")).buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
         const kind = parseFlag(args, "--kind") ?? "";
         const dryRun = hasFlag(args, "--dry-run");
         const apply = hasFlag(args, "--apply");
@@ -3419,7 +3509,7 @@ Examples:
       }
 
       case "templates": {
-        const mod = buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
+        const mod = (await import("./ci-governance/composition-root.js")).buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
         const subCommand = args[1];
         const emit = async (result: { exitCode: number; output: string; errorOutput: string }): Promise<void> => {
           if (result.output.length > 0) console.log(result.output);
@@ -3442,7 +3532,7 @@ Examples:
       }
 
       case "integrity:pin": {
-        const mod = buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
+        const mod = (await import("./ci-governance/composition-root.js")).buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
         const dryRun = hasFlag(args, "--dry-run");
         const format = json ? "json" : "human";
         const result = await mod.integrityHandler.pin({ dryRun, format });
@@ -3452,7 +3542,7 @@ Examples:
       }
 
       case "integrity:verify": {
-        const mod = buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
+        const mod = (await import("./ci-governance/composition-root.js")).buildCiGovernance(rootDir, harnessRoot, toCiGovernanceDocPaths(resolvedConfig));
         const format = json ? "json" : "human";
         const result = await mod.integrityHandler.verify({ format });
         console.log(result.output);
@@ -3462,7 +3552,15 @@ Examples:
 
       // ── skill-quality ──
       case "skill:execute-tdd-cycle": {
-        const mod = createSkillQualityHandlers();
+        const configuredValidation = hasFlag(args, "--configured-validation");
+        const mod = (await import("./skill-quality/composition-root.js")).createSkillQualityHandlers(configuredValidation ? {
+          rootDir,
+          l1Config: resolvedConfig
+            ? { l1Config: toL1Config(resolvedConfig), architecture: toArchitectureInput(resolvedConfig) }
+            : undefined,
+          validatorSystemConfig: toValidatorSystemConfig(resolvedConfig),
+          failOnWarning: resolvedConfig?.validate.failOnWarning,
+        } : {});
         const unit = parseFlag(args, "--unit") ?? "";
         const storyId = parseFlag(args, "--story") ?? "";
         const description = parseFlag(args, "--desc") ?? "";
@@ -3472,12 +3570,13 @@ Examples:
         const passed = hasFlag(args, "--passed");
         const result = await mod.executeTddCycleHandler.handle({ unit, storyId, description, phase, passed });
         console.log(result.message);
+        console.log(`Validation profile: ${configuredValidation ? "configured" : "legacy (use --configured-validation to explicitly adopt resolved project validation settings)"}`);
         await finishCliExit(result.exitCode);
         return;
       }
 
       case "skill:check-coverage": {
-        const mod = createSkillQualityHandlers();
+        const mod = (await import("./skill-quality/composition-root.js")).createSkillQualityHandlers();
         const storyId = parseFlag(args, "--story") ?? "";
         const format = json ? "json" : "human";
         const result = await mod.checkCoverageHandler.handle({ storyId, format });
@@ -3487,7 +3586,7 @@ Examples:
       }
 
       case "skill:collect-lessons": {
-        const mod = createSkillQualityHandlers();
+        const mod = (await import("./skill-quality/composition-root.js")).createSkillQualityHandlers();
         const storyId = parseFlag(args, "--story") ?? "";
         const sourcesRaw = parseFlag(args, "--sources") ?? "";
         const sources = sourcesRaw ? sourcesRaw.split(",") : [];
@@ -3499,7 +3598,7 @@ Examples:
       }
 
       case "skill:apply-cascade-update": {
-        const mod = createSkillQualityHandlers();
+        const mod = (await import("./skill-quality/composition-root.js")).createSkillQualityHandlers();
         const storyId = parseFlag(args, "--story") ?? "";
         const dryRun = hasFlag(args, "--dry-run");
         const result = await mod.applyCascadeUpdateHandler.handle({ storyId, dryRun, format: json ? "json" : "human" });
@@ -3509,7 +3608,7 @@ Examples:
       }
 
       case "skill:validate-structure": {
-        const mod = createSkillQualityHandlers();
+        const mod = (await import("./skill-quality/composition-root.js")).createSkillQualityHandlers();
         const skillFile = parseFlag(args, "--file") ?? "";
         const format = json ? "json" : "human";
         const result = await mod.validateSkillStructureHandler.handle({ skillFile, format });
@@ -3520,7 +3619,7 @@ Examples:
 
       // ── regression-suite ──
       case "regression:run-k-requirements": {
-        const mod = buildRegressionSuite(rootDir);
+        const mod = (await import("./regression-suite/composition-root.js")).buildRegressionSuite(rootDir);
         const result = await mod.runKRequirementsRegressionUseCase.execute();
         const output = json
           ? JSON.stringify(result, null, 2)
@@ -3531,7 +3630,7 @@ Examples:
       }
 
       case "regression:run-gng-gate": {
-        const mod = buildRegressionSuite(rootDir);
+        const mod = (await import("./regression-suite/composition-root.js")).buildRegressionSuite(rootDir);
         const result = await mod.runGngGateRegressionUseCase.execute();
         const output = json
           ? JSON.stringify(result, null, 2)
@@ -3542,7 +3641,7 @@ Examples:
       }
 
       case "regression:run-agent-guard": {
-        const mod = buildRegressionSuite(rootDir);
+        const mod = (await import("./regression-suite/composition-root.js")).buildRegressionSuite(rootDir);
         const result = await mod.runAgentIndependenceGuardUseCase.execute();
         const output = json
           ? JSON.stringify(result, null, 2)
@@ -3553,7 +3652,7 @@ Examples:
       }
 
       case "regression:run-k14-k15": {
-        const mod = buildRegressionSuite(rootDir);
+        const mod = (await import("./regression-suite/composition-root.js")).buildRegressionSuite(rootDir);
         const result = await mod.runK14K15RegressionUseCase.execute();
         const output = json
           ? JSON.stringify(result, null, 2)
@@ -3564,7 +3663,7 @@ Examples:
       }
 
       case "regression:configure-ci-gate": {
-        const mod = buildRegressionSuite(rootDir);
+        const mod = (await import("./regression-suite/composition-root.js")).buildRegressionSuite(rootDir);
         const requiredSuiteIds = parseSuiteIds(parseFlag(args, "--suites") ?? DEFAULT_REGRESSION_SUITES);
         const threshold = parseCoverageThreshold(parseFlag(args, "--threshold"));
         const result = await mod.configureCiGateUseCase.execute({
@@ -3581,7 +3680,7 @@ Examples:
       }
 
       case "regression:analyze-migration": {
-        const mod = buildRegressionSuite(rootDir);
+        const mod = (await import("./regression-suite/composition-root.js")).buildRegressionSuite(rootDir);
         const dryRun = !hasFlag(args, "--no-dry-run");
         const result = await mod.analyzeV0MigrationUseCase.execute({ dryRun });
         const output = json
@@ -3593,7 +3692,7 @@ Examples:
       }
 
       case "regression:migrate-v0-tests": {
-        const mod = buildRegressionSuite(rootDir);
+        const mod = (await import("./regression-suite/composition-root.js")).buildRegressionSuite(rootDir);
         const confirm = hasFlag(args, "--confirm");
         const result = await mod.migrateV0TestsUseCase.execute({ confirmExecute: confirm });
         const output = json
@@ -3606,7 +3705,7 @@ Examples:
 
       // ── phase2-extensions ──
       case "p2:check-freshness": {
-        const mod = buildPhase2Extensions(rootDir, resolvedConfig ?? undefined);
+        const mod = (await import("./phase2-extensions/composition-root.js")).buildPhase2Extensions(rootDir, resolvedConfig ?? undefined);
         const p2args = args.slice(1);
         const result = await mod.checkFreshnessHandler.handle(p2args);
         console.log(result.stdout);
@@ -3615,7 +3714,7 @@ Examples:
       }
 
       case "p2:validate-pointers": {
-        const mod = buildPhase2Extensions(rootDir, resolvedConfig ?? undefined);
+        const mod = (await import("./phase2-extensions/composition-root.js")).buildPhase2Extensions(rootDir, resolvedConfig ?? undefined);
         const p2args = args.slice(1);
         const result = await mod.validatePointersHandler.handle(p2args);
         console.log(result.stdout);
@@ -3624,7 +3723,7 @@ Examples:
       }
 
       case "p2:generate-e2e-template": {
-        const mod = buildPhase2Extensions(rootDir, resolvedConfig ?? undefined);
+        const mod = (await import("./phase2-extensions/composition-root.js")).buildPhase2Extensions(rootDir, resolvedConfig ?? undefined);
         const p2args = args.slice(1);
         const result = await mod.generateE2ETemplateHandler.handle(p2args);
         console.log(result.stdout);
@@ -3633,7 +3732,7 @@ Examples:
       }
 
       case "p2:check-initial-creation": {
-        const mod = buildPhase2Extensions(rootDir, resolvedConfig ?? undefined);
+        const mod = (await import("./phase2-extensions/composition-root.js")).buildPhase2Extensions(rootDir, resolvedConfig ?? undefined);
         const p2args = args.slice(1);
         const result = await mod.checkInitialCreationExpirationHandler.handle(p2args);
         console.log(result.stdout);