gsd-pi 2.32.0-dev.1e39869 → 2.32.0-dev.3d7932c

package/src/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/src/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",
   );
 });

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

@@ -9,6 +9,7 @@ import { deriveState } from "./state.js";
 import { invalidateAllCaches } from "./cache.js";
 import { gsdRoot, resolveTasksDir, resolveSlicePath, buildTaskFileName } from "./paths.js";
 import { sendDesktopNotification } from "./notifications.js";
+import { parseUnitId } from "./unit-id.js";
 
 /**
  * Undo the last completed unit: revert git commits, remove from completed-units,
@@ -62,11 +63,10 @@ export async function handleUndo(args: string, ctx: ExtensionCommandContext, _pi
   writeFileSync(completedKeysFile, JSON.stringify(keys), "utf-8");
 
   // 3. Delete summary artifact
-  const parts = unitId.split("/");
+  const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
   let summaryRemoved = false;
-  if (parts.length === 3) {
+  if (mid && sid && tid) {
     // Task-level: M001/S01/T01
-    const [mid, sid, tid] = parts;
     const tasksDir = resolveTasksDir(basePath, mid, sid);
     if (tasksDir) {
       const summaryFile = join(tasksDir, buildTaskFileName(tid, "SUMMARY"));
@@ -75,9 +75,8 @@ export async function handleUndo(args: string, ctx: ExtensionCommandContext, _pi
         summaryRemoved = true;
       }
     }
-  } else if (parts.length === 2) {
+  } else if (mid && sid) {
     // Slice-level: M001/S01
-    const [mid, sid] = parts;
     const slicePath = resolveSlicePath(basePath, mid, sid);
     if (slicePath) {
       // Try common summary filenames
@@ -93,8 +92,7 @@ export async function handleUndo(args: string, ctx: ExtensionCommandContext, _pi
 
   // 4. Uncheck task in PLAN if execute-task
   let planUpdated = false;
-  if (unitType === "execute-task" && parts.length === 3) {
-    const [mid, sid, tid] = parts;
+  if (unitType === "execute-task" && mid && sid && tid) {
     planUpdated = uncheckTaskInPlan(basePath, mid, sid, tid);
   }
 

package/src/resources/extensions/gsd/unit-id.ts

@@ -0,0 +1,14 @@
+// GSD Extension — Unit ID Parsing
+// Centralizes the milestone/slice/task decomposition of unit ID strings.
+
+export interface ParsedUnitId {
+  milestone: string;
+  slice?: string;
+  task?: string;
+}
+
+/** Parse a unit ID string (e.g. "M1/S1/T1") into its milestone, slice, and task components. */
+export function parseUnitId(unitId: string): ParsedUnitId {
+  const [milestone, slice, task] = unitId.split("/");
+  return { milestone: milestone!, slice, task };
+}

package/src/resources/extensions/gsd/unit-runtime.ts

@@ -9,6 +9,7 @@ import {
 } from "./paths.js";
 import { loadFile, parseTaskPlanMustHaves, countMustHavesMentionedInSummary } from "./files.js";
 import { loadJsonFileOrNull, saveJsonFile } from "./json-persistence.js";
+import { parseUnitId } from "./unit-id.js";
 
 export type UnitRuntimePhase =
   | "dispatched"
@@ -131,7 +132,7 @@ export async function inspectExecuteTaskDurability(
   basePath: string,
   unitId: string,
 ): Promise<ExecuteTaskRecoveryStatus | null> {
-  const [mid, sid, tid] = unitId.split("/");
+  const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
   if (!mid || !sid || !tid) return null;
 
   const planAbs = resolveSliceFile(basePath, mid, sid, "PLAN");

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

@@ -34,6 +34,7 @@ import type { FileLineStat } from "./worktree-manager.js";
 import { existsSync, realpathSync, readdirSync, rmSync, unlinkSync } from "node:fs";
 import { nativeMergeAbort } from "./native-git-bridge.js";
 import { join, sep } from "node:path";
+import { getErrorMessage } from "./error-utils.js";
 
 /**
  * Tracks the original project root so we can switch back.
@@ -370,7 +371,7 @@ async function handleCreate(
       "info",
     );
   } catch (error) {
-    const msg = error instanceof Error ? error.message : String(error);
+    const msg = getErrorMessage(error);
     ctx.ui.notify(`Failed to create worktree: ${msg}`, "error");
   }
 }
@@ -418,7 +419,7 @@ async function handleSwitch(
       "info",
     );
   } catch (error) {
-    const msg = error instanceof Error ? error.message : String(error);
+    const msg = getErrorMessage(error);
     ctx.ui.notify(`Failed to switch to worktree: ${msg}`, "error");
   }
 }
@@ -528,7 +529,7 @@ async function handleList(
 
     ctx.ui.notify(lines.join("\n"), "info");
   } catch (error) {
-    const msg = error instanceof Error ? error.message : String(error);
+    const msg = getErrorMessage(error);
     ctx.ui.notify(`Failed to list worktrees: ${msg}`, "error");
   }
 }
@@ -646,7 +647,7 @@ async function handleMerge(
       );
       return;
     } catch (mergeErr) {
-      const mergeMsg = mergeErr instanceof Error ? mergeErr.message : String(mergeErr);
+      const mergeMsg = getErrorMessage(mergeErr);
       const isConflict = /conflict/i.test(mergeMsg);
 
       if (isConflict) {
@@ -703,7 +704,7 @@ async function handleMerge(
       "info",
     );
   } catch (error) {
-    const msg = error instanceof Error ? error.message : String(error);
+    const msg = getErrorMessage(error);
     ctx.ui.notify(`Failed to start merge: ${msg}`, "error");
   }
 }
@@ -746,7 +747,7 @@ async function handleRemove(
 
     ctx.ui.notify(`${CLR.ok("✓")} Worktree ${CLR.name(name)} removed ${CLR.muted("(branch deleted)")}.`, "info");
   } catch (error) {
-    const msg = error instanceof Error ? error.message : String(error);
+    const msg = getErrorMessage(error);
     ctx.ui.notify(`Failed to remove worktree: ${msg}`, "error");
   }
 }
@@ -800,7 +801,7 @@ async function handleRemoveAll(
     if (failed.length > 0) lines.push(`${CLR.warn("✗")} Failed: ${failed.map(n => CLR.name(n)).join(", ")}`);
     ctx.ui.notify(lines.join("\n"), failed.length > 0 ? "warning" : "info");
   } catch (error) {
-    const msg = error instanceof Error ? error.message : String(error);
+    const msg = getErrorMessage(error);
     ctx.ui.notify(`Failed to remove worktrees: ${msg}`, "error");
   }
 }