@opengsd/gsd-core 1.7.0-rc.6 → 1.8.0

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

@@ -522,6 +522,27 @@ const FRONTMATTER_SCHEMAS = {
     summary: { required: ['phase', 'plan', 'subsystem', 'tags', 'duration', 'completed'] },
     verification: { required: ['phase', 'verified', 'status', 'score'] },
 };
+/**
+ * Strip ALL frontmatter blocks from the start of `content`.
+ *
+ * Handles CRLF line endings and multiple stacked blocks (corruption
+ * recovery): greedily strips consecutive `---...---` blocks separated by
+ * optional whitespace, so a doubled/tripled frontmatter header (e.g. from a
+ * botched merge) is fully removed, not just the first block.
+ *
+ * Canonical home for this primitive (#2143 audit dedup): previously
+ * duplicated byte-identically in both `state.cts` and `state-transition.cts`.
+ */
+function stripFrontmatter(content) {
+    let result = content;
+    while (true) {
+        const stripped = result.replace(/^\s*---\r?\n[\s\S]*?\r?\n---\s*/, '');
+        if (stripped === result)
+            break;
+        result = stripped;
+    }
+    return result;
+}
 function cmdFrontmatterGet(cwd, filePath, field, raw) {
     if (!filePath) {
         error('file path required');
@@ -654,6 +675,7 @@ module.exports = {
     parseFrontmatter: extractFrontmatter,
     reconstructFrontmatter,
     spliceFrontmatter,
+    stripFrontmatter,
     noOpObjectListSetError,
     parseMustHavesBlock,
     FRONTMATTER_SCHEMAS,

package/gsd-core/bin/lib/gap-checker.cjs

@@ -298,7 +298,16 @@ function runGapAnalysis(cwd, phaseDir, options = {}) {
         const mismatchMsg = '## Post-Planning Gap Analysis\n\nextracted 0 of N — possible format mismatch in CONTEXT.md decisions block.\n';
         // If there are also requirement items, include them in the return with the
         // mismatch summary appended, so the caller still sees requirement coverage.
-        if (items.length > 0) {
+        // #2334 HIGH 1: gate on `ghostReqIds.length > 0` too — identical defect to
+        // the one fixed at #2316-6b (~34 lines below, at the `items.length === 0`
+        // early return): a phase whose EVERY cited REQ-ID is unregistered has
+        // `items.length === 0` (all its requirement items were filtered out at
+        // ~line 297) but still has real ghost rows to report. Without this guard,
+        // a single malformed `<decisions>` line in CONTEXT.md made an all-ghost
+        // phase's ghost rows silently vanish (this could-not-parse branch fell
+        // through to the bare `mismatchMsg`-only return below, dropping ghost
+        // rows that the general path further down correctly surfaces).
+        if (items.length > 0 || ghostReqIds.length > 0) {
             const rows = sortRows([
                 ...detectCoverage(items, planText),
                 ...ghostReqIds.map(id => ({ source: 'REQUIREMENTS.md', item: id, status: 'Missing from REQUIREMENTS.md' })),
@@ -325,7 +334,13 @@ function runGapAnalysis(cwd, phaseDir, options = {}) {
         };
     }
     // #1365: if no items at all, surface a clean no-check message.
-    if (items.length === 0) {
+    // #2316-6b: this must NOT fire when `ghostReqIds` is non-empty — a phase
+    // whose EVERY cited REQ-ID is unregistered has `items.length === 0` (all
+    // its requirement items were filtered out at ~line 297) but still has real
+    // ghost rows to report below. Without this guard, an all-orphan phase
+    // reported LESS than a partially-orphan one (which falls through to the
+    // general path further down and correctly surfaces its ghost rows).
+    if (items.length === 0 && ghostReqIds.length === 0) {
         return {
             enabled: true,
             rows: [],

package/gsd-core/bin/lib/gsd2-import.cjs

@@ -26,6 +26,7 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const shell_command_projection_cjs_1 = require("./shell-command-projection.cjs");
 const runtime_slash_cjs_1 = require("./runtime-slash.cjs");
+const clock_cjs_1 = require("./clock.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const ioMod = require("./io.cjs");
 const { output } = ioMod;
@@ -276,7 +277,7 @@ function buildStateMd(phaseMap) {
     const status = currentEntry ? 'Ready to plan' : 'All phases complete';
     const filled = Math.round(pct / 10);
     const bar = `[${'█'.repeat(filled)}${'░'.repeat(10 - filled)}]`;
-    const today = new Date().toISOString().split('T')[0];
+    const today = clock_cjs_1.realClock.localToday();
     return [
         '# Project State',
         '',

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

@@ -13,6 +13,7 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_os_1 = __importDefault(require("node:os"));
 const shell_command_projection_cjs_1 = require("./shell-command-projection.cjs");
+const clock_cjs_1 = require("./clock.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports -- io.cjs is an export= CommonJS module
 const io = require("./io.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports -- config-loader.cjs is an export= CommonJS module
@@ -203,7 +204,7 @@ function getInitGitState(cwd) {
         }
         resolved = node_path_1.default.resolve(resolved);
         if (process.platform === 'win32') {
-            return resolved.replace(/\//g, '\\').toLowerCase();
+            return (0, shell_command_projection_cjs_1.toNativePath)(resolved).toLowerCase();
         }
         return resolved;
     };
@@ -213,7 +214,7 @@ function getInitGitState(cwd) {
         try {
             const prefixResult = (0, shell_command_projection_cjs_1.execGit)(['rev-parse', '--show-prefix'], { cwd, timeout: 5000 });
             if (prefixResult['exitCode'] === 0) {
-                const prefix = (typeof prefixResult['stdout'] === 'string' ? prefixResult['stdout'] : '').trim().replace(/\\/g, '/');
+                const prefix = (0, shell_command_projection_cjs_1.posixNormalize)((typeof prefixResult['stdout'] === 'string' ? prefixResult['stdout'] : '').trim());
                 inNestedSubdir = prefix.length > 0 && prefix !== '.' && prefix !== './';
                 resolvedByGitPrefix = true;
             }
@@ -230,7 +231,7 @@ function getInitGitState(cwd) {
                 }
                 else {
                     const rel = node_path_1.default.relative(rootNorm, cwdNorm);
-                    const relNorm = process.platform === 'win32' ? rel.replace(/\//g, '\\') : rel;
+                    const relNorm = (0, shell_command_projection_cjs_1.toNativePath)(rel);
                     inNestedSubdir =
                         relNorm !== '' &&
                             relNorm !== '.' &&
@@ -244,7 +245,7 @@ function getInitGitState(cwd) {
         }
     }
     if (inNestedSubdir && typeof worktreeRoot === 'string') {
-        const toComparableRaw = (p) => p.replace(/\\/g, '/').replace(/\/+$/g, '').toLowerCase();
+        const toComparableRaw = (p) => (0, shell_command_projection_cjs_1.posixNormalize)(p).replace(/\/+$/g, '').toLowerCase();
         if (toComparableRaw(worktreeRoot) === toComparableRaw(String(cwd))) {
             inNestedSubdir = false;
         }
@@ -304,7 +305,11 @@ function cmdInitExecutePhase(cwd, phase, raw, options = {}) {
         milestone_branch_template: config.milestone_branch_template,
         verifier_enabled: config.verifier,
         phase_found: !!phaseInfo,
-        phase_dir: phaseInfo?.['directory'] || null,
+        // #2376: absolute (anchored on cwd/project_root), not orchestrator-cwd-relative —
+        // a spawned subagent's own cwd may differ from the orchestrator's.
+        phase_dir: phaseInfo?.['directory']
+            ? toPosixPath(node_path_1.default.join(cwd, phaseInfo['directory']))
+            : null,
         phase_number: phaseInfo?.['phase_number'] || null,
         phase_name: phaseInfo?.['phase_name'] || null,
         phase_slug: phaseInfo?.['phase_slug'] || null,
@@ -330,9 +335,13 @@ function cmdInitExecutePhase(cwd, phase, raw, options = {}) {
         state_exists: node_fs_1.default.existsSync(node_path_1.default.join(planningDir(cwd), 'STATE.md')),
         roadmap_exists: node_fs_1.default.existsSync(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md')),
         config_exists: node_fs_1.default.existsSync(node_path_1.default.join(planningDir(cwd), 'config.json')),
-        state_path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'STATE.md'))),
-        roadmap_path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'ROADMAP.md'))),
-        config_path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'config.json'))),
+        // #2376: emit absolute paths — see comment above on phase_dir.
+        state_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'STATE.md')),
+        roadmap_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md')),
+        config_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'config.json')),
+        // #2376: execute-phase.md's verify_phase_goal step reads this instead of
+        // hardcoding '.planning/REQUIREMENTS.md' into the gsd-verifier spawn prompt.
+        requirements_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'REQUIREMENTS.md')),
     };
     if (options['validate']) {
         try {
@@ -404,7 +413,8 @@ function cmdInitPlanPhase(cwd, phase, raw, options = {}) {
         if (slug) {
             const prefix = rawProjectCodePlan ? `${rawProjectCodePlan}-` : '';
             const dirName = `${prefix}${paddedNum}-${slug}`;
-            expectedPhaseDirPlan = toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningPaths(cwd).phases, dirName)));
+            // #2376: absolute — see comment on phase_dir below.
+            expectedPhaseDirPlan = toPosixPath(node_path_1.default.join(planningPaths(cwd).phases, dirName));
         }
     }
     const granularityOverride = options['granularity'];
@@ -426,7 +436,10 @@ function cmdInitPlanPhase(cwd, phase, raw, options = {}) {
         auto_chain_active: !!(config._auto_chain_active),
         mode: config.mode || 'interactive',
         phase_found: !!phaseInfo,
-        phase_dir: phaseDirPlan,
+        // #2376: absolute (anchored on cwd/project_root) — path.join(cwd, phaseDirPlan)
+        // handed to a spawned subagent must resolve regardless of that subagent's own cwd.
+        // phaseDirPlan itself stays relative — phase_status below still joins it against cwd.
+        phase_dir: phaseDirPlan ? toPosixPath(node_path_1.default.join(cwd, phaseDirPlan)) : null,
         expected_phase_dir: expectedPhaseDirPlan,
         phase_number: phaseNumberPlan,
         phase_name: phaseNamePlan,
@@ -443,9 +456,10 @@ function cmdInitPlanPhase(cwd, phase, raw, options = {}) {
         plan_count: phaseInfo?.['plans']?.length || 0,
         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')),
-        state_path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'STATE.md'))),
-        roadmap_path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'ROADMAP.md'))),
-        requirements_path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'REQUIREMENTS.md'))),
+        // #2376: absolute — see comment on phase_dir above.
+        state_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'STATE.md')),
+        roadmap_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md')),
+        requirements_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'REQUIREMENTS.md')),
         patterns_path: null,
     };
     if (phaseInfo?.['directory']) {
@@ -454,27 +468,27 @@ function cmdInitPlanPhase(cwd, phase, raw, options = {}) {
             const files = node_fs_1.default.readdirSync(phaseDirFull);
             const contextFile = findContextMdIn(phaseDirFull);
             if (contextFile) {
-                result['context_path'] = toPosixPath(node_path_1.default.join(phaseInfo['directory'], contextFile));
+                result['context_path'] = toPosixPath(node_path_1.default.join(phaseDirFull, contextFile));
             }
             const researchFile = files.find((f) => f.endsWith('-RESEARCH.md') || f === 'RESEARCH.md');
             if (researchFile) {
-                result['research_path'] = toPosixPath(node_path_1.default.join(phaseInfo['directory'], researchFile));
+                result['research_path'] = toPosixPath(node_path_1.default.join(phaseDirFull, researchFile));
             }
             const verificationFile = files.find((f) => f.endsWith('-VERIFICATION.md') || f === 'VERIFICATION.md');
             if (verificationFile) {
-                result['verification_path'] = toPosixPath(node_path_1.default.join(phaseInfo['directory'], verificationFile));
+                result['verification_path'] = toPosixPath(node_path_1.default.join(phaseDirFull, verificationFile));
             }
             const uatFile = files.find((f) => f.endsWith('-UAT.md') || f === 'UAT.md');
             if (uatFile) {
-                result['uat_path'] = toPosixPath(node_path_1.default.join(phaseInfo['directory'], uatFile));
+                result['uat_path'] = toPosixPath(node_path_1.default.join(phaseDirFull, uatFile));
             }
             const reviewsFile = files.find((f) => f.endsWith('-REVIEWS.md') || f === 'REVIEWS.md');
             if (reviewsFile) {
-                result['reviews_path'] = toPosixPath(node_path_1.default.join(phaseInfo['directory'], reviewsFile));
+                result['reviews_path'] = toPosixPath(node_path_1.default.join(phaseDirFull, reviewsFile));
             }
             const patternsFile = files.find((f) => f.endsWith('-PATTERNS.md') || f === 'PATTERNS.md');
             if (patternsFile) {
-                result['patterns_path'] = toPosixPath(node_path_1.default.join(phaseInfo['directory'], patternsFile));
+                result['patterns_path'] = toPosixPath(node_path_1.default.join(phaseDirFull, patternsFile));
             }
         }
         catch {
@@ -535,7 +549,14 @@ function cmdInitNewProject(cwd, raw) {
         brave_search_available: hasBraveSearch,
         firecrawl_available: hasFirecrawl,
         exa_search_available: hasExaSearch,
-        project_path: '.planning/PROJECT.md',
+        // #2376: absolute — see comment on phase_dir in cmdInitExecutePhase.
+        project_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'PROJECT.md')),
+        // #2376: new-project.md's research-synthesizer/roadmapper spawn prompts
+        // read these instead of hardcoding '.planning/...' literals.
+        requirements_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'REQUIREMENTS.md')),
+        roadmap_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md')),
+        config_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'config.json')),
+        research_dir: toPosixPath(node_path_1.default.join(planningRoot(cwd), 'research')),
     };
     output(withProjectRoot(cwd, result), raw);
 }
