gsd-pi 2.34.0-dev.ed0bfbf → 2.35.0-dev.30eec3f

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

@@ -6,8 +6,8 @@
  * Both idempotent — non-destructive if already present.
  */
 import { join } from "node:path";
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { nativeRmCached } from "./native-git-bridge.js";
+import { existsSync, lstatSync, readFileSync, writeFileSync } from "node:fs";
+import { nativeRmCached, nativeLsFiles } from "./native-git-bridge.js";
 import { gsdRoot } from "./paths.js";
 /**
  * GSD runtime patterns for git index cleanup.
@@ -67,12 +67,48 @@ const BASELINE_PATTERNS = [
     "tmp/",
 ];
 /**
- * Ensure basePath/.gitignore contains a blanket `.gsd/` ignore.
- * Creates the file if missing; appends `.gsd/` if not present.
+ * Check whether `.gsd/` contains files tracked by git.
+ * If so, the project intentionally keeps `.gsd/` in version control
+ * and we must NOT add `.gsd` to `.gitignore` or attempt migration.
+ *
+ * Returns true if git tracks at least one file under `.gsd/`.
+ * Returns false (safe to ignore) if:
+ *   - Not a git repo
+ *   - `.gsd/` is a symlink (external state, should be ignored)
+ *   - `.gsd/` doesn't exist
+ *   - No tracked files found under `.gsd/`
+ */
+export function hasGitTrackedGsdFiles(basePath) {
+    const localGsd = join(basePath, ".gsd");
+    // If .gsd doesn't exist or is already a symlink, no tracked files concern
+    if (!existsSync(localGsd))
+        return false;
+    try {
+        if (lstatSync(localGsd).isSymbolicLink())
+            return false;
+    }
+    catch {
+        return false;
+    }
+    // Check if git tracks any files under .gsd/
+    try {
+        const tracked = nativeLsFiles(basePath, ".gsd");
+        return tracked.length > 0;
+    }
+    catch {
+        // Not a git repo or git not available — safe to proceed
+        return false;
+    }
+}
+/**
+ * Ensure basePath/.gitignore contains baseline ignore patterns.
+ * Creates the file if missing; appends missing patterns.
  * Returns true if the file was created or modified, false if already complete.
  *
- * `.gsd/` state is managed externally (symlinked to `~/.gsd/projects/<hash>/`),
- * so the entire directory is always gitignored.
+ * **Safety check:** If `.gsd/` contains git-tracked files (i.e., the project
+ * intentionally keeps `.gsd/` in version control), the `.gsd` ignore pattern
+ * is excluded to prevent data loss. Only the `.gsd` pattern is affected —
+ * all other baseline patterns are still applied normally.
  */
 export function ensureGitignore(basePath, options) {
     // If manage_gitignore is explicitly false, do not touch .gitignore at all
@@ -88,8 +124,14 @@ export function ensureGitignore(basePath, options) {
         .split("\n")
         .map((l) => l.trim())
         .filter((l) => l && !l.startsWith("#")));
+    // Determine which patterns to apply. If .gsd/ has tracked files,
+    // exclude the ".gsd" pattern to prevent deleting tracked state.
+    const gsdIsTracked = hasGitTrackedGsdFiles(basePath);
+    const patternsToApply = gsdIsTracked
+        ? BASELINE_PATTERNS.filter((p) => p !== ".gsd")
+        : BASELINE_PATTERNS;
     // Find patterns not yet present
-    const missing = BASELINE_PATTERNS.filter((p) => !existingLines.has(p));
+    const missing = patternsToApply.filter((p) => !existingLines.has(p));
     if (missing.length === 0)
         return false;
     // Build the block to append
@@ -111,6 +153,11 @@ export function ensureGitignore(basePath, options) {
  * already in the index even after .gitignore is updated.
  *
  * Only removes from the index (`--cached`), never from disk. Idempotent.
+ *
+ * Note: These are strictly runtime/ephemeral paths (activity logs, lock files,
+ * metrics, STATE.md). They are always safe to untrack, even when the project
+ * intentionally keeps other `.gsd/` files (like PROJECT.md, milestones/) in
+ * version control.
  */
 export function untrackRuntimeFiles(basePath) {
     const runtimePaths = GSD_RUNTIME_PATTERNS;

package/dist/resources/extensions/gsd/guided-flow.js

@@ -154,7 +154,7 @@ function parseMilestoneSequenceFromProject(content) {
  * This is the only way the wizard triggers work — everything else is the LLM's job.
  */
 function dispatchWorkflow(pi, note, customType = "gsd-run") {
-    const workflowPath = process.env.GSD_WORKFLOW_PATH ?? join(process.env.HOME ?? "~", ".pi", "GSD-WORKFLOW.md");
+    const workflowPath = process.env.GSD_WORKFLOW_PATH ?? join(process.env.HOME ?? "~", ".gsd", "agent", "GSD-WORKFLOW.md");
     const workflow = readFileSync(workflowPath, "utf-8");
     pi.sendMessage({
         customType,
@@ -661,9 +661,11 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
     untrackRuntimeFiles(basePath);
     // ── Self-heal stale runtime records from crashed auto-mode sessions ──
     selfHealRuntimeRecords(basePath, ctx);
-    // Check for crash from previous auto-mode session
+    // Check for crash from previous auto-mode session.
+    // Skip if the lock was written by the current process — acquireSessionLock()
+    // writes to the same file, so we'd always false-positive (#1398).
     const crashLock = readCrashLock(basePath);
-    if (crashLock) {
+    if (crashLock && crashLock.pid !== process.pid) {
         clearLock(basePath);
         // Bootstrap crash with zero completed units = no work was lost.
         // Auto-discard instead of prompting the user — this commonly happens

package/dist/resources/extensions/gsd/health-widget-core.js

@@ -0,0 +1,96 @@
+/**
+ * Pure GSD health widget logic.
+ *
+ * Separates project-state detection and line rendering from the widget's
+ * runtime integrations so the regressions can be tested directly.
+ */
+import { existsSync, readdirSync } from "node:fs";
+import { gsdRoot } from "./paths.js";
+import { join } from "node:path";
+export function detectHealthWidgetProjectState(basePath) {
+    const root = gsdRoot(basePath);
+    if (!existsSync(root))
+        return "none";
+    // Lightweight milestone count — avoids the full detectProjectState() scan
+    // (CI markers, Makefile targets, etc.) that is unnecessary on the 60s refresh.
+    try {
+        const milestonesDir = join(root, "milestones");
+        if (existsSync(milestonesDir)) {
+            const entries = readdirSync(milestonesDir, { withFileTypes: true });
+            if (entries.some(e => e.isDirectory()))
+                return "active";
+        }
+    }
+    catch { /* non-fatal */ }
+    return "initialized";
+}
+function formatCost(n) {
+    return n >= 1 ? `$${n.toFixed(2)}` : `${(n * 100).toFixed(1)}¢`;
+}
+function formatProgress(progress) {
+    if (!progress)
+        return null;
+    const parts = [];
+    parts.push(`M ${progress.milestones.done}/${progress.milestones.total}`);
+    if (progress.slices)
+        parts.push(`S ${progress.slices.done}/${progress.slices.total}`);
+    if (progress.tasks)
+        parts.push(`T ${progress.tasks.done}/${progress.tasks.total}`);
+    return parts.length > 0 ? `Progress: ${parts.join(" · ")}` : null;
+}
+function formatEnvironmentSummary(errorCount, warningCount) {
+    if (errorCount <= 0 && warningCount <= 0)
+        return null;
+    const parts = [];
+    if (errorCount > 0)
+        parts.push(`${errorCount} error${errorCount > 1 ? "s" : ""}`);
+    if (warningCount > 0)
+        parts.push(`${warningCount} warning${warningCount > 1 ? "s" : ""}`);
+    return `Env: ${parts.join(", ")}`;
+}
+function formatBudgetSummary(data) {
+    if (data.budgetCeiling !== undefined && data.budgetCeiling > 0) {
+        const pct = Math.min(100, (data.budgetSpent / data.budgetCeiling) * 100);
+        return `Budget: ${formatCost(data.budgetSpent)}/${formatCost(data.budgetCeiling)} (${pct.toFixed(0)}%)`;
+    }
+    if (data.budgetSpent > 0) {
+        return `Spent: ${formatCost(data.budgetSpent)}`;
+    }
+    return null;
+}
+function buildExecutionHeadline(data) {
+    const status = data.executionStatus ?? "Active project";
+    const target = data.executionTarget ?? data.blocker ?? "loading status…";
+    return `  GSD  ${status}${target ? ` - ${target}` : ""}`;
+}
+/**
+ * Build compact health lines for the widget.
+ * Returns a string array suitable for setWidget().
+ */
+export function buildHealthLines(data) {
+    if (data.projectState === "none") {
+        return ["  GSD  No project loaded — run /gsd to start"];
+    }
+    if (data.projectState === "initialized") {
+        return ["  GSD  Project initialized — run /gsd to continue setup"];
+    }
+    const lines = [buildExecutionHeadline(data)];
+    const details = [];
+    const progress = formatProgress(data.progress);
+    if (progress)
+        details.push(progress);
+    if (data.providerIssue)
+        details.push(data.providerIssue);
+    const environment = formatEnvironmentSummary(data.environmentErrorCount, data.environmentWarningCount);
+    if (environment)
+        details.push(environment);
+    const budget = formatBudgetSummary(data);
+    if (budget)
+        details.push(budget);
+    if (data.eta)
+        details.push(data.eta);
+    if (details.length > 0) {
+        lines.push(`  ${details.join("  │  ")}`);
+    }
+    return lines;
+}

package/dist/resources/extensions/gsd/health-widget.js

@@ -11,21 +11,23 @@ import { runProviderChecks, summariseProviderIssues } from "./doctor-providers.j
 import { runEnvironmentChecks } from "./doctor-environment.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
 import { loadLedgerFromDisk, getProjectTotals } from "./metrics.js";
+import { describeNextUnit, estimateTimeRemaining, updateSliceProgressCache } from "./auto-dashboard.js";
 import { projectRoot } from "./commands.js";
+import { deriveState, invalidateStateCache } from "./state.js";
+import { buildHealthLines, detectHealthWidgetProjectState, } from "./health-widget-core.js";
 // ── Data loader ────────────────────────────────────────────────────────────────
-function loadHealthWidgetData(basePath) {
-    let hasProject = false;
+function loadBaseHealthWidgetData(basePath) {
     let budgetCeiling;
     let budgetSpent = 0;
     let providerIssue = null;
     let environmentErrorCount = 0;
     let environmentWarningCount = 0;
+    const projectState = detectHealthWidgetProjectState(basePath);
     try {
         const prefs = loadEffectiveGSDPreferences();
         budgetCeiling = prefs?.preferences?.budget_ceiling;
         const ledger = loadLedgerFromDisk(basePath);
         if (ledger) {
-            hasProject = true;
             const totals = getProjectTotals(ledger.units ?? []);
             budgetSpent = totals.cost;
         }
@@ -47,7 +49,7 @@ function loadHealthWidgetData(basePath) {
     }
     catch { /* non-fatal */ }
     return {
-        hasProject,
+        projectState,
         budgetCeiling,
         budgetSpent,
         providerIssue,
@@ -56,50 +58,85 @@ function loadHealthWidgetData(basePath) {
         lastRefreshed: Date.now(),
     };
 }
-// ── Rendering ──────────────────────────────────────────────────────────────────
-function formatCost(n) {
-    return n >= 1 ? `$${n.toFixed(2)}` : `${(n * 100).toFixed(1)}¢`;
+function compactText(text, max = 64) {
+    const trimmed = text.replace(/\s+/g, " ").trim();
+    if (trimmed.length <= max)
+        return trimmed;
+    return `${trimmed.slice(0, max - 1).trimEnd()}…`;
 }
-/**
- * Build compact health lines for the widget.
- * Returns a string array suitable for setWidget().
- */
-export function buildHealthLines(data) {
-    if (!data.hasProject) {
-        return ["  GSD  No project loaded — run /gsd to start"];
-    }
-    const parts = [];
-    // System status signal
-    const totalIssues = data.environmentErrorCount + data.environmentWarningCount + (data.providerIssue ? 1 : 0);
-    if (totalIssues === 0) {
-        parts.push("● System OK");
-    }
-    else if (data.environmentErrorCount > 0 || data.providerIssue?.includes("✗")) {
-        parts.push(`✗ ${totalIssues} issue${totalIssues > 1 ? "s" : ""}`);
-    }
-    else {
-        parts.push(`⚠ ${totalIssues} warning${totalIssues > 1 ? "s" : ""}`);
+function summarizeExecutionStatus(state) {
+    switch (state.phase) {
+        case "blocked": return "Blocked";
+        case "paused": return "Paused";
+        case "complete": return "Complete";
+        case "executing": return "Executing";
+        case "planning": return "Planning";
+        case "pre-planning": return "Pre-planning";
+        case "summarizing": return "Summarizing";
+        case "validating-milestone": return "Validating";
+        case "completing-milestone": return "Completing";
+        case "needs-discussion": return "Needs discussion";
+        case "replanning-slice": return "Replanning";
+        default: return "Active";
     }
-    // Budget
-    if (data.budgetCeiling !== undefined && data.budgetCeiling > 0) {
-        const pct = Math.min(100, (data.budgetSpent / data.budgetCeiling) * 100);
-        parts.push(`Budget: ${formatCost(data.budgetSpent)}/${formatCost(data.budgetCeiling)} (${pct.toFixed(0)}%)`);
-    }
-    else if (data.budgetSpent > 0) {
-        parts.push(`Spent: ${formatCost(data.budgetSpent)}`);
-    }
-    // Provider issue (if any)
-    if (data.providerIssue) {
-        parts.push(data.providerIssue);
+}
+function summarizeExecutionTarget(state) {
+    switch (state.phase) {
+        case "needs-discussion":
+            return state.activeMilestone ? `Discuss ${state.activeMilestone.id}` : "Discuss milestone draft";
+        case "pre-planning":
+            return state.activeMilestone ? `Plan ${state.activeMilestone.id}` : "Research & plan milestone";
+        case "planning":
+            return state.activeSlice ? `Plan ${state.activeSlice.id}` : "Plan next slice";
+        case "executing":
+            return state.activeTask ? `Execute ${state.activeTask.id}` : "Execute next task";
+        case "summarizing":
+            return state.activeSlice ? `Complete ${state.activeSlice.id}` : "Complete current slice";
+        case "validating-milestone":
+            return state.activeMilestone ? `Validate ${state.activeMilestone.id}` : "Validate milestone";
+        case "completing-milestone":
+            return state.activeMilestone ? `Complete ${state.activeMilestone.id}` : "Complete milestone";
+        case "replanning-slice":
+            return state.activeSlice ? `Replan ${state.activeSlice.id}` : "Replan current slice";
+        case "blocked":
+            return `waiting on ${compactText(state.blockers[0] ?? state.nextAction, 56)}`;
+        case "paused":
+            return compactText(state.nextAction || "waiting to resume", 56);
+        case "complete":
+            return "All milestones complete";
+        default:
+            return compactText(describeNextUnit(state).label, 56);
     }
-    // Environment issues
-    if (data.environmentErrorCount > 0) {
-        parts.push(`Env: ${data.environmentErrorCount} error${data.environmentErrorCount > 1 ? "s" : ""}`);
+}
+async function enrichHealthWidgetData(basePath, baseData) {
+    if (baseData.projectState !== "active")
+        return baseData;
+    try {
+        invalidateStateCache();
+        const state = await deriveState(basePath);
+        if (state.activeMilestone) {
+            // Warm the slice-progress cache so estimateTimeRemaining() has data
+            updateSliceProgressCache(basePath, state.activeMilestone.id, state.activeSlice?.id);
+        }
+        return {
+            ...baseData,
+            executionPhase: state.phase,
+            executionStatus: summarizeExecutionStatus(state),
+            executionTarget: summarizeExecutionTarget(state),
+            nextAction: state.nextAction,
+            blocker: state.blockers[0] ?? null,
+            activeMilestoneId: state.activeMilestone?.id,
+            activeSliceId: state.activeSlice?.id,
+            activeTaskId: state.activeTask?.id,
+            progress: state.progress,
+            eta: state.phase === "blocked" || state.phase === "paused" || state.phase === "complete"
+                ? null
+                : estimateTimeRemaining(),
+        };
     }
-    else if (data.environmentWarningCount > 0) {
-        parts.push(`Env: ${data.environmentWarningCount} warning${data.environmentWarningCount > 1 ? "s" : ""}`);
+    catch {
+        return baseData;
     }
-    return [`  ${parts.join("  │  ")}`];
 }
 // ── Widget init ────────────────────────────────────────────────────────────────
 const REFRESH_INTERVAL_MS = 60_000;
@@ -112,19 +149,33 @@ export function initHealthWidget(ctx) {
         return;
     const basePath = projectRoot();
     // String-array fallback — used in RPC mode (factory is a no-op there)
-    const initialData = loadHealthWidgetData(basePath);
+    const initialData = loadBaseHealthWidgetData(basePath);
     ctx.ui.setWidget("gsd-health", buildHealthLines(initialData), { placement: "belowEditor" });
     // Factory-based widget for TUI mode — replaces the string-array above
     ctx.ui.setWidget("gsd-health", (_tui, _theme) => {
         let data = initialData;
         let cachedLines;
-        const refreshTimer = setInterval(() => {
+        let refreshInFlight = false;
+        const refresh = async () => {
+            if (refreshInFlight)
+                return;
+            refreshInFlight = true;
             try {
-                data = loadHealthWidgetData(basePath);
+                const baseData = loadBaseHealthWidgetData(basePath);
+                data = await enrichHealthWidgetData(basePath, baseData);
                 cachedLines = undefined;
                 _tui.requestRender();
             }
             catch { /* non-fatal */ }
+            finally {
+                refreshInFlight = false;
+            }
+        };
+        // Fire first enrichment immediately. requestRender() inside is a no-op
+        // if the widget has not yet rendered, so this is safe before factory return.
+        void refresh();
+        const refreshTimer = setInterval(() => {
+            void refresh();
         }, REFRESH_INTERVAL_MS);
         return {
             render(_width) {

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

@@ -140,7 +140,16 @@ export default function (pi) {
                 // Pipe closed — nothing we can write; just exit cleanly
                 process.exit(0);
             }
-            // Re-throw anything that isn't EPIPE so real crashes still surface
+            if (err.code === "ENOENT" &&
+                err.syscall?.startsWith("spawn")) {
+                // spawn ENOENT — command not found (e.g., npx on Windows).
+                // This surfaces as an uncaught exception from child_process but
+                // is not a fatal process error. Log and continue instead of
+                // crashing auto-mode (#1384).
+                process.stderr.write(`[gsd] spawn ENOENT: ${err.path ?? "unknown"} — command not found\n`);
+                return;
+            }
+            // Re-throw anything that isn't EPIPE/ENOENT so real crashes still surface
             throw err;
         };
         process.on("uncaughtException", _gsdEpipeGuard);

package/dist/resources/extensions/gsd/migrate-external.js

@@ -5,10 +5,11 @@
  * `~/.gsd/projects/<hash>/` state directory. After migration, a
  * symlink replaces the original directory so all paths remain valid.
  */
-import { existsSync, lstatSync, mkdirSync, readdirSync, renameSync, cpSync, rmSync, symlinkSync } from "node:fs";
+import { existsSync, lstatSync, mkdirSync, readdirSync, realpathSync, renameSync, cpSync, rmSync, symlinkSync } from "node:fs";
 import { join } from "node:path";
 import { externalGsdRoot } from "./repo-identity.js";
 import { getErrorMessage } from "./error-utils.js";
+import { hasGitTrackedGsdFiles } from "./gitignore.js";
 /**
  * Migrate a legacy in-project `.gsd/` directory to external storage.
  *
@@ -42,6 +43,27 @@ export function migrateToExternalState(basePath) {
     catch (err) {
         return { migrated: false, error: `Cannot stat .gsd: ${getErrorMessage(err)}` };
     }
+    // Skip if .gsd/ contains git-tracked files — the project intentionally
+    // keeps .gsd/ in version control and migration would destroy that.
+    if (hasGitTrackedGsdFiles(basePath)) {
+        return { migrated: false };
+    }
+    // Skip if .gsd/worktrees/ has active worktree directories (#1337).
+    // On Windows, active git worktrees hold OS-level directory handles that
+    // prevent rename/delete. Attempting migration causes EBUSY and data loss.
+    const worktreesDir = join(localGsd, "worktrees");
+    if (existsSync(worktreesDir)) {
+        try {
+            const entries = readdirSync(worktreesDir, { withFileTypes: true });
+            if (entries.some(e => e.isDirectory())) {
+                return { migrated: false };
+            }
+        }
+        catch {
+            // Can't read worktrees dir — skip migration to be safe
+            return { migrated: false };
+        }
+    }
     const externalPath = externalGsdRoot(basePath);
     const migratingPath = join(basePath, ".gsd.migrating");
     try {
@@ -89,7 +111,38 @@ export function migrateToExternalState(basePath) {
         }
         // Create symlink .gsd -> external path
         symlinkSync(externalPath, localGsd, "junction");
-        // Remove .gsd.migrating
+        // Verify the symlink resolves correctly before removing the backup (#1377).
+        // On Windows, junction creation can silently succeed but resolve to the wrong
+        // target, or the external dir may not be accessible. If verification fails,
+        // restore from the backup.
+        try {
+            const resolved = realpathSync(localGsd);
+            const resolvedExternal = realpathSync(externalPath);
+            if (resolved !== resolvedExternal) {
+                // Symlink points to wrong target — restore backup
+                try {
+                    rmSync(localGsd, { force: true });
+                }
+                catch { /* may not exist */ }
+                renameSync(migratingPath, localGsd);
+                return { migrated: false, error: `Migration verification failed: symlink resolves to ${resolved}, expected ${resolvedExternal}` };
+            }
+            // Verify we can read through the symlink
+            readdirSync(localGsd);
+        }
+        catch (verifyErr) {
+            // Symlink broken or unreadable — restore backup
+            try {
+                rmSync(localGsd, { force: true });
+            }
+            catch { /* may not exist */ }
+            try {
+                renameSync(migratingPath, localGsd);
+            }
+            catch { /* best-effort restore */ }
+            return { migrated: false, error: `Migration verification failed: ${getErrorMessage(verifyErr)}` };
+        }
+        // Remove .gsd.migrating only after symlink is verified
         rmSync(migratingPath, { recursive: true, force: true });
         return { migrated: true };
     }

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

@@ -9,7 +9,8 @@
  * via prefix matching, so existing projects work without migration.
  */
 import { readdirSync, existsSync, realpathSync, Dirent } from "node:fs";
-import { join } from "node:path";
+import { join, dirname, normalize } from "node:path";
+import { spawnSync } from "node:child_process";
 import { nativeScanGsdTree } from "./native-parser-bridge.js";
 import { DIR_CACHE_MAX } from "./constants.js";
 // ─── Directory Listing Cache ──────────────────────────────────────────────────
@@ -263,15 +264,81 @@ const LEGACY_GSD_ROOT_FILES = {
     OVERRIDES: "overrides.md",
     KNOWLEDGE: "knowledge.md",
 };
+// ─── GSD Root Discovery ───────────────────────────────────────────────────────
+const gsdRootCache = new Map();
+/** Exported for tests only — do not call in production code. */
+export function _clearGsdRootCache() {
+    gsdRootCache.clear();
+}
+/**
+ * Resolve the `.gsd` directory for a given project base path.
+ *
+ * Probe order:
+ *   1. basePath/.gsd         — fast path (common case)
+ *   2. git rev-parse root    — handles cwd-is-a-subdirectory
+ *   3. Walk up from basePath — handles moved .gsd in an ancestor (bounded by git root)
+ *   4. basePath/.gsd         — creation fallback (init scenario)
+ *
+ * Result is cached per basePath for the process lifetime.
+ */
 export function gsdRoot(basePath) {
-    const local = join(basePath, ".gsd");
+    const cached = gsdRootCache.get(basePath);
+    if (cached)
+        return cached;
+    const result = probeGsdRoot(basePath);
+    gsdRootCache.set(basePath, result);
+    return result;
+}
+function probeGsdRoot(rawBasePath) {
+    // 1. Fast path — check the input path directly
+    const local = join(rawBasePath, ".gsd");
+    if (existsSync(local))
+        return local;
+    // Resolve symlinks so path comparisons work correctly across platforms
+    // (e.g. macOS /var → /private/var). Use rawBasePath as fallback if not resolvable.
+    let basePath;
     try {
-        const resolved = realpathSync(local);
-        if (resolved !== local)
-            return resolved; // symlink resolved
+        basePath = realpathSync.native(rawBasePath);
+    }
+    catch {
+        basePath = rawBasePath;
+    }
+    // 2. Git root anchor — used as both probe target and walk-up boundary
+    //    Only walk if we're inside a git project — prevents escaping into
+    //    unrelated filesystem territory when running outside any repo.
+    let gitRoot = null;
+    try {
+        const out = spawnSync("git", ["rev-parse", "--show-toplevel"], {
+            cwd: basePath,
+            encoding: "utf-8",
+        });
+        if (out.status === 0) {
+            const r = out.stdout.trim();
+            if (r)
+                gitRoot = normalize(r);
+        }
+    }
+    catch { /* git not available */ }
+    if (gitRoot) {
+        const candidate = join(gitRoot, ".gsd");
+        if (existsSync(candidate))
+            return candidate;
+    }
+    // 3. Walk up from basePath to the git root (only if we are in a subdirectory)
+    if (gitRoot && basePath !== gitRoot) {
+        let cur = dirname(basePath);
+        while (cur !== basePath) {
+            const candidate = join(cur, ".gsd");
+            if (existsSync(candidate))
+                return candidate;
+            if (cur === gitRoot)
+                break;
+            basePath = cur;
+            cur = dirname(cur);
+        }
     }
-    catch { /* doesn't exist yet — fall through */ }
-    return local; // backwards compat: unmigrated projects
+    // 4. Fallback for init/creation
+    return local;
 }
 export function milestonesDir(basePath) {
     return join(gsdRoot(basePath), "milestones");

package/dist/resources/extensions/gsd/post-unit-hooks.js

@@ -111,10 +111,13 @@ function dequeueNextHook(basePath) {
         };
         // Build the prompt with variable substitution
         const [mid, sid, tid] = triggerUnitId.split("/");
-        const prompt = config.prompt
+        let prompt = config.prompt
             .replace(/\{milestoneId\}/g, mid ?? "")
             .replace(/\{sliceId\}/g, sid ?? "")
             .replace(/\{taskId\}/g, tid ?? "");
+        // Inject browser safety instruction for hooks that may use browser tools (#1345).
+        // Vite HMR and other persistent connections prevent networkidle from resolving.
+        prompt += "\n\n**Browser tool safety:** Do NOT use `browser_wait_for` with `condition: \"network_idle\"` — it hangs indefinitely when dev servers keep persistent connections (Vite HMR, WebSocket). Use `selector_visible`, `text_visible`, or `delay` instead.";
         return {
             hookName: config.name,
             prompt,