@opengsd/gsd-pi 1.8.1 → 1.9.0

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

@@ -12,7 +12,7 @@
 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 { transaction, insertMilestone, insertSlice, insertTask, insertVerificationEvidence, getMilestone, getSlice, getTask, updateTaskStatus, deleteVerificationEvidence, saveGateResult, getPendingGatesForTurn, getUnresolvedBlockingReworkFindingsForTask, getBlockingReworkFindingsForTask, applyReworkResolutions, } 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";
@@ -107,6 +107,44 @@ export function normalizeListParam(value) {
  * Build a TaskRow-shaped object from CompleteTaskParams so the unified
  * renderSummaryContent() can be used at completion time (#2720).
  */
+function normalizeReworkResolution(params) {
+    return (params.reworkResolution ?? []).map((resolution) => ({
+        milestoneId: params.milestoneId,
+        sliceId: params.sliceId,
+        taskId: params.taskId,
+        findingId: resolution.findingId,
+        status: resolution.status,
+        evidence: resolution.evidence,
+        decisionRef: resolution.decisionRef,
+    }));
+}
+function unresolvedReworkError(missingFindingIds) {
+    const plural = missingFindingIds.length === 1 ? "finding" : "findings";
+    return `unresolved blocking rework ${plural}: ${missingFindingIds.join(", ")} — provide reworkResolution entries with status resolved and evidence, or status deferred-with-override with evidence and decisionRef, before completing the task`;
+}
+function satisfiesBlockingReworkFinding(resolution) {
+    if (resolution.evidence.trim().length === 0)
+        return false;
+    if (resolution.status === "resolved")
+        return true;
+    return (resolution.decisionRef ?? "").trim().length > 0;
+}
+/**
+ * Restore rework findings to their pre-completion state.
+ *
+ * The completion transaction flips blocking findings to resolved/
+ * deferred-with-override via applyReworkResolutions. When a later projection
+ * or escalation write fails and we compensate by reverting the task to
+ * `pending`, we must also revert those findings. Otherwise a retry sees no
+ * unresolved blocking findings (getUnresolvedBlockingReworkFindingsForTask
+ * only returns `pending` rows) and completes the task with the blocking gate
+ * silently skipped.
+ */
+function revertAppliedReworkResolutions(snapshot) {
+    if (snapshot.length === 0)
+        return;
+    applyReworkResolutions(snapshot);
+}
 function paramsToTaskRow(params, completedAt) {
     return {
         milestone_id: params.milestoneId,
@@ -182,6 +220,7 @@ export async function handleCompleteTask(params, basePath) {
     let guardError = null;
     let summaryMd = "";
     let repairTaskSummaryRow = null;
+    let appliedReworkSnapshot = [];
     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
@@ -192,6 +231,7 @@ export async function handleCompleteTask(params, basePath) {
     // no escalation recorded, and the loop would silently advance past it.
     // The filesystem write happens later (after side effects) because that's
     // the cheapest ordering and validation is where 99% of failures live.
+    const reworkResolutions = normalizeReworkResolution(params);
     let validatedEscalationArtifact = null;
     let escalationWriteEnabled = false;
     if (params.escalation) {
@@ -231,6 +271,17 @@ export async function handleCompleteTask(params, basePath) {
             return;
         }
         const existingTask = getTask(params.milestoneId, params.sliceId, params.taskId);
+        const unresolvedRework = getUnresolvedBlockingReworkFindingsForTask(params.milestoneId, params.sliceId, params.taskId);
+        const resolvedFindingIds = new Set(reworkResolutions
+            .filter(satisfiesBlockingReworkFinding)
+            .map((resolution) => resolution.findingId));
+        const missingFindingIds = unresolvedRework
+            .filter((finding) => !resolvedFindingIds.has(finding.finding_id))
+            .map((finding) => finding.finding_id);
+        if (missingFindingIds.length > 0) {
+            guardError = unresolvedReworkError(missingFindingIds);
+            return;
+        }
         if (existingTask && isClosedStatus(existingTask.status)) {
             // Stale-turn path: a timed-out turn that was superseded by recovery
             // can still reach this code when its LLM call eventually returns and
@@ -278,6 +329,33 @@ export async function handleCompleteTask(params, basePath) {
             keyDecisions: params.keyDecisions ?? [],
             fullSummaryMd: summaryMd,
         });
+        // Only persist resolutions that actually satisfy the evidence
+        // requirement. The guard above admits a finding as long as ONE satisfying
+        // entry exists, but applyReworkResolutions writes by findingId and lets the
+        // last entry win. Persisting every entry would let a later non-satisfying
+        // duplicate (empty evidence, or deferred-with-override without decisionRef)
+        // overwrite a valid resolution and leave the finding non-pending without
+        // acceptable evidence. Filtering with the same predicate the guard uses
+        // keeps the applied set and the gate consistent.
+        const resolutionsToApply = reworkResolutions.filter(satisfiesBlockingReworkFinding);
+        if (resolutionsToApply.length > 0) {
+            // Snapshot the pre-resolution state of the findings we're about to
+            // change so a compensating rollback can restore them exactly (see
+            // revertAppliedReworkResolutions).
+            const resolvedFindingIdsForSnapshot = new Set(resolutionsToApply.map((r) => r.findingId));
+            appliedReworkSnapshot = getBlockingReworkFindingsForTask(params.milestoneId, params.sliceId, params.taskId)
+                .filter((finding) => resolvedFindingIdsForSnapshot.has(finding.finding_id))
+                .map((finding) => ({
+                milestoneId: params.milestoneId,
+                sliceId: params.sliceId,
+                taskId: params.taskId,
+                findingId: finding.finding_id,
+                status: finding.status,
+                evidence: finding.evidence,
+                decisionRef: finding.decision_ref,
+            }));
+            applyReworkResolutions(resolutionsToApply);
+        }
         for (const evidence of (params.verificationEvidence ?? [])) {
             insertVerificationEvidence({
                 taskId: params.taskId,
@@ -340,6 +418,7 @@ export async function handleCompleteTask(params, basePath) {
             ensureWorkflowDbAtPath(rollbackDbPath);
             deleteVerificationEvidence(params.milestoneId, params.sliceId, params.taskId);
             updateTaskStatus(params.milestoneId, params.sliceId, params.taskId, "pending");
+            revertAppliedReworkResolutions(appliedReworkSnapshot);
             invalidateStateCache();
             rollbackSucceeded = true;
         }
@@ -430,6 +509,7 @@ export async function handleCompleteTask(params, basePath) {
                 try {
                     deleteVerificationEvidence(params.milestoneId, params.sliceId, params.taskId);
                     updateTaskStatus(params.milestoneId, params.sliceId, params.taskId, 'pending');
+                    revertAppliedReworkResolutions(appliedReworkSnapshot);
                     invalidateStateCache();
                     logWarning("tool", `complete-task rolled back DB completion for ${params.milestoneId}/${params.sliceId}/${params.taskId} after escalation write failure; SUMMARY.md left on disk for retry.`);
                 }
@@ -447,6 +527,7 @@ export async function handleCompleteTask(params, basePath) {
             try {
                 deleteVerificationEvidence(params.milestoneId, params.sliceId, params.taskId);
                 updateTaskStatus(params.milestoneId, params.sliceId, params.taskId, 'pending');
+                revertAppliedReworkResolutions(appliedReworkSnapshot);
                 invalidateStateCache();
                 logWarning("tool", `complete-task rolled back DB completion for ${params.milestoneId}/${params.sliceId}/${params.taskId} because hard-blocker escalation handling is disabled; SUMMARY.md left on disk for retry.`);
             }

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

@@ -5,7 +5,7 @@ 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 { resolveTasksDir } from "../paths.js";
+import { resolveMilestonePath, resolveSlicePath } from "../paths.js";
 import { flushWorkflowProjections } from "../projection-flush.js";
 import { writeManifest } from "../workflow-manifest.js";
 import { appendEvent } from "../workflow-events.js";
@@ -193,21 +193,19 @@ export async function handlePlanTask(rawParams, basePath) {
         return { error: guardError };
     }
     try {
-        const renderResult = await renderTaskPlanFromDb(basePath, params.milestoneId, params.sliceId, params.taskId);
-        // 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).
+        const milestonePath = resolveMilestonePath(basePath, params.milestoneId);
+        const slicePath = resolveSlicePath(basePath, params.milestoneId, params.sliceId);
+        const isLegacySliceLayout = Boolean(milestonePath && slicePath && slicePath !== milestonePath);
+        let renderedPath;
         let slicePlanSynced = false;
-        try {
-            const tDir = resolveTasksDir(basePath, params.milestoneId, params.sliceId);
-            if (!tDir) {
-                await renderPlanFromDb(basePath, params.milestoneId, params.sliceId);
-                slicePlanSynced = true;
-            }
+        if (isLegacySliceLayout) {
+            const renderResult = await renderTaskPlanFromDb(basePath, params.milestoneId, params.sliceId, params.taskId);
+            renderedPath = renderResult.taskPlanPath;
         }
-        catch (syncErr) {
-            logWarning("tool", `plan-task: slice-plan sync failed: ${syncErr.message}`);
+        else {
+            const renderResult = await renderPlanFromDb(basePath, params.milestoneId, params.sliceId);
+            renderedPath = renderResult.planPath;
+            slicePlanSynced = true;
         }
         if (slicePlanSynced) {
             setSliceSketchFlag(params.milestoneId, params.sliceId, false);
@@ -234,7 +232,7 @@ export async function handlePlanTask(rawParams, basePath) {
             milestoneId: params.milestoneId,
             sliceId: params.sliceId,
             taskId: params.taskId,
-            taskPlanPath: renderResult.taskPlanPath,
+            taskPlanPath: renderedPath,
         };
     }
     catch (err) {

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

@@ -1,6 +1,6 @@
 import { existsSync, unlinkSync } from "node:fs";
-import { join } from "node:path";
-import { relSliceFile, resolveMilestoneFile, resolveMilestonePath, targetMilestoneFile } from "../paths.js";
+import { join, relative } from "node:path";
+import { gsdProjectionRoot, gsdRoot, resolveMilestoneFile, resolveMilestonePath, targetMilestoneFile } from "../paths.js";
 import { clearParseCache } from "../files.js";
 import { isClosedStatus } from "../status-guards.js";
 import { isNonEmptyString } from "../validation.js";
@@ -11,6 +11,14 @@ import { flushWorkflowProjections } from "../projection-flush.js";
 import { writeManifest } from "../workflow-manifest.js";
 import { appendEvent } from "../workflow-events.js";
 import { logWarning } from "../workflow-logger.js";
+function assessmentDbPathForRenderedFile(basePath, absPath) {
+    const projectionRoot = gsdProjectionRoot(basePath);
+    const projectionRel = relative(projectionRoot, absPath);
+    const root = projectionRel && !projectionRel.startsWith("..") && !projectionRel.startsWith("/")
+        ? projectionRoot
+        : gsdRoot(basePath);
+    return `.gsd/${relative(root, absPath).replace(/\\/g, "/")}`;
+}
 function validateParams(params) {
     if (!isNonEmptyString(params?.milestoneId))
         throw new Error("milestoneId is required");
@@ -74,10 +82,6 @@ export async function handleReassessRoadmap(rawParams, basePath) {
     catch (err) {
         return { error: `validation failed: ${err.message}` };
     }
-    // ── Compute assessment artifact path ──────────────────────────────
-    // Assessment lives in the completed slice's directory.
-    // Use relSliceFile so the path is layout-aware (flat-phase or legacy).
-    const assessmentRelPath = relSliceFile(basePath, params.milestoneId, params.completedSliceId, "ASSESSMENT");
     // ── 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).
@@ -152,15 +156,6 @@ export async function handleReassessRoadmap(rawParams, basePath) {
                     }
                 }
             }
-            // Record assessment
-            insertAssessment({
-                path: assessmentRelPath,
-                milestoneId: params.milestoneId,
-                sliceId: params.completedSliceId,
-                status: params.verdict,
-                scope: "roadmap",
-                fullContent: params.assessment,
-            });
             // Apply slice modifications
             for (const mod of params.sliceChanges.modified) {
                 updateSliceFields(params.milestoneId, mod.sliceId, {
@@ -220,6 +215,14 @@ export async function handleReassessRoadmap(rawParams, basePath) {
             assessment: params.assessment,
             completedSliceId: params.completedSliceId,
         });
+        insertAssessment({
+            path: assessmentDbPathForRenderedFile(basePath, assessmentResult.assessmentPath),
+            milestoneId: params.milestoneId,
+            sliceId: params.completedSliceId,
+            status: params.verdict,
+            scope: "roadmap",
+            fullContent: params.assessment,
+        });
         // ── Remove stale VALIDATION file from disk (#2957) ────────────
         const hasStructuralChanges = params.sliceChanges.added.length > 0 ||
             params.sliceChanges.modified.length > 0 ||

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

@@ -0,0 +1,128 @@
+import { clearParseCache } from "../files.js";
+import { getSlice, getTask, insertReplanHistory, transaction, upsertTaskPlanning, } from "../gsd-db.js";
+import { invalidateStateCache } from "../state.js";
+import { isClosedStatus } from "../status-guards.js";
+import { isNonEmptyString, validateStringArray } from "../validation.js";
+import { renderPlanFromDb, renderTaskPlanFromDb } from "../markdown-renderer.js";
+import { resolveMilestonePath, resolveSlicePath } 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";
+function validateParams(params) {
+    if (!isNonEmptyString(params?.milestoneId))
+        throw new Error("milestoneId is required");
+    if (!isNonEmptyString(params?.sliceId))
+        throw new Error("sliceId is required");
+    if (!isNonEmptyString(params?.taskId))
+        throw new Error("taskId is required");
+    if (!isNonEmptyString(params?.title))
+        throw new Error("title is required");
+    if (!isNonEmptyString(params?.description))
+        throw new Error("description is required");
+    if (!isNonEmptyString(params?.estimate))
+        throw new Error("estimate is required");
+    if (!isNonEmptyString(params?.verify))
+        throw new Error("verify is required");
+    return {
+        ...params,
+        files: validateStringArray(params.files, "files"),
+        inputs: validateStringArray(params.inputs, "inputs"),
+        expectedOutput: validateStringArray(params.expectedOutput, "expectedOutput"),
+    };
+}
+function replanSummary(params) {
+    const ref = params.reworkBriefRef?.trim();
+    return ref
+        ? `Task ${params.taskId} replanned from rework brief ${ref}`
+        : `Task ${params.taskId} replanned`;
+}
+export async function handleReplanTask(rawParams, basePath) {
+    let params;
+    try {
+        params = validateParams(rawParams);
+    }
+    catch (err) {
+        return { error: `validation failed: ${err.message}` };
+    }
+    let guardError = null;
+    try {
+        transaction(() => {
+            const parentSlice = getSlice(params.milestoneId, params.sliceId);
+            if (!parentSlice) {
+                guardError = `missing parent slice: ${params.milestoneId}/${params.sliceId}`;
+                return;
+            }
+            if (isClosedStatus(parentSlice.status)) {
+                guardError = `cannot replan a task in a closed slice: ${params.sliceId} (status: ${parentSlice.status})`;
+                return;
+            }
+            const task = getTask(params.milestoneId, params.sliceId, params.taskId);
+            if (!task) {
+                guardError = `task not found: ${params.milestoneId}/${params.sliceId}/${params.taskId}`;
+                return;
+            }
+            if (isClosedStatus(task.status)) {
+                guardError = `cannot replan completed task ${params.taskId} — use gsd_task_reopen first`;
+                return;
+            }
+            upsertTaskPlanning(params.milestoneId, params.sliceId, params.taskId, {
+                title: params.title,
+                description: params.description,
+                estimate: params.estimate,
+                files: params.files,
+                verify: params.verify,
+                inputs: params.inputs,
+                expectedOutput: params.expectedOutput,
+                fullPlanMd: params.fullPlanMd,
+            });
+            insertReplanHistory({
+                milestoneId: params.milestoneId,
+                sliceId: params.sliceId,
+                taskId: params.taskId,
+                summary: replanSummary(params),
+                previousArtifactPath: params.reworkBriefRef ?? null,
+            });
+        });
+    }
+    catch (err) {
+        return { error: `db write failed: ${err.message}` };
+    }
+    if (guardError)
+        return { error: guardError };
+    try {
+        const milestonePath = resolveMilestonePath(basePath, params.milestoneId);
+        const slicePath = resolveSlicePath(basePath, params.milestoneId, params.sliceId);
+        const isLegacySliceLayout = Boolean(milestonePath && slicePath && slicePath !== milestonePath);
+        const renderResult = isLegacySliceLayout
+            ? await renderTaskPlanFromDb(basePath, params.milestoneId, params.sliceId, params.taskId)
+            : await renderPlanFromDb(basePath, params.milestoneId, params.sliceId);
+        const taskPlanPath = "taskPlanPath" in renderResult ? renderResult.taskPlanPath : renderResult.planPath;
+        invalidateStateCache();
+        clearParseCache();
+        try {
+            await flushWorkflowProjections(basePath, { milestoneId: params.milestoneId });
+            writeManifest(basePath);
+            appendEvent(basePath, {
+                cmd: "replan-task",
+                params: { milestoneId: params.milestoneId, sliceId: params.sliceId, taskId: params.taskId },
+                ts: new Date().toISOString(),
+                actor: "agent",
+                actor_name: params.actorName,
+                trigger_reason: params.triggerReason,
+            });
+        }
+        catch (hookErr) {
+            logWarning("tool", `replan-task post-mutation hook warning: ${hookErr.message}`);
+        }
+        return {
+            milestoneId: params.milestoneId,
+            sliceId: params.sliceId,
+            taskId: params.taskId,
+            taskPlanPath,
+        };
+    }
+    catch (err) {
+        return { error: `render failed: ${err.message}` };
+    }
+}

package/dist/resources/extensions/gsd/tools/rework-brief.js

@@ -0,0 +1,74 @@
+import { saveReworkBrief } from "../gsd-db.js";
+import { isNonEmptyString, validateStringArray } from "../validation.js";
+function validateFinding(finding, index) {
+    if (!isNonEmptyString(finding?.findingId))
+        throw new Error(`findings[${index}].findingId is required`);
+    if (finding.severity !== "blocking" && finding.severity !== "advisory") {
+        throw new Error(`findings[${index}].severity must be blocking or advisory`);
+    }
+    if (!isNonEmptyString(finding.description))
+        throw new Error(`findings[${index}].description is required`);
+    if (!isNonEmptyString(finding.requiredFix))
+        throw new Error(`findings[${index}].requiredFix is required`);
+    const status = finding.status ?? "pending";
+    if (status !== "pending" && status !== "resolved" && status !== "deferred-with-override") {
+        throw new Error(`findings[${index}].status must be pending, resolved, or deferred-with-override`);
+    }
+    // A blocking finding is only enforced by gsd_task_complete while it is
+    // `pending` (getUnresolvedBlockingReworkFindingsForTask returns pending rows
+    // only). Persisting a blocking finding as resolved/deferred-with-override
+    // at save time therefore bypasses the completion gate entirely, so require
+    // the same justification a reworkResolution would (evidence for `resolved`,
+    // evidence + decisionRef for `deferred-with-override`). Advisory findings do
+    // not gate completion, so their status is left as-is.
+    if (finding.severity === "blocking" && status !== "pending") {
+        if (!isNonEmptyString(finding.evidence)) {
+            throw new Error(`findings[${index}].evidence is required when a blocking finding is saved as ${status}`);
+        }
+        if (status === "deferred-with-override" && !isNonEmptyString(finding.decisionRef)) {
+            throw new Error(`findings[${index}].decisionRef is required when a blocking finding is saved as deferred-with-override`);
+        }
+    }
+    return {
+        ...finding,
+        verificationCommands: validateStringArray(finding.verificationCommands, `findings[${index}].verificationCommands`),
+        status,
+    };
+}
+function validateParams(params) {
+    if (!isNonEmptyString(params?.milestoneId))
+        throw new Error("milestoneId is required");
+    if (!isNonEmptyString(params?.sliceId))
+        throw new Error("sliceId is required");
+    if (!isNonEmptyString(params?.taskId))
+        throw new Error("taskId is required");
+    if (!Array.isArray(params.findings) || params.findings.length === 0) {
+        throw new Error("findings must be a non-empty array");
+    }
+    return {
+        ...params,
+        findings: params.findings.map(validateFinding),
+    };
+}
+export async function handleReworkBriefSave(rawParams) {
+    let params;
+    try {
+        params = validateParams(rawParams);
+    }
+    catch (err) {
+        return { error: `validation failed: ${err.message}` };
+    }
+    try {
+        const { briefId } = saveReworkBrief(params);
+        return {
+            briefId,
+            milestoneId: params.milestoneId,
+            sliceId: params.sliceId,
+            taskId: params.taskId,
+            findingCount: params.findings.length,
+        };
+    }
+    catch (err) {
+        return { error: `db write failed: ${err.message}` };
+    }
+}

package/dist/resources/extensions/gsd/tools/workflow-tool-executors.js

@@ -18,6 +18,8 @@ import { handleCompleteSlice } from "./complete-slice.js";
 import { handlePlanMilestone } from "./plan-milestone.js";
 import { handlePlanSlice } from "./plan-slice.js";
 import { handleReplanSlice } from "./replan-slice.js";
+import { handleReplanTask } from "./replan-task.js";
+import { handleReworkBriefSave } from "./rework-brief.js";
 import { handleReopenMilestone } from "./reopen-milestone.js";
 import { handleReopenSlice } from "./reopen-slice.js";
 import { handleReopenTask } from "./reopen-task.js";
@@ -1277,6 +1279,85 @@ export async function executePlanSlice(params, basePath = process.cwd()) {
         };
     }
 }
+export async function executeReplanTask(params, basePath = process.cwd()) {
+    const dbAvailable = await ensureDbOpen(basePath);
+    if (!dbAvailable) {
+        return {
+            content: [{ type: "text", text: "Error: GSD database is not available. Cannot replan task." }],
+            details: { operation: "replan_task", error: "db_unavailable" },
+            isError: true,
+        };
+    }
+    try {
+        const result = await handleReplanTask(params, basePath);
+        if ("error" in result) {
+            return {
+                content: [{ type: "text", text: `Error replanning task: ${result.error}` }],
+                details: { operation: "replan_task", error: result.error },
+                isError: true,
+            };
+        }
+        return {
+            content: [{ type: "text", text: `Replanned task ${result.taskId} (${result.sliceId}/${result.milestoneId})` }],
+            details: {
+                operation: "replan_task",
+                milestoneId: result.milestoneId,
+                sliceId: result.sliceId,
+                taskId: result.taskId,
+                taskPlanPath: result.taskPlanPath,
+            },
+        };
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        logError("tool", `replan_task tool failed: ${msg}`, { tool: "gsd_replan_task", error: String(err) });
+        return {
+            content: [{ type: "text", text: `Error replanning task: ${msg}` }],
+            details: { operation: "replan_task", error: msg },
+            isError: true,
+        };
+    }
+}
+export async function executeReworkBriefSave(params, basePath = process.cwd()) {
+    const dbAvailable = await ensureDbOpen(basePath);
+    if (!dbAvailable) {
+        return {
+            content: [{ type: "text", text: "Error: GSD database is not available. Cannot save rework brief." }],
+            details: { operation: "rework_brief_save", error: "db_unavailable" },
+            isError: true,
+        };
+    }
+    try {
+        const result = await handleReworkBriefSave(params);
+        if ("error" in result) {
+            return {
+                content: [{ type: "text", text: `Error saving rework brief: ${result.error}` }],
+                details: { operation: "rework_brief_save", error: result.error },
+                isError: true,
+            };
+        }
+        return {
+            content: [{ type: "text", text: `Saved rework brief ${result.briefId} with ${result.findingCount} finding(s)` }],
+            details: {
+                operation: "rework_brief_save",
+                briefId: result.briefId,
+                milestoneId: result.milestoneId,
+                sliceId: result.sliceId,
+                taskId: result.taskId,
+                findingCount: result.findingCount,
+            },
+        };
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        logError("tool", `rework_brief_save tool failed: ${msg}`, { tool: "gsd_rework_brief_save", error: String(err) });
+        return {
+            content: [{ type: "text", text: `Error saving rework brief: ${msg}` }],
+            details: { operation: "rework_brief_save", error: msg },
+            isError: true,
+        };
+    }
+}
 export async function executeReplanSlice(params, basePath = process.cwd()) {
     const dbAvailable = await ensureDbOpen(basePath);
     if (!dbAvailable) {

package/dist/resources/extensions/gsd/unit-registry.js

@@ -232,6 +232,8 @@ export const UNIT_REGISTRY = {
                 "gsd_slice_complete",
                 "gsd_task_reopen",
                 "gsd_replan_slice",
+                "gsd_replan_task",
+                "gsd_rework_brief_save",
                 "gsd_decision_save",
                 "gsd_capture_thought",
                 "gsd_requirement_update",
@@ -245,6 +247,8 @@ export const UNIT_REGISTRY = {
                 "gsd_slice_complete",
                 "gsd_task_reopen",
                 "gsd_replan_slice",
+                "gsd_replan_task",
+                "gsd_rework_brief_save",
                 "gsd_requirement_update",
                 "gsd_summary_save",
             ],

package/dist/resources/extensions/gsd/uok/plan-v2.js

@@ -3,7 +3,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { gsdRoot, resolveMilestoneFile, resolveSliceFile } from "../paths.js";
-import { isDbAvailable, getMilestoneSlices, getSliceTasks } from "../gsd-db.js";
+import { isDbAvailable, getMilestoneSlices, getTasksBySliceIds } from "../gsd-db.js";
 const PLAN_V2_CLARIFY_ROUND_LIMIT = 3;
 export const EXECUTION_ENTRY_PHASES = new Set([
     "executing",
@@ -17,6 +17,19 @@ export function isExecutionEntryPhase(phase) {
 function graphOutputPath(basePath) {
     return join(gsdRoot(basePath), "runtime", "uok-plan-v2-graph.json");
 }
+// True when the on-disk graph matches `output` ignoring the volatile `compiledAt`
+// stamp, so redundant recompiles on the dispatch hot path skip the disk write.
+function graphBodyUnchanged(outPath, output) {
+    try {
+        const existing = JSON.parse(readFileSync(outPath, "utf-8"));
+        const { compiledAt: _existingStamp, ...existingBody } = existing;
+        const { compiledAt: _outputStamp, ...outputBody } = output;
+        return JSON.stringify(existingBody) === JSON.stringify(outputBody);
+    }
+    catch {
+        return false; // Missing, unreadable, or corrupt — write.
+    }
+}
 function hasFileContent(path) {
     if (!path || !existsSync(path))
         return false;
@@ -88,9 +101,10 @@ export function compileUnitGraphFromState(basePath, state) {
             finalizedContextIncluded,
         };
     }
+    const tasksBySlice = getTasksBySliceIds(slices.map((slice) => ({ milestoneId: mid, sliceId: slice.id })));
     for (const slice of slices) {
         const sid = slice.id;
-        const tasks = getSliceTasks(mid, sid)
+        const tasks = (tasksBySlice.get(`${mid}\0${sid}`) ?? [])
             .sort((a, b) => Number(a.sequence ?? 0) - Number(b.sequence ?? 0));
         let previousTaskNodeId = null;
         for (const task of tasks) {
@@ -138,7 +152,9 @@ export function compileUnitGraphFromState(basePath, state) {
     };
     const outPath = graphOutputPath(basePath);
     mkdirSync(join(gsdRoot(basePath), "runtime"), { recursive: true });
-    writeFileSync(outPath, JSON.stringify(output, null, 2) + "\n", "utf-8");
+    if (!graphBodyUnchanged(outPath, output)) {
+        writeFileSync(outPath, JSON.stringify(output, null, 2) + "\n", "utf-8");
+    }
     return {
         ok: true,
         graphPath: outPath,

package/dist/resources/extensions/gsd/worktree-state-projection.js

@@ -143,6 +143,9 @@ function syncOtherMilestoneArtifacts(srcMilestonesDir, dstMilestonesDir, current
         logWarning("worktree", `milestone artifact scan failed: ${err instanceof Error ? err.message : String(err)}`);
     }
 }
+function syncFlatPhaseArtifacts(prGsd, wtGsd) {
+    safeCopyRecursive(join(prGsd, "phases"), join(wtGsd, "phases"), { force: false });
+}
 /**
  * Root-level .gsd/ files copied from worktree back to project root for
  * post-merge diagnostics. Markdown projections are NOT in this list — DB
@@ -208,6 +211,9 @@ export function _projectRootToWorktreeImpl(projectRoot, worktreePath_, milestone
     // Root PROJECT/REQUIREMENTS/DECISIONS projections must be readable from a
     // worktree-bound unit; the project root remains authoritative.
     syncRootProjectionFilesToWorktree(prGsd, wtGsd);
+    // Flat-phase artifacts (phases/NN-slug/NN-CONTEXT.md, NN-DISCUSSION.md,
+    // ROADMAP, etc.) must be available before the first worktree dispatch.
+    syncFlatPhaseArtifacts(prGsd, wtGsd);
     // Copy milestone directory from project root to worktree — additive only.
     // force:false prevents cpSync from overwriting existing worktree files.
     // Without this, worktree-local files (e.g. VALIDATION.md written