@skillcap/gdh 2.0.1 → 3.0.1

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

@@ -4,9 +4,9 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { buildGdhStatusResult, CLAUDE_CHECK_UPDATE_HOOK_RELATIVE_PATH, CLAUDE_MIGRATE_SKILL_RELATIVE_PATH, CLAUDE_ONBOARD_SKILL_RELATIVE_PATH, CLAUDE_PREPARE_SKILL_RELATIVE_PATH, CLAUDE_STATUS_SKILL_RELATIVE_PATH, CODEX_MIGRATE_SKILL_RELATIVE_PATH, CODEX_ONBOARD_SKILL_RELATIVE_PATH, CODEX_PREPARE_SKILL_RELATIVE_PATH, CODEX_STATUS_SKILL_RELATIVE_PATH, createGsdSnapshot, getSupportedAgentAdaptersStatus, installSupportedAgentAdapters, } from "@gdh/adapters";
+import { buildGdhStatusResult, CLAUDE_CHECK_UPDATE_HOOK_RELATIVE_PATH, CLAUDE_MIGRATE_SKILL_RELATIVE_PATH, CLAUDE_ONBOARD_SKILL_RELATIVE_PATH, CLAUDE_PREPARE_SKILL_RELATIVE_PATH, CLAUDE_STATUS_SKILL_RELATIVE_PATH, CODEX_MIGRATE_SKILL_RELATIVE_PATH, CODEX_ONBOARD_SKILL_RELATIVE_PATH, CODEX_PREPARE_SKILL_RELATIVE_PATH, CODEX_STATUS_SKILL_RELATIVE_PATH, getSupportedAgentAdaptersStatus, installSupportedAgentAdapters, } from "@gdh/adapters";
 import { checkManagedLsp, doctorAuthoringDiagnostics, doctorManagedLsp, getAuthoringDiagnosticsStatus, getCurrentAuthoringDiagnostics, getManagedLspStatus, hasCompleteOnboardingSurface, inspectCacheState, pruneAuthoringDiagnostics, pruneCacheState, pruneManagedLsp, readProjectConfig, readWorktreeState, refreshAuthoringDiagnostics, resolveAuthoringStatus, resolveEffectiveTargetPath, resolvePinnedVersion, resolveProjectRoot, resolveTargetGodotDocsVersion, restartManagedLsp, runAuthoringCheck, runImportRefresh, runTargetPrepare, runWarmup, stopManagedLsp, warmupManagedLsp, } from "@gdh/authoring";
-import { definePackageBoundary, GDH_AUTHORING_DOGFOOD_VERSION, GDH_AUTHORING_SLICE_REPORT_VERSION, GDH_PRODUCT_NAME, resolveCurrentGdhInstall, resolveGdhProductMetadata, } from "@gdh/core";
+import { CODEX_RETRUST_REMINDER_TEXT, clearCodexRetrustReminder, definePackageBoundary, GDH_AUTHORING_DOGFOOD_VERSION, GDH_AUTHORING_SLICE_REPORT_VERSION, GDH_PRODUCT_NAME, readCodexRetrustReminder, resolveCurrentGdhInstall, resolveGdhProductMetadata, } from "@gdh/core";
 import { fetchOfficialGodotDoc, getGuidanceStatus, resolveGuidanceQuery, searchOfficialGodotDocs, } from "@gdh/docs";
 import { createMcpManifest, invokeMcpTool, serveMcpOverStdio } from "@gdh/mcp";
 import { inspectAuthoringEffectiveness, inspectAuthoringSessions, inspectGuidanceAudit, recordAuthoringSessionEvent, } from "@gdh/observability";
@@ -28,7 +28,7 @@ import { runSelfUpdateCommand as runSelfUpdateCommandImpl } from "./self-update.
 export async function runSelfUpdateCommand(args, io) {
     return runSelfUpdateCommandImpl(args, io);
 }
-import { executeSetupCommand, isSetupCanceledError, renderDurableTruthCollisionHint, renderSetupIntro, renderSetupOutro, renderSetupSummary, } from "./setup.js";
+import { executeSetupCommand, isSetupCanceledError, renderDurableTruthCollisionHint, renderGitRequiredHint, renderSetupIntro, renderSetupOutro, renderSetupSummary, } from "./setup.js";
 import { emitUpdateBannerIfStale } from "./update-banner.js";
 export const cliPackage = definePackageBoundary({
     name: "@gdh/cli",
@@ -390,6 +390,17 @@ async function runSetupCommand(args, io) {
             });
             return 1;
         }
