@opengsd/gsd-core 1.14.0 → 1.16.0

package/gsd-core/bin/lib/init.cjs

@@ -41,17 +41,24 @@ const { SCOPE } = planningScopeMod;
 const secrets_cjs_1 = require("./secrets.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports -- plan-scan.cjs is an export= CommonJS module
 const scanPhasePlans = require("./plan-scan.cjs");
+// eslint-disable-next-line @typescript-eslint/no-require-imports -- plan-document.cjs is an export= CommonJS module
+const planDocument = require("./plan-document.cjs");
 const state_document_cjs_1 = require("./state-document.cjs");
 const runtime_slash_cjs_1 = require("./runtime-slash.cjs");
 const host_runtime_detection_cjs_1 = require("./host-runtime-detection.cjs");
-// eslint-disable-next-line @typescript-eslint/no-require-imports -- commands.cjs is an export= CommonJS module
-const commandsMod = require("./commands.cjs");
 const security_cjs_1 = require("./security.cjs");
 const runtime_homes_cjs_1 = require("./runtime-homes.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports -- frontmatter.cjs is an export= CommonJS module
 const frontmatterMod = require("./frontmatter.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports -- verification.cjs is an export= CommonJS module
 const verificationMod = require("./verification.cjs");
+// #5060: Phase Status Module — the single owner of "what state is phase P
+// in?" (ADR-5057 §1/§2). Replaces this file's own determinePhaseStatus/
+// projectCompletionStatus derivations, and cmdInitMilestoneOp's
+// summary-count-only completion check (the former listPhaseSummaryFiles
+// helper, since removed). listPhasePlanFiles (below) is unrelated — it backs
+// only the STATE.md disk-plan-count validation, not a completion verdict.
+const phase_status_cjs_1 = require("./phase-status.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports -- uat-predicate.cjs is an export= CommonJS module
 const uatPredicateMod = require("./uat-predicate.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports -- agent-install-check.cjs is an export= CommonJS module
@@ -87,12 +94,11 @@ const { resolveModelInternal, resolveGranularityInternal, assertValidGranularity
 const { findPhaseInternal, listMilestonePhaseDirs, listAllPhaseDirs } = phaseLocator;
 const { getRoadmapPhaseInternal, getMilestoneInfo, stripShippedMilestones, extractCurrentMilestone, } = roadmapParser;
 const { pathExistsInternal, generateSlugInternal, toPosixPath } = coreUtils;
-const { comparePhaseNum, normalizePhaseName, matchPhaseDirs, stripProjectCodePrefix, PHASE_NUMBER_TOKEN_SOURCE, isForeignPrefixedPhaseQuery, isSentinelPhaseId, extractPhaseToken, scopeToPhase, renderPhaseBranchName } = phaseId;
+const { comparePhaseNum, normalizePhaseName, stripProjectCodePrefix, PHASE_NUMBER_TOKEN_SOURCE, PHASE_DEP_REF_SOURCE, isForeignPrefixedPhaseQuery, isSentinelPhaseId, extractPhaseToken, scopeToPhase, renderPhaseBranchName, parsePhaseId, renderPhaseId, phaseHeadingPrefixSrcFor, PHASE_HEADING_BASELINE, buildPhaseHeadingScanRegex, } = phaseId;
 const { pruneOrphanedWorktrees } = worktreeSafety;
-const { planningPaths, planningDir, planningRoot, todosDir, listAvailableWorkstreams, peekActiveWorkstream, diagnoseUnresolvedActiveWorkstream, describeUnresolvedWorkstreamReason, findContextMdIn, } = planningWorkspace;
-const { determinePhaseStatus } = commandsMod;
-const { extractFrontmatter } = frontmatterMod;
-const { isPhaseComplete, resolveVerificationFile, resolveUatFile } = verificationMod;
+const { planningPaths, planningDir, planningRoot, todosDir, listAvailableWorkstreams, peekActiveWorkstream, resolveEnvWorkstream, diagnoseUnresolvedActiveWorkstream, describeUnresolvedWorkstreamReason, findContextMdIn, resolvePhaseIdConvention, worktreesOptedOut, } = planningWorkspace;
+const { extractFrontmatter, frontmatterBlock } = frontmatterMod;
+const { isPhaseComplete, resolveVerificationFile, resolveUatFile, VERIFICATION_STATUS, VerificationStatusError } = verificationMod;
 const { evaluateUatPassed } = uatPredicateMod;
 const { resolveLoopHooks } = loopResolverMod;
 const { loadRegistry } = capabilityLoaderMod;
@@ -100,7 +106,6 @@ const { resolveCapabilityRuntimeState } = capabilityStateMod;
 // Unused but imported for structural parity
 void stripShippedMilestones;
 // Accept all bold/colon variants of the Requirements header (#2769)
-const REQUIREMENTS_HEADER_RE = /^\*\*Requirements:?\*\*[^\S\n]*:?[^\S\n]*([^\n]*)$/m;
 // #2056/#2104: isForeignPrefixedPhaseQuery is imported from phase-id.cts
 // (the canonical predicate). parsePhasePrefix is no longer needed locally.
 // phaseInfoMatchesExactPrefix and roadmapPhaseMatchesExactPrefix are local
@@ -110,9 +115,18 @@ function phaseInfoMatchesExactPrefix(phaseInfo, phase) {
     const numStr = typeof num === 'string' ? num : (typeof num === 'number' ? String(num) : '');
     return numStr.toUpperCase() === phase.toUpperCase();
 }
+// #4906 Phase 5 (#4984): NOT migrated onto the heading-baseline selector —
+// this site was never one of the five ADR-4910 §8 call sites this phase owns
+// (init milestone/progress heading scans + milestone.cts's unstarted-phase
+// guard, all via buildPhaseHeadingScanRegex), and adding a NEW direct
+// any-bracket selector consumer here inflated init.cts's
+// tests/adr-612-bracket-heading-selection.test.cjs census past its pinned
+// count. Left bracket-blind deliberately, matching this call's pre-#4984
+// behavior; folding it into the census is Phase 6 work.
 function roadmapPhaseMatchesExactPrefix(roadmapPhase, phase) {
     const sectionRaw = roadmapPhase?.['section'];
     const section = typeof sectionRaw === 'string' ? sectionRaw : '';
+    // phase-id-owner: deliberately unmigrated (#4984 revert) — see comment above the function.
     return new RegExp(`^#{2,4}\\s*Phase\\s+${(0, pattern_cjs_1.escapeRegex)(phase)}(?:\\b|\\s|:)`, 'i').test(section);
 }
 // #2104: shared helpers that wrap findPhaseInternal / getRoadmapPhaseInternal
@@ -176,20 +190,10 @@ function applyRoadmapFallback(phaseInfo, roadmapPhase, buildFallback) {
     }
     return phaseInfo;
 }
-function listPhaseSummaryFiles(phaseDir) {
-    return scanPhasePlans(phaseDir)['summaryFiles'];
-}
 function listPhasePlanFiles(phaseDir) {
     return scanPhasePlans(phaseDir)['planFiles'];
 }
-function projectCompletionStatus(implementationComplete, phaseComplete) {
-    if (phaseComplete)
-        return 'complete';
-    if (implementationComplete)
-        return 'executed';
-    return 'incomplete';
-}
-function buildPhaseCompletionProjection(cwd, phaseNumber, phaseDir, planCount, summaryCount, slashRuntime) {
+function buildPhaseCompletionProjection(cwd, phaseNumber, phaseDir, planCount, summaryCount, slashRuntime, convention) {
     // ADR-3180 §7.4 (issue #3186) / DO-NOT-MIGRATE exemption
     // (scripts/lint-completion-predicate-drift.cjs FUNCTION_SCOPED_EXEMPTIONS,
     // declared deviation): `implementation_complete` answers "are the plans
@@ -209,20 +213,35 @@ function buildPhaseCompletionProjection(cwd, phaseNumber, phaseDir, planCount, s
     // #2617: the router still owns both the message content and the runtime
     // projection; init passes the phase number it already knows (its phaseDir
     // is unresolved in some branches, where the router could not derive one).
-    const completionResult = isPhaseComplete(phaseFullDir, { runtime: slashRuntime, phaseNumber });
+    const completionResult = isPhaseComplete(phaseFullDir, { runtime: slashRuntime, phaseNumber, convention });
+    // #5118: the owner carried an out-of-set report status in its result
+    // (`statusError`, `verification.status: null`); an init bundle is never
+    // assembled over a report the owner refused — the carried error is raised
+    // here and every `init *` surface built on this projection fails with the
+    // error's own reason (the CLI entry seam), printing nothing.
+    if (completionResult.value.statusError)
+        throw completionResult.value.statusError;
     const verificationStatus = completionResult.value.verification;
     const projectedVerificationStatus = verificationStatus.status;
     const projectedVerificationAction = verificationStatus.next_action;
-    const verificationPassed = projectedVerificationStatus === 'passed';
+    const verificationPassed = projectedVerificationStatus === VERIFICATION_STATUS.PASSED;
     const phaseComplete = completionResult.value.complete;
     return {
         implementation_complete: implementationComplete,
         verification_status: projectedVerificationStatus,
         verification_passed: verificationPassed,
         phase_complete: phaseComplete,
-        completion_status: projectCompletionStatus(implementationComplete, phaseComplete),
+        // #5060: Phase Status Module — the single owner of "what state is phase P
+        // in?" (ADR-5057 §1/§2).
+        completion_status: (0, phase_status_cjs_1.toCompletionStatus)((0, phase_status_cjs_1.phaseStatusFromFacts)({
+            planCount,
+            summaryCount,
+            complete: phaseComplete,
+            verificationStatus: projectedVerificationStatus,
+        })),
         verification_next_action: projectedVerificationAction,
         verification_next_command: verificationStatus.next_command,
+        verification_route: verificationStatus.route,
         // #3057 B3: readVerificationStatus's result carries this flag when its
         // internal staleness check could not run to completion.
         verification_stale_check_indeterminate: 'staleCheckIndeterminate' in verificationStatus
@@ -469,7 +488,8 @@ function detectHasPriorPhases(cwd, phaseInfo) {
  * `false` — strict `=== true`, never coerced, mirrors `detectHasPriorPhases`'s
  * degrade-to-false discipline. `keyPath` is always a fixed literal supplied
  * by this module, never attacker/user input, so a plain bracket traversal
- * carries no prototype hazard here.
+ * carries no prototype hazard here. Only for keys whose default is OFF — a
+ * default-ON key read here silently inverts its unset value (#4977).
  */
 function readConfigJsonBoolean(cwd, keyPath) {
     try {
@@ -584,6 +604,13 @@ function detectPhaseMvpMode(cwd, phaseNumber) {
         const rawContent = node_fs_1.default.readFileSync(roadmapPath, 'utf-8');
         const content = extractCurrentMilestone(rawContent, cwd);
         const escapedPhase = (0, pattern_cjs_1.escapeRegex)(phaseNumber);
+        // #4906 Phase 5 (#4984): NOT migrated onto phaseHeadingPrefixSrcFor — same
+        // out-of-scope reasoning as roadmapPhaseMatchesExactPrefix above (only the
+        // five buildPhaseHeadingScanRegex sites in init.cts/milestone.cts are this
+        // phase's owned migration); a direct selector call here would have added
+        // a fourth uncounted ANY_BRACKET consumer to init.cts's pinned
+        // tests/adr-612-bracket-heading-selection.test.cjs census.
+        // phase-id-owner: deliberately unmigrated (#4984 revert) — see comment above.
         const phaseHeader = new RegExp(`#{2,4}\\s*Phase\\s+${escapedPhase}(?:\\s*\\([^)\\n]{0,200}\\))?\\s*:`, 'i');
         const headerMatch = content.match(phaseHeader);
         if (!headerMatch || headerMatch.index === undefined)
@@ -710,7 +737,13 @@ function buildSectionManifestField(cwd, phaseInfo, options, workflow, overrides
         flags,
         phaseNumber,
         hasPriorPhases: detectHasPriorPhases(cwd, phaseInfo),
-        worktreesEnabled: readConfigJsonBoolean(cwd, ['workflow', 'use_worktrees']),
+        // #4977: `workflow.use_worktrees` defaults ON, so this fact must come from
+        // the #3972 owner `query dispatch-isolation` and the isolation guard
+        // already share — not `readConfigJsonBoolean`, whose absent ⇒ false
+        // polarity (right for the opt-in keys around it) excluded the quick
+        // pre-dispatch plan commit while the executor was still dispatched
+        // isolated. The ladder also brings root→workstream inheritance along.
+        worktreesEnabled: !worktreesOptedOut(cwd),
         phaseMvpMode: detectPhaseMvpMode(cwd, phaseNumber),
         needsCodebaseMap: overrides.needsCodebaseMap,
         chunkedMode,
@@ -751,6 +784,54 @@ function buildSectionManifestField(cwd, phaseInfo, options, workflow, overrides
 function milestoneRecord(cwd) {
     return (getMilestoneInfo(cwd).value ?? {});
 }
+/**
+ * #4683 — threat IDs claimed by more than one of the phase's live PLAN files.
+ * `scanPhasePlans().planFiles` is the right input set twice over: it excludes
+ * derivative files (OUTLINE / PLAN-REVIEW / pre-bounce) AND `status: superseded`
+ * plans (#2349) — a superseded plan's IDs were deliberately reassigned to its
+ * replacement, so they must not hold against it. The per-document row parse is
+ * planDocument.extractThreatRegisterIds; only `<threat_model>` register rows
+ * count, and the reserved `T-{phase}-SC` shape is excluded there by grammar
+ * (every plan keeps that row by design). A missing/unreadable phase directory
+ * degrades to "no duplicates" — planning a brand-new phase has nothing to
+ * collide with.
+ */
+function findDuplicateThreatIds(cwd, phaseDirRel) {
+    if (!phaseDirRel)
+        return [];
+    const phaseDir = node_path_1.default.join(cwd, phaseDirRel);
+    let planFiles;
+    try {
+        planFiles = scanPhasePlans(phaseDir).planFiles;
+    }
+    catch {
+        return [];
+    }
+    const owners = new Map();
+    for (const planFile of planFiles) {
+        let content;
+        try {
+            content = node_fs_1.default.readFileSync(node_path_1.default.join(phaseDir, planFile), 'utf-8');
+        }
+        catch {
+            continue;
+        }
+        for (const id of planDocument.extractThreatRegisterIds(content)) {
+            const claimed = owners.get(id);
+            if (claimed) {
+                if (!claimed.includes(planFile))
+                    claimed.push(planFile);
+            }
+            else {
+                owners.set(id, [planFile]);
+            }
+        }
+    }
+    return [...owners.entries()]
+        .filter(([, claims]) => claims.length > 1)
+        .map(([id, plans]) => ({ id, plans: [...plans].sort() }))
+        .sort((a, b) => (a.id < b.id ? -1 : a.id > b.id ? 1 : 0));
+}
 function cmdInitExecutePhase(cwd, phase, raw, options = {}) {
     if (!phase) {
         error('phase required for init execute-phase');
@@ -788,9 +869,14 @@ function cmdInitExecutePhase(cwd, phase, raw, options = {}) {
             has_reviews: false,
         };
     });
-    const reqMatch = roadmapPhase?.['section']?.match(REQUIREMENTS_HEADER_RE);
-    const reqExtracted = reqMatch
-        ? reqMatch[1].replace(/[\[\]]/g, '').split(',').map((s) => s.trim()).filter(Boolean).join(', ')
+    // #4731: multiline-aware — the Requirements field may hard-wrap, so the
+    // value is extracted past the line break before the ID scan.
+    const phaseSection = roadmapPhase?.['section'];
+    const reqLine = phaseSection
+        ? roadmapParser.extractPhaseFieldMultiline(phaseSection, 'Requirements')
+        : null;
+    const reqExtracted = reqLine
+        ? reqLine.replace(/[\[\]]/g, '').split(',').map((s) => s.trim()).filter(Boolean).join(', ')
         : null;
     const phase_req_ids = reqExtracted && reqExtracted !== 'TBD' ? reqExtracted : null;
     // #3188: these paths are null when the file is absent, matching the contract
@@ -800,6 +886,8 @@ function cmdInitExecutePhase(cwd, phase, raw, options = {}) {
     const statePath = node_path_1.default.join(planningDir(cwd), 'STATE.md');
     const roadmapPath = node_path_1.default.join(planningDir(cwd), 'ROADMAP.md');
     const requirementsPath = node_path_1.default.join(planningDir(cwd), 'REQUIREMENTS.md');
+    // #4683: computed once — see the threat_id_duplicates fields in the payload.
+    const threatIdDuplicates = findDuplicateThreatIds(cwd, phaseInfo?.['directory']);
     const result = {
         executor_model: resolveModelInternal(cwd, 'gsd-executor'),
         verifier_model: resolveModelInternal(cwd, 'gsd-verifier'),
@@ -819,6 +907,13 @@ function cmdInitExecutePhase(cwd, phase, raw, options = {}) {
             ? toPosixPath(node_path_1.default.join(cwd, phaseInfo['directory']))
             : null,
         phase_number: phaseInfo?.['phase_number'] || null,
+        // #4748: the disk path hands back the directory's padded number (`03A`)
+        // but the ROADMAP fallback above hands back the heading's bare one (`3A`),
+        // and execute-phase.md's review lookup needs the padded form for
+        // `{PADDED}-REVIEW.md`. It used to re-pad in shell with `printf "%02d"`,
+        // which cannot pad a letter id and reads an already-padded `08` as octal.
+        // Emit the canonical normalization, as the plan-phase/code-review inits do.
+        padded_phase: phaseInfo?.['phase_number'] ? normalizePhaseName(phaseInfo['phase_number']) : null,
         // #3171: prefer the ROADMAP's curated display name for `phase_name`. When
         // the phase directory already exists on disk, the disk-lookup path
         // (searchPhaseInDir) derives phase_name from the directory-name remainder
@@ -837,6 +932,12 @@ function cmdInitExecutePhase(cwd, phase, raw, options = {}) {
         incomplete_plans: phaseInfo?.['incomplete_plans'] || [],
         plan_count: phaseInfo?.['plans']?.length || 0,
         incomplete_count: phaseInfo?.['incomplete_plans']?.length || 0,
+        // #4683: cross-plan threat-ID collisions (gap-closure plans renumbering
+        // from T-{phase}-01 again). execute-phase.md hard-stops on a non-empty
+        // list BEFORE any dispatch — SECURITY.md rows and VALIDATION.md's Threat
+        // Ref column key on this ID, so a reused ID is ambiguous downstream.
+        threat_id_duplicates: threatIdDuplicates,
+        threat_id_duplicate_count: threatIdDuplicates.length,
         // #2830: the halt-aware view, forwarded from the shared computation in
         // phase-locator. Additive — `incomplete_plans`/`incomplete_count` above keep
         // their exact name, type and semantics. Without this passthrough the shared
@@ -930,9 +1031,14 @@ function cmdInitPlanPhase(cwd, phase, raw, options = {}) {
             has_reviews: false,
         };
     });
-    const reqMatch = roadmapPhase?.['section']?.match(REQUIREMENTS_HEADER_RE);
-    const reqExtracted = reqMatch
-        ? reqMatch[1].replace(/[\[\]]/g, '').split(',').map((s) => s.trim()).filter(Boolean).join(', ')
+    // #4731: multiline-aware — the Requirements field may hard-wrap, so the
+    // value is extracted past the line break before the ID scan.
+    const phaseSection = roadmapPhase?.['section'];
+    const reqLine = phaseSection
+        ? roadmapParser.extractPhaseFieldMultiline(phaseSection, 'Requirements')
+        : null;
+    const reqExtracted = reqLine
+        ? reqLine.replace(/[\[\]]/g, '').split(',').map((s) => s.trim()).filter(Boolean).join(', ')
         : null;
     const phase_req_ids = reqExtracted && reqExtracted !== 'TBD' ? reqExtracted : null;
     const phaseDirPlan = phaseInfo?.['directory'] || null;
@@ -952,6 +1058,8 @@ function cmdInitPlanPhase(cwd, phase, raw, options = {}) {
     }
     const granularityOverride = options['granularity'];
     assertValidGranularityOverride(granularityOverride, error);
+    // #4683: computed once — see the threat_id_duplicates fields in the payload.
+    const threatIdDuplicatesPlan = findDuplicateThreatIds(cwd, phaseDirPlan);
     const granularity = resolveGranularityInternal(cwd, 'planning', granularityOverride || undefined);
     // #3188: see cmdInitExecutePhase — null when absent, parity with the
     // conditional sibling fields in this same result object.
@@ -983,8 +1091,10 @@ function cmdInitPlanPhase(cwd, phase, raw, options = {}) {
         phase_slug: phaseInfo?.['phase_slug'] || null,
         padded_phase: phaseNumberPlan ? normalizePhaseName(phaseNumberPlan) : null,
         phase_req_ids,
+        // #5060: Phase Status Module — the single owner of "what state is phase P
+        // in?" (ADR-5057 §1/§2).
         phase_status: phaseDirPlan
-            ? determinePhaseStatus(phaseInfo?.['plans']?.length || 0, phaseInfo?.['summaries']?.length || 0, node_path_1.default.join(cwd, phaseDirPlan), 'Pending')
+            ? (0, phase_status_cjs_1.toDisplayLabel)((0, phase_status_cjs_1.phaseStatus)(node_path_1.default.join(cwd, phaseDirPlan), { convention: resolvePhaseIdConvention(cwd) }).value.status, { pendingWord: 'Pending' })
             : 'Pending',
         has_research: phaseInfo?.['has_research'] || false,
         has_context: phaseInfo?.['has_context'] || false,
@@ -996,6 +1106,11 @@ function cmdInitPlanPhase(cwd, phase, raw, options = {}) {
         has_reviews: phaseInfo?.['has_reviews'] || false,
         has_plans: (phaseInfo?.['plans']?.length || 0) > 0,
         plan_count: phaseInfo?.['plans']?.length || 0,
+        // #4683: the same cross-plan threat-ID duplicate list execute-phase gates
+        // on, surfaced at PLAN time so the checker/reviewer catches the collision
+        // before the plans are approved — not just before execution.
+        threat_id_duplicates: threatIdDuplicatesPlan,
+        threat_id_duplicate_count: threatIdDuplicatesPlan.length,
         planning_exists: node_fs_1.default.existsSync(planningDir(cwd)),
         roadmap_exists: node_fs_1.default.existsSync(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md')),
         // #2376: absolute — see comment on phase_dir above.
@@ -1176,12 +1291,15 @@ function buildInitCompletenessFields(cwd) {
 }
 function cmdInitNewProject(cwd, raw, options = {}) {
     const config = loadConfig(cwd);
-    const homedir = node_os_1.default.homedir();
-    const braveKeyFile = node_path_1.default.join(homedir, '.gsd', 'brave_api_key');
+    // #4976: probe the GSD-owned store the config loader resolves
+    // (`GSD_HOME || homedir()`), so these flags agree with config-new-project's
+    // key probes in the same /gsd-new-project run.
+    const gsdHome = process.env['GSD_HOME'] || node_os_1.default.homedir();
+    const braveKeyFile = node_path_1.default.join(gsdHome, '.gsd', 'brave_api_key');
     const hasBraveSearch = !!(process.env['BRAVE_API_KEY'] || node_fs_1.default.existsSync(braveKeyFile));
-    const firecrawlKeyFile = node_path_1.default.join(homedir, '.gsd', 'firecrawl_api_key');
+    const firecrawlKeyFile = node_path_1.default.join(gsdHome, '.gsd', 'firecrawl_api_key');
     const hasFirecrawl = !!(process.env['FIRECRAWL_API_KEY'] || node_fs_1.default.existsSync(firecrawlKeyFile));
-    const exaKeyFile = node_path_1.default.join(homedir, '.gsd', 'exa_api_key');
+    const exaKeyFile = node_path_1.default.join(gsdHome, '.gsd', 'exa_api_key');
     const hasExaSearch = !!(process.env['EXA_API_KEY'] || node_fs_1.default.existsSync(exaKeyFile));
     const hasCode = hasCodeFilesInternal(cwd);
     const hasPackageFile = hasPackageFileInternal(cwd);
@@ -1336,7 +1454,7 @@ function cmdInitNewMilestone(cwd, raw, options = {}) {
     // would otherwise silently delete a stale/invalid pointer as a side effect
     // of building a JSON report field, and (per #3579) could change what a
     // LATER resolution in the same process observes.
-    const resolvedWorkstream = process.env['GSD_WORKSTREAM'] || peekActiveWorkstream(cwd);
+    const resolvedWorkstream = resolveEnvWorkstream() ?? peekActiveWorkstream(cwd);
     const workstreamActive = !!resolvedWorkstream;
     const flatMode = !workstreamActive;
     // #2992 (Phase 6.1): additive, optional field — degrades to null, never throws.
@@ -1541,9 +1659,21 @@ function cmdInitVerifyWork(cwd, phase, raw) {
         };
     });
     const phaseDir = phaseInfo?.['directory'] || null;
-    const planCount = phaseInfo?.['plans']?.length || 0;
-    const summaryCount = phaseInfo?.['summaries']?.length || 0;
-    const completion = buildPhaseCompletionProjection(cwd, phaseInfo?.['phase_number'] || phase, phaseDir, planCount, summaryCount, _slashRuntime);
+    // #5060: Phase Status Module — matched counts from the §7.5 owner
+    // (scanPhasePlans via phaseStatus), not phaseInfo's raw plans/summaries
+    // arrays, so this projection's counts agree with buildPhaseCompletionProjection's
+    // own isPhaseComplete call below (see the convention thread there).
+    const verifyWorkConvention = resolvePhaseIdConvention(cwd);
+    const verifyWorkPs = phaseDir
+        ? (0, phase_status_cjs_1.phaseStatus)(node_path_1.default.join(cwd, phaseDir), { convention: verifyWorkConvention })
+        : null;
+    const planCount = verifyWorkPs
+        ? verifyWorkPs.value.planCount
+        : phaseInfo?.['plans']?.length || 0;
+    const summaryCount = verifyWorkPs
+        ? verifyWorkPs.value.summaryCount
+        : phaseInfo?.['summaries']?.length || 0;
+    const completion = buildPhaseCompletionProjection(cwd, phaseInfo?.['phase_number'] || phase, phaseDir, planCount, summaryCount, _slashRuntime, verifyWorkConvention);
     const uatReport = phaseDir
         ? evaluateUatPassed(node_path_1.default.join(cwd, phaseDir), {
             policy: { requireVerification: true },
@@ -2217,6 +2347,12 @@ function cmdInitTodos(cwd, area, raw) {
 function cmdInitMilestoneOp(cwd, raw) {
     const config = loadConfig(cwd);
     const milestone = milestoneRecord(cwd);
+    // #5060: Phase Status Module — the single owner of "what state is phase P
+    // in?" (ADR-5057 §1/§2). A phase counts as completed only when the ladder
+    // itself says COMPLETE, not "has any *-SUMMARY.md" (a counts-only verdict
+    // that bypasses isPhaseComplete and disagrees with every other completion
+    // consumer on a stale `passed` report).
+    const milestoneOpConvention = resolvePhaseIdConvention(cwd);
     let phaseCount = 0;
     let completedPhases = 0;
     const phasesDir = node_path_1.default.join(planningDir(cwd), 'phases');
@@ -2225,14 +2361,16 @@ function cmdInitMilestoneOp(cwd, raw) {
         const roadmapPath = node_path_1.default.join(planningDir(cwd), 'ROADMAP.md');
         const roadmapRaw = node_fs_1.default.readFileSync(roadmapPath, 'utf-8');
         const currentSection = extractCurrentMilestone(roadmapRaw, cwd);
-        // #1729: `(?:\s*\([^)\n]{0,200}\))?` tolerates a pre-colon ( ) tag (literal mirror of OPTIONAL_PHASE_TAG_SOURCE).
-        const phasePattern = new RegExp(`#{2,4}\\s*Phase\\s+(${PHASE_NUMBER_TOKEN_SOURCE})(?:\\s*\\([^)\\n]{0,200}\\))?\\s*:`, 'gi');
+        // #1729: `(?:\s*\([^)\n]{0,200}\))?` tolerates a pre-colon ( ) tag, owned by
+        // buildPhaseHeadingScanRegex (phase-id.cts) so this scan also recognizes
+        // bracket-convention headings instead of hand-rolling a literal `Phase\s+`.
+        const { regex: phasePattern, phaseNumGroup } = buildPhaseHeadingScanRegex(PHASE_HEADING_BASELINE.ANY_BRACKET, milestoneOpConvention);
         let m;
         while ((m = phasePattern.exec(currentSection)) !== null) {
             // #3185: canonical sentinel predicate (SENTINEL_RANGES [0,999]) — this was a local 999-only literal that admitted Phase 0.
-            if (isSentinelPhaseId(m[1]))
+            if (isSentinelPhaseId(m[phaseNumGroup]))
                 continue;
-            roadmapPhaseNumbers.push(m[1]);
+            roadmapPhaseNumbers.push(m[phaseNumGroup]);
         }
     }
     catch {
@@ -2267,8 +2405,8 @@ function cmdInitMilestoneOp(cwd, raw) {
             if (!dirName)
                 continue;
             try {
-                const hasSummary = listPhaseSummaryFiles(node_path_1.default.join(phasesDir, dirName)).length > 0;
-                if (hasSummary)
+                const isComplete = (0, phase_status_cjs_1.phaseStatus)(node_path_1.default.join(phasesDir, dirName), { convention: milestoneOpConvention }).value.status === phase_status_cjs_1.PHASE_STATUS.COMPLETE;
+                if (isComplete)
                     completedPhases++;
             }
             catch {
@@ -2287,8 +2425,8 @@ function cmdInitMilestoneOp(cwd, raw) {
             phaseCount = dirs.length;
             for (const dir of dirs) {
                 try {
-                    const hasSummary = listPhaseSummaryFiles(node_path_1.default.join(phasesDir, dir)).length > 0;
-                    if (hasSummary)
+                    const isComplete = (0, phase_status_cjs_1.phaseStatus)(node_path_1.default.join(phasesDir, dir), { convention: milestoneOpConvention }).value.status === phase_status_cjs_1.PHASE_STATUS.COMPLETE;
+                    if (isComplete)
                         completedPhases++;
                 }
                 catch {
@@ -2375,6 +2513,10 @@ function cmdInitManager(cwd, raw) {
     const config = loadConfig(cwd);
     const milestone = milestoneRecord(cwd);
     const _slashRuntime = (0, runtime_slash_cjs_1.resolveRuntime)(cwd);
+    const phaseIdConvention = resolvePhaseIdConvention(cwd);
+    const capturesBracketId = phaseIdConvention === 'bracket';
+    const phaseHeadingPrefix = phaseHeadingPrefixSrcFor(PHASE_HEADING_BASELINE.LABEL_ONLY, phaseIdConvention, capturesBracketId);
+    const phaseHeadingPrefixNoCapture = phaseHeadingPrefixSrcFor(PHASE_HEADING_BASELINE.LABEL_ONLY, phaseIdConvention);
     const paths = planningPaths(cwd);
     if (!node_fs_1.default.existsSync(paths.roadmap)) {
         error(`No ROADMAP.md found. Run ${(0, runtime_slash_cjs_1.formatGsdSlash)('new-milestone', _slashRuntime)} first.`);
@@ -2384,39 +2526,61 @@ function cmdInitManager(cwd, raw) {
     }
     const rawContent = node_fs_1.default.readFileSync(paths.roadmap, 'utf-8');
     const content = extractCurrentMilestone(rawContent, cwd);
-    const phasesDir = paths.phases;
     // #3185 (ADR-3180 Decision 1): "which phase directories belong to the
     // CURRENT milestone" is the scoped question listMilestonePhaseDirs owns —
     // routed through it instead of a hand-rolled readdirSync + a separate
     // getMilestonePhaseFilter window check (which also never excluded
     // sentinels, unlike the owner).
-    const _phaseDirEntries = listMilestonePhaseDirs(phasesDir, { cwd }).value;
     const _checkboxStates = new Map();
-    const _cbPattern = new RegExp(`-\\s*\\[(x| )\\]\\s*.*Phase\\s+(${PHASE_NUMBER_TOKEN_SOURCE})[:\\s]`, 'gi');
+    // #4982: anchored (`^`, `m`) so the phase label must be the FIRST thing
+    // after the checkbox (tolerating only an optional `**` bold marker) —
+    // the prior unanchored `\s*.*` let the greedy `.*` bind to the LAST
+    // "Phase N" mentioned anywhere in the line's prose instead of the line's
+    // own phase. First-match-wins (`if (!_checkboxStates.has(...))` below)
+    // additionally guards against a later anchored line (e.g. a per-plan
+    // sub-entry self-titled "Phase N ...") overwriting an already-recorded
+    // phase's own (first) checkbox — anchoring alone does not fully close
+    // that "last-match-wins" composition defect.
+    const _cbPattern = new RegExp(`^[ \\t]*-[ \\t]*\\[(x| )\\][ \\t]*(?:\\*\\*)?${phaseHeadingPrefix}(${PHASE_NUMBER_TOKEN_SOURCE})[:\\s]`, 'gim');
     let _cbMatch;
     while ((_cbMatch = _cbPattern.exec(content)) !== null) {
-        _checkboxStates.set(_cbMatch[2], _cbMatch[1].toLowerCase() === 'x');
+        const phaseGroup = capturesBracketId ? 3 : 2;
+        const _cbKey = _cbMatch[phaseGroup];
+        if (!_checkboxStates.has(_cbKey)) {
+            _checkboxStates.set(_cbKey, _cbMatch[1].toLowerCase() === 'x');
+        }
     }
     // #1729: `(?:\s*\([^)\n]{0,200}\))?` tolerates a pre-colon ( ) tag (literal mirror of OPTIONAL_PHASE_TAG_SOURCE).
-    const phasePattern = new RegExp(`#{2,4}\\s*Phase\\s+(${PHASE_NUMBER_TOKEN_SOURCE})(?:\\s*\\([^)\\n]{0,200}\\))?\\s*:\\s*([^\\n]+)`, 'gi');
+    const phasePattern = new RegExp(`#{2,4}\\s*${phaseHeadingPrefix}(${PHASE_NUMBER_TOKEN_SOURCE})(?:\\s*\\([^)\\n]{0,200}\\))?\\s*:\\s*([^\\n]+)`, 'gi');
     const phases = [];
     let match;
     while ((match = phasePattern.exec(content)) !== null) {
-        const phaseNum = match[1];
-        const phaseName = match[2].replace(/\(INSERTED\)/i, '').trim();
+        const bracketId = capturesBracketId ? match[1] : undefined;
+        const phaseNum = capturesBracketId ? match[2] : match[1];
+        const phaseName = (capturesBracketId ? match[3] : match[2])
+            .replace(/\(INSERTED\)/i, '')
+            .trim();
+        let displayId;
+        if (bracketId) {
+            try {
+                displayId = renderPhaseId(parsePhaseId(`${bracketId}-${phaseNum}`));
+            }
+            catch {
+                // The bracket selector is deliberately read-tolerant. If a heading is
+                // non-canonical, retain the manager row without fabricating display_id.
+            }
+        }
         const sectionStart = match.index;
         const restOfContent = content.slice(sectionStart);
-        const nextHeader = restOfContent.match(/\n#{2,4}\s+Phase\s+\d[\d.]*/i);
+        const nextHeader = restOfContent.match(new RegExp(`\\n#{2,4}\\s+${phaseHeadingPrefixNoCapture}\\d[\\d.]*`, 'i'));
         const sectionEnd = nextHeader
             ? sectionStart + nextHeader.index
             : content.length;
         const section = content.slice(sectionStart, sectionEnd);
-        const goalMatch = section.match(/\*\*Goal(?::\*\*|\*\*:)\s*([^\n]+)/i);
-        const goal = goalMatch ? goalMatch[1].trim() : null;
+        const goal = roadmapParser.extractPhaseFieldMultiline(section, 'Goal');
         const dependsMatch = section.match(/\*\*Depends on(?::\*\*|\*\*:)\s*([^\n]+)/i);
         const depends_on = dependsMatch ? dependsMatch[1].trim() : null;
-        const normalized = normalizePhaseName(phaseNum);
-        let diskStatus = 'no_directory';
+        let diskStatus = phase_status_cjs_1.DISK_STATUS.NO_DIRECTORY;
         let planCount = 0;
         let summaryCount = 0;
         let hasContext = false;
@@ -2426,16 +2590,25 @@ function cmdInitManager(cwd, raw) {
         // #4014 (epic #3473 B4-unreadable): default COMPLETE — no directory at
         // all (dirMatch not found) is a genuine, not-unreadable answer.
         let contextScope = SCOPE.COMPLETE;
-        let completion = buildPhaseCompletionProjection(cwd, phaseNum, null, planCount, summaryCount, _slashRuntime);
+        let completion = buildPhaseCompletionProjection(cwd, phaseNum, null, planCount, summaryCount, _slashRuntime, phaseIdConvention);
         try {
-            // #3185 (ADR-3180 Decision 2) moved this lookup off the
-            // milestone-scoped set and onto the physical one; that scope choice is
-            // kept. Only the matcher is this PR's: matchPhaseDirs resolves
-            // digit-leading directory names the token predicate cannot (#2528).
-            const dirMatch = matchPhaseDirs(_phaseDirEntries, normalized).matches[0];
+            // #4801: resolve through the canonical locator instead of a private
+            // current-milestone-only scan. findPhaseInternal searches the live
+            // .planning/phases directory FIRST (same set the retired
+            // matchPhaseDirs/_phaseDirEntries pair scanned — the #3185 physical-dir
+            // scope choice is inherited by the locator's live arm) and then falls
+            // back through listArchiveVersionDirs (workstream-scoped, #2855), so an
+            // ARCHIVED phase directory with a passing verification resolves instead
+            // of reporting no_directory/phase_complete:false. Five other init
+            // commands already route through this same primitive; this was the
+            // holdout private copy (#4793-family declared-owner drift).
+            const located = findPhaseInternal(cwd, phaseNum, phaseIdConvention);
+            const dirMatch = located && located['found']
+                ? node_path_1.default.posix.basename(String(located['directory']))
+                : null;
             if (dirMatch) {
-                const fullDir = node_path_1.default.join(phasesDir, dirMatch);
-                const phaseDirRel = toPosixPath(node_path_1.default.relative(cwd, fullDir));
+                const fullDir = node_path_1.default.join(cwd, String(located['directory']));
+                const phaseDirRel = String(located['directory']);
                 // #4014 (epic #3473 B4-unreadable): this whole block used to swallow
                 // ANY readdirSync failure below into the bare `catch { /* empty */ }`
                 // at the bottom — an unreadable phase directory reported the exact
@@ -2448,8 +2621,11 @@ function cmdInitManager(cwd, raw) {
                 // only, the failure control-flow is untouched.
                 contextScope = findContextMdIn(fullDir).scope;
                 const phaseFiles = node_fs_1.default.readdirSync(fullDir);
-                planCount = listPhasePlanFiles(fullDir).length;
-                summaryCount = listPhaseSummaryFiles(fullDir).length;
+                // #5060: Phase Status Module — the single owner of "what state is
+                // phase P in?" (ADR-5057 §1/§2).
+                const ps = (0, phase_status_cjs_1.phaseStatus)(fullDir, { convention: phaseIdConvention });
+                planCount = ps.value.planCount;
+                summaryCount = ps.value.summaryCount;
                 // #3511-class: scope the raw listing to THIS phase's own artifacts
                 // before the hasContext/hasResearch predicates run, so a stray
                 // cross-phase `-CONTEXT.md`/`-RESEARCH.md` sitting in this directory
@@ -2457,21 +2633,8 @@ function cmdInitManager(cwd, raw) {
                 const scopedFiles = scopeToPhase(phaseFiles, dirMatch);
                 hasContext = findContextMdIn(scopedFiles) !== null;
                 hasResearch = scopedFiles.some((f) => f.endsWith('-RESEARCH.md') || f === 'RESEARCH.md');
-                completion = buildPhaseCompletionProjection(cwd, phaseNum, phaseDirRel, planCount, summaryCount, _slashRuntime);
-                if (completion.phase_complete)
-                    diskStatus = 'complete';
-                else if (completion.implementation_complete)
-                    diskStatus = 'executed';
-                else if (summaryCount > 0)
-                    diskStatus = 'partial';
-                else if (planCount > 0)
-                    diskStatus = 'planned';
-                else if (hasResearch)
-                    diskStatus = 'researched';
-                else if (hasContext)
-                    diskStatus = 'discussed';
-                else
-                    diskStatus = 'empty';
+                completion = buildPhaseCompletionProjection(cwd, phaseNum, phaseDirRel, planCount, summaryCount, _slashRuntime, phaseIdConvention);
+                diskStatus = (0, phase_status_cjs_1.toDiskStatus)(ps.value.status, { hasResearch, hasContext });
                 const nowMs = clock_cjs_1.realClock.now();
                 let newestMtime = 0;
                 for (const f of phaseFiles) {
@@ -2509,6 +2672,7 @@ function cmdInitManager(cwd, raw) {
         const roadmapComplete = _checkboxStates.get(phaseNum) || false;
         phases.push({
             number: phaseNum,
+            ...(displayId ? { display_id: displayId } : {}),
             name: phaseName,
             goal,
             depends_on,
@@ -2549,7 +2713,7 @@ function cmdInitManager(cwd, raw) {
         .filter((p) => p['phase_complete'] === true)
         .map((p) => normalizePhaseNumber(p['number'])));
     const phaseMap = new Map(phases.map((p) => [normalizePhaseNumber(p['number']), p]));
-    const _allCompletedPattern = new RegExp(`-\\s*\\[x\\]\\s*.*Phase\\s+(${PHASE_NUMBER_TOKEN_SOURCE})[:\\s]`, 'gi');
+    const _allCompletedPattern = new RegExp(`-\\s*\\[x\\]\\s*.*${phaseHeadingPrefixNoCapture}(${PHASE_NUMBER_TOKEN_SOURCE})[:\\s]`, 'gi');
     let _allMatch;
     while ((_allMatch = _allCompletedPattern.exec(rawContent)) !== null) {
         const phaseNum = normalizePhaseNumber(_allMatch[1]);
@@ -2575,13 +2739,47 @@ function cmdInitManager(cwd, raw) {
     function hasDepRelationship(numA, numB) {
         return reaches(numA, numB) || reaches(numB, numA);
     }
+    // #4764: a phase reference in depends_on prose is a PHASE-SHAPED token in
+    // context — directly following "Phase"/"Phases" — never a bare digit run.
+    // The previous whole-field scrape matched the token grammar against every
+    // digit run, so calendar dates ("2026-09-14" → 2026, 09, 14), git shas
+    // ("8bf403100d" → 8b, 403100d, …), bracketed ledger ids (WINDOWS #1843) and
+    // the row's OWN number all became "dependencies", and deps_satisfied came
+    // back false for phases whose prose declares none (50 of 92 phases in the
+    // reporter's milestone). The anchored grammar (owned by phase-id.cts as
+    // PHASE_DEP_REF_SOURCE, shared with planning-inspect's dependencies) keeps
+    // lists fully extracted ("Phases 601 and 602", "Phase 601, 602, and 603",
+    // "Phase 1-3") — silently dropping a REAL dependency would clear
+    // deps_satisfied prematurely, the dangerous direction. Negation prose
+    // ("dropped the dependency on Phase 654") is NOT detected: the issue's own
+    // minimum keeps such tokens.
+    const depPhaseRefRe = new RegExp(`${PHASE_DEP_REF_SOURCE}`, 'gi');
+    const depTokenRe = new RegExp(`${PHASE_NUMBER_TOKEN_SOURCE}`, 'gi');
     for (const phase of phases) {
         if (!phase['depends_on'] ||
             /^none$/i.test(phase['depends_on'].trim())) {
             phase['deps_satisfied'] = true;
         }
         else {
-            const depNums = phase['depends_on'].match(new RegExp(`${PHASE_NUMBER_TOKEN_SOURCE}`, 'gi')) || [];
+            const prose = phase['depends_on'];
+            const ownNumber = normalizePhaseNumber(phase['number']);
+            const depNums = [];
+            const seen = new Set();
+            let refMatch;
+            depPhaseRefRe.lastIndex = 0;
+            while ((refMatch = depPhaseRefRe.exec(prose)) !== null) {
+                let tok;
+                depTokenRe.lastIndex = 0;
+                while ((tok = depTokenRe.exec(refMatch[1])) !== null) {
+                    const normalized = normalizePhaseNumber(tok[0]);
+                    if (normalized === ownNumber)
+                        continue; // #4764: never the row's own phase
+                    if (seen.has(normalized))
+                        continue;
+                    seen.add(normalized);
+                    depNums.push(tok[0]);
+                }
+            }
             phase['deps_satisfied'] = depNums.every((n) => completedNums.has(normalizePhaseNumber(n)));
             phase['dep_phases'] = depNums;
         }
@@ -2594,7 +2792,7 @@ function cmdInitManager(cwd, raw) {
     }
     for (const phase of phases) {
         phase['is_next_to_discuss'] =
-            (phase['disk_status'] === 'empty' || phase['disk_status'] === 'no_directory') &&
+            (phase['disk_status'] === phase_status_cjs_1.DISK_STATUS.EMPTY || phase['disk_status'] === phase_status_cjs_1.DISK_STATUS.NO_DIRECTORY) &&
                 phase['deps_satisfied'];
     }
     let waitingSignal = null;
@@ -2616,12 +2814,12 @@ function cmdInitManager(cwd, raw) {
     }
     const recommendedActions = [];
     for (const phase of phases) {
-        if (phase['disk_status'] === 'complete')
+        if (phase['disk_status'] === phase_status_cjs_1.DISK_STATUS.COMPLETE)
             continue;
         // #3185: canonical sentinel predicate (SENTINEL_RANGES [0,999]) — this was a local 999-only literal that admitted Phase 0.
         if (isSentinelPhaseId(phase['number']))
             continue;
-        if (phase['disk_status'] === 'executed') {
+        if (phase['disk_status'] === phase_status_cjs_1.DISK_STATUS.EXECUTED) {
             recommendedActions.push({
                 phase: phase['number'],
                 phase_name: phase['name'],
@@ -2630,7 +2828,7 @@ function cmdInitManager(cwd, raw) {
                 command: phase['verification_next_command'],
             });
         }
-        else if (phase['disk_status'] === 'planned' && phase['deps_satisfied']) {
+        else if (phase['disk_status'] === phase_status_cjs_1.DISK_STATUS.PLANNED && phase['deps_satisfied']) {
             recommendedActions.push({
                 phase: phase['number'],
                 phase_name: phase['name'],
@@ -2639,8 +2837,8 @@ function cmdInitManager(cwd, raw) {
                 command: `${(0, runtime_slash_cjs_1.formatGsdSlash)('execute-phase', _slashRuntime)} ${phase['number']}`,
             });
         }
-        else if (phase['disk_status'] === 'discussed' ||
-            phase['disk_status'] === 'researched') {
+        else if (phase['disk_status'] === phase_status_cjs_1.DISK_STATUS.DISCUSSED ||
+            phase['disk_status'] === phase_status_cjs_1.DISK_STATUS.RESEARCHED) {
             recommendedActions.push({
                 phase: phase['number'],
                 phase_name: phase['name'],
@@ -2649,7 +2847,7 @@ function cmdInitManager(cwd, raw) {
                 command: `${(0, runtime_slash_cjs_1.formatGsdSlash)('plan-phase', _slashRuntime)} ${phase['number']}`,
             });
         }
-        else if ((phase['disk_status'] === 'empty' || phase['disk_status'] === 'no_directory') &&
+        else if ((phase['disk_status'] === phase_status_cjs_1.DISK_STATUS.EMPTY || phase['disk_status'] === phase_status_cjs_1.DISK_STATUS.NO_DIRECTORY) &&
             phase['is_next_to_discuss']) {
             recommendedActions.push({
                 phase: phase['number'],
@@ -2660,10 +2858,10 @@ function cmdInitManager(cwd, raw) {
             });
         }
     }
-    const activeExecuting = phases.filter((p) => p['disk_status'] === 'partial' ||
-        (p['disk_status'] === 'planned' && p['is_active']));
+    const activeExecuting = phases.filter((p) => p['disk_status'] === phase_status_cjs_1.DISK_STATUS.PARTIAL ||
+        (p['disk_status'] === phase_status_cjs_1.DISK_STATUS.PLANNED && p['is_active']));
     const activePlanning = phases.filter((p) => p['is_active'] &&
-        (p['disk_status'] === 'discussed' || p['disk_status'] === 'researched'));
+        (p['disk_status'] === phase_status_cjs_1.DISK_STATUS.DISCUSSED || p['disk_status'] === phase_status_cjs_1.DISK_STATUS.RESEARCHED));
     const filteredActions = recommendedActions.filter((action) => {
         if (action['action'] === 'execute' && activeExecuting.length > 0) {
             return activeExecuting.every((active) => !hasDepRelationship(action['phase'], active['number']));
@@ -2706,7 +2904,7 @@ function cmdInitManager(cwd, raw) {
         phases,
         phase_count: phases.length,
         completed_count: completedCount,
-        in_progress_count: phases.filter((p) => ['executed', 'partial', 'planned', 'discussed', 'researched'].includes(p['disk_status'])).length,
+        in_progress_count: phases.filter((p) => [phase_status_cjs_1.DISK_STATUS.EXECUTED, phase_status_cjs_1.DISK_STATUS.PARTIAL, phase_status_cjs_1.DISK_STATUS.PLANNED, phase_status_cjs_1.DISK_STATUS.DISCUSSED, phase_status_cjs_1.DISK_STATUS.RESEARCHED].includes(p['disk_status'])).length,
         recommended_actions: filteredActions,
         waiting_signal: waitingSignal,
         all_complete: completedCount === nonBacklogPhases.length && nonBacklogPhases.length > 0,
@@ -2921,7 +3119,7 @@ function cmdInitUpdate(cwd, raw, options = {}) {
 function cmdInitTransition(cwd, raw, options = {}) {
     // #3579 root-cause fix: read-only informational field — peek, don't
     // self-heal (see cmdInitNewMilestone's identical rationale above).
-    const resolvedWorkstream = process.env['GSD_WORKSTREAM'] || peekActiveWorkstream(cwd);
+    const resolvedWorkstream = resolveEnvWorkstream() ?? peekActiveWorkstream(cwd);
     const workstreamActive = !!resolvedWorkstream;
     const result = {
         other_active_workstreams: workstreamActive
@@ -3013,7 +3211,7 @@ function cmdInitProgress(cwd, raw, options = {}) {
     // non-mutating peek so an unresolvable pointer isn't self-healed (cleared)
     // here and then found "absent" by diagnoseUnresolvedActiveWorkstream below,
     // which would misreport a present-but-bad marker as no marker at all.
-    const _resolvedWorkstream = process.env['GSD_WORKSTREAM'] || peekActiveWorkstream(cwd);
+    const _resolvedWorkstream = resolveEnvWorkstream() ?? peekActiveWorkstream(cwd);
     if (_availableWorkstreams.length > 0 && !_resolvedWorkstream) {
         // #3579: getActiveWorkstream now inherits a pointer-less session's read
         // from the shared .planning/active-workstream marker, so reaching this
@@ -3040,17 +3238,50 @@ function cmdInitProgress(cwd, raw, options = {}) {
     const roadmapCheckboxStates = new Map();
     try {
         const roadmapContent = extractCurrentMilestone(node_fs_1.default.readFileSync(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md'), 'utf-8'), cwd);
-        // #1729: `(?:\s*\([^)\n]{0,200}\))?` tolerates a pre-colon ( ) tag (literal mirror of OPTIONAL_PHASE_TAG_SOURCE).
-        const headingPattern = new RegExp(`#{2,4}\\s*Phase\\s+(${PHASE_NUMBER_TOKEN_SOURCE})(?:\\s*\\([^)\\n]{0,200}\\))?\\s*:\\s*([^\\n]+)`, 'gi');
+        const progressConvention = resolvePhaseIdConvention(cwd);
+        // #1729: `(?:\s*\([^)\n]{0,200}\))?` tolerates a pre-colon ( ) tag, owned by
+        // buildPhaseHeadingScanRegex (phase-id.cts) so this scan also recognizes
+        // bracket-convention headings instead of hand-rolling a literal `Phase\s+`.
+        const { regex: headingPattern, phaseNumGroup: hNumGroup, phaseNameGroup: hNameGroup } = buildPhaseHeadingScanRegex(PHASE_HEADING_BASELINE.ANY_BRACKET, progressConvention);
         let hm;
         while ((hm = headingPattern.exec(roadmapContent)) !== null) {
-            roadmapPhaseNums.add(hm[1]);
-            roadmapPhaseNames.set(hm[1], hm[2].replace(/\(INSERTED\)/i, '').trim());
+            roadmapPhaseNums.add(hm[hNumGroup]);
+            roadmapPhaseNames.set(hm[hNumGroup], hm[hNameGroup].replace(/\(INSERTED\)/i, '').trim());
         }
-        const cbPattern = new RegExp(`-\\s*\\[(x| )\\]\\s*.*Phase\\s+(${PHASE_NUMBER_TOKEN_SOURCE})[:\\s]`, 'gi');
+        // #4906 Phase 5 (#4984): NOT migrated onto phaseHeadingPrefixSrcFor — same
+        // out-of-scope reasoning as roadmapPhaseMatchesExactPrefix/detectPhaseMvpMode
+        // above; a direct LABEL_ONLY selector call here would have added a third
+        // uncounted LABEL_ONLY consumer to init.cts's pinned
+        // tests/adr-612-bracket-heading-selection.test.cjs census.
+        // phase-id-owner: deliberately unmigrated (#4984 revert) — see comment above.
+        // #4982: anchored (`^`, `m`) — the phase label must be the FIRST thing
+        // after the checkbox (tolerating only an optional `**` bold marker) — so
+        // the greedy `.*` this replaces can no longer bind a line's checkbox to
+        // the LAST "Phase N" mentioned anywhere in that line's prose. This value
+        // feeds `roadmap_complete` AND directly gates next_phase/current_phase
+        // selection below, so getting the wrong phase here is load-bearing, not
+        // metadata-only (contrast the `_cbPattern` site in cmdInitManager).
+        // First-match-wins (`if (!roadmapCheckboxStates.has(...))`) additionally
+        // guards against a later anchored line (e.g. a per-plan sub-entry
+        // self-titled "Phase N ...") overwriting an already-recorded phase's own
+        // (first) checkbox — anchoring alone does not fully close that
+        // "last-match-wins" composition defect.
+        // `(?:\[[^\]\n]{0,200}\]\s*)?` tolerates an optional leading bracket tag
+        // (literal mirror of BASE_ANY_BRACKET_HEADING_PREFIX_SRC, phase-id.cts)
+        // BEFORE the literal "Phase" word — decoration tolerance only, no capture
+        // group, no convention gating. Without it the anchor fix above regresses
+        // a checklist line combining a bracket tag with literal "Phase N" wording
+        // (e.g. `**[GSD.02] Phase 3: ...**`), which the old unanchored `.*`
+        // matched (by absorbing the bracket text). This does NOT migrate the site
+        // onto phaseHeadingPrefixSrcFor / the bracket convention — that stays
+        // out of scope per the comment above (#4984 revert, pinned census).
+        const cbPattern = new RegExp(`^[ \\t]*-[ \\t]*\\[(x| )\\][ \\t]*(?:\\*\\*)?(?:\\[[^\\]\\n]{0,200}\\]\\s*)?Phase\\s+(${PHASE_NUMBER_TOKEN_SOURCE})[:\\s]`, 'gim');
         let cbm;
         while ((cbm = cbPattern.exec(roadmapContent)) !== null) {
-            roadmapCheckboxStates.set(cbm[2], cbm[1].toLowerCase() === 'x');
+            const cbKey = cbm[2];
+            if (!roadmapCheckboxStates.has(cbKey)) {
+                roadmapCheckboxStates.set(cbKey, cbm[1].toLowerCase() === 'x');
+            }
         }
     }
     catch {
@@ -3072,8 +3303,9 @@ function cmdInitProgress(cwd, raw, options = {}) {
             seenPhaseNums.add(phaseNumber.replace(/^0+/, '') || '0');
             const phasePath = node_path_1.default.join(phasesDir, dir);
             const phaseFiles = node_fs_1.default.readdirSync(phasePath);
-            const plans = listPhasePlanFiles(phasePath);
-            const summaries = listPhaseSummaryFiles(phasePath);
+            // #5060: Phase Status Module — the single owner of "what state is
+            // phase P in?" (ADR-5057 §1/§2).
+            const ps = (0, phase_status_cjs_1.phaseStatus)(phasePath, { convention: resolvePhaseIdConvention(cwd) });
             // #3511-class: scope the raw listing to THIS phase's own artifacts
             // before the hasResearch predicate runs, so a stray cross-phase
             // `-RESEARCH.md` sitting in this directory cannot win this phase's
@@ -3081,16 +3313,8 @@ function cmdInitProgress(cwd, raw, options = {}) {
             const scopedPhaseFiles = scopeToPhase(phaseFiles, dir);
             const hasResearch = scopedPhaseFiles.some((f) => f.endsWith('-RESEARCH.md') || f === 'RESEARCH.md');
             const phaseDirRel = toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'phases', dir)));
-            const completion = buildPhaseCompletionProjection(cwd, phaseNumber, phaseDirRel, plans.length, summaries.length, _slashRuntime);
-            const status = completion.phase_complete
-                ? 'complete'
-                : completion.implementation_complete
-                    ? 'executed'
-                    : plans.length > 0
-                        ? 'in_progress'
-                        : hasResearch
-                            ? 'researched'
-                            : 'pending';
+            const completion = buildPhaseCompletionProjection(cwd, phaseNumber, phaseDirRel, ps.value.planCount, ps.value.summaryCount, _slashRuntime, resolvePhaseIdConvention(cwd));
+            const status = (0, phase_status_cjs_1.toProgressStatus)(ps.value.status, { hasResearch });
             const phaseInfo = {
                 number: phaseNumber,
                 name: phaseName,
@@ -3099,30 +3323,37 @@ function cmdInitProgress(cwd, raw, options = {}) {
                 // above still joins it against cwd.
                 directory: toPosixPath(node_path_1.default.join(cwd, phaseDirRel)),
                 status,
-                plan_count: plans.length,
-                summary_count: summaries.length,
+                plan_count: ps.value.planCount,
+                summary_count: ps.value.summaryCount,
                 has_research: hasResearch,
                 ...completion,
             };
             phases.push(phaseInfo);
-            if (!currentPhase && (status === 'executed' || status === 'in_progress' || status === 'researched')) {
+            if (!currentPhase && (status === phase_status_cjs_1.PROGRESS_STATUS.EXECUTED || status === phase_status_cjs_1.PROGRESS_STATUS.IN_PROGRESS || status === phase_status_cjs_1.PROGRESS_STATUS.RESEARCHED)) {
                 currentPhase = phaseInfo;
             }
-            if (!nextPhase && status === 'pending') {
+            if (!nextPhase && status === phase_status_cjs_1.PROGRESS_STATUS.PENDING) {
                 nextPhase = phaseInfo;
             }
         }
     }
-    catch {
-        /* intentionally empty */
+    catch (err) {
+        // #5118: the owner's out-of-set report error is not a scan failure to
+        // degrade over — the bundle is never assembled over a refused report.
+        if (err instanceof VerificationStatusError)
+            throw err;
+        /* otherwise intentionally empty */
     }
     for (const [num, name] of roadmapPhaseNames) {
         const stripped = num.replace(/^0+/, '') || '0';
         if (!seenPhaseNums.has(stripped)) {
             const checkboxComplete = roadmapCheckboxStates.get(num) === true ||
                 roadmapCheckboxStates.get(stripped) === true;
-            const completion = buildPhaseCompletionProjection(cwd, num, null, 0, 0, _slashRuntime);
-            const status = 'not_started';
+            const completion = buildPhaseCompletionProjection(cwd, num, null, 0, 0, _slashRuntime, resolvePhaseIdConvention(cwd));
+            // #5060: this synthetic row has no phase directory at all — the
+            // roadmap heading exists but no `seenPhaseNums` disk match was found —
+            // so it is the ladder's own NOT_STARTED word, not a derived guess.
+            const status = phase_status_cjs_1.PROGRESS_STATUS.NOT_STARTED;
             const phaseInfo = {
                 number: num,
                 // #3883 (ADR-3473 §8.3): delegate to the canonical slug formula
@@ -3159,7 +3390,7 @@ function cmdInitProgress(cwd, raw, options = {}) {
     {
         const frontier = phases.find((p) => {
             const st = p['status'];
-            return (st === 'pending' || st === 'not_started') && p['roadmap_complete'] !== true;
+            return (st === phase_status_cjs_1.PROGRESS_STATUS.PENDING || st === phase_status_cjs_1.PROGRESS_STATUS.NOT_STARTED) && p['roadmap_complete'] !== true;
         });
         if (frontier)
             nextPhase = frontier;
@@ -3196,8 +3427,8 @@ function cmdInitProgress(cwd, raw, options = {}) {
         milestone_name: milestone['name'] ?? null,
         phases,
         phase_count: phases.length,
-        completed_count: phases.filter((p) => p['status'] === 'complete').length,
-        in_progress_count: phases.filter((p) => ['executed', 'in_progress'].includes(p['status'])).length,
+        completed_count: phases.filter((p) => p['status'] === phase_status_cjs_1.PROGRESS_STATUS.COMPLETE).length,
+        in_progress_count: phases.filter((p) => [phase_status_cjs_1.PROGRESS_STATUS.EXECUTED, phase_status_cjs_1.PROGRESS_STATUS.IN_PROGRESS].includes(p['status'])).length,
         current_phase: currentPhase,
         next_phase: nextPhase,
         paused_at: pausedAt,
@@ -3789,10 +4020,11 @@ function buildSkillManifest(cwd, skillsDir = null) {
             seenNamesInRoot.add(name);
             const description = frontmatter['description'] || '';
             const triggers = [];
-            const bodyMatch = content.match(/^---[\s\S]*?---\s*\r?\n([\s\S]*)$/);
-            if (bodyMatch) {
-                const body = bodyMatch[1];
-                const triggerLines = body.match(/^TRIGGER\s+when:\s*(.+)$/gmi);
+            // TRIGGER lines are read from the body after the block `extractFrontmatter` read (the
+            // one fence owner), so a `---` inside a frontmatter value cannot start the body early.
+            const block = frontmatterBlock(content);
+            if (block) {
+                const triggerLines = block.rest.match(/^TRIGGER\s+when:\s*(.+)$/gmi);
                 if (triggerLines) {
                     for (const line of triggerLines) {
                         const m = line.match(/^TRIGGER\s+when:\s*(.+)$/i);