@opengsd/gsd-pi 1.3.0-dev.eed73bea → 1.4.0-dev.5fc22c6f

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 { cpSync, existsSync, lstatSync, mkdirSync, readdirSync, readFileSync, realpathSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync } 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 {
@@ -198,6 +227,113 @@ function isRegisteredGitWorktreeAtPath(basePath: string, wtPath: string): boolea
   }
 }
 
+function inspectUncommittedWorktreeState(wtPath: string): { dirty: boolean; status: string } {
+  try {
+    const status = execFileSync(
+      "git",
+      ["status", "--porcelain=v1", "--untracked-files=all"],
+      { cwd: wtPath, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" },
+    ).trimEnd();
+    return { dirty: status.length > 0, status };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    logWarning(
+      "worktree",
+      `dirty worktree inspection failed for ${wtPath}: ${message}`,
+    );
+    // Fail closed: unknown state must quarantine rather than force-remove.
+    return { dirty: true, status: `git status failed: ${message}` };
+  }
+}
+
+function timestampForPath(): string {
+  return new Date().toISOString().replace(/[:.]/g, "-");
+}
+
+function uniqueQuarantinePath(basePath: string, name: string): string {
+  const root = join(basePath, ".gsd", "quarantine", "worktrees");
+  const baseName = `${name}-${timestampForPath()}`;
+  let candidate = join(root, baseName);
+  let suffix = 2;
+  while (existsSync(candidate)) {
+    candidate = join(root, `${baseName}-${suffix}`);
+    suffix++;
+  }
+  return candidate;
+}
+
+function quarantineDirtyWorktree(
+  basePath: string,
+  name: string,
+  branch: string,
+  wtPath: string,
+  status: string,
+): string | null {
+  const quarantinePath = uniqueQuarantinePath(basePath, name);
+  mkdirSync(join(basePath, ".gsd", "quarantine", "worktrees"), { recursive: true });
+
+  let moved = false;
+  try {
+    renameSync(wtPath, quarantinePath);
+    moved = true;
+  } catch (renameErr) {
+    logWarning(
+      "worktree",
+      `dirty worktree rename quarantine failed for ${name}: ${renameErr instanceof Error ? renameErr.message : String(renameErr)}; trying copy snapshot`,
+    );
+    try {
+      cpSync(wtPath, quarantinePath, { recursive: true, force: false, errorOnExist: true });
+    } catch (copyErr) {
+      logWarning(
+        "reconcile",
+        `Dirty worktree quarantine failed; preserving original worktree ${wtPath}: ${copyErr instanceof Error ? copyErr.message : String(copyErr)}`,
+        { worktree: name, path: wtPath },
+      );
+      return null;
+    }
+  }
+
+  try {
+    const gitFile = join(quarantinePath, ".git");
+    if (existsSync(gitFile) && lstatSync(gitFile).isFile()) {
+      unlinkSync(gitFile);
+    }
+  } catch (err) {
+    logWarning(
+      "worktree",
+      `failed to remove quarantined worktree git pointer: ${err instanceof Error ? err.message : String(err)}`,
+    );
+  }
+
+  try {
+    writeFileSync(
+      join(quarantinePath, ".gsd-quarantine.json"),
+      JSON.stringify({
+        kind: "dirty-worktree",
+        worktree: name,
+        branch,
+        originalPath: wtPath,
+        moved,
+        quarantinedAt: new Date().toISOString(),
+        status,
+      }, null, 2) + "\n",
+      "utf-8",
+    );
+  } catch (err) {
+    logWarning(
+      "worktree",
+      `failed to write worktree quarantine metadata: ${err instanceof Error ? err.message : String(err)}`,
+    );
+  }
+
+  logWarning(
+    "reconcile",
+    `Quarantined dirty worktree ${name} at ${quarantinePath} before removal. Branch ${branch} was preserved.`,
+    { worktree: name, path: quarantinePath, branch },
+  );
+  return quarantinePath;
+}
+
 /** True when `wtPath` has a git worktree checkout marker (`.git` file with gitdir pointer). */
 export function isLiveGitWorktreeCheckout(wtPath: string): boolean {
   const gitPath = join(wtPath, ".git");
@@ -701,12 +837,13 @@ export function removeWorktree(
   basePath: string,
   name: string,
   opts: { deleteBranch?: boolean; force?: boolean; branch?: string } = {},
-): void {
+): boolean {
   basePath = normalizeBasePathForWorktreeOps(basePath);
 
   let wtPath = worktreePath(basePath, name);
   const branch = opts.branch ?? worktreeBranchName(name);
   const { deleteBranch = true, force = true } = opts;
+  let deleteBranchAfterRemoval = deleteBranch;
 
   // Resolve the ACTUAL worktree path from git's worktree list.
   // The computed path may differ when .gsd/ is (or was) a symlink to an
@@ -759,10 +896,10 @@ export function removeWorktree(
 
   if (!existsSync(wtPath)) {
     nativeWorktreePrune(basePath);
-    if (deleteBranch) {
+    if (deleteBranchAfterRemoval) {
       deleteBranchIfPresent(basePath, branch, "nativeBranchDelete failed");
     }
-    return;
+    return true;
   }
 
   // Submodule safety (#2337): detect submodules with uncommitted changes
@@ -844,6 +981,35 @@ export function removeWorktree(
     }
   }
 
+  // Dirty-worktree quarantine (#2365): once submodule (#2337) and nested-.git
+  // (#2616) rescue have run — they commit/clean the tree first — quarantine any
+  // uncommitted state that remains instead of force-deleting it. Gate on a live
+  // git checkout so a stale local directory left behind by state-sync (which
+  // has no `.git` file and is not a registered worktree) is removed normally
+  // rather than quarantined; otherwise its branch would never be deleted and
+  // the worktree would never be unregistered (#1852).
+  if (force && resolvedPathSafe && isLiveGitWorktreeCheckout(resolvedWtPath)) {
+    const dirtyState = inspectUncommittedWorktreeState(resolvedWtPath);
+    if (dirtyState.dirty) {
+      const quarantinePath = quarantineDirtyWorktree(
+        basePath,
+        name,
+        branch,
+        resolvedWtPath,
+        dirtyState.status,
+      );
+      if (!quarantinePath) {
+        return false;
+      }
+
+      deleteBranchAfterRemoval = false;
+      if (!existsSync(resolvedWtPath)) {
+        nativeWorktreePrune(basePath);
+        return true;
+      }
+    }
+  }
+
   // Remove worktree — only use force/rmSync when the path is safely contained
   if (resolvedPathSafe) {
     // Remove worktree: try non-force first when submodules have changes,
@@ -894,9 +1060,10 @@ export function removeWorktree(
   // Prune stale entries so git knows the worktree is gone
   nativeWorktreePrune(basePath);
 
-  if (deleteBranch) {
+  if (deleteBranchAfterRemoval) {
     deleteBranchIfPresent(basePath, branch, "final branch delete failed");
   }
+  return true;
 }
 
 /**
@@ -1086,6 +1253,17 @@ export function mergeWorktreeToMain(
 
   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/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)})})]})]})}}}]);