Skip to content

chore: land triage train 2 (#3825 #3826 #3828 #3829) - #3830

Merged
steipete merged 7 commits into
mainfrom
triage/20260921-train2
Sep 21, 2026
Merged

steipete merged 7 commits into
mainfrom
triage/20260921-train2

Conversation

@steipete

@steipete steipete commented Sep 21, 2026

Copy link
Copy Markdown
Owner

Integrates the four reviewed wave-2 lanes in one PR to avoid repeated changelog conflicts and competing macOS CI runs. The five lane commits retain their original authors, bodies, human co-author trailers, and cherry-pick provenance, with the lane PR number appended to each subject. The seven-commit stack also retains the Kimi regional-subtitle test correction and the existing regeneration commit.

Lane verdicts

Integration

Preserves main's new Highlights section, every Unreleased bullet, and contributor thanks, Kimi dashboard routing alongside HelmCode, and train 1's widget-label switch refactor with only Crof removed. Provider documentation and localized site counts use 77; the capability audit's separate totals are calculated from its audited rows. Architecture anchors and widget fingerprints are checked against the combined sources.

Validation

  • Registry, both provider manifests, generated provider IDs, and README provider entries independently agree on 77 providers, retaining HelmCode, v0, and TypeSafe after Crof removal. All 69 provider-count strings across 23 site locales use 77.
  • All four prescribed generators passed with no drift. Main already contains the formerly missing HelmCode icon. The existing regeneration commit contains the formatting-only wrap of the corrected Kimi subtitle test; the concatenated expected value is unchanged.
  • swift build --jobs 4 passed.
  • make check passed: zero SwiftLint violations across 2,547 files; all repository checks passed. Its first run caught only the corrected subtitle assertion's 123-character line, fixed by the wrap above.
  • The expanded focused command below passed 574 tests (561 app tests plus 13 plugin/portable tests), with three opt-in UI proof tests skipped and zero failures. No full sharded suite or live provider/Keychain probe ran.
  • Independent Codex rebase review and the formatting-only amendment review both finished scoped-clean through P2.
  • The coordinator's Kimi test patch retains the same stable patch ID. All seven commit messages, original authors, author dates, and human trailers are preserved.
CODEXBAR_SUPPRESS_TEST_KEYCHAIN_ACCESS=1 swift test --jobs 4 --no-parallel --filter 'ProviderArchitectureGatekeeperTests|ProviderPluginParityTests|UserProviderPluginPortableTests|ProviderSettingsDescriptorTests|StatusItemCreationOrderingTests|MenuBarStatusItem|Kimi|CodexBarConfigUnknownProviderTests|MenuBarLayout|CodexBarWidgetProviderTests|WidgetSnapshotTests|CLIUsage|Providers'

Widget color fingerprints reflect the 77-provider registry, and the architecture gatekeeper passes with the merged provider metadata and anchors.

Existing synthetic UI proof

Cursor Grok Bot layout, captured and inspected in #3829:

Before:
Cursor layout before Grok Bot token

After:
Cursor layout after Grok Bot token

Kimi's synthetic settings renders and all lane verdict evidence remain in the coordinator's local lane reports. The status-item changes make no claim of completed Bartender runtime verification.

Closes #3825
Closes #3826
Closes #3828
Closes #3829
Fixes #3752
Closes #3657
Fixes #3309
Closes #3712

@clawsweeper

clawsweeper Bot commented Sep 21, 2026

Copy link
Copy Markdown

🦞👀
ClawSweeper picked this up.

Pull request received. I will update this pull request when review starts.

ClawSweeper review complete

ClawSweeper finished reviewing this revision. The review result is being finalized.

View the workflow run.

@clawsweeper clawsweeper Bot added P2 Normal priority bug or improvement with limited blast radius. merge-risk: 🚨 compatibility 🚨 Merging this PR could break existing users, config, migrations, defaults, or upgrades. rating: 🐚 platinum hermit Good normal PR readiness with ordinary maintainer review expected. status: 👀 ready for maintainer look ClawSweeper has no concrete contributor-facing blocker left for this PR. labels Sep 21, 2026
@clawsweeper

clawsweeper Bot commented Sep 21, 2026

Copy link
Copy Markdown

Codex review: needs maintainer review before merge. Reviewed September 21, 2026, 1:17 PM ET / 17:17 UTC (Revision 3).

ClawSweeper review

What this changes

The branch improves menu-bar item creation and placement repair, adds Kimi region selection and Cursor Grok Bot percentages, and removes the retired Crof provider.

Merge readiness

Ready for maintainer review

This remains useful, owner-sponsored integration work. No actionable introduced defect was found, and the earlier conflict and regeneration concerns are resolved.

Priority: P2
Reviewed head: 5b08ff9721404374b158331aec5f2a5070d11dc3

Review scores

Measure Result What it means
Overall readiness 🐚 platinum hermit (4/6) A coherent integration with focused compatibility coverage and no actionable correctness finding; proof limits are stated accurately.
Proof confidence 🌊 off-meta tidepool Not applicable: The OWNER-authored PR is exempt from the external-contributor proof gate. Inspected synthetic renderer images show Grok Bot output, and the Crof lane reports isolated CLI config preservation; neither establishes live Kimi requests or Bartender persistence, which the owner does not claim.
Patch quality 🐚 platinum hermit (4/6) No actionable review findings were identified.

Verification

Check Result Evidence
Real behavior Not applicable Not applicable: The OWNER-authored PR is exempt from the external-contributor proof gate. Inspected synthetic renderer images show Grok Bot output, and the Crof lane reports isolated CLI config preservation; neither establishes live Kimi requests or Bartender persistence, which the owner does not claim.
Evidence reviewed 13 items Repository policy: Read the complete root AGENTS.md; no nested AGENTS.md or matching maintainer-note files were found. Applied the guidance on provider isolation, settings compatibility, focused model tests, and avoiding unsolicited Keychain access. This review ran no builds, tests, generators, or provider probes.
Pinned introduction and integration: Reviewed merge-base 94ca725 to head 5b08ff9. The complete local delta contains 112 files, with 1,533 additions and 1,538 deletions.
Earlier merge conflict resolved: Raw test-merge parents are exactly pinned main followed by pinned PR head. GitHub's comparison confirms that the merge preserves main's Hugging Face changes and changelog entry. Local inspection of one merge blob failed with a promisor-fetch HTTP 403; the read-only GitHub comparison supplied the missing merge evidence.
Findings None None.
Security None None.

How this fits together

CodexBar combines provider credentials and usage responses with saved preferences to display usage in the macOS menu bar. These changes affect regional requests, available providers, saved layouts, and status-item placement.

flowchart LR
  A[Credentials and region] --> B[Provider requests]
  B --> C[Usage snapshots]
  D[Saved layout preferences] --> E[Compatible layout loading]
  C --> F[Menu-bar renderer]
  E --> F
  G[Saved positions and displays] --> H[Status-item creation]
  F --> H
Loading

Before merge

None.

Agent review details

Security

None.

Review metrics

Metric Value Why it matters
Production and test delta Production +492/−737 (net −245); tests +895/−643 (net +252) The feature additions are offset by retired-provider removal and helper reuse, with added compatibility and routing coverage.
Layout compatibility 1 new storage generation; 3 older projections retained V4 adds named usage tokens while preserving layouts readable by earlier releases.

Technical review

Best possible solution:

Retain the shared provider and layout implementations with their compatibility projections, while keeping recurring placement corruption and Bartender identity persistence tracked separately.

Do we have a high-confidence way to reproduce the issue?

Yes for the source-level Kimi routing and missing Grok Bot layout capability; current main exposes those gaps. Recurring position corruption and Bartender identity changes have not been reproduced by this review.

Is this the best way to solve the issue?

Yes: the branch extends existing provider settings, descriptor capabilities, and persistence projections instead of creating competing implementations, and its intentional compatibility changes are documented and owner-approved.

AGENTS.md: found and applied where relevant.

Codex review notes: model internal, reasoning medium; reviewed against 35d479eafd3f.

Labels

Label changes:

  • add proof: 📸 screenshot: Contributor real behavior proof includes screenshot evidence. The OWNER-authored PR is exempt from the external-contributor proof gate. Inspected synthetic renderer images show Grok Bot output, and the Crof lane reports isolated CLI config preservation; neither establishes live Kimi requests or Bartender persistence, which the owner does not claim.

Label justifications:

  • P2: This combines bounded provider and menu-bar improvements without evidence of an urgent widespread failure.
  • merge-risk: 🚨 compatibility: The owner explicitly accepts removing retired Crof entries on save and clearing menu-manager parking positions beyond the new bound; older layout projections are retained and covered.
  • rating: 🐚 platinum hermit: Overall readiness is 🐚 platinum hermit; proof is 🌊 off-meta tidepool and patch quality is 🐚 platinum hermit.
  • status: 👀 ready for maintainer look: ClawSweeper has no concrete contributor-facing blocker left for this PR. Not applicable: The OWNER-authored PR is exempt from the external-contributor proof gate. Inspected synthetic renderer images show Grok Bot output, and the Crof lane reports isolated CLI config preservation; neither establishes live Kimi requests or Bartender persistence, which the owner does not claim.
  • proof: 📸 screenshot: Contributor real behavior proof includes screenshot evidence. The OWNER-authored PR is exempt from the external-contributor proof gate. Inspected synthetic renderer images show Grok Bot output, and the Crof lane reports isolated CLI config preservation; neither establishes live Kimi requests or Bartender persistence, which the owner does not claim.

Evidence

What I checked:

Likely related people:

  • unknown: The claimed source-line change could not be verified from bounded local history. (role: source history unknown; confidence: low)
  • unknown: The claimed source-line change could not be verified from bounded local history. (role: source history unknown; confidence: low)

Rating scale

Score Internal tier Crab rank Meaning
6/6 S 🦀 challenger crab Exceptional readiness
5/6 A 🦞 diamond lobster Very strong readiness
4/6 B 🐚 platinum hermit Good normal PR; ordinary maintainer review
3/6 C 🦐 gold shrimp Useful, but confidence is limited
2/6 D 🦪 silver shellfish Proof or implementation needs work
1/6 F 🧂 unranked krab Not merge-ready
N/A NA 🌊 off-meta tidepool Rating does not apply

Overall follows the weaker of proof and patch quality.
Shiny media proof means a screenshot, video, or linked artifact directly shows the changed behavior. Runtime, network, CSP, and security claims still need visible diagnostics.

Workflow

  • ClawSweeper keeps one durable marker-backed review comment per issue or PR.
  • Re-runs edit this comment so the latest verdict, findings, and automation markers stay together instead of adding duplicate bot comments.
  • A fresh review can be triggered by eligible @clawsweeper re-review comments, exact-item GitHub events, scheduled/background review runs, or manual workflow dispatch.
  • PR/issue authors and users with repository write access can comment @clawsweeper re-review or @clawsweeper re-run on an open PR or issue to request a fresh review only.
  • Maintainers can also comment @clawsweeper review to request a fresh review only.
  • Fresh-review commands do not start repair, autofix, rebase, CI repair, or automerge.
  • Maintainer-only repair and merge flows require explicit commands such as @clawsweeper autofix, @clawsweeper automerge, @clawsweeper fix ci, or @clawsweeper address review.
  • Maintainers can comment @clawsweeper explain to ask for more context, or @clawsweeper stop to stop active automation.

History

Review history (2 earlier review cycles)
  • reviewed 2026-09-21T11:33:36.835Z sha 1bb2ec7 :: needs maintainer review before merge. :: none
  • reviewed 2026-09-21T15:57:39.076Z sha 0ee064b :: needs changes before merge. :: none

steipete and others added 7 commits September 21, 2026 09:43
…3825)

