@michengai/dsh-agency-agents 0.1.10 → 0.1.12

package/lib/client.js

@@ -2509,6 +2509,9 @@ window.__ModuleLoader__.load({
 			"settings.loading": "正在加载专家…",
 			"settings.enabled": "已启用",
 			"settings.disabled": "已停用",
+			"error.conflict": "配置已被其他窗口修改。",
+			"error.conflict.refreshed": "配置已被其他窗口修改，已为您刷新。",
+			"error.conflict.refreshFailed": "配置已被其他窗口修改，但刷新失败，请手动刷新。",
 			"btn.refresh": "刷新",
 			"btn.enable": "启用",
 			"btn.disable": "停用",
@@ -2547,6 +2550,9 @@ window.__ModuleLoader__.load({
 			"settings.loading": "Loading experts…",
 			"settings.enabled": "Enabled",
 			"settings.disabled": "Disabled",
+			"error.conflict": "Settings were changed in another window.",
+			"error.conflict.refreshed": "Settings were changed in another window and have been refreshed.",
+			"error.conflict.refreshFailed": "Settings were changed in another window, but refresh failed. Please refresh manually.",
 			"btn.refresh": "Refresh",
 			"btn.enable": "Enable",
 			"btn.disable": "Disable",
@@ -6646,9 +6652,19 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			return active === "en" && e.descriptionEn !== "" ? e.descriptionEn : e.description;
 		}
 		const CSS = ".aag-btn-wrap{position:relative;order:1;margin-right:-8px}.aag-btn{display:inline-flex;align-items:center;gap:4px;height:28px;padding:0 4px 0 8px;border:none;border-radius:24px;background:transparent;color:var(--dsw-alias-label-secondary);font-size:13px;line-height:20px;font-weight:500;cursor:pointer}.aag-btn:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}.aag-menu{position:absolute;bottom:calc(100% + 4px);left:0;box-sizing:border-box;padding:4px;display:flex;flex-direction:column;gap:0;width:300px;max-width:360px;max-height:calc(100vh - 24px);overflow-y:auto;border:1px solid var(--dsw-alias-border-inverted);border-radius:12px;background:var(--dsw-specific-menu);box-shadow:var(--dsw-shadow-lv3);z-index:10000}.aag-menu-title{padding:8px 10px;font-size:12px;line-height:16px;color:var(--dsw-alias-label-tertiary)}.aag-menu-item{display:flex;align-items:center;gap:8px;width:100%;min-height:40px;padding:8px 10px;border:none;border-radius:10px;background:transparent;cursor:pointer;text-align:left;font-size:14px;line-height:22px;color:var(--dsw-alias-label-primary);box-sizing:border-box}.aag-menu-item:hover{background:var(--dsw-alias-interactive-bg-hover)}.aag-emoji{flex:0 0 auto;font-size:16px}.aag-menu-empty{padding:8px 10px;color:var(--dsw-alias-label-secondary);font-size:13px}[data-composer-card] :has(> button[aria-haspopup=\"listbox\"]) > :nth-child(2){order:2}\n.aag-section{box-sizing:border-box;display:flex;min-width:0;max-width:760px;width:100%;margin:0 auto;flex-direction:column;gap:16px;padding:0 0 32px;color:var(--dsw-alias-label-primary)}\n.aag-toolbar{display:flex;align-items:flex-start;gap:16px;padding-bottom:12px}\n.aag-title{margin:0;font-size:20px;line-height:28px;font-weight:650;letter-spacing:-.2px}\n.aag-desc{margin:4px 0 0;max-width:42em;color:var(--dsw-alias-label-tertiary);font-size:13px;line-height:1.5}\n.aag-actions{display:flex;align-items:center;gap:8px;margin-left:auto}\n.aag-action{box-sizing:border-box;display:inline-flex;align-items:center;justify-content:center;min-height:32px;padding:0 12px;border:1px solid transparent;border-radius:8px;background:var(--dsw-alias-button-primary-fill);color:var(--dsw-alias-label-primary-foreground);font:inherit;font-size:13px;font-weight:550;cursor:pointer;transition:opacity 180ms ease,background 180ms ease,border-color 180ms ease}\n.aag-action:hover:not(:disabled){opacity:.9}.aag-action:disabled{opacity:.5;cursor:default}\n.aag-action-secondary{background:transparent;border-color:var(--dsw-alias-border-l2);color:var(--dsw-alias-label-primary)}\n.aag-action:focus-visible{outline:2px solid var(--dsw-alias-state-success-primary);outline-offset:2px}\n.aag-summary{display:flex;align-items:center;gap:12px;padding:12px 14px;border:1px solid var(--dsw-alias-border-l2);border-radius:10px;background:var(--dsw-alias-bg-layer-2)}\n.aag-summary-count{font-size:18px;font-weight:650}.aag-summary-label{color:var(--dsw-alias-label-secondary);font-size:12px}.aag-summary-separator{width:1px;height:24px;background:var(--dsw-alias-border-l2)}\n.aag-group{display:flex;flex-direction:column;overflow:hidden;border:1px solid var(--dsw-alias-border-l2);border-radius:12px;background:var(--dsw-alias-bg-layer-2)}\n.aag-group-head{display:flex;align-items:center;gap:10px;padding:14px 16px;border-bottom:1px solid var(--dsw-alias-border-l1)}\n.aag-group-title{margin:0;font-size:14px;font-weight:600}.aag-count{color:var(--dsw-alias-label-tertiary);font-size:12px}\n.aag-row{display:flex;align-items:center;gap:12px;padding:13px 16px;border-bottom:1px solid var(--dsw-alias-border-l1)}\n.aag-row:last-child{border-bottom:0}\n.aag-row-main{display:flex;min-width:0;flex:1;flex-direction:column;gap:3px}\n.aag-row-id{display:flex;align-items:center;gap:7px;min-width:0}\n.aag-row-name{overflow:hidden;font-size:13px;font-weight:500;line-height:20px;text-overflow:ellipsis;white-space:nowrap}\n.aag-tag{flex:none;padding:1px 6px;border:1px solid var(--dsw-alias-border-l3);border-radius:4px;color:var(--dsw-alias-label-secondary);font-size:11px;line-height:16px}\n.aag-tag-on{border-color:var(--dsw-alias-state-success-primary);color:var(--dsw-alias-state-success-primary)}\n.aag-tag-off{border-color:var(--dsw-alias-state-error-primary);color:var(--dsw-alias-state-error-primary)}\n.aag-note{overflow:hidden;color:var(--dsw-alias-label-secondary);font-size:12px;line-height:18px;text-overflow:ellipsis;white-space:nowrap}\n.aag-error{color:var(--dsw-alias-state-error-primary);font-size:13px;line-height:20px}\n@media (max-width:560px){.aag-toolbar{flex-wrap:wrap}.aag-actions{margin-left:0}.aag-row{align-items:flex-start;flex-wrap:wrap}.aag-row>.aag-action{margin-left:auto}}\n@media (prefers-reduced-motion:reduce){.aag-action{transition:none}}\n" + DIVISION_ORDER.map((d) => `[role="listbox"] div[data-source="division.${d}"] ~ button span:last-child`).join(",") + "{flex:1 1 auto;max-width:none;min-width:0}";
-		const SETTINGS_CONFLICT_MESSAGE = "配置已被其他窗口修改，已为您刷新。";
-		function writeErrorMessage(error) {
-			if (error instanceof Error && error.message.includes("changed since it was read")) return SETTINGS_CONFLICT_MESSAGE;
+		/** 将写失败映射到 agency 词条；非冲突错误返回 null，由调用方展示原始消息。 */
+		function writeErrorKey(error, options) {
+			if (error instanceof Error && error.message.includes("changed since it was read")) {
+				if (options?.refreshed === true) return "error.conflict.refreshed";
+				if (options?.refreshed === false) return "error.conflict.refreshFailed";
+				return "error.conflict";
+			}
+			return null;
+		}
+		/** 写失败时的用户可见文案。冲突场景必须显式传入 refreshed；传入 t 时按当前语言翻译。 */
+		function writeErrorMessage(error, options) {
+			const key = writeErrorKey(error, options);
+			if (key !== null) return (options?.t ?? ((item) => zh[item]))(key);
 			return error instanceof Error ? error.message : String(error);
 		}
 		async function readEnabled(remote) {
@@ -6710,6 +6726,18 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				window.requestAnimationFrame(select);
 			});
 		}
+		/** 根据当前草稿生成召唤指令。有内容时把原草稿包进 withTask 模板。 */
+		function buildSummonInstruction(t, name, slug, draft) {
+			return t(draft.trim().length > 0 ? "summon.instruction.withTask" : "summon.instruction", {
+				name,
+				slug,
+				task: draft
+			});
+		}
+		/** 将召唤指令写入输入框。有草稿时也不自动发送，留给用户确认后再提交。 */
+		function applyExpertSummon(options) {
+			if (options.inputActions !== void 0) options.inputActions.setDraft(options.instruction);
+		}
 		function AgentsButton(props) {
 			const [open, setOpen] = react.default.useState(false);
 			const [enabled, setEnabled] = react.default.useState(/* @__PURE__ */ new Set());
@@ -6739,16 +6767,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				const expert = EXPERTS.find((e) => e.slug === slug);
 				const name = expert === void 0 ? slug : displayName(expert, props.getActive());
 				const draft = props.input !== void 0 && typeof props.input.draft === "string" ? props.input.draft : "";
-				const hasTask = draft.trim().length > 0;
-				const instruction = props.t(hasTask ? "summon.instruction.withTask" : "summon.instruction", {
-					name,
-					slug,
-					task: draft
+				applyExpertSummon({
+					inputActions: props.inputActions,
+					instruction: buildSummonInstruction(props.t, name, slug, draft)
 				});
-				if (props.inputActions !== void 0) {
-					props.inputActions.setDraft(instruction);
-					if (hasTask) props.inputActions.submit();
-				}
 				setOpen(false);
 			};
 			const groups = groupByDivision(EXPERTS.filter((e) => enabled.has(e.slug)));
@@ -6787,6 +6809,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			}, [props.remote]);
 			const toggle = (slug) => {
 				if (state === null || saving.current) return;
+				const previous = state;
 				const next = new Set(state.enabled);
 				if (next.has(slug)) next.delete(slug);
 				else next.add(slug);
@@ -6796,11 +6819,23 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					enabled: next,
 					revision: state.revision
 				});
-				writeEnabled(props.remote, next, state.revision).then(setState).catch(async (err) => {
+				writeEnabled(props.remote, next, state.revision).then((current) => {
+					setState(current);
+					setError(null);
+				}).catch(async (err) => {
 					try {
 						setState(await readEnabled(props.remote));
-					} catch {}
-					setError(writeErrorMessage(err));
+						setError(writeErrorMessage(err, {
+							refreshed: true,
+							t: props.t
+						}));
+					} catch {
+						setState(previous);
+						setError(writeErrorMessage(err, {
+							refreshed: false,
+							t: props.t
+						}));
+					}
 				}).finally(() => {
 					saving.current = false;
 					setIsSaving(false);
@@ -6928,7 +6963,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		}
 		//#endregion
 		exports.apply = apply;
+		exports.applyExpertSummon = applyExpertSummon;
+		exports.buildSummonInstruction = buildSummonInstruction;
 		exports.inject = inject;
+		exports.writeErrorKey = writeErrorKey;
 		exports.writeErrorMessage = writeErrorMessage;
 		return module.exports;
 	}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@michengai/dsh-agency-agents",
   "description": "Agency Experts — a summonable domain-expert roster for DSH (expert mode)",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",