@opengsd/gsd-pi 1.0.2-dev.867e002 → 1.0.2-dev.a271e2d

package/dist/resources/extensions/gsd/bootstrap/register-hooks.js

@@ -25,7 +25,7 @@ import { initNotificationWidget } from "../notification-widget.js";
 import { resolveWorktreeProjectRoot } from "../worktree-root.js";
 import { extractSubagentAgentClasses } from "./subagent-input.js";
 import { approvalGateIdForUnit, isExplicitApprovalResponse, shouldPauseForUserApprovalQuestion } from "../user-input-boundary.js";
-import { resolveSkillManifest } from "../skill-manifest.js";
+import { applyUnitSkillVisibility, unitHasSkillManifest } from "../skill-scope.js";
 import { getGuidedUnitContext } from "../guided-unit-context.js";
 import { registerPlanMilestoneSchemaRecovery } from "./plan-milestone-schema-recovery.js";
 let approvalQuestionAbortInFlight = false;
@@ -285,8 +285,7 @@ export function scopeGsdWorkflowToolsForDispatch(pi, unitType) {
         ? buildMinimalAutoGsdToolSet(current, unitType, registeredToolNames)
         : buildMinimalGsdWorkflowToolSet(current, registeredToolNames);
     const toolsChanged = !(scoped.length === current.length && scoped.every((name, index) => name === current[index]));
-    const skillManifest = resolveSkillManifest(unitType);
-    const canScopeSkills = skillManifest !== null && pi.getVisibleSkills && pi.setVisibleSkills;
+    const canScopeSkills = unitHasSkillManifest(unitType) && pi.getVisibleSkills && pi.setVisibleSkills;
     if (!toolsChanged && !canScopeSkills) {
         return null;
     }
@@ -294,8 +293,8 @@ export function scopeGsdWorkflowToolsForDispatch(pi, unitType) {
         pi.setActiveTools(scoped);
     }
     const visibleSkills = canScopeSkills ? pi.getVisibleSkills() : undefined;
-    if (canScopeSkills) {
-        pi.setVisibleSkills(skillManifest);
+    if (canScopeSkills && pi.setVisibleSkills) {
+        applyUnitSkillVisibility({ setVisibleSkills: pi.setVisibleSkills }, unitType);
     }
     return {
         tools: toolsChanged ? current : null,
@@ -513,9 +512,20 @@ export function registerHooks(pi, ecosystemHandlers) {
         // before_agent_start, Claude Code CLI sessions should get the same
         // project MCP config that /gsd mcp init would write.
         await prepareWorkflowMcpForHookContext(ctx, beforeAgentBasePath);
+        let systemPrompt = event.systemPrompt;
+        const { appendDiscoveredSkillsFallback, hasSkillSnapshot, refreshCatalogForNewSkills } = await import("../skill-discovery.js");
+        if (hasSkillSnapshot()) {
+            const loadedSkills = await refreshCatalogForNewSkills({
+                reload: () => ctx.reload(),
+                notify: (message, level) => ctx.ui.notify(message, level),
+            });
+            if (loadedSkills.length > 0) {
+                systemPrompt = appendDiscoveredSkillsFallback(ctx.getSystemPrompt(), loadedSkills);
+            }
+        }
         // GSD's own context injection (existing behavior — unchanged).
         const { buildBeforeAgentStartResult } = await import("./system-context.js");
-        const gsdResult = await buildBeforeAgentStartResult(event, ctx);
+        const gsdResult = await buildBeforeAgentStartResult({ ...event, systemPrompt }, ctx);
         // Refresh the snapshot used by ecosystem getPhase()/getActiveUnit().
         // deriveState has its own ~100ms cache so this is cheap on repeat calls.
         try {
@@ -527,7 +537,7 @@ export function registerHooks(pi, ecosystemHandlers) {
         }
         // Chain ecosystem handlers using pi's runner.ts chaining protocol:
         // each handler sees the systemPrompt mutated by prior handlers.
-        let currentSystemPrompt = gsdResult?.systemPrompt ?? event.systemPrompt;
+        let currentSystemPrompt = gsdResult?.systemPrompt ?? systemPrompt;
         // `any` because pi's BeforeAgentStartEventResult.message uses an internal
         // CustomMessage type that's not re-exported (see ecosystem/gsd-extension-api.ts).
         let lastMessage = gsdResult?.message;

package/dist/resources/extensions/gsd/bootstrap/system-context.js

@@ -8,11 +8,9 @@ import { loadPrompt, getTemplatesDir } from "../prompt-loader.js";
 import { readForensicsMarker } from "../forensics.js";
 import { resolveAllSkillReferences, renderPreferencesForSystemPrompt, loadEffectiveGSDPreferences } from "../preferences.js";
 import { resolveModelWithFallbacksForUnit } from "../preferences-models.js";
-import { resolveSkillReference } from "../preferences-skills.js";
 import { resolveGsdRootFile, resolveSliceFile, resolveSlicePath, resolveTaskFile, resolveTaskFiles, resolveTasksDir, relSliceFile, relSlicePath, relTaskFile } from "../paths.js";
 import { extractIntroAndRules } from "../knowledge-parser.js";
 import { ensureCodebaseMapFresh, readCodebaseMap } from "../codebase-generator.js";
-import { hasSkillSnapshot, detectNewSkills, formatSkillsXml } from "../skill-discovery.js";
 import { getActiveAutoWorktreeContext } from "../auto-worktree.js";
 import { getActiveWorktreeName, getWorktreeOriginalCwd } from "../worktree-session-state.js";
 import { deriveState } from "../state.js";
@@ -66,20 +64,6 @@ export const BUNDLED_SKILL_TRIGGERS = [
     { trigger: "Author a YAML workflow definition — steps, triggers, and templates", skill: "create-workflow" },
     { trigger: "Deep code optimization audit — perf anti-patterns, memory leaks, algorithmic complexity, bundle size, I/O, caching, dead code (parallel pattern-based hunt)", skill: "code-optimizer" },
 ];
-function buildBundledSkillsTable() {
-    const cwd = process.cwd();
-    const rows = [];
-    for (const { trigger, skill } of BUNDLED_SKILL_TRIGGERS) {
-        const resolution = resolveSkillReference(skill, cwd);
-        if (resolution.method === "unresolved")
-            continue; // skill not installed — omit from prompt
-        rows.push(`| ${trigger} | \`${resolution.resolvedPath}\` |`);
-    }
-    if (rows.length === 0) {
-        return "*No bundled skills found. Install or sync skills to `~/.gsd/agent/skills/`, `~/.agents/skills/`, or `~/.claude/skills/`.*";
-    }
-    return `| Trigger | Skill to load |\n|---|---|\n${rows.join("\n")}`;
-}
 function warnDeprecatedAgentInstructions() {
     const paths = [
         join(gsdHome(), "agent-instructions.md"),
@@ -98,7 +82,6 @@ export async function buildBeforeAgentStartResult(event, ctx) {
         return undefined;
     const stopContextTimer = debugTime("context-inject");
     const systemContent = loadPrompt("system", {
-        bundledSkillsTable: buildBundledSkillsTable(),
         templatesDir: getTemplatesDir(),
         shortcutDashboard: formatShortcut("Ctrl+Alt+G"),
         shortcutShell: formatShortcut("Ctrl+Alt+B"),
@@ -125,7 +108,7 @@ export async function buildBeforeAgentStartResult(event, ctx) {
     if (loadedPreferences) {
         const cwd = basePath;
         const report = resolveAllSkillReferences(loadedPreferences.preferences, cwd);
-        preferenceBlock = `\n\n${renderPreferencesForSystemPrompt(loadedPreferences.preferences, report.resolutions)}`;
+        preferenceBlock = `\n\n${renderPreferencesForSystemPrompt(loadedPreferences.preferences, report.resolutions, { includeResolvedPaths: false })}`;
         if (report.warnings.length > 0) {
             ctx.ui.notify(`GSD skill preferences: ${report.warnings.length} unresolved skill${report.warnings.length === 1 ? "" : "s"}: ${report.warnings.join(", ")}`, "warning");
         }
@@ -178,13 +161,6 @@ export async function buildBeforeAgentStartResult(event, ctx) {
     if (globalSizeKb > 4) {
         ctx.ui.notify(`GSD: ~/.gsd/agent/KNOWLEDGE.md is ${globalSizeKb.toFixed(1)}KB — consider trimming to keep system prompt lean.`, "warning");
     }
-    let newSkillsBlock = "";
-    if (hasSkillSnapshot()) {
-        const newSkills = detectNewSkills();
-        if (newSkills.length > 0) {
-            newSkillsBlock = formatSkillsXml(newSkills);
-        }
-    }
     let codebaseBlock = "";
     try {
         const codebaseOptions = loadedPreferences?.preferences?.codebase
@@ -235,12 +211,12 @@ export async function buildBeforeAgentStartResult(event, ctx) {
     // Keeping it out of `fullSystem` preserves provider prompt-cache stability
     // for the static system/tool prefix. The dynamic memory block rides the
     // volatile context message instead. (#5019)
-    const fullSystem = `${event.systemPrompt}\n\n[SYSTEM CONTEXT — GSD]\n\n${systemContent}${preferenceBlock}${knowledgeBlock}${codebaseBlock}${newSkillsBlock}${worktreeBlock}${subagentModelBlock}`;
+    const fullSystem = `${event.systemPrompt}\n\n[SYSTEM CONTEXT — GSD]\n\n${systemContent}${preferenceBlock}${knowledgeBlock}${codebaseBlock}${worktreeBlock}${subagentModelBlock}`;
     stopContextTimer({
         systemPromptSize: fullSystem.length,
         injectionSize: injection?.length ?? forensicsInjection?.length ?? 0,
         hasPreferences: preferenceBlock.length > 0,
-        hasNewSkills: newSkillsBlock.length > 0,
+        hasNewSkills: false,
     });
     const contextMessage = buildContextMessage({ memoryBlock, injection, forensicsInjection });
     return {

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

@@ -167,7 +167,13 @@ export function getCloseoutManualResolveBlocker(basePath) {
     if (conflictProbe.status === "dirty" && conflictProbe.unmerged.length > 0) {
         return `Unmerged paths remain in ${basePath}: ${conflictProbe.unmerged.slice(0, 5).join(", ")}`;
     }
-    const status = runGit(basePath, ["status", "--porcelain"]);
+    let status;
+    try {
+        status = runGit(basePath, ["status", "--porcelain"]);
+    }
+    catch {
+        return `Could not inspect git status in ${basePath}.`;
+    }
     if (status) {
         return `Working tree still has uncommitted changes in ${basePath}. Commit, stash, or run /gsd closeout retry first.`;
     }

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

@@ -197,7 +197,15 @@ export async function handleAutoCommand(trimmed, ctx, pi) {
     if (trimmed === "") {
         if (!(await guardRemoteSession(ctx, pi)))
             return true;
-        if (await hasUnresolvedCloseoutBlocker(ctx, projectRoot()))
+        const basePath = projectRoot();
+        const { hasGsdBootstrapArtifacts } = await import("../../detection.js");
+        const { gsdRoot } = await import("../../paths.js");
+        if (!hasGsdBootstrapArtifacts(gsdRoot(basePath))) {
+            const { showSmartEntry } = await import("../../guided-flow.js");
+            await showSmartEntry(ctx, pi, basePath, { step: true });
+            return true;
+        }
+        if (await hasUnresolvedCloseoutBlocker(ctx, basePath))
             return true;
         const { showGsdHome } = await import("../../gsd-command-home.js");
         await showGsdHome(ctx, pi, projectRoot());

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) {