mirror of
https://github.com/stablyai/orca.git
synced 2026-10-29 00:03:37 +00:00
7d4aede5d359eb16dfcff2a64503b95d6cc56ef7
5
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
  Neilandmmarabel
|
2b0ce17514 |
Show provider credit balances alongside usage limits (#25408)
Display provider credit and currency balances separately from rate limits. Preserve quotas when balance data is unavailable and translate complete labels. Supersedes #9363; credit to @mmarabel for the original implementation. Co-authored-by: mmarabel <166927047+mmarabel@users.noreply.github.com> |
||
 
|
5802b54579 |
fix(rate-limits): read OpenCode Go usage with the Go API key (#22551)
* fix(rate-limits): read OpenCode Go usage with the account API key Since OpenCode's console migration (upstream fe51b0b19a, "fix(console): restrict legacy access to Black"), an account with no Black subscription is redirected from the legacy console to /console/login, so Orca's cookie-based workspace lookup returns nothing and the Go bar stays empty. Fetch usage from GET https://opencode.ai/zen/go/v1/usage instead, which authenticates with `Authorization: Bearer <key>` and needs no console session. The key resolves in order: Orca settings override, OPENCODE_API_KEY, then whatever OpenCode itself stored on /connect -- auth.json for 1.x, the credential table for 2.x. The cookie path stays as the fallback so Black/legacy accounts keep working. A 403 EntitlementError now reads as "no OpenCode Go subscription" in the status bar instead of a generic refresh failure (#22257's reporter was misled by exactly that). * fix(rate-limits): prefer OpenCode's stored Go key over OPENCODE_API_KEY OpenCode applies the key saved on /connect after the environment, so the stored key is the one its own Go requests use. OPENCODE_API_KEY is also the Zen provider's variable, so ranking it first could read a key that OpenCode itself is not using for Go. Co-Authored-By: Claude <noreply@anthropic.com> * fix(rate-limits): name the API key when OpenCode Go usage lands on sign-in A redirected usage request arrives as a 200 sign-in page because Electron follows redirects; report it as a rejected key instead of a parse failure. The cookie path's empty workspace lookup is what non-Black accounts now hit after the console migration, so its message points at the API key rather than only the workspace override. Co-Authored-By: Claude <noreply@anthropic.com> * chore(i18n): add the OpenCode Go API key strings to the English catalog Co-Authored-By: Claude <noreply@anthropic.com> * docs(rate-limits): stop calling the credential table an OpenCode 2 marker Verified on two real Windows hosts running OpenCode 1.18.16: the `credential` table exists there too (empty, same columns), so its presence does not identify a 2.x install. Neither host had an `auth.json` at all. The resolution already probes both stores on every version, so only the comments were wrong. Says so now, and records that a 2.x install which never ran the legacy import has no `auth.json` either — which is why both tiers exist. * refactor(shared): move GhosttyImportPreview out of global-settings-types Adding `opencodeGoApiKey` pushed global-settings-types.ts one line past the 300-line ceiling, failing `oxlint` in CI. AGENTS.md forbids a max-lines suppression, so split instead: the Ghostty import preview is a distinct concern that never belonged in the settings-shape file. Re-exported from the original module so no importer changes. 293 code lines now. --------- Co-authored-by: Jinwoo-H <jinwoo0825@gmail.com> Co-authored-by: Claude <noreply@anthropic.com> |
||
 Wooseong Kim
|
7a6d10064e |
fix: read OpenCode Go usage from the console API (#21462)
* fix: read OpenCode Go usage from the console API The workspace HTML page now 302s to console login. Fetch /console/api/go/status with x-org-id, map JSON meters into the existing windows, and keep __Host-console_session on the closed cookie allowlist. Fixes #21420 * fix: tell users to paste the OpenCode console session cookie The Go status API is authed by __Host-console_session. Settings still told people to paste auth only, which 401s. Ask for the full Cookie header; auth remains enough for workspace discovery. |
||
  
|
9080205812 |
fix(rate-limits): authenticate OpenCode Go through a session cookie jar (#8047)
* fix(rate-limits): use session cookies for OpenCode Go * fix(rate-limits): harden OpenCode session setup --------- Co-authored-by: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Co-authored-by: OrcaWin <alpha-eng@stably.ai> |
||
 
|
faf949835f |
feat(rate-limits): add Gemini and OpenCode Go usage tracking (#1023)
* feat(rate-limits): add Gemini and OpenCode Go usage tracking - Extend provider union and RateLimitState with 'gemini' and 'opencode-go' - Add opencodeSessionCookie to GlobalSettings (password input in GeneralPane) - Add GeminiIcon and OpenCodeGoIcon to status bar icons - Implement gemini-usage-fetcher: OAuth creds from ~/.gemini/oauth_creds.json, auto-refresh expired tokens (including server-side 401 retry), loadCodeAssist project resolution, retrieveUserQuota with pro/flash bucket mapping - Implement opencode-go-usage-fetcher: cookie-based POST to opencode.ai/_server, two-step workspace+subscription fetch, regex parse of text/javascript response - Wire both fetchers into RateLimitService via Promise.allSettled for isolation - Add formatWindowLabel() replacing hardcoded '5h'/'wk' strings in StatusBar - Render Gemini and OpenCode Go segments in StatusBar and tooltip - 28 new tests across fetchers, service, and label formatter Closes #1022 * fix(persistence): additive merge for statusBarItems on load New providers (gemini, opencode-go) were invisible to users with existing settings because the persisted statusBarItems array (without the new entries) overwrote the defaults. Union saved items with current defaults so new providers appear automatically after upgrade without user intervention. * feat(rate-limits): add Gemini multi-bucket usage Restore provider auth wiring, preserve Gemini model buckets in detailed views, and keep compact status rendering summary-only. Avoid embedding OAuth client secrets by failing closed for auth.json refreshes. * fix(gemini-oauth): resolve symlinks and use known-path + bundle-dir extraction Replace the recursive directory walker with two targeted strategies: 1. Known paths: checks explicit Homebrew/Nix/npm layouts without walking. 2. Bundle dir: walks up from the binary to find package.json, then scans the bundle dir for hash-named oauth2 chunks. Also threads the refresh token as a plain string through tryRefreshTokenFromBundle so both the oauth_creds.json and auth.json paths share one refresh flow without coupling to either struct. Windows: uses 'where gemini' and splits on newlines for multi-result output. * fix(status-bar): fix Gemini bucket display — names, window size, model context Three issues fixed: 1. windowMinutes was computed as time-remaining-until-reset instead of the fixed window size. Gemini buckets are always 1-hour windows; use the constant 60 so labels read "93% Pro 1h" instead of "93% 47m". 2. Unknown bucket names now humanize gracefully. Unknown model IDs get the "gemini-" prefix stripped and title-cased ("gemini-3.0-ultra" → "3.0 Ultra") instead of showing "Unknown (gemini-3.0-ultra)". Added more known model mappings (2.0 Flash, 2.0 Flash Lite, 1.5 Pro, 1.5 Flash, Flash Lite). 3. Status bar segment now shows the most-constrained bucket name next to the percentage so users know which model is the binding constraint. Pure unit tests for getBucketName/deriveSessionSummary extracted to gemini-bucket-helpers.test.ts to keep gemini-usage-fetcher.test.ts under the 300-line lint limit. * feat(status-bar): show all Gemini buckets individually in status bar Instead of showing only the most-constrained bucket summary, render each bucket by name with its remaining percentage (e.g. "Flash 93% · 3.1 Pro Preview 7%"). Falls back to the session/weekly window display for providers without buckets. * fix(status-bar): show only Flash and 3.1 Pro Preview buckets in Gemini segment Filter to the two most relevant buckets (Flash + 3.1 Pro Preview) to avoid cluttering the bar. Falls back to session summary if neither bucket is present. * fix(icons): replace GeminiIcon with official 2025 multicolor gradient The previous icon used a simple linear gradient (blue→purple→red). The official Google Gemini 2025 icon uses 11 blurred ellipses (feGaussianBlur) stacked under an alpha mask to produce the characteristic multicolor glow effect. Each instance gets unique filter/mask IDs via a module-level counter to prevent ID collisions when the icon is rendered multiple times on the same page. * feat(opencode): add monthly limits, workspace override, and improved cookie handling * fix(opencode): show correct status when session cookie is missing * fix(rate-limits): discard stale data on unavailable and show errors in tooltip * fix(rate-limits): invalidate stale data when opencode config changes * fix(security): resolve vulnerabilities and harden rate-limit fetchers * fix: address critical security, performance and concurrency issues identified during code review * fix(build): resolve claude rate-limit export and broken type definitions * fix(build): remove unused code in claude-fetcher after rebase * Fix claude fetcher * fix: resolve synchronization, performance, and robustness issues in AI providers - Convert synchronous file I/O to asynchronous to prevent main process blocking - Implement concurrency limiting in recursive directory copying to avoid EMFILE errors - Persist refreshed Gemini OAuth tokens to disk and improve project ID resolution - Fix OpenCode Go fetcher to correctly handle workspace overrides and robustly resolve IDs - Refine scraping regexes to handle nested objects and improve resilience - Update status bar bucket names and fix Gemini model mapping typos - Ensure proper handling of async operations in background services * feat(gemini): deduplicate quota buckets and update model mappings * fix(rate-limits): preserve stale data for Gemini and OpenCode Go on fetch errors * fix: remove out-of-scope Linear changes and restore files to upstream/main * fix(opencode-go): handle React Flight wire format and duplicate keys The opencode.ai page uses React Server Components. Usage keys like monthlyUsage appear twice: once as `key:$R[N]={...}` with real data and once as `key:null` inside a billing component. Render order varies, so on refresh the null could appear first, causing monthly to vanish or show 100% from a sibling sub-object. Replace flat regex extraction with extractUsageBlock, which: - Iterates all occurrences of each key - Skips null assignments (no { in 30-char window after colon) - Handles the $R[N]= token between colon and opening brace - Validates usagePercent + resetInSec as direct fields before accepting Add regression tests using the real React Flight HTML format. * fix(rate-limits): address PR review feedback from nwparker Scope reverts (out-of-scope changes removed): - Revert codex-accounts async refactor (fs-utils.ts, service.ts) - Revert filesystem-auth.ts path-auth reordering - Revert filesystem-mutations.ts bundled changes - Revert repos.ts handler move; keep only -- separator fix - Revert relay/fs-handler-git-fallback.ts RegExp try/catch - Revert fs-handler.ts stat→lstat, useFileDeletion.ts !isRemote guard - Revert persistence.ts statusBarItems additive merge Feature fixes: - Validate opencodeWorkspaceId override with ^(wrk|wk)_[A-Za-z0-9]+$ before URL interpolation - Remove internal 5-min cache from fetchGeminiRateLimits (service polls already) - Make saveGeminiCredentials atomic using tmp-file + rename pattern - Add fetchGeneration counter to OpenCode to discard stale mid-flight results - Add console.warn on safeStorage decrypt failure in persistence.ts - Add geminiCliOAuthEnabled opt-in setting (default: false) with UI toggle and risk disclosure - Use per-candidate AbortControllers in opencode-go fetcher - Add fragility comments to brace-depth parsers in opencode-go fetcher Refactor (keep under 300-line lint limit): - Extract gemini-bucket-formatting.ts from gemini-usage-fetcher.ts - Extract opencode-go-page-scraper.ts from opencode-go-usage-fetcher.ts Co-authored-by: Orca <help@stably.ai> * fix(rate-limits): restore OpenCode Go workspace ID regex + cleanup - opencode-go-usage-fetcher: regex accidentally shipped as `\\s*` (matches literal backslash-s) instead of `\s*` during the review-feedback commit, breaking workspace ID extraction when no override is configured — parseWorkspaceIds always returned []. 10 tests were failing as a result. - gemini-usage-fetcher: drop unused `_force` parameter left over from the removed 5-min internal cache; update service.ts call site. - codex-accounts test fixtures: add missing `geminiCliOAuthEnabled` to createSettings() to fix pre-existing typecheck errors introduced when the new setting was added. Co-authored-by: Orca <help@stably.ai> * test(rate-limits): stabilize Gemini fetcher tests, silence max-lines - Rewire Gemini fetcher tests to mock the CLI-credential extractor at the module boundary instead of stubbing every fs/child_process call. The extractor is a self-contained dependency with a simple async contract, and was previously being reached through sync-fs mocks that stopped matching after the extractor was refactored to node:fs/promises — three tests were silently failing as a result. With this change, all 17 Gemini fetcher tests pass. - Replace the "proceeds with empty projectId" test (which asserted that an empty projectId still hits the quota API — the current fetcher correctly short-circuits to an actionable error instead) with a test that documents the new behavior, plus an explicit test for the geminiCliOAuthEnabled=false unavailable path. - Add a max-lines disable pragma to service.test.ts matching the one already on service.ts, so the rate-limit fetch-ordering contract and its tests remain reviewable as a single unit. Co-authored-by: Orca <help@stably.ai> * fix(codex-accounts): revert runtime-home-service async refactor The review explicitly asked to drop the codex async refactor from this PR (fires floating promises from the constructor via void, and the prepare* helpers no longer block on sync completion — that is a behavior change around account prep racing with launch that deserves its own design discussion, not a drive-by). Earlier reverts removed fs-utils.ts and service.ts but left runtime-home-service.ts untouched, which was causing the matching runtime-home-service.test.ts suite (11 tests) to fail in CI. This restores the file to main so the suite is green and the PR stays scoped to the Gemini / OpenCode Go feature. Co-authored-by: Orca <help@stably.ai> --------- Co-authored-by: Orca <help@stably.ai> Co-authored-by: Neil <4138956+nwparker@users.noreply.github.com> |