@xmanrui/dsh-im 3.2.0 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "3.2.0",
+  "version": "4.0.0",
   "description": "把九种 IM 机器人和公网 AI Office 接入本机 DeepSeek Harness。 Connect nine IM channels and a public AI Office to a local DeepSeek Harness.",
   "keywords": [
     "deepseek-harness",

package/plugin-src/host/channels/dingtalk/index.mjs

@@ -2,7 +2,7 @@ import { createProductionController } from './production.mjs';
 import { installDingtalkRpc } from './rpc.mjs';
 
 export const name = 'dsh-dingtalk-host';
-export const inject = ['connection', 'credentials', 'apiProxy', 'typertGateway'];
+export const inject = ['connection', 'credentials', 'typertGateway'];
 
 export async function apply(ctx, config = {}) {
   if (config?.controller) {

package/plugin-src/host/channels/discord/index.mjs

@@ -2,7 +2,7 @@ import { createProductionController } from './production.mjs';
 import { installDiscordRpc } from './rpc.mjs';
 
 export const name = 'dsh-im-discord-host';
-export const inject = ['connection', 'credentials', 'apiProxy', 'typertGateway'];
+export const inject = ['connection', 'credentials', 'typertGateway'];
 
 export async function apply(ctx, config = {}) {
   if (config?.controller) {

package/plugin-src/host/channels/feishu/index.mjs

@@ -3,7 +3,7 @@ import { createProductionController } from './production.mjs';
 import { installFeishuRpc } from './rpc.mjs';
 
 export const name = 'dsh-feishu-host';
-export const inject = ['connection', 'credentials', 'apiProxy', 'typertGateway'];
+export const inject = ['connection', 'credentials', 'typertGateway'];
 
 function controllerFrom(ctx, config) {
   if (config?.controller) return config.controller;

package/plugin-src/host/channels/qq/index.mjs

@@ -2,7 +2,7 @@ import { createProductionController } from './production.mjs';
 import { installQqRpc } from './rpc.mjs';
 
 export const name = 'dsh-im-qq-host';
-export const inject = ['connection', 'credentials', 'apiProxy', 'typertGateway'];
+export const inject = ['connection', 'credentials', 'typertGateway'];
 
 export async function apply(ctx, config = {}) {
   if (config?.controller) {

package/plugin-src/host/channels/slack/index.mjs

@@ -2,7 +2,7 @@ import { createProductionController } from './production.mjs';
 import { installSlackRpc } from './rpc.mjs';
 
 export const name = 'dsh-im-slack-host';
-export const inject = ['connection', 'credentials', 'apiProxy', 'typertGateway'];
+export const inject = ['connection', 'credentials', 'typertGateway'];
 
 export async function apply(ctx, config = {}) {
   if (config?.controller) return installSlackRpc(ctx, config.controller, config.rpcAuthority);

package/plugin-src/host/channels/telegram/index.mjs

@@ -2,7 +2,7 @@ import { createProductionController } from './production.mjs';
 import { installTelegramRpc } from './rpc.mjs';
 
 export const name = 'dsh-im-telegram-host';
-export const inject = ['connection', 'credentials', 'apiProxy', 'typertGateway'];
+export const inject = ['connection', 'credentials', 'typertGateway'];
 
 export async function apply(ctx, config = {}) {
   if (config?.controller) {

package/plugin-src/host/channels/wecom/index.mjs

@@ -2,7 +2,7 @@ import { createProductionController } from './production.mjs';
 import { installWecomRpc } from './rpc.mjs';
 
 export const name = 'dsh-im-wecom-host';
-export const inject = ['connection', 'credentials', 'apiProxy', 'typertGateway'];
+export const inject = ['connection', 'credentials', 'typertGateway'];
 
 export async function apply(ctx, config = {}) {
   if (config?.controller) {

package/plugin-src/host/channels/weixin/index.mjs

@@ -2,7 +2,7 @@ import { createProductionController } from './production.mjs';
 import { installWeixinRpc } from './rpc.mjs';
 
 export const name = 'dsh-weixin-host';
-export const inject = ['connection', 'credentials', 'apiProxy', 'typertGateway'];
+export const inject = ['connection', 'credentials', 'typertGateway'];
 
 export async function apply(ctx, config = {}) {
   if (config?.controller) {

package/plugin-src/host/channels/whatsapp/index.mjs

@@ -2,7 +2,7 @@ import { createProductionController } from './production.mjs';
 import { installWhatsappRpc } from './rpc.mjs';
 
 export const name = 'dsh-im-whatsapp-host';
-export const inject = ['connection', 'apiProxy', 'typertGateway'];
+export const inject = ['connection', 'typertGateway'];
 
 export async function apply(ctx, config = {}) {
   if (config?.controller) {

package/plugin-src/host/harness-connection.mjs

@@ -1,13 +1,18 @@
+import { modernHarnessApi } from './modern-harness-api.mjs';
+
+function optionalService(ctx, name) {
+  if (ctx && Object.hasOwn(ctx, name)) return ctx[name];
+  return typeof ctx?.get === 'function' ? ctx.get(name) : undefined;
+}
+
 /** Connect to this Host directly unless an external Harness URL was configured. */
 export function harnessConnection(ctx, config = {}) {
   if (config.harnessBaseUrl !== undefined) {
     return { baseUrl: new URL(config.harnessBaseUrl) };
   }
-  if (!ctx?.apiProxy) {
-    throw new TypeError('dsh-im requires the Host apiProxy service; check that DSH has finished loading its Host services');
-  }
+  const apiProxy = optionalService(ctx, 'apiProxy') ?? modernHarnessApi(ctx);
   return {
-    apiProxy: ctx.apiProxy,
+    apiProxy,
     // Cordis child contexts share one root; different Hosts must not share
     // ownership of pending questions and approvals.
     interactionScope: ctx.root ?? ctx,

package/plugin-src/host/index.mjs

@@ -16,7 +16,6 @@ export const name = 'dsh-im-host';
 export const inject = [
   'connection',
   'credentials',
-  'apiProxy',
   'typertGateway',
 ];
 
@@ -55,38 +54,53 @@ export function createImHostPlugin(internals = {}) {
     name,
     inject,
     async apply(ctx, config = {}) {
-      setImHostLanguage(config.language ?? process.env.DSH_IM_LANGUAGE);
+      const activate = async (readyCtx) => {
+        await activateChannels(readyCtx, config);
+      };
       if (typeof ctx?.inject === 'function') {
-        ctx.inject(['tools', 'systemPrompt'], (artifactCtx) => {
-          installOutboundArtifactTool(artifactCtx);
-        });
-      } else {
-        installOutboundArtifactTool(ctx);
-      }
-      const logger = typeof ctx?.logger === 'function'
-        ? ctx.logger(name)
-        : (ctx?.logger ?? console);
-      if (ctx?.connection?.rpc) {
-        try {
-          startUpdate(ctx);
-        } catch (error) {
-          logger.error?.('[dsh-im] failed to activate update management; continuing with channels', error);
-        }
-      }
-      const failures = [];
-      for (const [channel, start] of channels) {
-        try {
-          await start(ctx, channelConfig(config, channel));
-        } catch (error) {
-          failures.push(error);
-          logger.error?.(`[dsh-im] failed to activate ${channel}; continuing with the remaining channels`, error);
-        }
-      }
-      if (failures.length === channels.length) {
-        throw new AggregateError(failures, 'dsh-im failed to activate every channel');
+        const modern = typeof ctx?.typertGateway?.stream === 'function';
+        await ctx.inject(
+          modern ? ['sessionController', 'workspaceController'] : ['apiProxy'],
+          activate,
+        );
+        return;
       }
+      await activate(ctx);
     },
   });
+
+  async function activateChannels(ctx, config) {
+    setImHostLanguage(config.language ?? process.env.DSH_IM_LANGUAGE);
+    if (typeof ctx?.inject === 'function') {
+      ctx.inject(['tools', 'systemPrompt'], (artifactCtx) => {
+        installOutboundArtifactTool(artifactCtx);
+      });
+    } else {
+      installOutboundArtifactTool(ctx);
+    }
+    const logger = typeof ctx?.logger === 'function'
+      ? ctx.logger(name)
+      : (ctx?.logger ?? console);
+    if (ctx?.connection?.rpc) {
+      try {
+        startUpdate(ctx);
+      } catch (error) {
+        logger.error?.('[dsh-im] failed to activate update management; continuing with channels', error);
+      }
+    }
+    const failures = [];
+    for (const [channel, start] of channels) {
+      try {
+        await start(ctx, channelConfig(config, channel));
+      } catch (error) {
+        failures.push(error);
+        logger.error?.(`[dsh-im] failed to activate ${channel}; continuing with the remaining channels`, error);
+      }
+    }
+    if (failures.length === channels.length) {
+      throw new AggregateError(failures, 'dsh-im failed to activate every channel');
+    }
+  }
 }
 
 export async function apply(ctx, config = {}) {