@liyang8246/dsh-accounts 0.1.10 → 0.1.12

package/lib/client.js

@@ -626,73 +626,48 @@
 	}
 	/**
 	* Keep only models whose name contains one of the keywords.
-	* @param state - the session's model directory snapshot.
+	* @param state - the shared catalog snapshot.
 	* @param keywords - lowercase keywords; empty keeps everything.
-	* @returns the snapshot with filtered provider groups; the selected model stays visible so the composer trigger keeps naming the model in use.
+	* @returns the snapshot with filtered provider groups.
 	*/
-	function filterModels(state, keywords) {
-		if (!keywords.length) return state;
-		const groups = state.groups.map((group) => ({
+	function filterCatalog(state, keywords) {
+		if (!keywords.length || state.value === null) return state;
+		const groups = state.value.groups.map((group) => ({
 			...group,
 			models: group.models.filter((model) => matches(model.name, keywords))
-		}));
-		const { current } = state;
-		if (current !== null) {
-			const source = state.groups.find((group) => group.id === current.provider);
-			const model = source?.models.find((item) => item.id === current.model);
-			if (source !== void 0 && model !== void 0) {
-				const target = groups.find((group) => group.id === source.id);
-				if (target === void 0) groups.push({
-					...source,
-					models: [model]
-				});
-				else if (!target.models.some((item) => item.id === model.id)) target.models = [...target.models, model];
-			}
-		}
+		})).filter((group) => group.models.length > 0);
 		return {
 			...state,
-			groups: groups.filter((group) => group.models.length > 0)
+			value: {
+				...state.value,
+				groups
+			}
 		};
 	}
 	/**
-	* Filter every session model directory the composer seat and /model popup share.
-	* Both entries read the directory's store, so the filter sits on the store
-	* instead of on either surface.
+	* Filter the one Host-generation model catalog that every session directory copies,
+	* so the composer seat and the /model popup share the filtered list.
+	*
+	* The resolver's own `directoryFor` is NOT wrapped: any method reached through
+	* `ctx.get` becomes callable only under this plugin's inject set, where the
+	* resolver's `this.ctx.remote.session` read is illegal and takes the composer
+	* seat down with it.
 	* @param ctx - client root context.
 	* @param filter - the page-owned keyword filter.
 	*/
 	function installModelFilter(ctx, filter) {
-		const models = ctx.get("modelDirectories");
-		if (models === void 0) return;
-		const original = models.directoryFor;
-		const patched = /* @__PURE__ */ new WeakSet();
-		models.directoryFor = (sessionId) => {
-			const directory = original.call(models, sessionId);
-			if (!patched.has(directory)) {
-				patched.add(directory);
-				try {
-					filterDirectory(directory, filter);
-				} catch {}
-			}
-			return directory;
-		};
-		ctx.effect(() => () => {
-			models.directoryFor = original;
-		});
-	}
-	function filterDirectory(directory, filter) {
-		const source = directory.store;
+		const catalog = ctx.get("modelDirectories")?.catalog;
+		const source = catalog?.store;
+		if (catalog === void 0 || source === void 0) return;
 		let cache;
 		const read = () => {
 			const snapshot = source.getSnapshot();
 			const key = filter.getSnapshot();
 			if (cache === void 0 || cache.snapshot !== snapshot || cache.key !== key) {
-				let value;
+				let value = snapshot;
 				try {
-					value = filterModels(snapshot, filter.keywords());
-				} catch {
-					value = snapshot;
-				}
+					value = filterCatalog(snapshot, filter.keywords());
+				} catch {}
 				cache = {
 					snapshot,
 					key,
@@ -701,24 +676,21 @@
 			}
 			return cache.value;
 		};
-		const wrapped = {
-			getSnapshot: read,
-			subscribe(listener) {
-				const stopSource = source.subscribe(listener);
-				const stopFilter = filter.subscribe(listener);
-				return () => {
-					stopSource();
-					stopFilter();
-				};
-			},
-			set: (next) => {
-				source.set(next);
-			},
-			update: (mutator) => {
-				source.update(mutator);
-			}
+		const subscribe = (listener) => {
+			const stopSource = source.subscribe(listener);
+			const stopFilter = filter.subscribe(listener);
+			return () => {
+				stopSource();
+				stopFilter();
+			};
 		};
-		Object.defineProperty(directory, "store", {
+		const wrapped = new Proxy(source, { get(target, property) {
+			if (property === "getSnapshot") return read;
+			if (property === "subscribe") return subscribe;
+			const value = Reflect.get(target, property, target);
+			return typeof value === "function" ? value.bind(target) : value;
+		} });
+		Object.defineProperty(catalog, "store", {
 			configurable: true,
 			get: () => wrapped
 		});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@liyang8246/dsh-accounts",
   "type": "module",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "Independent multi-account Codex, OpenCode Go and CommandCode Go plugin for DeepSeek Harness.",
   "repository": { "type": "git", "url": "https://github.com/liyang8246/dsh-zolin.git", "directory": "packages/dsh-accounts" },
   "exports": {