@opengsd/gsd-pi 1.3.0-dev.65546769 → 1.3.0-dev.738160b9

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

@@ -13,7 +13,7 @@ import { existsSync } from "node:fs";
 import { transaction, getMilestone, getMilestoneSlices, getSliceTasks, getLatestAssessmentByScope, updateMilestoneStatus, } from "../gsd-db.js";
 import { clearPathCache, relMilestoneFile } from "../paths.js";
 import { resolveCanonicalMilestoneRoot } from "../worktree-manager.js";
-import { isClosedStatus } from "../status-guards.js";
+import { isClosedStatus, isDeferredStatus } from "../status-guards.js";
 import { saveFile, clearParseCache } from "../files.js";
 import { invalidateStateCache } from "../state.js";
 import { stripIdPrefix } from "../workflow-projections.js";
@@ -118,7 +118,7 @@ export async function handleCompleteMilestone(params, basePath) {
             guardError = `no slices found for milestone ${params.milestoneId}`;
             return;
         }
-        const incompleteSlices = slices.filter(s => !isClosedStatus(s.status));
+        const incompleteSlices = slices.filter(s => !isClosedStatus(s.status) && !isDeferredStatus(s.status));
         if (incompleteSlices.length > 0) {
             const incompleteIds = incompleteSlices.map(s => `${s.id} (status: ${s.status})`).join(", ");
             guardError = `incomplete slices: ${incompleteIds}`;
@@ -126,6 +126,8 @@ export async function handleCompleteMilestone(params, basePath) {
         }
         // Deep check: verify all tasks in all slices are complete
         for (const slice of slices) {
+            if (isDeferredStatus(slice.status))
+                continue;
             const tasks = getSliceTasks(params.milestoneId, slice.id);
             const incompleteTasks = tasks.filter(t => !isClosedStatus(t.status));
             if (incompleteTasks.length > 0) {

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

@@ -21,7 +21,7 @@ import { classifyUatContent, escalatesArtifactUatToBrowser } from "../uat-policy
 import { invalidateStateCache } from "../state.js";
 import { renderRoadmapFromDb, roadmapRenderMarksSliceDone } from "../markdown-renderer.js";
 import { isStaleWrite } from "../auto/turn-epoch.js";
-import { flushWorkflowProjections } from "../projection-flush.js";
+import { renderMilestoneShellProjections } from "../workflow-projections.js";
 import { writeManifest } from "../workflow-manifest.js";
 import { appendEvent } from "../workflow-events.js";
 import { logWarning, logError } from "../workflow-logger.js";
@@ -458,7 +458,7 @@ export async function handleCompleteSlice(params, basePath) {
     // Separate try/catch per step so a projection failure doesn't prevent
     // the event log entry (critical for worktree reconciliation).
     try {
-        await flushWorkflowProjections(artifactBasePath, { milestoneId: params.milestoneId });
+        await renderMilestoneShellProjections(artifactBasePath, params.milestoneId);
     }
     catch (projErr) {
         logWarning("tool", `complete-slice projection warning for ${params.milestoneId}/${params.sliceId}: ${projErr.message}`);

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

@@ -5,13 +5,15 @@
  *
  * Validates inputs, writes task row and rendered SUMMARY.md to DB in a
  * transaction, then renders projections to disk and invalidates caches.
- * Projection write failures are reported as stale projections and do not roll
- * back committed DB state.
+ * If the critical task summary / plan projection write fails, the DB
+ * completion is compensated back to pending so DB state does not drift ahead
+ * of PLAN.md.
  */
-import { existsSync } from "node:fs";
+import { existsSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
 import { isClosedStatus } from "../status-guards.js";
 import { transaction, insertMilestone, insertSlice, insertTask, insertVerificationEvidence, getMilestone, getSlice, getTask, updateTaskStatus, deleteVerificationEvidence, saveGateResult, getPendingGatesForTurn, } from "../gsd-db.js";
+import { getWorkflowDatabasePath, ensureWorkflowDbAtPath } from "../db-workspace.js";
 import { getGatesForTurn } from "../gate-registry.js";
 import { gsdProjectionRoot, clearPathCache, resolveMilestonePath, resolveSlicePath } from "../paths.js";
 import { resolveCanonicalMilestoneRoot } from "../worktree-manager.js";
@@ -19,8 +21,7 @@ import { checkOwnership, taskUnitKey } from "../unit-ownership.js";
 import { saveFile, clearParseCache } from "../files.js";
 import { invalidateStateCache } from "../state.js";
 import { renderPlanCheckboxes } from "../markdown-renderer.js";
-import { renderSummaryContent } from "../workflow-projections.js";
-import { flushWorkflowProjections } from "../projection-flush.js";
+import { renderMilestoneShellProjections, renderSummaryContent, } from "../workflow-projections.js";
 import { writeManifest } from "../workflow-manifest.js";
 import { appendEvent } from "../workflow-events.js";
 import { logWarning, logError } from "../workflow-logger.js";
@@ -60,7 +61,7 @@ async function repairMissingTaskSummaryProjection(artifactBasePath, taskRow) {
     clearPathCache();
     clearParseCache();
     try {
-        await flushWorkflowProjections(artifactBasePath, { milestoneId: taskRow.milestone_id });
+        await renderMilestoneShellProjections(artifactBasePath, taskRow.milestone_id);
     }
     catch (projErr) {
         logWarning("tool", `complete-task repair projection warning: ${projErr.message}`);
@@ -181,6 +182,7 @@ export async function handleCompleteTask(params, basePath) {
     let guardError = null;
     let summaryMd = "";
     let repairTaskSummaryRow = null;
+    const rollbackDbPath = getWorkflowDatabasePath();
     // ── ADR-011 Phase 2: validate escalation payload BEFORE any side effects ─
     // Building the artifact runs the full shape validation (2-4 options, unique
     // ids, recommendation references a real id). If the payload is malformed
@@ -317,20 +319,48 @@ export async function handleCompleteTask(params, basePath) {
     if (guardError) {
         return { error: guardError };
     }
-    let projectionStale = false;
     // Resolve and write summary to disk
     const summaryPath = taskSummaryPath(artifactBasePath, params.milestoneId, params.sliceId, params.taskId);
     try {
         await saveFile(summaryPath, summaryMd);
         // Toggle or regenerate the plan projection from DB. Missing projection
         // files are rebuilt by the renderer instead of being skipped.
-        await renderPlanCheckboxes(artifactBasePath, params.milestoneId, params.sliceId);
+        if (!ensureWorkflowDbAtPath(rollbackDbPath)) {
+            throw new Error(`database unavailable before plan projection render for ${params.milestoneId}/${params.sliceId}`);
+        }
+        const wrotePlan = await renderPlanCheckboxes(artifactBasePath, params.milestoneId, params.sliceId);
+        if (!wrotePlan) {
+            throw new Error(`plan projection write returned false for ${params.milestoneId}/${params.sliceId}`);
+        }
     }
     catch (renderErr) {
-        projectionStale = true;
-        logWarning("projection", `complete_task projection write failed for ${params.milestoneId}/${params.sliceId}/${params.taskId}; DB completion remains committed`, {
-            error: renderErr.message,
-        });
+        logWarning("projection", `complete_task projection write failed for ${params.milestoneId}/${params.sliceId}/${params.taskId}`, { error: renderErr.message });
+        let rollbackSucceeded = false;
+        try {
+            ensureWorkflowDbAtPath(rollbackDbPath);
+            deleteVerificationEvidence(params.milestoneId, params.sliceId, params.taskId);
+            updateTaskStatus(params.milestoneId, params.sliceId, params.taskId, "pending");
+            invalidateStateCache();
+            rollbackSucceeded = true;
+        }
+        catch (rollbackErr) {
+            logWarning("projection", `complete_task rollback failed after projection write failure for ${params.milestoneId}/${params.sliceId}/${params.taskId}: ${rollbackErr.message}`);
+        }
+        try {
+            if (existsSync(summaryPath))
+                unlinkSync(summaryPath);
+        }
+        catch (summaryErr) {
+            logWarning("projection", `complete_task could not remove SUMMARY.md after projection write failure for ${params.milestoneId}/${params.sliceId}/${params.taskId}: ${summaryErr.message}`);
+        }
+        // Clear path/parse caches regardless of rollback outcome so stale
+        // entries from the failed write attempt don't leak into subsequent calls.
+        clearPathCache();
+        clearParseCache();
+        const returnMsg = rollbackSucceeded
+            ? `complete_task projection write failed for ${params.milestoneId}/${params.sliceId}/${params.taskId}; rolled completion back to pending`
+            : `complete_task projection write failed for ${params.milestoneId}/${params.sliceId}/${params.taskId}; rollback also failed — task may remain complete with stale plan`;
+        return { error: returnMsg };
     }
     // ── Close gates owned by execute-task (Q5/Q6/Q7) for this task ────────
     // Each gate id maps to a specific params field via taskGateFieldForId.
@@ -435,7 +465,7 @@ export async function handleCompleteTask(params, basePath) {
     // Separate try/catch per step so a projection failure doesn't prevent
     // the event log entry (critical for worktree reconciliation).
     try {
-        await flushWorkflowProjections(artifactBasePath, { milestoneId: params.milestoneId });
+        await renderMilestoneShellProjections(artifactBasePath, params.milestoneId);
     }
     catch (projErr) {
         logWarning("tool", `complete-task projection warning: ${projErr.message}`);
@@ -465,6 +495,5 @@ export async function handleCompleteTask(params, basePath) {
         milestoneId: params.milestoneId,
         summaryPath,
         ...(escalationMetadata ? { escalation: escalationMetadata } : {}),
-        ...(projectionStale ? { stale: true } : {}),
     };
 }

package/dist/resources/extensions/gsd/tools/exec-tool.js

@@ -144,7 +144,7 @@ export async function executeGsdExec(params, deps) {
     if (bashReferencesProjectRootOutsideWorktree(script, deps.baseDir)) {
         return paramError("script references the original project root while running inside a milestone worktree; use the active worktree path or relative paths");
     }
-    const opts = buildExecOptions(deps.baseDir, deps.preferences?.context_mode, { env: deps.env, now: deps.now, generateId: deps.generateId });
+    const opts = buildExecOptions(deps.baseDir, deps.preferences?.context_mode, { env: deps.env, now: deps.now, generateId: deps.generateId, signal: deps.signal });
     const run = deps.run ?? runExecSandbox;
     try {
         const result = await run({
@@ -235,6 +235,7 @@ function formatResult(result) {
             exit_code: result.exit_code,
             signal: result.signal,
             timed_out: result.timed_out,
+            aborted: result.aborted === true,
             force_resolved: result.force_resolved,
             duration_ms: result.duration_ms,
             stdout_bytes: result.stdout_bytes,
@@ -245,12 +246,16 @@ function formatResult(result) {
             stderr_path: result.stderr_path,
             meta_path: result.meta_path,
         },
-        isError: result.timed_out || result.signal !== null || result.exit_code !== 0,
+        isError: result.aborted === true || result.timed_out || result.signal !== null || result.exit_code !== 0,
     };
 }
 function formatExit(result) {
     // force_resolved means a non-closing (D-state) child was force-resolved past its
     // hard deadline rather than observed exiting; distinguish it from a clean timeout.
+    if (result.aborted && result.force_resolved)
+        return "aborted(force-killed)";
+    if (result.aborted)
+        return "aborted";
     if (result.force_resolved)
         return "timeout(force-killed)";
     if (result.timed_out)

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

@@ -28,9 +28,13 @@ function validateRepositoryTargetIds(field, value) {
     return deduped;
 }
 function validateTasks(value) {
-    if (!Array.isArray(value) || value.length === 0) {
-        throw new Error("tasks must be a non-empty array");
+    if (value === undefined)
+        return undefined;
+    if (!Array.isArray(value)) {
+        throw new Error("tasks must be an array");
     }
+    if (value.length === 0)
+        return undefined;
     const seen = new Set();
     return value.map((entry, index) => {
         if (!entry || typeof entry !== "object") {
@@ -129,7 +133,7 @@ function validateReferencedRepositories(params, registry, defaultTargets) {
     };
     for (const id of params.targetRepositories ?? defaultTargets)
         noteMissing(id);
-    for (const task of params.tasks) {
+    for (const task of params.tasks ?? []) {
         for (const id of task.targetRepositories ?? params.targetRepositories ?? defaultTargets)
             noteMissing(id);
     }
@@ -141,7 +145,7 @@ function resolveAllowedRootsForPathScope(params, registry, defaultTargets) {
     const requested = new Set();
     for (const id of params.targetRepositories ?? defaultTargets)
         requested.add(id);
-    for (const task of params.tasks) {
+    for (const task of params.tasks ?? []) {
         for (const id of task.targetRepositories ?? params.targetRepositories ?? defaultTargets)
             requested.add(id);
     }
@@ -153,7 +157,7 @@ function resolveAllowedRootsForPathScope(params, registry, defaultTargets) {
     return roots.length > 0 ? roots : [registry.projectRoot];
 }
 function toTaskRows(params, defaultTargets) {
-    return params.tasks.map((task, index) => ({
+    return (params.tasks ?? []).map((task, index) => ({
         milestone_id: params.milestoneId,
         slice_id: params.sliceId,
         id: task.taskId,
@@ -230,19 +234,21 @@ export async function handlePlanSlice(rawParams, basePath) {
         return { error: `validation failed: ${message}` };
     }
     const defaultTargets = defaultRepositoryTargets(repositoryRegistry);
+    const taskPayload = params.tasks ?? [];
+    const hasTaskPayload = taskPayload.length > 0;
     const repoValidationError = validateReferencedRepositories(params, repositoryRegistry, defaultTargets);
     if (repoValidationError) {
         return { error: `validation failed: ${repoValidationError}` };
     }
     const allowedAbsoluteRoots = resolveAllowedRootsForPathScope(params, repositoryRegistry, defaultTargets);
-    const pathOnlyError = validatePathOnlyPlanningFields(params.tasks.map((task, index) => ({
+    const pathOnlyError = validatePathOnlyPlanningFields(taskPayload.map((task, index) => ({
         field: `tasks[${index}].expectedOutput`,
         values: task.expectedOutput,
     })));
     if (pathOnlyError) {
         return { error: `validation failed: ${pathOnlyError}` };
     }
-    const pathScopeError = validatePlanningPathScope(basePath, params.tasks.flatMap((task, index) => [
+    const pathScopeError = validatePlanningPathScope(basePath, taskPayload.flatMap((task, index) => [
         { field: `tasks[${index}].files`, values: task.files },
         { field: `tasks[${index}].inputs`, values: task.inputs },
         { field: `tasks[${index}].expectedOutput`, values: task.expectedOutput },
@@ -279,15 +285,17 @@ export async function handlePlanSlice(rawParams, basePath) {
                 guardError = `cannot re-plan slice ${params.sliceId}: it is already complete — use gsd_slice_reopen first`;
                 return;
             }
-            const newTaskIds = new Set(params.tasks.map((task) => task.taskId));
+            const newTaskIds = new Set(taskPayload.map((task) => task.taskId));
             const existingTasks = getSliceTasks(params.milestoneId, params.sliceId);
-            omittedTaskIds = existingTasks
-                .filter((task) => !newTaskIds.has(task.id))
-                .map((task) => task.id);
-            for (const task of existingTasks) {
-                if (!newTaskIds.has(task.id) && isClosedStatus(task.status)) {
-                    guardError = `cannot remove completed task ${task.id}`;
-                    return;
+            if (hasTaskPayload) {
+                omittedTaskIds = existingTasks
+                    .filter((task) => !newTaskIds.has(task.id))
+                    .map((task) => task.id);
+                for (const task of existingTasks) {
+                    if (!newTaskIds.has(task.id) && isClosedStatus(task.status)) {
+                        guardError = `cannot remove completed task ${task.id}`;
+                        return;
+                    }
                 }
             }
             if (isDeferredStatus(parentSlice.status)) {
@@ -301,34 +309,36 @@ export async function handlePlanSlice(rawParams, basePath) {
                 observabilityImpact: params.observabilityImpact,
                 targetRepositories: params.targetRepositories ?? defaultTargets,
             });
-            for (const taskId of omittedTaskIds) {
-                deleteTask(params.milestoneId, params.sliceId, taskId);
-            }
-            const existingTaskById = new Map(existingTasks.map((task) => [task.id, task]));
-            for (const task of params.tasks) {
-                const planning = {
-                    title: task.title,
-                    description: task.description,
-                    estimate: task.estimate,
-                    files: task.files,
-                    verify: task.verify,
-                    inputs: task.inputs,
-                    expectedOutput: task.expectedOutput,
-                    observabilityImpact: task.observabilityImpact ?? "",
-                    fullPlanMd: task.fullPlanMd,
-                    targetRepositories: task.targetRepositories ?? params.targetRepositories ?? defaultTargets,
-                };
-                const existingTask = existingTaskById.get(task.taskId);
-                if (!existingTask || !isClosedStatus(existingTask.status)) {
-                    insertTask({
-                        id: task.taskId,
-                        sliceId: params.sliceId,
-                        milestoneId: params.milestoneId,
+            if (hasTaskPayload) {
+                for (const taskId of omittedTaskIds) {
+                    deleteTask(params.milestoneId, params.sliceId, taskId);
+                }
+                const existingTaskById = new Map(existingTasks.map((task) => [task.id, task]));
+                for (const task of taskPayload) {
+                    const planning = {
                         title: task.title,
-                        status: "pending",
-                    });
+                        description: task.description,
+                        estimate: task.estimate,
+                        files: task.files,
+                        verify: task.verify,
+                        inputs: task.inputs,
+                        expectedOutput: task.expectedOutput,
+                        observabilityImpact: task.observabilityImpact ?? "",
+                        fullPlanMd: task.fullPlanMd,
+                        targetRepositories: task.targetRepositories ?? params.targetRepositories ?? defaultTargets,
+                    };
+                    const existingTask = existingTaskById.get(task.taskId);
+                    if (!existingTask || !isClosedStatus(existingTask.status)) {
+                        insertTask({
+                            id: task.taskId,
+                            sliceId: params.sliceId,
+                            milestoneId: params.milestoneId,
+                            title: task.title,
+                            status: "pending",
+                        });
+                    }
+                    upsertTaskPlanning(params.milestoneId, params.sliceId, task.taskId, planning);
                 }
-                upsertTaskPlanning(params.milestoneId, params.sliceId, task.taskId, planning);
             }
             // Seed quality gate rows inside the transaction — all-or-nothing with
             // the plan data so a crash can't leave orphaned gates without tasks.
@@ -337,7 +347,7 @@ export async function handlePlanSlice(rawParams, basePath) {
                 insertGateRow({ milestoneId: params.milestoneId, sliceId: params.sliceId, gateId: gid, scope: "slice" });
             }
             const taskGates = resolveTaskGates(gateEvaluation);
-            for (const task of params.tasks) {
+            for (const task of taskPayload) {
                 for (const gid of taskGates) {
                     insertGateRow({ milestoneId: params.milestoneId, sliceId: params.sliceId, gateId: gid, scope: "task", taskId: task.taskId });
                 }
@@ -360,8 +370,13 @@ export async function handlePlanSlice(rawParams, basePath) {
             const artifactPath = relative(gsdProjectionRoot(basePath), taskPlanPath).replace(/\\/g, "/");
             deleteArtifactByPath(artifactPath);
         }
-        const renderResult = await renderPlanFromDb(basePath, params.milestoneId, params.sliceId);
-        setSliceSketchFlag(params.milestoneId, params.sliceId, false);
+        const sliceTasks = getSliceTasks(params.milestoneId, params.sliceId);
+        const renderResult = sliceTasks.length === 0
+            ? { planPath: "", taskPlanPaths: [] }
+            : await renderPlanFromDb(basePath, params.milestoneId, params.sliceId);
+        if (sliceTasks.length > 0) {
+            setSliceSketchFlag(params.milestoneId, params.sliceId, false);
+        }
         invalidateStateCache();
         clearParseCache();
         // ── Post-mutation hook: manifest, event log ─────────────────────────

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

@@ -1,14 +1,16 @@
 import { clearParseCache } from "../files.js";
 import { isClosedStatus } from "../status-guards.js";
 import { isNonEmptyString, validateStringArray } from "../validation.js";
-import { transaction, getSlice, getTask, insertTask, upsertTaskPlanning } from "../gsd-db.js";
+import { getGateIdsForTurn } from "../gate-registry.js";
+import { transaction, getSlice, getTask, insertTask, upsertTaskPlanning, insertGateRow, setSliceSketchFlag } from "../gsd-db.js";
 import { invalidateStateCache } from "../state.js";
 import { renderTaskPlanFromDb, renderPlanFromDb } from "../markdown-renderer.js";
-import { resolveSliceFile, resolveTasksDir } from "../paths.js";
+import { resolveTasksDir } from "../paths.js";
 import { flushWorkflowProjections } from "../projection-flush.js";
 import { writeManifest } from "../workflow-manifest.js";
 import { appendEvent } from "../workflow-events.js";
 import { logWarning } from "../workflow-logger.js";
+import { loadEffectiveGSDPreferences } from "../preferences.js";
 import { validatePathOnlyPlanningFields, validatePlanningPathScope } from "../planning-path-scope.js";
 function validateParams(params) {
     if (!isNonEmptyString(params?.milestoneId))
@@ -35,6 +37,12 @@ function validateParams(params) {
         expectedOutput: validateStringArray(params.expectedOutput, "expectedOutput"),
     };
 }
+function resolveTaskGates(basePath) {
+    const loaded = loadEffectiveGSDPreferences(basePath);
+    if (loaded?.preferences?.gate_evaluation?.task_gates === false)
+        return [];
+    return [...getGateIdsForTurn("execute-task")];
+}
 export async function handlePlanTask(rawParams, basePath) {
     let params;
     try {
@@ -57,6 +65,14 @@ export async function handlePlanTask(rawParams, basePath) {
     if (pathScopeError) {
         return { error: `validation failed: ${pathScopeError}` };
     }
+    let taskGates;
+    try {
+        taskGates = resolveTaskGates(basePath);
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        return { error: `validation failed: ${message}` };
+    }
     // ── Guards + DB writes inside a single transaction (prevents TOCTOU) ───
     // Guards must be inside the transaction so the state they check cannot
     // change between the read and the write (#2723).
@@ -97,6 +113,9 @@ export async function handlePlanTask(rawParams, basePath) {
                 observabilityImpact: params.observabilityImpact ?? "",
                 fullPlanMd: params.fullPlanMd,
             });
+            for (const gid of taskGates) {
+                insertGateRow({ milestoneId: params.milestoneId, sliceId: params.sliceId, gateId: gid, scope: "task", taskId: params.taskId });
+            }
         });
     }
     catch (err) {
@@ -110,17 +129,21 @@ export async function handlePlanTask(rawParams, basePath) {
         // Flat-phase: tasks live as checkboxes in the slice plan's <tasks> block,
         // not as standalone TID-PLAN.md files. Re-render the slice plan so the
         // new/updated task appears in the plan file that gsd-core reads.
-        // Guard: resolveTasksDir is null in flat-phase (no tasks/ subdir exists);
-        //        only sync if a slice plan already exists (guards pre-plan-slice calls).
+        // Guard: resolveTasksDir is null in flat-phase (no tasks/ subdir exists).
+        let slicePlanSynced = false;
         try {
             const tDir = resolveTasksDir(basePath, params.milestoneId, params.sliceId);
-            if (!tDir && resolveSliceFile(basePath, params.milestoneId, params.sliceId, "PLAN")) {
+            if (!tDir) {
                 await renderPlanFromDb(basePath, params.milestoneId, params.sliceId);
+                slicePlanSynced = true;
             }
         }
         catch (syncErr) {
             logWarning("tool", `plan-task: slice-plan sync failed: ${syncErr.message}`);
         }
+        if (slicePlanSynced) {
+            setSliceSketchFlag(params.milestoneId, params.sliceId, false);
+        }
         invalidateStateCache();
         clearParseCache();
         // ── Post-mutation hook: projections, manifest, event log ─────────────

package/dist/resources/extensions/gsd/undo.js

@@ -13,6 +13,7 @@ import { gsdRoot, resolveTasksDir, resolveSlicePath, resolveSliceFile, resolveTa
 import { sendDesktopNotification } from "./notifications.js";
 import { getTask, getSlice, getSliceTasks, updateTaskStatus, resetSliceCascade } from "./gsd-db.js";
 import { renderPlanCheckboxes, renderRoadmapCheckboxes } from "./markdown-renderer.js";
+import { UNIT_REGISTRY } from "./unit-registry.js";
 /**
  * Undo the last completed unit: revert git commits,
  * delete summary artifacts, and uncheck the task in PLAN.
@@ -35,15 +36,19 @@ export async function handleUndo(args, ctx, _pi, basePath) {
         ctx.ui.notify("Nothing to undo — no activity logs found.", "info");
         return;
     }
-    // Extract unit type and ID from the most recent activity log filename
-    // Format: <seq>-<unitType>-<unitId>.jsonl
-    const match = files[0].match(/^\d+-(.+?)-(.+)\.jsonl$/);
-    if (!match) {
+    // Extract unit type and ID from the most recent activity log filename.
+    // Both the unit type and the unit ID may contain hyphens, so anchor on the
+    // known unit-type vocabulary instead of guessing the unit-ID shape: a regex
+    // tuned to milestone-shaped IDs rejects project-level units whose IDs are
+    // symbolic (e.g. discuss-project uses PROJECT, workflow-preferences uses
+    // WORKFLOW-PREFS).
+    const parsed = parseActivityLogFilename(files[0]);
+    if (!parsed) {
         ctx.ui.notify("Nothing to undo — could not parse latest activity log.", "warning");
         return;
     }
-    const unitType = match[1];
-    const unitId = match[2].replace(/-/g, "/");
+    const unitType = parsed.unitType;
+    const unitId = parsed.unitId.replace(/-/g, "/");
     if (!force) {
         ctx.ui.notify(`Will undo: ${unitType} (${unitId})\n` +
             `This will:\n` +
@@ -87,6 +92,11 @@ export async function handleUndo(args, ctx, _pi, basePath) {
     if (unitType === "execute-task" && task !== undefined && slice !== undefined) {
         const [mid, sid, tid] = [milestone, slice, task];
         planUpdated = uncheckTaskInPlan(basePath, mid, sid, tid);
+        if (getTask(mid, sid, tid)) {
+            updateTaskStatus(mid, sid, tid, "pending");
+            await renderPlanCheckboxes(basePath, mid, sid);
+            planUpdated = true;
+        }
     }
     // 3. Try to revert git commits from activity log
     let commitsReverted = 0;
@@ -318,6 +328,33 @@ export async function handleResetSlice(args, ctx, _pi, basePath) {
     ctx.ui.notify(results.join("\n"), "success");
 }
 // ─── Helpers ──────────────────────────────────────────────────────────────────
+// Known unit types sorted longest-first so a more specific type (e.g.
+// "execute-task-simple") matches before a prefix of it ("execute-task") when
+// splitting "<seq>-<unitType>-<unitId>.jsonl".
+const UNIT_TYPES_BY_LENGTH_DESC = Object.keys(UNIT_REGISTRY).sort((a, b) => b.length - a.length);
+/**
+ * Parse an activity-log filename of the form `<seq>-<unitType>-<unitId>.jsonl`
+ * (the format written by activity-log.ts). Both the unit type and the unit ID
+ * may contain hyphens, so we anchor on the known unit-type vocabulary rather
+ * than guessing the ID shape. This keeps non-milestone IDs (e.g. PROJECT,
+ * WORKFLOW-PREFS) parseable. Returns null when the name has no sequence prefix
+ * or does not start with a recognised unit type.
+ */
+export function parseActivityLogFilename(filename) {
+    const seqMatch = filename.match(/^\d+-(.+)\.jsonl$/);
+    if (!seqMatch)
+        return null;
+    const rest = seqMatch[1];
+    for (const unitType of UNIT_TYPES_BY_LENGTH_DESC) {
+        const prefix = `${unitType}-`;
+        if (rest.startsWith(prefix)) {
+            const unitId = rest.slice(prefix.length);
+            if (unitId.length > 0)
+                return { unitType, unitId };
+        }
+    }
+    return null;
+}
 export function uncheckTaskInPlan(basePath, mid, sid, tid) {
     const slicePath = resolveSlicePath(basePath, mid, sid);
     if (!slicePath)

package/dist/resources/extensions/gsd/unit-context-composer.js

@@ -92,13 +92,27 @@ const CONTEXT_MODE_GUIDANCE_BY_LANE = {
     orchestration: "Use `gsd_resume` before resuming orchestration, `gsd_exec_search` to reuse prior runs, and `gsd_exec` for noisy coordination checks.",
     docs: "Use `gsd_resume` for prior context, `gsd_exec_search` for saved evidence, and `gsd_exec` for noisy doc validation commands.",
 };
-// Per-unit overrides win over the lane default. run-uat's tool contract
-// forbids `gsd_exec`/`gsd_exec_search` (acceptance evidence must flow through
-// `gsd_uat_exec`) and Claude Code dispatch strips the tools entirely, so the
-// shared verification-lane guidance would steer the agent into calling an
-// unavailable tool.
-const CONTEXT_MODE_GUIDANCE_BY_UNIT = {
+// Per-unit overrides win over the lane default. Some units intentionally run
+// with narrower tool contracts than their shared Context Mode lane, so their
+// guidance must name only tools the unit can actually call.
+export const CONTEXT_MODE_GUIDANCE_BY_UNIT = {
+    "discuss-milestone": "Use `ask_user_questions` to continue the milestone interview, then persist outcomes with `gsd_summary_save`, `gsd_decision_save`, `gsd_requirement_save`, `gsd_requirement_update`, `gsd_plan_milestone`, or `gsd_milestone_generate_id` as appropriate.",
+    "discuss-slice": "Use `ask_user_questions` to continue the slice interview, then persist outcomes with `gsd_summary_save` or `gsd_decision_save` as appropriate.",
+    "discuss-project": "Use `ask_user_questions` to continue the project interview, then persist outcomes with `gsd_summary_save`, `gsd_decision_save`, or `gsd_requirement_save` as appropriate.",
+    "discuss-requirements": "Use `ask_user_questions` to continue the requirements interview, then persist outcomes with `gsd_requirement_save` or `gsd_summary_save` as appropriate.",
+    "replan-slice": "Use `gsd_replan_slice` to persist the revised slice plan, and `gsd_decision_save` for planning decisions that need durable rationale.",
+    "reassess-roadmap": "Use `gsd_milestone_status` to inspect current milestone state, then `gsd_reassess_roadmap` to persist the roadmap reassessment.",
     "run-uat": "Use `gsd_uat_exec` for acceptance checks so evidence is typed as UAT-owned, and `gsd_resume` after compaction or resume.",
+    "research-project": "Dispatch parallel scout subagents for stack, features, architecture, and pitfalls research; each writes one file under `.gsd/research/` (`STACK.md`, `FEATURES.md`, `ARCHITECTURE.md`, `PITFALLS.md`).",
+    "gate-evaluate": "Use `subagent` to dispatch tester agents, then persist each gate with `gsd_save_gate_result`; rely on testers for verification evidence.",
+};
+// Per-unit guidance for the nested render mode (renderMode: "nested"), used when this
+// unit's Context Mode line is embedded into a subagent prompt — e.g. the tester prompts
+// dispatched by gate-evaluate. Must instruct the subagent on what IT should do, not
+// re-state the parent coordinator's dispatch instructions. Falls back to
+// CONTEXT_MODE_GUIDANCE_BY_UNIT then the lane default when no nested entry exists.
+export const CONTEXT_MODE_NESTED_GUIDANCE_BY_UNIT = {
+    "gate-evaluate": "Run verification checks to answer the gate question, then persist the verdict with `gsd_save_gate_result`.",
 };
 /**
  * Render the Context Mode instruction lane for a unit type. Unknown unit
@@ -112,7 +126,9 @@ export function composeContextModeInstructions(unitType, opts) {
     if (!manifest || manifest.contextMode === "none")
         return "";
     const lane = CONTEXT_MODE_LANE_LABELS[manifest.contextMode];
-    const guidance = CONTEXT_MODE_GUIDANCE_BY_UNIT[unitType] ?? CONTEXT_MODE_GUIDANCE_BY_LANE[manifest.contextMode];
+    const guidance = (opts.renderMode === "nested" ? CONTEXT_MODE_NESTED_GUIDANCE_BY_UNIT[unitType] : undefined)
+        ?? CONTEXT_MODE_GUIDANCE_BY_UNIT[unitType]
+        ?? CONTEXT_MODE_GUIDANCE_BY_LANE[manifest.contextMode];
     if (opts.renderMode === "nested") {
         return `Context Mode (${lane} lane): ${guidance}`;
     }