@deftai/directive-core 0.65.0 → 0.66.1

package/dist/triage/bootstrap/gitignore.js

@@ -1,5 +1,10 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname } from "node:path";
+import { dirname, relative } from "node:path";
+import { resolveEvalPath } from "../../layout/resolve.js";
+/** POSIX-style display path for `absPath` relative to `projectRoot` (#2109). */
+function evalRelDisplay(projectRoot, absPath) {
+    return relative(projectRoot, absPath).split(/[\\/]/).join("/");
+}
 export const GITIGNORE_LINE = ".deft-cache/";
 export const GITIGNORE_DEFT_RUNTIME_SENTINELS = [
     ".deft/ritual-state.json",
@@ -126,7 +131,6 @@ operators should know:
 - \`.gitattributes\` -- the \`merge=union\` rule.
 - \`scripts/candidates_log.py\` -- the writer for \`candidates.jsonl\`.
 `;
-const CANDIDATES_RELPATH = "vbrief/.eval/candidates.jsonl";
 function stepOutcome(name, ok, message, details = {}, error = null) {
     return { name, ok, message, error, details };
 }
@@ -307,10 +311,10 @@ function ensureGitattributesMergeUnion(gitattributesPath, stepName) {
     }
     return stepOutcome(stepName, true, "created .gitattributes with vbrief/.eval/*.jsonl merge=union", { gitattributes_appended: true, gitattributes_created: true });
 }
