phasegate 0.315.0 → 0.340.0

package/docs/guide/setup-artifacts.md

@@ -14,7 +14,7 @@ PhaseGate setup is more than `phasegate.config.json`. A healthy installation is
 
 | Class | Examples | Owner | Lifecycle |
 |---|---|---|---|
-| Managed target | `phasegate.config.json`, `.claude/settings.json`, `.codex/hooks.json`, `CLAUDE.md`, `AGENTS.md`, `.husky/pre-commit`, `.husky/commit-msg`, `.husky/pre-push`, `.github/workflows/phasegate-aidlc-gate.yml`, root `skills/` bundled skill bodies, `.claude/skills`, `.codex/skills`, `package.json` PhaseGate scripts/devDependency | PhaseGate managed block, real runtime artifact, shared skill body, or symlink plus user content | Created or merged by `install`, refreshed by `reconcile`, removed or reversed by `uninstall` |
+| Managed target | `phasegate.config.json`, `.claude/settings.json`, `.codex/hooks.json`, `.agents/hooks.json`, `CLAUDE.md`, `AGENTS.md`, `.husky/pre-commit`, `.husky/commit-msg`, `.husky/pre-push`, `.github/workflows/phasegate-aidlc-gate.yml`, root `skills/` bundled skill bodies, `.claude/skills`, `.codex/skills`, `.agents/skills`, `package.json` PhaseGate scripts/devDependency | PhaseGate managed block, real runtime artifact, shared skill body, or symlink plus user content | Created or merged by `install`, refreshed by `reconcile`, removed or reversed by `uninstall` |
 | Configuration | `phasegate.config.json`, `package.json` | User owned, PhaseGate assisted | Created by `init` or project install when absent; `install` may merge scripts/devDependency into `package.json` |
 | Generated artifact | `.phasegate/manifest.json`, `.phasegate/backups/*`, `.phasegate/uninstalled-*.json`, `.phasegate/baseline.json` | PhaseGate | Written by lifecycle commands and validators; safe to regenerate only through the owning command |
 | Runtime state/report | `.phasegate/hook-skip-events.jsonl`, explicit `doctor --report-out <path>` output, `reports/regression/*`, resolved `reporting.outputDir` reports | PhaseGate command output | Produced while hooks, doctor, and validation commands run |
@@ -26,11 +26,11 @@ PhaseGate setup is more than `phasegate.config.json`. A healthy installation is
 
 `install --apply` and `reconcile --apply` manage only explicit targets. The current structured lifecycle covers:
 
-- Agent hook JSON: `.claude/settings.json`, `.codex/hooks.json`
+- Agent hook JSON: `.claude/settings.json`, `.codex/hooks.json`, `.agents/hooks.json`
 - Agent context files: `CLAUDE.md` and `AGENTS.md` managed sections. `AGENT.md` singular is not a PhaseGate managed target; treat it as user-owned content or migrate it manually. <!-- @work-item-id WI-174 -->
 - Husky scripts when requested: `.husky/pre-commit`, `.husky/commit-msg`, `.husky/pre-push`
 - CI workflow when requested: `.github/workflows/phasegate-aidlc-gate.yml`
-- Agent skill links: `.claude/skills`, `.codex/skills`
+- Agent skill links: `.claude/skills`, `.codex/skills`, `.agents/skills`
 - Project shared bundled skills: selected `skills/<name>/` directories plus `skills/.harness-version`
 - Project config: `phasegate.config.json` when absent, so installed agent hooks have a discoverable runtime config
 - Package metadata: PhaseGate scripts and `devDependencies.phasegate` in `package.json`
@@ -48,7 +48,7 @@ If `.claude/*` or `.codex/*` already exists and is not a PhaseGate-managed perso
 
 Personal agent context is also placed only where the runtime will read it. Claude Code uses `.claude/CLAUDE.md`. Codex uses root `AGENTS.md` when PhaseGate can create or manage it locally; if a team `AGENTS.md` already exists, PhaseGate leaves it unchanged and doctor reports `codex-context-missing` instead of creating `AGENTS.override.md`. <!-- @work-item-id WI-215 -->
 