+        if (renderGitRequiredHint(error, io.stderr)) {
+            await recordSessionEvent(targetPath, {
+                commandStartedAtMs,
+                kind: "onboard",
+                command: "gdh setup",
+                state: "blocked",
+                summary: "GDH setup blocked because the target is not in a git working tree (RFC 0010 D1).",
+                errorMessage: formatCliError(error),
+            });
+            return 1;
+        }
         await recordSessionEvent(targetPath, {
             commandStartedAtMs,
             kind: "onboard",
@@ -466,6 +477,19 @@ async function runOnboardCommand(args, io) {
         return 0;
     }
     catch (error) {
+        if (renderGitRequiredHint(error, io.stderr)) {
+            if (!dryRun) {
+                await recordSessionEvent(targetPath, {
+                    commandStartedAtMs,
+                    kind: "onboard",
+                    command: "gdh onboard",
+                    state: "blocked",
+                    summary: "GDH onboard blocked because the target is not in a git working tree (RFC 0010 D1).",
+                    errorMessage: formatCliError(error),
+                });
+            }
+            return 1;
+        }
         if (!dryRun) {
             await recordSessionEvent(targetPath, {
                 commandStartedAtMs,
@@ -505,6 +529,18 @@ async function runStatusCommand(args, io) {
     // to `gdh status` and `gdh verify` only. Silent when cache is null /
     // current / offline / dev-mode (D-06).
     await emitUpdateBannerIfStale(targetPath, io);
+    // RFC 0010 / CPATH-16 (PR-1). One-shot Codex re-trust reminder. Set by the
+    // v3.0.0 canonical-path migration when the `.codex/config.toml` envelope is
+    // rewritten. `gdh self-update` already surfaced it once on the apply path;
+    // this is the second-half delivery — first post-migration `gdh status`
+    // call also emits the reminder, then clears the marker.
+    const codexReminder = await readCodexRetrustReminder(targetPath);
+    if (codexReminder !== null) {
+        const tty = Boolean(io.stderr.isTTY ?? process.stderr.isTTY);
+        const yellow = (text) => (tty ? `\x1b[33m${text}\x1b[0m` : text);
+        io.stderr.write(`${yellow("⚠ " + CODEX_RETRUST_REMINDER_TEXT)}\n`);
+        await clearCodexRetrustReminder(targetPath);
+    }
     try {
         const status = await buildGdhStatusResult(targetPath);
         io.stdout.write(`${JSON.stringify(status, null, 2)}\n`);
@@ -1578,7 +1614,6 @@ async function runAdaptersCommand(args, io) {
             "                                                   Inspect supported-agent reinforcement status as JSON.",
             "  install [target] [--dry-run] [--agent <name>] [--user] [--dev-repo <path>] [--integration-root <path>]",
             "                                                   Install or repair supported-agent reinforcement surfaces.",
-            "  gsd snapshot [target] [--files <path>]  Export a read-mostly GSD projection as JSON.",
             "",
             "Supported agents: codex, claude",
         ].join("\n") + "\n");
@@ -1590,36 +1625,11 @@ async function runAdaptersCommand(args, io) {
     if (subcommand === "install") {
         return runAdaptersInstallCommand(rest, io);
     }
-    if (subcommand === "gsd") {
-        return runGsdAdapterCommand(rest, io);
-    }
     io.stderr.write([
         `Unknown adapters command: ${subcommand}`,
         "",
         "Usage: gdh adapters status [target] [--user] [--integration-root <path>]",
         "Usage: gdh adapters install [target] [--dry-run] [--agent <name>] [--user] [--dev-repo <path>] [--integration-root <path>]",
-        "Usage: gdh adapters gsd snapshot [target] [--files <path>]",
-    ].join("\n") + "\n");
-    return 1;
-}
-async function runGsdAdapterCommand(args, io) {
-    const [subcommand, ...rest] = args;
-    if (!subcommand || subcommand === "--help" || subcommand === "help") {
-        io.stdout.write([
-            "Usage: gdh adapters gsd <command> [target]",
-            "",
-            "Commands:",
-            "  snapshot [target] [--files <path>]  Export a read-mostly GSD projection as JSON.",
-        ].join("\n") + "\n");
-        return 0;
-    }
-    if (subcommand === "snapshot") {
-        return runGsdSnapshotCommand(rest, io);
-    }
-    io.stderr.write([
-        `Unknown adapters gsd command: ${subcommand}`,
-        "",
-        "Usage: gdh adapters gsd snapshot [target] [--files <path>]",
     ].join("\n") + "\n");
     return 1;
 }
@@ -2888,43 +2898,6 @@ async function runAdaptersInstallCommand(args, io) {
         return 1;
     }
 }
-async function runGsdSnapshotCommand(args, io) {
-    if (args.includes("--help")) {
-        io.stdout.write([
-            "Usage: gdh adapters gsd snapshot [target] [--files <path>]",
-            "",
-            "Export a read-mostly GSD projection over current GDH status, guidance, and validation surfaces as JSON.",
-        ].join("\n") + "\n");
-        return 0;
-    }
-    const unsupportedOptionsError = findUnsupportedOptionsError(args, {
-        usage: "Usage: gdh adapters gsd snapshot [target] [--files <path>]\n",
-        optionsWithValues: ["--files"],
-    });
-    if (unsupportedOptionsError !== null) {
-        io.stderr.write(unsupportedOptionsError);
-        return 1;
-    }
-    const { targetPath, error: targetPathError } = parseOptionalPositionalTargetPath(args, {
-        usage: "Usage: gdh adapters gsd snapshot [target] [--files <path>]\n",
-        additionalOptionsWithValues: new Set(["--files"]),
-    });
-    if (targetPathError !== null) {
-        io.stderr.write(targetPathError);
-        return 1;
-    }
-    try {
-        const result = await createGsdSnapshot(targetPath, {
-            files: collectOptionValues(args, "--files"),
-        });
-        io.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
-        return 0;
-    }
-    catch (error) {
-        io.stderr.write(`Failed to create a GSD snapshot for "${targetPath}": ${formatCliError(error)}\n`);
-        return 1;
-    }
-}
 async function runMcpManifestCommand(args, io) {
     if (args.includes("--help")) {
         io.stdout.write(["Usage: gdh mcp manifest", "", "Print the thin GDH MCP manifest as JSON."].join("\n") + "\n");
@@ -3322,6 +3295,49 @@ async function runVerifyReadinessCommand(args, io) {
         return 1;
     }
 }
+const VERIFY_DRIFT_LEGACY_HOOK_PATHS = [
+    ".claude/hooks/gdh-authoring-guard.js",
+    ".claude/hooks/gdh-check-update.js",
+    ".claude/hooks/gdh-check-update-worker.js",
+    ".claude/hooks/gdh-statusline.js",
+    ".codex/hooks/gdh-authoring-guard.js",
+];
+const VERIFY_DRIFT_NEW_HOOK_PATHS = [
+    ".gdh/hooks/authoring-guard.js",
+    ".gdh/hooks/check-update.js",
+    ".gdh/hooks/check-update-worker.js",
+    ".gdh/hooks/statusline.js",
+];
+async function inspectVerifyDriftLegacyLayout(targetPath) {
+    const legacyFiles = [];
+    for (const relativePath of VERIFY_DRIFT_LEGACY_HOOK_PATHS) {
+        const absolutePath = path.join(targetPath, relativePath);
+        const exists = await fs
+            .access(absolutePath)
+            .then(() => true)
+            .catch(() => false);
+        if (exists)
+            legacyFiles.push(relativePath);
+    }
+    const newLayoutFiles = [];
+    for (const relativePath of VERIFY_DRIFT_NEW_HOOK_PATHS) {
+        const absolutePath = path.join(targetPath, relativePath);
+        const exists = await fs
+            .access(absolutePath)
+            .then(() => true)
+            .catch(() => false);
+        if (exists)
+            newLayoutFiles.push(relativePath);
+    }
+    if (legacyFiles.length === 0) {
+        return { state: "absent", legacyFiles, newLayoutFiles };
+    }
+    return {
+        state: newLayoutFiles.length > 0 ? "partially_migrated" : "migration_pending",
+        legacyFiles,
+        newLayoutFiles,
+    };
+}
 const VERIFY_DRIFT_SCANNED_FILES = [
     { relativePath: CODEX_ONBOARD_SKILL_RELATIVE_PATH, description: "Codex gdh-onboard skill" },
     { relativePath: CODEX_STATUS_SKILL_RELATIVE_PATH, description: "Codex gdh-status skill" },
@@ -3389,6 +3405,11 @@ async function runVerifyDriftCommand(args, io) {
             ".gdh/project.yaml gdh_version. Exits 1 and",
             "emits a structured JSON result when ANY file's baked version diverges from",
             "the pinned value. Covers ROADMAP Success Criterion #3 (one source of truth).",
+            "Also recognises the pre-v3.0.0 hook layout (RFC 0010 / CPATH-10): when",
+            "`.claude/hooks/gdh-*.js` or `.codex/hooks/gdh-authoring-guard.js` is still on",
+            "disk, the result emits `legacyLayout.state: \"migration_pending\"` (legacy only)",
+            "or `\"partially_migrated\"` (legacy + canonical present) and points the",
+            "remediation action at `gdh self-update` rather than `gdh adapters install`.",
             "This command does NOT validate runtime bridge, project lifecycle, or authoring health.",
             "",
         ].join("\n"));
@@ -3458,33 +3479,54 @@ async function runVerifyDriftCommand(args, io) {
     }));
     const driftFiles = fileResults.filter((file) => file.drift);
     const overallDrift = driftFiles.length > 0;
-    const result = {
-        ok: !overallDrift,
-        drift: overallDrift,
-        pinned: pinnedVersion,
-        scannedFileCount: fileResults.length,
-        driftFileCount: driftFiles.length,
-        files: fileResults,
-        action: overallDrift
+    // RFC 0010 CPATH-10 — recognise the pre-v3.0.0 hook layout as migration
+    // input. When legacy hook scripts are still on disk, route operators to
+    // `gdh self-update` instead of `gdh adapters install`; the migration entry
+    // owns the legacy-file cleanup that re-bake cannot perform.
+    const legacyLayout = await inspectVerifyDriftLegacyLayout(targetPath);
+    const action = legacyLayout.state === "migration_pending" ||
+        legacyLayout.state === "partially_migrated"
+        ? {
+            kind: "run_migration",
+            summary: legacyLayout.state === "migration_pending"
+                ? `Detected legacy v2.x hook layout (${legacyLayout.legacyFiles.length} script(s) under .claude/hooks/ or .codex/hooks/). Run \`gdh self-update\` to migrate to the v3.0.0 canonical layout.`
+                : `Detected partially-migrated hook layout (${legacyLayout.legacyFiles.length} legacy script(s) AND ${legacyLayout.newLayoutFiles.length} canonical script(s) coexisting). Re-run \`gdh self-update\` to converge.`,
+            command: ["gdh", "self-update", targetPath],
+            autoApplicable: true,
+        }
+        : overallDrift
             ? {
                 kind: "run_repair",
                 summary: `${driftFiles.length} managed-surface file(s) have a baked version that does not match .gdh/project.yaml gdh_version. Run \`gdh adapters install\` to regenerate them.`,
                 command: ["gdh", "adapters", "install", targetPath],
                 autoApplicable: true,
             }
-            : null,
+            : null;
+    const result = {
+        ok: !overallDrift && legacyLayout.state === "absent",
+        drift: overallDrift || legacyLayout.state !== "absent",
+        pinned: pinnedVersion,
+        scannedFileCount: fileResults.length,
+        driftFileCount: driftFiles.length,
+        files: fileResults,
+        action,
+        legacyLayout,
     };
     await recordSessionEvent(targetPath, {
         commandStartedAtMs,
         kind: "verify_drift",
         command: "gdh verify drift",
-        state: overallDrift ? "failed" : "succeeded",
-        summary: overallDrift
-            ? `Detected ${driftFiles.length} managed-surface file(s) with a baked version drifted from gdh_version.`
+        state: result.ok ? "succeeded" : "failed",
+        summary: !result.ok
+            ? legacyLayout.state === "migration_pending"
+                ? `Detected pre-v3.0.0 hook layout (${legacyLayout.legacyFiles.length} legacy script(s)). Run \`gdh self-update\` to migrate.`
+                : legacyLayout.state === "partially_migrated"
+                    ? `Detected partially-migrated hook layout (${legacyLayout.legacyFiles.length} legacy + ${legacyLayout.newLayoutFiles.length} canonical script(s)). Re-run \`gdh self-update\` to converge.`
+                    : `Detected ${driftFiles.length} managed-surface file(s) with a baked version drifted from gdh_version.`
             : `All ${fileResults.length} managed-surface file(s) match .gdh/project.yaml gdh_version.`,
     });
     writeJsonResult(io, result);
-    return overallDrift ? 1 : 0;
+    return result.ok ? 0 : 1;
 }
 async function runVerifyCorpusStatusCommand(args, io) {
     if (args.includes("--help")) {
@@ -4489,7 +4531,6 @@ function renderHelp() {
         "  docs fetch <ref-or-url> [target] [--project <relative-path>]  Fetch one official version-aware Godot docs page or section.",
         "  adapters status [target] [--user] [--integration-root <path>] Inspect supported-agent reinforcement status.",
         "  adapters install [target] [--dry-run] [--agent <name>] [--user] [--dev-repo <path>] [--integration-root <path>] Install or repair supported-agent reinforcement.",
-        "  adapters gsd snapshot [target] [--files <path>] Export a read-only GSD projection.",
         "  authoring check [target] Run the current authoring-check entrypoint.",
         "  authoring diagnostics <status|current|refresh|doctor|prune> [target] Inspect current Godot authoring diagnostics snapshots.",
         "  lsp <status|warmup|check|stop|restart|prune|doctor> [target] Manage authoring.lsp lifecycle state.",