@opengsd/gsd-pi 1.0.2-dev.e9a1b49 → 1.0.2-dev.fb7ddf1

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

@@ -3,8 +3,10 @@
  *
  * Shows current LLM context window usage and session token totals.
  */
+import { Key, matchesKey } from "@gsd/pi-tui";
 import { formatCost, formatPercent, formatTokenCount } from "./metrics.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
+import { renderDialogFrame, renderKeyHints } from "./tui/render-kit.js";
 export function scanSessionTokenTotals(entries) {
     const totals = {
         input: 0,
@@ -115,6 +117,97 @@ export function formatUsageReport(options) {
     }
     return lines.join("\n");
 }
+async function showUsageDialog(ctx, reportText) {
+    return ctx.ui.custom((tui, theme, _kb, done) => {
+        let cachedLines;
+        let cachedWidth;
+        let cachedRows;
+        let cachedScrollOffset;
+        let scrollOffset = 0;
+        let lastMaxScroll = 0;
+        let lastVisibleRows = 1;
+        function render(width) {
+            const terminalRows = process.stdout.rows || 0;
+            if (cachedLines &&
+                cachedWidth === width &&
+                cachedRows === terminalRows &&
+                cachedScrollOffset === scrollOffset) {
+                return cachedLines;
+            }
+            const contentWidth = Math.max(1, width - 4);
+            const body = reportText.split("\n");
+            if (body[0] === "Context Usage")
+                body.shift();
+            while (body[0] === "")
+                body.shift();
+            const maxOverlayRows = terminalRows > 0 ? Math.max(5, Math.floor(terminalRows * 0.8)) : 24;
+            const frameRows = 4;
+            const visibleRows = Math.max(1, maxOverlayRows - frameRows);
+            const maxScroll = Math.max(0, body.length - visibleRows);
+            scrollOffset = Math.min(Math.max(scrollOffset, 0), maxScroll);
+            lastMaxScroll = maxScroll;
+            lastVisibleRows = visibleRows;
+            const visible = body.slice(scrollOffset, scrollOffset + visibleRows);
+            const scrollable = body.length > visibleRows;
+            cachedLines = renderDialogFrame(theme, "Context Usage", visible, width, {
+                footer: renderKeyHints(theme, scrollable ? ["↑↓ scroll", "any key close"] : ["any key close"], contentWidth),
+                scroll: { offset: scrollOffset, visibleRows, totalRows: body.length },
+            });
+            cachedWidth = width;
+            cachedRows = terminalRows;
+            cachedScrollOffset = scrollOffset;
+            return cachedLines;
+        }
+        function scrollBy(delta) {
+            if (lastMaxScroll <= 0)
+                return false;
+            const nextOffset = Math.min(Math.max(scrollOffset + delta, 0), lastMaxScroll);
+            if (nextOffset !== scrollOffset) {
+                scrollOffset = nextOffset;
+                cachedLines = undefined;
+                cachedScrollOffset = undefined;
+                tui.requestRender();
+            }
+            return true;
+        }
+        return {
+            render,
+            invalidate: () => {
+                cachedLines = undefined;
+                cachedWidth = undefined;
+                cachedRows = undefined;
+                cachedScrollOffset = undefined;
+            },
+            handleInput: (data) => {
+                if (matchesKey(data, Key.down) || matchesKey(data, "j")) {
+                    if (scrollBy(1))
+                        return;
+                }
+                if (matchesKey(data, Key.up) || matchesKey(data, "k")) {
+                    if (scrollBy(-1))
+                        return;
+                }
+                if (matchesKey(data, Key.pageDown)) {
+                    if (scrollBy(lastVisibleRows))
+                        return;
+                }
+                if (matchesKey(data, Key.pageUp)) {
+                    if (scrollBy(-lastVisibleRows))
+                        return;
+                }
+                done(true);
+            },
+        };
+    }, {
+        overlay: true,
+        overlayOptions: {
+            width: "70%",
+            minWidth: 64,
+            maxHeight: "80%",
+            anchor: "center",
+        },
+    });
+}
 export async function handleUsage(args, ctx) {
     const contextUsage = ctx.getContextUsage?.();
     const sessionTotals = scanSessionTokenTotals(ctx.sessionManager.getEntries());
@@ -133,5 +226,16 @@ export async function handleUsage(args, ctx) {
         }, null, 2), "info");
         return;
     }
