🔍 Review upstream sync: Merge remote-tracking branch 'upstream/dev' into dev

[brunusansi]

Upstream Sync Review

A new merge from upstream was detected. Please review the changes and ensure our custom models and configurations are intact.

Merge commit

44227e802712f5e14cce8585832748effaa808cc

Files changed (18)

All changed files

packages/core/src/family.ts
providers/aihubmix/models/coding-glm-5.1.toml
providers/aihubmix/models/glm-5.1.toml
providers/inception/models/mercury-coder.toml
providers/inception/models/mercury-edit-2.toml
providers/inception/models/mercury.toml
providers/kilo/models/inception/mercury-coder.toml
providers/kilo/models/inception/mercury-edit-2.toml
providers/kilo/models/inception/mercury.toml
providers/nano-gpt/models/mercury-coder-small.toml
providers/opencode-go/models/qwen3.5-plus.toml
providers/opencode-go/models/qwen3.6-plus.toml
providers/openrouter/models/inception/mercury-coder.toml
providers/openrouter/models/inception/mercury-edit-2.toml
providers/openrouter/models/inception/mercury.toml
providers/venice/models/mercury-edit-2.toml
providers/vercel/models/inception/mercury-coder-small.toml
providers/vercel/models/inception/mercury-edit-2.toml

Provider changes:

providers/aihubmix/models/coding-glm-5.1.toml
providers/aihubmix/models/glm-5.1.toml
providers/inception/models/mercury-coder.toml
providers/inception/models/mercury-edit-2.toml
providers/inception/models/mercury.toml
providers/kilo/models/inception/mercury-coder.toml
providers/kilo/models/inception/mercury-edit-2.toml
providers/kilo/models/inception/mercury.toml
providers/nano-gpt/models/mercury-coder-small.toml
providers/opencode-go/models/qwen3.5-plus.toml
providers/opencode-go/models/qwen3.6-plus.toml
providers/openrouter/models/inception/mercury-coder.toml
providers/openrouter/models/inception/mercury-edit-2.toml
providers/openrouter/models/inception/mercury.toml
providers/venice/models/mercury-edit-2.toml
providers/vercel/models/inception/mercury-coder-small.toml
providers/vercel/models/inception/mercury-edit-2.toml

Core changes:

packages/core/src/family.ts

Tasks

1. Verify our custom models still exist and are correctly defined:
   • providers/github-copilot/models/ (22 models including claude-opus-4.6, gemini-3.1-pro, gpt-5.2-codex)
   • providers/google/models/gemini-3.1-pro.toml
   • providers/google/models/gemini-3-flash-preview.toml
   • providers/google/models/gemini-3-pro-preview.toml
2. If upstream changed provider schemas or the generate script (packages/core/), verify api.json generation still works
3. Check if any upstream provider TOML changes conflict with our custom models
4. If issues found, create a fix PR. If everything is fine, close this issue with a comment confirming all checks passed.

[copilot-swe-agent]

The agent encountered an error and was unable to start working on this issue: Please try again later, or contact support if the problem persists. (Request id: B01C:ADD9C:4A76ABA:137129E7:69DEFF6E)

[lightweight-agent]

🤖 Agent is analyzing this issue using a 5-model team:

1. 🔬 Gemini 3.1 Pro — Research & analysis
2. 🧠 Sonnet 4.6 — Architecture planning
3. 🛠️ Opus 4.6 — Implementation
4. ⚡ GPT-5.3 Codex — Validation
5. 📝 Opus 4.6 Fast — Code review

[lightweight-agent]

🤖 Agent could not produce a valid fix. Flagged for manual review.

Models used: Gemini 3.1 Pro, Sonnet 4.6, Opus 4.6, GPT-5.3 Codex, Opus 4.6 Fast

[lightweight-agent]

🤖 Agent is analyzing this issue using a 5-model team:

1. 🔬 Gemini 3.1 Pro — Research & analysis
2. 🧠 Sonnet 4.6 — Architecture planning
3. 🛠️ Opus 4.6 — Implementation
4. ⚡ GPT-5.3 Codex — Validation
5. 📝 Opus 4.6 Fast — Code review

[lightweight-agent]

🤖 Agent could not produce a valid fix. Flagged for manual review.

Models used: Gemini 3.1 Pro, Sonnet 4.6, Opus 4.6, GPT-5.3 Codex, Opus 4.6 Fast