@xmanrui/dsh-im 4.28.0 → 4.28.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "4.28.0",
+  "version": "4.28.1",
   "description": "把十二种 IM 渠道和公网 AI Office 接入本机 DeepSeek Harness。 Connect twelve IM channels and a public AI Office to a local DeepSeek Harness.",
   "keywords": [
     "deepseek-harness",

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

@@ -63,7 +63,7 @@ export async function createProductionController(ctx, config = {}, internals = {
   const { defaultWorkspace, ungroupedWorkspace } = await prepareBotWorkspace(config);
   const WorkspaceStore = internals.WorkspaceStore ?? BotWorkspaceStore;
   const workspaces = internals.workspaces
-    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace }).load();
+    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace, ungroupedWorkspace }).load();
   const canListConfiguredBots = typeof configStore.list === 'function';
   const configuredBots = canListConfiguredBots ? configStore.list() : [];
   if (canListConfiguredBots) {

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

@@ -122,7 +122,7 @@ export async function createProductionController(ctx, config = {}, internals = {
   const { defaultWorkspace, ungroupedWorkspace } = await prepareBotWorkspace(config);
   const WorkspaceStore = internals.WorkspaceStore ?? BotWorkspaceStore;
   const workspaces = internals.workspaces
-    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace }).load();
+    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace, ungroupedWorkspace }).load();
   const canListConfiguredBots = typeof configStore.list === 'function';
   const listConfiguredBots = () => canListConfiguredBots ? configStore.list() : [];
   const configuredBots = listConfiguredBots();

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

@@ -60,7 +60,7 @@ export async function createProductionController(ctx, config = {}, internals = {
   const { defaultWorkspace, ungroupedWorkspace } = await prepareBotWorkspace(config);
   const WorkspaceStore = internals.WorkspaceStore ?? BotWorkspaceStore;
   const workspaces = internals.workspaces
-    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace }).load();
+    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace, ungroupedWorkspace }).load();
   const configuredBots = configStore.list();
   await workspaces.reconcile(configuredBots.map((bot) => bot.botId));
   await Promise.all(configuredBots.map((bot) => workspaces.ensure(bot.botId, {

package/plugin-src/host/channels/shared/production.mjs

@@ -70,7 +70,7 @@ export async function createTokenProductionController(ctx, config, internals, de
   const { defaultWorkspace, ungroupedWorkspace } = await prepareBotWorkspace(config);
   const WorkspaceStore = internals.WorkspaceStore ?? BotWorkspaceStore;
   const workspaces = internals.workspaces
-    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace }).load();
+    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace, ungroupedWorkspace }).load();
   const configuredBots = configStore.list();
   await workspaces.reconcile(configuredBots.map((bot) => bot.botId));
   await Promise.all(configuredBots.map((bot) => workspaces.ensure(bot.botId, {

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

@@ -49,7 +49,7 @@ export async function createProductionController(ctx, config = {}, internals = {
   const { defaultWorkspace, ungroupedWorkspace } = await prepareBotWorkspace(config);
   const WorkspaceStore = internals.WorkspaceStore ?? BotWorkspaceStore;
   const workspaces = internals.workspaces
-    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace }).load();
+    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace, ungroupedWorkspace }).load();
   const configuredBots = configStore.list();
   await workspaces.reconcile(configuredBots.map((bot) => bot.botId));
   await Promise.all(configuredBots.map((bot) => workspaces.ensure(bot.botId, {

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

@@ -60,7 +60,7 @@ export async function createProductionController(ctx, config = {}, internals = {
   const { defaultWorkspace, ungroupedWorkspace } = await prepareBotWorkspace(config);
   const WorkspaceStore = internals.WorkspaceStore ?? BotWorkspaceStore;
   const workspaces = internals.workspaces
-    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace }).load();
+    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace, ungroupedWorkspace }).load();
   const configuredBots = configStore.list();
   await workspaces.reconcile(configuredBots.map((bot) => bot.botId));
   await Promise.all(configuredBots.map((bot) => workspaces.ensure(bot.botId, {

package/plugin-src/host/channels/wecom-app/production.mjs

@@ -74,7 +74,7 @@ export async function createProductionController(ctx, config = {}, internals = {
   const { defaultWorkspace, ungroupedWorkspace } = await prepareBotWorkspace(config);
   const WorkspaceStore = internals.WorkspaceStore ?? BotWorkspaceStore;
   const workspaces = internals.workspaces
-    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace }).load();
+    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace, ungroupedWorkspace }).load();
   const configuredBots = configStore.list();
   await workspaces.reconcile(configuredBots.map((bot) => bot.botId));
   await Promise.all(configuredBots.map((bot) => workspaces.ensure(bot.botId, {

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

@@ -2,6 +2,7 @@ import { getImageInputSettingsStore } from '../../../../src/channels/shared/imag
 import { unlink } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { join, resolve } from 'node:path';
+import { EnvHttpProxyAgent, fetch as undiciFetch } from 'undici';
 
 import { WeixinConfigStore } from '../../../../src/channels/weixin/config-store.mjs';
 import { HarnessClient } from '../../../../src/channels/weixin/harness-client.mjs';
@@ -83,7 +84,14 @@ export async function createProductionController(ctx, config = {}, internals = {
   const Harness = internals.HarnessClient ?? HarnessClient;
   const Controller = internals.Controller ?? WeixinController;
   const Runtime = internals.Runtime ?? WeixinRuntime;
-  const api = internals.api ?? createWeixinApi();
+  let uploadDispatcher;
+  const api = internals.api ?? createWeixinApi({
+    uploadFetchImpl: (url, options) => {
+      // Keep CDN response headers independent of the host's global dispatcher.
+      uploadDispatcher ??= new EnvHttpProxyAgent();
+      return undiciFetch(url, { ...options, dispatcher: uploadDispatcher });
+    },
+  });
   const createSupervisor = internals.createConnectionSupervisor ?? createConnectionSupervisor;
   const logger = typeof ctx.logger === 'function'
     ? ctx.logger('dsh-weixin')
@@ -95,7 +103,7 @@ export async function createProductionController(ctx, config = {}, internals = {
   const { defaultWorkspace, ungroupedWorkspace } = await prepareBotWorkspace(config);
   const WorkspaceStore = internals.WorkspaceStore ?? BotWorkspaceStore;
   const workspaces = diagnosticWorkspaces(internals.workspaces
-    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace }).load());
+    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace, ungroupedWorkspace }).load());
   const configuredBots = configStore.list();
   await workspaces.reconcile(configuredBots.map((bot) => bot.botId));
   await Promise.all(configuredBots.map((bot) => workspaces.ensure(bot.botId, {
@@ -232,9 +240,18 @@ export async function createProductionController(ctx, config = {}, internals = {
     }),
     ready: supervisor.ready,
     async close() {
-      await supervisor.close();
-      await controller.close();
-      harness.stopManagedProcess();
+      try {
+        await supervisor.close();
+        await controller.close();
+      } finally {
+        const dispatcher = uploadDispatcher;
+        uploadDispatcher = undefined;
+        try {
+          await dispatcher?.destroy();
+        } finally {
+          harness.stopManagedProcess();
+        }
+      }
     },
   };
 }

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

@@ -70,7 +70,7 @@ export async function createProductionController(ctx, config = {}, internals = {
   const { defaultWorkspace, ungroupedWorkspace } = await prepareBotWorkspace(config);
   const WorkspaceStore = internals.WorkspaceStore ?? BotWorkspaceStore;
   const workspaces = internals.workspaces
-    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace }).load();
+    ?? await new WorkspaceStore(paths.workspaces, { defaultWorkspace, ungroupedWorkspace }).load();
   const configuredBots = configStore.list();
   await workspaces.reconcile(configuredBots.map((bot) => bot.botId));
   await Promise.all(configuredBots.map((bot) => workspaces.ensure(bot.botId, {

package/src/channels/feishu/bridge.mjs

@@ -4980,8 +4980,14 @@ export class FeishuHarnessBridge {
     });
     // 流式卡片模式：每轮一张过程卡（原地 patch），过程与最终答案都进卡；
     // post 模式维持逐条直推。先预建卡片状态，纯问答回合也能在收尾时开卡。
-    const streamingCard = this.#stepPushMode === FEISHU_STEP_PUSH_MODES.STREAMING_CARD;
+    // 飞书原生思考过程按 chat_id 创建，不会落进话题（#244）；话题内的回合改用
+    // 实时过程卡（以 reply_in_thread 回复留在话题内），避免过程出现在话题外。
+    const liveCotInTopic = this.#stepPushMode === FEISHU_STEP_PUSH_MODES.LIVE_COT
+      && this.#replyInThreadFor(messageId);
+    const streamingCard = this.#stepPushMode === FEISHU_STEP_PUSH_MODES.STREAMING_CARD
+      || liveCotInTopic;
     const liveCot = this.#stepPushMode === FEISHU_STEP_PUSH_MODES.LIVE_COT
+      && !liveCotInTopic
       && typeof this.#channel?.createCot === 'function'
       && typeof this.#channel?.writeCotEvents === 'function';
     const cot = liveCot

package/src/channels/shared/bot-workspace-store.mjs

@@ -1,7 +1,7 @@
 import { t } from './i18n.mjs';
 import { atConnectionStage, connectionStageError, extractConnectionEvidence } from './connection-error.mjs';
 import { validateBotAlias, withBotAlias } from './bot-alias.mjs';
-import { defaultImWorkspace, sameWorkspacePath } from './default-workspace.mjs';
+import { defaultImWorkspace, ensureImWorkspaceDirectory, sameWorkspacePath } from './default-workspace.mjs';
 import {
   mkdir,
   readFile,
@@ -367,13 +367,14 @@ async function writeStoredDocument(path, document) {
   await rename(temporary, path);
 }
 
-export async function validateWorkspacePath(value) {
+export async function validateWorkspacePath(value, { ungroupedWorkspace } = {}) {
   if (typeof value !== 'string' || !value.trim() || !isAbsolute(value.trim())) {
     const error = new Error('工作区必须是绝对路径。');
     error.code = 'workspace-not-absolute';
     throw error;
   }
   const workspace = resolve(value.trim());
+  await ensureImWorkspaceDirectory(workspace, ungroupedWorkspace);
   let info;
   try {
     info = await stat(workspace);
@@ -393,6 +394,7 @@ export async function validateWorkspacePath(value) {
 export class BotWorkspaceStore {
   #path;
   #defaultWorkspace;
+  #ungroupedWorkspace;
   #version = 1;
   #workspaces = {};
   #agentPresets = {};
@@ -414,10 +416,11 @@ export class BotWorkspaceStore {
   #writeQueue = Promise.resolve();
   #botQueues = new Map();
 
-  constructor(path, { defaultWorkspace = defaultImWorkspace() } = {}) {
+  constructor(path, { defaultWorkspace = defaultImWorkspace(), ungroupedWorkspace } = {}) {
     if (typeof path !== 'string' || !path) throw new TypeError('workspace store path is required');
     this.#path = path;
     this.#defaultWorkspace = resolve(defaultWorkspace);
+    this.#ungroupedWorkspace = ungroupedWorkspace;
   }
 
   async load() {
@@ -691,11 +694,20 @@ export class BotWorkspaceStore {
       const createsBot = !this.#workspaces[id];
       const initializesAccessPolicy = initialAccessPolicy !== undefined
         && !Object.hasOwn(this.#accessPolicies, id);
+      const accessPolicy = initializesAccessPolicy
+        ? validateAccessPolicy(initialAccessPolicy)
+        : undefined;
+      const agentPreset = createsBot ? validateAgentPresetId(defaultAgentPreset) : null;
+      // Resolve saved bot/conversation choices before preparing the shared IM
+      // directory. Merely loading a channel must not create an unused fallback.
+      const selectedWorkspaces = new Set([
+        this.#workspaces[id] ?? initialWorkspace,
+        ...Object.values(this.#conversationWorkspaces[id] ?? {}),
+      ]);
+      for (const selected of selectedWorkspaces) {
+        await ensureImWorkspaceDirectory(selected, this.#ungroupedWorkspace);
+      }
       if (createsBot || initializesAccessPolicy) {
-        const accessPolicy = initializesAccessPolicy
-          ? validateAccessPolicy(initialAccessPolicy)
-          : undefined;
-        const agentPreset = createsBot ? validateAgentPresetId(defaultAgentPreset) : null;
         const hadAgentPreset = Object.hasOwn(this.#agentPresets, id);
         const previousAgentPreset = this.#agentPresets[id];
         const nextAccessPolicies = initializesAccessPolicy
@@ -744,7 +756,7 @@ export class BotWorkspaceStore {
       error.code = 'workspace-bot-not-found';
       throw error;
     }
-    const workspace = await validateWorkspacePath(value);
+    const workspace = await validateWorkspacePath(value, { ungroupedWorkspace: this.#ungroupedWorkspace });
     return this.#enqueue(id, async () => {
       if (!this.has(id)
         || (incarnation !== undefined && incarnation !== this.incarnationFor(id))) {
@@ -965,7 +977,9 @@ export class BotWorkspaceStore {
     }
     // Validate before queueing so an invalid path fails without disturbing the
     // conversation's current workspace or its session.
-    const workspace = value === null ? null : await validateWorkspacePath(value);
+    const workspace = value === null ? null : await validateWorkspacePath(value, {
+      ungroupedWorkspace: this.#ungroupedWorkspace,
+    });
     return this.#enqueue(id, async () => {
       const assertCurrentSwitch = () => {
         if (!this.has(id)
@@ -981,6 +995,10 @@ export class BotWorkspaceStore {
         }
       };
       assertCurrentSwitch();
+      if (workspace === null) {
+        await ensureImWorkspaceDirectory(this.workspaceFor(id), this.#ungroupedWorkspace);
+        assertCurrentSwitch();
+      }
       const previousOverrides = this.#conversationWorkspaces[id];
       const previous = previousOverrides?.[key];
       const hadOverride = Boolean(previousOverrides)
@@ -1065,7 +1083,9 @@ export class BotWorkspaceStore {
         );
       }
     };
-    const workspace = await canonicalWorkspacePath(await validateWorkspacePath(value));
+    const workspace = await canonicalWorkspacePath(await validateWorkspacePath(value, {
+      ungroupedWorkspace: this.#ungroupedWorkspace,
+    }));
     return this.#enqueue(id, async () => {
       if (!this.has(id)
         || (incarnation !== undefined && incarnation !== this.incarnationFor(id))) {

package/src/channels/shared/default-workspace.mjs

@@ -21,8 +21,11 @@ export async function sameWorkspacePath(left, right) {
 export async function prepareBotWorkspace(config = {}) {
   const ungroupedWorkspace = defaultImWorkspace(config);
   const defaultWorkspace = resolve(config.workspace ?? ungroupedWorkspace);
-  if (await sameWorkspacePath(defaultWorkspace, ungroupedWorkspace)) {
-    await mkdir(defaultWorkspace, { recursive: true });
-  }
   return { defaultWorkspace, ungroupedWorkspace };
 }
+
+export async function ensureImWorkspaceDirectory(workspace, ungroupedWorkspace) {
+  if (await sameWorkspacePath(workspace, ungroupedWorkspace)) {
+    await mkdir(workspace, { recursive: true });
+  }
+}

package/src/channels/shared/harness-session-binding.mjs

@@ -1,3 +1,4 @@
+import { mkdir } from 'node:fs/promises';
 import { isAbsolute } from 'node:path';
 
 const MAX_SESSION_ID_LENGTH = 256;
@@ -99,6 +100,9 @@ export async function adoptRegisteredWorkspaceSession(client, value, options = {
     }
     workspace = { path: summary.cwd };
   }
+  if (await client.isUngroupedWorkspace?.(workspace.path)) {
+    await mkdir(workspace.path, { recursive: true });
+  }
   const adopted = await client.rpc('session.create', {
     ...(workspace.workspaceId ? { workspaceId: workspace.workspaceId } : { cwd: workspace.path }),
     sessionId,

package/src/channels/weixin/weixin-api.mjs

@@ -504,8 +504,9 @@ function validateLoginResponse(value) {
   return value;
 }
 
-export function createWeixinApi({ fetchImpl = fetch } = {}) {
+export function createWeixinApi({ fetchImpl = fetch, uploadFetchImpl = fetchImpl } = {}) {
   if (typeof fetchImpl !== 'function') throw new TypeError('fetchImpl must be a function');
+  if (typeof uploadFetchImpl !== 'function') throw new TypeError('uploadFetchImpl must be a function');
 
   async function sendArtifact({
     baseUrl,
@@ -566,7 +567,7 @@ export function createWeixinApi({ fetchImpl = fetch } = {}) {
     const ciphertextSize = aesEcbPaddedSize(file.bytes.byteLength);
     let downloadParam;
     try {
-      downloadParam = await uploadWeixinCdn(fetchImpl, uploadUrl, file.bytes, aesKey, { signal });
+      downloadParam = await uploadWeixinCdn(uploadFetchImpl, uploadUrl, file.bytes, aesKey, { signal });
     } catch (error) {
       if (signal?.aborted) throw abortError(signal);
       const status = Number(error?.status);