Skip to content

Rework onboarding "Choose how to access AI": Subscription + Set up later#12993

Merged
jefflloyd merged 3 commits into
masterfrom
onboarding/ai-access
Jun 25, 2026
Merged

Rework onboarding "Choose how to access AI": Subscription + Set up later#12993
jefflloyd merged 3 commits into
masterfrom
onboarding/ai-access

Conversation

@jefflloyd

@jefflloyd jefflloyd commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

Description

Reworks the "Choose how to access AI" onboarding slide (Warp Agent path), gated by OpenWarpNewSettingsModes. The slide now offers two options:

  • Subscription — the paid plan, which kicks off the upgrade/checkout flow (browser open, manual auth-prompt fallback bar, Copy-URL / Paste-token links).
  • Set up later — "Explore Warp's built-in AI features before committing to a plan, or bring your own inference."

Primary action moved onto Next. The in-card "Choose plan" button is removed; the bottom Next button drives the flow based on the selected card:

  • Subscription selected → Next opens the upgrade page in the browser (and surfaces the fallback bar); if the user is already a paying user it advances. The slide still auto-advances once billing flips to paying.
  • Set up later selected → Next advances to the next slide (skippable without subscribing).

All bring-your-own-key/endpoint (BYOK) code is removed: the add-key / add-custom-endpoint buttons, their actions/events, the "connected keys" status line, and the set_byok_status plumbing across the onboarding view and root_view. The now-orphaned provider_keys_modal (BYOK "Add API key" dialog) is deleted. The settings page's CustomEndpointModal is intentionally untouched (still used by settings).

This slide's own "I don't want AI" escape button is also removed (the other slides' copies are handled in PR-B).

Why: part of the agent-onboarding rework — simplify AI access to a clear "subscribe now or explore first" choice, and let users proceed without subscribing.

Notes for the integrator

PR-C of a 4-PR split. Shared-file edits are localized:

  • model.rs: renamed AiAccessChoice::ByokSetUpLater. Also removed the now-unused NoAiConfirmationSource::AiAccess variant + its single cancel_no_ai arm (authorized bounded exception; removing this slide's no-AI trigger orphaned it under -D warnings). Expect a small localized conflict with PR-B here, resolved at integration (merge order B→C).
  • agent_onboarding_view.rs / bin/main.rs: removed the BYOK event variants.
  • Did not touch the LoginSlideView::new call sites (owned by PR-D).

Conversation: https://staging.warp.dev/conversation/23cf4d0f-2950-4c25-a229-37c9715cf2c3
Run: https://oz.staging.warp.dev/runs/019efa09-3960-738c-965a-d4ccfea2a0f0

Linked Issue

N/A — tracked by the onboarding rework plan.

Testing

  • ./script/format — clean

  • cargo clippy -p onboarding --all-targets --all-features --tests -- -D warnings — clean

  • cargo nextest run -p onboarding — 13/13 pass

  • cargo clippy -p warp --all-targets --tests -- -D warnings — clean (default features; --all-features is blocked by an unrelated command-signatures-v2 yarn/corepack environment issue that WARP.md special-cases)

  • cargo nextest run -p warp -E 'test(onboarding) | test(login)' — pass

  • I have manually tested my changes locally with ./script/run

Agent Mode

  • Warp Agent Mode - This PR was created via Warp's AI Agent Mode

CHANGELOG-IMPROVEMENT: The onboarding "Choose how to access AI" step now offers "Subscription" or "Set up later" and can be skipped without subscribing; choosing Subscription and pressing Next opens the upgrade page directly.

@cla-bot cla-bot Bot added the cla-signed label Jun 24, 2026
@jefflloyd jefflloyd marked this pull request as ready for review June 25, 2026 00:51
@jefflloyd jefflloyd requested a review from tylerlam-warp June 25, 2026 00:51
@oz-for-oss

oz-for-oss Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

@jefflloyd

I'm starting a first review of this pull request.

You can view the conversation on Warp.

I completed the review and no human review was requested for this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

@oz-for-oss oz-for-oss Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overview

This PR reworks the onboarding AI access slide to replace the BYOK option with Subscription / Set up later, moves the subscription checkout trigger to Next, and removes the now-unused BYOK onboarding modal and event plumbing.

Concerns

  • For this user-facing onboarding change, please include screenshots or a screen recording demonstrating the updated Subscription and Set up later flows end to end. The PR description does not include visual evidence, and the manual testing checkbox is still unchecked, so the UI behavior and fallback bar cannot be reviewed visually.

Verdict

Found: 0 critical, 1 important, 0 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

jefflloyd and others added 3 commits June 25, 2026 10:52
Replace the BYOK card with a skippable "Set up later" option, remove all BYOK plumbing (add-key/add-endpoint buttons, events, status line, set_byok_status, and the now-orphaned provider_keys_modal), and rename AiAccessChoice::Byok -> SetUpLater. Also remove this slide's "I don't want AI" button. Gated by OpenWarpNewSettingsModes.

Co-Authored-By: Oz <oz-agent@warp.dev>
Remove the in-card "Choose plan" button. The bottom "Next" button now opens the upgrade page in the browser when Subscription is selected (or advances if the user already has a plan), and advances on the "Set up later" path.

Co-Authored-By: Oz <oz-agent@warp.dev>
Co-Authored-By: Oz <oz-agent@warp.dev>
@jefflloyd jefflloyd force-pushed the onboarding/ai-access branch from cb48f16 to 20c7ee1 Compare June 25, 2026 14:57
@jefflloyd jefflloyd enabled auto-merge (squash) June 25, 2026 15:07
@jefflloyd jefflloyd merged commit b349964 into master Jun 25, 2026
25 checks passed
@jefflloyd jefflloyd deleted the onboarding/ai-access branch June 25, 2026 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants