@opengsd/gsd-pi 1.3.0 → 1.4.0

package/dist/resources/extensions/gsd/workflow-manifest.js

@@ -1,11 +1,12 @@
 // Project/App: gsd-pi
 // File Purpose: State manifest snapshot and restore orchestration for GSD workflow data.
 import { _getAdapter, readTransaction, restoreManifest, } from "./gsd-db.js";
-import { atomicWriteSync } from "./atomic-write.js";
+import { atomicWriteAsync, atomicWriteSync } from "./atomic-write.js";
 import { getAllDecisionsFromMemories } from "./context-store.js";
 import { backfillDecisionsToMemories } from "./memory-backfill.js";
 import { invalidateAllCaches } from "./cache.js";
-import { readFileSync, existsSync, mkdirSync } from "node:fs";
+import { logWarning } from "./workflow-logger.js";
+import { readFileSync, existsSync } from "node:fs";
 import { isAbsolute, join, relative, resolve } from "node:path";
 // ─── helpers ─────────────────────────────────────────────────────────────
 function requireDb() {
@@ -257,22 +258,131 @@ export function snapshotState() {
         return result;
     });
 }
-// ─── restore ─────────────────────────────────────────────────────────────
-//
-// The actual restore() implementation lives in gsd-db.ts (single-writer
-// invariant). This module only orchestrates reading the manifest file
-// and handing it to the writer.
-// ─── writeManifest ───────────────────────────────────────────────────────
+const manifestWrites = new Map();
+let processTeardownFlushInstalled = false;
+let beforeExitFlushStarted = false;
+function manifestWriteKey(basePath) {
+    return resolve(basePath);
+}
+function manifestFilePath(basePath) {
+    return join(resolve(basePath), ".gsd", "state-manifest.json");
+}
+function describeError(err) {
+    return err instanceof Error ? err.message : String(err);
+}
+function logManifestWriteFailure(filePath, err) {
+    logWarning("manifest", `state manifest write failed: ${describeError(err)}`, { file: filePath });
+}
+async function drainManifestWrites(key, state) {
+    let lastWriteError = null;
+    try {
+        while (state.latestJson !== null && state.syncFlushJson === null) {
+            const json = state.latestJson;
+            state.latestJson = null;
+            state.inFlightJson = json;
+            try {
+                await atomicWriteAsync(state.filePath, json);
+                if (state.syncFlushJson !== null) {
+                    atomicWriteSync(state.filePath, state.syncFlushJson);
+                    break;
+                }
+                lastWriteError = null;
+            }
+            catch (err) {
+                lastWriteError = err;
+                logManifestWriteFailure(state.filePath, err);
+            }
+            finally {
+                state.inFlightJson = null;
+            }
+        }
+    }
+    finally {
+        state.active = null;
+        if (state.latestJson === null && state.inFlightJson === null) {
+            manifestWrites.delete(key);
+        }
+    }
+    if (lastWriteError !== null && state.syncFlushJson === null) {
+        throw lastWriteError;
+    }
+}
+function enqueueManifestWrite(basePath, json) {
+    const key = manifestWriteKey(basePath);
+    let state = manifestWrites.get(key);
+    if (!state) {
+        state = {
+            filePath: manifestFilePath(basePath),
+            latestJson: null,
+            inFlightJson: null,
+            syncFlushJson: null,
+            active: null,
+        };
+        manifestWrites.set(key, state);
+    }
+    state.latestJson = json;
+    if (!state.active) {
+        const active = drainManifestWrites(key, state);
+        void active.catch(() => { });
+        state.active = active;
+    }
+}
 /**
- * Write current DB state to .gsd/state-manifest.json via atomicWriteSync.
+ * Queue current DB state for an async atomic write to .gsd/state-manifest.json.
  * Uses JSON.stringify with 2-space indent for git three-way merge friendliness.
  */
 export function writeManifest(basePath) {
     const manifest = snapshotState();
     const json = JSON.stringify(manifest, null, 2);
-    const dir = join(basePath, ".gsd");
-    mkdirSync(dir, { recursive: true });
-    atomicWriteSync(join(dir, "state-manifest.json"), json);
+    enqueueManifestWrite(basePath, json);
+}
+async function flushManifestByKey(key) {
+    for (;;) {
+        const active = manifestWrites.get(key)?.active;
+        if (!active)
+            return;
+        await active;
+    }
+}
+/**
+ * Wait for any queued manifest write for this base path to become durable.
+ */
+export async function flushManifest(basePath) {
+    await flushManifestByKey(manifestWriteKey(basePath));
+}
+export async function flushAllManifests() {
+    await Promise.all(Array.from(manifestWrites.keys(), key => flushManifestByKey(key)));
+}
+function flushAllManifestsSync() {
+    for (const [key, state] of manifestWrites) {
+        const json = state.latestJson ?? state.inFlightJson;
+        if (json === null)
+            continue;
+        try {
+            atomicWriteSync(state.filePath, json);
+            state.latestJson = null;
+            state.inFlightJson = null;
+            state.syncFlushJson = json;
+            manifestWrites.delete(key);
+        }
+        catch (err) {
+            logManifestWriteFailure(state.filePath, err);
+        }
+    }
+}
+export function installManifestFlushOnProcessTeardown() {
+    if (processTeardownFlushInstalled)
+        return;
+    processTeardownFlushInstalled = true;
+    process.once("beforeExit", () => {
+        if (beforeExitFlushStarted)
+            return;
+        beforeExitFlushStarted = true;
+        void flushAllManifests();
+    });
+    process.once("exit", () => {
+        flushAllManifestsSync();
+    });
 }
 // ─── readManifest ────────────────────────────────────────────────────────
 /**
@@ -317,7 +427,10 @@ function restoreArtifactProjections(basePath, manifest) {
     if (manifest.artifacts === undefined)
         return;
     for (const artifact of manifest.artifacts) {
-        atomicWriteSync(artifactProjectionPath(basePath, artifact.path), artifact.full_content ?? "");
+        const content = artifact.full_content ?? "";
+        if (content === "")
+            continue;
+        atomicWriteSync(artifactProjectionPath(basePath, artifact.path), content);
     }
 }
 // ─── bootstrapFromManifest ──────────────────────────────────────────────

package/dist/resources/extensions/gsd/workflow-mcp.js

@@ -54,6 +54,7 @@ function lookupCommand(command, platform = process.platform) {
         return null;
     }
 }
+const gsdPiRepoRootCache = new Map();
 function findGsdPiRepoRoot(startPath) {
     let current;
     try {
@@ -62,15 +63,22 @@ function findGsdPiRepoRoot(startPath) {
     catch {
         current = resolve(startPath);
     }
+    const cacheKey = current;
+    if (gsdPiRepoRootCache.has(cacheKey)) {
+        return gsdPiRepoRootCache.get(cacheKey) ?? null;
+    }
     while (true) {
         const distCli = resolve(current, "packages", "mcp-server", "dist", "cli.js");
-        if (existsSync(distCli))
+        if (existsSync(distCli)) {
+            gsdPiRepoRootCache.set(cacheKey, current);
             return current;
+        }
         const parent = dirname(current);
         if (parent === current)
             break;
         current = parent;
     }
+    gsdPiRepoRootCache.set(cacheKey, null);
     return null;
 }
 function findWorkflowCliFromAncestorPath(startPath) {

package/dist/resources/extensions/gsd/workflow-projections.js

@@ -13,7 +13,7 @@ import { isClosedStatus } from "./status-guards.js";
 import { deriveState } from "./state.js";
 import { renderPlanFromDb, renderRoadmapFromDb } from "./markdown-renderer.js";
 import { readManifest } from "./workflow-manifest.js";
-import { gsdRoot } from "./paths.js";
+import { gsdRoot, resolveSliceFile, resolveMilestonePath, resolveSlicePath, gsdProjectionRoot } from "./paths.js";
 // ─── Helpers ─────────────────────────────────────────────────────────────
 /**
  * Strip a leading ID prefix (e.g. "M001: " or "S04: ") from a title
@@ -276,7 +276,24 @@ export function renderSummaryProjection(basePath, milestoneId, sliceId, taskId)
         return;
     const evidenceRows = getVerificationEvidence(milestoneId, sliceId, taskId);
     const content = renderSummaryContent(taskRow, sliceId, milestoneId, evidenceRows);
-    const dir = join(basePath, ".gsd", "milestones", milestoneId, "slices", sliceId, "tasks");
+    // Layout-aware: avoid creating a milestones/ directory as a side effect for
+    // flat-phase projects. If milestonesDir() sees a freshly-created milestones/
+    // dir it treats the project as legacy, breaking all subsequent path resolution.
+    const slicePath = resolveSlicePath(basePath, milestoneId, sliceId);
+    const phaseDir = resolveMilestonePath(basePath, milestoneId);
+    let dir;
+    if (slicePath && phaseDir && slicePath !== phaseDir) {
+        // Legacy layout: slice has its own slices/SID/ subdir → tasks/ subdir
+        dir = join(slicePath, "tasks");
+    }
+    else if (phaseDir) {
+        // Flat-phase: task summaries go in the phase dir (no tasks/ subdir needed)
+        dir = phaseDir;
+    }
+    else {
+        // Fallback: legacy hardcoded path (milestone dir not on disk yet)
+        dir = join(gsdProjectionRoot(basePath), "milestones", milestoneId, "slices", sliceId, "tasks");
+    }
     mkdirSync(dir, { recursive: true });
     atomicWriteSync(join(dir, `${taskId}-SUMMARY.md`), content);
 }
@@ -382,15 +399,13 @@ export async function renderStateProjection(basePath) {
         logWarning("projection", `renderStateProjection failed: ${err.message}`);
     }
 }
-// ─── renderAllProjections ───────────────────────────────────────────────
+// ─── renderMilestoneShellProjections ─────────────────────────────────────
 /**
- * Regenerate all projection files for a milestone from DB state.
- * All calls are wrapped in try/catch — projection failure is non-fatal per D-02.
+ * Regenerate milestone-level projections (roadmap, top-level views, STATE.md).
+ * Does not touch slice PLAN.md or task SUMMARY.md — those have authoritative
+ * renderers in plan-slice / complete-task.
  */
