Repository navigation
Retry Relayfile setup after cloud auth refresh - #95
Conversation
|
CodeAnt AI is reviewing your PR. |
ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Free Run ID: 📒 Files selected for processing (3)
📝 WalkthroughWalkthroughThe PR adds token refresh and automatic retry-on-unauthorized functionality. It introduces ChangesToken Refresh and Retry on Authorization Failures
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes Poem
Note 🎁 Summarized by CodeRabbit FreeYour organization is on the Free plan. CodeRabbit will generate a high-level summary and a walkthrough for each pull request. For a comprehensive line-by-line review, please upgrade your subscription to CodeRabbit Pro by visiting https://app.coderabbit.ai/login. Comment |
codeant-ai
Bot
added
the
size:M
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request introduces token refreshing logic when encountering unauthorized (401/403) errors during workspace operations. It adds a helper refreshCloudAuth in auth.ts, implements isUnauthorizedError checks, and refactors both IntegrationEventBridge and IntegrationMountManager to catch unauthorized errors, refresh the cloud authentication, and retry the workspace connection or mount. Feedback on the changes highlights a bug in the isUnauthorizedError regular expression where the word boundary \b prevents matching "unauthorized" due to the truncated term "unauthor". It is recommended to update the regex to use "unauthorized" and to handle cases where the error is thrown directly as a string.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
| function isUnauthorizedError(error: unknown): boolean { | ||
| if (!error || typeof error !== 'object') return false | ||
| const status = (error as { httpStatus?: unknown; status?: unknown }).httpStatus ?? | ||
| (error as { httpStatus?: unknown; status?: unknown }).status | ||
| if (status === 401 || status === 403) return true | ||
| const message = (error as { message?: unknown }).message | ||
| return typeof message === 'string' && /\b(401|403|unauthor|forbidden)\b/i.test(message) | ||
| } |
There was a problem hiding this comment.
The regular expression /\b(401|403|unauthor|forbidden)\b/i will fail to match the word "unauthorized" because of the trailing word boundary \b. Since "unauthorized" continues with "ized", there is no word boundary after "unauthor", causing the match to fail. Changing "unauthor" to "unauthorized" ensures that the full word is matched correctly. Additionally, handling cases where the error is thrown directly as a string makes this utility more robust.
| function isUnauthorizedError(error: unknown): boolean { | |
| if (!error || typeof error !== 'object') return false | |
| const status = (error as { httpStatus?: unknown; status?: unknown }).httpStatus ?? | |
| (error as { httpStatus?: unknown; status?: unknown }).status | |
| if (status === 401 || status === 403) return true | |
| const message = (error as { message?: unknown }).message | |
| return typeof message === 'string' && /\b(401|403|unauthor|forbidden)\b/i.test(message) | |
| } | |
| function isUnauthorizedError(error: unknown): boolean { | |
| if (!error) return false; | |
| if (typeof error === 'string') { | |
| return /\b(401|403|unauthorized|forbidden)\b/i.test(error); | |
| } | |
| if (typeof error !== 'object') return false; | |
| const status = (error as { httpStatus?: unknown; status?: unknown }).httpStatus ?? | |
| (error as { httpStatus?: unknown; status?: unknown }).status; | |
| if (status === 401 || status === 403) return true; | |
| const message = (error as { message?: unknown }).message; | |
| return typeof message === 'string' && /\b(401|403|unauthorized|forbidden)\b/i.test(message); | |
| } |
| function isUnauthorizedError(error: unknown): boolean { | ||
| if (!error || typeof error !== 'object') return false | ||
| const status = (error as { httpStatus?: unknown; status?: unknown }).httpStatus ?? | ||
| (error as { httpStatus?: unknown; status?: unknown }).status | ||
| if (status === 401 || status === 403) return true | ||
| const message = (error as { message?: unknown }).message | ||
| return typeof message === 'string' && /\b(401|403|unauthor|forbidden)\b/i.test(message) | ||
| } |
There was a problem hiding this comment.
The regular expression /\b(401|403|unauthor|forbidden)\b/i will fail to match the word "unauthorized" because of the trailing word boundary \b. Since "unauthorized" continues with "ized", there is no word boundary after "unauthor", causing the match to fail. Changing "unauthor" to "unauthorized" ensures that the full word is matched correctly. Additionally, handling cases where the error is thrown directly as a string makes this utility more robust.
function isUnauthorizedError(error: unknown): boolean {
if (!error) return false;
if (typeof error === 'string') {
return /\b(401|403|unauthorized|forbidden)\b/i.test(error);
}
if (typeof error !== 'object') return false;
const status = (error as { httpStatus?: unknown; status?: unknown }).httpStatus ??
(error as { httpStatus?: unknown; status?: unknown }).status;
if (status === 401 || status === 403) return true;
const message = (error as { message?: unknown }).message;
return typeof message === 'string' && /\b(401|403|unauthorized|forbidden)\b/i.test(message);
}
![codeant-ai[bot]](https://avatars.githubusercontent.com/in/646884?s=60&v=4){kind=small}
| export async function refreshCloudAuth(): Promise<CloudAuth | null> { | ||
| const pearAuth = loadTokens() | ||
| if (!pearAuth) return null | ||
| const refreshed = await refreshStoredTokens(pearAuth) | ||
| return refreshed ? cloudAuthFromStored(refreshed) : null | ||
| } |
There was a problem hiding this comment.
Suggestion: refreshCloudAuth only tries to refresh Pear-stored tokens and immediately returns null when those tokens are absent, even though resolveCloudAuth also supports Cloud SDK credentials. This makes the new Unauthorized retry path fail for SDK-authenticated setups (env/file auth), because refresh is never attempted from that source. Make refreshCloudAuth fall back to re-resolving Cloud SDK auth so both auth sources are handled consistently. [incomplete implementation]
Severity Level: Major ⚠️
- ❌ Local integration mounts fail to recover after Unauthorized.
- ❌ Integration event subscriptions fail retry under SDK-only auth.
- ⚠️ Env/file-provisioned auth behaves worse than in-app login.Steps of Reproduction ✅
1. Configure Pear to use only Cloud SDK auth so `loadTokens()` returns null and
`readCloudSdkAuth()` returns valid unexpired credentials (see `loadTokens` at
`src/main/auth.ts:226-235` and `resolveCloudAuth` at `src/main/auth.ts:102-121`).
2. Trigger integration mount reconciliation so
`IntegrationManager.syncLocalIntegrationMount` calls
`integrationMountManager.ensureMounted(...)` (see `src/main/integrations.ts:1718-1725`),
which in turn calls the private `mount()` method and obtains `auth` via
`resolveCloudAuth()` (see `src/main/integration-mounts.ts:224-231`).
3. During `mount()`, `setup.mountWorkspace(...)` is invoked for each mount (see
`startMount` in `src/main/integration-mounts.ts:53-70`); if the Cloud SDK access token is
rejected with 401/403, the error reaches the `catch` block where
`isUnauthorizedError(error)` returns true (see `isUnauthorizedError` at
`src/main/integration-mounts.ts:32-39`).
4. The Unauthorized retry path then calls `refreshCloudAuth()` (see
`src/main/integration-mounts.ts:75-80`), which immediately returns `null` when no
Pear-stored tokens exist (implementation at `src/main/auth.ts:134-139`), causing the code
to rethrow the original error instead of retrying with refreshed or re-resolved Cloud SDK
credentials; the same pattern exists for integration event subscriptions in
`getWorkspaceHandle()` (`src/main/integration-event-bridge.ts:24-67`), so
SDK-authenticated setups never benefit from the new Unauthorized retry behavior.Fix in Cursor | Fix in VSCode Claude
(Use Cmd/Ctrl + Click for best experience)
Prompt for AI Agent 🤖
This is a comment left during a code review.
**Path:** src/main/auth.ts
**Line:** 652:657
**Comment:**
*Incomplete Implementation: `refreshCloudAuth` only tries to refresh Pear-stored tokens and immediately returns `null` when those tokens are absent, even though `resolveCloudAuth` also supports Cloud SDK credentials. This makes the new Unauthorized retry path fail for SDK-authenticated setups (env/file auth), because refresh is never attempted from that source. Make `refreshCloudAuth` fall back to re-resolving Cloud SDK auth so both auth sources are handled consistently.
Validate the correctness of the flagged issue. If correct, How can I resolve this? If you propose a fix, implement it and please make it concise.
Once fix is implemented, also check other comments on the same PR, and ask user if the user wants to fix the rest of the comments as well. if said yes, then fetch all the comments validate the correctness and implement a minimal fix| if (this.deps.getWorkspaceHandle) return this.deps.getWorkspaceHandle() | ||
| const { accountWorkspaceReadyRetryOptions, getAccountWorkspaceId, resolveCloudAuth } = await import('./auth.ts') | ||
| const auth = await resolveCloudAuth() | ||
| const { accountWorkspaceReadyRetryOptions, getAccountWorkspaceId, refreshCloudAuth, resolveCloudAuth } = await import('./auth.ts') |
There was a problem hiding this comment.
Suggestion: The dynamic import uses ./auth.ts while the rest of the code imports the same module via ./auth. In packaged/runtime builds this can break chunk/module resolution or create inconsistent module identity behavior for the same dependency. Use the same module specifier style as the rest of the codebase for this import. [api mismatch]
Severity Level: Critical 🚨
- ❌ Integration event bridge fails to initialize workspace handle.
- ❌ Event subscriptions for integrations never establish in packaged app.
- ⚠️ Inconsistent auth module identity complicates debugging and testing.Steps of Reproduction ✅
1. Build and run the packaged Electron main process using `npm run build`, which compiles
`src/main/*.ts` (including `auth.ts` and `integration-event-bridge.ts`) to JavaScript
while static imports reference `./auth` without an extension (see usages in
`src/main/proactive-agent.ts:8`, `src/main/integrations.ts:5`,
`src/main/cloud-agent.ts:17`, `src/main/relay-workspace.ts:3`, and
`src/main/ipc-handlers.ts:21`).
2. In the running app, trigger integration event subscription reconciliation so
`IntegrationsManager.syncEventSubscriptions` calls `integrationEventBridge.reconcile(...)`
(see `src/main/integrations.ts:1652-1657`), which internally needs a Relay workspace
handle and calls the private `getWorkspaceHandle()` method (see
`src/main/integration-event-bridge.ts:24-88`).
3. `getWorkspaceHandle()` performs a dynamic import using the specifier `await
import('./auth.ts')` (see `src/main/integration-event-bridge.ts:24-27`), which in the
compiled JavaScript will try to load a module literally named `./auth.ts` even though the
built file is `auth.js` and all other imports target `./auth` without an extension.
4. This dynamic import rejects at runtime due to a failed module resolution or yields a
distinct module identity from the `./auth` import graph, causing `getWorkspaceHandle()` to
throw before resolving credentials, so `syncEventSubscriptions()` logs `[integrations]
Failed to reconcile integration event subscriptions` and returns false (see
`src/main/integrations.ts:13-22`), leaving integration events unsubscribed.Fix in Cursor | Fix in VSCode Claude
(Use Cmd/Ctrl + Click for best experience)
Prompt for AI Agent 🤖
This is a comment left during a code review.
**Path:** src/main/integration-event-bridge.ts
**Line:** 945:945
**Comment:**
*Api Mismatch: The dynamic import uses `./auth.ts` while the rest of the code imports the same module via `./auth`. In packaged/runtime builds this can break chunk/module resolution or create inconsistent module identity behavior for the same dependency. Use the same module specifier style as the rest of the codebase for this import.
Validate the correctness of the flagged issue. If correct, How can I resolve this? If you propose a fix, implement it and please make it concise.
Once fix is implemented, also check other comments on the same PR, and ask user if the user wants to fix the rest of the comments as well. if said yes, then fetch all the comments validate the correctness and implement a minimal fix
|
CodeAnt AI finished reviewing your PR. |
|
Reviewed and fixed PR #95 locally. Changes made:
Validation run:
|
|
✅ pr-reviewer applied fixes — committed and pushed Reviewed and fixed PR #95 locally. Changes made:
Validation run:
|
1 participant
User description
Summary
This addresses the startup log pattern where Pear has integrations and symlinks, but Relayfile mounts and integration event subscriptions fail with Unauthorized after a Cloud auth token is rejected.
Tests
CodeAnt-AI Description
Retry Relayfile setup after Cloud auth refresh
What Changed
Impact
✅ Fewer startup failures for integrations✅ Fewer relaunches after Cloud token rejection✅ More reliable integration event subscriptions🔄 Retrigger CodeAnt AI Review
💡 Usage Guide
Checking Your Pull Request
Every time you make a pull request, our system automatically looks through it. We check for security issues, mistakes in how you're setting up your infrastructure, and common code problems. We do this to make sure your changes are solid and won't cause any trouble later.
Talking to CodeAnt AI
Got a question or need a hand with something in your pull request? You can easily get in touch with CodeAnt AI right here. Just type the following in a comment on your pull request, and replace "Your question here" with whatever you want to ask:
This lets you have a chat with CodeAnt AI about your pull request, making it easier to understand and improve your code.
Example
Preserve Org Learnings with CodeAnt
You can record team preferences so CodeAnt AI applies them in future reviews. Reply directly to the specific CodeAnt AI suggestion (in the same thread) and replace "Your feedback here" with your input:
This helps CodeAnt AI learn and adapt to your team's coding style and standards.
Example
Retrigger review
Ask CodeAnt AI to review the PR again, by typing:
Check Your Repository Health
To analyze the health of your code repository, visit our dashboard at https://app.codeant.ai. This tool helps you identify potential issues and areas for improvement in your codebase, ensuring your repository maintains high standards of code health.