@opengsd/gsd-pi 1.5.0 → 1.6.0

package/dist/resources/extensions/gsd/state/derive/from-db.js

@@ -12,6 +12,31 @@ import { countUnmappedActiveRequirements, formatCompletePhaseNextAction } from '
 import { logWarning } from '../../workflow-logger.js';
 import { buildDbUnavailableState, ensureExistingWorkflowDbOpen, getRequestedMilestoneLock, } from './db-open.js';
 const isStatusDone = isClosedStatus;
+function buildProgress(context) {
+    return {
+        milestones: context.milestoneProgress,
+        ...(context.sliceProgress ? { slices: context.sliceProgress } : {}),
+        ...(context.taskProgress ? { tasks: context.taskProgress } : {}),
+    };
+}
+function buildDerivedState(context, phase, nextAction, options = {}) {
+    return {
+        activeMilestone: context.activeMilestone,
+        activeSlice: context.activeSlice ?? null,
+        activeTask: context.activeTask ?? null,
+        phase,
+        recentDecisions: [],
+        blockers: options.blockers ?? [],
+        nextAction,
+        ...(options.lastCompletedMilestone !== undefined
+            ? { lastCompletedMilestone: options.lastCompletedMilestone }
+            : {}),
+        ...(options.includeActiveWorkspace ? { activeWorkspace: undefined } : {}),
+        registry: context.registry,
+        requirements: context.requirements,
+        progress: buildProgress(context),
+    };
+}
 function stripMilestonePrefix(title) {
     return title.replace(/^M\d+(?:-[a-z0-9]{6})?[^:]*:\s*/, '') || title;
 }
