Repository navigation
Merge upstream quattro (multi-account Claude/Codex/Grok, omarchy-app) - #57
Merged
2 commits merged intoOct 3, 2026
Merged
2 commits merged into
2 commits merged into
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>
|
Important Review skippedBot user detected. To trigger a single review, invoke the ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Advanced Run ID: 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 2 new non-merge omacom/omarchy
quattrocommits onto this fork'squattro(879977c6, after PR #55). Upstream moved from8b4eae66tof45461a3. That's 2 first-parent / 2 non-merge commits since last night's no-movement check. 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-09-30 /
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.omarchy-update-misenow relinks~/.grok/bin/grokaftermise up, because Grok's npm launcher does not pick up a new mise release on its own.omarchy agentis flags-only, soomarchy agent accountlists the account commands instead of being eaten as an argument.Conflicts / fork-only
Overlap files auto-applied except the three that still carry Cursor extras. Fork-only lines stayed.
manual/17-ai.md: kept the Cursor tarball / update paragraphs and added Cursor to the panel coverage list next to the new Grok CLI coverage.shell/plugins/agents/Panel.qml: took the upstream rewrite; keptlimitWindowextras plusformatLimitPercent/formatResetCaption(sub-1% complimentary Grok Bot reset still shows as 1%, and the tooltip names an early reset). Wired those helpers into the new compact-row tooltips.shell/plugins/agents/README.mdandmanifest.json: kept the Cursor collector and enabled-by-default entry next to the new Grok CLI collector.test/shell.d/agents-panel-test.sh: kept the format-helper assertions on top of the new keyboard/add-account coverage.test/cli: kept fork vscode copy/_watch/cksum version plusomarchy-apply-polkit-pamhidden; added theomarchy agent accountfamily help cases.bin/omarchy-agent: kept the Cursor--yolo --trustlaunch path; added account-home wrapping for Claude/Codex/Grok only.install/user/mise.sh: still omits the Cursor mise wrapper.omarchy-update-misetakes the Grok npm relink only.qt6-multimediais back inomarchy-base.packagesfor the omarchy-app skill. The shell still plays video through OWE; no Qt Multimedia import returned undershell/.Fork delta check
git diff --name-only <upstream tip> <fork tip>is still 155 files before (8b4eae66vsquattro) and after (f45461a3vs this branch).Tests
./test/clipasses, includingomarchy agent accountfamily help and the vscode theme cases.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.