dsh-per-message-model 0.1.6 → 0.1.8

package/lib/client.js

@@ -67,48 +67,6 @@ window.__ModuleLoader__.load({
 				})
 			]);
 		}
-		/**
-		* Per-message model badge as a small icon button. Missing projections
-		* degrade to the same icon with an unknown title (fail-soft, verifiable).
-		* @param value - a wire projection entry ({ provider, model, reasoningEffort, reasoningSource }).
-		* @param t - locale seat bound to this plugin's namespace.
-		*/
-		function modelBadge(value, t) {
-			const known = value !== null && typeof value === "object";
-			const provider = known && typeof value.provider === "string" ? value.provider : null;
-			const model = known && typeof value.model === "string" ? value.model : null;
-			const hasModel = provider !== null && model !== null;
-			const label = hasModel
-				? `${provider} / ${model}${t("badge.separator")}${t("badge.effort")} ${known && typeof value.reasoningEffort === "string" && value.reasoningEffort.length > 0 ? value.reasoningEffort : t("badge.effort.default")}`
-				: t("badge.unknown");
-			const title = hasModel && known && value.reasoningSource === "adapter-default"
-				? `${label}（${t("badge.effort.adapterDefault")}）`
-				: hasModel ? label : t("badge.unknown.title");
-			return createElement("span", {
-				className: BADGE_PREFIX + "icon",
-				"data-dsh-per-message-model": "true",
-				"aria-label": label,
-				title
-			}, chipIcon());
-		}
-		/** Session-header occupant: current model badge (latest folded assistant message). */
-		function SessionModelBadge({ useProjection, t }) {
-			const value = useProjection("perMessageModel");
-			const current = value === void 0 || value === null || typeof value !== "object" || value.current === void 0
-				? void 0
-				: value.current;
-			return modelBadge(current, t);
-		}
-		/** Assistant-actions occupant: per-message model icon, keyed by messageId
-		* (renders inside the official per-message action row, reordered after the
-		* branch button and before the time clock via CSS flex order). */
-		function PerMessageModelBadge({ messageId, useProjection, t }) {
-			const value = useProjection("perMessageModel");
-			const entry = value === void 0 || value === null || typeof value !== "object" || value.messages === void 0
-				? void 0
-				: value.messages[messageId];
-			return modelBadge(entry, t);
-		}
 		//#endregion
 		//#region client footer
 		/**
@@ -124,13 +82,14 @@ window.__ModuleLoader__.load({
 		* hook-based state in dock seats; the unfold/collapse is a pure DOM class
 		* toggle plus an inline transform on the icon, so it works in any host.
 		*/
-		function FooterModelBadge({ useProjection, t }) {
+		function MessageModelBadge({ messageId, useProjection, t }) {
 			let value = null;
 			try { value = useProjection("perMessageModel"); } catch (err) { value = null; }
 			const hasValue = value !== null && value !== void 0 && typeof value === "object";
-			const current = hasValue && typeof value.current === "object" && value.current !== null ? value.current : null;
-			const provider = current !== null && typeof current.provider === "string" ? current.provider : null;
-			const model = current !== null && typeof current.model === "string" ? current.model : null;
+			const messages = hasValue && typeof value.messages === "object" && value.messages !== null ? value.messages : null;
+			const entry = messages !== null && typeof messageId === "string" ? messages[messageId] : null;
+			const provider = entry !== null && typeof entry === "object" && typeof entry.provider === "string" ? entry.provider : null;
+			const model = entry !== null && typeof entry === "object" && typeof entry.model === "string" ? entry.model : null;
 			let label;
 			try { label = provider !== null && model !== null ? provider + " / " + model : (typeof t === "function" ? t("badge.unknown") : "model unknown"); }
 			catch (err) { label = provider !== null && model !== null ? provider + " / " + model : "model unknown"; }
@@ -171,8 +130,7 @@ window.__ModuleLoader__.load({
 					"data-open": "false"
 				}, label)
 			]);
-		}
-		//#endregion		//#endregion
+		}//#endregion		//#endregion
 		//#region client divider
 		/** Fixed Chinese copy for the model-switch divider (user-required). */
 		const SWITCH_COPY = "模型切换：";
