dsh-dock 0.6.0 → 0.7.1

package/features/tokenlog/view.jsx

@@ -37,13 +37,7 @@ function fmtCompact(n) {
 	if (n >= 1e3) return (n / 1e3).toFixed(1) + "K";
 	return String(Math.round(n));
 }
-function fmtCost(n) {
-	const v = Number(n) || 0;
-	if (v >= 10) return "$" + v.toFixed(2);
-	if (v >= 0.01) return "$" + v.toFixed(4);
-	return "$" + v.toFixed(6);
-}
-// 人民币金额: USD 按汇率换算, 默认 7.2(host 返回 rateUsdCny 可覆盖)
+// 金额记录在 RPC 中以 USD 传输；界面统一按人民币显示。
 function fmtCostCny(usd, rate) {
 	const v = (Number(usd) || 0) * (Number(rate) > 0 ? Number(rate) : 7.2);
 	if (v >= 10000) return "¥" + (v / 10000).toFixed(2) + "万";
@@ -170,7 +164,7 @@ function Detail({ rec, onClose, rate }) {
 		["计费输入", fmtNum(rec.billedInput)],
 		["缓存命中率", rec.cacheHitPercent + "%"],
 		["总 Token", fmtNum(rec.totalTokens)],
-		["消耗金额(估算)", fmtCost(rec.cost) + " ≈ " + fmtCostCny(rec.cost, rateCny)],
+		["消耗金额(估算)", fmtCostCny(rec.cost, rateCny)],
 		["推理强度", rec.effort || "—"],
 		["耗时", fmtDuration(rec.llmMs)],
 		["Turn / Step", rec.turn + " / " + rec.step],
@@ -350,8 +344,7 @@ export function TokenLogView(props) {
 		{ v: fmtCompact(totals.cacheReadTokens), l: "缓存命中" },
 		{ v: totals.cacheHitPct + "%", l: "缓存命中率" },
 		{ v: fmtCompact(totals.outputTokens), l: "输出" },
-		{ v: fmtCost(totals.cost), l: "消耗金额(估算)" },
-		{ v: fmtCostCny(totals.cost, rateCny), l: "消耗金额(¥)" },
+		{ v: fmtCostCny(totals.cost, rateCny), l: "消耗金额(估算·人民币)" },
 		{ v: fmtDuration(totals.llmMs), l: "累计耗时" + (totals.timed ? " (" + totals.timed + "步)" : "") },
 	] : [];
 
@@ -368,7 +361,6 @@ export function TokenLogView(props) {
 			<td>{r.key}</td><td>{fmtNum(r.calls)}</td><td>{fmtCompact(r.inputTokens)}</td>
 			<td>{fmtCompact(r.cacheReadTokens)}</td><td>{r.cacheHitPct + "%"}</td><td>{fmtCompact(r.outputTokens)}</td>
 			<td>{fmtCompact(r.totalTokens)}</td>
-			<td>{fmtCost(r.cost)}</td>
 			<td>{fmtCostCny(r.cost, rateCny)}</td>
 			<td>{fmtDuration(r.llmMs)}</td>
 		</tr>
@@ -394,7 +386,6 @@ export function TokenLogView(props) {
 				<td>{fmtNum(r.outputTokens)}</td>
 				<td>{fmtNum(r.reasoningTokens)}</td>
 				<td>{fmtNum(r.totalTokens)}</td>
-				<td>{fmtCost(r.cost)}</td>
 				<td>{fmtCostCny(r.cost, rateCny)}</td>
 				<td>{r.effort || "—"}</td>
 				<td>
@@ -418,7 +409,7 @@ export function TokenLogView(props) {
 		<div key="sumtab" className="dtok-table-wrap">
 			<table className="dtok-table">
 				<thead><tr>
-					<th>维度</th><th>调用</th><th>输入</th><th>缓存</th><th>命中率</th><th>输出</th><th>总Token</th><th>金额</th><th>金额(¥)</th><th>耗时</th>
+					<th>维度</th><th>调用</th><th>输入</th><th>缓存</th><th>命中率</th><th>输出</th><th>总Token</th><th>金额（人民币）</th><th>耗时</th>
 				</tr></thead>
 				<tbody>{summaryRows}</tbody>
 			</table>
@@ -451,7 +442,7 @@ export function TokenLogView(props) {
 					<thead><tr>
 						{sortTh("时间", "time")}{sortTh("会话ID", "sessionId")}{sortTh("提供商", "provider")}{sortTh("模型", "model")}
 						{sortTh("输入", "inputTokens")}{sortTh("缓存", "cacheReadTokens")}{sortTh("命中%", "cacheHitPercent")}{sortTh("输出", "outputTokens")}
-						{sortTh("推理", "reasoningTokens")}{sortTh("总额", "totalTokens")}{sortTh("金额", "cost")}{sortTh("金额(¥)", "cost")}{sortTh("强度", "effort")}
+						{sortTh("推理", "reasoningTokens")}{sortTh("总额", "totalTokens")}{sortTh("金额（人民币）", "cost")}{sortTh("强度", "effort")}
 						{sortTh("状态", "status")}{sortTh("耗时", "llmMs")}
 					</tr></thead>
 					<tbody>{detailRows}</tbody>
@@ -521,32 +512,32 @@ function TokenLogHomeStat() {
 	}, []);
 	if (!snap.totals) return <span>{snap.err ? "用量查询失败（点击进入查看）" : "正在拉取今日用量…"}</span>;
 	const t = snap.totals;
-	return <span>今日 {fmtNum(t.calls)} 次调用 · {fmtCompact(t.totalTokens)} Token · {fmtCost(t.cost)}（{fmtCostCny(t.cost, snap.rate)}）</span>;
+	return <span>今日 {fmtNum(t.calls)} 次调用 · {fmtCompact(t.totalTokens)} Token · {fmtCostCny(t.cost, snap.rate)}</span>;
 }
 
 // ---------- 会话输入区 chip：显示当前会话总 Token（10s 静默刷新），点击打开功能坞并按该会话筛选 ----------
 export function TokenLogChip(props) {
 	const sid = (props && props.sessionId) || (props && props.session && props.session.sessionId) || null;
-	const [snap, setSnap] = useState({ totals: null, err: "" });
+	const [snap, setSnap] = useState({ totals: null, rate: 7.2, err: "" });
 	useEffect(() => {
 		if (!sid) return;
 		let cancel = false;
 		const load = () => rpcCall("query", { sessionId: sid })
-			.then((d) => { if (!cancel) setSnap({ totals: d && d.totals, err: "" }); })
-			.catch((e) => { if (!cancel) setSnap((s) => ({ totals: s.totals, err: String((e && e.message) || e) })); });
+			.then((d) => { if (!cancel) setSnap({ totals: d && d.totals, rate: (d && d.rateUsdCny) || 7.2, err: "" }); })
+			.catch((e) => { if (!cancel) setSnap((s) => ({ totals: s.totals, rate: s.rate, err: String((e && e.message) || e) })); });
 		load();
 		const timer = setInterval(load, 10000);
 		return () => { cancel = true; clearInterval(timer); };
 	}, [sid]);
 	if (!sid) return null;
 	const t = snap.totals;
-	// chip 文案用紧凑金额（2 位小数）：fmtCost 对小金额输出 6 位小数，chip 里太长会撑爆输入卡工具行；
+	// chip 文案用紧凑人民币金额（2 位小数），避免撑爆输入卡工具行；
 	// 完整金额在 title 悬浮提示里。
 	const label = snap.err && !t
 		? (snap.err.includes("重启") ? "用量·需重启宿主" : "用量·失败")
-		: (t ? "⛁ " + fmtCompact(t.totalTokens) + (t.cost > 0 ? " · $" + t.cost.toFixed(2) : "") : "⛁ …");
+		: (t ? "⛁ " + fmtCompact(t.totalTokens) + (t.cost > 0 ? " · " + fmtCostCny(t.cost, snap.rate) : "") : "⛁ …");
 	const title = t
-		? "本会话 " + fmtNum(t.calls) + " 次调用 · " + fmtNum(t.totalTokens) + " Token · " + fmtCost(t.cost) + "（估算）\n点击在功能坞查看用量记录"
+		? "本会话 " + fmtNum(t.calls) + " 次调用 · " + fmtNum(t.totalTokens) + " Token · " + fmtCostCny(t.cost, snap.rate) + "（估算）\n点击在功能坞查看用量记录"
 		: (snap.err ? snap.err + "\n" : "") + "点击在功能坞查看用量记录";
 	return (
 		<button type="button" className={"dockchip" + (snap.err && !t ? " err" : "")} title={title} aria-label="会话用量"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-dock",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "DeepSeek Harness 功能坞插件（dsh-dock）：模块化功能中枢——每个功能一个 features/ 模块（可单独提取成包发布，又可经 dockBridge 装回面板）。含用量记录（LLM 调用记账/费用统计）、模型设置、图片理解代理、模型余额、任务动画（8 种氛围动效 + 桌面伙伴 3D 场景、完成通知与提示音、钉钉/飞书推送，开关独立、配置持久化）；侧栏入口 + 可拖拽弹窗（最大化/最小化/缩放）。",
   "type": "module",
   "main": "index.js",
@@ -52,6 +52,7 @@
     "@deepseek-ai/dsh-credentials": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-llm": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-settings": "^0.1.1-rc.2",
-    "@deepseek-ai/schemastery": "^3.18.1"
+    "@deepseek-ai/schemastery": "^3.18.1",
+    "qrcode": "^1.5.4"
   }
 }

package/src/client.jsx

@@ -26,7 +26,7 @@ import { feature as fBalance } from "../features/balance/view.js";
 import { feature as fAnimation } from "../features/animation/view.jsx";
 
 const name = "dsh-dock";
-const DOCK_VERSION = "0.5.0";
+const DOCK_VERSION = "0.7.1";
 
 // ---- 内置功能注册表：新功能 = features/<id>/ 加模块 + 这里 import 一行 ----
 const BUILTIN_FEATURES = [fTokenlog, fModelconfig, fHeartbeat, fTheme, fBalance, fAnimation];
@@ -172,7 +172,11 @@ const SHELL_CSS = [
 	// 弹层页脚：文字标签 + 开关 成组
 	".dockm-foot-sw{margin-left:auto;flex:none;display:inline-flex;align-items:center;gap:8px;}",
 	".dockm-foot-swlabel{font-size:11px;color:var(--dsw-alias-label-tertiary);}",
-	".dockm-foot-swlabel.on{color:var(--dsw-alias-state-success-primary);}",
+".dockm-foot-swlabel.on{color:var(--dsw-alias-state-success-primary);}",
+	// 窄屏：功能坞是一级工作台而不是被压扁的桌面弹窗。全屏承接安全区，导航改横向，
+	// 禁用桌面拖拽/缩放，所有导航和关闭动作保持至少 44px 的可点击面积。
+	"@media (max-width:680px){.dockm-backdrop{align-items:stretch;justify-content:stretch;background:var(--dsw-alias-bg-layer-2);backdrop-filter:none}.dockm-dialog,.dockm-dialog.dockm-max{position:fixed!important;left:0!important;top:0!important;right:auto!important;bottom:auto!important;width:100dvw!important;height:100dvh!important;min-height:100dvh;border:0;border-radius:0;box-shadow:none}.dockm-dialog.dockm-min .dockm-body{display:flex}.dockm-head{min-height:60px;box-sizing:border-box;padding:calc(env(safe-area-inset-top) + 8px) 12px 8px;cursor:default;touch-action:manipulation}.dockm-sub,.dockm-win,.dockm-resize{display:none}.dockm-title{font-size:16px}.dockm-close{width:44px;height:44px;font-size:17px}.dockm-body{flex-direction:column;min-height:0}.dockm-nav{box-sizing:border-box;width:auto;max-width:100%;min-height:56px;flex-direction:row;gap:6px;padding:6px 10px;overflow-x:auto;overflow-y:hidden;border-right:0;border-bottom:1px solid var(--dsw-alias-border-l1);scrollbar-width:none;overscroll-behavior-x:contain}.dockm-nav::-webkit-scrollbar{display:none}.dockm-nav-item{flex:none;min-height:44px;padding:0 12px;font-size:13px;touch-action:manipulation}.dockm-nav-item .dockm-badge{display:none}.dockm-content{padding:16px max(16px,env(safe-area-inset-right)) calc(20px + env(safe-area-inset-bottom)) max(16px,env(safe-area-inset-left));gap:14px;overscroll-behavior:contain}.dockm-content-head{gap:5px}.dockm-name{font-size:16px}.dockm-desc{font-size:13px;line-height:1.55}.dockm-foot{padding-top:12px;font-size:11px}.dockm-foot-sw{width:100%;margin-left:0;justify-content:space-between}.dock-sw{width:44px;height:26px}.dock-sw::after{top:3px;left:3px;width:18px;height:18px}.dock-sw.on::after{transform:translateX(18px)}.dockh-grid{grid-template-columns:1fr;gap:10px}.dockh-card{padding:12px}.dockh-desc{font-size:13px}.dockh-go{font-size:12px}}",
+	"@media (prefers-reduced-motion:reduce){.dockm-backdrop,.dockm-dialog{animation:none}.dockm-nav-item,.dockm-close,.dockm-win,.dock-sw{transition:none}}",
 	".dockh-desc{color:var(--dsw-alias-label-secondary);font-size:12px;line-height:1.5;}",
 	".dockh-stat{color:var(--dsw-alias-label-tertiary);font-size:12px;border-top:1px solid var(--dsw-alias-border-l1);padding-top:6px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}",
 	".dockh-foot{display:flex;align-items:center;gap:8px;}",
@@ -181,11 +185,16 @@ const SHELL_CSS = [
 	// 溢出兼容（两层防护，缺一不可）：
 	//  1) 宽度上限：宿主 .row 是 flex-wrap:wrap 且换行优先于收缩，chips 一长 tools 整行变宽，
 	//     右侧模型选择器/发送键被挤到第二行（左右错位）。宿主 .row 带 container-type:inline-size，
-	//     用容器单位 cqw 让上限随输入卡宽度自适应（窄卡少占、宽卡多占）；不支持 cqw 的老内核退回固定 280px。
+	//     用容器单位 cqw 让上限随输入卡宽度自适应（窄卡少占、宽卡多占）；不支持 cqw 的老内核退回固定值。
+	//     注意：旧上限 min(280px,36cqw) 仍偏宽——标准 780px 输入卡下（.row 内容约 762px），
+	//     add 钮(28)+工作区选择器(~214)+chips(280) 已与右侧模型选择器+发送键（~345px）合计超宽，
+	//     即便 chips 未截断 .row 也会换行把模型选择器/发送键挤到第二行。实测把上限收到 189px
+	//     （≈25cqw）并使 chips 内距收紧（padding 2px 6px、gap 2px）后，实测 4~6M 用量 + 余额
+	//     两 chip 可完整显示且不再换行；超限时仍被省略号截断，完整值在 title 悬浮提示里。
 	//  2) 截断：超限部分用省略号截断（完整数值在 title 悬浮提示里），防 chips 凸出输入卡圆角（悬空）。
-	".dockchip-row{display:inline-flex;align-items:center;gap:4px;min-width:0;flex:0 1 auto;overflow:hidden;max-width:280px;}",
-	"@supports (width:1cqw){.dockchip-row{max-width:min(280px,36cqw);}}",
-	".dockchip{display:inline-flex;align-items:center;gap:5px;cursor:pointer;border:none;background:transparent;color:var(--dsw-alias-label-tertiary);border-radius:8px;padding:2px 8px;font-family:inherit;font-size:11px;line-height:18px;white-space:nowrap;min-width:0;overflow:hidden;transition:background .15s var(--ds-ease-in-out),color .15s var(--ds-ease-in-out);}",
+	".dockchip-row{display:inline-flex;align-items:center;gap:2px;min-width:0;flex:0 1 auto;overflow:hidden;max-width:189px;}",
+	"@supports (width:1cqw){.dockchip-row{max-width:min(189px,25cqw);}}",
+	".dockchip{display:inline-flex;align-items:center;gap:5px;cursor:pointer;border:none;background:transparent;color:var(--dsw-alias-label-tertiary);border-radius:8px;padding:2px 6px;font-family:inherit;font-size:11px;line-height:18px;white-space:nowrap;min-width:0;overflow:hidden;transition:background .15s var(--ds-ease-in-out),color .15s var(--ds-ease-in-out);}",
 	".dockchip > span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;min-width:0;}",
 	".dockchip:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary);}",
 	".dockchip .dockchip-dot{width:6px;height:6px;border-radius:50%;flex:none;}",
@@ -193,6 +202,13 @@ const SHELL_CSS = [
 ].join("\n");
 
 let dockCssTag = null;
+let initialCssSchedule = null;
+function cancelInitialCssSchedule() {
+	if (!initialCssSchedule || typeof window === "undefined") return;
+	if (initialCssSchedule.type === "idle" && typeof window.cancelIdleCallback === "function") window.cancelIdleCallback(initialCssSchedule.id);
+	if (initialCssSchedule.type === "timer") window.clearTimeout(initialCssSchedule.id);
+	initialCssSchedule = null;
+}
 function fullDockCss() {
 	const parts = [SHELL_CSS];
 	for (const f of BUILTIN_FEATURES) if (f.css) parts.push(f.css);
@@ -204,6 +220,7 @@ function fullDockCss() {
 // 外部功能注册携带样式时可重算更新（外部样式后到）。
 function ensureCss() {
 	if (typeof document === "undefined") return;
+	cancelInitialCssSchedule();
 	try {
 		if (!dockCssTag || !dockCssTag.isConnected) {
 			if (document.querySelector('style[data-plugin-css="dsh-dock"]')) {
@@ -219,6 +236,20 @@ function ensureCss() {
 		console.error("[dsh-dock] ensureCss failed:", e && e.message ? e.message : String(e));
 	}
 }
+// 刷新页时宿主内容优先绘制：功能坞样式很大，首帧同步解析会让整页短暂停顿。
+// 首次注入延后到浏览器空闲期；之后的外部模块注册仍走 ensureCss() 立即更新。
+function scheduleInitialCss() {
+	if (typeof document === "undefined" || initialCssSchedule || (dockCssTag && dockCssTag.isConnected)) return;
+	const run = () => {
+		initialCssSchedule = null;
+		ensureCss();
+	};
+	if (typeof window !== "undefined" && typeof window.requestIdleCallback === "function") {
+		initialCssSchedule = { type: "idle", id: window.requestIdleCallback(run, { timeout: 350 }) };
+	} else {
+		initialCssSchedule = { type: "timer", id: setTimeout(run, 48) };
+	}
+}
 
 // ---- 外部功能变化订阅 hook（弹层/设置页重渲染用） ----
 function useExternalVersion() {
@@ -272,9 +303,14 @@ function DockModal() {
 	// lastGeom 记住本页生命周期内最后一次几何，重开弹层时还原
 	const [win, setWin] = react.useState(() => ({ mode: "normal", x: null, y: null, w: null, h: null }));
 	const dlgRef = react.useRef(null);
+	const contentRef = react.useRef(null);
 	react.useEffect(() => {
 		if (lastGeom.w) setWin({ mode: "normal", x: lastGeom.x, y: lastGeom.y, w: lastGeom.w, h: lastGeom.h });
 	}, []);
+	// 切换左侧模块时总是从新页面顶部开始，避免把上一页的滚动位置带进小游戏等短页面。
+	react.useEffect(() => {
+		if (open && contentRef.current) contentRef.current.scrollTop = 0;
+	}, [active, open]);
 	function beginDrag(e, type) {
 		if (win.mode !== "normal" || e.button !== 0) return;
 		if (type === "move" && e.target && e.target.closest && e.target.closest("button,select,input")) return;
@@ -377,7 +413,7 @@ function DockModal() {
 							react.createElement("span", null, m.name),
 							m.planned ? react.createElement("span", { className: "dockm-badge" }, "规划中") : null,
 							m.external ? react.createElement("span", { className: "dockm-badge" }, "外部") : null))),
-				react.createElement("div", { className: "dockm-content" },
+				react.createElement("div", { className: "dockm-content", ref: contentRef },
 					react.createElement("div", { className: "dockm-content-head" },
 						react.createElement("div", { className: "dockm-name" },
 							isHome
@@ -589,7 +625,7 @@ const ctxRef = { current: null };
 
 export function apply(ctx) {
 	ctxRef.current = ctx;
-	ensureCss();
+	scheduleInitialCss();
 	initFeatureState(BUILTIN_FEATURES.concat(PLANNED_FEATURES));
 	const slots = ctx.get("slots");
 	if (slots === undefined) return;
@@ -614,4 +650,4 @@ export function apply(ctx) {
 }
 
 export const inject = ["timer"];
-export { dockBridge };
+export { dockBridge };

package/src/host-core.js

@@ -39,7 +39,10 @@ export const DockConfig = z.object({
 })
 
 /** 任务动画 effectMode 合法值（客户端动画模式）。 */
-export const ANIMATION_MODES = ['flow', 'breathe', 'ring', 'orbit', 'robot', 'matrix', 'stars', 'aurora']
+export const ANIMATION_MODES = [
+  'flow', 'breathe', 'ring', 'orbit', 'robot', 'matrix', 'stars', 'aurora', 'space',
+  'nebula', 'warp', 'radar', 'constellation', 'fireflies', 'ocean', 'prism', 'circuit', 'gravity', 'lantern',
+]
 
 /** 提示音 soundEffect 合法值（客户端音效库键名）。 */
 export const SOUND_EFFECTS = ['chime', 'ding', 'coin', 'bell', 'pulse', 'arp']