feat(q): builderid "paid tier" flow #1197

justinmk3 · 2025-04-29T15:18:50Z

Problem

When "free tier" limit is reached, there are no clear next steps.

Solution

Handle "free tier exceeded" throttling/quota service error: show a chat card with an Upgrade button, and an IDE message.
Handle the "Upgrade" button event.
- Wait for upgrade to complete, show a message on success.
Handle the aws/chat/manageSubscription command, so clients can invoke the "Upgrade" codepath.

Related IDE changes:

VSC: feat(amazonq): paid tier aws-toolkit-vscode#7379
JB: todo
VS: todo

Todo

  1) MynahUI
       openTab
         should create a new tab with welcome messages if tabId not passed and previous messages not passed:
     AssertError: expected getChatItems to be called once and with exact arguments

License

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

justinmk3 · 2025-04-29T15:21:10Z

server/aws-lsp-codewhisperer/src/shared/streamingClientService.ts

-        return response
+            throw e
+        } finally {
+            this.inflightRequests.delete(controller)


This was a potential bug? If the service returns an error (which throws), the inflightRequests would not get updated.

good catch, indeed I think we were not handling service errors. Thanks for working on the fix.

avi-alpert · 2025-06-03T20:15:21Z

chat-client/src/client/chat.ts

@@ -390,6 +390,10 @@ export const createChat = (
        promptInputOptionChange: (params: PromptInputOptionChangeParams) => {
            sendMessageToClient({ command: PROMPT_INPUT_OPTION_CHANGE_METHOD, params })
        },
+        promptInputButtonClick: params => {
+            // TODO


whats this TODO for?

Requires protocol changes in https://github.com/aws/language-server-runtimes to integrate the changes from aws/mynah-ui#322 .

Not a blocker for this PR.

leigaol · 2025-06-03T21:13:41Z

Some high level questions:

Does this apply to all IDEs or just VS Code?
Does this require relevant IDE changes? What happens to the old IDE extensions that installs this language server?

If you want to merge it before any launch decision is made, you need a feature flag. then by launch date, disable the feature flag .

justinmk3 · 2025-06-03T22:25:04Z

Does this apply to all IDEs or just VS Code?

All IDEs.

Does this require relevant IDE changes? What happens to the old IDE extensions that installs this language server?

The only (optional) change needed in IDEs is if they add a Manage Subscriptions menu item. That is planned for each IDE, but not required.

leigaol · 2025-06-06T22:34:20Z

chat-client/src/client/mynahUi.ts

+            })
+
+            if (!isFreeTierLimitUi) {
+                // TODO: how to set a warning icon on the user's failed prompt?


is this a launch blocking TODO?

This is a cosmetic issue that will need to be done as a followup. May require changes to mynah-ui.

server/aws-lsp-codewhisperer/src/shared/codeWhispererService.ts

server/aws-lsp-codewhisperer/src/shared/constants.ts

leigaol · 2025-06-09T20:06:02Z

can you fix the CI?

1. get latest service models: - `client/token/bearer-token-service.json` - from: `<AWSVectorConsolasRuntimeServiceModel>/aws-sdk-external-2022-11-11/c2j/codewhispererruntime-2022-11-11.json` - `client/sigv4/service.json` - from: `<AWSVectorConsolasRuntimeServiceModel>/aws-sdk-external/c2j/codewhisperer-2024-10-25.json` 2. !!NOTE!! remove line `"signatureVersion": "bearer",` from `bearer-token-service.json` 3. restore the script that was mysteriously reverted in aws#161 without any documented alternative... 4. run `./node_modules/.bin/ts-node server/aws-lsp-codewhisperer/script/genclient.ts` service model version: 1.0.20901.0

- control MynahUI from Flare server

justinmk3 changed the title ~~feat: paid tier~~ feat(q paid tier): handle "free tier exceeded" throttle/quota response Apr 29, 2025

justinmk3 commented Apr 29, 2025

View reviewed changes

justinmk3 mentioned this pull request Apr 29, 2025

fix: implement proper error handling. #1115

Merged

justinmk3 force-pushed the paidtier branch 4 times, most recently from cab289b to 939e748 Compare May 7, 2025 22:57

justinmk3 force-pushed the paidtier branch 11 times, most recently from ef043b3 to 1968d12 Compare May 15, 2025 23:16

justinmk3 force-pushed the paidtier branch 7 times, most recently from b40cd74 to 027e119 Compare May 22, 2025 17:05

justinmk3 force-pushed the paidtier branch 2 times, most recently from 4d7efa4 to 2ec3dfc Compare May 28, 2025 19:35

justinmk3 changed the title ~~feat(q paid tier): handle "free tier exceeded" throttle/quota response~~ feat(q): builderid "paid tier" flow May 29, 2025

justinmk3 force-pushed the paidtier branch 2 times, most recently from 19e77d8 to 99f1e7c Compare June 2, 2025 18:41

avi-alpert reviewed Jun 3, 2025

View reviewed changes

justinmk3 force-pushed the paidtier branch 3 times, most recently from f239192 to f27737f Compare June 5, 2025 00:35

leigaol reviewed Jun 6, 2025

View reviewed changes

server/aws-lsp-codewhisperer/src/shared/codeWhispererService.ts Outdated Show resolved Hide resolved

leigaol closed this Jun 9, 2025

leigaol reopened this Jun 9, 2025

justinmk3 force-pushed the paidtier branch from 56a3106 to 35767af Compare June 9, 2025 17:44

awschristou reviewed Jun 9, 2025

View reviewed changes

server/aws-lsp-codewhisperer/src/shared/constants.ts Outdated Show resolved Hide resolved

justinmk3 force-pushed the paidtier branch from 35767af to 49115ea Compare June 9, 2025 20:51

justinmk3 mentioned this pull request Jun 9, 2025

build: update service model for bearer-token-service.json #1309

Closed

justinmk3 added 8 commits June 9, 2025 17:07

feat(paidtier): detect Free Tier, show "Upgrade" button

c35f542

- control MynahUI from Flare server

feat(paidtier): "/manage" quickaction

c29af67

feat(paidtier): Chat UI gets AWS Account ID from user

cc3ad01

fix(paidtier): ux changes

e5f57a5

fix(paidtier): skip for non-builderid user

4b02b88

fix(paidtier): ux changes: Chat UI does *not* get AWS Account ID

59268fd

fix(paidtier): ux changes

b28d87d

justinmk3 force-pushed the paidtier branch from 49115ea to b28d87d Compare June 9, 2025 21:07

justinmk3 enabled auto-merge (rebase) June 9, 2025 21:19

leigaol approved these changes Jun 9, 2025

View reviewed changes

justinmk3 disabled auto-merge June 9, 2025 22:03

justinmk3 merged commit d25bcb6 into aws:main Jun 9, 2025
6 checks passed

justinmk3 deleted the paidtier branch June 9, 2025 22:04

github-actions bot mentioned this pull request Jun 9, 2025

chore(release): release packages from branch main #1537

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat(q): builderid "paid tier" flow #1197

feat(q): builderid "paid tier" flow #1197

Uh oh!

justinmk3 commented Apr 29, 2025 •

edited

Loading

Uh oh!

justinmk3 Apr 29, 2025

Uh oh!

francescoopiccoli Apr 29, 2025

Uh oh!

avi-alpert Jun 3, 2025

Uh oh!

justinmk3 Jun 9, 2025

Uh oh!

leigaol commented Jun 3, 2025

Uh oh!

justinmk3 commented Jun 3, 2025

Uh oh!

leigaol Jun 6, 2025

Uh oh!

justinmk3 Jun 9, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

leigaol commented Jun 9, 2025

Uh oh!

Uh oh!

Uh oh!

feat(q): builderid "paid tier" flow #1197

feat(q): builderid "paid tier" flow #1197

Uh oh!

Conversation

justinmk3 commented Apr 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Problem

Solution

Todo

License

Uh oh!

justinmk3 Apr 29, 2025

Choose a reason for hiding this comment

Uh oh!

francescoopiccoli Apr 29, 2025

Choose a reason for hiding this comment

Uh oh!

avi-alpert Jun 3, 2025

Choose a reason for hiding this comment

Uh oh!

justinmk3 Jun 9, 2025

Choose a reason for hiding this comment

Uh oh!

leigaol commented Jun 3, 2025

Uh oh!

justinmk3 commented Jun 3, 2025

Uh oh!

leigaol Jun 6, 2025

Choose a reason for hiding this comment

Uh oh!

justinmk3 Jun 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

leigaol commented Jun 9, 2025

Uh oh!

Uh oh!

Uh oh!

justinmk3 commented Apr 29, 2025 •

edited

Loading

justinmk3 Jun 9, 2025 •

edited

Loading