Skip to content

feat(oauth): add google-antigravity to OAuth 401 replay and force-refresh providers #3576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
agentHits wants to merge 2 commits into from
Closed

feat(oauth): add google-antigravity to OAuth 401 replay and force-refresh providers #3576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a5419b
feat(oauth): add google-antigravity to OAuth 401 replay and force-ref…
agentHits Sep 5, 2026
fcfe877
fix(responses): fail-closed guard on project-less CCA 401 replay and …
agentHits Sep 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/oauth/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ export async function getValidAccessTokenSnapshot(provider: string): Promise<OAu
}

/** Providers whose upstream-401 replay path may force a snapshot refresh. */
const FORCE_REFRESH_PROVIDERS = new Set(["xai", "github-copilot", "kiro"]);
const FORCE_REFRESH_PROVIDERS = new Set(["xai", "github-copilot", "kiro", "google-antigravity"]);

export async function forceRefreshOAuthAccessSnapshot(
rejected: OAuthAccessSnapshot,
Expand Down
29 changes: 25 additions & 4 deletions src/server/responses/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3327,8 +3327,12 @@ async function handleResponsesInner(

// OAuth providers: swap in a fresh access token (auto-refreshed) as the Bearer key, so the
// existing openai-chat / anthropic adapters authenticate with no change.
const isOAuth401ReplayProvider = (route.providerName === "xai" || route.providerName === "github-copilot" || route.providerName === "kiro")
&& route.provider.authMode === "oauth";
const isOAuth401ReplayProvider = (
route.providerName === "xai"
|| route.providerName === "github-copilot"
|| route.providerName === "kiro"
|| route.providerName === "google-antigravity"
) && route.provider.authMode === "oauth";
let sentOAuthSnapshot: OAuthAccessSnapshot | undefined;
let replayOAuthCredentialSnapshot: Pick<OAuthAccessSnapshot, "accountId" | "generation"> | undefined;
let anthropicPoolAccountId: string | null = null;
Expand Down Expand Up @@ -4369,6 +4373,11 @@ async function handleResponsesInner(
releaseCodexAuthContextProbeLease(authCtx);
return formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(err));
}
if (route.provider.googleMode === "cloud-code-assist" && !refreshed.projectId) {
upstream.abort();
releaseCodexAuthContextProbeLease(authCtx);
return formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(new Error("Cloud Code Assist project is required")));
}
sentOAuthSnapshot = refreshed;
replayOAuthCredentialSnapshot = {
accountId: refreshed.accountId,
Expand All @@ -4379,7 +4388,11 @@ async function handleResponsesInner(
}
const refreshedProvider = resolveProviderTransport(
route.providerName,
{ ...route.provider, apiKey: refreshed.accessToken },
{
...route.provider,
apiKey: refreshed.accessToken,
...(refreshed.projectId ? { project: refreshed.projectId } : {}),
},
Comment thread
coderabbitai[bot] marked this conversation as resolved.
parsed.options.promptCacheKey,
route.providerName === "github-copilot"
? resolveCopilotApiBaseUrl(refreshed.apiBaseUrl)
Expand Down Expand Up @@ -6120,6 +6133,10 @@ async function handleResponsesInner(
cleanupUpstreamAbort();
return formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(err));
}
if (route.provider.googleMode === "cloud-code-assist" && !refreshed.projectId) {
cleanupUpstreamAbort();
return formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(new Error("Cloud Code Assist project is required")));
}
sentOAuthSnapshot = refreshed;
replayOAuthCredentialSnapshot = {
accountId: refreshed.accountId,
Expand All @@ -6130,7 +6147,11 @@ async function handleResponsesInner(
}
const refreshedProvider = resolveProviderTransport(
route.providerName,
{ ...route.provider, apiKey: refreshed.accessToken },
{
...route.provider,
apiKey: refreshed.accessToken,
...(refreshed.projectId ? { project: refreshed.projectId } : {}),
},
parsed.options.promptCacheKey,
route.providerName === "github-copilot"
? resolveCopilotApiBaseUrl(refreshed.apiBaseUrl)
Expand Down
Loading
Loading