@opengsd/gsd-pi 1.3.0 → 1.4.0

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

@@ -19,7 +19,7 @@
  *   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";
@@ -37,6 +37,7 @@ import {
   nativeGetCurrentBranch,
   nativeIsAncestor,
   nativeLogOneline,
+  nativeMergeAbort,
   nativeMergeSquash,
   nativeWorktreeAdd,
   nativeWorktreeList,
@@ -87,6 +88,34 @@ function deleteBranchIfPresent(basePath: string, branch: string, warningPrefix:
   }
 }
 
+function cleanupFailedSquashMergeState(basePath: string): void {
+  try {
+    nativeMergeAbort(basePath);
+  } catch (e) {
+    // Squash conflicts may not create MERGE_HEAD; this is expected.
+    logWarning("worktree", `merge abort skipped: ${(e as Error).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 as Error).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 as Error).message}`);
+    }
+  }
+}
+
 // ─── Path Helpers ──────────────────────────────────────────────────────────
 
 function normalizePathForComparison(path: string): string {
@@ -287,7 +316,7 @@ export function pruneEphemeralGhostWorktreeDirectories(basePath: string): string
   return removed;
 }
 
-function removeStaleWorktreeDirectory(wtPath: string, name: string): void {
+export function removeStaleWorktreeDirectory(wtPath: string, name: string): void {
   logWarning(
     "reconcile",
     `Removing stale worktree directory (not registered with git): ${wtPath}`,
@@ -964,11 +993,11 @@ function parseDiffNameStatus(entries: { status: string; path: string }[]): Workt
  * 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: string, name: string): WorktreeDiffSummary {
+export function diffWorktreeGSD(basePath: string, name: string, mainBranchOverride?: string): WorktreeDiffSummary {
   basePath = normalizeBasePathForWorktreeOps(basePath);
 
   const branch = worktreeBranchName(name);
-  const mainBranch = nativeDetectMainBranch(basePath);
+  const mainBranch = mainBranchOverride ?? nativeDetectMainBranch(basePath);
 
   const entries = nativeDiffNameStatus(basePath, mainBranch, branch, ".gsd/", true);
 
@@ -981,11 +1010,16 @@ export function diffWorktreeGSD(basePath: string, name: string): WorktreeDiffSum
  * on main when the merge is applied. If both branches have identical
  * content, this correctly returns an empty diff.
  */
-export function diffWorktreeAll(basePath: string, name: string, branchOverride?: string): WorktreeDiffSummary {
+export function diffWorktreeAll(
+  basePath: string,
+  name: string,
+  branchOverride?: string,
+  mainBranchOverride?: string,
+): WorktreeDiffSummary {
   basePath = normalizeBasePathForWorktreeOps(basePath);
 
   const branch = branchOverride ?? worktreeBranchName(name);
-  const mainBranch = nativeDetectMainBranch(basePath);
+  const mainBranch = mainBranchOverride ?? nativeDetectMainBranch(basePath);
 
   const entries = nativeDiffNameStatus(basePath, mainBranch, branch);
 
@@ -996,11 +1030,16 @@ export function diffWorktreeAll(basePath: string, name: string, 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: string, name: string, branchOverride?: string): FileLineStat[] {
+export function diffWorktreeNumstat(
+  basePath: string,
+  name: string,
+  branchOverride?: string,
+  mainBranchOverride?: string,
+): FileLineStat[] {
   basePath = normalizeBasePathForWorktreeOps(basePath);
 
   const branch = branchOverride ?? worktreeBranchName(name);
-  const mainBranch = nativeDetectMainBranch(basePath);
+  const mainBranch = mainBranchOverride ?? nativeDetectMainBranch(basePath);
 
   const rawStats = nativeDiffNumstat(basePath, mainBranch, branch);
 
@@ -1016,11 +1055,11 @@ export function diffWorktreeNumstat(basePath: string, name: string, branchOverri
  * 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: string, name: string): string {
+export function getWorktreeGSDDiff(basePath: string, name: string, mainBranchOverride?: string): string {
   basePath = normalizeBasePathForWorktreeOps(basePath);
 
   const branch = worktreeBranchName(name);
-  const mainBranch = nativeDetectMainBranch(basePath);
+  const mainBranch = mainBranchOverride ?? nativeDetectMainBranch(basePath);
 
   return nativeDiffContent(basePath, mainBranch, branch, ".gsd/", undefined, true);
 }
@@ -1029,11 +1068,11 @@ export function getWorktreeGSDDiff(basePath: string, name: string): string {
  * 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: string, name: string): string {
+export function getWorktreeCodeDiff(basePath: string, name: string, mainBranchOverride?: string): string {
   basePath = normalizeBasePathForWorktreeOps(basePath);
 
   const branch = worktreeBranchName(name);
-  const mainBranch = nativeDetectMainBranch(basePath);
+  const mainBranch = mainBranchOverride ?? nativeDetectMainBranch(basePath);
 
   return nativeDiffContent(basePath, mainBranch, branch, undefined, ".gsd/", true);
 }
@@ -1041,11 +1080,11 @@ export function getWorktreeCodeDiff(basePath: string, name: string): string {
 /**
  * Get commit log for the worktree branch since it diverged from main.
  */
-export function getWorktreeLog(basePath: string, name: string): string {
+export function getWorktreeLog(basePath: string, name: string, mainBranchOverride?: string): string {
   basePath = normalizeBasePathForWorktreeOps(basePath);
 
   const branch = worktreeBranchName(name);
-  const mainBranch = nativeDetectMainBranch(basePath);
+  const mainBranch = mainBranchOverride ?? nativeDetectMainBranch(basePath);
 
   const entries = nativeLogOneline(basePath, mainBranch, branch);
 
@@ -1057,11 +1096,17 @@ export function getWorktreeLog(basePath: string, name: string): string {
  * Must be called from the main working tree (not the worktree itself).
  * Returns the merge commit message.
  */
-export function mergeWorktreeToMain(basePath: string, name: string, commitMessage: string, branchOverride?: string): string {
+export function mergeWorktreeToMain(
+  basePath: string,
+  name: string,
+  commitMessage: string,
+  branchOverride?: string,
+  mainBranchOverride?: string,
+): string {
   basePath = normalizeBasePathForWorktreeOps(basePath);
 
   const branch = branchOverride ?? worktreeBranchName(name);
-  const mainBranch = nativeDetectMainBranch(basePath);
+  const mainBranch = mainBranchOverride ?? nativeDetectMainBranch(basePath);
   const current = nativeGetCurrentBranch(basePath);
 
   if (current !== mainBranch) {
@@ -1070,6 +1115,17 @@ export function mergeWorktreeToMain(basePath: string, name: string, commitMessag
 
   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 as Error).message}`);
+      }
+    }
     throw new GSDError(GSD_MERGE_CONFLICT, `Merge conflicts detected in: ${result.conflicts.join(", ")}`);
   }
 

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

@@ -7,7 +7,7 @@ import { join, resolve } from "node:path";
 
 import { normalizeWorktreePathForCompare } from "./worktree-root.js";
 import { worktreesDirs } from "./worktree-placement.js";
-import { listWorktrees } from "./worktree-manager.js";
+import { listWorktrees, removeStaleWorktreeDirectory } from "./worktree-manager.js";
 import { getCurrentBranch } from "./worktree.js";
 
 export type WorktreeSafetyWriteScope = "planning-only" | "source-writing";
@@ -74,6 +74,7 @@ export interface WorktreeSafetyDeps {
   lstatSync(path: string): Pick<Stats, "isFile">;
   listRegisteredWorktrees?(projectRoot: string): readonly RegisteredWorktree[];
   pruneRegisteredWorktrees?(projectRoot: string): void;
+  removeStaleWorktreeDirectory?(unitRoot: string, milestoneId: string): void;
   getCurrentBranch?(unitRoot: string): string;
 }
 
@@ -100,6 +101,7 @@ const defaultDeps: WorktreeSafetyDeps = {
       stdio: "pipe",
     });
   },
+  removeStaleWorktreeDirectory,
   getCurrentBranch,
 };
 
@@ -127,8 +129,6 @@ function errorMessage(error: unknown): string {
 export function createWorktreeSafetyModule(
   deps: WorktreeSafetyDeps = defaultDeps,
 ): WorktreeSafetyModule {
-  const unregisteredRecoveryFailed = new Set<string>();
-
   return {
     validateUnitRoot(input) {
       if (input.writeScope === "planning-only") {
@@ -230,22 +230,17 @@ export function createWorktreeSafetyModule(
           );
         }
         if (registered && !registered.some((worktree) => samePath(worktree.path, unitRoot))) {
-          const wasPreviouslyTracked = unregisteredRecoveryFailed.has(unitRoot);
           let attemptedPrune = false;
 
-          if (!wasPreviouslyTracked && deps.pruneRegisteredWorktrees) {
+          if (deps.pruneRegisteredWorktrees) {
             attemptedPrune = true;
             try {
               deps.pruneRegisteredWorktrees(projectRoot);
               const rechecked = deps.listRegisteredWorktrees?.(projectRoot);
               if (rechecked?.some((worktree) => samePath(worktree.path, unitRoot))) {
-                unregisteredRecoveryFailed.delete(unitRoot);
                 registered = rechecked;
-              } else {
-                unregisteredRecoveryFailed.add(unitRoot);
               }
             } catch (error) {
-              unregisteredRecoveryFailed.add(unitRoot);
               return failure(
                 "worktree-git-probe-failed",
                 `Unable to recover unregistered worktree root ${unitRoot}.`,
@@ -256,13 +251,38 @@ export function createWorktreeSafetyModule(
           }
 
           if (!registered?.some((worktree) => samePath(worktree.path, unitRoot))) {
+            // The directory exists on disk with a .git marker but git no longer
+            // tracks it as a worktree (e.g. a prior removeWorktree crash left the
+            // directory while `git worktree prune` cleaned the registry). Remove
+            // the orphaned directory — the same cleanup createWorktree performs —
+            // so the next dispatch recreates the milestone worktree from scratch
+            // instead of looping forever on worktree-unregistered (#803, #590).
+            if (deps.removeStaleWorktreeDirectory) {
+              try {
+                deps.removeStaleWorktreeDirectory(unitRoot, milestoneId);
+                return failure(
+                  "worktree-missing",
+                  `Worktree root ${unitRoot} was not registered with git; removed the orphaned directory so it can be recreated.`,
+                  "Recreate the milestone worktree before dispatching the source-writing Unit. Auto-mode recreates it automatically on the next dispatch.",
+                  { unitRoot, attemptedPrune, removedStaleDirectory: true },
+                );
+              } catch (error) {
+                return failure(
+                  "worktree-unregistered",
+                  `Worktree root ${unitRoot} is not registered with git worktree list and the orphaned directory could not be removed.`,
+                  "Remove the orphaned worktree directory manually (it may be locked by another process), then recreate or re-register the milestone worktree before dispatching the source-writing Unit.",
+                  { unitRoot, attemptedPrune, removedStaleDirectory: false, error: errorMessage(error) },
+                );
+              }
+            }
+
             return failure(
               "worktree-unregistered",
               `Worktree root ${unitRoot} is not registered with git worktree list.`,
-              attemptedPrune || wasPreviouslyTracked
+              attemptedPrune
                 ? "Worktree recovery was attempted but the root is still unregistered. Recreate or re-register the milestone worktree before dispatching the source-writing Unit."
                 : "Run 'git worktree prune'. If still unregistered, recreate or re-register the milestone worktree before dispatching the source-writing Unit.",
-              { unitRoot, attemptedPrune, trackedAsFailed: unregisteredRecoveryFailed.has(unitRoot) },
+              { unitRoot, attemptedPrune },
             );
           }
         }

package/src/resources/extensions/mcp-client/manager.ts

@@ -490,7 +490,7 @@ function normalizeRawServerConfig(
 		cwd: typeof config.cwd === "string" ? config.cwd : undefined,
 		headers,
 		oauth: config.oauth && typeof config.oauth === "object" ? config.oauth as McpHttpAuthConfig["oauth"] : undefined,
-		envWarnings: collectEnvWarnings([
+		envWarnings: collectMcpEnvWarnings([
 			["url", url],
 			...Object.entries(env ?? {}).map(([key, value]) => [`env.${key}`, value] as [string, string | undefined]),
 			...Object.entries(headers ?? {}).map(([key, value]) => [`headers.${key}`, value] as [string, string | undefined]),
@@ -498,7 +498,7 @@ function normalizeRawServerConfig(
 	};
 }
 
-function detectTransport(config: Record<string, unknown>): ManagedMcpTransport {
+export function detectTransport(config: Record<string, unknown>): ManagedMcpTransport {
 	const type = typeof config.type === "string" ? config.type.toLowerCase() : undefined;
 	if (type && type !== "stdio" && type !== "http") return "unsupported";
 	if (typeof config.command === "string") return "stdio";
@@ -530,7 +530,7 @@ function serializeServerInput(input: ManagedMcpServerInput): Record<string, unkn
 	});
 }
 
-function collectEnvWarnings(values: Array<[string, string | undefined]>): string[] {
+export function collectMcpEnvWarnings(values: Array<[string, string | undefined]>): string[] {
 	const warnings: string[] = [];
 	for (const [label, value] of values) {
 		if (!value) continue;

package/dist/web/standalone/.next/static/chunks/2772.bfa657f49f955239.js

@@ -1 +0,0 @@
-"use strict";(self.webpackChunk_N_E=self.webpackChunk_N_E||[]).push([[2772],{72772:(e,s,t)=>{t.r(s),t.d(s,{Roadmap:()=>p});var d=t(18870),r=t(20607),a=t(53348),n=t(32457),l=t(62970),i=t(92893),c=t(78070),o=t(18833),x=t(93058),m=t(46054);let u=({status:e,size:s="default"})=>{let t="large"===s?"h-5 w-5":"h-4 w-4";return"done"===e?(0,d.jsx)(r.A,{className:(0,o.cn)(t,"text-success")}):"in-progress"===e?(0,d.jsx)(a.A,{className:(0,o.cn)(t,"text-warning")}):"parked"===e?(0,d.jsx)(n.A,{className:(0,o.cn)(t,"text-muted-foreground")}):(0,d.jsx)(l.A,{className:(0,o.cn)(t,"text-muted-foreground")})},h=({risk:e})=>(0,d.jsxs)("span",{className:(0,o.cn)("inline-flex items-center gap-1 rounded px-1.5 py-0.5 text-[10px] font-medium uppercase","high"===e&&"bg-destructive/20 text-destructive","medium"===e&&"bg-warning/20 text-warning","low"===e&&"bg-muted text-muted-foreground"),children:["high"===e&&(0,d.jsx)(i.A,{className:"h-2.5 w-2.5"}),e]});function p(){let e=(0,x.gF)(),s=(0,x.Gr)(e),t=s?.milestones??[],r=s?.active??{},a=e.live.freshness.workspace.stale?"stale":e.live.freshness.workspace.status;return(0,d.jsxs)("div",{className:"flex h-full flex-col overflow-hidden",children:[(0,d.jsxs)("div",{className:"border-b border-border px-6 py-3",children:[(0,d.jsx)("h1",{className:"text-lg font-semibold",children:"Roadmap"}),(0,d.jsx)("p",{className:"text-sm text-muted-foreground",children:"Project milestone structure with slices and dependencies"}),(0,d.jsxs)("p",{className:"mt-1 text-xs text-muted-foreground","data-testid":"roadmap-workspace-freshness",children:["Workspace freshness: ",a]})]}),(0,d.jsxs)("div",{className:"flex-1 overflow-y-auto p-6",children:["loading"===e.bootStatus&&(0,d.jsx)("div",{className:"py-8 text-center text-sm text-muted-foreground",children:"Loading workspace…"}),"ready"===e.bootStatus&&0===t.length&&(0,d.jsxs)("div",{className:"py-8 text-center text-sm text-muted-foreground",children:["No milestones found. Create a milestone with ",(0,d.jsx)("code",{className:"rounded bg-muted px-1.5 py-0.5 font-mono text-xs",children:"/gsd"})," to get started."]}),(0,d.jsx)("div",{className:"space-y-6",children:t.map(e=>{let s=(0,m.Jq)(e,r),t=e.slices.filter(e=>e.done).length,a=e.slices.reduce((e,s)=>e+s.tasks.length,0),n=e.slices.reduce((e,s)=>e+s.tasks.filter(e=>e.done).length,0);return(0,d.jsxs)("div",{className:"rounded-md border border-border bg-card",children:[(0,d.jsxs)("div",{className:(0,o.cn)("flex items-center gap-3 border-b border-border px-4 py-3","in-progress"===s&&"bg-accent/30"),children:[(0,d.jsx)(u,{status:s,size:"large"}),(0,d.jsx)("div",{className:"flex-1",children:(0,d.jsxs)("div",{className:"flex items-center gap-2",children:[(0,d.jsx)("span",{className:"font-mono text-xs text-muted-foreground",children:e.id}),(0,d.jsx)(c.A,{className:"h-3 w-3 text-muted-foreground"}),(0,d.jsx)("span",{className:"font-semibold",children:e.title})]})}),(0,d.jsxs)("div",{className:"text-right",children:[(0,d.jsxs)("div",{className:"text-sm font-medium",children:[t,"/",e.slices.length," slices"]}),(0,d.jsxs)("div",{className:"text-xs text-muted-foreground",children:[n,"/",a," tasks"]})]})]}),(0,d.jsx)("div",{className:"divide-y divide-border",children:e.slices.map(s=>{let t=(0,m.z3)(e.id,s,r),a=s.tasks.filter(e=>e.done).length,n=s.tasks.length;return(0,d.jsxs)("div",{className:(0,o.cn)("flex items-center gap-3 px-4 py-2.5","in-progress"===t&&"bg-accent/20","pending"===t&&"opacity-70","parked"===t&&"opacity-70"),children:[(0,d.jsx)("div",{className:"w-4"}),(0,d.jsx)(u,{status:t}),(0,d.jsx)("div",{className:"flex-1",children:(0,d.jsxs)("div",{className:"flex items-center gap-2",children:[(0,d.jsx)("span",{className:"font-mono text-xs text-muted-foreground",children:s.id}),(0,d.jsx)("span",{className:"text-sm",children:s.title}),s.risk&&(0,d.jsx)(h,{risk:s.risk}),s.depends&&s.depends.length>0&&(0,d.jsxs)("span",{className:"text-[10px] text-muted-foreground",children:["depends on ",s.depends.join(", ")]})]})}),(0,d.jsxs)("div",{className:"flex items-center gap-4",children:[(0,d.jsx)("div",{className:"w-24",children:(0,d.jsx)("div",{className:"h-1 w-full rounded-full bg-accent",children:(0,d.jsx)("div",{className:"h-full rounded-full bg-foreground/70 transition-[width]",style:{width:n>0?`${a/n*100}%`:"0%"}})})}),(0,d.jsxs)("span",{className:"w-12 text-right text-xs text-muted-foreground",children:[a,"/",n]})]})]},`${e.id}-${s.id}`)})})]},e.id)})})]})]})}}}]);