@deftai/directive-core 0.65.0 → 0.66.0

package/dist/scope/vbrief-ref.js

@@ -1,4 +1,6 @@
 import { resolve } from "node:path";
+import { referenceTypeMatches } from "@deftai/directive-types";
+import { hasArtifactSuffix, stripArtifactSuffix } from "../layout/resolve.js";
 /** Resolve a vBRIEF reference URI to an absolute path, or null. */
 export function resolveVbriefRef(uri, vbriefDir) {
     if (typeof uri !== "string" || uri.length === 0) {
@@ -48,7 +50,7 @@ export function collectChildUris(plan) {
             continue;
         }
         const r = ref;
-        if (r.type !== "x-vbrief/plan") {
+        if (!referenceTypeMatches(String(r.type ?? ""), "plan")) {
             continue;
         }
         const uri = r.uri;
@@ -61,8 +63,8 @@ export function collectChildUris(plan) {
 /** Return registry IDs that may name a vBRIEF filename. */
 export function scopeIdsForFilename(filename) {
     let fullId;
-    if (filename.endsWith(".vbrief.json")) {
-        fullId = filename.slice(0, -".vbrief.json".length);
+    if (hasArtifactSuffix(filename)) {
+        fullId = stripArtifactSuffix(filename);
     }
     else {
         fullId = filename.replace(/\.[^.]+$/, "");

package/dist/session/resume-conditions.js

@@ -1,6 +1,7 @@
 import { randomUUID } from "node:crypto";
 import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
 import { join, resolve } from "node:path";
+import { hasArtifactSuffix } from "../layout/resolve.js";
 export const RESUME_ELIGIBLE_DECISION = "resume-eligible";
 export const EVALUATOR_ACTOR = "agent:resume-evaluator";
 export const CACHE_DIR_NAME = ".deft-cache";
@@ -270,7 +271,7 @@ function countPending(projectRoot) {
         for (const name of readdirSync(folder)) {
             const full = join(folder, name);
             try {
-                if (statSync(full).isFile() && name.endsWith(".vbrief.json")) {
+                if (statSync(full).isFile() && hasArtifactSuffix(name)) {
                     count += 1;
                 }
             }

package/dist/session/ritual-sentinel.js

@@ -1,5 +1,6 @@
 import { closeSync, existsSync, fdatasyncSync, mkdirSync, openSync, readdirSync, readFileSync, renameSync, statSync, writeSync, } from "node:fs";
 import { join, relative, resolve } from "node:path";
+import { hasArtifactSuffix } from "../layout/resolve.js";
 import { stableJson } from "./json.js";
 import { parseTimestamp, timestampIso } from "./time.js";
 export const SCHEMA_VERSION = 1;
@@ -307,7 +308,7 @@ export function detectLatestActiveVbrief(projectRoot) {
     }
     const candidates = [];
     for (const name of children) {
-        if (!name.endsWith(".vbrief.json")) {
+        if (!hasArtifactSuffix(name)) {
             continue;
         }
         const full = join(activeDir, name);

package/dist/session/staleness.js

@@ -1,3 +1,4 @@
+import { readPlanPolicy } from "../policy/plan-extensions.js";
 import { loadProjectDefinition } from "../policy/resolve.js";
 const DEFAULT_SESSION_RITUAL_STALENESS_HOURS = 4;
 function pythonTypeName(value) {
@@ -59,7 +60,7 @@ export function resolveSessionRitualStalenessHours(projectRoot) {
             error: "PROJECT-DEFINITION 'plan' is not an object",
         };
     }
-    const policyBlock = plan.policy;
+    const policyBlock = readPlanPolicy(plan);
     if (typeof policyBlock !== "object" ||
         policyBlock === null ||
         Array.isArray(policyBlock) ||

package/dist/slice/record.js

@@ -1,7 +1,7 @@
 import { randomUUID } from "node:crypto";
 import { appendFileSync, closeSync, existsSync, fsyncSync, mkdirSync, openSync, readFileSync, } from "node:fs";
-import { dirname, join, resolve } from "node:path";
-import { DEFAULT_SLICES_LOG_REL_PATH } from "./constants.js";
+import { dirname, resolve } from "node:path";
+import { resolveEvalPath } from "../layout/resolve.js";
 import { pythonJsonStringify } from "./json.js";
 import { withAppendLock } from "./lock.js";
 import { validateRecord } from "./validate.js";
@@ -16,7 +16,7 @@ const defaultDeps = {
     withLock: withAppendLock,
 };
 function resolvePath(path) {
-    return path !== undefined ? resolve(path) : resolve(DEFAULT_SLICES_LOG_REL_PATH);
+    return path !== undefined ? resolve(path) : resolveEvalPath(process.cwd(), "slices.jsonl");
 }
 export function newSliceId() {
     return randomUUID();
@@ -134,6 +134,6 @@ export function findByUmbrella(umbrella, options = {}) {
     return readAll(options).filter((record) => record.umbrella === umbrella);
 }
 export function slicesPath(projectRoot) {
-    return join(resolve(projectRoot), DEFAULT_SLICES_LOG_REL_PATH);
+    return resolveEvalPath(projectRoot, "slices.jsonl");
 }
 //# sourceMappingURL=record.js.map

package/dist/spec-authority/resolver.js

@@ -1,16 +1,16 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
+import { resolveLifecycleLayout, resolveLifecycleRoot, resolveProjectDefinitionPath, } from "../layout/resolve.js";
 import { SPEC_RENDER_BANNER } from "../render/constants.js";
 import { EXPORT_SPEC_PD_BANNER, GENERATED_SPEC_PURPOSE, GENERATED_SPEC_SOURCE_PD, GENERATED_SPEC_SOURCE_SPEC, } from "./constants.js";
-const SPEC_REL = join("vbrief", "specification.vbrief.json");
-const PD_REL = join("vbrief", "PROJECT-DEFINITION.vbrief.json");
 export function resolveSpecAuthority(projectRoot) {
     const root = projectRoot;
-    const vbriefDir = join(root, "vbrief");
-    const projectDefPath = join(root, PD_REL);
+    const layout = resolveLifecycleLayout(root);
+    const vbriefDir = resolveLifecycleRoot(root);
+    const projectDefPath = resolveProjectDefinitionPath(root);
     if (!existsSync(projectDefPath))
         return null;
-    const specPath = join(root, SPEC_REL);
+    const specPath = join(vbriefDir, `specification${layout.artifactSuffix}`);
     const hasSpec = existsSync(specPath);
     const kind = hasSpec ? "full-spec" : "greenfield";
     const banner = kind === "full-spec" ? SPEC_RENDER_BANNER : EXPORT_SPEC_PD_BANNER;

package/dist/swarm/complete-cohort.js

@@ -1,5 +1,6 @@
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { join, resolve } from "node:path";
+import { hasArtifactSuffix, resolveLifecycleRoot } from "../layout/resolve.js";
 import { detectLifecycleFolder } from "../scope/decomposed-refs.js";
 import { runTransition } from "../scope/transition.js";
 import { collectChildUris, collectPlanRefs, resolveVbriefRef } from "../scope/vbrief-ref.js";
@@ -41,7 +42,7 @@ function globResolve(pattern, projectRoot) {
         return [];
     }
     return readdirSync(dir)
-        .filter((name) => name.endsWith(".vbrief.json") || glob === name)
+        .filter((name) => hasArtifactSuffix(name) || glob === name)
         .map((name) => resolve(dir, name))
         .filter((p) => existsSync(p));
 }
@@ -229,7 +230,7 @@ function completeParent(parentPath, vbriefDir, projectRoot, settled, dryRun) {
     };
 }
 export function sweepCohort(storyPaths, projectRoot, dryRun) {
-    const vbriefDir = join(projectRoot, "vbrief");
+    const vbriefDir = resolveLifecycleRoot(projectRoot);
     const result = {
         project_root: resolve(projectRoot),
         dry_run: dryRun,
@@ -243,7 +244,7 @@ export function sweepCohort(storyPaths, projectRoot, dryRun) {
         const termDir = join(vbriefDir, term);
         if (existsSync(termDir)) {
             for (const name of readdirSync(termDir)) {
-                if (name.endsWith(".vbrief.json")) {
+                if (hasArtifactSuffix(name)) {
                     settled.add(resolve(join(termDir, name)));
                 }
             }
@@ -358,7 +359,7 @@ export function completeCohort(args) {
             stderr: `Error: project root does not exist: ${projectRoot}\n`,
         };
     }
-    if (!existsSync(join(projectRoot, "vbrief"))) {
+    if (!existsSync(resolveLifecycleRoot(projectRoot))) {
         return {
             exitCode: 2,
             stdout: "",

package/dist/swarm/launch.js

@@ -2,6 +2,7 @@ import { existsSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, join, resolve } from "node:path";
 import { inferGithubAuthMode } from "../intake/github-auth-modes.js";
 import { getPlatformCapabilities } from "../intake/platform-capabilities.js";
+import { hasArtifactSuffix, resolveLifecycleFolder, stripArtifactSuffix, } from "../layout/resolve.js";
 import { evaluate as preflightEvaluate } from "../preflight/evaluate.js";
 import { issueNumbersFromPlan, scopeMetadataRank } from "../triage/queue/scope-walk.js";
 import { selectionOrderingKey } from "../triage/queue/selection.js";
@@ -45,9 +46,7 @@ function storyId(path, plan) {
         return value.trim();
     }
     const name = basename(path);
-    return name.endsWith(".vbrief.json")
-        ? name.slice(0, -".vbrief.json".length)
-        : name.replace(/\.[^.]+$/, "");
+    return hasArtifactSuffix(name) ? stripArtifactSuffix(name) : name.replace(/\.[^.]+$/, "");
 }
 function extractHashNumbers(text) {
     const out = [];
@@ -128,13 +127,13 @@ function projectRel(projectRoot, path) {
     }
 }
 function indexActiveStories(projectRoot) {
-    const activeDir = join(projectRoot, "vbrief", "active");
+    const activeDir = resolveLifecycleFolder(projectRoot, "active");
     const index = [];
     if (!existsSync(activeDir)) {
         return index;
     }
     for (const name of readdirSync(activeDir).sort()) {
-        if (!name.endsWith(".vbrief.json")) {
+        if (!hasArtifactSuffix(name)) {
             continue;
         }
         const path = join(activeDir, name);
@@ -151,7 +150,7 @@ export function looksLikePath(token) {
     return (token.endsWith(".json") ||
         token.includes("/") ||
         token.includes("\\") ||
-        (existsSync(token) && basename(token).endsWith(".vbrief.json")));
+        (existsSync(token) && hasArtifactSuffix(basename(token))));
 }
 function resolveOne(token, projectRoot, idMap, issueMap) {
     if (looksLikePath(token)) {
@@ -411,7 +410,7 @@ export function swarmLaunch(args) {
             stderr: "Error: no stories supplied. Pass --stories <ids|paths> and/or --paths <paths>.\n",
         };
     }
-    if (!existsSync(join(projectRoot, "vbrief", "active"))) {
+    if (!existsSync(resolveLifecycleFolder(projectRoot, "active"))) {
         return {
             exitCode: EXIT_CONFIG_ERROR,
             stdout: "",

package/dist/swarm/readiness.js

@@ -1,5 +1,7 @@
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { basename, join, resolve } from "node:path";
+import { referenceTypeMatches } from "@deftai/directive-types";
+import { ARTIFACT_SUFFIXES, hasArtifactSuffix, LIFECYCLE_DIR_NAMES, resolveLifecycleLayout, resolveLifecycleRoot, stripArtifactSuffix, } from "../layout/resolve.js";
 import { acceptanceTextsFromItems, asStrList, deprecatedSubitemsIssues, itemHasTraces, itemsHaveAcceptance, missingRequiredSwarmFields, storyQualityIssues, } from "../vbrief-validation/story-quality.js";
 import { LIFECYCLE_FOLDERS, READY } from "./constants.js";
 function loadJson(path) {
@@ -24,7 +26,8 @@ function projectRel(projectRoot, path) {
     }
 }
 function expandPaths(projectRoot, patterns) {
-    const usePatterns = patterns.length > 0 ? patterns : ["vbrief/active/*.vbrief.json"];
+    const layout = resolveLifecycleLayout(projectRoot);
+    const usePatterns = patterns.length > 0 ? patterns : [`${layout.artifactDir}/active/*${layout.artifactSuffix}`];
     const out = [];
     const seen = new Set();
     for (const pattern of usePatterns) {
@@ -33,13 +36,14 @@ function expandPaths(projectRoot, patterns) {
             const globPart = pattern.includes("/")
                 ? pattern.slice(pattern.lastIndexOf("/") + 1)
                 : pattern;
-            if (existsSync(join(projectRoot, "vbrief", "active")) && pattern.startsWith("vbrief/")) {
-                const activeDir = join(projectRoot, pattern.split("/")[0] ?? "vbrief", pattern.split("/")[1] ?? "active");
-                if (existsSync(activeDir)) {
-                    for (const name of readdirSync(activeDir)) {
-                        if (matchGlob(name, globPart)) {
-                            addPath(join(activeDir, name), seen, out);
-                        }
+            const firstSeg = pattern.split("/")[0] ?? "";
+            const secondSeg = pattern.split("/")[1] ?? "";
+            const lifecyclePattern = LIFECYCLE_DIR_NAMES.includes(firstSeg);
+            if (lifecyclePattern && existsSync(join(projectRoot, firstSeg, secondSeg))) {
+                const activeDir = join(projectRoot, firstSeg, secondSeg);
+                for (const name of readdirSync(activeDir)) {
+                    if (matchGlob(name, globPart)) {
+                        addPath(join(activeDir, name), seen, out);
                     }
                 }
             }
@@ -69,8 +73,10 @@ function dirnamePattern(projectRoot, pattern) {
     return idx >= 0 ? join(projectRoot, pattern.slice(0, idx)) : projectRoot;
 }
 function matchGlob(name, glob) {
-    if (glob === "*.vbrief.json") {
-        return name.endsWith(".vbrief.json");
+    // Layout-aware (#2109 part 1): an artifact-suffix glob matches either suffix,
+    // so a mixed/either lifecycle tree resolves the same way.
+    if (ARTIFACT_SUFFIXES.some((suffix) => glob === `*${suffix}`)) {
+        return hasArtifactSuffix(name);
     }
     if (glob.startsWith("*.")) {
         return name.endsWith(glob.slice(1));
@@ -115,7 +121,7 @@ function hasChildPlanRefs(plan) {
     return refs.some((ref) => typeof ref === "object" &&
         ref !== null &&
         !Array.isArray(ref) &&
-        ref.type === "x-vbrief/plan");
+        referenceTypeMatches(String(ref.type ?? ""), "plan"));
 }
 function looksLikePhase(path, plan) {
     const title = String(plan.title ?? "");
@@ -153,9 +159,7 @@ function storyId(path, plan) {
         return value.trim();
     }
     const name = basename(path);
-    return name.endsWith(".vbrief.json")
-        ? name.slice(0, -".vbrief.json".length)
-        : name.replace(/\.[^.]+$/, "");
+    return hasArtifactSuffix(name) ? stripArtifactSuffix(name) : name.replace(/\.[^.]+$/, "");
 }
 function hasTraces(plan, swarm) {
     const narratives = plan.narratives;
@@ -182,7 +186,7 @@ function hasTraces(plan, swarm) {
             if (typeof ref === "object" &&
                 ref !== null &&
                 !Array.isArray(ref) &&
-                ref.type === "x-vbrief/spec-section") {
+                referenceTypeMatches(String(ref.type ?? ""), "spec-section")) {
                 return true;
             }
         }
@@ -206,14 +210,14 @@ function acceptanceCountJustification(plan, swarm) {
 }
 function allScopeIds(projectRoot) {
     const ids = new Map();
-    const vbriefDir = join(projectRoot, "vbrief");
+    const vbriefDir = resolveLifecycleRoot(projectRoot);
     for (const folder of LIFECYCLE_FOLDERS) {
         const dir = join(vbriefDir, folder);
         if (!existsSync(dir)) {
             continue;
         }
         for (const name of readdirSync(dir).sort()) {
-            if (!name.endsWith(".vbrief.json")) {
+            if (!hasArtifactSuffix(name)) {
                 continue;
             }
             const path = join(dir, name);
@@ -224,9 +228,7 @@ function allScopeIds(projectRoot) {
             const plan = planOf(data);
             const sid = storyId(path, plan);
             ids.set(sid, [path, String(plan.status ?? "")]);
-            const stem = name.endsWith(".vbrief.json")
-                ? name.slice(0, -".vbrief.json".length)
-                : name.replace(/\.[^.]+$/, "");
+            const stem = stripArtifactSuffix(name);
             if (!ids.has(stem)) {
                 ids.set(stem, [path, String(plan.status ?? "")]);
             }

package/dist/swarm/subagent-backend.js

@@ -11,6 +11,7 @@
  * @see {@link https://github.com/deftai/directive/issues/1739} Superseding PR
  * @see {@link https://github.com/deftai/directive/issues/1860} Hard deletion tracking
  */
+import { readPlanPolicy } from "../policy/plan-extensions.js";
 import { loadProjectDefinition } from "../policy/resolve.js";
 import { LEAF_CODING_WORKER_ROLE, SUBAGENT_BACKEND_SET_CMD } from "./constants.js";
 const TRUTHY = new Set(["1", "true", "yes", "on"]);
@@ -63,11 +64,7 @@ export function probeSubagentBackends(environ = process.env) {
     });
 }
 function getPolicyBlock(data) {
-    const plan = data.plan;
-    if (typeof plan !== "object" || plan === null || Array.isArray(plan)) {
-        return {};
-    }
-    const policy = plan.policy;
+    const policy = readPlanPolicy(data.plan);
     if (typeof policy !== "object" || policy === null || Array.isArray(policy)) {
         return {};
     }

package/dist/swarm/verify-review-clean.js

@@ -1,5 +1,6 @@
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { resolve } from "node:path";
+import { hasArtifactSuffix } from "../layout/resolve.js";
 import { defaultRunGh, fetchGreptileCommentBody, fetchPrHeadSha, } from "../pr-merge-readiness/gh.js";
 import { evaluateGates, parseGreptileBody } from "../pr-merge-readiness/index.js";
 import { EXIT_EXTERNAL_ERROR, EXIT_OK, EXIT_UNCLEAN } from "./constants.js";
@@ -34,7 +35,7 @@ function globPaths(pattern) {
             return [];
         }
         return readdirSync(dir)
-            .filter((name) => (glob === "*.vbrief.json" ? name.endsWith(".vbrief.json") : name === glob))
+            .filter((name) => (glob === "*.vbrief.json" ? hasArtifactSuffix(name) : name === glob))
             .map((name) => resolve(dir, name));
     }
     return [resolve(pattern)];

package/dist/triage/actions/candidates-log.d.ts

@@ -1,5 +1,8 @@
 import type { AuditEntry, CandidatesLog } from "./types.js";
+/** Display/back-compat constant; resolution flows through resolveEvalPath (#2109). */
 export declare const AUDIT_LOG_REL_PATH = "vbrief/.eval/candidates.jsonl";
+/** Layout-aware candidates audit-log path (xbrief when migrated, else vbrief). */
+export declare function resolveCandidatesLogPath(projectRoot: string): string;
 /** Read every well-formed audit-log row in insertion order (#1698 shared reader). */
 export declare function readAuditLog(logPath: string, repo?: string | null): AuditEntry[];
 /** Return every entry for ``(repo, issue_number)`` in insertion order. */

package/dist/triage/actions/candidates-log.js

@@ -1,8 +1,14 @@
 import { randomUUID } from "node:crypto";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
+import { resolveEvalPath } from "../../layout/resolve.js";
 import { CandidatesLogError } from "./errors.js";
+/** Display/back-compat constant; resolution flows through resolveEvalPath (#2109). */
 export const AUDIT_LOG_REL_PATH = "vbrief/.eval/candidates.jsonl";
+/** Layout-aware candidates audit-log path (xbrief when migrated, else vbrief). */
+export function resolveCandidatesLogPath(projectRoot) {
+    return resolveEvalPath(projectRoot, "candidates.jsonl");
+}
 const VALID_DECISIONS = new Set([
     "accept",
     "reject",
@@ -103,7 +109,7 @@ function resolveLogPath(projectRoot, override) {
     if (override !== undefined) {
         return override;
     }
-    return join(projectRoot, AUDIT_LOG_REL_PATH);
+    return resolveCandidatesLogPath(projectRoot);
 }
 function stableStringify(entry) {
     const sortedKeys = Object.keys(entry).sort();
@@ -227,6 +233,6 @@ export function rollbackAuditEntry(decisionId, projectRoot, logPathOverride) {
     return removed;
 }
 export function resolveAuditLogPath(projectRoot) {
-    return join(projectRoot, AUDIT_LOG_REL_PATH);
+    return resolveCandidatesLogPath(projectRoot);
 }
 //# sourceMappingURL=candidates-log.js.map

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)) {