@jingyi0605/codingns4dsh 0.2.1-beta.9 → 0.2.1-rc.2

package/data/build/dist/client/client.delegate-command.js

@@ -4,7 +4,7 @@ window.__ModuleLoader__.load({
 	factory: (require) => {
 		var module = { exports: {} };
 		var exports = module.exports;
-		const require_model_catalog_cache = require("@jingyi0605/codingns4dsh/client.model-catalog-cache.js");
+		const require_magpie_model_tag = require("@jingyi0605/codingns4dsh/client.magpie-model-tag.js");
 		const require_primitives_adapter = require("@jingyi0605/codingns4dsh/client.primitives-adapter.js");
 		//#region src/shared/delegation-carrier.ts
 		const CARRIER_PREFIX = "<!--codingns:delegate:v1:";
@@ -224,7 +224,7 @@ window.__ModuleLoader__.load({
 		function startDelegateUiDom(options) {
 			const dom = options.document ?? (typeof document === "undefined" ? void 0 : document);
 			const Observer = options.MutationObserver ?? (typeof MutationObserver === "undefined" ? void 0 : MutationObserver);
-			const iconUrl = options.iconUrlForAdapter ?? require_model_catalog_cache.providerIconUrl;
+			const iconUrl = options.iconUrlForAdapter ?? require_magpie_model_tag.providerIconUrl;
 			let disposed = false;
 			let scanQueued = false;
 			let observer;
@@ -722,7 +722,7 @@ window.__ModuleLoader__.load({
 		function registerDelegateCommandIn(ctx, options) {
 			const commandUi = readCommandUi(ctx);
 			if (commandUi === void 0) {
-				require_model_catalog_cache.debugWarn("codingns4dsh: /委派 未注册，当前 DSH 未提供 commandUi 服务");
+				require_magpie_model_tag.debugWarn("codingns4dsh: /委派 未注册，当前 DSH 未提供 commandUi 服务");
 				return;
 			}
 			const t = options.locale.bind("codingns");
@@ -743,10 +743,10 @@ window.__ModuleLoader__.load({
 							noResults: t("delegate.searchNoResults")
 						}),
 						async options(session) {
-							const capability = await require_model_catalog_cache.callCliRpc(options.rpc, "delegate/capability", { sessionId: session.sessionId });
+							const capability = await require_magpie_model_tag.callCliRpc(options.rpc, "delegate/capability", { sessionId: session.sessionId });
 							if (!capability.supported) throw new Error(capability.message);
-							const catalog = await require_model_catalog_cache.callCliRpc(options.rpc, "catalog", { sessionId: session.sessionId });
-							const list = delegateAdapterOptions(require_model_catalog_cache.adapterCatalogWithDsh(catalog, options.dshVersion));
+							const catalog = await require_magpie_model_tag.callCliRpc(options.rpc, "catalog", { sessionId: session.sessionId });
+							const list = delegateAdapterOptions(require_magpie_model_tag.adapterCatalogWithDsh(catalog, options.dshVersion));
 							setDelegatePopupOptions(list);
 							return list;
 						},
@@ -776,9 +776,9 @@ window.__ModuleLoader__.load({
 						}
 					}
 				}), "codingns4dsh: delegate command");
-				require_model_catalog_cache.debugInfo("codingns4dsh: /委派 命令已注册");
+				require_magpie_model_tag.debugInfo("codingns4dsh: /委派 命令已注册");
 			} catch (error) {
-				require_model_catalog_cache.debugWarn("codingns4dsh: /委派 命令注册失败", { error: error instanceof Error ? error.message : String(error) });
+				require_magpie_model_tag.debugWarn("codingns4dsh: /委派 命令注册失败", { error: error instanceof Error ? error.message : String(error) });
 			}
 		}
 		/**
@@ -857,7 +857,7 @@ window.__ModuleLoader__.load({
 					};
 				}, "codingns4dsh: delegate reference source");
 			} catch (error) {
-				require_model_catalog_cache.debugWarn("codingns4dsh: Agent 引用源注册失败", { error: error instanceof Error ? error.message : String(error) });
+				require_magpie_model_tag.debugWarn("codingns4dsh: Agent 引用源注册失败", { error: error instanceof Error ? error.message : String(error) });
 			}
 		}
 		/**
@@ -879,6 +879,7 @@ window.__ModuleLoader__.load({
 			let popupModels = [];
 			let popupEditor;
 			let popupToken;
+			let popupQuery = "";
 			let popupRequestId = 0;
 			let refreshTimer;
 			const cancelRefresh = () => {
@@ -896,6 +897,7 @@ window.__ModuleLoader__.load({
 				popupOptions = [];
 				popupModels = [];
 				popupMode = "adapter";
+				popupQuery = "";
 			};
 			const inputFor = (sessionId) => {
 				try {
@@ -1008,7 +1010,7 @@ window.__ModuleLoader__.load({
 						button.style.background = "transparent";
 					});
 					button.addEventListener("click", row.onClick);
-					const iconUrl = row.iconId === void 0 ? void 0 : require_model_catalog_cache.providerIconUrl(row.iconId);
+					const iconUrl = row.iconId === void 0 ? void 0 : require_magpie_model_tag.providerIconUrl(row.iconId);
 					if (iconUrl !== void 0 && iconUrl !== "" && row.iconId !== void 0) {
 						const image = document.createElement("img");
 						image.setAttribute("src", iconUrl);
@@ -1032,6 +1034,7 @@ window.__ModuleLoader__.load({
 						flex: "1 1 auto"
 					});
 					button.append(text);
+					if (row.magpie === true) text.after(require_magpie_model_tag.createMagpieModelTagNode(document, row.id));
 					if (row.detail) {
 						const detail = document.createElement("span");
 						detail.textContent = row.detail;
@@ -1074,10 +1077,30 @@ window.__ModuleLoader__.load({
 				}
 				close();
 			};
+			const renderModelCatalog = (catalog, query = popupQuery) => {
+				const adapter = popupAdapter;
+				if (popup === void 0 || popupMode !== "model" || adapter === void 0) return;
+				popupModels = catalog.groups.flatMap((group) => group.models.map((model) => {
+					const efforts = model.efforts.map((effort) => model.effortLabels?.[effort] ?? effort);
+					const effortsLabel = efforts.length === 0 ? void 0 : t("cli.thinkingLevel", { value: efforts.join(t("common.listSeparator")) });
+					const details = [model.description, effortsLabel].filter((value) => value !== void 0 && value.trim() !== "");
+					return {
+						id: model.id,
+						label: model.name || model.id,
+						...details.length === 0 ? {} : { detail: details.join(" · ") },
+						...model.source === "magpie" ? { magpie: true } : {}
+					};
+				}));
+				render(t("delegate.selectModel", { name: adapter.label }), popupModels.filter((model) => query === "" || model.id.toLowerCase().includes(query) || model.label.toLowerCase().includes(query)).map((model) => ({
+					...model,
+					onClick: () => selectModel(model)
+				})));
+			};
 			const selectAdapter = async (adapter) => {
 				cancelRefresh();
 				popupAdapter = adapter;
 				popupMode = "model";
+				popupQuery = "";
 				const requestId = ++popupRequestId;
 				const sessionId = popupSessionId;
 				render(t("delegate.selectModel", { name: adapter.label }), [{
@@ -1086,21 +1109,9 @@ window.__ModuleLoader__.load({
 					onClick: () => void 0
 				}]);
 				try {
-					popupModels = (await require_model_catalog_cache.loadModelCatalog(options.rpc, adapter.id, sessionId)).groups.flatMap((group) => group.models.map((model) => {
-						const efforts = model.efforts.map((effort) => model.effortLabels?.[effort] ?? effort);
-						const effortsLabel = efforts.length === 0 ? void 0 : t("cli.thinkingLevel", { value: efforts.join(t("common.listSeparator")) });
-						const details = [model.description, effortsLabel].filter((value) => value !== void 0 && value.trim() !== "");
-						return {
-							id: model.id,
-							label: model.name || model.id,
-							...details.length === 0 ? {} : { detail: details.join(" · ") }
-						};
-					}));
+					const catalog = await require_magpie_model_tag.loadModelCatalog(options.rpc, adapter.id, sessionId);
 					if (popup === void 0 || popupMode !== "model" || popupRequestId !== requestId || popupSessionId !== sessionId || popupAdapter?.id !== adapter.id) return;
-					render(t("delegate.selectModel", { name: adapter.label }), popupModels.map((model) => ({
-						...model,
-						onClick: () => selectModel(model)
-					})));
+					renderModelCatalog(catalog, "");
 				} catch (error) {
 					if (popup === void 0 || popupMode !== "model" || popupRequestId !== requestId || popupSessionId !== sessionId || popupAdapter?.id !== adapter.id) return;
 					render(t("delegate.selectModel", { name: adapter.label }), [{
@@ -1149,6 +1160,7 @@ window.__ModuleLoader__.load({
 				};
 				const root = ensurePopup(editor, sessionId);
 				const query = token.query.trim().toLowerCase();
+				popupQuery = query;
 				if (popupMode === "model" && popupAdapter !== void 0) {
 					render(t("delegate.selectModel", { name: popupAdapter.label }), popupModels.filter((model) => query === "" || model.id.toLowerCase().includes(query) || model.label.toLowerCase().includes(query)).map((model) => ({
 						...model,
@@ -1159,9 +1171,9 @@ window.__ModuleLoader__.load({
 				popupMode = "adapter";
 				popupAdapter = void 0;
 				const requestId = ++popupRequestId;
-				require_model_catalog_cache.callCliRpc(options.rpc, "catalog", { sessionId }).then((catalog) => {
+				require_magpie_model_tag.callCliRpc(options.rpc, "catalog", { sessionId }).then((catalog) => {
 					if (popup === void 0 || popupSessionId !== sessionId || popupMode !== "adapter" || popupRequestId !== requestId) return;
-					popupOptions = delegateAdapterOptions(require_model_catalog_cache.adapterCatalogWithDsh(catalog, options.dshVersion));
+					popupOptions = delegateAdapterOptions(require_magpie_model_tag.adapterCatalogWithDsh(catalog, options.dshVersion));
 					setDelegatePopupOptions(popupOptions);
 					const rows = popupOptions.filter((item) => query === "" || item.id.toLowerCase().includes(query) || item.label.toLowerCase().includes(query)).map((item) => {
 						const row = {
@@ -1210,6 +1222,11 @@ window.__ModuleLoader__.load({
 				if (event.key === "Escape") close();
 			};
 			const onResize = () => position();
+			const unsubscribeCatalog = require_magpie_model_tag.subscribeAdapterCatalogChanged(options.rpc, (change) => {
+				if (change.kind !== "models" || popup === void 0 || popupMode !== "model" || popupAdapter === void 0 || popupAdapter.id !== change.adapterId) return;
+				const catalog = require_magpie_model_tag.getModelCatalogCache(options.rpc, popupSessionId).get(popupAdapter.id);
+				if (catalog !== void 0) renderModelCatalog(catalog);
+			});
 			document.addEventListener("input", onInput, true);
 			document.addEventListener("compositionend", onCompositionEnd, true);
 			document.addEventListener("focusin", onFocus, true);
@@ -1220,6 +1237,7 @@ window.__ModuleLoader__.load({
 			window.visualViewport?.addEventListener("resize", onResize);
 			window.visualViewport?.addEventListener("scroll", onResize);
 			return () => {
+				unsubscribeCatalog();
 				close();
 				cancelRefresh();
 				document.removeEventListener("input", onInput, true);