dsh-milestone 0.7.0 → 0.7.1

package/README.md

@@ -114,7 +114,7 @@ shell.overlay (root scope)
 
 ## 版本与兼容
 
-- 当前官方支持线：**`0.1.5-rc.1`**（与 `@deepseek-ai/dsh` 最新 `latest` / `next` 标签一致）。
+- 当前官方支持线：**`0.1.5` 线**（`0.1.5-rc.1` 是 npm `latest`、`0.1.5-rc.2` 是 `next`；peer 范围 `>=0.1.5-rc.1 <0.3.0-0` 同时覆盖两者）。
 - peer/dev 范围为收紧的 `>=0.1.5-rc.1 <0.3.0-0`（`dsh-client-locale` / `dsh-client-store` / `dsh-client-ui-slots`）：依赖解析到旧线时会得到明确的 ERESOLVE，而不是静默错配。
 - 0.1.5 起流式时序内嵌在 `assistant/message` / `assistant/attempt` 的紧凑 `stream` 中（独立的 `assistant/chunk` 事件已移除），TTFT 由官方 `assistantStreamFirstTokenTime` 读取；`TokenUsage` 字段更名为 `inputTokens`/`outputTokens`/`totalTokens` 并拆分缓存计数，插件的 `input` 显示为三项之和（缓存计入），保持旧的「提示词 token」含义。
 - 会话数据自 0.1.2 起改经**会话投影**提供（插件注册 `milestone.messages`，client 端 `useProjection` 读取）；`defineStore` 由 `@deepseek-ai/dsh-client-store` 提供。
@@ -140,7 +140,17 @@ shell.overlay (root scope)
 ## 更新日志
 
 <details>
-<summary>v0.7.0 / v0.6.6 / v0.6.5 / v0.6.4（点击展开）</summary>
+<summary>v0.7.1 / v0.7.0 / v0.6.6 / v0.6.5 / v0.6.4（点击展开）</summary>
+
+**v0.7.1** · 升级不再被卡（可选 peer + 兼容边界）· 恢复模型与错误徽标 · 跟随官方 0.1.5-rc.2 · 457 项测试
+
+- **升级不再被 ERESOLVE 卡死**：三个 DSH 客户端包 peer 改为 **optional**——官方换 rc 线时只告警、不再拒绝安装；并新增**渲染期兼容边界**：契约一旦变化，给出明确提示（"与当前 DSH 版本不兼容，请升级插件"），不再静默消失或拖垮宿主 UI。
+- **恢复悬停卡的模型**：改从 0.1.5 的 `request/context` 事件读取 provider / model（此前恒为 `null`）。
+- **恢复错误 / 重试徽标**：由 `turn/end` 的结束原因（error / max-tokens）与 `assistant/attempt` 结算次数重建（此前徽标恒空）。
+- **跟随官方 `0.1.5-rc.2`**（npm `latest` 仍为 rc.1；peer 范围 `>=0.1.5-rc.1 <0.3.0-0` 同时覆盖两者）；上游 `dsh-client-store` 漏声明 `zustand`/`immer` 的兜底扩到整条 0.1.5 线。
+- **CI 新增 `advisory / dsh next`**：持续对官方 `next` 线跑类型检查与测试，提前预警破坏性变更（首跑即发现 rc.2 与上述打包缺陷）。
+
+> [GitHub Release v0.7.1](https://github.com/SnowCrescenter-tech/dsh-milestone/releases/tag/v0.7.1)
 
 **v0.7.0** · 跟随官方 0.1.5（会话投影数据层）· 折叠为可拖动悬浮球（issue #4）· 447 项测试
 

package/lib/client.js

@@ -4,9 +4,31 @@ window.__ModuleLoader__.load({
 		var module = { exports: {} };
 		var exports = module.exports;
 		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-		let react_jsx_runtime = require("react/jsx-runtime");
 		let react = require("react");
+		let react_jsx_runtime = require("react/jsx-runtime");
 		let _deepseek_ai_dsh_client_store = require("@deepseek-ai/dsh-client-store");
+		//#region src/client/modal-tokens.ts
+		/**
+		* modal-tokens: the ONE source for the settings modal's dark-panel palette and
+		* radius scale, shared with the 0.6.5 coach-tour bubble so the two surfaces
+		* cannot drift (same dark panel on a dark host, same three text tiers, same
+		* 12px panel / 8px control radius, same border tone).
+		*
+		* The static MODAL_CSS block (hover/focus-visible/reduced-motion rules) stays
+		* in MilestoneRail.tsx because it also styles the settings modal's own chrome
+		* (`[data-support-card]`, `[data-toolbar-*]`, ...); the tour bubble carries
+		* its own small TOUR_CSS block for its controls, built from these same tokens.
+		* MilestoneRail.tsx imports these constants verbatim so a future palette
+		* change edits exactly one file.
+		*/
+		const MODAL_BG = "rgba(20, 24, 32, 0.98)";
+		const MODAL_FG = "#e6e8ee";
+		const MODAL_TITLE = "#c7cede";
+		const MODAL_TEXT = "#b9c2d4";
+		const MODAL_HINT = "#8b96ab";
+		const MODAL_BORDER = "rgba(255, 255, 255, 0.14)";
+		const MODAL_TIP_BG = "#222834";
+		//#endregion
 		//#region src/client/MilestoneOverlay.tsx
 		/**
 		* @param props - runtime share (root kit) + the narrowed renderSlot and the
@@ -129,6 +151,23 @@ window.__ModuleLoader__.load({
 		* @param input - the mark's snapshot signals.
 		* @returns the winning badge kind, or null when no signal applies.
 		*/
+		/**
+		* 0.1.5: durable badge kinds for one projected turn. The fold no longer sees
+		* the chat-layer `turn-error` / `turn-max-tokens` node kinds, but `turn/end`'s
+		* reason carries the same signal, and every `assistant/attempt` settlement
+		* (failed / retried / cancelled / stream error) is a retry.
+		* @param turn - the projection's turn meta (only the two fields are read).
+		* @returns the node-kind vocabulary {@link deriveBadge} consumes; empty when normal.
+		*/
+		function kindsForTurn(turn) {
+			const kinds = [];
+			if (turn.endReason === "error" || turn.endReason === "interrupted") kinds.push("turn-error");
+			if (turn.endReason === "max-tokens") kinds.push("turn-max-tokens");
+			if ((turn.attempts ?? 0) > 0) kinds.push("model-retry");
+			return kinds.length === 0 ? EMPTY_KINDS : kinds;
+		}
+		/** Stable empty result so normal turns never allocate a fresh array. */
+		const EMPTY_KINDS = Object.freeze([]);
 		function deriveBadge(input) {
 			if (input.nodeKinds.includes("turn-error")) return "error";
 			if (input.nodeKinds.includes("turn-max-tokens")) return "max-tokens";
@@ -469,12 +508,12 @@ window.__ModuleLoader__.load({
 		* @returns the turn's metadata, null where unknown.
 		*/
 		function deriveTurnMetaFromProjection(turn) {
-			if (turn?.usage === void 0) return EMPTY_META;
+			if (turn === void 0) return EMPTY_META;
 			return {
-				model: null,
+				model: turn.model ?? null,
 				purpose: null,
-				inputTokens: turn.usage.input,
-				outputTokens: turn.usage.output
+				inputTokens: turn.usage?.input ?? null,
+				outputTokens: turn.usage?.output ?? null
 			};
 		}
 		//#endregion
@@ -1463,12 +1502,6 @@ window.__ModuleLoader__.load({
 				]
 			});
 		}
-		const MODAL_FG = "#e6e8ee";
-		const MODAL_TITLE = "#c7cede";
-		const MODAL_TEXT = "#b9c2d4";
-		const MODAL_HINT = "#8b96ab";
-		const MODAL_BORDER = "rgba(255, 255, 255, 0.14)";
-		const MODAL_TIP_BG = "#222834";
 		//#endregion
 		//#region src/client/onboarding-store.ts
 		/**
@@ -2832,7 +2865,7 @@ window.__ModuleLoader__.load({
 		* Installed plugin version. Injected at build time as
 		* `__DSH_MILESTONE_VERSION__`; falls back to `0.0.0-dev` when unbuilt.
 		*/
-		const PLUGIN_VERSION = "0.7.0";
+		const PLUGIN_VERSION = "0.7.1";
 		//#endregion
 		//#region src/client/MilestoneRail.tsx
 		/**
@@ -3173,7 +3206,16 @@ window.__ModuleLoader__.load({
 					preview: m.preview
 				}));
 			}, [projection]);
-			const kindsByTurn = EMPTY_KINDS_BY_TURN;
+			const kindsByTurn = (0, react.useMemo)(() => {
+				const turns = projection?.turns;
+				if (turns === void 0 || turns.length === 0) return EMPTY_KINDS_BY_TURN;
+				const map = /* @__PURE__ */ new Map();
+				for (const t of turns) {
+					const kinds = kindsForTurn(t);
+					if (kinds.length > 0) map.set(t.turn, kinds);
+				}
+				return map;
+			}, [projection]);
 			const running = useSession((s) => s.running);
 			const awaitingInput = useSession((s) => s.queue).length > 0;
 			const [railBox, setRailBox] = (0, react.useState)(null);
@@ -5273,7 +5315,7 @@ window.__ModuleLoader__.load({
 								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 									style: { color: "#8b96ab" },
 									children: [t("update.current"), ": "]
-								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: "0.7.0" })] }),
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: "0.7.1" })] }),
 								updateCheck.phase === "ok" && updateCheck.latest !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 									"data-update-latest": true,
 									children: [
@@ -5556,6 +5598,70 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
+		//#region src/client/CompatBoundary.tsx
+		/**
+		* Compatibility boundary for both plugin surfaces.
+		*
+		* The plugin consumes the framework's session standard kit (`useSession`,
+		* `useProjection`, the store seat) and the slot registry, all of which a DSH
+		* upgrade may rename or reshape. Without a boundary such a failure throws out
+		* of the plugin's render — and when the registry silently ignores a stale
+		* entry the rail simply vanishes with no explanation.
+		*
+		* The boundary converts any throw into ONE compact, honest notice instead: the
+		* surrounding harness keeps working, and the user is told what to do (0.1.2→
+		* 0.1.5 has already shown that these upgrades do break third-party plugins).
+		*
+		* A class boundary rather than a per-render capability probe is deliberate:
+		* React exposes error boundaries only through class components, and swapping
+		* hook implementations based on a runtime probe would break hook order.
+		*/
+		/** Catches a render failure anywhere below and shows the incompatibility notice. */
+		var CompatBoundary = class extends react.Component {
+			state = { failed: false };
+			static getDerivedStateFromError() {
+				return { failed: true };
+			}
+			componentDidCatch(error, info) {
+				console.error("[dsh-milestone] incompatible with this DSH version — the rail is disabled. Please update dsh-milestone (or pin an older DSH).", error, info.componentStack);
+			}
+			render() {
+				if (!this.state.failed) return this.props.children;
+				return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					"data-milestone-incompatible": true,
+					role: "status",
+					style: {
+						position: "fixed",
+						right: 14,
+						bottom: 14,
+						zIndex: 100,
+						maxWidth: 300,
+						padding: "10px 12px",
+						background: MODAL_BG,
+						color: MODAL_HINT,
+						border: `1px solid ${MODAL_BORDER}`,
+						borderRadius: 12,
+						fontSize: 12,
+						lineHeight: 1.5,
+						fontFamily: "inherit"
+					},
+					children: [
+						"dsh-milestone 与当前 DSH 版本不兼容，已停用。请升级插件。",
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("br", {}),
+						"Incompatible with this DSH version — please update dsh-milestone."
+					]
+				});
+			}
+		};
+		/** The `shell.overlay` seat wrapped in the compatibility boundary. */
+		function GuardedMilestoneOverlay(props) {
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CompatBoundary, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(MilestoneOverlay, { ...props }) });
+		}
+		/** The `milestone.rail` seat wrapped in the compatibility boundary. */
+		function GuardedMilestoneRail(props) {
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CompatBoundary, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(MilestoneRail, { ...props }) });
+		}
+		//#endregion
 		//#region src/client/bookmarkStore.ts
 		/**
 		* Persisted per-session bookmarks store for the milestone rail.
@@ -5698,7 +5804,7 @@ window.__ModuleLoader__.load({
 					kind: "single",
 					scope: "session"
 				} }
-			}, MilestoneOverlay));
+			}, GuardedMilestoneOverlay));
 			ctx.slots.inject("milestone.rail", () => ctx.slots.register({
 				name: "milestone.rail",
 				store: createBookmarksStore,
@@ -5709,7 +5815,7 @@ window.__ModuleLoader__.load({
 					searchSessions: createSessionSearch(sessions),
 					openSession: createOpenSession(sessions)
 				})
-			}, MilestoneRail));
+			}, GuardedMilestoneRail));
 		}
 		//#endregion
 		exports.apply = apply;

package/lib/index.js

@@ -20,7 +20,10 @@ const turnMetaSchema = z.object({
 		input: z.number(),
 		output: z.number(),
 		total: z.number()
-	}).optional()
+	}).optional(),
+	provider: z.string().optional(),
+	model: z.string().optional(),
+	attempts: z.number().int().nonnegative().optional()
 });
 z.object({
 	messages: z.array(messageEntrySchema),
@@ -73,7 +76,7 @@ function initialState() {
 }
 const milestoneMessagesProjectionDefinition = {
 	key: "milestone.messages",
-	stateVersion: 3,
+	stateVersion: 4,
 	stateSchema: z.custom(),
 	init: (_header, _inheritedEventCount) => initialState(),
 	apply(state, event) {
@@ -81,12 +84,17 @@ const milestoneMessagesProjectionDefinition = {
 			case "turn/start": {
 				const turn = event.data.turn;
 				if (state.turns.some((t) => t.turn === turn)) return state;
+				const route = state.route;
 				return {
-					messages: state.messages,
+					...state,
 					turns: [...state.turns, {
 						turn,
 						startSeq: SessionSeq(event.seq),
-						startTime: event.time
+						startTime: event.time,
+						...route === void 0 ? {} : {
+							provider: route.provider,
+							model: route.model
+						}
 					}]
 				};
 			}
@@ -97,6 +105,7 @@ const milestoneMessagesProjectionDefinition = {
 				const preview = previewText(content, 80);
 				const openTurn = state.turns[state.turns.length - 1];
 				return {
+					...state,
 					messages: [...state.messages, {
 						seq: SessionSeq(event.seq),
 						messageId: typeof data.id === "string" ? data.id : "",
@@ -104,8 +113,7 @@ const milestoneMessagesProjectionDefinition = {
 						turn: openTurn?.turn ?? 0,
 						preview,
 						text
-					}],
-					turns: state.turns
+					}]
 				};
 			}
 			case "assistant/message": {
@@ -143,24 +151,31 @@ const milestoneMessagesProjectionDefinition = {
 				const turns = state.turns.slice();
 				turns[index] = next;
 				return {
-					messages: state.messages,
+					...state,
 					turns
 				};
 			}
 			case "assistant/attempt": {
 				const turn = event.data.turn;
 				const index = state.turns.findIndex((t) => t.turn === turn);
-				if (index < 0 || state.turns[index].firstChunkTime !== void 0) return state;
-				const stream = event.data.stream;
-				const firstToken = Array.isArray(stream) ? assistantStreamFirstTokenTime(stream) : void 0;
-				if (firstToken === void 0) return state;
-				const turns = state.turns.slice();
-				turns[index] = {
-					...turns[index],
-					firstChunkTime: firstToken
+				if (index < 0) return state;
+				const prior = state.turns[index];
+				let next = {
+					...prior,
+					attempts: (prior.attempts ?? 0) + 1
 				};
+				if (prior.firstChunkTime === void 0) {
+					const stream = event.data.stream;
+					const firstToken = Array.isArray(stream) ? assistantStreamFirstTokenTime(stream) : void 0;
+					if (firstToken !== void 0) next = {
+						...next,
+						firstChunkTime: firstToken
+					};
+				}
+				const turns = state.turns.slice();
+				turns[index] = next;
 				return {
-					messages: state.messages,
+					...state,
 					turns
 				};
 			}
@@ -175,7 +190,39 @@ const milestoneMessagesProjectionDefinition = {
 					endReason: event.data.reason.kind
 				};
 				return {
-					messages: state.messages,
+					...state,
+					turns
+				};
+			}
+			case "request/context": {
+				const provider = typeof event.data.provider === "string" ? event.data.provider : "";
+				const model = typeof event.data.model === "string" ? event.data.model : "";
+				if (provider === "" && model === "") return state;
+				const index = state.turns.length - 1;
+				const open = index >= 0 ? state.turns[index] : void 0;
+				if (open === void 0 || open.endTime !== void 0) {
+					if (state.route?.provider === provider && state.route.model === model) return state;
+					return {
+						...state,
+						route: {
+							provider,
+							model
+						}
+					};
+				}
+				if (open.provider === provider && open.model === model) return state;
+				const turns = state.turns.slice();
+				turns[index] = {
+					...open,
+					provider,
+					model
+				};
+				return {
+					...state,
+					route: {
+						provider,
+						model
+					},
 					turns
 				};
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-milestone",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Git-style milestone timeline for DeepSeek Harness: hover for metadata, click to jump to any message. 会话里程碑导航条：圆点时间线，定位并跳转到每条提问。",
   "type": "module",
   "main": "lib/index.js",
@@ -53,15 +53,26 @@
     "@deepseek-ai/dsh-client-ui-slots": ">=0.1.5-rc.1 <0.3.0-0",
     "react": "^18.2.0"
   },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh-client-locale": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-store": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-slots": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-api-session-controller": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-locale": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-store": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-layout": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-session": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-api-session-controller": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-locale": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-store": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-layout": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-session": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.5-rc.2",
     "@playwright/test": "^1.62.1",
     "@testing-library/jest-dom": "^7.0.1",
     "@testing-library/react": "^16.3.2",
@@ -75,9 +86,9 @@
     "vitest": "^4.1.10"
   },
   "dependencies": {
-    "@deepseek-ai/dsh-llm": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-session": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-session-projection": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-llm": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-session": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-session-projection": "0.1.5-rc.2",
     "zod": "^4.5.4"
   }
 }