@@ -569,15 +590,22 @@ function cmdInitNewMilestone(cwd, raw) {
         latest_completed_milestone: latestCompleted?.version || null,
         latest_completed_milestone_name: latestCompleted?.name || null,
         phase_dir_count: phaseDirCount,
+        // #2376: absolute — see comment on phase_dir in cmdInitExecutePhase.
         phase_archive_path: latestCompleted
-            ? toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningRoot(cwd), 'milestones', `${latestCompleted.version}-phases`)))
+            ? toPosixPath(node_path_1.default.join(planningRoot(cwd), 'milestones', `${latestCompleted.version}-phases`))
             : null,
         project_exists: pathExistsInternal(cwd, '.planning/PROJECT.md'),
         roadmap_exists: node_fs_1.default.existsSync(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md')),
         state_exists: node_fs_1.default.existsSync(node_path_1.default.join(planningDir(cwd), 'STATE.md')),
-        project_path: '.planning/PROJECT.md',
-        roadmap_path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'ROADMAP.md'))),
-        state_path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'STATE.md'))),
+        project_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'PROJECT.md')),
+        roadmap_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md')),
+        state_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'STATE.md')),
+        // #2376: new-milestone.md's research-synthesizer/roadmapper spawn prompts
+        // read these instead of hardcoding '.planning/...' literals.
+        requirements_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'REQUIREMENTS.md')),
+        config_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'config.json')),
+        research_dir: toPosixPath(node_path_1.default.join(planningRoot(cwd), 'research')),
+        milestones_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'MILESTONES.md')),
     };
     output(withProjectRoot(cwd, result), raw);
 }
