@xmanrui/dsh-im 4.19.2 → 4.20.1

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

@@ -1,11 +1,11 @@
 import { SET_ALIAS_ENDPOINT, validAliasPayload } from '../shared/bot-alias-rpc.mjs';
 import { registerManagementRpc } from '../../../management-rpc.mjs';
 import QRCode from 'qrcode';
+import { createWeixinDiagnostics, weixinStageError } from '../../../../src/channels/weixin/connection-error.mjs';
 import { SET_CONTEXT_ENHANCEMENT_ENDPOINT, validContextEnhancementPayload } from '../shared/context-enhancement-rpc.mjs';
 import { SET_ACCESS_POLICY_ENDPOINT, validAccessPolicyPayload } from '../shared/access-policy-rpc.mjs';
 import { resolveRpcAuthority } from '../../rpc-authority.mjs';
 import {
-  publicWorkspaceError,
   SET_WORKSPACE_ENDPOINT,
   validWorkspacePayload,
 } from '../shared/workspace-rpc.mjs';
@@ -118,13 +118,6 @@ function cancelled() {
   return { ok: false, error: { code: 'cancelled', message: 'The request was cancelled.' } };
 }
 
-function internalFailure() {
-  return {
-    ok: false,
-    error: { code: 'weixin-operation-failed', message: '微信操作失败，请稍后重试。' },
-  };
-}
-
 async function qrDataUrl(value) {
   return QRCode.toDataURL(value, {
     type: 'image/png',
@@ -143,7 +136,9 @@ async function withEncodedQr(value, encodeQr) {
 }
 
 async function publicStatus(status, encodeQr) {
-  const safe = structuredClone(status);
+  let safe;
+  try { safe = structuredClone(status); }
+  catch (error) { throw weixinStageError('status-read-failed', error); }
   if (safe.provisioning) safe.provisioning = await withEncodedQr(safe.provisioning, encodeQr);
   return safe;
 }
@@ -161,14 +156,17 @@ function assertController(controller) {
   }
 }
 
-export function createWeixinRpcHandler(controller, { encodeQr = qrDataUrl } = {}) {
+export function createWeixinRpcHandler(controller, { encodeQr = qrDataUrl, logger = console, diagnostics = createWeixinDiagnostics({ logger }) } = {}) {
   assertController(controller);
   const qrCache = new Map();
   const cachedEncode = (url) => {
     let encoded = qrCache.get(url);
     if (!encoded) {
       if (qrCache.size >= 16) qrCache.delete(qrCache.keys().next().value);
-      encoded = Promise.resolve().then(() => encodeQr(url));
+      encoded = Promise.resolve().then(() => encodeQr(url)).catch(error => {
+        qrCache.delete(url);
+        throw weixinStageError('qr-encode-failed', error);
+      });
       qrCache.set(url, encoded);
     }
     return encoded;
@@ -193,7 +191,7 @@ export function createWeixinRpcHandler(controller, { encodeQr = qrDataUrl } = {}
         value = await withEncodedQr(started, cachedEncode);
       } else if (endpoint === WEIXIN_ENDPOINTS.pollProvisioning) {
         const current = await controller.registrationStatus(payload.attemptId);
-        if (!current) return badRequest('The provisioning attempt no longer exists.');
+        if (!current) throw weixinStageError('provision-attempt-not-found', undefined, 'qr.poll');
         value = await withEncodedQr(current, cachedEncode);
       } else if (endpoint === WEIXIN_ENDPOINTS.submitVerification) {
         value = await withEncodedQr(
@@ -202,7 +200,7 @@ export function createWeixinRpcHandler(controller, { encodeQr = qrDataUrl } = {}
         );
       } else if (endpoint === WEIXIN_ENDPOINTS.cancelProvisioning) {
         value = await controller.cancelProvisioning(payload.attemptId);
-        if (!value) return badRequest('The provisioning attempt no longer exists.');
+        if (!value) throw weixinStageError('provision-attempt-not-found', undefined, 'qr.cancel');
       } else if (endpoint === WEIXIN_ENDPOINTS.reconnectBot) {
         const snapshot = await controller.reconnectBot(payload.botId);
         if (signal?.aborted) return cancelled();
@@ -263,10 +261,17 @@ export function createWeixinRpcHandler(controller, { encodeQr = qrDataUrl } = {}
       }
       return signal?.aborted ? cancelled() : { ok: true, value };
     } catch (error) {
-      const workspaceError = publicWorkspaceError(error);
-      return signal?.aborted ? cancelled() : workspaceError
-        ? { ok: false, error: workspaceError }
-        : internalFailure();
+      if (signal?.aborted) return cancelled();
+      const context = {
+        'connection.status': ['status.read', 'status-read-failed'],
+        'provision.begin': ['qr.begin', 'qr-start-failed'],
+        'provision.poll': ['qr.poll'], 'provision.verify': ['qr.verify'], 'provision.cancel': ['qr.cancel'],
+        'bot.reconnect': ['connection.start', 'connection-start-failed'],
+        'bot.delete': ['account.remove'], 'bot.workspace.set': ['workspace.write', 'workspace-save-failed'],
+      }[endpoint] ?? ['workspace.write', 'workspace-save-failed'];
+      return { ok: false, error: diagnostics.report(error, {
+        operation: endpoint, stage: context[0], code: context[1], botId: payload.botId,
+      }).publicError };
     }
   };
 }

package/src/channels/dingtalk/dingtalk-bridge.mjs

@@ -852,7 +852,10 @@ export class DingtalkHarnessBridge {
       });
       return;
     }
+    const sessionWorkspace = typeof this.#harness.currentConversationWorkspace === 'function'
+      ? this.#harness.currentConversationWorkspace(key) : this.#harness.currentWorkspace?.();
     if (entry.workspace !== this.#harness.currentWorkspace?.()
+      || entry.sessionWorkspace !== sessionWorkspace
       || entry.sessionId !== this.#state.sessionFor(key)) {
       result = { message: t('会话或工作区已变化，菜单已刷新，请重新选择。') };
     } else if ((this.#queues.has(key) || options.pendingInteraction || this.#batchInputs.status(key).phase !== 'idle')
@@ -1029,7 +1032,7 @@ export class DingtalkHarnessBridge {
     if (quotedAt === null) return { unavailableReason: 'not-delivered' };
     const sessionId = this.#state.sessionFor(key);
     const session = typeof sessionId === 'string' && sessionId
-      ? this.#harness.workspaceSession?.(sessionId)
+      ? this.#harness.workspaceSession?.(sessionId, key)
       : null;
     const text = await recoverAssistantTextByTimestamp({
       session,

package/src/channels/dingtalk/dingtalk-menu.mjs

@@ -19,20 +19,24 @@ const presetCommand = (id) => `/preset ${/^\d+$/u.test(id) ? 'id:' : ''}${id}`;
 // as a command supplied by the client or as a prompt for the model.
 export async function dingtalkMenuSnapshot(harness, state, key, signal) {
   const workspace = harness.currentWorkspace?.();
+  const currentSessionWorkspace = () => typeof harness.currentConversationWorkspace === 'function'
+    ? harness.currentConversationWorkspace(key) : harness.currentWorkspace?.();
+  const sessionWorkspace = currentSessionWorkspace();
   const sessionId = state.sessionFor(key);
   const options = { signal };
   const results = await Promise.allSettled([
     workspacePathSnapshot(harness, options),
-    harness.listWorkspaceSessions?.(workspace, options),
+    harness.listWorkspaceSessions?.(sessionWorkspace, options),
     (async () => {
-      const session = sessionId ? harness.workspaceSession?.(sessionId) : null;
+      const session = sessionId ? harness.workspaceSession?.(sessionId, key) : null;
       return typeof session?.models === 'function'
         ? session.models(options) : harness.listModels?.(options);
     })(),
     harness.agentPresetSettings?.(options),
   ]);
   signal?.throwIfAborted();
-  if (harness.currentWorkspace?.() !== workspace || state.sessionFor(key) !== sessionId) {
+  if (harness.currentWorkspace?.() !== workspace
+    || currentSessionWorkspace() !== sessionWorkspace || state.sessionFor(key) !== sessionId) {
     throw new Error(t('会话或工作区已变化，请重新发送 /m。'));
   }
   const [paths, listed, catalog, settings] = results.map((r) => r.status === 'fulfilled' ? r.value : null);
@@ -65,7 +69,7 @@ export async function dingtalkMenuSnapshot(harness, state, key, signal) {
     }));
     data[`${name}_index`] = entries.findIndex(([, command]) => command === current[name]);
   }
-  return { workspace, sessionId, selections, data };
+  return { workspace, sessionWorkspace, sessionId, selections, data };
 }
 
 export function dingtalkMenuCommand(entry, callback) {

package/src/channels/feishu/bridge.mjs

@@ -2266,6 +2266,7 @@ export class FeishuHarnessBridge {
     chatId,
     key,
     messageId = null,
+    conversationWorkspace,
     sessionWorkspace = null,
     sessionPage = 0,
     sessionLimit = null,
@@ -2513,6 +2514,10 @@ export class FeishuHarnessBridge {
       return;
     }
     if (action.startsWith('use:')) {
+      if (conversationWorkspace !== undefined && conversationWorkspace !== this.#conversationWorkspace(key)) {
+        await reply(t('这个菜单已过期，请回复 /m 重新打开。'));
+        return;
+      }
       await this.#bindSession(key, chatId, action.slice('use:'.length), { updateMessageId: messageId, replyTo: messageId });
       return;
     }
@@ -2594,7 +2599,9 @@ export class FeishuHarnessBridge {
         return;
       }
       // The number label sits on the session (bind) button of the row.
-      await this.#handleCardAction(`use:${session.sessionId}`, { chatId, key, messageId: replyTo });
+      await this.#handleCardAction(`use:${session.sessionId}`, {
+        chatId, key, messageId: replyTo, conversationWorkspace: menu.conversationWorkspace,
+      });
       return;
     }
     if (menu.kind === 'workspaces') {
@@ -2624,6 +2631,12 @@ export class FeishuHarnessBridge {
     return sessions;
   }
 
+  #conversationWorkspace(key) {
+    return typeof this.#harness.currentConversationWorkspace === 'function'
+      ? this.#harness.currentConversationWorkspace(key)
+      : this.#harness.currentWorkspace?.();
+  }
+
   async #showSessions(
     { chatId, key, replyTo = null },
     selector,
@@ -2631,13 +2644,20 @@ export class FeishuHarnessBridge {
     { updateMessageId = null, limit = null } = {},
   ) {
     try {
+      const conversationWorkspace = this.#conversationWorkspace(key);
       const signal = this.#cardDataSignal();
-      const resolved = await resolveSessionListWorkspace(selector ?? '', this.#harness, { signal });
+      const resolved = await resolveSessionListWorkspace(selector ?? '', this.#harness, {
+        signal, conversationKey: key,
+      });
       if (resolved.error) {
         await this.#send(chatId, resolved.error, { replyTo });
         return;
       }
       const listed = await this.#harness.listWorkspaceSessions(resolved.workspace, { signal });
+      if (conversationWorkspace !== undefined && conversationWorkspace !== this.#conversationWorkspace(key)) {
+        await this.#send(chatId, t('这个菜单已过期，请回复 /m 重新打开。'), { replyTo });
+        return;
+      }
       const visibleSessions = this.#visibleSessions(Array.isArray(listed?.sessions) ? listed.sessions : []);
       const sessionLimit = Number.isSafeInteger(limit) && limit > 0 ? limit : null;
       const sessions = sessionLimit === null
@@ -2656,6 +2676,7 @@ export class FeishuHarnessBridge {
       const pageSlice = sessions.slice(safePage * MENU_PAGE_SIZE, (safePage + 1) * MENU_PAGE_SIZE);
       this.#rememberMenu(key, {
         kind: 'sessions',
+        conversationWorkspace,
         sessions: pageSlice.map((session) => ({ ...session, watched: watchedSet.has(session.sessionId) })),
       });
       await this.#sendCard(
@@ -2665,6 +2686,9 @@ export class FeishuHarnessBridge {
           key,
           updateMessageId,
           replyTo,
+          // The effective conversation workspace is separate from an explicit
+          // list selector, which may intentionally point at another workspace.
+          conversationWorkspace,
           // Keep the canonical selector result for later page callbacks. The
           // list response's workspace is display data and is not authoritative.
           sessionWorkspace: resolved.workspace,
@@ -2732,6 +2756,7 @@ export class FeishuHarnessBridge {
     this.#cardKeys.set(messageId, {
       key: options.key,
       chatId,
+      conversationWorkspace: options.conversationWorkspace,
       sessionWorkspace: typeof options.sessionWorkspace === 'string' && options.sessionWorkspace
         ? options.sessionWorkspace
         : null,
@@ -2850,13 +2875,14 @@ export class FeishuHarnessBridge {
   }
 
   async #sendMenuCard(key, chatId, { updateMessageId = null, replyTo = null } = {}) {
+    const conversationWorkspace = this.#conversationWorkspace(key);
     let currentSessionId = null;
     let directSessionTitle = null;
     try {
       const sessionId = this.#state.sessionFor(key);
       if (typeof sessionId === 'string' && sessionId) {
         currentSessionId = sessionId;
-        const session = this.#harness.workspaceSession?.(sessionId);
+        const session = this.#harness.workspaceSession?.(sessionId, key);
         directSessionTitle = nonEmptyString(session?.title)
           ?? nonEmptyString(session?.name)
           ?? nonEmptyString(session?.displayName);
@@ -2874,12 +2900,13 @@ export class FeishuHarnessBridge {
         return { current, paths: current ? [current] : [] };
       });
     const sessionTask = (async () => {
-      const current = typeof this.#harness.currentWorkspace === 'function'
-        ? this.#harness.currentWorkspace()
-        : null;
-      if (!current || typeof this.#harness.listWorkspaceSessions !== 'function') return [];
+      if (typeof this.#harness.listWorkspaceSessions !== 'function') return [];
       try {
-        const listed = await this.#harness.listWorkspaceSessions(current, { signal: dataSignal });
+        const resolved = await resolveSessionListWorkspace('', this.#harness, {
+          signal: dataSignal, conversationKey: key,
+        });
+        if (resolved.error) return [];
+        const listed = await this.#harness.listWorkspaceSessions(resolved.workspace, { signal: dataSignal });
         return this.#visibleSessions(Array.isArray(listed?.sessions) ? listed.sessions : []);
       } catch {
         return [];
@@ -2896,7 +2923,7 @@ export class FeishuHarnessBridge {
     const modelTask = (async () => {
       try {
         if (currentSessionId) {
-          const session = this.#harness.workspaceSession?.(currentSessionId);
+          const session = this.#harness.workspaceSession?.(currentSessionId, key);
           if (typeof session?.models === 'function') {
             return await session.models({ signal: dataSignal });
           }
@@ -2913,6 +2940,10 @@ export class FeishuHarnessBridge {
       presetTask,
       modelTask,
     ]);
+    if (conversationWorkspace !== undefined && conversationWorkspace !== this.#conversationWorkspace(key)) {
+      await this.#send(chatId, t('这个菜单已过期，请回复 /m 重新打开。'), { replyTo });
+      return;
+    }
     const workspaces = Array.isArray(snapshot.paths) ? snapshot.paths : [];
     const currentWorkspace = snapshot.current ?? null;
     const currentMatch = listedSessions.find((session) => session.sessionId === currentSessionId);
@@ -2944,7 +2975,7 @@ export class FeishuHarnessBridge {
         currentSession: currentSessionId ? { id: currentSessionId, title: currentSessionTitle } : null,
         sessions, archiveVisible, presetCatalog, modelCatalog,
       }),
-      { key, updateMessageId, replyTo },
+      { key, updateMessageId, replyTo, conversationWorkspace },
     );
   }
 
@@ -2956,7 +2987,7 @@ export class FeishuHarnessBridge {
   async #resolveSessionTitle(key, sessionId) {
     try {
       if (typeof this.#harness.workspaceSession === 'function') {
-        const session = this.#harness.workspaceSession(sessionId);
+        const session = this.#harness.workspaceSession(sessionId, key);
         if (session && typeof session === 'object') {
           const direct = nonEmptyString(session.title)
             ?? nonEmptyString(session.name)
@@ -3009,7 +3040,7 @@ export class FeishuHarnessBridge {
       const sessionId = this.#state?.sessionFor?.(key);
       let catalog;
       if (typeof sessionId === 'string' && sessionId) {
-        const session = this.#harness.workspaceSession(sessionId);
+        const session = this.#harness.workspaceSession(sessionId, key);
         if (session?.models) {
           catalog = await session.models({ signal });
         }
@@ -3078,7 +3109,7 @@ export class FeishuHarnessBridge {
       try {
         const sessionId = this.#state?.sessionFor?.(key);
         if (typeof sessionId === 'string' && sessionId) {
-          const session = this.#harness.workspaceSession(sessionId);
+          const session = this.#harness.workspaceSession(sessionId, key);
           if (session?.models) {
             const cat = await session.models({ signal });
             if (cat.current) info.model = `${cat.current.provider}/${cat.current.model}`;

package/src/channels/qq/qq-bridge.mjs

@@ -702,7 +702,10 @@ export class QqHarnessBridge {
   }
 
   #menuContext(key) {
-    return { workspace: this.#harness.currentWorkspace?.(), sessionId: this.#state.sessionFor(key) };
+    const workspace = this.#harness.currentWorkspace?.();
+    const sessionWorkspace = typeof this.#harness.currentConversationWorkspace === 'function'
+      ? this.#harness.currentConversationWorkspace(key) : workspace;
+    return { workspace, sessionWorkspace, sessionId: this.#state.sessionFor(key) };
   }
 
   async #showMenu(message, key, name, pageView = null) {
@@ -716,7 +719,8 @@ export class QqHarnessBridge {
     this.#signal?.throwIfAborted();
     this.#harness.assertWorkspaceScope?.();
     const current = this.#menuContext(key);
-    if (current.workspace !== context.workspace || current.sessionId !== context.sessionId) {
+    if (current.workspace !== context.workspace || current.sessionWorkspace !== context.sessionWorkspace
+      || current.sessionId !== context.sessionId) {
       return { message: t('会话或工作区已变化，请重新发送 /m。') };
     }
     if (!this.#menus.publish(key, actor, entry, view)) return { messages: [] };
@@ -753,7 +757,9 @@ export class QqHarnessBridge {
     const execute = async () => {
       this.#signal?.throwIfAborted();
       const current = this.#menuContext(key);
-      if (current.workspace !== choice.context.workspace || current.sessionId !== choice.context.sessionId) {
+      if (current.workspace !== choice.context.workspace
+        || current.sessionWorkspace !== choice.context.sessionWorkspace
+        || current.sessionId !== choice.context.sessionId) {
         return { message: t('会话或工作区已变化，请重新发送 /m。') };
       }
       // A prompt may have started while this action waited for a prior menu command.
@@ -764,7 +770,9 @@ export class QqHarnessBridge {
       if (command === '/new') return withSessionBindingLock(this.#state, key, async () => {
         if (isBusy()) return { message: t('当前任务仍在运行，请先停止任务或等待任务完成后再执行此操作。') };
         const locked = this.#menuContext(key);
-        if (locked.workspace !== choice.context.workspace || locked.sessionId !== choice.context.sessionId) {
+        if (locked.workspace !== choice.context.workspace
+          || locked.sessionWorkspace !== choice.context.sessionWorkspace
+          || locked.sessionId !== choice.context.sessionId) {
           return { message: t('会话或工作区已变化，请重新发送 /m。') };
         }
         await this.#state.clearSession(key);

package/src/channels/qq/qq-menu.mjs

@@ -55,7 +55,8 @@ export class QqMenuStore {
     const entry = this.#entries.get(this.#key(route, actor));
     if (!entry || entry.used || !entry.view || entry.expiresAt <= this.#now()
       || (token && token !== entry.token)) return { error: t('这个菜单已过期，请回复 /m 重新打开。') };
-    if (entry.workspace !== context.workspace || entry.sessionId !== context.sessionId) {
+    if (entry.workspace !== context.workspace || entry.sessionWorkspace !== context.sessionWorkspace
+      || entry.sessionId !== context.sessionId) {
       entry.used = true;
       return { error: t('会话或工作区已变化，请重新发送 /m。') };
     }
@@ -80,13 +81,15 @@ export function qqMenuPage(list, requestedPage = 0) {
     list.choices.length ? '' : t('暂无可用选项。')].filter(Boolean).join('\n'), entries, columns: 2 };
 }
 
-async function catalogFor(harness, sessionId, options) {
-  const session = sessionId ? harness.workspaceSession?.(sessionId) : null;
+async function catalogFor(harness, sessionId, key, options) {
+  const session = sessionId ? harness.workspaceSession?.(sessionId, key) : null;
   return typeof session?.models === 'function' ? session.models(options) : harness.listModels(options);
 }
 
 export async function qqMenuView(name, harness, state, key, { signal, busy = false } = {}) {
   const workspace = harness.currentWorkspace?.();
+  const sessionWorkspace = typeof harness.currentConversationWorkspace === 'function'
+    ? harness.currentConversationWorkspace(key) : workspace;
   const sessionId = state.sessionFor(key);
   const options = { signal };
   const archived = state.includesArchivedSessions?.() === true;
@@ -94,8 +97,8 @@ export async function qqMenuView(name, harness, state, key, { signal, busy = fal
   if (name === 'main' || name === 'status') {
     if (name === 'status') await harness.ensureRunning(options);
     const results = await Promise.allSettled([
-      harness.listWorkspaceSessions?.(workspace, options),
-      catalogFor(harness, sessionId, options),
+      harness.listWorkspaceSessions?.(name === 'main' ? sessionWorkspace : workspace, options),
+      catalogFor(harness, sessionId, key, options),
       harness.agentPresetSettings?.(options),
     ]);
     signal?.throwIfAborted();
@@ -125,8 +128,8 @@ export async function qqMenuView(name, harness, state, key, { signal, busy = fal
       ] };
   }
   if (name === 'sessions') {
-    const listed = await harness.listWorkspaceSessions(workspace, options);
-    return qqMenuPage({ title: t('📋 会话列表'), detail: clean(workspace), choices: visibleSessions(listed).map((item) =>
+    const listed = await harness.listWorkspaceSessions(sessionWorkspace, options);
+    return qqMenuPage({ title: t('📋 会话列表'), detail: clean(sessionWorkspace), choices: visibleSessions(listed).map((item) =>
       command(`${item.sessionId === sessionId ? '✓ ' : ''}${clean(item.title || item.sessionId, 70)}${item.archived ? t('（已归档）') : ''}`, `/session ${item.sessionId}`)) });
   }
   if (name === 'workspaces') {
@@ -135,7 +138,7 @@ export async function qqMenuView(name, harness, state, key, { signal, busy = fal
       command(`${path === workspace ? '✓ ' : ''}${clean(path)}`, `/workspace ${path}`)) });
   }
   if (name === 'models') {
-    const catalog = await catalogFor(harness, sessionId, options);
+    const catalog = await catalogFor(harness, sessionId, key, options);
     return qqMenuPage({ title: t('🧠 模型'), detail: catalog.failures?.length ? t('部分模型暂不可用，可稍后重试。') : '',
       choices: catalog.groups.flatMap((group) => group.models.map((model) => command(
         `${catalog.current?.provider === group.id && catalog.current?.model === model.id ? '✓ ' : ''}${clean(group.name, 30)} · ${clean(model.name, 60)}`,