0.6.0:模型清单改读全局目录,没打开过的部门也能改模型

This commit is contained in:
qyh15 2026-11-08 23:16:14 +08:00
parent 907805b02f
commit a1a40df16c
6 changed files with 215 additions and 101 deletions

View File

@ -1,6 +1,14 @@
# Changelog
> 版本号以 `package.json` 为准(当前 0.5.x 线);下面 0.6.x 条目沿用旧编号,保留作历史。
> 版本号以 `package.json` 为准(当前 0.6.0)。更早的 0.6.x 条目沿用旧编号,保留作历史。
## 0.6.0 — 模型选择真的能用了
- 部门设置里的模型清单原来靠 `modelDirectories.directoryFor(sessionId)` 取该会话的目录,而这个方法只认「本页登记过的会话」,于是每个还没在面板里打开过的部门都读不到模型。现在清单改从宿主的全局目录 `modelDirectories.catalog` 读(`catalog.load()` 一份,所有部门共用),不再依赖会话登记。
- 保存模型改成真正的 RPC:有 `ModelDirectory` 时走 `directory.select(...)`,没有时直接 `remote.session.selectModel({ sessionId, provider, model, reasoningEffort })`。**没在本页打开过的部门也能改模型**,保存后立即生效。
- 「当前模型」读不到该部门自己的选择时,退回全局默认并标明「跟随默认」,不再冒充成别人的选择;界面脚注会说明「该部门会话未在本页打开,选好保存后直接生效」。
- 错误分级:服务缺失 →「当前宿主没有全局模型清单(modelDirectories.catalog)」;清单读取失败 →「读取模型清单失败:<原文>」;6 秒超时 →「读取模型清单超时(显示已知缓存)」;宿主拒绝保存 → 「<code>:<message>」。
- 测试从 4 项模型用例重写为 6 项:服务缺失、清单来自全局且不依赖登记、未登记时保存走 RPC、宿主拒绝原文、清单读取失败保留缓存、正常路径;`node --test` 客户端 35 项全过。
## 0.5.7 — 模型目录读不到时说清是哪一步断了

View File

