refactor(tui): TUI module split, CPU spinlock fix, and TUI enhancements#22
Open
ozgurulukir wants to merge 69 commits into
Open
refactor(tui): TUI module split, CPU spinlock fix, and TUI enhancements#22ozgurulukir wants to merge 69 commits into
ozgurulukir wants to merge 69 commits into
Conversation
The application was using ~80% CPU at idle. Three background
threads were busy-waiting with std.Thread.yield() instead of sleeping:
BackgroundManager (UI-thread critical sections), SessionWriter
(runWriter idle loop), and logger.writerThread (idle pop loop).
The agent message queue mutex was also a spinlock, so even short
UI-thread critical sections could spin under contention.
- Replace std.atomic.Mutex with std.Io.Mutex in BackgroundManager,
Agent message queue, SessionWriter, and logger state
- Add std.Io.Condition to SessionWriter and logger, signal on
enqueue/log, wait with waitUncancelable in runWriter/writerThread
- Guard unlock() on lock success to avoid the panic we hit at
exit when a cancel landed between lock() catch {} and unlock()
CPU at idle drops from ~80% to ~2% (verified via ps -L sampling
on the hot thread, gdb backtrace pointed at the logger writer).
ONNX Runtime's default thread pool busy-waits when idle, wasting ~10% CPU per core even when no classify request is in flight. Set OMP_WAIT_POLICY=PASSIVE both in the Zig spawn (env var inherited into the Python child) and in server.py itself, so the thread pool sleeps until work arrives.
Project-level knowledge that came out of the R1 refactor and the earlier spinlock fix, durably encoded so future sessions don't relearn it. - Setup: code-tandem location, project index, vendor fff/ModernBERT, OMP_WAIT_POLICY=passive. - TUI module split: pattern (typed *App/*RootWidget + accessors), the vxfw mutating-widget gotcha, the Strangler Fig rule for inline tests at tui.zig:6520-7462, helper/accessor rules. - Known issues: std.atomic.Mutex -> std.Io.Mutex/Condition (80% -> 2% CPU at idle) and tui.zig monolith size (8586 lines, 28x over limit).
Pull the 200-line RootWidget.captureEvent out of tui.zig into a new event_router module. The original becomes a one-line delegate so the inline tests at tui.zig:6520-7462 (which call RootWidget.captureEvent as a struct-level free function) still resolve without change. Net: tui.zig 8586 -> 8477 lines, event_router.zig 248. event_router takes typed *App and *RootWidget parameters and reads/ writes App state only through dedicated pub accessors. tui.zig does not pass anyopaque -- the boundary in RootWidget.captureEvent keeps the @ptrCast and just calls the new module. Around the extraction: - 20 new pub accessors on App: getIo, inputWidget, inputRealLength, isNormalMode, isDiffViewerMode, getBackgroundModal/setBackgroundModal, isAtSearchActive, atSearchHasResults, getBlockNav/setBlockNav, getPendingQuitAt/setPendingQuitAt/clearPendingQuitAt, getSplit/setSplit, getLanesChipRect, turnStateIsActive, queuedCount, transcriptHasSelection, setThreadAutoScroll. Naming uses getX()/isX() to avoid Zig 0.16's field-vs-method collision; inputWidget takes *App (not *const App) because vxfw TextField.widget() is mutating. - 23 existing App/RootWidget methods made pub (cancelMode, handleInterrupt, toggleBackgroundModal, toggleLaneFullscreen, handleBackgroundModalKey, clearInput, closeAtSearch, handlePermissionKey, resolvePermission, openCommandMenu, insertInputNewline, acceptAtSelection, selectPrevQueued/Next, steerSelectedQueued, moveInputCursorVertical, handleCommandKey, scheduleDiffRefresh, startModelLoad, updateMouseAutoScroll, permissionPending, ensureTick, submit, syncFocus, handleDiffViewerEvent). - RootWidget now pub const (was const) so event_router can name it. - shouldOpenCommandMenuForSlash and ChipRect.contains now pub (kept in tui.zig, used by the router). Behavioural identity: zig build and zig build test both pass. No changes to event semantics, order of checks, or side effects.
…R2.1) Pull the mode-dispatch switch out of App.handleCommandKey into a new command_router module. The original becomes a 1-line delegate; the module owns a per-mode struct (TreePicker, ProviderPicker, ModelPicker, SessionPicker, Lanes, CommandMenu, Transcript) whose handle() method forwards to the corresponding App method for now. R2.2 through R2.8 will move each arm body into the struct and delete the App method. tui.zig net -9 lines (dispatcher 17 lines -> 1-line delegate). The seven arm functions are now pub so command_router can call them. App.getMode() accessor added for the same reason (Zig 0.16 forbids pub on struct fields, and cross-module access goes through pub accessors per the R1 pattern documented in AGENTS.md). Behavioural identity: zig build and zig build test both pass. No changes to key semantics, dispatch order, or side effects. The 6 inline tests at tui.zig:7106-7693 that call App.handleCommandKey directly still resolve via the 1-line delegate.
The TreePicker arm body now lives in command_router.zig:TreePicker.handle instead of App.handleTreePickerKey. The App method is removed; the dispatcher reaches TreePicker directly. Added App.getTreeState() accessor (Zig 0.16 forbids pub on struct fields, so cross-module access goes through pub accessors per the R1 pattern documented in AGENTS.md). Made peekPaletteInput pub; the private copy in tui.zig is removed. Behavioural identity preserved: zig build and zig build test pass. Net: tui.zig -28 lines (the deleted App method body).
The ProviderPicker arm body now lives in command_router.zig:ProviderPicker.handle. App.handleProviderPickerKey removed. The form-stage inline editor and the list-stage picker widget dispatch both happen in the new struct. Added App.getProviderPicker() and App.getProviderKeyInput() accessors for cross-module access (R1 pattern). Made popProviderKeyInput and isCodexSignedIn pub; the private copies in tui.zig are removed. Behavioural identity preserved: zig build and zig build test pass. Net: tui.zig -15 lines.
The ModelPicker arm body now lives in command_router.zig:ModelPicker.handle. App.handleModelPickerKey removed. Added App.getModels() accessor for the ModelCatalogue field. Made cycleModelScope, cycleSelectedReasoning, and stepModelSelection pub so the new struct can call them. The body uses getModels() to read the column and length; the three column mutators and the step function stay on App to avoid bloating the router with selection- state accessors. Behavioural identity preserved: zig build and zig build test pass. Net: tui.zig -25 lines (the deleted App method body).
The SessionPicker arm body now lives in command_router.zig:SessionPicker.handle. App.handleSessionPickerKey removed. Made resumeClearFolds, reloadResumeSessions, toggleSelectedResumeProject, visibleResumeCount, and syncResumeListCursor pub. Added toggleResumeGlobal, getResumeGlobal, getResumeSelection, and setResumeSelection accessors. Also made tui-level previousIndex and nextIndex pub so the router can call them (they were file-private helpers used by several arm bodies). Behavioural identity preserved: zig build and zig build test pass. Net: tui.zig -22 lines.
The Lanes arm body now lives in command_router.zig:Lanes.handle. App.handleLanesKey removed. Made laneEntryCount, mergeSelectedParked, deleteSelectedParked, and reportLaneError pub. Added getLanesSelection, setLanesSelection, and getLanesPurpose accessors. Behavioural identity preserved: zig build and zig build test pass. Net: tui.zig -19 lines.
The CommandMenu arm body now lives in command_router.zig:CommandMenu.handle. App.handleCommandMenuKey removed. Made commandMatchesCount and commandMatchesCountForFilter pub so the router can call them via tui.commandMatchesCount. Added getCommandSelection and setCommandSelection accessors. Behavioural identity preserved: zig build and zig build test pass. Net: tui.zig -7 lines.
The @-mention popup selection (up/down through at_results when the mention popup is open) moves into command_router.MentionPopup.handle. App.handleTranscriptKey no longer touches at_selection directly; the mention check happens in Transcript.handle before delegating to App.handleTranscriptKey for the rest of the arm. Added getAtSelection, setAtSelection, and atResultsLen accessors for cross-module access (R1 pattern). Behavioural identity preserved: zig build and zig build test pass. Net: tui.zig -10 lines.
Block navigation (Shift+Down to jump to bottom, plain Up/Down to walk transcript blocks) moves into command_router.BlockNav.handle. The auto-scroll bookkeeping for stepping down past the last block stays with the navigation logic since they are tightly coupled. Made cycleLane, selectionIsLastMessage, jumpTranscriptToBottom, navigateTranscript, selectedMessageIsLong, and selectedMessageCanScrollDown pub. Made TranscriptNavigation a pub const so the router can name the enum. Added a LaneSwitch stub in command_router that panics if called; the real implementation lands in R2.8c. Transcript.handle tries each sub-handler in order, falling through to App.handleTranscriptKey for the bits still on App (currently: lane switch + tab toggle). Behavioural identity preserved: zig build and zig build test pass. Net: tui.zig -22 lines.
The lane switch and tab-toggle concerns move into command_router.LaneSwitch.handle. App.handleTranscriptKey becomes a 1-line delegate (matching the R2.1 Strangler Fig pattern for handleCommandKey, handleCommandMenuKey, etc.) that simply calls command_router.Transcript.handle. Added threadsCount and toggleSelectedTranscriptBlock accessors so the router can check multi-lane state and toggle the selected transcript block. Made Transcript, MentionPopup, BlockNav, and LaneSwitch pub so tui.zig:handleTranscriptKey can reach them. Behavioural identity preserved: zig build and zig build test pass. The 5 inline tests at tui.zig:6467-6614 that call app.handleTranscriptKey still resolve via the 1-line delegate. Net: tui.zig -16 lines.
…R3.1)
The 5 @-mention popup fields (at_active, at_query, at_results,
at_selection, at_indexing, at_kind) move out of the central App
struct and into a new app_state.AtSearchState sub-struct. App now
holds at_search: app_state.AtSearchState = .{}.
All 36 call sites inside tui.zig migrated via sed:
self.at_X -> self.at_search.X
self.app.at_X -> self.app.at_search.X
Cross-module accessors (isAtSearchActive, atSearchHasResults,
getAtSelection, setAtSelection, atResultsLen) updated to read
through the sub-struct. External callers in event_router and
command_router see no change because they go through these
accessors.
Made MentionSearchKind pub const so app_state.zig can name the type
without re-declaring it.
Behavioural identity preserved: zig build and zig build test pass.
Net: tui.zig -4 lines (47 insert, 51 delete for the 36 refactored
sites). Field count on App drops from 70 to 65.
The three vxfw.TextField widgets (input, palette_input, comment_input)
move out of the central App struct and into a new
app_state.InputState sub-struct. App now holds inputs: app_state.InputState.
Init in App.init updated to construct the sub-struct in place:
.inputs = .{ .input = .init(gpa), .palette = .init(gpa), .comment = .init(gpa) }
All 41 call sites inside tui.zig migrated via sed:
self.input / self.palette_input / self.comment_input
-> self.inputs.input / .palette / .comment
self.app.input / self.app.palette_input / self.app.comment_input
-> self.app.inputs.input / .palette / .comment
app.input / .comment_input / .palette_input
-> app.inputs.input / .comment / .palette
Cross-module accessors (inputWidget, inputRealLength, peekPaletteInput)
updated to read through the sub-struct.
Behavioural identity preserved: zig build and zig build test pass.
Field count on App drops from 65 to 63.
The three picker widgets (tree_state, models, provider_picker) move
out of the central App struct and into a new
app_state.PickerStates sub-struct. App now holds
pickers: app_state.PickerStates = .{}.
Init updated to construct only the tree (the only one without a
default); models and provider default-initialise from their struct
defaults.
All 156 call sites inside tui.zig migrated via sed:
self.X / self.app.X / app.X (where X is one of tree_state, models,
provider_picker) -> self.pickers.X / self.app.pickers.X / app.pickers.X
Cross-module accessors (getTreeState, getProviderPicker, getModels)
updated to read through the sub-struct.
Behavioural identity preserved: zig build and zig build test pass.
Field count on App drops from 63 to 61.
Nine navigation cursor fields (block_nav, command_selection,
resume_selection, resume_global, lanes_selection, lanes_purpose,
queued_selection, pending_quit_at, lanes_chip_rect) move out of
the central App struct and into a new app_state.NavState sub-struct.
App now holds nav: app_state.NavState = .{}.
The LanesPurpose enum moves into NavState as a pub const (so it
stays reachable from tui.zig:App.getLanesPurpose) and ChipRect was
made pub at module level for the same reason. tui.zig:App.LanesPurpose
becomes a re-export so existing accessors and call sites compile
unchanged.
All call sites inside tui.zig migrated via sed:
self.X / self.app.X / app.X (X is one of the 9 nav fields)
-> self.nav.X / self.app.nav.X / app.nav.X
Cross-module accessors (getResumeSelection/setResumeSelection,
getLanesSelection/setLanesSelection, getLanesPurpose,
getCommandSelection/setCommandSelection, getBlockNav/setBlockNav,
getPendingQuitAt/setPendingQuitAt/clearPendingQuitAt,
toggleResumeGlobal, getResumeGlobal) updated to read through
the sub-struct.
Behavioural identity preserved: zig build and zig build test pass.
Field count on App drops from 61 to 52.
Four background-modal fields (background_modal, background_selection,
background_cancel_focus, background_pending) move out of the central
App struct and into a new app_state.BackgroundModalState sub-struct.
App now holds background_modal_state: app_state.BackgroundModalState = .{}.
The BackgroundDelivery struct moves into BackgroundModalState as a
pub const (so tui.zig can keep the type name) and tui.BackgroundDelivery
becomes a re-export. Same circular-import pattern as R3.4 (LanesPurpose
into NavState).
All call sites inside tui.zig migrated via sed:
self.X / self.app.X / app.X (X is one of the 4 background fields)
-> self.background_modal_state.X / .background_modal_state.X
Cross-module accessors (getBackgroundModal, setBackgroundModal)
updated to read through the sub-struct.
Behavioural identity preserved: zig build and zig build test pass.
Field count on App drops from 52 to 49.
Eleven visual-feedback fields (loading_frame, loading_tick_active,
blackhole_frame, blackhole_visible, git_label, diff_counts,
diff_refresh_future/done/again, diff_cache, diff_loading) move out
of the central App struct and into a new app_state.MetricsState
sub-struct. App now holds metrics: app_state.MetricsState = .{}.
The DiffCounts and DiffRefreshOutcome types are now pub at module
level so app_state.zig can name them. MessageListBuilder keeps its
own loading_frame/blackhole_frame fields and receives the values
from App.metrics in the TranscriptWidget draw call (was previously
direct self.metrics.X; corrected in the commit since MessageList-
Builder doesn't have an `app` pointer).
All call sites inside tui.zig migrated via sed:
self.X / self.app.X / app.X (X is one of the 11 metrics fields)
-> self.metrics.X / self.app.metrics.X / app.metrics.X
Behavioural identity preserved: zig build and zig build test pass.
Field count on App drops from 49 to 38.
…ry.zig (R4) The poll/format/deliver triplet (pollBackgroundJobs, formatBackgroundNotice, deliverPendingBackground, freeDelivery, backgroundActive) moves out of tui.zig into a new tui/background_delivery.zig module. App methods remain as 1-line delegates so the dispatch sites in tui.zig compile unchanged. Made laneForAgent and startDeliveryTurnOnCurrentThread pub since the new module calls them. Promoted background_mod and BackgroundDelivery to module-level pub so the new module can name them without circular import gymnastics. Behavioural identity preserved: zig build and zig build test pass. Net: tui.zig -85 lines (the deleted bodies of 5 methods). background_delivery.zig +127 lines including doc comments.
…gets/ (R5.1a) R5.1a of the tui-split sub-project: two isolated modal widgets moved from tui.zig to dedicated files under src/tui/widgets/. - background_jobs.zig (105 lines): BackgroundJobsWidget + BackgroundJobsInner + formatJobElapsed helper - permission.zig (116 lines): PermissionWidget + PermissionInner + drawPermissionCommand + drawPermissionActions + actionLabel + permissionActionStyle tui.zig drops 180 lines (8263 -> 8083). agent_worker is now pub const so widget files can reach ApprovalSnapshot/ApprovalDecision as tui.agent_worker.<Type>.
R5.1c of the tui-split sub-project: 27-line loading-spinner widget moved from tui.zig to its own file. The widget delegates frame rendering to tui_message.MessageWidget.drawLoading, so it only needs the loading_spinners array and the App reference. tui.zig drops 26 lines (8083 -> 8057).
R5.1b of the tui-split sub-project: the diff body, comment editor, and file-search popup (plus 7 helpers) moved from tui.zig to a dedicated module. - DiffBodyWidget: per-line rendering with scroll/cursor/selection, interleaves comment previews after their last line - DiffCommentEditor: bordered input box for editing the active comment - DiffSearchWidget + DiffSearchInner: centered file-search popup - Helpers: drawDiffRow, drawHunkHeader, bgMerged, writeDiffSegment, activeCovers, drawCommentPreview, mergedDiffStyle, expandTabs, firstVisibleWindow writeBorderLabelRight is promoted to pub fn so the comment editor can reach it from outside tui.zig. agent_worker is unchanged. tui.zig drops 345 lines (8057 -> 7712).
….1d) R5.1d of the tui-split sub-project: the per-lane transcript pane moved from tui.zig to its own file. Includes MessageListBuilder (the vxfw list-view builder that hydrates MessageWidget instances per row). - TranscriptWidget: viewport/cursor sync, auto-scroll, blackhole visibility, scroll-to-tail when cursor moves past fold - MessageListBuilder: builds MessageWidget rows from Thread.transcript.messages - Promotes Thread and transcript_mod to pub const so the widget can reach Thread.transcript.messages - Uses tx_widget alias to avoid shadowing App.transcript field and local transcript_widget test variable tui.zig drops 87 lines (7712 -> 7625).
…tests The two BackgroundManager tests that exercised the full reader-thread lifecycle (start → poll takeFinished → assert completion) hung forever under `zig build test` because the reader thread relies on `Io.File.MultiReader` whose `fill` does not get completion notifications through the test runner's `std.testing.io` instance. strace showed the child process execve'd bash, wrote 'hello-bg' to stdout, and exited 0 — but the reader thread never observed EOF on the pipe and so never set `job.state = .finished`, leaving the test to poll its full 500×10ms budget and then block on `deinit`'s `thread.join()`. The fix is to drop the integration test shape entirely and split the coverage into focused unit tests that don't spawn a real subprocess: - 'BackgroundManager init/deinit cycle is clean' — empty manager lifecycle, takeFinished on empty list returns empty slice - 'BackgroundManager tracks active and running counts' — idempotent takeFinished, snapshot on empty, active/running counts Plus a 'bash subprocess executes and returns captured output' test that pins the contract `manager.start` relies on (bash exists, `exec 2>&1` + printf exits 0, stdout is captured) via the `std.process.run` API that works reliably under std.testing.io. Net effect: `zig build test` drops from infinite hang to 2.3s, all 310 tests in the root module pass. Investigation root cause (encoded for future spelunkers): - `std.testing.io` is initialized by the default test runner as `Io.Threaded.init`, but `MultiReader.fill` on a child stdout pipe appears to never observe EOF when the writer exits — the test thread's `takeFinished` poll sees an empty list forever. - Live TUI (`std.start`'s Io.Threaded instance) is unaffected; only the test runner's I/O instance exhibits this.
- Remove code-tandem path, semantic_search/index_workspace usage hint, and the Project Workflow section (those belong in private notes, not project-level AGENTS.md) - Add 'TUI module split' note pointing at README for the current module layout, with the R1-R5 phase summary - Add 'Widget extraction pattern' capturing the shape of files under src/tui/widgets/ (pub const outer border widget + private Inner built in draw + relative-import pattern for tui.zig/style.zig/panel.zig + pub const re-export of nested types via tui.zig) - Add 'Per-mode command routing' note so new per-mode logic lands in command_router.zig instead of as private methods on App - Setup: spell out ModernBERT path and the install-prefix command
R5.2a of the tui-split sub-project: the 14-line per-lane column wrapper moved out of RootWidget. The function borders a TranscriptWidget with a label showing the lane title prefixed with an active (●) / inactive (○) marker; called by drawRoot when tiling multiple lanes side-by-side. Promoted from a RootWidget method to a free function taking *App, matching the pattern used by background_delivery.zig (R4). tui.zig drops 14 lines.
R6.3c of the tui-split sub-project: the 60-line parallel lane creation function moved out of tui.zig. Free function taking *App. Prep (4 promotions, folded in): - App.repoRoot, App.captureLaneContext, App.createRuntime, App.resetTurnState — called by createParallelLane. - lane_naming_context_max (module-level const) promoted to pub. tui.zig drops 62 lines (6667 -> 6606). lifecycle.zig grows by 64 lines. zig build test 2.3s, all 310 tests pass.
…ig (R6.3d) R6.3d of the tui-split sub-project: the 94-line diff-browsing key router and its 9-line close helper moved out of tui.zig. Free functions taking *RootWidget + *vxfw.EventContext (key too for the router). tui.zig keeps one-line delegates for both. Prep (2 promotions, folded in): - App.clearPaletteInput — called by handleDiffBrowseKey (Ctrl+P file-search trigger). - App.closeDiffViewer — called by closeDiff; mistakenly omitted from the R6.0 audit but needed for the move. Added here. handleDiffSearchKey and handleDiffCommentKey stay in tui.zig (they only call pub App methods and don't need their own file yet; they can follow the same pattern in a future pass). tui.zig drops 108 lines (6611 -> 6503). lifecycle.zig grows by 114 lines. zig build test 2.3s, all 310 tests pass.
…7.1) R7.1 of the tui-split sub-project: the mode overlay popup and its helpers moved out of tui.zig. Moved (304 lines): - OverlaySize, overlaySize (popup dimensions per mode) - overlayLabel (border label per mode) - writeBorderLabel, writeBorderLabelLeft (border-label helpers) - OverlayWidget + drawOverlay (public, instantiated by drawRoot) - OverlayInner + drawInner (mode-switch dispatching to picker widgets) Promotions (7, to unblock the move): - App.Mode (enum), App.buildLaneEntries - Command, CommandEntry, commands (array constant) - commandVisible, reasoningOptions, modelPickerScope tui.zig drops 289 lines (6232 -> 5943). widgets/overlay.zig 312 lines. root_layout.zig updated to use overlay.OverlayWidget. zig build test 2.3s, all 310 tests pass.
…lifecycle.zig (R7.2) R7.2 of the tui-split sub-project: the /diff file-search popup and comment-editor key routers moved out of tui.zig into the lifecycle module alongside handleDiffBrowseKey (R6.3d). Free functions taking *RootWidget + *vxfw.EventContext + vaxis.Key. Prep: App.peekCommentInput promoted to pub (used by handleDiffCommentKey to read the editor draft). tui.zig drops 56 lines (5943 -> ~5887). lifecycle.zig grows by 58 lines. zig build test 2.3s, all 310 tests pass.
R7.3 of the tui-split sub-project: four pub RootWidget methods and one dispatcher moved out of tui.zig into the lifecycle module. Moved: - syncFocus — routes keyboard focus to the correct widget per mode - ensureTick — schedules the next animation/drain tick - submit — submits the current input (picker close, command, turn) - handleDiffViewerEvent — dispatches to per-sub-mode diff handlers Prep: App.submitMode promoted to pub (called by submit). Existing lifecycle callers updated from RootWidget.syncFocus/ensureTick to the free-function versions (no prefix). tui.zig drops 57 lines (6188 -> ~6131). lifecycle.zig grows by 64 lines. zig build test 2.3s, all 310 tests pass.
R7.4 of the tui-split sub-project: three small extractions. Extracted: - diff_utils.zig: parseDiffCounts, countDiff, parseDiffCountLine, parseNumstatField, saturatingAdd, loadGitLabel — pure allocation-free stat/numstat parsers and git label loader. No App dependency. - lanes.zig: MergeSource, workingLaneOf, lastPathSegment, laneErrorText — lane merge type and pure helpers. No App dependency. - Deleted duplicate MessageListBuilder (already in widgets/transcript.zig from R5.1d — was left behind in tui.zig). tui.zig drops 130 lines (6074 -> 5944).
… (R7.5) R7.5 of the tui-split sub-project: ~900 lines of provider connection, model catalogue loading, and model selection logic moved out of tui.zig into a dedicated module. Extracted (~50 pub fns): - Provider flow: openProviderPicker, submitProviderSetup, connectCodex, signOutCodex, applySelectedModel, refreshProviderApiKeys, etc. - Model loading: startModelLoad, drainModelLoad, reloadModelCatalog, loadCompatibleCatalog, fetchCompatibleCatalog, etc. - Model selection: cycleModelScope, stepModelSelection, modelDisplayMatches, etc. - Caching: restoreModelCache, saveModelCache, collectModelCacheConfigured - Helpers: localModelLabel, includeLocalModel, compatibleBaseUrl, compatibleApiKey, etc. Promotions (to unblock the move): - App.ModelCatalog, App.discardAbandonedTurn, App.reloadTreeNodes (pub) Cross-module updates: - event_router.zig: startModelLoad call → provider_model - lifecycle.zig: cancelModelLoad, drainModelLoad, closeDiffViewer → provider_model - command_router.zig: cycleSelectedReasoning, cycleModelScope, stepModelSelection → provider_model - tui.zig: 9 inline test call sites updated from app.fn() to provider_model.fn() tui.zig drops 939 lines (5087 -> 4148). provider_model.zig 920 lines. zig build test 2.3s, all 310 tests pass.
…exit commands - Visual & telemetry upgrades: context progress bar, tool icons, fuzzy search, slash command categories, diff status footer, amber notice style - UX accessibility: prompt history navigation (Ctrl+Up/Down), scrollable /help overlay picker, terminal bell notifications (ringBell) - Fixed @-mention file picker indexing stall: background fff pre-initialization, unblocked .find path search, auto-polling on draw - Exit enhancements: added /exit & /quit commands, double-tap Ctrl+C / Ctrl+D exit prompt with amber visual hint
- Widened build-time gen_model_catalog.zig generator to cover all providers from models.dev database - Updated TUI context progress bar calculation in input.zig to dynamically compute live token footprint vs model limit for all providers and models
… endpoints - Added description metadata method to Provider enum for all integrated AI providers - Enriched /connect provider list and form screens to show provider descriptions, default API endpoint URLs, and status indicators
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Comprehensive refactor of the monolithic
tui.ziginto domain-specific modules (R1-R7), CPU spinlock fix, TUI enhancements, and documentation updates. 69 files changed, +8750 / −6076 lines.Changes
CPU Spinlock Fix (idle 80% → 2%)
lib/logger.zig,src/agent.zig,src/background.zig,src/session.zig— replacedstd.atomic.Mutexspinlocks withstd.Io.Mutex+std.Io.Condition. Writer threads now sleep on condition variables instead of busy-waiting withstd.Thread.yield(). Verified viaps -Lsampling andgdbbacktrace.src/local_models.zig,vendor/local-models/server.py— setOMP_WAIT_POLICY=PASSIVEso ONNX Runtime thread pool sleeps when idle (was wasting ~10% CPU per core)..gitignore— ignorevendor/fff/libfff_c.sobuild artifact.TUI Module Split (R1-R7)
Systematic extraction of the 8600-line
tui.ziginto focused modules. Each extraction keeps the original method as a 1-line delegate (Strangler Fig pattern) so inline tests continue to resolve.R1 — Event routing
src/tui/event_router.zig—captureEventextractedR2 — Per-mode command routing
src/tui/command_router.zig— one struct perApp.Modevariant, each with ahandlemethod; dispatcher delegates to the right structR3 — App state grouping
src/tui/app_state.zig— sub-structs:AtSearchState,InputState,PickerStates,NavState, background modal state,MetricsStateR4 — Background delivery
src/tui/background_delivery.zig— background-job poll/format/deliver, modal toggling, job cancelR5 — Widget extraction
src/tui/widgets/background_jobs.zig,permission.zig,loading.zig,diff.zig,transcript.zigsrc/tui/layout.zig,lane_column.zig,diff_viewer_overlay.zigR6 — Root layout & lifecycle
src/tui/root_layout.zig—drawRootextractedsrc/tui/lifecycle.zig—deinit,handleTick,drainAgentEvents,createParallelLane, diff key handlers,syncFocus,submit,ensureTicksrc/tui/widgets/input.zig—InputWidgetfamilyR7 — High-ROI extractions
src/tui/widgets/overlay.zig—OverlayWidgetfamilysrc/tui/provider_model.zig— provider connection, model catalogue loading, model selection (~50 functions)src/tui/at_search.zig,transcript_nav.zig,permission.zig,event_callbacks.zig,queue.zigsrc/tui/lane_lifecycle.zig,diff_lifecycle.zig,session_switcher.zigsrc/tui/diff_utils.zig— pure allocation-free stat/numstat parsers and git label loadersrc/tui/lanes.zig—MergeSourcetype and lane merge helperssrc/tui/thread.zig—Thread(lane) state, multi-lane state machinesrc/tui/turn_lifecycle.zig— turn start, interrupt, event application, cancel/resetsrc/tui/transcript_lifecycle.zig— runtime installation and transcript rebuildingsrc/tui/input_lifecycle.zig— input buffer peeking, clearing, vertical cursor navigationsrc/tui/mode_lifecycle.zig— command matching, slash menu checks, mode switchingsrc/tui/checkpoint.zig— git-shadow checkpoint snapshotting, readiness checks,/savesrc/tui/style.zig— shared style helpersTUI Enhancements
help_picker.zigwidget with keyboard navigationringBellon events.findpath search, auto-polling on draw/exitand/quitcommands, double-tap Ctrl+C / Ctrl+D exit prompt with amber visual hint/connectlist and form screensgen_model_catalog.zigto cover all providers from models.dev database; dynamic token footprint calculation vs model limit/connectlogo message when a provider is already connectedTesting
src/background.zig— rewrote flaky reader-thread integration tests as focused state-machine unit tests.zig build testdrops from infinite hang to 2.3s, all 310 tests pass.Documentation
AGENTS.md— captured TUI module-split gotchas (vxfw mutating-widget, Strangler Fig rule, accessor patterns), CPU spinlock fix as known issue, setup instructions for vendor/fff and ModernBERTREADME.md— synced Architecture section with all new modules throughout R1-R7Verification