phasegate 0.154.0 → 0.156.0

package/docs/guide/cli-reference.md

@@ -24,7 +24,7 @@ Command names in this document are split into three surfaces:
 |---|---|
 | `init --name <name>` | Legacy-compatible bootstrap for new projects: deploy skills, generate config, and optionally add hooks/CI. Options: `--preset <full\|standard\|minimal\|custom>`, `--skills <core\|all>`, `--agent <claude\|codex\|both>`, `--workflow <standard\|strict>`, `--with-husky`, `--with-ci`, `--yes`. |
 | `install --dry-run` / `--apply` | Idempotently merge PhaseGate into an existing project, preserve user content, add package scripts/devDependency, create selected `AGENTS.md` / `CLAUDE.md` managed sections, and write `.phasegate/manifest.json`. `--agent <claude\|codex\|both>`, `--skills <core\|all>`, and `--workflow <standard\|strict>` affect rendered agent context; `--force` replaces managed targets after backup. |
-| `doctor` | Diagnose silent or partial installations and report repair hints (`--json`, `--strict`, `--report-out <path>`). `--report-out` writes exactly to the supplied path, not to `reporting.outputDir`. |
+| `doctor` | Diagnose silent or partial installations and report repair hints (`--json`, `--strict`, `--agent <claude\|codex\|both>`, `--report-out <path>`). `--agent` defaults to `both`; single-agent scopes keep shared targets applicable and mark the other agent's findings as not applicable. `--report-out` writes exactly to the supplied path, not to `reporting.outputDir`. |
 | `uninstall --dry-run` / `--apply` | Remove PhaseGate-managed files and managed blocks using `.phasegate/manifest.json`; `--force` handles managed conflict cases. |
 | `reconcile --dry-run` / `--apply` | Update PhaseGate-managed files to current package templates and refresh manifest hashes; `--force` allows managed-file replacement with backup. |
 | `setup:agent` | Agent-readable setup planner and optional apply path. Options: `--intent <minimal\|recommended\|strict\|ci-only\|agent-hooks\|retrofit>`, `--agent <claude\|codex\|both>`, `--workflow <standard\|strict>`, `--with-husky`, `--with-ci`, `--dry-run`, `--apply`, `--json`. <!-- @work-item-id WI-172 --> |
@@ -40,7 +40,7 @@ Command names in this document are split into three surfaces:
 
 <!-- @work-item-id WI-158 -->
 
-Setup lifecycle commands support JSON for automation where shown by help: `install --json`, `reconcile --json`, `uninstall --json`, and `doctor --json`. `doctor --report-out <path>` persists the doctor JSON payload to that exact path. Relative paths are resolved from the project root; absolute paths are used as-is.
+Setup lifecycle commands support JSON for automation where shown by help: `install --json`, `reconcile --json`, `uninstall --json`, and `doctor --json`. `doctor --agent claude --json` and `doctor --agent codex --json` include `scope` and `scopedOutFindings` so agents can distinguish selected-agent readiness from full-install diagnostics. `doctor --report-out <path>` persists the doctor JSON payload to that exact path. Relative paths are resolved from the project root; absolute paths are used as-is. <!-- @work-item-id WI-178 -->
 
 This is separate from `reporting.outputDir`. The configured report directory is used by phase-dependency / phase-gate reporting, while regression-suite result files are fixed under `reports/regression/` and status/drift JSON is emitted to stdout.
 

package/docs/guide/troubleshooting.md

@@ -1,6 +1,6 @@
 # Troubleshooting
 
-<!-- @work-item-id WI-171, WI-172, WI-173, WI-175, WI-176 -->
+<!-- @work-item-id WI-171, WI-172, WI-173, WI-175, WI-176, WI-177 -->
 
 Start with:
 
@@ -63,6 +63,8 @@ The planner output is intentionally agent-readable: detected state, questions, p
 
 `doctor` green means the local managed setup is consistent for the inspected targets. It does not prove user-level Codex feature flags, hosted GitHub Actions execution, npm registry state, or team policy acceptance.
 