@@ -613,10 +641,13 @@ function cmdInitQuick(cwd, description, raw) {
         quick_id: quickId,
         slug: slug,
         description: description || null,
-        date: now.toISOString().split('T')[0],
-        timestamp: now.toISOString(),
-        quick_dir: '.planning/quick',
-        task_dir: slug ? `.planning/quick/${quickId}-${slug}` : null,
+        date: clock_cjs_1.realClock.localToday(),
+        timestamp: clock_cjs_1.realClock.nowIso(),
+        // #2376: absolute — see comment on phase_dir in cmdInitExecutePhase.
+        quick_dir: toPosixPath(node_path_1.default.join(planningDir(cwd), 'quick')),
+        task_dir: slug
+            ? toPosixPath(node_path_1.default.join(planningDir(cwd), 'quick', `${quickId}-${slug}`))
+            : null,
         roadmap_exists: node_fs_1.default.existsSync(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md')),
         planning_exists: node_fs_1.default.existsSync(planningRoot(cwd)),
     };
@@ -628,7 +659,18 @@ function cmdInitIngestDocs(cwd, raw) {
         project_exists: pathExistsInternal(cwd, '.planning/PROJECT.md'),
         planning_exists: node_fs_1.default.existsSync(planningRoot(cwd)),
         ...getInitGitState(cwd),
-        project_path: '.planning/PROJECT.md',
+        // #2376: absolute — see comment on phase_dir in cmdInitExecutePhase. The
+        // classify_parallel/synthesize/route_new_mode spawns in ingest-docs.md
+        // (gsd-doc-classifier, gsd-doc-synthesizer, gsd-roadmapper) previously
+        // hardcoded bare '.planning/intel/...', '.planning/PROJECT.md', etc.
+        // literals into their Agent(prompt=...) blocks; those now interpolate
+        // these fields instead.
+        project_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'PROJECT.md')),
+        requirements_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'REQUIREMENTS.md')),
+        roadmap_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md')),
+        state_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'STATE.md')),
+        intel_dir: toPosixPath(node_path_1.default.join(planningDir(cwd), 'intel')),
+        conflicts_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'INGEST-CONFLICTS.md')),
         commit_docs: config.commit_docs,
     };
     output(withProjectRoot(cwd, result), raw);
