dsh-advisor-group 0.1.1 → 0.1.3

package/lib/client.js

@@ -283,12 +283,60 @@ const DEFAULT_ADVISOR_PROMPT = `
 *   advisor-group/message -> update (live bubbles)
 *   advisor-group/end     -> update (final synopsis)
 */
-function advisorGroupToken() {
+/** The per-boot token as injected into the page, when that injection arrived. */
+function injectedAdvisorGroupToken() {
 	return globalThis.__ADVISOR_GROUP_TOKEN__ ?? "";
 }
-function authHeaders() {
-	const token = advisorGroupToken();
-	return token ? { "x-advisor-group-token": token } : {};
+let advisorGroupTokenCache = "";
+let advisorGroupTokenFetch = null;
+/** Token known so far: the injected one wins, otherwise the last handshake. */
+function currentAdvisorGroupToken() {
+	return injectedAdvisorGroupToken() || advisorGroupTokenCache;
+}
+/**
+* The host normally injects the per-boot token into the served index. The
+* desktop shell can compose its window before this plugin registers that
+* injection, so the page may never receive it — fall back to fetching it from
+* the plugin's own handshake route.
+*/
+async function resolveAdvisorGroupToken(force = false) {
+	if (!force) {
+		const known = currentAdvisorGroupToken();
+		if (known) return known;
+	}
+	if (!advisorGroupTokenFetch) advisorGroupTokenFetch = (async () => {
+		try {
+			const res = await fetch(`/advisor-group/boot-token`, { headers: { accept: "application/json" } });
+			if (!res.ok) return "";
+			const body = await res.json();
+			return typeof body.token === "string" ? body.token : "";
+		} catch {
+			return "";
+		}
+	})().then((token) => {
+		advisorGroupTokenCache = token;
+		advisorGroupTokenFetch = null;
+		return token;
+	});
+	return await advisorGroupTokenFetch || injectedAdvisorGroupToken();
+}
+/**
+* `fetch` with the per-boot token attached. A 401 means the token rotated (a
+* live plugin reload mints a new one) or that the injected copy was stale, so
+* refresh it once and retry before surfacing the failure.
+*/
+async function authedFetch(path, init = {}) {
+	const send = (token) => fetch(path, {
+		...init,
+		headers: {
+			...init.headers,
+			...token ? { "x-advisor-group-token": token } : {}
+		}
+	});
+	const res = await send(await resolveAdvisorGroupToken());
+	if (res.status !== 401) return res;
+	const refreshed = await resolveAdvisorGroupToken(true);
+	return refreshed ? send(refreshed) : res;
 }
 /**
 * Browser-side twin of `sanitizeAdvisorContent` (host module cannot be
@@ -315,7 +363,8 @@ function viewData(state) {
 		...state.context === void 0 ? {} : { context: state.context },
 		advisors: state.advisors,
 		messages: state.messages,
-		...state.summary === void 0 ? {} : { summary: state.summary }
+		...state.summary === void 0 ? {} : { summary: state.summary },
+		...state.mode === void 0 ? {} : { mode: state.mode }
 	};
 }
 const advisorGroupDefinition = {
@@ -335,7 +384,7 @@ const advisorGroupDefinition = {
 	start: (_context, match) => {
 		if (match.event.type !== "advisor-group/start") throw new Error("advisor-group requires advisor-group/start");
 		const data = match.event.data;
-		return {
+		const base = {
 			sessionId: data.sessionId,
 			turn: data.turn,
 			step: data.step,
@@ -351,6 +400,11 @@ const advisorGroupDefinition = {
 			}],
 			status: "running"
 		};
+		if (data.kind === "ask") return {
+			...base,
+			mode: "ask"
+		};
+		return base;
 	},
 	update: (context, match) => {
 		if (match.event.type === "advisor-group/message") {
@@ -710,11 +764,11 @@ function buildStepSequence(actionDescriptions, thinkingSegments, toolViews) {
 *   💭 思考·1 → ⛭ 工具×1（输入/输出）→ 💭 思考·2 → ⛭ 工具×2 → … → 📄 正文
 * Main/system messages stay a single collapsible row.
 */
-function AdvisorSteps({ message }) {
+function AdvisorSteps({ message, plain = false }) {
 	const isMain = message.role === "main";
 	const isSystem = message.role === "system";
 	const label = isMain ? "YOU" : isSystem ? "SYSTEM" : message.advisorName ?? message.advisorId ?? "ADVISOR";
-	const group = isMain ? "YOU" : isSystem ? "SYSTEM" : `${label} · R${message.round ?? 1}`;
+	const group = isMain || isSystem || plain ? label : `${label} · R${message.round ?? 1}`;
 	const truncated = message.truncated;
 	const toolViews = buildToolStepViews(message.toolSteps);
 	const thinkingSegments = message.thinkingSegments && message.thinkingSegments.length > 0 ? message.thinkingSegments : message.thinking ? [message.thinking] : [];
@@ -767,7 +821,7 @@ function AdvisorSteps({ message }) {
 		if (liveToolPhase) continue;
 		children.push((0, react.createElement)(StepRow, {
 			key: `body-${index}`,
-			title: `${group} 📄 正文`,
+			title: plain ? group : `${group} 📄 正文`,
 			badges: truncated ? [(0, react.createElement)("span", { style: badgeStyle("#f87171") }, truncated.reason === "timeout" ? "⏱ 响应超时截断" : "⚠ 流中断")] : [],
 			defaultOpen: true,
 			color: "#4ade80",
@@ -793,6 +847,7 @@ const NOTICE_TTL_MS = 6e3;
 function AdvisorGroupNodeView(props) {
 	const data = props.node.data;
 	const sessionId = data.sessionId;
+	const isAsk = data.mode === "ask";
 	const [live, setLive] = (0, react.useState)({});
 	const [contextCollapsed, setContextCollapsed] = (0, react.useState)(true);
 	const lastEventIdRef = (0, react.useRef)(0);
@@ -816,9 +871,20 @@ function AdvisorGroupNodeView(props) {
 	const clearStreamNotice = () => {
 		setTransientNotice((prev) => prev && prev.kind === "stream" ? null : prev);
 	};
+	const [streamTokenReady, setStreamTokenReady] = (0, react.useState)(() => currentAdvisorGroupToken() !== "");
+	(0, react.useEffect)(() => {
+		if (streamTokenReady) return;
+		let alive = true;
+		resolveAdvisorGroupToken().then((token) => {
+			if (alive && token) setStreamTokenReady(true);
+		});
+		return () => {
+			alive = false;
+		};
+	}, [streamTokenReady]);
 	(0, react.useEffect)(() => {
-		if (!sessionId) return;
-		const es = new EventSource(`/advisor-group/stream?sessionId=${encodeURIComponent(sessionId)}&lastEventId=${lastEventIdRef.current}&bootId=${encodeURIComponent(lastBootIdRef.current)}&token=${encodeURIComponent(advisorGroupToken())}`);
+		if (!sessionId || isAsk || !streamTokenReady) return;
+		const es = new EventSource(`/advisor-group/stream?sessionId=${encodeURIComponent(sessionId)}&lastEventId=${lastEventIdRef.current}&bootId=${encodeURIComponent(lastBootIdRef.current)}&token=${encodeURIComponent(currentAdvisorGroupToken())}`);
 		es.onopen = () => {
 			clearStreamNotice();
 		};
@@ -896,7 +962,7 @@ function AdvisorGroupNodeView(props) {
 				noticeTimerRef.current = null;
 			}
 		};
-	}, [sessionId]);
+	}, [sessionId, streamTokenReady]);
 	const mergedMessages = data.messages.map((message) => {
 		if (message.role !== "advisor") return message;
 		const advisorId = message.advisorId ?? "";
@@ -927,7 +993,7 @@ function AdvisorGroupNodeView(props) {
 		};
 	});
 	const shortId = data.sessionId.length > 8 ? data.sessionId.slice(0, 8) : data.sessionId;
-	const title = data.status === "completed" ? "ADVISOR GROUP · DONE" : data.status === "cancelled" ? "ADVISOR GROUP · STOPPED" : "ADVISOR GROUP · LIVE";
+	const title = isAsk ? data.status === "completed" ? "跨会话提问 · 已完成" : "跨会话提问 · 等待应答" : data.status === "completed" ? "ADVISOR GROUP · DONE" : data.status === "cancelled" ? "ADVISOR GROUP · STOPPED" : "ADVISOR GROUP · LIVE";
 	return (0, react.createElement)("div", {
 		style: rootStyle,
 		role: "log",
@@ -939,17 +1005,14 @@ function AdvisorGroupNodeView(props) {
 			alignItems: "center",
 			gap: 8
 		}
-	}, data.status === "running" ? (0, react.createElement)("button", {
+	}, data.status === "running" && !isAsk ? (0, react.createElement)("button", {
 		type: "button",
 		onClick: () => {
 			(async () => {
 				try {
-					const body = await (await fetch("/advisor-group/stop", {
+					const body = await (await authedFetch("/advisor-group/stop", {
 						method: "POST",
-						headers: {
-							"content-type": "application/json",
-							...authHeaders()
-						},
+						headers: { "content-type": "application/json" },
 						body: JSON.stringify({ sessionId })
 					})).json();
 					if (body.ok === false) showTransientNotice(body.error ?? "请求未被服务端接受，请稍后重试。", "action", NOTICE_TTL_MS);
@@ -967,17 +1030,14 @@ function AdvisorGroupNodeView(props) {
 			padding: "2px 8px",
 			fontSize: 11
 		}
-	}, "⏹ 停止") : data.status === "cancelled" ? (0, react.createElement)("button", {
+	}, "⏹ 停止") : data.status === "cancelled" && !isAsk ? (0, react.createElement)("button", {
 		type: "button",
 		onClick: () => {
 			(async () => {
 				try {
-					const body = await (await fetch("/advisor-group/resume", {
+					const body = await (await authedFetch("/advisor-group/resume", {
 						method: "POST",
-						headers: {
-							"content-type": "application/json",
-							...authHeaders()
-						},
+						headers: { "content-type": "application/json" },
 						body: JSON.stringify({ sessionId })
 					})).json();
 					if (body.ok === false) showTransientNotice(body.error ?? "请求未被服务端接受，请稍后重试。", "action", NOTICE_TTL_MS);
@@ -999,9 +1059,10 @@ function AdvisorGroupNodeView(props) {
 		type: "button",
 		onClick: () => setContextCollapsed((value) => !value),
 		style: contextToggleStyle
-	}, `📋 项目背景 ${contextCollapsed ? "▸" : "▾"}`), !contextCollapsed ? (0, react.createElement)("div", { style: contextBodyStyle }, data.context) : null) : null, (0, react.createElement)("div", { style: advisorsLineStyle }, `ADVISORS: ${data.advisors.map((a) => a.avatar ? `${a.avatar} ${a.name}` : a.name).join(" · ")}`), mergedMessages.map((message, index) => (0, react.createElement)(AdvisorSteps, {
+	}, `📋 项目背景 ${contextCollapsed ? "▸" : "▾"}`), !contextCollapsed ? (0, react.createElement)("div", { style: contextBodyStyle }, data.context) : null) : null, (0, react.createElement)("div", { style: advisorsLineStyle }, isAsk ? `提问方: ${data.advisors[0]?.name ?? "?"} → 目标会话: ${data.advisors[1]?.name ?? "?"}` : `ADVISORS: ${data.advisors.map((a) => a.avatar ? `${a.avatar} ${a.name}` : a.name).join(" · ")}`), mergedMessages.map((message, index) => (0, react.createElement)(AdvisorSteps, {
 		key: index,
-		message
+		message,
+		plain: isAsk
 	})), data.status === "completed" && data.summary?.conclusion ? (0, react.createElement)("div", { style: {
 		borderTop: "1px dashed #2f9e44",
 		marginTop: 8,
@@ -1010,7 +1071,7 @@ function AdvisorGroupNodeView(props) {
 		color: "#86efac",
 		fontWeight: 700,
 		marginBottom: 4
-	} }, "📌 综合结论"), (0, react.createElement)("div", null, renderMarkdown(data.summary.conclusion))) : null, data.status === "completed" && (data.summary?.riskNotes ?? []).length > 0 ? (0, react.createElement)("div", { style: {
+	} }, isAsk ? "📌 投递说明" : "📌 综合结论"), (0, react.createElement)("div", null, renderMarkdown(data.summary.conclusion))) : null, data.status === "completed" && (data.summary?.riskNotes ?? []).length > 0 ? (0, react.createElement)("div", { style: {
 		borderTop: "1px dashed #2f9e44",
 		marginTop: 8,
 		paddingTop: 8
@@ -1035,7 +1096,7 @@ function AdvisorGroupNodeView(props) {
 			fontSize: 12,
 			marginTop: 2
 		}
-	}, note))) : null, data.status === "running" ? (0, react.createElement)("div", { style: waitingStyle }, "▊ AWAITING RESPONSES…") : null, transientNotice ? (0, react.createElement)("div", { style: noticeStyle }, transientNotice.text) : null);
+	}, note))) : null, data.status === "running" ? (0, react.createElement)("div", { style: waitingStyle }, isAsk ? "▊ 已投递，等待对方回应…" : "▊ AWAITING RESPONSES…") : null, transientNotice ? (0, react.createElement)("div", { style: noticeStyle }, transientNotice.text) : null);
 }
 const settingsRootStyle = {
 	fontFamily: "'Inter', 'Segoe UI', system-ui, sans-serif",
@@ -1235,7 +1296,7 @@ function AdvisorGroupSettingsTab() {
 		setMsg("");
 		setError("");
 		try {
-			const [configData, providerData] = await Promise.all([fetch("/advisor-group/config", { headers: authHeaders() }).then((r) => r.json()), fetch("/advisor-group/providers", { headers: authHeaders() }).then((r) => r.json())]);
+			const [configData, providerData] = await Promise.all([authedFetch("/advisor-group/config").then((r) => r.json()), authedFetch("/advisor-group/providers").then((r) => r.json())]);
 			if (configData.ok && configData.config) {
 				setConfig(configData.config);
 				savedJsonRef.current = JSON.stringify(configData.config);
@@ -1291,12 +1352,9 @@ function AdvisorGroupSettingsTab() {
 		setError("");
 		setMsg("");
 		try {
-			const data = await (await fetch("/advisor-group/models", {
+			const data = await (await authedFetch("/advisor-group/models", {
 				method: "POST",
-				headers: {
-					"content-type": "application/json",
-					...authHeaders()
-				},
+				headers: { "content-type": "application/json" },
 				body: JSON.stringify({
 					advisorId: advisor.id,
 					provider: advisor.provider,
@@ -1332,12 +1390,9 @@ function AdvisorGroupSettingsTab() {
 		setError("");
 		setMsg("");
 		try {
-			const data = await (await fetch("/advisor-group/test-connection", {
+			const data = await (await authedFetch("/advisor-group/test-connection", {
 				method: "POST",
-				headers: {
-					"content-type": "application/json",
-					...authHeaders()
-				},
+				headers: { "content-type": "application/json" },
 				body: JSON.stringify({
 					advisorId: advisor.id,
 					provider: advisor.provider,
@@ -1371,12 +1426,9 @@ function AdvisorGroupSettingsTab() {
 				},
 				advisors: config.advisors.map(({ apiKeyMetaByProvider: _meta, ...rest }) => rest)
 			};
-			const data = await (await fetch("/advisor-group/config", {
+			const data = await (await authedFetch("/advisor-group/config", {
 				method: "POST",
-				headers: {
-					"content-type": "application/json",
-					...authHeaders()
-				},
+				headers: { "content-type": "application/json" },
 				body: JSON.stringify({
 					config: configPayload,
 					expectedRevision: revision