Skip to content

Merge upstream quattro (Codex spend limits, Go names, manual fixes) - #85

Merged
mark-groves merged 6 commits into
quattrofrom
cursor/upstream-changes-pr-d6e6
Oct 18, 2026
Merged

mark-groves merged 6 commits into
quattrofrom
cursor/upstream-changes-pr-d6e6

Conversation

@mark-groves

@mark-groves mark-groves commented Oct 18, 2026 •

Copy link
Copy Markdown
Owner

Cherry-picks upstream omacom/omarchy quattro onto this fork's quattro (281163bd, which already has #84). Upstream moved from 386176ab to 4e059acf. Five content commits are applied oldest-first, one fork commit per upstream change. The two upstream merge commits (omacom#15731 and omacom#15777) add nothing beyond those content commits, so they are not replayed. After this, the files upstream changed match upstream, and the remaining path delta is the fork's own work.

Go and Docker DB stay names (omacom#15731, omacom#15777)

Install and Remove > Development had translated the Go programming language as the verb "go": Chinese 前往, and the same mistake in Catalan, Greek, Mexican Spanish, Estonian, Persian, Finnish, Irish, Croatian, Korean, Latvian, Malay, Dutch, Polish, Tamil, and Uzbek. Those labels are Go again. Estonian Dokker DB is Docker DB again.

Codex spend limits (omacom#15722)

A Codex Business seat can return an individual spend cap with no rate windows. omarchy-agent-usage-codex appends that cap as a limit labeled Spend limit, with the share taken from used/limit (or from remainingPercent when the cap is zero) and the reset time the snapshot reports. No frequency is inferred. The agents panel translates that label (agents.windowSpendLimit). The collector table notes the cap.

The fork's Cursor row and the unified X subscription wording in shell/plugins/agents/README.md stay. Cursor's two shapes, plan names, and the Grok/Cursor collectors are unchanged.

Manual fixes (omacom#8974, omacom#8805)

The navigation manual says "you can do just about everything." The security manual says the firewall prevents containers from being exposed, that Arch always has the latest updates, and that Omarchy distribution infrastructure sits behind Cloudflare.

Fork-only lines kept

Setup/Remove > Security > Face, and Update > Grok Bot / Cursor, stay, including in the English menu catalog. Cursor is still installed from Cursor's official tarball, not through mise. omarchy-theme-set-vscode still does not theme Cursor. omarchy-powerprofiles-set still writes ActiveProfile through busctl, and the menu power-profiles provider stays out. The fork linux / linux-headers entries stay in install/omarchy-other.packages.

Tests

test/shell.d/agent-usage-codex-scanner-test.sh passes, including the Business spend cap and the zero-cap percentage.

Open in Web Open in Cursor 

Note

Low Risk
Mostly display and i18n fixes; Codex limit parsing is additive with tests and graceful fallbacks on bad snapshots.

Reviewed by Cursor Bugbot for commit 5c284ca. Configure here.

Vinx911 and others added 5 commits October 18, 2026 02:17
The text 'Go' (referring to the Go programming language) was incorrectly translated as '前往' (the verb 'go'). Updated it to 'Go'.
The Go programming language in Install and Remove > Development was
translated as the verb "go" in Catalan, Greek, Mexican Spanish, Estonian,
Persian, Finnish, Irish, Croatian, Korean, Latvian, Malay, Dutch, Polish,
Tamil and Uzbek, as omacom#15731 fixed for Chinese. Estonian also spelled
Docker DB as "Dokker DB". Put the names back.
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
* Fix grammar in security documentation

Corrected grammar and phrasing in security guidelines.

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@coderabbitai

coderabbitai Bot commented Oct 18, 2026 •

Copy link
Copy Markdown

Important

  • 🔍 Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

⚙️ Run configuration
  • Configuration used: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 444824eb-4f3c-43b5-9df4-3c7b05b57640
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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.

@mark-groves
mark-groves marked this pull request as ready for review October 18, 2026 03:10
@mark-groves
mark-groves merged commit 44cfd25 into quattro Oct 18, 2026
7 checks passed
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.

6 participants