gsd-pi 2.78.1-dev.8a893322c → 2.78.1-dev.a7b6e59b7

package/src/resources/extensions/gsd/auto/run-unit.ts

@@ -40,6 +40,29 @@ export async function runUnit(
 ): Promise<UnitResult> {
   debugLog("runUnit", { phase: "start", unitType, unitId });
 
+  // Ensure cwd matches basePath BEFORE newSession() captures it. The new
+  // session reads process.cwd() during construction to anchor its tool
+  // runtime and system prompt; if cwd has drifted (async_bash, background
+  // jobs, prior unit cleanup), the session would otherwise be rooted to
+  // the wrong directory. Must be synchronous — no awaits between chdir
+  // and newSession (#1389, #4762 follow-up).
+  try {
+    if (process.cwd() !== s.basePath) {
+      process.chdir(s.basePath);
+    }
+  } catch (e) {
+    const msg = `Failed to chdir to basePath before newSession (basePath: ${s.basePath}): ${String(e)}`;
+    logWarning("engine", msg, { basePath: s.basePath, error: String(e) });
+    return {
+      status: "cancelled",
+      errorContext: {
+        message: msg,
+        category: "session-failed",
+        isTransient: true,
+      },
+    };
+  }
+
   // ── Session creation with timeout ──
   debugLog("runUnit", { phase: "session-create", unitType, unitId });
 
@@ -120,17 +143,6 @@ export async function runUnit(
     _setCurrentResolve(resolve);
   });
 
-  // Ensure cwd matches basePath before dispatch (#1389).
-  // async_bash and background jobs can drift cwd away from the worktree.
-  // Realigning here prevents commits from landing on the wrong branch.
-  try {
-    if (process.cwd() !== s.basePath) {
-      process.chdir(s.basePath);
-    }
-  } catch (e) {
-    logWarning("engine", "Failed to chdir to basePath before dispatch", { basePath: s.basePath, error: String(e) });
-  }
-
   // ── Provider request-readiness pre-check (#4555) ──
   // Verify the provider can accept requests before dispatching. If the token
   // has expired since bootstrap, return cancelled immediately so the unit is

package/src/resources/extensions/gsd/auto-direct-dispatch.ts

