@xmanrui/dsh-im 4.9.1 → 4.11.0

package/plugin-src/client/channels/weixin/index.js

@@ -21,6 +21,11 @@ import {
   AgentPresetEditor,
   EMPTY_AGENT_PRESET_CATALOG,
 } from '../../agent-preset.js';
+import {
+  EMPTY_MODEL_CATALOG,
+  ModelCatalogContext,
+  ModelEditor,
+} from '../../model-setting.js';
 import { useWorkspaceSnapshotFence } from '../../workspace-snapshot-fence.js';
 import {
   BotSettingsButton,
@@ -208,6 +213,7 @@ export function AccountCard({
   removing,
   onReconnect,
   onWorkspaceSave,
+  onModelSave,
   onAgentPresetSave,
   onContextEnhancementSave,
   onRequestRemove,
@@ -244,6 +250,11 @@ export function AccountCard({
         disabled: Boolean(busy),
         onSave: onWorkspaceSave,
       }),
+      h(ModelEditor, {
+        model: account.model,
+        disabled: Boolean(busy),
+        onSave: onModelSave,
+      }),
       h(AgentPresetEditor, {
         agentPreset: account.agentPreset,
         disabled: Boolean(busy),
@@ -296,6 +307,7 @@ function AccountList(props) {
         removing: props.removeTarget === account.botId,
         onReconnect: () => props.onReconnect(account),
         onWorkspaceSave: (workspace) => props.onWorkspaceSave(account, workspace),
+        onModelSave: (model) => props.onModelSave(account, model),
         onAgentPresetSave: (agentPreset) => props.onAgentPresetSave(account, agentPreset),
         onContextEnhancementSave: (config) => props.onContextEnhancementSave(account, config),
         onRequestRemove: () => props.onRequestRemove(account),
@@ -324,6 +336,7 @@ export function WeixinSettingsTab({ rpcCall }) {
   const [model, setModel] = React.useState({
     phase: 'loading', bots: [], totals: EMPTY_TOTALS, revision: 0, error: null,
     agentPresetCatalog: EMPTY_AGENT_PRESET_CATALOG,
+    modelCatalog: EMPTY_MODEL_CATALOG,
   });
   const [provision, setProvision] = React.useState(null);
   const [busy, setBusy] = React.useState(false);
@@ -367,6 +380,7 @@ export function WeixinSettingsTab({ rpcCall }) {
         phase: 'ready', bots: snapshot.bots, totals: snapshot.totals,
         revision: snapshot.revision, error: null,
         agentPresetCatalog: snapshot.agentPresetCatalog ?? EMPTY_AGENT_PRESET_CATALOG,
+        modelCatalog: snapshot.modelCatalog ?? EMPTY_MODEL_CATALOG,
       });
       if (snapshot.provisioning) {
         setProvision((current) => mergeWeixinProvisioningSnapshot(
@@ -558,6 +572,7 @@ export function WeixinSettingsTab({ rpcCall }) {
         setModel((current) => ({
           ...current, bots: snapshot.bots, totals: snapshot.totals, revision: snapshot.revision,
           agentPresetCatalog: snapshot.agentPresetCatalog ?? current.agentPresetCatalog,
+          modelCatalog: snapshot.modelCatalog ?? current.modelCatalog,
         }));
       }
       const refreshed = snapshot.bots.find((bot) => bot.botId === account.botId);
@@ -603,6 +618,7 @@ export function WeixinSettingsTab({ rpcCall }) {
           phase: 'ready', bots: snapshot.bots, totals: snapshot.totals,
           revision: snapshot.revision, error: null,
           agentPresetCatalog: snapshot.agentPresetCatalog ?? EMPTY_AGENT_PRESET_CATALOG,
+          modelCatalog: snapshot.modelCatalog ?? EMPTY_MODEL_CATALOG,
         });
       }
     } finally {
@@ -625,6 +641,7 @@ export function WeixinSettingsTab({ rpcCall }) {
           phase: 'ready', bots: snapshot.bots, totals: snapshot.totals,
           revision: snapshot.revision, error: null,
           agentPresetCatalog: snapshot.agentPresetCatalog ?? EMPTY_AGENT_PRESET_CATALOG,
+          modelCatalog: snapshot.modelCatalog ?? EMPTY_MODEL_CATALOG,
         });
       }
     } finally {
@@ -646,6 +663,7 @@ export function WeixinSettingsTab({ rpcCall }) {
         setModel((current) => ({
           ...current, bots: snapshot.bots, totals: snapshot.totals, revision: snapshot.revision,
           agentPresetCatalog: snapshot.agentPresetCatalog ?? current.agentPresetCatalog,
+          modelCatalog: snapshot.modelCatalog ?? current.modelCatalog,
         }));
       }
       setRemoveTarget(null);
@@ -686,7 +704,9 @@ export function WeixinSettingsTab({ rpcCall }) {
     });
   }
 
-  return h(AgentPresetCatalogContext.Provider, {
+  return h(ModelCatalogContext.Provider, {
+    value: model.modelCatalog ?? EMPTY_MODEL_CATALOG,
+  }, h(AgentPresetCatalogContext.Provider, {
     value: model.agentPresetCatalog ?? EMPTY_AGENT_PRESET_CATALOG,
   }, h('section', { className: 'dxw-page dim-channelPage', 'aria-label': '微信设置' },
     h(Heading, {
@@ -721,6 +741,9 @@ export function WeixinSettingsTab({ rpcCall }) {
                   removeTarget,
                   onReconnect: (account) => void reconnect(account),
                   onWorkspaceSave: saveWorkspace,
+                  onModelSave: (account, selectedModel) => saveBotSetting(
+                    account, 'model', WEIXIN_ENDPOINTS.setModel, { model: selectedModel },
+                  ),
                   onAgentPresetSave: (account, agentPreset) => saveBotSetting(
                     account, 'preset', WEIXIN_ENDPOINTS.setAgentPreset, { agentPreset },
                   ),
@@ -732,5 +755,5 @@ export function WeixinSettingsTab({ rpcCall }) {
                   onCancelRemove: () => setRemoveTarget(null),
                 })
               : null),
-  ));
+  )));
 }

package/plugin-src/client/channels/whatsapp/api.js

@@ -1,4 +1,5 @@
 import { normalizeAgentPresetCatalog, normalizeAgentPresetId, SET_AGENT_PRESET_ENDPOINT } from '../../agent-preset.js';
+import { normalizeModelCatalog, normalizeModelSelection, SET_MODEL_ENDPOINT } from '../../model-setting.js';
 import { normalizeLastMessageError } from '../../last-message-error.js';
 import { normalizeAccessPolicy } from '../../../../src/channels/shared/access-policy.mjs';
 import { normalizeContextEnhancementConfig } from '../../../../src/channels/shared/context-enhancement.mjs';
@@ -14,6 +15,7 @@ export const WHATSAPP_ENDPOINTS = Object.freeze({
   deleteBot: 'bot.delete',
   setAccessPolicy: 'bot.access-policy.set',
   setWorkspace: 'bot.workspace.set',
+  setModel: SET_MODEL_ENDPOINT,
   setAgentPreset: SET_AGENT_PRESET_ENDPOINT,
   setContextEnhancement: 'bot.context-enhancement.set',
 });
@@ -90,6 +92,7 @@ function normalizeBot(value) {
     connected,
     state: connected ? 'connected' : state,
     workspace: text(value.workspace, '', 4_096),
+    model: normalizeModelSelection(value.model),
     agentPreset: normalizeAgentPresetId(value.agentPreset),
     contextEnhancement: normalizeContextEnhancementConfig(value.contextEnhancement),
     ...(Object.hasOwn(value, 'accessPolicy')
@@ -124,6 +127,7 @@ export function normalizeSnapshot(value) {
     totals: { configured: bots.length, connected: bots.filter((bot) => bot.connected).length },
     provisioning: source.provisioning ? normalizeProvisioning(source.provisioning) : null,
     agentPresetCatalog: normalizeAgentPresetCatalog(source.agentPresetCatalog),
+    modelCatalog: normalizeModelCatalog(source.modelCatalog),
   };
 }
 

package/plugin-src/client/channels/whatsapp/index.js

@@ -10,6 +10,11 @@ import {
   AgentPresetEditor,
   EMPTY_AGENT_PRESET_CATALOG,
 } from '../../agent-preset.js';
+import {
+  EMPTY_MODEL_CATALOG,
+  ModelCatalogContext,
+  ModelEditor,
+} from '../../model-setting.js';
 import { useWorkspaceSnapshotFence } from '../../workspace-snapshot-fence.js';
 import {
   BotSettingsButton,
@@ -185,6 +190,7 @@ export function WhatsappAccountCard({
   removing,
   onReconnect,
   onWorkspaceSave,
+  onModelSave,
   onAgentPresetSave,
   onContextEnhancementSave,
   onRequestRemove,
@@ -226,6 +232,11 @@ export function WhatsappAccountCard({
         disabled: Boolean(busy),
         onSave: onWorkspaceSave,
       }),
+      h(ModelEditor, {
+        model: account.model,
+        disabled: Boolean(busy),
+        onSave: onModelSave,
+      }),
       h(AgentPresetEditor, {
         agentPreset: account.agentPreset,
         disabled: Boolean(busy),
@@ -266,6 +277,7 @@ export function WhatsappSettingsTab({ rpcCall }) {
   const [model, setModel] = React.useState({
     phase: 'loading', bots: [], totals: { configured: 0, connected: 0 }, error: null,
     agentPresetCatalog: EMPTY_AGENT_PRESET_CATALOG,
+    modelCatalog: EMPTY_MODEL_CATALOG,
   });
   const [provision, setProvision] = React.useState(null);
   const [busy, setBusy] = React.useState(false);
@@ -304,6 +316,7 @@ export function WhatsappSettingsTab({ rpcCall }) {
       setModel({
         phase: 'ready', bots: snapshot.bots, totals: snapshot.totals, error: null,
         agentPresetCatalog: snapshot.agentPresetCatalog ?? EMPTY_AGENT_PRESET_CATALOG,
+        modelCatalog: snapshot.modelCatalog ?? EMPTY_MODEL_CATALOG,
       });
       if (restore && snapshot.provisioning) setProvision({
         ...snapshot.provisioning,
@@ -435,6 +448,7 @@ export function WhatsappSettingsTab({ rpcCall }) {
         setModel({
           phase: 'ready', bots: snapshot.bots, totals: snapshot.totals, error: null,
           agentPresetCatalog: snapshot.agentPresetCatalog ?? EMPTY_AGENT_PRESET_CATALOG,
+          modelCatalog: snapshot.modelCatalog ?? EMPTY_MODEL_CATALOG,
         });
         if (operation === 'reconnect') {
           setTestNoticeByBot((current) => ({
@@ -487,6 +501,12 @@ export function WhatsappSettingsTab({ rpcCall }) {
               WHATSAPP_ENDPOINTS.setWorkspace,
               { botId: account.botId, workspace },
             ),
+            onModelSave: (selectedModel) => botAction(
+              account,
+              'model',
+              WHATSAPP_ENDPOINTS.setModel,
+              { botId: account.botId, model: selectedModel },
+            ),
             onAgentPresetSave: (agentPreset) => botAction(
               account,
               'preset',
@@ -511,7 +531,9 @@ export function WhatsappSettingsTab({ rpcCall }) {
           })))))
     : null;
 
-  return h(AgentPresetCatalogContext.Provider, {
+  return h(ModelCatalogContext.Provider, {
+    value: model.modelCatalog ?? EMPTY_MODEL_CATALOG,
+  }, h(AgentPresetCatalogContext.Provider, {
     value: model.agentPresetCatalog ?? EMPTY_AGENT_PRESET_CATALOG,
   }, h('section', {
     className: 'ddt-page dwa-page dim-channelPage',
@@ -550,5 +572,5 @@ export function WhatsappSettingsTab({ rpcCall }) {
               : model.bots.length === 0
                 ? h(EmptyView, { busy, onStart: () => void startProvisioning(false) })
                 : null,
-          botList)));
+          botList))));
 }

package/plugin-src/client/delivery-settings.js

@@ -1,6 +1,7 @@
 import * as React from 'react';
 
 import { AccessPolicySettingsPage } from './access-policy-settings.js';
+import { FeishuGroupSettingsPage } from './channels/feishu/group-settings.js';
 import { h, isEnglish, localizeText } from './i18n.js';
 
 export const DELIVERY_RPC_CHANNEL = '/dsh-im-delivery';
@@ -16,6 +17,7 @@ export const DELIVERY_ENDPOINTS = Object.freeze({
   create: 'target.create',
   update: 'target.update',
   delete: 'target.delete',
+  sessionSync: 'target.session-sync.set',
   test: 'target.test',
 });
 
@@ -24,6 +26,15 @@ export const BOT_SETTINGS_TABS = Object.freeze([
   Object.freeze({ id: 'access', label: '访问设置' }),
 ]);
 
+export const FEISHU_BOT_SETTINGS_TABS = Object.freeze([
+  ...BOT_SETTINGS_TABS,
+  Object.freeze({ id: 'group', label: '群聊' }),
+]);
+
+export function botSettingsTabsForChannel(channel) {
+  return channel === 'feishu' ? FEISHU_BOT_SETTINGS_TABS : BOT_SETTINGS_TABS;
+}
+
 const CHANNEL_DEFINITIONS = Object.freeze({
   weixin: {
     label: '微信',
@@ -296,7 +307,9 @@ function TargetForm({
     h('div', { className: 'dim-targetFormHeading' },
       h('h3', null, editing ? '编辑投递目标' : '新建投递目标'),
       editing
-        ? null
+        ? initialValue?.sessionSync?.enabled
+          ? h('p', null, '修改接收位置会关闭会话双向同步。')
+          : null
         : h('p', null, source === 'suggestion'
             ? '已从会话自动填入目标信息；确认后再保存。'
             : '请手动填写从对应平台取得的原生标识。')),
@@ -457,8 +470,17 @@ function TargetSuggestionPicker({
 function TargetRow({ definition, target, botId, connected, rpcCall, onChanged, onEdit }) {
   const [action, setAction] = React.useState(null);
   const [testState, setTestState] = React.useState(null);
+  const [syncFeedback, setSyncFeedback] = React.useState(null);
   const [copyState, setCopyState] = React.useState(null);
   const [confirmDelete, setConfirmDelete] = React.useState(false);
+  const sessionSync = target.sessionSync ?? { enabled: false, state: 'unavailable' };
+  const syncDescription = sessionSync.state === 'active'
+    ? '自动跟随该私聊的当前会话'
+    : sessionSync.state === 'waiting'
+      ? '等待该私聊建立新会话'
+      : sessionSync.state === 'unavailable'
+        ? '仅支持已经聊过、已建立当前会话且使用当前 Host Harness 的私聊目标'
+        : '关闭时不发送 DSH 会话消息';
   const testTarget = async () => {
     setAction('test');
     setTestState(null);
@@ -494,6 +516,28 @@ function TargetRow({ definition, target, botId, connected, rpcCall, onChanged, o
     }
   };
 
+  const setSessionSync = async (enabled) => {
+    setAction('sync');
+    setSyncFeedback(null);
+    try {
+      await rpcCall(DELIVERY_ENDPOINTS.sessionSync, {
+        botId,
+        targetId: target.targetId,
+        enabled,
+      });
+      await onChanged();
+    } catch (error) {
+      setSyncFeedback({
+        tone: 'error',
+        message: error?.code === 'session-sync-unavailable'
+          ? '会话同步仅支持已经聊过、已建立当前会话且使用当前 Host Harness 的私聊目标。'
+          : presentError(error, '会话同步设置失败，请稍后重试。'),
+      });
+    } finally {
+      setAction(null);
+    }
+  };
+
   return h('li', { className: 'dim-targetRow', 'data-target-id': target.targetId },
     h('div', { className: 'dim-targetSummary' },
       h('div', { className: 'dim-targetTitle' },
@@ -514,7 +558,24 @@ function TargetRow({ definition, target, botId, connected, rpcCall, onChanged, o
         onClick: () => setConfirmDelete(true),
         disabled: Boolean(action),
       }, '删除')),
+    h('label', { className: 'dim-targetSessionSync' },
+      h('span', { className: 'dim-targetSessionSyncCopy' },
+        h('strong', null, '会话双向同步'),
+        h('small', null, syncDescription)),
+      h('input', {
+        type: 'checkbox',
+        checked: sessionSync.enabled === true,
+        disabled: Boolean(action)
+          || (sessionSync.enabled !== true && sessionSync.state === 'unavailable'),
+        onChange: (event) => void setSessionSync(event.target.checked),
+        'aria-label': '会话双向同步',
+      })),
     copyState ? h('p', { className: 'dim-targetFeedback', role: 'status' }, copyState) : null,
+    syncFeedback ? h('p', {
+      className: 'dim-targetFeedback',
+      'data-tone': syncFeedback.tone,
+      role: 'alert',
+    }, syncFeedback.message) : null,
     testState ? h('p', {
       className: 'dim-targetFeedback',
       'data-tone': testState.tone,
@@ -524,7 +585,8 @@ function TargetRow({ definition, target, botId, connected, rpcCall, onChanged, o
     confirmDelete ? h('div', { className: 'dim-targetDeleteConfirm', role: 'alertdialog' },
       h('p', null,
         '删除 ', h('code', null, target.targetId),
-        '？使用这个 targetId 的外部调用将返回 unknown-target。'),
+        '？使用这个 targetId 的外部调用将返回 unknown-target。',
+        sessionSync.enabled ? ' 会话同步设置也会一并删除。' : null),
       h('div', { className: 'dim-targetFormActions' },
         h(DeliveryButton, {
           onClick: () => setConfirmDelete(false),
@@ -672,8 +734,9 @@ export function DeliveryTargetSettingsPage({
     }
   };
 
-  const activeTab = BOT_SETTINGS_TABS.find((tab) => tab.id === activeTabId)
-    ?? BOT_SETTINGS_TABS[0];
+  const settingsTabs = botSettingsTabsForChannel(channel);
+  const activeTab = settingsTabs.find((tab) => tab.id === activeTabId)
+    ?? settingsTabs[0];
   const activeTabDomId = `dim-bot-settings-${activeTab.id}-tab`;
   const activePanelId = `dim-bot-settings-${activeTab.id}-panel`;
 
@@ -688,7 +751,7 @@ export function DeliveryTargetSettingsPage({
       className: 'dim-botSettingsTabs',
       role: 'tablist',
       'aria-label': '机器人设置页签',
-    }, BOT_SETTINGS_TABS.map((tab) => h('button', {
+    }, settingsTabs.map((tab) => h('button', {
       key: tab.id,
       id: `dim-bot-settings-${tab.id}-tab`,
       type: 'button',
@@ -712,6 +775,11 @@ export function DeliveryTargetSettingsPage({
         rpcCall: accessRpcCall,
         onSaved: setAccessPolicy,
       })
+    : activeTab.id === 'group' && channel === 'feishu'
+      ? h(FeishuGroupSettingsPage, {
+          account,
+          rpcCall: accessRpcCall,
+        })
     : h(React.Fragment, null,
   h('section', { className: 'dim-deliveryIdentity', 'aria-labelledby': 'dim-delivery-bot-title' },
     h('div', { className: 'dim-deliveryIdentityHeading' },