Create zero-length items, attach stable autosave names before registration and normal sizing, and preserve callback-selected widths. Share this factory across startup, provider vending, and merged-item recovery.

Repair only matching saved positions beyond the widest attached screen plus 512 points, logging removed keys. Consolidate repair and vending helpers to keep production code net negative.

Refs #3355 and #3201. Native AppKit write attribution and Bartender restart identity still require isolated runtime evidence.

(cherry picked from commit 3f2ff08)
Keep the existing Codex branch allowlist bound to line 344 after relocating the status-item factory. The anchor text, provider fingerprint, reference count, and justification are unchanged.

CI run 35584140370 and a local 41-test gatekeeper run reproduced the stale line-371 anchor. The corrected run passes 70 tests across four suites, make check passes with zero violations, and P2 review is scoped-clean.

(cherry picked from commit 8fe8928)
Route Kimi API, web, cookie discovery, settings links, and the Usage Dashboard through the selected region. Keep China as the default and restrict unscoped CLI credentials to its historical host. Reuse JWT decoding and remove redundant forwarding and parsing paths to keep production code smaller.

Fixes #3752

(cherry picked from commit b5e4ab1)
Adopt #3657 on the current 74-provider registry, remove Crof-only
presentation policy, and retain the existing unknown-provider config path.
Regenerate provider manifests, bundled plugin JavaScript, embedded CLI
icons, and the documentation index with repository scripts.

Verify retired config entries are ignored without rewriting on read and
removed on save while preserving all supported provider entries.

Co-authored-by: Aanish Bhirud <47579874+baanish@users.noreply.github.com>
(cherry picked from commit 9909f0f)
Add descriptor-owned named extra percentages and hide unavailable allowances.
Refresh the strip when Grok Bot changes independently of Cursor's other lanes.
Keep V3/V2/V1 projections beside V4 so downgrades preserve reset choices and
older-version edits still win when upgrading again.

Fixes #3309
Refs #3712

Co-authored-by: yicone <yicone@gmail.com>
(cherry picked from commit de88f94)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merge-risk: 🚨 compatibility 🚨 Merging this PR could break existing users, config, migrations, defaults, or upgrades. P2 Normal priority bug or improvement with limited blast radius. proof: 📸 screenshot Contributor real behavior proof includes screenshot evidence. rating: 🐚 platinum hermit Good normal PR readiness with ordinary maintainer review expected. status: 👀 ready for maintainer look ClawSweeper has no concrete contributor-facing blocker left for this PR.

Projects

None yet

1 participant