+By default, `phasegate doctor` inspects the full Claude + Codex + shared setup. For a deliberate single-agent setup, use `phasegate doctor --agent claude --json` or `phasegate doctor --agent codex --json`. Single-agent reports keep shared targets applicable and place the unselected agent's findings under `scopedOutFindings` with `applicability: "not-applicable"`; those findings are explanatory, not repair targets for the selected agent. <!-- @work-item-id WI-178 -->
+
 Check `plan.completeness` in `setup:agent --json`:
 
 - `configured`: PhaseGate found local evidence.
@@ -72,6 +74,14 @@ Check `plan.completeness` in `setup:agent --json`:
 
 When `install` or `setup:agent --apply` returns a structured `error`, use its `target`, `operation`, `code`, `recovery`, and `partialChanges` fields before rerunning.
 
+Common structured setup errors:
+
+| Code | Usually means | First recovery step |
+|---|---|---|
+| `EPERM` / `EACCES` | The current sandbox, user, or filesystem denied the write. | Ask the user to rerun in a writable workspace or approve the write, then retry the same `--apply` command. |
+| `EEXIST` / `ENOTDIR` | A parent path such as `.claude` or `.codex` exists as a file or incompatible path. | Inspect the path, decide whether it is user-owned, then move or rename it before rerunning. |
+| hash mismatch / refused target | A PhaseGate managed target contains user edits outside the expected hash. | Use `invoke /phasegate-config-doctor` and explain backup, merge, and `--force` tradeoffs before applying. |
+
 ## Claude Code Setup Still Feels Unclear
 
 Run the Claude-specific planner path:
@@ -85,3 +95,5 @@ Check `plan.agentReadiness`:
 - `agent=claude`: local Claude Code targets (`.claude/settings.json`, `CLAUDE.md`, skills).
 - `agent=shared`: package/config/skills plus selected Husky and CI targets.
 - `agent=codex`: should be `not-applicable` unless you selected `--agent both` or `--agent codex`.
+
+When `claude` and `shared` are `configured`, the next step is work planning, not more setup. Confirm or create the WI under `docs/inception/**/{WI-XXX}/description.md`, write the needed inception plan/design files, reflect accepted design into `docs/product/...` with `@work-item-id WI-XXX`, then run `npx phasegate phasegate:check-ready` or the relevant `validate --layer ...` command.

package/docs/templates/agent-context/CLAUDE.md.template.md

@@ -1,6 +1,6 @@
 # CLAUDE.md
 
-<!-- @work-item-id WI-174, WI-176 -->
+<!-- @work-item-id WI-174, WI-176, WI-177 -->
 
 <!-- phasegate:managed-section:start -->
 ## 必読ドキュメント
