fix(platform): resolve autopilot beta blockers (SECRT-2266/2267/2268/2269)

[ntindle]

Why / What / How

Why: A beta user spent significant time trying to build and run agents that read Google Sheets. Four separate failures compounded on their session — all already open in Linear as SECRT-2266 through SECRT-2269. Three in-flight PRs each addressed a piece but conflicted on the same files (backend/data/model.py, backend/blocks/_base.py, autogpt_libs/.../types.py), so landing them individually would have been churn. One of the four reported issues (the credential-delete crash) is also the top unresolved Sentry issue AUTOGPT-SERVER-6HB with 100+ events going back to 2025-10-20 — it was archived as "ignored" but is a real regression. Bug #4 required new work; the others we got by adopting the existing open PRs and addressing a pending review comment.

What: This PR consolidates the three in-flight PRs, adds the two pieces of new work needed to fully close the beta blockers, and addresses the pending review on one of the three PRs so it doesn't require a second round.

• Closes PR fix(platform): Fix Google Drive auto-credentials handling across the platform #12004 — Google Drive auto-credentials handling (merged in)
• Closes PR feat(platform): add incremental OAuth authorization for scope upgrades #12748 — Incremental OAuth for scope upgrades (merged in)
• Closes PR fix(blocks): prevent TypeError when auto_credentials field is empty #12588 — superseded by the systemic None-guard here (see "How" below)
• Adds Bug 2 fix — Google credential deletion no longer crashes on revoke_tokens
• Adds Bug 4 validator — the agent builder can no longer save a graph with a hardcoded Drive file ID

How:

1. Adopt PR fix(platform): Fix Google Drive auto-credentials handling across the platform #12004 (Bug 1 — auto-credentials resolution). Tags Drive-file fields as is_auto_credential on CredentialsFieldInfo, exposes BlockSchema.get_auto_credentials_fields() and Graph.regular_credentials_inputs / auto_credentials_inputs, extracts _acquire_auto_credentials() in the executor to resolve embedded _credentials_id at run time, clears _credentials_id on agent fork so cloned agents don't inherit the original author's credential, and fixes the Firefox referrer policy on the Google Drive picker script load.

2. Adopt PR feat(platform): add incremental OAuth authorization for scope upgrades #12748 (Bug 3 — credential accumulation). OAuth callback now merges scopes into an existing credential (explicit via credential_id in OAuth state, or implicit via provider + username match) instead of appending a new row on every reconnect. GitHub's non-incremental OAuth path requests the union of existing + new scopes at login so the upgrade path works there too.

3. Replace PR fix(blocks): prevent TypeError when auto_credentials field is empty #12588 with a systemic None-guard (addresses reviewer feedback). The original PR added a per-block credentials: GoogleCredentials | None = None + early guard pattern that would need to be repeated across 50+ blocks with GoogleDriveFileField. Per the reviewer's ask, we moved the guard into Block._execute() once: after the setdefault loop, if kwargs[kwarg_name] is None we raise BlockExecutionError with a clean user-facing message. The per-block change in sheets.py is dropped so credentials: GoogleCredentials stays non-Optional. Dry-run path skips the guard (executor intentionally runs blocks without resolved creds for schema validation).

4. Fix Bug 2 — Google revoke_tokens (SECRT-2267, AUTOGPT-SERVER-6HB). revoke_tokens() was handing our Pydantic OAuth2Credentials into google-auth's AuthorizedSession, which calls self.credentials.before_request(...) on the object and crashes with AttributeError: 'OAuth2Credentials' object has no attribute 'before_request'. Google's token revoke endpoint doesn't need any auth header — just token=<token> in the form body per Google's docs. Switched to the platform's async Requests helper, matching how reddit.py / github.py / todoist.py / other providers do revocation. No google-auth objects involved.

5. Fix Bug 4 — hardcoded Drive file IDs in agent graphs (SECRT-2269). Evidence from the beta user's session: CoPilot's agent-builder produced 13 saved graph versions in one session where each one stuffed either a bare string ("1KAv…") or a partial object ({"id": "1KAv…"}) into GoogleSheetsReadBlock.constantInput.spreadsheet, never wiring an AgentGoogleDriveFileInputBlock as the intended input. Bare-string versions failed pydantic validation with is not of type 'object'; object-with-only-id versions would have crashed at run time because _acquire_auto_credentials has no _credentials_id to resolve. Added a validator in GraphModel._validate_graph_get_errors that flags any auto-credentials field whose input_default.<field> is a bare string OR a dict missing _credentials_id, when there's no upstream link feeding the field. Remediation text is format-aware: when field_schema["format"] == "google-drive-picker" it names AgentGoogleDriveFileInputBlock specifically; for any other future auto-credentials format (OneDrive / Dropbox / etc.) the remediation is generic, so we don't ship a stale Google-specific hint that doesn't apply.

