feat(status-bar): consolidate memory + sessions into Resource Usage segment#1415
Open
feat(status-bar): consolidate memory + sessions into Resource Usage segment#1415
Conversation
…egment Merges the Memory and Terminal Sessions status-bar segments into a single Resource Usage segment with a Resources / Terminal Sessions tab strip, daemon Restart and Kill-all-sessions actions in the popover footer, and a 'Daemon not responding' banner when both subsystems are unreachable. The new segment is gated by a single 'resource-usage' StatusBarItem that defaults ON; legacy 'memory' and 'sessions' values migrate in place on load so users who had either enabled keep the new segment visible. Daemon restart + kill-all dialog flows are extracted into a shared useDaemonActions hook so the settings pane and status bar stay in sync. Co-authored-by: Orca <help@stably.ai>
…ions Replaces the heavyweight Radix Tabs strip with a compact segmented pill switcher in the popover header, and moves the Restart daemon and Kill all sessions buttons to icon-only triggers in the top-right of the same header. Removes the full-width footer and the unused Tabs primitive import. Tooltips carry the verbs so the icons stay scannable. Co-authored-by: Orca <help@stably.ai>
Wraps the Resources/Sessions tab content in a fixed-height container so switching between the two panes doesn't reflow the popover. The Sessions panel now fills its parent (h-full + min-h-0) and owns its own scroll instead of capping at a max-h, so empty/short states leave whitespace instead of collapsing the surface. Co-authored-by: Orca <help@stably.ai>
Mirrors the Settings > Manage Sessions row behavior. Every session now gets a kill X in the trailing slot; bound sessions hide it until the row is hovered/focused, orphan sessions show it always. Clicking opens a confirm Dialog (anti-dismiss while in-flight) that calls pty.kill on confirm — same flow the settings pane uses. Co-authored-by: Orca <help@stably.ai>
…d list The popover used to have two tabs: Resources (per-worktree CPU/Mem from the local memory collector, which excludes SSH PTYs by design) and Sessions (every PTY the daemon tracks, local + SSH). With SSH worktrees in use, Sessions could show many worktrees while Resources only showed one — a confusing inconsistency between two adjacent tabs. This consolidates them into a single grouped list (repo → worktree → session) sourced from the union of MemorySnapshot.worktrees and pty.listSessions(). Local rows render numeric CPU/Mem; remote rows render '—' and carry a '· remote' badge on the worktree, with the parent repo also flagged when it contains remote children. Kill-X on every session row with confirm Dialog (mirrors Settings > Manage Sessions). Optimistic removal so killed rows disappear immediately rather than lingering up to the 10s sessions-poll. Focus is restored to the popover body after the dialog closes. The merge is renderer-only and pure: a new mergeSnapshotAndSessions module emits a renderer-local view-model (cpu/memory: number | null) so shared types are untouched. SSH-only sessions resolve to their worktree group via the @@-parse fallback when no tab in this renderer claims the PTY. 12 unit tests cover the dedup, @@-parse, tab-walk-wins, repo aggregate, and all 4 interaction-state paths. Removes the tab switcher and the SessionsTabPanel component. Net -128 lines in the segment file. Co-authored-by: Orca <help@stably.ai>
…sibility Two parity regressions surfaced by a feature-parity audit against the pre-merge two-tab popover: 1. Worktree row was disabled-for-navigation whenever the renderer couldn't find a sidebar storeRecord. That suppressed click for every synthesized SSH worktree row, even though navigateToWorktree already safely handles the unknown case via activateAndRevealWorktree's own no-op path. Split the gate into two flags: isNavigable (only blocks the synthetic Unattributed/Orphan buckets) and showWorktreeActions (still requires a storeRecord, so Sleep/Delete keep working). 2. The sessions-only IPC error path was invisible after the merge — the old SessionsTabPanel rendered "Terminal sessions unavailable". The merged popover only showed the full daemon-unreachable banner when BOTH IPCs failed. Add a slim inline notice for the partial-failure case so users understand why the session list looks empty/stale even though the resource numbers are fine. Co-authored-by: Orca <help@stably.ai>
Two compounding perf issues were making the whole app feel laggy: 1. ResourceUsageStatusSegment is always mounted in the status bar and subscribed to runtimePaneTitlesByTabId via useAppStore. That object mutates on every keystroke in any open terminal pane, so every keystroke was re-running mergeSnapshotAndSessions across every worktree and session in the workspace, even though the popover was closed and the result was never displayed. Gate the merge on the open flag so it only runs when the popover is actually showing. 2. The merge itself did O(N) linear scans over ptyIdsByTabId and tabsByWorktree for every session it processed (S * (T + W) work). With many sessions and tabs that adds up. Pre-build O(1) lookup indices once per merge instead. The bound set is now derived from the same index instead of doing a separate Object.values flat walk. Also removed a duplicate boundPtyIds memo that was paying the same flat-walk cost just to compute orphanCount; folded that into a single cheap pass that runs only on the inputs orphanCount actually depends on. Co-authored-by: Orca <help@stably.ai>
Reserves a fixed-width trailing gutter on every row (session, worktree, repo, Orca app) AND on the column header. The kill-X button now lives inside the gutter on session rows; other rows leave it empty. CPU and Memory cells stay aligned with their column headers regardless of whether a row carries an action button. Also renames the bulk-kill button copy from "Kill N Orphan(s)" to "Kill N orphan terminal(s)" to match the surrounding label conventions and clarify what's being killed. Co-authored-by: Orca <help@stably.ai>
Orphan sessions have no tab in this Orca instance, so there's no "unsaved work in that pane" risk that justifies the confirm step. Clicking the X on an orphan now optimistically removes the row and fires pty.kill straight away — same UX as the bulk Kill orphan terminals button. Bound sessions still confirm because killing them takes a tab the user is actively working in. Co-authored-by: Orca <help@stably.ai>
navigateToWorktree and navigateToTab no longer close the popover, so users can chain multiple jumps (browse worktrees, hop between terminals) without re-opening the segment each time. The popover still closes via outside-click / Escape. Co-authored-by: Orca <help@stably.ai>
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
Merges the Memory and Terminal Sessions status-bar segments into a single Resource Usage segment. The popover has a Resources / Terminal Sessions tab strip, daemon Restart daemon and Kill all sessions buttons in the footer, and a Daemon not responding banner when both data sources are unreachable.
The new segment is gated by a single `resource-usage` `StatusBarItem` that defaults ON; persisted `memory` / `sessions` values migrate in place on hydration so users who had either enabled keep the segment visible.
Daemon restart + kill-all flows live in a new shared `useDaemonActions` hook so the settings pane (`ManageSessionsSection`) and the status bar stay in sync — no copy-paste.
Direction decisions (Phase 0.5 design review)
Files
Verification
Out of scope
Made with Orca 🐋