gsd-pi 2.15.1 → 2.16.0

package/README.md

@@ -213,6 +213,7 @@ On first run, GSD launches a branded setup wizard that walks you through LLM pro
 | `/gsd next`             | Explicit step mode (same as bare `/gsd`)                        |
 | `/gsd auto`             | Autonomous mode — researches, plans, executes, commits, repeats |
 | `/gsd stop`             | Stop auto mode gracefully                                       |
+| `/gsd steer`            | Hard-steer plan documents during execution                      |
 | `/gsd discuss`          | Discuss architecture and decisions (works alongside auto mode)  |
 | `/gsd status`           | Progress dashboard                                              |
 | `/gsd queue`            | Queue future milestones (safe during auto mode)                 |

package/dist/resources/extensions/async-jobs/async-bash-tool.ts

@@ -71,7 +71,7 @@ export function createAsyncBashTool(
 			"Check /jobs to see all running and recent background jobs.",
 		],
 		parameters: schema,
-		async execute(_toolCallId, params) {
+		async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
 			const manager = getManager();
 			const cwd = getCwd();
 			const { command, timeout, label } = params;
@@ -91,6 +91,7 @@ export function createAsyncBashTool(
 						"Use `await_job` to get results when ready, or `cancel_job` to stop.",
 					].join("\n"),
 				}],
+				details: undefined,
 			};
 		},
 	};

package/dist/resources/extensions/async-jobs/await-tool.ts

@@ -24,7 +24,7 @@ export function createAwaitTool(getManager: () => AsyncJobManager): ToolDefiniti
 		description:
 			"Wait for background jobs to complete. Provide specific job IDs or omit to wait for the next job that finishes. Returns results of completed jobs.",
 		parameters: schema,
-		async execute(_toolCallId, params) {
+		async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
 			const manager = getManager();
 			const { jobs: jobIds } = params;
 
@@ -43,6 +43,7 @@ export function createAwaitTool(getManager: () => AsyncJobManager): ToolDefiniti
 				if (notFound.length > 0 && watched.length === 0) {
 					return {
 						content: [{ type: "text", text: `No jobs found: ${notFound.join(", ")}` }],
+						details: undefined,
 					};
 				}
 			} else {
@@ -50,6 +51,7 @@ export function createAwaitTool(getManager: () => AsyncJobManager): ToolDefiniti
 				if (watched.length === 0) {
 					return {
 						content: [{ type: "text", text: "No running background jobs." }],
+						details: undefined,
 					};
 				}
 			}
@@ -59,7 +61,7 @@ export function createAwaitTool(getManager: () => AsyncJobManager): ToolDefiniti
 			if (running.length === 0) {
 				const result = formatResults(watched);
 				manager.acknowledgeDeliveries(watched.map((j) => j.id));
-				return { content: [{ type: "text", text: result }] };
+				return { content: [{ type: "text", text: result }], details: undefined };
 			}
 
 			// Wait for at least one to complete
@@ -75,7 +77,7 @@ export function createAwaitTool(getManager: () => AsyncJobManager): ToolDefiniti
 				result += `\n\n**Still running:** ${stillRunning.map((j) => `${j.id} (${j.label})`).join(", ")}`;
 			}
 
-			return { content: [{ type: "text", text: result }] };
+			return { content: [{ type: "text", text: result }], details: undefined };
 		},
 	};
 }

package/dist/resources/extensions/async-jobs/cancel-job-tool.ts

@@ -16,7 +16,7 @@ export function createCancelJobTool(getManager: () => AsyncJobManager): ToolDefi
 		label: "Cancel Background Job",
 		description: "Cancel a running background job by its ID.",
 		parameters: schema,
-		async execute(_toolCallId, params) {
+		async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
 			const manager = getManager();
 			const result = manager.cancel(params.job_id);
 
@@ -28,6 +28,7 @@ export function createCancelJobTool(getManager: () => AsyncJobManager): ToolDefi
 
 			return {
 				content: [{ type: "text", text: messages[result] ?? `Unknown result: ${result}` }],
+				details: undefined,
 			};
 		},
 	};

package/dist/resources/extensions/async-jobs/index.ts