@@ -657,9 +699,10 @@ function cmdInitResume(cwd, raw) {
         roadmap_exists: node_fs_1.default.existsSync(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md')),
         project_exists: pathExistsInternal(cwd, '.planning/PROJECT.md'),
         planning_exists: node_fs_1.default.existsSync(planningRoot(cwd)),
-        state_path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'STATE.md'))),
-        roadmap_path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'ROADMAP.md'))),
-        project_path: '.planning/PROJECT.md',
+        // #2376: absolute — see comment on phase_dir in cmdInitExecutePhase.
+        state_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'STATE.md')),
+        roadmap_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md')),
+        project_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'PROJECT.md')),
         has_interrupted_agent: !!interruptedAgentId,
         interrupted_agent_id: interruptedAgentId,
         commit_docs: config.commit_docs,
@@ -714,9 +757,15 @@ function cmdInitVerifyWork(cwd, phase, raw) {
         checker_model: resolveModelInternal(cwd, 'gsd-plan-checker'),
         commit_docs: config.commit_docs,
         phase_found: !!phaseInfo,
-        phase_dir: phaseDir,
+        // #2376: absolute — see comment on phase_dir in cmdInitExecutePhase. phaseDir
+        // itself stays relative — evaluateUatPassed above still joins it against cwd.
+        phase_dir: phaseDir ? toPosixPath(node_path_1.default.join(cwd, phaseDir)) : null,
         phase_number: phaseInfo?.['phase_number'] || null,
         phase_name: phaseInfo?.['phase_name'] || null,
+        // #2376: verify-work.md's plan_gap_closure step reads these instead of
+        // hardcoding '.planning/STATE.md' / '.planning/ROADMAP.md' literals.
+        state_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'STATE.md')),
+        roadmap_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md')),
         has_verification: phaseInfo?.['has_verification'] || false,
         phase_completion: {
             ...completion,
@@ -730,6 +779,21 @@ function cmdInitVerifyWork(cwd, phase, raw) {
 function cmdInitPhaseOp(cwd, phase, raw) {
     const config = loadConfig(cwd);
     let phaseInfo = guardedFindPhase(cwd, phase, config.project_code);
+    // #2237: surface ambiguous phase-directory collisions instead of silently
+    // taking the first match when unrelated projects share a .planning/phases/ tree.
+    if (phaseInfo?.['ambiguous_matches']) {
+        const matches = phaseInfo['ambiguous_matches'];
+        const result = {
+            phase_found: false,
+            phase_dir: null,
+            phase_number: null,
+            phase_name: null,
+            ambiguous_matches: matches,
+            warning: `Phase ${phase} is ambiguous: ${matches.length} directories match (${matches.map((m) => `"${m}"`).join(', ')}). Set a distinct project_code in .planning/config.json to scope resolution.`,
+        };
+        output(withProjectRoot(cwd, result), raw);
+        return;
+    }
     if (phaseInfo?.['archived']) {
         const roadmapPhase = guardedGetRoadmapPhase(cwd, phase, config.project_code);
         if (roadmapPhase?.['found']) {
@@ -783,7 +847,8 @@ function cmdInitPhaseOp(cwd, phase, raw) {
         if (slug) {
             const prefix = rawProjectCode ? `${rawProjectCode}-` : '';
             const dirName = `${prefix}${paddedNum}-${slug}`;
-            expectedPhaseDir = toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningPaths(cwd).phases, dirName)));
+            // #2376: absolute — see comment on phase_dir below.
+            expectedPhaseDir = toPosixPath(node_path_1.default.join(planningPaths(cwd).phases, dirName));
         }
     }
     const result = {
@@ -798,7 +863,8 @@ function cmdInitPhaseOp(cwd, phase, raw) {
             ? (0, secrets_cjs_1.maskIfSecret)('exa_search', config.exa_search)
             : config.exa_search,
         phase_found: !!phaseInfo,
-        phase_dir: phaseDir,
+        // #2376: absolute — see comment on phase_dir in cmdInitExecutePhase.
+        phase_dir: phaseDir ? toPosixPath(node_path_1.default.join(cwd, phaseDir)) : null,
         expected_phase_dir: expectedPhaseDir,
         phase_number: phaseNumber,
         phase_name: phaseName,
@@ -812,9 +878,10 @@ function cmdInitPhaseOp(cwd, phase, raw) {
         plan_count: phaseInfo?.['plans']?.length || 0,
         roadmap_exists: node_fs_1.default.existsSync(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md')),
         planning_exists: node_fs_1.default.existsSync(planningDir(cwd)),
-        state_path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'STATE.md'))),
-        roadmap_path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'ROADMAP.md'))),
-        requirements_path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'REQUIREMENTS.md'))),
+        // #2376: absolute — see comment on phase_dir above.
+        state_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'STATE.md')),
+        roadmap_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md')),
+        requirements_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'REQUIREMENTS.md')),
     };
     if (phaseInfo?.['directory']) {
         const phaseDirFull = node_path_1.default.join(cwd, phaseInfo['directory']);
@@ -822,23 +889,23 @@ function cmdInitPhaseOp(cwd, phase, raw) {
             const files = node_fs_1.default.readdirSync(phaseDirFull);
             const contextFile = findContextMdIn(phaseDirFull);
             if (contextFile) {
-                result['context_path'] = toPosixPath(node_path_1.default.join(phaseInfo['directory'], contextFile));
+                result['context_path'] = toPosixPath(node_path_1.default.join(phaseDirFull, contextFile));
             }
             const researchFile = files.find((f) => f.endsWith('-RESEARCH.md') || f === 'RESEARCH.md');
             if (researchFile) {
-                result['research_path'] = toPosixPath(node_path_1.default.join(phaseInfo['directory'], researchFile));
+                result['research_path'] = toPosixPath(node_path_1.default.join(phaseDirFull, researchFile));
             }
             const verificationFile = files.find((f) => f.endsWith('-VERIFICATION.md') || f === 'VERIFICATION.md');
             if (verificationFile) {
-                result['verification_path'] = toPosixPath(node_path_1.default.join(phaseInfo['directory'], verificationFile));
+                result['verification_path'] = toPosixPath(node_path_1.default.join(phaseDirFull, verificationFile));
             }
             const uatFile = files.find((f) => f.endsWith('-UAT.md') || f === 'UAT.md');
             if (uatFile) {
-                result['uat_path'] = toPosixPath(node_path_1.default.join(phaseInfo['directory'], uatFile));
+                result['uat_path'] = toPosixPath(node_path_1.default.join(phaseDirFull, uatFile));
             }
             const reviewsFile = files.find((f) => f.endsWith('-REVIEWS.md') || f === 'REVIEWS.md');
             if (reviewsFile) {
-                result['reviews_path'] = toPosixPath(node_path_1.default.join(phaseInfo['directory'], reviewsFile));
+                result['reviews_path'] = toPosixPath(node_path_1.default.join(phaseDirFull, reviewsFile));
             }
         }
         catch {
@@ -849,7 +916,6 @@ function cmdInitPhaseOp(cwd, phase, raw) {
 }
 function cmdInitTodos(cwd, area, raw) {
     const config = loadConfig(cwd);
-    const now = new Date();
     const pendingDir = node_path_1.default.join(planningDir(cwd), 'todos', 'pending');
     let count = 0;
     const todos = [];
@@ -863,6 +929,9 @@ function cmdInitTodos(cwd, area, raw) {
                 const createdMatch = content.match(/^created:\s*(.+)$/m);
                 const titleMatch = content.match(/^title:\s*(.+)$/m);
                 const areaMatch = content.match(/^area:\s*(.+)$/m);
+                // #2337: kept in parity with cmdListTodos — surface severity when
+                // present, omit the key entirely for todos with no severity line.
+                const severityMatch = content.match(/^severity:\s*(.+)$/m);
                 const todoArea = areaMatch ? areaMatch[1].trim() : 'general';
                 if (area && todoArea !== area)
                     continue;
@@ -872,7 +941,9 @@ function cmdInitTodos(cwd, area, raw) {
                     created: createdMatch ? createdMatch[1].trim() : 'unknown',
                     title: titleMatch ? titleMatch[1].trim() : 'Untitled',
                     area: todoArea,
-                    path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'todos', 'pending', file))),
+                    // #2376: absolute — see comment on phase_dir in cmdInitExecutePhase.
+                    path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'todos', 'pending', file)),
+                    ...(severityMatch ? { severity: severityMatch[1].trim() } : {}),
                 });
             }
             catch {
@@ -885,13 +956,14 @@ function cmdInitTodos(cwd, area, raw) {
     }
     const result = {
         commit_docs: config.commit_docs,
-        date: now.toISOString().split('T')[0],
-        timestamp: now.toISOString(),
+        date: clock_cjs_1.realClock.localToday(),
+        timestamp: clock_cjs_1.realClock.nowIso(),
         todo_count: count,
         todos,
         area_filter: area || null,
-        pending_dir: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'todos', 'pending'))),
-        completed_dir: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'todos', 'completed'))),
+        // #2376: absolute — see comment on phase_dir in cmdInitExecutePhase.
+        pending_dir: toPosixPath(node_path_1.default.join(planningDir(cwd), 'todos', 'pending')),
+        completed_dir: toPosixPath(node_path_1.default.join(planningDir(cwd), 'todos', 'completed')),
         planning_exists: node_fs_1.default.existsSync(planningDir(cwd)),
         todos_dir_exists: node_fs_1.default.existsSync(node_path_1.default.join(planningDir(cwd), 'todos')),
         pending_dir_exists: node_fs_1.default.existsSync(node_path_1.default.join(planningDir(cwd), 'todos', 'pending')),
