gsd-pi 2.32.0 → 2.33.0-dev.bafba33

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

@@ -98,11 +98,24 @@ export function isLockProcessAlive(lock: LockData): boolean {
 
 /** Format crash info for display or injection into a prompt. */
 export function formatCrashInfo(lock: LockData): string {
-  return [
+  const lines = [
     `Previous auto-mode session was interrupted.`,
     `  Was executing: ${lock.unitType} (${lock.unitId})`,
     `  Started at: ${lock.unitStartedAt}`,
     `  Units completed before crash: ${lock.completedUnits}`,
     `  PID: ${lock.pid}`,
-  ].join("\n");
+  ];
+
+  // Add recovery guidance based on what was happening when it crashed
+  if (lock.unitType === "starting" && lock.unitId === "bootstrap" && lock.completedUnits === 0) {
+    lines.push(`No work was lost. Run /gsd auto to restart.`);
+  } else if (lock.unitType.includes("research") || lock.unitType.includes("plan")) {
+    lines.push(`The ${lock.unitType} unit may be incomplete. Run /gsd auto to re-run it.`);
+  } else if (lock.unitType.includes("execute")) {
+    lines.push(`Task execution was interrupted. Run /gsd auto to resume — completed work is preserved.`);
+  } else if (lock.unitType.includes("complete")) {
+    lines.push(`Slice/milestone completion was interrupted. Run /gsd auto to finish.`);
+  }
+
+  return lines.join("\n");
 }

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

@@ -5,6 +5,7 @@ import { readdirSync } from "node:fs";
 import { resolveMilestoneFile, milestonesDir } from "./paths.js";
 import { parseRoadmapSlices } from "./roadmap-slices.js";
 import { findMilestoneIds } from "./guided-flow.js";
+import { parseUnitId } from "./unit-id.js";
 
 const SLICE_DISPATCH_TYPES = new Set([
   "research-slice",
@@ -39,7 +40,7 @@ function readRoadmapFromDisk(base: string, milestoneId: string): string | null {
 export function getPriorSliceCompletionBlocker(base: string, _mainBranch: string, unitType: string, unitId: string): string | null {
   if (!SLICE_DISPATCH_TYPES.has(unitType)) return null;
 
-  const [targetMid, targetSid] = unitId.split("/");
+  const { milestone: targetMid, slice: targetSid } = parseUnitId(unitId);
   if (!targetMid || !targetSid) return null;
 
   // Use findMilestoneIds to respect custom queue order.

package/dist/resources/extensions/gsd/error-utils.ts

@@ -0,0 +1,6 @@
+/**
+ * Extract a human-readable message from an unknown caught value.
+ */
+export function getErrorMessage(err: unknown): string {
+  return err instanceof Error ? err.message : String(err);
+}

package/dist/resources/extensions/gsd/export.ts

@@ -12,6 +12,7 @@ import {
 import type { UnitMetrics } from "./metrics.js";
 import { gsdRoot } from "./paths.js";
 import { formatDuration, fileLink } from "../shared/mod.js";
+import { getErrorMessage } from "./error-utils.js";
 
 /**
  * Open a file in the user's default browser.
@@ -226,7 +227,7 @@ export async function handleExport(args: string, ctx: ExtensionCommandContext, b
       }
     } catch (err) {
       ctx.ui.notify(
-        `HTML export failed: ${err instanceof Error ? err.message : String(err)}`,
+        `HTML export failed: ${getErrorMessage(err)}`,
         "error",
       );
     }

package/dist/resources/extensions/gsd/git-service.ts

@@ -33,6 +33,7 @@ import {
   nativeAddPaths,
 } from "./native-git-bridge.js";
 import { GSDError, GSD_MERGE_CONFLICT, GSD_GIT_ERROR } from "./errors.js";
+import { getErrorMessage } from "./error-utils.js";
 
 // ─── Types ─────────────────────────────────────────────────────────────────
 
@@ -281,7 +282,7 @@ export function runGit(basePath: string, args: string[], options: { allowFailure
     }).trim();
   } catch (error) {
     if (options.allowFailure) return "";
-    const message = error instanceof Error ? error.message : String(error);
+    const message = getErrorMessage(error);
     throw new GSDError(GSD_GIT_ERROR, `git ${args.join(" ")} failed in ${basePath}: ${filterGitSvnNoise(message)}`);
   }
 }
@@ -533,7 +534,7 @@ export class GitServiceImpl {
       execSync(command, { cwd: this.basePath, stdio: "pipe", encoding: "utf-8" });
       return { passed: true, skipped: false, command };
     } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
+      const msg = getErrorMessage(err);
       return { passed: false, skipped: false, command, error: msg };
     }
   }

package/dist/resources/extensions/gsd/guided-flow.ts

@@ -44,6 +44,7 @@ export {
   showQueue, handleQueueReorder, showQueueAdd,
   buildExistingMilestonesContext,
 } from "./guided-flow-queue.js";
+import { getErrorMessage } from "./error-utils.js";
 
 // ─── Commit Instruction Helpers ──────────────────────────────────────────────
 
@@ -158,9 +159,9 @@ export function checkAutoStartAfterDiscuss(): boolean {
 
   pendingAutoStart = null;
   startAuto(ctx, pi, basePath, false, { step }).catch((err) => {
-    ctx.ui.notify(`Auto-start failed: ${err instanceof Error ? err.message : String(err)}`, "error");
+    ctx.ui.notify(`Auto-start failed: ${getErrorMessage(err)}`, "error");
     if (process.env.GSD_DEBUG) console.error('[gsd] auto start error:', err);
-    debugLog("auto-start-failed", { error: err instanceof Error ? err.message : String(err) });
+    debugLog("auto-start-failed", { error: getErrorMessage(err) });
   });
   return true;
 }

package/dist/resources/extensions/gsd/index.ts

@@ -64,6 +64,7 @@ import { pauseAutoForProviderError, classifyProviderError } from "./provider-err
 import { toPosixPath } from "../shared/mod.js";
 import { isParallelActive, shutdownParallel } from "./parallel-orchestrator.js";
 import { DEFAULT_BASH_TIMEOUT_SECS } from "./constants.js";
+import { getErrorMessage } from "./error-utils.js";
 
 /**
  * Ensure the GSD database is available, auto-initializing if needed.
@@ -374,7 +375,7 @@ export default function (pi: ExtensionAPI) {
           details: { operation: "save_decision", id },
         };
       } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
+        const msg = getErrorMessage(err);
         process.stderr.write(`gsd-db: gsd_save_decision tool failed: ${msg}\n`);
         return {
           content: [{ type: "text" as const, text: `Error saving decision: ${msg}` }],
@@ -445,7 +446,7 @@ export default function (pi: ExtensionAPI) {
           details: { operation: "update_requirement", id: params.id },
         };
       } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
+        const msg = getErrorMessage(err);
         process.stderr.write(`gsd-db: gsd_update_requirement tool failed: ${msg}\n`);
         return {
           content: [{ type: "text" as const, text: `Error updating requirement: ${msg}` }],
@@ -525,7 +526,7 @@ export default function (pi: ExtensionAPI) {
           details: { operation: "save_summary", path: relativePath, artifact_type: params.artifact_type },
         };
       } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
+        const msg = getErrorMessage(err);
         process.stderr.write(`gsd-db: gsd_save_summary tool failed: ${msg}\n`);
         return {
           content: [{ type: "text" as const, text: `Error saving artifact: ${msg}` }],
@@ -574,7 +575,7 @@ export default function (pi: ExtensionAPI) {
           details: { operation: "generate_milestone_id", id: newId, existingCount: existingIds.length, reservedCount: reservedMilestoneIds.size, uniqueEnabled },
         };
       } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
+        const msg = getErrorMessage(err);
         return {
           content: [{ type: "text" as const, text: `Error generating milestone ID: ${msg}` }],
           isError: true,
@@ -795,6 +796,12 @@ export default function (pi: ExtensionAPI) {
 
   // ── agent_end: auto-mode advancement or auto-start after discuss ───────────
   pi.on("agent_end", async (event, ctx: ExtensionContext) => {
+    // Clean up quick-task branch if one just completed (#1269)
+    try {
+      const { cleanupQuickBranch } = await import("./quick.js");
+      cleanupQuickBranch();
+    } catch { /* non-fatal */ }
+
     // If discuss phase just finished, start auto-mode
     if (checkAutoStartAfterDiscuss()) {
       depthVerifiedMilestones.clear();
@@ -987,7 +994,7 @@ export default function (pi: ExtensionAPI) {
     } catch (err) {
       // Safety net: if handleAgentEnd throws despite its internal try-catch,
       // ensure auto-mode stops gracefully instead of silently stalling (#381).
-      const message = err instanceof Error ? err.message : String(err);
+      const message = getErrorMessage(err);
       ctx.ui.notify(
         `Auto-mode error in agent_end handler: ${message}. Stopping auto-mode.`,
         "error",

package/dist/resources/extensions/gsd/key-manager.ts

@@ -16,6 +16,7 @@ import { getEnvApiKey } from "@gsd/pi-ai";
 import { existsSync, statSync, chmodSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { mkdirSync } from "node:fs";
+import { getErrorMessage } from "./error-utils.js";
 
 // ─── Provider Registry ─────────────────────────────────────────────────────────
 
@@ -552,7 +553,7 @@ export async function testProviderKey(
     return { provider, status: "error", message: `HTTP ${res.status}`, latencyMs };
   } catch (err) {
     const latencyMs = Date.now() - start;
-    const msg = err instanceof Error ? err.message : String(err);
+    const msg = getErrorMessage(err);
     if (msg.includes("timeout") || msg.includes("AbortError")) {
       return { provider, status: "error", message: "timeout (15s)", latencyMs };
     }

package/dist/resources/extensions/gsd/marketplace-discovery.ts

@@ -16,6 +16,7 @@
 
 import * as fs from 'node:fs';
 import * as path from 'node:path';
+import { getErrorMessage } from "./error-utils.js";
 
 // ============================================================================
 // Type Definitions
@@ -194,7 +195,7 @@ export function parseMarketplaceJson(repoRoot: string):
   } catch (err) {
     return {
       success: false,
-      error: `Failed to read marketplace.json: ${err instanceof Error ? err.message : String(err)}`
+      error: `Failed to read marketplace.json: ${getErrorMessage(err)}`
     };
   }
   
@@ -204,7 +205,7 @@ export function parseMarketplaceJson(repoRoot: string):
   } catch (err) {
     return {
       success: false,
-      error: `Failed to parse marketplace.json: ${err instanceof Error ? err.message : String(err)}`
+      error: `Failed to parse marketplace.json: ${getErrorMessage(err)}`
     };
   }
   
@@ -293,7 +294,7 @@ export function inspectPlugin(
       }
     } catch (err) {
       // Fall back to marketplace inline or derived
-      result.error = `Failed to parse plugin.json: ${err instanceof Error ? err.message : String(err)}`;
+      result.error = `Failed to parse plugin.json: ${getErrorMessage(err)}`;
     }
   }
   

package/dist/resources/extensions/gsd/metrics.ts

@@ -18,6 +18,7 @@ import type { ExtensionContext } from "@gsd/pi-coding-agent";
 import { gsdRoot } from "./paths.js";
 import { getAndClearSkills } from "./skill-telemetry.js";
 import { loadJsonFile, loadJsonFileOrNull, saveJsonFile } from "./json-persistence.js";
+import { parseUnitId } from "./unit-id.js";
 
 // Re-export from shared — canonical implementation lives in format-utils.
 export { formatTokenCount } from "../shared/mod.js";
@@ -290,9 +291,8 @@ export function aggregateByPhase(units: UnitMetrics[]): PhaseAggregate[] {
 export function aggregateBySlice(units: UnitMetrics[]): SliceAggregate[] {
   const map = new Map<string, SliceAggregate>();
   for (const u of units) {
-    const parts = u.id.split("/");
-    // Slice ID is parts[0]/parts[1] if it exists, else parts[0]
-    const sliceId = parts.length >= 2 ? `${parts[0]}/${parts[1]}` : parts[0];
+    const { milestone, slice } = parseUnitId(u.id);
+    const sliceId = slice ? `${milestone}/${slice}` : milestone;
     let agg = map.get(sliceId);
     if (!agg) {
       agg = { sliceId, units: 0, tokens: emptyTokens(), cost: 0, duration: 0 };

package/dist/resources/extensions/gsd/migrate-external.ts

@@ -9,6 +9,7 @@
 import { existsSync, lstatSync, mkdirSync, readdirSync, renameSync, cpSync, rmSync, symlinkSync } from "node:fs";
 import { join } from "node:path";
 import { externalGsdRoot } from "./repo-identity.js";
+import { getErrorMessage } from "./error-utils.js";
 
 export interface MigrationResult {
   migrated: boolean;
@@ -47,7 +48,7 @@ export function migrateToExternalState(basePath: string): MigrationResult {
       return { migrated: false, error: ".gsd exists but is not a directory or symlink" };
     }
   } catch (err) {
-    return { migrated: false, error: `Cannot stat .gsd: ${err instanceof Error ? err.message : String(err)}` };
+    return { migrated: false, error: `Cannot stat .gsd: ${getErrorMessage(err)}` };
   }
 
   const externalPath = externalGsdRoot(basePath);
@@ -57,8 +58,24 @@ export function migrateToExternalState(basePath: string): MigrationResult {
     // mkdir -p the external dir
     mkdirSync(externalPath, { recursive: true });
 
-    // Rename .gsd -> .gsd.migrating (atomic lock)
-    renameSync(localGsd, migratingPath);
+    // Rename .gsd -> .gsd.migrating (atomic lock).
+    // On Windows, NTFS may reject rename with EPERM if file descriptors are
+    // open (VS Code watchers, antivirus on-access scan). Fall back to
+    // copy+delete (#1292).
+    try {
+      renameSync(localGsd, migratingPath);
+    } catch (renameErr: any) {
+      if (renameErr?.code === "EPERM" || renameErr?.code === "EBUSY") {
+        try {
+          cpSync(localGsd, migratingPath, { recursive: true, force: true });
+          rmSync(localGsd, { recursive: true, force: true });
+        } catch (copyErr) {
+          return { migrated: false, error: `Migration rename/copy failed: ${copyErr instanceof Error ? copyErr.message : String(copyErr)}` };
+        }
+      } else {
+        throw renameErr;
+      }
+    }
 
     // Copy contents to external dir, skipping worktrees/
     const entries = readdirSync(migratingPath, { withFileTypes: true });
@@ -98,7 +115,7 @@ export function migrateToExternalState(basePath: string): MigrationResult {
 
     return {
       migrated: false,
-      error: `Migration failed: ${err instanceof Error ? err.message : String(err)}`,
+      error: `Migration failed: ${getErrorMessage(err)}`,
     };
   }
 }

package/dist/resources/extensions/gsd/milestone-ids.ts

@@ -9,6 +9,7 @@ import { randomInt } from "node:crypto";
 import { readdirSync, existsSync } from "node:fs";
 import { milestonesDir } from "./paths.js";
 import { loadQueueOrder, sortByQueueOrder } from "./queue-order.js";
+import { getErrorMessage } from "./error-utils.js";
 
 // ─── Regex ──────────────────────────────────────────────────────────────────
 
@@ -88,7 +89,7 @@ export function findMilestoneIds(basePath: string): string[] {
   } catch (err) {
     // Log why milestone scanning failed — silent [] here causes infinite loops (#456)
     if (existsSync(dir)) {
-      console.error(`[gsd] findMilestoneIds: .gsd/milestones/ exists but readdirSync failed — ${err instanceof Error ? err.message : String(err)}`);
+      console.error(`[gsd] findMilestoneIds: .gsd/milestones/ exists but readdirSync failed — ${getErrorMessage(err)}`);
     }
     return [];
   }

package/dist/resources/extensions/gsd/native-git-bridge.ts

@@ -10,6 +10,7 @@ import { existsSync, readFileSync, unlinkSync, rmSync } from "node:fs";
 import { join } from "node:path";
 import { GSDError, GSD_GIT_ERROR } from "./errors.js";
 import { GIT_NO_PROMPT_ENV } from "./git-constants.js";
+import { getErrorMessage } from "./error-utils.js";
 
 // Issue #453: keep auto-mode bookkeeping on the stable git CLI path unless a
 // caller explicitly opts into the native helper.
@@ -716,7 +717,7 @@ export function nativeCommit(
     try {
       return native.gitCommit(basePath, message, options?.allowEmpty);
     } catch (e) {
-      const msg = e instanceof Error ? e.message : String(e);
+      const msg = getErrorMessage(e);
       if (msg.includes("nothing to commit")) return null;
       throw e;
     }

package/dist/resources/extensions/gsd/parallel-merge.ts

@@ -11,6 +11,7 @@ import { mergeMilestoneToMain } from "./auto-worktree.js";
 import { MergeConflictError } from "./git-service.js";
 import { removeSessionStatus } from "./session-status-io.js";
 import type { WorkerInfo } from "./parallel-orchestrator.js";
+import { getErrorMessage } from "./error-utils.js";
 
 // ─── Types ─────────────────────────────────────────────────────────────────
 
@@ -99,7 +100,7 @@ export async function mergeCompletedMilestone(
     return {
       milestoneId,
       success: false,
-      error: err instanceof Error ? err.message : String(err),
+      error: getErrorMessage(err),
     };
   }
 }

package/dist/resources/extensions/gsd/parallel-orchestrator.ts

@@ -38,6 +38,7 @@ import {
   analyzeParallelEligibility,
   type ParallelCandidates,
 } from "./parallel-eligibility.js";
+import { getErrorMessage } from "./error-utils.js";
 
 // ─── Types ─────────────────────────────────────────────────────────────────
 
@@ -363,7 +364,7 @@ export async function startParallel(
 
       started.push(mid);
     } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
+      const message = getErrorMessage(err);
       errors.push({ mid, error: message });
     }
   }

package/dist/resources/extensions/gsd/post-unit-hooks.ts

@@ -15,6 +15,7 @@ import { resolvePostUnitHooks, resolvePreDispatchHooks } from "./preferences.js"
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
 import { gsdRoot } from "./paths.js";
+import { parseUnitId } from "./unit-id.js";
 
 // ─── Hook Queue State ──────────────────────────────────────────────────────
 
@@ -149,7 +150,7 @@ function dequeueNextHook(basePath: string): HookDispatchResult | null {
     };
 
     // Build the prompt with variable substitution
-    const [mid, sid, tid] = triggerUnitId.split("/");
+    const { milestone: mid, slice: sid, task: tid } = parseUnitId(triggerUnitId);
     const prompt = config.prompt
       .replace(/\{milestoneId\}/g, mid ?? "")
       .replace(/\{sliceId\}/g, sid ?? "")
@@ -208,16 +209,14 @@ function handleHookCompletion(basePath: string): HookDispatchResult | null {
  *   - Milestone-level (M001):    .gsd/M001/{artifact}
  */
 export function resolveHookArtifactPath(basePath: string, unitId: string, artifactName: string): string {
-  const parts = unitId.split("/");
-  if (parts.length === 3) {
-    const [mid, sid, tid] = parts;
+  const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
+  if (mid && sid && tid) {
     return join(gsdRoot(basePath), mid, "slices", sid, "tasks", `${tid}-${artifactName}`);
   }
-  if (parts.length === 2) {
-    const [mid, sid] = parts;
+  if (mid && sid) {
     return join(gsdRoot(basePath), mid, "slices", sid, artifactName);
   }
-  return join(gsdRoot(basePath), parts[0], artifactName);
+  return join(gsdRoot(basePath), mid, artifactName);
 }
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -253,7 +252,7 @@ export function runPreDispatchHooks(
     return { action: "proceed", prompt, firedHooks: [] };
   }
 
-  const [mid, sid, tid] = unitId.split("/");
+  const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
   const substitute = (text: string): string =>
     text
       .replace(/\{milestoneId\}/g, mid ?? "")
@@ -466,7 +465,7 @@ export function triggerHookManually(
   activeHook.cycle = currentCycle;
 
   // Build the prompt with variable substitution
-  const [mid, sid, tid] = unitId.split("/");
+  const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
   const prompt = hook.prompt
     .replace(/\{milestoneId\}/g, mid ?? "")
     .replace(/\{sliceId\}/g, sid ?? "")

package/dist/resources/extensions/gsd/quick.ts

@@ -15,6 +15,7 @@ import { join } from "node:path";
 import { loadPrompt } from "./prompt-loader.js";
 import { gsdRoot } from "./paths.js";
 import { createGitService, runGit } from "./git-service.js";
+import { getErrorMessage } from "./error-utils.js";
 
 // ─── Quick Task Helpers ───────────────────────────────────────────────────────
 
@@ -107,10 +108,11 @@ export async function handleQuick(
   const skipBranch = git.prefs.isolation === "none";
 
   let branchCreated = false;
+  let originalBranch: string | undefined;
   if (!skipBranch) {
     try {
-      const current = git.getCurrentBranch();
-      if (current !== branchName) {
+      originalBranch = git.getCurrentBranch();
+      if (originalBranch !== branchName) {
         // Auto-commit any dirty state before switching
         try {
           git.autoCommit("quick-task", `Q${taskNum}`, []);
@@ -121,7 +123,7 @@ export async function handleQuick(
       }
     } catch (err) {
       // Branch creation failed — continue on current branch
-      const message = err instanceof Error ? err.message : String(err);
+      const message = getErrorMessage(err);
       ctx.ui.notify(`Could not create branch ${branchName}: ${message}. Working on current branch.`, "warning");
     }
   }
@@ -154,4 +156,57 @@ export async function handleQuick(
     },
     { triggerTurn: true },
   );
+
+  // Schedule branch merge-back after the quick task agent session ends.
+  // Without this, auto-mode resumes on the quick-task branch (#1269).
+  if (branchCreated && originalBranch) {
+    _pendingQuickBranchReturn = {
+      basePath,
+      originalBranch,
+      quickBranch: branchName,
+      taskNum,
+      slug,
+      description,
+    };
+  }
+}
+
+/** Pending quick-task branch return — consumed by cleanupQuickBranch(). */
+let _pendingQuickBranchReturn: {
+  basePath: string;
+  originalBranch: string;
+  quickBranch: string;
+  taskNum: number;
+  slug: string;
+  description: string;
+} | null = null;
+
+/**
+ * Merge the quick-task branch back to the original branch and switch.
+ * Called from the agent_end handler after a quick task completes.
+ * Returns true if a branch return was performed.
+ */
+export function cleanupQuickBranch(): boolean {
+  if (!_pendingQuickBranchReturn) return false;
+  const { basePath, originalBranch, quickBranch, taskNum, slug, description } = _pendingQuickBranchReturn;
+  _pendingQuickBranchReturn = null;
+
+  try {
+    // Auto-commit any remaining work
+    try { runGit(basePath, ["add", "-A"]); } catch {}
+    try { runGit(basePath, ["commit", "-m", `quick(Q${taskNum}): ${slug}`]); } catch {}
+
+    // Switch back and merge
+    runGit(basePath, ["checkout", originalBranch]);
+    try {
+      runGit(basePath, ["merge", "--squash", quickBranch]);
+      runGit(basePath, ["commit", "-m", `quick(Q${taskNum}): ${description.slice(0, 72)}`]);
+    } catch { /* merge conflict or nothing — non-fatal */ }
+
+    // Clean up quick branch
+    try { runGit(basePath, ["branch", "-D", quickBranch]); } catch {}
+    return true;
+  } catch {
+    return false;
+  }
 }

package/dist/resources/extensions/gsd/repo-identity.ts

@@ -10,7 +10,7 @@ import { createHash } from "node:crypto";
 import { execFileSync } from "node:child_process";
 import { existsSync, lstatSync, mkdirSync, readFileSync, realpathSync, symlinkSync } from "node:fs";
 import { homedir } from "node:os";
-import { join, resolve } from "node:path";
+import { join, resolve, sep } from "node:path";
 
 // ─── Repo Identity ──────────────────────────────────────────────────────────
 
@@ -37,6 +37,27 @@ function getRemoteUrl(basePath: string): string {
  */
 function resolveGitRoot(basePath: string): string {
   try {
+    // In a worktree, --show-toplevel returns the worktree path, not the main
+    // repo root. Use --git-common-dir to find the shared .git directory,
+    // then derive the main repo root from it (#1288).
+    const commonDir = execFileSync("git", ["rev-parse", "--git-common-dir"], {
+      cwd: basePath,
+      encoding: "utf-8",
+      stdio: ["ignore", "pipe", "ignore"],
+      timeout: 5_000,
+    }).trim();
+
+    // If commonDir ends with .git/worktrees/<name>, the main repo is two
+    // levels up from the worktrees dir. If it's just .git, resolve normally.
+    if (commonDir.includes(`${sep}worktrees${sep}`) || commonDir.includes("/worktrees/")) {
+      // e.g., /path/to/project/.gsd/worktrees/M001/.git → /path/to/project
+      // or /path/to/project/.git/worktrees/M001 → /path/to/project
+      const gitDir = commonDir.replace(/[/\\]worktrees[/\\][^/\\]+$/, "");
+      const mainRoot = resolve(gitDir, "..");
+      return mainRoot;
+    }
+
+    // Not in a worktree — use --show-toplevel as usual
     return execFileSync("git", ["rev-parse", "--show-toplevel"], {
       cwd: basePath,
       encoding: "utf-8",

package/dist/resources/extensions/gsd/session-lock.ts

@@ -154,12 +154,23 @@ export function acquireSessionLock(basePath: string): SessionLockResult {
         // Retry acquisition after cleanup
         const release = lockfile.lockSync(gsdDir, {
           realpath: false,
-          stale: 300_000,
+          stale: 1_800_000, // 30 minutes — match primary lock settings
           update: 10_000,
+          onCompromised: () => {
+            _lockCompromised = true;
+          },
         });
         _releaseFunction = release;
         _lockedPath = basePath;
         _lockPid = process.pid;
+
+        // Safety net for retry path too
+        const retryLockDir = join(gsdDir + ".lock");
+        process.once("exit", () => {
+          try { if (_releaseFunction) { _releaseFunction(); _releaseFunction = null; } } catch {}
+          try { if (existsSync(retryLockDir)) rmSync(retryLockDir, { recursive: true, force: true }); } catch {}
+        });
+
         atomicWriteSync(lp, JSON.stringify(lockData, null, 2));
         return { acquired: true };
       } catch {

package/dist/resources/extensions/gsd/tests/all-milestones-complete-merge.test.ts

@@ -70,31 +70,34 @@ test("auto.ts 'all milestones complete' path merges before stopping (#962)", ()
   const incompleteIdx = autoSrc.indexOf("incomplete.length === 0");
   assert.ok(incompleteIdx > -1, "auto.ts should have 'incomplete.length === 0' check");
 
-  // The merge call must appear BETWEEN the incomplete check and the stopAuto call
-  // in that same block
+  // The merge call must appear BETWEEN the incomplete check and the stopAuto call.
+  // After the #1308 refactor, the merge is delegated to tryMergeMilestone.
   const blockAfterIncomplete = autoSrc.slice(incompleteIdx, incompleteIdx + 3000);
 
   assert.ok(
-    blockAfterIncomplete.includes("mergeMilestoneToMain"),
-    "auto.ts should call mergeMilestoneToMain in the 'all milestones complete' path",
+    blockAfterIncomplete.includes("tryMergeMilestone"),
+    "auto.ts should call tryMergeMilestone in the 'all milestones complete' path",
   );
 
   // The merge should come before stopAuto in this block
-  const mergePos = blockAfterIncomplete.indexOf("mergeMilestoneToMain");
+  const mergePos = blockAfterIncomplete.indexOf("tryMergeMilestone");
   const stopPos = blockAfterIncomplete.indexOf("stopAuto");
   assert.ok(
     mergePos < stopPos,
-    "mergeMilestoneToMain should be called before stopAuto in the 'all complete' path",
+    "tryMergeMilestone should be called before stopAuto in the 'all complete' path",
   );
 
-  // Should handle both worktree and branch isolation modes
+  // Verify tryMergeMilestone handles both worktree and branch isolation
+  const helperIdx = autoSrc.indexOf("function tryMergeMilestone");
+  assert.ok(helperIdx > -1, "tryMergeMilestone helper should exist");
+  const helperBlock = autoSrc.slice(helperIdx, helperIdx + 2000);
   assert.ok(
-    blockAfterIncomplete.includes("isInAutoWorktree"),
-    "should check isInAutoWorktree for worktree mode",
+    helperBlock.includes("isInAutoWorktree"),
+    "tryMergeMilestone should check isInAutoWorktree for worktree mode",
   );
   assert.ok(
-    blockAfterIncomplete.includes("getIsolationMode"),
-    "should check getIsolationMode for branch isolation mode",
+    helperBlock.includes("getIsolationMode") || helperBlock.includes("isolationMode"),
+    "tryMergeMilestone should check isolation mode for branch mode",
   );
 });
 

package/dist/resources/extensions/gsd/tests/context-compression.test.ts

@@ -91,7 +91,7 @@ test("compression: buildPlanMilestonePrompt minimal drops project/requirements/d
   // The plan-milestone builder should gate root file inlining on inlineLevel
   assert.ok(
     promptsSrc.includes('inlineLevel !== "minimal"') &&
-    promptsSrc.includes('inlineGsdRootFile(base, "project.md"'),
+    promptsSrc.includes("inlineProjectFromDb(base)"),
     "plan-milestone should conditionally include project.md based on level",
   );
 });