@lijian-ui/dsh-im-gateway 0.2.1 → 0.2.3

package/lib/client.js

@@ -1147,8 +1147,8 @@ window.__ModuleLoader__.load({
 						message: result.error?.message ?? `${SERVICE}.${method} failed`
 					};
 					return {
-						ok: true,
-						...result.value
+						...result.value,
+						ok: true
 					};
 				} catch (err) {
 					return {
@@ -1304,6 +1304,41 @@ window.__ModuleLoader__.load({
 					t
 				})
 			}, ImChannelsSection));
+			const navLabels = /* @__PURE__ */ new Set([zh["section.label"], en["section.label"]]);
+			const imNavSvg = "<svg width=\"16\" height=\"16\" viewBox=\"0 0 16 16\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\" data-imgw-nav=\"1\"><path d=\"M8.3125 0.981587C8.66767 1.0545 8.97902 1.20558 9.2627 1.43374C9.48724 1.61438 9.73029 1.85933 9.97949 2.10854L14.707 6.83608L13.293 8.25014L9 3.95717V15.0431H7V3.95717L2.70703 8.25014L1.29297 6.83608L6.02051 2.10854C6.26971 1.85933 6.51277 1.61438 6.7373 1.43374C6.97662 1.24126 7.28445 1.04542 7.6875 0.981587C7.8973 0.94841 8.1031 0.956564 8.3125 0.981587Z\" fill=\"currentColor\"/></svg>";
+			const patchNavIcon = () => {
+				if (typeof document === "undefined") return;
+				for (const span of Array.from(document.querySelectorAll("button > span"))) {
+					if (!navLabels.has(span.textContent ?? "")) continue;
+					const button = span.parentElement;
+					if (button === null) continue;
+					const stale = button.querySelector("svg:not([data-imgw-nav])");
+					if (stale === null) continue;
+					const template = document.createElement("template");
+					template.innerHTML = imNavSvg;
+					const next = template.content.firstElementChild;
+					if (next === null) continue;
+					const cls = stale.getAttribute("class");
+					if (cls !== null) next.setAttribute("class", cls);
+					stale.replaceWith(next);
+				}
+			};
+			if (typeof document !== "undefined" && typeof MutationObserver !== "undefined" && document.body !== null) {
+				let scheduled = false;
+				const schedule = () => {
+					if (scheduled) return;
+					scheduled = true;
+					queueMicrotask(() => {
+						scheduled = false;
+						patchNavIcon();
+					});
+				};
+				patchNavIcon();
+				new MutationObserver(schedule).observe(document.body, {
+					childList: true,
+					subtree: true
+				});
+			}
 		}
 		//#endregion
 		exports.apply = apply;

package/lib/{index-DcKTwqN6.d.ts → index-CM3Kp_qE.d.ts}

@@ -1,5 +1,7 @@
 import { Context, Context as Context$1, Service } from "@deepseek-ai/cordis";
 import Schema from "@deepseek-ai/schemastery";
+import { SessionId } from "@deepseek-ai/dsh-session";
+import "@deepseek-ai/dsh-agent";
 import * as _deepseek_ai_cosmokit0 from "@deepseek-ai/cosmokit";
 import { AskUserQuestionAnswer, AskUserQuestionItem } from "@deepseek-ai/dsh-user-questions";
 

package/lib/index.js

@@ -4,7 +4,7 @@ import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-sett
 import { Service } from "@deepseek-ai/cordis";
 import Schema from "@deepseek-ai/schemastery";
 import { SessionId } from "@deepseek-ai/dsh-session";
