@dshtrading/watchlist 0.6.3 → 0.7.0

package/lib/file-store.js

@@ -1,6 +1,6 @@
 import { WATCHLIST_SEEDS } from "./seeds.js";
-import { newWatchlistGroupId, normalizeWatchlistRow } from "./index.js";
-import { createRecordStoreAdapter, readStoreText } from "@dshtrading/dsh-home";
+import { newWatchlistGroupId, normalizePinnedKey, normalizeWatchlistRow } from "./index.js";
+import { SKIP_WRITE, createRecordStoreAdapter, readStoreText } from "@dshtrading/dsh-home";
 //#region src/file-store.ts
 /**
 * 文件持久化版自选/选中 store（Node.js 宿主侧使用，issue #32 规格）。
@@ -154,15 +154,24 @@ function createFileWatchlistGroupsStore(filePath) {
 	};
 	/** 读盘/解析失败的日志前缀（坏 JSON 与非 ENOENT 读失败同一条，与既有 load 口径逐字一致）。 */
 	const READ_FAILED = `[dsh-trading/watchlist] failed to read watchlist groups from ${filePath}:`;
-	/** 文本 → 分组表：容器包裹（`{ groups: [] }`）逐条过滤形状；坏 JSON 降级空表并打日志。 */
+	/** 文本 → 容器记录：`{ groups, pinned }` 逐条过滤形状；坏 JSON 降级空容器并打日志。 */
 	function decode(text) {
-		if (text === void 0) return [];
+		if (text === void 0) return {
+			groups: [],
+			pinned: []
+		};
 		try {
 			const parsed = JSON.parse(text);
-			return Array.isArray(parsed.groups) ? parsed.groups.filter((group) => typeof group === "object" && group !== null && typeof group.id === "string" && group.id !== "" && typeof group.name === "string") : [];
+			return {
+				groups: Array.isArray(parsed.groups) ? parsed.groups.filter((group) => typeof group === "object" && group !== null && typeof group.id === "string" && group.id !== "" && typeof group.name === "string") : [],
+				pinned: Array.isArray(parsed.pinned) ? [...new Set(parsed.pinned.map(normalizePinnedKey).filter((key) => key !== null))] : []
+			};
 		} catch (err) {
 			console.error(READ_FAILED, err);
-			return [];
+			return {
+				groups: [],
+				pinned: []
+			};
 		}
 	}
 	const store = createRecordStoreAdapter({
@@ -170,24 +179,27 @@ function createFileWatchlistGroupsStore(filePath) {
 		logPrefix: LOG_PREFIX,
 		readFromDisk: () => readStoreText(filePath, READ_FAILED),
 		decode,
-		encode: (groups) => ({ groups })
+		encode: (record) => ({
+			groups: record.groups,
+			...record.pinned.length > 0 ? { pinned: record.pinned } : {}
+		})
 	});
 	/**
 	* 跨进程读改写；mutate 返回 null 表示无变化（不落盘），缓存仍取锁内新鲜值。
 	* 返回 null 是分组工具的既有写法，逐字保留。
 	*/
 	async function commit(mutate) {
-		return store.commit((onDisk) => mutate(onDisk) ?? onDisk);
+		return store.commit((onDisk) => mutate(onDisk) ?? SKIP_WRITE);
 	}
 	return {
 		async list() {
-			return [...await store.load()];
+			return [...(await store.load()).groups];
 		},
 		async create(name) {
 			let result;
 			await enqueue(async () => {
 				await commit((onDisk) => {
-					if (onDisk.some((group) => group.name === name)) {
+					if (onDisk.groups.some((group) => group.name === name)) {
 						result = { error: "duplicate" };
 						return null;
 					}
@@ -197,7 +209,10 @@ function createFileWatchlistGroupsStore(filePath) {
 						createdAt: Date.now()
 					};
 					result = { group };
-					return [...onDisk, group];
+					return {
+						...onDisk,
+						groups: [...onDisk.groups, group]
+					};
 				});
 			});
 			return result ?? { error: "duplicate" };
@@ -206,12 +221,12 @@ function createFileWatchlistGroupsStore(filePath) {
 			let result;
 			await enqueue(async () => {
 				await commit((onDisk) => {
-					const existing = onDisk.find((group) => group.id === id);
+					const existing = onDisk.groups.find((group) => group.id === id);
 					if (existing === void 0) {
 						result = { error: "not-found" };
 						return null;
 					}
-					if (onDisk.some((group) => group.id !== id && group.name === name)) {
+					if (onDisk.groups.some((group) => group.id !== id && group.name === name)) {
 						result = { error: "duplicate" };
 						return null;
 					}
@@ -219,10 +234,13 @@ function createFileWatchlistGroupsStore(filePath) {
 						...existing,
 						name
 					} };
-					return onDisk.map((group) => group.id === id ? {
-						...group,
-						name
-					} : group);
+					return {
+						...onDisk,
+						groups: onDisk.groups.map((group) => group.id === id ? {
+							...group,
+							name
+						} : group)
+					};
 				});
 			});
 			return result ?? { error: "not-found" };
@@ -231,13 +249,51 @@ function createFileWatchlistGroupsStore(filePath) {
 			let removed = false;
 			await enqueue(async () => {
 				await commit((onDisk) => {
-					const next = onDisk.filter((group) => group.id !== id);
-					if (next.length === onDisk.length) return null;
+					const next = onDisk.groups.filter((group) => group.id !== id);
+					if (next.length === onDisk.groups.length) return null;
 					removed = true;
-					return next;
+					return {
+						...onDisk,
+						groups: next
+					};
 				});
 			});
 			return removed;
+		},
+		async pinned() {
+			return [...(await store.load()).pinned];
+		},
+		async setPinned(key, want) {
+			const normalized = normalizePinnedKey(key);
+			if (normalized === null) return false;
+			let changed = false;
+			await enqueue(async () => {
+				await commit((onDisk) => {
+					if (onDisk.pinned.includes(normalized) === want) return null;
+					changed = true;
+					return {
+						...onDisk,
+						pinned: want ? [...onDisk.pinned, normalized] : onDisk.pinned.filter((entry) => entry !== normalized)
+					};
+				});
+			});
+			return changed;
+		},
+		async stripPinned(key) {
+			const normalized = normalizePinnedKey(key);
+			if (normalized === null) return false;
+			let changed = false;
+			await enqueue(async () => {
+				await commit((onDisk) => {
+					if (!onDisk.pinned.includes(normalized)) return null;
+					changed = true;
+					return {
+						...onDisk,
+						pinned: onDisk.pinned.filter((entry) => entry !== normalized)
+					};
+				});
+			});
+			return changed;
 		}
 	};
 }

package/lib/index.d.ts

@@ -35,13 +35,27 @@ interface WatchlistGroupWriteResult {
   group?: WatchlistGroup;
   error?: 'duplicate' | 'not-found';
 }
-/** 自定义分组注册表 store（元数据；成员关系的读写走 WatchlistStore.assignGroup/stripGroup）。 */
+/**
+ * 自定义分组注册表 store（元数据；成员关系的读写走 WatchlistStore.assignGroup/stripGroup）。
+ * 置顶键集与注册表同一容器、同一个 file store 实例（2026-09-08 双 store 前科：
+ * 同路径两个实例各持整表缓存，互相覆盖）。
+ */
 interface WatchlistGroupsStore {
   list(): Promise<WatchlistGroup[]>;
   create(name: string): Promise<WatchlistGroupWriteResult>;
   rename(id: string, name: string): Promise<WatchlistGroupWriteResult>;
   remove(id: string): Promise<boolean>;
+  /** 置顶键集（`market:symbol`，见 {@link watchlistRowKey}）：面板级用户偏好，各视图共用。 */
+  pinned(): Promise<string[]>;
+  /** 置顶/取消置顶；键已处于目标状态返回 false 且不落盘。 */
+  setPinned(key: string, pinned: boolean): Promise<boolean>;
+  /** 行被移除时清掉它的置顶键（防僵尸置顶：重新加回不会自动置顶）。 */
+  stripPinned(key: string): Promise<boolean>;
 }
+/** 行键/置顶键（`market:symbol`）：客户端 rowKey、桥端 pin 与删行清洗同源格式。 */
+declare function watchlistRowKey(market: string, symbol: string): string;
+/** 置顶键清洗：只收 `market:symbol` 形（空段/无冒号一律剔除，坏值不落盘）。 */
+declare function normalizePinnedKey(raw: unknown): string | null;
 /** 选中标的记录（中栏切图的 SSOT）。 */
 interface SelectionRecord {
   instrument: WatchlistInstrument | null;
@@ -71,8 +85,8 @@ declare function newWatchlistGroupId(): string;
 /** 内存版自选 store（单测用）。 */
 declare function createMemoryWatchlistStore(initial?: WatchlistsMap): WatchlistStore;
 /** 内存版分组注册表 store（单测用）。同名拒绝（trim 后精确匹配）；调用方负责非空校验。 */
-declare function createMemoryWatchlistGroupsStore(initial?: WatchlistGroup[]): WatchlistGroupsStore;
+declare function createMemoryWatchlistGroupsStore(initial?: WatchlistGroup[], initialPinned?: string[]): WatchlistGroupsStore;
 /** 内存版选中 store（单测用）。 */
 declare function createMemorySelectionStore(initial?: SelectionRecord): SelectionStore;
 //#endregion
-export { SelectionRecord, SelectionStore, WATCHLIST_SEEDS, WatchlistGroup, WatchlistGroupWriteResult, WatchlistGroupsStore, WatchlistInstrument, WatchlistStore, WatchlistsMap, createMemorySelectionStore, createMemoryWatchlistGroupsStore, createMemoryWatchlistStore, effectiveWatchlistRows, newWatchlistGroupId, normalizeWatchlistRow, watchlistRowSource };
+export { SelectionRecord, SelectionStore, WATCHLIST_SEEDS, WatchlistGroup, WatchlistGroupWriteResult, WatchlistGroupsStore, WatchlistInstrument, WatchlistStore, WatchlistsMap, createMemorySelectionStore, createMemoryWatchlistGroupsStore, createMemoryWatchlistStore, effectiveWatchlistRows, newWatchlistGroupId, normalizePinnedKey, normalizeWatchlistRow, watchlistRowKey, watchlistRowSource };

package/lib/index.js

@@ -1,5 +1,17 @@
 import { WATCHLIST_SEEDS, effectiveWatchlistRows, watchlistRowSource } from "./seeds.js";
 //#region src/index.ts
+/** 行键/置顶键（`market:symbol`）：客户端 rowKey、桥端 pin 与删行清洗同源格式。 */
+function watchlistRowKey(market, symbol) {
+	return `${market}:${symbol}`;
+}
+/** 置顶键清洗：只收 `market:symbol` 形（空段/无冒号一律剔除，坏值不落盘）。 */
+function normalizePinnedKey(raw) {
+	if (typeof raw !== "string") return null;
+	const key = raw.trim();
+	const split = key.indexOf(":");
+	if (split <= 0 || split === key.length - 1) return null;
+	return key;
+}
 /** 行规范化副本：groups 空数组不落键，保持落盘/输出形状干净；形态/资产类别可选项原样保真。 */
 function normalizeWatchlistRow(row) {
 	const groups = Array.isArray(row.groups) ? [...new Set(row.groups.filter((item) => typeof item === "string" && item))] : [];
@@ -100,8 +112,9 @@ function createMemoryWatchlistStore(initial = {}) {
 	};
 }
 /** 内存版分组注册表 store（单测用）。同名拒绝（trim 后精确匹配）；调用方负责非空校验。 */
-function createMemoryWatchlistGroupsStore(initial = []) {
+function createMemoryWatchlistGroupsStore(initial = [], initialPinned = []) {
 	let groups = [...initial];
+	let pinnedKeys = [...new Set(initialPinned.map(normalizePinnedKey).filter((key) => key !== null))];
 	return {
 		async list() {
 			return [...groups];
@@ -134,6 +147,22 @@ function createMemoryWatchlistGroupsStore(initial = []) {
 			if (next.length === groups.length) return false;
 			groups = next;
 			return true;
+		},
+		async pinned() {
+			return [...pinnedKeys];
+		},
+		async setPinned(key, want) {
+			const normalized = normalizePinnedKey(key);
+			if (normalized === null) return false;
+			if (pinnedKeys.includes(normalized) === want) return false;
+			pinnedKeys = want ? [...pinnedKeys, normalized] : pinnedKeys.filter((entry) => entry !== normalized);
+			return true;
+		},
+		async stripPinned(key) {
+			const normalized = normalizePinnedKey(key);
+			if (normalized === null || !pinnedKeys.includes(normalized)) return false;
+			pinnedKeys = pinnedKeys.filter((entry) => entry !== normalized);
+			return true;
 		}
 	};
 }
@@ -153,4 +182,4 @@ function createMemorySelectionStore(initial = { instrument: null }) {
 	};
 }
 //#endregion
-export { WATCHLIST_SEEDS, createMemorySelectionStore, createMemoryWatchlistGroupsStore, createMemoryWatchlistStore, effectiveWatchlistRows, newWatchlistGroupId, normalizeWatchlistRow, watchlistRowSource };
+export { WATCHLIST_SEEDS, createMemorySelectionStore, createMemoryWatchlistGroupsStore, createMemoryWatchlistStore, effectiveWatchlistRows, newWatchlistGroupId, normalizePinnedKey, normalizeWatchlistRow, watchlistRowKey, watchlistRowSource };

package/lib/plugin.js

@@ -1,5 +1,5 @@
 import { WATCHLIST_SEEDS, effectiveWatchlistRows, watchlistRowSource } from "./seeds.js";
-import { createMemorySelectionStore, createMemoryWatchlistGroupsStore, createMemoryWatchlistStore } from "./index.js";
+import { createMemorySelectionStore, createMemoryWatchlistGroupsStore, createMemoryWatchlistStore, watchlistRowKey } from "./index.js";
 import { createFileSelectionStore, createFileWatchlistGroupsStore, createFileWatchlistStore } from "./file-store.js";
 import { Service } from "@deepseek-ai/cordis";
 import { defineTool } from "@deepseek-ai/dsh-tools";
@@ -199,7 +199,10 @@ function createWatchlistRemoveTool(deps) {
 		async execute(raw) {
 			const { market, symbol } = parseInstrumentArgs(raw ?? {});
 			const removed = await deps.watchlists.remove(market, symbol);
-			if (removed) deps.onWatchlistsChanged?.();
+			if (removed) {
+				await deps.groups?.stripPinned(watchlistRowKey(market, symbol));
+				deps.onWatchlistsChanged?.();
+			}
 			return {
 				ok: true,
 				removed,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dshtrading/watchlist",
   "description": "Host-side watchlist + selection stores for dsh-trading: multi-list file store (~/.dsh/watchlists.json), selection store (~/.dsh/selection.json), and cross-market watchlist_* tools (watchlist_list/add/remove/select) on the host plane",
-  "version": "0.6.3",
+  "version": "0.7.0",
   "type": "module",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -21,14 +21,15 @@
   ],
   "license": "PolyForm-Noncommercial-1.0.0",
   "dependencies": {
-    "@dshtrading/api": "^0.6.3",
-    "@dshtrading/dsh-home": "^0.6.3"
+    "@dshtrading/api": "^0.7.0",
+    "@dshtrading/dsh-home": "^0.7.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": ">=4.0.0",
-    "@deepseek-ai/dsh-tools": ">=0.2.1-rc.2"
+    "@deepseek-ai/cordis": ">=4.1.0",
+    "@deepseek-ai/dsh-tools": ">=0.2.2-rc.1"
   },
   "devDependencies": {
+    "@deepseek-ai/dsh-tool-executor-native": "0.2.2-rc.1",
     "tsdown": "^0.22.0",
     "vitest": "^3.0.0"
   },