@@ -62,7 +62,7 @@ export default function AsyncJobs(pi: ExtensionAPI) {
 							"",
 							truncatedOutput,
 						].join("\n"),
-						display: `Background job ${job.id} ${job.status}`,
+						display: true,
 					},
 					{ deliverAs: "followUp", triggerTurn: true },
 				);
@@ -92,7 +92,7 @@ export default function AsyncJobs(pi: ExtensionAPI) {
 				pi.sendMessage({
 					customType: "async_jobs_list",
 					content: "No async job manager active.",
-					display: "No jobs",
+					display: true,
 				});
 				return;
 			}
@@ -126,7 +126,7 @@ export default function AsyncJobs(pi: ExtensionAPI) {
 			pi.sendMessage({
 				customType: "async_jobs_list",
 				content: lines.join("\n"),
-				display: `${running.length} running, ${completed.length} recent`,
+				display: true,
 			});
 		},
 	});

package/dist/resources/extensions/gsd/auto-dashboard.ts

@@ -49,6 +49,7 @@ export function unitVerb(unitType: string): string {
     case "execute-task": return "executing";
     case "complete-slice": return "completing";
     case "replan-slice": return "replanning";
+    case "rewrite-docs": return "rewriting";
     case "reassess-roadmap": return "reassessing";
     case "run-uat": return "running UAT";
     default: return unitType;
@@ -65,6 +66,7 @@ export function unitPhaseLabel(unitType: string): string {
     case "execute-task": return "EXECUTE";
     case "complete-slice": return "COMPLETE";
     case "replan-slice": return "REPLAN";
+    case "rewrite-docs": return "REWRITE";
     case "reassess-roadmap": return "REASSESS";
     case "run-uat": return "UAT";
     default: return unitType.toUpperCase();
@@ -88,6 +90,7 @@ function peekNext(unitType: string, state: GSDState): string {
     case "execute-task": return `continue ${sid}`;
     case "complete-slice": return "reassess roadmap";
     case "replan-slice": return `re-execute ${sid}`;
+    case "rewrite-docs": return "continue execution";
     case "reassess-roadmap": return "advance to next slice";
     case "run-uat": return "reassess roadmap";
     default: return "";

package/dist/resources/extensions/gsd/auto-dispatch.ts

@@ -12,7 +12,7 @@
 import type { GSDState } from "./types.js";
 import type { GSDPreferences } from "./preferences.js";
 import type { UatType } from "./files.js";
-import { loadFile, extractUatType } from "./files.js";
+import { loadFile, extractUatType, loadActiveOverrides } from "./files.js";
 import {
   resolveMilestoneFile, resolveSliceFile,
   relSliceFile,
@@ -28,6 +28,7 @@ import {
   buildReplanSlicePrompt,
   buildRunUatPrompt,
   buildReassessRoadmapPrompt,
+  buildRewriteDocsPrompt,
   checkNeedsReassessment,
   checkNeedsRunUat,
 } from "./auto-prompts.js";
@@ -54,9 +55,38 @@ interface DispatchRule {
   match: (ctx: DispatchContext) => Promise<DispatchAction | null>;
 }
 
+// ─── Rewrite Circuit Breaker ──────────────────────────────────────────────
+
+const MAX_REWRITE_ATTEMPTS = 3;
+let rewriteAttemptCount = 0;
+export function resetRewriteCircuitBreaker(): void {
+  rewriteAttemptCount = 0;
+}
+
 // ─── Rules ────────────────────────────────────────────────────────────────
 
 const DISPATCH_RULES: DispatchRule[] = [
+  {
+    name: "rewrite-docs (override gate)",
+    match: async ({ mid, midTitle, state, basePath }) => {
+      const pendingOverrides = await loadActiveOverrides(basePath);
+      if (pendingOverrides.length === 0) return null;
+      if (rewriteAttemptCount >= MAX_REWRITE_ATTEMPTS) {
+        const { resolveAllOverrides } = await import("./files.js");
+        await resolveAllOverrides(basePath);
+        rewriteAttemptCount = 0;
+        return null;
+      }
+      rewriteAttemptCount++;
+      const unitId = state.activeSlice ? `${mid}/${state.activeSlice.id}` : mid;
+      return {
+        action: "dispatch",
+        unitType: "rewrite-docs",
+        unitId,
+        prompt: await buildRewriteDocsPrompt(mid, midTitle, state.activeSlice, basePath, pendingOverrides),
+      };
+    },
+  },
   {
     name: "summarizing → complete-slice",
     match: async ({ state, mid, midTitle, basePath }) => {

package/dist/resources/extensions/gsd/auto-prompts.ts

@@ -6,8 +6,8 @@
  * utility.
  */
 
-import { loadFile, parseContinue, parseRoadmap, parseSummary, extractUatType } from "./files.js";
-import type { UatType } from "./files.js";
+import { loadFile, parseContinue, parsePlan, parseRoadmap, parseSummary, extractUatType, loadActiveOverrides, formatOverridesSection } from "./files.js";
+import type { Override, UatType } from "./files.js";
 import { loadPrompt, inlineTemplate } from "./prompt-loader.js";
 import {
   resolveMilestoneFile, resolveSliceFile, resolveSlicePath,
@@ -457,6 +457,9 @@ export async function buildResearchSlicePrompt(
   inlined.push(inlineTemplate("research", "Research"));
 
   const depContent = await inlineDependencySummaries(mid, sid, base);
+  const activeOverrides = await loadActiveOverrides(base);
+  const overridesInline = formatOverridesSection(activeOverrides);
+  if (overridesInline) inlined.unshift(overridesInline);
 
   const inlinedContext = `## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`;
 
@@ -495,6 +498,9 @@ export async function buildPlanSlicePrompt(
   inlined.push(inlineTemplate("task-plan", "Task Plan"));
 
   const depContent = await inlineDependencySummaries(mid, sid, base);
+  const planActiveOverrides = await loadActiveOverrides(base);
+  const planOverridesInline = formatOverridesSection(planActiveOverrides);
+  if (planOverridesInline) inlined.unshift(planOverridesInline);
 
   const inlinedContext = `## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`;
 
@@ -562,7 +568,11 @@ export async function buildExecuteTaskPrompt(
 
   const taskSummaryPath = `${relSlicePath(base, mid, sid)}/tasks/${tid}-SUMMARY.md`;
 
+  const activeOverrides = await loadActiveOverrides(base);
+  const overridesSection = formatOverridesSection(activeOverrides);
+
   return loadPrompt("execute-task", {
+    overridesSection,
     workingDirectory: base,
     milestoneId: mid, sliceId: sid, sliceTitle: sTitle, taskId: tid, taskTitle: tTitle,
     planPath: relSliceFile(base, mid, sid, "PLAN"),
@@ -609,6 +619,9 @@ export async function buildCompleteSlicePrompt(
   }
   inlined.push(inlineTemplate("slice-summary", "Slice Summary"));
   inlined.push(inlineTemplate("uat", "UAT"));
+  const completeActiveOverrides = await loadActiveOverrides(base);
+  const completeOverridesInline = formatOverridesSection(completeActiveOverrides);
+  if (completeOverridesInline) inlined.unshift(completeOverridesInline);
 
   const inlinedContext = `## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`;
 
@@ -712,6 +725,9 @@ export async function buildReplanSlicePrompt(
   // Inline decisions
   const decisionsInline = await inlineGsdRootFile(base, "decisions.md", "Decisions");
   if (decisionsInline) inlined.push(decisionsInline);
+  const replanActiveOverrides = await loadActiveOverrides(base);
+  const replanOverridesInline = formatOverridesSection(replanActiveOverrides);
+  if (replanOverridesInline) inlined.unshift(replanOverridesInline);
 
   const inlinedContext = `## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`;
 
@@ -795,3 +811,70 @@ export async function buildReassessRoadmapPrompt(
     inlinedContext,
   });
 }
+
+export async function buildRewriteDocsPrompt(
+  mid: string, midTitle: string,
+  activeSlice: { id: string; title: string } | null,
+  base: string,
+  overrides: Override[],
+): Promise<string> {
+  const sid = activeSlice?.id;
+  const sTitle = activeSlice?.title ?? "";
+  const docList: string[] = [];
+
+  if (sid) {
+    const slicePlanPath = resolveSliceFile(base, mid, sid, "PLAN");
+    const slicePlanRel = relSliceFile(base, mid, sid, "PLAN");
+    if (slicePlanPath) {
+      docList.push(`- Slice plan: \`${slicePlanRel}\``);
+      const tDir = resolveTasksDir(base, mid, sid);
+      if (tDir) {
+        const planContent = await loadFile(slicePlanPath);
+        if (planContent) {
+          const plan = parsePlan(planContent);
+          for (const task of plan.tasks) {
+            if (!task.done) {
+              const taskPlanPath = resolveTaskFile(base, mid, sid, task.id, "PLAN");
+              if (taskPlanPath) {
+                const taskRelPath = `${relSlicePath(base, mid, sid)}/tasks/${task.id}-PLAN.md`;
+                docList.push(`- Task plan: \`${taskRelPath}\``);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  const decisionsPath = resolveGsdRootFile(base, "DECISIONS");
+  if (existsSync(decisionsPath)) docList.push(`- Decisions: \`${relGsdRootFile("DECISIONS")}\``);
+  const requirementsPath = resolveGsdRootFile(base, "REQUIREMENTS");
+  if (existsSync(requirementsPath)) docList.push(`- Requirements: \`${relGsdRootFile("REQUIREMENTS")}\``);
+  const projectPath = resolveGsdRootFile(base, "PROJECT");
+  if (existsSync(projectPath)) docList.push(`- Project: \`${relGsdRootFile("PROJECT")}\``);
+  const contextPath = resolveMilestoneFile(base, mid, "CONTEXT");
+  const contextRel = relMilestoneFile(base, mid, "CONTEXT");
+  if (contextPath) docList.push(`- Milestone context (reference only): \`${contextRel}\``);
+  const roadmapPath = resolveMilestoneFile(base, mid, "ROADMAP");
+  const roadmapRel = relMilestoneFile(base, mid, "ROADMAP");
+  if (roadmapPath) docList.push(`- Roadmap: \`${roadmapRel}\``);
+
+  const overrideContent = overrides.map((o, i) => [
+    `### Override ${i + 1}`,
+    `**Change:** ${o.change}`,
+    `**Issued:** ${o.timestamp}`,
+    `**During:** ${o.appliedAt}`,
+  ].join("\n")).join("\n\n");
+
+  const documentList = docList.length > 0 ? docList.join("\n") : "- No active plan documents found.";
+
+  return loadPrompt("rewrite-docs", {
+    milestoneId: mid,
+    milestoneTitle: midTitle,
+    sliceId: sid ?? "none",
+    sliceTitle: sTitle,
+    overrideContent,
+    documentList,
+    overridesPath: relGsdRootFile("OVERRIDES"),
+  });
+}

package/dist/resources/extensions/gsd/auto-recovery.ts

@@ -11,7 +11,14 @@ import type { ExtensionContext } from "@gsd/pi-coding-agent";
 import {
   clearUnitRuntimeRecord,
 } from "./unit-runtime.js";
-import { runGit } from "./git-service.js";
+import {
+  nativeConflictFiles,
+  nativeCommit,
+  nativeCheckoutTheirs,
+  nativeAddPaths,
+  nativeMergeAbort,
+  nativeResetHard,
+} from "./native-git-bridge.js";
 import {
   resolveMilestonePath,
   resolveSlicePath,
@@ -26,6 +33,7 @@ import {
   buildTaskFileName,
   resolveMilestoneFile,
   clearPathCache,
+  resolveGsdRootFile,
 } from "./paths.js";
 import { parseRoadmap } from "./files.js";
 import { existsSync, mkdirSync, readFileSync, writeFileSync, unlinkSync, renameSync } from "node:fs";
@@ -78,6 +86,8 @@ export function resolveExpectedArtifactPath(unitType: string, unitId: string, ba
       const dir = resolveMilestonePath(base, mid);
       return dir ? join(dir, buildMilestoneFileName(mid, "SUMMARY")) : null;
     }
+    case "rewrite-docs":
+      return null;
     default:
       return null;
   }
@@ -93,13 +103,20 @@ export function resolveExpectedArtifactPath(unitType: string, unitId: string, ba
  * skipped writing the UAT file (see #176).
  */
 export function verifyExpectedArtifact(unitType: string, unitId: string, base: string): boolean {
-  // Clear stale directory listing cache so artifact checks see fresh disk state (#431)
-  clearPathCache();
-
   // Hook units have no standard artifact — always pass. Their lifecycle
   // is managed by the hook engine, not the artifact verification system.
   if (unitType.startsWith("hook/")) return true;
 
+  // Clear stale directory listing cache so artifact checks see fresh disk state (#431).
+  // Moved after hook check to avoid unnecessary cache clears for hook units.
+  clearPathCache();
+
+  if (unitType === "rewrite-docs") {
+    const overridesPath = resolveGsdRootFile(base, "OVERRIDES");
+    if (!existsSync(overridesPath)) return true;
+    const content = readFileSync(overridesPath, "utf-8");
+    return !content.includes("**Scope:** active");
+  }
 
   const absPath = resolveExpectedArtifactPath(unitType, unitId, base);
   // Unit types with no verifiable artifact always pass (e.g. replan-slice).
@@ -206,6 +223,8 @@ export function diagnoseExpectedArtifact(unitType: string, unitId: string, base:
       return `Slice ${sid} marked [x] in ${relMilestoneFile(base, mid!, "ROADMAP")} + summary + UAT written`;
     case "replan-slice":
       return `${relSliceFile(base, mid!, sid!, "REPLAN")} + updated ${relSliceFile(base, mid!, sid!, "PLAN")}`;
+    case "rewrite-docs":
+      return "Active overrides resolved in .gsd/OVERRIDES.md + plan documents updated";
     case "reassess-roadmap":
       return `${relSliceFile(base, mid!, sid!, "ASSESSMENT")} (roadmap reassessment)`;
     case "run-uat":
@@ -284,7 +303,8 @@ export function persistCompletedKey(base: string, key: string): void {
       keys = JSON.parse(readFileSync(file, "utf-8"));
     }
   } catch (e) { /* corrupt file — start fresh */ void e; }
-  if (!keys.includes(key)) {
+  const keySet = new Set(keys);
+  if (!keySet.has(key)) {
     keys.push(key);
     // Atomic write: tmp file + rename prevents partial writes on crash
     const tmpFile = file + ".tmp";
@@ -298,12 +318,15 @@ export function removePersistedKey(base: string, key: string): void {
   const file = completedKeysPath(base);
   try {
     if (existsSync(file)) {
-      let keys: string[] = JSON.parse(readFileSync(file, "utf-8"));
-      keys = keys.filter(k => k !== key);
-      // Atomic write: tmp file + rename prevents partial writes on crash
-      const tmpFile = file + ".tmp";
-      writeFileSync(tmpFile, JSON.stringify(keys), "utf-8");
-      renameSync(tmpFile, file);
+      const keys: string[] = JSON.parse(readFileSync(file, "utf-8"));
+      const filtered = keys.filter(k => k !== key);
+      // Only write if the key was actually present
+      if (filtered.length !== keys.length) {
+        // Atomic write: tmp file + rename prevents partial writes on crash
+        const tmpFile = file + ".tmp";
+        writeFileSync(tmpFile, JSON.stringify(filtered), "utf-8");
+        renameSync(tmpFile, file);
+      }
     }
   } catch (e) { /* non-fatal: removePersistedKey failure */ void e; }
 }
@@ -335,11 +358,11 @@ export function reconcileMergeState(basePath: string, ctx: ExtensionContext): bo
   const hasSquashMsg = existsSync(squashMsgPath);
   if (!hasMergeHead && !hasSquashMsg) return false;
 
-  const unmerged = runGit(basePath, ["diff", "--name-only", "--diff-filter=U"], { allowFailure: true });
-  if (!unmerged || !unmerged.trim()) {
+  const conflictedFiles = nativeConflictFiles(basePath);
+  if (conflictedFiles.length === 0) {
     // All conflicts resolved — finalize the merge/squash commit
     try {
-      runGit(basePath, ["commit", "--no-edit"], { allowFailure: false });
+      nativeCommit(basePath, "");  // --no-edit equivalent: use empty message placeholder
       const mode = hasMergeHead ? "merge" : "squash commit";
       ctx.ui.notify(`Finalized leftover ${mode} from prior session.`, "info");
     } catch {
@@ -347,25 +370,21 @@ export function reconcileMergeState(basePath: string, ctx: ExtensionContext): bo
     }
   } else {
     // Still conflicted — try auto-resolving .gsd/ state file conflicts (#530)
-    const conflictedFiles = unmerged.trim().split("\n").filter(Boolean);
     const gsdConflicts = conflictedFiles.filter(f => f.startsWith(".gsd/"));
     const codeConflicts = conflictedFiles.filter(f => !f.startsWith(".gsd/"));
 
     if (gsdConflicts.length > 0 && codeConflicts.length === 0) {
       // All conflicts are in .gsd/ state files — auto-resolve by accepting theirs
       let resolved = true;
-      for (const gsdFile of gsdConflicts) {
-        try {
-          runGit(basePath, ["checkout", "--theirs", "--", gsdFile], { allowFailure: false });
-          runGit(basePath, ["add", "--", gsdFile], { allowFailure: false });
-        } catch {
-          resolved = false;
-          break;
-        }
+      try {
+        nativeCheckoutTheirs(basePath, gsdConflicts);
+        nativeAddPaths(basePath, gsdConflicts);
+      } catch {
+        resolved = false;
       }
       if (resolved) {
         try {
-          runGit(basePath, ["commit", "--no-edit"], { allowFailure: false });
+          nativeCommit(basePath, "chore: auto-resolve .gsd/ state file conflicts");
           ctx.ui.notify(
             `Auto-resolved ${gsdConflicts.length} .gsd/ state file conflict(s) from prior merge.`,
             "info",
@@ -376,11 +395,11 @@ export function reconcileMergeState(basePath: string, ctx: ExtensionContext): bo
       }
       if (!resolved) {
         if (hasMergeHead) {
-          runGit(basePath, ["merge", "--abort"], { allowFailure: true });
+          try { nativeMergeAbort(basePath); } catch { /* best-effort */ }
         } else if (hasSquashMsg) {
           try { unlinkSync(squashMsgPath); } catch { /* best-effort */ }
         }
-        runGit(basePath, ["reset", "--hard", "HEAD"], { allowFailure: true });
+        try { nativeResetHard(basePath); } catch { /* best-effort */ }
         ctx.ui.notify(
           "Detected leftover merge state — auto-resolve failed, cleaned up. Re-deriving state.",
           "warning",
@@ -389,11 +408,11 @@ export function reconcileMergeState(basePath: string, ctx: ExtensionContext): bo
     } else {
       // Code conflicts present — abort and reset
       if (hasMergeHead) {
-        runGit(basePath, ["merge", "--abort"], { allowFailure: true });
+        try { nativeMergeAbort(basePath); } catch { /* best-effort */ }
       } else if (hasSquashMsg) {
         try { unlinkSync(squashMsgPath); } catch { /* best-effort */ }
       }
-      runGit(basePath, ["reset", "--hard", "HEAD"], { allowFailure: true });
+      try { nativeResetHard(basePath); } catch { /* best-effort */ }
       ctx.ui.notify(
         "Detected leftover merge state with unresolved conflicts — cleaned up. Re-deriving state.",
         "warning",

package/dist/resources/extensions/gsd/auto-supervisor.ts

@@ -5,7 +5,7 @@
  */
 
 import { clearLock } from "./crash-recovery.js";
-import { execSync } from "node:child_process";
+import { nativeHasChanges } from "./native-git-bridge.js";
 
 // ─── SIGTERM Handling ─────────────────────────────────────────────────────────
 
@@ -47,12 +47,7 @@ export function deregisterSigtermHandler(handler: (() => void) | null): void {
  */
 export function detectWorkingTreeActivity(cwd: string): boolean {
   try {
-    const out = execSync("git status --porcelain", {
-      cwd,
-      stdio: ["pipe", "pipe", "pipe"],
-      timeout: 5000,
-    });
-    return out.toString().trim().length > 0;
+    return nativeHasChanges(cwd);
   } catch {
     return false;
   }