Skip to content

[backport release/v0.14.1] fix(amr): improve unavailable model gating - #5360

Merged
mrcfps merged 1 commit into
release/v0.14.1from
backport-5335-to-release/v0.14.1
Jul 9, 2026
Merged

[backport release/v0.14.1] fix(amr): improve unavailable model gating#5360
mrcfps merged 1 commit into
release/v0.14.1from
backport-5335-to-release/v0.14.1

Conversation

@open-design-release-bot

Copy link
Copy Markdown
Contributor

Backport of #5335 to release/v0.14.1.\n\n> Clean pick -> merge once CI is green. Conflict -> this is a draft, resolve conflicts then merge.

@open-design-release-bot

Copy link
Copy Markdown
Contributor Author

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-5335-to-release/v0.14.1
git worktree add --checkout .worktree/backport-5335-to-release/v0.14.1 backport-5335-to-release/v0.14.1
cd .worktree/backport-5335-to-release/v0.14.1
git reset --hard HEAD^
git cherry-pick -x b3356807b62535f93e0bfe9bd8fe1f601f1e951c
git push --force-with-lease

@lefarcen
lefarcen requested a review from mrcfps July 9, 2026 10:51
@lefarcen lefarcen added size/XXL PR changes 1500+ lines risk/high High risk: apps/desktop, daemon, auth, migration, workflows, package deps type/bugfix Bug fix labels Jul 9, 2026
* fix(amr): honor full model list metadata

* fix(amr): classify tier entitlement failures

* fix(amr): refine unavailable model upgrade affordance

* fix(web): restore stale AMR model fallback

Generated-By: looper 0.10.1 (runner=fixer, agent=codex)

* fix(web): surface AMR tier upgrade failures

Generated-By: looper 0.10.1 (runner=fixer, agent=codex)

* fix(amr): mirror chat upgrade attribution

Generated-By: looper 0.10.1 (runner=fixer, agent=codex)

* fix(amr): skip disabled default models

Generated-By: looper 0.10.1 (runner=fixer, agent=codex)

* fix(amr): honor catalog default model

* chore(pack): bump vela cli to 0.0.20

* fix(amr): align locked catalog fallback state

* chore(nix): refresh pnpm deps hash

* fix(amr): refresh entitlement-aware model state

* fix(amr): refresh models after upgrade return

* fix(amr): preserve default model analytics

* fix(amr): tighten model gating follow-ups

Generated-By: looper 0.10.1 (runner=fixer, agent=codex)

* fix(amr): repair default and refresh follow-ups

Generated-By: looper 0.10.1 (runner=fixer, agent=codex)

* fix(amr): resolve explicit default before spawn

Generated-By: looper 0.10.1 (runner=fixer, agent=codex)

* fix(amr): concretize default model in smoke paths

Generated-By: looper 0.10.1 (runner=fixer, agent=codex)

* fix(amr): repair default model gating

Generated-By: looper 0.10.1 (runner=fixer, agent=codex)

* fix(amr): share connection-test model cache

Generated-By: looper 0.10.1 (runner=fixer, agent=codex)

---------

Co-authored-by: open-design-bot[bot] <282769551+open-design-bot[bot]@users.noreply.github.com>
(cherry picked from commit b335680)
@github-actions

github-actions Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Landing page preview

This PR is deployed to a Cloudflare Pages preview — not staging or production:

@mrcfps
mrcfps force-pushed the backport-5335-to-release/v0.14.1 branch from 88c1f21 to c287dc0 Compare July 9, 2026 11:04
@mrcfps
mrcfps marked this pull request as ready for review July 9, 2026 11:08
@mrcfps
mrcfps requested a review from a team as a code owner July 9, 2026 11:08

@mrcfps mrcfps 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.

@app/open-design-release-bot I reviewed the backport across the AMR/Vela model catalog path, disabled/default model handling, account-plan cache invalidation, upgrade/recharge failure guidance, shared contract enums, and the added daemon/web/e2e coverage. The live PR metadata still matches the seeded head, and GitHub checks are green; I did not find actionable issues in the changed ranges. Thanks for carrying this fix back to the release branch.

🔁 Powered by Looper · runner=reviewer · agent=codex · An autonomous AI dev team for your GitHub repos.

@mrcfps
mrcfps merged commit 3283aaf into release/v0.14.1 Jul 9, 2026
26 checks passed

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c287dc0c4d

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

for (let attempt = 0; attempt <= AMR_MODELS_RETRY_DELAYS_MS.length; attempt += 1) {
try {
const { stdout } = await execAgentFile(resolvedBin, ['model', 'list', '--format', 'json'], {
const { stdout } = await execAgentFile(resolvedBin, ['model', 'list', '--all', '--format', 'json'], {

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Update E2E fake Vela parsers for --all

This new --all argument is not understood by the E2E fake Vela binaries: I checked the repo and both e2e/lib/amr.ts and e2e/tests/amr/turn.test.ts still only match model list --format json with argv[4] === '--format'. In those suites the remote model refresh now falls through to the ACP stdin path and produces no remote JSON, so the tests silently exercise only the preset fallback and no longer validate the live catalog path this change depends on. Please update the E2E fakes to accept model list --all --format json alongside this production command change.

Useful? React with 👍 / 👎.

@lefarcen lefarcen added the needs-validation Runtime change detected; needs human or /explore agent validation. label Jul 9, 2026
@lefarcen
lefarcen requested a review from AmyShang-alt July 9, 2026 11:16
@lefarcen

lefarcen commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

🧪 This merged change still needs a manual QA pass because it touches the AMR model picker flow and related runtime recovery paths. We've queued post-merge validation now; if anyone on this thread notices a regression in model availability, upgrade prompts, or relogin/retry behavior, please add details here.

@AmyShang-alt AmyShang-alt removed the needs-validation Runtime change detected; needs human or /explore agent validation. label Jul 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

risk/high High risk: apps/desktop, daemon, auth, migration, workflows, package deps size/XXL PR changes 1500+ lines type/bugfix Bug fix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants