@xmanrui/dsh-im 4.16.0 → 4.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "4.16.0",
+  "version": "4.17.0",
   "description": "把十种 IM 机器人和公网 AI Office 接入本机 DeepSeek Harness。 Connect ten IM channels and a public AI Office to a local DeepSeek Harness.",
   "keywords": [
     "deepseek-harness",
@@ -39,6 +39,10 @@
     {
       "name": "BuvkB",
       "url": "https://github.com/BuvkB"
+    },
+    {
+      "name": "masucc",
+      "url": "https://github.com/masucc"
     }
   ],
   "license": "MIT",

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

@@ -11,6 +11,7 @@ import { normalizeModelCatalog, normalizeModelSelection, SET_MODEL_ENDPOINT } fr
 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";
+import { normalizeFeishuStepPushMode } from "../../../../src/channels/feishu/step-push-mode.mjs";
 
 export const FEISHU_RPC_CHANNEL = "/feishu";
 
@@ -33,6 +34,7 @@ export const FEISHU_ENDPOINTS = Object.freeze({
   setGroupResponseMode: "bot.group-response-mode.set",
   setGroupTopicReply: "bot.group-topic-reply.set",
   setStepPush: "bot.step-push.set",
+  setStepPushMode: "bot.step-push-mode.set",
   // Kept for rolling upgrades. The multi-bot UI never calls these endpoints.
   testConnection: "connection.test",
   disconnect: "connection.disconnect",
@@ -219,6 +221,7 @@ export function normalizeBotConnection(value, fallbackBotId) {
     groupResponseMode: normalizeGroupResponseMode(value.groupResponseMode),
     groupTopicReply: value.groupTopicReply === true,
     stepPush: value.stepPush === true,
+    stepPushMode: normalizeFeishuStepPushMode(value.stepPushMode),
     groupMessagePermissionGranted: value.groupMessagePermissionGranted === true,
     bot: normalizeBot(value.bot),
     health: normalizeHealth(value.health, connected),

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

@@ -464,21 +464,20 @@ function RemoveConfirmation({ bot, busy, onConfirm, onCancel }) {
   );
 }
 
-/** Toggle row for 分步直推, mirroring the group-topic reply toggle pattern. */
-function StepPushEditor({ value = false, disabled = false, onSave }) {
+/** One select for the step-push presentation: off / per-step posts / process card. */
+function StepPushEditor({ value = false, mode = "post", disabled = false, onSave, onModeSave }) {
   const titleId = React.useId();
   const helpId = `${titleId}-help`;
-  const current = value === true ? "on" : "off";
+  const current = value === true ? mode : "off";
   const [saving, setSaving] = React.useState(false);
   const [error, setError] = React.useState(null);
 
-  const change = async (event) => {
-    const next = event.target.value === "on";
-    if ((next ? "on" : "off") === current || saving || disabled) return;
+  const save = async (run) => {
+    if (saving || disabled) return;
     setSaving(true);
     setError(null);
     try {
-      await onSave?.(next);
+      await run();
     } catch (cause) {
       setError(cause?.message ?? "分步直推设置保存失败，请重试。");
     } finally {
@@ -486,13 +485,37 @@ function StepPushEditor({ value = false, disabled = false, onSave }) {
     }
   };
 
+  const change = (event) => {
+    const next = event.target.value;
+    if (next === current) return;
+    void save(async () => {
+      if (next === "off") {
+        // Turning off only needs the flag when it was on.
+        if (value === true) await onSave?.(false);
+        return;
+      }
+      const nextMode = next === "streaming_card" ? "streaming_card" : "post";
+      // Enabling (or switching presentation) may need both writes; the flag
+      // must land before the mode so the runtime never sees a mode without
+      // step push enabled.
+      if (value !== true) await onSave?.(true);
+      if (nextMode !== mode) await onModeSave?.(nextMode);
+    });
+  };
+
+  const helpText = current === "off"
+    ? "适合日常问答：执行过程中不显示工具调用等中间步骤，只回复最终结果"
+    : current === "streaming_card"
+      ? "推荐长任务使用：过程与最终答案都在同一张卡片里实时更新，不刷屏"
+      : "每一步都单独发一条消息（含工具调用和过程说明）；注意长任务会连续发送较多消息";
+
   return h("section", {
     className: "dim-feishuGroupControl",
     "aria-labelledby": titleId,
   },
   h("div", { className: "dim-feishuGroupControlHeader" },
     h("div", { className: "dim-presetTitle" },
-      h("h3", { id: titleId }, "分步直推"),
+      h("h3", { id: titleId }, "任务过程展示"),
       h("span", { className: "dim-presetHelp" },
         h("button", {
           type: "button",
@@ -504,7 +527,7 @@ function StepPushEditor({ value = false, disabled = false, onSave }) {
           id: helpId,
           className: "dim-presetTooltip",
           role: "tooltip",
-        }, "开启后逐步推送工具调用与过程说明"))),
+        }, "设置任务执行过程的呈现方式：不显示、实时卡片或逐步消息"))),
     saving
       ? h("span", { className: "dim-feishuGroupControlStatus", role: "status" }, "保存中…")
       : null),
@@ -512,11 +535,13 @@ function StepPushEditor({ value = false, disabled = false, onSave }) {
     className: "dim-feishuGroupSelect",
     value: current,
     disabled: disabled || saving,
-    "aria-label": "分步直推",
-    onChange: (event) => { void change(event); },
+    "aria-label": "任务过程展示",
+    onChange: change,
   },
-  h("option", { value: "off" }, "关闭（保持流式卡模式）"),
-  h("option", { value: "on" }, "开启（逐步推送工具调用与过程说明）")),
+  h("option", { value: "off" }, "不显示过程（只发送最终答案）"),
+  h("option", { value: "streaming_card" }, "实时过程卡（全程一张卡片动态更新）"),
+  h("option", { value: "post" }, "逐步直播（每一步单独发一条消息）")),
+  h("p", { className: "dim-feishuGroupHelp" }, helpText),
   error ? h("p", {
     className: "dim-feishuGroupError",
     role: "alert",
@@ -539,6 +564,7 @@ export function BotCard({
   onAgentPresetSave,
   onContextEnhancementSave,
   onStepPushSave,
+  onStepPushModeSave,
   onRequestRemove,
   onConfirmRemove,
   onCancelRemove,
@@ -627,8 +653,10 @@ export function BotCard({
       }),
       h(StepPushEditor, {
         value: connection.stepPush,
+        mode: connection.stepPushMode,
         disabled: Boolean(busy),
         onSave: onStepPushSave,
+        onModeSave: onStepPushModeSave,
       }),
       provisionContent
         ? h("section", {
@@ -723,6 +751,7 @@ function BotList(props) {
           onAgentPresetSave: (agentPreset) => props.onAgentPresetSave(bot, agentPreset),
           onContextEnhancementSave: (config) => props.onContextEnhancementSave(bot, config),
           onStepPushSave: (stepPush) => props.onStepPushSave(bot, stepPush),
+          onStepPushModeSave: (stepPushMode) => props.onStepPushModeSave(bot, stepPushMode),
           onRequestRemove: () => props.onRequestRemove(bot),
           onConfirmRemove: () => props.onConfirmRemove(bot),
           onCancelRemove: props.onCancelRemove,
@@ -1500,6 +1529,9 @@ export function FeishuSettingsTab({ rpcCall }) {
                   onStepPushSave: (connection, stepPush) => saveBotSetting(
                     connection, "step-push", FEISHU_ENDPOINTS.setStepPush, { stepPush },
                   ),
+                  onStepPushModeSave: (connection, stepPushMode) => saveBotSetting(
+                    connection, "step-push-mode", FEISHU_ENDPOINTS.setStepPushMode, { stepPushMode },
+                  ),
                   onRequestRemove: requestRemove,
                   onConfirmRemove: (bot) => void confirmRemove(bot),
                   onCancelRemove: cancelRemove,

package/plugin-src/client/i18n.js

@@ -223,9 +223,20 @@ const EN = Object.freeze({
   '分步直推': 'Step push',
   '查看分步直推说明': 'View step push help',
   '开启后逐步推送工具调用与过程说明': 'Push tool calls and process notes step by step',
-  '关闭（保持流式卡模式）': 'Off (keep the streaming card)',
-  '开启（逐步推送工具调用与过程说明）': 'On (push tool calls and process notes step by step)',
+  '任务过程展示': 'Task progress display',
+  '设置任务执行过程的呈现方式：不显示、实时卡片或逐步消息': 'Choose how the execution is presented: hidden, one live card, or step-by-step messages',
+  '不显示过程（只发送最终答案）': 'Hide the process (send the final answer only)',
+  '实时过程卡（全程一张卡片动态更新）': 'Live process card (one card updated throughout)',
+  '逐步直播（每一步单独发一条消息）': 'Step-by-step feed (one message per step)',
+  '适合日常问答：执行过程中不显示工具调用等中间步骤，只回复最终结果': 'For everyday Q&A: tool calls and other interim steps stay hidden, only the final result is replied',
+  '推荐长任务使用：过程与最终答案都在同一张卡片里实时更新，不刷屏': 'Recommended for long tasks: the process and the final answer update live in one card without flooding the chat',
+  '每一步都单独发一条消息（含工具调用和过程说明）；注意长任务会连续发送较多消息': 'Every step is sent as its own message (including tool calls and notes); long tasks may send many messages in a row',
   '分步直推设置保存失败，请重试。': 'Could not save the step push setting. Try again.',
+  'zcode过程卡模式': 'ZCode process-card mode',
+  '过程说明、工具摘要与最终答案都在同一张卡片中原地刷新':
+    'Process notes, the tool summary, and the final answer refresh in place inside one card',
+  '思考与工具摘要折叠展示，最终答案在同一张卡片中原地刷新':
+    'Thinking and the tool summary stay folded; the final answer refreshes in place inside one card',
   '钉钉设置': 'DingTalk settings',
   '企业微信设置': 'WeCom settings',
   '扫码接入机器人': 'Scan QR code',

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

@@ -219,6 +219,7 @@ export async function createProductionController(ctx, config = {}, internals = {
         groupResponseMode: botConfig.groupResponseMode,
         groupTopicReply: botConfig.groupTopicReply,
         stepPush: botConfig.stepPush,
+        stepPushMode: botConfig.stepPushMode,
         ownerOpenIds: botConfig.ownerOpenIds ?? [botConfig.ownerOpenId],
         harness: workspaceScope.harness,
         state: workspaceScope.state,

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

@@ -21,6 +21,10 @@ import {
   isFeishuGroupResponseMode,
   normalizeFeishuGroupResponseMode,
 } from '../../../../src/channels/feishu/group-response-mode.mjs';
+import {
+  isFeishuStepPushMode,
+  normalizeFeishuStepPushMode,
+} from '../../../../src/channels/feishu/step-push-mode.mjs';
 import {
   FEISHU_ENDPOINTS as FEISHU_CLIENT_ENDPOINTS,
   FEISHU_RPC_CHANNEL,
@@ -295,6 +299,7 @@ function publicBotEntry(entry) {
     groupResponseMode: normalizeFeishuGroupResponseMode(source.groupResponseMode),
     groupTopicReply: source.groupTopicReply === true,
     stepPush: source.stepPush === true,
+    stepPushMode: normalizeFeishuStepPushMode(source.stepPushMode),
     groupMessagePermissionGranted: source.groupMessagePermissionGranted === true,
     bot: publicBot(source.bot),
     health: publicHealth(source, connected),
@@ -466,6 +471,13 @@ function validPayload(endpoint, payload) {
       ? null
       : '请选择是否分步直推。';
   }
+  if (endpoint === FEISHU_ENDPOINTS.setStepPushMode) {
+    return hasOnlyKeys(payload, new Set(['botId', 'stepPushMode']))
+      && safeOpaqueId(payload.botId)
+      && isFeishuStepPushMode(payload.stepPushMode)
+      ? null
+      : '请选择分步直推的呈现方式。';
+  }
   return 'Unknown Feishu endpoint.';
 }
 
@@ -758,6 +770,14 @@ export function createFeishuRpcHandler(controller, { encodeQr = qrCodeDataUrl }
           await controller.updateStepPush(payload.botId, payload.stepPush),
           { encodeQr: cachedEncodeQr },
         );
+      } else if (endpoint === FEISHU_ENDPOINTS.setStepPushMode) {
+        if (typeof controller.updateStepPushMode !== 'function') {
+          throw new Error('Step push mode update is unavailable');
+        }
+        value = await toPublicFeishuStatus(
+          await controller.updateStepPushMode(payload.botId, payload.stepPushMode),
+          { encodeQr: cachedEncodeQr },
+        );
       } else {
         if (typeof controller.deleteBot !== 'function') throw new Error('Multi-bot delete is unavailable');
         value = await toPublicFeishuStatus(await controller.deleteBot(payload.botId), { encodeQr: cachedEncodeQr });

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

@@ -337,10 +337,13 @@ function cardMarkdown(text, target) {
 }
 
 function cardData(text, flowStatus, target) {
+  const markdown = cardMarkdown(text, target);
+  // The shared template uses msgContent for processing, finished, and
+  // failed cards. Switching its order to staticMsgContent hides the reply.
   return {
     cardParamMap: {
       flowStatus,
-      msgContent: cardMarkdown(text, target),
+      msgContent: markdown,
       staticMsgContent: '',
       sys_full_json_obj: JSON.stringify({ order: ['msgContent'] }),
       config: JSON.stringify({ autoLayout: true }),
@@ -922,13 +925,17 @@ export function createDingtalkApi({
 
       let delivered = false;
       try {
-        await cardRequest('v1.0/card/instances', {
+        // Deliver the thinking copy in the same request that first shows the
+        // card. Creating an empty instance and filling it after deliver (the
+        // previous three-request sequence) leaves a blank bubble visible in
+        // DingTalk for the time between deliver and the follow-up PUT, and
+        // leaves a permanently blank card if that PUT ever fails.
+        await cardRequest('v1.0/card/instances/createAndDeliver', {
           body: {
+            ...cardDeliverBody(cardInstanceId, normalizedTarget, appKey),
             cardTemplateId: DINGTALK_AI_CARD_TEMPLATE_ID,
             outTrackId: cardInstanceId,
-            cardData: {
-              cardParamMap: { config: JSON.stringify({ autoLayout: true }) },
-            },
+            cardData: cardData(content, '2', normalizedTarget),
             callbackType: 'STREAM',
             cardAtUserIds: normalizedTarget.atUserIds
               ? Object.keys(normalizedTarget.atUserIds)
@@ -938,37 +945,31 @@ export function createDingtalkApi({
           },
           headers,
           signal,
-          action: 'AI Card 创建',
-        });
-        await cardRequest('v1.0/card/instances/deliver', {
-          body: cardDeliverBody(cardInstanceId, normalizedTarget, appKey),
-          headers,
-          signal,
-          action: 'AI Card 投放',
+          action: 'AI Card 创建并投放',
         });
         delivered = true;
-        await cardRequest('v1.0/card/instances', {
-          method: 'PUT',
-          body: { outTrackId: cardInstanceId, cardData: cardData(content, '2', normalizedTarget) },
-          headers,
-          signal,
-          action: 'AI Card 启动',
-        });
-        await cardRequest('v1.0/card/streaming', {
-          method: 'PUT',
-          body: {
-            outTrackId: cardInstanceId,
-            guid: randomUUID(),
-            key: 'msgContent',
-            content: cardMarkdown(content, normalizedTarget).replace(/\n+$/, ''),
-            isFull: true,
-            isFinalize: false,
-            isError: false,
-          },
-          headers,
-          signal,
-          action: 'AI Card 启动',
-        });
+        try {
+          await cardRequest('v1.0/card/streaming', {
+            method: 'PUT',
+            body: {
+              outTrackId: cardInstanceId,
+              guid: randomUUID(),
+              key: 'msgContent',
+              content: cardMarkdown(content, normalizedTarget).replace(/\n+$/, ''),
+              isFull: true,
+              isFinalize: false,
+              isError: false,
+            },
+            headers,
+            signal,
+            action: 'AI Card 启动',
+          });
+        } catch (error) {
+          if (signal?.aborted) throw error;
+          // The card is already visible with the thinking copy from
+          // createAndDeliver above. Keep the instance so finishAiCard can
+          // still replace it in place instead of sending a second message.
+        }
       } catch (error) {
         if (delivered) {
           const cleanupSignal = AbortSignal.timeout(5_000);
@@ -1018,6 +1019,8 @@ export function createDingtalkApi({
       const token = await accessToken({ clientId, clientSecret, signal });
       const headers = { 'x-acs-dingtalk-access-token': token };
       const normalizedContent = cardMarkdown(content, target);
+      // Close the streaming widget before persisting the template's
+      // finished state and full answer in msgContent.
       await cardRequest('v1.0/card/streaming', {
         method: 'PUT',
         body: {
@@ -1033,8 +1036,7 @@ export function createDingtalkApi({
         signal,
         action: 'AI Card 完成',
       });
-      let completed = true;
-      const completionRequest = {
+      await cardRequest('v1.0/card/instances', {
         method: 'PUT',
         body: {
           outTrackId: instanceId,
@@ -1043,18 +1045,9 @@ export function createDingtalkApi({
         },
         headers,
         signal,
-        action: 'AI Card 收口',
-      };
-      try {
-        await cardRequest('v1.0/card/instances', completionRequest);
-      } catch {
-        try {
-          await cardRequest('v1.0/card/instances', completionRequest);
-        } catch {
-          completed = false;
-        }
-      }
-      return { delivered: true, completed };
+        action: 'AI Card 完成状态',
+      });
+      return { delivered: true, completed: true };
     },
 
     failAiCard: failCard,

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

@@ -1336,6 +1336,8 @@ export class DingtalkHarnessBridge {
             providerMessageIds: cardStream.providerMessageIds,
           });
         } else {
+          // Failed streams close the card with a notice pointing to a
+          // follow-up message. Deliver the answer through that fallback.
           textReceipt = createDeliveryReceipt({
             deliveryId: messageId,
             presentation: 'dingtalk-text',
@@ -1411,7 +1413,9 @@ export class DingtalkHarnessBridge {
           ? `${errorText}\n\n${batchFailureMessage}`
           : errorText;
         const streamed = cardStarted && await cardStream.finish(visibleError);
-        if (!streamed) await this.#send(sessionWebhook, visibleError, this.#atUsersFor(message));
+        if (!streamed) {
+          await this.#send(sessionWebhook, visibleError, this.#atUsersFor(message));
+        }
       } catch {
         this.#logger.error?.('[dsh-dingtalk] failed to send the safe error reply');
       }