@opengsd/gsd-pi 1.4.0-dev.c18009cd → 1.5.0-dev.4fb2d460

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

@@ -47,11 +47,15 @@ import { createWorkspace, scopeMilestone } from "./workspace.js";
 // adding type churn without enabling any test variation.
 import { autoCommitCurrentBranch, getCurrentBranch, } from "./worktree.js";
 import { nativeCheckoutBranch } from "./native-git-bridge.js";
-// ADR-016 phase 2 / C2 (#5625): worktree-manager helpers inlined from
-// `./auto-worktree.js`. These seven functions are not real seams — Lifecycle
-// is the only Module that calls them, and they live alongside the Module's
-// other primitives in `auto-worktree.ts`.
-import { autoWorktreeBranch, createAutoWorktree, enterAutoWorktree, enterBranchModeForMilestone, getAutoWorktreePath, isInAutoWorktree, teardownAutoWorktree, } from "./auto-worktree.js";
+// ADR-016 phase 2 / C2 (#5625): lifecycle uses focused auto-worktree
+// modules instead of the legacy compatibility barrel. Branch, entry/path,
+// creation, and teardown primitives are still implementation-level seams for
+// Lifecycle; tests vary them through `WorktreeLifecycleTestOverrides` below.
+import { autoWorktreeBranch, enterBranchModeForMilestone, } from "./auto-worktree-branch-lifecycle.js";
+import { createAutoWorktree } from "./auto-worktree-creation.js";
+import { enterAutoWorktree, isInAutoWorktree, } from "./auto-worktree-entry.js";
+import { getAutoWorktreePath } from "./auto-worktree-path-resolution.js";
+import { teardownAutoWorktree } from "./auto-worktree-teardown.js";
 import { resolveRoadmapForMilestoneMerge } from "./milestone-merge-roadmap.js";
 const recentWorktreeMergeFailures = new Map();
 const MERGE_FAILURE_DEDUPE_MS = 60_000;
