@deftai/directive-runtime 0.129.0 → 0.129.2

package/dist/setup.js

@@ -9,14 +9,20 @@ import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { ContainedWriteError, containedRemove, containedWrite, } from "../vendor/directive-core/dist/fs/contained-write.js";
+import { defaultTrackedNames, isTrackedDeletePath, stageFrameworkPaths, } from "../vendor/directive-core/dist/init-deposit/hygiene.js";
+import { seedMinimalProjectDefinition } from "../vendor/directive-core/dist/init-deposit/init-deposit.js";
 import { buildOwnershipRecord, fingerprintContent, ownershipRecordsEqual, readEvidenceGenerationNumber, readOwnershipRecord, writeOwnershipRecord, } from "../vendor/directive-core/dist/install-health/index.js";
 import { assertInventoryCompleteness } from "./installer-output-inventory.js";
 import { CURRENT_DATA_SCHEMA_VERSION, DATA_SCHEMA_MARKER_REL } from "./migrate.js";
 import { isConvertStrategyFrom, runStrategy } from "./removal-steps/index.js";
 import { ensureAgentsManagedSection, ensureGitHooks, ensureHostHooks, ensureOpenClawIntegrations, ensureSkillPointers, ensureSlashCommands, ensureTaskfileInclude, listSkillPointerPaths, listVerifiedManagedSlashCommandPaths, RUNTIME_PREFIX, } from "./setup-wiring.js";
 const SEED_PLACEHOLDER_REL = "xbrief/.directive-seed-placeholder";
+const PD_REL = "xbrief/PROJECT-DEFINITION.xbrief.json";
 const GEN_REL = ".deft/GENERATION.json";
 const WIRING_READY_DIR_REL = ".deft/directive";
+const XBRIEF_LIFECYCLE_DIRS = ["proposed", "pending", "active", "completed", "cancelled"];
+const XBRIEF_LIFECYCLE_GITKEEP = "# Keeps this xbrief/ lifecycle directory present in version control so the\n" +
+    "# deft-directive-setup pre-cutover guard does not fire on a fresh install (#4666).\n";
 function readOwnRuntimeVersion() {
     try {
         const here = dirname(fileURLToPath(import.meta.url));
@@ -144,6 +150,59 @@ function createSeedPlaceholder(projectRoot) {
     writeContained(projectRoot, SEED_PLACEHOLDER_REL, "# Directive initial seed placeholder (install only; repair must not create this).\n");
     return SEED_PLACEHOLDER_REL;
 }
+/** Install-only: five xbrief lifecycle dirs + .gitkeeps (#4666 / AC8.4). */
+function ensureXbriefLifecycleGitkeeps(projectRoot) {
+    const created = [];
+    for (const sub of XBRIEF_LIFECYCLE_DIRS) {
+        const rel = relPosix("xbrief", sub, ".gitkeep");
+        if (existsSync(join(projectRoot, rel)))
+            continue;
+        writeContained(projectRoot, rel, XBRIEF_LIFECYCLE_GITKEEP);
+        created.push(rel);
+    }
+    return created;
+}
+/**
+ * Stage this-run setup writes after install/upgrade (#4666).
+ * Always includes PD + lifecycle gitkeeps when present (fix the 0.126 hole).
+ * Does not `git add` every existing managed matcher path — that would stage
+ * unrelated dirty peers (package.json / custom .githooks/*). Keeps exact
+ * this-run paths (no skill/command parent compaction) so sibling untracked
+ * skills stay unstaged. This-run removals may be missing on disk so tracked
+ * deletions can reach `git add`; untracked missing paths are skipped so one
+ * unmatched pathspec cannot fail the whole staging batch (#5883 P1 / #3394).
+ */
+function stageSetupManagedPaths(projectRoot, thisRunPaths) {
+    const present = [];
+    const missingAllow = [];
+    const seen = new Set();
+    const add = (rel, opts = {}) => {
+        const normalized = rel.replace(/\\/g, "/");
+        if (!normalized || seen.has(normalized))
+            return;
+        const onDisk = existsSync(join(projectRoot, normalized));
+        if (!onDisk && !opts.allowMissing)
+            return;
+        seen.add(normalized);
+        if (onDisk)
+            present.push(normalized);
+        else
+            missingAllow.push(normalized);
+    };
+    for (const rel of thisRunPaths) {
+        add(rel, { allowMissing: true });
+    }
+    add(PD_REL);
+    for (const sub of XBRIEF_LIFECYCLE_DIRS) {
+        add(relPosix("xbrief", sub, ".gitkeep"));
+    }
+    const tracked = new Set(defaultTrackedNames(projectRoot, missingAllow));
+    const stagePaths = [
+        ...present,
+        ...missingAllow.filter((path) => isTrackedDeletePath(path, tracked)),
+    ];
+    stageFrameworkPaths(projectRoot, stagePaths);
+}
 /** Shared host settings / Taskfile: only Directive entries are owned (structured-entry). */
 const STRUCTURED_ENTRY_RELS = [
     { path: ".claude/settings.json", entryKey: "hooks" },
@@ -207,7 +266,9 @@ function buildOwnershipArtifacts(projectRoot) {
         });
     }
     const seedAbs = join(projectRoot, SEED_PLACEHOLDER_REL);
-    if (existsSync(seedAbs)) {
+    const pdAbs = join(projectRoot, PD_REL);
+    const hasLifecycle = XBRIEF_LIFECYCLE_DIRS.some((sub) => existsSync(join(projectRoot, "xbrief", sub, ".gitkeep")));
+    if (existsSync(seedAbs) || existsSync(pdAbs) || hasLifecycle) {
         artifacts.push({
             path: "xbrief",
             kind: "retained",
@@ -312,10 +373,15 @@ export function runSetup(options) {
         // Seeds only on first-time install (AC8.4); repair/upgrade never create them.
         // AC6.2: leave data-schema current for empty/seeded install. Repair may write a
         // missing marker (not a migration); upgrade still migrates when data is behind.
+        // #4666: greenfield retain — PD + lifecycle dirs (not placeholder-only); no schemas.
         if (operation === "install" && conflicts.length === 0) {
             const seed = createSeedPlaceholder(root);
             if (seed !== null)
                 created.push(seed);
+            created.push(...ensureXbriefLifecycleGitkeeps(root));
+            if (seedMinimalProjectDefinition(root, { printf: () => undefined })) {
+                created.push(PD_REL);
+            }
         }
         if ((operation === "install" || operation === "repair") &&
             conflicts.length === 0 &&
@@ -338,6 +404,12 @@ export function runSetup(options) {
             created.push(GEN_REL);
         else if (!unchanged || legacyConversion || convertViaRemovals)
             modified.push(GEN_REL);
+        // #4666: stage this-run managed peers including PD + lifecycle after install/upgrade.
+        // Still no auto-commit. Repair does not stage (seeds are install-only; upgrade stages
+        // existing PD/lifecycle with refreshed wiring).
+        if (conflicts.length === 0 && (operation === "install" || operation === "upgrade")) {
+            stageSetupManagedPaths(root, [...created, ...modified, ...removed]);
+        }
         if (conflicts.length > 0) {
             // Never publish readiness after conflict; invalidate any existing marker (AC8.6).
             invalidateReadinessMarkers(root, removed);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deftai/directive-runtime",
-  "version": "0.129.0",
+  "version": "0.129.2",
   "description": "Directive runtime — pinned product commands, hooks, content, and engine.",
   "license": "MIT",
   "homepage": "https://deftai.github.io/directive/",