golem15/msd-core
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(#1472,#1454): workstream-aware health paths; exclude active worktree from W017 (#1483)

Browse Source 
* fix(#1472,#1454): validate health workstream-aware paths; exclude active worktree from W017

#1472: cmdValidateHealth now uses planningRoot(cwd) for shared-root files
(PROJECT.md, config.json, MILESTONES.md) and planningDir(cwd) for
workstream-scoped files (ROADMAP.md, STATE.md, phases/). Previously a
single planningDir() call was used for all paths, causing false
E002/E003/E004/W003 when GSD_WORKSTREAM is set.

#1454: W017 no longer fires for a stale worktree whose path equals or is
an ancestor of process.cwd(), preventing advice to remove the active
session's own worktree.

Regression tests added for both bugs; all 40 existing health tests pass.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: correct changeset format

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Tom Boucher
2026-06-20 13:37:09 -04:00
committed by GitHub
parent fe0f9f904d
commit bb88a78faa
3 changed files with 172 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/verify.cts
View File

@@ -48,7 +48,7 @@ const { getMilestoneInfo, stripShippedMilestones, extractCurrentMilestone } = ro
import worktreeSafetyMod = require('./worktree-safety.cjs');
const { inspectWorktreeHealth } = worktreeSafetyMod;
const { planningDir } = planningWorkspace;
const { planningDir, planningRoot } = planningWorkspace;
const { extractFrontmatter, parseMustHavesBlock } = frontmatterMod;
const { writeStateMd } = stateMod;
const { MODEL_PROFILES } = modelProfilesMod;
@@ -1235,12 +1235,18 @@ function cmdValidateHealth(
return;
}
const planBase = planningDir(cwd);
const projectPath = path.join(planBase, 'PROJECT.md');
const roadmapPath = path.join(planBase, 'ROADMAP.md');
const statePath = path.join(planBase, 'STATE.md');
const configPath = path.join(planBase, 'config.json');
const phasesDir = path.join(planBase, 'phases');
// rootBase always resolves to .planning/ (shared root — PROJECT.md, config.json live here)
// wsBase resolves to .planning/workstreams/<ws>/ when GSD_WORKSTREAM is set (STATE.md, ROADMAP.md, phases/)
const rootBase = planningRoot(cwd);
const wsBase = planningDir(cwd);
// planBase is kept as an alias for wsBase for all the internal helpers (collectDiskPhases, etc.)
// that are already parameterised on the workstream-aware path.
const planBase = wsBase;
const projectPath = path.join(rootBase, 'PROJECT.md');
const roadmapPath = path.join(wsBase, 'ROADMAP.md');
const statePath = path.join(wsBase, 'STATE.md');
const configPath = path.join(rootBase, 'config.json');
const phasesDir = path.join(wsBase, 'phases');
const _slashRuntime = resolveRuntime(cwd);
const slash = (name: string) => formatGsdSlash(name, _slashRuntime) as string;
@@ -1262,7 +1268,7 @@ function cmdValidateHealth(
else info.push(issue);
};
if (!fs.existsSync(planBase)) {
if (!fs.existsSync(rootBase)) {
addIssue('error', 'E001', '.planning/ directory not found', `Run ${slash('new-project')} to initialize`);
output({ status: 'broken', errors, warnings, info, repairable_count: 0 }, raw);
return;
@@ -1683,11 +1689,21 @@ function cmdValidateHealth(
}
if (finding['kind'] === 'stale') {
// Do not flag the active session's worktree — removing it would be harmful.
const worktreePath = finding['path'] as string;
const activeCwd = process.cwd();
const normalizedWorktree = path.resolve(worktreePath);
const normalizedCwd = path.resolve(activeCwd);
// Skip if the worktree IS the cwd or is an ancestor of it.
const isActiveWorktree =
normalizedCwd === normalizedWorktree ||
normalizedCwd.startsWith(normalizedWorktree + path.sep);
if (isActiveWorktree) continue;
addIssue(
'warning',
'W017',
`Stale git worktree: ${finding['path'] as string} (last modified ${finding['ageMinutes'] as number} minutes ago)`,
`Run: git worktree remove ${finding['path'] as string} --force`,
`Stale git worktree: ${worktreePath} (last modified ${finding['ageMinutes'] as number} minutes ago)`,
`Run: git worktree remove ${worktreePath} --force`,
);
}
}
@@ -1727,8 +1743,8 @@ function cmdValidateHealth(
/* W021 check is advisory — skip on error */
}
const milestonesPath = path.join(planBase, 'MILESTONES.md');
const milestonesArchiveDir = path.join(planBase, 'milestones');
const milestonesPath = path.join(rootBase, 'MILESTONES.md');
const milestonesArchiveDir = path.join(rootBase, 'milestones');
const missingFromRegistry: string[] = [];
try {
if (fs.existsSync(milestonesArchiveDir)) {
@@ -1764,7 +1780,7 @@ function cmdValidateHealth(
}
try {
const entries = fs.readdirSync(planBase, { withFileTypes: true });
const entries = fs.readdirSync(rootBase, { withFileTypes: true });
for (const entry of entries) {
if (!entry.isFile()) continue;
if (!entry.name.endsWith('.md')) continue;
@@ -1868,7 +1884,7 @@ function cmdValidateHealth(
}
const milestone = getMilestoneInfo(cwd);
const projectRef = path
.relative(cwd, path.join(planningDir(cwd), 'PROJECT.md'))
.relative(cwd, path.join(rootBase, 'PROJECT.md'))
.split(path.sep)
.join('/');
let stateContent = `# Session State\n\n`;