phasegate 0.15.0 → 0.31.0

package/scripts/harness/harness-api/infrastructure/adapters/file-system-artifact-scanner-adapter.ts

@@ -1,3 +1,4 @@
+// @layer infrastructure
 // file-system-artifact-scanner-adapter.ts — FileSystemArtifactScannerAdapter
 
 import * as fs from 'node:fs/promises';

package/scripts/harness/harness-api/infrastructure/adapters/harness-config-query-adapter.ts

@@ -1,3 +1,4 @@
+// @layer infrastructure
 // harness-config-query-adapter.ts — HarnessConfigQueryAdapter
 
 import * as fs from 'node:fs/promises';

package/scripts/harness/harness-api/infrastructure/adapters/nyquist-validation-impact-analysis-adapter.ts

@@ -1,3 +1,4 @@
+// @layer infrastructure
 // nyquist-validation-impact-analysis-adapter.ts — NyquistValidationImpactAnalysisAdapter
 // Wave 2完了後にリアル実装へ差し替え（旧: @stub: wave2-pending）
 

package/scripts/harness/harness-api/infrastructure/adapters/phase-dependency-model-query-adapter.ts

@@ -1,3 +1,4 @@
+// @layer infrastructure
 // phase-dependency-model-query-adapter.ts — PhaseDependencyModelQueryAdapter
 // Wave 2完了後にリアル実装へ差し替え（旧: @stub: wave2-pending）
 

package/scripts/harness/harness-api/infrastructure/adapters/validator-system-execution-adapter.ts

@@ -1,3 +1,4 @@
+// @layer infrastructure
 // validator-system-execution-adapter.ts — ValidatorSystemExecutionAdapter
 // Wave 2完了後にリアル実装へ差し替え（旧: @stub: wave2-pending）
 

package/scripts/harness/harness-api/presentation/dto/cli-output-options.ts

