@ryubyte/dsh-a2a 0.1.2 → 0.1.4

package/lib/client.js

@@ -54,6 +54,10 @@ window.__ModuleLoader__.load({
 			const [tab, setTab] = (0, react.useState)("out");
 			/** connection ids whose skill list is expanded in the outbound tab. */
 			const [expanded, setExpanded] = (0, react.useState)(/* @__PURE__ */ new Set());
+			/** Optional bearer token for the add-agent form (outbound). */
+			const [addToken, setAddToken] = (0, react.useState)("");
+			/** Inbound authToken input (serve tab); empty string means "clear". */
+			const [authInput, setAuthInput] = (0, react.useState)("");
 			const refresh = async () => {
 				try {
 					setError(null);
@@ -101,7 +105,8 @@ window.__ModuleLoader__.load({
 						headers: { "content-type": "application/json" },
 						body: JSON.stringify({
 							action: "discover-agent",
-							agentCardUrl: u
+							agentCardUrl: u,
+							bearerToken: addToken.trim() || void 0
 						})
 					})).json();
 					if (!body.ok || !body.message) {
@@ -118,9 +123,13 @@ window.__ModuleLoader__.load({
 			const doConnect = async () => {
 				if (!discovered) return;
 				const n = discovered.name.trim() || "remote";
-				await act("add-agent", n, { agentCardUrl: discovered.agentCardUrl });
+				await act("add-agent", n, {
+					agentCardUrl: discovered.agentCardUrl,
+					bearerToken: addToken.trim() || void 0
+				});
 				if (!busy) {
 					setAddUrl("");
+					setAddToken("");
 					setDiscovered(null);
 				}
 			};
@@ -196,7 +205,25 @@ window.__ModuleLoader__.load({
 					flex: 1,
 					minWidth: 260
 				}
-			}), actionBtn("导入", false, () => void doDiscover(), discovering || !addUrl.trim())), discovering ? (0, react.createElement)("div", { style: {
+			}), actionBtn("导入", false, () => void doDiscover(), discovering || !addUrl.trim())), (0, react.createElement)("div", { style: {
+				display: "flex",
+				alignItems: "center",
+				gap: 8,
+				flexWrap: "wrap"
+			} }, (0, react.createElement)("input", {
+				type: "password",
+				placeholder: "Bearer Token(可选,发送为 Authorization: Bearer …)",
+				value: addToken,
+				onChange: (e) => setAddToken(e.target.value),
+				style: {
+					...inputStyle,
+					flex: 1,
+					minWidth: 260
+				}
+			})), (0, react.createElement)("div", { style: {
+				fontSize: 11.5,
+				color: "var(--dsw-alias-label-tertiary, #999)"
+			} }, "若远程 Agent 需要鉴权,填入 token;导入与后续调用都会带上。token 会明文存入 a2a.json。"), discovering ? (0, react.createElement)("div", { style: {
 				fontSize: 13,
 				color: "var(--dsw-alias-label-tertiary, #999)"
 			} }, "正在读取 Agent Card…") : discovered ? (0, react.createElement)("div", { style: {
@@ -243,7 +270,7 @@ window.__ModuleLoader__.load({
 				display: "flex",
 				gap: 8,
 				marginTop: 2
-			} }, actionBtn("连接", true, () => void doConnect(), busy === "add-agent"), actionBtn("取消", false, () => {
+			} }, actionBtn("连接", true, () => void doConnect(), busy?.startsWith("add-agent:") ?? false), actionBtn("取消", false, () => {
 				setDiscovered(null);
 				setAddUrl("");
 			}, false))) : (0, react.createElement)("div", { style: {
@@ -263,7 +290,7 @@ window.__ModuleLoader__.load({
 			} }, sec("A2A 服务（本 DSH 作为 Agent 对外）", 0), stateDot(serve.enabled ? "connected" : "disconnected"), (0, react.createElement)("span", { style: {
 				fontSize: 12.5,
 				color: serve.enabled ? "#2e7d32" : "#9e9e9e"
-			} }, serve.enabled ? "运行中" : "已下线"), (0, react.createElement)("span", { style: { marginLeft: "auto" } }, serve.enabled ? actionBtn("下线", false, () => void act("server-disable", ""), busy === "server-disable") : actionBtn("上线", true, () => void act("server-enable", ""), busy === "server-enable"))), (0, react.createElement)("div", { style: {
+			} }, serve.enabled ? "运行中" : "已下线"), (0, react.createElement)("span", { style: { marginLeft: "auto" } }, serve.enabled ? actionBtn("下线", false, () => void act("server-disable", ""), busy === "server-disable:") : actionBtn("上线", true, () => void act("server-enable", ""), busy === "server-enable:"))), (0, react.createElement)("div", { style: {
 				display: "flex",
 				flexDirection: "column",
 				gap: 6
@@ -301,13 +328,7 @@ window.__ModuleLoader__.load({
 					fontSize: 12.5,
 					color: "var(--dsw-alias-label-primary, #222)"
 				}
-			}, `• ${s.name}${s.description ? ` — ${s.description}` : ""}`))) : null), serve.enabled && !serve.customExecutor ? (0, react.createElement)("div", { style: {
-				fontSize: 12,
-				color: "var(--dsw-warning, #b26a00)",
-				background: "rgba(178,106,0,.08)",
-				borderRadius: 6,
-				padding: "6px 10px"
-			} }, "⚠ 默认 executor 会执行 shell 命令。生产环境请通过配置指定受限的 execute 实现。") : null) : null, tab === "in" ? (0, react.createElement)("div", { style: {
+			}, `• ${s.name}${s.description ? ` — ${s.description}` : ""}`))) : null), serve.enabled ? executorNote(serve) : null, serve.enabled ? authControl(serve, busy, act, authInput, setAuthInput) : null) : null, tab === "in" ? (0, react.createElement)("div", { style: {
 				display: "flex",
 				flexDirection: "column",
 				gap: 10
@@ -557,6 +578,83 @@ window.__ModuleLoader__.load({
 				}
 			}, label);
 		}
+		/**
+		* A semantically-correct note about how inbound tasks are executed. Dispatches
+		* on the `executor` field; falls back to the legacy `customExecutor` boolean
+		* for snapshots from an older host that didn't send `executor`.
+		*/
+		function executorNote(serve) {
+			const kind = serve.executor ?? (serve.customExecutor ? "custom" : void 0);
+			if (kind === "custom") return null;
+			if (kind === "dsh-agent") return (0, react.createElement)("div", { style: {
+				fontSize: 12,
+				color: "var(--dsw-alias-label-secondary, #666)",
+				background: "rgba(74,125,255,.08)",
+				borderRadius: 6,
+				padding: "6px 10px"
+			} }, "ℹ 入站任务由本 DSH 的 agent 会话执行,按 A2A contextId 一个对话一个会话。");
+			if (kind === "none") return (0, react.createElement)("div", { style: {
+				fontSize: 12,
+				color: "var(--dsw-warning, #b26a00)",
+				background: "rgba(178,106,0,.08)",
+				borderRadius: 6,
+				padding: "6px 10px"
+			} }, "⚠ 未配置 executor,且未检测到可用的 agent 循环:入站任务会被拒绝。通过配置注入 execute,或加载 agent-loop 插件。");
+			return null;
+		}
+		/**
+		* Inbound bearer-token control for the serve tab: shows whether the endpoint is
+		* token-gated, and lets the operator set or clear the shared token. The token
+		* value is never read back from the host — only whether one is configured.
+		*/
+		function authControl(serve, busy, act, authInput, setAuthInput) {
+			return (0, react.createElement)("div", { style: {
+				display: "flex",
+				flexDirection: "column",
+				gap: 6,
+				marginTop: 4
+			} }, (0, react.createElement)("div", { style: {
+				display: "flex",
+				alignItems: "center",
+				gap: 8
+			} }, (0, react.createElement)("span", { style: {
+				fontSize: 12.5,
+				fontWeight: 600,
+				color: "var(--dsw-alias-label-primary, #222)"
+			} }, "入站鉴权"), stateDot(serve.authConfigured ? "connected" : "disabled"), (0, react.createElement)("span", { style: {
+				fontSize: 12,
+				color: serve.authConfigured ? "#2e7d32" : "#9e9e9e"
+			} }, serve.authConfigured ? "已启用 Bearer 鉴权" : "未鉴权(任何客户端可调用)")), (0, react.createElement)("div", { style: {
+				display: "flex",
+				alignItems: "center",
+				gap: 8,
+				flexWrap: "wrap"
+			} }, (0, react.createElement)("input", {
+				type: "password",
+				placeholder: serve.authConfigured ? "输入新 token 以替换" : "设置 Bearer Token 以开启鉴权",
+				value: authInput,
+				onChange: (e) => setAuthInput(e.target.value),
+				style: {
+					padding: "4px 8px",
+					fontSize: 13,
+					borderRadius: 6,
+					border: "1px solid var(--dsw-alias-border-l2, rgba(127,127,127,.3))",
+					background: "var(--dsw-alias-fill-l1, rgba(127,127,127,.06))",
+					color: "var(--dsw-alias-label-primary, #222)",
+					flex: 1,
+					minWidth: 220
+				}
+			}), actionBtn("保存", true, () => {
+				act("set-server-auth", "", { authToken: authInput.trim() });
+				setAuthInput("");
+			}, busy === "set-server-auth:" || !authInput.trim()), serve.authConfigured ? actionBtn("清除", false, () => {
+				act("set-server-auth", "", { authToken: "" });
+				setAuthInput("");
+			}, busy === "set-server-auth:") : null), (0, react.createElement)("div", { style: {
+				fontSize: 11.5,
+				color: "var(--dsw-alias-label-tertiary, #999)"
+			} }, "token 会明文存入 a2a.json,重启后仍生效。设置后,入站 JSON-RPC 请求需带 Authorization: Bearer <token>。"));
+		}
 		function inboundRow(p, busy, act) {
 			return (0, react.createElement)("tr", { key: p.id }, (0, react.createElement)("td", { style: tdStyle }, p.label), (0, react.createElement)("td", { style: {
 				...tdStyle,