phasegate 0.160.21 → 0.162.0

package/scripts/harness/nyquist-validation/domain/services/matrix-validation-service.ts

@@ -23,11 +23,25 @@ interface RawStoryMappingEntry {
   storyId: string;
 }
 
+/**
+ * requirement-test-matrix.json から storyId を持つエントリを抽出する。
+ *
+ * スキーマ準拠の実データはトップレベルキー `stories`（各要素が `{ storyId, storyMappings }`）
+ * を用いる。旧来のテスト・入力ではトップレベル `storyMappings` を用いる場合があるため
+ * 両形式に対応する。以前は `storyMappings` のみを参照していたため、スキーマ準拠の実データ
+ * （`stories` 形式）に対しては常に空配列を返し、storyId 整合性検査が事実上 no-op だった。
+ */
 function extractStoryMappings(rawData: unknown): RawStoryMappingEntry[] {
   if (rawData === null || typeof rawData !== 'object') return [];
   const obj = rawData as Record<string, unknown>;
-  if (!Array.isArray(obj['storyMappings'])) return [];
-  return (obj['storyMappings'] as unknown[]).map((item) => {
+
+  const source = Array.isArray(obj['stories'])
+    ? (obj['stories'] as unknown[])
+    : Array.isArray(obj['storyMappings'])
+      ? (obj['storyMappings'] as unknown[])
+      : [];
+
+  return source.map((item) => {
     const entry = item as Record<string, unknown>;
     return { storyId: String(entry['storyId'] ?? '') };
   });
@@ -53,7 +67,9 @@ export class MatrixValidationService {
     const storyMappings = extractStoryMappings(rawData);
 
     const errors: NyquistHarnessError[] = [];
+    const seenStoryIds = new Set<string>();
     for (const sm of storyMappings) {
+      // storyId 整合性: 有効 storyId 一覧に含まれるか照合する
       if (!validStoryIds.includes(sm.storyId)) {
         errors.push({
           code: 'L3-004',
@@ -61,6 +77,15 @@ export class MatrixValidationService {
           message: `未登録のstoryIdです: ${sm.storyId}`,
         });
       }
+      // INV-1: 同一 storyId の StoryMapping は1つのみ存在する（重複を検出）
+      if (seenStoryIds.has(sm.storyId)) {
+        errors.push({
+          code: 'L3-004',
+          severity: 'error',
+          message: `storyIdが重複しています: ${sm.storyId}`,
+        });
+      }
+      seenStoryIds.add(sm.storyId);
     }
 
     if (errors.length === 0) {

package/scripts/harness/nyquist-validation/domain/services/requirement-intent-coverage-service.ts

@@ -3,12 +3,12 @@
 // @work-item-id WI-131
 
 import type {
-  IntentCoverageItemDto,
-  MatrixStoryDto,
-} from '../../application/dto/generate-matrix-output.js';
+  IntentCoverageItem,
+  IntentCoverageStory,
+} from '../value-objects/intent-coverage.js';
 
 export class RequirementIntentCoverageService {
-  evaluate(stories: readonly MatrixStoryDto[]): readonly IntentCoverageItemDto[] {
+  evaluate(stories: readonly IntentCoverageStory[]): readonly IntentCoverageItem[] {
     return stories.flatMap((story) => story.storyMappings.map((mapping) => {
       if (mapping.testReferences.length === 0) {
         return {

package/scripts/harness/nyquist-validation/domain/value-objects/intent-coverage.ts

@@ -0,0 +1,33 @@
+// @layer domain
+// @unit nyquist-validation
+// @work-item-id WI-131
+//
+// RequirementIntentCoverageService が入出力に用いるドメイン層の型定義。
+// 依存方向是正: これまで domain 層のサービスが application/dto から型を import しており
+// domain → application の逆流（レイヤー依存違反）が発生していた。型の正準を domain 層へ
+// 移し、application 層の DTO はここを参照する（domain ← application の正しい向き）。
+
+export interface IntentCoverageTestReference {
+  readonly filePath: string;
+  readonly testType: 'unit' | 'it' | 'scenario';
+  readonly testName?: string;
+}
+
+export interface IntentCoverageAcMapping {
+  readonly acId: string;
+  readonly testReferences: readonly IntentCoverageTestReference[];
+}
+
+export interface IntentCoverageStory {
+  readonly storyId: string;
+  readonly storyMappings: readonly IntentCoverageAcMapping[];
+}
+
+export type IntentCoverageStatus = 'observed' | 'weakly-observed' | 'unobserved';
+
+export interface IntentCoverageItem {
+  readonly storyId: string;
+  readonly acId: string;
+  readonly status: IntentCoverageStatus;
+  readonly warnings: readonly string[];
+}

package/scripts/harness/nyquist-validation/infrastructure/adapters/markdown-requirement-source-adapter.ts

@@ -6,7 +6,9 @@ import { readFile } from 'node:fs/promises';
 import type { RequirementSourcePort } from '../../application/usecases/generate-requirement-test-matrix-usecase.js';
 import type { RequirementSourceDto } from '../../application/dto/generate-matrix-output.js';
 
-const STORY_HEADING = /^###\s+(H\d{2}-\d{2}):/;
+// StoryId は HXX-XX 形式に加え Phase 2 拡張 Epic の HF\d+-XX 形式も許容する
+// （traceability-model の StoryId 正規表現と整合）。旧 /H\d{2}-\d{2}/ は HF2-01 を取りこぼしていた。
+const STORY_HEADING = /^###\s+(H(?:F\d+|\d{2})-\d{2}):/;
 const AC_ITEM = /^\s*-\s+\[[ xX]\]\s+(AC-[1-9][0-9]*):/;
 
 export class MarkdownRequirementSourceAdapter implements RequirementSourcePort {

package/scripts/harness/quick-mode/application/usecases/classify-change-category-usecase.ts

@@ -50,11 +50,16 @@ export class ClassifyChangeCategoryUseCase {
     const targetChanges = new Map((input.targetChanges ?? []).map((change) => [change.filePath, change]));
     const changedFiles = input.paths.map((p) => {
       const targetChange = targetChanges.get(p);
+      const beforeContent = targetChange?.beforeContent ?? null;
+      const afterContent = targetChange?.afterContent ?? null;
       return ChangedFile.create({
         filePath: p,
-        changeKind: 'MODIFY',
-        beforeContent: targetChange?.beforeContent ?? null,
-        afterContent: targetChange?.afterContent ?? null,
+        // 変更前の内容が無く変更後の内容がある場合は新規作成 (CREATE) とみなす。
+        // 以前は無条件で MODIFY 固定だったため、新規 domain/ ファイルが
+        // NEW_DOMAIN 判定を回避して quick mode をすり抜けていた。
+        changeKind: beforeContent === null && afterContent !== null ? 'CREATE' : 'MODIFY',
+        beforeContent,
+        afterContent,
       });
     });
 

package/scripts/harness/quick-mode/composition-root.ts

@@ -8,6 +8,7 @@
 import { GitDiffChangedFilesAdapter } from './infrastructure/adapters/git-diff-changed-files-adapter.js';
 import { HarnessConfigQuickModeConfigAdapter } from './infrastructure/adapters/harness-config-quick-mode-config-adapter.js';
 import { ValidatorSystemValidatorIdRegistryAdapter } from './infrastructure/adapters/validator-system-validator-id-registry-adapter.js';
+import { ValidatorSystemQuickModeExecutionAdapter } from './infrastructure/adapters/validator-system-quick-mode-execution-adapter.js';
 import { QuickModeJudgmentEngine } from './domain/services/quick-mode-judgment-engine.js';
 import { ValidatorRelaxationService } from './domain/services/validator-relaxation-service.js';
 import { QuickModeDecisionContractMapper } from './application/mappers/quick-mode-decision-contract-mapper.js';
@@ -32,6 +33,7 @@ export function createQuickModeCompositionRoot(): QuickModeCompositionRoot {
   const gitDiffAdapter = new GitDiffChangedFilesAdapter();
   const harnessConfigAdapter = new HarnessConfigQuickModeConfigAdapter();
   const validatorIdRegistryAdapter = new ValidatorSystemValidatorIdRegistryAdapter();
+  const validatorExecutionPort = new ValidatorSystemQuickModeExecutionAdapter();
 
   // Domain Services
   const judgmentEngine = new QuickModeJudgmentEngine();
@@ -64,6 +66,7 @@ export function createQuickModeCompositionRoot(): QuickModeCompositionRoot {
   const executeUseCase = new ExecuteQuickCiCheckUseCase({
     judgeUseCase,
     buildUseCase,
+    validatorExecutionPort,
   });
 
   const classifyUseCase = new ClassifyChangeCategoryUseCase({

package/scripts/harness/quick-mode/domain/value-objects/quick-mode-config.ts

@@ -77,7 +77,12 @@ export class QuickModeConfig {
   }
 
   isMaintained(validatorId: string): boolean {
-    return this.maintainedLayers.includes(validatorId);
+    // maintainedLayers の各エントリ P について、レイヤー名エントリ（例 "L2"）は
+    // そのレイヤーの全 ID（例 "L2-002"）にマッチし、ID 完全一致（例 "L2-002"）も
+    // 引き続きサポートする。
+    return this.maintainedLayers.some(
+      (entry) => validatorId === entry || validatorId.startsWith(`${entry}-`)
+    );
   }
 
   isRelaxed(validatorId: string): boolean {

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

@@ -0,0 +1,18 @@
+// @layer infrastructure
+// @unit quick-mode
+
+import type { ValidatorExecutionPort } from '../../application/ports/validator-execution-port.js';
+import type { ValidatorRelaxationProfileContract } from '../../application/dto/validator-relaxation-profile-contract.js';
+
+export class ValidatorSystemQuickModeExecutionAdapter implements ValidatorExecutionPort {
+  async executeWithProfile(profile: ValidatorRelaxationProfileContract): Promise<void> {
+    const { createValidatorSystemModule } = await import('../../../validator-system/composition-root.js');
+    const module = createValidatorSystemModule();
+    await module.runQuickModeUseCase.execute({
+      relaxationProfile: profile,
+      targetPaths: [],
+      unitName: '',
+      currentPhase: '',
+    });
+  }
+}

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

@@ -5,12 +5,56 @@
  * phasegate:ci-check --quick フラグを受け取り、ExecuteQuickCiCheckUseCase を呼ぶハンドラー
  */
 
+import * as childProcess from 'node:child_process';
+import { existsSync } from 'node:fs';
 import { HumanQuickModeFormatter } from '../formatters/human-quick-mode-formatter.js';
 import { AgentQuickModeFormatter } from '../formatters/agent-quick-mode-formatter.js';
 import { JsonQuickModeFormatter } from '../formatters/json-quick-mode-formatter.js';
 import type { ExecuteQuickCiCheckUseCase } from '../../application/usecases/execute-quick-ci-check-usecase.js';
 import type { QuickModeRenderOptions } from '../dto/quick-mode-render-options.js';
 
+/**
+ * `--files` で列挙されたパスの変更種別 (CREATE/MODIFY) を推定する。
+ *
+ * WI: 以前は無条件で MODIFY 固定だったため、新規 domain/ ファイルが
+ * NEW_DOMAIN 判定を回避して quick mode をすり抜けていた。git のステージ状態を
+ * 参照し、追加 (A) なら CREATE、それ以外は MODIFY とする。git 情報が取れない
+ * 場合は「ファイルが未追跡（作業ツリーにのみ存在しコミット履歴に無い）」を
+ * CREATE のヒューリスティックとして用いる。
+ */
+function resolveChangeKind(filePath: string): 'CREATE' | 'MODIFY' {
+  const gitStatus = readGitStatus(filePath);
+  if (gitStatus === 'A') return 'CREATE';
+  if (gitStatus !== null) return 'MODIFY';
+  return isUntrackedNewFile(filePath) ? 'CREATE' : 'MODIFY';
+}
+
+function readGitStatus(filePath: string): string | null {
+  try {
+    const output = childProcess.execSync(
+      `git diff --name-status --cached -- ${JSON.stringify(filePath)}`,
+      { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] },
+    ) as string;
+    const line = output.trim().split('\n').find((l) => l.trim().length > 0);
+    return line ? (line.split('\t')[0]?.trim() ?? null) : null;
+  } catch {
+    return null;
+  }
+}
+
+function isUntrackedNewFile(filePath: string): boolean {
+  if (!existsSync(filePath)) return false;
+  try {
+    childProcess.execSync(
+      `git ls-files --error-unmatch -- ${JSON.stringify(filePath)}`,
+      { stdio: ['pipe', 'pipe', 'pipe'] },
+    );
+    return false; // tracked → 既存ファイル
+  } catch {
+    return true; // 未追跡 → 新規ファイル
+  }
+}
+
 export interface CiCheckQuickModeHandlerDeps {
   useCase: Pick<ExecuteQuickCiCheckUseCase, 'execute'>;
 }
@@ -25,13 +69,15 @@ export class CiCheckQuickModeHandler {
   async handle(options: QuickModeRenderOptions): Promise<void> {
     const { files, dryRun = false, format = 'human', failOnReject = false } = options;
 
-    // --files 解析: カンマ区切りのファイルパスを MODIFY として扱う
+    // --files 解析: カンマ区切りのファイルパスを git ステージ状態から
+    // CREATE/MODIFY へ分類する（新規 domain/ ファイルの NEW_DOMAIN 判定のため）
     let changedFiles: { filePath: string; changeKind: string }[] | undefined;
     if (files) {
-      changedFiles = files.split(',').map((p) => ({
-        filePath: p.trim(),
-        changeKind: 'MODIFY',
-      }));
+      changedFiles = files
+        .split(',')
+        .map((p) => p.trim())
+        .filter((p) => p.length > 0)
+        .map((filePath) => ({ filePath, changeKind: resolveChangeKind(filePath) }));
     }
 
     let decision: Awaited<ReturnType<typeof this.useCase.execute>>;

package/scripts/harness/setup/skill-deployer.ts

@@ -4,6 +4,8 @@
 // @work-item-id WI-127
 // @work-item-id WI-184
 // @work-item-id WI-202
+// @work-item-id WI-212
+// @work-item-id WI-219
 // Note: import.meta.url を使わず、呼び出し元 (main.ts) がパスを解決して渡す設計。
 
 import { promises as fs } from "node:fs";
@@ -151,6 +153,44 @@ async function copyDirectory(src: string, dest: string): Promise<number> {
   return count;
 }
 
+type ModelDelegationPolicy = "delegate-sonnet" | "none";
+
+export async function readModelDelegationPolicy(projectRoot: string): Promise<ModelDelegationPolicy> {
+  try {
+    const raw = await fs.readFile(join(projectRoot, HARNESS_CONFIG_FILE), "utf-8");
+    const config = JSON.parse(raw) as { modelRouting?: { delegation?: unknown } };
+    return config.modelRouting?.delegation === "none" ? "none" : "delegate-sonnet";
+  } catch {
+    return "delegate-sonnet";
+  }
+}
+
+export function renderSkillForModelDelegation(content: string, policy: ModelDelegationPolicy): string {
+  if (policy !== "none") {
+    return content;
+  }
+
+  return content
+    .replace(/^model:\s+\S+\n/gm, "")
+    .replace(/^review:\s+\S+\n/gm, "")
+    .replaceAll("Sonnet 4.6 に委任して成果物を生成する（`npx phasegate delegate-sonnet` 経由）", "メインセッションが成果物を生成する")
+    .replaceAll("Opus が", "メインセッションが")
+    .replaceAll("Sonnet 4.6", "メインセッション")
+    .replaceAll("`npx phasegate delegate-sonnet`", "メインセッション");
+}
+
+async function applyModelDelegationPolicyToSkill(skillDir: string, policy: ModelDelegationPolicy): Promise<void> {
+  if (policy !== "none") {
+    return;
+  }
+
+  const skillPath = join(skillDir, "SKILL.md");
+  try {
+    const content = await fs.readFile(skillPath, "utf-8");
+    await fs.writeFile(skillPath, renderSkillForModelDelegation(content, policy), "utf-8");
+  } catch {}
+}
+
 export async function deploySkills(
   harnessRoot: string,
   projectRoot: string,
@@ -160,6 +200,7 @@ export async function deploySkills(
   const skillsTarget = join(projectRoot, SKILLS_TARGET_DIR);
   const version = await getHarnessVersion(harnessRoot);
   const deployedAt = new Date().toISOString();
+  const modelDelegationPolicy = await readModelDelegationPolicy(projectRoot);
 
   const skillDirs = await fs.readdir(skillsSource, { withFileTypes: true });
   const allSkills = skillDirs.filter((d) => d.isDirectory()).map((d) => d.name);
@@ -172,6 +213,7 @@ export async function deploySkills(
     const srcSkillDir = join(skillsSource, skill);
     const destSkillDir = join(skillsTarget, skill);
     await copyDirectory(srcSkillDir, destSkillDir);
+    await applyModelDelegationPolicyToSkill(destSkillDir, modelDelegationPolicy);
   }
 
   const versionInfo: VersionInfo = { version, deployedAt, skillSet };
@@ -456,6 +498,7 @@ export async function deployHookScripts(harnessRoot: string, projectRoot: string
 export interface InitHarnessConfigOptions {
   ciEnabled?: boolean;
   workflow?: "standard" | "strict";
+  language?: string;
 }
 
 export async function initHarnessConfig(
@@ -477,6 +520,7 @@ export async function initHarnessConfig(
     project: {
       name: projectName,
       preset: "standard",
+      languages: [options.language ?? "typescript"],
     },
     architecture: {
       preset: "clean",
@@ -497,6 +541,9 @@ export async function initHarnessConfig(
       default: "interactive",
       perPhase: {},
     },
+    modelRouting: {
+      delegation: "delegate-sonnet",
+    },
     harnesses: {},
     paths: {
       designDocs: "docs/product/construction",

package/scripts/harness/skill-quality/domain/services/skill-structure-validator.ts

@@ -1,6 +1,7 @@
 /**
  * @layer domain
  * @unit skill-quality
+ * @work-item-id WI-212
  */
 import { SkillStructure } from '../value-objects/skill-structure.js';
 import { SkillValidationResult } from '../value-objects/skill-validation-result.js';
@@ -29,6 +30,9 @@ export class SkillStructureValidator {
     // Check for frontmatter (YAML between --- delimiters)
     if (lines[0]?.trim() === '---') {
       sections.push('frontmatter');
+      if (this.hasLanguageMetadata(lines)) {
+        sections.push('languageMetadata');
+      }
     }
 
     // Look for headings that correspond to section names
@@ -69,4 +73,21 @@ export class SkillStructureValidator {
 
     return sections;
   }
+
+  private hasLanguageMetadata(lines: readonly string[]): boolean {
+    const closingDelimiterIndex = lines.findIndex((line, index) => index > 0 && line.trim() === '---');
+    if (closingDelimiterIndex < 0) return false;
+
+    const frontmatterLines = lines.slice(1, closingDelimiterIndex);
+    const languageLineIndex = frontmatterLines.findIndex((line) => /^\s*languages\s*:/.test(line));
+    if (languageLineIndex < 0) return false;
+
+    const languageLine = frontmatterLines[languageLineIndex] ?? '';
+    if (/\[[^\]]*\S[^\]]*\]/.test(languageLine)) return true;
+
+    return frontmatterLines.slice(languageLineIndex + 1).some((line) => {
+      if (/^\S/.test(line)) return false;
+      return /^\s*-\s*\S+/.test(line);
+    });
+  }
 }

package/scripts/harness/skill-quality/domain/value-objects/skill-structure.ts

@@ -1,11 +1,13 @@
 /**
  * @layer domain
  * @unit skill-quality
+ * @work-item-id WI-212
  */
 import type { SectionName } from '../types/section-name.js';
 
 const REQUIRED_SECTIONS: readonly SectionName[] = [
   'frontmatter',
+  'languageMetadata',
   'purpose',
   'inputs',
   'outputs',

package/scripts/harness/skill-quality/infrastructure/adapters/l1-biome-validator-adapter.ts

@@ -18,8 +18,18 @@ export class L1BiomeValidatorAdapter implements L1ValidatorPort {
         message: violation.message,
         location: `${violation.filePath.toString()}:${violation.line}:${violation.column}`,
       }));
-    } catch (_err) {
-      return [];
+    } catch (err) {
+      // Fail-closed: a validator failure must NOT be treated as "合格".
+      // Surface the error as a blocking violation so the commit gate stays closed.
+      const message = err instanceof Error ? err.message : String(err);
+      console.error(`[skill-quality] L1 Biome validator failed: ${message}`);
+      return [
+        {
+          ruleId: 'L1-VALIDATOR-ERROR',
+          message: `L1 Biome validator failed to run; treating as NOT compliant (fail-closed): ${message}`,
+          location: '',
+        },
+      ];
     }
   }
 }

package/scripts/harness/skill-quality/infrastructure/adapters/l2-validator-system-adapter.ts

@@ -23,8 +23,18 @@ export class L2ValidatorSystemAdapter implements L2ValidatorPort {
         message: error.message,
         location: '',
       }));
-    } catch {
-      return [];
+    } catch (err) {
+      // Fail-closed: a validator failure must NOT be treated as "合格".
+      // Surface the error as a blocking violation so the commit gate stays closed.
+      const message = err instanceof Error ? err.message : String(err);
+      console.error(`[skill-quality] L2 validator-system failed: ${message}`);
+      return [
+        {
+          ruleId: 'L2-VALIDATOR-ERROR',
+          message: `L2 validator-system failed to run; treating as NOT compliant (fail-closed): ${message}`,
+          location: '',
+        },
+      ];
     }
   }
 }

package/scripts/harness/traceability-model/application/usecases/apply-work-item-status-usecase.ts

@@ -42,12 +42,17 @@ export class ApplyWorkItemStatusUseCase {
   }
 }
 
+// `completed` is a manually promoted terminal state that the automatic
+// derivation never emits (derivation tops out at `tested`). It must rank
+// strictly above `tested` here so that deriving `tested` for an already
+// `completed` work item is detected as a downgrade and blocked, preventing a
+// `completed` -> `tested` regression on `work-items --apply`.
 const STATUS_ORDER: Record<WorkItemStatus, number> = {
   drafted: 0,
   reflected: 1,
   implemented: 2,
   tested: 3,
-  completed: 3,
+  completed: 4,
 };
 
 function statusOrder(status: WorkItemStatus): number {

package/scripts/harness/traceability-model/infrastructure/parsers/story-catalog-parser.ts

@@ -12,9 +12,10 @@ export interface ParsedStoryCatalog {
 
 const STORY_ID_LINE_PATTERN = /\bH(?:F\d+|[0-9]{2})-[0-9]{2}\b/g;
 const TABLE_ALIAS_PATTERN =
-  /\|\s*(H[0-9]{2}-[0-9]{2})\s*\|.*?\|\s*(US-[0-9]{3})\s*\|/g;
+  /\|\s*(H(?:F\d+|[0-9]{2})-[0-9]{2})\s*\|.*?\|\s*(US-[0-9]{3})\s*\|/g;
+// 旧US ラベルは Markdown 強調（**旧US**:）で囲まれることがあるため `\**` を許容する。
 const INLINE_ALIAS_PATTERN =
-  /(H[0-9]{2}-[0-9]{2}).*?旧US\s*[:：]\s*(US-[0-9]{3})/g;
+  /(H(?:F\d+|[0-9]{2})-[0-9]{2}).*?旧US\**\s*[:：]\s*(US-[0-9]{3})/g;
 
 function execAll(pattern: RegExp, text: string): RegExpExecArray[] {
   const results: RegExpExecArray[] = [];
@@ -56,14 +57,32 @@ export function parseStoryCatalog(content: string): ParsedStoryCatalog {
     aliasMap.set(inlineMatches[i][2], inlineMatches[i][1]);
   }
 
-  // 前後行コンテキスト形式: H03-01 の直後に 旧US: US-001
+  // 見出しスコープ形式:
+  //   ### H01-01: タイトル
+  //
+  //   **旧US**: US-036
+  // のように、`### HXX-XX:` 見出しの後、次の見出しが現れるまでの範囲に `旧US: US-xxx`
+  // が出現するパターンに対応する。旧実装は直後行（lines[i+1]）のみを見ていたため、
+  // 実際の user_stories.md（見出しと旧US行の間に空行や Epic 行が挟まる）では alias が
+  // 一切抽出されず、レガシー StoryId 解決が事実上機能していなかった。
+  const HEADING_STORY_ID = /^#{1,6}\s+(H(?:F\d+|[0-9]{2})-[0-9]{2})\b/;
+  const LEGACY_IN_LINE = /旧US\**\s*[:：]\s*(US-[0-9]{3})/;
+  let currentHeadingStoryId: string | null = null;
   for (let i = 0; i < lines.length; i++) {
-    const storyIdMatch = /\b(H(?:F\d+|[0-9]{2})-[0-9]{2})\b/.exec(lines[i]);
-    if (storyIdMatch) {
-      const nextLine = i + 1 < lines.length ? lines[i + 1] : '';
-      const legacyMatch = /旧US\s*[:：]\s*(US-[0-9]{3})/.exec(nextLine);
-      if (legacyMatch) {
-        aliasMap.set(legacyMatch[1], storyIdMatch[1]);
+    const headingMatch = HEADING_STORY_ID.exec(lines[i]);
+    if (headingMatch) {
+      currentHeadingStoryId = headingMatch[1];
+      continue;
+    }
+    if (/^#{1,6}\s+/.test(lines[i])) {
+      // StoryId を含まない別の見出しに入ったらスコープを閉じる
+      currentHeadingStoryId = null;
+      continue;
+    }
+    if (currentHeadingStoryId) {
+      const legacyMatch = LEGACY_IN_LINE.exec(lines[i]);
+      if (legacyMatch && !aliasMap.has(legacyMatch[1])) {
+        aliasMap.set(legacyMatch[1], currentHeadingStoryId);
       }
     }
   }