@@ -1,3 +1,4 @@
+// @layer presentation
 // cli-output-options.ts — CLIOutputOptions DTO
 
 export interface CLIOutputOptions {

package/scripts/harness/harness-api/presentation/formatters/harness-api-json-formatter.ts

@@ -1,3 +1,4 @@
+// @layer presentation
 // harness-api-json-formatter.ts — HarnessApiJsonFormatter
 
 import type { HarnessApiResponseContract } from '../../application/dto/harness-api-response-contract.js';

package/scripts/harness/harness-api/presentation/handlers/check-phase-handler.ts

@@ -1,3 +1,4 @@
+// @layer presentation
 // check-phase-handler.ts — CheckPhaseHandler
 
 import type { DispatchCommandUseCase } from '../../application/usecases/dispatch-command-usecase.js';
@@ -30,7 +31,7 @@ export class CheckPhaseHandler {
     }
 
     const result = await this.dispatchUseCase.execute({
-      commandName: 'harness:check-phase',
+      commandName: 'phasegate:check-phase',
       args,
       flags,
     });

package/scripts/harness/harness-api/presentation/handlers/check-ready-handler.ts

@@ -1,3 +1,4 @@
+// @layer presentation
 // check-ready-handler.ts — CheckReadyHandler
 
 import type { DispatchCommandUseCase } from '../../application/usecases/dispatch-command-usecase.js';
@@ -17,7 +18,7 @@ export class CheckReadyHandler {
     options: CLIOutputOptions = {}
   ): Promise<void> {
     const result = await this.dispatchUseCase.execute({
-      commandName: 'harness:check-ready',
+      commandName: 'phasegate:check-ready',
       args,
       flags,
     });

package/scripts/harness/harness-api/presentation/handlers/ci-check-handler.ts

@@ -1,3 +1,4 @@
+// @layer presentation
 // ci-check-handler.ts — CiCheckHandler
 
 import type { DispatchCommandUseCase } from '../../application/usecases/dispatch-command-usecase.js';
@@ -17,7 +18,7 @@ export class CiCheckHandler {
     options: CLIOutputOptions = {}
   ): Promise<void> {
     const result = await this.dispatchUseCase.execute({
-      commandName: 'harness:ci-check',
+      commandName: 'phasegate:ci-check',
       args,
       flags,
     });

package/scripts/harness/harness-api/presentation/handlers/complete-check-handler.ts

@@ -1,3 +1,4 @@
+// @layer presentation
 // complete-check-handler.ts — CompleteCheckHandler
 
 import type { DispatchCommandUseCase } from '../../application/usecases/dispatch-command-usecase.js';
@@ -17,7 +18,7 @@ export class CompleteCheckHandler {
     options: CLIOutputOptions = {}
   ): Promise<void> {
     const result = await this.dispatchUseCase.execute({
-      commandName: 'harness:complete-check',
+      commandName: 'phasegate:complete-check',
       args,
       flags,
     });

package/scripts/harness/harness-api/presentation/handlers/detect-drift-handler.ts

@@ -1,3 +1,4 @@
+// @layer presentation
 // detect-drift-handler.ts — DetectDriftHandler
 
 import type { DispatchCommandUseCase } from '../../application/usecases/dispatch-command-usecase.js';
@@ -17,7 +18,7 @@ export class DetectDriftHandler {
     options: CLIOutputOptions = {}
   ): Promise<void> {
     const result = await this.dispatchUseCase.execute({
-      commandName: 'harness:detect-drift',
+      commandName: 'phasegate:detect-drift',
       args,
       flags: { ...flags, json: true },
     });

package/scripts/harness/harness-api/presentation/handlers/impact-analysis-handler.ts

@@ -1,3 +1,4 @@
+// @layer presentation
 // impact-analysis-handler.ts — ImpactAnalysisHandler
 
 import type { DispatchCommandUseCase } from '../../application/usecases/dispatch-command-usecase.js';
@@ -33,7 +34,7 @@ export class ImpactAnalysisHandler {
     }
 
     const result = await this.dispatchUseCase.execute({
-      commandName: 'harness:impact-analysis',
+      commandName: 'phasegate:impact-analysis',
       args,
       flags,
     });

package/scripts/harness/harness-api/presentation/handlers/lint-handler.ts

@@ -1,3 +1,4 @@
+// @layer presentation
 // lint-handler.ts — LintHandler
 
 import type { DispatchCommandUseCase } from '../../application/usecases/dispatch-command-usecase.js';
@@ -17,7 +18,7 @@ export class LintHandler {
     options: CLIOutputOptions = {}
   ): Promise<void> {
     const result = await this.dispatchUseCase.execute({
-      commandName: 'harness:lint',
+      commandName: 'phasegate:lint',
       args,
       flags,
     });

package/scripts/harness/harness-api/presentation/handlers/status-handler.ts

@@ -1,3 +1,4 @@
+// @layer presentation
 // status-handler.ts — StatusHandler
 
 import type { DispatchCommandUseCase } from '../../application/usecases/dispatch-command-usecase.js';
@@ -20,15 +21,15 @@ export class StatusHandler {
     options: CLIOutputOptions = {}
   ): Promise<void> {
     const result = await this.dispatchUseCase.execute({
-      commandName: 'harness:status',
+      commandName: 'phasegate:status',
       args,
       flags,
     });
 
-    // Apply D5 rule: harness:status never returns exitCode 1
+    // Apply D5 rule: phasegate:status never returns exitCode 1
     const exitDecision = this.decideExitCodeUseCase.execute({
       status: result.response.status,
-      commandName: 'harness:status',
+      commandName: 'phasegate:status',
     });
 
     const json = HarnessApiJsonFormatter.format(result.response, options);

package/scripts/harness/harness-error/infrastructure/adapters/legacy-error-reporter-adapter.ts

@@ -2,7 +2,13 @@
  * @layer infrastructure
  * @unit harness-error
  */
-import type { HarnessError } from '../../../core/error-reporter.js';
+interface HarnessError {
+  code: string;
+  severity: string;
+  message: { short: string; detailed: string; agentInstruction: string };
+  resolution: { fixSuggestion: string; docLinks: string[]; relatedFiles: string[] };
+  metadata: { timestamp: string; validator: string; layer: string };
+}
 import type { ValidatorIssueDraft } from '../../application/dto/validator-issue-draft.js';
 
 function compressSuggestion(error: HarnessError): string {

package/scripts/harness/integrations/pre-commit.ts

@@ -1,3 +1,4 @@
+// @layer infrastructure
 /**
  * Harness Engineering - Pre-commit Integration
  *

package/scripts/harness/main.ts

@@ -8,10 +8,18 @@
  */
 
 import { dirname, join, resolve } from 'node:path';
+import { readFile as fsReadFile } from 'node:fs/promises';
 import { createConfigFoundationModule } from './config-foundation/composition-root.js';
+import { toPhaseConfigSection } from './config-foundation/application/mappers/phase-config-section-mapper.js';
 import { createHarnessErrorModule } from './harness-error/composition-root.js';
 import { createTraceabilityModelModule } from './traceability-model/composition-root.js';
 import { createPhaseDependencyModelModule } from './phase-dependency-model/composition-root.js';
+import { HarnessConfigPhaseConfigProvider, type PhaseConfigSection as PhaseDepConfigSection } from './phase-dependency-model/infrastructure/config/harness-config-phase-config-provider.js';
+import { StoryReflectionChecker } from './phase-dependency-model/domain/services/story-reflection-checker.js';
+import { CheckStoryReflectionUseCase } from './phase-dependency-model/application/usecases/check-story-reflection-usecase.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 { StoryReflectionResult } from './phase-dependency-model/domain/values/story-reflection-result.js';
 import { createAdrFoundationModule } from './adr-foundation/composition-root.js';
 import { createBiomeAstEngineModule } from './biome-ast-engine/composition-root.js';
 import { createValidatorSystemModule } from './validator-system/composition-root.js';
@@ -21,8 +29,10 @@ import { buildCiGovernance } from './ci-governance/composition-root.js';
 import { createSkillQualityHandlers } from './skill-quality/composition-root.js';
 import { buildRegressionSuite } from './regression-suite/composition-root.js';
 import { buildPhase2Extensions } from './phase2-extensions/composition-root.js';
-import { deploySkills, deployHookScripts, getDeployedVersion, getHarnessVersion, initHarnessConfig } from './setup/skill-deployer.js';
+import { deploySkills, deployHookScripts, getDeployedVersion, getHarnessVersion, initHarnessConfig, SKILL_CATEGORIES, getCategoryForSkill } from './setup/skill-deployer.js';
+import type { SkillSet } from './setup/skill-deployer.js';
 import type { HarnessConfigV2 } from './config-foundation/domain/harness-config.js';
+import { ConfigValidationError } from './config-foundation/domain/errors/config-validation-error.js';
 
 /**
  * main.ts (scripts/harness/main.ts) から2階層上がパッケージルート。
@@ -38,11 +48,11 @@ function getProjectRoot(): string {
 
 function printUsage(): void {
   const usage = `
-Usage: harness <command> [options]
+Usage: phasegate <command> [options]
 
 Setup:
   init                         Initialize project: deploy skills + create phasegate.config.json
-                               (--name <project-name>)
+                               (--name <project-name>, --preset <full|standard|minimal|custom>)
   update-skills                Re-deploy skills from current harness version
 
 Commands:
@@ -65,14 +75,14 @@ Commands:
   validate                     Run validators (--layer L0|L2|L3|L4|all, --unit, --format human|agent|ci)
   ci-check                     CI check (--quick for quick mode, --fail-on-reject, --dry-run, --files)
 
-  harness:check-ready          Check ready status (--json)
-  harness:check-phase          Check phase gate (--unit <unitId>, --json)
-  harness:ci-check             Full CI check (--json)
-  harness:detect-drift         Detect design/code drift (--json)
-  harness:status               Harness overall status (--json)
-  harness:lint                 Lint via harness-api (--target <path>, --json)
-  harness:complete-check       Complete L2-L4 check (--json)
-  harness:impact-analysis      Impact analysis for story (<storyId>, --json)
+  phasegate:check-ready         Check ready status (--json)
+  phasegate:check-phase         Check phase gate (--unit <unitId>, --json)
+  phasegate:ci-check            Full CI check (--json)
+  phasegate:detect-drift         Detect design/code drift (--json)
+  phasegate:status              Phasegate overall status (--json)
+  phasegate:lint                Lint via harness-api (--target <path>, --json)
+  phasegate:complete-check       Complete L2-L4 check (--json)
+  phasegate:impact-analysis      Impact analysis for story (<storyId>, --json)
 
   ci:generate-template         Generate CI template (--preset <id>, --type <type>, --render, --json)
   ci:migrate-agents-md         Migrate AGENTS.md (--dry-run, --validate-only, --json)
@@ -199,11 +209,14 @@ function parseCoverageThreshold(raw: string | undefined): number {
   return n;
 }
 
-type PhasePreset = 'default' | 'custom';
+type InitPhasePreset = 'full' | 'standard' | 'minimal' | 'custom';
 
-function toPhasePreset(value: string): PhasePreset {
-  if (value === 'default' || value === 'custom') return value;
-  return 'default';
+function parseInitPhasePreset(value: string | undefined): InitPhasePreset | undefined {
+  if (value === undefined) return undefined;
+  if (value === 'full' || value === 'standard' || value === 'minimal' || value === 'custom') {
+    return value;
+  }
+  return undefined;
 }
 
 type RuleSeverity = 'error' | 'warning' | 'off';
@@ -224,32 +237,82 @@ function toRuleSeverityMap(
 }
 
 /**
- * HarnessConfigV2 (resolved) から phase-dependency-model が期待する PhaseConfigSection を抽出する。
+ * HarnessConfigV2 (resolved) から biome-ast-engine が期待する L1 Config を抽出する。
  */
-function toPhaseConfigSection(resolvedConfig: HarnessConfigV2) {
+function toL1Config(resolvedConfig: HarnessConfigV2) {
   return {
-    planningMode: resolvedConfig.planningMode,
-    customization: {
-      preset: toPhasePreset(resolvedConfig.phaseDependencies.preset),
-      overrideEnabled: resolvedConfig.phaseDependencies.override,
-      rules: resolvedConfig.phaseDependencies.customRules.map((r) => ({
-        targetPhase: r.phase,
-        condition: 'requires',
-        action: r.requires,
-      })),
-    },
-    reportingOutputDir: resolvedConfig.reporting.outputDir,
+    enabled: resolvedConfig.layers.L1.enabled,
+    rules: toRuleSeverityMap(resolvedConfig.layers.L1.rules),
   };
 }
 
 /**
- * HarnessConfigV2 (resolved) から biome-ast-engine が期待する L1 Config を抽出する。
+ * phasegate.config.json を直接読み、storyReflection 設定解決用の provider を返す。
+ * config-foundation の HarnessConfigV2 は storyReflection 未サポートのため raw JSON 経由。
  */
-function toL1Config(resolvedConfig: HarnessConfigV2) {
-  return {
-    enabled: resolvedConfig.layers.L1.enabled,
-    rules: toRuleSeverityMap(resolvedConfig.layers.L1.rules),
+async function loadStoryReflectionProvider(
+  rootDir: string,
+): Promise<HarnessConfigPhaseConfigProvider | null> {
+  const configPath = join(rootDir, 'phasegate.config.json');
+  let raw: {
+    phaseDependencies?: {
+      preset?: 'default' | 'full' | 'standard' | 'minimal' | 'custom';
+      override?: boolean;
+      storyReflection?: {
+        enabled?: boolean;
+        mappings?: ReadonlyArray<{ inception: string; product: string; required: boolean }>;
+      };
+    };
+    reporting?: { outputDir?: string };
+  };
+  try {
+    const content = await fsReadFile(configPath, 'utf8');
+    raw = JSON.parse(content);
+  } catch {
+    return null;
+  }
+  const section: PhaseDepConfigSection = {
+    customization: {
+      preset: raw.phaseDependencies?.preset,
+      overrideEnabled: raw.phaseDependencies?.override ?? false,
+    },
+    storyReflection: raw.phaseDependencies?.storyReflection,
+    reportingOutputDir: raw.reporting?.outputDir,
   };
+  return new HarnessConfigPhaseConfigProvider({
+    config: section,
+    defaultOutputDir: raw.reporting?.outputDir ?? '.harness/reports',
+  });
+}
+
+async function printStoryReflectionValidationSummary(
+  rootDir: string,
+  unit: string | undefined,
+): Promise<void> {
+  const provider = await loadStoryReflectionProvider(rootDir);
+  if (provider === null) return;
+  const config = await provider.getStoryReflectionConfig();
+  const policy = await provider.getCustomizationPolicy();
+  const presenter = new StoryReflectionStatusPresenter();
+  let result = StoryReflectionResult.pass();
+  if (config.enabled && unit) {
+    const fsAdapter = new FileSystemStoryReflectionAdapter({ rootDir });
+    const checker = new StoryReflectionChecker(fsAdapter);
+    const useCase = new CheckStoryReflectionUseCase({ checker });
+    result = await useCase.execute({ unitId: unit, config });
+  }
+  console.log(
+    presenter.formatValidationSummary({ config, preset: policy.preset, result }),
+  );
+}
+
+async function printStoryReflectionStatusLine(rootDir: string): Promise<void> {
+  const provider = await loadStoryReflectionProvider(rootDir);
+  if (provider === null) return;
+  const config = await provider.getStoryReflectionConfig();
+  const policy = await provider.getCustomizationPolicy();
+  const presenter = new StoryReflectionStatusPresenter();
+  console.log(presenter.formatStatusLine({ config, preset: policy.preset }));
 }
 
 async function loadResolvedConfig(): Promise<HarnessConfigV2 | undefined> {
@@ -257,7 +320,12 @@ async function loadResolvedConfig(): Promise<HarnessConfigV2 | undefined> {
     const configModule = createConfigFoundationModule();
     const result = await configModule.usecases.loadResolvedConfigUseCase.execute();
     return result.config;
-  } catch {
+  } catch (error) {
+    if (error instanceof ConfigValidationError) {
+      process.stderr.write(`Invalid phasegate.config.json: ${error.message}\n`);
+      process.exit(2);
+    }
+
     return undefined;
   }
 }
@@ -290,10 +358,28 @@ async function main(): Promise<void> {
       // ── harness setup ──
       case 'init': {
         const projectName = parseFlag(args, '--name') ?? 'my-project';
-        const result = await deploySkills(harnessRoot, rootDir);
-        const configResult = await initHarnessConfig(rootDir, projectName);
+        const rawPhasePreset = parseFlag(args, '--preset');
+        if (
+          rawPhasePreset !== undefined
+          && rawPhasePreset !== 'full'
+          && rawPhasePreset !== 'standard'
+          && rawPhasePreset !== 'minimal'
+          && rawPhasePreset !== 'custom'
+        ) {
+          console.error(`Invalid --preset value: "${rawPhasePreset}". Use "full", "standard", "minimal", or "custom".`);
+          process.exit(2);
+        }
+        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".`);
+          process.exit(2);
+        }
+        const skillSet: SkillSet = skillSetRaw;
+        const result = await deploySkills(harnessRoot, rootDir, skillSet);
+        const configResult = await initHarnessConfig(rootDir, projectName, phasePreset);
         const hooksResult = await deployHookScripts(harnessRoot, rootDir);
-        console.log(`✓ Skills deployed to ${result.targetDir} (${result.deployedSkills.length} skills)`);
+        console.log(`✓ Skills deployed to ${result.targetDir} (${result.deployedSkills.length} skills, set: ${skillSet})`);
         if (configResult.created) {
           console.log(`✓ phasegate.config.json created`);
         } else {
@@ -310,7 +396,11 @@ async function main(): Promise<void> {
         console.log(`✓ Harness v${result.version} initialized`);
         console.log('');
         console.log('Next steps:');
-        console.log('  1. Run the product-architect skill to start AIDLC');
+        if (skillSet === 'core') {
+          console.log('  1. Core skills only — quality defense tools are ready');
+        } else {
+          console.log('  1. Run the product-architect skill to start AIDLC');
+        }
         console.log('  2. Customize phasegate.config.json if needed');
         console.log('  3. Edit .claude/scripts/hook-config.json to set target directories');
         process.exit(0);
@@ -320,14 +410,19 @@ async function main(): Promise<void> {
       case 'update-skills': {
         const deployed = await getDeployedVersion(rootDir);
         const current = await getHarnessVersion(harnessRoot);
+        const previousSkillSet: SkillSet = deployed?.skillSet ?? 'all';
+        const overrideSkillSet = parseFlag(args, '--skills');
+        const updateSkillSet: SkillSet = overrideSkillSet === 'core' || overrideSkillSet === 'all'
+          ? overrideSkillSet
+          : previousSkillSet;
         if (deployed) {
-          console.log(`Previously deployed: v${deployed.version} (${deployed.deployedAt})`);
+          console.log(`Previously deployed: v${deployed.version} (${deployed.deployedAt}, set: ${previousSkillSet})`);
         } else {
           console.log('No previously deployed skills found');
         }
         console.log(`Current harness version: v${current}`);
-        const result = await deploySkills(harnessRoot, rootDir);
-        console.log(`✓ Skills updated (${result.deployedSkills.length} skills redeployed)`);
+        const result = await deploySkills(harnessRoot, rootDir, updateSkillSet);
+        console.log(`✓ Skills updated (${result.deployedSkills.length} skills redeployed, set: ${updateSkillSet})`);
         process.exit(0);
         break;
       }
@@ -443,11 +538,13 @@ async function main(): Promise<void> {
         const level = Number(parseFlag(args, '--level') ?? '1');
         const unitId = parseFlag(args, '--unit');
         const storyId = parseFlag(args, '--story');
+        const targetFilePath = parseFlag(args, '--target-file');
         const result =
           await mod.checkPhaseGateCommandHandler.execute({
             targetLevel: level,
             unitId,
             storyId,
+            targetFilePath,
             json,
           });
         console.log(result.text);
@@ -523,6 +620,9 @@ async function main(): Promise<void> {
           targetPaths,
         });
         console.log(result.output);
+        if (layer === 'L2' || layer === 'all') {
+          await printStoryReflectionValidationSummary(rootDir, unit);
+        }
         process.exit(result.exitCode);
         break;
       }
@@ -547,7 +647,7 @@ async function main(): Promise<void> {
       }
 
       // ── harness-api ──
-      case 'harness:check-ready': {
+      case 'phasegate:check-ready': {
         const mod = createHarnessApiModule();
         const flags: Record<string, boolean | string> = {};
         if (json) flags.json = true;
@@ -555,7 +655,7 @@ async function main(): Promise<void> {
         break;
       }
 
-      case 'harness:check-phase': {
+      case 'phasegate:check-phase': {
         const mod = createHarnessApiModule();
         const unit = parseFlag(args, '--unit') ?? args[1] ?? '';
         const flags: Record<string, boolean | string> = {};
@@ -564,7 +664,7 @@ async function main(): Promise<void> {
         break;
       }
 
-      case 'harness:ci-check': {
+      case 'phasegate:ci-check': {
         const mod = createHarnessApiModule();
         const flags: Record<string, boolean | string> = {};
         if (json) flags.json = true;
@@ -572,7 +672,7 @@ async function main(): Promise<void> {
         break;
       }
 
-      case 'harness:detect-drift': {
+      case 'phasegate:detect-drift': {
         const mod = createHarnessApiModule();
         const flags: Record<string, boolean | string> = {};
         if (json) flags.json = true;
@@ -580,15 +680,16 @@ async function main(): Promise<void> {
         break;
       }
 
-      case 'harness:status': {
+      case 'phasegate:status': {
         const mod = createHarnessApiModule();
         const flags: Record<string, boolean | string> = {};
         if (json) flags.json = true;
         await mod.handlers.status.handle({}, flags);
+        await printStoryReflectionStatusLine(rootDir);
         break;
       }
 
-      case 'harness:lint': {
+      case 'phasegate:lint': {
         const mod = createHarnessApiModule();
         const flags: Record<string, boolean | string> = {};
         if (json) flags.json = true;
@@ -598,7 +699,7 @@ async function main(): Promise<void> {
         break;
       }
 
-      case 'harness:complete-check': {
+      case 'phasegate:complete-check': {
         const mod = createHarnessApiModule();
         const flags: Record<string, boolean | string> = {};
         if (json) flags.json = true;
@@ -606,7 +707,7 @@ async function main(): Promise<void> {
         break;
       }
 
-      case 'harness:impact-analysis': {
+      case 'phasegate:impact-analysis': {
         const mod = createHarnessApiModule();
         const storyId = args[1] && !args[1].startsWith('--') ? args[1] : (parseFlag(args, '--story-id') ?? '');
         const flags: Record<string, boolean | string> = {};
@@ -833,9 +934,28 @@ async function main(): Promise<void> {
             }
           }
           skills.sort();
-          console.log(`Available skills (${skills.length}):\n`);
+
+          const grouped: Record<string, string[]> = { core: [], aidlc: [], utility: [], unknown: [] };
           for (const name of skills) {
-            console.log(`  /${name}`);
+            const cat = getCategoryForSkill(name) ?? 'unknown';
+            grouped[cat].push(name);
+          }
+
+          console.log(`Available skills (${skills.length}):\n`);
+
+          const labels: Record<string, string> = {
+            core: 'Core — Quality Defense',
+            aidlc: 'AIDLC — Development Workflow',
+            utility: 'Utility',
+          };
+          for (const cat of ['core', 'aidlc', 'utility', 'unknown'] as const) {
+            if (grouped[cat].length === 0) continue;
+            const label = labels[cat] ?? 'Other';
+            console.log(`  [${label}] (${grouped[cat].length})`);
+            for (const name of grouped[cat]) {
+              console.log(`    /${name}`);
+            }
+            console.log('');
           }
           process.exit(0);
         }
@@ -843,7 +963,7 @@ async function main(): Promise<void> {
         if (subCommand === 'info') {
           const skillName = args[2];
           if (!skillName) {
-            console.error('Usage: harness skills info <skill-name>');
+            console.error('Usage: phasegate skills info <skill-name>');
             process.exit(2);
           }
           const { promises: fs } = await import('node:fs');
@@ -859,7 +979,7 @@ async function main(): Promise<void> {
           }
         }
 
-        console.error('Usage: harness skills <list|info <name>>');
+        console.error('Usage: phasegate skills <list|info <name>>');
         process.exit(2);
         break;
       }

package/scripts/harness/phase-dependency-model/application/dto/resolve-gate-result-dto.ts

@@ -0,0 +1,14 @@
+// @unit phase-dependency-model
+// @layer application
+
+export interface ResolveGateFindingDto {
+  readonly gateName: string;
+  readonly path: string;
+  readonly reason: string;
+}
+
+export interface ResolveGateResultDto {
+  readonly matchedGates: readonly string[];
+  readonly blockers: readonly ResolveGateFindingDto[];
+  readonly warnings: readonly ResolveGateFindingDto[];
+}

package/scripts/harness/phase-dependency-model/application/services/phase-gate-result-mapper.ts

@@ -4,6 +4,7 @@
  */
 
 import type { PhaseGateResultDto } from '../dto/phase-gate-result-dto.js';
+import type { ResolveGateResultDto } from '../dto/resolve-gate-result-dto.js';
 import type { PhaseGateResult } from '../../domain/values/phase-gate-result.js';
 
 export class PhaseGateResultMapper {
@@ -22,4 +23,23 @@ export class PhaseGateResultMapper {
       auditRecorded: context.auditRecorded,
     });
   }
+
+  mapFromResolve(
+    result: ResolveGateResultDto,
+    context: {
+      readonly targetLevel: 1 | 2 | 3;
+    },
+  ): PhaseGateResultDto {
+    return Object.freeze({
+      passed: result.blockers.length === 0,
+      targetLevel: context.targetLevel,
+      blockers: Object.freeze(
+        result.blockers.map((blocker) => `${blocker.gateName}: ${blocker.reason} (${blocker.path})`),
+      ),
+      warnings: Object.freeze(
+        result.warnings.map((warning) => `${warning.gateName}: ${warning.reason} (${warning.path})`),
+      ),
+      auditRecorded: false,
+    });
+  }
 }