@opengsd/gsd-pi 1.8.1 → 1.9.0-dev.97ef11e3

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

@@ -18,6 +18,8 @@ import { handleCompleteSlice } from "./complete-slice.js";
 import { handlePlanMilestone } from "./plan-milestone.js";
 import { handlePlanSlice } from "./plan-slice.js";
 import { handleReplanSlice } from "./replan-slice.js";
+import { handleReplanTask } from "./replan-task.js";
+import { handleReworkBriefSave } from "./rework-brief.js";
 import { handleReopenMilestone } from "./reopen-milestone.js";
 import { handleReopenSlice } from "./reopen-slice.js";
 import { handleReopenTask } from "./reopen-task.js";
@@ -1277,6 +1279,85 @@ export async function executePlanSlice(params, basePath = process.cwd()) {
         };
     }
 }
+export async function executeReplanTask(params, basePath = process.cwd()) {
+    const dbAvailable = await ensureDbOpen(basePath);
+    if (!dbAvailable) {
+        return {
+            content: [{ type: "text", text: "Error: GSD database is not available. Cannot replan task." }],
+            details: { operation: "replan_task", error: "db_unavailable" },
+            isError: true,
+        };
+    }
+    try {
+        const result = await handleReplanTask(params, basePath);
+        if ("error" in result) {
+            return {
+                content: [{ type: "text", text: `Error replanning task: ${result.error}` }],
+                details: { operation: "replan_task", error: result.error },
+                isError: true,
+            };
+        }
+        return {
+            content: [{ type: "text", text: `Replanned task ${result.taskId} (${result.sliceId}/${result.milestoneId})` }],
+            details: {
+                operation: "replan_task",
+                milestoneId: result.milestoneId,
+                sliceId: result.sliceId,
+                taskId: result.taskId,
+                taskPlanPath: result.taskPlanPath,
+            },
+        };
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        logError("tool", `replan_task tool failed: ${msg}`, { tool: "gsd_replan_task", error: String(err) });
+        return {
+            content: [{ type: "text", text: `Error replanning task: ${msg}` }],
+            details: { operation: "replan_task", error: msg },
+            isError: true,
+        };
+    }
+}
+export async function executeReworkBriefSave(params, basePath = process.cwd()) {
+    const dbAvailable = await ensureDbOpen(basePath);
+    if (!dbAvailable) {
+        return {
+            content: [{ type: "text", text: "Error: GSD database is not available. Cannot save rework brief." }],
+            details: { operation: "rework_brief_save", error: "db_unavailable" },
+            isError: true,
+        };
+    }
+    try {
+        const result = await handleReworkBriefSave(params);
+        if ("error" in result) {
+            return {
+                content: [{ type: "text", text: `Error saving rework brief: ${result.error}` }],
+                details: { operation: "rework_brief_save", error: result.error },
+                isError: true,
+            };
+        }
+        return {
+            content: [{ type: "text", text: `Saved rework brief ${result.briefId} with ${result.findingCount} finding(s)` }],
+            details: {
+                operation: "rework_brief_save",
+                briefId: result.briefId,
+                milestoneId: result.milestoneId,
+                sliceId: result.sliceId,
+                taskId: result.taskId,
+                findingCount: result.findingCount,
+            },
+        };
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        logError("tool", `rework_brief_save tool failed: ${msg}`, { tool: "gsd_rework_brief_save", error: String(err) });
+        return {
+            content: [{ type: "text", text: `Error saving rework brief: ${msg}` }],
+            details: { operation: "rework_brief_save", error: msg },
+            isError: true,
+        };
+    }
+}
 export async function executeReplanSlice(params, basePath = process.cwd()) {
     const dbAvailable = await ensureDbOpen(basePath);
     if (!dbAvailable) {

package/dist/resources/extensions/gsd/unit-context-composer.js

@@ -36,6 +36,7 @@
 // owned by the unit, not in the composer. Reviews must enforce this — it
 // is the difference between an orchestrator and a runaway DSL.
 import { resolveManifest, } from "./unit-context-manifest.js";
+import { resolveEffectivePlanningToolsPolicy } from "./planning-subagent-policy.js";
 import { getUnitToolSurfaceContract } from "./unit-tool-contracts.js";
 /**
  * Produce the inlined-context portion of a unit's system prompt by
@@ -148,11 +149,32 @@ const TOOL_SURFACE_GUIDANCE_BY_UNIT = {
     "validate-milestone": "Dispatch reviewer subagents in parallel, then persist the verdict via `gsd_validate_milestone`. Do not query `.gsd/gsd.db` directly — use `gsd_milestone_status` and inlined context.",
     "complete-milestone": "Persist completion only through `gsd_complete_milestone` after verification passes. Do not query `.gsd/gsd.db` directly. Do not write `.gsd/PROJECT.md` or `.gsd/REQUIREMENTS.md` by hand — use `gsd_summary_save` and `gsd_requirement_update`.",
     "replan-slice": "Persist replans through `gsd_replan_slice` only. Do not edit `PLAN.md` or task plans directly.",
-    "plan-slice": "Persist planning through `gsd_plan_slice` only. Dispatch subagents only to **scout** or **planner** for reconnaissance — not implementation agents. Do not edit user source files outside `.gsd/**`.",
-    "refine-slice": "Persist refinements through `gsd_plan_slice` only. Dispatch subagents only to **scout** or **planner**. Do not edit user source files outside `.gsd/**`.",
-    "plan-milestone": "Persist milestone planning through `gsd_plan_milestone` / `gsd_plan_slice`. Do not edit user source files outside `.gsd/**`.",
     "research-slice": "Dispatch subagents only to **scout** or **planner** for reconnaissance. Do not edit user source files outside `.gsd/**`.",
 };
+function formatAllowedAgents(agents) {
+    return agents.map((agent) => `**${agent}**`).join(", ");
+}
+function guidanceForUnitToolsPolicy(unitType, policy) {
+    if (unitType === "plan-slice") {
+        const dispatch = policy.mode === "planning-dispatch"
+            ? ` Dispatch subagents only to ${formatAllowedAgents(policy.allowedSubagents)} for reconnaissance — not implementation agents.`
+            : " Do not dispatch subagents.";
+        return `Persist planning through \`gsd_plan_slice\` only.${dispatch} Do not edit user source files outside \`.gsd/**\`.`;
+    }
+    if (unitType === "refine-slice") {
+        const dispatch = policy.mode === "planning-dispatch"
+            ? ` Dispatch subagents only to ${formatAllowedAgents(policy.allowedSubagents)}.`
+            : " Do not dispatch subagents.";
+        return `Persist refinements through \`gsd_plan_slice\` only.${dispatch} Do not edit user source files outside \`.gsd/**\`.`;
+    }
+    if (unitType === "plan-milestone") {
+        const dispatch = policy.mode === "planning-dispatch"
+            ? ` Dispatch subagents only to ${formatAllowedAgents(policy.allowedSubagents)}.`
+            : "";
+        return `Persist milestone planning through \`gsd_plan_milestone\` / \`gsd_plan_slice\`.${dispatch} Do not edit user source files outside \`.gsd/**\`.`;
+    }
+    return undefined;
+}
 function guidanceForToolsPolicy(policy) {
     switch (policy.mode) {
         case "planning":
@@ -191,8 +213,9 @@ export function composeToolSurfaceInstructions(unitType, opts) {
     const manifest = resolveManifest(unitType);
     if (!manifest)
         return "";
-    const unitGuidance = TOOL_SURFACE_GUIDANCE_BY_UNIT[unitType];
-    const policyGuidance = unitGuidance ? null : guidanceForToolsPolicy(manifest.tools);
+    const effectiveTools = resolveEffectivePlanningToolsPolicy(unitType, manifest.tools, opts.basePath) ?? manifest.tools;
+    const unitGuidance = guidanceForUnitToolsPolicy(unitType, effectiveTools) ?? TOOL_SURFACE_GUIDANCE_BY_UNIT[unitType];
+    const policyGuidance = unitGuidance ? null : guidanceForToolsPolicy(effectiveTools);
     const forbiddenLine = formatForbiddenWorkflowToolsLine(unitType, unitGuidance);
     const parts = [unitGuidance, policyGuidance, forbiddenLine].filter((part) => typeof part === "string" && part.length > 0);
     if (parts.length === 0)

package/dist/resources/extensions/gsd/unit-registry.js

@@ -232,6 +232,8 @@ export const UNIT_REGISTRY = {
                 "gsd_slice_complete",
                 "gsd_task_reopen",
                 "gsd_replan_slice",
+                "gsd_replan_task",
+                "gsd_rework_brief_save",
                 "gsd_decision_save",
                 "gsd_capture_thought",
                 "gsd_requirement_update",
@@ -245,6 +247,8 @@ export const UNIT_REGISTRY = {
                 "gsd_slice_complete",
                 "gsd_task_reopen",
                 "gsd_replan_slice",
+                "gsd_replan_task",
+                "gsd_rework_brief_save",
                 "gsd_requirement_update",
                 "gsd_summary_save",
             ],

package/dist/resources/extensions/gsd/uok/plan-v2.js

@@ -3,7 +3,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { gsdRoot, resolveMilestoneFile, resolveSliceFile } from "../paths.js";
-import { isDbAvailable, getMilestoneSlices, getSliceTasks } from "../gsd-db.js";
+import { isDbAvailable, getMilestoneSlices, getTasksBySliceIds } from "../gsd-db.js";
 const PLAN_V2_CLARIFY_ROUND_LIMIT = 3;
 export const EXECUTION_ENTRY_PHASES = new Set([
     "executing",
@@ -17,6 +17,19 @@ export function isExecutionEntryPhase(phase) {
 function graphOutputPath(basePath) {
     return join(gsdRoot(basePath), "runtime", "uok-plan-v2-graph.json");
 }
+// True when the on-disk graph matches `output` ignoring the volatile `compiledAt`
+// stamp, so redundant recompiles on the dispatch hot path skip the disk write.
+function graphBodyUnchanged(outPath, output) {
+    try {
+        const existing = JSON.parse(readFileSync(outPath, "utf-8"));
+        const { compiledAt: _existingStamp, ...existingBody } = existing;
+        const { compiledAt: _outputStamp, ...outputBody } = output;
+        return JSON.stringify(existingBody) === JSON.stringify(outputBody);
+    }
+    catch {
+        return false; // Missing, unreadable, or corrupt — write.
+    }
+}
 function hasFileContent(path) {
     if (!path || !existsSync(path))
         return false;
@@ -88,9 +101,10 @@ export function compileUnitGraphFromState(basePath, state) {
             finalizedContextIncluded,
         };
     }
+    const tasksBySlice = getTasksBySliceIds(slices.map((slice) => ({ milestoneId: mid, sliceId: slice.id })));
     for (const slice of slices) {
         const sid = slice.id;
-        const tasks = getSliceTasks(mid, sid)
+        const tasks = (tasksBySlice.get(`${mid}\0${sid}`) ?? [])
             .sort((a, b) => Number(a.sequence ?? 0) - Number(b.sequence ?? 0));
         let previousTaskNodeId = null;
         for (const task of tasks) {
@@ -138,7 +152,9 @@ export function compileUnitGraphFromState(basePath, state) {
     };
     const outPath = graphOutputPath(basePath);
     mkdirSync(join(gsdRoot(basePath), "runtime"), { recursive: true });
-    writeFileSync(outPath, JSON.stringify(output, null, 2) + "\n", "utf-8");
+    if (!graphBodyUnchanged(outPath, output)) {
+        writeFileSync(outPath, JSON.stringify(output, null, 2) + "\n", "utf-8");
+    }
     return {
         ok: true,
         graphPath: outPath,

package/dist/resources/extensions/gsd/workflow-projections.js

@@ -13,7 +13,7 @@ import { isClosedStatus } from "./status-guards.js";
 import { deriveState } from "./state.js";
 import { renderPlanFromDb, renderRoadmapFromDb } from "./markdown-renderer.js";
 import { readManifest } from "./workflow-manifest.js";
-import { gsdRoot, resolveMilestoneFile, resolveSliceFile, resolveTaskFile, relTaskFile } from "./paths.js";
+import { gsdRoot, resolveMilestoneFile, resolveSliceFile, resolveTaskFile, targetTaskFile } from "./paths.js";
 // ─── Helpers ─────────────────────────────────────────────────────────────
 /**
  * Strip a leading ID prefix (e.g. "M001: " or "S04: ") from a title
@@ -276,8 +276,7 @@ export function renderSummaryProjection(basePath, milestoneId, sliceId, taskId)
         return;
     const evidenceRows = getVerificationEvidence(milestoneId, sliceId, taskId);
     const content = renderSummaryContent(taskRow, sliceId, milestoneId, evidenceRows);
-    const summaryPath = resolveTaskFile(basePath, milestoneId, sliceId, taskId, "SUMMARY")
-        ?? join(basePath, relTaskFile(basePath, milestoneId, sliceId, taskId, "SUMMARY", getMilestone(milestoneId)?.title));
+    const summaryPath = targetTaskFile(basePath, milestoneId, sliceId, taskId, "SUMMARY", getMilestone(milestoneId)?.title);
     mkdirSync(dirname(summaryPath), { recursive: true });
     atomicWriteSync(summaryPath, content);
 }

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

@@ -2,6 +2,7 @@
 import { dirname, join, resolve } from "node:path";
 import { resolveGsdPathContract, resolveMilestoneFile, resolveMilestonePath, targetMilestoneFile, normalizeRealPath, } from "./paths.js";
 import { isGsdWorktreePath, resolveWorktreeProjectRoot } from "./worktree-root.js";
+import { milestoneMetaPath } from "./git-service.js";
 function tryRealpath(p) {
     return normalizeRealPath(p);
 }
@@ -63,7 +64,7 @@ export function scopeMilestone(workspace, milestoneId) {
         stateFile: () => join(gsd, "STATE.md"),
         dbPath: () => contract.projectDb,
         milestoneDir: () => scopeMilestoneDir(basePath, milestoneId),
-        metaJson: () => join(gsd, `${milestoneId}-META.json`),
+        metaJson: () => milestoneMetaPath(basePath, milestoneId),
     });
     return scope;
 }

package/dist/resources/extensions/gsd/worktree-state-projection.js

@@ -21,7 +21,7 @@
 import { cpSync, existsSync, mkdirSync, readdirSync, readFileSync, realpathSync, statSync, unlinkSync, } from "node:fs";
 import { join } from "node:path";
 import { reconcileWorktreeDb } from "./gsd-db.js";
-import { resolveGsdPathContract } from "./paths.js";
+import { dirIsContentBearingLegacyMilestone, resolveGsdPathContract } from "./paths.js";
 import { safeCopy, safeCopyRecursive } from "./safe-fs.js";
 import { logError, logWarning } from "./workflow-logger.js";
 // ─── Private helpers ──────────────────────────────────────────────────────
@@ -129,6 +129,8 @@ function syncOtherMilestoneArtifacts(srcMilestonesDir, dstMilestonesDir, current
             if (milestoneEntry.name === currentMilestoneId)
                 continue;
             const srcMilestoneDir = join(srcMilestonesDir, milestoneEntry.name);
+            if (!dirIsContentBearingLegacyMilestone(srcMilestoneDir))
+                continue;
             const dstMilestoneDir = join(dstMilestonesDir, milestoneEntry.name);
             // Additively project the entire milestone subtree (force:false), not just
             // top-level files. Prior completed milestones keep their per-slice and
@@ -143,6 +145,9 @@ function syncOtherMilestoneArtifacts(srcMilestonesDir, dstMilestonesDir, current
         logWarning("worktree", `milestone artifact scan failed: ${err instanceof Error ? err.message : String(err)}`);
     }
 }
+function syncFlatPhaseArtifacts(prGsd, wtGsd) {
+    safeCopyRecursive(join(prGsd, "phases"), join(wtGsd, "phases"), { force: false });
+}
 /**
  * Root-level .gsd/ files copied from worktree back to project root for
  * post-merge diagnostics. Markdown projections are NOT in this list — DB
@@ -208,30 +213,33 @@ export function _projectRootToWorktreeImpl(projectRoot, worktreePath_, milestone
     // Root PROJECT/REQUIREMENTS/DECISIONS projections must be readable from a
     // worktree-bound unit; the project root remains authoritative.
     syncRootProjectionFilesToWorktree(prGsd, wtGsd);
+    // Flat-phase artifacts (phases/NN-slug/NN-CONTEXT.md, NN-DISCUSSION.md,
+    // ROADMAP, etc.) must be available before the first worktree dispatch.
+    syncFlatPhaseArtifacts(prGsd, wtGsd);
     // Copy milestone directory from project root to worktree — additive only.
     // force:false prevents cpSync from overwriting existing worktree files.
     // Without this, worktree-local files (e.g. VALIDATION.md written
     // by validate-milestone) get clobbered by stale project root copies,
     // causing an infinite re-validation loop (#1886).
-    safeCopyRecursive(join(prGsd, "milestones", milestoneId), join(wtGsd, "milestones", milestoneId), { force: false });
-    // Additively project the full subtree of every OTHER milestone so
-    // worktree-bound units can read prior-milestone context artifacts and so
-    // completed milestones retain their per-slice/per-task SUMMARY.md and
-    // UAT.md on the worktree filesystem (otherwise the stale-render detector
-    // flags them as "complete in DB but missing on disk").
-    syncOtherMilestoneArtifacts(join(prGsd, "milestones"), join(wtGsd, "milestones"), milestoneId);
-    // Force-sync ASSESSMENT files that have a verdict from project root (#2821).
-    // The additive-only copy above preserves worktree-local files, but
-    // ASSESSMENT files are special: after run-uat writes a verdict and post-unit
-    // syncs it to the project root, the worktree may retain a stale copy (e.g.
-    // verdict:fail while the project root has verdict:pass from a retry). On
-    // session resume the DB is rebuilt from disk, and if the stale ASSESSMENT
-    // persists, checkNeedsRunUat finds no passing verdict → re-dispatches
-    // run-uat indefinitely (stuck-loop ×9).
     const prMilestoneDir = join(prGsd, "milestones", milestoneId);
     const wtMilestoneDir = join(wtGsd, "milestones", milestoneId);
-    forceOverwriteValidationWithVerdict(prMilestoneDir, wtMilestoneDir, milestoneId);
-    forceOverwriteAssessmentsWithVerdict(prMilestoneDir, wtMilestoneDir);
+    if (dirIsContentBearingLegacyMilestone(prMilestoneDir)) {
+        safeCopyRecursive(prMilestoneDir, wtMilestoneDir, { force: false });
+        // Force-sync ASSESSMENT files that have a verdict from project root (#2821).
+        // The additive-only copy above preserves worktree-local files, but
+        // ASSESSMENT files are special: after run-uat writes a verdict and post-unit
+        // syncs it to the project root, the worktree may retain a stale copy (e.g.
+        // verdict:fail while the project root has verdict:pass from a retry). On
+        // session resume the DB is rebuilt from disk, and if the stale ASSESSMENT
+        // persists, checkNeedsRunUat finds no passing verdict → re-dispatches
+        // run-uat indefinitely (stuck-loop ×9).
+        forceOverwriteValidationWithVerdict(prMilestoneDir, wtMilestoneDir, milestoneId);
+        forceOverwriteAssessmentsWithVerdict(prMilestoneDir, wtMilestoneDir);
+    }
+    // Additively project the full subtree of every OTHER content-bearing legacy
+    // milestone so worktree-bound units can read prior-milestone context artifacts
+    // without recreating empty/meta-only milestones/ scaffolds in flat-phase projects.
+    syncOtherMilestoneArtifacts(join(prGsd, "milestones"), join(wtGsd, "milestones"), milestoneId);
     // Forward-sync completed-units.json from project root to worktree.
     // Project root is authoritative for completion state after crash recovery;
     // without this, the worktree re-dispatches already-completed units (#1886).

package/dist/resources/extensions/mac-tools/index.js

@@ -15,6 +15,7 @@ import { StringEnum, Type } from "@gsd/pi-ai";
 import { execFileSync } from "node:child_process";
 import { statSync, readdirSync } from "node:fs";
 import path from "node:path";
+import { constrainScreenshot, getScreenshotBufferDimensions, } from "../browser-tools/screenshot-constraints.js";
 // ---------------------------------------------------------------------------
 // Paths
 // ---------------------------------------------------------------------------
@@ -79,6 +80,27 @@ function ensureCompiled() {
         throw new Error(`Swift compilation failed (${action.toLowerCase()}):\n${stderr || stdout || err.message}`);
     }
 }
+function macScreenshotQualityToPercent(quality) {
+    if (quality === undefined || !Number.isFinite(quality))
+        return 80;
+    return Math.min(100, Math.max(1, Math.round(quality * 100)));
+}
+export async function prepareMacScreenshotPayload(data, quality) {
+    const format = data.format;
+    const mimeType = format === "png" ? "image/png" : "image/jpeg";
+    const rawBuffer = Buffer.from(data.imageData, "base64");
+    const constrainedBuffer = await constrainScreenshot(null, rawBuffer, mimeType, macScreenshotQualityToPercent(quality));
+    const dimensions = constrainedBuffer === rawBuffer
+        ? null
+        : await getScreenshotBufferDimensions(constrainedBuffer);
+    return {
+        imageData: constrainedBuffer.toString("base64"),
+        width: dimensions?.width ?? data.width,
+        height: dimensions?.height ?? data.height,
+        format,
+        mimeType,
+    };
+}
 /**
  * Invoke the mac-agent CLI with a command and optional params.
  * Handles compilation caching, stdin/stdout JSON protocol, and error surfacing.
@@ -646,18 +668,18 @@ export default function (pi) {
             if (!result.success) {
                 throw new Error("mac_screenshot: " + result.error);
             }
-            const data = result.data;
-            const imageData = data.imageData;
-            const format = data.format;
-            const width = data.width;
-            const height = data.height;
-            const mimeType = format === "png" ? "image/png" : "image/jpeg";
+            const screenshot = await prepareMacScreenshotPayload(result.data, args.quality);
             return {
                 content: [
-                    { type: "text", text: `Screenshot: ${width}x${height} ${format}` },
-                    { type: "image", data: imageData, mimeType },
+                    { type: "text", text: `Screenshot: ${screenshot.width}x${screenshot.height} ${screenshot.format}` },
+                    { type: "image", data: screenshot.imageData, mimeType: screenshot.mimeType },
                 ],
-                details: { width, height, format, mimeType },
+                details: {
+                    width: screenshot.width,
+                    height: screenshot.height,
+                    format: screenshot.format,
+                    mimeType: screenshot.mimeType,
+                },
             };
         },
     });

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

@@ -144,6 +144,10 @@ export async function showInterviewRound(questions, opts, ctx) {
         let previewViewport = 0;
         let previewTotal = 0;
         function resetPreviewScroll() { previewScroll = 0; }
+        let optionsScroll = 0;
+        let optionsViewport = 0;
+        let optionsTotal = 0;
+        function resetOptionsScroll() { optionsScroll = 0; }
         function finish(result) {
             if (completed)
                 return;
@@ -203,6 +207,7 @@ export async function showInterviewRound(questions, opts, ctx) {
             saveEditorToState();
             currentIdx = newIdx;
             resetPreviewScroll();
+            resetOptionsScroll();
             loadStateToEditor();
             focusNotes = states[currentIdx].notesVisible && states[currentIdx].notes.length > 0;
             refresh();
@@ -376,32 +381,49 @@ export async function showInterviewRound(questions, opts, ctx) {
                     return;
                 }
             }
-            // ── Preview scrolling ────────────────────────────────────────
+            // ── Side-by-side panel scrolling ─────────────────────────────
             if (matchesKey(data, Key.pageUp)) {
+                let didScroll = false;
+                if (optionsScroll > 0) {
+                    optionsScroll = Math.max(0, optionsScroll - optionsViewport);
+                    didScroll = true;
+                }
                 if (previewScroll > 0) {
                     previewScroll = Math.max(0, previewScroll - previewViewport);
-                    refresh();
+                    didScroll = true;
                 }
+                if (didScroll)
+                    refresh();
                 return;
             }
             if (matchesKey(data, Key.pageDown)) {
+                let didScroll = false;
+                const maxOptionsScroll = Math.max(0, optionsTotal - optionsViewport);
+                if (optionsScroll < maxOptionsScroll) {
+                    optionsScroll = Math.min(maxOptionsScroll, optionsScroll + optionsViewport);
+                    didScroll = true;
+                }
                 const maxScroll = Math.max(0, previewTotal - previewViewport);
                 if (previewScroll < maxScroll) {
                     previewScroll = Math.min(maxScroll, previewScroll + previewViewport);
-                    refresh();
+                    didScroll = true;
                 }
+                if (didScroll)
+                    refresh();
                 return;
             }
             // ── Cursor navigation ────────────────────────────────────────
             if (matchesKey(data, Key.up)) {
                 st.cursorIndex = (st.cursorIndex - 1 + optCount) % optCount;
                 resetPreviewScroll();
+                resetOptionsScroll();
                 refresh();
                 return;
             }
             if (matchesKey(data, Key.down)) {
                 st.cursorIndex = (st.cursorIndex + 1) % optCount;
                 resetPreviewScroll();
+                resetOptionsScroll();
                 refresh();
                 return;
             }
@@ -637,6 +659,8 @@ export async function showInterviewRound(questions, opts, ctx) {
             // No scrollable preview unless the side-by-side path sets these below.
             previewTotal = 0;
             previewViewport = 0;
+            optionsTotal = 0;
+            optionsViewport = 0;
             if (useSideBySide) {
                 // ── Preview path ──────────────────────────────────────
                 const ui = makeUI(theme, contentWidth);
@@ -672,10 +696,21 @@ export async function showInterviewRound(questions, opts, ctx) {
                 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);
+                optionsTotal = fullLeft.length;
+                optionsViewport = maxBody;
+                const maxOptionsScroll = Math.max(0, fullLeft.length - maxBody);
+                if (optionsScroll > maxOptionsScroll)
+                    optionsScroll = maxOptionsScroll;
+                const leftLines = fullLeft.slice(optionsScroll, optionsScroll + maxBody);
                 if (fullLeft.length > maxBody) {
-                    const n = fullLeft.length - maxBody + 1;
-                    leftLines[maxBody - 1] = scrollIndicator(`+${n} lines hidden`, leftWidth);
+                    const hiddenAbove = optionsScroll;
+                    const hiddenBelow = fullLeft.length - (optionsScroll + maxBody);
+                    if (hiddenAbove > 0) {
+                        leftLines[0] = scrollIndicator(`▲ ${hiddenAbove} more`, leftWidth);
+                    }
+                    if (hiddenBelow > 0) {
+                        leftLines[leftLines.length - 1] = scrollIndicator(`▼ ${hiddenBelow} more · PgUp/PgDn`, leftWidth);
+                    }
                 }
                 const preview = getCurrentPreview();
                 const fullRight = preview ? renderPreviewColumn(preview, previewWidth) : [];
@@ -734,6 +769,8 @@ export async function showInterviewRound(questions, opts, ctx) {
                 }
                 if (previewTotal > previewViewport)
                     hints.push("pgup/pgdn scroll preview");
+                if (optionsTotal > optionsViewport)
+                    hints.push("pgup/pgdn scroll options");
                 hints.push("esc to exit");
                 const footer = ui.hints(hints)[0] ?? "";
                 cachedLines = renderSharedDialogFrame(theme, title, lines, width, { footer });