A companion handoff for the CoPilot agent-builder team is drafted at /tmp/agent-builder-ticket-drive-file-input.md (to be filed in their tracker). The validator here is a safety net so reviewers and the LLM both get a clear error with the correct remediation; the agent-builder itself still needs to learn the correct pattern so it stops trying to hardcode Drive files in the first place.

Changes 🏗️

Backend

• backend/data/model.py — merged is_auto_credential + input_field_name (fix(platform): Fix Google Drive auto-credentials handling across the platform #12004) with OAuthState.credential_id (feat(platform): add incremental OAuth authorization for scope upgrades #12748); kept HEAD's defensive set() copy on discriminator_values.
• backend/blocks/_base.py — _execute() runs the auto-credentials setdefault loop + raises BlockExecutionError when a resolved value is None.
• backend/blocks/google/sheets_test.py — 2 new tests (systemic None-guard behaviour).
• backend/blocks/google/_drive.py, _drive_test.py — unchanged on this branch (earlier bare-string validator was reverted after feedback; see "Out of scope" below).
• backend/data/graph.py — auto-credentials anti-pattern validator in _validate_graph_get_errors.
• backend/data/graph_test.py — 11 new tests for the validator.
• backend/integrations/oauth/google.py — revoke_tokens swapped to Requests().post, removed AuthorizedSession misuse.
• backend/integrations/oauth/google_test.py — 3 new tests covering the revoke happy path, no-access-token, and non-2xx-response.
• backend/integrations/credentials_store.py — from feat(platform): add incremental OAuth authorization for scope upgrades #12748.
• backend/api/features/integrations/router.py — incremental-OAuth callback + scope upgrade helpers (from feat(platform): add incremental OAuth authorization for scope upgrades #12748).
• backend/api/features/integrations/incremental_oauth_test.py — 15 tests (from feat(platform): add incremental OAuth authorization for scope upgrades #12748).
• backend/api/features/chat/tools/utils.py → renamed to backend/copilot/tools/utils.py during merge; now uses regular_credentials_inputs for missing-creds + matching (from fix(platform): Fix Google Drive auto-credentials handling across the platform #12004).
• backend/copilot/tools/utils_test.py — moved from api/features/chat/tools/, import paths updated.
• backend/api/features/library/db.py — library preset guard uses regular_credentials_inputs (from fix(platform): Fix Google Drive auto-credentials handling across the platform #12004).
• backend/data/graph.py — regular_credentials_inputs / auto_credentials_inputs properties + _reassign_ids clears _credentials_id on fork (from fix(platform): Fix Google Drive auto-credentials handling across the platform #12004).
• backend/executor/manager.py — _acquire_auto_credentials() extracted + validation (from fix(platform): Fix Google Drive auto-credentials handling across the platform #12004).
• backend/executor/utils.py, utils_test.py, manager_auto_credentials_test.py — auto-credentials tests (from fix(platform): Fix Google Drive auto-credentials handling across the platform #12004).

Frontend

• frontend/src/components/contextual/GoogleDrivePicker/helpers.ts — Firefox referrer fix (from fix(platform): Fix Google Drive auto-credentials handling across the platform #12004).
• frontend/src/components/contextual/CredentialsInput/useCredentialsInput.ts, src/hooks/useCredentials.ts, src/lib/autogpt-server-api/client.ts, src/providers/agent-credentials/credentials-provider.tsx, src/app/api/openapi.json — incremental-OAuth scope upgrade UI (from feat(platform): add incremental OAuth authorization for scope upgrades #12748).

Shared libs

• autogpt_libs/supabase_integration_credentials_store/types.py — merged additions from both fix(platform): Fix Google Drive auto-credentials handling across the platform #12004 and feat(platform): add incremental OAuth authorization for scope upgrades #12748.

Test plan 📋

• poetry run lint — clean
• poetry run pytest backend/data/graph_test.py — 55 passed including 11 new validator tests
• poetry run pytest backend/integrations/oauth/google_test.py — 3 new tests passing
• poetry run pytest backend/blocks/google/sheets_test.py — 2 new tests passing
• poetry run pytest backend/blocks/google/ backend/integrations/oauth/ backend/executor/ backend/data/graph_test.py backend/api/features/integrations/ backend/copilot/tools/utils_test.py — 250 passed, 6 pre-existing failures that require the docker stack (RabbitMQ/Redis/Postgres) and fail identically on origin/dev
• pnpm format — clean
• pnpm lint — 3 pre-existing <img> warnings on files I didn't touch, no errors
• pnpm types — pre-existing errors on AgentActivityDropdown that also fail on origin/dev (unrelated to this PR; needs a separate fix on dev)
• Live repro on dev verified Bug 2 fires against current prod code — two fresh Sentry events in AUTOGPT-SERVER-6HB at 2026-04-21T21:35:54Z on app:dev-behave:cloud matching the exact DELETE /api/integrations/google/credentials/{cred_id} path. Airtable OAuth2 delete as a control worked cleanly, confirming Google-specific.
• Live repro on dev verified Bug 4 (CoPilot direct-run variant) — {"spreadsheet": {"id": "..."}} → Cannot use file 'None' (type: None) from _validate_spreadsheet_file mimeType check, as expected.

Reviewer post-merge verification:

• Delete a Google OAuth credential via the Integrations UI — succeeds cleanly, no Sentry event fires
• Connect Google twice (same account, same scopes) — credential count stays at 1 (dedup)
• Save an agent graph with GoogleSheetsReadBlock.constantInput.spreadsheet = "bare-id" via API — graph validator rejects with AgentGoogleDriveFileInputBlock remediation
• Save an agent graph with GoogleSheetsReadBlock whose spreadsheet is fed by an upstream AgentGoogleDriveFileInputBlock.result — validator accepts, agent runs

Out of scope (for follow-ups)

• Bug 1 — "Failed to retrieve Google OAuth credentials" in frontend/src/components/contextual/GoogleDrivePicker/useGoogleDrivePicker.ts:163. Zero hits for this string in the beta user's Langfuse traces and we weren't able to reproduce it from a clean flow. Most likely a stale-credential race condition (delete in another tab, picker queries a stale React-Query cache). Tracked as a separate task; not blocking.
• CoPilot first-attempt mimeType retry loop. Observed on dev: CoPilot's first call to GoogleSheetsReadBlock sends {"spreadsheet": {"id": "..."}} without mimeType, hits _validate_spreadsheet_file, retries with mimeType. Costs a round-trip. Two possible fixes (relax _validate_spreadsheet_file to skip when mimeType is None and let Google's API surface the real error; OR extend get_auto_credentials_fields metadata so CoPilot's tool description prompts it to always include mimeType). Deliberately deferred — fixing only one of "API caller sends a bare string" or "CoPilot sends an incomplete object" risked the same auth-ambiguity the bare-string commit in this branch history hit.
• CoPilot agent-builder prompt/guide update. The validator here produces the correct error message, but the agent-builder model still needs to learn to use AgentGoogleDriveFileInputBlock upfront rather than discover it through validator retries. Separate handoff ticket filed.

🤖 Generated with Claude Code

---

Note

Medium Risk
Touches OAuth credential issuance/upgrade paths and introduces a new endpoint that returns raw access tokens (scope-gated), plus broad changes to execution-time credential resolution/validation; mistakes could impact auth/security or break integrations.

Overview
Fixes several Google/Drive agent-builder blockers by supporting incremental OAuth scope upgrades and by hardening how credential-bearing file inputs (“auto-credentials”) are validated, resolved, and cleared on graph fork.

On the integrations API, /{provider}/login now accepts credential_id and persists it in OAuthState to upgrade an existing OAuth2 credential on callback (explicit upgrade), with an implicit merge path for same provider+username. The callback path now merges scopes/metadata, preserves ID/title, preserves existing refresh_token/username when missing from incremental responses, blocks upgrades for managed/system credentials, and adds a new /{provider}/credentials/{cred_id}/picker-token endpoint to return a short-lived access token for provider-hosted pickers (currently allowlisted to Google Drive scopes).

For auto-credentials, CredentialsFieldInfo gains is_auto_credential + input_field_name, graphs now expose regular_credentials_inputs vs auto_credentials_inputs, and multiple callers switch from aggregate_credentials_inputs() to regular_credentials_inputs so embedded picker credentials aren’t treated as user-mapped inputs. Execution-time auto-credential acquisition is extracted into _acquire_auto_credentials() with clearer error handling and lock cleanup; block execution adds a systemic guard to surface a clean Missing credentials error when auto-credentials are absent.

Separately fixes Google credential deletion by rewriting GoogleOAuthHandler.revoke_tokens() to use the platform Requests helper (bounded retries) instead of AuthorizedSession, and expands test coverage across these flows (incremental OAuth, picker-token, auto-credential validation/acquisition, graph validator, and frontend diagnostics test stubs).

^{Reviewed by Cursor Bugbot for commit cac36ea. Bugbot is set up for automated code reviews on this repo. Configure here.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit ff67797. Configure here.}