@@ -304,12 +262,7 @@ window.__ModuleLoader__.load({
 			const badgeStyle = document.createElement("style");
 			badgeStyle.dataset.dshPerMessageModel = BADGE_PREFIX;
 			badgeStyle.textContent = [
-				// Per-message icon: small chip, full value in title/aria.
-				`[data-dsh-per-message-model]{display:inline-flex;align-items:center;justify-content:center;width:20px;height:20px;margin:0 2px;color:var(--dsw-alias-label-tertiary);border-radius:5px;cursor:default}`,
-				`[data-dsh-per-message-model]:hover{color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-base-2, var(--dsw-alias-bg-hover, rgba(128,128,128,.12)))}`,
-				// Reorder inside the official action row: copy(0) branch(0) icon(3) clock(4)
-				`[data-dsh-per-message-model]{order:3}`,
-				`div[class*="actions"]:has([data-slot="conversation.chat.assistant-actions"]) [class*="timeEnd"]{order:4}`,
+
 				// In-stream divider: full-width block, embeds in the message flow.
 				// Label (模型切换：) and arrow are gray; model names are darker/bolder.
 				`[data-dsh-model-switch]{display:flex;align-items:center;gap:8px;margin:10px 0 16px;padding:10px 14px;border:1.5px solid var(--dsw-alias-state-business-primary, #4f8cff);border-radius:10px;background:var(--dsw-alias-state-business-tertiary, rgba(79,140,255,.12));box-shadow:0 1px 3px rgba(0,0,0,.10);color:var(--dsw-alias-label-secondary);font-size:12px;line-height:18px;user-select:none}`,
@@ -317,39 +270,27 @@ window.__ModuleLoader__.load({
 				`[data-dsh-model-switch] [class*="-divider-model"]{flex:none;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-primary);font-weight:700}`,
 				`[data-dsh-model-switch] [class*="-divider-arrow"]{flex:none;display:inline-flex;align-items:center;color:var(--dsw-alias-label-tertiary)}`,
 				// Composer-dock model button: chip icon + unfoldable label (scroll).
-				`[data-dsh-per-message-model-footer]{display:inline-flex;align-items:center;gap:6px;padding:4px 8px;border:1px solid var(--dsw-alias-border-l2, rgba(128,128,128,.25));border-radius:8px;background:transparent;color:var(--dsw-alias-label-tertiary);cursor:pointer;max-width:100%;width:fit-content;flex:none;overflow:hidden}`,
+				`[data-dsh-per-message-model-footer]{display:inline-flex;align-items:center;gap:4px;padding:2px 6px;border:1px solid var(--dsw-alias-border-l2, rgba(128,128,128,.25));border-radius:6px;background:transparent;color:var(--dsw-alias-label-tertiary);cursor:pointer;max-width:100%;width:fit-content;flex:none;overflow:hidden;vertical-align:middle}`,
 				`[data-dsh-per-message-model-footer]:hover{color:var(--dsw-alias-label-primary);background:var(--dsw-alias-interactive-bg-hover, rgba(128,128,128,.12))}`,
 				`[data-dsh-per-message-model-footer] [class*="-footer-icon"]{display:inline-flex;align-items:center;flex:none;transition:transform .45s cubic-bezier(.34,1.56,.64,1)}`,
-				`[data-dsh-per-message-model-footer] [class*="-footer-label"]{display:inline-block;overflow:hidden;white-space:nowrap;max-width:0;opacity:0;transition:max-width .45s cubic-bezier(.4,0,.2,1),opacity .35s ease;font-size:12px;line-height:16px;color:var(--dsw-alias-label-primary);font-weight:600}`,
+				`[data-dsh-per-message-model-footer] [class*="-footer-label"]{display:inline-block;overflow:hidden;white-space:nowrap;max-width:0;opacity:0;transition:max-width .45s cubic-bezier(.4,0,.2,1),opacity .35s ease;font-size:11px;line-height:16px;color:var(--dsw-alias-label-primary);font-weight:600}`,
 				`[data-dsh-per-message-model-footer] [class*="-footer-label"][data-open="true"]{max-width:360px;opacity:1}`
 			].join("\n");
 			document.head.appendChild(badgeStyle);
 			ctx.effect(() => () => badgeStyle.remove(), "per-message-model: css");
 			ctx.effect(() => ctx.locale.register(NS, { zh, en }), "per-message-model: dictionaries");
-			ctx.slots.inject("conversation.session.header.actions", () => ctx.slots.register({
-				name: "conversation.session.header.actions",
-				id: "dsh-per-message-model-header",
-				locale: NS,
-				order: 80
-			}, SessionModelBadge));
-			ctx.slots.inject("conversation.chat.assistant-actions", () => ctx.slots.register({
-				name: "conversation.chat.assistant-actions",
-				id: "dsh-per-message-model-badge",
-				locale: NS,
-				order: 40
-			}, PerMessageModelBadge));
 			ctx.slots.inject("conversation.session.header.actions", () => ctx.slots.register({
 				name: "conversation.session.header.actions",
 				id: "dsh-per-message-model-switch",
 				locale: NS,
 				order: 90
 			}, ModelSwitchDivider));
-			ctx.slots.inject("conversation.input.dock", () => ctx.slots.register({
-				name: "conversation.input.dock",
+			ctx.slots.inject("conversation.chat.assistant-actions", () => ctx.slots.register({
+				name: "conversation.chat.assistant-actions",
 				id: "dsh-per-message-model-footer",
 				locale: NS,
-				order: 90
-			}, FooterModelBadge));
+				order: 40
+			}, MessageModelBadge));
 		}
 		//#endregion
 		exports.apply = apply;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-per-message-model",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "在 DSH 主对话每条 assistant 回复旁展示该条回复实际使用的 provider / model 徽章（可选附带 reasoning effort）",
   "type": "module",
   "main": "./lib/index.js",