Skip to content

Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.

fix(models): align CLI catalogs and reasoning choices (#1082)

crispinhu276f606cf2a735
diff --git a/chatbot/src/ModelProviderIcon.jsx b/chatbot/src/ModelProviderIcon.jsx
index 48c5463d..110c23db 100644
--- a/chatbot/src/ModelProviderIcon.jsx
+++ b/chatbot/src/ModelProviderIcon.jsx
@@ -1,5 +1,7 @@
import React, { useEffect, useId, useRef, useState } from "react";
import HarnessIcon from "./HarnessIcon";
+import kimiCodeLogo from "./assets/provider-logos/kimi-code.png";
+import { engineBrand } from "./engines.js";
import "./model-provider-icon.css";
// Trusted, bundled brand artwork from Grasp and local assets. Source and
@@ -11,18 +13,20 @@ const brandSources = import.meta.glob("./assets/provider-logos/*.svg", {
});
const modelBrands = [
- [/^(?:claude|anthropic)(?:$|[-_.\s:\d])/i, "claude"],
+ [/^(?:claude|anthropic|opus|sonnet|haiku|fable)(?:$|[-_.\s:\d])/i, "claude"],
[/^(?:gpt|chatgpt|codex|openai)(?:$|[-_.\s:\d])|^o[1-9]\d?(?:$|[-_.\s:])/i, "openai"],
- [/^(?:gemini|google)(?:$|[-_.\s:\d])/i, "google"],
+ [/^(?:gemini|google)(?:$|[-_.\s:\d])/i, "gemini"],
[/^deepseek(?:$|[-_.\s:\d])/i, "deepseek"],
[/^(?:chatglm|glm|zhipu)(?:$|[-_.\s:\d])/i, "zhipu"],
- [/^kimi(?:$|[-_.\s:\d])/i, "kimi"],
+ [/^kimi(?:$|[-_.\s:\d])|^k[23](?:$|[-_.\s])/i, "kimi"],
[/^moonshot(?:ai)?(?:$|[-_.\s:\d])/i, "moonshot"],
[/^(?:qwen|qvq|alibaba)(?:$|[-_.\s:\d])/i, "qwen"],
[/^(?:hunyuan|tencent)(?:$|[-_.\s:\d])|^hy(?:\d|[-_.\s:])/i, "hunyuan"],
[/^minimax(?:$|[-_.\s:\d])/i, "minimax"],
[/^(?:mimo|xiaomi)(?:$|[-_.\s:\d])/i, "xiaomimimo"],
- [/^(?:grok|xai)(?:$|[-_.\s:\d])/i, "xai"],
+ [/^(?:(?:cursor-)?grok|xai)(?:$|[-_.\s:\d])/i, "xai"],
+ [/^(?:muse|meta)(?:$|[-_.\s:\d])/i, "meta"],
+ [/^composer(?:$|[-_.\s:\d])/i, "cursor"],
[/^(?:doubao|seed|seedream|bytedance)(?:$|[-_.\s:\d])/i, "doubao"],
[/^(?:ernie|wenxin|baidu|qianfan)(?:$|[-_.\s:\d])/i, "qianfan"],
[/^(?:zai|z\.ai)(?:$|[-_.\s:\d])/i, "zai"],
@@ -33,6 +37,7 @@ const fallbackBrands = new Set([
]);
const colorBrands = new Set([
"qwen", "doubao", "siliconflow", "minimax", "zhipu", "hunyuan", "qianfan",
+ "gemini", "antigravity", "pi", "kimi-code", "meta",
]);
/** A visual label only. Never use inferred brands to route model requests. */
@@ -41,7 +46,11 @@ export function modelProviderFor(model) {
? [model]
: [model?.family, model?.id, model?.name];
for (const value of values) {
- for (const part of String(value || "").trim().split("/").reverse()) {
+ const text = String(value || "").trim();
+ const prefix = /^([a-z-]+):/i.exec(text)?.[1];
+ const id = engineBrand(prefix) ? text.slice(prefix.length + 1) : text;
+ if ((prefix === "cursor" || model?.engine === "cursor") && /^auto(?:-smart)?$/i.test(id)) return "cursor";
+ for (const part of id.split("/").reverse()) {
const match = modelBrands.find(([pattern]) => pattern.test(part.trim()));
if (match) return match[1];
}
@@ -51,7 +60,7 @@ export function modelProviderFor(model) {
}
export function hasProviderLogo(name) {
- return Boolean(brandSources[`./assets/provider-logos/${name}.svg`]);
+ return name === "kimi-code" || Boolean(brandSources[`./assets/provider-logos/${name}.svg`]);
}
function artwork(name, prefix) {
@@ -117,10 +126,11 @@ export default function ModelProviderIcon({ model, brand: named = "", size = 20,
const identity = `model-provider-${useId().replace(/[^\w-]/g, "")}`;
const [motionKey, setMotionKey] = useState(0);
const brand = named || modelProviderFor(model);
+ const image = brand === "kimi-code" ? kimiCodeLogo : null;
useEffect(() => {
const element = host.current;
- if (!element || !brand) return;
+ if (!element || !brand || image) return;
const control = element.closest('button, [role="option"], [role="button"], summary, a[href]') || element;
const play = () => {
if (matchMedia("(prefers-reduced-motion: reduce)").matches ||
@@ -138,13 +148,13 @@ export default function ModelProviderIcon({ model, brand: named = "", size = 20,
control.removeEventListener("pointerdown", press);
control.removeEventListener("focusin", focus);
};
- }, [brand]);
+ }, [brand, image]);
return (
<span ref={host} aria-hidden="true" data-model-provider={brand || "unknown"}
className={`model-provider-icon ${colorBrands.has(brand) ? "model-provider-icon--color" : brand === "kimi" ? "model-provider-icon--kimi" : "model-provider-icon--mono"} ${className}`.trim()}
style={{ width: size, height: size }}>
- {brand ? (
+ {image ? <img src={image} alt="" /> : brand ? (
<>
<BrandSvg name={brand} identity={identity} motionKey={motionKey}
className={brand === "kimi" ? "model-provider-svg--light" : ""} />
diff --git a/chatbot/src/assets/provider-logos/README.md b/chatbot/src/assets/provider-logos/README.md
index bdf305b0..f732e7e7 100644
--- a/chatbot/src/assets/provider-logos/README.md
+++ b/chatbot/src/assets/provider-logos/README.md
@@ -1,7 +1,6 @@
# Provider logo sources
-These SVGs are bundled locally so the credentials UI does not make runtime
-requests to an image host.
+The interface uses these bundled assets in both chat and configuration.
- `claude.svg`, `codebuddy.svg`, `cursor.svg`, `trae.svg`, `opencode.svg`,
`github.svg`, `gitlab.svg`, `deepseek.svg`, `openrouter.svg`, `google.svg`
@@ -10,9 +9,9 @@ requests to an image host.
[Simple Icons repository](https://github.com/simple-icons/simple-icons),
and the pinned assets were downloaded from the corresponding
`cdn.jsdelivr.net/npm/simple-icons@v16/icons/<slug>.svg` URLs.
-- `pi.svg` is a plain π glyph drawn locally, not from Grasp. It is the same
- mark as `web/images/credentials/pi.svg`, bundled here for the chat CLI
- selector.
+- `pi.svg` is the official primary color mark from the [Pi press kit](https://pi.dev/press-kit).
+- `antigravity.svg` is the full-color icon from the [Google Antigravity press assets](https://antigravity.google/press).
+- `kimi-code.png` is the icon published by Moonshot AI for the [Kimi Code extension](https://marketplace.visualstudio.com/items?itemName=moonshot-ai.kimi-code).
- `openai.svg` comes from the [OpenAI 2025 logo package](https://cdn.openai.com/brand/OpenAI-Logos-2025.zip).
`codex.svg` uses the same official OpenAI blossom because OpenAI does not
publish a separate Codex mark in that package or in the official Codex CLI
@@ -37,6 +36,7 @@ requests to an image host.
| `zhipu.svg` | [zhipu-color.svg](https://github.com/lobehub/lobe-icons/blob/7d7d0379f18b114a4009dc5cb85a7c375284f31b/packages/static-svg/icons/zhipu-color.svg) |
| `zai.svg` | [zai.svg](https://github.com/lobehub/lobe-icons/blob/7d7d0379f18b114a4009dc5cb85a7c375284f31b/packages/static-svg/icons/zai.svg) |
| `gemini.svg` | [gemini-color.svg](https://github.com/lobehub/lobe-icons/blob/7d7d0379f18b114a4009dc5cb85a7c375284f31b/packages/static-svg/icons/gemini-color.svg) |
+ | `meta.svg` | [meta-color.svg](https://github.com/lobehub/lobe-icons/blob/7d7d0379f18b114a4009dc5cb85a7c375284f31b/packages/static-svg/icons/meta-color.svg) |
| `hunyuan.svg` | [hunyuan-color.svg](https://github.com/lobehub/lobe-icons/blob/7d7d0379f18b114a4009dc5cb85a7c375284f31b/packages/static-svg/icons/hunyuan-color.svg) |
| `qianfan.svg` | [baiducloud-color.svg](https://github.com/lobehub/lobe-icons/blob/7d7d0379f18b114a4009dc5cb85a7c375284f31b/packages/static-svg/icons/baiducloud-color.svg) |
| `xiaomimimo.svg` | [xiaomimimo.svg](https://github.com/lobehub/lobe-icons/blob/7d7d0379f18b114a4009dc5cb85a7c375284f31b/packages/static-svg/icons/xiaomimimo.svg);经典 SPA 同一文件复制为 `web/images/credentials/mimo.svg` |
diff --git a/chatbot/src/assets/provider-logos/SOURCE.md b/chatbot/src/assets/provider-logos/SOURCE.md
index 5d1994e7..6530e167 100644
--- a/chatbot/src/assets/provider-logos/SOURCE.md
+++ b/chatbot/src/assets/provider-logos/SOURCE.md
@@ -1,11 +1,9 @@
# Bundled model brand artwork
-Except for `pi.svg`, these SVGs and the accompanying README.md and
-LICENSE.lobe-icons were originally copied from the Grasp repository,
-web/src/assets/provider-logos. `pi.svg` reuses the local π glyph from
-`web/images/credentials/pi.svg`; README.md records this addition. The original Grasp
-MIT notice is retained as LICENSE.grasp. README.md records each artwork's own
-source and applicable license, including official brand artwork and Simple Icons.
+The original model SVGs, README.md, and LICENSE.lobe-icons came from the
+Grasp repository at `web/src/assets/provider-logos`. The original Grasp MIT
+notice remains in LICENSE.grasp. README.md identifies each asset's source,
+including the Pi, Antigravity, and Kimi Code product marks added separately.
ModelProviderIcon.jsx adapts Grasp's visual brand matching and theme treatment.
Its internal light animation is local presentation code. A visual brand match
diff --git a/chatbot/src/assets/provider-logos/antigravity.svg b/chatbot/src/assets/provider-logos/antigravity.svg
new file mode 100644
index 00000000..3b2f2637
--- /dev/null
+++ b/chatbot/src/assets/provider-logos/antigravity.svg
@@ -0,0 +1,76 @@
+<svg width="180" height="180" viewBox="0 0 180 180" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M144.248 149.062C151.748 154.688 162.998 150.938 152.685 140.625C121.748 110.625 128.31 28.125 89.8727 28.125C51.4352 28.125 57.9977 110.625 27.0602 140.625C15.8102 151.875 27.9977 154.688 35.4977 149.062C64.5602 129.375 62.6852 94.6875 89.8727 94.6875C117.06 94.6875 115.185 129.375 144.248 149.062Z" fill="#3186FF"/>
+<mask id="mask0_6001_409" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="22" y="28" width="136" height="125">
+<path d="M144.248 149.062C151.748 154.688 162.998 150.938 152.685 140.625C121.748 110.625 128.31 28.125 89.8727 28.125C51.4352 28.125 57.9977 110.625 27.0602 140.625C15.8102 151.875 27.9977 154.688 35.4977 149.062C64.5602 129.375 62.6852 94.6875 89.8727 94.6875C117.06 94.6875 115.185 129.375 144.248 149.062Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_6001_409)">
+<g filter="url(#filter0_f_6001_409)">
+<ellipse cx="36.6225" cy="43.0872" rx="36.6225" ry="43.0872" transform="matrix(-0.112784 0.99362 -0.99362 -0.112781 106.557 -26.4847)" fill="#FFE432"/>
+</g>
+<g filter="url(#filter1_f_6001_409)">
+<ellipse cx="155.163" cy="54.9292" rx="47.4118" ry="48.4541" transform="rotate(76.9243 155.163 54.9292)" fill="#FC413D"/>
+</g>
+<g filter="url(#filter2_f_6001_409)">
+<ellipse cx="14.6006" cy="65.4425" rx="49.5515" ry="64.192" transform="rotate(74.1257 14.6006 65.4425)" fill="#00B95C"/>
+</g>
+<g filter="url(#filter3_f_6001_409)">
+<ellipse cx="14.6006" cy="65.4425" rx="49.5515" ry="64.192" transform="rotate(74.1257 14.6006 65.4425)" fill="#00B95C"/>
+</g>
+<g filter="url(#filter4_f_6001_409)">
+<ellipse cx="18.1226" cy="67.414" rx="48.5679" ry="53.4688" transform="rotate(45.6065 18.1226 67.414)" fill="#00B95C"/>
+</g>
+<g filter="url(#filter5_f_6001_409)">
+<ellipse cx="121.837" cy="166.945" rx="46.6356" ry="44.9084" transform="rotate(76.9243 121.837 166.945)" fill="#3186FF"/>
+</g>
+<g filter="url(#filter6_f_6001_409)">
+<ellipse cx="53.9456" cy="56.8997" rx="53.9456" ry="56.8997" transform="matrix(-0.409539 0.912293 -0.912294 -0.409537 162.811 -25.895)" fill="#FBBC04"/>
+</g>
+<g filter="url(#filter7_f_6001_409)">
+<path d="M4.21557 239.063C-25.3231 227.467 25.1577 132.061 37.7105 100.085C50.2634 68.1097 84.3853 51.5888 113.924 63.1848C143.463 74.7809 178.474 138.65 165.921 170.626C153.368 202.601 33.7543 250.659 4.21557 239.063Z" fill="#3186FF"/>
+</g>
+<g filter="url(#filter8_f_6001_409)">
+<path d="M183.197 120.315C175.289 129.545 154.652 124.839 137.102 109.803C119.553 94.7668 111.738 75.0955 119.646 65.8656C127.554 56.6357 148.191 61.3423 165.74 76.3782C183.289 91.414 191.105 111.085 183.197 120.315Z" fill="#749BFF"/>
+</g>
+<g filter="url(#filter9_f_6001_409)">
+<ellipse cx="148.928" cy="36.7252" rx="71.1018" ry="44.199" transform="rotate(34.0763 148.928 36.7252)" fill="#FC413D"/>
+</g>
+<g filter="url(#filter10_f_6001_409)">
+<ellipse cx="37.848" cy="46.0346" rx="38.1008" ry="22.1575" transform="rotate(112.516 37.848 46.0346)" fill="#FFEE48"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_f_6001_409" x="4.09591" y="-44.1761" width="111.037" height="98.4416" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="6.25234"/>
+</filter>
+<filter id="filter1_f_6001_409" x="46.2974" y="-53.0009" width="217.731" height="215.86" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="30.2268"/>
+</filter>
+<filter id="filter2_f_6001_409" x="-100.018" y="-36.7558" width="229.238" height="204.397" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="25.6957"/>
+</filter>
+<filter id="filter3_f_6001_409" x="-100.018" y="-36.7558" width="229.238" height="204.397" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="25.6957"/>
+</filter>
+<filter id="filter4_f_6001_409" x="-84.3985" y="-35.003" width="205.042" height="204.834" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="25.6957"/>
+</filter>
+<filter id="filter5_f_6001_409" x="27.9915" y="71.5493" width="187.691" height="190.791" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="24.4184"/>
+</filter>
+<filter id="filter6_f_6001_409" x="-11.8808" y="-98.7085" width="201.38" height="197.45" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="22.1301"/>
+</filter>
+<filter id="filter7_f_6001_409" x="-44.4432" y="19.9522" width="252.513" height="260.404" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="19.7631"/>
+</filter>
+<filter id="filter8_f_6001_409" x="81.1915" y="25.7722" width="140.46" height="134.637" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="17.6843"/>
+</filter>
+<filter id="filter9_f_6001_409" x="55.1499" y="-47.2531" width="187.555" height="167.957" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="14.9365"/>
+</filter>
+<filter id="filter10_f_6001_409" x="-24.2633" y="-27.1515" width="124.223" height="146.372" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="18.4865"/>
+</filter>
+</defs>
+</svg>
diff --git a/chatbot/src/assets/provider-logos/kimi-code.png b/chatbot/src/assets/provider-logos/kimi-code.png
new file mode 100644
index 00000000..033c0f4f
Binary files /dev/null and b/chatbot/src/assets/provider-logos/kimi-code.png differ
diff --git a/chatbot/src/assets/provider-logos/meta.svg b/chatbot/src/assets/provider-logos/meta.svg
new file mode 100644
index 00000000..a8a8d948
--- /dev/null
+++ b/chatbot/src/assets/provider-logos/meta.svg
@@ -0,0 +1 @@
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Meta</title><path d="M6.897 4h-.024l-.031 2.615h.022c1.715 0 3.046 1.357 5.94 6.246l.175.297.012.02 1.62-2.438-.012-.019a48.763 48.763 0 00-1.098-1.716 28.01 28.01 0 00-1.175-1.629C10.413 4.932 8.812 4 6.896 4z" fill="url(#lobe-icons-meta-0-_R_0_)"></path><path d="M6.873 4C4.95 4.01 3.247 5.258 2.02 7.17a4.352 4.352 0 00-.01.017l2.254 1.231.011-.017c.718-1.083 1.61-1.774 2.568-1.785h.021L6.896 4h-.023z" fill="url(#lobe-icons-meta-1-_R_0_)"></path><path d="M2.019 7.17l-.011.017C1.2 8.447.598 9.995.274 11.664l-.005.022 2.534.6.004-.022c.27-1.467.786-2.828 1.456-3.845l.011-.017L2.02 7.17z" fill="url(#lobe-icons-meta-2-_R_0_)"></path><path d="M2.807 12.264l-2.533-.6-.005.022c-.177.918-.267 1.851-.269 2.786v.023l2.598.233v-.023a12.591 12.591 0 01.21-2.44z" fill="url(#lobe-icons-meta-3-_R_0_)"></path><path d="M2.677 15.537a5.462 5.462 0 01-.079-.813v-.022L0 14.468v.024a8.89 8.89 0 00.146 1.652l2.535-.585a4.106 4.106 0 01-.004-.022z" fill="url(#lobe-icons-meta-4-_R_0_)"></path><path d="M3.27 16.89c-.284-.31-.484-.756-.589-1.328l-.004-.021-2.535.585.004.021c.192 1.01.568 1.85 1.106 2.487l.014.017 2.018-1.745a2.106 2.106 0 01-.015-.016z" fill="url(#lobe-icons-meta-5-_R_0_)"></path><path d="M10.78 9.654c-1.528 2.35-2.454 3.825-2.454 3.825-2.035 3.2-2.739 3.917-3.871 3.917a1.545 1.545 0 01-1.186-.508l-2.017 1.744.014.017C2.01 19.518 3.058 20 4.356 20c1.963 0 3.374-.928 5.884-5.33l1.766-3.13a41.283 41.283 0 00-1.227-1.886z" fill="#0082FB"></path><path d="M13.502 5.946l-.016.016c-.4.43-.786.908-1.16 1.416.378.483.768 1.024 1.175 1.63.48-.743.928-1.345 1.367-1.807l.016-.016-1.382-1.24z" fill="url(#lobe-icons-meta-6-_R_0_)"></path><path d="M20.918 5.713C19.853 4.633 18.583 4 17.225 4c-1.432 0-2.637.787-3.723 1.944l-.016.016 1.382 1.24.016-.017c.715-.747 1.408-1.12 2.176-1.12.826 0 1.6.39 2.27 1.075l.015.016 1.589-1.425-.016-.016z" fill="#0082FB"></path><path d="M23.998 14.125c-.06-3.467-1.27-6.566-3.064-8.396l-.016-.016-1.588 1.424.015.016c1.35 1.392 2.277 3.98 2.361 6.971v.023h2.292v-.022z" fill="url(#lobe-icons-meta-7-_R_0_)"></path><path d="M23.998 14.15v-.023h-2.292v.022c.004.14.006.282.006.424 0 .815-.121 1.474-.368 1.95l-.011.022 1.708 1.782.013-.02c.62-.96.946-2.293.946-3.91 0-.083 0-.165-.002-.247z" fill="url(#lobe-icons-meta-8-_R_0_)"></path><path d="M21.344 16.52l-.011.02c-.214.402-.519.67-.917.787l.778 2.462a3.493 3.493 0 00.438-.182 3.558 3.558 0 001.366-1.218l.044-.065.012-.02-1.71-1.784z" fill="url(#lobe-icons-meta-9-_R_0_)"></path><path d="M19.92 17.393c-.262 0-.492-.039-.718-.14l-.798 2.522c.449.153.927.222 1.46.222.492 0 .943-.073 1.352-.215l-.78-2.462c-.167.05-.341.075-.517.073z" fill="url(#lobe-icons-meta-10-_R_0_)"></path><path d="M18.323 16.534l-.014-.017-1.836 1.914.016.017c.637.682 1.246 1.105 1.937 1.337l.797-2.52c-.291-.125-.573-.353-.9-.731z" fill="url(#lobe-icons-meta-11-_R_0_)"></path><path d="M18.309 16.515c-.55-.642-1.232-1.712-2.303-3.44l-1.396-2.336-.011-.02-1.62 2.438.012.02.989 1.668c.959 1.61 1.74 2.774 2.493 3.585l.016.016 1.834-1.914a2.353 2.353 0 01-.014-.017z" fill="url(#lobe-icons-meta-12-_R_0_)"></path><defs><linearGradient id="lobe-icons-meta-0-_R_0_" x1="75.897%" x2="26.312%" y1="89.199%" y2="12.194%"><stop offset=".06%" stop-color="#0867DF"></stop><stop offset="45.39%" stop-color="#0668E1"></stop><stop offset="85.91%" stop-color="#0064E0"></stop></linearGradient><linearGradient id="lobe-icons-meta-1-_R_0_" x1="21.67%" x2="97.068%" y1="75.874%" y2="23.985%"><stop offset="13.23%" stop-color="#0064DF"></stop><stop offset="99.88%" stop-color="#0064E0"></stop></linearGradient><linearGradient id="lobe-icons-meta-2-_R_0_" x1="38.263%" x2="60.895%" y1="89.127%" y2="16.131%"><stop offset="1.47%" stop-color="#0072EC"></stop><stop offset="68.81%" stop-color="#0064DF"></stop></linearGradient><linearGradient id="lobe-icons-meta-3-_R_0_" x1="47.032%" x2="52.15%" y1="90.19%" y2="15.745%"><stop offset="7.31%" stop-color="#007CF6"></stop><stop offset="99.43%" stop-color="#0072EC"></stop></linearGradient><linearGradient id="lobe-icons-meta-4-_R_0_" x1="52.155%" x2="47.591%" y1="58.301%" y2="37.004%"><stop offset="7.31%" stop-color="#007FF9"></stop><stop offset="100%" stop-color="#007CF6"></stop></linearGradient><linearGradient id="lobe-icons-meta-5-_R_0_" x1="37.689%" x2="61.961%" y1="12.502%" y2="63.624%"><stop offset="7.31%" stop-color="#007FF9"></stop><stop offset="100%" stop-color="#0082FB"></stop></linearGradient><linearGradient id="lobe-icons-meta-6-_R_0_" x1="34.808%" x2="62.313%" y1="68.859%" y2="23.174%"><stop offset="27.99%" stop-color="#007FF8"></stop><stop offset="91.41%" stop-color="#0082FB"></stop></linearGradient><linearGradient id="lobe-icons-meta-7-_R_0_" x1="43.762%" x2="57.602%" y1="6.235%" y2="98.514%"><stop offset="0%" stop-color="#0082FB"></stop><stop offset="99.95%" stop-color="#0081FA"></stop></linearGradient><linearGradient id="lobe-icons-meta-8-_R_0_" x1="60.055%" x2="39.88%" y1="4.661%" y2="69.077%"><stop offset="6.19%" stop-color="#0081FA"></stop><stop offset="100%" stop-color="#0080F9"></stop></linearGradient><linearGradient id="lobe-icons-meta-9-_R_0_" x1="30.282%" x2="61.081%" y1="59.32%" y2="33.244%"><stop offset="0%" stop-color="#027AF3"></stop><stop offset="100%" stop-color="#0080F9"></stop></linearGradient><linearGradient id="lobe-icons-meta-10-_R_0_" x1="20.433%" x2="82.112%" y1="50.001%" y2="50.001%"><stop offset="0%" stop-color="#0377EF"></stop><stop offset="99.94%" stop-color="#0279F1"></stop></linearGradient><linearGradient id="lobe-icons-meta-11-_R_0_" x1="40.303%" x2="72.394%" y1="35.298%" y2="57.811%"><stop offset=".19%" stop-color="#0471E9"></stop><stop offset="100%" stop-color="#0377EF"></stop></linearGradient><linearGradient id="lobe-icons-meta-12-_R_0_" x1="32.254%" x2="68.003%" y1="19.719%" y2="84.908%"><stop offset="27.65%" stop-color="#0867DF"></stop><stop offset="100%" stop-color="#0471E9"></stop></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/chatbot/src/assets/provider-logos/pi.svg b/chatbot/src/assets/provider-logos/pi.svg
index 6c81d7e2..e2851685 100644
--- a/chatbot/src/assets/provider-logos/pi.svg
+++ b/chatbot/src/assets/provider-logos/pi.svg
@@ -1 +1,6 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Pi</title><path d="M3 4.5h18v3h-3.2v8.6c0 .9.4 1.3 1.1 1.3.5 0 .9-.1 1.3-.3l.6 2.8c-.7.4-1.7.6-2.8.6-2.4 0-3.6-1.4-3.6-4V7.5H9.6V20H6.4V7.5H3z"/></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 800 800">
+ <path fill="#F09082" d="M165.29 165.29H517.36V400H400V282.65H165.29Z"/>
+ <path fill="#4D9ABF" d="M165.29 282.65H282.65V400H400V517.36H282.65V634.72H165.29Z"/>
+ <path fill="#F1BE58" d="M517.36 400H634.72V634.72H517.36Z"/>
+</svg>
diff --git a/chatbot/src/engines.js b/chatbot/src/engines.js
index d0bf0943..a21b6271 100644
--- a/chatbot/src/engines.js
+++ b/chatbot/src/engines.js
@@ -5,9 +5,9 @@ export const defaultEngine = "codebuddy";
// Bundled logo per CLI; an unknown CLI falls back to its model's brand.
const brands = {
codebuddy: "codebuddy", codex: "codex", "claude-code": "claude",
- opencode: "opencode", cursor: "cursor", agy: "gemini", kimi: "kimi", pi: "pi", dsh: "deepseek", zcode: "zhipu",
+ opencode: "opencode", cursor: "cursor", agy: "antigravity", kimi: "kimi-code", pi: "pi", dsh: "deepseek", zcode: "zhipu",
};
-export const engineBrand = (id) => brands[id] || "";
+export const engineBrand = (id) => Object.hasOwn(brands, id) ? brands[id] : "";
export const modelEngine = (model) => model?.engine || defaultEngine;
@@ -19,8 +19,11 @@ export function engineOfModel(id, models = []) {
return prefix || defaultEngine;
}
+export const concreteModel = (model, engine = modelEngine(model)) =>
+ !!model?.id && model.id !== "default" && model.id !== `${engine}:default`;
+
export const engineModels = (models, engine) =>
- (models || []).filter((m) => modelEngine(m) === engine);
+ (models || []).filter((m) => modelEngine(m) === engine && concreteModel(m, engine));
// Mirrors assistantEngineMissingKey in internal/httpapi/assistant_engines.go;
// credentialHint turns it into a "去配置" button.
diff --git a/chatbot/src/model-provider-icon.css b/chatbot/src/model-provider-icon.css
index 03d2211d..302aa1b6 100644
--- a/chatbot/src/model-provider-icon.css
+++ b/chatbot/src/model-provider-icon.css
@@ -19,6 +19,12 @@
height: var(--provider-artwork-size);
overflow: hidden;
}
+.model-provider-icon > img {
+ display: block;
+ width: 100%;
+ height: 100%;
+ object-fit: contain;
+}
/* The official blossom contains generous padding in its original viewBox. */
.model-provider-icon[data-model-provider="openai"] {
--provider-artwork-size: 140%;
diff --git a/chatbot/src/useChat.js b/chatbot/src/useChat.js
index cbac0a83..bd0f7fd4 100644
--- a/chatbot/src/useChat.js
+++ b/chatbot/src/useChat.js
@@ -16,7 +16,7 @@ import { cliFailureSettles } from "./cli-install.jsx";
import { useExecutionMachines } from "./useExecutionMachines.js";
import { executionLocked } from "./execution-target.js";
import { modelEffort } from "./effort.js";
-import { conversationEngine, engineModels } from "./engines.js";
+import { concreteModel, conversationEngine, engineModels } from "./engines.js";
import { readComposerPreference, writeComposerPreference } from "./composer-preferences.js";
import {
enqueue,
@@ -52,8 +52,8 @@ function storedExecutor() {
function executorModelList(models, executor, providerCatalogs) {
const listed = engineModels(models, executor);
- if (executor === "codebuddy") return listed.filter((model) => model.id !== "default");
- return listed.length ? listed : providerCatalogs?.[executor]?.models || [];
+ if (listed.length || executor === "codebuddy") return listed;
+ return (providerCatalogs?.[executor]?.models || []).filter((model) => concreteModel(model, executor));
}
// A CLI's fallback list uses bare model IDs, while the personal catalog
@@ -65,7 +65,9 @@ function unprefixedModel(executor, model) {
function findExecutorModel(list, executor, model) {
const id = unprefixedModel(executor, model);
- return list.find((item) => unprefixedModel(executor, item.id) === id);
+ if (!id) return undefined;
+ return list.find((item) => unprefixedModel(executor, item.id) === id) ??
+ list.find((item) => item.efforts?.some((level) => item.effortModelIds?.[level] === id));
}
function effortPreference(executor, model) {
@@ -73,11 +75,12 @@ function effortPreference(executor, model) {
}
// A new conversation restores a listed preference or picks the first model.
-// When the list is empty, keep the CLI's fallback.
+// CodeBuddy also supports a server-configured fallback when the list is empty.
function preferredModel(list, executor, codeBuddyDefault) {
const remembered = readComposerPreference(`model.${executor}`);
- const listed = findExecutorModel(list, executor, remembered);
- return listed?.id || list[0]?.id || (executor === "codebuddy" ? codeBuddyDefault : remembered || "default");
+ const available = list.filter((model) => !model.disabled && !model.unavailable);
+ const listed = findExecutorModel(available, executor, remembered);
+ return (listed && remembered) || available[0]?.id || (executor === "codebuddy" ? codeBuddyDefault : "");
}
// Mirrors errAssistantSponsoredModel in internal/httpapi/assistant_sponsor.go;
@@ -594,9 +597,14 @@ export function useChat() {
const personalMachine = executionMachines.machines.find(
(machine) => machine.id === personalMachineId && machine.ownerUserId === user?.id,
);
+ const agyRuntime = personalMachine?.runtimes?.find((runtime) => runtime.provider === "agy");
+ const agyAccountKey = executor === "agy" && agyRuntime && agyRuntime.authMode !== "personal"
+ ? `agy-account:${user.id}:${personalMachine.id}` : "";
+ const agyAccountCatalog = providerCatalogs[agyAccountKey];
const codeBuddy = executor === "codebuddy";
const listedForEngine = engineModels(models, executor);
- const executorModels = executorModelList(models, executor, providerCatalogs);
+ const executorModels = agyAccountKey ? agyAccountCatalog?.models || [] :
+ executorModelList(models, executor, providerCatalogs);
const missingKey = !!user && !user.codeBuddyApiKeyConfigured;
// Without their own key users chat on the platform's shared key, limited to
// the models the administrator allowed (the first is the default).
@@ -613,25 +621,47 @@ export function useChat() {
const availableModel = sponsored ? sharedModelFor(selectedModel) : selectedModel;
const activeModelEntry = modelEntry(availableModel);
const activeModel = activeModelEntry?.id ?? availableModel;
+ const requestedModelId = unprefixedModel(executor, availableModel);
+ const unavailableAgyVariant = agyAccountCatalog && !activeModelEntry &&
+ /-(?:low|medium|high|xhigh|max)$/.test(requestedModelId || "");
+ // Older sessions and preferences stored the ID of the selected effort variant.
+ const legacyEffort = requestedModelId !== unprefixedModel(executor, activeModel)
+ ? activeModelEntry?.efforts?.find((level) => activeModelEntry.effortModelIds?.[level] === requestedModelId)
+ : undefined;
// null follows the browser preference, while "" is the CLI's default level.
- const activeEffort = modelEffort(
- activeModelEntry,
- ((model === null || hasSelectedModel) ? effort : null) ??
- readComposerPreference(effortPreference(executor, activeModel)),
- );
+ const preferredEffort = ((model === null || hasSelectedModel) ? effort : null) ??
+ readComposerPreference(effortPreference(executor, availableModel));
+ const activeEffort = modelEffort(activeModelEntry, preferredEffort || legacyEffort);
useEffect(() => {
- if (codeBuddy || listedForEngine.length || providerCatalogs[executor]) return;
+ const key = agyAccountKey || executor;
+ if (codeBuddy || providerCatalogs[key] || (!agyAccountKey && listedForEngine.length)) return;
let current = true;
- api(`/api/assistant/models?executor=${encodeURIComponent(executor)}`)
+ const request = agyAccountKey
+ ? write(`/api/runners/${encodeURIComponent(personalMachineId)}/models/probe`, { provider: "agy", useSaved: true })
+ : api(`/api/assistant/models?executor=${encodeURIComponent(executor)}`);
+ request
.then((catalog) => {
if (!current) return;
- setProviderCatalogs((old) => ({ ...old, [executor]: catalog }));
+ if (catalog.error) throw new Error(catalog.error);
+ const result = agyAccountKey ? {
+ models: (catalog.models || []).filter((model) => concreteModel(model, "agy")).map((model) => ({
+ id: `agy:${model.id}`,
+ engine: "agy",
+ name: model.name || model.id,
+ efforts: model.reasoningEfforts ?? model.discoveredReasoningEfforts,
+ effortModelIds: model.efforts,
+ })),
+ } : catalog;
+ setProviderCatalogs((old) => ({ ...old, [key]: result }));
})
- .catch((e) => current && setError(e.message));
+ .catch((e) => {
+ if (!current) return;
+ setError(e.message);
+ });
return () => {
current = false;
};
- }, [codeBuddy, executor, listedForEngine.length, providerCatalogs]);
+ }, [agyAccountKey, codeBuddy, executor, listedForEngine.length, personalMachineId, providerCatalogs]);
const chooseExecutor = useCallback(
(id) => {
if (id === "claude") id = "claude-code";
@@ -706,7 +736,10 @@ export function useChat() {
e.source === window.parent &&
e.origin === location.origin &&
e.data?.type === "agentflow-credentials-changed"
- ) requestModelCatalogRefresh((revision) => revision + 1);
+ ) {
+ setProviderCatalogs({});
+ requestModelCatalogRefresh((revision) => revision + 1);
+ }
};
window.addEventListener("message", onMessage);
if (ready && missingKey) window.addEventListener("focus", refreshUser);
@@ -867,6 +900,14 @@ export function useChat() {
fromQueue = false,
}) {
if (!text.trim() && !attachments.length) return false;
+ if (unavailableAgyVariant) {
+ setError("当前模型已不在该执行机器的账号目录,请重新选择模型。");
+ return false;
+ }
+ if (!activeModel) {
+ setError("当前 CLI 暂无可用模型,请在个人配置中获取或添加模型。");
+ return false;
+ }
const approval = fromQueue
? queuedApproval({ approvalMode, approvalUserId }, user?.id)
: { approvalMode, approvalUserId: user?.id };
diff --git a/chatbot/tests/app-render.test.jsx b/chatbot/tests/app-render.test.jsx
index dcea5e04..6861c8e4 100644
--- a/chatbot/tests/app-render.test.jsx
+++ b/chatbot/tests/app-render.test.jsx
@@ -2,6 +2,7 @@ import React from "react";
import { fireEvent, render, screen, waitFor, within } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { beforeEach, describe, expect, test, vi } from "vitest";
+import { modelProviderFor } from "../src/ModelProviderIcon";
const chat = {
user: { id: "u1", loginName: "tester", chineseName: "测试用户" },
@@ -539,11 +540,26 @@ describe("App", () => {
chat.executors = [
...previous.executors,
{ id: "pi", icon: "terminal", label: "Pi", detail: "Pi" },
+ { id: "agy", icon: "sparkles", label: "Antigravity", detail: "Antigravity" },
+ { id: "kimi", icon: "terminal", label: "Kimi Code", detail: "Kimi Code" },
];
const view = render(<App />);
await user.click(screen.getByRole("button", { name: "CLI" }));
const pi = await screen.findByRole("menuitemradio", { name: "Pi" });
expect(pi.querySelector('[data-model-provider="pi"] svg')).not.toBeNull();
+ const agy = screen.getByRole("menuitemradio", { name: "Antigravity" });
+ expect(agy.querySelector('[data-model-provider="antigravity"] svg')).not.toBeNull();
+ const kimi = screen.getByRole("menuitemradio", { name: "Kimi Code" });
+ expect(kimi.querySelector('[data-model-provider="kimi-code"] img')).not.toBeNull();
+ expect(modelProviderFor({ id: "agy:gemini-4-neon-high" })).toBe("gemini");
+ expect(modelProviderFor({ id: "agy:claude-opus-5-5-high" })).toBe("claude");
+ expect(modelProviderFor({ id: "claude-code:opus" })).toBe("claude");
+ expect(modelProviderFor({ id: "cursor:composer-2.5" })).toBe("cursor");
+ expect(modelProviderFor({ id: "cursor:cursor-grok-4.6" })).toBe("xai");
+ expect(modelProviderFor({ id: "cursor:muse-wonder-1.0" })).toBe("meta");
+ expect(modelProviderFor({ id: "auto", engine: "cursor" })).toBe("cursor");
+ expect(modelProviderFor({ id: "kimi:k3.1-pro-highspeed" })).toBe("kimi");
+ expect(modelProviderFor({ id: "kimi:deepseek-v4-pro" })).toBe("deepseek");
await user.click(await screen.findByRole("menuitemradio", { name: "Codex" }));
expect(chat.setExecutor).toHaveBeenCalledWith("codex");
expect(screen.getByRole("button", { name: "思考强度" })).toBeInTheDocument();
diff --git a/chatbot/tests/hooks.test.jsx b/chatbot/tests/hooks.test.jsx
index 59f0a66e..518ee1a6 100644
--- a/chatbot/tests/hooks.test.jsx
+++ b/chatbot/tests/hooks.test.jsx
@@ -82,8 +82,8 @@ describe("conversation hooks", () => {
expect(result.current.executor).toBe("codebuddy");
expect(result.current.executors.map((item) => item.id)).toEqual(EXECUTORS.map((item) => item.id));
act(() => result.current.setExecutor("codex"));
- await waitFor(() => expect(result.current.models.map((m) => m.id)).toEqual(["default", "gpt-5"]));
- expect(result.current.model).toBe("default");
+ await waitFor(() => expect(result.current.models.map((m) => m.id)).toEqual(["gpt-5"]));
+ expect(result.current.model).toBe("gpt-5");
expect(result.current.effort).toBe("");
expect(result.current.sponsored).toBe(false);
act(() => result.current.setExecutor("unknown"));
@@ -91,7 +91,7 @@ describe("conversation hooks", () => {
await act(() => result.current.send({ text: "你好" }));
expect(writeMock).toHaveBeenCalledWith(
"/api/assistant/generations",
- expect.objectContaining({ executor: "codex", model: "default", effort: "" }),
+ expect.objectContaining({ executor: "codex", model: "gpt-5", effort: "" }),
);
act(() => result.current.setExecutor("codebuddy"));
expect(result.current.model).toBe("m1");
@@ -107,6 +107,119 @@ describe("conversation hooks", () => {
await waitFor(() => expect(result.current.model).toBe("gpt-5"));
});
+ test("does not create a chat without a concrete model on Pi", async () => {
+ const view = renderHook(() => useChat());
+ try {
+ await waitFor(() => expect(view.result.current.ready).toBe(true));
+ act(() => view.result.current.setExecutor("pi"));
+ await waitFor(() => expect(apiMock).toHaveBeenCalledWith("/api/assistant/models?executor=pi"));
+ expect(view.result.current.models).toEqual([]);
+ await act(async () => expect(await view.result.current.send({ text: "开始" })).toBe(false));
+ expect(writeMock).not.toHaveBeenCalled();
+ } finally {
+ view.unmount();
+ localStorage.removeItem("loopforge.assistant.executor");
+ }
+ });
+
+ test("reads Antigravity model families and restores a previous variant as an effort", async () => {
+ const originalAPI = apiMock.getMockImplementation();
+ const originalWrite = writeMock.getMockImplementation();
+ apiMock.mockImplementation((path, options) => {
+ if (path === "/api/runners?mine=1") return Promise.resolve([
+ { id: "mac", name: "Mac", status: "online", ownerUserId: 1,
+ runtimes: [{ provider: "agy", authMode: "local" }] },
+ ]);
+ if (path === "/api/runners/default") return Promise.resolve({ runnerId: "mac" });
+ return originalAPI(path, options);
+ });
+ writeMock.mockImplementation((path, body) => path === "/api/runners/mac/models/probe"
+ ? Promise.resolve({ models: [
+ {
+ id: "claude-sonnet-5-5-medium", name: "Claude Sonnet 5.5",
+ efforts: {
+ low: "claude-sonnet-5-5-low", medium: "claude-sonnet-5-5-medium", high: "claude-sonnet-5-5-high",
+ },
+ discoveredReasoningEfforts: ["low", "medium", "high"],
+ },
+ { id: "claude-opus-5-5-medium", name: "Claude Opus 5.5" },
+ ] })
+ : originalWrite(path, body));
+
+ writeComposerPreference("model.agy", "agy:claude-sonnet-5-5-high");
+ const view = renderHook(() => useChat());
+ try {
+ await waitFor(() => expect(view.result.current.defaultRunnerId).toBe("mac"));
+ act(() => view.result.current.setExecutor("agy"));
+ await waitFor(() => expect(view.result.current.models.map((m) => m.id)).toEqual([
+ "agy:claude-sonnet-5-5-medium", "agy:claude-opus-5-5-medium",
+ ]));
+ expect(writeMock).toHaveBeenCalledWith("/api/runners/mac/models/probe", { provider: "agy", useSaved: true });
+ expect(view.result.current.model).toBe("agy:claude-sonnet-5-5-medium");
+ expect(view.result.current.modelDetails.efforts).toEqual(["low", "medium", "high"]);
+ expect(view.result.current.effort).toBe("high");
+ act(() => view.result.current.setEffort(""));
+ expect(view.result.current.effort).toBe("");
+ act(() => view.result.current.setEffort("low"));
+ await act(() => view.result.current.send({ text: "使用低思考强度" }));
+ expect(writeMock).toHaveBeenCalledWith("/api/assistant/generations", expect.objectContaining({
+ model: "agy:claude-sonnet-5-5-medium", effort: "low", executionTarget: { pool: "runner", runnerId: "mac" },
+ }));
+ } finally {
+ view.unmount();
+ apiMock.mockImplementation(originalAPI);
+ writeMock.mockImplementation(originalWrite);
+ localStorage.removeItem("loopforge.assistant.executor");
+ localStorage.removeItem("loopforge.assistant.model.agy");
+ localStorage.removeItem("loopforge.assistant.effort.agy.claude-sonnet-5-5-medium");
+ history.replaceState({}, "", "/");
+ }
+ });
+
+ test("asks for a new model before continuing on a retired Antigravity variant", async () => {
+ const originalAPI = apiMock.getMockImplementation();
+ const originalWrite = writeMock.getMockImplementation();
+ const session = {
+ id: "legacy-agy", executor: "agy", model: "agy:gemini-3.8-flash-high", effort: "",
+ executionTarget: { pool: "runner", runnerId: "mac" },
+ messages: [{ role: "user", content: "原消息" }, { role: "assistant", content: "原回复", model: "agy:gemini-3.8-flash-high" }],
+ };
+ apiMock.mockImplementation(async (path, options) => {
+ if (path === "/api/runners?mine=1") return [
+ { id: "mac", status: "online", ownerUserId: 1, runtimes: [{ provider: "agy", authMode: "local" }] },
+ ];
+ if (path === "/api/assistant/sessions/legacy-agy") return structuredClone(session);
+ return originalAPI(path, options);
+ });
+ writeMock.mockImplementation(async (path, body) => path === "/api/runners/mac/models/probe"
+ ? { models: [{
+ id: "gemini-3.8-flash-low", name: "Gemini 3.8 Flash", discoveredReasoningEfforts: ["low", "medium"],
+ efforts: { low: "gemini-3.8-flash-low", medium: "gemini-3.8-flash-medium" },
+ }] }
+ : originalWrite(path, body));
+ const view = renderHook(() => useChat());
+ try {
+ await waitFor(() => expect(view.result.current.ready).toBe(true));
+ act(() => view.result.current.open(session.id));
+ await waitFor(() => expect(view.result.current.models.map(model => model.id)).toEqual(["agy:gemini-3.8-flash-low"]));
+ await act(async () => expect(await view.result.current.send({ text: "继续" })).toBe(false));
+ expect(view.result.current.error).toContain("请重新选择模型");
+ expect(writeMock).not.toHaveBeenCalledWith("/api/assistant/generations", expect.anything());
+ act(() => view.result.current.setModel("agy:gemini-3.8-flash-low"));
+ await act(async () => expect(await view.result.current.send({ text: "继续" })).toBe(true));
+ expect(writeMock).toHaveBeenCalledWith("/api/assistant/generations", expect.objectContaining({
+ sessionId: session.id, model: "agy:gemini-3.8-flash-low", effort: "",
+ }));
+ } finally {
+ view.unmount();
+ apiMock.mockImplementation(originalAPI);
+ writeMock.mockImplementation(originalWrite);
+ localStorage.removeItem("loopforge.assistant.executor");
+ localStorage.removeItem("loopforge.assistant.model.agy");
+ localStorage.removeItem("loopforge.assistant.effort.agy.gemini-3.8-flash-low");
+ }
+ });
+
test.each(["after saving a key", "during the first open"])("refreshes a pending Cursor catalog %s", async (scenario) => {
const original = apiMock.getMockImplementation();
let configured = scenario === "during the first open";
@@ -228,7 +341,7 @@ describe("conversation hooks", () => {
);
act(() => first.result.current.newChat());
act(() => first.result.current.setExecutor("codex"));
- await waitFor(() => expect(first.result.current.models.map((m) => m.id)).toEqual(["default", "gpt-5"]));
+ await waitFor(() => expect(first.result.current.models.map((m) => m.id)).toEqual(["gpt-5"]));
act(() => { first.result.current.setModel("gpt-5"); });
act(() => first.result.current.setEffort("high"));
act(() => first.result.current.setExecutor("codebuddy"));
diff --git a/design.md b/design.md
index c34e2634..0461ff6f 100644
--- a/design.md
+++ b/design.md
@@ -55,7 +55,7 @@
- 设置模式与工作台模式切换通过共享过渡控制器衔接;过渡副本不得接受点击、键盘焦点或提交操作。
- 凭据定位等跳转应在目标页面挂载后聚焦;用户已切换到其他页面时取消旧的焦点请求。
- 对话失败如果是因为当前服务器没有安装所选 CLI,错误写明「没有安装」,并在同一条提示里提供「安装」按钮。点击后按钮变为「自动安装」,刷新页面也保持这个状态,直到安装结束。安装完成后,原来的「没有安装」或「AI 助手生成失败」改为可以重新发送。按钮只安装平台允许的 CLI。安装在服务器上继续,关闭页面也不会中断。
-- 个人配置里,Codex、Claude Code,以及带协议的 Agent CLI,可以维护模型目录:获取可用模型,勾选、排序、修改显示名。目录为空时,未填 Base URL 或协议是 Gemini 官方 API 则使用该 CLI 自带模型,填写了 Base URL 则跟随服务公布的模型。保存过的目录在官方服务和自定义地址上都生效。Cursor CLI 只使用官方模型。
+- 个人配置里,Codex、Claude Code,以及带协议的 Agent CLI,可以获取、勾选、排序模型并修改显示名。目录为空时,官方端点使用该 CLI 自带的模型,填写 Base URL 后跟随该服务公布的模型。保存过的目录在官方服务和自定义地址上都生效。Cursor CLI 只使用官方模型。
- 模型目录每行可展开「思考强度」,选择自动或自定义可选档位;自定义全部取消表示仅使用模型默认强度。获取模型时保留服务提供的档位,缺失时沿用已有 CLI 目录能力;用户自定义优先,Cursor 的档位与模型 ID 映射独立保留。相同 ID 补充的能力信息也需要保存。
- 主题入口在左下角头像卡片(`#userProfilePopover`)的「外观」行:「浅色 / 深色 / 跟随系统」三段开关(`.upp-theme-seg`,`role="radiogroup"`),访客与登录卡片都显示,选项文案与 chatbot 设置一致,偏好写入共享键 `agentflow.theme.v3`。三段前分别是 Harness `sun`、`moon`、`monitor` 图标,悬停、聚焦或点击时播放一次动效;选中滑块由 SlidingTabs 驱动,卡片展开时立即对准当前选项。切换时页面颜色约 280ms 渐变,减少动态效果时直接切换。
- 顶栏 `#themeToggle` 只在宽度 ≤1000px(图标栏隐藏)时显示,作为浅色、深色一键切换的兜底;宽屏下仅隐藏,DOM 节点保留给 AI 助手按钮定位。
@@ -89,7 +89,8 @@
- 模型触发器和选项显示品牌图标;未知品牌使用通用图标,不影响模型可选性。
- 品牌图标保留原始颜色及明暗主题变体,悬停时只在图形内部播放短暂光效。
- 模型列表保留服务端顺序、真实模型 ID、名称、系列及倍率信息,品牌推断只用于展示。
-- 对话输入区在当前浏览器记住最近选用的 CLI、每个 CLI 的模型和每个模型的思考强度。操作确认方式在同一浏览器内按登录账号保存,新账号默认使用「请求批准」。刷新或开始新对话时优先恢复上次选用的可用模型,否则选择列表第一项。打开已有对话时模型和强度以会话记录为准。CodeBuddy 的菜单只列出具体模型,列表为空时使用 CLI 默认模型。
+- 对话输入区在当前浏览器记住最近选用的 CLI、每个 CLI 的模型和每个模型的思考强度。操作确认方式在同一浏览器内按登录账号保存,新账号默认使用「请求批准」。模型菜单只列出具体模型。刷新或开始新对话时优先恢复上次选用的可用模型,其次选择列表第一项。打开已有对话时模型和强度以会话记录为准。
+- Antigravity 使用账号登录的执行机器时,优先使用已保存的目录,目录为空时查询该机器的可用模型。同一模型的强度变体合并为一个模型,思考强度菜单只显示目录提供的档位,执行时使用对应的模型 ID。Gemini API Key 使用 Gemini 模型目录,自定义网关使用该服务的目录。CLI 选择显示 Antigravity 标识,Gemini 和 Claude 模型显示各自标识。
- 发送消息时校验审批选择对应的账号与当前登录账号。切换账号后,从旧标签页发送会提示刷新。
- 保存 CLI 凭据后自动更新对话输入区的模型和强度。Cursor 后台探测完成时更新账号模型目录。
- 搜索支持名称、ID 和系列;选中态使用固定勾选位置,搜索为空时显示明确结果。
@@ -397,7 +398,7 @@ AI 助手页(`#assistantView`,路由 `#/assistant`)在设置导航「管
| 尺寸 | 编辑态随屏幕缩放:宽取视口 72%(不小于 880px、不大于 1320px),高取视口 84%(不小于 640px、不大于 1000px),且始终不超过视口的 94% / 92%;切换标签页时弹窗不变高也不移位;正文超出时在 `.as-main` 内滚动,任务页的 prompt 输入框撑满剩余高度;≤720px 全屏 |
| 顶部 | 标题 + 一行弱化元信息「CLI · 模型(未选时标「默认」)· 版本 · 版本历史」,由 `renderAgentSummary()` 写入 `#agentRuntimeMeta`;不放状态胶囊 |
| 标签 | 身份 / 任务 / 产物与门禁 / 技能与工具,计数为 0 时隐藏 |
-| 身份 | 名称与只读标识同一行(新建时标识在名称下方,可「修改」);职责为单行输入、最多 160 字并显示计数;CLI、模型、思考强度归在「运行方式」下,三个触发器同为 36px、细边框、chevron。模型下拉首项是「默认 · CLI 默认模型」,不显示「选择模型」占位。模型与思考强度菜单在滚动的正文里展开,打开时按触发器上下剩余空间选方向,最大高度不超过该空间;菜单打开时不显示触发器的提示气泡,标签未被截断时也不挂提示 |
+| 身份 | 名称与只读标识同一行(新建时标识在名称下方,可「修改」);职责为单行输入、最多 160 字并显示计数;CLI、模型、思考强度归在「运行方式」下,三个触发器同为 36px、细边框、chevron。新建角色或切换 CLI 时选中首个具体模型,目录为空时提示选择或填写模型 ID。模型与思考强度菜单在滚动的正文里展开,打开时按触发器上下剩余空间选方向,最大高度不超过该空间;菜单打开时不显示触发器的提示气泡,标签未被截断时也不挂提示 |
| 任务 | 只有一个角色 prompt 输入框;运行时变量按钮做成贴在输入框顶部的工具条,点击插入到光标处;框下一行弱化小字列出运行时自动附上的内容(角色名、产物数、门禁数、重试轮数),随其他标签页的修改实时更新 |
| 开关 | 共享、自动重试、人工介入、平台 MCP、知识库都用 `.as-switch-row`:左侧标题 + 说明,右侧 `role="switch"` 开关;不用带边框的勾选卡片 |
| 说明文字 | 各标签页不放开头说明句,说明写在字段或分区标题的弱化副文字里 |
diff --git a/internal/domain/user.go b/internal/domain/user.go
index d8f38f7f..d5502629 100644
--- a/internal/domain/user.go
+++ b/internal/domain/user.go
@@ -193,8 +193,8 @@ func PublicUser(u User) User {
// CLIModel is one entry of a CLI model catalog. ID is passed to the CLI
// as-is; an empty Name shows the ID.
//
-// Efforts is set on a Cursor model family folded out of the CLI's own model
-// list: it maps each reasoning effort onto the model ID cursor-agent printed
+// Efforts is set on a model family folded out of the CLI's own model
+// list: it maps each reasoning effort onto the model ID the CLI printed
// for it, and DefaultEffort is the effort an empty choice runs. They are
// saved with the catalog so the family resolves for its owner on any
// instance and after a restart.
diff --git a/internal/httpapi/antigravity_runner_login_test.go b/internal/httpapi/antigravity_runner_login_test.go
index 26753089..5f6f6c1d 100644
--- a/internal/httpapi/antigravity_runner_login_test.go
+++ b/internal/httpapi/antigravity_runner_login_test.go
@@ -31,7 +31,17 @@ func TestAntigravityRunnerLoginRequiresMachineOwner(t *testing.T) {
request := assistantRequest{SessionID: "agy-login", Executor: "agy", Model: "gemini-4-hydrogen-high", Messages: []assistantMessage{{Role: "user", Content: "hello"}}, ExecutionTarget: &target}
body, _ := json.Marshal(request)
c, rec := workbenchContext(owner, http.MethodPost, "/api/assistant/chat", bytes.NewBuffer(body))
- h.chat(c)
+ h.runnerControls = quietRunnerHub()
+ conn := testRunnerConn(row.ID)
+ registerTestConn(h.runnerControls, conn)
+ defer conn.close()
+ done := make(chan struct{})
+ go func() { h.chat(c); close(done) }()
+ lookup := answerOnce(t, h.runnerControls, conn, domain.RunnerWorkspaceResponse{Status: 200, Payload: []byte(`[{"id":"gemini-4-hydrogen-high"}]`)})
+ <-done
+ if lookup.Operation != domain.RunnerWorkspaceOperationLoginModels || lookup.ModelProvider != "agy" {
+ t.Fatalf("unexpected account discovery: %+v", lookup)
+ }
if rec.Code != http.StatusOK || !called {
t.Fatalf("account login was blocked by the API-key preflight: %d %s", rec.Code, rec.Body)
}
diff --git a/internal/httpapi/assistant.go b/internal/httpapi/assistant.go
index 6bf40733..b696a0e3 100644
--- a/internal/httpapi/assistant.go
+++ b/internal/httpapi/assistant.go
@@ -172,7 +172,8 @@ func (h *assistantHandlers) chat(c *gin.Context) {
req.ExecutionTarget = target
}
cliEngine, _ := assistantModelEngine(req.Model)
- runnerLogin := h.assistantUsesRunnerLogin(stored.ID, req.ExecutionTarget, cliEngine)
+ loginRunner := h.assistantLoginRunner(stored.ID, req.ExecutionTarget, cliEngine)
+ runnerLogin := loginRunner.ID != ""
user, model, refusal := h.assistantTurnUser(stored, req.Model, runnerLogin)
if refusal != "" {
c.JSON(400, gin.H{"error": refusal})
@@ -226,7 +227,8 @@ func (h *assistantHandlers) chat(c *gin.Context) {
}
cliEngine, _ = assistantModelEngine(req.Model)
req.Executor = cliEngine
- if err := validateAssistantEffort(c.Request.Context(), user, req.Model, req.Effort); err != nil {
+ cliModel, err := h.resolveAssistantTurnModel(c.Request.Context(), user, req.Model, req.Effort, loginRunner)
+ if err != nil {
c.JSON(400, gin.H{"error": err.Error()})
return
}
@@ -549,7 +551,7 @@ func (h *assistantHandlers) chat(c *gin.Context) {
} else {
prompt = assistantPlatformExecutionReminder + "\n" + prompt
}
- cliReq := assistantCLIRequest{Executor: req.Executor, Prompt: prompt, Model: req.Model, Effort: req.Effort, SessionID: cliSessionID, Resume: resume, UserID: u.ID, Native: true, MCPConfig: mcp, Settings: settings, SystemPrompt: system, SessionRoot: cliRoot, RunnerLogin: runnerLogin, OnUsage: turnUsage.add, Workspace: req.workspaceMode, RemoteBinary: req.workspaceMode || toolSession.ExecutionRunnerID != "", Execute: h.conversationExecutor(toolSession, cliRoot)}
+ cliReq := assistantCLIRequest{Executor: req.Executor, Prompt: prompt, Model: cliModel, Effort: req.Effort, SessionID: cliSessionID, Resume: resume, UserID: u.ID, Native: true, MCPConfig: mcp, Settings: settings, SystemPrompt: system, SessionRoot: cliRoot, RunnerLogin: runnerLogin, OnUsage: turnUsage.add, Workspace: req.workspaceMode, RemoteBinary: req.workspaceMode || toolSession.ExecutionRunnerID != "", Execute: h.conversationExecutor(toolSession, cliRoot)}
persistAttempt := func(unstarted bool) error {
if nativeSession != nil {
nativeSession.checkpoint.Unstarted = unstarted
@@ -1536,7 +1538,7 @@ func runAssistantCLI(ctx context.Context, req assistantCLIRequest, user domain.U
sessionID = newAssistantSessionID()
}
var inv assistantCLIInvocation
- engineOpts := assistantEngineInvocationOpts{Bin: bin, Root: root, Config: config, Prompt: req.Prompt, Model: engineModel, Effort: req.Effort, SessionID: sessionID, Resume: req.Resume, SystemPrompt: req.SystemPrompt, ReviewOnly: req.ReviewOnly, Workspace: req.Workspace}
+ engineOpts := assistantEngineInvocationOpts{Bin: bin, Root: root, Config: config, Prompt: req.Prompt, Model: engineModel, Effort: req.Effort, SessionID: sessionID, Resume: req.Resume, SystemPrompt: req.SystemPrompt, ReviewOnly: req.ReviewOnly, Workspace: req.Workspace, RunnerLogin: req.RunnerLogin}
switch engine {
case assistantEngineClaude:
if !req.RunnerLogin {
diff --git a/internal/httpapi/assistant_effort.go b/internal/httpapi/assistant_effort.go
index 339471cd..71414811 100644
--- a/internal/httpapi/assistant_effort.go
+++ b/internal/httpapi/assistant_effort.go
@@ -37,6 +37,10 @@ func assistantModelEffortsForBaseURL(model string, catalog []domain.CLIModel, ba
// The CodeBuddy fallback mirrors CodeBuddy Code 2.180.0's model capabilities.
// Unknown CodeBuddy, Codex and Claude Code models fall back to low/medium/high.
func assistantModelEffortsIn(model string, catalog []domain.CLIModel) []string {
+ return assistantModelEffortsInCatalog(model, catalog, false)
+}
+
+func assistantModelEffortsInCatalog(model string, catalog []domain.CLIModel, runnerLogin bool) []string {
engine, id := assistantModelEngine(model)
supported := domain.ExecutorEffortLevels[engine]
builtins := builtinExecutorModels[engine]
@@ -56,6 +60,17 @@ func assistantModelEffortsIn(model string, catalog []domain.CLIModel) []string {
if configured == nil {
configured = item.DiscoveredReasoningEfforts
}
+ if runnerLogin && engine == runtime.AgentCLIAntigravity && len(item.Efforts) > 0 {
+ supported = nil
+ for _, level := range runtime.AgyAccountModelEfforts(id) {
+ if item.Efforts[level] != "" {
+ supported = append(supported, level)
+ }
+ }
+ if configured == nil {
+ return supported
+ }
+ }
if configured == nil {
continue
}
@@ -112,7 +127,54 @@ func validateAssistantEffort(ctx context.Context, user domain.User, model, effor
if effort == "" {
return nil
}
- efforts := assistantModelEfforts(ctx, user, model)
+ return validateAssistantModelEffort(model, effort, assistantModelEfforts(ctx, user, model))
+}
+
+type assistantRunnerTurnModelKey struct{}
+
+// Carry the admitted selection into the internal chat request of this turn.
+type assistantRunnerTurnModel struct {
+ runnerID string
+ model string
+ effort string
+ resolved string
+}
+
+func (h *assistantHandlers) resolveAssistantTurnModel(ctx context.Context, user domain.User, model, effort string, runner domain.Runner) (string, error) {
+ engine, id := assistantModelEngine(model)
+ if runner.ID == "" || engine != runtime.AgentCLIAntigravity {
+ return model, validateAssistantEffort(ctx, user, model, effort)
+ }
+ // Legacy sessions can carry an explicit variant in the ID alone.
+ _, variantEffort := runtime.SplitAgyModelEffort(id)
+ if effort == "" && variantEffort == "" {
+ return model, nil
+ }
+ if admitted, ok := ctx.Value(assistantRunnerTurnModelKey{}).(assistantRunnerTurnModel); ok &&
+ admitted.runnerID == runner.ID && admitted.model == model && admitted.effort == effort {
+ return admitted.resolved, nil
+ }
+ _, catalog := runnerLoginModelCatalog(ctx, h.runnerControls, runner, engine, assistantEngineCustomModels(user, engine))
+ if catalog.Error != "" {
+ return "", fmt.Errorf("无法验证模型 %s 的思考强度:%s", model, catalog.Error)
+ }
+ for _, item := range catalog.Models {
+ if item.ID != id && (variantEffort == "" || item.Efforts[variantEffort] != id) {
+ continue
+ }
+ if effort == "" {
+ return model, nil
+ }
+ efforts := assistantModelEffortsInCatalog(engine+":"+item.ID, catalog.Models, true)
+ if err := validateAssistantModelEffort(model, effort, efforts); err != nil {
+ return "", err
+ }
+ return engine + ":" + firstNonEmpty(item.Efforts[effort], id), nil
+ }
+ return "", fmt.Errorf("模型 %s 已不在该执行机器的账号目录,请重新选择模型", model)
+}
+
+func validateAssistantModelEffort(model, effort string, efforts []string) error {
if !slices.Contains(efforts, effort) {
if len(efforts) == 0 {
return fmt.Errorf("模型 %s 仅支持默认思考强度", model)
diff --git a/internal/httpapi/assistant_engine_agentcli.go b/internal/httpapi/assistant_engine_agentcli.go
index 1eb5b892..074e9e36 100644
--- a/internal/httpapi/assistant_engine_agentcli.go
+++ b/internal/httpapi/assistant_engine_agentcli.go
@@ -57,6 +57,7 @@ func prepareAssistantAgentCLIInvocation(kind string, o assistantEngineInvocation
command := runtime.AgentCLICommand(kind, runtime.AgentCLICommandOptions{
Binary: o.Bin, Model: o.Model, Effort: o.Effort, Resume: resume, Prompt: o.Prompt,
SystemPrompt: o.SystemPrompt, SystemPromptFile: systemFile, Chat: true, Workspace: o.Workspace, AgentFile: agentFile,
+ RunnerLogin: o.RunnerLogin,
})
command.CredentialBindings = []runtime.CredentialBinding{runtime.BindAgentCLI}
translate := runtime.NewAgentCLITranslator(kind)
diff --git a/internal/httpapi/assistant_engine_cli.go b/internal/httpapi/assistant_engine_cli.go
index d06bb522..39f2223e 100644
--- a/internal/httpapi/assistant_engine_cli.go
+++ b/internal/httpapi/assistant_engine_cli.go
@@ -37,7 +37,7 @@ type assistantCLIInvocation struct {
type assistantEngineInvocationOpts struct {
Bin, Root, Config, Prompt, Model, Effort, SessionID, SystemPrompt string
- Resume, Workspace bool
+ Resume, Workspace, RunnerLogin bool
// ReviewOnly is a one-shot call without MCP servers or session history,
// such as a title summary.
ReviewOnly bool
diff --git a/internal/httpapi/assistant_engines.go b/internal/httpapi/assistant_engines.go
index f4dbc7fb..77776d2e 100644
--- a/internal/httpapi/assistant_engines.go
+++ b/internal/httpapi/assistant_engines.go
@@ -132,6 +132,11 @@ func assistantEngineAnthropicModels(engine, protocol string) bool {
return engine == assistantEngineClaude || protocol == runtime.AgentCLIProtocolMessages
}
+func antigravityUsesCustomEndpoint(user domain.User) bool {
+ _, baseURL := assistantEngineCredential(user, runtime.AgentCLIAntigravity)
+ return baseURL != "" || assistantEngineProtocol(user, runtime.AgentCLIAntigravity) == runtime.AgentCLIProtocolChat
+}
+
func assistantEngineCustomModels(user domain.User, engine string) []domain.CLIModel {
switch engine {
case assistantEngineCodeBuddy:
@@ -315,8 +320,11 @@ func assistantDiscoveredModelsFor(ctx context.Context, user domain.User, engine
key, baseURL := assistantEngineCredential(user, engine)
protocol := assistantEngineProtocol(user, engine)
listed := assistantSavedModels(user, engine)
- if len(listed) == 0 && key != "" && baseURL != "" && protocol != runtime.AgentCLIProtocolGemini {
- listed = cachedAssistantEngineDiscovery(ctx, assistantEngineAnthropicModels(engine, protocol), key, baseURL)
+ if len(listed) == 0 && key != "" && baseURL != "" {
+ if assistantEngineAnthropicModels(engine, protocol) {
+ protocol = runtime.AgentCLIProtocolMessages
+ }
+ listed = cachedAssistantEngineDiscovery(ctx, protocol, key, baseURL)
}
if engine == runtime.AgentCLICursor && key != "" && !user.AgentCLICredentials[engine].ModelsCustomized {
fresh, pending := cachedCursorModels(key)
@@ -331,7 +339,7 @@ func assistantDiscoveredModelsFor(ctx context.Context, user domain.User, engine
func assistantSavedModels(user domain.User, engine string) []assistantDiscoveredModel {
var listed []assistantDiscoveredModel
for _, model := range assistantEngineCustomModels(user, engine) {
- if assistantValidEngineModel(model.ID) {
+ if model.ID != assistantDefaultModel && assistantValidEngineModel(model.ID) {
listed = append(listed, assistantDiscoveredModel{
ID: model.ID, Name: model.Name, Efforts: model.Efforts, DefaultEffort: model.DefaultEffort,
ReasoningEfforts: model.ReasoningEfforts, DiscoveredReasoningEfforts: model.DiscoveredReasoningEfforts,
@@ -353,11 +361,14 @@ func assistantEngineModels(ctx context.Context, user domain.User, runnerLogin ma
listed, pending = assistantDiscoveredModelsFor(ctx, user, engine)
cursorModelsPending = cursorModelsPending || pending
}
- if len(listed) == 0 {
+ if len(listed) == 0 && (engine != runtime.AgentCLIAntigravity || runnerLogin[engine] || !antigravityUsesCustomEndpoint(user)) {
listed = assistantEngineBuiltinModels(engine)
}
catalog := cliModelsOf(listed)
for _, model := range listed {
+ if model.ID == assistantDefaultModel {
+ continue
+ }
name := strings.TrimSpace(model.Name)
if name == "" {
name = model.ID
@@ -366,7 +377,7 @@ func assistantEngineModels(ctx context.Context, user domain.User, runnerLogin ma
models = append(models, assistantModel{
ID: id,
Name: name,
- Family: assistantModelFamily(model.ID),
+ Family: assistantModelFamily(model.ID, engine),
Engine: engine,
Efforts: assistantModelEffortsForBaseURL(id, catalog, baseURL),
})
@@ -404,13 +415,13 @@ var (
assistantEngineDiscover = discoverAssistantEngineModels
)
-func assistantDiscoveryKey(anthropic bool, apiKey, baseURL string) string {
- sum := sha256.Sum256([]byte(fmt.Sprint(anthropic) + "\x00" + baseURL + "\x00" + apiKey))
+func assistantDiscoveryKey(protocol, apiKey, baseURL string) string {
+ sum := sha256.Sum256([]byte(protocol + "\x00" + baseURL + "\x00" + apiKey))
return hex.EncodeToString(sum[:])
}
-func cachedAssistantEngineDiscovery(ctx context.Context, anthropic bool, apiKey, baseURL string) []assistantDiscoveredModel {
- cacheKey := assistantDiscoveryKey(anthropic, apiKey, baseURL)
+func cachedAssistantEngineDiscovery(ctx context.Context, protocol, apiKey, baseURL string) []assistantDiscoveredModel {
+ cacheKey := assistantDiscoveryKey(protocol, apiKey, baseURL)
now := time.Now()
if cached, ok := assistantDiscoveryCache.Load(cacheKey); ok {
if entry := cached.(assistantDiscoveryEntry); now.Before(entry.expires) {
@@ -419,7 +430,13 @@ func cachedAssistantEngineDiscovery(ctx context.Context, anthropic bool, apiKey,
}
ctx, cancel := context.WithTimeout(ctx, assistantDiscoveryTimeout)
defer cancel()
- models, err := assistantEngineDiscover(ctx, anthropic, apiKey, baseURL)
+ var models []assistantDiscoveredModel
+ var err error
+ if protocol == runtime.AgentCLIProtocolGemini {
+ models, err = discoverGeminiModels(ctx, apiKey, baseURL)
+ } else {
+ models, err = assistantEngineDiscover(ctx, protocol == runtime.AgentCLIProtocolMessages, apiKey, baseURL)
+ }
ttl := assistantDiscoveryTTL
if err != nil || len(models) == 0 {
models, ttl = nil, assistantDiscoveryFailureTTL
diff --git a/internal/httpapi/assistant_execution.go b/internal/httpapi/assistant_execution.go
index 27c36098..71da703b 100644
--- a/internal/httpapi/assistant_execution.go
+++ b/internal/httpapi/assistant_execution.go
@@ -53,11 +53,18 @@ func (h *assistantHandlers) newExecutionTarget(userID int64, projectID string, r
// Use a machine's login only for its owner on a personal execution target.
func (h *assistantHandlers) assistantUsesRunnerLogin(userID int64, target *domain.AssistantExecutionTarget, engine string) bool {
+ return h.assistantLoginRunner(userID, target, engine).ID != ""
+}
+
+func (h *assistantHandlers) assistantLoginRunner(userID int64, target *domain.AssistantExecutionTarget, engine string) domain.Runner {
if target == nil || target.Pool != domain.ExecutionModeRunner {
- return false
+ return domain.Runner{}
}
runner, ok := h.repo.Runner(target.RunnerID)
- return ok && runner.OwnerUserID == userID && runnerUsesLocalLogin(runner, engine)
+ if ok && runner.OwnerUserID == userID && runnerUsesLocalLogin(runner, engine) {
+ return runner
+ }
+ return domain.Runner{}
}
func runnerUsesLocalLogin(runner domain.Runner, engine string) bool {
diff --git a/internal/httpapi/assistant_generation.go b/internal/httpapi/assistant_generation.go
index 987dad72..bb055e3a 100644
--- a/internal/httpapi/assistant_generation.go
+++ b/internal/httpapi/assistant_generation.go
@@ -4,6 +4,7 @@ import (
"agentflow/internal/auth"
"agentflow/internal/domain"
"agentflow/internal/engine"
+ "agentflow/internal/runtime"
"bytes"
"context"
@@ -77,7 +78,8 @@ func (h *assistantHandlers) startGeneration(c *gin.Context) {
}
}
cliEngine, _ := assistantModelEngine(req.Model)
- runnerLogin := h.assistantUsesRunnerLogin(stored.ID, req.ExecutionTarget, cliEngine)
+ loginRunner := h.assistantLoginRunner(stored.ID, req.ExecutionTarget, cliEngine)
+ runnerLogin := loginRunner.ID != ""
user, model, refusal := h.assistantTurnUser(stored, req.Model, runnerLogin)
if refusal != "" {
c.JSON(400, gin.H{"error": refusal})
@@ -122,7 +124,8 @@ func (h *assistantHandlers) startGeneration(c *gin.Context) {
}
cliEngine, _ = assistantModelEngine(req.Model)
req.Executor = cliEngine
- if err := validateAssistantEffort(c.Request.Context(), user, req.Model, req.Effort); err != nil {
+ cliModel, err := h.resolveAssistantTurnModel(c.Request.Context(), user, req.Model, req.Effort, loginRunner)
+ if err != nil {
c.JSON(400, gin.H{"error": err.Error()})
return
}
@@ -197,6 +200,11 @@ func (h *assistantHandlers) startGeneration(c *gin.Context) {
// Keep the authenticated identity, but disconnect model execution from the
// lifetime of the browser request. Only explicit cancellation stops a turn.
parent := context.WithValue(context.WithoutCancel(c.Request.Context()), assistantFreshCLIKey{}, freshCLI)
+ if runnerLogin && cliEngine == runtime.AgentCLIAntigravity {
+ parent = context.WithValue(parent, assistantRunnerTurnModelKey{}, assistantRunnerTurnModel{
+ runnerID: loginRunner.ID, model: req.Model, effort: req.Effort, resolved: cliModel,
+ })
+ }
_, sharedModels, _ := h.assistantChatUser(stored)
h.scheduleAssistantTitle(h.helperExecutionContext(parent, ownerID, req.ExecutionTarget), ownerID, user, old, req.SessionID, req.Messages, req.Model, sharedModels)
done := inflightTasks.Add()
@@ -521,7 +529,8 @@ func (h *assistantHandlers) steerGeneration(c *gin.Context) {
return
}
target := session.Execution()
- runnerLogin := h.assistantUsesRunnerLogin(stored.ID, &target, cliEngine)
+ loginRunner := h.assistantLoginRunner(stored.ID, &target, cliEngine)
+ runnerLogin := loginRunner.ID != ""
user, model, refusal := h.assistantTurnUser(stored, model, runnerLogin)
if refusal != "" {
c.JSON(400, gin.H{"error": refusal})
@@ -545,7 +554,7 @@ func (h *assistantHandlers) steerGeneration(c *gin.Context) {
c.JSON(409, gin.H{"error": refusal})
return
}
- if err := validateAssistantEffort(c.Request.Context(), user, model, body.Effort); err != nil {
+ if _, err := h.resolveAssistantTurnModel(c.Request.Context(), user, model, body.Effort, loginRunner); err != nil {
c.JSON(400, gin.H{"error": err.Error()})
return
}
diff --git a/internal/httpapi/assistant_models.go b/internal/httpapi/assistant_models.go
index 60587067..32f5b881 100644
--- a/internal/httpapi/assistant_models.go
+++ b/internal/httpapi/assistant_models.go
@@ -192,26 +192,33 @@ func (h *assistantHandlers) models(c *gin.Context) {
} else if id == "claude" {
engine = assistantEngineClaude
}
- var kimiBaseURL string
- if engine == runtime.AgentCLIKimi {
+ var user domain.User
+ if h.repo != nil && (engine == runtime.AgentCLIKimi || engine == runtime.AgentCLIAntigravity) {
if current, signedIn := h.requestUser(c.Request, true); signedIn {
- if stored, found := h.repo.User(current.ID); found {
- _, kimiBaseURL = assistantEngineCredential(stored, engine)
- }
+ user, _ = h.repo.User(current.ID)
}
}
+ _, kimiBaseURL := assistantEngineCredential(user, runtime.AgentCLIKimi)
catalog, ok := executorModelCatalogs(kimiBaseURL)[id]
if !ok {
c.JSON(400, gin.H{"error": "不支持的执行器"})
return
}
- result := assistantModelCatalog{Default: "default", Models: []assistantModel{{ID: "default", Name: "CLI default", Family: map[string]string{"codex": "gpt", "claude": "claude"}[id], Efforts: assistantModelEffortsIn(engine+":default", nil)}}}
+ result := assistantModelCatalog{Models: make([]assistantModel, 0, len(catalog.Models))}
+ if engine == runtime.AgentCLIAntigravity && antigravityUsesCustomEndpoint(user) {
+ c.Header("Cache-Control", "private, no-store")
+ c.JSON(200, result)
+ return
+ }
for _, item := range catalog.Models {
levels := make([]string, 0, len(item.Efforts))
for _, option := range item.Efforts {
levels = append(levels, option.Value)
}
- result.Models = append(result.Models, assistantModel{ID: item.ID, Name: item.Name, Family: map[string]string{"codex": "gpt", "claude": "claude"}[id], Efforts: levels})
+ result.Models = append(result.Models, assistantModel{ID: item.ID, Name: item.Name, Family: item.Family, Engine: engine, Efforts: levels})
+ }
+ if len(result.Models) > 0 {
+ result.Default = result.Models[0].ID
}
c.JSON(200, result)
return
@@ -281,13 +288,17 @@ func (h *assistantHandlers) models(c *gin.Context) {
func selectableCodeBuddyModels(models []assistantModel) []assistantModel {
listed := make([]assistantModel, 0, len(models))
for _, model := range models {
- if model.ID != assistantDefaultModel {
+ if !codeBuddyIsDefaultModel(model.ID) {
listed = append(listed, model)
}
}
return listed
}
+func codeBuddyIsDefaultModel(id string) bool {
+ return id == assistantDefaultModel || id == "default-model"
+}
+
// withCodeBuddyPersonalModels accepts the user's saved CodeBuddy models and
// defaults requests without a model to the first of them. The environment's
// models stay accepted.
@@ -388,11 +399,18 @@ func assistantFixedCatalog() assistantModelCatalog {
}
func assistantListedModel(id, name, credits string) assistantModel {
- return assistantModel{ID: id, Name: name, Family: assistantModelFamily(id), Credits: credits, Efforts: assistantModelEffortsIn(id, nil)}
+ return assistantModel{ID: id, Name: name, Family: assistantModelFamily(id, assistantEngineCodeBuddy), Credits: credits, Efforts: assistantModelEffortsIn(id, nil)}
}
-func assistantModelFamily(id string) string {
- id = strings.ToLower(id)
+func assistantModelFamily(id, engine string) string {
+ id = strings.ToLower(strings.TrimSpace(id))
+ if engine == assistantEngineCodeBuddy {
+ switch id {
+ case "fast-model", "balanced-model", "primary-model", "deep-model":
+ return "codebuddy"
+ }
+ }
+ id = id[strings.LastIndexByte(id, '/')+1:]
switch {
case strings.HasPrefix(id, "claude"):
return "claude"
@@ -402,8 +420,22 @@ func assistantModelFamily(id string) string {
return "glm"
case strings.HasPrefix(id, "gemini"):
return "gemini"
- case strings.HasPrefix(id, "kimi"):
+ case id == "grok" || strings.HasPrefix(id, "grok-") || strings.HasPrefix(id, "cursor-grok-"):
+ return "grok"
+ case id == "muse" || strings.HasPrefix(id, "muse-"):
+ return "muse"
+ case id == "composer" || strings.HasPrefix(id, "composer-") || (engine == runtime.AgentCLICursor && (id == "auto" || id == "auto-smart")):
+ return "cursor"
+ case strings.HasPrefix(id, "kimi") || id == "k3" || strings.HasPrefix(id, "k3-") || strings.HasPrefix(id, "k3."):
return "kimi"
+ case strings.HasPrefix(id, "moonshot"):
+ return "moonshot"
+ case strings.HasPrefix(id, "qwen") || strings.HasPrefix(id, "qvq"):
+ return "qwen"
+ case strings.HasPrefix(id, "doubao") || strings.HasPrefix(id, "seed-") || strings.HasPrefix(id, "seedream"):
+ return "doubao"
+ case strings.HasPrefix(id, "ernie") || strings.HasPrefix(id, "wenxin") || strings.HasPrefix(id, "qianfan"):
+ return "qianfan"
case strings.HasPrefix(id, "deepseek"):
return "deepseek"
case strings.HasPrefix(id, "minimax"):
diff --git a/internal/httpapi/assistant_models_test.go b/internal/httpapi/assistant_models_test.go
index 8baf4b6c..4e99c339 100644
--- a/internal/httpapi/assistant_models_test.go
+++ b/internal/httpapi/assistant_models_test.go
@@ -11,7 +11,7 @@ import (
func TestAssistantModelPickerOmitsCodeBuddyCLIDefault(t *testing.T) {
t.Setenv("AGENTFLOW_ASSISTANT_MODEL", "")
- t.Setenv("AGENTFLOW_ASSISTANT_MODELS", "model-a,model-b")
+ t.Setenv("AGENTFLOW_ASSISTANT_MODELS", "default-model,model-a,model-b")
h, user := workbenchFixture(t)
stubCLIModelDiscovery(t)
@@ -22,7 +22,7 @@ func TestAssistantModelPickerOmitsCodeBuddyCLIDefault(t *testing.T) {
t.Fatalf("model picker: %d %s", rec.Code, rec.Body)
}
if catalog.Default != assistantDefaultModel || len(catalog.DefaultEfforts) == 0 ||
- assistantCatalogLists(catalog, assistantDefaultModel) || !assistantCatalogLists(catalog, "model-b") {
+ assistantCatalogLists(catalog, assistantDefaultModel) || assistantCatalogLists(catalog, "default-model") || !assistantCatalogLists(catalog, "model-b") {
t.Fatalf("model picker shows the wrong choices: %+v", catalog)
}
if got := assistantAllowedModel("", h.chatCatalog(context.Background(), user)); got != assistantDefaultModel {
diff --git a/internal/httpapi/assistant_session.go b/internal/httpapi/assistant_session.go
index f091b5a4..719ef080 100644
--- a/internal/httpapi/assistant_session.go
+++ b/internal/httpapi/assistant_session.go
@@ -411,7 +411,8 @@ func (h *assistantHandlers) session(c *gin.Context) {
if engine == assistantEngineCodeBuddy {
editor, _, _ = h.assistantChatUser(editor)
}
- if err := validateAssistantEffort(c.Request.Context(), editor, model, conv.Effort); err != nil {
+ loginRunner := h.assistantLoginRunner(current.ID, conv.ExecutionTarget, engine)
+ if _, err := h.resolveAssistantTurnModel(c.Request.Context(), editor, model, conv.Effort, loginRunner); err != nil {
c.JSON(400, gin.H{"error": err.Error()})
return
}
diff --git a/internal/httpapi/assistant_sponsor_test.go b/internal/httpapi/assistant_sponsor_test.go
index 0adc9504..a460801c 100644
--- a/internal/httpapi/assistant_sponsor_test.go
+++ b/internal/httpapi/assistant_sponsor_test.go
@@ -340,11 +340,11 @@ func TestAssistantModelsPerExecutor(t *testing.T) {
}
for executor, family := range map[string]string{"codex": "gpt", "claude": "claude", "claude-code": "claude"} {
rec, catalog := get(executor)
- if rec.Code != 200 || catalog.Default != "default" || len(catalog.Models) < 2 || catalog.Models[0].ID != "default" {
+ if rec.Code != 200 || len(catalog.Models) < 2 || catalog.Default != catalog.Models[0].ID {
t.Fatalf("%s catalog: %d %s", executor, rec.Code, rec.Body.String())
}
for _, model := range catalog.Models {
- if model.Family != family {
+ if model.ID == "default" || model.Family != family {
t.Fatalf("%s model %s family = %q", executor, model.ID, model.Family)
}
if len(model.Efforts) == 0 {
@@ -355,6 +355,11 @@ func TestAssistantModelsPerExecutor(t *testing.T) {
t.Fatalf("%s must not offer the CodeBuddy sponsored model", executor)
}
}
+ for _, executor := range []string{"opencode", "pi"} {
+ if rec, catalog := get(executor); rec.Code != 200 || len(catalog.Models) != 0 || catalog.Default != "" {
+ t.Fatalf("%s without a configured catalog: %d %s", executor, rec.Code, rec.Body.String())
+ }
+ }
if rec, _ := get("bogus"); rec.Code != 400 || !strings.Contains(rec.Body.String(), "不支持的执行器") {
t.Fatalf("unknown executor: %d %s", rec.Code, rec.Body.String())
}
diff --git a/internal/httpapi/catalog_test.go b/internal/httpapi/catalog_test.go
index 768f3dd7..454d75b9 100644
--- a/internal/httpapi/catalog_test.go
+++ b/internal/httpapi/catalog_test.go
@@ -43,7 +43,7 @@ func TestPutAgentValidatesEffortLevel(t *testing.T) {
func TestExecutorModelsCatalogListsPerCLI(t *testing.T) {
t.Setenv("AGENTFLOW_ASSISTANT_MODEL", "")
- t.Setenv("AGENTFLOW_ASSISTANT_MODELS", "test-model")
+ t.Setenv("AGENTFLOW_ASSISTANT_MODELS", "fast-model,test-model")
s, err := repo.OpenTest()
if err != nil {
t.Fatal(err)
@@ -64,6 +64,9 @@ func TestExecutorModelsCatalogListsPerCLI(t *testing.T) {
t.Fatal("the CodeBuddy CLI default must not be listed as a model")
}
}
+ if cb.Models[0].ID != "fast-model" || cb.Models[0].Family != "codebuddy" {
+ t.Fatalf("CodeBuddy routing model = %+v", cb.Models[0])
+ }
codex := catalogs["codex"]
if len(codex.Models) < 2 || codex.Models[0].ID != "gpt-6.1-sol" || codex.Models[1].ID != "gpt-6.1-terra" || codex.Models[1].Name != "GPT-6.1 Terra" {
t.Fatalf("codex catalog = %+v", codex.Models)
@@ -818,7 +821,7 @@ func TestExecutorModelsCatalogUsesOnlyTheEditorsSavedModels(t *testing.T) {
CodexModels: []domain.CLIModel{{ID: "gateway/second", Name: "Second"}, {ID: "gateway/first"}},
ClaudeCodeModels: []domain.CLIModel{{ID: "custom-sonnet", Name: "Personal Sonnet"}},
AgentCLICredentials: map[string]domain.AgentCLICredential{
- "opencode": {Models: []domain.CLIModel{{ID: "open/model", Name: "Open Model"}}},
+ "opencode": {Models: []domain.CLIModel{{ID: "alibaba/qwen3.7-plus", Name: "Qwen3.7 Plus"}}},
},
}
if err := assistant.repo.PutUser(user); err != nil {
@@ -841,7 +844,7 @@ func TestExecutorModelsCatalogUsesOnlyTheEditorsSavedModels(t *testing.T) {
if models := catalogs["claude"].Models; len(models) != 1 || models[0].Name != "Personal Sonnet" {
t.Fatalf("Claude models = %+v", models)
}
- if models := catalogs["opencode"].Models; len(models) != 1 || models[0].Name != "Open Model" {
+ if models := catalogs["opencode"].Models; len(models) != 1 || models[0].Name != "Qwen3.7 Plus" || models[0].Family != "qwen" {
t.Fatalf("OpenCode models = %+v", models)
}
if !catalogs["codex"].CustomModel || len(catalogs["codex"].Efforts) == 0 {
diff --git a/internal/httpapi/cli_model_efforts_test.go b/internal/httpapi/cli_model_efforts_test.go
index 8f07a8f2..c135b0be 100644
--- a/internal/httpapi/cli_model_efforts_test.go
+++ b/internal/httpapi/cli_model_efforts_test.go
@@ -148,7 +148,7 @@ func TestAutomaticDiscoveryUsesSameEffortsForColdValidation(t *testing.T) {
t.Cleanup(gateway.Close)
ctx := context.Background()
user := domain.User{CodexAPIKey: "fixture-key", CodexBaseURL: gateway.URL}
- key := assistantDiscoveryKey(false, user.CodexAPIKey, user.CodexBaseURL)
+ key := assistantDiscoveryKey("", user.CodexAPIKey, user.CodexBaseURL)
t.Cleanup(func() { assistantDiscoveryCache.Delete(key) })
catalog, _ := assistantEngineModels(ctx, user, nil)
if !slices.ContainsFunc(catalog, func(model assistantModel) bool {
diff --git a/internal/httpapi/cli_models_probe.go b/internal/httpapi/cli_models_probe.go
index 29e3125e..195426d6 100644
--- a/internal/httpapi/cli_models_probe.go
+++ b/internal/httpapi/cli_models_probe.go
@@ -99,7 +99,7 @@ func (h *usersHandlers) probeCLIModels(c *gin.Context) {
defer cancel()
var models []domain.CLIModel
for _, id := range discoverCLIModels(ctx, environment, apiKey) {
- if id != assistantDefaultModel && assistantValidEngineModel(id) {
+ if !codeBuddyIsDefaultModel(id) && assistantValidEngineModel(id) {
models = append(models, domain.CLIModel{ID: id})
}
}
diff --git a/internal/httpapi/cli_models_probe_test.go b/internal/httpapi/cli_models_probe_test.go
index 447e1770..d2d6f70c 100644
--- a/internal/httpapi/cli_models_probe_test.go
+++ b/internal/httpapi/cli_models_probe_test.go
@@ -70,8 +70,61 @@ func TestDiscoverGeminiModelsKeepsGenerativeIDs(t *testing.T) {
}
}
+func TestAntigravityCatalogFollowsCredentialSource(t *testing.T) {
+ ctx := context.Background()
+ user := domain.User{AgentCLICredentials: map[string]domain.AgentCLICredential{
+ "agy": {APIKey: "fixture-key", Protocol: domain.AgentCLIProtocolGemini},
+ }}
+ builtin, _ := assistantEngineModels(ctx, user, nil)
+ for id, efforts := range map[string][]string{
+ "gemini-4-neon-high": {"low", "medium", "high", "xhigh"},
+ "gemini-4-carbon-medium": {"low", "medium", "high"},
+ "gemini-4-argon-medium": {"low", "medium", "high"},
+ "gemini-4-hydrogen-high": {"low", "medium", "high", "xhigh"},
+ } {
+ var found []string
+ for _, model := range builtin {
+ if model.ID == "agy:"+id {
+ found = model.Efforts
+ break
+ }
+ }
+ if !reflect.DeepEqual(found, efforts) {
+ t.Errorf("built-in %s efforts = %v, want %v", id, found, efforts)
+ }
+ }
+
+ service := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ switch {
+ case r.URL.Path == "/v1beta/models" && r.Header.Get("x-goog-api-key") == "fixture-key":
+ _, _ = io.WriteString(w, `{"models":[{"name":"models/gemini-gateway","displayName":"Gateway Gemini","supportedGenerationMethods":["generateContent"]}]}`)
+ case (r.URL.Path == "/models" || r.URL.Path == "/v1/models") && r.Header.Get("Authorization") == "Bearer fixture-key":
+ _, _ = io.WriteString(w, `{"data":[]}`)
+ default:
+ t.Errorf("unexpected Gemini catalog request: %s", r.URL.Path)
+ }
+ }))
+ t.Cleanup(service.Close)
+ cred := user.AgentCLICredentials["agy"]
+ cred.BaseURL = service.URL
+ user.AgentCLICredentials["agy"] = cred
+ custom, _ := assistantEngineModels(ctx, user, nil)
+ if len(custom) != 1 || custom[0].ID != "agy:gemini-gateway" {
+ t.Fatalf("custom endpoint models = %+v", custom)
+ }
+ cred.Protocol = domain.AgentCLIProtocolChat
+ user.AgentCLICredentials["agy"] = cred
+ if fallback, _ := assistantEngineModels(ctx, user, nil); len(fallback) != 0 {
+ t.Fatalf("an unavailable gateway offered native models: %+v", fallback)
+ }
+}
+
func TestCursorModelFamiliesFoldGemini4(t *testing.T) {
output := `
+gemini-4-neon-low - Gemini 4 Neon Low
+gemini-4-neon-medium - Gemini 4 Neon Medium
+gemini-4-neon-high - Gemini 4 Neon High
+gemini-4-neon-xhigh - Gemini 4 Neon Extra High
gemini-4-carbon-low - Gemini 4 Carbon Low
gemini-4-carbon-medium - Gemini 4 Carbon Medium
gemini-4-carbon-high - Gemini 4 Carbon High
@@ -85,6 +138,7 @@ gemini-4-argon-high - Gemini 4 Argon High
`
got := cursorModelFamilies(parseCursorModels(output))
want := []domain.CLIModel{
+ {ID: "gemini-4-neon", Name: "Gemini 4 Neon"},
{ID: "gemini-4-carbon", Name: "Gemini 4 Carbon"},
{ID: "gemini-4-hydrogen", Name: "Gemini 4 Hydrogen"},
{ID: "gemini-4-argon", Name: "Gemini 4 Argon"},
diff --git a/internal/httpapi/cursor_catalog_test.go b/internal/httpapi/cursor_catalog_test.go
index 7cc2e467..b41a6c63 100644
--- a/internal/httpapi/cursor_catalog_test.go
+++ b/internal/httpapi/cursor_catalog_test.go
@@ -22,6 +22,11 @@ widget-extra-high - Widget Extra High
nova-medium - Nova Medium (NO ZDR)
nova-high - Nova High (NO ZDR)
grok-5-code - Grok 5 Code
+cursor-grok-4.6-high - Grok 4.6 High
+muse-wonder-1.0-medium - Muse Wonder Medium
+muse-spark-1.3-high - Muse Spark 1.3 High
+composer-2.5 - Composer 2.5
+auto - Auto (default)
`
// TestCursorFamiliesSurviveRestart covers a family folded out of the CLI's
@@ -133,6 +138,18 @@ func TestCursorFamiliesSurviveRestart(t *testing.T) {
if got := names["cursor:nova"]; got.Name != "Nova (NO ZDR)" || !slices.Equal(got.Efforts, []string{"medium", "high"}) {
t.Fatalf("nova after restart: %+v", got)
}
+ for id, want := range map[string]string{
+ "cursor:grok-5-code": "grok",
+ "cursor:cursor-grok-4.6": "grok",
+ "cursor:muse-wonder-1.0": "muse",
+ "cursor:muse-spark-1.3": "muse",
+ "cursor:composer-2.5": "cursor",
+ "cursor:auto": "cursor",
+ } {
+ if got := names[id].Family; got != want {
+ t.Errorf("%s family = %q, want %q", id, got, want)
+ }
+ }
for _, c := range []struct {
user domain.User
diff --git a/internal/httpapi/executor_models.go b/internal/httpapi/executor_models.go
index 2939325d..c96344a3 100644
--- a/internal/httpapi/executor_models.go
+++ b/internal/httpapi/executor_models.go
@@ -14,6 +14,7 @@ import (
type executorModelInfo struct {
ID string `json:"id"`
Name string `json:"name"`
+ Family string `json:"family"`
Credits string `json:"credits,omitempty"`
Efforts []executorEffortOption `json:"efforts"`
}
@@ -157,9 +158,17 @@ func executorModelCatalogs(kimiBaseURL string) map[string]executorModelCatalog {
},
"agy": {
CustomModel: true,
+ // Slugs from agy models in Gemini API mode. Account-login models
+ // are queried from the user's runner because they vary by plan.
Models: []executorModelInfo{
{ID: "gemini-3.8-flash-medium", Name: "Gemini 3.8 Flash"},
+ {ID: "gemini-4-neon-high", Name: "Gemini 4 Neon"},
+ {ID: "gemini-4-carbon-medium", Name: "Gemini 4 Carbon"},
{ID: "gemini-4-argon-medium", Name: "Gemini 4 Argon"},
+ {ID: "gemini-4-hydrogen-high", Name: "Gemini 4 Hydrogen"},
+ {ID: "gemini-3.7-flash-medium", Name: "Gemini 3.7 Flash"},
+ {ID: "gemini-3.6-flash-medium", Name: "Gemini 3.6 Flash"},
+ {ID: "gemini-3.1-pro-high", Name: "Gemini 3.1 Pro"},
},
Efforts: effortOptions(domain.ExecutorEffortLevels["agy"]),
},
@@ -181,6 +190,7 @@ func executorModelCatalogs(kimiBaseURL string) map[string]executorModelCatalog {
}
for i := range catalog.Models {
id := catalog.Models[i].ID
+ catalog.Models[i].Family = assistantModelFamily(id, modelEngine)
if modelEngine != assistantEngineCodeBuddy {
id = modelEngine + ":" + id
}
@@ -216,6 +226,11 @@ func (h *catalogHandlers) executorModels(c *gin.Context) {
}
_, kimiBaseURL := assistantEngineCredential(user, runtime.AgentCLIKimi)
catalogs := executorModelCatalogs(kimiBaseURL)
+ if antigravityUsesCustomEndpoint(user) {
+ catalog := catalogs[runtime.AgentCLIAntigravity]
+ catalog.Models = []executorModelInfo{}
+ catalogs[runtime.AgentCLIAntigravity] = catalog
+ }
for _, engine := range append([]string{assistantEngineCodeBuddy}, assistantCLIEngines()...) {
models, _ := assistantDiscoveredModelsFor(c.Request.Context(), user, engine)
if len(models) == 0 {
@@ -230,7 +245,7 @@ func (h *catalogHandlers) executorModels(c *gin.Context) {
catalog.Models = make([]executorModelInfo, 0, len(models))
personal := cliModelsOf(models)
for _, model := range models {
- if engine == assistantEngineCodeBuddy && model.ID == assistantDefaultModel {
+ if model.ID == assistantDefaultModel || (engine == assistantEngineCodeBuddy && codeBuddyIsDefaultModel(model.ID)) {
continue
}
name := strings.TrimSpace(model.Name)
@@ -241,7 +256,12 @@ func (h *catalogHandlers) executorModels(c *gin.Context) {
if engine != assistantEngineCodeBuddy {
modelID = engine + ":" + modelID
}
- catalog.Models = append(catalog.Models, executorModelInfo{ID: model.ID, Name: name, Efforts: effortOptions(assistantModelEffortsForBaseURL(modelID, personal, kimiBaseURL))})
+ catalog.Models = append(catalog.Models, executorModelInfo{
+ ID: model.ID,
+ Name: name,
+ Family: assistantModelFamily(model.ID, engine),
+ Efforts: effortOptions(assistantModelEffortsForBaseURL(modelID, personal, kimiBaseURL)),
+ })
}
if len(catalog.Models) > 0 {
catalogs[id] = catalog
diff --git a/internal/httpapi/runner_models.go b/internal/httpapi/runner_models.go
index 729c522d..28103eda 100644
--- a/internal/httpapi/runner_models.go
+++ b/internal/httpapi/runner_models.go
@@ -5,10 +5,12 @@ import (
"encoding/json"
"fmt"
"net/http"
+ "slices"
"strings"
"time"
"agentflow/internal/domain"
+ "agentflow/internal/runtime"
"github.com/gin-gonic/gin"
)
@@ -31,6 +33,7 @@ func (h *runnersHandlers) probeRunnerModels(c *gin.Context) {
}
var req struct {
Provider string `json:"provider"`
+ UseSaved bool `json:"useSaved"`
}
if !decode(c, &req) {
return
@@ -40,35 +43,62 @@ func (h *runnersHandlers) probeRunnerModels(c *gin.Context) {
c.JSON(http.StatusConflict, cliModelProbeResult{Error: "请先为该 CLI 启用账号登录"})
return
}
- if runner.Status != domain.RunnerStatusOnline || !runner.SupportsProvider(provider) || h.runnerControls == nil {
- c.JSON(http.StatusServiceUnavailable, cliModelProbeResult{Error: "执行机器或所选 CLI 当前不可用"})
- return
+ var saved []domain.CLIModel
+ if provider == runtime.AgentCLIAntigravity && req.UseSaved {
+ stored, _ := h.repo.User(user.ID)
+ saved = assistantEngineCustomModels(stored, provider)
+ }
+ status, result := runnerLoginModelCatalog(c.Request.Context(), h.runnerControls, runner, provider, saved)
+ c.JSON(status, result)
+}
+
+func runnerLoginModelCatalog(ctx context.Context, controls *runnerControlHub, runner domain.Runner, provider string, saved []domain.CLIModel) (int, cliModelProbeResult) {
+ if models := runnerLoginModelsWithEfforts(provider, saved); len(models) > 0 {
+ return http.StatusOK, cliModelProbeResult{Models: models, Source: "saved"}
+ }
+ if runner.Status != domain.RunnerStatusOnline || !runner.SupportsProvider(provider) || controls == nil {
+ return http.StatusServiceUnavailable, cliModelProbeResult{Error: "执行机器或所选 CLI 当前不可用"}
}
if !runner.SupportsCLISettings() {
- c.JSON(http.StatusConflict, cliModelProbeResult{Error: fmt.Sprintf("获取账号模型需要 Runner %s 或以上版本", domain.RunnerVersionCLISettings)})
- return
+ return http.StatusConflict, cliModelProbeResult{Error: fmt.Sprintf("获取账号模型需要 Runner %s 或以上版本", domain.RunnerVersionCLISettings)}
}
- ctx, cancel := context.WithTimeout(c.Request.Context(), 20*time.Second)
+ ctx, cancel := context.WithTimeout(ctx, 20*time.Second)
defer cancel()
- response, err := h.runnerControls.requestWorkspace(ctx, runner.ID, domain.RunnerWorkspaceRequest{
+ response, err := controls.requestWorkspace(ctx, runner.ID, domain.RunnerWorkspaceRequest{
Operation: domain.RunnerWorkspaceOperationLoginModels, ModelProvider: provider,
})
if err != nil {
- c.JSON(http.StatusServiceUnavailable, cliModelProbeResult{Error: "无法连接执行机器,请稍后重试"})
- return
+ return http.StatusServiceUnavailable, cliModelProbeResult{Error: "无法连接执行机器,请稍后重试"}
}
if response.Error != "" {
- c.JSON(http.StatusBadGateway, cliModelProbeResult{Error: response.Error})
- return
+ return http.StatusBadGateway, cliModelProbeResult{Error: response.Error}
}
var models []domain.CLIModel
if err := json.Unmarshal(response.Payload, &models); err != nil {
- c.JSON(http.StatusBadGateway, cliModelProbeResult{Error: "执行机器返回了无效的模型列表"})
- return
+ return http.StatusBadGateway, cliModelProbeResult{Error: "执行机器返回了无效的模型列表"}
}
+ models = runnerLoginModelsWithEfforts(provider, models)
if len(models) == 0 {
- c.JSON(http.StatusOK, cliModelProbeResult{Error: "账号没有返回可用模型,可以手动添加模型"})
- return
+ return http.StatusOK, cliModelProbeResult{Error: "账号没有返回可用模型,可以手动添加模型"}
+ }
+ return http.StatusOK, cliModelProbeResult{Models: models, Source: "runner"}
+}
+
+func runnerLoginModelsWithEfforts(provider string, models []domain.CLIModel) []domain.CLIModel {
+ models = slices.DeleteFunc(slices.Clone(models), func(model domain.CLIModel) bool {
+ return model.ID == assistantDefaultModel || model.ID == provider+":"+assistantDefaultModel || !assistantValidEngineModel(model.ID)
+ })
+ if provider != runtime.AgentCLIAntigravity {
+ return cliModelsWithEfforts(provider, models, "")
+ }
+ models = runtime.FoldAgyAccountModels(models)
+ for i, model := range models {
+ levels := append([]string{}, assistantModelEffortsInCatalog(provider+":"+model.ID, models, true)...)
+ if model.ReasoningEfforts != nil {
+ models[i].ReasoningEfforts = &levels
+ } else {
+ models[i].DiscoveredReasoningEfforts = &levels
+ }
}
- c.JSON(http.StatusOK, cliModelProbeResult{Models: cliModelsWithEfforts(provider, models, ""), Source: "runner"})
+ return models
}
diff --git a/internal/httpapi/runner_models_test.go b/internal/httpapi/runner_models_test.go
index 65071e6e..fbc65ceb 100644
--- a/internal/httpapi/runner_models_test.go
+++ b/internal/httpapi/runner_models_test.go
@@ -2,11 +2,18 @@ package httpapi
import (
"bytes"
+ "context"
+ "encoding/json"
+ "maps"
"net/http"
"net/http/httptest"
+ "slices"
+ "strings"
"testing"
"agentflow/internal/domain"
+ "agentflow/internal/repo"
+ "agentflow/internal/runtime"
"github.com/gin-gonic/gin"
)
@@ -48,11 +55,203 @@ func TestRunnerModelProbeUsesOwnersSelectedMachine(t *testing.T) {
c, w := probe(owner, "codex")
done := make(chan struct{})
go func() { handlers.probeRunnerModels(c); close(done) }()
- request := answerOnce(t, hub, conn, domain.RunnerWorkspaceResponse{Status: 200, Payload: []byte(`[{"id":"runner-model"}]`)})
+ request := answerOnce(t, hub, conn, domain.RunnerWorkspaceResponse{Status: 200, Payload: []byte(`[
+ {"id":"default","name":"Default (recommended)"},
+ {"id":"runner-model","discoveredReasoningEfforts":["xhigh","unsupported"]}
+ ]`)})
<-done
response := w.Result()
if request.Operation != domain.RunnerWorkspaceOperationLoginModels || request.ModelProvider != "codex" ||
response.StatusCode != http.StatusOK || response.Header.Get("Cache-Control") != "private, no-store" {
t.Fatalf("request=%+v response=%+v", request, response)
}
+ var catalog cliModelProbeResult
+ if err := json.Unmarshal(w.Body.Bytes(), &catalog); err != nil || len(catalog.Models) != 1 || catalog.Models[0].ID != "runner-model" {
+ t.Fatalf("unexpected selectable models: %s (decode %v)", w.Body, err)
+ }
+ if got := catalog.Models[0].DiscoveredReasoningEfforts; got == nil || !slices.Equal(*got, []string{"xhigh"}) {
+ t.Fatalf("runner metadata was not preserved and constrained: %s", w.Body)
+ }
+}
+
+func TestAntigravityRunnerModelProbeGroupsAdvertisedEfforts(t *testing.T) {
+ h, owner := workbenchFixture(t)
+ provider := runtime.AgentCLIAntigravity
+ row := domain.Runner{
+ ID: "agy-models", OwnerUserID: owner.ID, Status: domain.RunnerStatusOnline, RunnerVersion: domain.RunnerVersionCLISettings,
+ Runtimes: []domain.RunnerRuntime{{Provider: provider, AuthMode: domain.RuntimeAuthLocal}},
+ }
+ if err := h.repo.PutRunner(row); err != nil {
+ t.Fatal(err)
+ }
+ hub := quietRunnerHub()
+ conn := testRunnerConn(row.ID)
+ registerTestConn(hub, conn)
+ t.Cleanup(conn.close)
+ handlers := &runnersHandlers{deps: h.deps, runnerControls: hub}
+ probe := func(body string) (*gin.Context, *httptest.ResponseRecorder) {
+ c, w := workbenchContext(owner, http.MethodPost, "/", bytes.NewBufferString(body))
+ c.Params = gin.Params{{Key: "id", Value: row.ID}}
+ return c, w
+ }
+
+ payload := []byte(`[
+ {"id":"claude-opus-5-5-low","name":"Claude Opus 5.5 (Low)"},
+ {"id":"claude-opus-5-5-medium","name":"Claude Opus 5.5 (Medium)"},
+ {"id":"claude-opus-5-5-high","name":"Claude Opus 5.5 (High)"},
+ {"id":"claude-sonnet-5-5-high","name":"Claude Sonnet 5.5 (High)"},
+ {"id":"claude-sonnet-5-5-max","name":"Claude Sonnet 5.5 (Max)"}
+ ]`)
+ check := func(w *httptest.ResponseRecorder, source string) {
+ t.Helper()
+ var result cliModelProbeResult
+ if err := json.Unmarshal(w.Body.Bytes(), &result); err != nil || w.Code != http.StatusOK || result.Source != source || len(result.Models) != 2 {
+ t.Fatalf("probe returned %d: %s (decode %v)", w.Code, w.Body, err)
+ }
+ opus, sonnet := result.Models[0], result.Models[1]
+ if opus.ID != "claude-opus-5-5-medium" || opus.Name != "Claude Opus 5.5" || opus.DefaultEffort != "medium" ||
+ opus.DiscoveredReasoningEfforts == nil || !slices.Equal(*opus.DiscoveredReasoningEfforts, []string{"low", "medium", "high"}) ||
+ !maps.Equal(opus.Efforts, map[string]string{"low": "claude-opus-5-5-low", "medium": "claude-opus-5-5-medium", "high": "claude-opus-5-5-high"}) {
+ t.Errorf("unexpected Opus family: %+v", opus)
+ }
+ if sonnet.ID != "claude-sonnet-5-5-high" || sonnet.Name != "Claude Sonnet 5.5" || sonnet.DefaultEffort != "high" ||
+ sonnet.DiscoveredReasoningEfforts == nil || !slices.Equal(*sonnet.DiscoveredReasoningEfforts, []string{"high", "max"}) {
+ t.Errorf("unexpected Sonnet family: %+v", sonnet)
+ }
+ }
+ c, w := probe(`{"provider":"agy","useSaved":true}`)
+ done := make(chan struct{})
+ go func() { handlers.probeRunnerModels(c); close(done) }()
+ request := answerOnce(t, hub, conn, domain.RunnerWorkspaceResponse{Status: 200, Payload: payload})
+ <-done
+ if request.ModelProvider != provider {
+ t.Fatalf("unexpected runner request: %+v", request)
+ }
+ check(w, "runner")
+
+ var existing []domain.CLIModel
+ if err := json.Unmarshal(payload, &existing); err != nil {
+ t.Fatal(err)
+ }
+ owner, err := h.repo.UpdateUserCredentials(owner.ID, repo.UserCredentialUpdate{
+ AgentCLICredentials: map[string]repo.AgentCLICredentialUpdate{provider: {Models: &existing}},
+ })
+ if err != nil {
+ t.Fatal(err)
+ }
+ row.Status = domain.RunnerStatusOffline
+ if err := h.repo.PutRunner(row); err != nil {
+ t.Fatal(err)
+ }
+ c, w = probe(`{"provider":"agy","useSaved":true}`)
+ handlers.probeRunnerModels(c)
+ check(w, "saved")
+
+ ctx := context.Background()
+ const model = "agy:claude-opus-5-5-medium"
+ if got, err := h.resolveAssistantTurnModel(ctx, owner, model, "high", row); err != nil || got != "agy:claude-opus-5-5-high" {
+ t.Errorf("advertised effort did not resolve to the runner variant: %q %v", got, err)
+ }
+ if _, err := h.resolveAssistantTurnModel(ctx, owner, model, "max", row); err == nil {
+ t.Error("unadvertised effort accepted")
+ }
+ if err := validateAssistantEffort(ctx, owner, model, "high"); err == nil {
+ t.Error("account-only effort accepted for API key execution")
+ }
+}
+
+func TestAntigravityGenerationUsesLiveRunnerCatalog(t *testing.T) {
+ h, owner := workbenchFixture(t)
+ h.generate = func(context.Context, string, domain.User) (string, error) { return "test reply", nil }
+ runner := domain.Runner{
+ ID: "agy-live", OwnerUserID: owner.ID, Status: domain.RunnerStatusOnline, RunnerVersion: domain.RunnerVersionCLISettings,
+ Runtimes: []domain.RunnerRuntime{{Provider: runtime.AgentCLIAntigravity, AuthMode: domain.RuntimeAuthLocal}},
+ }
+ if err := h.repo.PutRunner(runner); err != nil {
+ t.Fatal(err)
+ }
+ hub := quietRunnerHub()
+ h.runnerControls = hub
+ conn := testRunnerConn(runner.ID)
+ registerTestConn(hub, conn)
+ defer conn.close()
+ go func() {
+ for {
+ select {
+ case <-conn.done:
+ return
+ case msg := <-conn.send:
+ if msg.WorkspaceRequest != nil && msg.WorkspaceRequest.Operation == domain.RunnerWorkspaceOperationLoginModels {
+ hub.resolveWorkspace(msg.RequestID, domain.RunnerWorkspaceResponse{Status: 200, Payload: []byte(`[
+ {"id":"gemini-3.8-flash-low"}, {"id":"gemini-3.8-flash-medium"}
+ ]`)})
+ }
+ }
+ }
+ }()
+ probe := &runnersHandlers{deps: h.deps, runnerControls: hub}
+ c, w := workbenchContext(owner, http.MethodPost, "/", bytes.NewBufferString(`{"provider":"agy","useSaved":true}`))
+ c.Params = gin.Params{{Key: "id", Value: runner.ID}}
+ probe.probeRunnerModels(c)
+ var catalog cliModelProbeResult
+ if err := json.Unmarshal(w.Body.Bytes(), &catalog); err != nil || w.Code != http.StatusOK || catalog.Source != "runner" || len(catalog.Models) != 1 {
+ t.Fatalf("probe returned %d: %s (decode %v)", w.Code, w.Body, err)
+ }
+ if levels := catalog.Models[0].DiscoveredReasoningEfforts; levels == nil || !slices.Equal(*levels, []string{"low", "medium"}) {
+ t.Fatalf("unexpected runner model: %+v", catalog.Models[0])
+ }
+
+ request := assistantRequest{
+ SessionID: "agy-live-turn", Model: "agy:" + catalog.Models[0].ID, Effort: "high",
+ ExecutionTarget: &domain.AssistantExecutionTarget{Pool: domain.ExecutionModeRunner, RunnerID: runner.ID},
+ Messages: []assistantMessage{{Role: "user", Content: "hello"}},
+ }
+ body, err := json.Marshal(request)
+ if err != nil {
+ t.Fatal(err)
+ }
+ c, w = workbenchContext(owner, http.MethodPost, "/api/assistant/generations", bytes.NewBuffer(body))
+ h.startGeneration(c)
+ if w.Code != http.StatusBadRequest || !strings.Contains(w.Body.String(), "可选:默认、low、medium") {
+ t.Fatalf("unadvertised effort returned %d: %s", w.Code, w.Body)
+ }
+ resolved, err := h.resolveAssistantTurnModel(t.Context(), owner, request.Model, "medium", runner)
+ if err != nil || resolved != "agy:gemini-3.8-flash-medium" {
+ t.Fatalf("advertised effort did not resolve to the runner variant: %q %v", resolved, err)
+ }
+ provider, modelID := assistantModelEngine(resolved)
+ command := runtime.AgentCLICommand(provider, runtime.AgentCLICommandOptions{Model: modelID, Effort: "medium", RunnerLogin: true})
+ if i := slices.Index(command.Argv, "--model"); i < 0 || i+1 == len(command.Argv) || command.Argv[i+1] != "gemini-3.8-flash-medium" {
+ t.Fatalf("command did not use the advertised model ID: %v", command.Argv)
+ }
+
+ legacy := domain.AssistantSession{
+ ID: "agy-live-legacy", Executor: runtime.AgentCLIAntigravity, Model: "agy:gemini-3.8-flash-high",
+ ExecutionTarget: request.ExecutionTarget,
+ Messages: []domain.AssistantMessage{
+ {Role: "user", Content: "first message"},
+ {Role: "assistant", Content: "first reply", Model: "agy:gemini-3.8-flash-high"},
+ },
+ }
+ if err := h.repo.PutAssistantSession(owner.ID, legacy); err != nil {
+ t.Fatal(err)
+ }
+ legacy, _ = h.repo.AssistantSession(owner.ID, legacy.ID)
+ request.SessionID, request.Model, request.Effort = legacy.ID, legacy.Model, ""
+ request.Messages = append(legacy.Messages, assistantMessage{Role: "user", Content: "continue"})
+ body, err = json.Marshal(request)
+ if err != nil {
+ t.Fatal(err)
+ }
+ c, w = workbenchContext(owner, http.MethodPost, "/api/assistant/generations", bytes.NewBuffer(body))
+ h.startGeneration(c)
+ if w.Code != http.StatusBadRequest || !strings.Contains(w.Body.String(), "请重新选择模型") {
+ t.Fatalf("retired legacy variant returned %d: %s", w.Code, w.Body)
+ }
+ if _, created := h.repo.AssistantGeneration(owner.ID, legacy.ID); created {
+ t.Fatal("retired legacy variant created a generation")
+ }
+ if got, err := h.resolveAssistantTurnModel(t.Context(), owner, "agy:gemini-3.8-flash-medium", "", runner); err != nil || got != "agy:gemini-3.8-flash-medium" {
+ t.Fatalf("available legacy variant was not preserved: %q %v", got, err)
+ }
}
diff --git a/internal/runner/daemon.go b/internal/runner/daemon.go
index d5cde58e..f3c8c169 100644
--- a/internal/runner/daemon.go
+++ b/internal/runner/daemon.go
@@ -859,8 +859,12 @@ func (d *Daemon) executeInvocation(ctx context.Context, task domain.RunnerTask)
Agent: inv.Agent,
Assets: boundAssets,
Prompt: task.Prompt,
- Options: runtime.InvocationOptions{RunID: inv.RunID, NodeID: inv.NodeID, ResumeSessionID: inv.ResumeSessionID, GateResultPath: inv.GateResultPath, Repositories: invocationRepositoryContexts(inv), BrowserMCP: browserMCP},
- Driver: driver,
+ Options: runtime.InvocationOptions{
+ RunID: inv.RunID, NodeID: inv.NodeID, ResumeSessionID: inv.ResumeSessionID,
+ GateResultPath: inv.GateResultPath, Repositories: invocationRepositoryContexts(inv),
+ BrowserMCP: browserMCP, RunnerLogin: inv.CredentialSource == domain.RuntimeAuthLocal,
+ },
+ Driver: driver,
})
if err != nil {
return execResult{status: domain.RunnerTaskFailed, errMsg: fmt.Sprintf("prepare invocation: %v", err)}, nil
diff --git a/internal/runtime/agent_cli_test.go b/internal/runtime/agent_cli_test.go
index c5f6f25b..c518421d 100644
--- a/internal/runtime/agent_cli_test.go
+++ b/internal/runtime/agent_cli_test.go
@@ -102,14 +102,24 @@ func TestKimiThinkingConfiguration(t *testing.T) {
}
func TestAgentCLICommandAgyEffortSuffix(t *testing.T) {
- for _, tc := range []struct{ model, effort, want string }{
- {"gemini-3.8-flash-medium", "low", "gemini-3.8-flash-low"},
- {"gemini-3.8-flash-medium", "", "gemini-3.8-flash-medium"},
- {"gemini-3.8-flash", "low", "gemini-3.8-flash"},
- {"gemini-4-argon-xhigh", "max", "gemini-4-argon-max"},
- {"gateway-model", "low", "gateway-model"},
+ for _, tc := range []struct {
+ model, effort, want string
+ runnerLogin bool
+ }{
+ {"gemini-3.8-flash-medium", "low", "gemini-3.8-flash-low", false},
+ {"gemini-3.8-flash-medium", "", "gemini-3.8-flash-medium", false},
+ {"gemini-3.8-flash", "low", "gemini-3.8-flash", false},
+ {"gemini-4-argon-xhigh", "max", "gemini-4-argon-max", false},
+ {"gateway-model", "low", "gateway-model", false},
+ {"claude-opus-5-5-medium", "high", "claude-opus-5-5-high", true},
+ {"claude-sonnet-5-5-medium", "low", "claude-sonnet-5-5-low", true},
+ {"claude-sonnet-5-5-medium", "", "claude-sonnet-5-5-medium", true},
+ {"claude-opus-5-5-high", "", "claude-opus-5-5-high", true},
+ {"claude-opus-5-5-medium", "high", "claude-opus-5-5-medium", false},
} {
- argv := AgentCLICommand(AgentCLIAntigravity, AgentCLICommandOptions{Model: tc.model, Effort: tc.effort, Prompt: "p"}).Argv
+ argv := AgentCLICommand(AgentCLIAntigravity, AgentCLICommandOptions{
+ Model: tc.model, Effort: tc.effort, Prompt: "p", RunnerLogin: tc.runnerLogin,
+ }).Argv
if i := slices.Index(argv, "--model"); i < 0 || argv[i+1] != tc.want {
t.Errorf("%s at %q: %q", tc.model, tc.effort, argv)
}
diff --git a/internal/runtime/agy_models.go b/internal/runtime/agy_models.go
new file mode 100644
index 00000000..298eae0f
--- /dev/null
+++ b/internal/runtime/agy_models.go
@@ -0,0 +1,90 @@
+package runtime
+
+import (
+ "slices"
+ "strings"
+
+ "agentflow/internal/domain"
+)
+
+// SplitAgyModelEffort separates an Antigravity model ID's recognized effort suffix.
+func SplitAgyModelEffort(model string) (base, effort string) {
+ for _, level := range domain.ExecutorEffortLevels[AgentCLIAntigravity] {
+ if base, ok := strings.CutSuffix(model, "-"+level); ok {
+ return base, level
+ }
+ }
+ return model, ""
+}
+
+func agyClaudeFamily(model string) string {
+ base, _ := SplitAgyModelEffort(model)
+ switch base {
+ case "claude-opus-5-5", "claude-sonnet-5-5":
+ return base
+ }
+ return ""
+}
+
+// AgyAccountModelEfforts includes the Claude variants exposed by account login.
+func AgyAccountModelEfforts(model string) []string {
+ if agyClaudeFamily(model) != "" {
+ return []string{"low", "medium", "high", "max"}
+ }
+ return AgyModelEfforts(model)
+}
+
+// FoldAgyAccountModels keeps an advertised model ID for the default and
+// carries the actual variant IDs and levels returned by this account.
+func FoldAgyAccountModels(models []domain.CLIModel) []domain.CLIModel {
+ out := make([]domain.CLIModel, 0, len(models))
+ groups := make(map[string]int)
+ for _, model := range models {
+ base, effort := SplitAgyModelEffort(model.ID)
+ levels := AgyAccountModelEfforts(base)
+ if !slices.Contains(levels, effort) {
+ out = append(out, model)
+ continue
+ }
+ index, exists := groups[base]
+ if !exists {
+ index = len(out)
+ groups[base] = index
+ name := model.Name
+ if suffix := " (" + effort + ")"; strings.HasSuffix(strings.ToLower(name), suffix) {
+ name = name[:len(name)-len(suffix)]
+ }
+ if name == "" {
+ name = base
+ }
+ out = append(out, domain.CLIModel{
+ ID: model.ID, Name: name, DefaultEffort: effort,
+ Efforts: make(map[string]string), ReasoningEfforts: model.ReasoningEfforts,
+ })
+ }
+ group := &out[index]
+ group.Efforts[effort] = model.ID
+ for _, level := range levels {
+ if id := model.Efforts[level]; id == base+"-"+level {
+ group.Efforts[level] = id
+ }
+ }
+ if agyClaudeFamily(base) != "" && effort == "medium" {
+ group.ReasoningEfforts = model.ReasoningEfforts
+ }
+ }
+ for base, index := range groups {
+ row := &out[index]
+ if agyClaudeFamily(base) != "" && row.Efforts["medium"] != "" {
+ row.ID, row.DefaultEffort = row.Efforts["medium"], "medium"
+ }
+ levels := []string{}
+ for _, level := range AgyAccountModelEfforts(base) {
+ if row.Efforts[level] != "" {
+ levels = append(levels, level)
+ }
+ }
+ row.DiscoveredReasoningEfforts = &levels
+ }
+ return out
+}
diff --git a/internal/runtime/conversation_login_models.go b/internal/runtime/conversation_login_models.go
index e4d19e28..05803e53 100644
--- a/internal/runtime/conversation_login_models.go
+++ b/internal/runtime/conversation_login_models.go
@@ -155,6 +155,9 @@ func codexLoginModels(send *json.Encoder, scanner *bufio.Scanner) []domain.CLIMo
Data []struct {
Model string `json:"model"`
DisplayName string `json:"displayName"`
+ Efforts *[]struct {
+ Value string `json:"reasoningEffort"`
+ } `json:"supportedReasoningEfforts"`
} `json:"data"`
}
if json.Unmarshal(codexLoginResult(scanner, 3), &result) != nil || result.Data == nil {
@@ -163,7 +166,15 @@ func codexLoginModels(send *json.Encoder, scanner *bufio.Scanner) []domain.CLIMo
models := make([]domain.CLIModel, 0, len(result.Data))
for _, item := range result.Data {
if id := strings.TrimSpace(item.Model); id != "" {
- models = append(models, domain.CLIModel{ID: id, Name: item.DisplayName})
+ model := domain.CLIModel{ID: id, Name: item.DisplayName}
+ if item.Efforts != nil {
+ levels := make([]string, 0, len(*item.Efforts))
+ for _, level := range *item.Efforts {
+ levels = append(levels, level.Value)
+ }
+ model.DiscoveredReasoningEfforts = &levels
+ }
+ models = append(models, model)
}
}
return models
@@ -198,8 +209,10 @@ func claudeLoginModels(send *json.Encoder, scanner *bufio.Scanner) []domain.CLIM
Subtype string `json:"subtype"`
Response struct {
Models []struct {
- Value string `json:"value"`
- DisplayName string `json:"displayName"`
+ Value string `json:"value"`
+ DisplayName string `json:"displayName"`
+ SupportsEffort *bool `json:"supportsEffort"`
+ EffortLevels *[]string `json:"supportedEffortLevels"`
} `json:"models"`
} `json:"response"`
} `json:"response"`
@@ -213,7 +226,11 @@ func claudeLoginModels(send *json.Encoder, scanner *bufio.Scanner) []domain.CLIM
models := make([]domain.CLIModel, 0, len(message.Response.Response.Models))
for _, item := range message.Response.Response.Models {
if id := strings.TrimSpace(item.Value); id != "" {
- models = append(models, domain.CLIModel{ID: id, Name: item.DisplayName})
+ levels := item.EffortLevels
+ if item.SupportsEffort != nil && !*item.SupportsEffort {
+ levels = &[]string{}
+ }
+ models = append(models, domain.CLIModel{ID: id, Name: item.DisplayName, DiscoveredReasoningEfforts: levels})
}
}
return models
diff --git a/internal/runtime/conversation_login_models_test.go b/internal/runtime/conversation_login_models_test.go
index acd61bf3..dfa9193f 100644
--- a/internal/runtime/conversation_login_models_test.go
+++ b/internal/runtime/conversation_login_models_test.go
@@ -4,6 +4,7 @@ import (
"context"
"os"
"path/filepath"
+ "slices"
"strings"
"testing"
)
@@ -22,7 +23,7 @@ read -r request; case "$request" in *'"method":"initialized"'*) ;; *) exit 3 ;;
read -r request; case "$request" in *'"method":"account/read"'*) ;; *) exit 4 ;; esac
printf '%s\n' '{"id":2,"result":{"account":{"email":"[email protected]"}}}'
read -r request; case "$request" in *'"method":"model/list"'*) ;; *) exit 5 ;; esac
-printf '%s\n' '{"id":3,"result":{"data":[{"id":"display-alias","model":"fixture-model","displayName":"Fixture Model"}]}}'
+printf '%s\n' '{"id":3,"result":{"data":[{"id":"display-alias","model":"fixture-model","displayName":"Fixture Model","supportedReasoningEfforts":[{"reasoningEffort":"high"},{"reasoningEffort":"xhigh"}]},{"model":"legacy"},{"model":"no-effort","supportedReasoningEfforts":[]}]}}'
`},
{"claude-code", "CLAUDE_CONFIG_DIR", ".credentials.json", `
test -z "${ANTHROPIC_API_KEY:-}"
@@ -32,7 +33,7 @@ if [ "$1" = auth ] && [ "$2" = status ]; then
exit
fi
read -r request; case "$request" in *'"subtype":"initialize"'*) ;; *) exit 2 ;; esac
-printf '%s\n' '{"type":"control_response","response":{"subtype":"success","request_id":"loopforge-models","response":{"models":[{"value":"fixture-model","displayName":"Fixture Model"}]}}}'
+printf '%s\n' '{"type":"control_response","response":{"subtype":"success","request_id":"loopforge-models","response":{"models":[{"value":"fixture-model","displayName":"Fixture Model","supportsEffort":true,"supportedEffortLevels":["high","xhigh"]},{"value":"legacy"},{"value":"no-effort","supportsEffort":false}]}}}'
`},
}
for _, tc := range tests {
@@ -52,9 +53,15 @@ printf '%s\n' '{"type":"control_response","response":{"subtype":"success","reque
t.Fatal(err)
}
models, err := DiscoverRunnerLoginModels(context.Background(), tc.provider, bin)
- if err != nil || len(models) != 1 || models[0].ID != "fixture-model" || models[0].Name != "Fixture Model" {
+ if err != nil || len(models) != 3 || models[0].ID != "fixture-model" || models[0].Name != "Fixture Model" {
t.Fatalf("models=%+v error=%v", models, err)
}
+ if got := models[0].DiscoveredReasoningEfforts; got == nil || !slices.Equal(*got, []string{"high", "xhigh"}) {
+ t.Fatalf("native effort levels were not preserved: %v", got)
+ }
+ if legacy, noEffort := models[1].DiscoveredReasoningEfforts, models[2].DiscoveredReasoningEfforts; legacy != nil || noEffort == nil || len(*noEffort) > 0 {
+ t.Fatalf("omitted and empty capability metadata must stay distinct: legacy=%v no effort=%v", legacy, noEffort)
+ }
if dirs, err := os.ReadDir(isolated); err != nil || len(dirs) != 0 {
t.Fatalf("lookup left its credential directory behind: %v %v", dirs, err)
}
diff --git a/internal/runtime/cursor_models.go b/internal/runtime/cursor_models.go
index 2a7cfa46..aee25655 100644
--- a/internal/runtime/cursor_models.go
+++ b/internal/runtime/cursor_models.go
@@ -83,6 +83,7 @@ var cursorModels = []CursorModel{
{ID: "gpt-5.2-fast", Name: "GPT-5.2 Fast", Default: "medium", Variants: map[string]string{"low": "gpt-5.2-low-fast", "medium": "gpt-5.2-fast", "high": "gpt-5.2-high-fast", "xhigh": "gpt-5.2-xhigh-fast"}},
{ID: "gpt-5.1", Name: "GPT-5.1", Default: "medium", Variants: map[string]string{"low": "gpt-5.1-low", "medium": "gpt-5.1", "high": "gpt-5.1-high"}},
{ID: "gpt-5-mini", Name: "GPT-5 Mini", Default: "", Variants: map[string]string{"": "gpt-5-mini"}},
+ {ID: "gemini-4-neon", Name: "Gemini 4 Neon", Default: "medium", Variants: map[string]string{"low": "gemini-4-neon-low", "medium": "gemini-4-neon-medium", "high": "gemini-4-neon-high", "xhigh": "gemini-4-neon-xhigh"}},
{ID: "gemini-4-carbon", Name: "Gemini 4 Carbon", Default: "medium", Variants: map[string]string{"low": "gemini-4-carbon-low", "medium": "gemini-4-carbon-medium", "high": "gemini-4-carbon-high"}},
{ID: "gemini-4-hydrogen", Name: "Gemini 4 Hydrogen", Default: "medium", Variants: map[string]string{"low": "gemini-4-hydrogen-low", "medium": "gemini-4-hydrogen-medium", "high": "gemini-4-hydrogen-high", "xhigh": "gemini-4-hydrogen-xhigh"}},
{ID: "gemini-4-argon", Name: "Gemini 4 Argon", Default: "medium", Variants: map[string]string{"low": "gemini-4-argon-low", "medium": "gemini-4-argon-medium", "high": "gemini-4-argon-high"}},
diff --git a/internal/runtime/cursor_models_test.go b/internal/runtime/cursor_models_test.go
index 00c99721..995e760d 100644
--- a/internal/runtime/cursor_models_test.go
+++ b/internal/runtime/cursor_models_test.go
@@ -43,6 +43,8 @@ func TestCursorModelID(t *testing.T) {
{"gemini-4-argon", "max", "gemini-4-argon-high"},
{"composer-2.5", "high", "composer-2.5"},
{"auto", "", "auto"},
+ {"gemini-4-neon", "", "gemini-4-neon-medium"},
+ {"gemini-4-neon", "xhigh", "gemini-4-neon-xhigh"},
{"gemini-4-carbon", "", "gemini-4-carbon-medium"},
{"gemini-4-carbon", "high", "gemini-4-carbon-high"},
{"gemini-4-hydrogen", "xhigh", "gemini-4-hydrogen-xhigh"},
@@ -62,6 +64,9 @@ func TestCursorModelID(t *testing.T) {
if got := CursorModelEfforts("kimi-k3", nil); !slices.Equal(got, []string{"low", "high", "max"}) {
t.Errorf("kimi-k3 efforts: %v", got)
}
+ if got := CursorModelEfforts("gemini-4-neon", nil); !slices.Equal(got, []string{"low", "medium", "high", "xhigh"}) {
+ t.Errorf("Gemini 4 Neon efforts: %v", got)
+ }
if got := CursorModelEfforts("composer-2.5", nil); got != nil {
t.Errorf("composer efforts: %v", got)
}
diff --git a/internal/runtime/provider_agentcli.go b/internal/runtime/provider_agentcli.go
index 372419aa..600d4a64 100644
--- a/internal/runtime/provider_agentcli.go
+++ b/internal/runtime/provider_agentcli.go
@@ -5,6 +5,7 @@ import (
"encoding/hex"
"os"
"path/filepath"
+ "slices"
"strings"
"agentflow/internal/domain"
@@ -73,6 +74,7 @@ func (p agentCLIProvider) Prepare(in providerInvocation) (CommandSpec, error) {
Binary: in.Executor.Binary, Model: in.Executor.Model, Effort: in.Executor.Effort,
Resume: in.Options.ResumeSessionID, Prompt: positionalPrompt(in),
SystemPrompt: in.Compiled.SystemPrompt, SystemPromptFile: systemFile, Extra: in.Executor.Args,
+ RunnerLogin: in.Options.RunnerLogin,
})
command.CredentialBindings = []CredentialBinding{BindAgentCLI, BindGit, BindMCP}
command.PrivateHome = true
@@ -93,8 +95,9 @@ type AgentCLICommandOptions struct {
// Chat runs the CLI for AI 对话 on the control plane: MCP tools stay
// available, shell, file writes and web access do not. The MCP
// configuration (WriteAgentCLIMCPConfig ReadOnly) completes the policy.
- Chat bool
- Workspace bool
+ Chat bool
+ Workspace bool
+ RunnerLogin bool
// AgentFile is Kimi Code's chat agent definition (WriteKimiChatAgent).
AgentFile string
}
@@ -151,6 +154,9 @@ func AgentCLICommand(kind string, o AgentCLICommandOptions) CommandSpec {
// Chat deny rules travel as --settings (ApplyAgentCLICredential);
// they hold even with --dangerously-skip-permissions.
argv = []string{binary, "--output-format", "stream-json", "--dangerously-skip-permissions", "--disable-slash-commands"}
+ if family := agyClaudeFamily(model); o.RunnerLogin && family != "" && slices.Contains(AgyAccountModelEfforts(family), effort) {
+ model, effort = family+"-"+effort, ""
+ }
if model != "" && AgyModelEfforts(model) == nil {
effort = ""
}
@@ -226,11 +232,18 @@ func AgentCLICommand(kind string, o AgentCLICommandOptions) CommandSpec {
return CommandSpec{Argv: argv, Provider: kind, AgentCLI: options}
}
-// AgyModelEfforts lists the efforts agy accepts for a model, weakest first.
-// Only its Gemini models take --effort; agy rejects the flag for any other
-// model a Base URL serves ("--effort is not supported for model …").
+// AgyModelEfforts returns the separate effort choices for Gemini API models.
func AgyModelEfforts(model string) []string {
- if strings.HasPrefix(strings.TrimSpace(model), "gemini-") {
+ model, _ = SplitAgyModelEffort(strings.TrimSpace(model))
+ switch model {
+ case "gemini-4-neon", "gemini-4-hydrogen":
+ return []string{"low", "medium", "high", "xhigh"}
+ case "gemini-4-carbon", "gemini-4-argon", "gemini-3.8-flash", "gemini-3.7-flash", "gemini-3.6-flash":
+ return []string{"low", "medium", "high"}
+ case "gemini-3.1-pro", "gemini-3.1-pro-preview":
+ return []string{"low", "high"}
+ }
+ if strings.HasPrefix(model, "gemini-") && !strings.HasPrefix(model, "gemini-pro-orchestrator") {
return domain.ExecutorEffortLevels[AgentCLIAntigravity]
}
return nil
@@ -243,10 +256,8 @@ func agyModelForEffort(model, effort string) string {
if effort == "" {
return model
}
- for _, level := range domain.ExecutorEffortLevels[AgentCLIAntigravity] {
- if base, ok := strings.CutSuffix(model, "-"+level); ok {
- return base + "-" + effort
- }
+ if base, existing := SplitAgyModelEffort(model); existing != "" {
+ return base + "-" + effort
}
return model
}
diff --git a/internal/runtime/runtime.go b/internal/runtime/runtime.go
index 5481d6c8..3be28080 100644
--- a/internal/runtime/runtime.go
+++ b/internal/runtime/runtime.go
@@ -91,6 +91,7 @@ type InvocationOptions struct {
ResumeSessionID string
GateResultPath string
Repositories []domain.RepositoryContext
+ RunnerLogin bool
// BrowserMCP is resolved on the executing host, never sent to a runner.
BrowserMCP *domain.MCPServerDefinition `json:"-"`
}
diff --git a/web/app.js b/web/app.js
index e8998bc8..36c167d9 100644
--- a/web/app.js
+++ b/web/app.js
@@ -1092,7 +1092,7 @@ function bind(){
$('#runGenericTemplateDirect')&&($('#runGenericTemplateDirect').onclick=()=>{const id=state.genericTemplateId;$('#genericTemplateModal').classList.remove('open');if(!id)return toast('请先选择通用模板');openRunModal(id)});
$('#confirmRun').onclick=startRun; $('#newAgent').onclick=()=>openAgentWizard();
$('#agentForm').onsubmit=saveAgent;
- $('#agentForm').elements.executorId?.addEventListener('change',e=>applyAgentModelUI(e.target.value,'',''));
+ $('#agentForm').elements.executorId?.addEventListener('change',e=>applyAgentModelUI(e.target.value,'','',true));
bindAgentPicker('#agentModelPicker',renderAgentModelPicker);
bindAgentPicker('#agentEffortPicker',renderAgentEffortPicker);
$('#agentClone')&&($('#agentClone').onclick=()=>cloneAgent(state.selectedAgent));
diff --git a/web/app/agents.js b/web/app/agents.js
index 0a3bf917..aa9b56d4 100644
--- a/web/app/agents.js
+++ b/web/app/agents.js
@@ -142,8 +142,8 @@ function loadExecutorModelCatalogs(){
function agentModelAPI(){return window.AgentFlowAssistantModels}
function currentAgentExecutorId(){return $('#agentForm')?.elements?.executorId?.value||'codebuddy'}
function agentModelItems(executorId,current){
- const cat=executorModelCatalogs()[executorId]||{},items=(cat.models||[]).slice();
- if(current&&current!==AGENT_CUSTOM_MODEL&&!items.some(m=>m.id===current))items.push({id:current,name:`${current}(历史模型)`,family:'other'});
+ const cat=executorModelCatalogs()[executorId]||{},items=(cat.models||[]).filter(item=>item.id!=='default');
+ if(current&&current!=='default'&&current!==AGENT_CUSTOM_MODEL&&!items.some(m=>m.id===current))items.push({id:current,name:`${current}(历史模型)`,family:'other'});
if(cat.customModel)items.push({id:AGENT_CUSTOM_MODEL,name:'手动输入模型 ID…',icon:false});
return items;
}
@@ -162,16 +162,10 @@ function paintAgentPicker(pickerId,item){
const label=toggle?.querySelector('[data-model-label]');
if(toggle&&label&&label.scrollWidth<=label.clientWidth){toggle.removeAttribute('title');toggle.removeAttribute('data-hui-title')}
}
-// The empty choice runs the CLI's own default model; name it instead of
-// showing an unset 「选择模型」.
-function agentDefaultModelItem(executorId){
- const exec=(state.data?.executors||[]).find(x=>x.id===executorId);
- return {id:'',name:exec?.model?`默认 · ${exec.model}`:'默认模型',icon:false};
-}
function renderAgentModelPicker(){
const picker=$('#agentModelPicker');if(!picker)return;
const current=picker.querySelector('[name="modelChoice"]').value;
- const items=[agentDefaultModelItem(currentAgentExecutorId())].concat(agentModelItems(currentAgentExecutorId(),current));
+ const items=agentModelItems(currentAgentExecutorId(),current);
const menu=picker.querySelector('.ai-model-menu');
agentModelAPI()?.renderOptions?.(menu,items,current,id=>{
picker.querySelector('[name="modelChoice"]').value=id;
@@ -181,7 +175,7 @@ function renderAgentModelPicker(){
menu.hidden=true;picker.querySelector('[data-model-toggle]').setAttribute('aria-expanded','false');
});
syncAgentModelCustomField();
- paintAgentPicker('#agentModelPicker',items.find(x=>x.id===current)||{id:current,name:current});
+ paintAgentPicker('#agentModelPicker',items.find(x=>x.id===current));
}
function syncAgentModelCustomField(){
const picker=$('#agentModelPicker'),field=$('#agentModelCustomField');
@@ -202,11 +196,12 @@ function renderAgentEffortPicker(modelChanged=false){
});
paintAgentPicker('#agentEffortPicker',items.find(x=>x.id===current)||{id:current,name:current,icon:false});
}
-function applyAgentModelUI(executorId,model,effort){
+function applyAgentModelUI(executorId,model,effort,pickFirst=false){
const picker=$('#agentModelPicker');if(!picker||!$('#agentEffortPicker'))return;
const cat=executorModelCatalogs()[executorId]||{};
- let choice=model||'';
- if(choice&&!(cat.models||[]).some(m=>m.id===choice)&&cat.customModel)choice=AGENT_CUSTOM_MODEL;
+ // Keep cached models available for manual picks while the catalog refreshes.
+ let choice=model||(pickFirst&&!executorModelCatalogRequest?(cat.models||[]).find(item=>item.id!=='default')?.id:'')||'';
+ if(choice&&choice!=='default'&&!(cat.models||[]).some(m=>m.id===choice)&&cat.customModel)choice=AGENT_CUSTOM_MODEL;
picker.querySelector('[name="modelChoice"]').value=choice;
const customInput=$('#agentModelCustomField')?.querySelector('input[name="model"]');
if(customInput&&choice===AGENT_CUSTOM_MODEL)customInput.value=model||'';
@@ -250,16 +245,18 @@ function selectAgent(a,rerender=true){
if(f.elements.executorId)f.elements.executorId.innerHTML=executorOptions(a.executorId||'codebuddy');
const modelRevision=++agentModelRevision;
const modelUser=state.currentUser?.id;
- applyAgentModelUI(currentAgentExecutorId(),a.model||'',a.effort||'');
- loadExecutorModelCatalogs().then(()=>{
+ const refreshModels=loadExecutorModelCatalogs();
+ applyAgentModelUI(currentAgentExecutorId(),a.model||'',a.effort||'',!a.id);
+ refreshModels.then(()=>{
if(modelRevision!==agentModelRevision||modelUser!==state.currentUser?.id)return;
const model=agentEffectiveModel(f);
if(!model&&f.elements.modelChoice?.value===AGENT_CUSTOM_MODEL){
renderAgentModelPicker();
renderAgentEffortPicker();
- return;
+ }else{
+ applyAgentModelUI(currentAgentExecutorId(),model,f.elements.effort?.value,!a.id||currentAgentExecutorId()!==(a.executorId||'codebuddy'));
}
- applyAgentModelUI(currentAgentExecutorId(),model,f.elements.effort?.value);
+ if(state.agentModalMode==='create'&&state.agentCreateStep===3)renderAgentCreateReview();
});
if(f.elements.id)f.elements.id.readOnly=!!a.id;
renderAgentPresets();renderAgentTaskBook(a);renderAgentGovernance(a);renderAgentAssetsPanel(a);renderAgentSummary();
@@ -428,6 +425,14 @@ function saveAgent(e){
}
async function persistAgent(f){
const creating=state.agentModalMode==='create';
+ const changedExecutor=currentAgentExecutorId()!==(agentWizardSubject()?.executorId||'codebuddy');
+ const model=agentEffectiveModel(f);
+ if((creating||changedExecutor||f.elements.modelChoice?.value===AGENT_CUSTOM_MODEL)&&(!model||model==='default')){
+ toast('请选择模型或填写模型 ID','err');
+ if(creating)setAgentCreateStep(2);
+ else setAgentTab('identity');
+ return null;
+ }
if(state.agentSaving)return null;
state.agentSaving=true;
try{return await persistAgentRequest(f,creating)}finally{state.agentSaving=false}
diff --git a/web/app/assistant-models.js b/web/app/assistant-models.js
index e31b75fd..ee9f6daa 100644
--- a/web/app/assistant-models.js
+++ b/web/app/assistant-models.js
@@ -9,15 +9,28 @@
const FAMILY_MARK = {claude:'',gpt:'',glm:'智',gemini:'G',kimi:'K',deepseek:'D',minimax:'M',hunyuan:'混',mimo:'Mi',echo:'E',other:'AI'};
const FAMILY_ICON = {
claude:'/images/credentials/claude.svg',
+ codebuddy:'/images/credentials/codebuddy.svg',
+ cursor:'/images/credentials/cursor.svg',
gpt:'/images/credentials/codex.svg',
glm:'/images/credentials/glm.svg',
gemini:'/images/credentials/gemini.svg',
+ grok:'/images/credentials/xai.svg',
+ muse:'/images/credentials/meta.svg',
kimi:'/images/credentials/kimi.svg',
+ moonshot:'/images/credentials/moonshot.svg',
+ qwen:'/images/credentials/qwen.svg',
+ doubao:'/images/credentials/doubao.svg',
+ qianfan:'/images/credentials/qianfan.svg',
deepseek:'/images/credentials/deepseek.svg',
minimax:'/images/credentials/minimax.svg',
hunyuan:'/images/credentials/hunyuan.svg',
mimo:'/images/credentials/mimo.svg'
};
+ const CLI_ICON = {
+ codebuddy:'codebuddy.svg', codex:'codex.svg', 'claude-code':'claude.svg',
+ opencode:'opencode.svg', cursor:'cursor.svg', agy:'antigravity.svg',
+ kimi:'kimi-code.png', pi:'pi.svg', dsh:'deepseek.svg', zcode:'glm.svg'
+ };
let catalog = {
default: DEFAULT_MODEL,
models: []
@@ -25,12 +38,20 @@
let loading = null;
function familyOf(id) {
- const v = String(id || '').toLowerCase();
- if (v.startsWith('claude')) return 'claude';
+ const raw = String(id || '').toLowerCase();
+ const v = raw.replace(/^(?:codebuddy|codex|claude-code|opencode|cursor|agy|kimi|pi|dsh|zcode):/, '').split('/').at(-1);
+ if (/^(?:claude|anthropic|opus|sonnet|haiku|fable)(?:$|[-_.\s:\d])/.test(v)) return 'claude';
+ if (/^composer(?:$|[-_.\s:\d])/.test(v) || (raw.startsWith('cursor:') && /^auto(?:-smart)?$/.test(v))) return 'cursor';
if (v.startsWith('gpt') || v.includes('codex')) return 'gpt';
if (v.startsWith('glm')) return 'glm';
if (v.startsWith('gemini')) return 'gemini';
- if (v.startsWith('kimi')) return 'kimi';
+ if (/^(?:cursor-)?grok(?:$|[-_.\s:\d])/.test(v)) return 'grok';
+ if (/^muse(?:$|[-_.\s:\d])/.test(v)) return 'muse';
+ if (/^(?:kimi|k[23])(?:$|[-_.\s:])/.test(v)) return 'kimi';
+ if (/^moonshot(?:ai)?(?:$|[-_.\s:\d])/.test(v)) return 'moonshot';
+ if (/^(?:qwen|qvq|alibaba)(?:$|[-_.\s:\d])/.test(v)) return 'qwen';
+ if (/^(?:doubao|seed|seedream|bytedance)(?:$|[-_.\s:\d])/.test(v)) return 'doubao';
+ if (/^(?:ernie|wenxin|baidu|qianfan)(?:$|[-_.\s:\d])/.test(v)) return 'qianfan';
if (v.startsWith('deepseek')) return 'deepseek';
if (v.startsWith('minimax')) return 'minimax';
if (v.startsWith('hy') || v.includes('hunyuan')) return 'hunyuan';
@@ -53,9 +74,13 @@
}
function fillModelIcon(el, family, id) {
if (!el) return;
+ if (!family || family === 'other') family = familyOf(id);
el.dataset.family = family || 'other';
const src = FAMILY_ICON[family];
- if (src) { el.innerHTML = `<img src="${src}" alt="">`; return; }
+ if (src) {
+ el.innerHTML = `<img src="${src}" alt="">` + (family === 'kimi' ? '<img src="/images/credentials/kimi-dark.svg" alt="">' : '');
+ return;
+ }
el.textContent = FAMILY_MARK[family] || String(id || 'AI').slice(0, 1).toUpperCase();
}
function creditLabel(item) {
@@ -151,7 +176,7 @@
if (!loading) {
loading = fetchCatalog().then(data => {
if (Array.isArray(data?.models)) {
- const models = data.models.filter(m => m.id !== DEFAULT_MODEL || (m.engine && m.engine !== 'codebuddy'));
+ const models = data.models.filter(m => m.id !== DEFAULT_MODEL && m.id !== `${m.engine}:default`);
catalog = {default: data.default || DEFAULT_MODEL, models, engines: data.engines || []};
}
return catalog;
@@ -162,6 +187,7 @@
window.AgentFlowAssistantModels = {
DEFAULT: DEFAULT_MODEL,
catalog: () => catalog,
+ cliIcon: id => Object.hasOwn(CLI_ICON, id) ? '/images/credentials/' + CLI_ICON[id] : '',
codeBuddyModel,
codeBuddyModels,
engineOf,
diff --git a/web/app/runners.js b/web/app/runners.js
index 38449d44..f625de4d 100644
--- a/web/app/runners.js
+++ b/web/app/runners.js
@@ -57,7 +57,6 @@ function runnerStatusLabel(status,lastSeen){
return `<span class="runner-status${style}" title="${escapeHTML(runnerLastSeen(lastSeen))}"><i></i>${escapeHTML(label)}</span>`;
}
const runnerCLILabels={'claude-code':'Claude Code','codex':'Codex','codebuddy':'CodeBuddy',opencode:'OpenCode',cursor:'Cursor CLI',agy:'Antigravity',kimi:'Kimi Code',pi:'Pi',dsh:'DeepSeek Harness',zcode:'ZCode'};
-const runnerCLIIcons={'claude-code':'claude',codex:'codex',codebuddy:'codebuddy',opencode:'opencode',cursor:'cursor',agy:'gemini',kimi:'kimi',pi:'pi',dsh:'deepseek',zcode:'glm'};
const runnerAuthLabel={local:'账号登录',personal:'API Key'};
const runnerAuthDescription={local:'Claude Code、Codex 和 Antigravity 可以使用运行 Runner 的系统账号在这台机器上的已有登录,对话与 SOP 的 native、Docker 沙箱均可复用。共享对话中,只有机器所有者发言时会使用此登录。',personal:'读取「个人配置」中保存的 API Key。对话使用当前发言人的 Key,SOP 使用运行责任人的 Key。Antigravity 的 Gemini API Key 按 API 单独计费。'};
const runnerOSLabels={darwin:'macOS',linux:'Linux',windows:'Windows'};
@@ -96,10 +95,11 @@ function runnerRuntimeHTML(runner,runtime,shared){
const testing=runnerRuntimeTests.has(key),updating=runnerMaintenancePending.has(key);
const busy=testing||updating||runnerAuthChanges.has(key);
const disabled=runtime.status==='disabled';
+ const icon=window.AgentFlowAssistantModels?.cliIcon(provider);
return `<div class="runner-runtime-row ${disabled?'off':''}">
<label class="runner-runtime-label">
<input type="checkbox" data-runner-cli="${safeKey}" ${disabled?'':'checked'} ${shared?'disabled':''} aria-label="启用 ${label}">
- <span class="runner-runtime-icon ${provider}" aria-hidden="true"><img src="/images/credentials/${runnerCLIIcons[provider]}.svg" alt=""></span>
+ <span class="runner-runtime-icon ${provider}" aria-hidden="true">${icon?`<img src="${icon}" alt="">`:''}</span>
<span class="runner-runtime-name"><b>${label}</b><small title="${escapeHTML(runtime.binaryPath||'')}">${escapeHTML(runtime.version||runtime.binaryPath||'已发现')}</small></span>
</label>
${runnerAuthHTML(runtime,key,busy,shared)}
diff --git a/web/app/workbench.js b/web/app/workbench.js
index b00a85f6..a6883f48 100644
--- a/web/app/workbench.js
+++ b/web/app/workbench.js
@@ -95,13 +95,13 @@ const CREDENTIAL_KINDS=[
agentCliCredentialKind('cursor',{name:'Cursor CLI',logo:'cursor',monochrome:true,
note:'Cursor CLI 连接 Cursor 官方服务,可按账号获取模型。',
guide:[['登录 Cursor 控制台,在「Integrations → User API Keys」新建 Key','https://cursor.com/dashboard?tab=integrations','前往 Cursor 创建 API Key'],['复制以 <code>crsr_</code> 开头的 Key'],['粘贴到下方保存']]}),
- agentCliCredentialKind('agy',{name:'Antigravity',logo:'gemini',baseUrl:'https://gateway.example.com/v1',required:protocol=>protocol==='chat',
+ agentCliCredentialKind('agy',{name:'Antigravity',logo:'antigravity',baseUrl:'https://gateway.example.com/v1',required:protocol=>protocol==='chat',
note:'默认连接 Gemini 官方服务;选择 OpenAI 兼容网关时需要填写 Base URL。',extraNote:'OpenAI 兼容网关必填',
guide:[['在 Google AI Studio 创建 Gemini API Key,或准备 OpenAI 兼容网关的 Key','https://aistudio.google.com/apikey','前往 Google AI Studio'],['走网关时记下网关地址'],['粘贴 Key,选择协议;保存后可在模型目录里挑选 AI 对话的模型']],
protocols:[['gemini','Gemini 官方 API'],['chat','OpenAI 兼容网关(Chat Completions)']]}),
- agentCliCredentialKind('kimi',{name:'Kimi Code',logo:'kimi',baseUrl:'https://api.kimi.com/coding/v1',
+ agentCliCredentialKind('kimi',{name:'Kimi Code',logo:'kimi-code.png',baseUrl:'https://api.kimi.com/coding/v1',
note:'未填写 Base URL 时连接 Kimi Code 官方服务。',protocols:[['chat','Chat Completions'],['responses','Responses'],['messages','Messages(Anthropic)']]}),
- agentCliCredentialKind('pi',{name:'Pi',logo:'pi',monochrome:true,baseUrl:'https://api.example.com/v1',required:()=>true,
+ agentCliCredentialKind('pi',{name:'Pi',logo:'pi',baseUrl:'https://api.example.com/v1',required:()=>true,
note:'Pi 没有自己的模型服务,需要填写 Base URL。',protocols:[['chat','Chat Completions'],['responses','Responses'],['messages','Messages(Anthropic)']]}),
agentCliCredentialKind('dsh',{name:'DeepSeek Harness',logo:'deepseek',baseUrl:'https://api.deepseek.com',
note:'未填写 Base URL 时连接 DeepSeek 官方服务。',protocols:[['chat','Chat Completions'],['responses','Responses'],['messages','Messages(Anthropic)']]}),
@@ -140,7 +140,7 @@ function credentialModelsEndpoint(kind,protocol){
// ---- 模型目录(Codex / Claude Code / 可配置 Agent CLI) ----
// A saved catalog is the chat list on the official endpoint and behind a Base URL.
// An empty catalog follows the CLI's built-in models when there is no Base URL
-// (or the protocol is Gemini), and the Base URL's published models otherwise.
+// and the Base URL's published models otherwise.
// Edits stay in the DOM until 保存.
const CREDENTIAL_CATALOG_MAX=100;
let credentialEffortCatalogs,credentialEffortCatalogRequest;
@@ -226,7 +226,7 @@ function credentialCatalogRowHTML(model={},engine=''){
}
function credentialCatalogCopy(mode,kind){
const name=kind?.name||'该 CLI';
- if(mode==='runner')return {title:'使用 CLI 默认模型',detail:'获取这台机器的账号模型,或手动添加。',reset:'清空自定义列表',restored:'已恢复默认,保存后生效'};
+ if(mode==='runner')return {title:'使用执行机器的账号模型',detail:'获取这台机器的账号模型,或手动添加。',reset:'清空自定义列表',restored:'已清空目录,保存后生效'};
return mode==='official'
?{title:`使用 ${name} 自带的模型`,detail:`目录为空时,AI 对话列出 ${name} 支持的模型。获取可用模型可以改成自己的目录,也可以手动添加。`,reset:'清空目录,改回使用自带的模型',restored:'已恢复默认,保存后使用自带的模型'}
:{title:'跟随服务发布的模型',reset:'清空目录,改回跟随服务发布的模型',restored:'已恢复默认,保存后跟随服务发布的模型'};
@@ -239,7 +239,7 @@ function credentialCatalogHTML(kind,user,{runnerLogin=false,label='模型目录'
const baseUrl=kind.extra?.url?credentialValue(user,kind.extra.name):'',protocol=credentialProtocol(kind,user);
const cursorAutomatic=kind.agentCli==='cursor'&&!user?.agentCliCredentials?.cursor?.modelsCustomized;
const models=credentialCatalogModels(cursorAutomatic?[]:credentialValue(user,kind.models.name)),empty=!models.length;
- const mode=runnerLogin?'runner':!String(baseUrl||'').trim()||protocol==='gemini'?'official':'remote';
+ const mode=runnerLogin?'runner':!String(baseUrl||'').trim()?'official':'remote';
const copy=credentialCatalogCopy(mode,kind);
return `<section class="credential-catalog" data-credential-catalog data-catalog-engine="${escapeHTML(kind.models.engine)}" data-catalog-mode="${mode}" data-catalog-protocol="${escapeHTML(protocol)}" data-original-key="${escapeHTML(credentialCatalogKey(models))}" data-catalog-source="${escapeHTML(credentialCatalogSource(baseUrl))}" aria-label="模型目录">
<div class="credential-catalog-body" data-catalog-body>
@@ -269,8 +269,8 @@ function credentialCatalogFilledRows(catalog){return credentialCatalogRows(catal
function readCredentialCatalog(catalog){return credentialCatalogModels(credentialCatalogRows(catalog).map(credentialCatalogRowModel))}
function credentialCatalogMode(catalog){
const form=catalog?.closest('.credential-editor-form'),extra=form?.querySelector('input[name="extra"]');
- if(!extra)return catalog.dataset.catalogMode;
- return !extra.value.trim()||form.querySelector('select[name="protocol"]')?.value==='gemini'?'official':'remote';
+ if(!extra||catalog.dataset.catalogMode==='runner')return catalog.dataset.catalogMode;
+ return extra.value.trim()?'remote':'official';
}
function credentialCatalogDirty(catalog){return !!catalog&&credentialCatalogKey(readCredentialCatalog(catalog))!==catalog.dataset.originalKey}
function credentialCatalogPayload(catalog){
@@ -497,7 +497,10 @@ function credentialUser(){return userById(state.currentUser?.id)||{}}
function credentialUI(){return state.credentialUI||(state.credentialUI={open:null,filter:'all',closed:{}})}
function credentialGlyph(name,size=16,cls=''){return `<svg class="agent-icon harness-icon${cls?' '+cls:''}" data-icon="${name}" width="${size}" height="${size}" aria-hidden="true" focusable="false"></svg>`}
function credentialSpinner(size=14){return credentialGlyph('arc-spinner',size,'credential-spin')}
-function credentialLogo(kind,cls=''){return `<span class="credential-logo${kind.monochrome?' monochrome':''}${cls?' '+cls:''}">${kind.icon?credentialGlyph(kind.icon,18):`<img src="/images/credentials/${kind.logo}.svg" alt="">`}</span>`}
+function credentialLogo(kind,cls=''){
+ const file=kind.logo?.endsWith('.png')?kind.logo:kind.logo+'.svg';
+ return `<span class="credential-logo${kind.monochrome?' monochrome':''}${cls?' '+cls:''}">${kind.icon?credentialGlyph(kind.icon,18):`<img src="/images/credentials/${file}" alt="">`}</span>`;
+}
function hydrateCredentialIcons(root){if(root)window.AgentFlowHarnessIcons?.hydrate?.(root)}
function credentialNextKind(user){return CREDENTIAL_RECOMMENDED.map(credentialKind).find(kind=>!credentialConfigured(kind,user))||null}
function credentialSecretError(kind,value){
diff --git a/web/assistant-models.css b/web/assistant-models.css
index 6fc625f8..e6e29062 100644
--- a/web/assistant-models.css
+++ b/web/assistant-models.css
@@ -16,9 +16,17 @@
font-size:9px;font-weight:800;color:#fff;letter-spacing:0;overflow:hidden;
}
.ai-model-icon img{width:18px;height:18px;display:block;object-fit:contain;background:transparent}
-.ai-model-icon[data-family=claude],.ai-model-icon[data-family=gpt],.ai-model-icon[data-family=gemini],.ai-model-icon[data-family=deepseek],.ai-model-icon[data-family=minimax],.ai-model-icon[data-family=mimo]{background:#fff}
+.ai-model-icon:is(
+ [data-family=claude],[data-family=codebuddy],[data-family=cursor],[data-family=deepseek],
+ [data-family=doubao],[data-family=gemini],[data-family=gpt],[data-family=grok],
+ [data-family=mimo],[data-family=minimax],[data-family=moonshot],[data-family=muse],
+ [data-family=qianfan],[data-family=qwen]
+){background:#fff}
.ai-model-icon[data-family=glm]{background:#3859FF}
-.ai-model-icon[data-family=kimi]{background:#111827}
+.ai-model-icon[data-family=kimi]{background:transparent}
+.ai-model-icon[data-family=kimi] img+img{display:none}
+[data-theme=dark] .ai-model-icon[data-family=kimi] img:first-child{display:none}
+[data-theme=dark] .ai-model-icon[data-family=kimi] img+img{display:block}
.ai-model-icon[data-family=hunyuan]{background:#0F766E}
.ai-model-icon[data-family=echo],.ai-model-icon[data-family=other]{background:#64748b}
.ai-model-menu{
diff --git a/web/assistant_models_test.js b/web/assistant_models_test.js
index f6fea0e4..b45b2f6a 100644
--- a/web/assistant_models_test.js
+++ b/web/assistant_models_test.js
@@ -92,6 +92,37 @@ vm.runInContext(moduleSource, ctx);
assert.equal(typeof api[name], 'function', `AgentFlowAssistantModels.${name}`);
}
assert.equal(api.DEFAULT, 'default');
+ assert.equal(api.cliIcon('agy'), '/images/credentials/antigravity.svg');
+ assert.equal(api.cliIcon('kimi'), '/images/credentials/kimi-code.png');
+ assert.equal(api.cliIcon('pi'), '/images/credentials/pi.svg');
+ api.paintItem(toggle, {id: 'kimi:k3.1-pro', family: 'other'});
+ assert.match(icon.innerHTML, /\/images\/credentials\/kimi\.svg/);
+ api.paintItem(toggle, {id: 'agy:gemini-4-neon-high'});
+ assert.match(icon.innerHTML, /\/images\/credentials\/gemini\.svg/);
+ api.paintItem(toggle, {id: 'claude-code:opus'});
+ assert.match(icon.innerHTML, /\/images\/credentials\/claude\.svg/);
+ api.paintItem(toggle, {id: 'cursor:composer-2.5'});
+ assert.match(icon.innerHTML, /\/images\/credentials\/cursor\.svg/);
+ api.paintItem(toggle, {id: 'cursor:cursor-grok-4.6', family: 'other'});
+ assert.equal(icon.dataset.family, 'grok');
+ assert.match(icon.innerHTML, /\/images\/credentials\/xai\.svg/);
+ api.paintItem(toggle, {id: 'cursor:muse-wonder-1.0'});
+ assert.equal(icon.dataset.family, 'muse');
+ assert.match(icon.innerHTML, /\/images\/credentials\/meta\.svg/);
+ api.paintItem(toggle, {id: 'auto', family: 'cursor'});
+ assert.match(icon.innerHTML, /\/images\/credentials\/cursor\.svg/);
+ api.paintItem(toggle, {id: 'primary-model', family: 'codebuddy'});
+ assert.match(icon.innerHTML, /\/images\/credentials\/codebuddy\.svg/);
+ for (const [id, family] of [
+ ['opencode:alibaba/qwen3.7-plus', 'qwen'],
+ ['opencode:doubao-seed-2-0-lite-260428', 'doubao'],
+ ['pi:ernie-5.1', 'qianfan'],
+ ['pi:moonshot-v1-8k', 'moonshot'],
+ ]) {
+ api.paintItem(toggle, {id, family: 'other'});
+ assert.equal(icon.dataset.family, family);
+ assert.ok(icon.innerHTML.includes(`/images/credentials/${family}.svg`));
+ }
// Pickers keep painting before the catalog lands, so the built-in fallback
// must already render a usable label.
assert.equal(api.codeBuddyModel('codex:gpt-5.5'), 'default', 'codex ids fall back before the catalog loads');
diff --git a/web/embed.go b/web/embed.go
index 4ae3777b..59b10f4e 100644
--- a/web/embed.go
+++ b/web/embed.go
@@ -2,5 +2,5 @@ package web
import "embed"
-//go:embed boot.js i18n.js i18n-en.js preferences.css login.html login.js bot-bind.html bot-bind.js boot-theme.js gongfeng-oauth-done.html gongfeng-oauth-done.js index.html vscode.html vscode.js vscode.css app.js app assistant-models.css chat-codex.css orchestrate.js bots.css mcp-setup.txt styles.css assets.css platform.css observability.css artifacts.css sops.css sync.css access.css product-v3.css product-v4.css images/credentials/*.svg images/loopforge-logo.png favicon.ico favicon.png favicon.svg apple-touch-icon.png mcp-icons monaco vendor vscode-web extensions all:native-chat
+//go:embed boot.js i18n.js i18n-en.js preferences.css login.html login.js bot-bind.html bot-bind.js boot-theme.js gongfeng-oauth-done.html gongfeng-oauth-done.js index.html vscode.html vscode.js vscode.css app.js app assistant-models.css chat-codex.css orchestrate.js bots.css mcp-setup.txt styles.css assets.css platform.css observability.css artifacts.css sops.css sync.css access.css product-v3.css product-v4.css images/credentials/*.svg images/credentials/kimi-code.png images/loopforge-logo.png favicon.ico favicon.png favicon.svg apple-touch-icon.png mcp-icons monaco vendor vscode-web extensions all:native-chat
var Files embed.FS
diff --git a/web/images/credentials/README.md b/web/images/credentials/README.md
index d4978e3d..3415f9cd 100644
--- a/web/images/credentials/README.md
+++ b/web/images/credentials/README.md
@@ -5,3 +5,9 @@ Its source is [Simple Icons](https://github.com/simple-icons/simple-icons),
distributed under CC0 1.0. See the bundled provider-logo README and SOURCE.md
for the existing artwork attribution. Brand names and marks belong to their
respective owners.
+
+`antigravity.svg`, `doubao.svg`, `gemini.svg`, `kimi-code.png`, `kimi.svg`, `kimi-dark.svg`,
+`meta.svg`, `moonshot.svg`, `pi.svg`, `qianfan.svg`, `qwen.svg`, and `xai.svg` are the same
+artwork as in `chatbot/src/assets/provider-logos/`.
+The [provider-logo README](../../../chatbot/src/assets/provider-logos/README.md)
+records the upstream sources and notices.
diff --git a/web/images/credentials/antigravity.svg b/web/images/credentials/antigravity.svg
new file mode 100644
index 00000000..3b2f2637
--- /dev/null
+++ b/web/images/credentials/antigravity.svg
@@ -0,0 +1,76 @@
+<svg width="180" height="180" viewBox="0 0 180 180" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M144.248 149.062C151.748 154.688 162.998 150.938 152.685 140.625C121.748 110.625 128.31 28.125 89.8727 28.125C51.4352 28.125 57.9977 110.625 27.0602 140.625C15.8102 151.875 27.9977 154.688 35.4977 149.062C64.5602 129.375 62.6852 94.6875 89.8727 94.6875C117.06 94.6875 115.185 129.375 144.248 149.062Z" fill="#3186FF"/>
+<mask id="mask0_6001_409" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="22" y="28" width="136" height="125">
+<path d="M144.248 149.062C151.748 154.688 162.998 150.938 152.685 140.625C121.748 110.625 128.31 28.125 89.8727 28.125C51.4352 28.125 57.9977 110.625 27.0602 140.625C15.8102 151.875 27.9977 154.688 35.4977 149.062C64.5602 129.375 62.6852 94.6875 89.8727 94.6875C117.06 94.6875 115.185 129.375 144.248 149.062Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_6001_409)">
+<g filter="url(#filter0_f_6001_409)">
+<ellipse cx="36.6225" cy="43.0872" rx="36.6225" ry="43.0872" transform="matrix(-0.112784 0.99362 -0.99362 -0.112781 106.557 -26.4847)" fill="#FFE432"/>
+</g>
+<g filter="url(#filter1_f_6001_409)">
+<ellipse cx="155.163" cy="54.9292" rx="47.4118" ry="48.4541" transform="rotate(76.9243 155.163 54.9292)" fill="#FC413D"/>
+</g>
+<g filter="url(#filter2_f_6001_409)">
+<ellipse cx="14.6006" cy="65.4425" rx="49.5515" ry="64.192" transform="rotate(74.1257 14.6006 65.4425)" fill="#00B95C"/>
+</g>
+<g filter="url(#filter3_f_6001_409)">
+<ellipse cx="14.6006" cy="65.4425" rx="49.5515" ry="64.192" transform="rotate(74.1257 14.6006 65.4425)" fill="#00B95C"/>
+</g>
+<g filter="url(#filter4_f_6001_409)">
+<ellipse cx="18.1226" cy="67.414" rx="48.5679" ry="53.4688" transform="rotate(45.6065 18.1226 67.414)" fill="#00B95C"/>
+</g>
+<g filter="url(#filter5_f_6001_409)">
+<ellipse cx="121.837" cy="166.945" rx="46.6356" ry="44.9084" transform="rotate(76.9243 121.837 166.945)" fill="#3186FF"/>
+</g>
+<g filter="url(#filter6_f_6001_409)">
+<ellipse cx="53.9456" cy="56.8997" rx="53.9456" ry="56.8997" transform="matrix(-0.409539 0.912293 -0.912294 -0.409537 162.811 -25.895)" fill="#FBBC04"/>
+</g>
+<g filter="url(#filter7_f_6001_409)">
+<path d="M4.21557 239.063C-25.3231 227.467 25.1577 132.061 37.7105 100.085C50.2634 68.1097 84.3853 51.5888 113.924 63.1848C143.463 74.7809 178.474 138.65 165.921 170.626C153.368 202.601 33.7543 250.659 4.21557 239.063Z" fill="#3186FF"/>
+</g>
+<g filter="url(#filter8_f_6001_409)">
+<path d="M183.197 120.315C175.289 129.545 154.652 124.839 137.102 109.803C119.553 94.7668 111.738 75.0955 119.646 65.8656C127.554 56.6357 148.191 61.3423 165.74 76.3782C183.289 91.414 191.105 111.085 183.197 120.315Z" fill="#749BFF"/>
+</g>
+<g filter="url(#filter9_f_6001_409)">
+<ellipse cx="148.928" cy="36.7252" rx="71.1018" ry="44.199" transform="rotate(34.0763 148.928 36.7252)" fill="#FC413D"/>
+</g>
+<g filter="url(#filter10_f_6001_409)">
+<ellipse cx="37.848" cy="46.0346" rx="38.1008" ry="22.1575" transform="rotate(112.516 37.848 46.0346)" fill="#FFEE48"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_f_6001_409" x="4.09591" y="-44.1761" width="111.037" height="98.4416" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="6.25234"/>
+</filter>
+<filter id="filter1_f_6001_409" x="46.2974" y="-53.0009" width="217.731" height="215.86" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="30.2268"/>
+</filter>
+<filter id="filter2_f_6001_409" x="-100.018" y="-36.7558" width="229.238" height="204.397" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="25.6957"/>
+</filter>
+<filter id="filter3_f_6001_409" x="-100.018" y="-36.7558" width="229.238" height="204.397" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="25.6957"/>
+</filter>
+<filter id="filter4_f_6001_409" x="-84.3985" y="-35.003" width="205.042" height="204.834" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="25.6957"/>
+</filter>
+<filter id="filter5_f_6001_409" x="27.9915" y="71.5493" width="187.691" height="190.791" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="24.4184"/>
+</filter>
+<filter id="filter6_f_6001_409" x="-11.8808" y="-98.7085" width="201.38" height="197.45" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="22.1301"/>
+</filter>
+<filter id="filter7_f_6001_409" x="-44.4432" y="19.9522" width="252.513" height="260.404" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="19.7631"/>
+</filter>
+<filter id="filter8_f_6001_409" x="81.1915" y="25.7722" width="140.46" height="134.637" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="17.6843"/>
+</filter>
+<filter id="filter9_f_6001_409" x="55.1499" y="-47.2531" width="187.555" height="167.957" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="14.9365"/>
+</filter>
+<filter id="filter10_f_6001_409" x="-24.2633" y="-27.1515" width="124.223" height="146.372" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feGaussianBlur stdDeviation="18.4865"/>
+</filter>
+</defs>
+</svg>
diff --git a/web/images/credentials/doubao.svg b/web/images/credentials/doubao.svg
new file mode 100644
index 00000000..e2511454
--- /dev/null
+++ b/web/images/credentials/doubao.svg
@@ -0,0 +1 @@
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Doubao</title><path d="M5.31 15.756c.172-3.75 1.883-5.999 2.549-6.739-3.26 2.058-5.425 5.658-6.358 8.308v1.12C1.501 21.513 4.226 24 7.59 24a6.59 6.59 0 002.2-.375c.353-.12.7-.248 1.039-.378.913-.899 1.65-1.91 2.243-2.992-4.877 2.431-7.974.072-7.763-4.5l.002.001z" fill="#1E37FC"></path><path d="M22.57 10.283c-1.212-.901-4.109-2.404-7.397-2.8.295 3.792.093 8.766-2.1 12.773a12.782 12.782 0 01-2.244 2.992c3.764-1.448 6.746-3.457 8.596-5.219 2.82-2.683 3.353-5.178 3.361-6.66a2.737 2.737 0 00-.216-1.084v-.002z" fill="#37E1BE"></path><path d="M14.303 1.867C12.955.7 11.248 0 9.39 0 7.532 0 5.883.677 4.545 1.807 2.791 3.29 1.627 5.557 1.5 8.125v9.201c.932-2.65 3.097-6.25 6.357-8.307.5-.318 1.025-.595 1.569-.829 1.883-.801 3.878-.932 5.746-.706-.222-2.83-.718-5.002-.87-5.617h.001z" fill="#A569FF"></path><path d="M17.305 4.961a199.47 199.47 0 01-1.08-1.094c-.202-.213-.398-.419-.586-.622l-1.333-1.378c.151.615.648 2.786.869 5.617 3.288.395 6.185 1.898 7.396 2.8-1.306-1.275-3.475-3.487-5.266-5.323z" fill="#1E37FC"></path></svg>
\ No newline at end of file
diff --git a/web/images/credentials/gemini.svg b/web/images/credentials/gemini.svg
index 2815efd0..62681dfa 100644
--- a/web/images/credentials/gemini.svg
+++ b/web/images/credentials/gemini.svg
@@ -1 +1 @@
-<svg fill="#8E75B2" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Gemini</title><path d="M11.04 19.32Q12 21.51 12 24q0-2.49.93-4.68.96-2.19 2.58-3.81t3.81-2.55Q21.51 12 24 12q-2.49 0-4.68-.93a12.3 12.3 0 0 1-3.81-2.58 12.3 12.3 0 0 1-2.58-3.81Q12 2.49 12 0q0 2.49-.96 4.68-.93 2.19-2.55 3.81a12.3 12.3 0 0 1-3.81 2.58Q2.49 12 0 12q2.49 0 4.68.96 2.19.93 3.81 2.55t2.55 3.81"/></svg>
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Gemini</title><path d="M20.616 10.835a14.147 14.147 0 01-4.45-3.001 14.111 14.111 0 01-3.678-6.452.503.503 0 00-.975 0 14.134 14.134 0 01-3.679 6.452 14.155 14.155 0 01-4.45 3.001c-.65.28-1.318.505-2.002.678a.502.502 0 000 .975c.684.172 1.35.397 2.002.677a14.147 14.147 0 014.45 3.001 14.112 14.112 0 013.679 6.453.502.502 0 00.975 0c.172-.685.397-1.351.677-2.003a14.145 14.145 0 013.001-4.45 14.113 14.113 0 016.453-3.678.503.503 0 000-.975 13.245 13.245 0 01-2.003-.678z" fill="#3186FF"></path><path d="M20.616 10.835a14.147 14.147 0 01-4.45-3.001 14.111 14.111 0 01-3.678-6.452.503.503 0 00-.975 0 14.134 14.134 0 01-3.679 6.452 14.155 14.155 0 01-4.45 3.001c-.65.28-1.318.505-2.002.678a.502.502 0 000 .975c.684.172 1.35.397 2.002.677a14.147 14.147 0 014.45 3.001 14.112 14.112 0 013.679 6.453.502.502 0 00.975 0c.172-.685.397-1.351.677-2.003a14.145 14.145 0 013.001-4.45 14.113 14.113 0 016.453-3.678.503.503 0 000-.975 13.245 13.245 0 01-2.003-.678z" fill="url(#lobe-icons-gemini-0-_R_0_)"></path><path d="M20.616 10.835a14.147 14.147 0 01-4.45-3.001 14.111 14.111 0 01-3.678-6.452.503.503 0 00-.975 0 14.134 14.134 0 01-3.679 6.452 14.155 14.155 0 01-4.45 3.001c-.65.28-1.318.505-2.002.678a.502.502 0 000 .975c.684.172 1.35.397 2.002.677a14.147 14.147 0 014.45 3.001 14.112 14.112 0 013.679 6.453.502.502 0 00.975 0c.172-.685.397-1.351.677-2.003a14.145 14.145 0 013.001-4.45 14.113 14.113 0 016.453-3.678.503.503 0 000-.975 13.245 13.245 0 01-2.003-.678z" fill="url(#lobe-icons-gemini-1-_R_0_)"></path><path d="M20.616 10.835a14.147 14.147 0 01-4.45-3.001 14.111 14.111 0 01-3.678-6.452.503.503 0 00-.975 0 14.134 14.134 0 01-3.679 6.452 14.155 14.155 0 01-4.45 3.001c-.65.28-1.318.505-2.002.678a.502.502 0 000 .975c.684.172 1.35.397 2.002.677a14.147 14.147 0 014.45 3.001 14.112 14.112 0 013.679 6.453.502.502 0 00.975 0c.172-.685.397-1.351.677-2.003a14.145 14.145 0 013.001-4.45 14.113 14.113 0 016.453-3.678.503.503 0 000-.975 13.245 13.245 0 01-2.003-.678z" fill="url(#lobe-icons-gemini-2-_R_0_)"></path><defs><linearGradient gradientUnits="userSpaceOnUse" id="lobe-icons-gemini-0-_R_0_" x1="7" x2="11" y1="15.5" y2="12"><stop stop-color="#08B962"></stop><stop offset="1" stop-color="#08B962" stop-opacity="0"></stop></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="lobe-icons-gemini-1-_R_0_" x1="8" x2="11.5" y1="5.5" y2="11"><stop stop-color="#F94543"></stop><stop offset="1" stop-color="#F94543" stop-opacity="0"></stop></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="lobe-icons-gemini-2-_R_0_" x1="3.5" x2="17.5" y1="13.5" y2="12"><stop stop-color="#FABC12"></stop><stop offset=".46" stop-color="#FABC12" stop-opacity="0"></stop></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/web/images/credentials/kimi-code.png b/web/images/credentials/kimi-code.png
new file mode 100644
index 00000000..033c0f4f
Binary files /dev/null and b/web/images/credentials/kimi-code.png differ
diff --git a/web/images/credentials/kimi-dark.svg b/web/images/credentials/kimi-dark.svg
new file mode 100644
index 00000000..949cf16d
--- /dev/null
+++ b/web/images/credentials/kimi-dark.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.7202 0.939941C22.9502 0.939941 23.9502 1.93994 23.9502 3.16994C23.9502 4.39994 22.9502 5.39994 21.7202 5.39994H19.7502C19.6002 5.39994 19.4902 5.27994 19.4902 5.13994V3.16994C19.4902 1.93994 20.4902 0.939941 21.7202 0.939941Z" fill="#1783FF"/>
+<path d="M9.39 13.9501L17.82 5.59012C17.98 5.43012 17.89 5.12012 17.68 5.12012H13.14C13.14 5.12012 13.04 5.14012 13 5.18012L3.92 14.1901C3.78 14.3301 3.57 14.2101 3.57 13.9801V5.39012C3.57 5.24012 3.47 5.12012 3.35 5.12012H0.219999C0.0999993 5.12012 0 5.24012 0 5.39012V23.9201C0 24.0701 0.0999993 24.1901 0.219999 24.1901H3.35C3.47 24.1901 3.57 24.0701 3.57 23.9201V20.1401C3.57 20.0601 3.6 19.9801 3.65 19.9301L6.47 17.1401C6.54 17.0701 6.63 17.0601 6.71 17.1101L14.24 22.6501C15.47 23.4801 16.85 23.9901 18.25 24.1401C18.37 24.1501 18.48 24.0301 18.48 23.8701V20.3101C18.48 20.1701 18.4 20.0601 18.29 20.0501C17.47 19.9201 16.66 19.6001 15.94 19.1101L9.42 14.3901C9.28 14.3001 9.27 14.0701 9.39 13.9501Z" fill="white"/>
+</svg>
diff --git a/web/images/credentials/kimi.svg b/web/images/credentials/kimi.svg
index dfeb1697..209edf3b 100644
--- a/web/images/credentials/kimi.svg
+++ b/web/images/credentials/kimi.svg
@@ -1,5 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" role="img">
- <title>Kimi</title>
- <rect width="24" height="24" rx="6" fill="#111827"/>
- <path fill="#fff" d="M15.4 5.1a7.4 7.4 0 1 0 2.9 13.2 8.4 8.4 0 0 1-2.9-13.2z"/>
+<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.7202 0.939941C22.9502 0.939941 23.9502 1.93994 23.9502 3.16994C23.9502 4.39994 22.9502 5.39994 21.7202 5.39994H19.7502C19.6002 5.39994 19.4902 5.27994 19.4902 5.13994V3.16994C19.4902 1.93994 20.4902 0.939941 21.7202 0.939941Z" fill="#1783FF"/>
+<path d="M9.39 13.9501L17.82 5.59012C17.98 5.43012 17.89 5.12012 17.68 5.12012H13.14C13.14 5.12012 13.04 5.14012 13 5.18012L3.92 14.1901C3.78 14.3301 3.57 14.2101 3.57 13.9801V5.39012C3.57 5.24012 3.47 5.12012 3.35 5.12012H0.219999C0.0999993 5.12012 0 5.24012 0 5.39012V23.9201C0 24.0701 0.0999993 24.1901 0.219999 24.1901H3.35C3.47 24.1901 3.57 24.0701 3.57 23.9201V20.1401C3.57 20.0601 3.6 19.9801 3.65 19.9301L6.47 17.1401C6.54 17.0701 6.63 17.0601 6.71 17.1101L14.24 22.6501C15.47 23.4801 16.85 23.9901 18.25 24.1401C18.37 24.1501 18.48 24.0301 18.48 23.8701V20.3101C18.48 20.1701 18.4 20.0601 18.29 20.0501C17.47 19.9201 16.66 19.6001 15.94 19.1101L9.42 14.3901C9.28 14.3001 9.27 14.0701 9.39 13.9501Z" fill="black"/>
</svg>
diff --git a/web/images/credentials/meta.svg b/web/images/credentials/meta.svg
new file mode 100644
index 00000000..a8a8d948
--- /dev/null
+++ b/web/images/credentials/meta.svg
@@ -0,0 +1 @@
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Meta</title><path d="M6.897 4h-.024l-.031 2.615h.022c1.715 0 3.046 1.357 5.94 6.246l.175.297.012.02 1.62-2.438-.012-.019a48.763 48.763 0 00-1.098-1.716 28.01 28.01 0 00-1.175-1.629C10.413 4.932 8.812 4 6.896 4z" fill="url(#lobe-icons-meta-0-_R_0_)"></path><path d="M6.873 4C4.95 4.01 3.247 5.258 2.02 7.17a4.352 4.352 0 00-.01.017l2.254 1.231.011-.017c.718-1.083 1.61-1.774 2.568-1.785h.021L6.896 4h-.023z" fill="url(#lobe-icons-meta-1-_R_0_)"></path><path d="M2.019 7.17l-.011.017C1.2 8.447.598 9.995.274 11.664l-.005.022 2.534.6.004-.022c.27-1.467.786-2.828 1.456-3.845l.011-.017L2.02 7.17z" fill="url(#lobe-icons-meta-2-_R_0_)"></path><path d="M2.807 12.264l-2.533-.6-.005.022c-.177.918-.267 1.851-.269 2.786v.023l2.598.233v-.023a12.591 12.591 0 01.21-2.44z" fill="url(#lobe-icons-meta-3-_R_0_)"></path><path d="M2.677 15.537a5.462 5.462 0 01-.079-.813v-.022L0 14.468v.024a8.89 8.89 0 00.146 1.652l2.535-.585a4.106 4.106 0 01-.004-.022z" fill="url(#lobe-icons-meta-4-_R_0_)"></path><path d="M3.27 16.89c-.284-.31-.484-.756-.589-1.328l-.004-.021-2.535.585.004.021c.192 1.01.568 1.85 1.106 2.487l.014.017 2.018-1.745a2.106 2.106 0 01-.015-.016z" fill="url(#lobe-icons-meta-5-_R_0_)"></path><path d="M10.78 9.654c-1.528 2.35-2.454 3.825-2.454 3.825-2.035 3.2-2.739 3.917-3.871 3.917a1.545 1.545 0 01-1.186-.508l-2.017 1.744.014.017C2.01 19.518 3.058 20 4.356 20c1.963 0 3.374-.928 5.884-5.33l1.766-3.13a41.283 41.283 0 00-1.227-1.886z" fill="#0082FB"></path><path d="M13.502 5.946l-.016.016c-.4.43-.786.908-1.16 1.416.378.483.768 1.024 1.175 1.63.48-.743.928-1.345 1.367-1.807l.016-.016-1.382-1.24z" fill="url(#lobe-icons-meta-6-_R_0_)"></path><path d="M20.918 5.713C19.853 4.633 18.583 4 17.225 4c-1.432 0-2.637.787-3.723 1.944l-.016.016 1.382 1.24.016-.017c.715-.747 1.408-1.12 2.176-1.12.826 0 1.6.39 2.27 1.075l.015.016 1.589-1.425-.016-.016z" fill="#0082FB"></path><path d="M23.998 14.125c-.06-3.467-1.27-6.566-3.064-8.396l-.016-.016-1.588 1.424.015.016c1.35 1.392 2.277 3.98 2.361 6.971v.023h2.292v-.022z" fill="url(#lobe-icons-meta-7-_R_0_)"></path><path d="M23.998 14.15v-.023h-2.292v.022c.004.14.006.282.006.424 0 .815-.121 1.474-.368 1.95l-.011.022 1.708 1.782.013-.02c.62-.96.946-2.293.946-3.91 0-.083 0-.165-.002-.247z" fill="url(#lobe-icons-meta-8-_R_0_)"></path><path d="M21.344 16.52l-.011.02c-.214.402-.519.67-.917.787l.778 2.462a3.493 3.493 0 00.438-.182 3.558 3.558 0 001.366-1.218l.044-.065.012-.02-1.71-1.784z" fill="url(#lobe-icons-meta-9-_R_0_)"></path><path d="M19.92 17.393c-.262 0-.492-.039-.718-.14l-.798 2.522c.449.153.927.222 1.46.222.492 0 .943-.073 1.352-.215l-.78-2.462c-.167.05-.341.075-.517.073z" fill="url(#lobe-icons-meta-10-_R_0_)"></path><path d="M18.323 16.534l-.014-.017-1.836 1.914.016.017c.637.682 1.246 1.105 1.937 1.337l.797-2.52c-.291-.125-.573-.353-.9-.731z" fill="url(#lobe-icons-meta-11-_R_0_)"></path><path d="M18.309 16.515c-.55-.642-1.232-1.712-2.303-3.44l-1.396-2.336-.011-.02-1.62 2.438.012.02.989 1.668c.959 1.61 1.74 2.774 2.493 3.585l.016.016 1.834-1.914a2.353 2.353 0 01-.014-.017z" fill="url(#lobe-icons-meta-12-_R_0_)"></path><defs><linearGradient id="lobe-icons-meta-0-_R_0_" x1="75.897%" x2="26.312%" y1="89.199%" y2="12.194%"><stop offset=".06%" stop-color="#0867DF"></stop><stop offset="45.39%" stop-color="#0668E1"></stop><stop offset="85.91%" stop-color="#0064E0"></stop></linearGradient><linearGradient id="lobe-icons-meta-1-_R_0_" x1="21.67%" x2="97.068%" y1="75.874%" y2="23.985%"><stop offset="13.23%" stop-color="#0064DF"></stop><stop offset="99.88%" stop-color="#0064E0"></stop></linearGradient><linearGradient id="lobe-icons-meta-2-_R_0_" x1="38.263%" x2="60.895%" y1="89.127%" y2="16.131%"><stop offset="1.47%" stop-color="#0072EC"></stop><stop offset="68.81%" stop-color="#0064DF"></stop></linearGradient><linearGradient id="lobe-icons-meta-3-_R_0_" x1="47.032%" x2="52.15%" y1="90.19%" y2="15.745%"><stop offset="7.31%" stop-color="#007CF6"></stop><stop offset="99.43%" stop-color="#0072EC"></stop></linearGradient><linearGradient id="lobe-icons-meta-4-_R_0_" x1="52.155%" x2="47.591%" y1="58.301%" y2="37.004%"><stop offset="7.31%" stop-color="#007FF9"></stop><stop offset="100%" stop-color="#007CF6"></stop></linearGradient><linearGradient id="lobe-icons-meta-5-_R_0_" x1="37.689%" x2="61.961%" y1="12.502%" y2="63.624%"><stop offset="7.31%" stop-color="#007FF9"></stop><stop offset="100%" stop-color="#0082FB"></stop></linearGradient><linearGradient id="lobe-icons-meta-6-_R_0_" x1="34.808%" x2="62.313%" y1="68.859%" y2="23.174%"><stop offset="27.99%" stop-color="#007FF8"></stop><stop offset="91.41%" stop-color="#0082FB"></stop></linearGradient><linearGradient id="lobe-icons-meta-7-_R_0_" x1="43.762%" x2="57.602%" y1="6.235%" y2="98.514%"><stop offset="0%" stop-color="#0082FB"></stop><stop offset="99.95%" stop-color="#0081FA"></stop></linearGradient><linearGradient id="lobe-icons-meta-8-_R_0_" x1="60.055%" x2="39.88%" y1="4.661%" y2="69.077%"><stop offset="6.19%" stop-color="#0081FA"></stop><stop offset="100%" stop-color="#0080F9"></stop></linearGradient><linearGradient id="lobe-icons-meta-9-_R_0_" x1="30.282%" x2="61.081%" y1="59.32%" y2="33.244%"><stop offset="0%" stop-color="#027AF3"></stop><stop offset="100%" stop-color="#0080F9"></stop></linearGradient><linearGradient id="lobe-icons-meta-10-_R_0_" x1="20.433%" x2="82.112%" y1="50.001%" y2="50.001%"><stop offset="0%" stop-color="#0377EF"></stop><stop offset="99.94%" stop-color="#0279F1"></stop></linearGradient><linearGradient id="lobe-icons-meta-11-_R_0_" x1="40.303%" x2="72.394%" y1="35.298%" y2="57.811%"><stop offset=".19%" stop-color="#0471E9"></stop><stop offset="100%" stop-color="#0377EF"></stop></linearGradient><linearGradient id="lobe-icons-meta-12-_R_0_" x1="32.254%" x2="68.003%" y1="19.719%" y2="84.908%"><stop offset="27.65%" stop-color="#0867DF"></stop><stop offset="100%" stop-color="#0471E9"></stop></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/web/images/credentials/moonshot.svg b/web/images/credentials/moonshot.svg
new file mode 100644
index 00000000..2326a38f
--- /dev/null
+++ b/web/images/credentials/moonshot.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Moonshot AI</title><path d="m1.053 16.91 9.538 2.55a21 20.981 0 0 0 .06 2.031l5.956 1.592a12 11.99 0 0 1-15.554-6.172m-1.02-5.79 11.352 3.035a21 20.981 0 0 0-.469 2.01l10.817 2.89a12 11.99 0 0 1-1.845 2.004L.658 15.918a12 11.99 0 0 1-.625-4.796m1.593-5.146L13.573 9.17a21 20.981 0 0 0-1.01 1.874l11.297 3.02a21 20.981 0 0 1-.67 2.362l-11.55-3.087L.125 10.26a12 11.99 0 0 1 1.499-4.285ZM6.067 1.58l11.285 3.016a21 20.981 0 0 0-1.688 1.719l7.824 2.091a21 20.981 0 0 1 .513 2.664L2.107 5.218a12 11.99 0 0 1 3.96-3.638M21.68 4.866 7.222 1.003A12 11.99 0 0 1 21.68 4.866"/></svg>
\ No newline at end of file
diff --git a/web/images/credentials/pi.svg b/web/images/credentials/pi.svg
index 6c81d7e2..e2851685 100644
--- a/web/images/credentials/pi.svg
+++ b/web/images/credentials/pi.svg
@@ -1 +1,6 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Pi</title><path d="M3 4.5h18v3h-3.2v8.6c0 .9.4 1.3 1.1 1.3.5 0 .9-.1 1.3-.3l.6 2.8c-.7.4-1.7.6-2.8.6-2.4 0-3.6-1.4-3.6-4V7.5H9.6V20H6.4V7.5H3z"/></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 800 800">
+ <path fill="#F09082" d="M165.29 165.29H517.36V400H400V282.65H165.29Z"/>
+ <path fill="#4D9ABF" d="M165.29 282.65H282.65V400H400V517.36H282.65V634.72H165.29Z"/>
+ <path fill="#F1BE58" d="M517.36 400H634.72V634.72H517.36Z"/>
+</svg>
diff --git a/web/images/credentials/qianfan.svg b/web/images/credentials/qianfan.svg
new file mode 100644
index 00000000..40565efc
--- /dev/null
+++ b/web/images/credentials/qianfan.svg
@@ -0,0 +1 @@
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>BaiduCloud</title><path d="M21.715 5.61l-3.983 2.31a.903.903 0 01-.896 0L12.44 5.384a.903.903 0 00-.897 0L7.156 7.92a.903.903 0 01-.896 0L2.276 5.617 12.002 0l9.713 5.61z" fill="#5BCA87"></path><path d="M18.641 9.467a.89.89 0 00-.438.77v5.072a.896.896 0 01-.445.77l-4.428 2.51a.884.884 0 00-.445.777v4.607l4.429-2.536 5.31-3.047V7.157l-3.983 2.31z" fill="#EC5D3E"></path><path d="M10.98 18.941a.936.936 0 00-.305-.352l-4.429-2.516a.903.903 0 01-.431-.764v-5.078a.89.89 0 00-.452-.757l-.451-.26L1.38 7.158V18.39l5.311 3.047L11.126 24v-4.608a.881.881 0 00-.146-.45z" fill="#2464F5"></path></svg>
\ No newline at end of file
diff --git a/web/images/credentials/qwen.svg b/web/images/credentials/qwen.svg
new file mode 100644
index 00000000..93d3311a
--- /dev/null
+++ b/web/images/credentials/qwen.svg
@@ -0,0 +1 @@
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Qwen</title><path d="M19.713 2.825h-5.907c0-.251-.066-.503-.196-.728L12.819.728A1.46 1.46 0 0 0 11.559 0h-1.58c-.52 0-1 .275-1.26.728l-2.42 4.19a1.45 1.45 0 0 0 0 1.453l.791 1.37c.26.448.74.727 1.26.727h11.36c.52 0 1-.275 1.26-.728l.79-1.37a1.45 1.45 0 0 0 0-1.451l-.79-1.37a1.46 1.46 0 0 0-1.26-.728zM.195 9.905l2.951 5.115a1.46 1.46 0 0 0-.531.531l-.791 1.37a1.45 1.45 0 0 0 0 1.452l.79 1.37c.26.448.74.727 1.26.727h4.84c.52 0 1-.275 1.26-.728l.79-1.37a1.45 1.45 0 0 0 0-1.451L5.086 7.083a1.46 1.46 0 0 0-1.26-.728h-1.58c-.52 0-1 .276-1.26.728l-.79 1.37a1.45 1.45 0 0 0 0 1.452m15.888 13.367 2.951-5.115c.217.125.469.196.728.196h1.582c.52 0 1-.275 1.26-.728l.79-1.37a1.45 1.45 0 0 0 0-1.451l-2.42-4.191a1.46 1.46 0 0 0-1.259-.728h-1.582c-.52 0-1 .276-1.259.728l-5.678 9.838a1.45 1.45 0 0 0 0 1.452l.79 1.37c.26.448.74.727 1.26.727h1.582c.52 0 1-.275 1.26-.728z" fill="#082dff"></path></svg>
\ No newline at end of file
diff --git a/web/images/credentials/xai.svg b/web/images/credentials/xai.svg
new file mode 100644
index 00000000..0c83eb3d
--- /dev/null
+++ b/web/images/credentials/xai.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 466.04 516.93"><polygon points="0.12 182.71 234.14 516.92 338.15 516.92 104.13 182.71 0.12 182.71"/><polygon points="0 516.92 104.08 516.92 156.08 442.67 104.04 368.34 0 516.92"/><polygon points="466.04 0 361.96 0 182.1 256.86 234.15 331.18 466.04 0"/><polygon points="380.78 516.92 466.04 516.92 466.04 37.16 380.78 158.92 380.78 516.92"/></svg>
\ No newline at end of file
diff --git a/web/orchestrate.js b/web/orchestrate.js
index 4cbab417..7d36327e 100644
--- a/web/orchestrate.js
+++ b/web/orchestrate.js
@@ -3,8 +3,6 @@ let aiBuild = null;
let aiAbort = null;
const aiHistory = {};
-const aiOrchestratorCLIBrands = {codebuddy:'codebuddy', codex:'codex', 'claude-code':'claude', opencode:'opencode', cursor:'cursor', agy:'gemini', kimi:'kimi', pi:'pi', dsh:'deepseek', zcode:'glm'};
-
function aiOrchestratorEngine(model) {
const listed = window.AgentFlowAssistantModels?.catalog().models.find(item => item.id === model);
return listed?.engine || (String(model || '').includes(':') ? model.split(':')[0] : 'codebuddy');
@@ -44,9 +42,9 @@ function bindAIOrchestratorModelPicker() {
const painters = [];
const paintAll = () => painters.forEach(paint => paint());
const paintCLIIcon = (icon, engine) => {
- const brand = aiOrchestratorCLIBrands[engine];
+ const src = api.cliIcon(engine);
icon.dataset.cli = engine;
- if (brand) icon.innerHTML = `<img src="/images/credentials/${brand}.svg" alt="">`;
+ if (src) icon.innerHTML = `<img src="${src}" alt="">`;
else icon.textContent = engine.slice(0, 1).toUpperCase();
};
diff --git a/web/runner_cli_notice_test.go b/web/runner_cli_notice_test.go
index b3d6fc49..89fdd172 100644
--- a/web/runner_cli_notice_test.go
+++ b/web/runner_cli_notice_test.go
@@ -18,7 +18,7 @@ func TestRunnerUsesPerCLIMaintenanceControls(t *testing.T) {
if err != nil {
t.Fatal(err)
}
- for _, want := range []string{"data-runner-runtime-menu", "data-runner-check-update", "/images/credentials/", "runtime.version||runtime.binaryPath"} {
+ for _, want := range []string{"data-runner-runtime-menu", "data-runner-check-update", "AgentFlowAssistantModels?.cliIcon(provider)", "runtime.version||runtime.binaryPath"} {
if !bytes.Contains(app, []byte(want)) {
t.Errorf("missing runner card control or status: %s", want)
}
diff --git a/web/syntax_test.go b/web/syntax_test.go
index 6b66ec6b..8713f3c4 100644
--- a/web/syntax_test.go
+++ b/web/syntax_test.go
@@ -563,8 +563,13 @@ const officialCatalog = credentialCatalogHTML(cred.kind('codexApiKey'), {codexMo
assert.ok(officialCatalog.includes('value="hy4"') && officialCatalog.includes('data-catalog-act="probe"') && officialCatalog.includes('改回使用自带的模型') && !officialCatalog.includes('data-catalog-body hidden'), 'an official key keeps its custom catalog editable');
const officialEmpty = credentialCatalogHTML(cred.kind('codexApiKey'), {});
assert.ok(officialEmpty.includes('使用 Codex 自带的模型') && officialEmpty.includes('data-catalog-act="add"') && !officialEmpty.includes('data-catalog-body hidden'));
-const geminiCatalog = credentialCatalogHTML(cred.kind('agentCli.agy'), {agentCliCredentials: {agy: {baseUrl: 'https://gw.example/v1', protocol: 'gemini'}}});
-assert.ok(geminiCatalog.includes('使用 Antigravity 自带的模型') && geminiCatalog.includes('data-catalog-act="probe"') && !geminiCatalog.includes('data-catalog-body hidden'), 'Gemini official API can still keep a custom catalog');
+const agyKind = cred.kind('agentCli.agy');
+const geminiOfficial = credentialCatalogHTML(agyKind, {agentCliCredentials: {agy: {protocol: 'gemini', models: [{id: 'gemini-4-neon-high'}]}}});
+assert.match(geminiOfficial, /data-catalog-mode="official"/);
+assert.ok(geminiOfficial.includes('value="gemini-4-neon-high"') && geminiOfficial.includes('使用 Antigravity 自带的模型') && !geminiOfficial.includes('data-catalog-body hidden'), 'a saved catalog stays editable on the official endpoint');
+const geminiGateway = credentialCatalogHTML(agyKind, {agentCliCredentials: {agy: {baseUrl: 'https://gw.example/v1', protocol: 'gemini'}}});
+assert.match(geminiGateway, /data-catalog-mode="remote"/);
+assert.ok(geminiGateway.includes('跟随服务发布的模型') && geminiGateway.includes('data-catalog-endpoint>/v1beta/models') && geminiGateway.includes('data-catalog-act="probe"'), 'a Gemini gateway uses its own model listing');
assert.ok(credentialEditorHTML(cred.kind('codexApiKey'), catalogUser).includes('data-credential-catalog') && credentialEditorHTML(cred.kind('codexApiKey'), catalogUser).includes('has-catalog'));
assert.ok(credentialEditorHTML(cred.kind('agentCli.cursor'), {agentCliCredentials: {cursor: {apiKeyConfigured: true}}}).includes('data-credential-catalog'), 'Cursor can fetch the models of its account');
assert.equal(credentialCatalogKey([{id: 'a', name: 'a'}, {id: '', name: ''}]), credentialCatalogKey([{id: 'a'}]));
diff --git a/webtest/tests/assets-agents.test.mjs b/webtest/tests/assets-agents.test.mjs
index 3a0ed45b..b5fff6e0 100644
--- a/webtest/tests/assets-agents.test.mjs
+++ b/webtest/tests/assets-agents.test.mjs
@@ -83,8 +83,13 @@ test('asset forms save environment and sandbox-specific JSON fields', async (t)
test('agent catalog search, presets, validation, persistence, clone, and delete update state', async (t) => {
const app = await loadApp();
t.after(app.close);
+ app.router.get('/api/executor-models', {
+ codebuddy: { models: [{ id: 'cb-model', name: 'CB model' }] },
+ codex: { models: [] }, claude: { models: [] },
+ });
app.evaluate(`afConfirm=async()=>true;afPrompt=async({defaultValue}={})=>defaultValue||'Developer copy'`);
app.evaluate(`switchView('agents');renderAgents();openAgentWizard()`);
+ await settle();
app.evaluate(`applyAgentPreset('developer')`);
const form = app.document.querySelector('#agentForm');
form.elements.executorId.append(new app.window.Option('CodeBuddy', 'codebuddy'));
@@ -99,6 +104,7 @@ test('agent catalog search, presets, validation, persistence, clone, and delete
const created = app.router.calls.find((c) => c.path === '/api/agents' && c.method === 'PUT');
assert.equal(created.body.name, '研发工程师');
assert.equal(created.body.executorId, 'codebuddy');
+ assert.equal(created.body.model, 'cb-model');
assert.ok(app.evaluate(`state.data.agents.some(a=>a.name==='研发工程师')`));
app.router.post('/api/agents/agent-1/clone', { id: 'agent-copy', projectId: 'project-1', name: 'Developer copy' });
@@ -132,17 +138,55 @@ test('role model picker reloads the editor catalog and preserves a CLI change wh
complete(catalog([{ id: 'private/second', name: 'Second' }, { id: 'private/first', name: 'First' }]));
await settle();
const menu = () => [...app.document.querySelectorAll('#agentModelPicker [role=option]')];
- assert.deepEqual(menu().map(row => row.dataset.id), ['', 'private/second', 'private/first', '__custom__']);
- assert.equal(menu()[1].querySelector('.ai-model-name').textContent, 'Second');
+ assert.deepEqual(menu().map(row => row.dataset.id), ['private/second', 'private/first', '__custom__']);
+ assert.equal(menu()[0].querySelector('.ai-model-name').textContent, 'Second');
assert.equal(f.elements.executorId.value, 'codex');
- menu()[1].click();
assert.equal(app.evaluate(`agentEffectiveModel($('#agentForm'))`), 'private/second');
app.router.get('/api/executor-models', () => catalog([{ id: 'private/second', name: 'Renamed model' }]));
app.evaluate(`openAgentWizard({id:'role-review',name:'Review',prompt:'Review changes',executorId:'codex',model:'private/second'})`);
await settle();
- assert.deepEqual(menu().map(row => row.dataset.id), ['', 'private/second', '__custom__']);
+ assert.deepEqual(menu().map(row => row.dataset.id), ['private/second', '__custom__']);
assert.equal(app.document.querySelector('#agentModelPicker [data-model-label]').textContent, 'Renamed model');
+
+ let refresh;
+ app.router.get('/api/executor-models', () => new Promise(resolve => { refresh = resolve; }));
+ app.evaluate(`openAgentWizard()`);
+ f.elements.executorId.value = 'codex';
+ f.elements.executorId.dispatchEvent(new app.window.Event('change', { bubbles: true }));
+ menu().find(row => row.dataset.id === 'private/second').click();
+ await settle();
+ refresh(catalog([{ id: 'private/new', name: 'New model' }]));
+ await settle();
+ assert.equal(app.evaluate(`agentEffectiveModel($('#agentForm'))`), 'private/second');
+});
+
+test('a new role saves the first model from the refreshed catalog', async (t) => {
+ const app = await loadApp();
+ t.after(app.close);
+ const catalog = id => ({ codebuddy: { models: [{ id }] }, codex: { models: [] }, claude: { models: [] } });
+ app.router.get('/api/executor-models', catalog('retired-model'));
+ app.router.put('/api/agents', call => ({ status: 200, body: call.body }));
+ app.evaluate(`openAgentWizard()`);
+ await settle();
+ const model = () => app.evaluate(`agentEffectiveModel($('#agentForm'))`);
+ assert.equal(model(), 'retired-model');
+ app.document.querySelector('#agentModal .modal-close').click();
+
+ let complete;
+ app.router.get('/api/executor-models', () => new Promise(resolve => { complete = resolve; }));
+ app.evaluate(`openAgentWizard(); applyAgentPreset('developer')`);
+ await settle();
+ assert.equal(model(), '');
+ await app.evaluate(`persistAgent($('#agentForm'))`);
+ assert.equal(app.router.calls.some(call => call.path === '/api/agents' && call.method === 'PUT'), false);
+ app.evaluate(`setAgentCreateStep(3)`);
+ complete(catalog('current-model'));
+ await settle();
+ assert.equal(model(), 'current-model');
+ assert.match(app.document.querySelector('#agentCreateReview').textContent, /current-model/);
+ await app.evaluate(`persistAgent($('#agentForm'))`);
+ assert.equal(app.router.calls.find(call => call.path === '/api/agents' && call.method === 'PUT').body.model, 'current-model');
});
test('role effort picker follows each model and resets an unsupported level on model changes', async (t) => {
diff --git a/webtest/tests/runner-codebuddy-environment.test.mjs b/webtest/tests/runner-codebuddy-environment.test.mjs
index 9d8232d1..c975bda4 100644
--- a/webtest/tests/runner-codebuddy-environment.test.mjs
+++ b/webtest/tests/runner-codebuddy-environment.test.mjs
@@ -70,6 +70,7 @@ test('Claude Code, Codex and Antigravity offer account login and API Key rows ex
`);
const choices = [...app.document.querySelectorAll('[data-runner-auth]')];
assert.deepEqual(choices.map(select => select.dataset.runnerAuth), ['runner-cb|codex', 'runner-cb|claude-code', 'runner-cb|agy']);
+ assert.equal(app.document.querySelector('.runner-runtime-icon.agy img')?.getAttribute('src'), '/images/credentials/antigravity.svg');
for (const select of choices) {
assert.deepEqual([...select.options].map(option => option.textContent), ['账号登录', 'API Key']);
}