@@ -874,8 +878,9 @@ function _mergeBranchModeImpl(deps, mctx) {
  * **CWD anchor**: anchors `process.cwd()` at `originalBasePath` before
  * non-worktree merge paths to mirror the single-loop guard against ENOENT
  * after teardown (de73fb43d). Worktree-mode merge paths keep the real
- * worktree as cwd because `mergeMilestoneToMain()` infers source worktree
- * state from `process.cwd()`. Best-effort; silent on failure.
+ * worktree as cwd because the default milestone merge transaction delegates
+ * to the legacy merge primitive, which infers source worktree state from
+ * `process.cwd()`. Best-effort; silent on failure.
  *
  * **Failure handling**: `MergeConflictError` and other unrecoverable errors
  * propagate to the caller. The caller is responsible for any state restore
@@ -963,8 +968,8 @@ export function mergeMilestoneStandalone(deps, mctx) {
     }
     // Set cwd to the correct anchor before dispatching to mode implementations.
     // Worktree mode / in-worktree override must run from the live worktree so
-    // mergeMilestoneToMain can find worktree-local state; branch mode runs from
-    // the original project root. Best-effort for synthetic test paths.
+    // The default merge transaction can find worktree-local state; branch mode
+    // runs from the original project root. Best-effort for synthetic test paths.
     const targetCwd = mode === "worktree" || inWorktree
         ? worktreeBasePath
         : originalBasePath;

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

@@ -6,7 +6,8 @@
 // back into the worktree. The worktree path is fully derivable from state, so we
 // resolve and chdir into it directly instead.
 import { readdirSync } from "node:fs";
-import { enterAutoWorktree, getAutoWorktreePath } from "./auto-worktree.js";
+import { enterAutoWorktree } from "./auto-worktree-entry.js";
+import { getAutoWorktreePath } from "./auto-worktree-path-resolution.js";
 import { getIsolationMode } from "./preferences.js";
 import { allWorktreesDirs } from "./worktree-manager.js";
 import { isGsdWorktreePath, resolveWorktreeProjectRoot } from "./worktree-root.js";

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

@@ -137,6 +137,13 @@ export async function showInterviewRound(questions, opts, ctx) {
         let cachedLines;
         let completed = false;
         let removeAbortListener;
+        // Preview-panel scrolling. previewScroll is the first visible line of the
+        // side-by-side preview column; the viewport/total are captured on each
+        // render so PgUp/PgDn input can clamp against real bounds.
+        let previewScroll = 0;
+        let previewViewport = 0;
+        let previewTotal = 0;
+        function resetPreviewScroll() { previewScroll = 0; }
         function finish(result) {
             if (completed)
                 return;
@@ -195,6 +202,7 @@ export async function showInterviewRound(questions, opts, ctx) {
                 return;
             saveEditorToState();
             currentIdx = newIdx;
+            resetPreviewScroll();
             loadStateToEditor();
             focusNotes = states[currentIdx].notesVisible && states[currentIdx].notes.length > 0;
             refresh();
@@ -368,14 +376,32 @@ export async function showInterviewRound(questions, opts, ctx) {
                     return;
                 }
             }
+            // ── Preview scrolling ────────────────────────────────────────
+            if (matchesKey(data, Key.pageUp)) {
+                if (previewScroll > 0) {
+                    previewScroll = Math.max(0, previewScroll - previewViewport);
+                    refresh();
+                }
+                return;
+            }
+            if (matchesKey(data, Key.pageDown)) {
+                const maxScroll = Math.max(0, previewTotal - previewViewport);
+                if (previewScroll < maxScroll) {
+                    previewScroll = Math.min(maxScroll, previewScroll + previewViewport);
+                    refresh();
+                }
+                return;
+            }
             // ── Cursor navigation ────────────────────────────────────────
             if (matchesKey(data, Key.up)) {
                 st.cursorIndex = (st.cursorIndex - 1 + optCount) % optCount;
+                resetPreviewScroll();
                 refresh();
                 return;
             }
             if (matchesKey(data, Key.down)) {
                 st.cursorIndex = (st.cursorIndex + 1) % optCount;
+                resetPreviewScroll();
                 refresh();
                 return;
             }
@@ -496,6 +522,11 @@ export async function showInterviewRound(questions, opts, ctx) {
             return renderSharedDialogFrame(theme, title, lines, width, { footer });
         }
         // ── Preview helpers ──────────────────────────────────────────────
+        // Centered dim label between horizontal rules, used to mark hidden/scrollable rows.
+        function scrollIndicator(lbl, colWidth) {
+            const d = "─".repeat(Math.max(0, Math.floor((colWidth - lbl.length - 2) / 2)));
+            return truncateToWidth(theme.fg("dim", ` ${d} ${lbl} ${d}`), colWidth);
+        }
         let mdThemeCache = null;
         let previewCache = null;
         function questionHasAnyPreview() {
@@ -603,6 +634,9 @@ export async function showInterviewRound(questions, opts, ctx) {
             const title = questions[currentIdx]?.header || "GSD Interview";
             const useSideBySide = questionHasAnyPreview()
                 && contentWidth >= (MIN_OPTIONS_WIDTH + MIN_PREVIEW_WIDTH + DIVIDER_WIDTH);
+            // No scrollable preview unless the side-by-side path sets these below.
+            previewTotal = 0;
+            previewViewport = 0;
             if (useSideBySide) {
                 // ── Preview path ──────────────────────────────────────
                 const ui = makeUI(theme, contentWidth);
@@ -641,18 +675,35 @@ export async function showInterviewRound(questions, opts, ctx) {
                 const leftLines = fullLeft.slice(0, maxBody);
                 if (fullLeft.length > maxBody) {
                     const n = fullLeft.length - maxBody + 1;
-                    const lbl = `+${n} lines hidden`;
-                    const d = "─".repeat(Math.max(0, Math.floor((leftWidth - lbl.length - 2) / 2)));
-                    leftLines[maxBody - 1] = truncateToWidth(theme.fg("dim", ` ${d} ${lbl} ${d}`), leftWidth);
+                    leftLines[maxBody - 1] = scrollIndicator(`+${n} lines hidden`, leftWidth);
                 }
                 const preview = getCurrentPreview();
                 const fullRight = preview ? renderPreviewColumn(preview, previewWidth) : [];
-                const rightLines = fullRight.slice(0, maxBody);
-                if (fullRight.length > maxBody) {
-                    const n = fullRight.length - maxBody + 1;
-                    const lbl = `+${n} lines hidden`;
-                    const d = "─".repeat(Math.max(0, Math.floor((previewWidth - lbl.length - 2) / 2)));
-                    rightLines[maxBody - 1] = truncateToWidth(theme.fg("dim", ` ${d} ${lbl} ${d}`), previewWidth);
+                // The first two lines are the pinned "Preview" header; the body
+                // below them scrolls via PgUp/PgDn so no content is unreachable.
+                const headerRows = fullRight.length > 0 ? 2 : 0;
+                const previewBody = fullRight.slice(headerRows);
+                const bodyViewport = Math.max(1, maxBody - headerRows);
+                previewTotal = previewBody.length;
+                previewViewport = bodyViewport;
+                const maxScroll = Math.max(0, previewBody.length - bodyViewport);
+                if (previewScroll > maxScroll)
+                    previewScroll = maxScroll;
+                const rightLines = fullRight.slice(0, headerRows);
+                if (previewBody.length <= bodyViewport) {
+                    rightLines.push(...previewBody);
+                }
+                else {
+                    rightLines.push(...previewBody.slice(previewScroll, previewScroll + bodyViewport));
+                    const hiddenAbove = previewScroll;
+                    const hiddenBelow = previewBody.length - (previewScroll + bodyViewport);
+                    // Overwrite the top/bottom visible rows with scroll indicators.
+                    if (hiddenAbove > 0) {
+                        rightLines[headerRows] = scrollIndicator(`▲ ${hiddenAbove} more`, previewWidth);
+                    }
+                    if (hiddenBelow > 0) {
+                        rightLines[rightLines.length - 1] = scrollIndicator(`▼ ${hiddenBelow} more · PgUp/PgDn`, previewWidth);
+                    }
                 }
                 while (leftLines.length < maxBody)
                     leftLines.push("");
@@ -681,6 +732,8 @@ export async function showInterviewRound(questions, opts, ctx) {
                         hints.push("←/→ navigate");
                     hints.push(isLast && allAnswered() ? "enter to review" : "enter to next");
                 }
+                if (previewTotal > previewViewport)
+                    hints.push("pgup/pgdn scroll preview");
                 hints.push("esc to exit");
                 const footer = ui.hints(hints)[0] ?? "";
                 cachedLines = renderSharedDialogFrame(theme, title, lines, width, { footer });