@opengsd/gsd-pi 1.8.1 → 1.9.0-dev.5c1a3ff2

package/src/resources/extensions/gsd/tools/replan-task.ts

@@ -0,0 +1,160 @@
+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";
+
+export interface ReplanTaskParams {
+  milestoneId: string;
+  sliceId: string;
+  taskId: string;
+  title: string;
+  description: string;
+  estimate: string;
+  files: string[];
+  verify: string;
+  inputs: string[];
+  expectedOutput: string[];
+  reworkBriefRef?: string;
+  fullPlanMd?: string;
+  actorName?: string;
+  triggerReason?: string;
+}
+
+export interface ReplanTaskResult {
+  milestoneId: string;
+  sliceId: string;
+  taskId: string;
+  taskPlanPath: string;
+}
+
+function validateParams(params: ReplanTaskParams): ReplanTaskParams {
+  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: ReplanTaskParams): string {
+  const ref = params.reworkBriefRef?.trim();
+  return ref
+    ? `Task ${params.taskId} replanned from rework brief ${ref}`
+    : `Task ${params.taskId} replanned`;
+}
+
+export async function handleReplanTask(
+  rawParams: ReplanTaskParams,
+  basePath: string,
+): Promise<ReplanTaskResult | { error: string }> {
+  let params: ReplanTaskParams;
+  try {
+    params = validateParams(rawParams);
+  } catch (err) {
+    return { error: `validation failed: ${(err as Error).message}` };
+  }
+
+  let guardError: string | null = 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 as Error).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 as Error).message}`);
+    }
+
+    return {
+      milestoneId: params.milestoneId,
+      sliceId: params.sliceId,
+      taskId: params.taskId,
+      taskPlanPath,
+    };
+  } catch (err) {
+    return { error: `render failed: ${(err as Error).message}` };
+  }
+}

package/src/resources/extensions/gsd/tools/rework-brief.ts

@@ -0,0 +1,91 @@
+import { saveReworkBrief, type ReworkBriefFindingInput } from "../gsd-db.js";
+import { isNonEmptyString, validateStringArray } from "../validation.js";
+
+export interface ReworkBriefSaveParams {
+  briefId?: string;
+  milestoneId: string;
+  sliceId: string;
+  taskId: string;
+  findings: ReworkBriefFindingInput[];
+}
+
+export interface ReworkBriefSaveResult {
+  briefId: string;
+  milestoneId: string;
+  sliceId: string;
+  taskId: string;
+  findingCount: number;
+}
+
+function validateFinding(finding: ReworkBriefFindingInput, index: number): ReworkBriefFindingInput {
+  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: ReworkBriefSaveParams): ReworkBriefSaveParams {
+  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: ReworkBriefSaveParams,
+): Promise<ReworkBriefSaveResult | { error: string }> {
+  let params: ReworkBriefSaveParams;
+  try {
+    params = validateParams(rawParams);
+  } catch (err) {
+    return { error: `validation failed: ${(err as Error).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 as Error).message}` };
+  }
+}

package/src/resources/extensions/gsd/tools/workflow-tool-executors.ts

@@ -37,6 +37,10 @@ import type { PlanSliceParams } from "./plan-slice.js";
 import { handlePlanSlice } from "./plan-slice.js";
 import type { ReplanSliceParams } from "./replan-slice.js";
 import { handleReplanSlice } from "./replan-slice.js";
+import type { ReplanTaskParams } from "./replan-task.js";
+import { handleReplanTask } from "./replan-task.js";
+import type { ReworkBriefSaveParams } from "./rework-brief.js";
+import { handleReworkBriefSave } from "./rework-brief.js";
 import type { ReopenMilestoneParams } from "./reopen-milestone.js";
 import { handleReopenMilestone } from "./reopen-milestone.js";
 import type { ReopenSliceParams } from "./reopen-slice.js";
@@ -696,6 +700,8 @@ export type SliceCompleteExecutorParams = CompleteSliceParams;
 export type PlanMilestoneExecutorParams = PlanMilestoneParams;
 export type PlanSliceExecutorParams = PlanSliceParams;
 export type ReplanSliceExecutorParams = ReplanSliceParams;
+export type ReplanTaskExecutorParams = ReplanTaskParams;
+export type ReworkBriefSaveExecutorParams = ReworkBriefSaveParams;
 export type ReopenTaskExecutorParams = ReopenTaskParams;
 export type ReopenSliceExecutorParams = ReopenSliceParams;
 export type ReopenMilestoneExecutorParams = ReopenMilestoneParams;
@@ -1490,6 +1496,92 @@ export async function executePlanSlice(
   }
 }
 
+
+export async function executeReplanTask(
+  params: ReplanTaskExecutorParams,
+  basePath: string = process.cwd(),
+): Promise<ToolExecutionResult> {
+  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: ReworkBriefSaveExecutorParams,
+  basePath: string = process.cwd(),
+): Promise<ToolExecutionResult> {
+  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: ReplanSliceExecutorParams,
   basePath: string = process.cwd(),

package/src/resources/extensions/gsd/types.ts

@@ -695,6 +695,17 @@ export interface CompleteTaskParams {
     verdict: string;
     durationMs: number;
   }>;
+  /**
+   * Resolution evidence for structured rework findings linked to this task.
+   * All blocking findings must be resolved before completion is accepted.
+   * @optional
+   */
+  reworkResolution?: Array<{
+    findingId: string;
+    status: "resolved" | "deferred-with-override";
+    evidence: string;
+    decisionRef?: string;
+  }>;
   /**
    * Q5 failure-modes section content (what breaks when dependencies fail).
    * Populated → `pass`; omitted/empty → `omitted`.

package/src/resources/extensions/gsd/unit-context-composer.ts

@@ -46,6 +46,7 @@ import {
   type ToolsPolicy,
   type UnitContextManifest,
 } from "./unit-context-manifest.js";
+import { resolveEffectivePlanningToolsPolicy } from "./planning-subagent-policy.js";
 import { getUnitToolSurfaceContract } from "./unit-tool-contracts.js";
 import type { UnitPromptContextContract } from "./tool-contract.js";
 
@@ -207,6 +208,7 @@ export function composeContextModeInstructions(
 
 export interface ComposeToolSurfaceInstructionOptions {
   readonly renderMode: ContextModeRenderMode;
+  readonly basePath?: string;
 }
 
 const TOOL_SURFACE_GUIDANCE_BY_UNIT: Record<string, string> = {
@@ -226,16 +228,39 @@ const TOOL_SURFACE_GUIDANCE_BY_UNIT: Record<string, string> = {
     "Persist completion only through `gsd_complete_milestone` after verification passes. Do not query `.gsd/gsd.db` directly. Do not write `.gsd/PROJECT.md` or `.gsd/REQUIREMENTS.md` by hand — use `gsd_summary_save` and `gsd_requirement_update`.",
   "replan-slice":
     "Persist replans through `gsd_replan_slice` only. Do not edit `PLAN.md` or task plans directly.",
-  "plan-slice":
-    "Persist planning through `gsd_plan_slice` only. Dispatch subagents only to **scout** or **planner** for reconnaissance — not implementation agents. Do not edit user source files outside `.gsd/**`.",
-  "refine-slice":
-    "Persist refinements through `gsd_plan_slice` only. Dispatch subagents only to **scout** or **planner**. Do not edit user source files outside `.gsd/**`.",
-  "plan-milestone":
-    "Persist milestone planning through `gsd_plan_milestone` / `gsd_plan_slice`. Do not edit user source files outside `.gsd/**`.",
   "research-slice":
     "Dispatch subagents only to **scout** or **planner** for reconnaissance. Do not edit user source files outside `.gsd/**`.",
 };
 
+function formatAllowedAgents(agents: readonly string[]): string {
+  return agents.map((agent) => `**${agent}**`).join(", ");
+}
+
+function guidanceForUnitToolsPolicy(unitType: string, policy: ToolsPolicy): string | undefined {
+  if (unitType === "plan-slice") {
+    const dispatch = policy.mode === "planning-dispatch"
+      ? ` Dispatch subagents only to ${formatAllowedAgents(policy.allowedSubagents)} for reconnaissance — not implementation agents.`
+      : " Do not dispatch subagents.";
+    return `Persist planning through \`gsd_plan_slice\` only.${dispatch} Do not edit user source files outside \`.gsd/**\`.`;
+  }
+
+  if (unitType === "refine-slice") {
+    const dispatch = policy.mode === "planning-dispatch"
+      ? ` Dispatch subagents only to ${formatAllowedAgents(policy.allowedSubagents)}.`
+      : " Do not dispatch subagents.";
+    return `Persist refinements through \`gsd_plan_slice\` only.${dispatch} Do not edit user source files outside \`.gsd/**\`.`;
+  }
+
+  if (unitType === "plan-milestone") {
+    const dispatch = policy.mode === "planning-dispatch"
+      ? ` Dispatch subagents only to ${formatAllowedAgents(policy.allowedSubagents)}.`
+      : "";
+    return `Persist milestone planning through \`gsd_plan_milestone\` / \`gsd_plan_slice\`.${dispatch} Do not edit user source files outside \`.gsd/**\`.`;
+  }
+
+  return undefined;
+}
+
 function guidanceForToolsPolicy(policy: ToolsPolicy): string | null {
   switch (policy.mode) {
     case "planning":
@@ -280,8 +305,9 @@ export function composeToolSurfaceInstructions(
   const manifest = resolveManifest(unitType);
   if (!manifest) return "";
 
-  const unitGuidance = TOOL_SURFACE_GUIDANCE_BY_UNIT[unitType];
-  const policyGuidance = unitGuidance ? null : guidanceForToolsPolicy(manifest.tools);
+  const effectiveTools = resolveEffectivePlanningToolsPolicy(unitType, manifest.tools, opts.basePath) ?? manifest.tools;
+  const unitGuidance = guidanceForUnitToolsPolicy(unitType, effectiveTools) ?? TOOL_SURFACE_GUIDANCE_BY_UNIT[unitType];
+  const policyGuidance = unitGuidance ? null : guidanceForToolsPolicy(effectiveTools);
   const forbiddenLine = formatForbiddenWorkflowToolsLine(unitType, unitGuidance);
   const parts = [unitGuidance, policyGuidance, forbiddenLine].filter(
     (part): part is string => typeof part === "string" && part.length > 0,

package/src/resources/extensions/gsd/unit-registry.ts

@@ -290,6 +290,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",
@@ -303,6 +305,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/src/resources/extensions/gsd/uok/plan-v2.ts

@@ -6,7 +6,7 @@ import { join } from "node:path";
 
 import type { GSDState, Phase } from "../types.js";
 import { gsdRoot, resolveMilestoneFile, resolveSliceFile } from "../paths.js";
-import { isDbAvailable, getMilestoneSlices, getSliceTasks } from "../gsd-db.js";
+import { isDbAvailable, getMilestoneSlices, getTasksBySliceIds } from "../gsd-db.js";
 import type { SliceRow } from "../db-task-slice-rows.js";
 import type { UokGraphNode } from "./contracts.js";
 
@@ -39,6 +39,19 @@ function graphOutputPath(basePath: string): string {
   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: string, output: Record<string, unknown>): boolean {
+  try {
+    const existing = JSON.parse(readFileSync(outPath, "utf-8")) as Record<string, unknown>;
+    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: string | null): boolean {
   if (!path || !existsSync(path)) return false;
   try {
@@ -120,9 +133,11 @@ export function compileUnitGraphFromState(basePath: string, state: GSDState): Pl
     };
   }
 
+  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: string | null = null;
@@ -174,7 +189,9 @@ export function compileUnitGraphFromState(basePath: string, state: GSDState): Pl
 
   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,

package/src/resources/extensions/gsd/workflow-projections.ts

@@ -26,7 +26,7 @@ import { deriveState } from "./state.js";
 import type { GSDState } from "./types.js";
 import { renderPlanFromDb, renderRoadmapFromDb } from "./markdown-renderer.js";
 import { readManifest } from "./workflow-manifest.js";
-import { gsdRoot, resolveMilestoneFile, resolveSliceFile, resolveTaskFile, relTaskFile } from "./paths.js";
+import { gsdRoot, resolveMilestoneFile, resolveSliceFile, resolveTaskFile, targetTaskFile } from "./paths.js";
 
 // ─── Helpers ─────────────────────────────────────────────────────────────
 
@@ -329,8 +329,7 @@ export function renderSummaryProjection(basePath: string, milestoneId: string, s
   const evidenceRows = getVerificationEvidence(milestoneId, sliceId, taskId);
   const content = renderSummaryContent(taskRow, sliceId, milestoneId, evidenceRows);
 
-  const summaryPath = resolveTaskFile(basePath, milestoneId, sliceId, taskId, "SUMMARY")
-    ?? join(basePath, relTaskFile(basePath, milestoneId, sliceId, taskId, "SUMMARY", getMilestone(milestoneId)?.title));
+  const summaryPath = targetTaskFile(basePath, milestoneId, sliceId, taskId, "SUMMARY", getMilestone(milestoneId)?.title);
   mkdirSync(dirname(summaryPath), { recursive: true });
   atomicWriteSync(summaryPath, content);
 }

package/src/resources/extensions/gsd/workspace.ts

@@ -10,6 +10,7 @@ import {
   normalizeRealPath,
 } from "./paths.js";
 import { isGsdWorktreePath, resolveWorktreeProjectRoot } from "./worktree-root.js";
+import { milestoneMetaPath } from "./git-service.js";
 
 export type GsdWorkspaceMode = "project" | "worktree";
 
@@ -107,7 +108,7 @@ export function scopeMilestone(workspace: GsdWorkspace, milestoneId: string): Mi
     stateFile: () => join(gsd, "STATE.md"),
     dbPath: () => contract.projectDb,
     milestoneDir: () => scopeMilestoneDir(basePath, milestoneId),
-    metaJson: () => join(gsd, `${milestoneId}-META.json`),
+    metaJson: () => milestoneMetaPath(basePath, milestoneId),
   });
 
   return scope;

package/src/resources/extensions/gsd/worktree-state-projection.ts

@@ -179,6 +179,14 @@ function syncOtherMilestoneArtifacts(
   }
 }
 
+function syncFlatPhaseArtifacts(prGsd: string, wtGsd: string): void {
+  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
@@ -254,6 +262,10 @@ export function _projectRootToWorktreeImpl(
   // 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

package/src/resources/extensions/mac-tools/index.ts

@@ -17,6 +17,10 @@ import { StringEnum, Type } from "@gsd/pi-ai";
 import { execFileSync } from "node:child_process";
 import { statSync, readdirSync } from "node:fs";
 import path from "node:path";
+import {
+	constrainScreenshot,
+	getScreenshotBufferDimensions,
+} from "../browser-tools/screenshot-constraints.js";
 
 // ---------------------------------------------------------------------------
 // Paths
@@ -96,6 +100,45 @@ interface MacAgentResponse {
 	error?: string;
 }
 
+interface MacScreenshotPayload {
+	imageData: string;
+	width: number;
+	height: number;
+	format: string;
+	mimeType: string;
+}
+
+function macScreenshotQualityToPercent(quality: number | undefined): number {
+	if (quality === undefined || !Number.isFinite(quality)) return 80;
+	return Math.min(100, Math.max(1, Math.round(quality * 100)));
+}
+
+export async function prepareMacScreenshotPayload(
+	data: Record<string, any>,
+	quality: number | undefined,
+): Promise<MacScreenshotPayload> {
+	const format = data.format as string;
+	const mimeType = format === "png" ? "image/png" : "image/jpeg";
+	const rawBuffer = Buffer.from(data.imageData as string, "base64");
+	const constrainedBuffer = await constrainScreenshot(
+		null as any,
+		rawBuffer,
+		mimeType,
+		macScreenshotQualityToPercent(quality),
+	);
+	const dimensions = constrainedBuffer === rawBuffer
+		? null
+		: await getScreenshotBufferDimensions(constrainedBuffer);
+
+	return {
+		imageData: constrainedBuffer.toString("base64"),
+		width: dimensions?.width ?? (data.width as number),
+		height: dimensions?.height ?? (data.height as number),
+		format,
+		mimeType,
+	};
+}
+
 /**
  * Invoke the mac-agent CLI with a command and optional params.
  * Handles compilation caching, stdin/stdout JSON protocol, and error surfacing.
@@ -718,19 +761,19 @@ export default function (pi: ExtensionAPI) {
 				throw new Error("mac_screenshot: " + result.error);
 			}
 
-			const data = result.data!;
-			const imageData = data.imageData as string;
-			const format = data.format as string;
-			const width = data.width as number;
-			const height = data.height as number;
-			const mimeType = format === "png" ? "image/png" : "image/jpeg";
+			const screenshot = await prepareMacScreenshotPayload(result.data!, args.quality);
 
 			return {
 				content: [
-					{ type: "text" as const, text: `Screenshot: ${width}x${height} ${format}` },
-					{ type: "image" as const, data: imageData, mimeType },
+					{ type: "text" as const, text: `Screenshot: ${screenshot.width}x${screenshot.height} ${screenshot.format}` },
+					{ type: "image" as const, data: screenshot.imageData, mimeType: screenshot.mimeType },
 				],
-				details: { width, height, format, mimeType },
+				details: {
+					width: screenshot.width,
+					height: screenshot.height,
+					format: screenshot.format,
+					mimeType: screenshot.mimeType,
+				},
 			};
 		},
 	});