@opengsd/gsd-pi 1.2.0-dev.4c756166 → 1.2.0-dev.6ccd27b3

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

@@ -8,9 +8,10 @@
  * `.gsd/CAPTURES.md`, not the worktree's local `.gsd/`.
  */
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "node:fs";
-import { join, resolve, sep } from "node:path";
+import { join, resolve } from "node:path";
 import { randomUUID } from "node:crypto";
 import { gsdRoot } from "./paths.js";
+import { projectRootFromWorktreePath } from "./worktree-root.js";
 // ─── Constants ────────────────────────────────────────────────────────────────
 const CAPTURES_FILENAME = "CAPTURES.md";
 const VALID_CLASSIFICATIONS = [
@@ -29,20 +30,9 @@ const VALID_CLASSIFICATIONS = [
  * directory that contains `.gsd/worktrees/` — that's the project root.
  */
 export function resolveCapturesPath(basePath) {
-    const resolved = resolve(basePath);
-    // Direct layout: /.gsd/worktrees/
-    const worktreeMarker = `${sep}.gsd${sep}worktrees${sep}`;
-    let idx = resolved.indexOf(worktreeMarker);
-    if (idx === -1) {
-        // Symlink-resolved layout: /.gsd/projects/<hash>/worktrees/
-        const symlinkRe = new RegExp(`\\${sep}\\.gsd\\${sep}projects\\${sep}[a-f0-9]+\\${sep}worktrees\\${sep}`);
-        const match = resolved.match(symlinkRe);
-        if (match && match.index !== undefined)
-            idx = match.index;
-    }
-    if (idx !== -1) {
-        // basePath is inside a worktree — resolve to project root
-        const projectRoot = resolved.slice(0, idx);
+    // If basePath is inside a worktree, resolve to the project root.
+    const projectRoot = projectRootFromWorktreePath(resolve(basePath));
+    if (projectRoot) {
         return join(projectRoot, ".gsd", CAPTURES_FILENAME);
     }
     return join(gsdRoot(basePath), CAPTURES_FILENAME);

package/dist/resources/extensions/gsd/closeout-recovery.js

@@ -2,12 +2,13 @@
 // File Purpose: Closeout git failure discovery, retry, and manual resolution helpers.
 import { execFileSync } from "node:child_process";
 import { existsSync, realpathSync } from "node:fs";
-import { isAbsolute, join, resolve } from "node:path";
+import { isAbsolute, resolve } from "node:path";
 import { GIT_NO_PROMPT_ENV } from "./git-constants.js";
 import { runTurnGitAction } from "./git-service.js";
 import { _getAdapter, upsertTurnGitTransaction } from "./gsd-db.js";
 import { probeGitConflictState } from "./git-conflict-state.js";
 import { parseUnitId } from "./unit-id.js";
+import { worktreePathFor } from "./worktree-placement.js";
 function parseMetadata(value) {
     if (typeof value !== "string" || !value.trim())
         return {};
@@ -121,7 +122,7 @@ export function resolveCloseoutRecoveryBasePath(projectRoot, record) {
     const parsed = parseUnitId(record.unitId);
     const milestoneId = parsed.milestone ?? (/^M\d+(?:-[a-z0-9]{6})?/.exec(record.unitId)?.[0] ?? "");
     if (milestoneId) {
-        const worktreePath = existingRealPath(join(projectRoot, ".gsd", "worktrees", milestoneId));
+        const worktreePath = existingRealPath(worktreePathFor(projectRoot, milestoneId));
         if (worktreePath)
             return worktreePath;
     }

package/dist/resources/extensions/gsd/closeout-wizard.js

@@ -1,22 +1,107 @@
 // Project/App: gsd-pi
 // File Purpose: Shared closeout detection and merge actions for /gsd home and smart entry.
+import { existsSync, readdirSync, statSync } from "node:fs";
+import { join } from "node:path";
 import { setAutoOutcomeWidget } from "./auto-dashboard.js";
 import { invalidateAllCaches } from "./cache.js";
+import { isDbAvailable } from "./db/engine.js";
+import { getMilestone } from "./db/queries.js";
+import { MILESTONE_ID_RE } from "./milestone-ids.js";
 import { mergeCompletedMilestone } from "./parallel-merge.js";
 import { cleanupQuickBranch, detectStrandedQuickBranch } from "./quick.js";
+import { isClosedStatus } from "./status-guards.js";
 import { findUnmergedCompletedMilestones, } from "./unmerged-milestone-guard.js";
 import { appendRequirementsBacklogToSummary } from "./requirements-backlog.js";
+import { nativeBranchList, nativeIsRepo } from "./native-git-bridge.js";
+import { allWorktreesDirs } from "./worktree-manager.js";
 const MILESTONE_MERGE_CLOSEOUT_COMMANDS = [
     "/gsd status for overview",
     "/gsd visualize to inspect",
     "/gsd notifications for history",
     "/gsd start for new work",
 ];
+function listMilestoneWorktreeIds(basePath) {
+    const ids = new Set();
+    for (const wtDir of allWorktreesDirs(basePath)) {
+        if (!existsSync(wtDir))
+            continue;
+        for (const entry of readdirSync(wtDir)) {
+            if (!MILESTONE_ID_RE.test(entry))
+                continue;
+            try {
+                if (statSync(join(wtDir, entry)).isDirectory())
+                    ids.add(entry);
+            }
+            catch {
+                // skip unreadable entries
+            }
+        }
+    }
+    return [...ids].sort();
+}
+function listMilestoneBranchIds(basePath) {
+    try {
+        return nativeBranchList(basePath, "milestone/*")
+            .map((branch) => branch.replace(/^milestone\//, ""))
+            .filter((id) => MILESTONE_ID_RE.test(id))
+            .sort();
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * A milestone ID is "stranded residue" only when its worktree/branch artifacts
+ * exist for a milestone the DB does not consider currently in flight — i.e. the
+ * row is closed (complete/done/skipped/closed) or absent. Active, pending,
+ * blocked, parked, queued, and deferred rows describe normal in-flight or
+ * intentionally-preserved state, never residue. Returning `false` skips the ID;
+ * returning `true` keeps it in the hint.
+ */
+function isStrandedMilestoneId(milestoneId) {
+    if (!isDbAvailable())
+        return true;
+    const row = getMilestone(milestoneId);
+    if (!row)
+        return true;
+    return isClosedStatus(row.status);
+}
+/** Surface stranded milestone git residue when closeout guards did not classify it. */
+export function detectIdleMilestoneResidueHint(basePath) {
+    if (!nativeIsRepo(basePath))
+        return null;
+    const gsdDir = join(basePath, ".gsd");
+    const dbPath = join(gsdDir, "gsd.db");
+    if (!existsSync(gsdDir) || !existsSync(dbPath)) {
+        return {
+            milestoneIds: [],
+            message: "This git repo has no local GSD workflow database (.gsd/gsd.db). " +
+                "Workflow state may live in an external worktree, or run /gsd new-project to initialize here.",
+        };
+    }
+    const worktreeIds = listMilestoneWorktreeIds(basePath);
+    const branchIds = listMilestoneBranchIds(basePath);
+    const candidateIds = [...new Set([...worktreeIds, ...branchIds])].sort();
+    const milestoneIds = candidateIds.filter(isStrandedMilestoneId);
+    if (milestoneIds.length === 0)
+        return null;
+    const listed = milestoneIds.join(", ");
+    const recovery = milestoneIds.length === 1
+        ? `/gsd dispatch complete-milestone ${milestoneIds[0]}`
+        : "/gsd doctor --fix";
+    return {
+        milestoneIds,
+        message: `Stranded milestone git residue detected (${listed}: worktree dir and/or milestone/* branch). ` +
+            `Run ${recovery} or /gsd status to recover closeout before starting new work.`,
+    };
+}
 export async function loadCloseoutContext(basePath) {
     const unmergedMilestones = await findUnmergedCompletedMilestones(basePath);
+    const idleResidueHint = unmergedMilestones.length === 0 ? detectIdleMilestoneResidueHint(basePath) : null;
     return {
         strandedQuick: detectStrandedQuickBranch(basePath),
         unmergedMilestones,
+        idleResidueHint,
     };
 }
 export function getPrimaryCloseoutRecommendation(closeout) {
@@ -62,6 +147,13 @@ export function buildIdleMenuSummary(state, closeout) {
             `${blocker.milestoneId} is complete but not merged into ${blocker.integrationBranch}.`,
         ];
     }
+    // Surface idle residue before the completion summary so smart entry shows
+    // the same recovery text /gsd home would: a closed/unknown milestone with
+    // lingering worktree/branch artifacts must not be hidden behind the
+    // "all milestones complete" message.
+    if (closeout.idleResidueHint) {
+        return [closeout.idleResidueHint.message];
+    }
     if (state.phase === "complete") {
         const last = state.lastCompletedMilestone;
         return appendRequirementsBacklogToSummary(state, [

package/dist/resources/extensions/gsd/commands/catalog.js

@@ -1,7 +1,8 @@
 import { existsSync, readFileSync, readdirSync } from "node:fs";
-import { join, resolve } from "node:path";
+import { join } from "node:path";
 import { loadRegistry } from "../workflow-templates.js";
 import { gsdHome } from "../gsd-home.js";
+import { resolveWorktreeProjectRoot } from "../worktree-root.js";
 import { VISUAL_BRIEF_MODES } from "../../visual-brief/prompts.js";
 export const GSD_COMMAND_DESCRIPTION = "GSD — Git Ship Done: /gsd help|start|templates|next|auto|stop|pause|status|widget|visualize|brief|report|queue|quick|discuss|capture|triage|dispatch|verdict|history|undo|undo-task|reset-slice|rate|skip|export|cleanup|closeout|rebuild|model|mode|prefs|config|keys|hooks|run-hook|skill-health|doctor|debug|logs|forensics|changelog|migrate|remote|steer|knowledge|memory|new-milestone|new-project|parallel|cmux|park|unpark|init|setup|onboarding|inspect|extensions|update|upgrade|fast|mcp|rethink|workflow|codebase|notifications|ship|do|usage|context|session-report|backlog|pr-branch|add-tests|scan|language|worktree|eval-review";
 export const TOP_LEVEL_SUBCOMMANDS = [
@@ -380,70 +381,13 @@ function getExtensionCompletions(prefix, action) {
         return [];
     }
 }
-function normalizePathForCompare(path) {
-    return path.replaceAll("\\", "/").replace(/\/+$/, "");
-}
-function findWorktreeSegment(normalizedPath) {
-    const directMarker = "/.gsd/worktrees/";
-    const directIdx = normalizedPath.indexOf(directMarker);
-    if (directIdx !== -1) {
-        return { gsdIdx: directIdx, afterWorktrees: directIdx + directMarker.length };
-    }
-    const symlinkMatch = normalizedPath.match(/\/\.gsd\/projects\/[a-f0-9]+\/worktrees\//);
-    if (symlinkMatch?.index !== undefined) {
-        return { gsdIdx: symlinkMatch.index, afterWorktrees: symlinkMatch.index + symlinkMatch[0].length };
-    }
-    return null;
-}
-function resolveProjectRootFromGitFile(worktreePath) {
-    try {
-        let dir = worktreePath;
-        for (let i = 0; i < 30; i++) {
-            const gitPath = join(dir, ".git");
-            if (existsSync(gitPath)) {
-                const content = readFileSync(gitPath, "utf8").trim();
-                if (content.startsWith("gitdir: ")) {
-                    const gitDir = resolve(dir, content.slice(8));
-                    const dotGitDir = resolve(gitDir, "..", "..");
-                    if (dotGitDir.endsWith(".git") || dotGitDir.endsWith(".git/") || dotGitDir.endsWith(".git\\")) {
-                        return resolve(dotGitDir, "..");
-                    }
-                    const commonDirPath = join(gitDir, "commondir");
-                    if (existsSync(commonDirPath)) {
-                        const commonDir = readFileSync(commonDirPath, "utf8").trim();
-                        return resolve(resolve(gitDir, commonDir), "..");
-                    }
-                }
-                break;
-            }
-            const parent = resolve(dir, "..");
-            if (parent === dir)
-                break;
-            dir = parent;
-        }
-    }
-    catch {
-        // Completion must stay best-effort.
-    }
-    return null;
-}
 function resolveProjectRootForCompletion(basePath) {
+    // Completion honors GSD_PROJECT_ROOT unconditionally (worker processes may
+    // complete from any cwd); resolveWorktreeProjectRoot only honors it for
+    // worktree paths.
     if (process.env.GSD_PROJECT_ROOT)
         return process.env.GSD_PROJECT_ROOT;
-    const normalizedPath = normalizePathForCompare(basePath);
-    const segment = findWorktreeSegment(normalizedPath);
-    if (!segment)
-        return basePath;
-    const separator = basePath.includes("\\") ? "\\" : "/";
-    const gsdMarker = `${separator}.gsd${separator}`;
-    const gsdIdx = basePath.indexOf(gsdMarker);
-    const candidate = gsdIdx !== -1 ? basePath.slice(0, gsdIdx) : basePath.slice(0, segment.gsdIdx);
-    const normalizedGsdHome = normalizePathForCompare(gsdHome());
-    const candidateGsdPath = normalizePathForCompare(join(candidate, ".gsd"));
-    if (candidateGsdPath === normalizedGsdHome || candidateGsdPath.startsWith(`${normalizedGsdHome}/`)) {
-        return resolveProjectRootFromGitFile(basePath) ?? basePath;
-    }
-    return candidate;
+    return resolveWorktreeProjectRoot(basePath);
 }
 export function getGsdArgumentCompletions(prefix) {
     const hasTrailingSpace = prefix.endsWith(" ");

package/dist/resources/extensions/gsd/commands/context.js

@@ -1,4 +1,4 @@
-import { checkRemoteAutoSession, isAutoActive, isAutoPaused, stopAutoRemote } from "../auto.js";
+import { checkRemoteAutoSession, forceStopAutoRemote, isAutoActive, isAutoPaused, stopAutoRemote } from "../auto.js";
 import { validateDirectory } from "../validate-directory.js";
 import { resolveProjectRoot } from "../worktree.js";
 import { showNextAction } from "../../shared/tui.js";
@@ -135,5 +135,19 @@ export async function guardRemoteSession(ctx, pi) {
         }
         return false;
     }
-    return choice === "force";
+    if (choice === "force") {
+        const result = forceStopAutoRemote(projectRoot());
+        if (result.error) {
+            ctx.ui.notify(`Failed to force-stop remote auto-mode: ${result.error}`, "error");
+            return false;
+        }
+        if (result.found) {
+            ctx.ui.notify(`Force-stopped auto-mode session (PID ${result.pid}). Starting a new session.`, "warning");
+        }
+        else {
+            ctx.ui.notify("Remote session is no longer running. Starting a new session.", "info");
+        }
+        return true;
+    }
+    return false;
 }

package/dist/resources/extensions/gsd/commands-handlers.js

@@ -7,7 +7,7 @@
 import { existsSync, readFileSync, mkdirSync } from "node:fs";
 import { execFileSync } from "node:child_process";
 import { createRequire } from "node:module";
-import { join, resolve as resolvePath, sep } from "node:path";
+import { join, resolve as resolvePath, sep, win32 as pathWin32 } from "node:path";
 import { homedir } from "node:os";
 import { deriveState } from "./state.js";
 import { gsdRoot } from "./paths.js";
@@ -20,6 +20,7 @@ import { getAutoWorktreePath } from "./auto-worktree.js";
 import { currentDirectoryRoot, projectRoot } from "./commands/context.js";
 import { loadPrompt } from "./prompt-loader.js";
 import { buildClaudeRuntimeFloorAdvisory } from "../../shared/claude-runtime-floor.js";
+import { reconcileGsdBrowserPathAfterInstall } from "../../shared/gsd-browser-path-sync.js";
 import { isPnpmInstall } from "../../shared/package-manager-detection.js";
 import { buildDoctorHealIssuePayload, buildDoctorHealSummary, buildWorkflowDispatchContent, } from "./workflow-protocol.js";
 import { restoreGsdWorkflowTools, scopeGsdWorkflowToolsForDispatch, } from "./bootstrap/register-hooks.js";
@@ -51,8 +52,31 @@ function resolveInstallCommand(pkg) {
         return `bun add -g ${pkg}`;
     if (isPnpmInstall())
         return `pnpm add -g ${pkg}`;
+    const npmPrefix = resolveWindowsNpmGlobalPrefix();
+    if (npmPrefix)
+        return `npm --prefix ${quoteWindowsArg(npmPrefix)} install -g ${pkg}`;
     return `npm install -g ${pkg}`;
 }
+function resolveWindowsNpmGlobalPrefix(argv1 = process.argv[1], platform = process.platform) {
+    if (platform !== "win32" || !argv1)
+        return null;
+    const normalized = pathWin32.normalize(argv1);
+    const marker = `${pathWin32.sep}node_modules${pathWin32.sep}`;
+    const index = normalized.toLowerCase().lastIndexOf(marker);
+    if (index <= 0)
+        return null;
+    const prefix = normalized.slice(0, index);
+    // Verify this is a real npm global prefix: such a directory always contains
+    // npm's own bin shim (`npm.cmd`) as a sibling of `node_modules/`. Local
+    // project `node_modules/`, npx caches, and other non-global layouts do not,
+    // so without this check `--prefix` would target the wrong directory.
+    if (!existsSync(pathWin32.join(prefix, "npm.cmd")))
+        return null;
+    return prefix;
+}
+function quoteWindowsArg(value) {
+    return `"${value.replace(/"/g, '\\"')}"`;
+}
 function notifyClaudeRuntimeFloorAdvisory(ctx) {
     let advisory = null;
     try {
@@ -484,11 +508,30 @@ export async function handleUpdate(ctx, args = "") {
         execSync(installCmd, {
             stdio: ["ignore", "pipe", "ignore"],
         });
+        let reconcile = null;
+        if (browserUpdate) {
+            try {
+                reconcile = reconcileGsdBrowserPathAfterInstall({
+                    latestVersion: latest,
+                    compareSemver: compareSemverLocal,
+                    resolvePathVersion: resolveGsdBrowserPathVersionForCommand,
+                });
+            }
+            catch {
+                // Reconciliation is best-effort: the install above already succeeded,
+                // so a reconcile failure must not flip the result to "Update failed".
+                reconcile = null;
+            }
+        }
         const newPathVersion = browserUpdate ? resolveGsdBrowserPathVersionForCommand() : null;
-        const pathReady = !browserUpdate || (!!newPathVersion && compareSemverLocal(newPathVersion, latest) >= 0);
+        const pathNote = browserUpdate && !(newPathVersion && compareSemverLocal(newPathVersion, latest) >= 0)
+            ? (reconcile?.message
+                ?? "Ensure the npm global bin directory is on your PATH so MCP automation uses the updated binary.")
+            : "";
         ctx.ui.notify(browserUpdate
             ? `Updated gsd-browser to v${latest}. Restart your GSD session to use the new browser automation version.` +
-                (pathReady ? "" : "\nNote: Ensure the npm global bin directory is on your PATH so MCP automation uses the updated binary.")
+                (reconcile?.action === "synced" && reconcile.message ? `\n${reconcile.message}` : "") +
+                (pathNote ? `\nNote: ${pathNote}` : "")
             : `Updated to v${latest}. Restart your GSD session to use the new version.`, "info");
         if (!browserUpdate)
             notifyClaudeRuntimeFloorAdvisory(ctx);

package/dist/resources/extensions/gsd/commands-mcp-status.js

@@ -59,7 +59,7 @@ export function formatMcpStatusReport(servers) {
                 : s.connected
                     ? `connected — ${s.toolCount} tools`
                     : s.available
-                        ? `available — ${s.toolCount} tools`
+                        ? `probe available — ${s.toolCount} tools`
                         : "disconnected";
         const warningText = s.envWarnings?.length ? ` — ${s.envWarnings.length} warning(s)` : "";
         lines.push(`  ${icon} ${s.name} (${s.transport}) — ${status}${warningText}`);
@@ -83,7 +83,7 @@ export function formatMcpServerDetail(server) {
         lines.push(`  Error:     ${server.error}`);
     }
     else if (server.connected || server.available) {
-        lines.push(`  Status:    ${server.connected ? "connected" : "available"}`);
+        lines.push(`  Status:    ${server.connected ? "connected" : "probe available"}`);
         lines.push(`  Tools:     ${server.toolCount}`);
         if (server.tools.length > 0) {
             lines.push("");

package/dist/resources/extensions/gsd/commands-workflow-templates.js

@@ -59,6 +59,13 @@ function datePrefix() {
     const dd = String(d.getDate()).padStart(2, "0");
     return `${yy}${mm}${dd}`;
 }
+export function isWorkflowStateComplete(state) {
+    if (state.completedAt)
+        return true;
+    return Array.isArray(state.phases) &&
+        state.phases.length > 0 &&
+        state.phases.every((phase) => phase.status === "completed");
+}
 /**
  * Write a STATE.json file to track workflow execution state.
  */
@@ -85,7 +92,7 @@ function writeWorkflowState(artifactDir, templateId, templateName, phases, descr
  * Scan all workflow artifact directories for in-progress STATE.json files.
  * Returns workflows that were started but not completed.
  */
-function findInProgressWorkflows(basePath) {
+export function findInProgressWorkflows(basePath) {
     const workflowsRoot = join(gsdRoot(basePath), "workflows");
     if (!existsSync(workflowsRoot))
         return [];
@@ -105,7 +112,7 @@ function findInProgressWorkflows(basePath) {
                 try {
                     const raw = readFileSync(statePath, "utf-8");
                     const state = JSON.parse(raw);
-                    if (!state.completedAt) {
+                    if (!isWorkflowStateComplete(state)) {
                         results.push(state);
                     }
                 }