Skip to content

Merge upstream quattro (agent reorder, Grok tokens/mise, leftover multi-account) - #58

Merged
mark-groves merged 3 commits into
quattrofrom
cursor/upstream-changes-pr-9b45
Oct 3, 2026
Merged

mark-groves merged 3 commits into
quattrofrom
cursor/upstream-changes-pr-9b45

Conversation

@cursor

@cursor cursor Bot commented Oct 2, 2026

Copy link
Copy Markdown

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

  • Reorder agents in the panel (Reorder the agents in the panel, count Grok's tokens, and install Grok through mise omacom/omarchy#14004). Drag an agent by its mark to move its section; the header it will land on lights up, and the move happens on release. Each agent's header is now a keyboard stop. Ctrl+Up/Down (or Ctrl+k/j) moves the agent the cursor is in. The order is kept in ~/.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 Grok through mise's first-party package. install/user/mise.sh and omarchy-default-agent now use grok instead of npm:@xai-official/grok. Adding a first Grok account installs the same package. omarchy-update-mise is back to mise up only — the npm-launcher relink from Bring Grok up to par with Claude and Codex in the agents panel omacom/omarchy#13992 is gone. Migration 1790863209 rewrites 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/agent symlink that pointed under ~/.grok. A failed mise up is no longer hidden by later Grok upkeep.
  • Count Grok tokens from its usage ledger. omarchy-agent-usage-grok now reads each session's usage.json (the ledger grok usage prints) 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)

  • 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. That npm-relink in omarchy-update-mise is 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

  • Cursor stays a usage collector only (no account homes). omarchy-default-agent still uses a cursor-agent already on PATH or Cursor's official tarball — not mise. install/user/mise.sh still omits the Cursor mise wrapper.
  • manual/17-ai.md keeps the Cursor tarball / update paragraphs and adds Cursor to the panel coverage list. Grok's row now points at Grok Build and warns off the curl | bash installer.
  • shell/plugins/agents/Panel.qml took the reorder; kept limitWindow extras plus formatLimitPercent / formatResetCaption (sub-1% complimentary Grok Bot reset still shows as 1%, and the tooltip names an early reset).
  • shell/plugins/agents/README.md and manifest.json: kept the Cursor collector and enabled-by-default entry next to the Grok CLI collector (now usage.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 plus omarchy-apply-polkit-pam hidden; leftover Merge upstream quattro (multi-account Claude/Codex/Grok, omarchy-app) #57 added the omarchy agent account family help cases.
  • bin/omarchy-agent: kept the Cursor --yolo --trust launch path; account-home wrapping is Claude/Codex/Grok 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/.
  • Cursor's Grok Bot weekly pool is a different product from the Grok CLI credits / usage.json collector.

Fork delta check

  • git diff --name-only <upstream tip> <fork tip> is still 155 files before (8b4eae66 vs quattro) and after (821ae589 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 reorder + 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 (ledger tokens + same-day limits-only reuse), default-agent (Cursor tarball path unchanged; Grok now the first-party mise package; migration 1790863209 covered).
  • test/shell.d/update-mise-grok-test.sh is gone with the npm-relink upkeep; that is upstream's deletion, not a fork drop.
  • 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 3 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>
…k through mise (omacom#14004)

Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
@coderabbitai

coderabbitai Bot commented Oct 2, 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: df3d6ecf-6bf2-44b1-a856-e4024cefff62

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.

@cursor
cursor Bot marked this pull request as ready for review October 2, 2026 23:06
@mark-groves
mark-groves merged commit 8b08af7 into quattro Oct 3, 2026
2 checks passed
@mark-groves
mark-groves deleted the cursor/upstream-changes-pr-9b45 branch October 17, 2026 23:22
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