Repository navigation
Merge upstream quattro (Codex/Claude usage, OpenClaw self-update, image picker) - #59
Merged
6 commits merged intoOct 5, 2026
Merged
6 commits merged into
6 commits merged into
Conversation
…ommunity PRs (omacom#14049) * Read Codex app-server replies from the raw fd (omacom#13703) * Resolve Codex through mise which instead of running the lazy launcher (omacom#13109) * Skip the Codex app-server probe when there are no credentials (omacom#13106) Adapted: credentials are checked in the home being probed rather than in the CODEX_HOME environment variable, since each registered account is probed in its own home, so a signed-out secondary account isn't hidden behind the primary's login. A home without credentials reports "Waiting for auth" like any other signed-out home. The credentials store setting is read with tomllib, so a single-quoted value counts too. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Show the Codex CLI's own error when its app-server dies (omacom#8977) Detect an app-server that exits or stops answering, and report the end of its stderr instead of a bare RPC method name. Rebased onto the raw-fd reply reader; the switch from "-a on-request" to "-a never" is left out, keeping the current approval flags. * Count pi sessions when HOME is a git checkout (omacom#13209) * Count only OpenAI-backed native sessions as Codex usage (omacom#12032) * Deduplicate Pi usage across forked sessions (omacom#8602) * Skip unchanged native Codex token snapshots (omacom#10531) * Count omp and pi profile sessions in the agent usage collectors (omacom#9546) `omp --profile=<name>` (and pi's equivalent) relocates the whole agent tree under <base>/profiles/<name>/. The Claude and Codex collectors only ever scanned <base>/agent/sessions, so a subscription driven entirely through a profile was invisible to the agents panel: no tokens by day, no tokens by model, no prompt or session counts. Discover the profile roots alongside the default one. Sessions are keyed by file path, so a profile adds sessions instead of double-counting the default root, and a missing or unreadable profiles directory leaves the existing behavior untouched. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_014zFbJcDEEpV5BAmsH6kAB3 * Skip unrelated Codex session lines before JSON parsing (omacom#12803) Adapted: session_meta lines also pass the pre-filter, since the provider filter from omacom#12032 reads them to skip rollouts served by a non-OpenAI provider. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Read only the Codex session files that changed since the last scan (omacom#12595) Native Codex rollouts keep per-file totals between runs, replayed while a file's mtime and size are unchanged. Rebased onto the session_meta provider filter, snapshot dedup, and line pre-filter, which now live in the per-file reader. pi and omp sessions are left out of the per-file cache: a forked pi session repeats its parent's messages, so they are deduplicated across the whole tree on every scan. * Count streamed Claude messages by their highest-output usage line (omacom#10606) Claude Code writes a streamed assistant response as several transcript lines that share one message id, one per content block. Each line carries a usage object. The first line's output_tokens is a placeholder, often 1, and the last line has the real count. Input and cache fields usually match across the lines. The scanner dedupes by message id and keeps the first line it sees, so it under-counts output tokens. On a machine with 2,577 transcripts it reported 39.0M output tokens against 60.1M used, a 35% shortfall. Input and both cache fields differed by under 0.01%. Keep the line with the highest output count, with the last one scanned winning a tie. The whole line is kept because a response can fall back to another model mid-stream. Those lines are separate snapshots with different cache figures and a different model, and taking a maximum per field across them over-counts cache tokens and credits the wrong model. The zero-usage check now runs before dedup, so a zero-usage first line no longer claims a message id and hides a later line with real usage. Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> Co-authored-by: GPT-6 Astra <noreply@openai.com> * Index Claude transcripts so the agents refresh reads only what was appended (omacom#8313) omarchy-agent-usage-claude re-parsed every line of every transcript under ~/.claude/projects on each refresh: no mtime cutoff, no memory of the last pass. The agents widget is on by default and ticks every 15 minutes, so the cost grew for the life of the machine. After one month here that was 803 files, 640 MB, 127k lines and 57k JSON parses per tick, about 1 core-second, pushed through the page cache every quarter hour forever. Keep a per-file index next to the scan cache: the unique usage records already parsed out of each transcript and the byte offset they end at. A file whose size and mtime match is not opened; a file that grew is read from the stored offset; a file that shrank or was rewritten is read from the start. --force drops the index and rescans from scratch. The summary is built from the indexed records in the same directory order the walk always used. That matters: when a resumed session carries earlier messages, the same message id appears in two files with different usage, and the first file visited wins. 91 ids differed on this machine; sorting the walk moved one model's output total by 25k tokens. Output is now byte-identical to the previous scan on a frozen copy of the corpus, cold, warm, and after an append. Warm refresh: 1.0 s -> 0.10 s of CPU, of which the scan itself is 70 ms; the index for this corpus is 2.9 MB. Adapted: - Rebased onto omacom#10606: the highest-output rule for streamed messages now lives where the index parses records, and decides between files too. - The index records the timezone it was written in, and a change rereads every transcript, since its records hold local days. - A file only counts as appended to when its inode and the hash of what was already read still match, so a transcript replaced by a larger one, or rewritten in place, is read from the start. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Label a Claude Team seat by its subscription, not its rate-limit tier (omacom#11109) The collector built the plan label from the OAuth rateLimitTier first, so a Team premium seat, which runs on default_claude_max_5x, showed in the agents panel as "Max 5x". Lead with subscriptionType and keep the multiplier as its qualifier: Max still reads "Max 5x", a Team seat reads "Team 5x". Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * Label the Claude plan from the profile the CLI refreshes (omacom#7225) Adapted: the profile is found the same way current_account_id() finds it, now shared as profile_path(): ~/.claude.json for the default home, the home's own .claude.json otherwise. The original fell back to ~/.claude.json for any home without CLAUDE_CONFIG_DIR set, so a secondary account read the primary's tier. The profile's tier also keeps the subscription in the label, so a Team seat stays "Team" (omacom#11109). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Call a lapsed Claude access token paused, not signed out (omacom#8093) * Refresh Claude usage after the clock moves backwards (omacom#9956) * Bound unreadable Claude transcript warnings (omacom#12414) * Count Claude usage from opencode v2 sessions (omacom#13894) * Reload agent usage records when an inotify watch fails to rearm (omacom#10067) * Reload agent usage records after each update run instead of on a timer Rather than omacom#10067's two-minute timer per record, reload every record when the omarchy-agent-usage-update process exits, the moment its files can have been replaced. A reload that finds a file unchanged keeps its record, so the panel isn't stirred up by identical data. The grep test now runs the QML functions. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Show the agent status when the trouble line has no help text (omacom#8497) * Clear stale agent login guidance after a successful probe (omacom#8892) * Clear the Grok login hint after a successful probe Claude and Codex collectors; Grok's collector had the same stale hint. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Read Fireworks credentials from pi's auth.json (omacom#7455) The Fireworks collector skipped pi, Omarchy's default agent, when walking its credential ladder, so a machine signed in to Fireworks only through pi (/login fireworks) never showed the tab. Insert the key pi stores in $PI_CODING_AGENT_DIR/auth.json (default ~/.pi/agent) between the firectl auth.ini and the opencode fallback. pi keys can be literals, $ENV_VAR/${ENV_VAR} references, or !command shell lookups. The collector resolves the first two; command lookups stay pi-only and are skipped rather than sent to the API verbatim. * Call a lapsed Grok access token paused, not signed out Grok's access token lives six hours and Grok mints a new one from its refresh token whenever it starts, so a lapsed one is routine. Reporting it as an expired sign-in made the panel offer Sign-in required several times a day, sending people through grok login for nothing. With a refresh token present it now reads as paused, like Claude's. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Keep showing Grok's last limits while it sits idle While Grok hasn't run, nothing on the machine has spent its allowance, so with a refresh token on hand the last numbers still stand: they show as current rather than dimmed under a status line. A weekly window that reset in the meantime starts over at 0%, a whole number of weeks on. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Ask for a Grok sign-in once its refresh token is past 30 days A refresh token older than Grok's 30-day sign-in can't renew anything, so the panel offers Sign-in required again instead of showing the last limits as current. With nothing cached yet it says to start Grok, rather than showing an empty section without a word. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Check both ends of what the Claude index read before resuming a transcript A transcript rewritten in place could grow and change only after its first kilobytes, and the index took it for an append. It now compares the last kilobytes before the resume point too. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Simplify the agent usage collectors - Codex: pass the forced-scan choice down instead of a module global, make the per-file reader's cache arguments required, shrink the cache record check, and drop guards for shapes that can't occur: an empty launcher path, realpath raising, mise itself being a lazy launcher, multi-line `mise which` output, and probing without a temp file for stderr. - Claude: decide an append by the digest of both ends of what was read alone; the inode and mtime checks it made redundant are gone. - Snapshot: the device id falls back to the hostname, which always exists. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Share fixture setup in the agent usage scanner tests Every fixture home lives under one scratch directory with a single cleanup trap, instead of a trap rewritten with a longer list for each new home, and the Codex test builds its signed-in homes with one helper. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Treat a replaced Claude transcript as new even when its ends match Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Probe Codex without its error text when there's no temporary space Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: tossbaws <17258053+tossbaws@users.noreply.github.com> Co-authored-by: surim0n <suritech@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: anonwurcod <anonwurcod@proton.me> Co-authored-by: Kevin Rajan <7121943+kvnloo@users.noreply.github.com> Co-authored-by: Nate Ashby <nate.ashby11@gmail.com> Co-authored-by: Aris Gysel <aris.gysel@me.com> Co-authored-by: Brams <76213579+Brams-s@users.noreply.github.com> Co-authored-by: This_Is_NPC <gabrielfollone27@gmail.com> Co-authored-by: sanjyay <102979855+sanjyay@users.noreply.github.com> Co-authored-by: PapistProtocol <12738904+PapistProtocol@users.noreply.github.com> Co-authored-by: steez <stevedimakos97@gmail.com> Co-authored-by: GPT-6 Astra <noreply@openai.com> Co-authored-by: Ryan Yogan <ryanyogan@gmail.com> Co-authored-by: Oli Denton <41393837+omdenton@users.noreply.github.com> Co-authored-by: Igor Kramar <i@ikramar.ru> Co-authored-by: Martin Eidensten <martin@meibe.se> Co-authored-by: Romain Perron <rdj.perron@gmail.com> Co-authored-by: Omarchy Contributor <contributor@users.noreply.github.com> Co-authored-by: manuaudio <manu@arimaka.com> Co-authored-by: Tyler South <tsouth2@gmail.com> Co-authored-by: whathek <Hek846@users.noreply.github.com> Co-authored-by: Ty Richards <me@tyrichards.com>
…ourcedir fix(shell): keep __sourceDir on third-party plugin manifests
Install OpenClaw as a self-updating copy under ~/.openclaw Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
* Pin root= before the packages that can drop it limine-entry-tool falls back to /proc/cmdline for root= only while nothing appends to KERNEL_CMDLINE. Installing omarchy-settings lands a drop-in that appends with +=, switching that fallback off, and a kernel bump in the same transaction then bakes a UKI with no root= at all. preserve_kernel_cmdline_root repaired that afterwards, so a completed upgrade booted — but the machine was unbootable for the seconds in between, and an upgrade interrupted there left it in an emergency shell. Pinning cannot wait until after the packages land, and the old guard could not be moved earlier as it was: it asked the tool for its effective cmdline, which still resolves root= through the fallback right up until the drop-in arrives, so it reported healthy on exactly the machines about to break. Ask the config layers whether root= is stated explicitly instead, for the default profile alone, and pin before the package transaction. Verification stays after it, since that is what rebuilds the UKIs. The pin no longer gates on limine-mkinitcpio being present, since it now runs before the transaction that can install it, and a machine still missing it is exactly one that needs pinning first. Verified in a VM upgrading a 3.8.0 install, sampling the UKI every 2s across the upgrade: a legacy install without the pin lost root= for ~10s, and booting that state landed in "Failed to mount '' on real root". With this change the same upgrade never loses it, and an install that already pins root= is untouched. Closes omacom#6894 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * Merge the limine config layers when checking for a root= pin, and re-pin after the transaction The pin check returned on any line that mentioned root= under KERNEL_CMDLINE[default]. limine-entry-tool merges its layers in order, /usr/share drop-ins, /etc/limine-entry-tool.conf, /etc drop-ins, then /etc/default/limine, where = replaces and += appends, so a later layer's = could remove a pin the check still counted, and a quote before root= let systemd.setenv="root=..." read as one. Both skip the pin, which is the direction that bricks the next boot. The check now merges the layers the same way, strips only the outer double quotes the tool strips, drops quoted values the kernel does not split, and looks for root= as a parameter of its own. It was checked against limine-entry-tool --get-cmdline on a worker for every fixture in the test. Installing limine-mkinitcpio-hook runs limine-install, so a machine with no /boot/limine.conf when the pin runs ahead of the transaction can have one after it, and verification only warned about the UKI it found without root=. Verification now runs the pin for any machine the first call skipped. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Co-Authored-By: Codex Medium <noreply@openai.com> --------- Co-authored-by: Claude Opus 5 <noreply@anthropic.com> Co-authored-by: omarchybot <omarchybot@users.noreply.github.com> Co-authored-by: Codex Medium <noreply@openai.com>
…ge-collections Keep the image picker responsive with large theme collections
Keep image picker previews sharp on HiDPI displays
|
Important Review skippedBot user detected. To trigger a single review, invoke the ⚙️ Run configuration
You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
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
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.
Cherry-picks the 6 new first-parent / 22 non-merge omacom/omarchy
quattrocommits onto this fork'squattro(4fea5f3a, after PR #58 plus merged face #54 and pstack #56). Upstream moved from821ae589to8e02fc84. Commits are applied oldest-first, one fork commit per first-parent commit, no full merge.No leftover open sync PRs. #57 merged with #58; leftover draft #53 is closed.
New since last check (2026-10-02 /
821ae589)mise whichinstead of the lazy launcher, skips the probe when that home has no credentials, and shows the CLI's own error when the app-server dies. Native Codex rollouts count only the built-inopenaiprovider (OSS / custom gateways are skipped). Unchanged files are replayed from a per-file cache; pi/omp profile sessions are discovered next to the default root; forked pi sessions are deduped. Claude streamed messages keep the line with the highest output count, and a per-file transcript index means a warm refresh only reads what was appended. Team seats label as "Team 5x" from the CLI profile (not the rate-limit tier). A lapsed Claude access token reads as paused, not signed out. The panel reloads usage records whenomarchy-agent-usage-updateexits, and the trouble line falls back to the usage status when a record has no auth help. Grok with a refresh token keeps last limits while idle (paused, not signed out) and asks for a sign-in only after 30 days. Fireworks now reads the key pi stores in~/.pi/agent/auth.json.__sourceDir(fix(shell): keep __sourceDir on third-party plugin manifests omacom/omarchy#11925).publicPluginManifeststill strips host trust markers, but plugins can find their bundled scripts through__sourceDir.~/.openclaw(Install OpenClaw as a self-updating copy under ~/.openclaw omacom/omarchy#13296). Theopenclawpackage is now the seed (installer + tarball under/usr/share/openclaw), not the runtime.omarchy-install-openclaw-cliinstalls a private Node + package the user owns, points~/.local/bin/openclawat it, and moves a gateway still on the old package's script or Node over to the runtime.openclaw updateand the Control UI's Update button work. A moved service that was stopped or disabled stays that way. Removal takes the PATH link and the service, and keeps the~/.openclawcopy that can open the state. Migration1790397381moves existing package installs.root=before the packages that can drop it (Pin root= before the packages that can drop it omacom/omarchy#6951).omarchy-upgrade-to-quattroused to repairroot=after the package transaction. Installingomarchy-settingslands aKERNEL_CMDLINEdrop-in that turns off limine-entry-tool's/proc/cmdlinefallback, so a kernel bump in the same transaction baked a UKI with noroot=for ~10s. The pin now runs before that transaction, and the check merges limine config layers the same way the tool does so a later=cannot hide a missing pin.Fork-only lines kept
omarchy-default-agentstill uses acursor-agentalready on PATH or Cursor's official tarball — not mise.install/user/mise.shstill omits the Cursor mise wrapper.manual/17-ai.mdkeeps the Cursor tarball / update paragraphs and Cursor on the panel coverage list. OpenClaw's desktop paragraph now matches upstream (self-updating under~/.openclaw).shell/plugins/agents/Panel.qmltook the trouble-line fallback; keptlimitWindowextras plusformatLimitPercent/formatResetCaption.shell/plugins/agents/README.mdkept the Cursor collector row next to the updated Codex (openai-provider) and Fireworks (pi auth.json) rows.test/shell.d/agents-panel-test.shkept the format-helper assertions on top of the new trouble-line coverage.test/shell.d/default-agent-test.shtook the OpenClaw installer stub (--check/--now); kept the fork install-fail flag and all Cursor tarball cases.shell/shell.qmlkeptFaceChrome.pluginRegistryandAuthServiceStorenext to the__sourceDirkeep.test/shell.d/plugins-test.shkeptomarchy.face-overlayin the keepLoaded list next to the new publicManifest checks.shell/plugins/README.mdkept the lock-face / polkit chrome notes next to the new carousel paragraph.Fork delta check
git diff --name-only <upstream tip> <fork tip>is still 155 files before (821ae589vsquattro) and after (8e02fc84vs this branch).Tests
./test/clipasses, including vscode theme copy/_watch/cksum version cases.__sourceDir+ face-overlay keepLoaded), image-picker (bounded carousel + HiDPI decode), menu-images (lazy workers), upgrade-to-quattro (root=pin).Not done: a visual check on real hardware. There is no compositor in the cloud sandbox.