@skillcap/gdh 0.18.2 → 0.19.0

package/node_modules/@gdh/adapters/dist/index.js

@@ -10,11 +10,13 @@ import { createDefaultGuidanceUnits, createDefaultRulesDocument, getGuidanceStat
 import { inspectGuidanceAudit } from "@gdh/observability";
 import { inspectRuntimeBridgeSurface, inspectRuntimeKnowledgeSurface } from "@gdh/runtime";
 import { readInventoryCacheOrScan } from "@gdh/scan";
-import { evaluateDonePolicy, recommendValidationForChange } from "@gdh/verify";
-import { CLAUDE_SETTINGS_RELATIVE_PATH, patchClaudeSettingsForGdhSessionStart, patchClaudeSettingsForGdhStatusline, } from "./claude-settings-patch.js";
+import { CLAUDE_SETTINGS_RELATIVE_PATH, patchClaudeSettingsForGdhAuthoringHooks, patchClaudeSettingsForGdhSessionStart, patchClaudeSettingsForGdhStatusline, } from "./claude-settings-patch.js";
+import { CLAUDE_AUTHORING_HOOK_RELATIVE_PATH, CODEX_AUTHORING_HOOK_COMMAND, CODEX_AUTHORING_HOOK_RELATIVE_PATH, renderGdhAuthoringHook, } from "./authoring-hook-render.js";
 import { CLAUDE_STATUSLINE_RELATIVE_PATH, renderClaudeUpdateStatusline, } from "./claude-statusline-render.js";
 import { CLAUDE_CHECK_UPDATE_HOOK_RELATIVE_PATH, CLAUDE_CHECK_UPDATE_WORKER_RELATIVE_PATH, renderClaudeCheckUpdateHook, } from "./claude-update-hook-render.js";
 import { renderClaudeCheckUpdateWorker } from "./claude-update-worker-render.js";
+import { GDH_MANAGED_AGENT_SKILL_MARKER, renderClaudeCheckSkill, renderClaudeMigrateSkill, renderClaudeOnboardSkill, renderClaudePrepareSkill, renderClaudeScanSkill, renderClaudeStatusSkill, renderClaudeUpdateSkill, renderCodexCheckSkill, renderCodexMigrateSkill, renderCodexOnboardSkill, renderCodexPrepareSkill, renderCodexScanSkill, renderCodexStatusSkill, renderCodexUpdateSkill, renderCursorCheckSkill, renderCursorMigrateSkill, renderCursorOnboardSkill, renderCursorPrepareSkill, renderCursorScanSkill, renderCursorStatusSkill, renderCursorUpdateSkill, } from "./skill-rendering.js";
+export { GDH_MANAGED_AGENT_SKILL_MARKER, GDH_SKILL_DEFINITIONS, GDH_SKILL_IDS, renderGdhSkill, renderManagedSkillMarker, renderClaudeCheckSkill, renderClaudeMigrateSkill, renderClaudeOnboardSkill, renderClaudePrepareSkill, renderClaudeScanSkill, renderClaudeStatusSkill, renderClaudeUpdateSkill, renderCodexCheckSkill, renderCodexMigrateSkill, renderCodexOnboardSkill, renderCodexPrepareSkill, renderCodexScanSkill, renderCodexStatusSkill, renderCodexUpdateSkill, renderCursorCheckSkill, renderCursorMigrateSkill, renderCursorOnboardSkill, renderCursorPrepareSkill, renderCursorScanSkill, renderCursorStatusSkill, renderCursorUpdateSkill, } from "./skill-rendering.js";
 export const adaptersPackage = definePackageBoundary({
     name: "@gdh/adapters",
     layer: "integration",
@@ -26,7 +28,6 @@ export const adaptersPackage = definePackageBoundary({
         "@gdh/observability",
         "@gdh/runtime",
         "@gdh/scan",
-        "@gdh/verify",
     ],
 });
 export const SUPPORTED_AGENTS = [
@@ -35,47 +36,60 @@ export const SUPPORTED_AGENTS = [
     "cursor",
 ];
 export const CLAUDE_SHIM_RELATIVE_PATH = "CLAUDE.md";
-export const CLAUDE_ONBOARD_COMMAND_RELATIVE_PATH = ".claude/commands/gdh/onboard.md";
+export const CLAUDE_ONBOARD_SKILL_RELATIVE_PATH = ".claude/skills/gdh-onboard/SKILL.md";
 export const PROJECT_MCP_RELATIVE_PATH = ".mcp.json";
 export const CURSOR_MCP_RELATIVE_PATH = ".cursor/mcp.json";
 export const CURSOR_RULE_RELATIVE_PATH = ".cursor/rules/gdh-agent.mdc";
 export const CURSOR_ONBOARD_SKILL_RELATIVE_PATH = ".cursor/skills/gdh-onboard/SKILL.md";
 export const CODEX_ONBOARD_SKILL_RELATIVE_PATH = ".agents/skills/gdh-onboard/SKILL.md";
-export const CLAUDE_STATUS_COMMAND_RELATIVE_PATH = ".claude/commands/gdh/status.md";
-export const CLAUDE_MIGRATE_COMMAND_RELATIVE_PATH = ".claude/commands/gdh/migrate.md";
-export const CLAUDE_CHECK_COMMAND_RELATIVE_PATH = ".claude/commands/gdh/check.md";
-export const CLAUDE_PREPARE_COMMAND_RELATIVE_PATH = ".claude/commands/gdh/prepare.md";
-export const CLAUDE_VERIFY_COMMAND_RELATIVE_PATH = ".claude/commands/gdh/verify.md";
+export const CLAUDE_STATUS_SKILL_RELATIVE_PATH = ".claude/skills/gdh-status/SKILL.md";
+export const CLAUDE_MIGRATE_SKILL_RELATIVE_PATH = ".claude/skills/gdh-migrate/SKILL.md";
+export const CLAUDE_CHECK_SKILL_RELATIVE_PATH = ".claude/skills/gdh-check/SKILL.md";
+export const CLAUDE_PREPARE_SKILL_RELATIVE_PATH = ".claude/skills/gdh-prepare/SKILL.md";
 export const CODEX_STATUS_SKILL_RELATIVE_PATH = ".agents/skills/gdh-status/SKILL.md";
 export const CODEX_MIGRATE_SKILL_RELATIVE_PATH = ".agents/skills/gdh-migrate/SKILL.md";
 export const CODEX_CHECK_SKILL_RELATIVE_PATH = ".agents/skills/gdh-check/SKILL.md";
 export const CODEX_PREPARE_SKILL_RELATIVE_PATH = ".agents/skills/gdh-prepare/SKILL.md";
-export const CODEX_VERIFY_SKILL_RELATIVE_PATH = ".agents/skills/gdh-verify/SKILL.md";
 export const CURSOR_STATUS_SKILL_RELATIVE_PATH = ".cursor/skills/gdh-status/SKILL.md";
 export const CURSOR_MIGRATE_SKILL_RELATIVE_PATH = ".cursor/skills/gdh-migrate/SKILL.md";
 export const CURSOR_CHECK_SKILL_RELATIVE_PATH = ".cursor/skills/gdh-check/SKILL.md";
 export const CURSOR_PREPARE_SKILL_RELATIVE_PATH = ".cursor/skills/gdh-prepare/SKILL.md";
-export const CURSOR_VERIFY_SKILL_RELATIVE_PATH = ".cursor/skills/gdh-verify/SKILL.md";
 // Phase 13 SELF-01: /gdh-update skill surface path constants. The rendered
 // bodies shell out to `npx -y @skillcap/gdh@latest self-update` (LITERAL
 // @latest, not the pinned version — D-10) so the NEW CLI performs the update,
 // not the (potentially pre-Phase-12) OLD pinned one. These constants are
 // INTENTIONALLY excluded from VERIFY_DRIFT_SCANNED_FILES (D-13) because the
 // rendered bodies are version-agnostic by design.
-export const CLAUDE_UPDATE_COMMAND_RELATIVE_PATH = ".claude/commands/gdh/update.md";
+export const CLAUDE_UPDATE_SKILL_RELATIVE_PATH = ".claude/skills/gdh-update/SKILL.md";
 export const CODEX_UPDATE_SKILL_RELATIVE_PATH = ".agents/skills/gdh-update/SKILL.md";
 export const CURSOR_UPDATE_SKILL_RELATIVE_PATH = ".cursor/skills/gdh-update/SKILL.md";
-export const CLAUDE_SCAN_COMMAND_RELATIVE_PATH = ".claude/commands/gdh/scan.md";
+export const CLAUDE_SCAN_SKILL_RELATIVE_PATH = ".claude/skills/gdh-scan/SKILL.md";
 export const CODEX_SCAN_SKILL_RELATIVE_PATH = ".agents/skills/gdh-scan/SKILL.md";
+export const CLAUDE_ONBOARD_COMMAND_RELATIVE_PATH = CLAUDE_ONBOARD_SKILL_RELATIVE_PATH;
+export const CLAUDE_STATUS_COMMAND_RELATIVE_PATH = CLAUDE_STATUS_SKILL_RELATIVE_PATH;
+export const CLAUDE_MIGRATE_COMMAND_RELATIVE_PATH = CLAUDE_MIGRATE_SKILL_RELATIVE_PATH;
+export const CLAUDE_CHECK_COMMAND_RELATIVE_PATH = CLAUDE_CHECK_SKILL_RELATIVE_PATH;
+export const CLAUDE_PREPARE_COMMAND_RELATIVE_PATH = CLAUDE_PREPARE_SKILL_RELATIVE_PATH;
+export const CLAUDE_UPDATE_COMMAND_RELATIVE_PATH = CLAUDE_UPDATE_SKILL_RELATIVE_PATH;
+export const CLAUDE_SCAN_COMMAND_RELATIVE_PATH = CLAUDE_SCAN_SKILL_RELATIVE_PATH;
+const LEGACY_CLAUDE_SKILL_COMMAND_RELATIVE_PATHS = [
+    [".claude/commands/gdh/onboard.md", "gdh-onboard"],
+    [".claude/commands/gdh/status.md", "gdh-status"],
+    [".claude/commands/gdh/migrate.md", "gdh-migrate"],
+    [".claude/commands/gdh/update.md", "gdh-update"],
+    [".claude/commands/gdh/check.md", "gdh-check"],
+    [".claude/commands/gdh/prepare.md", "gdh-prepare"],
+    [".claude/commands/gdh/scan.md", "gdh-scan"],
+];
 const LEGACY_CODEX_SKILL_RELATIVE_PATHS = [
-    [".codex/skills/gdh-onboard/SKILL.md", renderCodexOnboardSkill, "gdh-onboard"],
-    [".codex/skills/gdh-status/SKILL.md", renderCodexStatusSkill, "gdh-status"],
-    [".codex/skills/gdh-migrate/SKILL.md", renderCodexMigrateSkill, "gdh-migrate"],
-    [".codex/skills/gdh-update/SKILL.md", renderCodexUpdateSkill, "gdh-update"],
-    [".codex/skills/gdh-check/SKILL.md", renderCodexCheckSkill, "gdh-check"],
-    [".codex/skills/gdh-prepare/SKILL.md", renderCodexPrepareSkill, "gdh-prepare"],
-    [".codex/skills/gdh-verify/SKILL.md", renderCodexVerifySkill, "gdh-verify"],
-    [".codex/skills/gdh-scan/SKILL.md", renderCodexScanSkill, "gdh-scan"],
+    [".codex/skills/gdh-onboard/SKILL.md", "gdh-onboard"],
+    [".codex/skills/gdh-status/SKILL.md", "gdh-status"],
+    [".codex/skills/gdh-migrate/SKILL.md", "gdh-migrate"],
+    [".codex/skills/gdh-update/SKILL.md", "gdh-update"],
+    [".codex/skills/gdh-check/SKILL.md", "gdh-check"],
+    [".codex/skills/gdh-prepare/SKILL.md", "gdh-prepare"],
+    [".codex/skills/gdh-verify/SKILL.md", "gdh-verify"],
+    [".codex/skills/gdh-scan/SKILL.md", "gdh-scan"],
 ];
 export const CURSOR_SCAN_SKILL_RELATIVE_PATH = ".cursor/skills/gdh-scan/SKILL.md";
 export const LOCAL_PATH_HINTS_RELATIVE_PATH = ".gdh-state/local-paths.json";
@@ -83,8 +97,7 @@ export const CODEX_PROJECT_CONFIG_RELATIVE_PATH = ".codex/config.toml";
 export const GDH_MCP_SERVER_NAME = "gdh";
 // Phase 17 UX-01: single source of truth for the `/gdh-status` preview-header
 // literal. The character between "dry-run)" and "not" is em-dash U+2014 (NOT
-// two hyphens). Centralizing here prevents silent drift across the 3
-// `/gdh-status` renderer bodies (Pitfall #5 three-adapter parity).
+// two hyphens). Centralizing here prevents silent drift across shipped skills.
 const PREVIEW_HEADER_LITERAL = "Preview (dry-run) — not applied";
 const execFile = promisify(execFileCallback);
 export async function getSupportedAgentAdaptersStatus(targetPath, options = {}) {
@@ -263,7 +276,6 @@ export async function createGsdSnapshot(targetPath, options = {}) {
     const context = await buildAuthoringContext(targetPath);
     const effectiveRepoState = deriveRepoState(context);
     const files = normalizeChangedFiles(options.files ?? []);
-    const performed = [...new Set(options.performed ?? [])];
     const guidance = await getGuidanceStatus(targetPath);
     const [audit, guidanceResolve] = await Promise.all([
         inspectGuidanceAudit(targetPath),
@@ -282,41 +294,6 @@ export async function createGsdSnapshot(targetPath, options = {}) {
         guidance,
         audit,
     };
-    const validationRecommendation = files.length === 0
-        ? {
-            state: "unavailable",
-            summary: "Validation expectations are unavailable until the snapshot is given changed files.",
-            value: null,
-        }
-        : {
-            state: "available",
-            summary: "Validation expectations were projected from the current GDH verify recommendation surface.",
-            value: await recommendValidationForChange({
-                targetPath,
-                inventory: context.inventory,
-                status: context.status,
-                projectConfig: context.projectConfig,
-                files,
-            }),
-        };
-    const donePolicy = validationRecommendation.value === null
-        ? {
-            state: "unavailable",
-            summary: "Done-policy evaluation is unavailable until changed files are supplied for the snapshot.",
-            value: null,
-        }
-        : {
-            state: "available",
-            summary: "Done-policy evaluation was projected from the current GDH verify done surface.",
-            value: await evaluateDonePolicy({
-                targetPath,
-                inventory: context.inventory,
-                status: context.status,
-                projectConfig: context.projectConfig,
-                files,
-                performed,
-            }),
-        };
     return {
         targetPath,
         adapter: {
@@ -326,12 +303,9 @@ export async function createGsdSnapshot(targetPath, options = {}) {
             summary: "The GSD bridge is an optional read-mostly adapter over stable GDH outputs and is not required for core GDH behavior.",
         },
         files,
-        performed,
         status: context.status,
         guidanceStatus,
         guidanceResolve,
-        validationRecommendation,
-        donePolicy,
     };
 }
 export function renderCursorRule() {
@@ -351,1016 +325,25 @@ export function renderCursorRule() {
     ].join("\n");
 }
 export function renderClaudeOnboardCommand(pinnedVersion) {
-    return [
-        "---",
-        "name: gdh:onboard",
-        "description: Finish GDH setup handoff and report project readiness",
-        "allowed-tools:",
-        "  - Read",
-        "  - Grep",
-        "  - Glob",
-        "  - Bash",
-        "  - AskUserQuestion",
-        "---",
-        "<objective>",
-        `Finish the first-time GDH handoff after \`npx -y @skillcap/gdh@${pinnedVersion} setup\` and turn the generated GDH surface into a trustworthy starting point for real work.`,
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `1. Confirm the selected target and current GDH state with \`npx -y @skillcap/gdh@${pinnedVersion} status\`.`,
-        "2. Read `.gdh/project.yaml`, `docs/agent/README.md`, and `docs/agent/00-gdh-onboarding.md` before asking for facts GDH already knows.",
-        `3. Check immediate readiness with \`npx -y @skillcap/gdh@${pinnedVersion} guidance status\` and \`npx -y @skillcap/gdh@${pinnedVersion} target prepare --dry-run\`.`,
-        `4. If authoring is available, run \`npx -y @skillcap/gdh@${pinnedVersion} authoring check\`; if LSP matters, run \`npx -y @skillcap/gdh@${pinnedVersion} lsp status\`.`,
-        `5. Inspect \`npx -y @skillcap/gdh@${pinnedVersion} run-config list\` and \`npx -y @skillcap/gdh@${pinnedVersion} verification-scenario list\` and call out anything draft, missing, or blocked.`,
-        "6. If GDH reports `godot_editor_not_configured`, explain that the Godot binary path is machine-local and offer to record `.gdh-state/local-paths.json` `godotEditorBinPath` once the human provides the local path.",
-        "7. Ask the human only for narrow unresolved environment or target facts.",
-        "8. End with a concise readiness summary and the exact next development step.",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do not start editing code during `/gdh-onboard` unless the human explicitly asks.",
-        "- Prefer GDH structured surfaces over repo guesswork.",
-        "- Keep the output short, operational, and specific.",
-        "- For cache/persistence behavior of scan, status, onboard: see `docs/agent/persistence-semantics.md`.",
-        "</rules>",
-        "",
-    ].join("\n");
+    return renderClaudeOnboardSkill(pinnedVersion);
 }
-export function renderCodexOnboardSkill(pinnedVersion) {
-    return [
-        "---",
-        'name: "gdh-onboard"',
-        'description: "Finish GDH setup handoff and report project readiness"',
-        "metadata:",
-        '  short-description: "Finish GDH setup handoff and report project readiness"',
-        "---",
-        "",
-        "<codex_skill_adapter>",
-        "## Invocation",
-        "- This skill is invoked when the user says `/gdh-onboard` or mentions `$gdh-onboard`.",
-        "- Treat any extra user text as additional onboarding context.",
-        "",
-        "## User questions",
-        "- Ask only narrow follow-up questions when GDH cannot infer the missing setup fact safely.",
-        "- If structured user-input tooling is unavailable, ask concise plain-text questions instead.",
-        "</codex_skill_adapter>",
-        "",
-        "<objective>",
-        `Finish the first-time GDH handoff after \`npx -y @skillcap/gdh@${pinnedVersion} setup\` and turn the generated GDH surface into a trustworthy starting point for real work.`,
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} status\``,
-        "- inspect `.gdh/project.yaml`, `docs/agent/README.md`, and `docs/agent/00-gdh-onboarding.md`",
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} guidance status\``,
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} target prepare --dry-run\``,
-        `- if authoring is available, run \`npx -y @skillcap/gdh@${pinnedVersion} authoring check\``,
-        `- if LSP matters, run \`npx -y @skillcap/gdh@${pinnedVersion} lsp status\``,
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} run-config list\``,
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} verification-scenario list\``,
-        "- if GDH reports `godot_editor_not_configured`, explain that the Godot binary path is machine-local and offer to record `.gdh-state/local-paths.json` `godotEditorBinPath` once the user provides it",
-        "- ask only for narrow unresolved environment or target facts",
-        "- finish with a concise readiness summary and the exact next development step",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do not start editing code during `/gdh-onboard` unless the human explicitly asks.",
-        "- Prefer GDH structured surfaces over repo guesswork.",
-        "- Keep output short, operational, and specific.",
-        "- For cache/persistence behavior of scan, status, onboard: see `docs/agent/persistence-semantics.md`.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-export function renderCursorOnboardSkill(pinnedVersion) {
-    return [
-        "---",
-        "name: gdh-onboard",
-        'description: "Finish GDH setup handoff and report project readiness"',
-        "---",
-        "",
-        "<cursor_skill_adapter>",
-        "## Invocation",
-        "- This skill is invoked when the user says `/gdh-onboard` or mentions `gdh-onboard`.",
-        "- Treat any extra user text as additional onboarding context.",
-        "",
-        "## User questions",
-        "- Ask only narrow follow-up questions when GDH cannot infer the missing setup fact safely.",
-        "- Keep questions conversational and concise.",
-        "</cursor_skill_adapter>",
-        "",
-        "<objective>",
-        `Finish the first-time GDH handoff after \`npx -y @skillcap/gdh@${pinnedVersion} setup\` and turn the generated GDH surface into a trustworthy starting point for real work.`,
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} status\``,
-        "- inspect `.gdh/project.yaml`, `docs/agent/README.md`, and `docs/agent/00-gdh-onboarding.md`",
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} guidance status\``,
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} target prepare --dry-run\``,
-        `- if authoring is available, run \`npx -y @skillcap/gdh@${pinnedVersion} authoring check\``,
-        `- if LSP matters, run \`npx -y @skillcap/gdh@${pinnedVersion} lsp status\``,
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} run-config list\``,
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} verification-scenario list\``,
-        "- if GDH reports `godot_editor_not_configured`, explain that the Godot binary path is machine-local and offer to record `.gdh-state/local-paths.json` `godotEditorBinPath` once the user provides it",
-        "- ask only for narrow unresolved environment or target facts",
-        "- finish with a concise readiness summary and the exact next development step",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do not start editing code during `/gdh-onboard` unless the human explicitly asks.",
-        "- Prefer GDH structured surfaces over repo guesswork.",
-        "- Keep output short, operational, and specific.",
-        "- For cache/persistence behavior of scan, status, onboard: see `docs/agent/persistence-semantics.md`.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-// --- gdh-status skill renders ---
 export function renderClaudeStatusCommand(pinnedVersion) {
-    return [
-        "---",
-        "name: gdh:status",
-        "description: Check GDH project readiness, surface migration needs, and suggest next step",
-        "allowed-tools:",
-        "  - Read",
-        "  - Grep",
-        "  - Glob",
-        "  - Bash",
-        "---",
-        "<objective>",
-        "Check GDH project readiness, surface migration needs, and suggest the most productive next step.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `1. Run \`npx -y @skillcap/gdh@${pinnedVersion} status\` and explain each readiness field.`,
-        "2. Distinguish `blockingReasons` (needs /gdh-update or manual intervention) from `coupledReasons` (fixable via /gdh-migrate).",
-        `3. Check if migration is needed with \`npx -y @skillcap/gdh@${pinnedVersion} migrate\`.`,
-        `4. ${PREVIEW_HEADER_LITERAL} — migrate output at this step describes planned actions ("would delete …") not applied ones ("deleted").`,
-        "5. If status JSON `recoveryHints` array is non-empty, surface each entry's `{command, skillName}` pair.",
-        "6. Surface any degraded or unavailable capabilities.",
-        "7. Suggest the most productive next step based on current state.",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do not start editing code.",
-        "- Prefer structured GDH surfaces over repo guesswork.",
-        "- Keep output short and operational.",
-        "- For cache/persistence behavior of scan, status, onboard: see `docs/agent/persistence-semantics.md`.",
-        "</rules>",
-        "",
-    ].join("\n");
+    return renderClaudeStatusSkill(pinnedVersion);
 }
