@jingyi0605/codingns4dsh 0.2.1-beta.6 → 0.2.1-beta.7

package/data/build/dist/client/client.manager.js

@@ -216,6 +216,12 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/shared/assistant-avatar.ts
+		const ASSISTANT_AVATAR_REACTIONS = [
+			"success",
+			"concerned",
+			"question",
+			"approval"
+		];
 		const ASSISTANT_AVATAR_STATES = [
 			"idle",
 			"listening",
@@ -363,9 +369,14 @@ window.__ModuleLoader__.load({
 				...model.surfaces === void 0 ? {} : { surfaces: model.surfaces }
 			};
 		}
-		function assistantAvatarImageSource(model, state) {
+		function assistantAvatarImageSource(model, state, reaction) {
+			if (reaction !== void 0 && !assistantAvatarVoicePriority(state) && model.reactionSources?.[reaction] !== void 0) return model.reactionSources[reaction];
 			return model.stateSources?.[state] ?? model.source;
 		}
+		/** 单动作通道不能抢占监听、思考或说话；角标仍可同时展示。 */
+		function assistantAvatarVoicePriority(state) {
+			return state === "listening" || state === "thinking" || state === "speaking";
+		}
 		function resolveAssistantAvatarState(state, pending = false) {
 			if (state === "error") return "error";
 			if (state === "speaking") return "speaking";
@@ -374,6 +385,10 @@ window.__ModuleLoader__.load({
 			if (state === "waiting") return "waiting";
 			return "idle";
 		}
+		function assistantSpriteReactionMotion(model, state, reaction) {
+			const motion = reaction === void 0 || assistantAvatarVoicePriority(state) ? void 0 : model.reactionMotionGroups?.[reaction];
+			return typeof motion === "object" ? motion : assistantSpriteMotion(state);
+		}
 		/** 帧布局来自 Signalight/codex-to-dsh-pet；单帧 192×208，8 列。 */
 		function assistantSpriteMotion(state) {
 			if (state === "error") return {
@@ -413,11 +428,24 @@ window.__ModuleLoader__.load({
 			return typeof model.id === "string" && /^[A-Za-z][A-Za-z0-9_-]{0,79}$/u.test(model.id) && typeof model.name === "string" && model.name.trim().length > 0 && model.name.length <= 80 && validAsset(model) && validPackage(model.package) && validSurfaces(model.surfaces);
 		}
 		function validAsset(asset) {
-			return typeof asset.renderer === "string" && validId(asset.renderer) && asset.renderer !== "builtin" && typeof asset.source === "string" && isAssistantAvatarSource(asset.source) && (asset.spriteVersion === 1 || asset.spriteVersion === 2) && validStateMap(asset.stateSources, (source) => asset.renderer === "image" && isAssistantAvatarSource(source)) && validStateMap(asset.motionGroups, (group) => asset.renderer === "live2d" && group.trim().length > 0 && group.length <= 120) && validLive2dOptions(asset.live2d, asset.renderer);
+			return typeof asset.renderer === "string" && validId(asset.renderer) && asset.renderer !== "builtin" && typeof asset.source === "string" && isAssistantAvatarSource(asset.source) && (asset.spriteVersion === 1 || asset.spriteVersion === 2) && validStateMap(asset.stateSources, (source) => asset.renderer === "image" && isAssistantAvatarSource(source)) && validStateMap(asset.motionGroups, (group) => asset.renderer === "live2d" && group.trim().length > 0 && group.length <= 120) && validReactionMap(asset.reactionSources, (source) => asset.renderer === "image" && typeof source === "string" && isAssistantAvatarSource(source)) && validReactionMap(asset.reactionMotionGroups, (motion) => asset.renderer === "live2d" ? validMotionName(motion) : asset.renderer === "spritesheet" && validSpriteReaction(motion, asset.spriteVersion)) && validReactionMap(asset.reactionExpressions, (expression) => asset.renderer === "live2d" && validMotionName(expression)) && validLive2dOptions(asset.live2d, asset.renderer);
 		}
 		function validStateMap(value, valid) {
 			return value === void 0 || isRecord(value) && Object.entries(value).every(([state, item]) => ASSISTANT_AVATAR_STATES.includes(state) && typeof item === "string" && valid(item));
 		}
+		function validReactionMap(value, valid) {
+			return value === void 0 || isRecord(value) && Object.entries(value).every(([reaction, item]) => ASSISTANT_AVATAR_REACTIONS.includes(reaction) && valid(item));
+		}
+		function validMotionName(value) {
+			return typeof value === "string" && value.trim().length > 0 && value.length <= 120 && !/[\u0000-\u001f]/u.test(value);
+		}
+		function validSpriteReaction(value, version) {
+			return isRecord(value) && Object.keys(value).every((key) => [
+				"row",
+				"frames",
+				"interval"
+			].includes(key)) && Number.isInteger(value.row) && Number(value.row) >= 0 && Number(value.row) < (version === 2 ? 11 : 9) && Number.isInteger(value.frames) && Number(value.frames) >= 1 && Number(value.frames) <= 8 && Number.isInteger(value.interval) && Number(value.interval) >= 16 && Number(value.interval) <= 1e4;
+		}
 		function validPackage(value) {
 			if (value === void 0) return true;
 			if (!isRecord(value) || typeof value.adapterId !== "string" || !validId(value.adapterId)) return false;
@@ -449,6 +477,9 @@ window.__ModuleLoader__.load({
 				spriteVersion: asset.spriteVersion,
 				...asset.stateSources === void 0 ? {} : { stateSources: { ...asset.stateSources } },
 				...asset.motionGroups === void 0 ? {} : { motionGroups: { ...asset.motionGroups } },
+				...asset.reactionSources === void 0 ? {} : { reactionSources: { ...asset.reactionSources } },
+				...asset.reactionMotionGroups === void 0 ? {} : { reactionMotionGroups: Object.fromEntries(Object.entries(asset.reactionMotionGroups).map(([key, value]) => [key, typeof value === "string" ? value : { ...value }])) },
+				...asset.reactionExpressions === void 0 ? {} : { reactionExpressions: { ...asset.reactionExpressions } },
 				...asset.live2d === void 0 ? {} : { live2d: {
 					...asset.live2d,
 					...asset.live2d.position === void 0 ? {} : { position: [...asset.live2d.position] }
@@ -492,6 +523,9 @@ window.__ModuleLoader__.load({
 				spriteVersion: input.spriteVersion ?? 2,
 				...input.stateSources === void 0 ? {} : { stateSources: Object.fromEntries(Object.entries(record(input.stateSources)).map(([state, source]) => [state, resolveAssistantAvatarSource(source, url)])) },
 				...input.motionGroups === void 0 ? {} : { motionGroups: record(input.motionGroups) },
+				...input.reactionSources === void 0 ? {} : { reactionSources: Object.fromEntries(Object.entries(record(input.reactionSources)).map(([reaction, source]) => [reaction, resolveAssistantAvatarSource(source, url)])) },
+				...input.reactionMotionGroups === void 0 ? {} : { reactionMotionGroups: record(input.reactionMotionGroups) },
+				...input.reactionExpressions === void 0 ? {} : { reactionExpressions: record(input.reactionExpressions) },
 				...input.live2d === void 0 ? {} : { live2d: record(input.live2d) }
 			};
 		}
@@ -673,7 +707,7 @@ window.__ModuleLoader__.load({
 		}
 		const DEFAULT_ASSISTANT_TTS_SETTINGS = {
 			backend: "browser",
-			selectedId: "moss:Junhao",
+			selectedId: "moss:Yuewen",
 			voices: [],
 			parameters: DEFAULT_ASSISTANT_TTS_PARAMETERS
 		};
@@ -897,8 +931,8 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/avatar/image.ts
 		/** 图片差分也消费相同的状态接口；某张差分缺失时先回落该角色默认图片。 */
-		function ImageAssistantAvatar({ model, state, size, onError, onLoadProgress }) {
-			const requested = assistantAvatarImageSource(model, state);
+		function ImageAssistantAvatar({ model, state, reaction, size, onError, onLoadProgress }) {
+			const requested = assistantAvatarImageSource(model, state, reaction);
 			const [failed, setFailed] = (0, react.useState)("");
 			const image = (0, react.useRef)(null);
 			(0, react.useEffect)(() => setFailed(""), [requested]);
@@ -940,12 +974,47 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
+		//#region src/client/avatar/reaction-badge.ts
+		/** 角标独立于模型能力，旧包与缺失表情接口仍可提供文字反馈。 */
+		function AssistantAvatarReactionBadge({ reaction }) {
+			const t = require_transport.resolveCodingNsTranslator();
+			const labels = {
+				success: t("awb.notifications.completed"),
+				concerned: t("awb.notifications.error"),
+				question: t("awb.notifications.question"),
+				approval: t("awb.notifications.approval")
+			};
+			return (0, react.createElement)("span", {
+				role: "status",
+				"aria-label": labels[reaction],
+				title: labels[reaction],
+				"data-codingns-avatar-reaction": reaction,
+				style: {
+					position: "absolute",
+					right: 0,
+					top: 0,
+					padding: "2px 7px",
+					borderRadius: 12,
+					background: "#fff",
+					color: "#242424",
+					border: "1px solid #b8c3d3",
+					pointerEvents: "none"
+				}
+			}, {
+				success: "✓",
+				concerned: "!",
+				question: "?",
+				approval: "…"
+			}[reaction]);
+		}
+		//#endregion
 		//#region src/client/avatar/spritesheet.ts
 		/** 可测试的时钟：只推进当前动作实际拥有的帧，暂停后不追赶后台时间。 */
 		var AssistantSpriteClock = class {
 			state;
 			frame = 0;
 			last;
+			motion;
 			constructor(state) {
 				this.state = state;
 			}
@@ -956,11 +1025,17 @@ window.__ModuleLoader__.load({
 					this.last = void 0;
 				}
 			}
+			setMotion(motion) {
+				if (this.motion?.row === motion.row && this.motion.frames === motion.frames && this.motion.interval === motion.interval) return;
+				this.motion = motion;
+				this.frame = 0;
+				this.last = void 0;
+			}
 			reset() {
 				this.last = void 0;
 			}
 			tick(now) {
-				const motion = assistantSpriteMotion(this.state);
+				const motion = this.motion ?? assistantSpriteMotion(this.state);
 				if (this.last === void 0) this.last = now;
 				const steps = Math.floor(Math.max(0, now - this.last) / motion.interval);
 				this.frame = (this.frame + steps) % motion.frames;
@@ -972,13 +1047,19 @@ window.__ModuleLoader__.load({
 			}
 		};
 		/** 参考 Signalight 的纯 DOM 图集渲染，不引入 Pixi 或上游会话逻辑。 */
-		function SpriteSheetAssistantAvatar({ model, state, size, onError, onLoadProgress }) {
+		function SpriteSheetAssistantAvatar({ model, state, reaction, size, onError, onLoadProgress }) {
 			const element = (0, react.useRef)(null);
-			const stateRef = (0, react.useRef)(state);
-			stateRef.current = state;
+			const motion = assistantSpriteReactionMotion(model, state, reaction);
+			const motionRef = (0, react.useRef)(motion);
+			motionRef.current = motion;
 			(0, react.useEffect)(() => {
-				if (element.current !== null) element.current.style.backgroundPosition = `0% ${assistantSpriteMotion(state).row * 100 / (model.spriteVersion === 2 ? 10 : 8)}%`;
-			}, [state, model.spriteVersion]);
+				if (element.current !== null) element.current.style.backgroundPosition = `0% ${motion.row * 100 / (model.spriteVersion === 2 ? 10 : 8)}%`;
+			}, [
+				motion.row,
+				motion.frames,
+				motion.interval,
+				model.spriteVersion
+			]);
 			(0, react.useEffect)(() => {
 				const target = element.current;
 				if (target === null) return void 0;
@@ -986,11 +1067,11 @@ window.__ModuleLoader__.load({
 				const image = new Image();
 				let disposed = false;
 				let frameId = 0;
-				const clock = new AssistantSpriteClock(stateRef.current);
+				const clock = new AssistantSpriteClock("idle");
 				const media = window.matchMedia?.("(prefers-reduced-motion: reduce)");
 				const rows = model.spriteVersion === 2 ? 11 : 9;
 				const paint = (now) => {
-					clock.setState(stateRef.current);
+					clock.setMotion(motionRef.current);
 					const frame = clock.tick(now);
 					target.style.backgroundPosition = `${frame.frame * 100 / 7}% ${frame.row * 100 / (rows - 1)}%`;
 				};
@@ -1688,18 +1769,23 @@ window.__ModuleLoader__.load({
 			motionGroups;
 			options;
 			timeoutMs;
+			reactions;
 			disposed = false;
 			state = "idle";
+			reaction;
+			appliedExpression;
+			appliedMotion;
 			loaded = false;
 			loadConfirmed = false;
 			cancelLoad;
 			refreshDeadline;
 			report;
-			constructor(runtime, motionGroups, options, report, timeoutMs = 45e3) {
+			constructor(runtime, motionGroups, options, report, timeoutMs = 45e3, reactions) {
 				this.runtime = runtime;
 				this.motionGroups = motionGroups;
 				this.options = options;
 				this.timeoutMs = timeoutMs;
+				this.reactions = reactions;
 				this.report = report;
 				runtime.on?.("loadstart", (total) => {
 					if (this.disposed) return;
@@ -1767,11 +1853,37 @@ window.__ModuleLoader__.load({
 				if (this.disposed) return;
 				this.state = state;
 				if (!this.loaded) return;
+				this.apply();
+			}
+			setReaction(reaction) {
+				if (this.disposed || this.reaction === reaction) return;
+				this.reaction = reaction;
+				if (this.loaded) this.apply();
+			}
+			apply() {
+				const state = this.state;
 				const groups = Object.keys(this.runtime.getMotions());
 				const desired = state === "speaking" ? /talk|speak/iu : state === "thinking" ? /think|work/iu : state === "error" ? /fail|error|sad/iu : state === "listening" || state === "waiting" ? /listen|wait/iu : /idle/iu;
 				const configured = this.motionGroups?.[state];
-				const group = configured !== void 0 && groups.includes(configured) ? configured : groups.find((name) => desired.test(name)) ?? groups.find((name) => /idle/iu.test(name));
-				if (group !== void 0) this.runtime.playMotion(group, void 0, 2);
+				const reactionMotion = this.reaction === void 0 || assistantAvatarVoicePriority(state) ? void 0 : this.reactions?.reactionMotionGroups?.[this.reaction];
+				const group = typeof reactionMotion === "string" && groups.includes(reactionMotion) ? reactionMotion : configured !== void 0 && groups.includes(configured) ? configured : groups.find((name) => desired.test(name)) ?? groups.find((name) => /idle/iu.test(name));
+				if (group !== void 0 && group !== this.appliedMotion) {
+					this.runtime.playMotion(group, void 0, 2);
+					this.appliedMotion = group;
+				}
+				this.applyExpression();
+			}
+			applyExpression() {
+				const runtime = this.runtime;
+				if (typeof runtime.getExpressions !== "function" || typeof runtime.setExpression !== "function" || typeof runtime.clearExpression !== "function") return;
+				try {
+					const requested = this.reaction === void 0 || assistantAvatarVoicePriority(this.state) ? void 0 : this.reactions?.reactionExpressions?.[this.reaction];
+					const next = requested !== void 0 && runtime.getExpressions().includes(requested) ? requested : void 0;
+					if (next === this.appliedExpression) return;
+					if (next === void 0) runtime.clearExpression();
+					else runtime.setExpression(next);
+					this.appliedExpression = next;
+				} catch {}
 			}
 			resize() {
 				if (!this.disposed && this.loaded) this.runtime.resize();
@@ -1780,6 +1892,9 @@ window.__ModuleLoader__.load({
 				if (this.disposed) return;
 				this.disposed = true;
 				this.report = void 0;
+				if (this.appliedExpression !== void 0) try {
+					this.runtime.clearExpression?.();
+				} catch {}
 				this.cancelLoad?.();
 				this.runtime.destroy();
 			}
@@ -1815,16 +1930,25 @@ window.__ModuleLoader__.load({
 				canvas.remove();
 			}
 		}
-		function Live2dAssistantAvatar({ model, state, size, onError, onLoadProgress, diagnostics = false, onPreview }) {
-			const configKey = JSON.stringify([model.motionGroups, model.live2d]);
+		function Live2dAssistantAvatar({ model, state, reaction, size, onError, onLoadProgress, diagnostics = false, onPreview }) {
+			const configKey = JSON.stringify([
+				model.motionGroups,
+				model.live2d,
+				model.reactionMotionGroups,
+				model.reactionExpressions
+			]);
 			const config = (0, react.useMemo)(() => ({
 				motionGroups: model.motionGroups,
-				options: model.live2d
+				options: model.live2d,
+				reactionMotionGroups: model.reactionMotionGroups,
+				reactionExpressions: model.reactionExpressions
 			}), [configKey]);
 			const canvas = (0, react.useRef)(null);
 			const controller = (0, react.useRef)(void 0);
 			const currentState = (0, react.useRef)(state);
 			currentState.current = state;
+			const currentReaction = (0, react.useRef)(reaction);
+			currentReaction.current = reaction;
 			const [visible, setVisible] = (0, react.useState)(() => typeof document === "undefined" || !document.hidden);
 			(0, react.useEffect)(() => {
 				const refresh = () => setVisible(!document.hidden);
@@ -1865,9 +1989,13 @@ window.__ModuleLoader__.load({
 					});
 					const runtime = module.init(target);
 					if (runtime === null) throw new Error("avatar_webgl_unavailable");
-					instance = new AssistantLive2dController(runtime, config.motionGroups, config.options, report);
+					instance = new AssistantLive2dController(runtime, config.motionGroups, config.options, report, 45e3, {
+						...config.reactionMotionGroups === void 0 ? {} : { reactionMotionGroups: config.reactionMotionGroups },
+						...config.reactionExpressions === void 0 ? {} : { reactionExpressions: config.reactionExpressions }
+					});
 					controller.current = instance;
 					instance.setState(currentState.current);
+					instance.setReaction(currentReaction.current);
 					if (!await instance.load(model.source) || disposed) return;
 					if (onPreview !== void 0) {
 						const preview = await captureAssistantAvatarPreview(runtime.getCanvas?.() ?? target, previewController.signal);
@@ -1907,6 +2035,9 @@ window.__ModuleLoader__.load({
 			(0, react.useEffect)(() => {
 				controller.current?.setState(state);
 			}, [state]);
+			(0, react.useEffect)(() => {
+				controller.current?.setReaction(reaction);
+			}, [reaction]);
 			return (0, react.createElement)("canvas", {
 				ref: canvas,
 				width: Math.round(size * 2),
@@ -2082,7 +2213,7 @@ window.__ModuleLoader__.load({
 					position: "absolute",
 					bottom: 0,
 					maxWidth: "100%",
-					fontSize: 10,
+					fontSize: require_theme.uiFontSize(10),
 					lineHeight: 1.4,
 					color: require_theme.dshThemeColor.labelSecondary,
 					textAlign: "center",
@@ -2208,7 +2339,7 @@ window.__ModuleLoader__.load({
 					transition: "width .2s ease"
 				}
 			})), animationOnly ? null : (0, react.createElement)("span", { style: {
-				fontSize: 10,
+				fontSize: require_theme.uiFontSize(10),
 				lineHeight: 1.5,
 				padding: "0 6px",
 				maxWidth: "100%"
@@ -2548,7 +2679,7 @@ window.__ModuleLoader__.load({
 				renderer
 			}));
 		}
-		function AvatarContent({ services, model, state, surface, size, renderer, showDiagnostics, transient }) {
+		function AvatarContent({ services, model, state, reaction, surface, size, renderer, showDiagnostics, transient }) {
 			const [error, setError] = (0, react.useState)("");
 			const [progress, setProgress] = (0, react.useState)(() => renderer?.reportsLoading === true ? { phase: renderer.initialLoadPhase ?? "resources" } : void 0);
 			const { preview, onPreview, discard } = useAssistantAvatarPreview(model, surface, transient ? void 0 : renderer?.previewVersion);
@@ -2579,6 +2710,7 @@ window.__ModuleLoader__.load({
 				onError,
 				onLoadProgress,
 				diagnostics,
+				...reaction === void 0 ? {} : { reaction },
 				...onPreview === void 0 ? {} : { onPreview: publishPreview }
 			};
 			const component = renderer?.component;
@@ -2628,7 +2760,7 @@ window.__ModuleLoader__.load({
 					opacity: progress !== void 0 && progress.phase !== "ready" ? 1 : 0,
 					transition: "opacity .25s ease"
 				}
-			}), progress === void 0 || progress.phase === "ready" && (!diagnostics || progress.elapsedMs === void 0 && !showCache) ? null : (0, react.createElement)(AssistantAvatarLoading, {
+			}), reaction === void 0 ? null : (0, react.createElement)(AssistantAvatarReactionBadge, { reaction }), progress === void 0 || progress.phase === "ready" && (!diagnostics || progress.elapsedMs === void 0 && !showCache) ? null : (0, react.createElement)(AssistantAvatarLoading, {
 				progress,
 				size,
 				t,
@@ -2662,6 +2794,7 @@ window.__ModuleLoader__.load({
 			return (0, react.createElement)("div", {
 				"data-codingns-avatar-fallback": true,
 				style: {
+					position: "relative",
 					display: "grid",
 					justifyItems: "center",
 					maxWidth: "100%"
@@ -2670,7 +2803,7 @@ window.__ModuleLoader__.load({
 				...props,
 				model: BUILTIN_ASSISTANT_AVATAR,
 				onError: () => void 0
-			}), (0, react.createElement)("span", {
+			}), props.reaction === void 0 ? null : (0, react.createElement)(AssistantAvatarReactionBadge, { reaction: props.reaction }), (0, react.createElement)("span", {
 				role: "status",
 				style: {
 					...require_theme.dshSettingsHelpStyle,
@@ -3219,6 +3352,12 @@ window.__ModuleLoader__.load({
 				return DEFAULT_ASSISTANT_TTS_PARAMETERS;
 			}
 		});
+		Object.defineProperty(exports, "DEFAULT_ASSISTANT_TTS_SETTINGS", {
+			enumerable: true,
+			get: function() {
+				return DEFAULT_ASSISTANT_TTS_SETTINGS;
+			}
+		});
 		Object.defineProperty(exports, "MOSS_BUILTIN_VOICES", {
 			enumerable: true,
 			get: function() {