@thegitai/cli 1.0.0-preview.44 → 1.0.0-preview.45

package/README.md

@@ -78,12 +78,18 @@ The agent can pause its current turn to ask up to four related questions in one
 form. Use **↑ / ↓**, the displayed option number, or **Enter** to choose, and
 **← / →** to move between questions. **Something else / add details** is the
 numbered final option; focus it and type, paste, or press **Enter** to add a
-single-line note. On single-select questions it is mutually exclusive with the
-listed choices, and **↑ / ↓** leaves its editor when the note is empty.
+single-line note; **Enter** commits it and moves on the way any other choice
+does — to the next question, or to **Submit answers** on the last one — without
+submitting the form. On single-select questions it is mutually exclusive with
+the listed choices, and **↑ / ↓** leaves its editor when the note is empty.
 Multi-select questions toggle choices. The last question has an explicit
 **Submit answers** row. **Esc** closes an open note first and otherwise cancels
 the form; **Ctrl+C** cancels the whole turn.
 
+Only the option you are on shows its description, so the whole form — every
+option, the note row, **Submit answers**, and the key hints — stays on screen
+without scrolling. Move between options to read the others.
+
 Answers return to the same turn, and completed question/answer records remain
 readable when the session is resumed. Default, Bypass all permissions, and Plan
 modes all support the form; Bypass all permissions does not choose answers for

package/dist/src/help-text.js

@@ -103,6 +103,18 @@ const HELP_MARKDOWN = [
         ? ['- On Mac laptops without dedicated keys, **Home/End** are `Fn+←` / `Fn+→`.']
         : []),
     '',
+    '## Questions',
+    '',
+    '- The agent can pause a turn to ask up to four questions in one form.',
+    '  **↑/↓** moves, the option number or **Enter** chooses, **←/→** moves',
+    '  between questions, and the last question has a **Submit answers** row.',
+    '- Only the option you are on shows its description, so the whole form fits',
+    '  on screen. Move to an option to read what it means.',
+    '- **Something else / add details** is the numbered final option: focus it',
+    '  and type. **Enter** commits the note and moves to the next question, or to',
+    '  Submit on the last one — it never submits the form for you.',
+    '- **Esc** closes an open note first, and otherwise cancels the form.',
+    '',
     '## Chat commands',
     '',
     '- `/help` — show this help',

package/dist/src/ui/tui/build-frame.js

@@ -44,6 +44,7 @@ export function footerNotificationHint(status) {
 }
 const FOOTER_CYCLE_HINT = ' (shift+tab to cycle)';
 const OVERLAY_PANEL_MAX_WIDTH = 86;
+const USER_INPUT_PANEL_MAX_WIDTH = 120;
 const OVERLAY_PANEL_MARGIN_LINES = 2;
 const OVERLAY_PANEL_MARGIN_MIN_ROWS = 30;
 const OVERLAY_BORDER_COLOR = 'yellow';
@@ -817,8 +818,8 @@ function overlayPanelContentBudget(height) {
     const margins = overlayPanelMarginLineCount(height) * 2;
     return Math.max(1, Math.floor(height) - margins - 2);
 }
