${label?`${escapeHTML(label)}`:''}${credentialCatalogCountText(models.length)}
-
${models.map(credentialCatalogRowHTML).join('')}
+
${models.map(model=>credentialCatalogRowHTML(model,kind.models.engine)).join('')}
${credentialGlyph('layers',16)}
${escapeHTML(copy.title)}${credentialCatalogDetailHTML(mode,kind,protocol)}
@@ -204,7 +258,12 @@ function credentialCatalogRows(catalog){return [...catalog.querySelectorAll('[da
function credentialCatalogRowModel(row){
const id=row.querySelector('[data-catalog-field="id"]').value,name=row.querySelector('[data-catalog-field="name"]').value;
const metadata=row.dataset.catalogMetadata?JSON.parse(row.dataset.catalogMetadata):null;
- return metadata?.id===id.trim()?{...metadata,id,name}:{id,name};
+ const model=metadata?.id===id.trim()?{...metadata,id,name}:{id,name},mode=row.querySelector('[data-catalog-effort-mode]');
+ if(mode){
+ delete model.reasoningEfforts;
+ if(mode.value==='custom')model.reasoningEfforts=[...row.querySelectorAll('[data-catalog-effort]:checked')].map(input=>input.dataset.catalogEffort);
+ }
+ return model;
}
function credentialCatalogFilledRows(catalog){return credentialCatalogRows(catalog).filter(row=>credentialCatalogModels([credentialCatalogRowModel(row)]).length)}
function readCredentialCatalog(catalog){return credentialCatalogModels(credentialCatalogRows(catalog).map(credentialCatalogRowModel))}
@@ -251,7 +310,7 @@ function resetCredentialCatalog(row){
}
function addCredentialCatalogRow(catalog,model={}){
const list=catalog.querySelector('[data-catalog-list]');
- list.insertAdjacentHTML('beforeend',credentialCatalogRowHTML(model));
+ list.insertAdjacentHTML('beforeend',credentialCatalogRowHTML(model,catalog.dataset.catalogEngine));
const row=list.lastElementChild;
hydrateCredentialIcons(row);
credentialCatalogChanged(catalog);
@@ -367,14 +426,21 @@ function applyCredentialCatalogProbe(catalog){
const probe=catalog.probe;if(!probe)return;
const picked=new Set([...catalog.querySelectorAll('[data-catalog-probe] input[type="checkbox"]:checked')].map(input=>input.value));
const offered=new Set(probe.models.map(model=>model.id)),kept=new Set();
+ const discovered=new Map(probe.models.map(model=>[model.id,model]));
let removed=0;
credentialCatalogRows(catalog).forEach(row=>{
const id=row.querySelector('[data-catalog-field="id"]').value.trim();
- if(offered.has(id)&&!picked.has(id)){row.remove();removed++}else kept.add(id);
+ if(offered.has(id)&&!picked.has(id)){row.remove();removed++}else{
+ kept.add(id);
+ if(picked.has(id)&&discovered.has(id)){
+ const current=credentialCatalogRowModel(row),fresh=discovered.get(id);
+ row.outerHTML=credentialCatalogRowHTML({...current,...fresh,name:current.name,reasoningEfforts:current.reasoningEfforts},catalog.dataset.catalogEngine);
+ }
+ }
});
const added=probe.models.filter(model=>picked.has(model.id)&&!kept.has(model.id));
const room=Math.max(0,CREDENTIAL_CATALOG_MAX-kept.size),list=catalog.querySelector('[data-catalog-list]');
- list.insertAdjacentHTML('beforeend',credentialCatalogModels(added.slice(0,room)).map(credentialCatalogRowHTML).join(''));
+ list.insertAdjacentHTML('beforeend',credentialCatalogModels(added.slice(0,room)).map(model=>credentialCatalogRowHTML(model,catalog.dataset.catalogEngine)).join(''));
hydrateCredentialIcons(list);
closeCredentialCatalogProbe(catalog);
credentialCatalogChanged(catalog);
@@ -910,6 +976,7 @@ function bindCredentialPanel(panel){
if(catalog){
if(event.target.closest('[data-catalog-probe]'))return syncCredentialCatalogProbe(catalog);
event.target.closest('.credential-input')?.classList.remove('is-bad');
+ syncCredentialCatalogEfforts(event.target.closest('[data-catalog-row]'));
}
if(event.target.name==='extra'||event.target.name==='protocol'){const catalogBox=form.querySelector('[data-credential-catalog]');if(catalogBox)syncCredentialCatalog(catalogBox)}
if(event.target.name==='secret'){
@@ -1237,6 +1304,7 @@ async function renderPersonalSettings(){
const panel=host.querySelector('#credentialPanel');
bindCredentialPanel(panel);
renderCredentialPanel();
+ loadCredentialEffortCatalogs().then(()=>panel.querySelectorAll('[data-credential-catalog]').forEach(refreshCredentialCatalogEfforts));
hydrateCredentialIcons(host);
setTimeout(()=>panel.classList.remove('is-entering'),900);
// Offer the OAuth shortcut only when the server has a Gongfeng application.
diff --git a/web/assistant_models_test.js b/web/assistant_models_test.js
index 76b4285b..f6fea0e4 100644
--- a/web/assistant_models_test.js
+++ b/web/assistant_models_test.js
@@ -70,6 +70,7 @@ const ctx = {
json: async () => ({
default: 'model-b',
models: [
+ { id: 'default', name: 'CLI 默认模型', family: 'other' },
{ id: 'model-a', name: 'Model A', family: 'claude', credits: 'x1.00' },
{ id: 'model-b', name: 'Model B', family: 'glm', credits: 'x0.06' },
{ id: 'codex:gpt-5.5', name: 'GPT-5.5', family: 'gpt', engine: 'codex' },
@@ -95,8 +96,9 @@ vm.runInContext(moduleSource, ctx);
// must already render a usable label.
assert.equal(api.codeBuddyModel('codex:gpt-5.5'), 'default', 'codex ids fall back before the catalog loads');
api.paint(toggle, api.DEFAULT);
- assert.equal(label.textContent, 'CLI 默认模型');
+ assert.equal(label.textContent, '默认');
assert.equal(icon.dataset.family, 'other');
+ assert.equal(api.codeBuddyModels().length, 0, 'the placeholder is not selectable before loading');
await api.load();
assert.equal(api.catalog().default, 'model-b');
diff --git a/web/orchestrate.js b/web/orchestrate.js
index aa718bfb..4cbab417 100644
--- a/web/orchestrate.js
+++ b/web/orchestrate.js
@@ -11,7 +11,10 @@ function aiOrchestratorEngine(model) {
}
function selectedAIOrchestratorModel() {
- return localStorage.getItem('agentflow.orchestratorModel') || localStorage.getItem('agentflow.assistantModel') || window.AgentFlowAssistantModels?.catalog().default || '';
+ const api = window.AgentFlowAssistantModels;
+ const remembered = localStorage.getItem('agentflow.orchestratorModel') || localStorage.getItem('agentflow.assistantModel');
+ if (remembered && remembered !== api?.DEFAULT) return remembered;
+ return api?.codeBuddyModels()[0]?.id || api?.catalog().default || remembered || '';
}
function aiOrchestratorModels(engine = aiOrchestratorEngine(selectedAIOrchestratorModel())) {
@@ -53,10 +56,14 @@ function bindAIOrchestratorModelPicker() {
const search = host.querySelector('[data-model-search]');
const list = host.querySelector('[role="listbox"]');
const selected = () => cli ? aiOrchestratorEngine(selectedAIOrchestratorModel()) : selectedAIOrchestratorModel();
- const items = () => cli ? aiOrchestratorEngines().map(engine => ({...engine, icon: false, disabled: engine.configured === false || !aiOrchestratorModels(engine.id).length})) : aiOrchestratorModels();
+ const items = () => cli ? aiOrchestratorEngines().map(engine => ({
+ ...engine,
+ icon: false,
+ disabled: engine.configured === false || (engine.id !== 'codebuddy' && !aiOrchestratorModels(engine.id).length),
+ })) : aiOrchestratorModels();
const paint = () => {
const id = selected();
- const item = items().find(item => item.id === id) || {id, name: id};
+ const item = items().find(item => item.id === id) || {id, name: !cli && id === api.DEFAULT ? '默认' : id};
api.paintItem(toggle, item);
if (cli) paintCLIIcon(toggle.querySelector('.ai-model-icon'), id);
};
@@ -79,7 +86,9 @@ function bindAIOrchestratorModelPicker() {
if (cli) {
const models = aiOrchestratorModels(id);
const remembered = localStorage.getItem('agentflow.orchestratorModel.' + id);
- model = models.find(item => item.id === (id === selected() ? selectedAIOrchestratorModel() : remembered))?.id || models.find(item => item.id === api.catalog().default)?.id || models[0]?.id;
+ const preference = id === selected() ? selectedAIOrchestratorModel() : remembered;
+ const fallback = models[0]?.id || (id === 'codebuddy' ? api.catalog().default || api.DEFAULT : '');
+ model = models.find(item => item.id === preference)?.id || fallback;
}
if (!model) return;
selectAIOrchestratorModel(model);
diff --git a/web/orchestrate_models_test.js b/web/orchestrate_models_test.js
index 5c815b42..bcb0178b 100644
--- a/web/orchestrate_models_test.js
+++ b/web/orchestrate_models_test.js
@@ -143,5 +143,13 @@ dom.run(`
request = await send();
assert.equal(request.sessionId, '');
assert.equal(request.messages.length, 1);
+
+ catalog.default = 'default';
+ await dom.run('AgentFlowAssistantModels.load()');
+ store.delete('agentflow.orchestratorModel.codebuddy');
+ choose(cli, 'codebuddy');
+ assert.equal((await send()).model, 'cb-model', 'switching to CodeBuddy picks the first offered model');
+ open(model);
+ assert.deepEqual([...model.list.querySelectorAll('[role="option"]')].map(option => option.dataset.id), ['cb-model']);
console.log('orchestrator multi-CLI models ok');
})().catch(error => { console.error(error); process.exit(1); });
diff --git a/web/platform.css b/web/platform.css
index 89de6401..7f191418 100644
--- a/web/platform.css
+++ b/web/platform.css
@@ -2472,6 +2472,15 @@ html[data-theme="dark"] .credential-logo.monochrome img{filter:invert(1)}
.credential-catalog-row:hover{border-color:var(--cr-line)}
.credential-catalog-row .credential-input input{height:32px;font-size:12.5px}
.credential-catalog-row .credential-input input.credential-mono{font-size:12px}
+.credential-catalog-effort{grid-column:2/4;min-width:0;padding:0 2px 5px;color:var(--cr-muted);font-size:11.5px}
+.credential-catalog-effort summary{cursor:pointer;line-height:24px}
+.credential-catalog-effort summary span{margin-left:8px;color:var(--cr-tertiary);overflow-wrap:anywhere}
+.credential-catalog-effort-mode{display:flex;align-items:center;gap:10px;margin:4px 0 8px}
+.credential-catalog-effort-mode select{padding:4px 8px;border:1px solid var(--cr-line);border-radius:6px;background:var(--cr-surface);color:var(--cr-text);font:inherit}
+.credential-catalog-effort-levels{display:flex;flex-wrap:wrap;gap:8px 14px;padding-bottom:4px}
+.credential-catalog-effort-levels label{display:flex;align-items:center;gap:5px;cursor:pointer;color:var(--cr-text-2)}
+.credential-catalog-effort-levels input{margin:0;accent-color:var(--cr-accent)}
+.credential-catalog-effort-levels small{flex-basis:100%;color:var(--cr-tertiary);font-size:11px;line-height:1.5}
.credential-catalog-grip{display:grid;place-items:center;width:24px;height:30px;margin:0;padding:0;border:0;border-radius:6px;background:transparent;color:var(--cr-tertiary);cursor:grab;touch-action:none}
.credential-catalog-grip:hover{background:var(--cr-hover);color:var(--cr-text)}
.credential-catalog-grip:focus-visible{outline:2px solid color-mix(in srgb,var(--cr-accent) 65%,transparent);outline-offset:1px;color:var(--cr-text)}
diff --git a/webtest/tests/assets-agents.test.mjs b/webtest/tests/assets-agents.test.mjs
index d767b208..07042836 100644
--- a/webtest/tests/assets-agents.test.mjs
+++ b/webtest/tests/assets-agents.test.mjs
@@ -129,3 +129,49 @@ test('role model picker reloads the editor catalog and preserves a CLI change wh
assert.deepEqual(menu().map(row => row.dataset.id), ['', 'private/second', '__custom__']);
assert.equal(app.document.querySelector('#agentModelPicker [data-model-label]').textContent, 'Renamed model');
});
+
+test('role effort picker follows each model and resets an unsupported level on model changes', async (t) => {
+ const app = await loadApp();
+ t.after(app.close);
+ const xhigh = { value:'xhigh', label:'超高 xhigh' };
+ app.router.get('/api/executor-models', {
+ codebuddy:{models:[],efforts:[]}, claude:{models:[],efforts:[]},
+ codex:{customModel:true,models:[{id:'reasoner',name:'Reasoner',efforts:[xhigh]}, {id:'plain',name:'Plain',efforts:[]}],efforts:[{value:'low',label:'低 low'},xhigh]},
+ });
+ app.evaluate(`
+ state.data.executors=[{id:'codebuddy',name:'CodeBuddy'}, {id:'codex',name:'Codex'}];
+ openAgentWizard({id:'test-role',name:'Test',prompt:'Test',executorId:'codex',model:'reasoner',effort:'xhigh'});
+ `);
+ await settle();
+ const choices = () => [...app.document.querySelectorAll('#agentEffortPicker [role=option]')].map(row=>row.dataset.id);
+ assert.deepEqual(choices(), ['', 'xhigh']);
+ assert.equal(app.document.querySelector('#agentEffortPicker [name="effort"]').value, 'xhigh');
+ app.document.querySelector('#agentModelPicker [data-id="plain"]').click();
+ assert.deepEqual(choices(), ['']);
+ assert.equal(app.document.querySelector('#agentEffortPicker [name="effort"]').value, '');
+});
+
+test('a personal catalog does not rewrite an existing role effort during a name edit', async (t) => {
+ const app = await loadApp();
+ t.after(app.close);
+ let loaded;
+ app.router.get('/api/executor-models', () => new Promise(resolve => { loaded = resolve; }));
+ app.router.put('/api/agents', call => ({ status: 200, body: call.body }));
+ app.evaluate(`
+ state.data.executors=[{id:'codebuddy',name:'CodeBuddy'}, {id:'codex',name:'Codex'}];
+ openAgentWizard({id:'agent-1',name:'Developer',prompt:'Review',executorId:'codex',model:'reasoner',effort:'xhigh'});
+ `);
+ await settle();
+ loaded({codex:{customModel:true,models:[{id:'reasoner',name:'Reasoner',efforts:[]}],efforts:[]}});
+ await settle();
+ const picker = app.document.querySelector('#agentEffortPicker');
+ assert.deepEqual([...picker.querySelectorAll('[role=option]')].map(item=>item.dataset.id), ['']);
+ assert.equal(picker.querySelector('[data-model-label]').textContent, 'xhigh');
+ await app.evaluate(`
+ $('#agentForm').elements.name.value='Renamed';
+ persistAgent($('#agentForm'));
+ `);
+ const saved = app.router.calls.find(call=>call.path==='/api/agents'&&call.method==='PUT').body;
+ assert.equal(saved.name, 'Renamed');
+ assert.equal(saved.effort, 'xhigh');
+});
diff --git a/webtest/tests/model-catalog-efforts.test.mjs b/webtest/tests/model-catalog-efforts.test.mjs
new file mode 100644
index 00000000..c176b77f
--- /dev/null
+++ b/webtest/tests/model-catalog-efforts.test.mjs
@@ -0,0 +1,120 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { loadApp, settle } from '../lib/load-app.mjs';
+
+const levels = ['low', 'medium', 'high', 'xhigh', 'max', 'ultra'];
+const catalogs = {
+ codebuddy: { models: [], efforts: levels.map(value => ({ value, label: value })) },
+ codex: { models: [], efforts: levels.map(value => ({ value, label: value })) },
+ claude: { models: [], efforts: levels.map(value => ({ value, label: value })) },
+ cursor: { models: [], efforts: levels.map(value => ({ value, label: value })) },
+};
+
+async function editor(t, models, engine='codex', catalogReply=catalogs) {
+ const app = await loadApp();
+ t.after(app.close);
+ app.router.get('/api/executor-models?builtin=1', catalogReply);
+ const credential = engine==='cursor'
+ ? {agentCliCredentials:{cursor:{apiKeyConfigured:true,models,modelsCustomized:true}}}
+ : {codexApiKeyConfigured:true,codexModels:models};
+ app.evaluate(`
+ state.currentUser={...state.data.users[0],id:1,isGuest:false,...${JSON.stringify(credential)}};
+ state.data.users[0]=state.currentUser;
+ `);
+ app.router.put('/api/users/1/credentials', ({body}) => ({ id:1, codexApiKeyConfigured:true, ...body }));
+ await app.evaluate('renderPersonalSettings()');
+ await settle();
+ const kind=engine==='cursor'?'agentCli.cursor':'codexApiKey';
+ app.evaluate(`toggleCredentialRow(${JSON.stringify(kind)},true)`);
+ const row = app.document.querySelector(`[data-credential-row="${kind}"]`);
+ return { app, row, catalog: row.querySelector('[data-credential-catalog]') };
+}
+
+function input(app, element, value) {
+ if(element.type === 'checkbox') element.checked = value;
+ else element.value = value;
+ element.dispatchEvent(new app.window.Event('input', { bubbles:true }));
+}
+
+test('model effort edits save independently of ID and name, and automatic differs from default-only', async t => {
+ const {app,row,catalog} = await editor(t, [{id:'gateway',reasoningEfforts:['high','low']}, {id:'legacy'}]);
+ const save = () => row.querySelector('[data-credential-act="save"]');
+ assert.equal(save().disabled, true, 'opening a stored catalog never reorders it into a dirty state');
+ const model = catalog.querySelector('[data-catalog-row]');
+ model.querySelector('details').open = true;
+ input(app, model.querySelector('[data-catalog-effort="high"]'), false);
+ assert.equal(save().disabled, false, 'capability-only edits enable save');
+ assert.equal(model.querySelector('[data-catalog-effort-summary]').textContent, 'low');
+ save().click();
+ await settle();
+ const saved = app.router.calls.find(call => call.method === 'PUT').body;
+ assert.deepEqual(saved.codexModels, [{id:'gateway',reasoningEfforts:['low']}, {id:'legacy'}]);
+
+ app.evaluate(`toggleCredentialRow('codexApiKey',true)`);
+ const fresh = app.document.querySelector('[data-credential-row="codexApiKey"] [data-catalog-row]');
+ input(app, fresh.querySelector('[data-catalog-effort="low"]'), false);
+ assert.deepEqual(JSON.parse(app.evaluate(`JSON.stringify(readCredentialCatalog(document.querySelector('[data-credential-row="codexApiKey"] [data-credential-catalog]')))`))[0].reasoningEfforts, []);
+ input(app, fresh.querySelector('[data-catalog-effort-mode]'), 'auto');
+ const automatic = JSON.parse(app.evaluate(`JSON.stringify(readCredentialCatalog(document.querySelector('[data-credential-row="codexApiKey"] [data-credential-catalog]')))`));
+ assert.equal(Object.hasOwn(automatic[0], 'reasoningEfforts'), false);
+ assert.equal(fresh.querySelector('[data-catalog-effort-levels]').hidden, true);
+});
+
+test('re-probing changes automatic capabilities and keeps explicit overrides', async t => {
+ const {app,row,catalog} = await editor(t, [
+ {id:'automatic',name:'My name',discoveredReasoningEfforts:['low']},
+ {id:'custom',discoveredReasoningEfforts:['low'],reasoningEfforts:['low']},
+ {id:'default-only',reasoningEfforts:[]},
+ ]);
+ app.router.post('/api/users/1/cli-models/probe', {
+ source:'remote', models:[
+ {id:'automatic',name:'Remote name',discoveredReasoningEfforts:['high','xhigh']},
+ {id:'custom',discoveredReasoningEfforts:['high']},
+ {id:'default-only',discoveredReasoningEfforts:['high']},
+ ],
+ });
+ catalog.querySelector('[data-catalog-act="probe"]').click();
+ await settle();
+ catalog.querySelector('[data-catalog-act="probe-apply"]').click();
+ const modes = [...catalog.querySelectorAll('[data-catalog-effort-mode]')];
+ assert.deepEqual(modes.map(mode=>mode.value), ['auto','custom','custom']);
+ assert.equal(catalog.querySelector('[data-catalog-effort-summary]').textContent, '自动 · high / xhigh');
+ const save = row.querySelector('[data-credential-act="save"]');
+ assert.equal(save.disabled, false);
+ save.click();
+ await settle();
+ assert.deepEqual(app.router.calls.find(call => call.method === 'PUT').body.codexModels, [
+ {id:'automatic',name:'My name',discoveredReasoningEfforts:['high','xhigh']},
+ {id:'custom',discoveredReasoningEfforts:['high'],reasoningEfforts:['low']},
+ {id:'default-only',discoveredReasoningEfforts:['high'],reasoningEfforts:[]},
+ ]);
+});
+
+test('metadata-only refresh is dirty and leaves Cursor model-ID mappings intact', async t => {
+ const {app,catalog} = await editor(t, [{id:'family',efforts:{high:'family-high',low:'family-low'},defaultEffort:'low'}], 'cursor');
+ const row = catalog.querySelector('[data-catalog-row]');
+ input(app, row.querySelector('[data-catalog-effort-mode]'), 'custom');
+ input(app, row.querySelector('[data-catalog-effort="high"]'), true);
+ const payload = JSON.parse(app.evaluate(`JSON.stringify(credentialCatalogPayload(document.querySelector('[data-credential-row="agentCli.cursor"] [data-credential-catalog]')))`));
+ assert.deepEqual(payload[0].efforts, {high:'family-high',low:'family-low'});
+ assert.equal(payload[0].defaultEffort, 'low');
+ assert.deepEqual(payload[0].reasoningEfforts, ['high']);
+});
+
+test('late CLI capabilities fill in missing choices without replacing unsaved effort edits', async t => {
+ let finish;
+ const pending=new Promise(resolve=>{finish=resolve});
+ const {app,catalog}=await editor(t,[{id:'slow-model',reasoningEfforts:['high']}],'codex',()=>pending);
+ const high=catalog.querySelector('[data-catalog-effort="high"]');
+ assert.ok(high);
+ assert.equal(catalog.querySelector('[data-catalog-effort="xhigh"]'),null);
+ input(app,high,false);
+ high.focus();
+ finish(catalogs);
+ await settle();
+ assert.ok(catalog.querySelector('[data-catalog-effort="xhigh"]'));
+ assert.equal(high.checked,false);
+ assert.equal(app.document.activeElement,high);
+ const payload=JSON.parse(app.evaluate(`JSON.stringify(credentialCatalogPayload(document.querySelector('[data-credential-row="codexApiKey"] [data-credential-catalog]')))`));
+ assert.deepEqual(payload[0].reasoningEfforts,[]);
+});
diff --git a/webtest/tests/sync-schedule.test.mjs b/webtest/tests/sync-schedule.test.mjs
index 9b398502..cc40ab05 100644
--- a/webtest/tests/sync-schedule.test.mjs
+++ b/webtest/tests/sync-schedule.test.mjs
@@ -541,7 +541,7 @@ test('AI schedule model picker includes account login CLI models and keeps a sav
const app = await loadApp();
t.after(app.close);
app.router.get('/api/assistant/models', call => ({
- default: 'glm-test',
+ default: 'default',
models: [
{ id: 'glm-test', name: 'GLM Test', family: 'glm' },
{ id: 'claude-test', name: 'Claude Test', family: 'claude' },