@@ -125,103 +150,60 @@ async function buildRegistryAndFindActive(basePath, milestones, completeMileston
 function handleNoActiveMilestone(registry, requirements, milestoneProgress) {
     const pendingEntries = registry.filter(e => e.status === 'pending');
     const parkedEntries = registry.filter(e => e.status === 'parked');
+    const context = {
+        activeMilestone: null,
+        registry,
+        requirements,
+        milestoneProgress,
+    };
     if (pendingEntries.length > 0) {
         const blockerDetails = pendingEntries
             .filter(e => e.dependsOn && e.dependsOn.length > 0)
             .map(e => `${e.id} is waiting on unmet deps: ${e.dependsOn.join(', ')}`);
-        return {
-            activeMilestone: null, activeSlice: null, activeTask: null,
-            phase: 'blocked',
-            recentDecisions: [], blockers: blockerDetails.length > 0
+        return buildDerivedState(context, 'blocked', 'Resolve milestone dependencies before proceeding.', {
+            blockers: blockerDetails.length > 0
                 ? blockerDetails
                 : ['All remaining milestones are dep-blocked but no deps listed — check CONTEXT.md files'],
-            nextAction: 'Resolve milestone dependencies before proceeding.',
-            registry, requirements,
-            progress: { milestones: milestoneProgress },
-        };
+        });
     }
     if (parkedEntries.length > 0) {
         const parkedIds = parkedEntries.map(e => e.id).join(', ');
-        return {
-            activeMilestone: null, activeSlice: null, activeTask: null,
-            phase: 'pre-planning',
-            recentDecisions: [], blockers: [],
-            nextAction: `All remaining milestones are parked (${parkedIds}). Run /gsd unpark <id> or create a new milestone.`,
-            registry, requirements,
-            progress: { milestones: milestoneProgress },
-        };
+        return buildDerivedState(context, 'pre-planning', `All remaining milestones are parked (${parkedIds}). Run /gsd unpark <id> or create a new milestone.`);
     }
     if (registry.length === 0) {
-        return {
-            activeMilestone: null, activeSlice: null, activeTask: null,
-            phase: 'pre-planning',
-            recentDecisions: [], blockers: [],
-            nextAction: 'No milestones found. Run /gsd to create one.',
-            registry: [], requirements,
-            progress: { milestones: { done: 0, total: 0 } },
-        };
+        return buildDerivedState({ ...context, registry: [], milestoneProgress: { done: 0, total: 0 } }, 'pre-planning', 'No milestones found. Run /gsd to create one.');
     }
     const lastEntry = registry[registry.length - 1];
     const unmappedActive = countUnmappedActiveRequirements();
     const completionNote = formatCompletePhaseNextAction(unmappedActive);
-    return {
-        activeMilestone: null,
+    return buildDerivedState(context, 'complete', completionNote, {
         lastCompletedMilestone: lastEntry ? { id: lastEntry.id, title: lastEntry.title } : null,
-        activeSlice: null, activeTask: null,
-        phase: 'complete',
-        recentDecisions: [], blockers: [],
-        nextAction: completionNote,
-        registry, requirements,
-        progress: { milestones: milestoneProgress },
-    };
+    });
 }
 async function handleAllSlicesDone(basePath, activeMilestone, registry, requirements, milestoneProgress, sliceProgress) {
     const validation = getLatestAssessmentByScope(activeMilestone.id, "milestone-validation");
     const verdict = typeof validation?.status === "string" ? validation.status : undefined;
     const validationTerminal = verdict != null && verdict !== "";
+    const context = {
+        activeMilestone,
+        registry,
+        requirements,
+        milestoneProgress,
+        sliceProgress,
+    };
     if (!validationTerminal) {
-        return {
-            activeMilestone, activeSlice: null, activeTask: null,
-            phase: 'validating-milestone',
-            recentDecisions: [], blockers: [],
-            nextAction: `Validate milestone ${activeMilestone.id} before completion.`,
-            registry, requirements,
-            progress: { milestones: milestoneProgress, slices: sliceProgress },
-        };
+        return buildDerivedState(context, 'validating-milestone', `Validate milestone ${activeMilestone.id} before completion.`);
     }
     // All roadmap slices are done (enforced by caller) and verdict is
     // needs-remediation — remediation cannot progress without new slices.
     // Return blocked instead of re-dispatching validate-milestone (#4506).
     if (verdict === 'needs-attention') {
-        return {
-            activeMilestone, activeSlice: null, activeTask: null,
-            phase: 'blocked',
-            recentDecisions: [],
-            blockers: [formatNeedsAttentionBlocker(activeMilestone.id)],
-            nextAction: `Resolve ${activeMilestone.id} validation attention before proceeding.`,
-            registry, requirements,
-            progress: { milestones: milestoneProgress, slices: sliceProgress },
-        };
+        return buildDerivedState(context, 'blocked', `Resolve ${activeMilestone.id} validation attention before proceeding.`, { blockers: [formatNeedsAttentionBlocker(activeMilestone.id)] });
     }
     if (verdict === 'needs-remediation') {
-        return {
-            activeMilestone, activeSlice: null, activeTask: null,
-            phase: 'blocked',
-            recentDecisions: [],
-            blockers: [formatNeedsRemediationBlocker(activeMilestone.id)],
-            nextAction: `Resolve ${activeMilestone.id} remediation before proceeding.`,
-            registry, requirements,
-            progress: { milestones: milestoneProgress, slices: sliceProgress },
-        };
+        return buildDerivedState(context, 'blocked', `Resolve ${activeMilestone.id} remediation before proceeding.`, { blockers: [formatNeedsRemediationBlocker(activeMilestone.id)] });
     }
-    return {
-        activeMilestone, activeSlice: null, activeTask: null,
-        phase: 'completing-milestone',
-        recentDecisions: [], blockers: [],
-        nextAction: `All slices complete in ${activeMilestone.id}. Write milestone summary.`,
-        registry, requirements,
-        progress: { milestones: milestoneProgress, slices: sliceProgress },
-    };
+    return buildDerivedState(context, 'completing-milestone', `All slices complete in ${activeMilestone.id}. Write milestone summary.`);
 }
 function resolveSliceDependencies(activeMilestoneSlices) {
     const doneSliceIds = new Set(activeMilestoneSlices.filter(s => isStatusDone(s.status)).map(s => s.id));
@@ -271,13 +253,12 @@ export async function deriveStateFromDb(basePath, artifactReadRoot = basePath) {
         ? allMilestones.filter(m => m.id === milestoneLock)
         : allMilestones;
     if (milestones.length === 0) {
-        return {
-            activeMilestone: null, activeSlice: null, activeTask: null,
-            phase: 'pre-planning', recentDecisions: [], blockers: [],
-            nextAction: 'No milestones found. Run /gsd to create one.',
-            registry: [], requirements,
-            progress: { milestones: { done: 0, total: 0 } },
-        };
+        return buildDerivedState({
+            activeMilestone: null,
+            registry: [],
+            requirements,
+            milestoneProgress: { done: 0, total: 0 },
+        }, 'pre-planning', 'No milestones found. Run /gsd to create one.');
     }
     const { completeMilestoneIds, parkedMilestoneIds } = buildCompletenessSet(basePath, milestones);
     const registryContext = await buildRegistryAndFindActive(basePath, milestones, completeMilestoneIds, parkedMilestoneIds);
@@ -294,18 +275,20 @@ export async function deriveStateFromDb(basePath, artifactReadRoot = basePath) {
         const nextAction = activeMilestoneHasDraft
             ? `Discuss draft context for milestone ${activeMilestone.id}.`
             : `Plan milestone ${activeMilestone.id}.`;
-        return {
-            activeMilestone, activeSlice: null, activeTask: null,
-            phase, recentDecisions: [], blockers: [],
-            nextAction, registry, requirements,
-            progress: { milestones: milestoneProgress },
-        };
+        return buildDerivedState({ activeMilestone, registry, requirements, milestoneProgress }, phase, nextAction);
     }
     const allSlicesDone = activeMilestoneSlices.every(s => isStatusDone(s.status));
     const sliceProgress = {
         done: activeMilestoneSlices.filter(s => isStatusDone(s.status)).length,
         total: activeMilestoneSlices.length,
     };
+    const sliceStateContext = {
+        activeMilestone,
+        registry,
+        requirements,
+        milestoneProgress,
+        sliceProgress,
+    };
     if (allSlicesDone) {
         return handleAllSlicesDone(basePath, activeMilestone, registry, requirements, milestoneProgress, sliceProgress);
     }
@@ -314,21 +297,9 @@ export async function deriveStateFromDb(basePath, artifactReadRoot = basePath) {
         // If locked slice wasn't found, it returns null but logs warning, we need to return 'blocked'
         const sliceLock = process.env.GSD_PARALLEL_WORKER ? process.env.GSD_SLICE_LOCK : undefined;
         if (sliceLock) {
-            return {
-                activeMilestone, activeSlice: null, activeTask: null,
-                phase: 'blocked', recentDecisions: [], blockers: [`GSD_SLICE_LOCK=${sliceLock} not found in active milestone slices`],
-                nextAction: 'Slice lock references a non-existent slice — check orchestrator dispatch.',
-                registry, requirements,
-                progress: { milestones: milestoneProgress, slices: sliceProgress },
-            };
+            return buildDerivedState(sliceStateContext, 'blocked', 'Slice lock references a non-existent slice — check orchestrator dispatch.', { blockers: [`GSD_SLICE_LOCK=${sliceLock} not found in active milestone slices`] });
         }
-        return {
-            activeMilestone, activeSlice: null, activeTask: null,
-            phase: 'blocked', recentDecisions: [], blockers: ['No slice eligible — check dependency ordering'],
-            nextAction: 'Resolve dependency blockers or plan next slice.',
-            registry, requirements,
-            progress: { milestones: milestoneProgress, slices: sliceProgress },
-        };
+        return buildDerivedState(sliceStateContext, 'blocked', 'Resolve dependency blockers or plan next slice.', { blockers: ['No slice eligible — check dependency ordering'] });
     }
     const { activeSlice } = activeSliceContext;
     const activeSliceRow = activeSliceContext.activeSliceRow;
@@ -338,39 +309,30 @@ export async function deriveStateFromDb(basePath, artifactReadRoot = basePath) {
     // PLAN.md and preference flags are projections/configuration and are
     // deliberately not used to infer whether the slice itself is a sketch.
     if (activeSliceRow?.is_sketch === 1) {
-        return {
-            activeMilestone, activeSlice, activeTask: null,
-            phase: 'refining', recentDecisions: [], blockers: [],
-            nextAction: `Refine sketch slice ${activeSlice.id} (${activeSlice.title}) using prior slice context.`,
-            registry, requirements,
-            progress: { milestones: milestoneProgress, slices: sliceProgress },
-        };
+        return buildDerivedState({ ...sliceStateContext, activeSlice }, 'refining', `Refine sketch slice ${activeSlice.id} (${activeSlice.title}) using prior slice context.`);
     }
     const tasks = getSliceTasks(activeMilestone.id, activeSlice.id);
     const taskProgress = {
         done: tasks.filter(t => isStatusDone(t.status)).length,
         total: tasks.length,
     };
+    const taskStateContext = {
+        ...sliceStateContext,
+        activeSlice,
+        taskProgress,
+    };
     const activeTaskRow = tasks.find(t => !isStatusDone(t.status));
     if (!activeTaskRow && tasks.length > 0) {
-        return {
-            activeMilestone, activeSlice, activeTask: null,
-            phase: 'summarizing', recentDecisions: [], blockers: [],
-            nextAction: `All tasks done in ${activeSlice.id}. Write slice summary and complete slice.`,
-            registry, requirements,
-            progress: { milestones: milestoneProgress, slices: sliceProgress, tasks: taskProgress },
-        };
+        return buildDerivedState(taskStateContext, 'summarizing', `All tasks done in ${activeSlice.id}. Write slice summary and complete slice.`);
     }
     if (!activeTaskRow) {
-        return {
-            activeMilestone, activeSlice, activeTask: null,
-            phase: 'planning', recentDecisions: [], blockers: [],
-            nextAction: `Slice ${activeSlice.id} has no DB tasks. Plan slice tasks before execution.`,
-            registry, requirements,
-            progress: { milestones: milestoneProgress, slices: sliceProgress, tasks: taskProgress },
-        };
+        return buildDerivedState(taskStateContext, 'planning', `Slice ${activeSlice.id} has no DB tasks. Plan slice tasks before execution.`);
     }
     const activeTask = { id: activeTaskRow.id, title: activeTaskRow.title };
+    const activeTaskStateContext = {
+        ...taskStateContext,
+        activeTask,
+    };
     // ── Quality gate evaluation check ──────────────────────────────────
     // Pause before execution only when gates owned by the `gate-evaluate`
     // turn (Q3/Q4) are still pending. Q8 is also `scope:"slice"` but is
@@ -380,27 +342,16 @@ export async function deriveStateFromDb(basePath, artifactReadRoot = basePath) {
     // Slices with zero gate rows (pre-feature or simple) skip straight through.
     const pendingGateCount = getPendingGateCountForTurn(activeMilestone.id, activeSlice.id, "gate-evaluate");
     if (pendingGateCount > 0) {
-        return {
-            activeMilestone, activeSlice, activeTask: null,
-            phase: 'evaluating-gates', recentDecisions: [], blockers: [],
-            nextAction: `Evaluate ${pendingGateCount} quality gate(s) for ${activeSlice.id} before execution.`,
-            registry, requirements,
-            progress: { milestones: milestoneProgress, slices: sliceProgress, tasks: taskProgress },
-        };
+        return buildDerivedState(taskStateContext, 'evaluating-gates', `Evaluate ${pendingGateCount} quality gate(s) for ${activeSlice.id} before execution.`);
     }
     const blockerTaskId = await detectBlockers(basePath, activeMilestone.id, activeSlice.id, tasks);
     if (blockerTaskId) {
         const replanHistory = getReplanHistory(activeMilestone.id, activeSlice.id);
         if (replanHistory.length === 0) {
-            return {
-                activeMilestone, activeSlice, activeTask,
-                phase: 'replanning-slice', recentDecisions: [],
+            return buildDerivedState(activeTaskStateContext, 'replanning-slice', `Task ${blockerTaskId} reported blocker_discovered. Replan slice ${activeSlice.id} before continuing.`, {
                 blockers: [`Task ${blockerTaskId} discovered a blocker requiring slice replan`],
-                nextAction: `Task ${blockerTaskId} reported blocker_discovered. Replan slice ${activeSlice.id} before continuing.`,
-                activeWorkspace: undefined,
-                registry, requirements,
-                progress: { milestones: milestoneProgress, slices: sliceProgress, tasks: taskProgress },
-            };
+                includeActiveWorkspace: true,
+            });
         }
     }
     // ADR-011 Phase 2: pause-on-escalation takes precedence over dispatching the
@@ -415,38 +366,22 @@ export async function deriveStateFromDb(basePath, artifactReadRoot = basePath) {
     // and the user's prior resolution never lands.
     const escalatingTaskId = detectPendingEscalation(tasks, basePath);
     if (escalatingTaskId) {
-        return {
-            activeMilestone, activeSlice, activeTask,
-            phase: 'escalating-task', recentDecisions: [],
+        return buildDerivedState(activeTaskStateContext, 'escalating-task', `Run /gsd escalate show ${escalatingTaskId} to review, then /gsd escalate resolve ${escalatingTaskId} <choice> to proceed.`, {
             blockers: [`Task ${escalatingTaskId} requires a user decision before the loop can proceed`],
-            nextAction: `Run /gsd escalate show ${escalatingTaskId} to review, then /gsd escalate resolve ${escalatingTaskId} <choice> to proceed.`,
-            activeWorkspace: undefined,
-            registry, requirements,
-            progress: { milestones: milestoneProgress, slices: sliceProgress, tasks: taskProgress },
-        };
+            includeActiveWorkspace: true,
+        });
     }
     if (!blockerTaskId) {
         const isTriggered = checkReplanTrigger(basePath, activeMilestone.id, activeSlice.id);
         if (isTriggered) {
             const replanHistory = getReplanHistory(activeMilestone.id, activeSlice.id);
             if (replanHistory.length === 0) {
-                return {
-                    activeMilestone, activeSlice, activeTask,
-                    phase: 'replanning-slice', recentDecisions: [],
+                return buildDerivedState(activeTaskStateContext, 'replanning-slice', `Triage replan triggered for slice ${activeSlice.id}. Replan before continuing.`, {
                     blockers: ['Triage replan trigger detected — slice replan required'],
-                    nextAction: `Triage replan triggered for slice ${activeSlice.id}. Replan before continuing.`,
-                    activeWorkspace: undefined,
-                    registry, requirements,
-                    progress: { milestones: milestoneProgress, slices: sliceProgress, tasks: taskProgress },
-                };
+                    includeActiveWorkspace: true,
+                });
             }
         }
     }
-    return {
-        activeMilestone, activeSlice, activeTask,
-        phase: 'executing', recentDecisions: [], blockers: [],
-        nextAction: `Execute ${activeTask.id}: ${activeTask.title} in slice ${activeSlice.id}.`,
-        registry, requirements,
-        progress: { milestones: milestoneProgress, slices: sliceProgress, tasks: taskProgress },
-    };
+    return buildDerivedState(activeTaskStateContext, 'executing', `Execute ${activeTask.id}: ${activeTask.title} in slice ${activeSlice.id}.`);
 }

package/dist/resources/extensions/gsd/state-reconciliation/drift/artifact-db.js

@@ -140,16 +140,7 @@ function detectArtifactDbStatusDriftForMilestone(basePath, milestoneId) {
         for (const task of tasks) {
             if (isClosedStatus(task.status))
                 continue;
-            // Flat-phase: task summaries live in the phase dir as TID-SUMMARY.md
-            let diskTaskSummary = resolveTaskFile(basePath, milestoneId, slice.id, task.id, "SUMMARY");
-            if (!diskTaskSummary) {
-                const phaseDir = resolveMilestonePath(basePath, milestoneId);
-                if (phaseDir) {
-                    const flatSummary = join(phaseDir, `${task.id}-SUMMARY.md`);
-                    if (existsSync(flatSummary))
-                        diskTaskSummary = flatSummary;
-                }
-            }
+            const diskTaskSummary = resolveTaskFile(basePath, milestoneId, slice.id, task.id, "SUMMARY");
             if (!diskTaskSummary || !existsSync(diskTaskSummary))
                 continue;
             addUniqueDrift(drifts, seen, {

package/dist/resources/extensions/gsd/state-reconciliation/drift/completion.js

@@ -7,8 +7,7 @@
 // same value).
 import { existsSync, statSync } from "node:fs";
 import { getAllMilestones, getMilestone, getMilestoneSlices, getSliceTasks, isDbAvailable, updateMilestoneStatus, updateSliceStatus, updateTaskStatus, } from "../../gsd-db.js";
-import { resolveMilestoneFile, resolveMilestonePath, resolveSliceFile, resolveTaskFile, } from "../../paths.js";
-import { join } from "node:path";
+import { resolveMilestoneFile, resolveSliceFile, resolveTaskFile, } from "../../paths.js";
 const COMPLETE_STATUSES = new Set(["complete", "done"]);
 function summaryMtimeIso(path) {
     try {
@@ -68,18 +67,7 @@ function collectMilestoneCompletionDrift(mid, ctx, drifts) {
                 continue;
             if (task.completed_at !== null)
                 continue;
-            // Flat-phase: task summaries live in the phase dir as TID-SUMMARY.md.
-            // Legacy: resolveTaskFile returns the tasks/TID/TID-SUMMARY.md path.
-            let taskSummary = resolveTaskFile(ctx.basePath, mid, slice.id, task.id, "SUMMARY");
-            // Flat-phase fallback: check the phase dir directly
-            if (!taskSummary) {
-                const phaseDir = resolveMilestonePath(ctx.basePath, mid);
-                if (phaseDir) {
-                    const flatSummary = join(phaseDir, `${task.id}-SUMMARY.md`);
-                    if (existsSync(flatSummary))
-                        taskSummary = flatSummary;
-                }
-            }
+            const taskSummary = resolveTaskFile(ctx.basePath, mid, slice.id, task.id, "SUMMARY");
             if (taskSummary && existsSync(taskSummary)) {
                 drifts.push({
                     kind: "missing-completion-timestamp",
@@ -136,16 +124,7 @@ export function repairMissingCompletionTimestamp(record, ctx) {
             task.completed_at !== null ||
             !COMPLETE_STATUSES.has(task.status))
             return;
-        // Flat-phase: task summaries live in the phase dir as TID-SUMMARY.md
-        let summary = resolveTaskFile(ctx.basePath, mid, sid, tid, "SUMMARY");
-        if (!summary) {
-            const phaseDir = resolveMilestonePath(ctx.basePath, mid);
-            if (phaseDir) {
-                const flatSummary = join(phaseDir, `${tid}-SUMMARY.md`);
-                if (existsSync(flatSummary))
-                    summary = flatSummary;
-            }
-        }
+        const summary = resolveTaskFile(ctx.basePath, mid, sid, tid, "SUMMARY");
         const ts = summary ? summaryMtimeIso(summary) : null;
         if (!ts)
             return;

package/dist/resources/extensions/gsd/state-reconciliation/index.js

@@ -41,6 +41,16 @@ export async function reconcileBeforeDispatch(basePath, partialDeps = {}) {
     if (!deps.dryRun) {
         const { capturePlanningCompatIfNeeded } = await import("../compat/planning-compat.js");
         await capturePlanningCompatIfNeeded(basePath);
+        // Self-heal phantom projection entries (#1257): a renamed/removed phase
+        // directory leaves stale `.compat.json` projection paths that no detector
+        // ever prunes (they all skip missing files), so the marker drifts from disk
+        // reality permanently. Drop entries whose backing file is gone before the
+        // detect passes run. Gated on !dryRun to keep detection read-only.
+        const { pruneOrphanedProjectionEntries } = await import("../compat/compat-marker.js");
+        const prunedCount = pruneOrphanedProjectionEntries(basePath);
+        if (prunedCount > 0) {
+            logWarning("reconcile", `pruned ${prunedCount} orphaned projection entr${prunedCount === 1 ? "y" : "ies"} from .compat.json (backing file no longer on disk)`);
+        }
     }
     for (let pass = 0; pass < MAX_PASSES; pass++) {
         deps.invalidateStateCache();

package/dist/resources/extensions/gsd/tool-contract.js

@@ -26,6 +26,20 @@ export function getUnitWorkflowDispatchReadinessError(input) {
         activeTools: input.activeTools,
     });
 }
+export function getUnitWorkflowDispatchReadinessErrorForModel(input) {
+    const provider = input.model?.provider ?? input.fallbackModel?.provider;
+    const baseUrl = input.model?.baseUrl ?? input.fallbackModel?.baseUrl;
+    return getUnitWorkflowDispatchReadinessError({
+        provider,
+        unitType: input.unitType,
+        projectRoot: input.projectRoot,
+        env: input.env,
+        surface: input.surface,
+        authMode: provider ? input.getProviderAuthMode?.(provider) : undefined,
+        baseUrl,
+        activeTools: input.activeTools,
+    });
+}
 export function compileUnitToolContract(unitType) {
     const manifest = resolveManifest(unitType);
     const surfaceContract = getUnitToolSurfaceContract(unitType);

package/dist/resources/extensions/gsd/tools/complete-milestone.js

@@ -8,10 +8,9 @@
  * renders MILESTONE-SUMMARY.md to disk, stores rendered markdown in DB
  * for recovery, and invalidates caches.
  */
-import { join } from "node:path";
 import { existsSync } from "node:fs";
 import { transaction, getMilestone, getMilestoneSlices, getSliceTasks, getLatestAssessmentByScope, updateMilestoneStatus, } from "../gsd-db.js";
-import { clearPathCache, relMilestoneFile } from "../paths.js";
+import { clearPathCache, resolveMilestoneFile, targetMilestoneFile } from "../paths.js";
 import { resolveCanonicalMilestoneRoot } from "../worktree-manager.js";
 import { isClosedStatus, isDeferredStatus } from "../status-guards.js";
 import { saveFile, clearParseCache } from "../files.js";
@@ -144,9 +143,8 @@ export async function handleCompleteMilestone(params, basePath) {
     }
     // ── Filesystem operations (outside transaction) ─────────────────────────
     const summaryMd = renderMilestoneSummaryMarkdown(params, completedAt);
-    // Layout-aware: flat-phase → phases/NN-slug/NN-SUMMARY.md;
-    // legacy → milestones/MID/MID-SUMMARY.md.
-    const summaryPath = join(artifactBasePath, relMilestoneFile(artifactBasePath, params.milestoneId, "SUMMARY"));
+    const summaryPath = resolveMilestoneFile(artifactBasePath, params.milestoneId, "SUMMARY") ??
+        targetMilestoneFile(artifactBasePath, params.milestoneId, "SUMMARY", getMilestone(params.milestoneId)?.title);
     // Guard (#4598): if SUMMARY.md already exists on disk, do not overwrite it.
     // This handles re-dispatch scenarios (DB/disk state divergence) where a prior
     // completion already wrote the file. Overwriting would silently destroy the

package/dist/resources/extensions/gsd/tools/reassess-roadmap.js

@@ -1,6 +1,6 @@
-import { join } from "node:path";
 import { existsSync, unlinkSync } from "node:fs";
-import { relSliceFile, relMilestoneFile } from "../paths.js";
+import { join } from "node:path";
+import { relSliceFile, resolveMilestoneFile, resolveMilestonePath, targetMilestoneFile } from "../paths.js";
 import { clearParseCache } from "../files.js";
 import { isClosedStatus } from "../status-guards.js";
 import { isNonEmptyString } from "../validation.js";
@@ -225,14 +225,20 @@ export async function handleReassessRoadmap(rawParams, basePath) {
             params.sliceChanges.modified.length > 0 ||
             params.sliceChanges.removed.length > 0;
         if (hasStructuralChanges) {
-            // Layout-aware: flat-phase → phases/NN-slug/NN-VALIDATION.md; legacy → milestones/MID/MID-VALIDATION.md
-            const validationFile = join(basePath, relMilestoneFile(basePath, params.milestoneId, "VALIDATION"));
-            try {
-                if (existsSync(validationFile))
-                    unlinkSync(validationFile);
-            }
-            catch (e) {
-                logWarning("tool", `validation file cleanup failed: ${e.message}`);
+            const milestoneDir = resolveMilestonePath(basePath, params.milestoneId);
+            const validationFiles = new Set([
+                resolveMilestoneFile(basePath, params.milestoneId, "VALIDATION"),
+                targetMilestoneFile(basePath, params.milestoneId, "VALIDATION", getMilestone(params.milestoneId)?.title),
+                milestoneDir ? join(milestoneDir, `${params.milestoneId}-VALIDATION.md`) : null,
+            ].filter((file) => Boolean(file)));
+            for (const validationFile of validationFiles) {
+                try {
+                    if (existsSync(validationFile))
+                        unlinkSync(validationFile);
+                }
+                catch (e) {
+                    logWarning("tool", `validation file cleanup failed: ${e.message}`);
+                }
             }
         }
         // ── Invalidate caches ─────────────────────────────────────────

package/dist/resources/extensions/gsd/tools/reopen-slice.js

@@ -5,6 +5,11 @@
  * tasks back to "pending". This is intentional — if you're reopening a
  * slice, you're re-doing the work. Partial resets create ambiguous state.
  *
+ * Also recovers a desynced slice (#1205): when a UAT→planning fallback leaves
+ * the slice open (e.g. "pending") but its tasks still "complete", this clears
+ * that state so the planner can re-plan without hitting "already complete"
+ * rejections.
+ *
  * The parent milestone must still be open (not complete).
  */
 // GSD — reopen-slice tool handler

package/dist/resources/extensions/gsd/tools/reopen-task.js

@@ -16,8 +16,8 @@ import { writeManifest } from "../workflow-manifest.js";
 import { appendEvent } from "../workflow-events.js";
 import { logWarning } from "../workflow-logger.js";
 import { existsSync, unlinkSync } from "node:fs";
-import { join } from "node:path";
-import { resolveTasksDir, clearPathCache } from "../paths.js";
+import { join, basename, dirname } from "node:path";
+import { resolveTasksDir, resolveSlicePath, clearPathCache } from "../paths.js";
 export async function handleReopenTask(params, basePath) {
     // ── Validate required fields ────────────────────────────────────────────
     if (!params.taskId || typeof params.taskId !== "string" || params.taskId.trim() === "") {
@@ -69,10 +69,18 @@ export async function handleReopenTask(params, basePath) {
     // ── Clean up stale filesystem artifacts (M12 fix) ────────────────────────
     // Without this, the DB-filesystem reconciler sees the SUMMARY.md and
     // auto-corrects the task back to "complete", making reopen a no-op (#3161).
+    // Legacy layout keeps the summary under a tasks/ subdir; flat-phase writes
+    // TID-SUMMARY.md directly in the phase dir. A tasks/ subdir may still exist
+    // in flat-phase for auxiliary artifacts — its mere existence must NOT redirect
+    // summary cleanup into tasks/ (#1208).
     try {
-        const tasksDir = resolveTasksDir(basePath, params.milestoneId, params.sliceId);
-        if (tasksDir) {
-            const summaryPath = join(tasksDir, `${params.taskId}-SUMMARY.md`);
+        const slicePath = resolveSlicePath(basePath, params.milestoneId, params.sliceId);
+        if (slicePath) {
+            const isLegacySlice = basename(dirname(slicePath)) === "slices";
+            const summaryDir = isLegacySlice
+                ? (resolveTasksDir(basePath, params.milestoneId, params.sliceId) ?? slicePath)
+                : slicePath;
+            const summaryPath = join(summaryDir, `${params.taskId}-SUMMARY.md`);
             if (existsSync(summaryPath))
                 unlinkSync(summaryPath);
         }

package/dist/resources/extensions/gsd/tools/validate-milestone.js

@@ -10,9 +10,8 @@
  * were never persisted, causing M002+ milestones to have zero gate records
  * despite passing validation.
  */
-import { join } from "node:path";
 import { transaction, insertAssessment, getMilestoneSlices, getMilestone, } from "../gsd-db.js";
-import { clearPathCache, relMilestoneFile } from "../paths.js";
+import { clearPathCache, targetMilestoneFile } from "../paths.js";
 import { resolveCanonicalMilestoneRoot } from "../worktree-manager.js";
 import { resolveWorktreeProjectRoot } from "../worktree-root.js";
 import { saveFile, clearParseCache } from "../files.js";
@@ -113,11 +112,7 @@ export async function handleValidateMilestone(params, basePath, opts) {
     // worktree exists for this milestone, validation reads/writes the
     // worktree's artifacts instead of stale project-root state.
     const validationMd = renderValidationMarkdown(effectiveParams);
-    // Layout-aware: flat-phase → phases/NN-slug/NN-VALIDATION.md;
-    // legacy → milestones/MID/MID-VALIDATION.md.
-    // join(artifactBasePath, relMilestoneFile) gives the absolute path; relMilestoneFile
-    // returns ".gsd/..."-relative so joining with basePath (project/worktree root) is correct.
-    const validationPath = join(artifactBasePath, relMilestoneFile(artifactBasePath, effectiveParams.milestoneId, "VALIDATION"));
+    const validationPath = targetMilestoneFile(artifactBasePath, effectiveParams.milestoneId, "VALIDATION", getMilestone(effectiveParams.milestoneId)?.title);
     // ── DB write first — matches complete-task/complete-slice pattern ───
     // Write DB before disk so a crash between the two leaves a recoverable
     // state: the DB row exists but the file is missing, which projection
@@ -148,7 +143,7 @@ export async function handleValidateMilestone(params, basePath, opts) {
         const projectRoot = resolveWorktreeProjectRoot(basePath);
         if (projectRoot !== artifactBasePath) {
             // Mirror to project root using the project root's layout (same logic as above).
-            const projectValidationPath = join(projectRoot, relMilestoneFile(projectRoot, effectiveParams.milestoneId, "VALIDATION"));
+            const projectValidationPath = targetMilestoneFile(projectRoot, effectiveParams.milestoneId, "VALIDATION", getMilestone(effectiveParams.milestoneId)?.title);
             try {
                 await saveFile(projectValidationPath, validationMd);
             }