@@ -30,6 +30,8 @@ import {
 import { loadEffectiveGSDPreferences } from "./preferences.js";
 import type { MinimalModelRegistry } from "./context-budget.js";
 import { pauseAuto } from "./auto.js";
+import { resolveCanonicalMilestoneRoot } from "./worktree-manager.js";
+import { logWarning } from "./workflow-logger.js";
 import {
   getWorkflowTransportSupportError,
   getRequiredWorkflowToolsForAutoUnit,
@@ -50,6 +52,14 @@ export async function dispatchDirectPhase(
     return;
   }
 
+  const projectRoot = base;
+
+  // Switch the dispatch base to the canonical milestone worktree if one
+  // exists. Without this, /gsd dispatch invoked from the project root would
+  // build prompts and create a session anchored to the project root even
+  // though the milestone's actual code lives in the worktree.
+  const dispatchBase = resolveCanonicalMilestoneRoot(base, mid);
+
   const normalized = phase.toLowerCase();
   let unitType: string;
   let unitId: string;
@@ -70,7 +80,7 @@ export async function dispatchDirectPhase(
 
         // When require_slice_discussion is enabled, pause auto-mode before
         // each new slice so the user can discuss requirements first (#789).
-        const sliceContextFile = resolveSliceFile(base, mid, sid, "CONTEXT");
+        const sliceContextFile = resolveSliceFile(dispatchBase, mid, sid, "CONTEXT");
         const requireDiscussion = loadEffectiveGSDPreferences()?.preferences?.phases?.require_slice_discussion;
         if (requireDiscussion && !sliceContextFile) {
           ctx.ui.notify(
@@ -83,11 +93,11 @@ export async function dispatchDirectPhase(
 
         unitType = "research-slice";
         unitId = `${mid}/${sid}`;
-        prompt = await buildResearchSlicePrompt(mid, midTitle, sid, sTitle, base);
+        prompt = await buildResearchSlicePrompt(mid, midTitle, sid, sTitle, dispatchBase);
       } else {
         unitType = "research-milestone";
         unitId = mid;
-        prompt = await buildResearchMilestonePrompt(mid, midTitle, base);
+        prompt = await buildResearchMilestonePrompt(mid, midTitle, dispatchBase);
       }
       break;
     }
@@ -106,7 +116,7 @@ export async function dispatchDirectPhase(
         unitType = "plan-slice";
         unitId = `${mid}/${sid}`;
         prompt = await buildPlanSlicePrompt(
-          mid, midTitle, sid, sTitle, base, undefined,
+          mid, midTitle, sid, sTitle, dispatchBase, undefined,
           {
             sessionContextWindow: ctx.model?.contextWindow,
             modelRegistry: ctx.modelRegistry as MinimalModelRegistry | undefined,
@@ -115,7 +125,7 @@ export async function dispatchDirectPhase(
       } else {
         unitType = "plan-milestone";
         unitId = mid;
-        prompt = await buildPlanMilestonePrompt(mid, midTitle, base);
+        prompt = await buildPlanMilestonePrompt(mid, midTitle, dispatchBase);
       }
       break;
     }
@@ -137,7 +147,7 @@ export async function dispatchDirectPhase(
       unitType = "execute-task";
       unitId = `${mid}/${sid}/${tid}`;
       prompt = await buildExecuteTaskPrompt(
-        mid, sid, sTitle, tid, tTitle, base,
+        mid, sid, sTitle, tid, tTitle, dispatchBase,
         {
           sessionContextWindow: ctx.model?.contextWindow,
           modelRegistry: ctx.modelRegistry as MinimalModelRegistry | undefined,
@@ -159,11 +169,11 @@ export async function dispatchDirectPhase(
         }
         unitType = "complete-slice";
         unitId = `${mid}/${sid}`;
-        prompt = await buildCompleteSlicePrompt(mid, midTitle, sid, sTitle, base);
+        prompt = await buildCompleteSlicePrompt(mid, midTitle, sid, sTitle, dispatchBase);
       } else {
         unitType = "complete-milestone";
         unitId = mid;
-        prompt = await buildCompleteMilestonePrompt(mid, midTitle, base);
+        prompt = await buildCompleteMilestonePrompt(mid, midTitle, dispatchBase);
       }
       break;
     }
@@ -177,7 +187,7 @@ export async function dispatchDirectPhase(
       }
       if (completedSliceIds.length === 0) {
         // File-based fallback: parse roadmap checkboxes
-        const roadmapPath = resolveMilestoneFile(base, mid, "ROADMAP");
+        const roadmapPath = resolveMilestoneFile(dispatchBase, mid, "ROADMAP");
         if (roadmapPath) {
           const roadmapContent = await loadFile(roadmapPath);
           if (roadmapContent) {
@@ -192,7 +202,7 @@ export async function dispatchDirectPhase(
       const completedSliceId = completedSliceIds[completedSliceIds.length - 1];
       unitType = "reassess-roadmap";
       unitId = `${mid}/${completedSliceId}`;
-      prompt = await buildReassessRoadmapPrompt(mid, midTitle, completedSliceId, base);
+      prompt = await buildReassessRoadmapPrompt(mid, midTitle, completedSliceId, dispatchBase);
       break;
     }
 
@@ -208,7 +218,7 @@ export async function dispatchDirectPhase(
       }
       if (uatCompletedSliceIds.length === 0) {
         // File-based fallback: parse roadmap checkboxes
-        const roadmapPath = resolveMilestoneFile(base, mid, "ROADMAP");
+        const roadmapPath = resolveMilestoneFile(dispatchBase, mid, "ROADMAP");
         if (roadmapPath) {
           const roadmapContent = await loadFile(roadmapPath);
           if (roadmapContent) {
@@ -221,7 +231,7 @@ export async function dispatchDirectPhase(
         return;
       }
       const sid = uatCompletedSliceIds[uatCompletedSliceIds.length - 1];
-      const uatFile = resolveSliceFile(base, mid, sid, "UAT");
+      const uatFile = resolveSliceFile(dispatchBase, mid, sid, "UAT");
       if (!uatFile) {
         ctx.ui.notify("Cannot dispatch run-uat: no UAT file found.", "warning");
         return;
@@ -231,10 +241,10 @@ export async function dispatchDirectPhase(
         ctx.ui.notify("Cannot dispatch run-uat: UAT file is empty.", "warning");
         return;
       }
-      const uatPath = relSliceFile(base, mid, sid, "UAT");
+      const uatPath = relSliceFile(dispatchBase, mid, sid, "UAT");
       unitType = "run-uat";
       unitId = `${mid}/${sid}`;
-      prompt = await buildRunUatPrompt(mid, sid, uatPath, uatContent, base);
+      prompt = await buildRunUatPrompt(mid, sid, uatPath, uatContent, dispatchBase);
       break;
     }
 
@@ -248,7 +258,7 @@ export async function dispatchDirectPhase(
       }
       unitType = "replan-slice";
       unitId = `${mid}/${sid}`;
-      prompt = await buildReplanSlicePrompt(mid, midTitle, sid, sTitle, base);
+      prompt = await buildReplanSlicePrompt(mid, midTitle, sid, sTitle, dispatchBase);
       break;
     }
 
@@ -264,7 +274,7 @@ export async function dispatchDirectPhase(
     ctx.model?.provider,
     getRequiredWorkflowToolsForAutoUnit(unitType),
     {
-      projectRoot: base,
+      projectRoot,
       surface: "direct phase dispatch",
       unitType,
       authMode: ctx.model?.provider ? ctx.modelRegistry.getProviderAuthMode(ctx.model.provider) : undefined,
@@ -277,13 +287,39 @@ export async function dispatchDirectPhase(
   }
 
   ctx.ui.notify(`Dispatching ${unitType} for ${unitId}...`, "info");
-  const result = await ctx.newSession();
-  if (result.cancelled) {
-    ctx.ui.notify("Session creation cancelled.", "warning");
-    return;
+
+  const originalCwd = process.cwd();
+
+  try {
+    // Ensure cwd matches dispatchBase BEFORE newSession() captures it. Synchronous —
+    // no awaits between chdir and newSession.
+    try {
+      if (process.cwd() !== dispatchBase) {
+        process.chdir(dispatchBase);
+      }
+    } catch (err) {
+      const msg = `Failed to chdir before direct-dispatch newSession (basePath: ${dispatchBase}): ${err instanceof Error ? err.message : String(err)}`;
+      logWarning("engine", msg, { file: "auto-direct-dispatch.ts", basePath: dispatchBase, error: err instanceof Error ? err.message : String(err) });
+      ctx.ui.notify(`${msg}. Cancelling dispatch to avoid running in the wrong directory.`, "error");
+      return;
+    }
+
+    const result = await ctx.newSession();
+    if (result.cancelled) {
+      ctx.ui.notify("Session creation cancelled.", "warning");
+      return;
+    }
+    pi.sendMessage(
+      { customType: "gsd-dispatch", content: prompt, display: false },
+      { triggerTurn: true },
+    );
+  } finally {
+    try {
+      if (process.cwd() !== originalCwd) {
+        process.chdir(originalCwd);
+      }
+    } catch (err) {
+      logWarning("engine", `Failed to restore cwd after direct dispatch: ${err instanceof Error ? err.message : String(err)}`, { file: "auto-direct-dispatch.ts", basePath: originalCwd });
+    }
   }
-  pi.sendMessage(
-    { customType: "gsd-dispatch", content: prompt, display: false },
-    { triggerTurn: true },
-  );
 }

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

@@ -1267,6 +1267,7 @@ export async function buildDiscussMilestonePrompt(
   const discussTemplates = inlineTemplate("context", "Context");
 
   const basePrompt = loadPrompt("guided-discuss-milestone", {
+    workingDirectory: base,
     milestoneId: mid,
     milestoneTitle: midTitle,
     inlinedTemplates: discussTemplates,
@@ -2645,6 +2646,7 @@ export async function buildParallelResearchSlicesPrompt(
   }
 
   return loadPrompt("parallel-research-slices", {
+    workingDirectory: basePath,
     mid,
     midTitle,
     sliceCount: String(slices.length),
@@ -2681,6 +2683,7 @@ export async function buildGateEvaluatePrompt(
 
   const subagentSections: string[] = [];
   const gateListLines: string[] = [];
+  const normalizedBase = base.replaceAll("\\", "/");
 
   for (const def of gateDefs) {
     gateListLines.push(`- **${def.id}**: ${def.question}`);
@@ -2688,6 +2691,8 @@ export async function buildGateEvaluatePrompt(
     const subPrompt = [
       `You are evaluating quality gate **${def.id}** for slice ${sid} (${sTitle}).`,
       "",
+      `**Working directory:** \`${normalizedBase}\`. All file reads, writes, and shell commands MUST operate relative to this directory. Do NOT \`cd\` to any other directory.`,
+      "",
       `## Question: ${def.question}`,
       "",
       def.guidance,
@@ -2804,6 +2809,7 @@ export async function buildRewriteDocsPrompt(
   const documentList = docList.length > 0 ? docList.join("\n") : "- No active plan documents found.";
 
   return loadPrompt("rewrite-docs", {
+    workingDirectory: base,
     milestoneId: mid,
     milestoneTitle: midTitle,
     sliceId: sid ?? "none",

package/src/resources/extensions/gsd/auto-worktree.ts

@@ -2372,5 +2372,20 @@ export function mergeMilestoneToMain(
   originalBase = null;
   nudgeGitBranchCache(previousCwd);
 
+  // 15. Anchor cwd at the project root on success-return. Step 12 removed
+  // the worktree dir; if cwd was inside it, every subsequent process.cwd()
+  // would throw ENOENT and trip auto/run-unit.ts:50's session-failed cancel
+  // path (the de73fb43d regression that closes headless gsd auto). Step 3
+  // already chdir'd here, but defending the success-return contract makes
+  // future maintainers safe against intervening chdir's between step 3 and
+  // here.
+  try {
+    // process.cwd() can throw ENOENT when cwd was removed, so attempt
+    // recovery directly.
+    process.chdir(originalBasePath_);
+  } catch (err) {
+    logWarning("worktree", `chdir to project root after merge failed: ${err instanceof Error ? err.message : String(err)}`);
+  }
+
   return { commitMessage, pushed, prCreated, codeFilesChanged };
 }

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

@@ -1864,16 +1864,21 @@ export async function dispatchHookUnit(
   hookModel: string | undefined,
   targetBasePath: string,
 ): Promise<boolean> {
+  const wasActive = s.active;
+  const previousBasePath = s.basePath;
+  const previousCurrentUnit = s.currentUnit ? { ...s.currentUnit } : null;
+
   if (!s.active) {
     s.active = true;
     s.stepMode = true;
     s.cmdCtx = ctx as ExtensionCommandContext;
-    s.basePath = targetBasePath;
     s.autoStartTime = Date.now();
     s.currentUnit = null;
     s.pendingQuickTasks = [];
   }
 
+  s.basePath = targetBasePath;
+
   const hookUnitType = `hook/${hookName}`;
   const hookStartedAt = Date.now();
 
@@ -1883,6 +1888,23 @@ export async function dispatchHookUnit(
     startedAt: hookStartedAt,
   };
 
+  // Ensure cwd matches basePath BEFORE newSession() captures it (#1389).
+  // newSession() snapshots process.cwd() during construction; chdir-ing
+  // afterward leaves the session rooted to whatever cwd was when the call
+  // was made. Must be synchronous — no awaits between chdir and newSession.
+  try { if (process.cwd() !== s.basePath) process.chdir(s.basePath); } catch (err) {
+    const msg = `Failed to chdir before hook newSession (basePath: ${s.basePath}): ${err instanceof Error ? err.message : String(err)}`;
+    logWarning("engine", msg, { file: "auto.ts", basePath: s.basePath, error: err instanceof Error ? err.message : String(err) });
+    ctx.ui.notify(`${msg}. Cancelling hook dispatch to avoid running in the wrong directory.`, "error");
+    if (wasActive) {
+      s.basePath = previousBasePath;
+      s.currentUnit = previousCurrentUnit;
+    } else {
+      s.reset();
+    }
+    return false;
+  }
+
   const result = await s.cmdCtx!.newSession();
   if (result.cancelled) {
     await stopAuto(ctx, pi);
@@ -1939,11 +1961,6 @@ export async function dispatchHookUnit(
   ctx.ui.setStatus("gsd-auto", s.stepMode ? "next" : "auto");
   ctx.ui.notify(`Running post-unit hook: ${hookName}`, "info");
 
-  // Ensure cwd matches basePath before hook dispatch (#1389)
-  try { if (process.cwd() !== s.basePath) process.chdir(s.basePath); } catch (err) {
-    logWarning("engine", `chdir failed before hook dispatch: ${err instanceof Error ? err.message : String(err)}`, { file: "auto.ts" });
-  }
-
   debugLog("dispatchHookUnit", {
     phase: "send-message",
     promptLength: hookPrompt.length,

package/src/resources/extensions/gsd/prompts/guided-discuss-milestone.md

@@ -1,3 +1,5 @@
+**Working directory:** `{{workingDirectory}}`. All file reads, writes, and shell commands MUST operate relative to this directory. Do NOT `cd` to any other directory.
+
 Discuss milestone {{milestoneId}} ("{{milestoneTitle}}"). Identify gray areas, ask the user about them, and write `{{milestoneId}}-CONTEXT.md` in the milestone directory with the decisions. Use the **Context** output template below. If a `GSD Skill Preferences` block is present in system context, use it to decide which skills to load and follow; do not override required artifact rules.
 
 **Structured questions available: {{structuredQuestionsAvailable}}**

package/src/resources/extensions/gsd/prompts/parallel-research-slices.md

@@ -1,5 +1,7 @@
 # Parallel Slice Research
 
+**Working directory:** `{{workingDirectory}}`. All file reads, writes, and shell commands MUST operate relative to this directory. Do NOT `cd` to any other directory.
+
 You are dispatching parallel research agents for **{{sliceCount}} slices** in milestone **{{mid}} — {{midTitle}}**.
 
 ## Slices to Research

package/src/resources/extensions/gsd/prompts/rewrite-docs.md

@@ -1,5 +1,7 @@
 You are executing GSD auto-mode.
 
+**Working directory:** `{{workingDirectory}}`. All file reads, writes, and shell commands MUST operate relative to this directory. Do NOT `cd` to any other directory.
+
 ## UNIT: Rewrite Documents — Apply Override(s) for Milestone {{milestoneId}} ("{{milestoneTitle}}")
 
 An override was issued by the user that changes a fundamental decision or approach. Your job is to propagate this change across all active planning documents so they are internally consistent and future tasks execute correctly.

package/src/resources/extensions/gsd/tests/auto-loop.test.ts

@@ -63,6 +63,7 @@ function makeMockSession(opts?: {
   const session = {
     active: true,
     verbose: false,
+    basePath: process.cwd(),
     cmdCtx: {
       newSession: (options?: { abortSignal?: AbortSignal }) => {
         opts?.onNewSessionStart?.(session);

package/src/resources/extensions/gsd/tests/stash-pop-gsd-conflict.test.ts

@@ -21,6 +21,7 @@ import { _clearGsdRootCache } from "../paths.ts";
 // Isolate from user's global preferences (which may have git.main_branch set)
 let originalHome: string | undefined;
 let fakeHome: string;
+const testCwd = process.cwd();
 
 test.before(() => {
   originalHome = process.env.HOME;
@@ -37,6 +38,11 @@ test.after(() => {
   rmSync(fakeHome, { recursive: true, force: true });
 });
 
+function cleanupTempRepo(repo: string): void {
+  try { process.chdir(testCwd); } catch { /* best-effort */ }
+  try { rmSync(repo, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 }); } catch { /* cleanup best-effort */ }
+}
+
 function run(cmd: string, cwd: string): string {
   return execSync(cmd, { cwd, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" }).trim();
 }
@@ -106,7 +112,7 @@ test("#2766: stash pop conflict on .gsd/ files is auto-resolved", () => {
     try { stashList = run("git stash list", repo); } catch { /* empty stash */ }
     assert.strictEqual(stashList, "", "stash is empty after .gsd/ conflict auto-resolution");
   } finally {
-    try { rmSync(repo, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 }); } catch { /* cleanup best-effort */ }
+    cleanupTempRepo(repo);
   }
 });
 
@@ -141,6 +147,6 @@ test("#2766: stash pop conflict on non-.gsd files preserves stash for manual res
       "merge succeeds even with non-.gsd stash pop conflict",
     );
   } finally {
-    try { rmSync(repo, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 }); } catch { /* cleanup best-effort */ }
+    cleanupTempRepo(repo);
   }
 });

package/src/resources/extensions/gsd/tests/stash-queued-context-files.test.ts

@@ -35,6 +35,7 @@ import { _clearGsdRootCache } from "../paths.ts";
 // Isolate from user's global preferences (which may have git.main_branch set)
 let originalHome: string | undefined;
 let fakeHome: string;
+const testCwd = process.cwd();
 
 test.before(() => {
   originalHome = process.env.HOME;
@@ -51,6 +52,13 @@ test.after(() => {
   rmSync(fakeHome, { recursive: true, force: true });
 });
 
+function cleanupTempPaths(...paths: string[]): void {
+  try { process.chdir(testCwd); } catch { /* best-effort */ }
+  for (const p of paths) {
+    rmSync(p, { recursive: true, force: true });
+  }
+}
+
 function run(cmd: string, cwd: string): string {
   return execSync(cmd, {
     cwd,
@@ -271,7 +279,7 @@ test("#2505: mergeMilestoneToMain preserves queued CONTEXT files (not swept into
       }
     }
   } finally {
-    rmSync(repo, { recursive: true, force: true });
+    cleanupTempPaths(repo);
   }
 });
 
@@ -308,8 +316,7 @@ test("#2505: pre-merge stash handles symlinked .gsd without traversing it", () =
     assert.equal(readFileSync(join(repo, "README.md"), "utf-8").replace(/\r\n/g, "\n"), "# test\n\nDirty change.\n");
     assert.equal(readFileSync(join(repo, "local-note.txt"), "utf-8"), "local scratch\n");
   } finally {
-    rmSync(repo, { recursive: true, force: true });
-    rmSync(stateDir, { recursive: true, force: true });
+    cleanupTempPaths(repo, stateDir);
   }
 });
 
@@ -375,7 +382,7 @@ test("#2505: back-to-back merges preserve queued CONTEXT files", () => {
       "M013 context content preserved after back-to-back merges",
     );
   } finally {
-    rmSync(repo, { recursive: true, force: true });
+    cleanupTempPaths(repo);
   }
 });
 
@@ -430,7 +437,6 @@ test("#4573: gitignored .gsd symlink does not break pre-merge stash", () => {
       ".gsd symlink remains in place",
     );
   } finally {
-    rmSync(repo, { recursive: true, force: true });
-    rmSync(stateDir, { recursive: true, force: true });
+    cleanupTempPaths(repo, stateDir);
   }
 });