-import { createUserMessage } from "@deepseek-ai/dsh-llm";
+import { ReasoningEffortId, createUserMessage } from "@deepseek-ai/dsh-llm";
 import { installModelSelection } from "@deepseek-ai/dsh-agent";
 import { closeSync, existsSync, fsyncSync, linkSync, mkdirSync, openSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import crypto, { randomUUID } from "node:crypto";
@@ -722,8 +722,11 @@ var CommandHandler = class {
 				this.gw.modelOverrides.delete(currentSessionId);
 				this.gw.sessionToConv.delete(currentSessionId);
 			}
-			const handle = await this.gw.ctx.agents.resume({ resumeSessionId: targetSessionId });
-			this.gw.installModelSelection(handle.agent, targetSessionId);
+			const handle = await this.gw.ctx.agents.resume({
+				resumeSessionId: targetSessionId,
+				agentOptions: this.gw.currentModelFor(targetSessionId),
+				setup: this.gw.presetSetup(targetSessionId)
+			});
 			this.gw.agentHandles.set(targetSessionId, handle);
 			this.gw.convToSession.set(convKey, targetSessionId);
 			this.gw.sessionToConv.set(targetSessionId, convKey);
@@ -1276,7 +1279,7 @@ const Config = Schema.object({
 */
 var ImGatewayService = class extends Service {
 	config;
-	static inject = ["agents"];
+	static inject = ["agents", "agentPresets"];
 	channels = /* @__PURE__ */ new Map();
 	convToSession = /* @__PURE__ */ new Map();
 	sessionToConv = /* @__PURE__ */ new Map();
@@ -1581,8 +1584,11 @@ var ImGatewayService = class extends Service {
 		if (persistence) {
 			if ((await persistence.list()).find((header) => header.id === sessionId)) {
 				console.log(`[im-gateway] ensureSession: branch 2 (resume from persistence)`);
-				const handle = await this.ctx.agents.resume({ resumeSessionId: sessionId });
-				this.installModelSelection(handle.agent, sessionId);
+				const handle = await this.ctx.agents.resume({
+					resumeSessionId: sessionId,
+					agentOptions: this.currentModelFor(sessionId),
+					setup: this.presetSetup(sessionId)
+				});
 				this.agentHandles.set(sessionId, handle);
 				this.convToSession.set(convKey, sessionId);
 				this.sessionToConv.set(sessionId, convKey);
@@ -1598,15 +1604,20 @@ var ImGatewayService = class extends Service {
 		try {
 			handle = await this.ctx.agents.create({
 				sessionId,
-				meta: { cwd: effectiveCwd }
+				meta: { cwd: effectiveCwd },
+				agentOptions: this.currentModelFor(sessionId),
+				setup: this.presetSetup(sessionId)
 			});
 		} catch (err) {
 			if (isIdCollision(err)) {
 				console.log(`[im-gateway] ensureSession: id collision, falling back to resume`);
-				handle = await this.ctx.agents.resume({ resumeSessionId: sessionId });
+				handle = await this.ctx.agents.resume({
+					resumeSessionId: sessionId,
+					agentOptions: this.currentModelFor(sessionId),
+					setup: this.presetSetup(sessionId)
+				});
 			} else throw err;
 		}
-		this.installModelSelection(handle.agent, sessionId);
 		this.agentHandles.set(sessionId, handle);
 		this.convToSession.set(convKey, sessionId);
 		this.sessionToConv.set(sessionId, convKey);
@@ -1712,6 +1723,27 @@ var ImGatewayService = class extends Service {
 			}
 		} catch {}
 	}
+	/** Compute the initial model selection for a session (override → global → deployment default). */
+	currentModelFor(sessionId) {
+		const override = this.modelOverrides.get(sessionId) ?? this.globalModelOverride;
+		if (override) return override;
+		return this.ctx.get("agentDefaultModel")?.currentSelection();
+	}
+	/**
+	* Agent setup callback: mount the 'standard' preset (tools, prompt sections,
+	* skills) and install model selection into the agent's prompt assembly.
+	* Called by agents.create/agents.resume BEFORE the agent is published, so
+	* the first prompt assembly has all tools and {{provider}}/{{model}} variables.
+	*/
+	presetSetup(sessionId) {
+		const gateway = this;
+		return async (agentCtx) => {
+			const presets = gateway.ctx.get("agentPresets");
+			if (presets) await presets.mount(agentCtx, "standard");
+			else console.warn("[im-gateway] agentPresets not available, agent will have no tools");
+			gateway.installModelSelection(agentCtx, sessionId);
+		};
+	}
 	/**
 	* Wire the agent-default-model selection into one agent's prompt assembly
 	* (mirrors dsh-host-apiproxy selectionFor). Listeners live on the agent's
@@ -1724,14 +1756,19 @@ var ImGatewayService = class extends Service {
 	* `modelRefs` so `/model` can mutate `current` on the same object the prompt
 	* assembly reads.
 	*/
-	installModelSelection(agent, sessionId) {
+	installModelSelection(agentCtx, sessionId) {
 		const gateway = this;
 		const defaults = this.ctx.get("agentDefaultModel");
 		const ref = {
 			get current() {
 				const override = gateway.modelOverrides.get(sessionId) ?? gateway.globalModelOverride;
 				const base = defaults?.currentSelection();
-				return override ?? base ?? void 0;
+				if (!override) return base ?? void 0;
+				return {
+					provider: override.provider,
+					model: override.model,
+					...override.reasoningEffort === void 0 ? {} : { reasoningEffort: ReasoningEffortId(override.reasoningEffort) }
+				};
 			},
 			set current(next) {
 				if (next) gateway.modelOverrides.set(sessionId, {
@@ -1743,7 +1780,7 @@ var ImGatewayService = class extends Service {
 			},
 			assembled: void 0
 		};
-		installModelSelection(agent.ctx, ref);
+		installModelSelection(agentCtx, ref);
 		this.modelRefs.set(sessionId, ref);
 	}
 	async runTurn(sessionId, convKey, channel, parts) {
@@ -4895,10 +4932,11 @@ function mergeStoredSecrets(current, incoming) {
 		if (!stored) return inst;
 		const config = { ...inst.config };
 		for (const key of SECRET_KEYS) {
-			const value = config[key];
+			const bag = config;
+			const value = bag[key];
 			if (value === "" || value === void 0) {
 				const old = stored.config?.[key];
-				if (old !== void 0 && old !== "") config[key] = old;
+				if (old !== void 0 && old !== "") bag[key] = old;
 			}
 		}
 		return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lijian-ui/dsh-im-gateway",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Multi-channel IM gateway plugin for DeepSeek Harness (dsh): DingTalk / QQ / WeChat(iLink) with QR-scan binding, streaming replies, and a unified ctx.imGateway service. 为 DeepSeek Harness 提供钉钉/QQ/个人微信多 IM 通道接入。",
   "license": "MIT",
   "type": "module",
@@ -64,13 +64,13 @@
   "peerDependencies": {
     "@deepseek-ai/cordis": "*",
     "@deepseek-ai/schemastery": "*",
-    "@deepseek-ai/dsh-agent": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-session": "0.1.0-rc.6",
+    "@deepseek-ai/dsh-agent": "0.1.1-rc.2 || 0.1.0-rc.8 || 0.1.0-rc.7 || 0.1.0-rc.6",
+    "@deepseek-ai/dsh-llm": "0.1.1-rc.2 || 0.1.0-rc.8 || 0.1.0-rc.7 || 0.1.0-rc.6",
+    "@deepseek-ai/dsh-session": "0.1.1-rc.2 || 0.1.0-rc.8 || 0.1.0-rc.7 || 0.1.0-rc.6",
     "@deepseek-ai/dsh-settings": "*",
     "@deepseek-ai/dsh-typert-protocol": "*",
-    "@deepseek-ai/dsh-user-approval": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-user-questions": "0.1.0-rc.6"
+    "@deepseek-ai/dsh-user-approval": "0.1.1-rc.2 || 0.1.0-rc.8 || 0.1.0-rc.7 || 0.1.0-rc.6",
+    "@deepseek-ai/dsh-user-questions": "0.1.1-rc.2 || 0.1.0-rc.8 || 0.1.0-rc.7 || 0.1.0-rc.6"
   },
   "dependencies": {
     "@tencent-connect/qqbot-connector": "^1.2.0",
@@ -81,22 +81,22 @@
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.1",
+    "@deepseek-ai/dsh-agent": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-api-gateway": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-connection": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-locale": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-runtime": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings-plugins": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-llm": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-session": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-settings": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-typert-protocol": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-typert-registry": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-user-approval": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-user-questions": "0.1.1-rc.2",
     "@deepseek-ai/schemastery": "3.18.1",
-    "@deepseek-ai/dsh-agent": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-session": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-settings": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-typert-protocol": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-user-approval": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-user-questions": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-connection": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-locale": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-schema-form": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-settings-plugins": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-api-gateway": "0.1.0-rc.6",
     "@types/node": "^22.0.0",
     "@types/qrcode": "^1.5.5",
     "@types/react": "^18.3.0",