Skip to content

feat(cli): OpenTUI migration live-session and input batch - #10368

Merged
chiga0 merged 35 commits into
QwenLM:mainfrom
chiga0:feat/tui-live-session-batch
Sep 1, 2026
Merged

chiga0 merged 35 commits into
QwenLM:mainfrom
chiga0:feat/tui-live-session-batch

Conversation

@chiga0

@chiga0 chiga0 commented Aug 28, 2026 •

Copy link
Copy Markdown
Collaborator

What this PR does

Third batch of the OpenTUI migration landing plan (#8662), stacked on the foundation-modules batch: the live-session and input layer of the OpenTUI renderer. It adds the live-session stream fold and its model, message rendering (streaming markdown heal, progressive MCP displays, client tool runs, text batching), the transcript adapter with resume and session-switch support, sticky todos, the composer (view, key handling, input model), mouse rows and scrollbar, unified-diff rendering, and the session-compaction notice. Thirty-six files, about 10.3k lines including tests; 280 new tests, all green.

Everything is additive: no reachable ink code path is touched, nothing imports these modules yet, and the default renderer stays ink. The batch is self-contained on top of the foundation modules (theme, event adapter, input history, slash dispatch, mouse hit-testing) and adds no dependency on the dialog or backend batches that follow.

Two landing notes. This batch carries the first consumer of the markdown-heal dependency that was deferred from the infra batch; it lands in devDependencies per the renderer-deps convention used there. One of the carried modules, the transcript adapter, has no dedicated test file on the implementation branch; its conversion logic is exercised through the resume-mapping tests, which replay saved sessions end to end.

Why it's needed

The migration lands batch by batch so each unit is reviewable on its own merits; this is the batch that brings the live conversation — streaming fold, message rendering, and input — into the OpenTUI tree. With the streaming model and foundation services already landed or under review, this batch connects them to actual session rendering and composer behavior, leaving the dialogs, backend composition, and activation batches to complete the path to a flag-reachable renderer.

Risk & Scope

Main risk is bounded by construction: all modules are unreachable from the running CLI until a later batch wires the renderer dispatch, so the blast radius of a defect here is zero for current users; the default (ink) path is byte-for-byte unchanged. Not validated in this PR: rendering behavior on a real terminal (requires the activation batch to make the renderer reachable), and Windows behavior of the mouse-row/scrollbar geometry (CI covers type-level correctness only). No breaking changes, no migration notes — additive only. The markdown-heal dependency is new to the tree (devDependencies, first consumer lands here per the deferred-dependency plan recorded in the infra batch).

Reviewer Test Plan

All new code is unreachable from the running CLI (no wiring yet), so there is no user-visible behavior change to exercise; verification is build, types, and the test suite.

How to verify

Build all workspaces and run the typecheck — both are clean. Run the dependency-direction gate (npm run check:tui-dep-direction): it passes, confirming the new renderer modules keep the framework-neutral boundary intact. Run the CLI test suite: the full packages/cli suite is green, with the OpenTUI subset at 42 files / 619 tests. To confirm the ink path is untouched, note the diff adds files only under the OpenTUI directory plus the renderer dependency in the CLI package manifest and its lockfile.

Tested on

  • macOS 15 (arm64, local): full workspace build, typecheck, lockfile check, dependency-direction gate, full packages/cli suite, OpenTUI subset 42 files / 619 tests, one mutation spot-check (markdown-heal disabled → 3 tests fail as expected).
  • Linux / Windows: not exercised locally; covered by CI (Test jobs run on ubuntu/windows runners).

Evidence (Before & After)

N/A — no user-visible change; modules are not yet wired into the renderer dispatch.

Linked Issues

Checklist


中文说明:OpenTUI 迁移第三批(Live-session & input)——实时会话折叠与模型、消息渲染(流式 markdown 修复、MCP 渐进显示、工具运行、文本批处理)、转录适配(含 resume/会话切换)、粘性待办、输入框(视图/按键/模型)、鼠标行与滚动条、diff 渲染、会话压缩提示。全部为增量代码,不触碰 ink 可达路径,默认渲染器仍为 ink。stacked 在基础模块批(#10146)之上;本批首次引入基建批延迟的 markdown 修复依赖(置于 devDependencies,沿用渲染器依赖约定)。构建、类型检查、依赖方向门禁全过,全量 CLI 测试绿,OpenTUI 子集 42 文件 / 619 用例。

chiga0 added 5 commits August 28, 2026 10:50
… dialogs scaffolding

Foundation batch of the OpenTUI migration tracked in QwenLM#8662. Adds the renderer-neutral foundation modules under ui/opentui: theme family, a11y (plain-text, screen-reader), clipboard, key-map, mouse hit/caret, link-click + osc8 parity, early-input, exit guard/lifecycle, kitty negotiation, event-adapter, item-projection, slash dispatch (+ command parsing), commands context/output, help content, input history, and the dialog scaffolding primitives (core/shared) with the theme dialog. Two helpers land inside ui/opentui rather than utils/ to respect the utils leaf-layer rule (QwenLM#9737). Stacked on the infra batch: consumes ui/model streaming model and @OpenTui deps. No reachable ink code changes beyond a one-line export addition in the shared osc8 module.
Upstream renamed setGeminiMdFileCount to setMemoryFileCount in the command
UI contract; the rebase onto main surfaced the mismatch at build. Rename
the host interface member, the bridge wiring, the dispatch stub, and the
test mock to match.
Third landing batch of the OpenTUI migration (QwenLM#8662): live-session stream
fold and model, message rendering (markdown heal, MCP progressive, client
tool runs, text batching), transcript adapter with resume/session-switch,
sticky todos, the composer (input-prompt view/key/model), mouse rows and
scrollbar, unified-diff rendering, and session-compaction notice. All
additive — no reachable ink code path is touched, ink remains the default.

Carries the first consumer of the remend dependency deferred from the
infra batch, placed in devDependencies per the renderer-deps convention.
The stacked-skill completion helpers import from the relocated
ui/commands module following the upstream rename.
@chiga0

chiga0 commented Aug 28, 2026

Copy link
Copy Markdown
Collaborator Author

@qwen-code /triage

chiga0 added 3 commits August 28, 2026 16:45
Round-2 review fixes (17 Critical + 10 Suggestion resolved in code):

- dialogs-shared: move number-select flush out of the setState updater
  (StrictMode double-fires onSelect); split setActiveIndex (ink
  SET_ACTIVE_INDEX, lands on any in-range row) from highlightIndex
  (arrow keys skip disabled rows) so wheel navigation never sticks
- event-adapter: chat_compressed notice mirrors ink formatCount ('~'
  prefix for estimated counts); vision_bridge_notice renders
  summary\nnotice; explicit projections for task_execution /
  findings_list / terminal_image keep multi-MB payloads off the
  transcript; retry-countdown-clear forwards isContinuation
- slash-dispatch: isSlashCommandInput drops the '?' branch (ink gate
  routes ? input to the model); executeSlashCommand races the action
  against the abort signal; dialog effects carry the
  OpenDialogActionReturn payload; projected added-item text surfaces
  alongside non-handled effects (notice); message-shaped items project
  to their text; ui.history comes from env; absent sessionStats stamp
  now, not epoch; telemetry parity (recordSkillInvocation /
  recordAutoSkillCommandUsage / makeSlashCommandEvent)
- item-projection: model stats render per-(model,source) sections with
  N/A for unpriced entries; Tool Calls line uses ASCII x like ink;
  redactProxy deduplicated via systemInfoFields export
- theme: palette/syntax colors resolve through color-utils toHex before
  parseColor (ink CSS names / *bright names no longer degrade to
  magenta); unresolvable values stay unset
- key-map: kitty 'kpenter' normalizes to 'return'; resolveCommands
  exposes ink's key fan-out (Ctrl+C fires QUIT + CLEAR_INPUT)
- a11y: hardWrap delegates to wrap-ansi (word-boundary parity with
  ink's screen-reader path); markdown reducer tracks fence length,
  keeps fence-like lines literal inside fences and inner backticks in
  multi-backtick spans; stripAnsi delegates to strip-ansi plus a
  private-parameter CSI pass (SGR mouse, DEC save/restore)
- clipboard: OSC 52 write gated on a TTY (stderr preferred), tests spy
  the stream instead of writing real sequences to the runner's terminal
- exit-guard: independent per-key arm windows like ink
- dialogs-theme: diff preview pane receives syntaxStyle/filetype
…review

- kitty-negotiation: KITTY_REPLY_RE requires at least one flag digit
  (\d+), so an echoed bare query \x1b[?u in PTY/CI environments no
  longer resolves true and locks the renderer into kitty mode on a
  terminal that never answers queries; the accumulation buffer keeps
  only a 256-byte tail (bounded memory, bounded rescan under byte
  floods); the settle-window drain is removed — an EventEmitter data
  listener cannot consume chunks from other listeners, so late replies
  flow to the renderer's input parser like any other terminal noise
- a11y-screen-reader: ScreenReaderOutputWriter sanitizes written
  content (stripAnsi + drop bare C0/C1 controls, keep newlines) so the
  plain-text-only contract is enforced at the writer instead of
  trusting every future caller — smuggled OSC 52 clipboard writes or
  title/cursor sequences cannot execute on the main screen
@chiga0

chiga0 commented Aug 28, 2026

Copy link
Copy Markdown
Collaborator Author

@yiliang114 The head has moved to eb4be25 — it merges the foundation batch's round-2 review fixes (the same modules this batch builds on), so the stacked imports are current. Local verification on that head: 655/655 opentui unit tests pass and typecheck is clean.

The main CI (Test / Desktop Shell workflows) has still never run on this fork PR — only the label/triage/review pipelines fire — so the runs need a workflow approval to produce CI evidence on the head. Could you approve the workflow runs for this PR? (Alternatively I can trigger @qwen-code /verify on the new head if that's the preferred path.)

@chiga0

chiga0 commented Aug 28, 2026

Copy link
Copy Markdown
Collaborator Author

Correction to my earlier note above: the missing main CI here is not a pending workflow approval — the Qwen Code CI workflow only triggers on PRs whose base is main or release/**, and this PR's base is the foundation branch by design (stacked chain). The macOS Live Host CI does run on the head and passes. Full Test/Desktop-Shell CI will land on this change set once the base batch merges and the base flips to main; until then the evidence is the Live Host run plus local verification (655/655 opentui tests + typecheck on the current head). No workflow action needed — sorry for the noise.

chiga0 added 7 commits August 28, 2026 19:18
…ation

All 15 findings from the independent static review verified in source and
fixed (no false positives; none deferred):

- quit effect carries QuitActionReturn.messages projected to text on a
  notice field — ink renders them via QuittingDisplay and the payload was
  permanently lost (Important #1)
- error and finished branches emit retry-countdown-clear like ink's
  handleErrorEvent/handleFinishedEvent, so a terminal event inside the
  countdown window no longer leaves a stale retry row (#2)
- projectContextUsage renders the compaction-threshold ladder and the
  per-item detail sections (tools/memory/skills, ink's sort order) when
  showDetails is on — /context detail transcripts no longer show strictly
  less than the compact view (#3)
- projectMcpStatus honors showSchema (parameter JSON under each tool) and
  showTips, so /mcp schema is distinguishable from /mcp (QwenLM#4)
- SlashDispatchEnv.settings is required: the real
  CommandContext.services.settings is non-null and a null surfaced as a
  generic command failure on first .merged read (QwenLM#5)
- dead singleColumn flag removed from the help width layout (clamp makes
  it always false; ink has no single-column mode) (QwenLM#6)
- truncated SS3 tail (bare ESC O) is stripped like the truncated CSI
  tail, so a captured half F1-F4 no longer leaks 'O' into the composer (QwenLM#7)
- readBufferRow trims cellColumns alongside text, so URLs ending at
  end-of-row on a wide character hit-test on both halves of the cell (QwenLM#8)
- kitty probe writes guarded: a synchronous stream throw settles the
  probe (restores raw mode, removes the listener) instead of leaking (QwenLM#9)
- eraseLines reuses the ansi-escapes helper (already a repo dependency)
  instead of a byte-identical hand-rolled copy (QwenLM#10)
- truncateText passthrough wrapper dropped; callers use the exported
  truncateHelpText directly (QwenLM#11)
- SkillsList truncate keeps total length n like ink, so the description
  column no longer shifts by one cell when a name truncates (QwenLM#12)
- model_fallback names pass through sanitizeDisplayText like ink (QwenLM#13)
- selectIndex fires onHighlight before onSelect (ink dispatches
  SET_ACTIVE_INDEX then SELECT_CURRENT), keeping highlight-driven
  stay-open dialogs synced on mouse input (QwenLM#14)
- mcp_app without fallbackText renders empty instead of JSON-dumping the
  embedded HTML; projectAbout hides Base URL when selectedAuthType is
  empty, matching ink's formatBaseUrl (QwenLM#15)
- executeSlashCommand catch checks the abort signal first: an ESC-
  cancelled command (action rejects AbortError) returns handled with no
  failure telemetry or error message, mirroring ink's processor — the
  race promise never resolves when the signal is already aborted at
  addEventListener time
- submit effect carries the full SubmitPromptActionReturn contract
  (modelOverride, onComplete, refreshContextFilesOnWrite) so the
  backend can honor /model <id> <prompt>, /dream's manual-run record,
  and /remember's context refresh like ink instead of silently
  degrading them
- closing fences cannot carry info text (CommonMark): a ```js line
  inside an open block is literal body, not an early close that drops
  the block and inverts parse state for the rest of the document
- info items append their linkUrl/linkText footer (ink's InfoMessage
  renders it; headless/SSH users need the printed URL, e.g. /bug)
- the screen-reader sanitize keeps TAB: it separates words in
  tool/model output and deleting it fused adjacent tokens
- a11y-plain-text: split on all CommonMark line endings so CRLF
  markdown opens/closes fences correctly; private-param CSI regex
  covers ECMA-48 intermediate bytes; DCS/SOS/PM/APC and unterminated
  OSC sequences consumed before strip-ansi; code-span pattern mirrors
  ink's INLINE_CODE_SPAN_PATTERN (non-empty content, closing-run
  lookbehind)
- dialogs-shared: clearNumberBuffer called from setActiveIndex,
  selectIndex, and resyncKey block so wheel/hover/click/resync can't
  commit a stale numeric-flush selection the user never made
- event-adapter: tool_call_response carries visionBridgeNotice on the
  tool-result event (ink ToolMessage renders the egress disclosure)
- item-projection: projectContextUsage reads memoryFiles as { path,
  tokens } (ContextMemoryDetail), not { name, tokens }
- key-map: 10 kp* keypad-navigation aliases (kpleft→left, …) and
  super flag folded into meta (ink Cmd+Enter = newline, not submit)
- link-click: cellColumns no longer truncated to trimmed text length
  (preserves the wide-glyph right-half boundary); findUrlAtRow end
  boundary is width-aware (stringWidth of the last glyph)
- slash-dispatch: submit effect carries PartListUnion content + a
  textContent string for text-only consumers (image parts survive);
  toggleVimEnabled and startNewSession seams wired from env; abort
  race resolves immediately for an already-aborted signal
- clipboard: OSC 52 self-write removed — copyToClipboard's existing
  fallback (writeOsc52 / wrapForMultiplexer) is the single source
- a11y-screen-reader: appendStatic skips clean === '\n' (ink's
  hasStaticOutput guard)
@chiga0
chiga0 changed the base branch from feat/tui-foundation-batch to main August 31, 2026 03:53
The workflow-run registry gained listStartingRunIds with the workflow
tasks feature on main; backgroundWorkUtils iterates it when describing
blocking work, so the fake registry in session-switch.test.ts now
implements it (empty) to match the interface the merged code expects.
@chiga0

chiga0 commented Aug 31, 2026

Copy link
Copy Markdown
Collaborator Author

Heads-up on the CI reds after retargeting to main: Install dependencies fails with Browser daemon SDK bundle is 220220 bytes; expected <= 220160. This is a main-branch regression, not from this PR — the SDK error-detail surfacing grew the browser-safe bundle past the 215KB build gate, and main's own latest push run fails with the identical error (verified on a clean checkout of main: same 220220 bytes). Filed the one-line budget bump as #10602; once that merges on main this PR's CI should go green on the next run.

@qwen-code-dev-bot qwen-code-dev-bot left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gate APPROVE at head b7fe5b95.

  • Historical blockers: the only formal CHANGES_REQUESTED was the triage stage-1a template gate on 81f13f4; the current body has Tested on, Risk & Scope, and Linked Issues filled in. All 39 review threads are resolved.
  • Required CI on this head: all completed and successful (Test ubuntu, web-shell E2E Smoke, Integration no-AK, CVE audit, TruffleHog, Java matrix, Desktop Shell); only the review-pr pipeline itself is still running.
  • Independent check: the diff is 100% additive (+10,704/−0, 37 files — new modules under packages/cli/src/ui/opentui/, plus remend ^1.3.1 in packages/cli/package.json). Nothing outside ui/opentui/ imports the new modules, so the default ink renderer is untouched; remend matches the tracking plan's deferred item (lands with its first consumer, markdown-heal). No new Critical found.

中文:在 head b7fe5b95 通过门禁。历史唯一正式 CHANGES_REQUESTED 为模板门禁,正文三个必填段已补齐、39 条评审线程全部关闭;当前 head required CI 全绿;本批纯增量(+10,704/−0),新代码全部隔离在 ui/opentui/ 且默认 ink 路径零引用,remend 依赖符合迁移计划的延后约定;独立检查未发现新的 Critical。APPROVE。

@yiliang114
yiliang114 dismissed a stale review August 31, 2026 08:17

Stage 1a template gate is stale: the PR body now carries every required section (Tested on, Risk & Scope, Linked Issues, Checklist) — verified at head b7fe5b9. Dismissing so the decision reflects the current state.

@yiliang114 yiliang114 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Independent pass at b7fe5b9 (the stale stage-1a template gate was dismissed — the body sections are all present now). Local verification on this head: dependency-direction gate PASS, opentui subset 42 files / 671 tests all green, packages/cli tsc clean. Five findings inline — the batch is unwired so none is live today, but four of them become real the moment the renderer is reachable, so they are worth resolving in this batch rather than the activation one. Headlines: the replay id fallback mints mismatched ids for the two sides of one id-less tool call (resumed sessions show tools as skipped with lost output); the session-switch commit point sits after five host mutations instead of at the first irreversible one, so a mid-sequence throw rolls core back under an already-re-keyed UI; diff bodies reach the pre-approval preview without the escapeAnsiCtrlCodes boundary the ink path applies; and remend is a devDependency imported from production source. Not approving this round; happy to re-check once these are addressed.

- transcript-adapter: FIFO queue for id-less tool call pairing so
  tool-start and tool_result share the same minted id
- session-switch: move uiSwapped=true to right after startNewSession
  (the first irreversible host mutation) preventing core/UI divergence
  on mid-sequence throw; same fix for branch handler
- session-switch: add error item when /resume targets an unloadable
  session instead of returning silently
- diff-render: run diff content through escapeAnsiCtrlCodes matching
  the ink text-boundary convention (useTurnDiffs.ts)
- package.json: move remend from devDependencies to dependencies
  (imported from production source markdown-heal.ts)

@qwen-code-dev-bot qwen-code-dev-bot left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gate APPROVE at head fd764e8b on the review conclusion (Test (ubuntu) 21 required checks green; only the review-pr pipeline itself is red, non-code). The delta since my 08:07 approval on b7fe5b95 is exactly the fix commit addressing yiliang114's review: ANSI control-code escaping on every rendered diff line (injection hardening), remend moved from devDependencies to dependencies, uiSwapped set at the true commit point in both session-switch paths (rollback no longer contradicts a half-applied UI swap), FIFO pairing of id-less tool calls to id-less results in the transcript adapter (replacing the orphaning per-result counter), and a user-visible error when a resume loads nothing. All 44 threads resolved. 中文:新提交即评审修复本身(ANSI 转义、remend 依赖段修正、uiSwapped 提交点、无 id 工具结果配对、恢复失败可见报错),required CI 全绿、44 线程全闭,重投 Approve。

@chiga0
chiga0 enabled auto-merge August 31, 2026 15:26

@yiliang114 yiliang114 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Independent pass at fd764e8. Local verification: opentui subset 42 files / 671 tests all green, packages/cli tsc clean; the security dimension found no escape-injection gaps in the new renderers (diff-render escapes every line, toolCard sanitizes, osc8 is sanitized + scheme-allowlisted, clipboard base64 is injection-safe). Four findings inline, two of them worth fixing before merge: the remend manifest/lock divergence will crash production installs the moment this module is wired in, and the thinking-burst latch leaves interleaved thoughts unterminated on replay. Not approving this round; happy to re-check once these land.

Comment thread packages/cli/package.json Resolved
…, text join

- Replace one-shot `closed` latch with `thinkingOpen` state so
  [thought, text, thought, ...] patterns emit matching thinking-end
  for each burst (P2)
- Mirror live path: treat cancelled tool status as failed, not ok (P3)
- Join user text parts with newline instead of empty string (P3)
- Regenerate package-lock.json so remend is in dependencies (P2)
- session-compaction: add missing COMPRESSION_FAILED_EMPTY_SUMMARY,
  OUTPUT_TRUNCATED, and API_ERROR cases to match ink compression-text.ts
- live-session: distinguish cancelled from error in tool-end summary
  so toolStatusMeta renders strikethrough instead of red X
- transcript-adapter: gate slash_command replay on phase=invocation to
  prevent double-replay (recorder writes both invocation and result)
- input-prompt: add key.meta/key.option to DELETE_WORD_BACKWARD branch
  to match the guard condition that intercepts Alt+Backspace
R2-5: update session-compaction.test.ts to assert the three new
parity texts (EMPTY_SUMMARY, OUTPUT_TRUNCATED, API_ERROR) added in
63a7f3c; the old assertion that EMPTY_SUMMARY returned '' is stale.

R3-2: transcript-adapter replay producer folded cancelled tool status
into summary 'error' (red ✕) instead of 'cancelled' (strikethrough).
Add the cancelled branch to match live-session.ts.

R3-12: hidden slash-command invocations (hiddenInvocation: true for
/auth, /help, /settings, /status, bare /effort, /btw) replayed as
visible user rows and entered composer history. Gate them on the
hiddenInvocation flag in the invocation filter.

R4-1: modelOverride was only carried on the first UserQuery send;
ToolResult continuation sends omitted it, so a per-turn model override
silently reverted to the session default after the first tool batch.
Propagate modelOverride into every continuation send.

@qwen-code-dev-bot qwen-code-dev-bot left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gate APPROVE at head 1b896e43. My prior approval (fd764e8b, auto-dismissed by the round-5 pushes) is re-anchored after re-checking those pushes: the R4-1 Critical is verifiably fixed — per-turn modelOverride now rides every ToolResult continuation send, with the cancelled-summary and thinking-latch replays aligned and multi-part user text joined with newlines. The two open Suggestion threads (R4-2 missing witnesses for the round-4 fixes; R4-3 the result-phase outputHistoryItems still not consumed on replay, so a resumed /about-style command shows no output) are confirmed still unaddressed in this head by the fix commit's own scoping — correctness-adjacent but Suggestion-grade; fold them in or open a tracked follow-up. All previously resolved threads stay resolved, required checks otherwise green (Test ubuntu was re-triggered by the 01:05 push, running at submission). Per maintainer policy, decided on the review conclusion. 中文:新修复提交实证解决了 R4-1 Critical(modelOverride 随每次 ToolResult 续发、取消态与 thinking 闩锁对齐、多段 user 文本按换行拼接)。两条未闭 Suggestion(R4-2 缺测试见证、R4-3 result 阶段输出仍未回放)经核对确在本 head 未处理、按建议级放行——请随本 PR 或立 issue 跟进。required 除因新 push 重跑的 Test 外全绿;按维护者指示以 Review 结论投票。

@yiliang114 yiliang114 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re-review at 1b896e4 — all four findings from my first pass are fixed in 859ec33 and verified in source, with confirmation replies in each thread:

  • remend manifest/lock divergence: lock regenerated; node_modules/remend no longer carries the dev flag and the lock lists remend under packages/cli dependencies only, so production installs include it.
  • thinking-burst latch: replaced with a thinkingOpen state machine that closes every burst on thought→non-thought transitions and at record end; interleaved replays settle.
  • cancelled tool results now replay as failed, mirroring the live path.
  • multi-part user prompts join with newline.

The round-5 delta (modelOverride carried into the ToolResult send message, session-compaction tests) is small and consistent. Local verification on this head: opentui subset 42 files / 674 tests all green, packages/cli tsc clean.

@chiga0
chiga0 dismissed a stale review September 1, 2026 02:13

updated

@chiga0
chiga0 added this pull request to the merge queue Sep 1, 2026
Merged via the queue into QwenLM:main with commit b2dfca6 Sep 1, 2026
561 of 576 checks passed
chiga0 added a commit that referenced this pull request Sep 1, 2026
Reconcile stack after #10368 merged. Shared live-session modules
(diff-render, input-prompt, live-session, session-compaction,
transcript-adapter) taken from main's finalized #10368 content;
session-switch keeps this branch's R4-4 review fixes.
pull Bot pushed a commit to Stars1233/qwen-code that referenced this pull request Sep 1, 2026
…-rewind (QwenLM#10383)

* feat(cli): OpenTUI foundation modules — theme, a11y, clipboard, keys, dialogs scaffolding

Foundation batch of the OpenTUI migration tracked in QwenLM#8662. Adds the renderer-neutral foundation modules under ui/opentui: theme family, a11y (plain-text, screen-reader), clipboard, key-map, mouse hit/caret, link-click + osc8 parity, early-input, exit guard/lifecycle, kitty negotiation, event-adapter, item-projection, slash dispatch (+ command parsing), commands context/output, help content, input history, and the dialog scaffolding primitives (core/shared) with the theme dialog. Two helpers land inside ui/opentui rather than utils/ to respect the utils leaf-layer rule (QwenLM#9737). Stacked on the infra batch: consumes ui/model streaming model and @OpenTui deps. No reachable ink code changes beyond a one-line export addition in the shared osc8 module.

* fix(cli): import originals instead of forking slash parser and dialog scope utils

* fix(cli): address R1 review findings in OpenTUI foundation modules

* fix(cli): align OpenTUI command host with the memory-file-count rename

Upstream renamed setGeminiMdFileCount to setMemoryFileCount in the command
UI contract; the rebase onto main surfaced the mismatch at build. Rename
the host interface member, the bridge wiring, the dispatch stub, and the
test mock to match.

* feat(cli): OpenTUI migration live-session and input batch

Third landing batch of the OpenTUI migration (QwenLM#8662): live-session stream
fold and model, message rendering (markdown heal, MCP progressive, client
tool runs, text batching), transcript adapter with resume/session-switch,
sticky todos, the composer (input-prompt view/key/model), mouse rows and
scrollbar, unified-diff rendering, and session-compaction notice. All
additive — no reachable ink code path is touched, ink remains the default.

Carries the first consumer of the remend dependency deferred from the
infra batch, placed in devDependencies per the renderer-deps convention.
The stacked-skill completion helpers import from the relocated
ui/commands module following the upstream rename.

* feat(cli): OpenTUI migration batch 4 — dialogs, commands, and session-rewind

Adds the dialog layer and command-routing infrastructure for the OpenTUI
renderer: 19 dialog modules (auth, extensions, MCP, memory-status, misc,
model family, modes, permissions, settings, stats/skills, help overlay,
arena host, folder-trust gate), the commands registry with slash-to-dialog
routing, the commands dispatcher (action interpreter connecting the slash
gateway to the session and dialog layer), and the session-rewind viewer
with its history-folding model.

Also exports `isUserTextContent` from historyMapping so the rewind model
can classify user turns without duplicating the predicate.

Everything is additive: no reachable ink code path is touched, the default
renderer stays ink, and the dep-direction gate passes. Stacked on the
live-session batch.

56 test files / 886 tests, all green.

* fix(cli): address R2 review findings in OpenTUI foundation modules

Round-2 review fixes (17 Critical + 10 Suggestion resolved in code):

- dialogs-shared: move number-select flush out of the setState updater
  (StrictMode double-fires onSelect); split setActiveIndex (ink
  SET_ACTIVE_INDEX, lands on any in-range row) from highlightIndex
  (arrow keys skip disabled rows) so wheel navigation never sticks
- event-adapter: chat_compressed notice mirrors ink formatCount ('~'
  prefix for estimated counts); vision_bridge_notice renders
  summary\nnotice; explicit projections for task_execution /
  findings_list / terminal_image keep multi-MB payloads off the
  transcript; retry-countdown-clear forwards isContinuation
- slash-dispatch: isSlashCommandInput drops the '?' branch (ink gate
  routes ? input to the model); executeSlashCommand races the action
  against the abort signal; dialog effects carry the
  OpenDialogActionReturn payload; projected added-item text surfaces
  alongside non-handled effects (notice); message-shaped items project
  to their text; ui.history comes from env; absent sessionStats stamp
  now, not epoch; telemetry parity (recordSkillInvocation /
  recordAutoSkillCommandUsage / makeSlashCommandEvent)
- item-projection: model stats render per-(model,source) sections with
  N/A for unpriced entries; Tool Calls line uses ASCII x like ink;
  redactProxy deduplicated via systemInfoFields export
- theme: palette/syntax colors resolve through color-utils toHex before
  parseColor (ink CSS names / *bright names no longer degrade to
  magenta); unresolvable values stay unset
- key-map: kitty 'kpenter' normalizes to 'return'; resolveCommands
  exposes ink's key fan-out (Ctrl+C fires QUIT + CLEAR_INPUT)
- a11y: hardWrap delegates to wrap-ansi (word-boundary parity with
  ink's screen-reader path); markdown reducer tracks fence length,
  keeps fence-like lines literal inside fences and inner backticks in
  multi-backtick spans; stripAnsi delegates to strip-ansi plus a
  private-parameter CSI pass (SGR mouse, DEC save/restore)
- clipboard: OSC 52 write gated on a TTY (stderr preferred), tests spy
  the stream instead of writing real sequences to the runner's terminal
- exit-guard: independent per-key arm windows like ink
- dialogs-theme: diff preview pane receives syntaxStyle/filetype

* fix(cli): harden kitty probe and screen-reader writer per maintainer review

- kitty-negotiation: KITTY_REPLY_RE requires at least one flag digit
  (\d+), so an echoed bare query \x1b[?u in PTY/CI environments no
  longer resolves true and locks the renderer into kitty mode on a
  terminal that never answers queries; the accumulation buffer keeps
  only a 256-byte tail (bounded memory, bounded rescan under byte
  floods); the settle-window drain is removed — an EventEmitter data
  listener cannot consume chunks from other listeners, so late replies
  flow to the renderer's input parser like any other terminal noise
- a11y-screen-reader: ScreenReaderOutputWriter sanitizes written
  content (stripAnsi + drop bare C0/C1 controls, keep newlines) so the
  plain-text-only contract is enforced at the writer instead of
  trusting every future caller — smuggled OSC 52 clipboard writes or
  title/cursor sequences cannot execute on the main screen

* test(cli): strengthen /branch awaits handleBranch assertion with a deferred race

The previous test asserted branchNames was populated after dispatch, but a
fire-and-forget void call passed because microtasks drained before the check.
Replace with a Promise.race that proves dispatch was still pending (blocked on
the closed gate) before the gate was resolved — a void call resolves dispatch
immediately, making the race return 'resolved' instead of the sentinel.

* fix(cli): correct stale 67→69 count in commands-registry docblocks; clarify gate test

Two docblock comments said "67 modules" but the table has 69 entries (verified
against BuiltinCommandLoader.ts). Fixed to 69.

The gated-commands test comment now explains that TypeScript enforces the
CommandGate type at compile time, so the runtime loop is unnecessary — the
literal name list is the intentional guard for a bogus gatedBy on an ungated
command.

* fix(cli): address dialogs-batch self-review findings in command registry

- /theme route results include 'message': themeCommand returns a
  MessageActionReturn under NO_COLOR, so the declared results were
  incomplete
- drop the unreachable 'branch' member from OpenTuiDialogRequest and
  make routeDialogToOpenTui throw on dialog-branch instead: /branch is
  a host action intercepted unconditionally by the dispatcher (ink
  parity), and a compile-time exclusion is not expressible because
  OpenDialogActionReturn is a single interface with a union dialog
  field — the loud throw guards against a future refactor dropping the
  interception; the branch route no longer advertises a dialogs entry
  no renderer opens
- derive gate coverage from the loader instead of a hardcoded name
  list: the coverage test loads with every gate ON (plus the
  checkpointing flag the /restore factory needs) and asserts set
  equality between route names and registered built-ins — no escape
  hatches — and a new test proves every gatedBy route is genuinely
  absent from a gates-off load, so a bogus gate on an always-registered
  command fails

* fix(cli): address ytahdn independent review findings in OpenTUI foundation

All 15 findings from the independent static review verified in source and
fixed (no false positives; none deferred):

- quit effect carries QuitActionReturn.messages projected to text on a
  notice field — ink renders them via QuittingDisplay and the payload was
  permanently lost (Important #1)
- error and finished branches emit retry-countdown-clear like ink's
  handleErrorEvent/handleFinishedEvent, so a terminal event inside the
  countdown window no longer leaves a stale retry row (#2)
- projectContextUsage renders the compaction-threshold ladder and the
  per-item detail sections (tools/memory/skills, ink's sort order) when
  showDetails is on — /context detail transcripts no longer show strictly
  less than the compact view (#3)
- projectMcpStatus honors showSchema (parameter JSON under each tool) and
  showTips, so /mcp schema is distinguishable from /mcp (#4)
- SlashDispatchEnv.settings is required: the real
  CommandContext.services.settings is non-null and a null surfaced as a
  generic command failure on first .merged read (#5)
- dead singleColumn flag removed from the help width layout (clamp makes
  it always false; ink has no single-column mode) (#6)
- truncated SS3 tail (bare ESC O) is stripped like the truncated CSI
  tail, so a captured half F1-F4 no longer leaks 'O' into the composer (#7)
- readBufferRow trims cellColumns alongside text, so URLs ending at
  end-of-row on a wide character hit-test on both halves of the cell (#8)
- kitty probe writes guarded: a synchronous stream throw settles the
  probe (restores raw mode, removes the listener) instead of leaking (#9)
- eraseLines reuses the ansi-escapes helper (already a repo dependency)
  instead of a byte-identical hand-rolled copy (#10)
- truncateText passthrough wrapper dropped; callers use the exported
  truncateHelpText directly (#11)
- SkillsList truncate keeps total length n like ink, so the description
  column no longer shifts by one cell when a name truncates (#12)
- model_fallback names pass through sanitizeDisplayText like ink (#13)
- selectIndex fires onHighlight before onSelect (ink dispatches
  SET_ACTIVE_INDEX then SELECT_CURRENT), keeping highlight-driven
  stay-open dialogs synced on mouse input (#14)
- mcp_app without fallbackText renders empty instead of JSON-dumping the
  embedded HTML; projectAbout hides Base URL when selectedAuthType is
  empty, matching ink's formatBaseUrl (#15)

* fix(cli): drop dead single-column branch in help overlay

The foundation batch removed the always-false singleColumn flag from
the help width layout (the 72-column clamp makes it unreachable and ink
has no single-column mode); the overlay's conditional branch on it no
longer compiles. Only the two-column path was ever taken.

* fix(cli): address R3 review findings in OpenTUI foundation modules

- executeSlashCommand catch checks the abort signal first: an ESC-
  cancelled command (action rejects AbortError) returns handled with no
  failure telemetry or error message, mirroring ink's processor — the
  race promise never resolves when the signal is already aborted at
  addEventListener time
- submit effect carries the full SubmitPromptActionReturn contract
  (modelOverride, onComplete, refreshContextFilesOnWrite) so the
  backend can honor /model <id> <prompt>, /dream's manual-run record,
  and /remember's context refresh like ink instead of silently
  degrading them
- closing fences cannot carry info text (CommonMark): a ```js line
  inside an open block is literal body, not an early close that drops
  the block and inverts parse state for the rest of the document
- info items append their linkUrl/linkText footer (ink's InfoMessage
  renders it; headless/SSH users need the printed URL, e.g. /bug)
- the screen-reader sanitize keeps TAB: it separates words in
  tool/model output and deleting it fused adjacent tokens

* fix(cli): address R4 review findings in OpenTUI foundation modules

- a11y-plain-text: split on all CommonMark line endings so CRLF
  markdown opens/closes fences correctly; private-param CSI regex
  covers ECMA-48 intermediate bytes; DCS/SOS/PM/APC and unterminated
  OSC sequences consumed before strip-ansi; code-span pattern mirrors
  ink's INLINE_CODE_SPAN_PATTERN (non-empty content, closing-run
  lookbehind)
- dialogs-shared: clearNumberBuffer called from setActiveIndex,
  selectIndex, and resyncKey block so wheel/hover/click/resync can't
  commit a stale numeric-flush selection the user never made
- event-adapter: tool_call_response carries visionBridgeNotice on the
  tool-result event (ink ToolMessage renders the egress disclosure)
- item-projection: projectContextUsage reads memoryFiles as { path,
  tokens } (ContextMemoryDetail), not { name, tokens }
- key-map: 10 kp* keypad-navigation aliases (kpleft→left, …) and
  super flag folded into meta (ink Cmd+Enter = newline, not submit)
- link-click: cellColumns no longer truncated to trimmed text length
  (preserves the wide-glyph right-half boundary); findUrlAtRow end
  boundary is width-aware (stringWidth of the last glyph)
- slash-dispatch: submit effect carries PartListUnion content + a
  textContent string for text-only consumers (image parts survive);
  toggleVimEnabled and startNewSession seams wired from env; abort
  race resolves immediately for an already-aborted signal
- clipboard: OSC 52 self-write removed — copyToClipboard's existing
  fallback (writeOsc52 / wrapForMultiplexer) is the single source
- a11y-screen-reader: appendStatic skips clean === '\n' (ink's
  hasStaticOutput guard)

* fix(cli): address QwenLM#10383 R1 findings in foundation modules

- event-adapter: finished branch emits retry-countdown-clear BEFORE the
  info notice so the countdown row is actually cleared (the fold only
  pops when the last item is the retry row)
- item-projection: /mcp tips now include all 5 lines ink renders (added
  OAuth auth tip and Ctrl+T toggle tip)
- link-click: wide-glyph end boundary uses the last code point (not
  UTF-16 code unit) so non-BMP emoji are measured correctly by
  stringWidth
- a11y-plain-text: CSI_SEQUENCE replaces PRIVATE_PARAM_CSI — drops the
  marker requirement so any CSI (with or without private parameter
  marker, with or without intermediate bytes) is fully consumed

* fix(cli): address QwenLM#10383 R1 findings in dialogs batch

- dialogs-mcp: flatServers derived from grouped render order, not raw
  prop order, so keyboard selection matches the highlighted server
- dialogs-misc: highlightScope syncs editor selection (setSel) so Enter
  persists the highlighted scope's own editor, not the previous one
- dialogs-settings: buildSettingsListItems forwards
  excludeWorkspaceRestricted under Workspace scope, matching ink's
  filter that prevents dead settings entries
- dialogs-extensions: all onDetailAction call sites now swallow async
  rejections (.catch), matching session-rewind.tsx's pattern
- dialogs-stats-skills: metrics read from per-session bucket
  (getMetricsForSession) not process-global; Wall Time computed from
  uiTelemetryService.getSessionStartTime() not a module-load constant
- dialogs-modes: MODE_DESC key 'auto_edit' fixed to 'auto-edit' to
  match ApprovalMode.AUTO_EDIT enum value

* fix(cli): address QwenLM#10383 R2 Critical findings in slash-dispatch

- abort race: already-aborted signal now skips command.action entirely
  (result = undefined) instead of eagerly evaluating it as a Promise.race
  argument — the action's side effects (clear, persist, addItem) must not
  run on a cancelled submission
- parent command telemetry: logEvent (slash_command SUCCESS) is now
  called before the early return for parent commands with subCommands
  (help listing) and bare handled — matching ink's finally-block logging

* fix(cli): address QwenLM#10383 R2 Critical findings in dialogs batch

- dialog-data: buildModelEntries image mode gates on
  isImageGenerationCapable (not imageOnly) so dual-role and visionOnly
  image-capable models appear in the image selector like ink
- dialogs-extensions: detailSelect gets resyncKey: view so the cursor
  re-syncs when re-entering detail (action list shrinks after
  checked-update state resets)
- dialogs-stats-skills: subscribes to uiTelemetryService 'update' event
  so stats stay live while the dialog is open (ink re-renders via
  SessionStatsProvider)

* fix(cli): address QwenLM#10383 R3 review findings in opentui dialogs/dispatch

- buildModelEntries: keep visionOnly models in the image selector (ink
  ModelDialog parity: isVisionModelMode || isImageModelMode || !visionOnly)
- useDialogSelect: re-sync the cursor on items changes like ink's
  useSelectionList INITIALIZE reducer — follow the active item's key,
  fall back to the initial index when it is gone, so a shrinking list
  never strands the cursor where Enter reads undefined
- OpenTuiSlashDispatcher: skip the action entirely when the signal is
  already aborted before the race — a late 'abort' listener never fires,
  so the eager race would run side effects before discarding
- tests: pin the pre-aborted skip in both dispatchers, the dual-role
  image/vision fixture, the items-shrink clamp, and restore the
  uninstall-backout guard assertion

* fix(cli): address QwenLM#10368 R2 review findings in live-session batch

- input-prompt: convert OpenTUI display-width cursor coordinates to
  code-point positions at the component boundary — the pinned
  @opentui/core reports logicalCursor.col/offset and el.cursorOffset in
  terminal-cell units (edit-buffer.zig), while the ported ink helpers
  work in code points; wide characters previously shifted placeholder
  backspace, the backslash continuation check, completion targeting,
  and history edge compares
- input-prompt: bump both search sequence refs when Esc dismisses the
  completion dropdown so an in-flight search resolving afterwards cannot
  re-open it and hijack Enter
- live-session-model: carry the vision-bridge egress disclosure through
  the tool-result fold (ink ToolMessage renders it under the result)
- messages: recognize the producers' two-L 'cancelled' summary spelling
  so canceled tools get the CANCELED glyph with strikethrough instead of
  the red ERROR glyph
- session-switch: wrap /resume and /branch in the telemetry swap
  transaction (begin before the outgoing-session capture, commit at the
  UI re-key, abort after a rolled-back swap) — restores the usage
  aggregate on failed swaps and rejects concurrent switches
- tests: display-width fake editor, wide-char placeholder/continuation
  witnesses, Esc invalidation, fold notice, cancelled spelling, and the
  three swap-transaction lifecycle cases

* fix(cli): declare cursorOffset on the FakeEditor test interface

The display-width fake added in 656e996 implements a cursorOffset
getter/setter but the interface it is cast through never declared the
member, so tsc --build fails with TS2339 at the two reads in the
wide-char placeholder test. Typecheck ran before that commit's files
were staged and missed it.

* fix(cli): address QwenLM#10383 R4 review findings in dialogs batch

- commands-dispatch.test: type the pre-aborted action mock as
  SlashCommandActionReturn so tsc --build passes (the inferred
  { type: string } could not satisfy the literal 'message' kind)
- dialogs-shared.test: pin the resyncKey numeric-flush disarm — an
  armed digit quick-select must not commit a selection in the view
  swapped to before the flush timeout
- session-switch.test: pin the unarmed-swap settlement when the
  resumed session is not found (commit, never abort) so the single
  swap slot cannot stay latched forever

* test(cli): stub listStartingRunIds in the session-switch fake registry

The workflow-run registry gained listStartingRunIds with the workflow
tasks feature on main; backgroundWorkUtils iterates it when describing
blocking work, so the fake registry in session-switch.test.ts now
implements it (empty) to match the interface the merged code expects.

* fix(opentui): address P2 review findings in session-rewind and load_history

- session-rewind: add useRef re-entrancy guard to prevent double onRewind
  from batched key events in single stdin chunk
- session-rewind: dispatch restore-error on onRewind rejection so the
  dialog recovers from dead 'restoring' phase back to 'pick'
- commands-dispatch: pass Date.now()-based timestamps to addItem instead
  of array indices in load_history branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants