gsd-pi 2.78.1-dev.b0759e59b → 2.78.1-dev.e9d88a536

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

@@ -8,7 +8,7 @@ import { existsSync, readdirSync } from "node:fs";
 import { join } from "node:path";
 import { spawnSync } from "node:child_process";
 import { loadFile } from "./files.js";
-import { resolveMilestoneFile } from "./paths.js";
+import { resolveGsdPathContract, resolveMilestoneFile } from "./paths.js";
 import { mergeMilestoneToMain } from "./auto-worktree.js";
 import { MergeConflictError } from "./git-service.js";
 import { removeSessionStatus } from "./session-status-io.js";
@@ -16,12 +16,13 @@ import { getErrorMessage } from "./error-utils.js";
 import { logWarning } from "./workflow-logger.js";
 // ─── Merge Queue ───────────────────────────────────────────────────────────
 /**
- * Check whether a milestone is complete by querying its worktree SQLite DB.
+ * Check whether a milestone is complete by querying the canonical project DB.
  * Uses a subprocess to avoid disrupting the global DB singleton.
- * Returns true when milestones.status = 'complete' in the worktree's gsd.db.
+ * Returns true when milestones.status = 'complete' in project gsd.db.
  */
-export function isMilestoneCompleteInWorktreeDb(basePath, mid) {
-    const dbPath = join(basePath, ".gsd", "worktrees", mid, ".gsd", "gsd.db");
+export function isMilestoneCompleteInProjectDb(basePath, mid) {
+    const workRoot = join(basePath, ".gsd", "worktrees", mid);
+    const dbPath = resolveGsdPathContract(workRoot, basePath).projectDb;
     if (!existsSync(dbPath))
         return false;
     try {
@@ -34,15 +35,15 @@ export function isMilestoneCompleteInWorktreeDb(basePath, mid) {
     }
 }
 /**
- * Discover milestone IDs with status='complete' in their worktree DB,
- * scanning .gsd/worktrees/<MID>/.gsd/gsd.db for each worktree directory.
+ * Discover milestone IDs with status='complete' in the canonical DB,
+ * using worktree directories only to enumerate active parallel workers.
  */
 function discoverDbCompletedMilestones(basePath) {
     const completed = new Set();
     const worktreeDir = join(basePath, ".gsd", "worktrees");
     try {
         for (const entry of readdirSync(worktreeDir)) {
-            if (entry.startsWith("M") && isMilestoneCompleteInWorktreeDb(basePath, entry)) {
+            if (entry.startsWith("M") && isMilestoneCompleteInProjectDb(basePath, entry)) {
                 completed.add(entry);
             }
         }
@@ -57,15 +58,15 @@ function discoverDbCompletedMilestones(basePath) {
  * Sequential: merge in milestone ID order (M001 before M002).
  * By-completion: merge in the order milestones finished.
  *
- * When basePath is provided, also checks worktree SQLite DBs as the
- * source of truth — workers with stale orchestrator state (e.g. "error")
- * are included if their worktree DB shows status='complete'.
+ * When basePath is provided, also checks the canonical project DB as the
+ * source of truth. Workers with stale orchestrator state (e.g. "error")
+ * are included if their project DB row shows status='complete'.
  * See: https://github.com/gsd-build/gsd-2/issues/2812
  */
 export function determineMergeOrder(workers, order = "sequential", basePath) {
     // Start with workers the orchestrator already knows are stopped
     const stoppedIds = new Set(workers.filter(w => w.state === "stopped").map(w => w.milestoneId));
-    // When basePath is available, also check worktree DBs for milestones
+    // When basePath is available, also check the project DB for milestones
     // whose orchestrator state is stale but are actually complete (#2812)
     const dbCompleted = basePath ? discoverDbCompletedMilestones(basePath) : new Set();
     // Union: milestone is mergeable if stopped OR DB-complete
@@ -80,7 +81,7 @@ export function determineMergeOrder(workers, order = "sequential", basePath) {
             allMergeable.push(w);
         }
         else {
-            // Milestone discovered from worktree DB but not in workers list
+            // Milestone discovered from project DB but not in workers list
             allMergeable.push({
                 milestoneId: mid,
                 title: mid,

package/dist/resources/extensions/gsd/parallel-monitor-overlay.js

@@ -13,6 +13,7 @@ import { spawnSync } from "node:child_process";
 import { matchesKey, Key } from "@gsd/pi-tui";
 import { formatDuration } from "../shared/mod.js";
 import { formattedShortcutPair } from "./shortcut-defs.js";
+import { resolveGsdPathContract } from "./paths.js";
 // ─── Data Helpers ─────────────────────────────────────────────────────────
 function readJsonSafe(filePath) {
     try {
@@ -74,7 +75,8 @@ function discoverWorkers(basePath) {
     return [...mids].sort();
 }
 function querySliceProgress(basePath, mid) {
-    const dbPath = join(basePath, ".gsd", "worktrees", mid, ".gsd", "gsd.db");
+    const workRoot = join(basePath, ".gsd", "worktrees", mid);
+    const dbPath = resolveGsdPathContract(workRoot, basePath).projectDb;
     if (!existsSync(dbPath))
         return [];
     try {
@@ -119,7 +121,8 @@ function extractCostFromNdjson(basePath, mid) {
     }
 }
 function queryRecentCompletions(basePath, mid) {
-    const dbPath = join(basePath, ".gsd", "worktrees", mid, ".gsd", "gsd.db");
+    const workRoot = join(basePath, ".gsd", "worktrees", mid);
+    const dbPath = resolveGsdPathContract(workRoot, basePath).projectDb;
     if (!existsSync(dbPath))
         return [];
     try {

package/dist/resources/extensions/gsd/paths.js

@@ -9,12 +9,13 @@
  * via prefix matching, so existing projects work without migration.
  */
 import { readdirSync, existsSync, realpathSync, Dirent } from "node:fs";
-import { join, dirname, normalize } from "node:path";
+import { join, dirname, normalize, resolve } from "node:path";
 import { homedir } from "node:os";
 import { spawnSync } from "node:child_process";
 import { nativeScanGsdTree } from "./native-parser-bridge.js";
 import { DIR_CACHE_MAX } from "./constants.js";
 import { gsdHome } from "./gsd-home.js";
+import { isGsdWorktreePath, resolveWorktreeProjectRoot } from "./worktree-root.js";
 // ─── Directory Listing Cache ──────────────────────────────────────────────────
 const dirEntryCache = new Map();
 const dirListCache = new Map();
@@ -270,6 +271,36 @@ const LEGACY_GSD_ROOT_FILES = {
 };
 // ─── GSD Root Discovery ───────────────────────────────────────────────────────
 const gsdRootCache = new Map();
+export function resolveGsdPathContract(workRoot, originalProjectRoot) {
+    const resolvedWorkRoot = resolve(workRoot || process.cwd());
+    const isWorktree = isGsdWorktreePath(resolvedWorkRoot);
+    if (isWorktree && !originalProjectRoot?.trim()) {
+        const externalMatch = /[/\\]\.gsd[/\\]projects[/\\][^/\\]+[/\\]worktrees(?:[/\\]|$)/.exec(resolvedWorkRoot);
+        if (externalMatch) {
+            const worktreesIdx = externalMatch[0].search(/[/\\]worktrees(?:[/\\]|$)/);
+            const projectGsd = resolvedWorkRoot.slice(0, externalMatch.index + worktreesIdx);
+            return {
+                projectRoot: dirname(dirname(projectGsd)),
+                workRoot: resolvedWorkRoot,
+                projectGsd,
+                worktreeGsd: join(resolvedWorkRoot, ".gsd"),
+                projectDb: join(projectGsd, "gsd.db"),
+                isWorktree,
+            };
+        }
+    }
+    const projectRoot = resolve(resolveWorktreeProjectRoot(resolvedWorkRoot, originalProjectRoot));
+    const projectGsd = join(projectRoot, ".gsd");
+    const worktreeGsd = isWorktree ? join(resolvedWorkRoot, ".gsd") : null;
+    return {
+        projectRoot,
+        workRoot: resolvedWorkRoot,
+        projectGsd,
+        worktreeGsd,
+        projectDb: join(projectGsd, "gsd.db"),
+        isWorktree,
+    };
+}
 /** Exported for tests only — do not call in production code. */
 export function _clearGsdRootCache() {
     gsdRootCache.clear();
@@ -362,6 +393,9 @@ function isInsideGsdWorktree(p) {
     return false;
 }
 function probeGsdRoot(rawBasePath) {
+    const contract = resolveGsdPathContract(rawBasePath);
+    if (contract.isWorktree)
+        return contract.projectGsd;
     // 1. Fast path — check the input path directly
     const local = join(rawBasePath, ".gsd");
     if (existsSync(local))

package/dist/resources/extensions/gsd/prompts/plan-milestone.md

@@ -10,6 +10,12 @@ All relevant context has been preloaded below — start working immediately with
 
 {{inlinedContext}}
 
+## Already Planned? Soft Brake
+
+If `{{outputPath}}` already exists on disk with at least one slice line (e.g. `- [ ] **S01:`) AND `gsd_query` reports slice rows for this milestone, a prior `gsd_plan_milestone` call already persisted the plan. Do **not** re-call `gsd_plan_milestone` — its UPSERT would overwrite the existing plan with whatever you reconstruct, which is unsafe when you don't have the original decomposition reasoning. Skip directly to the ready phrase at the end of this prompt.
+
+If only the file exists (no DB rows) or only DB rows exist (no file), the prior write was incomplete — proceed with planning as normal so the tool reconciles both.
+
 ## Your Role in the Pipeline
 
 You are the first deep look at this milestone. You have full tool access — explore the codebase, look up docs, investigate technology choices. Your job is to understand the landscape and then strategically decompose the work into demoable slices.

package/dist/resources/extensions/gsd/queue-order.js

@@ -12,6 +12,7 @@ import { join } from "node:path";
 import { gsdRoot } from "./paths.js";
 import { milestoneIdSort } from "./milestone-ids.js";
 import { loadJsonFileOrNull, saveJsonFile } from "./json-persistence.js";
+import { isDbAvailable, setMilestoneQueueOrder } from "./gsd-db.js";
 // ─── Path ────────────────────────────────────────────────────────────────────
 function queueOrderPath(basePath) {
     return join(gsdRoot(basePath), "QUEUE-ORDER.json");
@@ -30,9 +31,13 @@ export function loadQueueOrder(basePath) {
     return data?.order ?? null;
 }
 /**
- * Save a custom queue order to disk.
+ * Save a custom queue order. The DB sequence is canonical when a DB
+ * connection is open; QUEUE-ORDER.json remains a compatibility projection.
  */
 export function saveQueueOrder(basePath, order) {
+    if (isDbAvailable()) {
+        setMilestoneQueueOrder(order);
+    }
     const data = {
         order,
         updatedAt: new Date().toISOString(),

package/dist/resources/extensions/gsd/rethink.js

@@ -17,14 +17,14 @@ import { getMilestoneSlices, isDbAvailable } from "./gsd-db.js";
 import { buildExistingMilestonesContext } from "./guided-flow-queue.js";
 import { loadPrompt } from "./prompt-loader.js";
 import { isGsdGitignored } from "./gitignore.js";
-import { projectRoot } from "./commands/context.js";
+import { currentDirectoryRoot } from "./commands/context.js";
 // ─── Entry Point ──────────────────────────────────────────────────────────────
 export async function handleRethink(_args, ctx, pi) {
     if (isAutoActive()) {
         ctx.ui.notify("Cannot rethink while auto-mode is active. Stop auto-mode first.", "error");
         return;
     }
-    const basePath = projectRoot();
+    const basePath = currentDirectoryRoot();
     const root = gsdRoot(basePath);
     if (!existsSync(root)) {
         ctx.ui.notify("No GSD project found. Run /gsd init first.", "warning");