The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(tui): page long approval commands so every line is reviewable before a choice
Teknium6513a4f591fd
diff --git a/locales/_keys.tui.json b/locales/_keys.tui.jsonindex de2cf19106f..5c956593651 100644--- a/locales/_keys.tui.json+++ b/locales/_keys.tui.json@@ -746,8 +746,9 @@"pickers.session.title","prompt.approval.always","prompt.approval.deny",- "prompt.approval.moreLines","prompt.approval.once",+ "prompt.approval.pageEnd",+ "prompt.approval.pageMore","prompt.approval.session","prompt.approval.title","prompt.clarify.confirmAndContinue",diff --git a/locales/af.tui.yaml b/locales/af.tui.yamlindex 243ea194a53..165e9c16aaa 100644--- a/locales/af.tui.yaml+++ b/locales/af.tui.yaml@@ -762,8 +762,9 @@ pickers.session.title: "Sessies"prompt.approval.always: "Laat altyd toe"prompt.approval.deny: "Weier"-prompt.approval.moreLines: "… +{0} reël(s) meer (volledige teks hierbo)"prompt.approval.once: "Laat eenmalig toe"+prompt.approval.pageEnd: "reëls {0}–{1} van {2} (einde) · druk v om terug te gaan na bo"+prompt.approval.pageMore: "reëls {0}–{1} van {2} · druk v om die res te sien voor jy kies"prompt.approval.session: "Laat vir hierdie sessie toe"prompt.approval.title: "⚠ goedkeuring vereis"prompt.clarify.hint: "↑/↓ kies · Enter {0} · Tab/Shift+Tab wissel vraag · Esc/Ctrl+C kanselleer"diff --git a/locales/ar.tui.yaml b/locales/ar.tui.yamlindex f7c1eb381ec..c387e747e4b 100644--- a/locales/ar.tui.yaml+++ b/locales/ar.tui.yaml@@ -762,8 +762,9 @@ pickers.session.title: "الجلسات"prompt.approval.always: "السماح دائمًا"prompt.approval.deny: "رفض"-prompt.approval.moreLines: "… +{0} أسطر إضافية (النص الكامل أعلاه)"prompt.approval.once: "السماح مرة واحدة"+prompt.approval.pageEnd: "الأسطر {0}–{1} من {2} (النهاية) · اضغط v للعودة إلى البداية"+prompt.approval.pageMore: "الأسطر {0}–{1} من {2} · اضغط v لعرض الباقي قبل الاختيار"prompt.approval.session: "السماح لهذه الجلسة"prompt.approval.title: "⚠ الموافقة مطلوبة"prompt.clarify.hint: "↑/↓ اختيار · Enter {0} · Tab/Shift+Tab تبديل السؤال · Esc/Ctrl+C إلغاء"diff --git a/locales/de.tui.yaml b/locales/de.tui.yamlindex ba71b43fbd6..67c8557e374 100644--- a/locales/de.tui.yaml+++ b/locales/de.tui.yaml@@ -762,8 +762,9 @@ pickers.session.title: "Sitzungen"prompt.approval.always: "Immer erlauben"prompt.approval.deny: "Ablehnen"-prompt.approval.moreLines: "… +{0} weitere Zeile(n) (vollständiger Text oben)"prompt.approval.once: "Einmalig erlauben"+prompt.approval.pageEnd: "Zeilen {0}–{1} von {2} (Ende) · v drücken, um zum Anfang zurückzukehren"+prompt.approval.pageMore: "Zeilen {0}–{1} von {2} · v drücken, um vor der Auswahl den Rest zu sehen"prompt.approval.session: "Für diese Sitzung erlauben"prompt.approval.title: "⚠ Genehmigung erforderlich"prompt.clarify.hint: "↑/↓ auswählen · Enter {0} · Tab/Shift+Tab Frage wechseln · Esc/Ctrl+C abbrechen"diff --git a/locales/es.tui.yaml b/locales/es.tui.yamlindex c9fd35bbf2c..13fc5821ba9 100644--- a/locales/es.tui.yaml+++ b/locales/es.tui.yaml@@ -762,8 +762,9 @@ pickers.session.title: "Sesiones"prompt.approval.always: "Permitir siempre"prompt.approval.deny: "Denegar"-prompt.approval.moreLines: "… +{0} línea(s) más (texto completo arriba)"prompt.approval.once: "Permitir una vez"+prompt.approval.pageEnd: "líneas {0}–{1} de {2} (fin) · pulsa v para volver al principio"+prompt.approval.pageMore: "líneas {0}–{1} de {2} · pulsa v para ver el resto antes de elegir"prompt.approval.session: "Permitir en esta sesión"prompt.approval.title: "⚠ se requiere aprobación"prompt.clarify.hint: "↑/↓ seleccionar · Enter {0} · Tab/Shift+Tab cambiar de pregunta · Esc/Ctrl+C cancelar"diff --git a/locales/fr.tui.yaml b/locales/fr.tui.yamlindex 76d7b4c402e..5b6067e6544 100644--- a/locales/fr.tui.yaml+++ b/locales/fr.tui.yaml@@ -762,8 +762,9 @@ pickers.session.title: "Sessions"prompt.approval.always: "Toujours autoriser"prompt.approval.deny: "Refuser"-prompt.approval.moreLines: "… +{0} ligne(s) de plus (texte complet ci-dessus)"prompt.approval.once: "Autoriser une fois"+prompt.approval.pageEnd: "lignes {0}–{1} sur {2} (fin) · appuyez sur v pour revenir au début"+prompt.approval.pageMore: "lignes {0}–{1} sur {2} · appuyez sur v pour voir la suite avant de choisir"prompt.approval.session: "Autoriser pour cette session"prompt.approval.title: "⚠ approbation requise"prompt.clarify.hint: "↑/↓ choisir · Entrée {0} · Tab/Shift+Tab changer de question · Échap/Ctrl+C annuler"diff --git a/locales/ga.tui.yaml b/locales/ga.tui.yamlindex 215dc3d3485..11cbbb86b62 100644--- a/locales/ga.tui.yaml+++ b/locales/ga.tui.yaml@@ -762,8 +762,9 @@ pickers.session.title: "Seisiúin"prompt.approval.always: "Ceadaigh i gcónaí"prompt.approval.deny: "Diúltaigh"-prompt.approval.moreLines: "… +{0} líne eile (téacs iomlán thuas)"prompt.approval.once: "Ceadaigh uair amháin"+prompt.approval.pageEnd: "línte {0}–{1} as {2} (deireadh) · brúigh v chun filleadh ar an mbarr"+prompt.approval.pageMore: "línte {0}–{1} as {2} · brúigh v chun an chuid eile a fheiceáil sula roghnaíonn tú"prompt.approval.session: "Ceadaigh don seisiún seo"prompt.approval.title: "⚠ cead de dhíth"prompt.clarify.hint: "↑/↓ roghnaigh · Enter {0} · Tab/Shift+Tab athraigh ceist · Esc/Ctrl+C cealaigh"diff --git a/locales/hu.tui.yaml b/locales/hu.tui.yamlindex bd8a9ed3b38..1c30e7f34e8 100644--- a/locales/hu.tui.yaml+++ b/locales/hu.tui.yaml@@ -762,8 +762,9 @@ pickers.session.title: "Munkamenetek"prompt.approval.always: "Mindig engedélyez"prompt.approval.deny: "Elutasít"-prompt.approval.moreLines: "… +{0} további sor (a teljes szöveg fent)"prompt.approval.once: "Egyszer engedélyez"+prompt.approval.pageEnd: "{0}–{1}. sor / {2} (vége) · nyomd meg a v-t, hogy visszaugorj az elejére"+prompt.approval.pageMore: "{0}–{1}. sor / {2} · választás előtt nyomd meg a v-t a többi sor megtekintéséhez"prompt.approval.session: "Engedélyez erre a munkamenetre"prompt.approval.title: "⚠ jóváhagyás szükséges"prompt.clarify.hint: "↑/↓ választás · Enter {0} · Tab/Shift+Tab kérdésváltás · Esc/Ctrl+C mégse"diff --git a/locales/it.tui.yaml b/locales/it.tui.yamlindex 644f6ca1be1..87394b4e12e 100644--- a/locales/it.tui.yaml+++ b/locales/it.tui.yaml@@ -762,8 +762,9 @@ pickers.session.title: "Sessioni"prompt.approval.always: "Consenti sempre"prompt.approval.deny: "Nega"-prompt.approval.moreLines: "… +{0} riga/righe (testo completo sopra)"prompt.approval.once: "Consenti una volta"+prompt.approval.pageEnd: "righe {0}–{1} di {2} (fine) · premi v per tornare all'inizio"+prompt.approval.pageMore: "righe {0}–{1} di {2} · premi v per vedere il resto prima di scegliere"prompt.approval.session: "Consenti per questa sessione"prompt.approval.title: "⚠ approvazione richiesta"prompt.clarify.hint: "↑/↓ seleziona · Invio {0} · Tab/Shift+Tab cambia domanda · Esc/Ctrl+C annulla"diff --git a/locales/ja.tui.yaml b/locales/ja.tui.yamlindex dc4547be9ed..3284929546a 100644--- a/locales/ja.tui.yaml+++ b/locales/ja.tui.yaml@@ -762,8 +762,9 @@ pickers.session.title: "セッション"prompt.approval.always: "常に許可"prompt.approval.deny: "拒否"-prompt.approval.moreLines: "… 他 {0} 行(全文は上記)"prompt.approval.once: "今回のみ許可"+prompt.approval.pageEnd: "{2} 行中 {0}–{1} 行目(末尾)· v で先頭に戻る"+prompt.approval.pageMore: "{2} 行中 {0}–{1} 行目 · 選択する前に v で残りを表示"prompt.approval.session: "このセッション中は許可"prompt.approval.title: "⚠ 承認が必要です"prompt.clarify.hint: "↑/↓ 選択 · Enter {0} · Tab/Shift+Tab 質問を切り替え · Esc/Ctrl+C キャンセル"diff --git a/locales/ko.tui.yaml b/locales/ko.tui.yamlindex 303abb1bce9..d32899e30ec 100644--- a/locales/ko.tui.yaml+++ b/locales/ko.tui.yaml@@ -762,8 +762,9 @@ pickers.session.title: "세션"prompt.approval.always: "항상 허용"prompt.approval.deny: "거부"-prompt.approval.moreLines: "… 외 {0}줄 더 있음 (전체 내용은 위 참조)"prompt.approval.once: "한 번 허용"+prompt.approval.pageEnd: "전체 {2}줄 중 {0}–{1}줄 (끝) · v를 눌러 처음으로 돌아가기"+prompt.approval.pageMore: "전체 {2}줄 중 {0}–{1}줄 · 선택하기 전에 v를 눌러 나머지 보기"prompt.approval.session: "이 세션에서 허용"prompt.approval.title: "⚠ 승인 필요"prompt.clarify.hint: "↑/↓ 선택 · Enter {0} · Tab/Shift+Tab 질문 전환 · Esc/Ctrl+C 취소"diff --git a/locales/pt.tui.yaml b/locales/pt.tui.yamlindex 04f62cb620c..4c4d52df60a 100644--- a/locales/pt.tui.yaml+++ b/locales/pt.tui.yaml@@ -762,8 +762,9 @@ pickers.session.title: "Sessões"prompt.approval.always: "Permitir sempre"prompt.approval.deny: "Negar"-prompt.approval.moreLines: "… +{0} linha(s) a mais (texto completo acima)"prompt.approval.once: "Permitir uma vez"+prompt.approval.pageEnd: "linhas {0}–{1} de {2} (fim) · pressione v para voltar ao início"+prompt.approval.pageMore: "linhas {0}–{1} de {2} · pressione v para ver o resto antes de escolher"prompt.approval.session: "Permitir nesta sessão"prompt.approval.title: "⚠ aprovação necessária"prompt.clarify.hint: "↑/↓ selecionar · Enter {0} · Tab/Shift+Tab trocar pergunta · Esc/Ctrl+C cancelar"diff --git a/locales/ru.tui.yaml b/locales/ru.tui.yamlindex ee3c692ac86..e5234a6addf 100644--- a/locales/ru.tui.yaml+++ b/locales/ru.tui.yaml@@ -762,8 +762,9 @@ pickers.session.title: "Сеансы"prompt.approval.always: "Разрешать всегда"prompt.approval.deny: "Отклонить"-prompt.approval.moreLines: "… ещё строк: {0} (полный текст выше)"prompt.approval.once: "Разрешить один раз"+prompt.approval.pageEnd: "строки {0}–{1} из {2} (конец) · нажмите v, чтобы вернуться к началу"+prompt.approval.pageMore: "строки {0}–{1} из {2} · нажмите v, чтобы увидеть остальное перед выбором"prompt.approval.session: "Разрешить на этот сеанс"prompt.approval.title: "⚠ требуется одобрение"prompt.clarify.hint: "↑/↓ выбор · Enter {0} · Tab/Shift+Tab другой вопрос · Esc/Ctrl+C отмена"diff --git a/locales/tr.tui.yaml b/locales/tr.tui.yamlindex 426464adf08..b716fb29a95 100644--- a/locales/tr.tui.yaml+++ b/locales/tr.tui.yaml@@ -762,8 +762,9 @@ pickers.session.title: "Oturumlar"prompt.approval.always: "Her zaman izin ver"prompt.approval.deny: "Reddet"-prompt.approval.moreLines: "… +{0} satır daha (tam metin yukarıda)"prompt.approval.once: "Bir kez izin ver"+prompt.approval.pageEnd: "{2} satırdan {0}–{1} (son) · başa dönmek için v'ye basın"+prompt.approval.pageMore: "{2} satırdan {0}–{1} · seçmeden önce kalanı görmek için v'ye basın"prompt.approval.session: "Bu oturum için izin ver"prompt.approval.title: "⚠ onay gerekiyor"prompt.clarify.hint: "↑/↓ seç · Enter {0} · Tab/Shift+Tab soru değiştir · Esc/Ctrl+C iptal"diff --git a/locales/uk.tui.yaml b/locales/uk.tui.yamlindex ba0bca0e36b..b639da431b5 100644--- a/locales/uk.tui.yaml+++ b/locales/uk.tui.yaml@@ -762,8 +762,9 @@ pickers.session.title: "Сеанси"prompt.approval.always: "Дозволяти завжди"prompt.approval.deny: "Відхилити"-prompt.approval.moreLines: "… ще {0} рядк. (повний текст вище)"prompt.approval.once: "Дозволити один раз"+prompt.approval.pageEnd: "рядки {0}–{1} з {2} (кінець) · натисніть v, щоб повернутися на початок"+prompt.approval.pageMore: "рядки {0}–{1} з {2} · натисніть v, щоб побачити решту перед вибором"prompt.approval.session: "Дозволити на цей сеанс"prompt.approval.title: "⚠ потрібне схвалення"prompt.clarify.hint: "↑/↓ вибрати · Enter {0} · Tab/Shift+Tab перейти до іншого питання · Esc/Ctrl+C скасувати"diff --git a/locales/zh-hant.tui.yaml b/locales/zh-hant.tui.yamlindex fe392ae87eb..4bfdc25689a 100644--- a/locales/zh-hant.tui.yaml+++ b/locales/zh-hant.tui.yaml@@ -762,8 +762,9 @@ pickers.session.title: "工作階段"prompt.approval.always: "一律允許"prompt.approval.deny: "拒絕"-prompt.approval.moreLines: "… 還有 {0} 行(完整內容見上方)"prompt.approval.once: "允許一次"+prompt.approval.pageEnd: "第 {0}–{1} 行,共 {2} 行(結尾)· 按 v 回到開頭"+prompt.approval.pageMore: "第 {0}–{1} 行,共 {2} 行 · 選擇前按 v 查看其餘內容"prompt.approval.session: "本工作階段允許"prompt.approval.title: "⚠ 需要批准"prompt.clarify.hint: "↑/↓ 選擇 · Enter {0} · Tab/Shift+Tab 切換問題 · Esc/Ctrl+C 取消"diff --git a/locales/zh.tui.yaml b/locales/zh.tui.yamlindex 894fe53c86a..3dee47735bb 100644--- a/locales/zh.tui.yaml+++ b/locales/zh.tui.yaml@@ -762,8 +762,9 @@ pickers.session.title: "会话"prompt.approval.always: "永久允许"prompt.approval.deny: "拒绝"-prompt.approval.moreLines: "… 还有 {0} 行(完整内容见上方)"prompt.approval.once: "仅允许一次"+prompt.approval.pageEnd: "第 {0}–{1} 行,共 {2} 行(结尾)· 按 v 回到开头"+prompt.approval.pageMore: "第 {0}–{1} 行,共 {2} 行 · 选择前按 v 查看其余内容"prompt.approval.session: "本次会话允许"prompt.approval.title: "⚠ 需要批准"prompt.clarify.hint: "↑/↓ 选择 · Enter {0} · Tab/Shift+Tab 切换问题 · Esc/Ctrl+C 取消"diff --git a/ui-tui/src/__tests__/approvalPromptPaging.test.tsx b/ui-tui/src/__tests__/approvalPromptPaging.test.tsxnew file mode 100644index 00000000000..f1a9c682126--- /dev/null+++ b/ui-tui/src/__tests__/approvalPromptPaging.test.tsx@@ -0,0 +1,81 @@+import { EventEmitter } from 'node:events'+import { PassThrough } from 'node:stream'++import { renderSync } from '@hermes/ink'+import React from 'react'+import stripAnsi from 'strip-ansi'+import { describe, expect, it, vi } from 'vitest'++import { ApprovalPrompt } from '../components/prompts.js'+import { DEFAULT_THEME } from '../theme.js'++class FakeInput extends EventEmitter {+ chunks: string[] = []+ isRaw = false+ isTTY = true+ readableLength = 0+ ref = vi.fn()+ setEncoding = vi.fn()+ unref = vi.fn()++ read() {+ const next = this.chunks.shift() ?? null+ this.readableLength = this.chunks.length++ return next+ }++ send(chunk: string) {+ this.chunks.push(chunk)+ this.readableLength = this.chunks.length+ this.emit('readable')+ }++ setRawMode = vi.fn((enabled: boolean) => {+ this.isRaw = enabled+ })+}++const settle = (ms = 25) => new Promise(resolve => setTimeout(resolve, ms))++describe('ApprovalPrompt long commands', () => {+ it('pages to every line of the command before a choice, and says where the rest is', async () => {+ const command = [...Array.from({ length: 10 }, (_, i) => `echo step ${i + 1}`), 'rm -rf ~/important'].join('\n')+ const onChoice = vi.fn()+ const stdin = new FakeInput()+ const stdout = Object.assign(new PassThrough(), { columns: 80, isTTY: false, rows: 40 })+ const frames: string[] = []+ stdout.on('data', chunk => frames.push(chunk.toString()))++ const instance = renderSync(+ <ApprovalPrompt+ cols={80}+ onChoice={onChoice}+ req={{ command, description: 'recursive delete', requestId: 'r1' }}+ t={DEFAULT_THEME}+ />,+ {+ patchConsole: false,+ stdin: stdin as unknown as NodeJS.ReadStream,+ stdout: stdout as unknown as NodeJS.WriteStream+ }+ )++ await settle()+ const first = stripAnsi(frames.join(''))+ expect(first).not.toContain('rm -rf ~/important')+ expect(first).toContain('lines 1–10 of 11 · press v to see the rest before choosing')+ expect(first).not.toContain('full text above')++ frames.length = 0+ stdin.send('v')+ await settle()+ const second = stripAnsi(frames.join(''))+ expect(second).toContain('rm -rf ~/important')+ expect(second).toContain('lines 11–11 of 11 (end)')+ expect(onChoice).not.toHaveBeenCalled()++ instance.unmount()+ instance.cleanup()+ })+})diff --git a/ui-tui/src/components/prompts.tsx b/ui-tui/src/components/prompts.tsxindex 4f36dff1c0c..dbb063dd16b 100644--- a/ui-tui/src/components/prompts.tsx+++ b/ui-tui/src/components/prompts.tsx@@ -23,6 +23,18 @@ const approvalLabels = (): Record<ApprovalChoice, string> => {const CMD_PREVIEW_LINES = 10+/**+ * The page of wrapped command lines on screen. A command longer than one page+ * is paged with `v` (wrapping back to the top), so every line of what will run+ * can be read in the panel before a choice is made.+ */+export function commandPage(total: number, page: number, size = CMD_PREVIEW_LINES) {+ const pages = Math.max(1, Math.ceil(total / size))+ const start = (page % pages) * size++ return { end: Math.min(total, start + size), pages, start }+}+type ApprovalChoice = 'always' | 'deny' | 'once' | 'session'export function approvalOptions(req: ApprovalReq): readonly ApprovalChoice[] {@@ -45,7 +57,8 @@ type ApprovalKey = {upArrow?: boolean}-type ApprovalAction = { kind: 'choose'; choice: ApprovalChoice } | { kind: 'move'; delta: -1 | 1 } | { kind: 'noop' }+type ApprovalAction =+ { kind: 'choose'; choice: ApprovalChoice } | { kind: 'move'; delta: -1 | 1 } | { kind: 'noop' } | { kind: 'page' }/*** Pure key-dispatch for the approval prompt — exported so the regression@@ -57,6 +70,7 @@ type ApprovalAction = { kind: 'choose'; choice: ApprovalChoice } | { kind: 'move* with the global Ctrl+C handler that already calls cancelOverlayFromCtrlC* for approvals). Numbers 1..opts.length pick the labelled choice. Enter* confirms the current selection. ↑/↓ moves the selection within bounds.+ * `v` pages a long command (a no-op when it fits on one page).*/export function approvalAction(ch: string,@@ -78,6 +92,10 @@ export function approvalAction(return { kind: 'choose', choice: opts[sel]! }}+ if (ch === 'v' || ch === 'V') {+ return { kind: 'page' }+ }+if (key.upArrow && sel > 0) {return { kind: 'move', delta: -1 }}@@ -92,8 +110,11 @@ export function approvalAction(export function ApprovalPrompt({ cols = 80, onChoice, req, t }: ApprovalPromptProps) {const T = useT()const [sel, setSel] = useState(0)+ const [page, setPage] = useState(0)const opts = approvalOptions(req)+ useEffect(() => setPage(0), [req])+useInput((ch, key) => {const action = approvalAction(ch, key, sel, opts)@@ -101,6 +122,8 @@ export function ApprovalPrompt({ cols = 80, onChoice, req, t }: ApprovalPromptPronChoice(action.choice)} else if (action.kind === 'move') {setSel(s => s + action.delta)+ } else if (action.kind === 'page') {+ setPage(p => p + 1)}})@@ -113,8 +136,9 @@ export function ApprovalPrompt({ cols = 80, onChoice, req, t }: ApprovalPromptPr.split('\n').flatMap(line => wrapAnsi(line, innerWidth, { hard: true, trim: false }).split('\n'))- const shown = rawLines.slice(0, CMD_PREVIEW_LINES)- const overflow = rawLines.length - shown.length+ const { end, pages, start } = commandPage(rawLines.length, page)+ const shown = rawLines.slice(start, end)+ const pager = end < rawLines.length ? T.prompt.approval.pageMore : T.prompt.approval.pageEndreturn (<Box borderColor={t.color.warn} borderStyle="double" flexDirection="column" paddingX={1}>@@ -129,7 +153,7 @@ export function ApprovalPrompt({ cols = 80, onChoice, req, t }: ApprovalPromptPr</Text>))}- {overflow > 0 ? <Text color={t.color.muted}>{T.prompt.approval.moreLines(overflow)}</Text> : null}+ {pages > 1 ? <Text color={t.color.warn}>{pager(start + 1, end, rawLines.length)}</Text> : null}</Box><Text />diff --git a/ui-tui/src/i18n/en/overlays.ts b/ui-tui/src/i18n/en/overlays.tsindex 4bfee29996a..278ae9e0602 100644--- a/ui-tui/src/i18n/en/overlays.ts+++ b/ui-tui/src/i18n/en/overlays.ts@@ -6,7 +6,10 @@ export const overlaysEn = {prompt: {approval: {title: '⚠ approval required',- moreLines: (count: number) => `… +${count} more line${count === 1 ? '' : 's'} (full text above)`,+ pageMore: (from: number, to: number, total: number) =>+ `lines ${from}–${to} of ${total} · press v to see the rest before choosing`,+ pageEnd: (from: number, to: number, total: number) =>+ `lines ${from}–${to} of ${total} (end) · press v to go back to the top`,once: 'Allow once',session: 'Allow this session',always: 'Always allow',