-export async function renderAllProjections(basePath, milestoneId) {
-    // Delegate to the authoritative roadmap renderer — the reduced
-    // renderRoadmapProjection omits sections like ## Boundary Map and would
-    // clobber the output written by plan-milestone / reassess-roadmap.
+export async function renderMilestoneShellProjections(basePath, milestoneId) {
     try {
         await renderRoadmapFromDb(basePath, milestoneId);
     }
@@ -409,6 +424,20 @@ export async function renderAllProjections(basePath, milestoneId) {
     catch (err) {
         logWarning("projection", `renderTopLevelQueueFromDb failed: ${err.message}`);
     }
+    try {
+        await renderStateProjection(basePath);
+    }
+    catch (err) {
+        logWarning("projection", `renderStateProjection failed: ${err.message}`);
+    }
+}
+// ─── renderAllProjections ───────────────────────────────────────────────
+/**
+ * Regenerate all projection files for a milestone from DB state.
+ * All calls are wrapped in try/catch — projection failure is non-fatal per D-02.
+ */
+export async function renderAllProjections(basePath, milestoneId) {
+    await renderMilestoneShellProjections(basePath, milestoneId);
     // Query all slices for this milestone
     const sliceRows = getMilestoneSlices(milestoneId);
     for (const slice of sliceRows) {
@@ -428,13 +457,6 @@ export async function renderAllProjections(basePath, milestoneId) {
             }
         }
     }
-    // Render STATE.md
-    try {
-        await renderStateProjection(basePath);
-    }
-    catch (err) {
-        logWarning("projection", `renderStateProjection failed: ${err.message}`);
-    }
 }
 // ─── regenerateIfMissing ────────────────────────────────────────────────
 /**
@@ -447,7 +469,9 @@ export async function regenerateIfMissing(basePath, milestoneId, sliceId, fileTy
     let filePath;
     switch (fileType) {
         case "PLAN":
-            filePath = join(basePath, ".gsd", "milestones", milestoneId, "slices", sliceId, `${sliceId}-PLAN.md`);
+            // Use resolveSliceFile so both flat-phase and legacy layouts are detected.
+            // Falls back to "" (non-existent) when the file hasn't been rendered yet.
+            filePath = resolveSliceFile(basePath, milestoneId, sliceId, "PLAN") ?? "";
             break;
         case "ROADMAP":
             filePath = join(basePath, ".gsd", "milestones", milestoneId, `${milestoneId}-ROADMAP.md`);
@@ -497,7 +521,9 @@ export async function regenerateIfMissing(basePath, milestoneId, sliceId, fileTy
         switch (fileType) {
             case "PLAN":
                 await renderPlanFromDb(basePath, milestoneId, sliceId);
-                return existsSync(filePath);
+                // Re-resolve after render: the rendered file may be at a different path
+                // from the pre-check (flat-phase vs legacy). resolveSliceFile finds it.
+                return !!(resolveSliceFile(basePath, milestoneId, sliceId, "PLAN"));
             case "ROADMAP":
                 await renderRoadmapFromDb(basePath, milestoneId);
                 return existsSync(filePath);

package/dist/resources/extensions/gsd/workspace-git-preflight.js

@@ -4,9 +4,11 @@ import { existsSync, realpathSync } from "node:fs";
 import { getAutoWorktreePath } from "./auto-worktree.js";
 import { isSafeToAutoResolve } from "./auto-worktree.js";
 import { ensureDbOpen } from "./bootstrap/dynamic-tools.js";
-import { probeGitConflictState, reconcileGitConflictsOnSignal, } from "./git-conflict-state.js";
+import { listMergeStateBlockers, probeGitConflictState, reconcileGitConflictsOnSignal, } from "./git-conflict-state.js";
 import { deriveState } from "./state.js";
 import { resolveWorktreeProjectRoot } from "./worktree-root.js";
+const CLEAN_TARGET_CACHE_TTL_MS = 10_000;
+const cleanTargetProbeCache = new Map();
 function normalizeTargetPath(path) {
     try {
         return realpathSync(path);
@@ -77,6 +79,25 @@ function formatBlockReason(severity, conflictedPaths, targets) {
 }
 async function ensureTargetGitReady(target) {
     const fixesApplied = [];
+    const cacheKey = normalizeTargetPath(target);
+    const cachedCleanAt = cleanTargetProbeCache.get(cacheKey);
+    if (cachedCleanAt !== undefined) {
+        if (Date.now() - cachedCleanAt < CLEAN_TARGET_CACHE_TTL_MS) {
+            // Merge-state markers (MERGE_HEAD, rebase-apply, rebase-merge) are the most
+            // common way a repo transitions from clean to dirty within the TTL window,
+            // including when a non-git folder is initialized as a repo mid-TTL and a
+            // merge immediately introduces conflicts. Check them here — they are pure
+            // existsSync calls with no git subprocess — and fall through to a full probe
+            // only when markers are present.
+            if (listMergeStateBlockers(cacheKey).length === 0) {
+                return { ok: true, fixesApplied };
+            }
+            cleanTargetProbeCache.delete(cacheKey);
+        }
+        else {
+            cleanTargetProbeCache.delete(cacheKey);
+        }
+    }
     let probe = probeGitConflictState(target);
     for (let attempt = 0; attempt < 3 && probe.status === "dirty"; attempt++) {
         const beforeKey = JSON.stringify({
@@ -95,6 +116,7 @@ async function ensureTargetGitReady(target) {
             break;
     }
     if (probe.status === "unknown") {
+        cleanTargetProbeCache.delete(cacheKey);
         return {
             ok: false,
             reason: formatBlockReason("unrecoverable", [], [target]),
@@ -106,6 +128,7 @@ async function ensureTargetGitReady(target) {
     }
     const conflictedPaths = productConflictPaths(probe);
     if (conflictedPaths.length > 0 || probe.checkFailures.length > 0) {
+        cleanTargetProbeCache.delete(cacheKey);
         return {
             ok: false,
             reason: formatBlockReason("product-conflicts", conflictedPaths, [target]),
@@ -115,6 +138,12 @@ async function ensureTargetGitReady(target) {
             targets: [target],
         };
     }
+    if (probe.status === "clean") {
+        cleanTargetProbeCache.set(cacheKey, Date.now());
+    }
+    else {
+        cleanTargetProbeCache.delete(cacheKey);
+    }
     return { ok: true, fixesApplied };
 }
 /** Probe and heal a single git root (tests and headless paths). */

package/dist/resources/extensions/gsd/worktree-command.js

@@ -454,11 +454,11 @@ async function handleMerge(basePath, name, ctx, pi, targetBranch) {
             return;
         }
         // Gather merge context — full repo diff, not just .gsd/
-        const diffSummary = diffWorktreeAll(basePath, name);
-        const numstat = diffWorktreeNumstat(basePath, name);
-        const gsdDiff = getWorktreeGSDDiff(basePath, name);
-        const codeDiff = getWorktreeCodeDiff(basePath, name);
-        const commitLog = getWorktreeLog(basePath, name);
+        const diffSummary = diffWorktreeAll(basePath, name, undefined, mainBranch);
+        const numstat = diffWorktreeNumstat(basePath, name, undefined, mainBranch);
+        const gsdDiff = getWorktreeGSDDiff(basePath, name, mainBranch);
+        const codeDiff = getWorktreeCodeDiff(basePath, name, mainBranch);
+        const commitLog = getWorktreeLog(basePath, name, mainBranch);
         const totalChanges = diffSummary.added.length + diffSummary.modified.length + diffSummary.removed.length;
         if (totalChanges === 0 && !commitLog.trim()) {
             ctx.ui.notify(`Worktree ${CLR.name(name)} has no changes to merge.`, "info");
@@ -541,7 +541,7 @@ async function handleMerge(basePath, name, ctx, pi, targetBranch) {
             catch { /* non-fatal */ }
         }
         try {
-            mergeWorktreeToMain(basePath, name, commitMessage);
+            mergeWorktreeToMain(basePath, name, commitMessage, undefined, mainBranch);
             ctx.ui.notify([
                 `${CLR.ok("✓")} Merged ${CLR.name(name)} → ${CLR.branch(mainBranch)} ${CLR.muted("(deterministic squash)")}`,
                 "",

package/dist/resources/extensions/gsd/worktree-health.js

@@ -19,9 +19,9 @@ const DEFAULT_STALE_DAYS = 14;
  * @param basePath — the main project root (not the worktree path)
  * @param wt — worktree info from listWorktrees()
  * @param staleDays — days without commits to consider stale (default: 14)
+ * @param mainBranch — pre-detected main branch for batched health checks
  */
-export function getWorktreeHealth(basePath, wt, staleDays = DEFAULT_STALE_DAYS) {
-    const mainBranch = nativeDetectMainBranch(basePath);
+export function getWorktreeHealth(basePath, wt, staleDays = DEFAULT_STALE_DAYS, mainBranch = nativeDetectMainBranch(basePath)) {
     // Merge status: is the worktree branch fully contained in main?
     let mergedIntoMain = false;
     try {
@@ -84,7 +84,10 @@ export function getWorktreeHealth(basePath, wt, staleDays = DEFAULT_STALE_DAYS)
  */
 export function getAllWorktreeHealth(basePath, staleDays = DEFAULT_STALE_DAYS) {
     const worktrees = listWorktrees(basePath);
-    return worktrees.map(wt => getWorktreeHealth(basePath, wt, staleDays));
+    if (worktrees.length === 0)
+        return [];
+    const mainBranch = nativeDetectMainBranch(basePath);
+    return worktrees.map(wt => getWorktreeHealth(basePath, wt, staleDays, mainBranch));
 }
 /**
  * Format a human-readable status line for a worktree health entry.

package/dist/resources/extensions/gsd/worktree-manager.js

@@ -17,12 +17,12 @@
  *   3. merge()   — LLM-guided reconciliation of .gsd/ artifacts back to main
  *   4. remove()  — git worktree remove + branch cleanup
  */
-import { existsSync, lstatSync, mkdirSync, readdirSync, readFileSync, realpathSync, rmSync, statSync } from "node:fs";
+import { existsSync, lstatSync, mkdirSync, readdirSync, readFileSync, realpathSync, rmSync, statSync, unlinkSync } from "node:fs";
 import { execFileSync } from "node:child_process";
 import { join, resolve, sep } from "node:path";
 import { GSDError, GSD_PARSE_ERROR, GSD_STALE_STATE, GSD_LOCK_HELD, GSD_GIT_ERROR, GSD_MERGE_CONFLICT } from "./errors.js";
 import { logWarning } from "./workflow-logger.js";
-import { nativeBranchList, nativeBranchDelete, nativeBranchExists, nativeBranchForceReset, nativeCommit, nativeDetectMainBranch, nativeDiffContent, nativeDiffNameStatus, nativeDiffNumstat, nativeGetCurrentBranch, nativeIsAncestor, nativeLogOneline, nativeMergeSquash, nativeWorktreeAdd, nativeWorktreeList, nativeWorktreePrune, nativeWorktreeRemove, } from "./native-git-bridge.js";
+import { nativeBranchList, nativeBranchDelete, nativeBranchExists, nativeBranchForceReset, nativeCommit, nativeDetectMainBranch, nativeDiffContent, nativeDiffNameStatus, nativeDiffNumstat, nativeGetCurrentBranch, nativeIsAncestor, nativeLogOneline, nativeMergeAbort, nativeMergeSquash, nativeWorktreeAdd, nativeWorktreeList, nativeWorktreePrune, nativeWorktreeRemove, } from "./native-git-bridge.js";
 import { emitCanonicalRootRedirect } from "./worktree-telemetry.js";
 import { isGsdWorktreePath, normalizeWorktreePathForCompare, resolveWorktreeProjectRoot, } from "./worktree-root.js";
 import { MILESTONE_ID_RE } from "./milestone-ids.js";
@@ -37,6 +37,36 @@ function deleteBranchIfPresent(basePath, branch, warningPrefix) {
         logWarning("worktree", `${warningPrefix}: ${e.message}`);
     }
 }
+function cleanupFailedSquashMergeState(basePath) {
+    try {
+        nativeMergeAbort(basePath);
+    }
+    catch (e) {
+        // Squash conflicts may not create MERGE_HEAD; this is expected.
+        logWarning("worktree", `merge abort skipped: ${e.message}`);
+    }
+    try {
+        execFileSync("git", ["reset", "--merge"], {
+            cwd: basePath,
+            stdio: ["ignore", "pipe", "pipe"],
+            encoding: "utf-8",
+        });
+    }
+    catch (e) {
+        logWarning("worktree", `failed squash merge reset failed: ${e.message}`);
+    }
+    const gitDir = resolveGitDir(basePath);
+    for (const marker of ["SQUASH_MSG", "MERGE_MSG", "MERGE_MODE", "MERGE_HEAD", "AUTO_MERGE"]) {
+        try {
+            const markerPath = join(gitDir, marker);
+            if (existsSync(markerPath))
+                unlinkSync(markerPath);
+        }
+        catch (e) {
+            logWarning("worktree", `failed squash merge marker cleanup failed (${marker}): ${e.message}`);
+        }
+    }
+}
 // ─── Path Helpers ──────────────────────────────────────────────────────────
 function normalizePathForComparison(path) {
     const normalized = path
@@ -225,7 +255,7 @@ export function pruneEphemeralGhostWorktreeDirectories(basePath) {
     }
     return removed;
 }
-function removeStaleWorktreeDirectory(wtPath, name) {
+export function removeStaleWorktreeDirectory(wtPath, name) {
     logWarning("reconcile", `Removing stale worktree directory (not registered with git): ${wtPath}`, { worktree: name });
     try {
         rmSync(wtPath, { recursive: true, force: true });
@@ -821,10 +851,10 @@ function parseDiffNameStatus(entries) {
  * Diff the .gsd/ directory between the worktree branch and main branch.
  * Returns a summary of added, modified, and removed GSD artifacts.
  */
-export function diffWorktreeGSD(basePath, name) {
+export function diffWorktreeGSD(basePath, name, mainBranchOverride) {
     basePath = normalizeBasePathForWorktreeOps(basePath);
     const branch = worktreeBranchName(name);
-    const mainBranch = nativeDetectMainBranch(basePath);
+    const mainBranch = mainBranchOverride ?? nativeDetectMainBranch(basePath);
     const entries = nativeDiffNameStatus(basePath, mainBranch, branch, ".gsd/", true);
     return parseDiffNameStatus(entries);
 }
@@ -834,10 +864,10 @@ export function diffWorktreeGSD(basePath, name) {
  * on main when the merge is applied. If both branches have identical
  * content, this correctly returns an empty diff.
  */
-export function diffWorktreeAll(basePath, name, branchOverride) {
+export function diffWorktreeAll(basePath, name, branchOverride, mainBranchOverride) {
     basePath = normalizeBasePathForWorktreeOps(basePath);
     const branch = branchOverride ?? worktreeBranchName(name);
-    const mainBranch = nativeDetectMainBranch(basePath);
+    const mainBranch = mainBranchOverride ?? nativeDetectMainBranch(basePath);
     const entries = nativeDiffNameStatus(basePath, mainBranch, branch);
     return parseDiffNameStatus(entries);
 }
@@ -845,10 +875,10 @@ export function diffWorktreeAll(basePath, name, branchOverride) {
  * Get per-file line addition/deletion stats for what will change on main.
  * Uses direct diff (not merge-base) so the preview matches the actual merge outcome.
  */
-export function diffWorktreeNumstat(basePath, name, branchOverride) {
+export function diffWorktreeNumstat(basePath, name, branchOverride, mainBranchOverride) {
     basePath = normalizeBasePathForWorktreeOps(basePath);
     const branch = branchOverride ?? worktreeBranchName(name);
-    const mainBranch = nativeDetectMainBranch(basePath);
+    const mainBranch = mainBranchOverride ?? nativeDetectMainBranch(basePath);
     const rawStats = nativeDiffNumstat(basePath, mainBranch, branch);
     const stats = [];
     for (const entry of rawStats) {
@@ -862,29 +892,29 @@ export function diffWorktreeNumstat(basePath, name, branchOverride) {
  * Get the full diff content for .gsd/ between the worktree branch and main.
  * Returns the raw unified diff for LLM consumption.
  */
-export function getWorktreeGSDDiff(basePath, name) {
+export function getWorktreeGSDDiff(basePath, name, mainBranchOverride) {
     basePath = normalizeBasePathForWorktreeOps(basePath);
     const branch = worktreeBranchName(name);
-    const mainBranch = nativeDetectMainBranch(basePath);
+    const mainBranch = mainBranchOverride ?? nativeDetectMainBranch(basePath);
     return nativeDiffContent(basePath, mainBranch, branch, ".gsd/", undefined, true);
 }
 /**
  * Get the full diff content for non-.gsd/ files between the worktree branch and main.
  * Returns the raw unified diff for LLM consumption.
  */
-export function getWorktreeCodeDiff(basePath, name) {
+export function getWorktreeCodeDiff(basePath, name, mainBranchOverride) {
     basePath = normalizeBasePathForWorktreeOps(basePath);
     const branch = worktreeBranchName(name);
-    const mainBranch = nativeDetectMainBranch(basePath);
+    const mainBranch = mainBranchOverride ?? nativeDetectMainBranch(basePath);
     return nativeDiffContent(basePath, mainBranch, branch, undefined, ".gsd/", true);
 }
 /**
  * Get commit log for the worktree branch since it diverged from main.
  */
-export function getWorktreeLog(basePath, name) {
+export function getWorktreeLog(basePath, name, mainBranchOverride) {
     basePath = normalizeBasePathForWorktreeOps(basePath);
     const branch = worktreeBranchName(name);
-    const mainBranch = nativeDetectMainBranch(basePath);
+    const mainBranch = mainBranchOverride ?? nativeDetectMainBranch(basePath);
     const entries = nativeLogOneline(basePath, mainBranch, branch);
     return entries.map(e => `${e.sha} ${e.message}`).join("\n");
 }
@@ -893,16 +923,28 @@ export function getWorktreeLog(basePath, name) {
  * Must be called from the main working tree (not the worktree itself).
  * Returns the merge commit message.
  */
-export function mergeWorktreeToMain(basePath, name, commitMessage, branchOverride) {
+export function mergeWorktreeToMain(basePath, name, commitMessage, branchOverride, mainBranchOverride) {
     basePath = normalizeBasePathForWorktreeOps(basePath);
     const branch = branchOverride ?? worktreeBranchName(name);
-    const mainBranch = nativeDetectMainBranch(basePath);
+    const mainBranch = mainBranchOverride ?? nativeDetectMainBranch(basePath);
     const current = nativeGetCurrentBranch(basePath);
     if (current !== mainBranch) {
         throw new GSDError(GSD_GIT_ERROR, `Must be on ${mainBranch} to merge. Currently on ${current}.`);
     }
     const result = nativeMergeSquash(basePath, branch);
     if (!result.success) {
+        const dirtyWorkingTree = result.conflicts.includes("__dirty_working_tree__");
+        if (!dirtyWorkingTree) {
+            cleanupFailedSquashMergeState(basePath);
+        }
+        if (!dirtyWorkingTree && branch.startsWith("milestone/")) {
+            try {
+                removeWorktree(basePath, name, { branch, deleteBranch: true, force: true });
+            }
+            catch (e) {
+                logWarning("worktree", `failed milestone branch cleanup after squash merge failure: ${e.message}`);
+            }
+        }
         throw new GSDError(GSD_MERGE_CONFLICT, `Merge conflicts detected in: ${result.conflicts.join(", ")}`);
     }
     nativeCommit(basePath, commitMessage);