Repository navigation
Merge upstream quattro (agent reorder, Grok tokens/mise, leftover multi-account) - #58
Merged
Merged
Conversation
… the Omarchy way (omacom#13770) Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
…m#13992) Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
…k through mise (omacom#14004) Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
|
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 was referenced Oct 3, 2026
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 3 new non-merge omacom/omarchy
quattrocommits onto this fork'squattro(879977c6, after PR #55). Upstream moved from8b4eae66to821ae589. That's leftover draft #57 (#13770+#13992, still open and not on quattro) plus 1 new first-parent / 1 non-merge commit since last night (#14004). Commits are applied oldest-first, one fork commit per upstream commit, no full merge.Leftover draft #53 is still open and already remade by merged #55 — not remade again. Face #54 and pstack #56 stay off
quattro.New since last check (2026-10-01 /
f45461a3)~/.local/state/omarchy/agents/order.json. The key catcher turns Ctrl+Up/Down into a reorder only for panels that opt in. The lit mark is boxed alone (not the whole header), and the scrolling area reaches into the panel padding so that box is not clipped. Reorder is held off while an account name is being edited, and Ctrl+Up/Down does nothing when the cursor is on the hero buttons or starter tiles.install/user/mise.shandomarchy-default-agentnow usegrokinstead ofnpm:@xai-official/grok. Adding a first Grok account installs the same package.omarchy-update-miseis back tomise uponly — the npm-launcher relink from Bring Grok up to par with Claude and Codex in the agents panel omacom/omarchy#13992 is gone. Migration1790863209rewrites Omarchy's old npm wrapper, drops the npm tool, removes leftover~/.grok/bin/grok*binaries so they cannot shadow mise, and removes an x.ai~/.local/bin/agentsymlink that pointed under~/.grok. A failedmise upis no longer hidden by later Grok upkeep.omarchy-agent-usage-groknow reads each session'susage.json(the ledgergrok usageprints) for tokens today, by day for the last week, and by model, with cached input kept apart. Today's prompts are the turns that ended today. A limits-only refresh reuses a session scan only on the day it was made. Daily totals sum the per-model buckets so cache writes are not dropped.Leftover from #57 (new since #55 /
8b4eae66)omarchy agent account add|use|list|remove|rename|modekeeps more than one login per provider. The login you already had stays Main in~/.claude/~/.codex/~/.grok. Added accounts get their own home under~/.local/state/omarchy/agents/accounts/<provider>/<id>/and link history, settings, skills, and plugins back to the primary home so--continuestill works.cx,cy, a plainclaude/codex/grok, andomarchy-agentstart as the active account unlessCLAUDE_CONFIG_DIR/CODEX_HOME/GROK_HOMEis already set. The first account signs in through the normal browser; every one after that uses a private window so the browser's current login is not reused.qmake6+make, live Omarchy theme, Arch package. Migrations1790702362/1790702606installbase-devel,ffmpeg, and the Qt6 modules and link the skill for existing users.omarchy-agent-usage-grokreads Grok's own/usagecredits endpoint and session summaries. That npm-relink inomarchy-update-miseis superseded here by Reorder the agents in the panel, count Grok's tokens, and install Grok through mise omacom/omarchy#14004's first-party mise package.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 adds Cursor to the panel coverage list. Grok's row now points at Grok Build and warns off thecurl | bashinstaller.shell/plugins/agents/Panel.qmltook the reorder; keptlimitWindowextras plusformatLimitPercent/formatResetCaption(sub-1% complimentary Grok Bot reset still shows as 1%, and the tooltip names an early reset).shell/plugins/agents/README.mdandmanifest.json: kept the Cursor collector and enabled-by-default entry next to the Grok CLI collector (nowusage.json+ credits).test/shell.d/agents-panel-test.sh: kept the format-helper assertions on top of the new reorder / keyboard coverage.test/cli: kept fork vscode copy/_watch/cksum version plusomarchy-apply-polkit-pamhidden; leftover Merge upstream quattro (multi-account Claude/Codex/Grok, omarchy-app) #57 added theomarchy agent accountfamily help cases.bin/omarchy-agent: kept the Cursor--yolo --trustlaunch path; account-home wrapping is Claude/Codex/Grok only.qt6-multimediais back inomarchy-base.packagesfor the omarchy-app skill. The shell still plays video through OWE; no Qt Multimedia import returned undershell/.usage.jsoncollector.Fork delta check
git diff --name-only <upstream tip> <fork tip>is still 155 files before (8b4eae66vsquattro) and after (821ae589vs this branch).Tests
./test/clipasses, includingomarchy agent accountfamily help and the vscode theme cases.1790863209covered).test/shell.d/update-mise-grok-test.shis gone with the npm-relink upkeep; that is upstream's deletion, not a fork drop.video-background-test.shstill dies after the OWE assertions when it sourcesset_theme_backgroundwithoutPREPARED_BACKGROUND_SNAPSHOT(set -u). Same on quattro879977c6, not a sync regression.agent-usage-cursor-scanner-test.sh"limits-only keeps cached daily stats" still fails when today's date is past the fixture week. Collector unchanged; not a sync regression.Not done: a visual check on real hardware. There is no compositor in the cloud sandbox.