@xmanrui/dsh-im 4.25.0 → 4.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "4.25.0",
+  "version": "4.26.0",
   "description": "把十二种 IM 渠道和公网 AI Office 接入本机 DeepSeek Harness。 Connect twelve IM channels and a public AI Office to a local DeepSeek Harness.",
   "keywords": [
     "deepseek-harness",
@@ -116,6 +116,7 @@
     "lib",
     "plugin-src",
     "scripts/verify-interface-language.mjs",
+    "scripts/verify-injected-context.mjs",
     "scripts/verify-lan-management.mjs",
     "scripts/verify-model-setting.mjs",
     "scripts/verify-package.mjs",
@@ -145,13 +146,9 @@
       "platform": "web"
     },
     "compatibility": {
-      "dsh": "0.1.2-alpha.4 || 0.1.2-alpha.5 || 0.1.2-rc.1 || 0.1.3-alpha.1 || 0.1.5-alpha.1",
+      "dsh": "0.1.7-alpha.1",
       "dshReleases": {
-        "0.1.2-alpha.4": "compatible",
-        "0.1.2-alpha.5": "compatible",
-        "0.1.2-rc.1": "compatible",
-        "0.1.3-alpha.1": "compatible",
-        "0.1.5-alpha.1": "compatible"
+        "0.1.7-alpha.1": "compatible"
       },
       "profiles": [
         "web"

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

@@ -118,21 +118,33 @@ export function ImageInputSettings({ rpcCall }) {
     ['maxTotalMb', '模型图片总量上限 (MB)'],
     ['maxImages', '每条消息最多图片数'],
   ];
-  return h('section', { className: 'dim-globalSection', 'aria-label': '图片输入', 'aria-busy': phase === 'loading' || phase === 'saving' },
-    h('h3', null, '图片输入'),
-    h('p', null, '适用于支持图片的聊天渠道。原图按附件保留时长保存，发送给模型的副本会自动缩放或压缩；无法直接发送时交给模型按文件处理。'),
+  return h('section', { className: 'dim-globalSection dim-imageSettings', 'aria-label': '图片输入', 'aria-busy': phase === 'loading' || phase === 'saving' },
+    h('div', { className: 'dim-globalHead' },
+      h('div', { className: 'dim-globalHeadTitle' },
+        h('h3', null, '图片输入'),
+        h('div', { className: 'dim-globalTtlHelp' },
+          h('button', {
+            type: 'button',
+            className: 'dim-channelHelpButton dim-globalTtlHelpButton',
+            'aria-label': '查看图片输入说明',
+            'aria-describedby': `${id}-help`,
+          }, h('span', { 'aria-hidden': 'true' }, '?')),
+          h('div', { id: `${id}-help`, className: 'dim-globalTtlTooltip dim-imageSettingsTooltip', role: 'tooltip' },
+            '适用于支持图片的聊天渠道。原图按附件保留时长保存，发送给模型的副本会自动缩放或压缩；无法直接发送时交给模型按文件处理。')))),
     h('form', { onSubmit: save },
-      ...fields.map(([key, label]) => h('div', { className: 'dim-globalTtlRow', key },
-        h('label', { htmlFor: `${id}-${key}` }, label),
-        h('input', { id: `${id}-${key}`, className: 'dim-globalTtlInput', type: 'number', min: 1, step: 1,
-          value: values[key], disabled: phase !== 'ready',
-          onChange: (event) => { setValues((current) => ({ ...current, [key]: event.target.value })); setSaved(false); setError(null); },
-        }))),
-      h(GlobalButton, { type: 'submit', kind: 'primary', disabled: phase !== 'ready' }, phase === 'saving' ? '保存中…' : '保存图片设置'),
-      phase === 'error' ? h(GlobalButton, { onClick: () => void load() }, '重试') : null),
-    error ? h('p', { role: 'alert' }, error) : null,
-    saved ? h('p', { role: 'status' }, '已保存') : null,
-    phase === 'loading' ? h('p', { role: 'status' }, '正在读取图片设置…') : null);
+      h('div', { className: 'dim-imageSettingsFields' },
+        ...fields.map(([key, label]) => h('div', { className: 'dim-imageSettingsField', key },
+          h('label', { htmlFor: `${id}-${key}` }, label),
+          h('input', { id: `${id}-${key}`, className: 'dim-globalTtlInput', type: 'number', min: 1, step: 1,
+            value: values[key], disabled: phase !== 'ready',
+            onChange: (event) => { setValues((current) => ({ ...current, [key]: event.target.value })); setSaved(false); setError(null); },
+          })))),
+      h('div', { className: 'dim-imageSettingsActions' },
+        h(GlobalButton, { type: 'submit', kind: 'primary', className: 'dim-globalSaveButton', disabled: phase !== 'ready' }, phase === 'saving' ? '保存中…' : '保存图片设置'),
+        phase === 'error' ? h(GlobalButton, { className: 'dim-globalSaveButton', onClick: () => void load() }, '重试') : null)),
+    error ? h('p', { className: 'dim-globalInline dim-imageSettingsFeedback', 'data-tone': 'error', role: 'alert' }, error) : null,
+    saved ? h('p', { className: 'dim-globalInline dim-imageSettingsFeedback', role: 'status' }, '已保存') : null,
+    phase === 'loading' ? h('p', { className: 'dim-globalInline dim-imageSettingsFeedback', role: 'status' }, '正在读取图片设置…') : null);
 }
 
 export function GlobalSettingsPanel({ rpcCall }) {

package/plugin-src/client/i18n.js

@@ -108,6 +108,10 @@ const EN = Object.freeze({
   '当前版本': 'Current version',
   'DSH-IM 更新': 'DSH-IM update',
   '检查更新': 'Check for updates',
+  'DSH 版本兼容说明': 'DSH version compatibility',
+  'dsh-im 4.25.0 支持到 DSH v0.1.6-alpha.2。': 'dsh-im 4.25.0 supports DSH up to v0.1.6-alpha.2.',
+  'dsh-im 4.26.0 仅支持 DSH v0.1.7-alpha.1。': 'dsh-im 4.26.0 only supports DSH v0.1.7-alpha.1.',
+  '升级到 dsh-im 4.26.0 前，请先将 DSH 升级到 v0.1.7-alpha.1；使用旧版 DSH 请保留 dsh-im 4.25.0。': 'Before updating to dsh-im 4.26.0, upgrade DSH to v0.1.7-alpha.1. If you use an older DSH version, stay on dsh-im 4.25.0.',
   '重新检查': 'Check again',
   '刷新状态': 'Refresh status',
   '手工更新': 'Manual update',

package/plugin-src/client/styles.js

@@ -613,6 +613,20 @@ const CSS = String.raw`
 .dim-generalSettingsTab:focus-visible { outline: 2px solid var(--dim-blue); outline-offset: -2px; border-radius: 5px; }
 .dim-generalSettingsTabPanel { min-width: 0; padding-top: 14px; }
 .dim-globalSection { min-width: 0; padding: 14px 16px; border: 1px solid var(--dsw-alias-border-l2, #dfe1e5); border-radius: 12px; background: var(--dsw-alias-bg-layer-3, #fff); }
+.dim-globalSection + .dim-globalSection { margin-top: 12px; }
+.dim-imageSettings { container-type: inline-size; }
+.dim-imageSettings .dim-globalHead { position: relative; }
+.dim-imageSettings .dim-globalTtlHelp { position: static; }
+.dim-globalTtlTooltip.dim-imageSettingsTooltip { width: min(320px, 100%); max-width: none; color: var(--dsw-alias-label-secondary, #646a73); font-size: 11px; line-height: 17px; white-space: normal; overflow-wrap: anywhere; }
+.dim-imageSettingsFields { min-width: 0; display: grid; gap: 12px; margin-top: 12px; }
+.dim-imageSettingsField { min-width: 0; display: grid; grid-template-columns: minmax(0, 220px) minmax(0, 160px); align-items: center; gap: 6px 16px; }
+.dim-imageSettingsField label { min-width: 0; color: var(--dsw-alias-label-secondary, #646a73); font-size: 13px; line-height: 20px; overflow-wrap: anywhere; }
+.dim-imageSettingsField .dim-globalTtlInput { width: 100%; min-width: 0; }
+.dim-imageSettingsActions { display: flex; align-items: center; flex-wrap: wrap; gap: 8px; margin-top: 16px; }
+.dim-globalInline.dim-imageSettingsFeedback { margin: 10px 0 0; }
+@container (max-width: 380px) {
+  .dim-imageSettingsField { grid-template-columns: minmax(0, 1fr); }
+}
 .dim-globalHead { min-width: 0; display: flex; align-items: center; }
 .dim-globalHeadTitle { min-width: 0; display: inline-flex; align-items: center; gap: 6px; }
 .dim-globalHead h3 { min-width: 0; overflow: hidden; margin: 0; color: var(--dsw-alias-label-primary, #1f2329); font-size: 15px; line-height: 22px; font-weight: 650; text-overflow: ellipsis; white-space: nowrap; }

package/plugin-src/client/update-panel.js

@@ -467,6 +467,12 @@ export function UpdatePanel({ rpcCall, clientVersion, onStatus }) {
         versionsDiffer && !restartRequired ? h('p', { className: 'dim-updateHint' }, '页面版本与运行版本不同，请手动刷新页面；若仍不一致，请手动重启 Harness 或 Desktop。') : null,
         canConfirm ? h('p', { className: 'dim-updateHint' },
           '请在机器人空闲时安装；安装会修改当前 profile 的依赖，完成后需手动重启。') : null,
+        h('aside', { className: 'dim-updateHint', 'aria-label': 'DSH 版本兼容说明' },
+          h('strong', null, 'DSH 版本兼容说明'),
+          h('p', { className: 'dim-updateManualHint' }, 'dsh-im 4.25.0 支持到 DSH v0.1.6-alpha.2。'),
+          h('p', { className: 'dim-updateManualHint' }, 'dsh-im 4.26.0 仅支持 DSH v0.1.7-alpha.1。'),
+          h('p', { className: 'dim-updateManualHint' },
+            '升级到 dsh-im 4.26.0 前，请先将 DSH 升级到 v0.1.7-alpha.1；使用旧版 DSH 请保留 dsh-im 4.25.0。')),
         h(ManualUpdateCommand, {
           key: manualCommand ?? 'unavailable', command: manualCommand,
           disabled: busyAction || activeJob || uncertainInstall,

package/plugin-src/host/delivery-rpc.mjs

@@ -65,7 +65,9 @@ function validDraftTarget(value) {
 function validPayload(endpoint, payload) {
   if (!ENDPOINTS.has(endpoint) || !isRecord(payload)) return false;
   if (endpoint === DELIVERY_ENDPOINTS.send) {
-    return exactKeys(payload, ['botId', 'targetId', 'text'])
+    return (exactKeys(payload, ['botId', 'targetId', 'text'])
+        || (exactKeys(payload, ['botId', 'targetId', 'text', 'format'])
+          && ['plain', 'markdown'].includes(payload.format)))
       && validBotId(payload.botId) && validTargetId(payload.targetId)
       && typeof payload.text === 'string' && Boolean(payload.text.trim());
   }
@@ -128,7 +130,10 @@ export function createDeliveryRpcHandler(service) {
     try {
       let value;
       if (endpoint === DELIVERY_ENDPOINTS.send) {
-        value = await service.send(payload.botId, payload.targetId, payload.text, { signal });
+        value = await service.send(payload.botId, payload.targetId, payload.text, {
+          signal,
+          ...(payload.format === undefined ? {} : { format: payload.format }),
+        });
       } else if (endpoint === DELIVERY_ENDPOINTS.listTargets) {
         value = await service.listTargets(payload.botId);
       } else if (endpoint === DELIVERY_ENDPOINTS.listSuggestions) {

package/plugin-src/host/delivery-service.mjs

@@ -290,7 +290,7 @@ export class DeliveryService {
     }
   }
 
-  async send(botId, targetIdOrDraft, text, { signal } = {}) {
+  async send(botId, targetIdOrDraft, text, { signal, format = 'plain' } = {}) {
     const id = botIdOf(botId);
     const targetKey = typeof targetIdOrDraft === 'string'
       ? targetIdOf(targetIdOrDraft)
@@ -299,6 +299,9 @@ export class DeliveryService {
     if (typeof text !== 'string' || !text.trim()) {
       throw deliveryError('bad-request', 'Message text is required');
     }
+    if (format !== 'plain' && format !== 'markdown') {
+      throw deliveryError('bad-request', 'Message format must be plain or markdown');
+    }
     cancellation(signal);
     const adapter = await this.#adapterFor(id);
     try {
@@ -312,7 +315,10 @@ export class DeliveryService {
         if (!target) throw deliveryError('unknown-target', 'Unknown target');
       }
       cancellation(signal);
-      await adapter.sendText(id, target, text, { signal });
+      await adapter.sendText(id, target, text, {
+        signal,
+        ...(format === 'markdown' ? { format } : {}),
+      });
       return { sent: true };
     } catch (error) {
       if (signal?.aborted || error?.name === 'AbortError' || error?.code === 'ABORT_ERR') {

package/scripts/verify-injected-context.mjs

@@ -0,0 +1,120 @@
+/** Verify the built Host hook against a built DSH's real JSONL persistence. */
+import assert from 'node:assert/strict';
+import { mkdtemp, rm } from 'node:fs/promises';
+import { createRequire } from 'node:module';
+import { tmpdir } from 'node:os';
+import { join, resolve } from 'node:path';
+import { pathToFileURL } from 'node:url';
+
+import { createImHostPlugin } from '../lib/index.js';
+import {
+  captureContextEnhancement, enhanceContextContent, INJECTED_CONTEXT_TAGS,
+} from '../src/channels/shared/context-enhancement.mjs';
+
+if (!process.argv[2]) throw new Error('Pass the path of a built DSH checkout.');
+const harnessRoot = resolve(process.argv[2]);
+const fromHarness = createRequire(resolve(harnessRoot, 'packages/session/session-persistence-jsonl/package.json'));
+const load = (name) => import(pathToFileURL(fromHarness.resolve(name)).href);
+const { Context } = await load('@deepseek-ai/cordis');
+const { SESSION_FORMAT_VERSION } = await load('@deepseek-ai/dsh-session');
+const { default: JsonlSessionPersistence } = await load('@deepseek-ai/dsh-session-persistence-jsonl');
+assert.equal(SESSION_FORMAT_VERSION, 4, 'This regression verifies Session format V4.');
+
+const directory = await mkdtemp(join(tmpdir(), 'dsh-im-context-'));
+const ctx = new Context();
+const source = { channel: 'feishu', senderName: 'Context test' };
+const guidance = 'Reply briefly.';
+const reply = `${INJECTED_CONTEXT_TAGS.replyOpen}${JSON.stringify({
+  authorName: 'Quoted author', content: 'Quoted text',
+})}${INJECTED_CONTEXT_TAGS.replyClose}`;
+
+function enhanced(content, fields = ['channel', 'senderName'], instructions = '') {
+  const snapshot = captureContextEnhancement({
+    botId: 'context-test',
+    getSettings: () => ({
+      group: { enabled: true, fields, guidance: instructions },
+      direct: { enabled: false, fields: [], guidance: '' },
+    }),
+  }, 'group');
+  return enhanceContextContent(content, snapshot, () => source);
+}
+
+function turnEvents(messages, turn = 1, offset = 0) {
+  return [
+    { type: 'turn/start', data: { turn } },
+    { type: 'step/start', data: { turn, step: 1 } },
+    ...messages.map(data => ({ type: 'user/message', data, surfaceOp: 'append' })),
+    { type: 'step/end', data: { turn, step: 1 } },
+    { type: 'turn/end', data: { turn, reason: { kind: 'completed' } } },
+  ].map((event, index) => ({ ...event, seq: offset + index, time: offset + index + 1 }));
+}
+
+const cases = [
+  ['plain', 'Question', ['user']],
+  ['source', enhanced('Question'), ['user', 'notice']],
+  ['guidance', enhanced('Question', [], guidance), ['user', 'instructions']],
+  ['quote', `${reply}\n\nQuestion`, ['notice', 'user']],
+  ['combined', enhanced(`${reply}\n\nQuestion`, ['channel'], guidance),
+    ['notice', 'user', 'notice', 'instructions']],
+  ['structured', enhanced([{ type: 'text', text: reply }, { type: 'text', text: 'Question' }]),
+    ['notice', 'user', 'notice']],
+];
+
+try {
+  await ctx.plugin(JsonlSessionPersistence, { root: directory, compression: 'none' });
+  for (const [name, value] of Object.entries({
+    connection: {}, credentials: {}, typertGateway: { stream() {} },
+    sessionController: {}, workspaceController: {},
+  })) ctx.provide(name, value);
+  // Keep the real bundled context hook; unrelated channel connections stay idle.
+  const internals = Object.fromEntries([
+    'Feishu', 'Weixin', 'Dingtalk', 'Wecom', 'WecomApp', 'Qq', 'Slack',
+    'Telegram', 'Discord', 'Whatsapp', 'IMessage', 'Email', 'Matrix', 'Office',
+  ].map(name => [`apply${name}`, async () => {}]));
+  const host = ctx.plugin(createImHostPlugin({
+    ...internals,
+    installHostLanguage: () => {},
+    installSessionSyncCoordinator: () => {},
+  }));
+  await host.await();
+
+  for (const [id, content, expectedForms] of cases) {
+    const message = {
+      id: `${id}-user`, role: 'user',
+      content: typeof content === 'string' ? [{ type: 'text', text: content }] : content,
+      source: { kind: 'user', rpcId: `feishu-${id}` },
+    };
+    const decision = { kind: 'enter', messages: [message] };
+    const result = await ctx.waterfall('agent/pre-step', { agent: { session: { id } } },
+      async () => decision);
+    assert.deepEqual(result.messages.map(entry => entry.source.kind === 'user' ? 'user' : entry.source.form), expectedForms, id);
+    const human = result.messages.find(entry => entry.source.kind === 'user');
+    assert.equal(human.id, message.id);
+    assert.deepEqual(human.source, message.source);
+    assert.deepEqual(human.content, [{ type: 'text', text: 'Question' }]);
+    for (const context of result.messages.filter(entry => entry !== human)) {
+      assert.equal(context.source.kind, 'plugin:dsh-im', id);
+      assert.equal(Object.hasOwn(context.source, 'plugin'), false, id);
+      if (context.source.form === 'notice') assert.ok(context.source.summary.length > 0, id);
+    }
+    assert.equal(await ctx.waterfall('agent/pre-step', { agent: { session: { id } } }, async () => result), result);
+
+    const header = { version: SESSION_FORMAT_VERSION, id, createdAt: 1, isSeeded: false, delegationDepth: 0 };
+    const events = turnEvents(result.messages);
+    const writer = await ctx.sessionPersistence.create(header);
+    try { await writer.append(events); } finally { await writer.close(); }
+    // Reopen for a second turn, then verify both turns through a fresh read handle.
+    const resumed = await ctx.sessionPersistence.open(id, 'write');
+    const second = turnEvents([{ ...human, id: `${id}-second` }], 2, events.length);
+    try { await resumed.append(second); } finally { await resumed.close(); }
+    const reader = await ctx.sessionPersistence.open(id, 'read');
+    try {
+      assert.deepEqual((await reader.read()).events, [...events, ...second], id);
+    } finally { await reader.close(); }
+    console.log(`PASS ${id}: bundled hook, persistence, reopen and next turn`);
+  }
+} finally {
+  try { await ctx.fiber.dispose(); }
+  finally { await rm(directory, { recursive: true, force: true }); }
+}
+console.log(`Injected context verified against ${harnessRoot} (format V4).`);

package/scripts/verify-package.mjs

@@ -23,6 +23,7 @@ const required = [
   'lib/client.js',
   'bin/dsh-im.mjs',
   'cordis.patch.yml',
+  'scripts/verify-injected-context.mjs',
   'README.md',
   'README.en.md',
   'PROACTIVE_DELIVERY.md',

package/src/channels/feishu/feishu-runtime.mjs

@@ -628,7 +628,7 @@ export class FeishuRuntime {
     });
   }
 
-  async sendProactiveText(target, text, { signal } = {}) {
+  async sendProactiveText(target, text, { signal, format = 'plain' } = {}) {
     if (!this.#status.ready || !this.#client) {
       const error = new Error('飞书机器人尚未连接');
       error.code = 'bot-not-connected';
@@ -646,13 +646,23 @@ export class FeishuRuntime {
       error.code = 'invalid-target';
       throw error;
     }
+    if (format !== 'plain' && format !== 'markdown') {
+      const error = new TypeError('Message format must be plain or markdown');
+      error.code = 'bad-request';
+      throw error;
+    }
     signal?.throwIfAborted();
+    // Use the same native Markdown element as chat, without opening a stream
+    // or retrying as plain text after a possibly accepted delivery.
+    const content = format === 'markdown'
+      ? { schema: '2.0', body: { elements: [{ tag: 'markdown', content: text }] } }
+      : { text };
     const response = await this.#client.im.v1.message.create({
       params: { receive_id_type: receiveIdType },
       data: {
         receive_id: receiveId,
-        msg_type: 'text',
-        content: JSON.stringify({ text }),
+        msg_type: format === 'markdown' ? 'interactive' : 'text',
+        content: JSON.stringify(content),
       },
     });
     if (response?.code && response.code !== 0) {

package/src/channels/shared/i18n-en/image-input.mjs

@@ -11,6 +11,7 @@ export default {
   "模型图片总量上限 (MB)": "Model total image limit (MB)",
   "每条消息最多图片数": "Maximum images per message",
   "图片输入": "Image input",
+  "查看图片输入说明": "View image input details",
   "适用于支持图片的聊天渠道。原图按附件保留时长保存，发送给模型的副本会自动缩放或压缩；无法直接发送时交给模型按文件处理。": "Applies to chat channels that support images. Originals follow attachment retention settings. Model copies are resized or compressed automatically; images that cannot be sent directly are provided as files.",
   "保存图片设置": "Save image settings",
   "正在读取图片设置…": "Loading image settings…"

package/src/channels/shared/injected-context.mjs

@@ -252,7 +252,7 @@ export function splitLeadingInjectedContext(text, options = {}) {
 }
 
 /**
- * Build the plugin-sourced context message for one parsed block.
+ * Build one context message with the producer-owned source kind required by V4.
  * @param block - one parsed block.
  * @param newId - identity factory for the new message.
  * @param plugin - source plugin name recorded on it.
@@ -260,8 +260,8 @@ export function splitLeadingInjectedContext(text, options = {}) {
  */
 function contextMessage(block, newId, plugin) {
   const source = block.form === 'notice' && typeof block.summary === 'string'
-    ? { kind: 'plugin', plugin, form: 'notice', summary: block.summary }
-    : { kind: 'plugin', plugin, form: block.form };
+    ? { kind: `plugin:${plugin}`, form: 'notice', summary: block.summary }
+    : { kind: `plugin:${plugin}`, form: block.form };
   return {
     id: newId(),
     role: 'user',