-export function renderCodexStatusSkill(pinnedVersion) {
-    return [
-        "---",
-        'name: "gdh-status"',
-        'description: "Check GDH project readiness, surface migration needs, and suggest next step"',
-        "metadata:",
-        '  short-description: "Check GDH project readiness, surface migration needs, and suggest next step"',
-        "---",
-        "",
-        "<codex_skill_adapter>",
-        "## Invocation",
-        "- This skill is invoked when the user says `/gdh-status` or mentions `$gdh-status`.",
-        "- Treat any extra user text as additional status context.",
-        "",
-        "## User questions",
-        "- Ask only narrow follow-up questions when GDH cannot infer the missing fact safely.",
-        "- If structured user-input tooling is unavailable, ask concise plain-text questions instead.",
-        "</codex_skill_adapter>",
-        "",
-        "<objective>",
-        "Check GDH project readiness, surface migration needs, and suggest the most productive next step.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} status\` and explain each readiness field`,
-        "- distinguish `blockingReasons` (needs /gdh-update or manual intervention) from `coupledReasons` (fixable via /gdh-migrate)",
-        `- check if migration is needed with \`npx -y @skillcap/gdh@${pinnedVersion} migrate\``,
-        `- ${PREVIEW_HEADER_LITERAL} — migrate output describes planned actions ("would delete …") not applied ones ("deleted")`,
-        "- if status JSON `recoveryHints` array is non-empty, surface each entry's `{command, skillName}` pair",
-        "- surface any degraded or unavailable capabilities",
-        "- suggest the most productive next step based on current state",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do not start editing code.",
-        "- Prefer structured GDH surfaces over repo guesswork.",
-        "- Keep output short and operational.",
-        "- For cache/persistence behavior of scan, status, onboard: see `docs/agent/persistence-semantics.md`.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-export function renderCursorStatusSkill(pinnedVersion) {
-    return [
-        "---",
-        "name: gdh-status",
-        'description: "Check GDH project readiness, surface migration needs, and suggest next step"',
-        "---",
-        "",
-        "<cursor_skill_adapter>",
-        "## Invocation",
-        "- This skill is invoked when the user says `/gdh-status` or mentions `gdh-status`.",
-        "- Treat any extra user text as additional status context.",
-        "",
-        "## User questions",
-        "- Ask only narrow follow-up questions when GDH cannot infer the missing fact safely.",
-        "- Keep questions conversational and concise.",
-        "</cursor_skill_adapter>",
-        "",
-        "<objective>",
-        "Check GDH project readiness, surface migration needs, and suggest the most productive next step.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} status\` and explain each readiness field`,
-        "- distinguish `blockingReasons` (needs /gdh-update or manual intervention) from `coupledReasons` (fixable via /gdh-migrate)",
-        `- check if migration is needed with \`npx -y @skillcap/gdh@${pinnedVersion} migrate\``,
-        `- ${PREVIEW_HEADER_LITERAL} — migrate output describes planned actions ("would delete …") not applied ones ("deleted")`,
-        "- if status JSON `recoveryHints` array is non-empty, surface each entry's `{command, skillName}` pair",
-        "- surface any degraded or unavailable capabilities",
-        "- suggest the most productive next step based on current state",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do not start editing code.",
-        "- Prefer structured GDH surfaces over repo guesswork.",
-        "- Keep output short and operational.",
-        "- For cache/persistence behavior of scan, status, onboard: see `docs/agent/persistence-semantics.md`.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-// --- gdh-scan skill renders ---
 export function renderClaudeScanCommand(pinnedVersion) {
-    return [
-        "---",
-        "name: gdh:scan",
-        "description: Refresh inventory cache and explain persistence effect",
-        "allowed-tools:",
-        "  - Read",
-        "  - Grep",
-        "  - Glob",
-        "  - Bash",
-        "---",
-        "<objective>",
-        "Refresh the inventory cache and explain the persistence effect of the scan.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `1. Run \`npx -y @skillcap/gdh@${pinnedVersion} scan\` and parse the \`persisted\` field from the envelope.`,
-        "2. Check the `mode` field: `create`, `unchanged`, `overwrite`, or `null`.",
-        "3. Explain the persistence effect; if `null`, the target is not onboarded and no disk write occurred.",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do not edit the persisted inventory directly.",
-        "- Prefer the cached inventory for status reads; re-run scan only when freshness is in question.",
-        "- For cache/persistence behavior of scan, status, onboard: see `docs/agent/persistence-semantics.md`.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-export function renderCodexScanSkill(pinnedVersion) {
-    return [
-        "---",
-        'name: "gdh-scan"',
-        'description: "Refresh inventory cache and explain persistence effect"',
-        "metadata:",
-        '  short-description: "Refresh inventory cache and explain persistence effect"',
-        "---",
-        "",
-        "<codex_skill_adapter>",
-        "## Invocation",
-        "- This skill is invoked when the user says `/gdh-scan` or mentions `$gdh-scan`.",
-        "- Treat any extra user text as additional scan context.",
-        "",
-        "## User questions",
-        "- Ask only narrow follow-up questions when GDH cannot infer the missing fact safely.",
-        "- If structured user-input tooling is unavailable, ask concise plain-text questions instead.",
-        "</codex_skill_adapter>",
-        "",
-        "<objective>",
-        "Refresh the inventory cache and explain the persistence effect of the scan.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} scan\``,
-        "- parse the `persisted` field from the envelope",
-        "- check `mode`: `create`, `unchanged`, `overwrite`, or `null`",
-        "- explain the persistence effect; if `null`, explain the target is not onboarded",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do not edit the persisted inventory directly.",
-        "- Prefer the cached inventory for status reads; re-run scan only when freshness is in question.",
-        "- For cache/persistence behavior of scan, status, onboard: see `docs/agent/persistence-semantics.md`.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-export function renderCursorScanSkill(pinnedVersion) {
-    return [
-        "---",
-        "name: gdh-scan",
-        'description: "Refresh inventory cache and explain persistence effect"',
-        "---",
-        "",
-        "<cursor_skill_adapter>",
-        "## Invocation",
-        "- This skill is invoked when the user says `/gdh-scan` or mentions `gdh-scan`.",
-        "- Treat any extra user text as additional scan context.",
-        "",
-        "## User questions",
-        "- Ask only narrow follow-up questions when GDH cannot infer the missing fact safely.",
-        "- Keep questions conversational and concise.",
-        "</cursor_skill_adapter>",
-        "",
-        "<objective>",
-        "Refresh the inventory cache and explain the persistence effect of the scan.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} scan\``,
-        "- parse the `persisted` field from the envelope",
-        "- check `mode`: `create`, `unchanged`, `overwrite`, or `null`",
-        "- explain the persistence effect; if `null`, explain the target is not onboarded",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do not edit the persisted inventory directly.",
-        "- Prefer the cached inventory for status reads; re-run scan only when freshness is in question.",
-        "- For cache/persistence behavior of scan, status, onboard: see `docs/agent/persistence-semantics.md`.",
-        "</rules>",
-        "",
-    ].join("\n");
+    return renderClaudeScanSkill(pinnedVersion);
 }
-// --- gdh-migrate skill renders ---
 export function renderClaudeMigrateCommand(pinnedVersion) {
-    return [
-        "---",
-        "name: gdh:migrate",
-        "description: Preview and apply GDH project migrations",
-        "allowed-tools:",
-        "  - Read",
-        "  - Grep",
-        "  - Glob",
-        "  - Bash",
-        "  - AskUserQuestion",
-        "---",
-        "<objective>",
-        "Preview and apply GDH project migrations safely with explicit user approval.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `1. Run \`npx -y @skillcap/gdh@${pinnedVersion} migrate\` to preview pending migrations (this is a dry-run; the JSON \`mode\` field will be \`"preview"\`).`,
-        "2. Inspect `compatibility.blockingReasons` vs `compatibility.coupledReasons` — if `blockingReasons` is non-empty, STOP: `migrate --apply` cannot fix them (recommend `/gdh-update` or manual intervention per each reason's recovery hint). If only `coupledReasons` is non-empty, proceed.",
-        '3. Explain what each migration step will change and why (use "would" verb forms — "would delete", "would create", "would refresh").',
-        `4. Offer to run \`npx -y @skillcap/gdh@${pinnedVersion} migrate --apply\` if the user approves — after apply, the JSON \`mode\` field becomes \`"applied"\` and verbs switch to past tense ("deleted", "created", "refreshed").`,
-        "5. After apply, read `terminal.state` in the stdout JSON.",
-        "6. If `terminal.state` is `healthy`, confirm no further migration action is required and stop.",
-        "7. If `terminal.state` is `follow_up_required`, run the surfaced `terminal.commands`, then run the surfaced `terminal.validationCommands`, and confirm the follow-up results before stopping.",
-        "8. If `terminal.state` is `manual_review_required`, run any surfaced `terminal.commands` first because they are auto-applicable, then run the surfaced `terminal.validationCommands`, explain the remaining `terminal.manualSteps`, and stop for review instead of improvising a repair.",
-        "9. If `terminal.state` is `blocked`, surface `terminal.summary` plus the reasons and stop.",
-        "</process>",
-        "",
-        "<rules>",
-        "- Never apply migrations without explicit user approval.",
-        "- Show the dry-run output first.",
-        "- Keep explanations concise.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-export function renderCodexMigrateSkill(pinnedVersion) {
-    return [
-        "---",
-        'name: "gdh-migrate"',
-        'description: "Preview and apply GDH project migrations"',
-        "metadata:",
-        '  short-description: "Preview and apply GDH project migrations"',
-        "---",
-        "",
-        "<codex_skill_adapter>",
-        "## Invocation",
-        "- This skill is invoked when the user says `/gdh-migrate` or mentions `$gdh-migrate`.",
-        "- Treat any extra user text as additional migration context.",
-        "",
-        "## User questions",
-        "- Always ask before applying migrations.",
-        "- If structured user-input tooling is unavailable, ask concise plain-text questions instead.",
-        "</codex_skill_adapter>",
-        "",
-        "<objective>",
-        "Preview and apply GDH project migrations safely with explicit user approval.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} migrate\` to preview pending migrations (this is a dry-run; the JSON \`mode\` field will be \`"preview"\`)`,
-        "- inspect `compatibility.blockingReasons` vs `compatibility.coupledReasons` — if `blockingReasons` is non-empty, STOP: `migrate --apply` cannot fix them (recommend `/gdh-update` or manual intervention per each reason's recovery hint); if only `coupledReasons` is non-empty, proceed",
-        '- explain what each migration step will change and why (use "would" verb forms — "would delete", "would create", "would refresh")',
-        `- offer to run \`npx -y @skillcap/gdh@${pinnedVersion} migrate --apply\` if the user approves — after apply, the JSON \`mode\` field becomes \`"applied"\` and verbs switch to past tense ("deleted", "created", "refreshed")`,
-        "- after apply, read `terminal.state` in the stdout JSON",
-        "- if `terminal.state` is `healthy`, confirm no further migration action is required and stop",
-        "- if `terminal.state` is `follow_up_required`, run the surfaced `terminal.commands`, then run the surfaced `terminal.validationCommands`, and confirm the follow-up results before stopping",
-        "- if `terminal.state` is `manual_review_required`, run any surfaced `terminal.commands` first because they are auto-applicable, then run the surfaced `terminal.validationCommands`, explain the remaining `terminal.manualSteps`, and stop for review instead of improvising a repair",
-        "- if `terminal.state` is `blocked`, surface `terminal.summary` plus the reasons and stop",
-        "</process>",
-        "",
-        "<rules>",
-        "- Never apply migrations without explicit user approval.",
-        "- Show the dry-run output first.",
-        "- Keep explanations concise.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-export function renderCursorMigrateSkill(pinnedVersion) {
-    return [
-        "---",
-        "name: gdh-migrate",
-        'description: "Preview and apply GDH project migrations"',
-        "---",
-        "",
-        "<cursor_skill_adapter>",
-        "## Invocation",
-        "- This skill is invoked when the user says `/gdh-migrate` or mentions `gdh-migrate`.",
-        "- Treat any extra user text as additional migration context.",
-        "",
-        "## User questions",
-        "- Always ask before applying migrations.",
-        "- Keep questions conversational and concise.",
-        "</cursor_skill_adapter>",
-        "",
-        "<objective>",
-        "Preview and apply GDH project migrations safely with explicit user approval.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} migrate\` to preview pending migrations (this is a dry-run; the JSON \`mode\` field will be \`"preview"\`)`,
-        "- inspect `compatibility.blockingReasons` vs `compatibility.coupledReasons` — if `blockingReasons` is non-empty, STOP: `migrate --apply` cannot fix them (recommend `/gdh-update` or manual intervention per each reason's recovery hint); if only `coupledReasons` is non-empty, proceed",
-        '- explain what each migration step will change and why (use "would" verb forms — "would delete", "would create", "would refresh")',
-        `- offer to run \`npx -y @skillcap/gdh@${pinnedVersion} migrate --apply\` if the user approves — after apply, the JSON \`mode\` field becomes \`"applied"\` and verbs switch to past tense ("deleted", "created", "refreshed")`,
-        "- after apply, read `terminal.state` in the stdout JSON",
-        "- if `terminal.state` is `healthy`, confirm no further migration action is required and stop",
-        "- if `terminal.state` is `follow_up_required`, run the surfaced `terminal.commands`, then run the surfaced `terminal.validationCommands`, and confirm the follow-up results before stopping",
-        "- if `terminal.state` is `manual_review_required`, run any surfaced `terminal.commands` first because they are auto-applicable, then run the surfaced `terminal.validationCommands`, explain the remaining `terminal.manualSteps`, and stop for review instead of improvising a repair",
-        "- if `terminal.state` is `blocked`, surface `terminal.summary` plus the reasons and stop",
-        "</process>",
-        "",
-        "<rules>",
-        "- Never apply migrations without explicit user approval.",
-        "- Show the dry-run output first.",
-        "- Keep explanations concise.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-// --- gdh-update skill renders (Phase 13 SELF-01) ---
-//
-// D-10 invariant: every rendered body shells out to the LITERAL string
-// `@skillcap/gdh@latest` in every npx line (dry-run, apply, verify drift).
-// The `pinnedVersion` parameter is accepted for planSkillInstallAction
-// signature symmetry with every other renderer, but MUST NOT be interpolated
-// into the shellout — running the OLD pinned CLI (potentially pre-Phase-12
-// and lacking bumpAndRebakePin entirely) to perform its own update is the
-// failure mode Phase 13 exists to close. Check 44 in scripts/validate-docs.mjs
-// enforces both the @latest presence AND the @${pinnedVersion} absence.
-//
-// Phase 41 update-flow policy: preview first, then explicit approval before
-// apply, then terminal-driven follow-through. The renderers still avoid
-// adapter-specific branching logic here — they all consume the same
-// structured `preview` JSON from `gdh self-update --dry-run`, then after
-// apply they use `terminal.state` as the final truth for whether the update
-// is healthy, needs follow-up commands, needs manual review, or is blocked.
-//
-// D-12: accept an optional positional version forwarded verbatim to the CLI.
-// `/gdh-update` = latest; `/gdh-update 0.6.0` = pin that version.
-//
-// D-13: the three rendered skill files are EXCLUDED from VERIFY_DRIFT_SCANNED_FILES
-// because @latest is not a semver literal — the baked-version scanner would
-// permanently report no_baked_version. See rationale comments adjacent to the
-// VERIFY_DRIFT_SCANNED_FILES declaration in packages/cli/src/index.ts.
-export function renderClaudeUpdateCommand(_pinnedVersion) {
-    return [
-        "---",
-        "name: gdh:update",
-        "description: Update GDH to npm latest (bump pinned version + re-bake managed surfaces)",
-        "allowed-tools:",
-        "  - Read",
-        "  - Bash",
-        "---",
-        "<objective>",
-        "Update this project's GDH pinning to npm latest and re-bake every managed surface at the new pin.",
-        "Treat any positional argument (e.g., `/gdh-update 0.6.0`) as an explicit version; otherwise default to npm latest.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        "1. Preview: run `npx -y @skillcap/gdh@latest self-update [version] --dry-run` (omit `[version]` to preview against npm latest).",
-        "2. Read the `preview` field in the stdout JSON. If `preview.state` is `blocked`, surface the issues and stop. If `preview.state` is `noop`, explain the project is already at the target version and stop.",
-        "3. When `preview.state` is `ready`, summarize the current version, target version, intervening releases, bounded release highlights, ordered steps, and which work is `mechanical`, `agent_reasoning`, or `manual_review`.",
-        "4. Ask for explicit approval before apply.",
-        "5. Apply: run `npx -y @skillcap/gdh@latest self-update [version]` (omit `[version]` to apply against npm latest; forward whatever positional the user passed to `/gdh-update`).",
-        "6. If this chat or editor keeps a long-lived GDH MCP session alive, do the MCP cleanup yourself before trusting MCP follow-up output: stop stale `gdh mcp serve` / `@skillcap/gdh ... mcp serve` processes for this target when possible, then let the next MCP connection restart from the updated config. If the client owns reconnection and the process cannot be controlled from Bash, report that limitation after attempting cleanup.",
-        "7. Verify baked pinning: run `npx -y @skillcap/gdh@latest verify drift` to confirm every managed skill/command surface matches the new pin. This does not validate runtime bridge or other lifecycle surfaces.",
-        "8. Read `terminal.state` in the apply stdout JSON and treat it as the lifecycle/runtime truth.",
-        "9. If `terminal.state` is `healthy`, confirm the update completed and stop.",
-        "10. If `terminal.state` is `follow_up_required`, run the surfaced `terminal.commands`, then run the surfaced `terminal.validationCommands`, and confirm the follow-up results before stopping.",
-        "11. If `terminal.state` is `manual_review_required`, run any surfaced `terminal.commands` first because they are auto-applicable, then run the surfaced `terminal.validationCommands`, explain the remaining `terminal.manualSteps`, and stop for review instead of inventing a repair.",
-        "12. If `terminal.state` is `blocked`, surface `terminal.summary` plus the reasons and stop.",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do ask for explicit approval after the structured preview and before apply.",
-        "- Do not invent migration steps from prose docs; use the machine-readable `preview` payload.",
-        "- Do treat `terminal.state` as the primary apply truth; the additive compatibility fields are not the main follow-through contract.",
-        "- `terminal.commands` contains only GDH-classified auto-applicable follow-up; project-owned review stays in `terminal.manualSteps`.",
-        "- Bake literal `@latest` in the shellout so the new CLI performs the update, not the old one.",
-        "- If `self-update` returns `rolled_back` or `blocked`, surface the failure reason and stop (do not retry).",
-        "- If `self-update` returns `skipped_dev_mode`, explain that dev-from-source mode bypasses pinning; no action needed.",
-        "</rules>",
-        "",
-    ].join("\n");
+    return renderClaudeMigrateSkill(pinnedVersion);
 }
-export function renderCodexUpdateSkill(_pinnedVersion) {
-    return [
-        "---",
-        'name: "gdh-update"',
-        'description: "Update GDH to npm latest (bump pinned version + re-bake managed surfaces)"',
-        "metadata:",
-        '  short-description: "Update GDH to npm latest"',
-        "---",
-        "",
-        "<codex_skill_adapter>",
-        "## Invocation",
-        "- This skill is invoked when the user says `/gdh-update` or mentions `$gdh-update`.",
-        "- Treat any positional argument (e.g., `/gdh-update 0.6.0`) as an explicit version; otherwise default to npm latest.",
-        "</codex_skill_adapter>",
-        "",
-        "<objective>",
-        "Update this project's GDH pinning to npm latest and re-bake every managed surface at the new pin.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        "1. Preview: run `npx -y @skillcap/gdh@latest self-update [version] --dry-run` (omit `[version]` to preview against npm latest).",
-        "2. Read the `preview` field in the stdout JSON. If `preview.state` is `blocked`, surface the issues and stop. If `preview.state` is `noop`, explain the project is already at the target version and stop.",
-        "3. When `preview.state` is `ready`, summarize the current version, target version, intervening releases, bounded release highlights, ordered steps, and which work is `mechanical`, `agent_reasoning`, or `manual_review`.",
-        "4. Ask for explicit approval before apply.",
-        "5. Apply: run `npx -y @skillcap/gdh@latest self-update [version]` (omit `[version]` to apply against npm latest; forward whatever positional the user passed to `/gdh-update`).",
-        "6. If this chat or editor keeps a long-lived GDH MCP session alive, do the MCP cleanup yourself before trusting MCP follow-up output: stop stale `gdh mcp serve` / `@skillcap/gdh ... mcp serve` processes for this target when possible, then let the next MCP connection restart from the updated config. If the client owns reconnection and the process cannot be controlled from Bash, report that limitation after attempting cleanup.",
-        "7. Verify baked pinning: run `npx -y @skillcap/gdh@latest verify drift` to confirm every managed skill/command surface matches the new pin. This does not validate runtime bridge or other lifecycle surfaces.",
-        "8. Read `terminal.state` in the apply stdout JSON and treat it as the lifecycle/runtime truth.",
-        "9. If `terminal.state` is `healthy`, confirm the update completed and stop.",
-        "10. If `terminal.state` is `follow_up_required`, run the surfaced `terminal.commands`, then run the surfaced `terminal.validationCommands`, and confirm the follow-up results before stopping.",
-        "11. If `terminal.state` is `manual_review_required`, run any surfaced `terminal.commands` first because they are auto-applicable, then run the surfaced `terminal.validationCommands`, explain the remaining `terminal.manualSteps`, and stop for review instead of inventing a repair.",
-        "12. If `terminal.state` is `blocked`, surface `terminal.summary` plus the reasons and stop.",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do ask for explicit approval after the structured preview and before apply.",
-        "- Do not invent migration steps from prose docs; use the machine-readable `preview` payload.",
-        "- Do treat `terminal.state` as the primary apply truth; the additive compatibility fields are not the main follow-through contract.",
-        "- `terminal.commands` contains only GDH-classified auto-applicable follow-up; project-owned review stays in `terminal.manualSteps`.",
-        "- Bake literal `@latest` in the shellout so the new CLI performs the update, not the old one.",
-        "- If `self-update` returns `rolled_back` or `blocked`, surface the failure reason and stop (do not retry).",
-        "- If `self-update` returns `skipped_dev_mode`, explain that dev-from-source mode bypasses pinning; no action needed.",
-        "</rules>",
-        "",
-    ].join("\n");
+export function renderClaudeUpdateCommand(pinnedVersion) {
+    return renderClaudeUpdateSkill(pinnedVersion);
 }
-export function renderCursorUpdateSkill(_pinnedVersion) {
-    return [
-        "---",
-        "name: gdh-update",
-        'description: "Update GDH to npm latest (bump pinned version + re-bake managed surfaces)"',
-        "---",
-        "",
-        "<cursor_skill_adapter>",
-        "## Invocation",
-        "- This skill is invoked when the user says `/gdh-update` or mentions `gdh-update`.",
-        "- Treat any positional argument (e.g., `gdh-update 0.6.0`) as an explicit version; otherwise default to npm latest.",
-        "</cursor_skill_adapter>",
-        "",
-        "<objective>",
-        "Update this project's GDH pinning to npm latest and re-bake every managed surface at the new pin.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        "1. Preview: run `npx -y @skillcap/gdh@latest self-update [version] --dry-run` (omit `[version]` to preview against npm latest).",
-        "2. Read the `preview` field in the stdout JSON. If `preview.state` is `blocked`, surface the issues and stop. If `preview.state` is `noop`, explain the project is already at the target version and stop.",
-        "3. When `preview.state` is `ready`, summarize the current version, target version, intervening releases, bounded release highlights, ordered steps, and which work is `mechanical`, `agent_reasoning`, or `manual_review`.",
-        "4. Ask for explicit approval before apply.",
-        "5. Apply: run `npx -y @skillcap/gdh@latest self-update [version]` (omit `[version]` to apply against npm latest; forward whatever positional the user passed to `/gdh-update`).",
-        "6. If this chat or editor keeps a long-lived GDH MCP session alive, do the MCP cleanup yourself before trusting MCP follow-up output: stop stale `gdh mcp serve` / `@skillcap/gdh ... mcp serve` processes for this target when possible, then let the next MCP connection restart from the updated config. If the client owns reconnection and the process cannot be controlled from Bash, report that limitation after attempting cleanup.",
-        "7. Verify baked pinning: run `npx -y @skillcap/gdh@latest verify drift` to confirm every managed skill/command surface matches the new pin. This does not validate runtime bridge or other lifecycle surfaces.",
-        "8. Read `terminal.state` in the apply stdout JSON and treat it as the lifecycle/runtime truth.",
-        "9. If `terminal.state` is `healthy`, confirm the update completed and stop.",
-        "10. If `terminal.state` is `follow_up_required`, run the surfaced `terminal.commands`, then run the surfaced `terminal.validationCommands`, and confirm the follow-up results before stopping.",
-        "11. If `terminal.state` is `manual_review_required`, run any surfaced `terminal.commands` first because they are auto-applicable, then run the surfaced `terminal.validationCommands`, explain the remaining `terminal.manualSteps`, and stop for review instead of inventing a repair.",
-        "12. If `terminal.state` is `blocked`, surface `terminal.summary` plus the reasons and stop.",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do ask for explicit approval after the structured preview and before apply.",
-        "- Do not invent migration steps from prose docs; use the machine-readable `preview` payload.",
-        "- Do treat `terminal.state` as the primary apply truth; the additive compatibility fields are not the main follow-through contract.",
-        "- `terminal.commands` contains only GDH-classified auto-applicable follow-up; project-owned review stays in `terminal.manualSteps`.",
-        "- Bake literal `@latest` in the shellout so the new CLI performs the update, not the old one.",
-        "- If `self-update` returns `rolled_back` or `blocked`, surface the failure reason and stop (do not retry).",
-        "- If `self-update` returns `skipped_dev_mode`, explain that dev-from-source mode bypasses pinning; no action needed.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-// --- gdh-check skill renders ---
 export function renderClaudeCheckCommand(pinnedVersion) {
-    return [
-        "---",
-        "name: gdh:check",
-        "description: Run GDH authoring checks and explain diagnostics",
-        "allowed-tools:",
-        "  - Read",
-        "  - Grep",
-        "  - Glob",
-        "  - Bash",
-        "---",
-        "<objective>",
-        "Run GDH authoring checks and explain diagnostics in human-readable terms.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `1. Run \`npx -y @skillcap/gdh@${pinnedVersion} lsp status\` only for lifecycle visibility; do not treat lifecycle readiness as diagnostic evidence.`,
-        `2. Run \`npx -y @skillcap/gdh@${pinnedVersion} authoring check\` to collect validator evidence.`,
-        "3. Explain each diagnostic finding with severity, provenance, and validator family (`gdscript_lsp` for `.gd`, `godot_scene_resource` for `.tscn`/`.tres`).",
-        "4. Surface any import-state caveats or editor-side warnings.",
-        `5. If stale managed LSP state is suspected, use bounded GDH cleanup such as \`npx -y @skillcap/gdh@${pinnedVersion} lsp prune\` or \`npx -y @skillcap/gdh@${pinnedVersion} lsp stop\`; do not hand-manage Godot LSP processes.`,
-        "6. If issues found, suggest concrete remediation steps.",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do not fix issues automatically unless asked.",
-        "- Do not hand-manage Godot LSP processes; use GDH lifecycle commands.",
-        "- The gdh lsp lifecycle commands are status, prune, and stop.",
-        "- Explain diagnostics in human-readable terms.",
-        "- A ready `authoring.lsp` lifecycle is not proof that the authoring check collected diagnostics.",
-        "- Report both hard failures and informational caveats.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-export function renderCodexCheckSkill(pinnedVersion) {
-    return [
-        "---",
-        'name: "gdh-check"',
-        'description: "Run GDH authoring checks and explain diagnostics"',
-        "metadata:",
-        '  short-description: "Run GDH authoring checks and explain diagnostics"',
-        "---",
-        "",
-        "<codex_skill_adapter>",
-        "## Invocation",
-        "- This skill is invoked when the user says `/gdh-check` or mentions `$gdh-check`.",
-        "- Treat any extra user text as additional check context.",
-        "",
-        "## User questions",
-        "- Ask only narrow follow-up questions when GDH cannot infer the missing fact safely.",
-        "- If structured user-input tooling is unavailable, ask concise plain-text questions instead.",
-        "</codex_skill_adapter>",
-        "",
-        "<objective>",
-        "Run GDH authoring checks and explain diagnostics in human-readable terms.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} lsp status\` only for lifecycle visibility; do not treat lifecycle readiness as diagnostic evidence`,
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} authoring check\` to collect validator evidence`,
-        "- explain each diagnostic finding with severity, provenance, and validator family (`gdscript_lsp` for `.gd`, `godot_scene_resource` for `.tscn`/`.tres`)",
-        "- surface any import-state caveats or editor-side warnings",
-        `- if stale managed LSP state is suspected, use bounded GDH cleanup such as \`npx -y @skillcap/gdh@${pinnedVersion} lsp prune\` or \`npx -y @skillcap/gdh@${pinnedVersion} lsp stop\`; do not hand-manage Godot LSP processes`,
-        "- if issues found, suggest concrete remediation steps",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do not fix issues automatically unless asked.",
-        "- Do not hand-manage Godot LSP processes; use GDH lifecycle commands.",
-        "- The gdh lsp lifecycle commands are status, prune, and stop.",
-        "- Explain diagnostics in human-readable terms.",
-        "- A ready `authoring.lsp` lifecycle is not proof that the authoring check collected diagnostics.",
-        "- Report both hard failures and informational caveats.",
-        "</rules>",
-        "",
-    ].join("\n");
+    return renderClaudeCheckSkill(pinnedVersion);
 }
-export function renderCursorCheckSkill(pinnedVersion) {
-    return [
-        "---",
-        "name: gdh-check",
-        'description: "Run GDH authoring checks and explain diagnostics"',
-        "---",
-        "",
-        "<cursor_skill_adapter>",
-        "## Invocation",
-        "- This skill is invoked when the user says `/gdh-check` or mentions `gdh-check`.",
-        "- Treat any extra user text as additional check context.",
-        "",
-        "## User questions",
-        "- Ask only narrow follow-up questions when GDH cannot infer the missing fact safely.",
-        "- Keep questions conversational and concise.",
-        "</cursor_skill_adapter>",
-        "",
-        "<objective>",
-        "Run GDH authoring checks and explain diagnostics in human-readable terms.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} lsp status\` only for lifecycle visibility; do not treat lifecycle readiness as diagnostic evidence`,
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} authoring check\` to collect validator evidence`,
-        "- explain each diagnostic finding with severity, provenance, and validator family (`gdscript_lsp` for `.gd`, `godot_scene_resource` for `.tscn`/`.tres`)",
-        "- surface any import-state caveats or editor-side warnings",
-        `- if stale managed LSP state is suspected, use bounded GDH cleanup such as \`npx -y @skillcap/gdh@${pinnedVersion} lsp prune\` or \`npx -y @skillcap/gdh@${pinnedVersion} lsp stop\`; do not hand-manage Godot LSP processes`,
-        "- if issues found, suggest concrete remediation steps",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do not fix issues automatically unless asked.",
-        "- Do not hand-manage Godot LSP processes; use GDH lifecycle commands.",
-        "- The gdh lsp lifecycle commands are status, prune, and stop.",
-        "- Explain diagnostics in human-readable terms.",
-        "- A ready `authoring.lsp` lifecycle is not proof that the authoring check collected diagnostics.",
-        "- Report both hard failures and informational caveats.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-// --- gdh-prepare skill renders ---
 export function renderClaudePrepareCommand(pinnedVersion) {
-    return [
-        "---",
-        "name: gdh:prepare",
-        "description: Prepare a Godot target for authoring or runtime work",
-        "allowed-tools:",
-        "  - Read",
-        "  - Grep",
-        "  - Glob",
-        "  - Bash",
-        "  - AskUserQuestion",
-        "---",
-        "<objective>",
-        "Prepare a Godot target for authoring or runtime work using GDH target preparation.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `1. Run \`npx -y @skillcap/gdh@${pinnedVersion} target prepare --dry-run\` first to preview planned actions.`,
-        "2. Explain what hydration and import refresh will do.",
-        `3. If the user approves, run \`npx -y @skillcap/gdh@${pinnedVersion} target prepare\`.`,
-        "4. If a `--source-target` is relevant, explain when and why to use it.",
-        `5. Verify preparation succeeded with \`npx -y @skillcap/gdh@${pinnedVersion} status\`.`,
-        "</process>",
-        "",
-        "<rules>",
-        "- Always show dry-run first.",
-        "- Explain worktree hydration context.",
-        "- Do not skip import refresh without explicit reason.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-export function renderCodexPrepareSkill(pinnedVersion) {
-    return [
-        "---",
-        'name: "gdh-prepare"',
-        'description: "Prepare a Godot target for authoring or runtime work"',
-        "metadata:",
-        '  short-description: "Prepare a Godot target for authoring or runtime work"',
-        "---",
-        "",
-        "<codex_skill_adapter>",
-        "## Invocation",
-        "- This skill is invoked when the user says `/gdh-prepare` or mentions `$gdh-prepare`.",
-        "- Treat any extra user text as additional preparation context.",
-        "",
-        "## User questions",
-        "- Ask before running preparation if the user has not explicitly approved.",
-        "- If structured user-input tooling is unavailable, ask concise plain-text questions instead.",
-        "</codex_skill_adapter>",
-        "",
-        "<objective>",
-        "Prepare a Godot target for authoring or runtime work using GDH target preparation.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} target prepare --dry-run\` first to preview planned actions`,
-        "- explain what hydration and import refresh will do",
-        `- if the user approves, run \`npx -y @skillcap/gdh@${pinnedVersion} target prepare\``,
-        "- if a `--source-target` is relevant, explain when and why to use it",
-        `- verify preparation succeeded with \`npx -y @skillcap/gdh@${pinnedVersion} status\``,
-        "</process>",
-        "",
-        "<rules>",
-        "- Always show dry-run first.",
-        "- Explain worktree hydration context.",
-        "- Do not skip import refresh without explicit reason.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-export function renderCursorPrepareSkill(pinnedVersion) {
-    return [
-        "---",
-        "name: gdh-prepare",
-        'description: "Prepare a Godot target for authoring or runtime work"',
-        "---",
-        "",
-        "<cursor_skill_adapter>",
-        "## Invocation",
-        "- This skill is invoked when the user says `/gdh-prepare` or mentions `gdh-prepare`.",
-        "- Treat any extra user text as additional preparation context.",
-        "",
-        "## User questions",
-        "- Ask before running preparation if the user has not explicitly approved.",
-        "- Keep questions conversational and concise.",
-        "</cursor_skill_adapter>",
-        "",
-        "<objective>",
-        "Prepare a Godot target for authoring or runtime work using GDH target preparation.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} target prepare --dry-run\` first to preview planned actions`,
-        "- explain what hydration and import refresh will do",
-        `- if the user approves, run \`npx -y @skillcap/gdh@${pinnedVersion} target prepare\``,
-        "- if a `--source-target` is relevant, explain when and why to use it",
-        `- verify preparation succeeded with \`npx -y @skillcap/gdh@${pinnedVersion} status\``,
-        "</process>",
-        "",
-        "<rules>",
-        "- Always show dry-run first.",
-        "- Explain worktree hydration context.",
-        "- Do not skip import refresh without explicit reason.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-// --- gdh-verify skill renders ---
-export function renderClaudeVerifyCommand(pinnedVersion) {
-    return [
-        "---",
-        "name: gdh:verify",
-        "description: Evaluate verification readiness and done-policy for changed files",
-        "allowed-tools:",
-        "  - Read",
-        "  - Grep",
-        "  - Glob",
-        "  - Bash",
-        "---",
-        "<objective>",
-        "Evaluate verification readiness and done-policy for changed files using GDH verification surfaces.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        "1. Identify changed files from git diff or user input.",
-        `2. Run \`npx -y @skillcap/gdh@${pinnedVersion} verify recommend\` with those files to get recommended validation kinds.`,
-        `3. Run \`npx -y @skillcap/gdh@${pinnedVersion} verify done\` with performed validations to check done eligibility.`,
-        "4. For authoring checks, explain validator-family expectations: `gdscript_lsp` for `.gd`, `godot_scene_resource` for `.tscn`/`.tres`, and manual validation for unsupported authoring files.",
-        "5. Summarize gaps between recommended and performed validation, including unavailable/degraded authoring evidence.",
-        "6. Suggest specific next verification steps.",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do not mark work as done if done-policy is not satisfied.",
-        "- Surface all recommended validation kinds.",
-        "- Keep the summary actionable.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-export function renderCodexVerifySkill(pinnedVersion) {
-    return [
-        "---",
-        'name: "gdh-verify"',
-        'description: "Evaluate verification readiness and done-policy for changed files"',
-        "metadata:",
-        '  short-description: "Evaluate verification readiness and done-policy for changed files"',
-        "---",
-        "",
-        "<codex_skill_adapter>",
-        "## Invocation",
-        "- This skill is invoked when the user says `/gdh-verify` or mentions `$gdh-verify`.",
-        "- Treat any extra user text as additional verification context.",
-        "",
-        "## User questions",
-        "- Ask only narrow follow-up questions when GDH cannot infer the missing fact safely.",
-        "- If structured user-input tooling is unavailable, ask concise plain-text questions instead.",
-        "</codex_skill_adapter>",
-        "",
-        "<objective>",
-        "Evaluate verification readiness and done-policy for changed files using GDH verification surfaces.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        "- identify changed files from git diff or user input",
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} verify recommend\` with those files to get recommended validation kinds`,
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} verify done\` with performed validations to check done eligibility`,
-        "- for authoring checks, explain validator-family expectations: `gdscript_lsp` for `.gd`, `godot_scene_resource` for `.tscn`/`.tres`, and manual validation for unsupported authoring files",
-        "- summarize gaps between recommended and performed validation, including unavailable/degraded authoring evidence",
-        "- suggest specific next verification steps",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do not mark work as done if done-policy is not satisfied.",
-        "- Surface all recommended validation kinds.",
-        "- Keep the summary actionable.",
-        "</rules>",
-        "",
-    ].join("\n");
-}
-export function renderCursorVerifySkill(pinnedVersion) {
-    return [
-        "---",
-        "name: gdh-verify",
-        'description: "Evaluate verification readiness and done-policy for changed files"',
-        "---",
-        "",
-        "<cursor_skill_adapter>",
-        "## Invocation",
-        "- This skill is invoked when the user says `/gdh-verify` or mentions `gdh-verify`.",
-        "- Treat any extra user text as additional verification context.",
-        "",
-        "## User questions",
-        "- Ask only narrow follow-up questions when GDH cannot infer the missing fact safely.",
-        "- Keep questions conversational and concise.",
-        "</cursor_skill_adapter>",
-        "",
-        "<objective>",
-        "Evaluate verification readiness and done-policy for changed files using GDH verification surfaces.",
-        "</objective>",
-        "",
-        "<process>",
-        "Follow this order:",
-        "",
-        "- identify changed files from git diff or user input",
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} verify recommend\` with those files to get recommended validation kinds`,
-        `- run \`npx -y @skillcap/gdh@${pinnedVersion} verify done\` with performed validations to check done eligibility`,
-        "- for authoring checks, explain validator-family expectations: `gdscript_lsp` for `.gd`, `godot_scene_resource` for `.tscn`/`.tres`, and manual validation for unsupported authoring files",
-        "- summarize gaps between recommended and performed validation, including unavailable/degraded authoring evidence",
-        "- suggest specific next verification steps",
-        "</process>",
-        "",
-        "<rules>",
-        "- Do not mark work as done if done-policy is not satisfied.",
-        "- Surface all recommended validation kinds.",
-        "- Keep the summary actionable.",
-        "</rules>",
-        "",
-    ].join("\n");
+    return renderClaudePrepareSkill(pinnedVersion);
 }
 async function inspectProjectMcpSupport(targetPath, options) {
     const projectConfig = await readProjectConfig(targetPath);
@@ -1588,34 +571,94 @@ function inspectCodexSkillSurface(targetPath, relativePath, content, expectedCon
         }),
     ];
 }
-function inspectClaudeCommandSurface(targetPath, relativePath, content, expectedContent, commandName) {
+function inspectCodexAuthoringHookConfig(targetPath, content, enabled) {
+    if (!enabled) {
+        return createSurfaceStatus({
+            kind: "hook_config",
+            scope: "repo",
+            targetPath,
+            relativePath: CODEX_PROJECT_CONFIG_RELATIVE_PATH,
+            present: content !== null,
+            state: "ready",
+            summary: "Codex authoring hooks are disabled because project MCP config is disabled.",
+            version: null,
+        });
+    }
+    const ready = content !== null &&
+        /^\s*codex_hooks\s*=\s*true\s*$/m.test(content) &&
+        content.includes("# BEGIN GDH managed authoring hooks") &&
+        content.includes(CODEX_AUTHORING_HOOK_RELATIVE_PATH);
+    return createSurfaceStatus({
+        kind: "hook_config",
+        scope: "repo",
+        targetPath,
+        relativePath: CODEX_PROJECT_CONFIG_RELATIVE_PATH,
+        present: content !== null,
+        state: content === null ? "missing" : ready ? "ready" : "misconfigured",
+        summary: content === null
+            ? "Codex project config is missing and should register GDH authoring hooks."
+            : ready
+                ? "Codex project config enables GDH PostToolUse and Stop authoring hooks."
+                : "Codex project config exists but is missing the managed GDH authoring hook block.",
+        version: null,
+    });
+}
+function inspectManagedHookSurface(agent, targetPath, relativePath, content, expectedContent, hookName) {
+    if (expectedContent === null) {
+        return createSurfaceStatus({
+            kind: "hook_file",
+            scope: "repo",
+            targetPath,
+            relativePath,
+            present: content !== null,
+            state: "missing",
+            summary: `${agentLabel(agent)} ${hookName} hook cannot be validated yet: no \`gdh_version\` is pinned (run \`gdh setup\` or \`gdh migrate --apply\`).`,
+            version: null,
+        });
+    }
+    return createSurfaceStatus({
+        kind: "hook_file",
+        scope: "repo",
+        targetPath,
+        relativePath,
+        present: content !== null,
+        state: content === null ? "missing" : content === expectedContent ? "ready" : "misconfigured",
+        summary: content === null
+            ? `${agentLabel(agent)} ${hookName} hook file is missing.`
+            : content === expectedContent
+                ? `${agentLabel(agent)} ${hookName} hook file is managed and current.`
+                : `${agentLabel(agent)} ${hookName} hook file exists but no longer matches the managed GDH hook.`,
+        version: null,
+    });
+}
+function inspectClaudeSkillSurface(targetPath, relativePath, content, expectedContent, skillName) {
     if (expectedContent === null) {
         return [
             createSurfaceStatus({
-                kind: "command_file",
+                kind: "skill_file",
                 scope: "repo",
                 targetPath,
                 relativePath,
                 present: content !== null,
                 state: "missing",
-                summary: `Claude ${commandName} command cannot be validated yet: no \`gdh_version\` is pinned (run \`gdh setup\` or \`gdh migrate --apply\`).`,
+                summary: `Claude ${skillName} skill cannot be validated yet: no \`gdh_version\` is pinned (run \`gdh setup\` or \`gdh migrate --apply\`).`,
                 version: null,
             }),
         ];
     }
     return [
         createSurfaceStatus({
-            kind: "command_file",
+            kind: "skill_file",
             scope: "repo",
             targetPath,
             relativePath,
             present: content !== null,
             state: content === null ? "missing" : content === expectedContent ? "ready" : "misconfigured",
             summary: content === null
-                ? `Claude \`/${commandName}\` command is missing and should install under .claude/commands/gdh/.`
+                ? `Claude \`/${skillName}\` skill is missing and should install under .claude/skills/.`
                 : content === expectedContent
-                    ? `Claude can discover the managed \`/${commandName}\` command.`
-                    : `Claude \`/${commandName}\` command exists but no longer matches the expected managed GDH command.`,
+                    ? `Claude can discover the managed \`/${skillName}\` skill.`
+                    : `Claude \`/${skillName}\` skill exists but no longer matches the expected managed GDH skill.`,
             version: null,
         }),
     ];
@@ -1674,20 +717,29 @@ async function inspectCodexAdapter(targetPath, guidance, projectMcp, pinnedVersi
     const codexPrepareContent = await fs
         .readFile(path.join(targetPath, CODEX_PREPARE_SKILL_RELATIVE_PATH), "utf8")
         .catch(() => null);
-    const codexVerifyContent = await fs
-        .readFile(path.join(targetPath, CODEX_VERIFY_SKILL_RELATIVE_PATH), "utf8")
-        .catch(() => null);
     const codexScanContent = await fs
         .readFile(path.join(targetPath, CODEX_SCAN_SKILL_RELATIVE_PATH), "utf8")
         .catch(() => null);
+    const codexAuthoringHookContent = await fs
+        .readFile(path.join(projectMcp.integrationRootPath, CODEX_AUTHORING_HOOK_RELATIVE_PATH), "utf8")
+        .catch(() => null);
+    const codexProjectConfigContent = await fs
+        .readFile(path.join(projectMcp.integrationRootPath, CODEX_PROJECT_CONFIG_RELATIVE_PATH), "utf8")
+        .catch(() => null);
     const expectedCodexOnboardSkill = pinnedVersion === null ? null : renderCodexOnboardSkill(pinnedVersion);
     const expectedCodexStatusSkill = pinnedVersion === null ? null : renderCodexStatusSkill(pinnedVersion);
     const expectedCodexMigrateSkill = pinnedVersion === null ? null : renderCodexMigrateSkill(pinnedVersion);
     const expectedCodexUpdateSkill = pinnedVersion === null ? null : renderCodexUpdateSkill(pinnedVersion);
     const expectedCodexCheckSkill = pinnedVersion === null ? null : renderCodexCheckSkill(pinnedVersion);
     const expectedCodexPrepareSkill = pinnedVersion === null ? null : renderCodexPrepareSkill(pinnedVersion);
-    const expectedCodexVerifySkill = pinnedVersion === null ? null : renderCodexVerifySkill(pinnedVersion);
     const expectedCodexScanSkill = pinnedVersion === null ? null : renderCodexScanSkill(pinnedVersion);
+    const expectedCodexAuthoringHook = pinnedVersion === null
+        ? null
+        : renderGdhAuthoringHook({
+            pinnedVersion,
+            targetRelativePath: path.relative(projectMcp.integrationRootPath, targetPath) || ".",
+            agent: "codex",
+        });
     const surfaces = [
         createSurfaceStatus({
             kind: "canonical_entrypoint",
@@ -1734,8 +786,9 @@ async function inspectCodexAdapter(targetPath, guidance, projectMcp, pinnedVersi
         ...inspectCodexSkillSurface(targetPath, CODEX_UPDATE_SKILL_RELATIVE_PATH, codexUpdateContent, expectedCodexUpdateSkill, "gdh-update"),
         ...inspectCodexSkillSurface(targetPath, CODEX_CHECK_SKILL_RELATIVE_PATH, codexCheckContent, expectedCodexCheckSkill, "gdh-check"),
         ...inspectCodexSkillSurface(targetPath, CODEX_PREPARE_SKILL_RELATIVE_PATH, codexPrepareContent, expectedCodexPrepareSkill, "gdh-prepare"),
-        ...inspectCodexSkillSurface(targetPath, CODEX_VERIFY_SKILL_RELATIVE_PATH, codexVerifyContent, expectedCodexVerifySkill, "gdh-verify"),
         ...inspectCodexSkillSurface(targetPath, CODEX_SCAN_SKILL_RELATIVE_PATH, codexScanContent, expectedCodexScanSkill, "gdh-scan"),
+        inspectManagedHookSurface("codex", projectMcp.integrationRootPath, CODEX_AUTHORING_HOOK_RELATIVE_PATH, codexAuthoringHookContent, expectedCodexAuthoringHook, "authoring guard"),
+        inspectCodexAuthoringHookConfig(projectMcp.integrationRootPath, codexProjectConfigContent, projectMcp.enabled),
     ];
     if (projectMcp.enabled) {
         surfaces.push(createSurfaceStatus({
@@ -1775,7 +828,7 @@ async function inspectClaudeAdapter(targetPath, guidance, projectMcp, pinnedVers
     const claudeMigrateContent = await fs
         .readFile(path.join(targetPath, CLAUDE_MIGRATE_COMMAND_RELATIVE_PATH), "utf8")
         .catch(() => null);
-    // Phase 13 Plan 13-03 deliverable — /gdh-update slash command for Claude.
+    // Phase 13 Plan 13-03 deliverable — /gdh-update skill for Claude.
     // Inspection wiring is required so planSkillInstallAction can see the surface
     // state; otherwise the planner returns `unchanged` for a missing file and
     // install becomes a no-op (Plan 13-05 integration-test Rule 2 fix).
@@ -1788,9 +841,6 @@ async function inspectClaudeAdapter(targetPath, guidance, projectMcp, pinnedVers
     const claudePrepareContent = await fs
         .readFile(path.join(targetPath, CLAUDE_PREPARE_COMMAND_RELATIVE_PATH), "utf8")
         .catch(() => null);
-    const claudeVerifyContent = await fs
-        .readFile(path.join(targetPath, CLAUDE_VERIFY_COMMAND_RELATIVE_PATH), "utf8")
-        .catch(() => null);
     const claudeScanContent = await fs
         .readFile(path.join(targetPath, CLAUDE_SCAN_COMMAND_RELATIVE_PATH), "utf8")
         .catch(() => null);
@@ -1803,6 +853,9 @@ async function inspectClaudeAdapter(targetPath, guidance, projectMcp, pinnedVers
     const claudeStatuslineContent = await fs
         .readFile(path.join(targetPath, CLAUDE_STATUSLINE_RELATIVE_PATH), "utf8")
         .catch(() => null);
+    const claudeAuthoringHookContent = await fs
+        .readFile(path.join(targetPath, CLAUDE_AUTHORING_HOOK_RELATIVE_PATH), "utf8")
+        .catch(() => null);
     let detectedTarget = null;
     if (lstat?.isSymbolicLink()) {
         detectedTarget = await fs.readlink(absolutePath).catch(() => null);
@@ -1811,12 +864,18 @@ async function inspectClaudeAdapter(targetPath, guidance, projectMcp, pinnedVers
     const expectedClaudeCheckUpdateHook = pinnedVersion === null ? null : renderClaudeCheckUpdateHook(pinnedVersion);
     const expectedClaudeCheckUpdateWorker = pinnedVersion === null ? null : renderClaudeCheckUpdateWorker(pinnedVersion);
     const expectedClaudeStatusline = pinnedVersion === null ? null : renderClaudeUpdateStatusline(pinnedVersion);
+    const expectedClaudeAuthoringHook = pinnedVersion === null
+        ? null
+        : renderGdhAuthoringHook({
+            pinnedVersion,
+            targetRelativePath: ".",
+            agent: "claude",
+        });
     const expectedClaudeStatusCommand = pinnedVersion === null ? null : renderClaudeStatusCommand(pinnedVersion);
     const expectedClaudeMigrateCommand = pinnedVersion === null ? null : renderClaudeMigrateCommand(pinnedVersion);
     const expectedClaudeUpdateCommand = pinnedVersion === null ? null : renderClaudeUpdateCommand(pinnedVersion);
     const expectedClaudeCheckCommand = pinnedVersion === null ? null : renderClaudeCheckCommand(pinnedVersion);
     const expectedClaudePrepareCommand = pinnedVersion === null ? null : renderClaudePrepareCommand(pinnedVersion);
-    const expectedClaudeVerifyCommand = pinnedVersion === null ? null : renderClaudeVerifyCommand(pinnedVersion);
     const expectedClaudeScanCommand = pinnedVersion === null ? null : renderClaudeScanCommand(pinnedVersion);
     const surfaces = [
         createSurfaceStatus({
@@ -1840,7 +899,7 @@ async function inspectClaudeAdapter(targetPath, guidance, projectMcp, pinnedVers
             detectedTarget,
         }),
         createSurfaceStatus({
-            kind: "command_file",
+            kind: "skill_file",
             scope: "repo",
             targetPath,
             relativePath: CLAUDE_ONBOARD_COMMAND_RELATIVE_PATH,
@@ -1853,24 +912,24 @@ async function inspectClaudeAdapter(targetPath, guidance, projectMcp, pinnedVers
                         ? "ready"
                         : "misconfigured",
             summary: onboardCommandContent === null
-                ? "Claude onboarding handoff is missing and should install `/gdh-onboard` under .claude/commands/."
+                ? "Claude onboarding handoff is missing and should install `/gdh-onboard` under .claude/skills/."
                 : expectedClaudeOnboardCommand === null
                     ? "Claude onboarding handoff cannot be validated yet: no `gdh_version` is pinned (run `gdh setup` or `gdh migrate --apply`)."
                     : onboardCommandContent === expectedClaudeOnboardCommand
-                        ? "Claude can discover the managed `/gdh-onboard` handoff command."
-                        : "Claude onboarding handoff exists but no longer matches the expected managed GDH command.",
+                        ? "Claude can discover the managed `/gdh-onboard` handoff skill."
+                        : "Claude onboarding handoff exists but no longer matches the expected managed GDH skill.",
             version: null,
         }),
-        ...inspectClaudeCommandSurface(targetPath, CLAUDE_STATUS_COMMAND_RELATIVE_PATH, claudeStatusContent, expectedClaudeStatusCommand, "gdh-status"),
-        ...inspectClaudeCommandSurface(targetPath, CLAUDE_MIGRATE_COMMAND_RELATIVE_PATH, claudeMigrateContent, expectedClaudeMigrateCommand, "gdh-migrate"),
-        ...inspectClaudeCommandSurface(targetPath, CLAUDE_UPDATE_COMMAND_RELATIVE_PATH, claudeUpdateContent, expectedClaudeUpdateCommand, "gdh-update"),
-        ...inspectClaudeCommandSurface(targetPath, CLAUDE_CHECK_COMMAND_RELATIVE_PATH, claudeCheckContent, expectedClaudeCheckCommand, "gdh-check"),
-        ...inspectClaudeCommandSurface(targetPath, CLAUDE_PREPARE_COMMAND_RELATIVE_PATH, claudePrepareContent, expectedClaudePrepareCommand, "gdh-prepare"),
-        ...inspectClaudeCommandSurface(targetPath, CLAUDE_VERIFY_COMMAND_RELATIVE_PATH, claudeVerifyContent, expectedClaudeVerifyCommand, "gdh-verify"),
-        ...inspectClaudeCommandSurface(targetPath, CLAUDE_SCAN_COMMAND_RELATIVE_PATH, claudeScanContent, expectedClaudeScanCommand, "gdh-scan"),
-        ...inspectClaudeCommandSurface(targetPath, CLAUDE_CHECK_UPDATE_HOOK_RELATIVE_PATH, claudeCheckUpdateHookContent, expectedClaudeCheckUpdateHook, "gdh-check-update-hook"),
-        ...inspectClaudeCommandSurface(targetPath, CLAUDE_CHECK_UPDATE_WORKER_RELATIVE_PATH, claudeCheckUpdateWorkerContent, expectedClaudeCheckUpdateWorker, "gdh-check-update-worker"),
-        ...inspectClaudeCommandSurface(targetPath, CLAUDE_STATUSLINE_RELATIVE_PATH, claudeStatuslineContent, expectedClaudeStatusline, "gdh-statusline"),
+        ...inspectClaudeSkillSurface(targetPath, CLAUDE_STATUS_COMMAND_RELATIVE_PATH, claudeStatusContent, expectedClaudeStatusCommand, "gdh-status"),
+        ...inspectClaudeSkillSurface(targetPath, CLAUDE_MIGRATE_COMMAND_RELATIVE_PATH, claudeMigrateContent, expectedClaudeMigrateCommand, "gdh-migrate"),
+        ...inspectClaudeSkillSurface(targetPath, CLAUDE_UPDATE_COMMAND_RELATIVE_PATH, claudeUpdateContent, expectedClaudeUpdateCommand, "gdh-update"),
+        ...inspectClaudeSkillSurface(targetPath, CLAUDE_CHECK_COMMAND_RELATIVE_PATH, claudeCheckContent, expectedClaudeCheckCommand, "gdh-check"),
+        ...inspectClaudeSkillSurface(targetPath, CLAUDE_PREPARE_COMMAND_RELATIVE_PATH, claudePrepareContent, expectedClaudePrepareCommand, "gdh-prepare"),
+        ...inspectClaudeSkillSurface(targetPath, CLAUDE_SCAN_COMMAND_RELATIVE_PATH, claudeScanContent, expectedClaudeScanCommand, "gdh-scan"),
+        inspectManagedHookSurface("claude", targetPath, CLAUDE_CHECK_UPDATE_HOOK_RELATIVE_PATH, claudeCheckUpdateHookContent, expectedClaudeCheckUpdateHook, "gdh-check-update-hook"),
+        inspectManagedHookSurface("claude", targetPath, CLAUDE_CHECK_UPDATE_WORKER_RELATIVE_PATH, claudeCheckUpdateWorkerContent, expectedClaudeCheckUpdateWorker, "gdh-check-update-worker"),
+        inspectManagedHookSurface("claude", targetPath, CLAUDE_STATUSLINE_RELATIVE_PATH, claudeStatuslineContent, expectedClaudeStatusline, "gdh-statusline"),
+        inspectManagedHookSurface("claude", targetPath, CLAUDE_AUTHORING_HOOK_RELATIVE_PATH, claudeAuthoringHookContent, expectedClaudeAuthoringHook, "authoring guard"),
     ];
     if (projectMcp.enabled) {
         surfaces.push(createSurfaceStatus({
@@ -1912,9 +971,6 @@ async function inspectCursorAdapter(targetPath, guidance, projectMcp, pinnedVers
     const cursorPrepareContent = await fs
         .readFile(path.join(targetPath, CURSOR_PREPARE_SKILL_RELATIVE_PATH), "utf8")
         .catch(() => null);
-    const cursorVerifyContent = await fs
-        .readFile(path.join(targetPath, CURSOR_VERIFY_SKILL_RELATIVE_PATH), "utf8")
-        .catch(() => null);
     const cursorScanContent = await fs
         .readFile(path.join(targetPath, CURSOR_SCAN_SKILL_RELATIVE_PATH), "utf8")
         .catch(() => null);
@@ -1926,7 +982,6 @@ async function inspectCursorAdapter(targetPath, guidance, projectMcp, pinnedVers
     const expectedCursorUpdateSkill = pinnedVersion === null ? null : renderCursorUpdateSkill(pinnedVersion);
     const expectedCursorCheckSkill = pinnedVersion === null ? null : renderCursorCheckSkill(pinnedVersion);
     const expectedCursorPrepareSkill = pinnedVersion === null ? null : renderCursorPrepareSkill(pinnedVersion);
-    const expectedCursorVerifySkill = pinnedVersion === null ? null : renderCursorVerifySkill(pinnedVersion);
     const expectedCursorScanSkill = pinnedVersion === null ? null : renderCursorScanSkill(pinnedVersion);
     const surfaces = [
         createSurfaceStatus({
@@ -1970,7 +1025,6 @@ async function inspectCursorAdapter(targetPath, guidance, projectMcp, pinnedVers
         ...inspectCursorSkillSurface(targetPath, CURSOR_UPDATE_SKILL_RELATIVE_PATH, cursorUpdateContent, expectedCursorUpdateSkill, "gdh-update"),
         ...inspectCursorSkillSurface(targetPath, CURSOR_CHECK_SKILL_RELATIVE_PATH, cursorCheckContent, expectedCursorCheckSkill, "gdh-check"),
         ...inspectCursorSkillSurface(targetPath, CURSOR_PREPARE_SKILL_RELATIVE_PATH, cursorPrepareContent, expectedCursorPrepareSkill, "gdh-prepare"),
-        ...inspectCursorSkillSurface(targetPath, CURSOR_VERIFY_SKILL_RELATIVE_PATH, cursorVerifyContent, expectedCursorVerifySkill, "gdh-verify"),
         ...inspectCursorSkillSurface(targetPath, CURSOR_SCAN_SKILL_RELATIVE_PATH, cursorScanContent, expectedCursorScanSkill, "gdh-scan"),
     ];
     if (projectMcp.enabled) {
@@ -2079,6 +1133,7 @@ async function planInstallActions(targetPath, adapters, requestedAgents, options
             actions.push(...planCursorInstallActions(targetPath, adapter, options.pinnedVersion));
         }
     }
+    actions.push(...planRetiredVerifySurfaceCleanupActions(targetPath));
     return dedupeInstallActions(actions);
 }
 function planSharedRepoInstallActions(targetPath, projectMcp, agent, effectiveDevRepoPath, integrationRootPath, pinnedVersion) {
@@ -2155,7 +1210,7 @@ function planSkillInstallAction(agent, targetPath, adapter, relativePath, render
             relativePath,
             state: "unchanged",
             mode: "unchanged",
-            summary: `The managed ${agentLabel(agent)} \`/${skillName}\` ${agent === "claude" ? "command" : "skill"} already matches the expected GDH content.`,
+            summary: `The managed ${agentLabel(agent)} \`/${skillName}\` skill already matches the expected GDH content.`,
             content: renderFn(pinnedVersion),
         });
     }
@@ -2168,8 +1223,37 @@ function planSkillInstallAction(agent, targetPath, adapter, relativePath, render
         state: "planned",
         mode: surface.present ? "replace" : "create",
         summary: surface.present
-            ? `Replace the existing ${agentLabel(agent)} \`/${skillName}\` ${agent === "claude" ? "command" : "skill"} with the managed GDH ${agent === "claude" ? "command" : "skill"}.`
-            : `Create the managed ${agentLabel(agent)} \`/${skillName}\` ${agent === "claude" ? "command" : "skill"}.`,
+            ? `Replace the existing ${agentLabel(agent)} \`/${skillName}\` skill with the managed GDH skill.`
+            : `Create the managed ${agentLabel(agent)} \`/${skillName}\` skill.`,
+        content: renderFn(pinnedVersion),
+    });
+}
+function planHookInstallAction(agent, targetPath, adapter, relativePath, renderFn, hookName, pinnedVersion) {
+    const surface = adapter.surfaces.find((entry) => entry.relativePath === relativePath);
+    if (!surface || surface.state === "ready") {
+        return createInstallAction({
+            agent,
+            kind: "write_file",
+            scope: "repo",
+            targetPath,
+            relativePath,
+            state: "unchanged",
+            mode: "unchanged",
+            summary: `${agentLabel(agent)} ${hookName} hook already matches the managed GDH hook.`,
+            content: renderFn(pinnedVersion),
+        });
+    }
+    return createInstallAction({
+        agent,
+        kind: "write_file",
+        scope: "repo",
+        targetPath,
+        relativePath,
+        state: "planned",
+        mode: surface.present ? "replace" : "create",
+        summary: surface.present
+            ? `Replace the existing ${agentLabel(agent)} ${hookName} hook with the managed GDH hook.`
+            : `Create the managed ${agentLabel(agent)} ${hookName} hook.`,
         content: renderFn(pinnedVersion),
     });
 }
@@ -2191,8 +1275,12 @@ function planCodexRepoInstallActions(targetPath, adapter, pinnedVersion, project
         planSkillInstallAction("codex", targetPath, adapter, CODEX_UPDATE_SKILL_RELATIVE_PATH, renderCodexUpdateSkill, "gdh-update", pinnedVersion),
         planSkillInstallAction("codex", targetPath, adapter, CODEX_CHECK_SKILL_RELATIVE_PATH, renderCodexCheckSkill, "gdh-check", pinnedVersion),
         planSkillInstallAction("codex", targetPath, adapter, CODEX_PREPARE_SKILL_RELATIVE_PATH, renderCodexPrepareSkill, "gdh-prepare", pinnedVersion),
-        planSkillInstallAction("codex", targetPath, adapter, CODEX_VERIFY_SKILL_RELATIVE_PATH, renderCodexVerifySkill, "gdh-verify", pinnedVersion),
         planSkillInstallAction("codex", targetPath, adapter, CODEX_SCAN_SKILL_RELATIVE_PATH, renderCodexScanSkill, "gdh-scan", pinnedVersion),
+        planSkillInstallAction("codex", integrationRootPath, adapter, CODEX_AUTHORING_HOOK_RELATIVE_PATH, (version) => renderGdhAuthoringHook({
+            pinnedVersion: version,
+            targetRelativePath: path.relative(integrationRootPath, targetPath) || ".",
+            agent: "codex",
+        }), "authoring guard", pinnedVersion),
     ];
     if (projectMcp.enabled && projectMcp.codexProjectFile.state !== "ready") {
         const absolutePath = path.join(integrationRootPath, CODEX_PROJECT_CONFIG_RELATIVE_PATH);
@@ -2216,19 +1304,77 @@ function planCodexRepoInstallActions(targetPath, adapter, pinnedVersion, project
     actions.push(...planLegacyCodexSkillCleanupActions(targetPath, pinnedVersion));
     return actions;
 }
-// The signature embedded in every codex skill render body via the
-// `<codex_skill_adapter>` block. Detecting this marker lets the legacy
-// cleanup recognize a managed file regardless of which prior GDH version
-// rendered it, so stale-version skills at `.codex/skills/...` get removed
-// during migrate even when their pinned-npx string no longer matches the
-// current `pinnedVersion` (D-22 fix; see Session 7 dogfooding follow-up).
-const CODEX_MANAGED_SKILL_MARKER = "<codex_skill_adapter>";
+// Current skill renders use a neutral Markdown-safe GDH_MANAGED_AGENT_SKILL
+// marker. Legacy renders used provider-specific XML-ish marker blocks. Cleanup
+// accepts both so old managed files can migrate without deleting user-authored
+// files based only on path.
+const LEGACY_CODEX_MANAGED_SKILL_MARKER = "<codex_skill_adapter>";
+const LEGACY_CURSOR_MANAGED_SKILL_MARKER = "<cursor_skill_adapter>";
+function isManagedAgentSkillContent(content) {
+    return (content.includes(GDH_MANAGED_AGENT_SKILL_MARKER) ||
+        content.includes(LEGACY_CODEX_MANAGED_SKILL_MARKER) ||
+        content.includes(LEGACY_CURSOR_MANAGED_SKILL_MARKER));
+}
 function isManagedLegacyCodexSkillContent(content) {
-    return content.includes(CODEX_MANAGED_SKILL_MARKER);
+    return (content.includes(GDH_MANAGED_AGENT_SKILL_MARKER) ||
+        content.includes(LEGACY_CODEX_MANAGED_SKILL_MARKER));
+}
+function isManagedLegacyClaudeCommandContent(content, skillName) {
+    const slashName = skillName.replace("gdh-", "gdh:");
+    return (content.includes(`name: ${slashName}`) &&
+        (content.includes("@skillcap/gdh@") ||
+            content.includes(GDH_MANAGED_AGENT_SKILL_MARKER) ||
+            content.includes("<objective>") ||
+            content.includes("<process>") ||
+            content.includes("<rules>")));
+}
+const RETIRED_VERIFY_SURFACE_RELATIVE_PATHS = [
+    {
+        agent: "codex",
+        relativePath: ".agents/skills/gdh-verify/SKILL.md",
+        skillName: "gdh-verify",
+        isManaged: isManagedAgentSkillContent,
+    },
+    {
+        agent: "cursor",
+        relativePath: ".cursor/skills/gdh-verify/SKILL.md",
+        skillName: "gdh-verify",
+        isManaged: isManagedAgentSkillContent,
+    },
+    {
+        agent: "claude",
+        relativePath: ".claude/commands/gdh/verify.md",
+        skillName: "gdh-verify",
+        isManaged: (content) => content.includes("name: gdh:verify") &&
+            (content.includes("@skillcap/gdh@") || content.includes("gdh verify recommend")),
+    },
+];
+function planRetiredVerifySurfaceCleanupActions(targetPath) {
+    const actions = [];
+    for (const entry of RETIRED_VERIFY_SURFACE_RELATIVE_PATHS) {
+        const absolutePath = path.join(targetPath, entry.relativePath);
+        const content = fsSync.existsSync(absolutePath)
+            ? fsSync.readFileSync(absolutePath, "utf8")
+            : null;
+        if (content === null || !entry.isManaged(content)) {
+            continue;
+        }
+        actions.push(createInstallAction({
+            agent: entry.agent,
+            kind: "remove_file",
+            scope: "repo",
+            targetPath,
+            relativePath: entry.relativePath,
+            state: "planned",
+            mode: "delete",
+            summary: `Remove retired managed \`/${entry.skillName}\` surface. Agents should use \`/gdh-check\` for code-validity evidence.`,
+        }));
+    }
+    return actions;
 }
 function planLegacyCodexSkillCleanupActions(targetPath, _pinnedVersion) {
     const actions = [];
-    for (const [relativePath, _renderFn, skillName] of LEGACY_CODEX_SKILL_RELATIVE_PATHS) {
+    for (const [relativePath, skillName] of LEGACY_CODEX_SKILL_RELATIVE_PATHS) {
         const absolutePath = path.join(targetPath, relativePath);
         const content = fsSync.existsSync(absolutePath)
             ? fsSync.readFileSync(absolutePath, "utf8")
@@ -2255,6 +1401,29 @@ function planLegacyCodexSkillCleanupActions(targetPath, _pinnedVersion) {
     }
     return actions;
 }
+function planLegacyClaudeCommandCleanupActions(targetPath) {
+    const actions = [];
+    for (const [relativePath, skillName] of LEGACY_CLAUDE_SKILL_COMMAND_RELATIVE_PATHS) {
+        const absolutePath = path.join(targetPath, relativePath);
+        const content = fsSync.existsSync(absolutePath)
+            ? fsSync.readFileSync(absolutePath, "utf8")
+            : null;
+        if (content === null || !isManagedLegacyClaudeCommandContent(content, skillName)) {
+            continue;
+        }
+        actions.push(createInstallAction({
+            agent: "claude",
+            kind: "remove_file",
+            scope: "repo",
+            targetPath,
+            relativePath,
+            state: "planned",
+            mode: "delete",
+            summary: `Remove legacy managed Claude \`/${skillName}\` command after installing the provider-recommended .claude/skills surface.`,
+        }));
+    }
+    return actions;
+}
 function planCodexUserInstallActions(targetPath, projectMcp, integrationRootPath, pinnedVersion) {
     if (!projectMcp.enabled || projectMcp.codexServerName === null) {
         return [];
@@ -2333,14 +1502,18 @@ function planClaudeInstallActions(targetPath, adapter, pinnedVersion) {
             expectedTarget: "AGENTS.md",
         }));
     }
-    actions.push(planSkillInstallAction("claude", targetPath, adapter, CLAUDE_ONBOARD_COMMAND_RELATIVE_PATH, renderClaudeOnboardCommand, "gdh-onboard", pinnedVersion), planSkillInstallAction("claude", targetPath, adapter, CLAUDE_STATUS_COMMAND_RELATIVE_PATH, renderClaudeStatusCommand, "gdh-status", pinnedVersion), planSkillInstallAction("claude", targetPath, adapter, CLAUDE_MIGRATE_COMMAND_RELATIVE_PATH, renderClaudeMigrateCommand, "gdh-migrate", pinnedVersion), planSkillInstallAction("claude", targetPath, adapter, CLAUDE_UPDATE_COMMAND_RELATIVE_PATH, renderClaudeUpdateCommand, "gdh-update", pinnedVersion), planSkillInstallAction("claude", targetPath, adapter, CLAUDE_CHECK_COMMAND_RELATIVE_PATH, renderClaudeCheckCommand, "gdh-check", pinnedVersion), planSkillInstallAction("claude", targetPath, adapter, CLAUDE_PREPARE_COMMAND_RELATIVE_PATH, renderClaudePrepareCommand, "gdh-prepare", pinnedVersion), planSkillInstallAction("claude", targetPath, adapter, CLAUDE_VERIFY_COMMAND_RELATIVE_PATH, renderClaudeVerifyCommand, "gdh-verify", pinnedVersion), planSkillInstallAction("claude", targetPath, adapter, CLAUDE_SCAN_COMMAND_RELATIVE_PATH, renderClaudeScanCommand, "gdh-scan", pinnedVersion), 
+    actions.push(planSkillInstallAction("claude", targetPath, adapter, CLAUDE_ONBOARD_COMMAND_RELATIVE_PATH, renderClaudeOnboardCommand, "gdh-onboard", pinnedVersion), planSkillInstallAction("claude", targetPath, adapter, CLAUDE_STATUS_COMMAND_RELATIVE_PATH, renderClaudeStatusCommand, "gdh-status", pinnedVersion), planSkillInstallAction("claude", targetPath, adapter, CLAUDE_MIGRATE_COMMAND_RELATIVE_PATH, renderClaudeMigrateCommand, "gdh-migrate", pinnedVersion), planSkillInstallAction("claude", targetPath, adapter, CLAUDE_UPDATE_COMMAND_RELATIVE_PATH, renderClaudeUpdateCommand, "gdh-update", pinnedVersion), planSkillInstallAction("claude", targetPath, adapter, CLAUDE_CHECK_COMMAND_RELATIVE_PATH, renderClaudeCheckCommand, "gdh-check", pinnedVersion), planSkillInstallAction("claude", targetPath, adapter, CLAUDE_PREPARE_COMMAND_RELATIVE_PATH, renderClaudePrepareCommand, "gdh-prepare", pinnedVersion), planSkillInstallAction("claude", targetPath, adapter, CLAUDE_SCAN_COMMAND_RELATIVE_PATH, renderClaudeScanCommand, "gdh-scan", pinnedVersion), 
     // UPD-01 managed hook surfaces baked at the pinned version.
-    planSkillInstallAction("claude", targetPath, adapter, CLAUDE_CHECK_UPDATE_HOOK_RELATIVE_PATH, renderClaudeCheckUpdateHook, "gdh-check-update-hook", pinnedVersion), planSkillInstallAction("claude", targetPath, adapter, CLAUDE_CHECK_UPDATE_WORKER_RELATIVE_PATH, renderClaudeCheckUpdateWorker, "gdh-check-update-worker", pinnedVersion), 
+    planHookInstallAction("claude", targetPath, adapter, CLAUDE_CHECK_UPDATE_HOOK_RELATIVE_PATH, renderClaudeCheckUpdateHook, "gdh-check-update-hook", pinnedVersion), planHookInstallAction("claude", targetPath, adapter, CLAUDE_CHECK_UPDATE_WORKER_RELATIVE_PATH, renderClaudeCheckUpdateWorker, "gdh-check-update-worker", pinnedVersion), 
     // UPD-02 managed statusline surface baked at the pinned version. The .js
     // file is ALWAYS baked, even when settings.json statusLine is not owned
     // by GDH (write-if-absent below) — users can manually point their config
     // at gdh-statusline.js later; the baked file is a no-op until wired.
-    planSkillInstallAction("claude", targetPath, adapter, CLAUDE_STATUSLINE_RELATIVE_PATH, renderClaudeUpdateStatusline, "gdh-statusline", pinnedVersion));
+    planHookInstallAction("claude", targetPath, adapter, CLAUDE_STATUSLINE_RELATIVE_PATH, renderClaudeUpdateStatusline, "gdh-statusline", pinnedVersion), planHookInstallAction("claude", targetPath, adapter, CLAUDE_AUTHORING_HOOK_RELATIVE_PATH, (version) => renderGdhAuthoringHook({
+        pinnedVersion: version,
+        targetRelativePath: ".",
+        agent: "claude",
+    }), "authoring guard", pinnedVersion));
     // UPD-01 + UPD-02 .claude/settings.json composite patch action.
     //   - Plan 02 (Strategy A, planner-lock #1): patch-merge the SessionStart
     //     hook entry by exact command-literal match, preserving siblings.
@@ -2360,7 +1533,7 @@ function planClaudeInstallActions(targetPath, adapter, pinnedVersion) {
     catch {
         existingSettingsContent = "";
     }
-    const patchedSettings = patchClaudeSettingsForGdhStatusline(patchClaudeSettingsForGdhSessionStart(existingSettingsContent));
+    const patchedSettings = patchClaudeSettingsForGdhStatusline(patchClaudeSettingsForGdhAuthoringHooks(patchClaudeSettingsForGdhSessionStart(existingSettingsContent)));
     const settingsIsUnchanged = existingSettingsContent === patchedSettings;
     const settingsExistedOnDisk = existingSettingsContent.length > 0;
     actions.push(createInstallAction({
@@ -2372,12 +1545,13 @@ function planClaudeInstallActions(targetPath, adapter, pinnedVersion) {
         state: settingsIsUnchanged ? "unchanged" : "planned",
         mode: settingsIsUnchanged ? "unchanged" : settingsExistedOnDisk ? "replace" : "create",
         summary: settingsIsUnchanged
-            ? "GDH SessionStart hook + statusline already registered in .claude/settings.json."
+            ? "GDH SessionStart hook, authoring guard hooks, and statusline already registered in .claude/settings.json."
             : settingsExistedOnDisk
-                ? "Register the GDH SessionStart hook and statusline (write-if-absent) in .claude/settings.json while preserving sibling content (patch-merge)."
-                : "Create .claude/settings.json with the GDH SessionStart hook + statusline registration.",
+                ? "Register the GDH SessionStart hook, authoring guard hooks, and statusline (write-if-absent) in .claude/settings.json while preserving sibling content (patch-merge)."
+                : "Create .claude/settings.json with the GDH SessionStart hook, authoring guard hooks, and statusline registration.",
         content: patchedSettings,
     }));
+    actions.push(...planLegacyClaudeCommandCleanupActions(targetPath));
     return actions;
 }
 function planCursorInstallActions(targetPath, adapter, pinnedVersion) {
@@ -2413,7 +1587,7 @@ function planCursorInstallActions(targetPath, adapter, pinnedVersion) {
             content: renderCursorRule(),
         }));
     }
-    actions.push(planSkillInstallAction("cursor", targetPath, adapter, CURSOR_ONBOARD_SKILL_RELATIVE_PATH, renderCursorOnboardSkill, "gdh-onboard", pinnedVersion), planSkillInstallAction("cursor", targetPath, adapter, CURSOR_STATUS_SKILL_RELATIVE_PATH, renderCursorStatusSkill, "gdh-status", pinnedVersion), planSkillInstallAction("cursor", targetPath, adapter, CURSOR_MIGRATE_SKILL_RELATIVE_PATH, renderCursorMigrateSkill, "gdh-migrate", pinnedVersion), planSkillInstallAction("cursor", targetPath, adapter, CURSOR_UPDATE_SKILL_RELATIVE_PATH, renderCursorUpdateSkill, "gdh-update", pinnedVersion), planSkillInstallAction("cursor", targetPath, adapter, CURSOR_CHECK_SKILL_RELATIVE_PATH, renderCursorCheckSkill, "gdh-check", pinnedVersion), planSkillInstallAction("cursor", targetPath, adapter, CURSOR_PREPARE_SKILL_RELATIVE_PATH, renderCursorPrepareSkill, "gdh-prepare", pinnedVersion), planSkillInstallAction("cursor", targetPath, adapter, CURSOR_VERIFY_SKILL_RELATIVE_PATH, renderCursorVerifySkill, "gdh-verify", pinnedVersion), planSkillInstallAction("cursor", targetPath, adapter, CURSOR_SCAN_SKILL_RELATIVE_PATH, renderCursorScanSkill, "gdh-scan", pinnedVersion));
+    actions.push(planSkillInstallAction("cursor", targetPath, adapter, CURSOR_ONBOARD_SKILL_RELATIVE_PATH, renderCursorOnboardSkill, "gdh-onboard", pinnedVersion), planSkillInstallAction("cursor", targetPath, adapter, CURSOR_STATUS_SKILL_RELATIVE_PATH, renderCursorStatusSkill, "gdh-status", pinnedVersion), planSkillInstallAction("cursor", targetPath, adapter, CURSOR_MIGRATE_SKILL_RELATIVE_PATH, renderCursorMigrateSkill, "gdh-migrate", pinnedVersion), planSkillInstallAction("cursor", targetPath, adapter, CURSOR_UPDATE_SKILL_RELATIVE_PATH, renderCursorUpdateSkill, "gdh-update", pinnedVersion), planSkillInstallAction("cursor", targetPath, adapter, CURSOR_CHECK_SKILL_RELATIVE_PATH, renderCursorCheckSkill, "gdh-check", pinnedVersion), planSkillInstallAction("cursor", targetPath, adapter, CURSOR_PREPARE_SKILL_RELATIVE_PATH, renderCursorPrepareSkill, "gdh-prepare", pinnedVersion), planSkillInstallAction("cursor", targetPath, adapter, CURSOR_SCAN_SKILL_RELATIVE_PATH, renderCursorScanSkill, "gdh-scan", pinnedVersion));
     return actions;
 }
 function dedupeInstallActions(actions) {
@@ -2578,19 +1752,23 @@ export function renderManagedCodexProjectSection(pinnedVersion) {
 }
 export function renderManagedCodexProjectConfig(existingContent, pinnedVersion) {
     const section = renderManagedCodexProjectSection(pinnedVersion);
-    if (existingContent === null || existingContent.trim() === "") {
-        return `${section}\n`;
-    }
-    const lines = existingContent.split("\n");
+    const withoutManagedHooks = removeManagedCodexAuthoringHookBlock(existingContent ?? "");
+    const withFeature = ensureCodexHooksFeature(withoutManagedHooks);
+    const withMcp = patchManagedCodexProjectSection(withFeature, section);
+    return appendManagedCodexAuthoringHookBlock(withMcp);
+}
+function patchManagedCodexProjectSection(content, section) {
+    const lines = content.split("\n");
     const sectionStart = lines.findIndex((line) => /^\[mcp_servers\.gdh\]\s*$/.test(line));
     if (sectionStart === -1) {
-        const trailingNewline = existingContent.endsWith("\n") ? "" : "\n";
-        const separator = existingContent.length > 0 ? "\n" : "";
-        return `${existingContent}${trailingNewline}${separator}${section}\n`;
+        const trailingNewline = content.endsWith("\n") ? "" : "\n";
+        const separator = content.length > 0 ? "\n" : "";
+        return `${content}${trailingNewline}${separator}${section}\n`;
     }
     let sectionEnd = lines.length;
     for (let i = sectionStart + 1; i < lines.length; i++) {
-        if (/^\[/.test(lines[i] ?? "")) {
+        if (/^\[/.test(lines[i] ?? "") ||
+            /^# BEGIN GDH managed authoring hooks$/.test(lines[i] ?? "")) {
             sectionEnd = i;
             break;
         }
@@ -2603,6 +1781,62 @@ export function renderManagedCodexProjectConfig(existingContent, pinnedVersion)
     const afterJoin = afterNonEmpty.length > 0 ? `\n\n${afterNonEmpty}` : "\n";
     return `${beforeJoin}${section}${afterJoin}`;
 }
+function removeManagedCodexAuthoringHookBlock(content) {
+    return content
+        .replace(/(?:^|\n)# BEGIN GDH managed authoring hooks\n[\s\S]*?# END GDH managed authoring hooks\n?/, "\n")
+        .replace(/\n{3,}/g, "\n\n")
+        .trimEnd();
+}
+function appendManagedCodexAuthoringHookBlock(content) {
+    const normalized = content.trimEnd();
+    const separator = normalized.length > 0 ? "\n\n" : "";
+    return `${normalized}${separator}${renderManagedCodexAuthoringHookBlock()}`;
+}
+function ensureCodexHooksFeature(content) {
+    const lines = content.split("\n");
+    const featuresStart = lines.findIndex((line) => /^\[features\]\s*$/.test(line));
+    if (featuresStart === -1) {
+        const separator = content.trim().length > 0 ? "\n\n" : "";
+        return `${content}${separator}[features]\ncodex_hooks = true`;
+    }
+    let featuresEnd = lines.length;
+    for (let i = featuresStart + 1; i < lines.length; i++) {
+        if (/^\[/.test(lines[i] ?? "")) {
+            featuresEnd = i;
+            break;
+        }
+    }
+    const featureLines = lines.slice(featuresStart, featuresEnd);
+    const codexHooksIndex = featureLines.findIndex((line) => /^\s*codex_hooks\s*=/.test(line));
+    if (codexHooksIndex === -1) {
+        featureLines.push("codex_hooks = true");
+    }
+    else {
+        featureLines[codexHooksIndex] = "codex_hooks = true";
+    }
+    return [...lines.slice(0, featuresStart), ...featureLines, ...lines.slice(featuresEnd)].join("\n");
+}
+function renderManagedCodexAuthoringHookBlock() {
+    return [
+        "# BEGIN GDH managed authoring hooks",
+        "[[hooks.PostToolUse]]",
+        'matcher = "apply_patch|Edit|Write"',
+        "[[hooks.PostToolUse.hooks]]",
+        'type = "command"',
+        `command = ${JSON.stringify(CODEX_AUTHORING_HOOK_COMMAND)}`,
+        "timeout = 30",
+        'statusMessage = "Checking GDH authoring edit"',
+        "",
+        "[[hooks.Stop]]",
+        "[[hooks.Stop.hooks]]",
+        'type = "command"',
+        `command = ${JSON.stringify(CODEX_AUTHORING_HOOK_COMMAND)}`,
+        "timeout = 120",
+        'statusMessage = "Checking GDH final authoring validation"',
+        "# END GDH managed authoring hooks",
+        "",
+    ].join("\n");
+}
 function extractManagedCodexSection(content) {
     const lines = content.split("\n");
     const start = lines.findIndex((line) => /^\[mcp_servers\.gdh\]\s*$/.test(line));
@@ -2611,7 +1845,8 @@ function extractManagedCodexSection(content) {
     }
     let end = lines.length;
     for (let i = start + 1; i < lines.length; i++) {
-        if (/^\[/.test(lines[i] ?? "")) {
+        if (/^\[/.test(lines[i] ?? "") ||
+            /^# BEGIN GDH managed authoring hooks$/.test(lines[i] ?? "")) {
             end = i;
             break;
         }
@@ -2888,7 +2123,7 @@ async function inspectRulesLifecycleSurface(targetPath, projectConfig) {
             surface: "rules_schema",
             management: "project_owned",
             state: "migration_needed",
-            summary: "Rules are missing from .gdh/rules.yaml, so done-policy and guidance enforcement are incomplete.",
+            summary: "Rules are missing from .gdh/rules.yaml, so guidance enforcement is incomplete.",
             reasons: ["rules_missing"],
             probes,
             action: {
@@ -3771,6 +3006,7 @@ function normalizeChangedFiles(files) {
 }
 export { CLAUDE_STATUSLINE_RELATIVE_PATH } from "./claude-statusline-render.js";
 export { CLAUDE_CHECK_UPDATE_HOOK_RELATIVE_PATH } from "./claude-update-hook-render.js";
+export { CLAUDE_AUTHORING_HOOK_COMMAND, CLAUDE_AUTHORING_HOOK_RELATIVE_PATH, CODEX_AUTHORING_HOOK_COMMAND, CODEX_AUTHORING_HOOK_RELATIVE_PATH, } from "./authoring-hook-render.js";
 export { bumpAndRebakePin, } from "./self-update-mechanics.js";
 // Internal aggregator exposed for Wave 0 unit tests
 // (packages/adapters/src/lifecycle-compatibility.test.ts). Callers outside this