@deftai/directive-core 0.65.0 → 0.66.1

package/dist/triage/scope/validate.js

@@ -1,3 +1,4 @@
+import { readPlanPolicy } from "../../policy/plan-extensions.js";
 import { REFERENCED_BY_VBRIEF_SCOPES, SLICED_FROM_SCOPES, VALID_IGNORE_KEYS, VALID_IGNORE_RULES, VALID_RULE_TYPES, } from "./constants.js";
 import { parseDurationMs } from "./duration.js";
 import { validateMilestoneRule } from "./milestone.js";
@@ -238,9 +239,7 @@ function pointerForError(err, rawList) {
 }
 export function validateTriageScopeOnPlan(plan, filepath) {
     const out = [];
-    const policy = typeof plan === "object" && plan !== null && !Array.isArray(plan)
-        ? plan.policy
-        : undefined;
+    const policy = readPlanPolicy(plan);
     const rawScope = typeof policy === "object" && policy !== null && !Array.isArray(policy)
         ? policy.triageScope
         : undefined;
@@ -254,9 +253,7 @@ export function validateTriageScopeOnPlan(plan, filepath) {
 }
 export function validateTriageScopeIgnoresOnPlan(plan, filepath) {
     const out = [];
-    const policy = typeof plan === "object" && plan !== null && !Array.isArray(plan)
-        ? plan.policy
-        : undefined;
+    const policy = readPlanPolicy(plan);
     const raw = typeof policy === "object" && policy !== null && !Array.isArray(policy)
         ? policy.triageScopeIgnores
         : undefined;

package/dist/triage/scope-drift/add-ignore.js

@@ -1,6 +1,7 @@
 import { existsSync, mkdtempSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { dirname, join, resolve } from "node:path";
+import { migrateLegacyPolicyKey, PLAN_POLICY_KEY } from "../../policy/plan-extensions.js";
 const PROJECT_DEFINITION_REL_PATH = "vbrief/PROJECT-DEFINITION.vbrief.json";
 function projectDefinitionPath(projectRoot) {
     return join(resolve(projectRoot), PROJECT_DEFINITION_REL_PATH);
@@ -54,10 +55,11 @@ export function addIgnore(projectRoot, options) {
         throw new Error(`PROJECT-DEFINITION at ${path} has a non-object 'plan' key`);
     }
     const planRec = plan;
-    let policy = planRec.policy;
+    migrateLegacyPolicyKey(planRec);
+    let policy = planRec[PLAN_POLICY_KEY];
     if (typeof policy !== "object" || policy === null || Array.isArray(policy)) {
         policy = {};
-        planRec.policy = policy;
+        planRec[PLAN_POLICY_KEY] = policy;
     }
     const policyRec = policy;
     const raw = Array.isArray(policyRec.triageScopeIgnores)

package/dist/triage/scope-drift/scope-rules.js

@@ -1,5 +1,6 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join, resolve } from "node:path";
+import { readPlanPolicy } from "../../policy/plan-extensions.js";
 const PROJECT_DEFINITION_REL_PATH = "vbrief/PROJECT-DEFINITION.vbrief.json";
 const DEFAULT_TRIAGE_SCOPE = [{ rule: "all-open" }];
 function loadProjectDefinition(projectRoot) {
@@ -25,7 +26,7 @@ export function resolveScopeRules(projectRoot, projectDefinition) {
     if (typeof plan !== "object" || plan === null || Array.isArray(plan)) {
         return DEFAULT_TRIAGE_SCOPE.map((r) => ({ ...r }));
     }
-    const policy = plan.policy;
+    const policy = readPlanPolicy(plan);
     if (typeof policy !== "object" || policy === null || Array.isArray(policy)) {
         return DEFAULT_TRIAGE_SCOPE.map((r) => ({ ...r }));
     }
@@ -47,7 +48,7 @@ export function resolveScopeIgnores(projectRoot, projectDefinition) {
     const plan = data.plan;
     if (typeof plan !== "object" || plan === null || Array.isArray(plan))
         return out;
-    const policy = plan.policy;
+    const policy = readPlanPolicy(plan);
     if (typeof policy !== "object" || policy === null || Array.isArray(policy))
         return out;
     const raw = policy.triageScopeIgnores;

package/dist/triage/subscribe/index.js

@@ -1,6 +1,8 @@
 import { randomUUID } from "node:crypto";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync, } from "node:fs";
-import { basename, join, resolve } from "node:path";
+import { basename, join } from "node:path";
+import { resolveEvalPath, resolveProjectDefinitionPath } from "../../layout/resolve.js";
+import { migrateLegacyPolicyKey, PLAN_POLICY_KEY } from "../../policy/plan-extensions.js";
 export const SUBSCRIPTION_HISTORY_REL_PATH = "vbrief/.eval/subscription-history.jsonl";
 export const SUBSCRIPTION_HISTORY_SCHEMA = "deft.triage.subscription-change.v1";
 export const PROJECT_DEFINITION_REL_PATH = "vbrief/PROJECT-DEFINITION.vbrief.json";
@@ -15,7 +17,7 @@ export class ProjectDefinitionIOError extends Error {
     }
 }
 function projectDefinitionPath(projectRoot) {
-    return join(resolve(projectRoot), PROJECT_DEFINITION_REL_PATH);
+    return resolveProjectDefinitionPath(projectRoot);
 }
 export function loadProjectDefinitionForMutation(projectRoot) {
     const path = projectDefinitionPath(projectRoot);
@@ -87,7 +89,7 @@ function resolveActor(actor) {
     }
 }
 export function recordSubscriptionChange(projectRoot, options) {
-    const historyPath = join(resolve(projectRoot), SUBSCRIPTION_HISTORY_REL_PATH);
+    const historyPath = resolveEvalPath(projectRoot, "subscription-history.jsonl");
     const record = {
         schema: SUBSCRIPTION_HISTORY_SCHEMA,
         change_id: randomUUID(),
@@ -249,15 +251,19 @@ function mutate(projectRoot, options) {
         throw new Error(`PROJECT-DEFINITION at ${path} has a non-object 'plan' key`);
     }
     const plan = data.plan;
-    if (typeof plan.policy !== "object" || plan.policy === null || Array.isArray(plan.policy)) {
-        if (plan.policy === undefined) {
-            plan.policy = {};
+    migrateLegacyPolicyKey(plan);
+    const existingPolicy = plan[PLAN_POLICY_KEY];
+    if (typeof existingPolicy !== "object" ||
+        existingPolicy === null ||
+        Array.isArray(existingPolicy)) {
+        if (existingPolicy === undefined) {
+            plan[PLAN_POLICY_KEY] = {};
         }
         else {
             throw new Error(`PROJECT-DEFINITION at ${path} has a non-object 'plan.policy' key`);
         }
     }
-    const policy = plan.policy;
+    const policy = plan[PLAN_POLICY_KEY];
     if (!Array.isArray(policy.triageScope)) {
         if (policy.triageScope === undefined) {
             policy.triageScope = [];

package/dist/triage/summary/index.js

@@ -1,6 +1,8 @@
 import { createHash } from "node:crypto";
 import { appendFileSync, existsSync, mkdirSync, readdirSync, readFileSync } from "node:fs";
 import { join, resolve as pathResolve } from "node:path";
+import { hasArtifactSuffix, resolveEvalPath, resolveLifecycleFolder, resolveProjectDefinitionPath, } from "../../layout/resolve.js";
+import { readPlanPolicy } from "../../policy/plan-extensions.js";
 import { loadProjectDefinition, PROJECT_DEFINITION_REL_PATH } from "../../policy/resolve.js";
 import { countVbriefWip, DEFAULT_WIP_CAP, resolveWipCap } from "../../policy/wip.js";
 import { AUDIT_LOG_REL_PATH, latestDecisions, readAuditLog } from "../actions/candidates-log.js";
@@ -93,13 +95,13 @@ export function iterCachedIssues(cacheRoot) {
 // ---------------------------------------------------------------------------
 /** Count filesystem-truth in-flight vBRIEFs (#1270). */
 export function countFilesystemInFlight(projectRoot) {
-    const folder = join(pathResolve(projectRoot), "vbrief", FILESYSTEM_IN_FLIGHT_FOLDER);
+    const folder = resolveLifecycleFolder(projectRoot, FILESYSTEM_IN_FLIGHT_FOLDER);
     if (!existsSync(folder)) {
         return 0;
     }
     let total = 0;
     for (const entry of readdirSync(folder, { withFileTypes: true })) {
-        if (!entry.isFile() || !entry.name.endsWith(".vbrief.json")) {
+        if (!entry.isFile() || !hasArtifactSuffix(entry.name)) {
             continue;
         }
         try {
@@ -124,7 +126,7 @@ export function countFilesystemInFlight(projectRoot) {
 }
 /** True iff `plan.policy.triageScope` is a non-empty list of dict rules. */
 export function isTriageScopeExplicitlyConfigured(projectRoot) {
-    const path = join(pathResolve(projectRoot), PROJECT_DEFINITION_REL_PATH);
+    const path = resolveProjectDefinitionPath(projectRoot);
     if (!existsSync(path)) {
         return false;
     }
@@ -137,7 +139,7 @@ export function isTriageScopeExplicitlyConfigured(projectRoot) {
         if (typeof plan !== "object" || plan === null || Array.isArray(plan)) {
             return false;
         }
-        const policy = plan.policy;
+        const policy = readPlanPolicy(plan);
         if (typeof policy !== "object" || policy === null || Array.isArray(policy)) {
             return false;
         }
@@ -187,7 +189,7 @@ export function isCachedIssueOpen(cacheRoot, repo, issueNumber) {
 export function computeSummary(projectRoot, options = {}) {
     const root = pathResolve(projectRoot);
     const resolvedCacheRoot = options.cacheRoot ?? join(root, CACHE_DIR_NAME);
-    const resolvedLogPath = options.auditLogPath ?? join(root, CANDIDATES_LOG_REL_PATH);
+    const resolvedLogPath = options.auditLogPath ?? resolveEvalPath(root, "candidates.jsonl");
     const cached = iterCachedIssues(resolvedCacheRoot);
     const repos = [...new Set(cached.map(([repo]) => repo))].sort();
     const wipCap = resolveWipCapInt(root);

package/dist/triage/summary/reconcilable.js

@@ -1,5 +1,7 @@
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { join } from "node:path";
+import { referenceTypeMatches } from "@deftai/directive-types";
+import { hasArtifactSuffix, resolveEvalPath, resolveLifecycleRoot } from "../../layout/resolve.js";
 import { AUDIT_LOG_REL_PATH, readAuditLog } from "../actions/candidates-log.js";
 /** Lifecycle folders scanned for reconcilable vBRIEFs (#1468). */
 export const BACKFILL_FOLDERS = ["proposed", "pending", "active"];
@@ -36,7 +38,7 @@ function extractIssueRef(data) {
             continue;
         }
         const obj = ref;
-        if (obj.type !== "x-vbrief/github-issue") {
+        if (!referenceTypeMatches(String(obj.type ?? ""), "github-issue")) {
             continue;
         }
         const [repo, number] = parseGithubIssueUri(obj.uri);
@@ -61,11 +63,11 @@ function auditKey(repo, issueNumber) {
  */
 export function countReconcilable(projectRoot, options = {}) {
     try {
-        const auditPath = options.auditLogPath ?? join(projectRoot, CANDIDATES_LOG_REL_PATH);
+        const auditPath = options.auditLogPath ?? resolveEvalPath(projectRoot, "candidates.jsonl");
         const existing = existingAuditRefs(auditPath);
         const defaultRepo = options.defaultRepo ?? null;
         const keys = new Set();
-        const vbriefRoot = join(projectRoot, "vbrief");
+        const vbriefRoot = resolveLifecycleRoot(projectRoot);
         for (const folderName of BACKFILL_FOLDERS) {
             const folder = join(vbriefRoot, folderName);
             if (!existsSync(folder)) {
@@ -73,7 +75,7 @@ export function countReconcilable(projectRoot, options = {}) {
             }
             const entries = readdirSync(folder, { withFileTypes: true });
             for (const entry of entries) {
-                if (!entry.isFile() || !entry.name.endsWith(".vbrief.json")) {
+                if (!entry.isFile() || !hasArtifactSuffix(entry.name)) {
                     continue;
                 }
                 const path = join(folder, entry.name);

package/dist/triage/summary/scope-drift.js

@@ -1,5 +1,6 @@
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { join } from "node:path";
+import { readPlanPolicy } from "../../policy/plan-extensions.js";
 import { loadProjectDefinition } from "../../policy/resolve.js";
 const DRIFT_MIN_ISSUES = 3;
 const CACHE_SOURCE = "github-issue";
@@ -88,7 +89,7 @@ function resolveScopeRules(projectRoot) {
     if (typeof plan !== "object" || plan === null || Array.isArray(plan)) {
         return [{ rule: "all-open" }];
     }
-    const policy = plan.policy;
+    const policy = readPlanPolicy(plan);
     if (typeof policy !== "object" || policy === null || Array.isArray(policy)) {
         return [{ rule: "all-open" }];
     }

package/dist/triage/welcome/prior-state.js

@@ -1,8 +1,10 @@
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { join, resolve } from "node:path";
-import { CACHE_DIR_NAME, CACHE_SOURCE, CANDIDATES_RELPATH, DEFAULT_WIP_CAP, SUBSCRIPTION_PRESETS, WIP_LIFECYCLE_DIRS, } from "./constants.js";
+import { hasArtifactSuffix, resolveAuditPath, resolveEvalPath, resolveLifecycleRoot, resolveProjectDefinitionPath, } from "../../layout/resolve.js";
+import { readPlanPolicy } from "../../policy/plan-extensions.js";
+import { CACHE_DIR_NAME, CACHE_SOURCE, DEFAULT_WIP_CAP, SUBSCRIPTION_PRESETS, WIP_LIFECYCLE_DIRS, } from "./constants.js";
 function loadProjectDefinition(projectRoot) {
-    const path = join(resolve(projectRoot), "vbrief", "PROJECT-DEFINITION.vbrief.json");
+    const path = resolveProjectDefinitionPath(projectRoot);
     if (!existsSync(path))
         return null;
     try {
@@ -37,17 +39,17 @@ function countCacheEntries(projectRoot) {
     return count;
 }
 export function candidatesLogPath(projectRoot) {
-    return join(resolve(projectRoot), ...CANDIDATES_RELPATH);
+    return resolveEvalPath(projectRoot, "candidates.jsonl");
 }
 function countWip(projectRoot) {
     let total = 0;
-    const root = join(resolve(projectRoot), "vbrief");
+    const root = resolveLifecycleRoot(projectRoot);
     for (const sub of WIP_LIFECYCLE_DIRS) {
         const folder = join(root, sub);
         if (!existsSync(folder))
             continue;
         for (const child of readdirSync(folder, { withFileTypes: true })) {
-            if (child.isFile() && child.name.endsWith(".vbrief.json"))
+            if (child.isFile() && hasArtifactSuffix(child.name))
                 total += 1;
         }
     }
@@ -80,7 +82,7 @@ function summarizeScope(rules) {
     return [true, `custom (${rules.length} rule(s))`];
 }
 function countPendingDecisions(projectRoot) {
-    const logPath = join(resolve(projectRoot), "vbrief", ".audit", "pending-human-decisions.jsonl");
+    const logPath = resolveAuditPath(projectRoot, "pending-human-decisions.jsonl");
     if (!existsSync(logPath))
         return 0;
     let text;
@@ -121,9 +123,7 @@ export function pendingDecisionsNudgeLine(count, threshold = 3) {
 export function detectPriorState(projectRoot) {
     const data = loadProjectDefinition(projectRoot) ?? {};
     const plan = data.plan;
-    const policy = typeof plan === "object" && plan !== null && !Array.isArray(plan)
-        ? plan.policy
-        : null;
+    const policy = readPlanPolicy(plan);
     const rawScope = typeof policy === "object" && policy !== null && !Array.isArray(policy)
         ? policy.triageScope
         : null;

package/dist/triage/welcome/summary.js

@@ -1,11 +1,12 @@
 import { appendFileSync, existsSync, mkdirSync, readdirSync, readFileSync } from "node:fs";
 import { join, resolve } from "node:path";
+import { hasArtifactSuffix, resolveEvalPath, resolveLifecycleFolder, resolveProjectDefinitionPath, } from "../../layout/resolve.js";
+import { readPlanPolicy } from "../../policy/plan-extensions.js";
 import { countVbriefWip, DEFAULT_WIP_CAP, resolveWipCap } from "../../policy/wip.js";
 import { countReconcilable } from "../reconcile/reconcile.js";
 import { computeDrift } from "../scope-drift/compute.js";
-import { SUMMARY_HISTORY_REL_PATH, shouldSuppressD2Emission } from "../summary/index.js";
+import { shouldSuppressD2Emission } from "../summary/index.js";
 import { CACHE_DIR_NAME, CACHE_SOURCE, EMPTY_CACHE_LINE, MAX_LINE_CHARS, SUMMARY_HISTORY_SCHEMA, WIP_WARN_GLYPH, } from "./constants.js";
-const CANDIDATES_LOG_REL_PATH = "vbrief/.eval/candidates.jsonl";
 const FILESYSTEM_IN_FLIGHT_STATUS = "running";
 const TRIAGED_DECISIONS = new Set([
     "accept",
@@ -72,12 +73,12 @@ function latestDecisions(entries) {
     return out;
 }
 function countFilesystemInFlight(projectRoot) {
-    const activeDir = join(resolve(projectRoot), "vbrief", "active");
+    const activeDir = resolveLifecycleFolder(projectRoot, "active");
     if (!existsSync(activeDir))
         return 0;
     let count = 0;
     for (const name of readdirSync(activeDir)) {
-        if (!name.endsWith(".vbrief.json"))
+        if (!hasArtifactSuffix(name))
             continue;
         try {
             const data = JSON.parse(readFileSync(join(activeDir, name), "utf8"));
@@ -92,7 +93,7 @@ function countFilesystemInFlight(projectRoot) {
     return count;
 }
 function isTriageScopeConfigured(projectRoot) {
-    const path = join(resolve(projectRoot), "vbrief", "PROJECT-DEFINITION.vbrief.json");
+    const path = resolveProjectDefinitionPath(projectRoot);
     if (!existsSync(path))
         return false;
     try {
@@ -100,7 +101,7 @@ function isTriageScopeConfigured(projectRoot) {
         const plan = data.plan;
         if (typeof plan !== "object" || plan === null || Array.isArray(plan))
             return false;
-        const scope = plan.policy;
+        const scope = readPlanPolicy(plan);
         if (typeof scope !== "object" || scope === null || Array.isArray(scope))
             return false;
         const triageScope = scope.triageScope;
@@ -118,7 +119,7 @@ function utcIso() {
 export function computeSummary(projectRoot) {
     const root = resolve(projectRoot);
     const cacheRoot = join(root, CACHE_DIR_NAME);
-    const logPath = join(root, CANDIDATES_LOG_REL_PATH);
+    const logPath = resolveEvalPath(root, "candidates.jsonl");
     const cached = iterCachedIssues(cacheRoot);
     const repos = [...new Set(cached.map(([r]) => r))].sort().slice(0, 8);
     const wipCapResult = resolveWipCap(root);
@@ -292,7 +293,7 @@ export function appendHistory(historyPath, result, line) {
 export function emitOneliner(projectRoot, options = {}) {
     const result = computeSummary(projectRoot);
     const line = formatSummary(result);
-    const historyPath = join(resolve(projectRoot), SUMMARY_HISTORY_REL_PATH);
+    const historyPath = resolveEvalPath(projectRoot, "summary-history.jsonl");
     const applySuppression = options.applyD2Suppression !== false;
     if (applySuppression && shouldSuppressD2Emission(result, historyPath, { now: options.now })) {
         return line;

package/dist/triage/welcome/writers.js

@@ -1,8 +1,10 @@
 import { appendFileSync, existsSync, mkdirSync, readdirSync, readFileSync, renameSync, statSync, writeFileSync, } from "node:fs";
 import { dirname, join, resolve } from "node:path";
-import { AUDIT_LOG_REL_PATH, DEFAULT_RELIEF_AGE_DAYS, DEFAULT_WIP_CAP, PROJECT_DEFINITION_REL_PATH, SUBSCRIPTION_PRESETS, WELCOME_AUDIT_TAG, } from "./constants.js";
+import { hasArtifactSuffix, resolveLifecycleFolder, resolveProjectDefinitionPath, } from "../../layout/resolve.js";
+import { migrateLegacyPolicyKey, PLAN_POLICY_KEY } from "../../policy/plan-extensions.js";
+import { AUDIT_LOG_REL_PATH, DEFAULT_RELIEF_AGE_DAYS, DEFAULT_WIP_CAP, SUBSCRIPTION_PRESETS, WELCOME_AUDIT_TAG, } from "./constants.js";
 function projectDefinitionPath(projectRoot) {
-    return join(resolve(projectRoot), PROJECT_DEFINITION_REL_PATH);
+    return resolveProjectDefinitionPath(projectRoot);
 }
 function utcIso() {
     return new Date().toISOString().replace(/\.\d{3}Z$/, "Z");
@@ -34,10 +36,11 @@ export function writeTriageScope(projectRoot, rules, options = { presetLabel: "c
         throw new Error("PROJECT-DEFINITION 'plan' is not an object");
     }
     const planRec = plan;
-    let policy = planRec.policy;
+    migrateLegacyPolicyKey(planRec);
+    let policy = planRec[PLAN_POLICY_KEY];
     if (typeof policy !== "object" || policy === null || Array.isArray(policy)) {
         policy = {};
-        planRec.policy = policy;
+        planRec[PLAN_POLICY_KEY] = policy;
     }
     const policyRec = policy;
     const previous = policyRec.triageScope;
@@ -68,10 +71,11 @@ export function writeWipCap(projectRoot, wipCap, options = {}) {
         throw new Error("PROJECT-DEFINITION 'plan' is not an object");
     }
     const planRec = plan;
-    let policy = planRec.policy;
+    migrateLegacyPolicyKey(planRec);
+    let policy = planRec[PLAN_POLICY_KEY];
     if (typeof policy !== "object" || policy === null || Array.isArray(policy)) {
         policy = {};
-        planRec.policy = policy;
+        planRec[PLAN_POLICY_KEY] = policy;
     }
     const policyRec = policy;
     const previous = policyRec.wipCap;
@@ -124,16 +128,14 @@ function daysInPending(path, now) {
     }
 }
 export function previewWipRelief(projectRoot, olderThanDays = DEFAULT_RELIEF_AGE_DAYS) {
-    const pendingDir = join(resolve(projectRoot), "vbrief", "pending");
+    const pendingDir = resolveLifecycleFolder(projectRoot, "pending");
     if (!existsSync(pendingDir)) {
         return { olderThanDays, eligibleCount: 0, eligibleFiles: [], skippedCount: 0 };
     }
     const now = new Date();
     const eligible = [];
     let skipped = 0;
-    for (const name of [...readdirSync(pendingDir)]
-        .filter((n) => n.endsWith(".vbrief.json"))
-        .sort()) {
+    for (const name of [...readdirSync(pendingDir)].filter((n) => hasArtifactSuffix(n)).sort()) {
         const path = join(pendingDir, name);
         const days = daysInPending(path, now);
         if (days >= olderThanDays)

package/dist/validate-content/capacity-policy.js

@@ -1,5 +1,6 @@
 import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
+import { resolveAuditPath } from "../layout/resolve.js";
+import { readPlanPolicy } from "../policy/plan-extensions.js";
 import { loadProjectDefinition } from "../policy/resolve.js";
 export const DEFAULT_CAPACITY_UNIT = "vbrief-count";
 export const CAPACITY_UNIT_COST = "cost";
@@ -139,7 +140,7 @@ export function resolveCapacityAllocation(projectRoot) {
     if (typeof plan !== "object" || plan === null || Array.isArray(plan)) {
         return defaultCapacityAllocation("default");
     }
-    const policy = plan.policy;
+    const policy = readPlanPolicy(plan);
     if (typeof policy !== "object" || policy === null || Array.isArray(policy)) {
         return defaultCapacityAllocation("default");
     }
@@ -197,7 +198,7 @@ export function resolveAutonomy(projectRoot) {
     if (typeof plan !== "object" || plan === null || Array.isArray(plan)) {
         return defaultAutonomyPolicy("default");
     }
-    const policy = plan.policy;
+    const policy = readPlanPolicy(plan);
     if (typeof policy !== "object" || policy === null || Array.isArray(policy)) {
         return defaultAutonomyPolicy("default");
     }
@@ -243,7 +244,7 @@ function parseIsoTs(value) {
     }
 }
 export function readDecisionEvents(projectRoot) {
-    const path = join(projectRoot, "vbrief", ".audit", "pending-human-decisions.jsonl");
+    const path = resolveAuditPath(projectRoot, "pending-human-decisions.jsonl");
     if (!existsSync(path))
         return [];
     const out = [];

package/dist/validate-content/capacity-show.js

@@ -1,5 +1,7 @@
 import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
 import { join } from "node:path";
+import { referenceTypeMatches } from "@deftai/directive-types";
+import { hasArtifactSuffix, resolveLifecycleRoot } from "../layout/resolve.js";
 import { CAPACITY_UNIT_COST, DEFAULT_CAPACITY_UNIT, DEFAULT_PENDING_DECISIONS_THRESHOLD, pendingDecisionsNudgeLine, recommendAutonomyLevel, resolveAutonomy, resolveCapacityAllocation, summarizeDecisionBacklog, } from "./capacity-policy.js";
 export const FORWARD_FOLDERS = ["pending", "active"];
 export const BACKWARD_FOLDER = "completed";
@@ -25,7 +27,7 @@ function planHasChildren(plan) {
         return false;
     return refs.some((ref) => typeof ref === "object" &&
         ref !== null &&
-        ref.type === "x-vbrief/plan");
+        referenceTypeMatches(String(ref.type ?? ""), "plan"));
 }
 function coerceCost(value) {
     if (typeof value === "boolean")
@@ -96,7 +98,7 @@ export function iterVbriefPlans(vbriefRoot) {
         if (!existsSync(folderPath) || !statSync(folderPath).isDirectory())
             continue;
         for (const name of readdirSync(folderPath).sort()) {
-            if (!name.endsWith(".vbrief.json"))
+            if (!hasArtifactSuffix(name))
                 continue;
             const child = join(folderPath, name);
             try {
@@ -145,7 +147,7 @@ export function bucketDeficit(report, tally) {
 export function computeReport(projectRoot, options = {}) {
     const now = options.now ?? new Date();
     const allocation = options.allocation ?? resolveCapacityAllocation(projectRoot);
-    const vbriefRoot = join(projectRoot, "vbrief");
+    const vbriefRoot = resolveLifecycleRoot(projectRoot);
     const records = iterVbriefPlans(vbriefRoot).map(({ folder, plan }) => classifyRecord(plan, folder, allocation, now));
     const tallies = new Map();
     for (const bucket of allocation.buckets) {

package/dist/validate-content/filename.d.ts

@@ -1,3 +1,3 @@
-/** Linear filename validator for YYYY-MM-DD-<slug>.vbrief.json (no nested regex). */
+/** Linear filename validator for YYYY-MM-DD-<slug>.{vbrief,xbrief}.json (no nested regex). */
 export declare function isDatePrefixedVbriefFilename(name: string): boolean;
 //# sourceMappingURL=filename.d.ts.map

package/dist/validate-content/filename.js

@@ -1,9 +1,10 @@
-/** Linear filename validator for YYYY-MM-DD-<slug>.vbrief.json (no nested regex). */
+import { hasArtifactSuffix, stripArtifactSuffix } from "../layout/resolve.js";
+/** Linear filename validator for YYYY-MM-DD-<slug>.{vbrief,xbrief}.json (no nested regex). */
 export function isDatePrefixedVbriefFilename(name) {
-    const suffix = ".vbrief.json";
-    if (!name.endsWith(suffix))
+    // Layout-aware (#2109 part 2a): accept either artifact suffix.
+    if (!hasArtifactSuffix(name))
         return false;
-    const base = name.slice(0, -suffix.length);
+    const base = stripArtifactSuffix(name);
     if (base.length < 12)
         return false;
     const y = base.slice(0, 4);

package/dist/validate-content/validate-strategy-output.js

@@ -1,5 +1,6 @@
 import { existsSync, readdirSync, statSync } from "node:fs";
 import { join, resolve } from "node:path";
+import { hasArtifactSuffix, resolveLifecycleLayout, resolveProjectDefinitionPath, } from "../layout/resolve.js";
 import { checkSpecMigrationFidelity } from "../spec-authority/migration-fidelity.js";
 import { isFullSpecState } from "../spec-authority/resolver.js";
 import { isDatePrefixedVbriefFilename } from "./filename.js";
@@ -26,7 +27,10 @@ function isDeftFrameworkRoot(projectRoot) {
 export function validateStrategyOutput(projectRoot, strict = false) {
     const root = resolve(projectRoot);
     const errors = [];
-    const vbriefDir = join(root, "vbrief");
+    // Layout-aware (#2109 part 2a): resolve the lifecycle dir/suffix dynamically;
+    // identical to vbrief/ on today's tree.
+    const layout = resolveLifecycleLayout(root);
+    const vbriefDir = layout.root;
     if (!existsSync(vbriefDir)) {
         if (strict) {
             errors.push("vbrief/ directory missing entirely. v0.20 strategies must emit at least " +
@@ -34,13 +38,18 @@ export function validateStrategyOutput(projectRoot, strict = false) {
         }
         return errors;
     }
-    const projDef = join(vbriefDir, "PROJECT-DEFINITION.vbrief.json");
+    const projDef = resolveProjectDefinitionPath(root);
     if (!existsSync(projDef)) {
-        errors.push("Missing vbrief/PROJECT-DEFINITION.vbrief.json. " +
+        errors.push(`Missing ${layout.artifactDir}/PROJECT-DEFINITION${layout.artifactSuffix}. ` +
             "All v0.20-conformant strategy output must include a complete project definition " +
             "(see v0-20-contract.md and task project:render).");
     }
-    const specLegacy = join(vbriefDir, "specification.vbrief.json");
+    // The legacy-spec guard intentionally stays pinned to the literal legacy
+    // path (#2109 part 2a): its job is to detect a stranded pre-v0.20
+    // vbrief/specification.vbrief.json, which is a legacy artifact regardless of
+    // the active layout -- routing it through the resolver would make it
+    // self-cancelling once an xbrief tree is live.
+    const specLegacy = join(root, "vbrief", "specification.vbrief.json");
     if (existsSync(specLegacy) && !isDeftFrameworkRoot(root) && !isFullSpecState(root)) {
         errors.push("Legacy artifact vbrief/specification.vbrief.json present. " +
             "v0.20 strategies MUST NOT dual-write the old specification.vbrief.json " +
@@ -52,7 +61,7 @@ export function validateStrategyOutput(projectRoot, strict = false) {
         if (!existsSync(dpath) || !statSync(dpath).isDirectory())
             continue;
         for (const name of readdirSync(dpath).sort()) {
-            if (!name.endsWith(".vbrief.json"))
+            if (!hasArtifactSuffix(name))
                 continue;
             if (!isDatePrefixedVbriefFilename(name)) {
                 errors.push(`Non-conformant filename in vbrief/${dname}/: ${name}. ` +

package/dist/vbrief-build/build.js

@@ -57,7 +57,7 @@ function githubIssueReference(params) {
         : `Issue #${cleanedNumber}`;
     return {
         uri: `${cleanedRepo}/issues/${cleanedNumber}`,
-        type: "x-vbrief/github-issue",
+        type: "x-xbrief/github-issue",
         title: refTitle,
     };
 }

package/dist/vbrief-build/constants.js

@@ -8,12 +8,19 @@ export const INTERNAL_REFERENCE_TYPES = new Set([
     "x-vbrief/plan",
     "x-vbrief/spec-section",
     "x-vbrief/user-request",
+    "x-xbrief/plan",
+    "x-xbrief/spec-section",
+    "x-xbrief/user-request",
 ]);
 export const EXTERNAL_REFERENCE_TYPES = new Set([
     "x-vbrief/github-issue",
     "x-vbrief/github-pr",
     "x-vbrief/jira-ticket",
     "x-vbrief/web-page",
+    "x-xbrief/github-issue",
+    "x-xbrief/github-pr",
+    "x-xbrief/jira-ticket",
+    "x-xbrief/web-page",
 ]);
 export const FOLDER_TO_STATUSES = {
     proposed: ["draft", "proposed"],

package/dist/vbrief-build/speckit.js

@@ -1,5 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename } from "node:path";
+import { referenceTypeMatches } from "@deftai/directive-types";
 import { referenceWithDefaultTrust, slugify } from "./build.js";
 import { EMITTED_VBRIEF_VERSION } from "./constants.js";
 import { pythonJsonPretty } from "./json.js";
@@ -99,7 +100,7 @@ export function createSpeckitScopeVbrief(item, options) {
         }
     }
     const references = [
-        referenceWithDefaultTrust({ type: "x-vbrief/plan", uri: specRef }),
+        referenceWithDefaultTrust({ type: "x-xbrief/plan", uri: specRef }),
     ];
     const itemRefs = item.references;
     if (Array.isArray(itemRefs)) {
@@ -107,7 +108,7 @@ export function createSpeckitScopeVbrief(item, options) {
             if (typeof ref === "object" &&
                 ref !== null &&
                 !Array.isArray(ref) &&
-                ref.type !== "x-vbrief/plan") {
+                !referenceTypeMatches(String(ref.type ?? ""), "plan")) {
                 references.push(referenceWithDefaultTrust(ref));
             }
         }

package/dist/vbrief-reconcile/graph.js

@@ -1,5 +1,6 @@
 import { existsSync, readdirSync } from "node:fs";
 import { join, resolve } from "node:path";
+import { hasArtifactSuffix, resolveLifecycleFolder } from "../layout/resolve.js";
 import { countVbriefWip, resolveWipCap } from "../policy/wip.js";
 import { runTransition } from "../scope/transition.js";
 import { allScopeIds, asStrList, candidateDepGraph, candidateFromPath, markCycles, } from "./swarm-deps.js";
@@ -27,7 +28,7 @@ function candidateInCycle(candidate) {
 }
 export function reconcileGraph(projectRoot, options = {}) {
     const root = resolve(projectRoot);
-    const proposedDir = join(root, "vbrief", "proposed");
+    const proposedDir = resolveLifecycleFolder(root, "proposed");
     if (!existsSync(proposedDir)) {
         return [
             2,
@@ -45,7 +46,7 @@ export function reconcileGraph(projectRoot, options = {}) {
         ];
     }
     const candidatePaths = readdirSync(proposedDir)
-        .filter((f) => f.endsWith(".vbrief.json"))
+        .filter((f) => hasArtifactSuffix(f))
         .sort()
         .map((f) => join(proposedDir, f));
     const candidates = candidatePaths