-    ctx.ui.notify(formatUsageReport({ modelLabel, contextUsage, sessionTotals }), "info");
+    const reportText = formatUsageReport({ modelLabel, contextUsage, sessionTotals });
+    if (ctx.hasUI) {
+        try {
+            const result = await showUsageDialog(ctx, reportText);
+            if (result !== undefined)
+                return;
+        }
+        catch {
+            // Fall back to text notify below when custom overlays are unavailable.
+        }
+    }
+    ctx.ui.notify(reportText, "info");
 }

package/dist/resources/extensions/gsd/config-overlay.js

@@ -7,6 +7,7 @@
  * Opened via `/gsd show-config` or `/gsd config`.
  */
 import { matchesKey, Key, truncateToWidth } from "@gsd/pi-tui";
+import { renderDialogFrame, renderKeyHints } from "./tui/render-kit.js";
 import { loadEffectiveGSDPreferences, loadGlobalGSDPreferences, loadProjectGSDPreferences, getGlobalGSDPreferencesPath, getProjectGSDPreferencesPath, resolveDynamicRoutingConfig, resolveEffectiveProfile, resolveModelWithFallbacksForUnit, resolveAutoSupervisorConfig, } from "./preferences.js";
 function collectConfigSections() {
     const sections = [];
@@ -227,6 +228,7 @@ export class GSDConfigOverlay {
     onClose;
     sections;
     cachedLines;
+    cachedWidth;
     scrollOffset = 0;
     disposed = false;
     constructor(tui, theme, onClose) {
@@ -237,6 +239,7 @@ export class GSDConfigOverlay {
     }
     invalidate() {
         this.cachedLines = undefined;
+        this.cachedWidth = undefined;
     }
     dispose() {
         this.disposed = true;
@@ -273,14 +276,12 @@ export class GSDConfigOverlay {
         }
     }
     render(width) {
-        if (this.cachedLines)
+        if (this.cachedLines && this.cachedWidth === width)
             return this.cachedLines;
         const t = this.theme;
-        const w = Math.max(width, 50);
+        const w = Math.max(1, width);
+        const contentWidth = Math.max(1, w - 4);
         const allLines = [];
-        // Header
-        allLines.push(t.bold(t.fg("accent", " GSD Configuration ")));
-        allLines.push(t.fg("muted", "\u2500".repeat(w)));
         // Find max label width for alignment
         let maxLabel = 0;
         for (const section of this.sections) {
@@ -291,22 +292,27 @@ export class GSDConfigOverlay {
         }
         const labelPad = Math.min(maxLabel + 2, 24);
         for (const section of this.sections) {
-            allLines.push("");
+            if (allLines.length > 0)
+                allLines.push("");
             allLines.push(t.bold(t.fg("accent", `  ${section.title}`)));
             for (const row of section.rows) {
                 const label = t.fg("muted", `    ${row.label.padEnd(labelPad)}`);
                 const value = row.accent ? t.bold(row.value) : row.value;
-                allLines.push(truncateToWidth(`${label}${value}`, w));
+                allLines.push(truncateToWidth(`${label}${value}`, contentWidth));
             }
         }
-        allLines.push("");
-        allLines.push(t.fg("muted", `  ${"\u2500".repeat(w - 4)}`));
-        allLines.push(t.fg("muted", "  esc/q close  \u2502  \u2191\u2193/jk scroll  \u2502  /gsd prefs to edit"));
         // Apply scroll
-        const maxScroll = Math.max(0, allLines.length - 20);
+        const terminalRows = process.stdout.rows || 32;
+        const maxBodyRows = Math.max(1, Math.min(allLines.length, terminalRows - 12));
+        const maxScroll = Math.max(0, allLines.length - maxBodyRows);
         this.scrollOffset = Math.min(this.scrollOffset, maxScroll);
-        const visible = allLines.slice(this.scrollOffset);
-        this.cachedLines = visible;
-        return visible;
+        const visible = allLines.slice(this.scrollOffset, this.scrollOffset + maxBodyRows);
+        const footer = renderKeyHints(t, ["esc/q close", "\u2191\u2193/jk scroll", "/gsd prefs to edit"], contentWidth);
+        this.cachedLines = renderDialogFrame(t, "GSD Configuration", visible, w, {
+            footer,
+            scroll: { offset: this.scrollOffset, visibleRows: maxBodyRows, totalRows: allLines.length },
+        });
+        this.cachedWidth = width;
+        return this.cachedLines;
     }
 }

package/dist/resources/extensions/gsd/context-overlay.js

@@ -3,7 +3,7 @@
  */
 import { matchesKey, Key, truncateToWidth } from "@gsd/pi-tui";
 import { formatTokenCount } from "./metrics.js";
-import { renderProgressBar, rightAlign } from "./tui/render-kit.js";
+import { renderDialogFrame, renderKeyHints, renderProgressBar, rightAlign } from "./tui/render-kit.js";
 const SECTION_COLORS = ["accent", "success", "warning", "borderAccent", "text"];
 export function getContextChartTotals(report) {
     const systemTokens = report.systemSections.reduce((sum, section) => sum + section.tokens, 0);
@@ -47,6 +47,7 @@ export class GSDContextOverlay {
     onClose;
     report;
     cachedLines;
+    cachedWidth;
     scrollOffset = 0;
     disposed = false;
     constructor(tui, theme, report, onClose) {
@@ -57,6 +58,7 @@ export class GSDContextOverlay {
     }
     invalidate() {
         this.cachedLines = undefined;
+        this.cachedWidth = undefined;
     }
     dispose() {
         this.disposed = true;
@@ -92,21 +94,20 @@ export class GSDContextOverlay {
         }
     }
     render(width) {
-        if (this.cachedLines)
+        if (this.cachedLines && this.cachedWidth === width)
             return this.cachedLines;
         const theme = this.theme;
-        const w = Math.max(width, 60);
+        const w = Math.max(1, width);
+        const contentWidth = Math.max(1, w - 4);
         const totals = getContextChartTotals(this.report);
         const chartTotal = Math.max(totals.inContext, totals.estimated, 1);
         const lines = [];
-        lines.push(theme.bold(theme.fg("accent", " Context Breakdown ")));
-        lines.push(theme.fg("muted", "─".repeat(w)));
         if (this.report.modelLabel) {
-            lines.push(rightAlign(theme.fg("muted", "Model"), theme.fg("text", this.report.modelLabel), w));
+            lines.push(rightAlign(theme.fg("muted", "Model"), theme.fg("text", this.report.modelLabel), contentWidth));
         }
         lines.push("");
         if (totals.window != null) {
-            const usageBarWidth = Math.max(20, w - 28);
+            const usageBarWidth = Math.max(8, contentWidth - 28);
             const usageBar = renderProgressBar(theme, totals.inContext, totals.window, usageBarWidth, {
                 filledColor: totals.inContext / totals.window > 0.85 ? "warning" : "accent",
             });
@@ -115,7 +116,7 @@ export class GSDContextOverlay {
         else {
             lines.push(`  ${theme.fg("muted", "Estimated")} ${theme.fg("text", formatTokenCount(chartTotal))}`);
         }
-        const splitWidth = Math.max(16, Math.floor((w - 8) / 2));
+        const splitWidth = Math.max(8, Math.floor((contentWidth - 8) / 2));
         const systemBar = renderProgressBar(theme, totals.systemTokens, chartTotal, splitWidth, { filledColor: "accent" });
         const convBar = renderProgressBar(theme, totals.conversationTokens, chartTotal, splitWidth, { filledColor: "success" });
         lines.push("");
@@ -123,17 +124,17 @@ export class GSDContextOverlay {
         lines.push(`  ${theme.fg("success", "History")} ${convBar} ${theme.fg("muted", formatPct(totals.conversationTokens, chartTotal))}`);
         lines.push("");
         lines.push(theme.bold(theme.fg("accent", "  System prompt")));
-        lines.push(...renderSectionBars(theme, this.report.systemSections, chartTotal, w, 22));
+        lines.push(...renderSectionBars(theme, this.report.systemSections, chartTotal, contentWidth, 22));
         lines.push("");
         lines.push(theme.bold(theme.fg("accent", "  Conversation")));
-        lines.push(...renderSectionBars(theme, this.report.conversationSections, chartTotal, w, 22));
+        lines.push(...renderSectionBars(theme, this.report.conversationSections, chartTotal, contentWidth, 22));
         lines.push("");
         lines.push(theme.bold(theme.fg("accent", "  Skills")));
         const { skills } = this.report;
         if (skills.available.length > 0) {
             lines.push(`    ${theme.fg("muted", "Available")} ${theme.fg("text", `${skills.available.length}`)}`);
             const preview = skills.available.slice(0, 8).join(", ");
-            lines.push(truncateToWidth(`      ${preview}${skills.available.length > 8 ? "…" : ""}`, w));
+            lines.push(truncateToWidth(`      ${preview}${skills.available.length > 8 ? "…" : ""}`, contentWidth));
         }
         else {
             lines.push(theme.fg("dim", "    none in prompt"));
@@ -147,12 +148,17 @@ export class GSDContextOverlay {
         lines.push("");
         lines.push(theme.bold(theme.fg("accent", "  Agents")));
         lines.push(`    ${theme.fg("muted", "Subagent spawns")} ${theme.fg("text", String(this.report.subagentSpawns))}`);
-        lines.push("");
-        lines.push(theme.fg("muted", `  ${"─".repeat(Math.max(0, w - 4))}`));
-        lines.push(theme.fg("muted", "  esc/q close  │  ↑↓ scroll  │  /gsd context --open for browser chart"));
-        const maxScroll = Math.max(0, lines.length - 24);
+        const terminalRows = process.stdout.rows || 32;
+        const maxBodyRows = Math.max(1, Math.min(lines.length, terminalRows - 12));
+        const maxScroll = Math.max(0, lines.length - maxBodyRows);
         this.scrollOffset = Math.min(this.scrollOffset, maxScroll);
-        this.cachedLines = lines.slice(this.scrollOffset);
+        const visible = lines.slice(this.scrollOffset, this.scrollOffset + maxBodyRows);
+        const footer = renderKeyHints(theme, ["esc/q close", "↑↓ scroll", "/gsd context --open"], contentWidth);
+        this.cachedLines = renderDialogFrame(theme, "Context Breakdown", visible, w, {
+            footer,
+            scroll: { offset: this.scrollOffset, visibleRows: maxBodyRows, totalRows: lines.length },
+        });
+        this.cachedWidth = width;
         return this.cachedLines;
     }
 }

package/dist/resources/extensions/gsd/dashboard-overlay.js

@@ -6,7 +6,7 @@
  * Toggled with Ctrl+Alt+G (⌃⌥G on macOS), Ctrl+Shift+G fallback,
  * or opened from /gsd status.
  */
-import { truncateToWidth, visibleWidth, matchesKey, Key } from "@gsd/pi-tui";
+import { truncateToWidth, matchesKey, Key } from "@gsd/pi-tui";
 import { deriveState } from "./state.js";
 import { loadFile } from "./files.js";
 import { isDbAvailable, getMilestoneSlices, getSliceTasks } from "./gsd-db.js";
@@ -21,6 +21,7 @@ import { estimateTimeRemaining } from "./auto-dashboard.js";
 import { computeProgressScore } from "./progress-score.js";
 import { runEnvironmentChecks } from "./doctor-environment.js";
 import { formattedShortcutPair } from "./shortcut-defs.js";
+import { renderDialogFrame, renderKeyHints } from "./tui/render-kit.js";
 export function unitLabel(type) {
     switch (type) {
         case "discuss-milestone":
@@ -222,30 +223,20 @@ export class GSDDashboardOverlay {
         }
         const content = this.buildContentLines(width);
         const viewportHeight = Math.max(5, process.stdout.rows ? process.stdout.rows - 8 : 24);
-        const chromeHeight = 2;
-        const visibleContentRows = Math.max(1, viewportHeight - chromeHeight);
+        const visibleContentRows = Math.max(1, viewportHeight - 4);
         const maxScroll = Math.max(0, content.length - visibleContentRows);
         this.scrollOffset = Math.min(this.scrollOffset, maxScroll);
         const visibleContent = content.slice(this.scrollOffset, this.scrollOffset + visibleContentRows);
-        const lines = this.wrapInBox(visibleContent, width);
+        const contentWidth = Math.max(1, width - 4);
+        const footer = renderKeyHints(this.theme, ["↑↓ scroll", "g/G top/end", `Esc/${formattedShortcutPair("dashboard")} close`], contentWidth);
+        const lines = renderDialogFrame(this.theme, "GSD Dashboard", visibleContent, width, {
+            footer,
+            scroll: { offset: this.scrollOffset, visibleRows: visibleContentRows, totalRows: content.length },
+        });
         this.cachedWidth = width;
         this.cachedLines = lines;
         return lines;
     }
-    wrapInBox(inner, width) {
-        const th = this.theme;
-        const border = (s) => th.fg("borderAccent", s);
-        const innerWidth = width - 4;
-        const lines = [];
-        lines.push(border("╭" + "─".repeat(width - 2) + "╮"));
-        for (const line of inner) {
-            const truncated = truncateToWidth(line, innerWidth);
-            const padWidth = Math.max(0, innerWidth - visibleWidth(truncated));
-            lines.push(border("│") + " " + truncated + " ".repeat(padWidth) + " " + border("│"));
-        }
-        lines.push(border("╰" + "─".repeat(width - 2) + "╯"));
-        return lines;
-    }
     buildContentLines(width) {
         const th = this.theme;
         const shellWidth = width - 4;
@@ -260,7 +251,6 @@ export class GSDDashboardOverlay {
         const blank = () => row("");
         const hr = () => row(th.fg("dim", "─".repeat(contentWidth)));
         const centered = (content) => row(centerLine(content, contentWidth));
-        const title = th.fg("accent", th.bold("GSD Dashboard"));
         const isRemote = !!this.dashData.remoteSession;
         const status = this.dashData.active
             ? `${Date.now() % 2000 < 1000 ? th.fg("success", "●") : th.fg("dim", "○")} ${th.fg("success", "AUTO")}`
@@ -287,7 +277,7 @@ export class GSDDashboardOverlay {
         else if (isRemote) {
             elapsedParts = th.fg("dim", `since ${this.dashData.remoteSession.startedAt.replace("T", " ").slice(0, 19)}`);
         }
-        lines.push(row(joinColumns(`${title}  ${status}${worktreeTag}`, elapsedParts, contentWidth)));
+        lines.push(row(joinColumns(`${status}${worktreeTag}`, elapsedParts, contentWidth)));
         // Progress score — traffic light indicator (#1221)
         if (this.dashData.active || this.dashData.paused) {
             const progressScore = computeProgressScore();
@@ -528,9 +518,6 @@ export class GSDDashboardOverlay {
                 }
             }
         }
-        lines.push(blank());
-        lines.push(hr());
-        lines.push(centered(th.fg("dim", `↑↓ scroll · g/G top/end · Esc/${formattedShortcutPair("dashboard")} close`)));
         return lines;
     }
     renderProgressRow(label, done, total, color, width) {

package/dist/resources/extensions/gsd/doctor-engine-checks.js

@@ -1,6 +1,7 @@
 import { existsSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { isDbAvailable, _getAdapter } from "./gsd-db.js";
+import { isAfter, latestExplicitReopenAt } from "./milestone-reopen-events.js";
 import { resolveGsdPathContract, resolveMilestoneFile } from "./paths.js";
 import { deriveState } from "./state.js";
 import { readEvents } from "./workflow-events.js";
@@ -131,6 +132,92 @@ export async function checkEngineHealth(basePath, issues, fixesApplied) {
             catch {
                 // Non-fatal — duplicate ID check failed
             }
+            // e. Completed milestone dispatch history but DB reopened without an explicit reopen event.
+            try {
+                const reopened = adapter
+                    .prepare(`SELECT m.id, m.status, ud.started_at, ud.ended_at
+             FROM milestones m
+             JOIN unit_dispatches ud ON ud.milestone_id = m.id
+             WHERE m.status NOT IN ('complete', 'done', 'skipped', 'closed')
+               AND ud.unit_type = 'complete-milestone'
+               AND ud.unit_id = m.id
+               AND ud.status = 'completed'
+               AND ud.id = (
+                 SELECT latest.id
+                 FROM unit_dispatches latest
+                 WHERE latest.milestone_id = m.id
+                   AND latest.unit_type = 'complete-milestone'
+                   AND latest.unit_id = m.id
+                   AND latest.status = 'completed'
+                 ORDER BY COALESCE(latest.ended_at, latest.started_at) DESC, latest.id DESC
+                 LIMIT 1
+               )
+             ORDER BY m.id`)
+                    .all();
+                for (const row of reopened) {
+                    const completedAt = row.ended_at ?? row.started_at ?? null;
+                    const reopenAt = latestExplicitReopenAt(basePath, row.id);
+                    if (reopenAt && (!completedAt || Date.parse(reopenAt) > Date.parse(completedAt)))
+                        continue;
+                    issues.push({
+                        severity: "error",
+                        code: "completed_milestone_reopened",
+                        scope: "milestone",
+                        unitId: row.id,
+                        message: `Milestone ${row.id} has completed complete-milestone dispatch history but DB status is ${row.status}. Explicitly reopen or recover before planning it again.`,
+                        fixable: false,
+                    });
+                }
+            }
+            catch {
+                // Non-fatal — completed-milestone reopen check failed
+            }
+            // f. Completion artifacts disagree with open DB hierarchy rows.
+            try {
+                const rows = adapter
+                    .prepare(`SELECT a.path, a.artifact_type, a.milestone_id, a.slice_id, a.task_id, a.imported_at,
+                    m.status AS milestone_status,
+                    s.status AS slice_status,
+                    t.status AS task_status,
+                    (SELECT COUNT(*) FROM tasks tt WHERE tt.milestone_id = a.milestone_id AND tt.slice_id = a.slice_id) AS task_count
+             FROM artifacts a
+             JOIN milestones m ON m.id = a.milestone_id
+             LEFT JOIN slices s ON s.milestone_id = a.milestone_id AND s.id = a.slice_id
+             LEFT JOIN tasks t ON t.milestone_id = a.milestone_id AND t.slice_id = a.slice_id AND t.id = a.task_id
+             WHERE a.artifact_type = 'SUMMARY'
+               AND m.status NOT IN ('complete', 'done', 'skipped', 'closed')`)
+                    .all();
+                const seen = new Set();
+                for (const row of rows) {
+                    const reopenAt = latestExplicitReopenAt(basePath, row.milestone_id);
+                    if (!isAfter(row.imported_at, reopenAt))
+                        continue;
+                    const isSliceSummary = row.slice_id && !row.task_id && row.slice_status && !["complete", "done", "skipped", "closed"].includes(row.slice_status);
+                    const isTaskSummary = row.slice_id && row.task_id && (!row.task_status || !["complete", "done", "skipped", "closed"].includes(row.task_status));
+                    const isTaskArtifactWithoutDbTasks = row.slice_id && row.task_id && Number(row.task_count) === 0;
+                    if (!isSliceSummary && !isTaskSummary && !isTaskArtifactWithoutDbTasks)
+                        continue;
+                    const unitId = row.task_id
+                        ? `${row.milestone_id}/${row.slice_id}/${row.task_id}`
+                        : row.slice_id
+                            ? `${row.milestone_id}/${row.slice_id}`
+                            : row.milestone_id;
+                    if (seen.has(unitId))
+                        continue;
+                    seen.add(unitId);
+                    issues.push({
+                        severity: "error",
+                        code: "artifact_db_status_divergence",
+                        scope: row.task_id ? "task" : row.slice_id ? "slice" : "milestone",
+                        unitId,
+                        message: `Completion artifact ${row.path} exists while DB state for ${unitId} is still open or missing. Runtime will not import it silently; run explicit recovery/repair after review.`,
+                        fixable: false,
+                    });
+                }
+            }
+            catch {
+                // Non-fatal — artifact/DB status drift check failed
+            }
         }
     }
     catch {

package/dist/resources/extensions/gsd/doctor-git-checks.js

@@ -1,7 +1,7 @@
 // gsd-pi doctor git health checks
 import { spawnSync } from "node:child_process";
-import { existsSync, readdirSync, realpathSync, rmSync, statSync } from "node:fs";
-import { join } from "node:path";
+import { cpSync, existsSync, mkdirSync, readdirSync, realpathSync, rmSync, statSync } from "node:fs";
+import { dirname, join } from "node:path";
 import { loadFile } from "./files.js";
 import { parseRoadmap as parseLegacyRoadmap } from "./parsers-legacy.js";
 import { isDbAvailable, getMilestone } from "./gsd-db.js";
@@ -52,13 +52,50 @@ function isSameOrNestedPath(candidate, container) {
     return normalizedCandidate === normalizedContainer ||
         normalizedCandidate.startsWith(`${normalizedContainer}/`);
 }
-function hasProjectContentOnDisk(dirPath) {
+function normalizeGitPath(path) {
+    return path.replaceAll("\\", "/").replace(/^\.\//, "");
+}
+function isProjectContentPath(path) {
+    const normalized = normalizeGitPath(path);
+    if (!normalized || normalized.endsWith("/"))
+        return false;
+    if (normalized === ".gitignore" || normalized === ".gitattributes")
+        return false;
+    if (normalized.endsWith(".DS_Store"))
+        return false;
+    const parts = normalized.split("/");
+    return !parts.some(part => part === ".git" || part === ".gsd");
+}
+function gitLines(basePath, args) {
+    const result = spawnSync("git", args, {
+        cwd: basePath,
+        encoding: "utf-8",
+    });
+    if (result.status !== 0)
+        return [];
+    return result.stdout
+        .split("\n")
+        .map(line => normalizeGitPath(line.trim()))
+        .filter(isProjectContentPath);
+}
+function listProjectContentFiles(basePath) {
+    return [...new Set([
+            ...gitLines(basePath, ["ls-files"]),
+            ...gitLines(basePath, ["ls-files", "--others", "--exclude-standard"]),
+        ])];
+}
+function hasMaterializedProjectContentFallback(dirPath) {
     try {
         for (const entry of readdirSync(dirPath, { withFileTypes: true })) {
-            if (entry.name === ".git" || entry.name === ".gsd")
+            if (!isProjectContentPath(entry.name))
                 continue;
             if (entry.name === ".DS_Store")
                 continue;
+            if (entry.isDirectory()) {
+                if (hasMaterializedProjectContentFallback(join(dirPath, entry.name)))
+                    return true;
+                continue;
+            }
             return true;
         }
     }
@@ -67,6 +104,26 @@ function hasProjectContentOnDisk(dirPath) {
     }
     return false;
 }
+function hasProjectContentOnDisk(dirPath) {
+    const gitProjectFiles = listProjectContentFiles(dirPath);
+    if (gitProjectFiles.length > 0) {
+        return gitProjectFiles.some(file => existsSync(join(dirPath, file)));
+    }
+    return hasMaterializedProjectContentFallback(dirPath);
+}
+function copyProjectRootContentIntoWorktree(projectRoot, worktreeRoot) {
+    let copied = 0;
+    for (const relPath of listProjectContentFiles(projectRoot)) {
+        const src = join(projectRoot, relPath);
+        if (!existsSync(src))
+            continue;
+        const dst = join(worktreeRoot, relPath);
+        mkdirSync(dirname(dst), { recursive: true });
+        cpSync(src, dst, { recursive: true, force: true });
+        copied++;
+    }
+    return copied;
+}
 function getSnapshotDiffCheckFailure(basePath) {
     const failures = [];
     for (const args of [["--cached"], []]) {
@@ -158,7 +215,15 @@ export async function checkGitHealth(basePath, issues, fixesApplied, shouldFix,
                             if (reset.status !== 0) {
                                 throw new Error(reset.stderr || reset.error?.message || "git reset --hard failed");
                             }
-                            fixesApplied.push(`recreated empty worktree ${wt.path}`);
+                            const copied = !hasProjectContentOnDisk(recreated.path) && hasProjectContentOnDisk(basePath)
+                                ? copyProjectRootContentIntoWorktree(basePath, recreated.path)
+                                : 0;
+                            if (!hasProjectContentOnDisk(recreated.path) && hasProjectContentOnDisk(basePath)) {
+                                throw new Error("recreated worktree still has no project content");
+                            }
+                            fixesApplied.push(copied > 0
+                                ? `recreated empty worktree ${wt.path} and copied ${copied} project file${copied === 1 ? "" : "s"} from project root`
+                                : `recreated empty worktree ${wt.path}`);
                         }
                         catch {
                             fixesApplied.push(`failed to recreate empty worktree ${wt.path}`);