-function ensureEvalReadme(readmePath, stepName) {
+function ensureEvalReadme(readmePath, readmeRel, stepName) {
     try {
         readFileSync(readmePath, { encoding: "utf8" });
-        return stepOutcome(stepName, true, "vbrief/.eval/README.md already present (no-op)", {
+        return stepOutcome(stepName, true, `${readmeRel} already present (no-op)`, {
             readme_created: false,
             readme_already_present: true,
         });
@@ -325,7 +329,7 @@ function ensureEvalReadme(readmePath, stepName) {
     catch (exc) {
         return stepOutcome(stepName, false, `could not create ${readmePath}`, { readme_created: false }, String(exc));
     }
-    return stepOutcome(stepName, true, "created vbrief/.eval/README.md (#1144 hybrid policy)", {
+    return stepOutcome(stepName, true, `created ${readmeRel} (#1144 hybrid policy)`, {
         readme_created: true,
     });
 }
@@ -333,7 +337,10 @@ function ensureEvalReadme(readmePath, stepName) {
 export function stepEnsureGitignoreEvalEntries(projectRoot) {
     const gitignorePath = `${projectRoot}/.gitignore`;
     const gitattributesPath = `${projectRoot}/.gitattributes`;
-    const readmePath = `${projectRoot}/vbrief/.eval/README.md`;
+    // Layout-aware (#2109): resolve the README under the active lifecycle `.eval`
+    // dir (xbrief/ when migrated, else vbrief/) instead of a hardcoded vbrief/ path.
+    const readmePath = resolveEvalPath(projectRoot, "README.md");
+    const readmeRel = evalRelDisplay(projectRoot, readmePath);
     const stepName = "ensure_gitignore_eval_entries";
     const details = {};
     const giResult = ensureGitignoreSelectiveEntries(gitignorePath, stepName);
@@ -348,7 +355,7 @@ export function stepEnsureGitignoreEvalEntries(projectRoot) {
         return stepOutcome(stepName, false, gaResult.message, details, gaResult.error ?? null);
     }
     Object.assign(details, gaResult.details);
-    const rdResult = ensureEvalReadme(readmePath, stepName);
+    const rdResult = ensureEvalReadme(readmePath, readmeRel, stepName);
     if (!rdResult.ok) {
         Object.assign(details, rdResult.details);
         return stepOutcome(stepName, false, rdResult.message, details, rdResult.error ?? null);
@@ -361,7 +368,7 @@ export function stepEnsureGitignoreEvalEntries(projectRoot) {
     if (appendedLines === 0 && !appendedAttr && !createdReadme) {
         message =
             ".gitignore selective entries, .gitattributes merge=union, " +
-                "and vbrief/.eval/README.md already present (#1144 hybrid " +
+                `and ${readmeRel} already present (#1144 hybrid ` +
                 "policy satisfied; no-op)";
     }
     else {
@@ -373,7 +380,7 @@ export function stepEnsureGitignoreEvalEntries(projectRoot) {
         if (appendedAttr)
             parts.push(".gitattributes merge=union rule");
         if (createdReadme)
-            parts.push("vbrief/.eval/README.md");
+            parts.push(readmeRel);
         message = `wrote ${parts.join(" + ")} per #1144 hybrid policy`;
     }
     message += formatBlanketWarning(Boolean(details.blanket_present));
@@ -381,7 +388,10 @@ export function stepEnsureGitignoreEvalEntries(projectRoot) {
 }
 /** Ensure `vbrief/.eval/candidates.jsonl` exists (#1240 option A). */
 export function stepSeedCandidatesLog(projectRoot) {
-    const auditPath = `${projectRoot}/${CANDIDATES_RELPATH}`;
+    // Layout-aware (#2109): seed under the active lifecycle `.eval` dir (xbrief/
+    // when migrated, else vbrief/) instead of a hardcoded vbrief/ path.
+    const auditPath = resolveEvalPath(projectRoot, "candidates.jsonl");
+    const auditRel = evalRelDisplay(projectRoot, auditPath);
     const auditDir = dirname(auditPath);
     try {
         mkdirSync(auditDir, { recursive: true });
@@ -391,8 +401,7 @@ export function stepSeedCandidatesLog(projectRoot) {
     }
     try {
         readFileSync(auditPath, { encoding: "utf8" });
-        const relative = CANDIDATES_RELPATH;
-        return stepOutcome("seed_candidates_log", true, `${relative} already present (no-op)`, {
+        return stepOutcome("seed_candidates_log", true, `${auditRel} already present (no-op)`, {
             created: false,
             already_present: true,
         });
@@ -406,7 +415,7 @@ export function stepSeedCandidatesLog(projectRoot) {
     catch (exc) {
         return stepOutcome("seed_candidates_log", false, `could not seed ${auditPath}`, {}, String(exc));
     }
-    return stepOutcome("seed_candidates_log", true, `created empty ${CANDIDATES_RELPATH}`, {
+    return stepOutcome("seed_candidates_log", true, `created empty ${auditRel}`, {
         created: true,
         already_present: false,
     });

package/dist/triage/bootstrap/index.js

@@ -3,6 +3,7 @@ import { randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { promisify } from "node:util";
+import { hasArtifactSuffix, resolveEvalPath, resolveLifecycleRoot } from "../../layout/resolve.js";
 import { SUBPROCESS_MAX_BUFFER } from "../../subprocess/max-buffer.js";
 import { stepEnsureGitignoreEntry, stepEnsureGitignoreEvalEntries, stepSeedCandidatesLog, } from "./gitignore.js";
 import { PROGRESS_DEFAULT } from "./types.js";
@@ -296,7 +297,9 @@ function extractIssueNumber(vbriefData) {
         if (typeof ref !== "object" || ref === null)
             continue;
         const typed = ref;
-        if (typed.type !== "x-vbrief/github-issue")
+        // Dual-namespace (#2109): accept the migrated `x-xbrief/` corpus token and
+        // the legacy `x-vbrief/` token (still read-accepted for back-compat).
+        if (typed.type !== "x-xbrief/github-issue" && typed.type !== "x-vbrief/github-issue")
             continue;
         const uri = typed.uri;
         if (typeof uri !== "string")
@@ -312,7 +315,7 @@ function scanLifecycleFolder(folder) {
     if (!existsSync(folder))
         return results;
     const entries = readdirSync(folder)
-        .filter((name) => name.endsWith(".vbrief.json"))
+        .filter((name) => hasArtifactSuffix(name))
         .sort();
     for (const name of entries) {
         const path = join(folder, name);
@@ -370,11 +373,11 @@ export function stepBackfillAuditLog(projectRoot, repo, options = {}) {
     if (repo === null) {
         return stepOutcome("backfill_audit_log", true, "skipped (no --repo provided; pass --repo OWNER/NAME to backfill)", { skipped: "no-repo" });
     }
-    const vbriefRoot = join(projectRoot, "vbrief");
+    const vbriefRoot = resolveLifecycleRoot(projectRoot);
     if (!existsSync(vbriefRoot)) {
         return stepOutcome("backfill_audit_log", true, `skipped (no vbrief/ directory under ${projectRoot})`, { skipped: "no-vbrief" });
     }
-    const auditPath = join(projectRoot, AUDIT_LOG_RELPATH);
+    const auditPath = resolveEvalPath(projectRoot, "candidates.jsonl");
     const alreadyLogged = existingAuditIssueNumbers(auditPath);
     const nowIso = options.nowIso ?? nowIsoDefault;
     const appendEntry = options.appendAuditEntry ?? appendAuditEntryDefault;

package/dist/triage/bulk/index.js

@@ -1,6 +1,7 @@
 import { spawnSync } from "node:child_process";
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
+import { resolveEvalPath } from "../../layout/resolve.js";
 export const ACTION_FN_NAMES = {
     accept: "accept",
     reject: "reject",
@@ -375,7 +376,7 @@ export function createFilesystemCacheModule() {
         CacheError,
     };
 }
-export function createFilesystemCandidatesLogModule(logPath = "vbrief/.eval/candidates.jsonl") {
+export function createFilesystemCandidatesLogModule(logPath = resolveEvalPath(process.cwd(), "candidates.jsonl")) {
     return {
         readAll(options) {
             if (!existsSync(logPath)) {

package/dist/triage/classify/index.js

@@ -1,5 +1,8 @@
 import { readdirSync, readFileSync } from "node:fs";
 import { join, resolve } from "node:path";
+import { referenceTypeMatches } from "@deftai/directive-types";
+import { hasArtifactSuffix, resolveLifecycleRoot, resolveProjectDefinitionPath, } from "../../layout/resolve.js";
+import { readPlanPolicy } from "../../policy/plan-extensions.js";
 import { pyRepr } from "../../scm/py-format.js";
 function pythonTypeName(value) {
     if (value === null) {
@@ -252,8 +255,7 @@ export function validateHoldMarkers(markers) {
     return { errors, warnings };
 }
 export function projectDefinitionPath(projectRoot) {
-    const root = projectRoot ?? process.cwd();
-    return join(root, PROJECT_DEFINITION_REL_PATH);
+    return resolveProjectDefinitionPath(projectRoot ?? process.cwd());
 }
 function loadProjectDefinition(projectRoot) {
     const path = projectDefinitionPath(projectRoot);
@@ -276,7 +278,7 @@ function consumerRulesFromProject(data) {
     if (typeof plan !== "object" || plan === null || Array.isArray(plan)) {
         return [];
     }
-    const policy = plan.policy;
+    const policy = readPlanPolicy(plan);
     if (typeof policy !== "object" || policy === null || Array.isArray(policy)) {
         return [];
     }
@@ -294,7 +296,7 @@ function holdMarkersFromProject(data) {
     if (typeof plan !== "object" || plan === null || Array.isArray(plan)) {
         return null;
     }
-    const policy = plan.policy;
+    const policy = readPlanPolicy(plan);
     if (typeof policy !== "object" || policy === null || Array.isArray(policy)) {
         return null;
     }
@@ -518,13 +520,13 @@ export function classifyIssue(issue, options = {}) {
 }
 /** Return issue numbers referenced by pending/ or active/ scope vBRIEFs. */
 export function extractReferencedIssues(projectRoot, lifecycleFolders = ["pending", "active"]) {
-    const root = join(projectRoot ?? process.cwd(), "vbrief");
+    const root = resolveLifecycleRoot(projectRoot ?? process.cwd());
     const referenced = new Set();
     for (const folder of lifecycleFolders) {
         const folderPath = join(root, folder);
         let entries;
         try {
-            entries = readdirSync(folderPath).filter((f) => f.endsWith(".vbrief.json"));
+            entries = readdirSync(folderPath).filter((f) => hasArtifactSuffix(f));
         }
         catch {
             continue;
@@ -549,7 +551,7 @@ export function extractReferencedIssues(projectRoot, lifecycleFolders = ["pendin
                         continue;
                     }
                     const r = ref;
-                    if (r.type !== "x-vbrief/github-issue") {
+                    if (!referenceTypeMatches(String(r.type ?? ""), "github-issue")) {
                         continue;
                     }
                     const uri = r.uri;
@@ -652,7 +654,7 @@ export function validateTriageAutoClassifyOnPlan(plan, filepath) {
     if (typeof plan !== "object" || plan === null || Array.isArray(plan)) {
         return out;
     }
-    const policy = plan.policy;
+    const policy = readPlanPolicy(plan);
     const raw = typeof policy === "object" && policy !== null && !Array.isArray(policy)
         ? policy.triageAutoClassify
         : undefined;
@@ -671,7 +673,7 @@ export function validateTriageHoldMarkersOnPlan(plan, filepath) {
     if (typeof plan !== "object" || plan === null || Array.isArray(plan)) {
         return out;
     }
-    const policy = plan.policy;
+    const policy = readPlanPolicy(plan);
     const raw = typeof policy === "object" && policy !== null && !Array.isArray(policy)
         ? policy.triageHoldMarkers
         : undefined;
@@ -696,7 +698,7 @@ export function validateProject(projectRoot) {
         return {
             code: 0,
             stdout: "OK: no PROJECT-DEFINITION at " +
-                `${join(root, "vbrief", "PROJECT-DEFINITION.vbrief.json")} -- ` +
+                `${resolveProjectDefinitionPath(root)} -- ` +
                 "framework defaults apply with no consumer overrides.\n",
             stderr: "",
         };
@@ -709,7 +711,7 @@ export function validateProject(projectRoot) {
             stderr: "FAIL: PROJECT-DEFINITION.plan is not an object\n",
         };
     }
-    const rel = join(root, "vbrief", "PROJECT-DEFINITION.vbrief.json");
+    const rel = resolveProjectDefinitionPath(root);
     const classifyErrs = validateTriageAutoClassifyOnPlan(plan, rel);
     const holderErrs = validateTriageHoldMarkersOnPlan(plan, rel);
     const errors = [...classifyErrs, ...holderErrs];

package/dist/triage/queue/audit.js

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync } from "node:fs";
-import { join, resolve } from "node:path";
-import { DEFAULT_AUDIT_LOG_REL_PATH } from "./constants.js";
+import { resolve } from "node:path";
+import { resolveEvalPath } from "../../layout/resolve.js";
 /** Resolve audit log path; mirrors candidates_log._resolve_path (framework root). */
 export function resolveAuditLogPath(options = {}) {
     if (options.auditLogPath !== null && options.auditLogPath !== undefined) {
@@ -12,7 +12,7 @@ export function resolveAuditLogPath(options = {}) {
         : envRoot.length > 0
             ? resolve(envRoot)
             : process.cwd();
-    return join(root, DEFAULT_AUDIT_LOG_REL_PATH);
+    return resolveEvalPath(root, "candidates.jsonl");
 }
 /** Read audit log entries, optionally filtered by repo. */
 export function readAuditEntries(repo, options = {}) {

package/dist/triage/queue/cache.js

@@ -1,7 +1,8 @@
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { join, resolve } from "node:path";
+import { resolveEvalPath } from "../../layout/resolve.js";
 import { extractAuthor, extractMilestone } from "../scope-drift/cache-walker.js";
-import { CACHE_DIR_NAME, CACHE_SOURCE_GITHUB_ISSUE, DEFAULT_SLICES_LOG_REL_PATH, } from "./constants.js";
+import { CACHE_DIR_NAME, CACHE_SOURCE_GITHUB_ISSUE } from "./constants.js";
 import { hasActiveScopeIgnores, isRawIssueScopeIgnored, resolveScopeIgnores, } from "./scope-ignores-filter.js";
 import { blockedByIssueNumber, rankByIssueNumber } from "./scope-walk.js";
 function cachedState(issue) {
@@ -22,7 +23,7 @@ export function resolveSlicesLogPath(options = {}) {
         : envRoot.length > 0
             ? resolve(envRoot)
             : process.cwd();
-    return join(root, DEFAULT_SLICES_LOG_REL_PATH);
+    return resolveEvalPath(root, "slices.jsonl");
 }
 /** Read slices.jsonl records. */
 export function loadSliceRecords(options = {}) {

package/dist/triage/queue/ranking-labels.js

@@ -1,3 +1,4 @@
+import { readPlanPolicy } from "../../policy/plan-extensions.js";
 import { DEFAULT_TRIAGE_RANKING_LABELS, PROJECT_DEFINITION_REL_PATH } from "./constants.js";
 import { loadProjectDefinition } from "./project.js";
 /** Resolve effective plan.policy.triageRankingLabels list. */
@@ -10,7 +11,7 @@ export function resolveRankingLabels(projectRoot) {
     if (typeof plan !== "object" || plan === null) {
         return [...DEFAULT_TRIAGE_RANKING_LABELS];
     }
-    const policy = plan.policy;
+    const policy = readPlanPolicy(plan);
     if (typeof policy !== "object" || policy === null) {
         return [...DEFAULT_TRIAGE_RANKING_LABELS];
     }

package/dist/triage/queue/scope-walk.js

@@ -1,5 +1,7 @@
 import { existsSync, readdirSync, readFileSync } from "node:fs";
-import { join, resolve } from "node:path";
+import { join } from "node:path";
+import { referenceTypeMatches } from "@deftai/directive-types";
+import { hasArtifactSuffix, resolveLifecycleFolder, resolveLifecycleRoot, } from "../../layout/resolve.js";
 function loadPlan(path) {
     try {
         const data = JSON.parse(readFileSync(path, { encoding: "utf8" }));
@@ -25,7 +27,7 @@ export function issueNumbersFromPlan(plan) {
             continue;
         }
         const typed = ref;
-        if (typed.type !== "x-vbrief/github-issue") {
+        if (!referenceTypeMatches(String(typed.type ?? ""), "github-issue")) {
             continue;
         }
         const uri = typed.uri;
@@ -82,11 +84,11 @@ function dependsOnIds(plan) {
 }
 function completedPlanIds(projectRoot) {
     const out = new Set();
-    const base = join(resolve(projectRoot), "vbrief", "completed");
+    const base = resolveLifecycleFolder(projectRoot, "completed");
     if (!existsSync(base)) {
         return out;
     }
-    for (const name of readdirSync(base).filter((entry) => entry.endsWith(".vbrief.json"))) {
+    for (const name of readdirSync(base).filter((entry) => hasArtifactSuffix(entry))) {
         const plan = loadPlan(join(base, name));
         if (plan === null) {
             continue;
@@ -111,14 +113,14 @@ export function scopeIsBlocked(plan, completedIds) {
     return deps.length > 0 && deps.some((dep) => !completedIds.has(dep));
 }
 function walkScopeFolders(projectRoot, folders, visitor) {
-    const base = join(resolve(projectRoot), "vbrief");
+    const base = resolveLifecycleRoot(projectRoot);
     for (const folder of folders) {
         const folderDir = join(base, folder);
         if (!existsSync(folderDir)) {
             continue;
         }
         for (const name of readdirSync(folderDir)
-            .filter((entry) => entry.endsWith(".vbrief.json"))
+            .filter((entry) => hasArtifactSuffix(entry))
             .sort()) {
             const plan = loadPlan(join(folderDir, name));
             if (plan !== null) {

package/dist/triage/reconcile/audit.js

@@ -1,12 +1,13 @@
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { join } from "node:path";
+import { hasArtifactSuffix } from "../../layout/resolve.js";
 import { extractIssueRef } from "./parse-uri.js";
 export function scanLifecycleRefs(folder) {
     const results = [];
     if (!existsSync(folder))
         return results;
     const files = readdirSync(folder)
-        .filter((name) => name.endsWith(".vbrief.json"))
+        .filter((name) => hasArtifactSuffix(name))
         .sort();
     for (const name of files) {
         const path = join(folder, name);

package/dist/triage/reconcile/parse-uri.js

@@ -1,3 +1,4 @@
+import { referenceTypeMatches } from "@deftai/directive-types";
 /** Parse (repo, issue_number) from a github-issue reference URI. */
 export function parseGithubIssueUri(uri) {
     if (typeof uri !== "string")
@@ -32,7 +33,7 @@ export function extractIssueRef(data) {
         if (typeof ref !== "object" || ref === null || Array.isArray(ref))
             continue;
         const rec = ref;
-        if (rec.type !== "x-vbrief/github-issue")
+        if (!referenceTypeMatches(String(rec.type ?? ""), "github-issue"))
             continue;
         const [repo, number] = parseGithubIssueUri(rec.uri);
         if (number !== null)

package/dist/triage/reconcile/reconcile.js

@@ -1,9 +1,10 @@
 import { execFileSync } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { appendFileSync, mkdirSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
+import { dirname, resolve } from "node:path";
+import { resolveEvalPath, resolveLifecycleFolder } from "../../layout/resolve.js";
 import { auditKey, existingAuditRefs, scanLifecycleRefs } from "./audit.js";
-import { AUDIT_LOG_RELPATH, BACKFILL_FOLDERS, RECONCILE_ACTOR, } from "./types.js";
+import { BACKFILL_FOLDERS, RECONCILE_ACTOR, } from "./types.js";
 const GIT_ORIGIN_RE = /^(?:https?:\/\/(?:[^@/]+@)?github\.com\/|git@github\.com:|ssh:\/\/git@github\.com[:/])([A-Za-z0-9][A-Za-z0-9._-]*)\/([A-Za-z0-9][A-Za-z0-9._-]*?)(?:\.git)?\/?\s*$/;
 export function inferRepoFromGit(cwd) {
     try {
@@ -32,13 +33,13 @@ function newDecisionId() {
 }
 export function findReconcilable(projectRoot, options = {}) {
     const root = resolve(projectRoot);
-    const auditPath = options.auditLogPath ?? join(root, AUDIT_LOG_RELPATH);
+    const auditPath = options.auditLogPath ?? resolveEvalPath(root, "candidates.jsonl");
     const existing = existingAuditRefs(auditPath);
     const defaultRepo = options.defaultRepo ?? null;
     const items = [];
     const seen = new Set();
     for (const folderName of BACKFILL_FOLDERS) {
-        const folderPath = join(root, "vbrief", folderName);
+        const folderPath = resolveLifecycleFolder(root, folderName);
         for (const [refRepo, number, path] of scanLifecycleRefs(folderPath)) {
             const effectiveRepo = refRepo ?? defaultRepo;
             if (effectiveRepo === null)
@@ -63,7 +64,7 @@ function countSkippedExisting(projectRoot, defaultRepo, auditPath) {
     let count = 0;
     const root = resolve(projectRoot);
     for (const folderName of BACKFILL_FOLDERS) {
-        for (const [refRepo, number] of scanLifecycleRefs(join(root, "vbrief", folderName))) {
+        for (const [refRepo, number] of scanLifecycleRefs(resolveLifecycleFolder(root, folderName))) {
             const effectiveRepo = refRepo ?? defaultRepo;
             if (effectiveRepo === null)
                 continue;
@@ -86,7 +87,7 @@ function countNoRepo(projectRoot, defaultRepo, auditPath) {
     let count = 0;
     const root = resolve(projectRoot);
     for (const folderName of BACKFILL_FOLDERS) {
-        for (const [refRepo, number] of scanLifecycleRefs(join(root, "vbrief", folderName))) {
+        for (const [refRepo, number] of scanLifecycleRefs(resolveLifecycleFolder(root, folderName))) {
             if ((refRepo ?? defaultRepo) === null && !existingNumbers.has(number))
                 count += 1;
         }
@@ -115,7 +116,7 @@ export function reconcile(projectRoot, options = {}) {
     if (defaultRepo === null) {
         defaultRepo = inferRepoFromGit(root);
     }
-    const auditPath = options.auditLogPath ?? join(root, AUDIT_LOG_RELPATH);
+    const auditPath = options.auditLogPath ?? resolveEvalPath(root, "candidates.jsonl");
     const dryRun = options.dryRun ?? false;
     const result = {
         projectRoot: root,

package/dist/triage/refresh/extract.js

@@ -1,11 +1,13 @@
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { join } from "node:path";
+import { referenceTypeMatches } from "@deftai/directive-types";
+import { hasArtifactSuffix } from "../../layout/resolve.js";
 const ISSUE_URL_RE = /github\.com\/([^/]+\/[^/]+)\/issues\/(\d+)/i;
 export function iterActiveVbriefs(activeDir) {
     if (!existsSync(activeDir))
         return [];
     return readdirSync(activeDir)
-        .filter((name) => name.endsWith(".vbrief.json"))
+        .filter((name) => hasArtifactSuffix(name))
         .sort()
         .map((name) => join(activeDir, name));
 }
@@ -30,7 +32,7 @@ export function extractIssueRefs(vbriefPath) {
         if (typeof ref !== "object" || ref === null || Array.isArray(ref))
             continue;
         const rec = ref;
-        if (rec.type !== "x-vbrief/github-issue")
+        if (!referenceTypeMatches(String(rec.type ?? ""), "github-issue"))
             continue;
         const uri = String(rec.uri ?? "");
         const match = ISSUE_URL_RE.exec(uri);

package/dist/triage/refresh/refresh.js

@@ -1,4 +1,5 @@
-import { join, resolve } from "node:path";
+import { resolve } from "node:path";
+import { resolveLifecycleFolder } from "../../layout/resolve.js";
 import { detectDrift } from "./drift.js";
 import { iterActiveVbriefs } from "./extract.js";
 import { PROMPT_OPTIONS } from "./types.js";
@@ -20,7 +21,7 @@ function defaultAuditWriter(repo, issueNumber, annotation, log) {
 }
 export function refreshActive(projectRoot, options = {}) {
     const root = resolve(projectRoot);
-    const activeDir = options.activeDir ?? join(root, "vbrief", "active");
+    const activeDir = options.activeDir ?? resolveLifecycleFolder(root, "active");
     const log = options.log ?? ((line) => process.stdout.write(`${line}\n`));
     const inputFn = options.inputFn ?? (() => "");
     const refreshLocal = options.refreshLocal ?? (() => { });

package/dist/triage/scope/mutations-core.js

@@ -2,14 +2,16 @@ import { randomUUID } from "node:crypto";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, writeFileSync, } from "node:fs";
 import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
-import { PROJECT_DEFINITION_REL_PATH, SUBSCRIPTION_HISTORY_REL_PATH, SUBSCRIPTION_HISTORY_SCHEMA, } from "./constants.js";
+import { resolveEvalPath, resolveProjectDefinitionPath } from "../../layout/resolve.js";
+import { migrateLegacyPolicyKey, PLAN_POLICY_KEY } from "../../policy/plan-extensions.js";
+import { SUBSCRIPTION_HISTORY_SCHEMA } from "./constants.js";
 import { pyStrRepr } from "./python-repr.js";
 import { utcIso } from "./time.js";
 export class ProjectDefinitionIOError extends Error {
     name = "ProjectDefinitionIOError";
 }
 export function projectDefinitionPath(projectRoot) {
-    return join(projectRoot, PROJECT_DEFINITION_REL_PATH);
+    return resolveProjectDefinitionPath(projectRoot);
 }
 export function loadProjectDefinitionForMutation(projectRoot) {
     const path = projectDefinitionPath(projectRoot);
@@ -58,7 +60,7 @@ function resolveActor(actor) {
     }
 }
 export function recordSubscriptionChange(projectRoot, options) {
-    const historyPath = join(projectRoot, SUBSCRIPTION_HISTORY_REL_PATH);
+    const historyPath = resolveEvalPath(projectRoot, "subscription-history.jsonl");
     const record = {
         schema: SUBSCRIPTION_HISTORY_SCHEMA,
         change_id: randomUUID(),
@@ -132,9 +134,10 @@ export function subscribe(projectRoot, options) {
         throw new Error(`PROJECT-DEFINITION at ${path} has a non-object 'plan' key`);
     }
     const planRec = plan;
-    if (planRec.policy === undefined)
-        planRec.policy = {};
-    const policy = planRec.policy;
+    migrateLegacyPolicyKey(planRec);
+    if (planRec[PLAN_POLICY_KEY] === undefined)
+        planRec[PLAN_POLICY_KEY] = {};
+    const policy = planRec[PLAN_POLICY_KEY];
     if (typeof policy !== "object" || policy === null || Array.isArray(policy)) {
         throw new Error(`PROJECT-DEFINITION at ${path} has a non-object 'plan.policy' key`);
     }
@@ -179,9 +182,10 @@ export function addIgnore(projectRoot, label) {
         throw new Error(`PROJECT-DEFINITION at ${path} has a non-object 'plan' key`);
     }
     const planRec = plan;
-    if (planRec.policy === undefined)
-        planRec.policy = {};
-    const policy = planRec.policy;
+    migrateLegacyPolicyKey(planRec);
+    if (planRec[PLAN_POLICY_KEY] === undefined)
+        planRec[PLAN_POLICY_KEY] = {};
+    const policy = planRec[PLAN_POLICY_KEY];
     if (typeof policy !== "object" || policy === null || Array.isArray(policy)) {
         throw new Error(`PROJECT-DEFINITION at ${path} has a non-object 'plan.policy' key`);
     }

package/dist/triage/scope/renderers.js

@@ -1,10 +1,12 @@
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { join } from "node:path";
+import { referenceTypeMatches } from "@deftai/directive-types";
+import { hasArtifactSuffix, resolveLifecycleRoot } from "../../layout/resolve.js";
 import { subscriptionHash } from "./normalize.js";
 import { pyListRepr } from "./python-repr.js";
 const LIFECYCLE_FOLDERS = ["proposed", "pending", "active", "completed", "cancelled"];
 export function extractReferencedIssues(projectRoot, lifecycleFolders = LIFECYCLE_FOLDERS) {
-    const root = join(projectRoot, "vbrief");
+    const root = resolveLifecycleRoot(projectRoot);
     const anySet = new Set();
     const activeSet = new Set();
     if (!existsSync(root))
@@ -14,7 +16,7 @@ export function extractReferencedIssues(projectRoot, lifecycleFolders = LIFECYCL
         if (!existsSync(folderPath))
             continue;
         for (const name of readdirSync(folderPath)) {
-            if (!name.endsWith(".vbrief.json"))
+            if (!hasArtifactSuffix(name))
                 continue;
             const vbriefPath = join(folderPath, name);
             let data;
@@ -36,7 +38,7 @@ export function extractReferencedIssues(projectRoot, lifecycleFolders = LIFECYCL
                 if (typeof ref !== "object" || ref === null || Array.isArray(ref))
                     continue;
                 const rec = ref;
-                if (rec.type !== "x-vbrief/github-issue")
+                if (!referenceTypeMatches(String(rec.type ?? ""), "github-issue"))
                     continue;
                 const uri = rec.uri;
                 if (typeof uri !== "string")

package/dist/triage/scope/resolve.js

@@ -1,5 +1,6 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join, resolve } from "node:path";
+import { readPlanPolicy } from "../../policy/plan-extensions.js";
 import { DEFAULT_TRIAGE_SCOPE, PROJECT_DEFINITION_REL_PATH } from "./constants.js";
 export function projectDefinitionPath(projectRoot) {
     return join(resolve(projectRoot), PROJECT_DEFINITION_REL_PATH);
@@ -24,7 +25,7 @@ export function isDefaultApplied(data) {
     const plan = data.plan;
     if (typeof plan !== "object" || plan === null || Array.isArray(plan))
         return true;
-    const policy = plan.policy;
+    const policy = readPlanPolicy(plan);
     if (typeof policy !== "object" || policy === null || Array.isArray(policy))
         return true;
     const scope = policy.triageScope;
@@ -36,7 +37,7 @@ export function getRawScope(data) {
     const plan = data.plan;
     if (typeof plan !== "object" || plan === null || Array.isArray(plan))
         return undefined;
-    const policy = plan.policy;
+    const policy = readPlanPolicy(plan);
     if (typeof policy !== "object" || policy === null || Array.isArray(policy))
         return undefined;
     return policy.triageScope;
@@ -47,7 +48,7 @@ export function getRawIgnores(data) {
     const plan = data.plan;
     if (typeof plan !== "object" || plan === null || Array.isArray(plan))
         return [];
-    const policy = plan.policy;
+    const policy = readPlanPolicy(plan);
     if (typeof policy !== "object" || policy === null || Array.isArray(policy))
         return [];
     const raw = policy.triageScopeIgnores;
@@ -65,7 +66,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 }));
     }
@@ -91,7 +92,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;