@@ -21,6 +21,15 @@ Before planning implementation work in a new or upgraded repository, run `phaseg
 - `agent=shared` covers package scripts, `phasegate.config.json`, skills, and selected Husky/CI targets.
 - `manual` or `external-actions` entries require user or hosted-service confirmation; do not treat local readiness as proof that external CI or user-level agent settings are complete.
 
+After the `claude` and `shared` rows are `configured`, move from setup to work planning:
+
+1. Confirm the target WI under `docs/inception/**/{WI-XXX}/description.md`, or create the next unused WI if the user asks for new work.
+2. For implementation work, prepare or update the WI plan/design files under `docs/inception/.../{WI-XXX}/` before editing source or tests.
+3. Reflect the accepted design into the relevant `docs/product/...` files with `@work-item-id WI-XXX`.
+4. Run `phasegate phasegate:check-ready` or the requested `phasegate validate --layer ...` command before committing.
+
+If `setup:agent --apply --json` or `install --apply --json` fails with a structured `error`, explain `target`, `operation`, `code`, `likelyCause`, `recovery`, and `partialChanges` before retrying. Use `invoke /phasegate-config-doctor` for managed target conflicts and `invoke /phasegate-toolkit-guide` for read-only setup guidance.
+
 ## Phase Presets
 
 {{PHASEGATE_PRESETS}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phasegate",
-  "version": "0.154.0",
+  "version": "0.156.0",
   "packageManager": "pnpm@10.30.1",
   "description": "Phasegate — AI-agnostic quality defense toolkit. Enforces structural integrity between design intent and code.",
   "license": "MIT",

package/scripts/harness/installation/application/usecases/run-doctor-diagnostics.ts

@@ -1,22 +1,38 @@
 // @unit installation
 // @layer application
 // @work-item-id WI-145
+// @work-item-id WI-178
 
 import { DiagnosticReport } from "../../domain/diagnostic-report.js";
+import type { CheckId } from "../../domain/check-id.js";
+import type { DiagnosticFinding } from "../../domain/diagnostic-finding.js";
 import type { HeuristicCheck } from "../../domain/ports/heuristic-check.js";
 import type { FileInspectorPort } from "../ports/file-inspector-port.js";
 import type { ManifestRepositoryPort } from "../ports/manifest-repository-port.js";
 
+export type DoctorAgentScope = "claude" | "codex" | "both";
+
+export interface ScopedOutDiagnosticFinding {
+  readonly finding: DiagnosticFinding;
+  readonly scopeReason: string;
+}
+
 export interface RunDoctorDiagnosticsInput {
   readonly projectRoot: string;
   readonly strict: boolean;
+  readonly agent?: DoctorAgentScope;
 }
 
 export interface RunDoctorDiagnosticsOutput {
   readonly report: DiagnosticReport;
+  readonly agent: DoctorAgentScope;
+  readonly scopedOutFindings: readonly ScopedOutDiagnosticFinding[];
   readonly exitCode: number;
 }
 
+const CLAUDE_ONLY_CHECKS = new Set<CheckId>(["claude-hook-missing", "claude-skills-symlink"]);
+const CODEX_ONLY_CHECKS = new Set<CheckId>(["codex-hook-missing", "codex-skills-symlink"]);
+
 export class RunDoctorDiagnosticsUseCase {
   constructor(
     private readonly checks: readonly HeuristicCheck[],
@@ -25,17 +41,42 @@ export class RunDoctorDiagnosticsUseCase {
   ) {}
 
   async execute(input: RunDoctorDiagnosticsInput): Promise<RunDoctorDiagnosticsOutput> {
+    const agent = input.agent ?? "both";
     await this.manifestRepository.load(input.projectRoot).catch(() => null);
-    const findings = (await Promise.all(
+    const rawFindings = (await Promise.all(
       this.checks.map((check) => check.run(input.projectRoot, this.inspector)),
     )).filter((finding) => finding !== null);
+    const { findings, scopedOutFindings } = this.applyAgentScope(rawFindings, agent);
     const report = DiagnosticReport.create(findings);
     return {
       report,
+      agent,
+      scopedOutFindings,
       exitCode: this.decideExitCode(report, input.strict),
     };
   }
 
+  private applyAgentScope(
+    findings: readonly DiagnosticFinding[],
+    agent: DoctorAgentScope,
+  ): { readonly findings: readonly DiagnosticFinding[]; readonly scopedOutFindings: readonly ScopedOutDiagnosticFinding[] } {
+    if (agent === "both") return { findings, scopedOutFindings: [] };
+    const scopedOutChecks = agent === "claude" ? CODEX_ONLY_CHECKS : CLAUDE_ONLY_CHECKS;
+    const applicable: DiagnosticFinding[] = [];
+    const scopedOut: ScopedOutDiagnosticFinding[] = [];
+    for (const finding of findings) {
+      if (scopedOutChecks.has(finding.checkId)) {
+        scopedOut.push({
+          finding,
+          scopeReason: `${finding.checkId} belongs to an unselected agent for doctor --agent ${agent}.`,
+        });
+      } else {
+        applicable.push(finding);
+      }
+    }
+    return { findings: applicable, scopedOutFindings: scopedOut };
+  }
+
   private decideExitCode(report: DiagnosticReport, strict: boolean): number {
     if (report.hasRedFlag()) return 1;
     if (strict && report.hasWarning()) return 1;

package/scripts/harness/installation/application/usecases/run-install.ts

@@ -3,6 +3,7 @@
 // @work-item-id WI-146
 // @work-item-id WI-174
 // @work-item-id WI-175
+// @work-item-id WI-177
 
 import { mkdir, readFile, writeFile, copyFile, chmod, access, lstat, readlink, symlink } from "node:fs/promises";
 import { dirname, join } from "node:path";
@@ -236,14 +237,16 @@ function likelyCauseFor(code: string): string {
   if (code === "EPERM") return "The filesystem or sandbox denied this write operation.";
   if (code === "EACCES") return "The current user does not have permission to write this target.";
   if (code === "EROFS") return "The project is on a read-only filesystem.";
+  if (code === "EEXIST") return "A parent path already exists as a file or incompatible filesystem entry.";
   if (code === "ENOTDIR") return "A parent path exists but is not a directory.";
   return "The managed target could not be written.";
 }
 
 function recoveryFor(code: string, target: string): string {
-  if (code === "EPERM") return `Review sandbox or filesystem permissions for ${target}, then rerun phasegate setup:agent --apply or phasegate install --apply.`;
+  if (code === "EPERM") return `Review sandbox or filesystem permissions for ${target}, ask the user for write access when needed, then rerun phasegate setup:agent --apply or phasegate install --apply.`;
   if (code === "EACCES") return `Fix ownership or permissions for ${target}, then rerun phasegate install --apply.`;
   if (code === "EROFS") return `Move the project to a writable filesystem or rerun in a writable workspace before applying ${target}.`;
+  if (code === "EEXIST" || code === "ENOTDIR") return `Inspect the parent path for ${target}; if it is user-owned, rename or move it before rerunning phasegate install --dry-run --json and then --apply.`;
   return `Inspect ${target}, run phasegate install --dry-run --json, then rerun with --apply after resolving the filesystem issue.`;
 }
 

package/scripts/harness/installation/presentation/cli/doctor-handler.ts

@@ -1,10 +1,11 @@
 // @unit installation
 // @layer presentation
 // @work-item-id WI-145
+// @work-item-id WI-178
 
 import { mkdir, writeFile } from "node:fs/promises";
 import { dirname, isAbsolute, join } from "node:path";
-import type { RunDoctorDiagnosticsUseCase } from "../../application/usecases/run-doctor-diagnostics.js";
+import type { DoctorAgentScope, RunDoctorDiagnosticsUseCase } from "../../application/usecases/run-doctor-diagnostics.js";
 import { DiagnosticReportFormatter } from "../formatters/diagnostic-report-formatter.js";
 
 export interface DoctorHandlerInput {
@@ -13,6 +14,7 @@ export interface DoctorHandlerInput {
   readonly json: boolean;
   readonly reportOut: string | null;
   readonly phasegateVersion: string;
+  readonly agent?: DoctorAgentScope;
 }
 
 export interface DoctorHandlerOutput {
@@ -30,9 +32,12 @@ export class DoctorHandler {
     const result = await this.useCase.execute({
       projectRoot: input.projectRoot,
       strict: input.strict,
+      agent: input.agent,
     });
     const formatInput = {
       report: result.report,
+      agent: result.agent,
+      scopedOutFindings: result.scopedOutFindings,
       phasegateVersion: input.phasegateVersion,
       projectRoot: input.projectRoot,
       exitCode: result.exitCode,

package/scripts/harness/installation/presentation/formatters/diagnostic-report-formatter.ts

@@ -1,11 +1,15 @@
 // @unit installation
 // @layer presentation
 // @work-item-id WI-145
+// @work-item-id WI-178
 
+import type { DoctorAgentScope, ScopedOutDiagnosticFinding } from "../../application/usecases/run-doctor-diagnostics.js";
 import type { DiagnosticReport } from "../../domain/diagnostic-report.js";
 
 export interface DiagnosticReportFormatterInput {
   readonly report: DiagnosticReport;
+  readonly agent: DoctorAgentScope;
+  readonly scopedOutFindings: readonly ScopedOutDiagnosticFinding[];
   readonly phasegateVersion: string;
   readonly projectRoot: string;
   readonly exitCode: number;
@@ -18,8 +22,20 @@ export class DiagnosticReportFormatter {
         schemaVersion: "1.0",
         phasegateVersion: input.phasegateVersion,
         projectRoot: input.projectRoot,
+        scope: {
+          agent: input.agent,
+          description: scopeDescription(input.agent),
+        },
         overallStatus: input.report.overallStatus,
-        findings: input.report.findings.map((finding) => finding.toJSON()),
+        findings: input.report.findings.map((finding) => ({
+          ...finding.toJSON(),
+          applicability: "applicable",
+        })),
+        scopedOutFindings: input.scopedOutFindings.map(({ finding, scopeReason }) => ({
+          ...finding.toJSON(),
+          applicability: "not-applicable",
+          scopeReason,
+        })),
         exitCode: input.exitCode,
       },
       null,
@@ -31,6 +47,7 @@ export class DiagnosticReportFormatter {
     const lines = [
       `phasegate doctor v${input.phasegateVersion}`,
       `Project: ${input.projectRoot}`,
+      `Scope: ${input.agent} (${scopeDescription(input.agent)})`,
       "",
     ];
     for (const finding of input.report.findings) {
@@ -47,7 +64,16 @@ export class DiagnosticReportFormatter {
     const redCount = input.report.findings.filter((finding) => finding.severity === "red").length;
     const warnCount = input.report.findings.filter((finding) => finding.severity === "warn").length;
     lines.push(`Status: ${input.report.overallStatus.toUpperCase()} (${input.report.findings.length} findings: ${redCount} red, ${warnCount} warn)`);
+    if (input.scopedOutFindings.length > 0) {
+      lines.push(`Scoped out: ${input.scopedOutFindings.length} findings not applicable to --agent ${input.agent}`);
+    }
     lines.push(`Exit: ${input.exitCode}`);
     return lines.join("\n");
   }
 }
+
+function scopeDescription(agent: DoctorAgentScope): string {
+  if (agent === "claude") return "Claude Code and shared setup targets; Codex-only findings are not applicable.";
+  if (agent === "codex") return "Codex and shared setup targets; Claude-only findings are not applicable.";
+  return "Full setup diagnostics for Claude, Codex, and shared targets.";
+}

package/scripts/harness/main.ts

@@ -152,7 +152,7 @@ Setup:
                                 --skills <core|all>, --agent <claude|codex|both>, --workflow <standard|strict>,
                                 --with-husky, --with-ci, --yes)
   update-skills                Alias for reconcile (kept for compatibility)
-  doctor                       Diagnose silent installation failures (--json, --strict, --report-out <path>)
+  doctor                       Diagnose silent installation failures (--json, --strict, --agent <claude|codex|both>, --report-out <path>)
   scaffold-wi <unit> <type>    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)
@@ -772,6 +772,16 @@ function parseAgentTarget(value: string | undefined, fallback: AgentTarget = "bo
   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;
+  return null;
+}
+
+function doctorValidationCommand(agent: AgentTarget): string {
+  return agent === "both" ? "phasegate doctor" : `phasegate doctor --agent ${agent}`;
+}
+
 function parseSetupIntent(value: string | undefined): SetupIntent {
   if (
     value === "minimal" ||
@@ -863,6 +873,7 @@ function buildSetupCompleteness(input: {
 }): readonly SetupCompletenessEntry[] {
   const includeClaude = input.agent === "claude" || input.agent === "both";
   const includeCodex = input.agent === "codex" || input.agent === "both";
+  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);
   const entries: SetupCompletenessEntry[] = [
@@ -872,7 +883,7 @@ function buildSetupCompleteness(input: {
       configured: input.checks.packageJson && input.checks.phasegateConfig,
       configuredEvidence: "package.json and phasegate.config.json are present.",
       plannedEvidence: "setup:agent will create or merge package.json scripts and phasegate.config.json.",
-      nextAction: "Run setup:agent --apply, then phasegate doctor.",
+      nextAction: `Run setup:agent --apply, then ${doctorCommand}.`,
     }),
     setupCompletenessEntry({
       area: "agent-hooks",
@@ -922,7 +933,7 @@ function buildSetupCompleteness(input: {
       configured: input.checks.packageJson && input.checks.phasegateConfig,
       configuredEvidence: "Local validation commands can be run against the configured project.",
       plannedEvidence: "Validation commands are planned after setup apply.",
-      nextAction: "Run phasegate doctor, phasegate phasegate:check-ready, and phasegate validate --layer L2 --format human.",
+      nextAction: `Run ${doctorCommand}, phasegate phasegate:check-ready, and phasegate validate --layer L2 --format human.`,
     }),
   ];
 
@@ -994,6 +1005,7 @@ function buildAgentReadiness(input: {
 }): readonly AgentReadinessEntry[] {
   const includeClaude = input.agent === "claude" || input.agent === "both";
   const includeCodex = input.agent === "codex" || input.agent === "both";
+  const doctorCommand = doctorValidationCommand(input.agent);
   const sharedConfigured =
     input.checks.packageJson &&
     input.checks.phasegateConfig &&
@@ -1045,7 +1057,7 @@ function buildAgentReadiness(input: {
       plannedEvidence: [
         "setup:agent will create or refresh package scripts, phasegate.config.json, skills, and selected Husky/CI targets.",
       ],
-      nextAction: "Run setup:agent --apply, then phasegate doctor, phasegate phasegate:check-ready, and phasegate validate --layer L2 --format human.",
+      nextAction: `Run setup:agent --apply, then ${doctorCommand}, phasegate phasegate:check-ready, and phasegate validate --layer L2 --format human.`,
       risk: input.withCi ? "A hosted CI run remains an external manual check." : undefined,
     }),
   ];
@@ -1103,7 +1115,7 @@ async function buildAgentSetupPlan(rootDir: string, input: {
       "Backups are written under .phasegate/backups when force is used on changed managed files.",
     ],
     validation: [
-      "phasegate doctor",
+      doctorValidationCommand(input.agent),
       "phasegate phasegate:check-ready",
       "phasegate validate --layer L2 --format human",
     ],
@@ -1728,6 +1740,17 @@ async function main(): Promise<void> {
       }
 
       case "doctor": {
+        const KNOWN_DOCTOR_FLAGS = ["--json", "--strict", "--agent", "--report-out"];
+        const flagError = validateKnownFlags(args, KNOWN_DOCTOR_FLAGS);
+        if (flagError) {
+          console.error(flagError);
+          process.exit(2);
+        }
+        const agent = parseRequiredAgentTarget(parseFlag(args, "--agent"), "both");
+        if (agent === null) {
+          console.error(`Invalid --agent value: "${parseFlag(args, "--agent")}". Use "claude", "codex", or "both".`);
+          process.exit(2);
+        }
         const mod = createInstallationModule();
         const phasegateVersion = await getHarnessVersion(harnessRoot);
         const result = await mod.doctorHandler.execute({
@@ -1736,6 +1759,7 @@ async function main(): Promise<void> {
           json,
           reportOut: parseFlag(args, "--report-out") ?? null,
           phasegateVersion,
+          agent,
         });
         console.log(result.stdout);
         process.exit(result.exitCode);

package/skills/phasegate-config-doctor/SKILL.md

@@ -127,12 +127,14 @@ product-architect で Unit を作り、いくつかの logical_design を書い
 #### 観点 9: setup lifecycle と doctor finding
 
 - `phasegate doctor --json` の finding に `repairMode: "ai-assisted"` と `suggestedSkill.skillName = "phasegate-config-doctor"` がある → 本 skill が merge 方針、保持する user content、実行すべき `install --apply` / `--force` / `reconcile --apply` を提案する
+- Claude-only / Codex-only 導入後は `phasegate doctor --agent claude --json` または `phasegate doctor --agent codex --json` を使って selected agent の readiness を読む。`scopedOutFindings` は未選択 agent の `not-applicable` 情報なので、ユーザーがその agent を導入したいと言っていない限り repair 提案にしない。<!-- @work-item-id WI-178 -->
 - `repairHint` がある mechanical finding → 原則として hint のコマンドを優先し、実行前に対象ファイルと manifest の差分を確認
 - manifest parse error → `.phasegate/manifest.json` を手で修復する前に backup / uninstall / reinstall の選択肢を提示
 - reconcile / uninstall が refuse → user modified managed target として扱い、`--force` のリスクと backup path を説明して承認を取る
 - Codex の `codex_hooks` feature flag は user-level setting。project-local `install` では変更されないため、必要なら `codex features enable codex_hooks` を案内
 - Codex native `apply_patch` bypass は hook で完全捕捉できない。`.husky/pre-commit` の `phasegate pre-commit` が backstop になるため、Husky 配線を診断対象に含める
 - 初回 setup / retrofit / CI-only / agent-hooks の判断が曖昧な場合は `npx phasegate setup:agent --dry-run --json` を先に使い、検出済み状態、質問、変更案、rollback、validation を根拠として提案する。<!-- @work-item-id WI-172 -->
+- Claude Code setup 相談では `npx phasegate setup:agent --agent claude --dry-run --json` を先に使い、`plan.agentReadiness` の `claude` / `shared` が `configured` なら setup 修復ではなく WI 起票、inception 計画、product reflection、validation の順で作業開始を案内する。`setup:agent --apply --json` または `install --apply --json` の structured `error` がある場合は、`target`, `operation`, `code`, `likelyCause`, `recovery`, `partialChanges` を読み、`.claude` が file として存在する path conflict、sandbox/permission denial、PhaseGate managed target hash mismatch を区別して説明する。<!-- @work-item-id WI-177 -->
 - 「L4 を厳しめにして」「Codex hook を有効にして」「CI で warning を fail にして」などの自然言語依頼は、`npx phasegate config:plan --intent <intent> --dry-run --json` で対象ファイル、コマンド、リスク、検証を確認してから diff を提案する。<!-- @work-item-id WI-173 -->
 - `AGENTS.md` は標準運用ルールの managed section と lesson pointer section を分ける。`ci:auto-refresh-agent-context --apply` は lesson pointers 専用 section を更新し、標準運用ルールや user-owned content を置換してはいけない。<!-- @work-item-id WI-174 -->
 

package/skills/phasegate-toolkit-guide/SKILL.md

@@ -132,8 +132,12 @@ docs/guide/                          # phasegate リポジトリ自体 (dogfood)
 
 `setup-artifacts.md` は managed target / generated artifact / runtime state / legacy artifact / user-level setting の分類を持つ。`doctor --report-out` は明示 path への出力で、`.phasegate/last-doctor-report.json` は固定生成物ではない点もここを参照する。<!-- @work-item-id WI-153 -->
 
+Claude-only / Codex-only setup の確認では、full `phasegate doctor` と scoped doctor を区別する。ユーザーが `setup:agent --agent claude` を選んだ場合は `phasegate doctor --agent claude --json` を優先し、`scopedOutFindings` の Codex finding は「未選択 agent の not-applicable 情報」であり修復対象ではないと説明する。full doctor は両 agent を導入したい場合の診断として扱う。<!-- @work-item-id WI-178 -->
+
 `setup:agent` は初回 setup / retrofit / CI-only / agent hook 有効化の agent-readable planner、`config:plan` は安全な設定変更 intent planner。質問が「次に何を実行するか」「この変更はどの file/validation に対応するか」に寄っている場合は、これらの guide と CLI を案内する。<!-- @work-item-id WI-171, WI-172, WI-173 -->
 
+Claude Code readiness の質問では `npx phasegate setup:agent --agent claude --dry-run --json` を案内し、`plan.agentReadiness` の `claude` / `shared` が `configured` なら setup ではなく作業導線へ進める。最短ルートは、WI の確認または起票、`docs/inception/.../{WI-XXX}/` への計画/設計、`docs/product/...` への `@work-item-id WI-XXX` 反映、`phasegate phasegate:check-ready` または該当 `validate` の実行である。`setup:agent --apply --json` の structured `error` は troubleshooting に委譲し、`target` / `operation` / `code` / `recovery` を読ませる。<!-- @work-item-id WI-177 -->
+
 ### 8. skill 一覧と使い分け
 
 ユーザー質問例: