diff --git a/panel/lib/client.js b/panel/lib/client.js index e916450..b6a2634 100644 --- a/panel/lib/client.js +++ b/panel/lib/client.js @@ -524,6 +524,10 @@ window.__ModuleLoader__.load({ }; const sendDecree = () => { + if (!team) { + setNotice({ kind: "error", text: "尚无朝班:请先「开新朝堂」,旨意只会投往朝堂会话,不会写进当前对话。" }); + return; + } const target = seat && seat.role === "lead" ? leadSessionId : (seat && seat.id); const text = decreeText(seat.role, decree, team); if (!text || !target) return; @@ -583,11 +587,11 @@ window.__ModuleLoader__.load({ type: "button", className: "sl-btn", onClick: () => { - host.startFormation().then((result) => { + host.openCourtSession().then((result) => { setNotice({ kind: result.ok ? "ok" : "error", text: result.ok ? result.text : result.error }); }); }, - children: "让丞相组建朝班", + children: "开新朝堂", }) : null, ]), @@ -1023,6 +1027,43 @@ window.__ModuleLoader__.load({ .then((result) => (result && result.ok ? { ok: true, text: "已请丞相组建朝班" } : { ok: false, error: result && result.error ? result.error.message : "投递失败" }), (error) => ({ ok: false, error: String(error && error.message || error) })); }, + + /** 新开一个独立朝堂会话:绝不把旨意或组建指令写进用户当前正在聊的对话。 */ + openCourtSession() { + const snapshot = sessionsStore && typeof sessionsStore.getSnapshot === "function" ? sessionsStore.getSnapshot() : undefined; + const before = new Set(Object.keys((snapshot && snapshot.byId) || {})); + const ref = currentSession(); + let workspaceId; + try { workspaceId = ctx.uiWorkspace && ctx.uiWorkspace.currentWorkspaceId; } catch (error) { /* 忽略 */ } + if (!workspaceId && ref && snapshot && snapshot.byId && snapshot.byId[ref]) workspaceId = snapshot.byId[ref].workspaceId; + if (!workspaceId && snapshot && snapshot.ids && snapshot.ids.length) { + const first = snapshot.byId[snapshot.ids[0]]; + if (first && first.workspaceId) workspaceId = first.workspaceId; + } + try { ctx.uiWorkspace.startSession(workspaceId, { clearPreviousDraft: false }); } catch (error) { + return Promise.resolve({ ok: false, error: "无法新建会话:" + String(error && error.message || error) }); + } + const waitNew = (left) => { + const now = sessionsStore && typeof sessionsStore.getSnapshot === "function" ? sessionsStore.getSnapshot() : undefined; + const ids = (now && now.ids) || []; + for (const id of ids) if (!before.has(id)) return Promise.resolve(id); + if (left <= 0) return Promise.resolve(undefined); + return new Promise((resolve) => setTimeout(() => resolve(waitNew(left - 1)), 150)); + }; + return waitNew(20).then((sessionId) => { + if (!sessionId) return { ok: false, error: "新建会话超时,请直接在侧栏新建会话并选用「上朝」预设。" }; + return selectPreset(sessionId, "sansheng-liubu") + .then(() => sendPrompt(sessionId, FORMATION_PROMPT)) + .then((sent) => { + selectedSessionId = sessionId; + try { ctx.uiWorkspace.openSession(sessionId); } catch (error) { /* 忽略 */ } + return sent && sent.ok === false + ? { ok: true, text: "已新开朝堂会话,但组建指令未送达:" + sent.error, sessionId } + : { ok: true, text: "已新开独立朝堂会话,丞相开始组建朝班", sessionId }; + }) + .catch((error) => ({ ok: false, error: "新开朝堂失败:" + String(error && error.message || error) })); + }); + }, }; } @@ -1032,7 +1073,7 @@ window.__ModuleLoader__.load({ "2. 在共享任务板建立“中书拟案 → 门下审议 → 尚书派工”依赖链,写清各任务 writeScopes。", "3. 门下准奏后再由尚书创建 gongbu/libu/bingbu 并派工。", "4. 每阶段完成后向我汇报,我确认后再进入下一阶段。", - ].join("\\n"); + ].join("\n"); function SidebarIcon(props) { const size = props.size || 18;