-Project install uses a different topology: selected bundled skills are deployed once to root `skills/`, and `.claude/skills` / `.codex/skills` point to that shared target. Existing root `skills/` is also a mergeable catalog: selected bundled skill directories are refreshed, selection-excluded or user-owned skills are not removed, and uninstall deletes only manifest-managed bundled skills plus metadata. If an older project install has the links but an empty `skills/` target, `phasegate doctor` reports the selected agent skill check and `phasegate reconcile --apply` repairs the shared skill bodies. <!-- @work-item-id WI-210 --> <!-- @work-item-id WI-216 -->
+Project install uses a different topology: selected bundled skills are deployed once to root `skills/`, and `.claude/skills` / `.codex/skills` / `.agents/skills` point to that shared target. Existing root `skills/` is also a mergeable catalog: selected bundled skill directories are refreshed, selection-excluded or user-owned skills are not removed, and uninstall deletes only manifest-managed bundled skills plus metadata. If an older project install has the links but an empty `skills/` target, `phasegate doctor` reports the selected agent skill check and `phasegate reconcile --apply` repairs the shared skill bodies. <!-- @work-item-id WI-210 --> <!-- @work-item-id WI-216 -->
 
 ## Doctor Findings
 

package/docs/guide/skills-overview.md

@@ -1,6 +1,6 @@
 # Skills Overview
 
-Phasegate provides 29 skills covering the full AIDLC (AI-Driven Development Life Cycle). `npx phasegate init` and project `npx phasegate install` deploy skill bodies to root `skills/` and expose them to enabled agents through `.claude/skills/` / `.codex/skills/` links. Personal install instead writes real local-only per-agent skill directories. <!-- @work-item-id WI-210 -->
+Phasegate provides 29 skills covering the full AIDLC (AI-Driven Development Life Cycle). `npx phasegate init` and project `npx phasegate install` deploy skill bodies to root `skills/` and expose them to enabled agents through `.claude/skills/`, `.codex/skills/`, or `.agents/skills/` links. Personal install instead writes real local-only per-agent skill directories. <!-- @work-item-id WI-210 --> <!-- @work-item-id WI-385 -->
 
 Bundled `SKILL.md` files include `languages: [typescript]` frontmatter so PhaseGate can distinguish current TypeScript-oriented guidance from future language-specific skill variants. The metadata is advisory for applicability and does not prevent non-TypeScript projects from installing the catalog. <!-- @work-item-id WI-212 -->
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phasegate",
-  "version": "0.315.0",
+  "version": "0.340.0",
   "packageManager": "pnpm@10.30.1",
   "description": "Phasegate — AI-agnostic quality defense toolkit. Enforces structural integrity between design intent and code.",
   "license": "MIT",
@@ -60,7 +60,7 @@
     "harness:check-phase": "pnpm phasegate:check-phase",
     "harness:check-ready": "pnpm phasegate:check-ready",
     "test": "vitest run --config scripts/harness/__tests__/vitest.config.forks.ts && vitest run --config scripts/harness/__tests__/vitest.config.ts",