@ -1,6 +1,6 @@
{
"name": "dsh-sansheng-liubu-mode",
"version": "0.5.7",
"version": "0.6.0",
"private": true,
"description": "上朝:丞相统筹的三省六部多 Agent 模式",
"type": "module",

View File

@ -675,7 +675,7 @@ button.sl-stat-members:focus-visible{outline:2px solid color-mix(in srgb,var(--s
setCatalog((prev) => ({ ...prev, status: "loading", error: null }));
host.loadCatalog(targetId).then((result) => {
if (!alive) return;
setCatalog({ status: "ready", options: result.options, current: result.current, error: result.error, subagent: result.subagent, unresolved: result.unresolved === true });
setCatalog({ status: "ready", options: result.options, current: result.current, error: result.error, subagent: result.subagent, unresolved: result.unresolved === true, inherited: result.inherited === true });
setDraftModel(result.current ? result.current.provider + "/" + result.current.model : "");
setDraftEffort((result.current && result.current.reasoningEffort) || "");
}, (error) => {
@ -692,7 +692,7 @@ button.sl-stat-members:focus-visible{outline:2px solid color-mix(in srgb,var(--s
const currentModelValue = catalog.current ? catalog.current.provider + "/" + catalog.current.model : "";
const currentEffortValue = (catalog.current && catalog.current.reasoningEffort) || "";
const modelDirty = draftModel !== currentModelValue || draftEffort !== currentEffortValue;
const canSaveModel = Boolean(chosenOption && seat && seat.id && modelDirty && !catalog.subagent && !catalog.unresolved && !busy);
const canSaveModel = Boolean(chosenOption && seat && seat.id && modelDirty && !catalog.subagent && !busy);
const applyModel = () => {
if (!chosenOption || !seat || !seat.id) return;
@ -939,7 +939,13 @@ button.sl-stat-members:focus-visible{outline:2px solid color-mix(in srgb,var(--s
onClick: applyModel,
children: busy ? "保存中…" : "保存模型设置",
}),
h("small", { className: modelDirty ? "is-dirty" : "", children: catalog.subagent ? "子会话沿用丞相模型" : catalog.unresolved ? "进入该部门会话后才能改模型" : modelDirty ? "有未保存的更改" : "当前:" + (catalog.current ? modelLabel(catalog.current) : "未设置") }),
h("small", { className: modelDirty ? "is-dirty" : "", children: catalog.subagent
? "子会话沿用丞相模型"
: modelDirty
? "有未保存的更改"
: catalog.inherited
? (catalog.unresolved ? "该部门会话未在本页打开,选好保存后直接生效" : "当前:跟随默认(" + modelLabel(catalog.current) + ")")
: "当前:" + (catalog.current ? modelLabel(catalog.current) : "未设置") }),
]),
]),
catalog.error ? h("div", { className: "sl-error", children: catalog.error }) : null,
@ -1129,23 +1135,6 @@ button.sl-stat-members:focus-visible{outline:2px solid color-mix(in srgb,var(--s
} catch (error) { return undefined; }
};
/** 兜底读全局模型清单用的另一个会话:先找最近活跃的,再找任意已登记的。 */
const sessionsOtherThan = (sessionId) => {
const newest = newestSessionId();
if (newest && newest !== sessionId) return newest;
try {
const snapshot = sessionsStore && typeof sessionsStore.getSnapshot === "function" ? sessionsStore.getSnapshot() : undefined;
const byId = snapshot && snapshot.byId ? snapshot.byId : {};
for (const key of Object.keys(byId)) {
const item = byId[key];
if (!item || item.blank === true) continue;
const id = item.id || key;
if (id && id !== sessionId) return id;
}
} catch (error) { /* 忽略:没有可兜底的会话 */ }
return undefined;
};
/** 主视图当前选中的会话:以 uiWorkspace 的选中记录为准(面板是 root 级槽)。 */
const currentSession = () => {
try {
@ -1185,8 +1174,30 @@ button.sl-stat-members:focus-visible{outline:2px solid color-mix(in srgb,var(--s
}
};
/** 宿主对没登记的会话抛的原话是 session "<id>" resolved no scope / no binding。 */
const unregisteredSession = (detail) => /resolved no (scope|binding)/.test(String(detail || ""));
/** 全局模型清单(宿主一代一份):不依赖任何会话,是模型选择最稳的数据源。 */
const modelCatalogOf = () => {
let service;
try {
service = ctx.modelDirectories || (typeof ctx.get === "function" ? ctx.get("modelDirectories") : undefined);
} catch (error) {
return { error: "读取模型目录服务失败:" + String((error && error.message) || error) };
}
if (!service || typeof service.directoryFor !== "function") return { service: false };
const catalog = service.catalog;
if (!catalog || typeof catalog.load !== "function" || !catalog.store || typeof catalog.store.getSnapshot !== "function") {
return { error: "当前宿主没有全局模型清单(modelDirectories.catalog)" };
}
return { catalog };
};
/** 会话 RPC 面:改模型只认 sessionId,不需要该会话在本页登记。 */
const remoteSession = () => {
try {
const remote = ctx.remote;
const session = remote && remote.session;
return session && typeof session.selectModel === "function" ? session : undefined;
} catch (error) { return undefined; }
};
const sidebarNav = () => {
const candidates = [];
@ -1338,72 +1349,78 @@ button.sl-stat-members:focus-visible{outline:2px solid color-mix(in srgb,var(--s
},
loadCatalog(sessionId) {
const subagentOf = (id) => (typeof sessions.subagentAddress === "function" ? sessions.subagentAddress(id) !== undefined : false);
/** 把目录快照投影成面板要的形状;keepCurrent: false 时不冒充该会话的当前选择。 */
const project = (directory, extra) => {
// 模型清单是全局的:宿主同时只维护一份,任何会话都能读到;会话只决定「当前选的是哪个」。
const global = modelCatalogOf();
if (global.service === false) {
return Promise.resolve({ options: [], current: undefined, inherited: false, error: "当前宿主没有模型目录服务(modelDirectories)", subagent: false, unresolved: false });
}
if (!global.catalog) {
return Promise.resolve({ options: [], current: undefined, inherited: false, error: global.error, subagent: subagentOf(sessionId), unresolved: false });
}
const catalog = global.catalog;
const resolved = modelDirectoryOf(sessionId);
const directory = resolved.directory;
/** 该会话自己的当前模型;没在本页登记时为 undefined。 */
const ownCurrent = () => {
if (!directory) return undefined;
try {
const snapshot = directory.store.getSnapshot();
return {
options: modelOptions(snapshot),
current: extra && extra.keepCurrent === false ? undefined : snapshot.current,
error: (extra && extra.error) || snapshot.error || null,
subagent: subagentOf(sessionId),
unresolved: Boolean(extra && extra.unresolved),
};
} catch (inner) {
return {
options: [],
current: undefined,
error: (extra && extra.error) || "读取模型目录缓存失败:" + String((inner && inner.message) || inner),
subagent: subagentOf(sessionId),
unresolved: false,
};
}
return snapshot && snapshot.current ? snapshot.current : undefined;
} catch (error) { return undefined; }
};
const resolved = modelDirectoryOf(sessionId);
if (resolved.service === false) {
return Promise.resolve({ options: [], current: undefined, error: "当前宿主没有模型目录服务(modelDirectories)", subagent: false, unresolved: false });
}
if (!resolved.directory) {
const detail = resolved.error || "原因未知";
note("模型目录读取失败(" + sessionId + "):" + detail);
if (!unregisteredSession(detail)) {
return Promise.resolve({ options: [], current: undefined, error: "读取模型目录失败:" + detail, subagent: subagentOf(sessionId), unresolved: false });
}
// 该部门会话还没在本页登记:模型清单是全局的,先借另一个会话的目录把它列出来,
// 但不把别人的当前选择当成它的,也不允许在这里保存。
const sibling = sessionsOtherThan(sessionId);
const fallback = sibling ? modelDirectoryOf(sibling).directory : undefined;
if (!fallback) {
return Promise.resolve({ options: [], current: undefined, error: "该部门会话还没有在本页打开,也找不到别的会话读取模型清单;先进入该会话再试。", subagent: subagentOf(sessionId), unresolved: false });
}
return Promise.resolve()
.then(() => fallback.load())
.then(
() => project(fallback, { keepCurrent: false, unresolved: true, error: "该部门会话还没有在本页打开,这里只列出全局模型清单;进入该会话后才能修改它自己的模型。" }),
(error) => project(fallback, { keepCurrent: false, unresolved: true, error: "读取模型清单失败:" + String((error && error.message) || error) }),
);
}
const directory = resolved.directory;
const cached = (message) => project(directory, { error: message });
const directoryError = () => {
if (!directory) return null;
try { return directory.store.getSnapshot().error || null; } catch (error) { return null; }
};
const shape = (extra) => {
let value;
try { value = catalog.store.getSnapshot().value; } catch (error) { value = null; }
const own = ownCurrent();
const fallback = value && value.default ? value.default : undefined;
return {
options: modelOptions(value),
current: own || fallback,
inherited: own ? false : Boolean(fallback),
error: (extra && extra.error) || directoryError() || null,
subagent: subagentOf(sessionId),
unresolved: Boolean(extra && extra.unresolved),
};
};
const cached = (message) => shape({ error: message, unresolved: !directory });
const chain = Promise.resolve()
.then(() => directory.load())
.then(() => project(directory), (error) => cached(String(error && error.message || error)));
return withDeadline(chain, 6000, () => cached("读取模型目录超时(显示已知缓存)"));
.then(() => catalog.load())
.then(() => shape({ unresolved: !directory }), (error) => cached("读取模型清单失败:" + String((error && error.message) || error)));
return withDeadline(chain, 6000, () => cached("读取模型清单超时(显示已知缓存)"));
},
selectModel(sessionId, payload) {
const resolved = modelDirectoryOf(sessionId);
if (resolved.service === false) return Promise.resolve({ ok: false, error: "当前宿主没有模型目录服务(modelDirectories)" });
if (!resolved.directory) {
const detail = resolved.error || "原因未知";
return Promise.resolve({ ok: false, error: unregisteredSession(detail) ? "该部门会话还没有在本页打开,先进入该会话再改它的模型。" : "读取模型目录失败:" + detail });
}
const directory = resolved.directory;
if (directory) {
return Promise.resolve()
.then(() => directory.select(payload))
.then(() => {
const snapshot = directory.store.getSnapshot();
return snapshot.error ? { ok: false, error: snapshot.error } : { ok: true };
}, (error) => ({ ok: false, error: String((error && error.message) || error) }));
}
// 该部门会话没在本页登记时拿不到目录,但「改模型」是宿主 RPC,只认 sessionId。
const remote = remoteSession();
if (!remote) {
return Promise.resolve({ ok: false, error: "当前宿主没有保存模型的接口(remote.session.selectModel)" });
}
const request = { sessionId, provider: payload.provider, model: payload.model };
if (payload.reasoningEffort !== undefined) request.reasoningEffort = payload.reasoningEffort;
return Promise.resolve()
.then(() => directory.select(payload))
.then(() => {
const snapshot = directory.store.getSnapshot();
return snapshot.error ? { ok: false, error: snapshot.error } : { ok: true };
}, (error) => ({ ok: false, error: String(error && error.message || error) }));
.then(() => remote.selectModel(request))
.then((result) => {
if (result && result.ok) return { ok: true };
const failure = result && result.error;
const detail = failure
? (failure.code ? failure.code + ":" + failure.message : String(failure.message || failure))
: "保存模型失败";
return { ok: false, error: detail };
}, (error) => ({ ok: false, error: String((error && error.message) || error) }));
},
selectPreset(sessionId, presetId) {
const remote = presetsRemote();

View File

@ -1,6 +1,6 @@
{
"name": "dsh-sansheng-liubu-panel",
"version": "0.5.7",
"version": "0.6.0",
"private": true,
"description": "三省六部 Agent 面板:在 DSH Web GUI 中常驻显示并切换团队 Agent",
"type": "module",

View File

@ -61,9 +61,24 @@ function loadPlugin() {
return { loaded, exports: loaded.exports, styleCount: () => styleCount, css: () => cssText }
}
/** 全局模型清单的样板值:宿主一代只给一份,任何会话读到的都是它。 */
const CATALOG_VALUE = {
default: { provider: 'deepseek', model: 'deepseek-chat' },
failures: [],
groups: [
{
id: 'deepseek',
name: 'DeepSeek',
models: [
{ id: 'deepseek-chat', name: 'DeepSeek Chat' },
{ id: 'deepseek-reasoner', name: 'DeepSeek Reasoner', reasoning: { defaultEffort: 'high', efforts: [{ id: 'high', name: '高' }] } },
],
},
],
}
/** 模拟宿主 ctx:只实现面板调用到的服务面。 */
function mockContext(prompts = []) {
const registrations = []
function mockContext(prompts = []) { const registrations = []
const injected = []
const selections = []
const tabTypes = []
@ -104,13 +119,20 @@ function mockContext(prompts = []) {
},
uiConversation: { binding: () => ({ target: () => ({ getSnapshot: () => undefined }) }) },
modelDirectories: {
catalog: {
load: async () => CATALOG_VALUE,
store: { getSnapshot: () => ({ value: CATALOG_VALUE, status: 'ready', error: null }) },
},
directoryFor: () => ({
load: async () => {},
select: async () => {},
select: async () => ({ ok: true }),
store: { getSnapshot: () => ({ current: { provider: 'p', model: 'm' }, groups: [], failures: [], status: 'ready', error: null }) },
}),
},
remote: { agentPresets: { list: async () => ({ ok: true, value: { presets: [] } }), select: async () => ({ ok: true }) } },
remote: {
agentPresets: { list: async () => ({ ok: true, value: { presets: [] } }), select: async () => ({ ok: true }) },
session: { selectModel: async () => ({ ok: true }) },
},
layout: { selectPanel(id) { selections.push(id) } },
get() { return undefined },
sidebarRightTabs: { register(descriptor) { tabTypes.push(descriptor); return () => {} } },
@ -803,43 +825,99 @@ test('宿主没有模型目录服务时,错误要说清是服务缺失', async
assert.equal(result.options.length, 0)
assert.match(result.error, /没有模型目录服务/)
assert.notEqual(result.error, '当前宿主未提供模型目录', '不能再用那句笼统的误导文案')
const saved = await host.selectModel('lead-1', { provider: 'deepseek', model: 'deepseek-chat' })
assert.equal(saved.ok, false)
assert.match(saved.error, /没有模型目录服务/)
})
test('会话没登记时借别的会话列出全局清单,但不冒充它的当前选择', async () => {
test('清单来自全局目录,不依赖哪个会话是否在本页登记', async () => {
const calls = []
const snapshot = { current: { provider: 'lead-provider', model: 'lead-model' }, groups: [], failures: [], status: 'ready', error: null }
const { host } = catalogHost({
modelDirectories: {
catalog: {
load: async () => CATALOG_VALUE,
store: { getSnapshot: () => ({ value: CATALOG_VALUE, status: 'ready', error: null }) },
},
directoryFor(sessionId) {
calls.push(sessionId)
if (sessionId === 'dept-9') throw new Error('ui-model-selection: session "dept-9" resolved no scope')
return { load: async () => {}, select: async () => {}, store: { getSnapshot: () => snapshot } }
throw new Error('ui-model-selection: session "' + sessionId + '" resolved no scope')
},
},
})
const result = await host.loadCatalog('dept-9')
assert.equal(result.unresolved, true, '要标记成只读,界面才敢禁用保存')
assert.equal(result.current, undefined, '不能把兜底会话的当前模型当成这个部门的')
assert.match(result.error, /本页打开/)
assert.deepEqual(calls, ['dept-9', 'lead-1'], '先问目标会话,再借已登记的会话')
const saved = await host.selectModel('dept-9', { provider: 'lead-provider', model: 'lead-model' })
assert.equal(saved.ok, false)
assert.match(saved.error, /先进入该会话/)
const result = await host.loadCatalog('libu')
assert.equal(result.error, null, '未登记的会话也要能列出模型')
assert.equal(result.options.map((option) => option.rowId).join(','), 'deepseek/deepseek-chat,deepseek/deepseek-reasoner')
assert.equal(result.inherited, true, '读不到该部门自己的选择时标成跟随默认')
assert.deepEqual(result.current, { provider: 'deepseek', model: 'deepseek-chat' })
assert.equal(result.unresolved, true, '界面据此提示「未在本页打开」')
assert.deepEqual(calls, ['libu'])
})
test('模型目录读取抛别的错时原样带出,不再伪装成服务缺失', async () => {
test('部门会话没在本页登记时,保存直接走宿主 RPC', async () => {
const sent = []
const { host } = catalogHost({
modelDirectories: { directoryFor() { throw new Error('目录服务已崩溃') } },
modelDirectories: {
catalog: {
load: async () => CATALOG_VALUE,
store: { getSnapshot: () => ({ value: CATALOG_VALUE, status: 'ready', error: null }) },
},
directoryFor() { throw new Error('ui-model-selection: session "libu" resolved no binding') },
},
remote: {
agentPresets: { list: async () => ({ ok: true, value: { presets: [] } }), select: async () => ({ ok: true }) },
session: { selectModel: async (request) => { sent.push(request); return { ok: true } } },
},
})
const saved = await host.selectModel('libu', { provider: 'deepseek', model: 'deepseek-reasoner', reasoningEffort: 'high' })
assert.equal(JSON.stringify(saved), JSON.stringify({ ok: true }))
assert.equal(JSON.stringify(sent), JSON.stringify([{ sessionId: 'libu', provider: 'deepseek', model: 'deepseek-reasoner', reasoningEffort: 'high' }]), '要带 sessionId 和推理等级')
})
test('宿主拒绝保存时把原因原样带出', async () => {
const { host } = catalogHost({
modelDirectories: {
catalog: {
load: async () => CATALOG_VALUE,
store: { getSnapshot: () => ({ value: CATALOG_VALUE, status: 'ready', error: null }) },
},
directoryFor() { throw new Error('ui-model-selection: session "libu" resolved no binding') },
},
remote: {
agentPresets: { list: async () => ({ ok: true, value: { presets: [] } }), select: async () => ({ ok: true }) },
session: { selectModel: async () => ({ ok: false, error: { code: 'session/unknown', message: '没有这个会话' } }) },
},
})
const saved = await host.selectModel('libu', { provider: 'deepseek', model: 'deepseek-chat' })
assert.equal(saved.ok, false)
assert.match(saved.error, /session\/unknown:没有这个会话/)
})
test('清单读取失败时说明是读清单失败,并保留已知缓存', async () => {
const { host } = catalogHost({
modelDirectories: {
catalog: {
load: async () => { throw new Error('宿主断线') },
store: { getSnapshot: () => ({ value: null, status: 'error', error: '宿主断线' }) },
},
directoryFor: () => ({
load: async () => {},
select: async () => ({ ok: true }),
store: { getSnapshot: () => ({ current: { provider: 'p', model: 'm' }, groups: [], failures: [], status: 'ready', error: null }) },
}),
},
})
const result = await host.loadCatalog('lead-1')
assert.match(result.error, /读取模型目录失败:目录服务已崩溃/)
assert.match(result.error, /读取模型清单失败:宿主断线/)
assert.deepEqual(result.current, { provider: 'p', model: 'm' }, '清单读不到时仍显示该会话已知的当前模型')
assert.equal(result.unresolved, false)
})
test('模型目录正常时给出清单与当前选择', async () => {
test('正常路径给出全局清单与该会话自己的当前选择', async () => {
const { host } = catalogHost()
const result = await host.loadCatalog('lead-1')
assert.equal(result.error, null)
assert.equal(result.unresolved, false)
assert.equal(result.inherited, false)
assert.equal(result.options.length, 2)
assert.deepEqual(result.current, { provider: 'p', model: 'm' })
})

View File

@ -772,6 +772,14 @@ function createDemoContext() {
}),
},
modelDirectories: {
catalog: {
load: async () => ({
default: catalogSnapshot.current,
groups: catalogSnapshot.groups,
failures: [],
}),
store: { getSnapshot: () => ({ value: catalogSnapshot, status: "ready", error: null }) },
},
directoryFor: () => ({
load: () => Promise.resolve(),
select: () => Promise.resolve({ ok: true }),
@ -786,6 +794,9 @@ function createDemoContext() {
list: async () => ({ ok: true, value: { presets: [] } }),
select: async () => ({ ok: true }),
},
session: {
selectModel: async () => ({ ok: true }),
},
},
get: () => undefined,
layout: { selectPanel: () => {} },