-function buildOverlayPanel(rows, width, color, height = Number.POSITIVE_INFINITY) {
-    const panelWidth = Math.max(24, Math.min(width, OVERLAY_PANEL_MAX_WIDTH));
+function buildOverlayPanel(rows, width, color, height = Number.POSITIVE_INFINITY, maxWidth = OVERLAY_PANEL_MAX_WIDTH) {
+    const panelWidth = Math.max(24, Math.min(width, maxWidth));
     const innerWidth = Math.max(1, panelWidth - 4);
     const margin = Array.from({
         length: overlayPanelMarginLineCount(height),
@@ -1104,6 +1105,9 @@ export function buildWorkingClockLine(state, elapsedSeconds) {
 export function approvalPanelInnerWidth(width) {
     return Math.max(1, Math.max(24, Math.min(width, OVERLAY_PANEL_MAX_WIDTH)) - 4);
 }
+export function userInputPanelInnerWidth(width) {
+    return Math.max(1, Math.max(24, Math.min(width, USER_INPUT_PANEL_MAX_WIDTH)) - 4);
+}
 export function approvalPaddingEnabled(height) {
     return height >= APPROVAL_PADDING_MIN_ROWS;
 }
@@ -1212,7 +1216,7 @@ function buildOverlayLines(state, width, height, nowMs) {
         if (height < 3) {
             return [];
         }
-        return buildOverlayPanel(buildUserInputOverlayLines(state.userInputPrompt, innerWidth, overlayPanelContentBudget(height)), width, USER_INPUT_BORDER_COLOR, height);
+        return buildOverlayPanel(buildUserInputOverlayLines(state.userInputPrompt, userInputPanelInnerWidth(width), overlayPanelContentBudget(height)), width, USER_INPUT_BORDER_COLOR, height, USER_INPUT_PANEL_MAX_WIDTH);
     }
     if (state.approvalPrompt) {
         const prompt = state.approvalPrompt;
@@ -1337,7 +1341,7 @@ export function userInputViewportForFrame(state, cols, rows, spinnerFrame, elaps
     const liveRows = buildLiveLines(state, contentWidth, spinnerFrame, elapsedSeconds, nowMs).length;
     const overlayHeight = Math.max(0, rows - liveRows - composerFooterLines(state, contentWidth).length);
     return {
-        width: approvalPanelInnerWidth(contentWidth),
+        width: userInputPanelInnerWidth(contentWidth),
         maxRows: overlayPanelContentBudget(overlayHeight),
     };
 }

package/dist/src/ui/tui/user-input.js

@@ -139,9 +139,19 @@ function editOpenNote(state, event) {
     const question = currentQuestion(state);
     const current = state.customText[question.id] ?? '';
     const cursor = Math.max(0, Math.min(state.noteCursor, current.length));
-    if (event.escape || event.returnKey) {
+    if (event.escape) {
         return { ...state, noteOpen: false };
     }
+    if (event.returnKey) {
+        const closed = { ...state, noteOpen: false };
+        if (question.multiSelect || !current.trim()) {
+            return closed;
+        }
+        const index = questionIndex(closed);
+        return index < closed.questions.length - 1
+            ? setQuestion(closed, index + 1)
+            : setCursor(closed, question, SUBMIT_CURSOR);
+    }
     if (event.tab)
         return state;
     if ((event.upArrow || event.downArrow) && !current.trim()) {
@@ -433,8 +443,10 @@ function buildUserInputContent(state, width) {
         }), ...(recommendation
             ? [span(recommendation, { color: 'green' })]
             : [])));
-        for (const description of wrapText(option.description, Math.max(8, width - 5))) {
-            lines.push(plainLine(`     ${description}`, { color: 'gray' }));
+        if (focused) {
+            for (const description of wrapText(option.description, Math.max(8, width - 5))) {
+                lines.push(plainLine(`     ${description}`, { color: 'gray' }));
+            }
         }
         if (state.contentScrollAnchor === option.id) {
             anchorRange = { start: blockStart, end: lines.length - 1 };
@@ -490,23 +502,38 @@ function buildUserInputContent(state, width) {
     if (state.validationMessage) {
         lines.push(plainLine(state.validationMessage, { color: 'yellow' }));
     }
-    lines.push(plainLine(state.noteOpen
-        ? 'Type a single-line note • ↑/↓ moves when empty • Enter saves • Esc closes • PgUp/PgDn scroll'
+    const footer = plainLine(state.noteOpen
+        ? 'Type a single-line note • ↑/↓ moves when empty • Enter saves • Esc closes'
         : question.multiSelect
-            ? `↑/↓ move • 1–${otherNumber} choose • Enter toggles/edits • ←/→ questions • PgUp/PgDn scroll • Esc cancels`
-            : `↑/↓ move • 1–${otherNumber} choose • Enter selects/edits • ←/→ questions • PgUp/PgDn scroll • Esc cancels`, { color: 'gray' }));
+            ? `↑/↓ move • 1–${otherNumber} choose • Enter toggles/edits • ←/→ questions • Esc cancels`
+            : `↑/↓ move • 1–${otherNumber} choose • Enter selects/edits • ←/→ questions • Esc cancels`, { color: 'gray' });
     return {
         anchorRange,
+        footer: clipLineToWidth(footer, width),
         lines: lines.map((row) => clipLineToWidth(row, width)),
     };
 }
 function buildUserInputWindow(state, width, maxRows) {
     const content = buildUserInputContent(state, width);
-    if (!Number.isFinite(maxRows) || content.lines.length <= maxRows) {
-        return { lines: content.lines, maxOffset: 0, offset: 0 };
+    if (!Number.isFinite(maxRows)) {
+        return {
+            lines: [...content.lines, content.footer],
+            maxOffset: 0,
+            offset: 0,
+        };
     }
     const rowBudget = Math.max(1, Math.floor(maxRows));
-    const visibleRowBudget = rowBudget === 1 ? 1 : rowBudget - 1;
+    if (rowBudget === 1) {
+        return { lines: [content.footer], maxOffset: 0, offset: 0 };
+    }
+    if (content.lines.length <= rowBudget - 1) {
+        return {
+            lines: [...content.lines, content.footer],
+            maxOffset: 0,
+            offset: 0,
+        };
+    }
+    const visibleRowBudget = Math.max(1, rowBudget - 2);
     const maxOffset = Math.max(0, content.lines.length - visibleRowBudget);
     let offset = Math.max(0, Math.min(state.contentScrollOffset, maxOffset));
     const range = content.anchorRange;
@@ -527,13 +554,11 @@ function buildUserInputWindow(state, width, maxRows) {
         offset = Math.max(0, Math.min(offset, maxOffset));
     }
     const visible = content.lines.slice(offset, offset + visibleRowBudget);
-    if (rowBudget === 1) {
-        return { lines: visible, maxOffset, offset };
-    }
     return {
         lines: [
             ...visible,
             plainLine(fitText(`Rows ${offset + 1}–${offset + visible.length} of ${content.lines.length} · PgUp/PgDn scroll`, width), { color: 'gray' }),
+            content.footer,
         ],
         maxOffset,
         offset,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thegitai/cli",
-  "version": "1.0.0-preview.44",
+  "version": "1.0.0-preview.45",
   "description": "TheGitAI is an agentic AI coding tool for your terminal. It reads and searches your repository, writes and edits files, runs your tests, and verifies the change before handing it back.",
   "keywords": [
     "agentic-ai",
@@ -44,11 +44,11 @@
     "@lydell/node-pty-linux-x64": "1.1.0",
     "@lydell/node-pty-win32-arm64": "1.1.0",
     "@lydell/node-pty-win32-x64": "1.1.0",
-    "@thegitai/tui-darwin-arm64": "1.0.0-preview.44",
-    "@thegitai/tui-darwin-x64": "1.0.0-preview.44",
-    "@thegitai/tui-linux-arm64": "1.0.0-preview.44",
-    "@thegitai/tui-linux-x64": "1.0.0-preview.44",
-    "@thegitai/tui-win32-x64": "1.0.0-preview.44",
+    "@thegitai/tui-darwin-arm64": "1.0.0-preview.45",
+    "@thegitai/tui-darwin-x64": "1.0.0-preview.45",
+    "@thegitai/tui-linux-arm64": "1.0.0-preview.45",
+    "@thegitai/tui-linux-x64": "1.0.0-preview.45",
+    "@thegitai/tui-win32-x64": "1.0.0-preview.45",
     "@vscode/ripgrep": "1.18.0"
   },
   "repository": {