Skip to content

Merge upstream quattro (multi-account Claude/Codex/Grok, omarchy-app) - #57

Merged
2 commits merged into
quattrofrom
cursor/upstream-changes-pr-21d9
Oct 3, 2026
Merged

2 commits merged into
quattrofrom
cursor/upstream-changes-pr-21d9

Conversation

@cursor

@cursor cursor Bot commented Oct 1, 2026

Copy link
Copy Markdown

Cherry-picks the 2 new non-merge omacom/omarchy quattro commits onto this fork's quattro (879977c6, after PR #55). Upstream moved from 8b4eae66 to f45461a3. 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)

  • Several Claude, Codex, and Grok subscriptions (Switch between several Claude and Codex subscriptions, and build apps the Omarchy way omacom/omarchy#13770, then Bring Grok up to par with Claude and Codex in the agents panel omacom/omarchy#13992). omarchy agent account add|use|list|remove|rename|mode keeps 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 --continue still works. cx, cy, a plain claude/codex/grok, and omarchy-agent start as the active account unless CLAUDE_CONFIG_DIR / CODEX_HOME / GROK_HOME is 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.
  • Autoswitch or notify near a limit. After each usage update, an active account at or over the threshold (95% by default) moves new sessions to the account with the most headroom in auto mode, or offers that switch as a notification in manual mode. It never flaps back to an account that just reset, and says once when every account is over. While an active account is within 15 points of the threshold, limits refresh every three minutes instead of 15.
  • Agents panel rewrite. Every subscription is now one page: each agent and account with its plan and limit meters (percentage on hover), under a rotating hero line for tokens this week / most used model / etc. The + in the hero corner adds a Claude, Codex, or Grok account in-place. Number keys + Enter (or Use) switch. Hover reveals Autoswitch. A machine with no agent yet opens the panel as the blank slate; the first one signed in becomes the default agent. Under Make something it offers starter prompts for a new theme, plugin, or app that hand the task to your default agent.
  • omarchy-app skill. New agent skill for building apps the way Hype, Monologue, and Omacut are built: C++ and Qt Quick, qmake6 + make, live Omarchy theme, Arch package. Migrations 1790702362 / 1790702606 install base-devel, ffmpeg, and the Qt6 modules and link the skill for existing users.
  • Grok usage collector (Bring Grok up to par with Claude and Codex in the agents panel omacom/omarchy#13992). omarchy-agent-usage-grok reads Grok's own /usage credits endpoint and session summaries. omarchy-update-mise now relinks ~/.grok/bin/grok after mise up, because Grok's npm launcher does not pick up a new mise release on its own.
  • CLI router. omarchy agent is flags-only, so omarchy agent account lists 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; kept limitWindow extras plus formatLimitPercent / 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.md and manifest.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 plus omarchy-apply-polkit-pam hidden; added the omarchy agent account family help cases.
  • bin/omarchy-agent: kept the Cursor --yolo --trust launch path; added account-home wrapping for Claude/Codex/Grok only.
  • install/user/mise.sh: still omits the Cursor mise wrapper. omarchy-update-mise takes the Grok npm relink only.
  • qt6-multimedia is back in omarchy-base.packages for the omarchy-app skill. The shell still plays video through OWE; no Qt Multimedia import returned under shell/.
  • The fork Cursor usage collector is untouched. Cursor's Grok Bot weekly pool is a different product from the new Grok CLI credits collector.

Fork delta check

  • git diff --name-only <upstream tip> <fork tip> is still 155 files before (8b4eae66 vs quattro) and after (f45461a3 vs this branch).

Tests

  • ./test/cli passes, including omarchy agent account family help and the vscode theme cases.
  • Focused shell tests for this batch pass: agents-panel (upstream keyboard + fork format helpers), agent-account, agent-account-autoswitch, agent-usage-accounts, agent-usage-claude-limits, agent-usage-codex-scanner (including limits-when-account/read-hangs), agent-usage-grok, update-mise-grok, default-agent (Cursor tarball path unchanged).
  • video-background-test.sh still dies after the OWE assertions when it sources set_theme_background without PREPARED_BACKGROUND_SNAPSHOT (set -u). Same on quattro 879977c6, 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.

Open in Web View Automation 

cursoragent and others added 2 commits October 1, 2026 23:15
… 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>
@coderabbitai

coderabbitai Bot commented Oct 1, 2026

Copy link
Copy Markdown

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Advanced

Run ID: ce919169-ed0f-4e40-b269-4def5386d271

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
  • Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Autopilot is currently an internal CodeRabbit preview.


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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants