@opengsd/gsd-pi 1.0.2-dev.5961fbf → 1.0.2-dev.5f7864c

package/dist/resources/extensions/gsd/tools/workflow-tool-executors.js

@@ -238,6 +238,24 @@ export async function executeSummarySave(params, basePath = process.cwd()) {
         };
     }
 }
+function normalizeVerificationEvidence(evidence) {
+    return (evidence ?? []).map((entry) => typeof entry === "string"
+        ? { command: entry, exitCode: -1, verdict: "unknown (coerced from string)", durationMs: 0 }
+        : entry);
+}
+function deriveVerificationSummary(evidence) {
+    if (evidence.length === 0)
+        return null;
+    const rendered = evidence.slice(0, 3).map((entry) => {
+        const command = entry.command.trim() || "(unspecified command)";
+        const verdict = entry.verdict.trim() || "recorded";
+        return `\`${command}\` exited ${entry.exitCode} (${verdict})`;
+    });
+    const suffix = evidence.length > rendered.length
+        ? `; ${evidence.length - rendered.length} more check(s) recorded`
+        : "";
+    return `Verification evidence recorded: ${rendered.join("; ")}${suffix}.`;
+}
 export async function executeTaskComplete(params, basePath = process.cwd()) {
     const dbAvailable = await ensureDbOpen(basePath);
     if (!dbAvailable) {
@@ -249,7 +267,28 @@ export async function executeTaskComplete(params, basePath = process.cwd()) {
     }
     try {
         const coerced = { ...params };
-        coerced.verificationEvidence = (params.verificationEvidence ?? []).map((v) => typeof v === "string" ? { command: v, exitCode: -1, verdict: "unknown (coerced from string)", durationMs: 0 } : v);
+        const verificationEvidence = normalizeVerificationEvidence(params.verificationEvidence);
+        coerced.verificationEvidence = verificationEvidence;
+        const verification = typeof params.verification === "string" ? params.verification.trim() : "";
+        if (verification.length === 0) {
+            const derived = deriveVerificationSummary(verificationEvidence);
+            if (derived) {
+                coerced.verification = derived;
+            }
+            else if (params.blockerDiscovered === true) {
+                coerced.verification = "Not run: blocker discovered before verification.";
+            }
+            else {
+                return {
+                    content: [{
+                            type: "text",
+                            text: "Error completing task: verification is required unless verificationEvidence is provided or blockerDiscovered is true.",
+                        }],
+                    details: { operation: "complete_task", error: "verification_required" },
+                    isError: true,
+                };
+            }
+        }
         const result = await handleCompleteTask(coerced, basePath);
         if ("error" in result) {
             return {

package/dist/resources/extensions/gsd/tui/render-kit.js

@@ -105,3 +105,54 @@ export function renderFrame(theme, inner, width, options = {}) {
     lines.push(border("╰" + "─".repeat(width - 2) + "╯"));
     return lines.map((line) => safeLine(line, width, ""));
 }
+function renderTitledTopBorder(theme, title, width, border) {
+    const trimmedTitle = title.trim();
+    if (!trimmedTitle || width < 10) {
+        return border("╭" + "─".repeat(width - 2) + "╮");
+    }
+    const maxTitleWidth = Math.max(0, width - 7);
+    const safeTitle = safeLine(trimmedTitle, maxTitleWidth);
+    const fill = Math.max(0, width - visibleWidth(safeTitle) - 5);
+    return border("╭─ ") + theme.bold(theme.fg("accent", safeTitle)) + border(" " + "─".repeat(fill) + "╮");
+}
+export function renderDialogFrame(theme, title, inner, width, options = {}) {
+    if (width < 4)
+        return inner.map((line) => safeLine(line, width));
+    const borderColor = options.borderColor ?? "borderAccent";
+    const paddingX = Math.max(0, options.paddingX ?? 1);
+    const contentWidth = Math.max(0, width - 2 - paddingX * 2);
+    const border = (text) => theme.fg(borderColor, text);
+    const pad = " ".repeat(paddingX);
+    const lines = [renderTitledTopBorder(theme, title, width, border)];
+    const scroll = options.scroll;
+    const bodyRows = inner.length;
+    const trackOffset = Math.max(0, Math.min(scroll?.trackOffset ?? 0, bodyRows));
+    const trackRows = Math.max(0, Math.min(scroll?.trackRows ?? bodyRows, bodyRows - trackOffset));
+    const scrollable = !!scroll && scroll.totalRows > scroll.visibleRows && trackRows > 0;
+    const thumbLen = scrollable
+        ? Math.max(1, Math.round((scroll.visibleRows / scroll.totalRows) * trackRows))
+        : 0;
+    const maxThumbStart = Math.max(0, trackRows - thumbLen);
+    const maxScrollOffset = scrollable ? Math.max(1, scroll.totalRows - scroll.visibleRows) : 1;
+    const thumbStart = scrollable
+        ? trackOffset + Math.min(maxThumbStart, Math.round((scroll.offset / maxScrollOffset) * maxThumbStart))
+        : -1;
+    for (let i = 0; i < inner.length; i++) {
+        const line = inner[i] ?? "";
+        const rightBorder = scrollable && i >= thumbStart && i < thumbStart + thumbLen ? "┃" : "│";
+        lines.push(border("│") + pad + padRightVisible(line, contentWidth) + pad + border(rightBorder));
+    }
+    const footer = Array.isArray(options.footer)
+        ? options.footer
+        : options.footer
+            ? [options.footer]
+            : [];
+    if (footer.length > 0) {
+        lines.push(border("├" + "─".repeat(width - 2) + "┤"));
+        for (const line of footer) {
+            lines.push(border("│") + pad + padRightVisible(line, contentWidth) + pad + border("│"));
+        }
+    }
+    lines.push(border("╰" + "─".repeat(width - 2) + "╯"));
+    return lines.map((line) => safeLine(line, width, ""));
+}

package/dist/resources/extensions/gsd/vision-ask.js

@@ -0,0 +1,22 @@
+/**
+ * Natural-language openers for milestone discussion.
+ *
+ * Keep these short and conversational. They are often the user's first prompt
+ * when GSD starts shaping a project or milestone, so they should feel like a
+ * collaborator starting a working session rather than a form field.
+ */
+import { randomInt } from "node:crypto";
+export const VISION_ASK_VARIANTS = [
+    "What are we building?",
+    "What do you want to make next?",
+    "What should this become?",
+    "What are you picturing?",
+    "Where should we take this?",
+    "What should this milestone unlock?",
+    "Tell me what you want to build.",
+    "What should GSD help you shape?",
+];
+export function chooseVisionAskVariant(pickIndex = randomInt) {
+    const index = pickIndex(VISION_ASK_VARIANTS.length);
+    return VISION_ASK_VARIANTS[index] ?? VISION_ASK_VARIANTS[0];
+}

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

@@ -1,4 +1,4 @@
-import { truncateToWidth, visibleWidth, matchesKey, Key } from "@gsd/pi-tui";
+import { visibleWidth, matchesKey, Key } from "@gsd/pi-tui";
 import { loadVisualizerData } from "./visualizer-data.js";
 import { renderProgressView, renderDepsView, renderMetricsView, renderTimelineView, renderAgentView, renderChangelogView, renderExportView, renderKnowledgeView, renderCapturesView, renderHealthView, } from "./visualizer-views.js";
 import { writeFileSync, mkdirSync } from "node:fs";
@@ -6,6 +6,7 @@ import { join } from "node:path";
 import { writeExportFile } from "./export.js";
 import { gsdRoot } from "./paths.js";
 import { stripAnsi } from "../shared/mod.js";
+import { renderDialogFrame, renderKeyHints } from "./tui/render-kit.js";
 export const TAB_COUNT = 10;
 const TAB_LABELS = [
     "1 Progress",
@@ -440,51 +441,22 @@ export class GSDVisualizerOverlay {
         }
         // Apply scroll
         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);
         this.lastVisibleRows = visibleContentRows;
         const totalLines = content.length;
         const maxScroll = Math.max(0, content.length - visibleContentRows);
         this.scrollOffsets[this.activeTab] = Math.min(this.scrollOffsets[this.activeTab], maxScroll);
         const offset = this.scrollOffsets[this.activeTab];
         const visibleContent = content.slice(offset, offset + visibleContentRows);
-        const lines = this.wrapInBox(visibleContent, width, offset, visibleContentRows, totalLines);
-        // Footer hint
-        const hint = th.fg("dim", "Tab/Shift+Tab/1-9,0 switch \u00b7 / filter \u00b7 PgUp/PgDn scroll \u00b7 ? help \u00b7 esc close");
-        const hintVis = visibleWidth(hint);
-        const hintPad = Math.max(0, Math.floor((width - hintVis) / 2));
-        lines.push(" ".repeat(hintPad) + hint);
+        const footer = renderKeyHints(th, ["Tab/Shift+Tab/1-9,0 switch", "/ filter", "PgUp/PgDn scroll", "? help", "esc close"], Math.max(1, width - 4));
+        const lines = renderDialogFrame(th, "GSD Visualizer", visibleContent, width, {
+            footer,
+            scroll: { offset, visibleRows: visibleContentRows, totalRows: totalLines },
+        });
         this.cachedWidth = width;
         this.cachedLines = lines;
         return lines;
     }
-    wrapInBox(inner, width, offset, visibleRows, totalLines) {
-        const th = this.theme;
-        const border = (s) => th.fg("borderAccent", s);
-        const innerWidth = width - 4;
-        const lines = [];
-        lines.push(border("\u256d" + "\u2500".repeat(width - 2) + "\u256e"));
-        // Compute scroll indicator positions
-        const scrollable = totalLines !== undefined && visibleRows !== undefined && totalLines > visibleRows;
-        let thumbStart = -1;
-        let thumbLen = 0;
-        const innerRows = inner.length;
-        if (scrollable && innerRows > 0 && totalLines > 0) {
-            thumbStart = Math.round(((offset ?? 0) / totalLines) * innerRows);
-            thumbLen = Math.max(1, Math.round((visibleRows / totalLines) * innerRows));
-        }
-        for (let i = 0; i < inner.length; i++) {
-            const line = inner[i];
-            const truncated = truncateToWidth(line, innerWidth);
-            const padWidth = Math.max(0, innerWidth - visibleWidth(truncated));
-            const rightBorder = scrollable && i >= thumbStart && i < thumbStart + thumbLen
-                ? border("\u2503")
-                : border("\u2502");
-            lines.push(border("\u2502") + " " + truncated + " ".repeat(padWidth) + " " + rightBorder);
-        }
-        lines.push(border("\u2570" + "\u2500".repeat(width - 2) + "\u256f"));
-        return lines;
-    }
     invalidate() {
         this.cachedWidth = undefined;
         this.cachedLines = undefined;

package/dist/resources/extensions/gsd/worktree-lifecycle.js

@@ -203,7 +203,7 @@ function validateMilestoneId(milestoneId) {
  *   - emits worktree-created telemetry on successful entry
  *   - notifies the caller via `ctx.notify` for every user-visible outcome
  */
-export function _enterMilestoneCore(s, deps, milestoneId, ctx) {
+export function _enterMilestoneCore(s, deps, milestoneId, ctx, opts = {}) {
     if (!isValidMilestoneId(milestoneId)) {
         debugLog("WorktreeLifecycle", {
             action: "enterMilestone",
@@ -305,7 +305,7 @@ export function _enterMilestoneCore(s, deps, milestoneId, ctx) {
     // Handles the case where originalBasePath is falsy and basePath is itself
     // a worktree path — prevents double-nested worktree paths (#3729).
     const basePath = resolveWorktreeProjectRoot(s.basePath, s.originalBasePath);
-    const mode = getIsolationMode(basePath);
+    const mode = opts.modeOverride ?? getIsolationMode(basePath);
     if (s.isolationDegraded) {
         if (mode === "worktree") {
             try {
@@ -841,7 +841,8 @@ export function mergeMilestoneStandalone(deps, mctx) {
             pushed: false,
         };
     }
-    const mode = getIsolationMode(originalBasePath || worktreeBasePath);
+    const mode = mctx.isolationModeOverride ??
+        getIsolationMode(originalBasePath || worktreeBasePath);
     debugLog("WorktreeLifecycle", {
         action: "mergeAndExit",
         milestoneId,
@@ -1137,6 +1138,7 @@ export class WorktreeLifecycle {
                 originalBasePath: this.s.originalBasePath,
                 worktreeBasePath: this.s.basePath,
                 milestoneId,
+                isolationModeOverride: this.s.strandedRecoveryIsolationMode ?? undefined,
                 isolationDegraded: this.s.isolationDegraded,
                 notify: ctx.notify,
             });
@@ -1223,6 +1225,7 @@ export class WorktreeLifecycle {
             // Rebuild GitService after merge (branch HEAD changed)
             rebuildGitService(this.s, this.deps);
         }
+        this.s.strandedRecoveryIsolationMode = null;
         return result;
     }
     // ── Removed: _mergeWorktreeMode / _mergeBranchMode bodies ────────────
@@ -1345,6 +1348,24 @@ export class WorktreeLifecycle {
     resumeFromPausedSession(base, persistedWorktreePath) {
         this.s.basePath = resolvePausedResumeBasePath(base, persistedWorktreePath);
     }
+    /**
+     * Adopt in-progress stranded work during bootstrap.
+     *
+     * Unlike completed-orphan recovery, this does not merge, delete, or commit.
+     * It only moves the live session onto the branch/worktree proven by the
+     * audit evidence, while preserving that mode for the eventual merge.
+     */
+    adoptStrandedMilestone(milestoneId, base, ctx, opts) {
+        this.adoptSessionRoot(base);
+        this.s.strandedRecoveryIsolationMode = opts.mode;
+        const result = _enterMilestoneCore(this.s, this.deps, milestoneId, ctx, {
+            modeOverride: opts.mode,
+        });
+        if (!result.ok) {
+            this.s.strandedRecoveryIsolationMode = null;
+        }
+        return result;
+    }
     /**
      * Adopt an orphan worktree for a bootstrap-time merge (ADR-016 phase 2 / B4,
      * issue #5622).

package/dist/resources/extensions/search-the-web/native-search.js

@@ -12,6 +12,45 @@ export const BRAVE_TOOL_NAMES = ["search-the-web", "search_and_read"];
 export const CUSTOM_SEARCH_TOOL_NAMES = ["search-the-web", "search_and_read", "google_search"];
 /** Thinking block types that require signature validation by the API */
 const THINKING_TYPES = new Set(["thinking", "redacted_thinking"]);
+const NATIVE_SERVER_TOOL_USE_TYPES = new Set([
+    "server_tool_use",
+    "serverToolUse",
+]);
+const NATIVE_WEB_SEARCH_RESULT_TYPES = new Set([
+    "web_search_tool_result",
+    "webSearchResult",
+]);
+function nativeServerToolId(block) {
+    if (!NATIVE_SERVER_TOOL_USE_TYPES.has(block?.type))
+        return undefined;
+    return typeof block.id === "string" ? block.id : undefined;
+}
+function nativeWebSearchResultId(block) {
+    if (!NATIVE_WEB_SEARCH_RESULT_TYPES.has(block?.type))
+        return undefined;
+    const id = block.type === "webSearchResult" ? block.toolUseId : block.tool_use_id;
+    return typeof id === "string" ? id : undefined;
+}
+function hasCompleteNativeServerToolReplay(content) {
+    const pendingToolUseIds = new Set();
+    let sawNativeServerToolUse = false;
+    for (const block of content) {
+        const toolUseId = nativeServerToolId(block);
+        if (toolUseId !== undefined) {
+            if (pendingToolUseIds.has(toolUseId))
+                return false;
+            sawNativeServerToolUse = true;
+            pendingToolUseIds.add(toolUseId);
+            continue;
+        }
+        const resultId = nativeWebSearchResultId(block);
+        if (resultId !== undefined) {
+            if (!pendingToolUseIds.delete(resultId))
+                return false;
+        }
+    }
+    return sawNativeServerToolUse && pendingToolUseIds.size === 0;
+}
 /**
  * Providers whose Anthropic-Messages endpoint is known to accept the native
  * `web_search_20250305` server tool. Anthropic-shaped transports NOT in this
@@ -30,6 +69,10 @@ const NATIVE_WEB_SEARCH_PROVIDERS = new Set([
     "anthropic-vertex",
     "vercel-ai-gateway",
 ]);
+function looksLikeAnthropicModelName(modelName) {
+    const normalized = modelName.trim().toLowerCase();
+    return normalized.startsWith("claude-") || normalized.startsWith("anthropic/claude-");
+}
 /**
  * True when the model is an Anthropic-shaped transport AND the provider is
  * known to accept the native `web_search_20250305` tool. Gate both on api
@@ -74,11 +117,10 @@ export function preferBraveSearch() {
  * those blocks. The Anthropic API detects the modification and rejects the
  * request with "thinking blocks cannot be modified."
  *
- * Fix: Remove thinking blocks from all assistant messages in the history.
- * In Anthropic's Messages API, the messages array always ends with a user
- * message, so every assistant message is from a previous turn that has been
- * through a store/replay cycle. The model generates fresh thinking for the
- * current turn regardless.
+ * Fix: Remove thinking blocks only from assistant messages that do not carry
+ * native server-tool blocks. Complete native server-tool histories can be
+ * replayed as-is; stripping thinking from those messages is itself a latest
+ * assistant message modification.
  */
 export function stripThinkingFromHistory(messages) {
     for (const msg of messages) {
@@ -87,6 +129,9 @@ export function stripThinkingFromHistory(messages) {
         const content = msg.content;
         if (!Array.isArray(content))
             continue;
+        if (hasCompleteNativeServerToolReplay(content)) {
+            continue;
+        }
         msg.content = content.filter((block) => !THINKING_TYPES.has(block?.type));
     }
 }
@@ -152,6 +197,8 @@ export function registerNativeSearchHooks(pi) {
         // The model name heuristic is needed for session restores where
         // modelsAreEqual suppresses model_select AND the SDK doesn't pass model.
         const eventModel = event.model;
+        const payloadModelName = typeof payload.model === "string" ? payload.model : "";
+        const payloadLooksAnthropic = payloadModelName ? looksLikeAnthropicModelName(payloadModelName) : undefined;
         let isAnthropic;
         if (eventModel?.api || eventModel?.provider) {
             // Preferred path: gate on api shape + provider allowlist. Both fields
@@ -161,13 +208,15 @@ export function registerNativeSearchHooks(pi) {
             isAnthropic = supportsNativeWebSearch(eventModel);
         }
         else if (modelSelectFired) {
-            isAnthropic = isAnthropicProvider;
+            // The model_select flag can be stale if the next request omits event.model
+            // after a provider switch. A concrete non-Claude payload must win so an
+            // Anthropic-only tool never leaks into OpenAI Responses requests.
+            isAnthropic = isAnthropicProvider && payloadLooksAnthropic !== false;
         }
         else {
             // Last resort: session-restore paths where the SDK doesn't pass model.
             // The model-name prefix is best-effort and assumes direct Anthropic.
-            const modelName = typeof payload.model === "string" ? payload.model : "";
-            isAnthropic = modelName.startsWith("claude-");
+            isAnthropic = payloadLooksAnthropic === true;
         }
         if (!isAnthropic)
             return;

package/dist/resources/extensions/shared/confirm-ui.js

@@ -15,6 +15,7 @@
  *   if (!confirmed) return textResult("Cancelled.");
  */
 import { Key, matchesKey, truncateToWidth } from "@gsd/pi-tui";
+import { renderSharedDialogFrame } from "./dialog-frame.js";
 import { makeUI, GLYPH } from "./ui.js";
 /**
  * Show a themed yes/no confirmation dialog.
@@ -69,12 +70,13 @@ export async function showConfirm(ctx, opts) {
         function render(width) {
             if (cachedLines)
                 return cachedLines;
-            const ui = makeUI(theme, width);
+            const contentWidth = Math.max(1, width - 4);
+            const ui = makeUI(theme, contentWidth);
             const lines = [];
             const push = (...rows) => { for (const r of rows)
                 lines.push(...r); };
-            push(ui.bar(), ui.blank(), ui.header(`  ${opts.title}`), ui.blank(), ui.subtitle(`  ${opts.message}`), ui.blank());
-            const add = (s) => truncateToWidth(s, width);
+            push(ui.blank(), ui.subtitle(`  ${opts.message}`), ui.blank());
+            const add = (s) => truncateToWidth(s, contentWidth);
             const option = (num, label, selected) => {
                 if (selected) {
                     return add(`  ${theme.fg("accent", GLYPH.cursor)} ${theme.fg("accent", `${num}. ${label}`)}`);
@@ -83,9 +85,10 @@ export async function showConfirm(ctx, opts) {
             };
             lines.push(option(1, yesLabel, cursor === 0));
             lines.push(option(2, noLabel, cursor === 1));
-            push(ui.blank(), ui.hints(["↑/↓ to choose", "y/n to quick-select", "enter to confirm"]), ui.bar());
-            cachedLines = lines;
-            return lines;
+            push(ui.blank());
+            const footer = ui.hints(["↑/↓ to choose", "y/n to quick-select", "enter to confirm"])[0] ?? "";
+            cachedLines = renderSharedDialogFrame(theme, opts.title, lines, width, { footer });
+            return cachedLines;
         }
         return {
             render,

package/dist/resources/extensions/shared/dialog-frame.js

@@ -0,0 +1,42 @@
+import { truncateToWidth, visibleWidth } from "@gsd/pi-tui";
+function safeLine(text, width) {
+    return truncateToWidth(text, width, "");
+}
+function padVisible(text, width) {
+    const clipped = safeLine(text, width);
+    return clipped + " ".repeat(Math.max(0, width - visibleWidth(clipped)));
+}
+function renderTopBorder(theme, title, width, border) {
+    const trimmedTitle = title.trim();
+    if (!trimmedTitle || width < 10) {
+        return border("╭" + "─".repeat(width - 2) + "╮");
+    }
+    const safeTitle = safeLine(trimmedTitle, Math.max(0, width - 7));
+    const fill = Math.max(0, width - visibleWidth(safeTitle) - 5);
+    return border("╭─ ") + theme.bold(theme.fg("accent", safeTitle)) + border(" " + "─".repeat(fill) + "╮");
+}
+export function renderSharedDialogFrame(theme, title, inner, width, options = {}) {
+    if (width < 4)
+        return inner.map((line) => safeLine(line, width));
+    const paddingX = Math.max(0, options.paddingX ?? 1);
+    const contentWidth = Math.max(0, width - 2 - paddingX * 2);
+    const border = (text) => theme.fg(options.borderColor ?? "borderAccent", text);
+    const pad = " ".repeat(paddingX);
+    const lines = [renderTopBorder(theme, title, width, border)];
+    for (const line of inner) {
+        lines.push(border("│") + pad + padVisible(line, contentWidth) + pad + border("│"));
+    }
+    const footer = Array.isArray(options.footer)
+        ? options.footer
+        : options.footer
+            ? [options.footer]
+            : [];
+    if (footer.length > 0) {
+        lines.push(border("├" + "─".repeat(width - 2) + "┤"));
+        for (const line of footer) {
+            lines.push(border("│") + pad + padVisible(line, contentWidth) + pad + border("│"));
+        }
+    }
+    lines.push(border("╰" + "─".repeat(width - 2) + "╯"));
+    return lines;
+}

package/dist/resources/extensions/shared/interview-ui.js

@@ -27,6 +27,7 @@
  */
 import { getMarkdownTheme } from "@gsd/pi-coding-agent";
 import { Editor, Key, Markdown, matchesKey, truncateToWidth, } from "@gsd/pi-tui";
+import { renderSharedDialogFrame } from "./dialog-frame.js";
 import { mergeSideBySide } from "./layout-utils.js";
 import { makeUI, INDENT } from "./ui.js";
 // ─── Constants ────────────────────────────────────────────────────────────────
@@ -39,6 +40,9 @@ const PREVIEW_RATIO = 0.60; // preview gets the majority of the width
 const DIVIDER_CHARS = " │ ";
 const DIVIDER_WIDTH = 3;
 const PREVIEW_MAX_LINES = 20; // hard cap — keeps total ≤ 24 rows for single-question
+function dialogContentWidth(width) {
+    return width < 4 ? Math.max(1, width) : Math.max(1, width - 4);
+}
 // ─── Wrap-up screen ───────────────────────────────────────────────────────────
 export async function showWrapUpScreen(opts, ctx) {
     return ctx.ui.custom((tui, theme, _kb, done) => {
@@ -81,11 +85,12 @@ export async function showWrapUpScreen(opts, ctx) {
         function render(width) {
             if (cachedLines)
                 return cachedLines;
-            const ui = makeUI(theme, width);
+            const contentWidth = dialogContentWidth(width);
+            const ui = makeUI(theme, contentWidth);
             const lines = [];
             const push = (...rows) => { for (const r of rows)
                 lines.push(...r); };
-            push(ui.bar(), ui.blank(), ui.header(`  ${opts.headline}`), ui.blank());
+            push(ui.blank());
             if (opts.progress)
                 push(ui.meta(`  ${opts.progress}`), ui.blank());
             if (cursorIdx === 1) {
@@ -101,9 +106,10 @@ export async function showWrapUpScreen(opts, ctx) {
             else {
                 push(ui.actionUnselected(2, opts.keepGoingLabel, "Continue with another batch of questions."));
             }
-            push(ui.blank(), ui.hints(["↑/↓ to choose", "1/2 to quick-select", "enter to confirm"]), ui.bar());
-            cachedLines = lines;
-            return lines;
+            push(ui.blank());
+            const footer = ui.hints(["↑/↓ to choose", "1/2 to quick-select", "enter to confirm"])[0] ?? "";
+            cachedLines = renderSharedDialogFrame(theme, opts.headline, lines, width, { footer });
+            return cachedLines;
         }
         return {
             render,
@@ -427,11 +433,13 @@ export async function showInterviewRound(questions, opts, ctx) {
         }
         // ── Review screen ────────────────────────────────────────────────
         function renderReviewScreen(width) {
-            const ui = makeUI(theme, width);
+            const contentWidth = dialogContentWidth(width);
+            const title = opts.reviewHeadline ?? "Review your answers";
+            const ui = makeUI(theme, contentWidth);
             const lines = [];
             const push = (...rows) => { for (const r of rows)
                 lines.push(...r); };
-            push(ui.bar(), ui.blank(), ui.header(`  ${opts.reviewHeadline ?? "Review your answers"}`), ui.blank());
+            push(ui.blank());
             for (let i = 0; i < questions.length; i++) {
                 const q = questions[i];
                 const st = states[i];
@@ -453,16 +461,19 @@ export async function showInterviewRound(questions, opts, ctx) {
                     push(ui.note(`${INDENT.note}note: ${st.notes}`));
                 push(ui.blank());
             }
-            push(ui.actionSelected(0, "Submit answers"), ui.blank(), ui.hints(["← to go back and edit", "enter to submit", `esc to ${opts.exitLabel ?? "end interview"}`]), ui.bar());
-            return lines;
+            push(ui.actionSelected(0, "Submit answers"), ui.blank());
+            const footer = ui.hints(["← to go back and edit", "enter to submit", `esc to ${opts.exitLabel ?? "end interview"}`])[0] ?? "";
+            return renderSharedDialogFrame(theme, title, lines, width, { footer });
         }
         // ── Exit confirm screen ──────────────────────────────────────────
         function renderExitConfirm(width) {
-            const ui = makeUI(theme, width);
+            const contentWidth = dialogContentWidth(width);
+            const title = opts.exitHeadline ?? "End interview?";
+            const ui = makeUI(theme, contentWidth);
             const lines = [];
             const push = (...rows) => { for (const r of rows)
                 lines.push(...r); };
-            push(ui.bar(), ui.blank(), ui.header(`  ${opts.exitHeadline ?? "End interview?"}`), ui.blank(), ui.subtitle("  Answers from this batch won't be saved."), ui.blank());
+            push(ui.blank(), ui.subtitle("  Answers from this batch won't be saved."), ui.blank());
             const keepGoingLabel = "Keep going";
             const exitActionLabel = opts.exitLabel
                 ? opts.exitLabel.charAt(0).toUpperCase() + opts.exitLabel.slice(1)
@@ -480,8 +491,9 @@ export async function showInterviewRound(questions, opts, ctx) {
             else {
                 push(ui.actionUnselected(2, exitActionLabel, "Exit and discard this batch of answers."));
             }
-            push(ui.blank(), ui.hints(["↑/↓ to choose", "1/2 to quick-select", "enter to confirm"]), ui.bar());
-            return lines;
+            push(ui.blank());
+            const footer = ui.hints(["↑/↓ to choose", "1/2 to quick-select", "enter to confirm"])[0] ?? "";
+            return renderSharedDialogFrame(theme, title, lines, width, { footer });
         }
         // ── Preview helpers ──────────────────────────────────────────────
         let mdThemeCache = null;
@@ -587,15 +599,16 @@ export async function showInterviewRound(questions, opts, ctx) {
                 cachedLines = renderReviewScreen(width);
                 return cachedLines;
             }
+            const contentWidth = dialogContentWidth(width);
+            const title = questions[currentIdx]?.header || "GSD Interview";
             const useSideBySide = questionHasAnyPreview()
-                && width >= (MIN_OPTIONS_WIDTH + MIN_PREVIEW_WIDTH + DIVIDER_WIDTH);
+                && contentWidth >= (MIN_OPTIONS_WIDTH + MIN_PREVIEW_WIDTH + DIVIDER_WIDTH);
             if (useSideBySide) {
                 // ── Preview path ──────────────────────────────────────
-                const ui = makeUI(theme, width);
+                const ui = makeUI(theme, contentWidth);
                 const lines = [];
                 const push = (...rows) => { for (const r of rows)
                     lines.push(...r); };
-                push(ui.bar());
                 if (isMultiQuestion) {
                     const unanswered = questions.filter((_, i) => !isQuestionAnswered(i)).length;
                     const answeredSet = new Set(questions.map((_, i) => i).filter(i => isQuestionAnswered(i)));
@@ -619,11 +632,11 @@ export async function showInterviewRound(questions, opts, ctx) {
                 // component: spinner/loader (1-2), status line (1), tool header (1),
                 // plus a safety margin for future additions.
                 const termRows = (typeof process !== "undefined" && process.stdout?.rows) || 24;
-                const footerLines = 3; // blank + hints + bar
+                const footerLines = 5; // body spacer + frame top/footer/bottom chrome
                 const tuiChrome = 5;
                 const maxBody = Math.min(PREVIEW_MAX_LINES, Math.max(6, termRows - lines.length - footerLines - tuiChrome));
-                const previewWidth = Math.max(MIN_PREVIEW_WIDTH, Math.floor(width * PREVIEW_RATIO));
-                const leftWidth = Math.max(MIN_OPTIONS_WIDTH, width - previewWidth - DIVIDER_WIDTH);
+                const previewWidth = Math.max(MIN_PREVIEW_WIDTH, Math.min(contentWidth - MIN_OPTIONS_WIDTH - DIVIDER_WIDTH, Math.floor(contentWidth * PREVIEW_RATIO)));
+                const leftWidth = Math.max(MIN_OPTIONS_WIDTH, contentWidth - previewWidth - DIVIDER_WIDTH);
                 const fullLeft = renderOptionsColumn(leftWidth);
                 const leftLines = fullLeft.slice(0, maxBody);
                 if (fullLeft.length > maxBody) {
@@ -646,7 +659,7 @@ export async function showInterviewRound(questions, opts, ctx) {
                 while (rightLines.length < maxBody)
                     rightLines.push("");
                 const divider = theme.fg("dim", DIVIDER_CHARS);
-                lines.push(...mergeSideBySide(leftLines, rightLines, leftWidth, divider, width));
+                lines.push(...mergeSideBySide(leftLines, rightLines, leftWidth, divider, contentWidth));
                 // Footer
                 push(ui.blank());
                 const isLast = !isMultiQuestion || currentIdx === questions.length - 1;
@@ -669,19 +682,18 @@ export async function showInterviewRound(questions, opts, ctx) {
                     hints.push(isLast && allAnswered() ? "enter to review" : "enter to next");
                 }
                 hints.push("esc to exit");
-                push(ui.hints(hints), ui.bar());
-                cachedLines = lines;
-                return lines;
+                const footer = ui.hints(hints)[0] ?? "";
+                cachedLines = renderSharedDialogFrame(theme, title, lines, width, { footer });
+                return cachedLines;
             }
             // ── Original path — no preview, untouched ────────────────
-            const ui = makeUI(theme, width);
+            const ui = makeUI(theme, contentWidth);
             const lines = [];
             const push = (...rows) => { for (const r of rows)
                 lines.push(...r); };
             const q = questions[currentIdx];
             const st = states[currentIdx];
             const multiSel = isMultiSelect(currentIdx);
-            push(ui.bar());
             // ── Progress header ────────────────────────────────────────────
             if (isMultiQuestion) {
                 const unanswered = questions.filter((_, i) => !isQuestionAnswered(i)).length;
@@ -750,8 +762,8 @@ export async function showInterviewRound(questions, opts, ctx) {
             if (st.notesVisible || focusNotes) {
                 push(ui.blank(), ui.notesLabel(focusNotes));
                 if (focusNotes) {
-                    for (const line of getEditor().render(width - 2))
-                        lines.push(truncateToWidth(` ${line}`, width));
+                    for (const line of getEditor().render(contentWidth - 2))
+                        lines.push(truncateToWidth(` ${line}`, contentWidth));
                 }
                 else if (st.notes) {
                     push(ui.notesText(st.notes));
@@ -779,9 +791,9 @@ export async function showInterviewRound(questions, opts, ctx) {
                 hints.push(isLast && allAnswered() ? "enter to review" : "enter to next");
             }
             hints.push("esc to exit");
-            push(ui.hints(hints), ui.bar());
-            cachedLines = lines;
-            return lines;
+            const footer = ui.hints(hints)[0] ?? "";
+            cachedLines = renderSharedDialogFrame(theme, title, lines, width, { footer });
+            return cachedLines;
         }
         return {
             render,