From 3f192b28f5225b508db23112a8950af7edbddff8 Mon Sep 17 00:00:00 2001 From: qyh15 Date: Mon, 9 Nov 2026 00:01:21 +0800 Subject: [PATCH] =?UTF-8?q?0.9.0=EF=BC=9A=E7=94=A8=E6=88=B7=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=BB=95=E8=BF=87=E4=B8=9E=E7=9B=B8=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E6=B4=BE=E6=B4=BB=EF=BC=8C=E6=94=B9=E6=A8=A1=E5=9E=8B=E4=B9=9F?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=80=9F=E4=B8=9E=E7=9B=B8=E4=BC=9A=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 8 ++- package.json | 2 +- panel/lib/client.js | 125 ++++++++++++++++++++++++++++++++++---- panel/package.json | 2 +- panel/test/client.test.js | 85 ++++++++++++++++++++++++++ scripts/preview.mjs | 3 + 6 files changed, 210 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a2ce0b..a278204 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,13 @@ # Changelog -> 版本号以 `package.json` 为准(当前 0.8.0)。更早的 0.6.x 条目沿用旧编号,保留作历史。 +> 版本号以 `package.json` 为准(当前 0.9.0)。更早的 0.6.x 条目沿用旧编号,保留作历史。 +## 0.9.0 — 你也可以直接给部门派活,模型不再绕丞相 + +- 席位详情里新增「直接派活」:写清要办的事,点「派给礼部」,消息直接进该部门自己的会话——丞相收不到、也不参与。丞相照旧可以自己派活,两条路互不干扰。 +- 派活走宿主 `subagents.prompt`(`{ requestId, parentSessionId, childSessionId, mode: "continuable", delivery: "queue" }`),每次带独立 requestId;宿主拒绝时把原因原样显示。 +- 改模型不再借丞相的会话:先在部门自己的会话里执行 `/dept-model`,那个会话冷着就退到任一已登记会话——指令只写全局路由表,依然不产生对话消息、不唤醒模型。 +- 测试新增 4 项(派活投递、非子会话报错、模型优先用部门会话、失败回退且不发消息),全量 54 项通过。 ## 0.8.0 — 换完即存,不再惊动智能体 - 模型和推理等级改成**选完就保存**,去掉「保存模型设置」按钮;脚注直接显示「自动保存 · 当前:…」。 diff --git a/package.json b/package.json index c06710f..fab6328 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dsh-sansheng-liubu-mode", - "version": "0.8.0", + "version": "0.9.0", "private": true, "description": "上朝:丞相统筹的三省六部多 Agent 模式", "type": "module", diff --git a/panel/lib/client.js b/panel/lib/client.js index 40b5790..03ff17a 100644 --- a/panel/lib/client.js +++ b/panel/lib/client.js @@ -509,6 +509,9 @@ window.__ModuleLoader__.load({ .sl-model-foot small.is-dirty{color:#b45309} .sl-link-button{appearance:none;align-self:flex-start;border:0;background:none;padding:0;color:var(--sl-accent);font:inherit;font-size:10px;line-height:16px;cursor:pointer} .sl-conversation-block{display:flex;flex-direction:column;gap:7px} +.sl-delegate-block{display:flex;flex-direction:column;gap:8px;padding-top:2px} +.sl-delegate-block textarea{width:100%;box-sizing:border-box;resize:vertical;min-height:54px;border:1px solid var(--sl-line);border-radius:9px;background:var(--sl-card);color:inherit;font:inherit;font-size:11px;line-height:17px;padding:7px 9px} +.sl-delegate-block textarea::placeholder{color:var(--dsw-alias-label-tertiary,#8a8f98)} .sl-conversation-action{width:100%;min-height:40px;display:flex;align-items:center;justify-content:space-between;gap:10px;padding:0 13px;border:1px solid transparent;border-radius:10px;background:var(--sl-accent);color:#fff;font:inherit;font-size:12px;line-height:18px;font-weight:600;cursor:pointer;box-shadow:0 4px 12px color-mix(in srgb,var(--sl-accent) 18%,transparent)} .sl-conversation-action:hover{background:color-mix(in srgb,var(--sl-accent) 88%,#172554)} .sl-conversation-action:focus-visible{outline:2px solid color-mix(in srgb,var(--sl-accent) 60%,transparent);outline-offset:2px} @@ -694,6 +697,8 @@ button.sl-stat-members:focus-visible{outline:2px solid color-mix(in srgb,var(--s const [notice, setNotice] = React.useState(null); const [busy, setBusy] = React.useState(false); const [catalogRetry, setCatalogRetry] = React.useState(0); + const [delegationText, setDelegationText] = React.useState(""); + const [delegating, setDelegating] = React.useState(false); const targetId = seat && seat.id ? seat.id : seat && seat.role === "lead" ? leadSessionId : undefined; @@ -733,7 +738,7 @@ button.sl-stat-members:focus-visible{outline:2px solid color-mix(in srgb,var(--s setBusy(true); setNotice(null); const request = plan.via === "command" - ? host.routeModel(seat.role, plan.payload) + ? host.routeModel(seat.role, plan.payload, seat.id) : host.selectModel(seat.id, plan.payload); request.then((result) => { setBusy(false); @@ -768,6 +773,18 @@ button.sl-stat-members:focus-visible{outline:2px solid color-mix(in srgb,var(--s ? "回到统一受理需求的主会话;部门对话不会自动转呈丞相。" : "进入该部门自己的 DSH 会话;消息不会自动同步给丞相。"; + const sendDelegation = () => { + const body = delegationText.trim(); + if (body === "" || !seat || !seat.id) return; + setDelegating(true); + setNotice(null); + host.dispatchToSeat(seat.id, body).then((result) => { + setDelegating(false); + if (result.ok) { setDelegationText(""); setNotice({ kind: "ok", text: "已派给" + seat.label }); } + else setNotice({ kind: "error", text: result.error }); + }); + }; + const openSeatConversation = () => { if (!targetId) { setNotice({ kind: "error", text: "该部门还没有可进入的会话,请先让丞相组建朝班。" }); @@ -1008,6 +1025,28 @@ button.sl-stat-members:focus-visible{outline:2px solid color-mix(in srgb,var(--s ], }), h("p", { className: "sl-conversation-hint", children: onTargetConversation ? "你当前就在这个会话中。" : conversationHint }), + seat && seat.id && seat.role !== "lead" ? h("div", { className: "sl-delegate-block" }, [ + h("label", { className: "sl-control" }, [ + h("span", { children: "直接派活" }), + h("textarea", { + rows: 2, + "aria-label": "直接派活给" + seat.label, + placeholder: "不经过丞相,直接交给" + seat.label + "办", + value: delegationText, + onChange: (event) => setDelegationText(event.target.value), + }), + ]), + h("div", { className: "sl-model-foot" }, [ + h("button", { + type: "button", + className: "sl-btn primary", + disabled: delegating || delegationText.trim() === "", + onClick: sendDelegation, + children: delegating ? "派发中…" : "派给" + seat.label, + }), + h("small", { children: "直接进该部门会话,丞相收不到这条" }), + ]), + ]) : null, ]), h("details", { className: "sl-advanced" }, [ h("summary", { children: "高级信息" }), @@ -1237,6 +1276,42 @@ button.sl-stat-members:focus-visible{outline:2px solid color-mix(in srgb,var(--s } catch (error) { return undefined; } }; + /** 改模型时按这个顺序找执行者:部门自己 > 其它会话 > 丞相(只当执行上下文,不投递消息)。 */ + const routeCandidates = (preferredSessionId) => { + const lead = currentSession(); + const list = []; + if (preferredSessionId) list.push(preferredSessionId); + try { + const snapshot = sessions.list && typeof sessions.list.getSnapshot === "function" ? sessions.list.getSnapshot() : undefined; + const ids = (snapshot && snapshot.ids) || []; + for (const id of ids) if (id !== preferredSessionId && id !== lead) list.push(id); + } catch (error) { /* 忽略 */ } + if (lead && list.indexOf(lead) < 0) list.push(lead); + return list; + }; + + /** 子会话投递面:用户直接派活给某个部门,绕开丞相。 */ + const remoteSubagents = () => { + try { + const remote = ctx.remote; + const subagents = remote && remote.subagents; + return subagents && typeof subagents.prompt === "function" ? subagents : undefined; + } catch (error) { return undefined; } + }; + + /** 子会话地址:谁把我召来的。 */ + const subagentAddressOf = (sessionId) => { + if (!sessionId || !sessions || typeof sessions.subagentAddress !== "function") return undefined; + try { return sessions.subagentAddress(sessionId); } catch (error) { return undefined; } + }; + + const mintRequestId = () => { + try { + if (globalThis.crypto && typeof globalThis.crypto.randomUUID === "function") return globalThis.crypto.randomUUID(); + } catch (error) { /* 忽略 */ } + return "req-" + Date.now().toString(36) + "-" + Math.random().toString(16).slice(2); + }; + /** 指令 RPC 面:直接执行斜杠指令,不经过模型,也不进对话。 */ const remoteCommands = () => { try { @@ -1475,21 +1550,26 @@ button.sl-stat-members:focus-visible{outline:2px solid color-mix(in srgb,var(--s }, /** 子会话不能直接改模型,改由丞相会话把指令下发给模式插件。 */ /** 子会话不能直接改模型:用 commands/execute 直接跑指令,全程不碰模型。 */ - routeModel(role, payload) { + routeModel(role, payload, preferredSessionId) { const commands = remoteCommands(); if (!commands) return Promise.resolve({ ok: false, error: "当前宿主没有直接执行指令的接口(remote.commands.execute)" }); - const lead = currentSession(); - if (!lead) return Promise.resolve({ ok: false, error: "没有可下发指令的丞相会话" }); const line = "/" + DEPT_MODEL_COMMAND + " " + role + " " + payload.provider + " " + payload.model + (payload.reasoningEffort ? " " + payload.reasoningEffort : ""); - return Promise.resolve() - .then(() => commands.execute(lead, line, [])) - .then((result) => { - const outcome = result && result.result; - if (outcome && outcome.kind === "success") return { ok: true, text: line }; - const detail = outcome && outcome.kind === "error" ? outcome.text : undefined; - return { ok: false, error: detail || "宿主没有执行这条指令(可能还没有重启)" }; - }, (error) => ({ ok: false, error: String((error && error.message) || error) })); + // 先在部门自己的会话里执行;它冷着或被回收时再退到别的会话(指令只写全局路由表,不碰任何对话)。 + const candidates = routeCandidates(preferredSessionId); + const attempt = (index, lastError) => { + if (index >= candidates.length) return Promise.resolve({ ok: false, error: lastError || "没有可执行这条指令的会话" }); + const agent = candidates[index]; + return Promise.resolve() + .then(() => commands.execute(agent, line, [])) + .then((result) => { + const outcome = result && result.result; + if (outcome && outcome.kind === "success") return { ok: true, text: line, agent: agent }; + const detail = outcome && outcome.kind === "error" ? outcome.text : undefined; + return attempt(index + 1, detail || "宿主没有执行这条指令(可能还没有重启)"); + }, (error) => attempt(index + 1, String((error && error.message) || error))); + }; + return attempt(0, undefined); }, selectPreset(sessionId, presetId) { const remote = presetsRemote(); @@ -1509,6 +1589,27 @@ button.sl-stat-members:focus-visible{outline:2px solid color-mix(in srgb,var(--s } }, getLastAction() { return lastAction; }, + /** 用户直接派活:走 subagent 投递,丞相完全不知道这条。 */ + dispatchToSeat(sessionId, text) { + const body = String(text === undefined || text === null ? "" : text).trim(); + if (body === "") return Promise.resolve({ ok: false, error: "先说清要派什么活" }); + if (!sessionId) return Promise.resolve({ ok: false, error: "该部门还没有会话,先让丞相组建朝班" }); + const remote = remoteSubagents(); + if (!remote) return Promise.resolve({ ok: false, error: "当前宿主没有子会话投递接口(remote.subagents.prompt)" }); + const address = subagentAddressOf(sessionId); + if (!address || !address.parentSessionId) return Promise.resolve({ ok: false, error: "这个会话不是子会话,直接在它自己的对话里说就行" }); + return Promise.resolve() + .then(() => remote.prompt({ + requestId: mintRequestId(), + parentSessionId: address.parentSessionId, + childSessionId: sessionId, + mode: "continuable", + delivery: "queue", + content: [{ type: "text", text: body }], + })) + .then((result) => (result && result.messageId ? { ok: true, messageId: result.messageId } : { ok: false, error: "投递失败" }), + (error) => ({ ok: false, error: String((error && error.message) || error) })); + }, sendPrompt(sessionId, text) { return deliverPrompt(sessionId, text); }, diff --git a/panel/package.json b/panel/package.json index 6a9518f..03bd3a8 100644 --- a/panel/package.json +++ b/panel/package.json @@ -1,6 +1,6 @@ { "name": "dsh-sansheng-liubu-panel", - "version": "0.8.0", + "version": "0.9.0", "private": true, "description": "三省六部 Agent 面板:在 DSH Web GUI 中常驻显示并切换团队 Agent", "type": "module", diff --git a/panel/test/client.test.js b/panel/test/client.test.js index 7eb045c..51aebfa 100644 --- a/panel/test/client.test.js +++ b/panel/test/client.test.js @@ -139,6 +139,7 @@ function mockContext(prompts = []) { const registrations = [] agentPresets: { list: async () => ({ ok: true, value: { presets: [] } }), select: async () => ({ ok: true }) }, session: { selectModel: async () => ({ ok: true }) }, commands: { execute: async () => ({ commandId: 'cmd-1', result: { kind: 'success' } }) }, + subagents: { prompt: async () => ({ messageId: 'msg-1' }) }, }, layout: { selectPanel(id) { selections.push(id) } }, get() { return undefined }, @@ -1007,3 +1008,87 @@ test('还没召见的部门也能先选好模型,保存走 /dept-model', async // 详情区的模型设置对缺席席位也要渲染出来(不再是 seat.present 才给)。 assert.match(source, /seat \? h\("div", \{ className: "sl-setting-block" \}, \[/, '模型设置绑定席位,而不是绑定「已召见」') }) + +test('用户直接派活:走 subagent 投递,不经过丞相', async () => { + const delivered = [] + const { host } = catalogHost({ + sessions: { + list: { getSnapshot: () => ({ ids: ['lead-1', 'gongbu-1'], byId: {}, projectionsBySession: {} }), subscribe: () => () => {} }, + binding: () => ({ session: { prompt: async () => ({ ok: true }) } }), + subagentAddress: (sessionId) => (sessionId === 'gongbu-1' ? { parentSessionId: 'lead-1', childSessionId: 'gongbu-1' } : undefined), + refreshProjections: async () => {}, + }, + remote: { + agentPresets: { list: async () => ({ ok: true, value: { presets: [] } }), select: async () => ({ ok: true }) }, + session: { selectModel: async () => ({ ok: true }) }, + commands: { execute: async () => ({ commandId: 'cmd-1', result: { kind: 'success' } }) }, + subagents: { prompt: async (request) => { delivered.push(request); return { messageId: 'msg-1' } } }, + }, + }) + const result = await host.dispatchToSeat('gongbu-1', '把安装脚本补完') + assert.equal(result.ok, true) + assert.equal(delivered.length, 1) + assert.equal(delivered[0].parentSessionId, 'lead-1') + assert.equal(delivered[0].childSessionId, 'gongbu-1') + assert.equal(delivered[0].mode, 'continuable') + assert.equal(delivered[0].delivery, 'queue') + assert.equal(JSON.stringify(delivered[0].content), JSON.stringify([{ type: 'text', text: '把安装脚本补完' }])) + assert.equal(typeof delivered[0].requestId, 'string') + assert.ok(delivered[0].requestId.length > 0, '每次投递都要带独立的 requestId') +}) + +test('不是子会话时,直接派活要说清原因', async () => { + const { host } = catalogHost() + const result = await host.dispatchToSeat('lead-1', '随便说说') + assert.equal(result.ok, false) + assert.match(result.error, /不是子会话/) +}) + +test('改模型优先在部门自己的会话里执行指令', async () => { + const executed = [] + const { host } = catalogHost({ + remote: { + agentPresets: { list: async () => ({ ok: true, value: { presets: [] } }), select: async () => ({ ok: true }) }, + session: { selectModel: async () => ({ ok: true }) }, + subagents: { prompt: async () => ({ messageId: 'msg-1' }) }, + commands: { + execute: async (agentId, line) => { + executed.push(agentId) + return { commandId: 'cmd-1', result: { kind: 'success', text: line } } + }, + }, + }, + }) + const result = await host.routeModel('gongbu', { provider: 'deepseek', model: 'deepseek-chat' }, 'gongbu-1') + assert.equal(result.ok, true) + assert.equal(JSON.stringify(executed), JSON.stringify(['gongbu-1']), '第一步就该用部门自己的会话') +}) + +test('部门会话执行不了时退到别的会话,仍然不碰对话', async () => { + const executed = [] + const prompts = [] + const { host } = catalogHost({ + sessions: { + list: { getSnapshot: () => ({ ids: ['lead-1'], byId: {}, projectionsBySession: {} }), subscribe: () => () => {} }, + binding: (sessionId) => ({ session: { prompt: async (parts, mode) => { prompts.push({ sessionId, parts, mode }); return { ok: true } } } }), + subagentAddress: () => undefined, + refreshProjections: async () => {}, + }, + remote: { + agentPresets: { list: async () => ({ ok: true, value: { presets: [] } }), select: async () => ({ ok: true }) }, + session: { selectModel: async () => ({ ok: true }) }, + subagents: { prompt: async () => ({ messageId: 'msg-1' }) }, + commands: { + execute: async (agentId) => { + executed.push(agentId) + if (agentId === 'gongbu-1') throw new Error('session "gongbu-1" resolved no scope') + return { commandId: 'cmd-1', result: { kind: 'success' } } + }, + }, + }, + }) + const result = await host.routeModel('gongbu', { provider: 'deepseek', model: 'deepseek-chat' }, 'gongbu-1') + assert.equal(result.ok, true) + assert.equal(JSON.stringify(executed), JSON.stringify(['gongbu-1', 'lead-1'])) + assert.equal(prompts.length, 0, '退到别的会话也只是执行指令,不发消息') +}) diff --git a/scripts/preview.mjs b/scripts/preview.mjs index 62ea75d..27f4264 100644 --- a/scripts/preview.mjs +++ b/scripts/preview.mjs @@ -822,6 +822,9 @@ function createDemoContext(options = {}) { commands: { execute: async (_agentId, line) => ({ commandId: 'preview-command', result: { kind: 'success', text: line } }), }, + subagents: { + prompt: async () => ({ messageId: 'preview-msg' }), + }, }, get: () => undefined, layout: { selectPanel: () => {} },