-    "coverage": "node -e \"require('node:fs').rmSync('coverage',{recursive:true,force:true})\" && vitest run --config scripts/harness/__tests__/vitest.config.coverage.forks.ts --reporter=blob --outputFile=coverage/.blob/forks.json && vitest run --config scripts/harness/__tests__/vitest.config.coverage.ts --reporter=blob --outputFile=coverage/.blob/threads.json && vitest run --config scripts/harness/__tests__/vitest.config.coverage.ts --merge-reports=coverage/.blob",
+    "coverage": "node -e \"require('node:fs').rmSync('coverage',{recursive:true,force:true})\" && vitest run --config scripts/harness/__tests__/vitest.config.coverage.forks.ts --reporter=blob --reporter=default --outputFile.blob=coverage/.blob/forks.json && vitest run --config scripts/harness/__tests__/vitest.config.coverage.ts --reporter=blob --reporter=default --outputFile.blob=coverage/.blob/threads.json && vitest run --config scripts/harness/__tests__/vitest.config.coverage.ts --merge-reports=coverage/.blob",
     "ci": "npm run coverage && npm run test"
   },
   "dependencies": {

package/scripts/harness/agent-integration/application/dto/handle-pre-tool-use-dto.ts

@@ -3,10 +3,14 @@
  * @unit agent-integration
  */
 
+/**
+ * WI-376 (ADR-039): 呼び出し元 skill 名を受け取るフィールドは持たない。
+ * 判定・案内の入力は hook が自ら観測・検証できる state（対象パス、変更カテゴリ、
+ * session marker、設計文書の存在、解決済み config 等）に限る。
+ */
 export interface HandlePreToolUseInput {
   toolName: string;
   targetFilePaths: string[];
-  callerSkill?: string;
   targetChanges?: {
     filePath: string;
     beforeContent?: string | null;
@@ -22,7 +26,7 @@ export interface HandlePreToolUseOutput {
   phaseGateBlockers?: string[];
   storyReflectionBlockers?: string[];
   storyReflectionWarnings?: string[];
-  fullModeRejectionRule?: 'MIXED_CHANGES' | 'NEW_DOMAIN' | 'API_CONTRACT';
+  fullModeRejectionRule?: 'CATEGORY_NOT_ALLOWED' | 'MIXED_CHANGES' | 'NEW_DOMAIN' | 'API_CONTRACT';
   fullModeDominantCategory?: string;
   nextAction?: string;
   // Quick Mode が write を許可した際に dominant カテゴリを presentation 層に伝える。

package/scripts/harness/agent-integration/application/dto/normalized-pre-tool-use-request.ts

@@ -0,0 +1,32 @@
+/**
+ * @unit agent-integration
+ * @layer application
+ * @work-item-id WI-385
+ */
+
+export type PayloadShape = "FLAT_SNAKE_CASE" | "FLAT_CAMEL_CASE" | "NESTED_TOOL_CALL";
+
+export type HookResponseProfile = "LEGACY_EXIT_ONLY" | "COMPATIBILITY_DENY_ENVELOPE" | "TOP_LEVEL_DENY_ENVELOPE";
+
+export interface CanonicalPreToolUseInput {
+  readonly path?: string;
+  readonly file_path?: string;
+  readonly paths?: readonly string[];
+  readonly command?: string;
+  readonly content?: string;
+  readonly old_string?: string;
+  readonly new_string?: string;
+}
+
+export interface NormalizedPreToolUseRequest {
+  readonly shape: PayloadShape;
+  readonly responseProfile: HookResponseProfile;
+  readonly cwd?: string;
+  readonly toolName: string;
+  readonly toolInput: CanonicalPreToolUseInput;
+  readonly inputTruncated: boolean;
+}
+
+export type PreToolUseNormalizationResult =
+  | { readonly ok: true; readonly request: NormalizedPreToolUseRequest }
+  | { readonly ok: false; readonly reason: string; readonly responseProfile?: HookResponseProfile };

package/scripts/harness/agent-integration/application/usecases/handle-pre-tool-use-usecase.ts

@@ -8,6 +8,7 @@
  * @work-item-id WI-214
  * @work-item-id WI-349
  * @work-item-id WI-354
+ * @work-item-id WI-376
  *
  * HandlePreToolUseUseCase
  * PreToolUse Hook処理のオーケストレーション
@@ -187,7 +188,6 @@ export class HandlePreToolUseUseCase {
               fullModeResult,
               guidance,
               unitIdForGuidance,
-              input.callerSkill,
               sessionResult,
             );
           }
@@ -278,13 +278,12 @@ export class HandlePreToolUseUseCase {
     blockedFilePath: string | undefined,
     result: {
       requiresFullMode: boolean;
-      rejectionRule?: "MIXED_CHANGES" | "NEW_DOMAIN" | "API_CONTRACT";
+      rejectionRule?: "CATEGORY_NOT_ALLOWED" | "MIXED_CHANGES" | "NEW_DOMAIN" | "API_CONTRACT";
       rejectionReason?: string;
       dominantCategory?: string;
     },
     guidance: ErrorGuidance | null,
     unitId: string | undefined,
-    callerSkill?: string,
     sessionResult?: FullModeSessionQueryResult,
   ): HandlePreToolUseOutput {
     const fp = blockedFilePath ?? "不明なファイル";
@@ -311,7 +310,7 @@ export class HandlePreToolUseUseCase {
         nextAction: `${dryRunCommand} && ${applyCommand}`,
       };
     }
-    if (HandlePreToolUseUseCase.shouldGuideQuickModeRelax(result.dominantCategory, callerSkill)) {
+    if (HandlePreToolUseUseCase.shouldGuideQuickModeRelax(result.dominantCategory)) {
       const dryRunCommand = "phasegate config:plan --intent quick-mode-relax --dry-run --json";
       const applyCommand = "phasegate config:plan --intent quick-mode-relax --apply --json";
       const lines: string[] = [`Full mode 必須変更が検出されました: ${fp}`];
@@ -387,15 +386,18 @@ export class HandlePreToolUseUseCase {
    * 実運用で設定されず、この分岐は到達不能だった。カテゴリを一次条件にして
    * skill context なしでも実用的な復旧手順を出す。
    * feature / domain / api は従来どおり /story-implementor 誘導を維持する。
+   *
+   * WI-376 (ADR-039): 判定入力は hook が自ら観測できる state のみとする方針に従い、
+   * カテゴリ未確定時の callerSkill フォールバックを削除した。カテゴリが取れない場合は
+   * 一律 /story-implementor 誘導（従来のフォールバックも実運用では常にこの経路だった）。
    */
   private static readonly QUICK_MODE_SCOPE_CATEGORIES: readonly string[] = ["bugfix", "docs", "test", "config"];
 
-  private static shouldGuideQuickModeRelax(dominantCategory: string | undefined, callerSkill?: string): boolean {
-    if (dominantCategory !== undefined) {
-      return HandlePreToolUseUseCase.QUICK_MODE_SCOPE_CATEGORIES.includes(dominantCategory);
+  private static shouldGuideQuickModeRelax(dominantCategory: string | undefined): boolean {
+    if (dominantCategory === undefined) {
+      return false;
     }
-    // カテゴリ不明時は skill context だけが手掛かり
-    return callerSkill === "quick-implementor";
+    return HandlePreToolUseUseCase.QUICK_MODE_SCOPE_CATEGORIES.includes(dominantCategory);
   }
 
   /**
@@ -575,6 +577,12 @@ export class HandlePreToolUseUseCase {
       message: (fp) =>
         `保護ファイルへの書き込みがブロックされました: ${fp}\nClaude Code の設定変更は /update-config スキルを使用してください。`,
     },
+    {
+      // WI-363: .husky/ 配下は L0 runtime の実施点。Quick Mode でも書き換えさせない。
+      pattern: /(?:^|\/)\.husky\//,
+      message: (fp) =>
+        `保護ファイルへの書き込みがブロックされました: ${fp}\n.husky/ 配下は L0 runtime（pre-commit / commit-msg / pre-push）の実施点であり、Quick Mode でも変更できません。\n未導入 hook の配置は npx phasegate setup:agent --apply --with-husky を使用してください。\n意図的な手編集が必要な場合は、agent セッション外で人間が変更し、通常の検証を実行してください。`,
+    },
   ];
 
   private async buildProtectedFileBlockOutput(blockedFilePath: string | undefined): Promise<HandlePreToolUseOutput> {

package/scripts/harness/agent-integration/domain/ports/full-mode-requirement-query-port.ts

@@ -1,15 +1,17 @@
 // @unit agent-integration
 // @layer domain
+// @work-item-id WI-384
 
 export interface FullModeRequirementQueryResult {
   readonly requiresFullMode: boolean;
-  readonly rejectionRule?: 'MIXED_CHANGES' | 'NEW_DOMAIN' | 'API_CONTRACT';
+  readonly rejectionRule?: 'CATEGORY_NOT_ALLOWED' | 'MIXED_CHANGES' | 'NEW_DOMAIN' | 'API_CONTRACT';
   readonly rejectionReason?: string;
   readonly dominantCategory?: string;
 }
 
 export interface FullModeTargetChange {
   readonly filePath: string;
+  readonly changeKind?: 'CREATE' | 'MODIFY' | 'DELETE';
   readonly beforeContent?: string | null;
   readonly afterContent?: string | null;
 }

package/scripts/harness/agent-integration/domain/services/apply-patch-write-target-extractor.ts

@@ -0,0 +1,98 @@
+/**
+ * @layer domain
+ * @unit agent-integration
+ * @work-item-id WI-384
+ *
+ * Codex apply_patch の raw patch から書き込み対象と変更種別を抽出する。
+ */
+
+export type PatchChangeKind = "CREATE" | "MODIFY" | "DELETE";
+
+export interface PatchWriteTarget {
+  readonly filePath: string;
+  readonly changeKind: PatchChangeKind;
+}
+
+const APPLY_PATCH_BEGIN_SOURCE = String.raw`\*\*\*\s+Begin\s+Patch`;
+const APPLY_PATCH_END_SOURCE = String.raw`\*\*\*\s+End\s+Patch`;
+const APPLY_PATCH_FILE_LINE_SOURCE = String.raw`^\*\*\*\s+(Update|Add|Delete)\s+File:\s*(.+?)\s*$`;
+const APPLY_PATCH_MOVE_LINE_SOURCE = String.raw`^\*\*\*\s+Move\s+to:\s*(.+?)\s*$`;
+
+const CHANGE_KIND_BY_DIRECTIVE = Object.freeze({
+  Add: "CREATE",
+  Update: "MODIFY",
+  Delete: "DELETE",
+} as const satisfies Readonly<Record<string, PatchChangeKind>>);
+
+const EMPTY_TARGETS: readonly PatchWriteTarget[] = Object.freeze([]);
+
+export class ApplyPatchWriteTargetExtractor {
+  extract(rawPatch: string): readonly PatchWriteTarget[] {
+    if (typeof rawPatch !== "string" || rawPatch.length === 0) {
+      return EMPTY_TARGETS;
+    }
+
+    const beginGlobal = new RegExp(APPLY_PATCH_BEGIN_SOURCE, "g");
+    const beginStarts: number[] = [];
+    let match = beginGlobal.exec(rawPatch);
+    while (match !== null) {
+      beginStarts.push(match.index + match[0].length);
+      match = beginGlobal.exec(rawPatch);
+    }
+    if (beginStarts.length === 0) {
+      return EMPTY_TARGETS;
+    }
+
+    const endGlobal = new RegExp(APPLY_PATCH_END_SOURCE, "g");
+    const endStarts: number[] = [];
+    match = endGlobal.exec(rawPatch);
+    while (match !== null) {
+      endStarts.push(match.index);
+      match = endGlobal.exec(rawPatch);
+    }
+
+    const targets: PatchWriteTarget[] = [];
+    const seen = new Set<string>();
+    for (let index = 0; index < beginStarts.length; index += 1) {
+      const start = beginStarts[index];
+      const nextBegin = index + 1 < beginStarts.length ? beginStarts[index + 1] : rawPatch.length;
+      const endInRange = endStarts.find((candidate) => candidate > start && candidate <= nextBegin);
+      const body = rawPatch.slice(start, endInRange ?? nextBegin);
+      let acceptsMoveDestination = false;
+
+      for (const line of body.split(/\r?\n/)) {
+        const fileMatch = new RegExp(APPLY_PATCH_FILE_LINE_SOURCE).exec(line);
+        if (fileMatch !== null) {
+          const directive = fileMatch[1] as keyof typeof CHANGE_KIND_BY_DIRECTIVE;
+          const filePath = fileMatch[2].trim();
+          acceptsMoveDestination = directive === "Update";
+          if (filePath.length === 0) continue;
+          const changeKind = CHANGE_KIND_BY_DIRECTIVE[directive];
+          this.appendTarget(targets, seen, filePath, changeKind);
+          continue;
+        }
+
+        const moveMatch = acceptsMoveDestination ? new RegExp(APPLY_PATCH_MOVE_LINE_SOURCE).exec(line) : null;
+        acceptsMoveDestination = false;
+        if (moveMatch === null) continue;
+        const filePath = moveMatch[1].trim();
+        if (filePath.length === 0) continue;
+        this.appendTarget(targets, seen, filePath, "CREATE");
+      }
+    }
+
+    return targets.length === 0 ? EMPTY_TARGETS : Object.freeze(targets);
+  }
+
+  private appendTarget(
+    targets: PatchWriteTarget[],
+    seen: Set<string>,
+    filePath: string,
+    changeKind: PatchChangeKind,
+  ): void {
+    const key = `${changeKind}\u0000${filePath}`;
+    if (seen.has(key)) return;
+    seen.add(key);
+    targets.push(Object.freeze({ filePath, changeKind }));
+  }
+}

package/scripts/harness/agent-integration/domain/services/bash-write-target-extractor.ts

@@ -1,6 +1,7 @@
 /**
  * @layer domain
  * @unit agent-integration
+ * @work-item-id WI-384
  *
  * BashWriteTargetExtractor ドメインサービス
  *
@@ -9,7 +10,8 @@
  *
  * 副作用なし・純粋関数相当。対応パターンは以下:
  *   - リダイレクト `>` / `>>` / `>|` (clobber)
- *   - heredoc (`<<EOF > path`)
+ *   - heredoc (`<<EOF > path`) — ヒアドキュメント**本文**はシェル構文解析の対象外
+ *     (本文中の `<...>` をリダイレクトと誤認しないため。WI-362)
  *   - `tee` / `tee -a`
  *   - `sed -i` / `sed -i ''` (BSD)
  *   - `cp` / `mv` (宛先のみ)
@@ -24,6 +26,8 @@
  *     `*** Update|Add|Delete File: <path>` 行) — Codex CLI 対応 (ISSUE-013 Wave 1)
  */
 
+import { ApplyPatchWriteTargetExtractor } from './apply-patch-write-target-extractor.js';
+
 /** 引数トークン (値とクォート種別) */
 type Token = {
   readonly value: string;
@@ -111,6 +115,191 @@ function tokenize(input: string): Token[] {
   return tokens;
 }
 
+/** ヒアドキュメント開始演算子で宣言された終端デリミタ */
+type HeredocDelimiter = {
+  /** クォート・エスケープを解除した終端語 */
+  readonly word: string;
+  /** `<<-` 形式か (終端行の先頭タブを無視する) */
+  readonly allowIndent: boolean;
+};
+
+/** デリミタ語の終端となる文字 (空白およびシェル演算子) */
+const DELIMITER_TERMINATORS = new Set([' ', '\t', ';', '&', '|', '<', '>', '(', ')']);
+
+/**
+ * 1 行から ヒアドキュメント開始演算子 (`<<WORD` / `<<-WORD` / `<<'WORD'`) を検出し、
+ * 宣言順に終端デリミタを返す。
+ *
+ * クォート状態を追跡し、クォート内の `<<` は演算子として扱わない
+ * (例: `echo "a << b" > out.txt` の `<<` はヒアドキュメントではない)。
+ * `$( ... )` コマンド置換の内側ではクォート文脈がリセットされるため、
+ * `git commit -m "$(cat <<'EOF'` のような入れ子も検出できる。
+ * ヒアストリング `<<<` は本文を持たないため対象外。
+ */
+function findHeredocDelimiters(line: string): HeredocDelimiter[] {
+  const found: HeredocDelimiter[] = [];
+  const substitutionStack: ('none' | 'single' | 'double')[] = [];
+  let quote: 'none' | 'single' | 'double' = 'none';
+  let i = 0;
+
+  while (i < line.length) {
+    const ch = line[i];
+
+    if (quote === 'single') {
+      if (ch === "'") quote = 'none';
+      i += 1;
+      continue;
+    }
+
+    if (ch === '\\') {
+      i += 2;
+      continue;
+    }
+
+    if (ch === '$' && line[i + 1] === '(') {
+      substitutionStack.push(quote);
+      quote = 'none';
+      i += 2;
+      continue;
+    }
+
+    if (quote === 'double') {
+      if (ch === '"') quote = 'none';
+      i += 1;
+      continue;
+    }
+
+    if (ch === "'") {
+      quote = 'single';
+      i += 1;
+      continue;
+    }
+
+    if (ch === '"') {
+      quote = 'double';
+      i += 1;
+      continue;
+    }
+
+    if (ch === ')' && substitutionStack.length > 0) {
+      quote = substitutionStack.pop() ?? 'none';
+      i += 1;
+      continue;
+    }
+
+    if (ch === '<' && line[i + 1] === '<') {
+      if (line[i + 2] === '<') {
+        // ヒアストリング `<<<` は本文行を持たない
+        i += 3;
+        continue;
+      }
+      i += 2;
+      let allowIndent = false;
+      if (line[i] === '-') {
+        allowIndent = true;
+        i += 1;
+      }
+      while (i < line.length && (line[i] === ' ' || line[i] === '\t')) i += 1;
+      const word = readHeredocDelimiterWord(line, i);
+      i = word.nextIndex;
+      if (word.value.length > 0) {
+        found.push({ word: word.value, allowIndent });
+      }
+      continue;
+    }
+
+    i += 1;
+  }
+
+  return found;
+}
+
+/** `<<` 直後のデリミタ語を読む。クォート/バックスラッシュを解除した値を返す。 */
+function readHeredocDelimiterWord(line: string, start: number): { value: string; nextIndex: number } {
+  let value = '';
+  let i = start;
+
+  while (i < line.length) {
+    const ch = line[i];
+
+    if (ch === "'") {
+      i += 1;
+      while (i < line.length && line[i] !== "'") {
+        value += line[i];
+        i += 1;
+      }
+      i += 1;
+      continue;
+    }
+
+    if (ch === '"') {
+      i += 1;
+      while (i < line.length && line[i] !== '"') {
+        if (line[i] === '\\' && i + 1 < line.length) {
+          value += line[i + 1];
+          i += 2;
+          continue;
+        }
+        value += line[i];
+        i += 1;
+      }
+      i += 1;
+      continue;
+    }
+
+    if (ch === '\\' && i + 1 < line.length) {
+      value += line[i + 1];
+      i += 2;
+      continue;
+    }
+
+    if (DELIMITER_TERMINATORS.has(ch)) break;
+
+    value += ch;
+    i += 1;
+  }
+
+  return { value, nextIndex: i };
+}
+
+/** 終端行判定 (`<<-` は先頭タブを無視し、行末の空白・CR は許容する) */
+function isHeredocTerminator(line: string, delimiter: HeredocDelimiter): boolean {
+  const candidate = delimiter.allowIndent ? line.replace(/^\t+/, '') : line;
+  return candidate.trimEnd() === delimiter.word;
+}
+
+/**
+ * ヒアドキュメント本文行を除去する。
+ *
+ * 本文はシェル構文ではなくデータであり、`Co-Authored-By: Claude <noreply@example.com>`
+ * のような `<...>` をリダイレクトと誤解釈すると無関係なコマンドが誤ブロックされる (WI-362)。
+ * 除去対象は**本文行と終端行のみ**で、開始演算子のある行はそのまま残すため
+ * `cat <<EOF > path` の `> path` は従来どおり検出される (fail-closed 維持)。
+ */
+function stripHeredocBodies(command: string): string {
+  if (!command.includes('<<')) return command;
+
+  const lines = command.split('\n');
+  const kept: string[] = [];
+  const pending: HeredocDelimiter[] = [];
+
+  for (const line of lines) {
+    if (pending.length > 0) {
+      // 本文行 / 終端行はいずれも構文解析対象から外す
+      if (isHeredocTerminator(line, pending[0])) {
+        pending.shift();
+      }
+      continue;
+    }
+    kept.push(line);
+    for (const delimiter of findHeredocDelimiters(line)) {
+      pending.push(delimiter);
+    }
+  }
+
+  return kept.join('\n');
+}
+
 const OPERATOR_SEPARATORS = new Set(['&&', '||', ';', '|']);
 
 /** トークン列を複合・パイプ境界で分割 */
@@ -311,7 +500,9 @@ function collectPositionals(tokens: Token[]): Token[] {
 
 /** コマンド文字列を token 化 → 演算子分割 → 各コマンドから書き込み先を抽出する内部関数。 */
 function extractFromCommandString(command: string): string[] {
-  const tokens = tokenize(command);
+  // ヒアドキュメント本文はデータなのでシェル構文解析の対象外にする (WI-362)。
+  // apply_patch 抽出は元の command 文字列を直接走査するため影響を受けない。
+  const tokens = tokenize(stripHeredocBodies(command));
   const groups = splitByOperators(tokens);
   const collected: string[] = [];
   for (const group of groups) {
@@ -320,62 +511,13 @@ function extractFromCommandString(command: string): string[] {
     }
   }
   // ネスト内の apply_patch heredoc も拾う
-  for (const p of extractApplyPatchTargets(command)) {
-    collected.push(p);
+  const patchExtractor = new ApplyPatchWriteTargetExtractor();
+  for (const target of patchExtractor.extract(command)) {
+    collected.push(target.filePath);
   }
   return collected;
 }
 
-/** apply_patch ブロック境界マーカー (Begin/End) */
-const APPLY_PATCH_BEGIN_SOURCE = String.raw`\*\*\*\s+Begin\s+Patch`;
-const APPLY_PATCH_END_SOURCE = String.raw`\*\*\*\s+End\s+Patch`;
-/** ブロック内のファイル行: `*** (Update|Add|Delete) File: <path>` */
-const APPLY_PATCH_FILE_LINE_SOURCE = String.raw`^\s*\*\*\*\s+(?:Update|Add|Delete)\s+File:\s*(.+?)\s*$`;
-
-/**
- * apply_patch ヒアドキュメント構文から対象ファイルパスを抽出する。
- *
- * Codex CLI 等が採用する unified-diff 風パッチフォーマット:
- *   *** Begin Patch
- *   *** Update File: <path>
- *   *** Add File: <path>
- *   *** Delete File: <path>
- *   *** End Patch
- *
- * `*** End Patch` が欠けている場合は command 末尾までをブロックとして扱う
- * (保護側に倒す — phase-gate の取りこぼしよりも誤検出のほうが許容される)。
- */
-function extractApplyPatchTargets(command: string): string[] {
-  const beginGlobal = new RegExp(APPLY_PATCH_BEGIN_SOURCE, 'g');
-  const beginStarts: number[] = [];
-  let m: RegExpExecArray | null;
-  while ((m = beginGlobal.exec(command)) !== null) {
-    beginStarts.push(m.index + m[0].length);
-  }
-  if (beginStarts.length === 0) return [];
-
-  const endGlobal = new RegExp(APPLY_PATCH_END_SOURCE, 'g');
-  const endStarts: number[] = [];
-  while ((m = endGlobal.exec(command)) !== null) {
-    endStarts.push(m.index);
-  }
-
-  const results: string[] = [];
-  for (let i = 0; i < beginStarts.length; i += 1) {
-    const start = beginStarts[i];
-    const nextBegin = i + 1 < beginStarts.length ? beginStarts[i + 1] : command.length;
-    const endInRange = endStarts.find((e) => e > start && e <= nextBegin);
-    const end = endInRange ?? nextBegin;
-    const body = command.slice(start, end);
-
-    const fileRegex = new RegExp(APPLY_PATCH_FILE_LINE_SOURCE, 'gm');
-    while ((m = fileRegex.exec(body)) !== null) {
-      results.push(m[1]);
-    }
-  }
-  return results;
-}
-
 export class BashWriteTargetExtractor {
   /**
    * Bash コマンド文字列から書き込み先ファイルパスを抽出する。

package/scripts/harness/agent-integration/domain/value-objects/hook-translation-result.ts

@@ -18,7 +18,7 @@ export interface BlockMetadata {
   readonly scopeLevel?: 1 | 2 | 3;
   readonly unitId?: string;
   readonly storyId?: string;
-  readonly fullModeRejectionRule?: 'MIXED_CHANGES' | 'NEW_DOMAIN' | 'API_CONTRACT';
+  readonly fullModeRejectionRule?: 'CATEGORY_NOT_ALLOWED' | 'MIXED_CHANGES' | 'NEW_DOMAIN' | 'API_CONTRACT';
   readonly fullModeRejectionReason?: string;
   readonly fullModeDominantCategory?: string;
 }