@@ -1007,7 +1079,6 @@ function cmdInitMilestoneOp(cwd, raw) {
 }
 function cmdInitMapCodebase(cwd, raw) {
     const config = loadConfig(cwd);
-    const now = new Date();
     const codebaseDir = node_path_1.default.join(planningRoot(cwd), 'codebase');
     let existingMaps = [];
     try {
@@ -1022,9 +1093,10 @@ function cmdInitMapCodebase(cwd, raw) {
         search_gitignored: config.search_gitignored,
         parallelization: config.parallelization,
         subagent_timeout: config.subagent_timeout,
-        date: now.toISOString().split('T')[0],
-        timestamp: now.toISOString(),
-        codebase_dir: '.planning/codebase',
+        date: clock_cjs_1.realClock.localToday(),
+        timestamp: clock_cjs_1.realClock.nowIso(),
+        // #2376: absolute — see comment on phase_dir in cmdInitExecutePhase.
+        codebase_dir: toPosixPath(node_path_1.default.join(planningRoot(cwd), 'codebase')),
         existing_maps: existingMaps,
         has_maps: existingMaps.length > 0,
         planning_exists: pathExistsInternal(cwd, '.planning'),
@@ -1425,7 +1497,10 @@ function cmdInitProgress(cwd, raw) {
             const phaseInfo = {
                 number: phaseNumber,
                 name: phaseName,
-                directory: phaseDirRel,
+                // #2376: absolute — see comment on phase_dir in cmdInitExecutePhase.
+                // phaseDirRel itself stays relative — buildPhaseCompletionProjection
+                // above still joins it against cwd.
+                directory: toPosixPath(node_path_1.default.join(cwd, phaseDirRel)),
                 status,
                 plan_count: plans.length,
                 summary_count: summaries.length,
@@ -1493,10 +1568,11 @@ function cmdInitProgress(cwd, raw) {
         project_exists: pathExistsInternal(cwd, '.planning/PROJECT.md'),
         roadmap_exists: node_fs_1.default.existsSync(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md')),
         state_exists: node_fs_1.default.existsSync(node_path_1.default.join(planningDir(cwd), 'STATE.md')),
-        state_path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'STATE.md'))),
-        roadmap_path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'ROADMAP.md'))),
-        project_path: '.planning/PROJECT.md',
-        config_path: toPosixPath(node_path_1.default.relative(cwd, node_path_1.default.join(planningDir(cwd), 'config.json'))),
+        // #2376: absolute — see comment on phase_dir in cmdInitExecutePhase.
+        state_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'STATE.md')),
+        roadmap_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md')),
+        project_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'PROJECT.md')),
+        config_path: toPosixPath(node_path_1.default.join(planningDir(cwd), 'config.json')),
     };
     output(withProjectRoot(cwd, result), raw);
 }
@@ -1654,7 +1730,9 @@ function cmdInitRemoveWorkspace(cwd, name, raw) {
         dirty_repos: dirtyRepos,
         has_dirty_repos: dirtyRepos.length > 0,
     };
-    output(result, raw);
+    // #2402: sibling init commands route through withProjectRoot so response_language
+    // (and project_root/agents_installed) reach the workflow; this one didn't.
+    output(withProjectRoot(cwd, result), raw);
 }
 function buildAgentSkillsBlock(config, agentType, projectRoot, diagnostics) {
     const warn = (message) => {
@@ -1763,7 +1841,7 @@ function buildAgentSkillsBlock(config, agentType, projectRoot, diagnostics) {
         if (entry.kind === 'directive') {
             return `- Load the \`${entry.name}\` skill via the Skill tool before proceeding (plugin-provided).`;
         }
-        return `- @${String(entry.ref).replace(/\\/g, '/')}`;
+        return `- @${(0, shell_command_projection_cjs_1.posixNormalize)(String(entry.ref))}`;
     }).join('\n');
     return `<agent_skills>\nRead these user-configured skills:\n${lines}\n</agent_skills>`;
 }