@xmanrui/dsh-im 4.20.2 → 4.21.0

package/src/channels/shared/batch-input.mjs

@@ -33,6 +33,18 @@ function submissionPrompt(messages) {
   ].join('\n\n');
 }
 
+/**
+ * Session title for one submission.
+ *
+ * The submitted prompt is dsh-im's own composition -- a framing sentence plus
+ * `[消息 N]` labels -- so using it as the conversation title would put plugin
+ * text where the user's own words belong. The first collected message is what
+ * the user actually said first.
+ */
+function submissionTitle(messages) {
+  return messages.find((message) => message.trim()) ?? '';
+}
+
 export function isBatchInputCommand(text) {
   return commandName(text) !== null;
 }
@@ -73,7 +85,10 @@ export class BatchInputManager {
 
     if (!batch) {
       if (!name) return { handled: false };
-      if (!plainText) {
+      // Only starting a batch requires the plain-text command itself; /send and
+      // /cancel carry no content, so they must answer with their own state
+      // message instead of being refused as uncollectable content.
+      if (!plainText && name === 'batch') {
         return result('unsupported-content', t('批量输入命令仅支持纯文字，请移除图片、文件或引用消息后重试。'));
       }
       if (name === 'send') {
@@ -90,7 +105,11 @@ export class BatchInputManager {
       });
     }
 
-    if (!plainText && (batch.phase === 'collecting' || name)) {
+    // A command is never collected content: /send, /cancel and a repeated
+    // /batch must keep working even when the message that carries them is a
+    // quoted reply, an image caption or a file. Only the collected text itself
+    // has to be plain.
+    if (!plainText && batch.phase === 'collecting' && !name) {
       return result('unsupported-content', t(`批量输入模式目前仅支持文字，不支持图片、文件或引用消息，这条消息未收录。
 请继续发送文字，或使用 /send、/cancel。`), {
         count: batch.messages.length,
@@ -141,6 +160,7 @@ export class BatchInputManager {
         token,
         messages,
         prompt: submissionPrompt(messages),
+        title: submissionTitle(messages),
         count: messages.length,
       });
     }

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

@@ -32,11 +32,16 @@ import {
   validateModelSelection,
 } from './model-setting.mjs';
 import { WORKSPACE_SESSION_STALE } from './workspace-session.mjs';
+import { configValidationError, withConfigResource } from './config-read-error.mjs';
 
 const DELIVERY_DOCUMENT_VERSION = 2;
 export const CURRENT_DOCUMENT_VERSION = 3;
 const EMPTY_DOCUMENT = Object.freeze({ version: 1, workspaces: Object.freeze({}) });
 
+function invalidWorkspaceConfig(field, issue) {
+  throw configValidationError('dsh-im workspace config is invalid', field, issue);
+}
+
 function workspaceSessionStale(message) {
   const error = new Error(message);
   error.code = WORKSPACE_SESSION_STALE;
@@ -185,13 +190,17 @@ function sameDeliveryRoute(left, right) {
 function normalizeDeliveryTargets(value, { version } = {}) {
   const deliveryTargets = Object.create(null);
   if (value === undefined) return deliveryTargets;
-  if (!value || typeof value !== 'object' || Array.isArray(value)) return null;
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return invalidWorkspaceConfig('deliveryTargets', 'expected-object');
+  let field = 'deliveryTargets';
   try {
-    for (const [botId, targets] of Object.entries(value)) {
+    for (const [botIndex, [botId, targets]] of Object.entries(value).entries()) {
+      field = `deliveryTargets[${botIndex}].key`;
       botIdOf(botId);
-      if (!targets || typeof targets !== 'object' || Array.isArray(targets)) return null;
+      field = `deliveryTargets[${botIndex}].targets`;
+      if (!targets || typeof targets !== 'object' || Array.isArray(targets)) throw new TypeError('Invalid targets');
       const normalizedTargets = Object.create(null);
-      for (const [targetId, target] of Object.entries(targets)) {
+      for (const [targetIndex, [targetId, target]] of Object.entries(targets).entries()) {
+        field = `deliveryTargets[${botIndex}].targets[${targetIndex}]`;
         // Backward compatibility: some released builds persisted the target id
         // inside the stored object as well. Accept a redundant targetId that
         // matches the map key when loading a stored document; a mismatch stays
@@ -215,7 +224,7 @@ function normalizeDeliveryTargets(value, { version } = {}) {
       deliveryTargets[botId] = normalizedTargets;
     }
   } catch {
-    return null;
+    return invalidWorkspaceConfig(field, 'invalid-delivery-target');
   }
   return deliveryTargets;
 }
@@ -241,44 +250,44 @@ function normalizeAccessPolicies(value, workspaces) {
 }
 
 function normalizeDocument(value) {
-  if (!value || ![1, DELIVERY_DOCUMENT_VERSION, CURRENT_DOCUMENT_VERSION].includes(value.version)
-    || !value.workspaces
-    || typeof value.workspaces !== 'object' || Array.isArray(value.workspaces)) return null;
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return invalidWorkspaceConfig('$', 'expected-object');
+  if (![1, DELIVERY_DOCUMENT_VERSION, CURRENT_DOCUMENT_VERSION].includes(value.version)) return invalidWorkspaceConfig('version', 'unsupported-version');
+  if (!value.workspaces || typeof value.workspaces !== 'object' || Array.isArray(value.workspaces)) return invalidWorkspaceConfig('workspaces', 'expected-object');
   const workspaces = {};
-  for (const [botId, workspace] of Object.entries(value.workspaces)) {
-    if (!/^[A-Za-z0-9_-]{1,128}$/.test(botId)
-      || typeof workspace !== 'string' || !isAbsolute(workspace)) return null;
+  for (const [index, [botId, workspace]] of Object.entries(value.workspaces).entries()) {
+    if (!/^[A-Za-z0-9_-]{1,128}$/.test(botId)) return invalidWorkspaceConfig(`workspaces[${index}].key`, 'invalid-identifier');
+    if (typeof workspace !== 'string' || !isAbsolute(workspace)) return invalidWorkspaceConfig(`workspaces[${index}].value`, 'invalid-workspace-path');
     workspaces[botId] = resolve(workspace);
   }
   const conversationWorkspaces = normalizeConversationWorkspaces(value.conversationWorkspaces);
   let agentPresets = {};
   if (value.agentPresets !== undefined) {
     if (!value.agentPresets || typeof value.agentPresets !== 'object'
-      || Array.isArray(value.agentPresets)) return null;
-    for (const [botId, agentPreset] of Object.entries(value.agentPresets)) {
-      if (!/^[A-Za-z0-9_-]{1,128}$/.test(botId)) return null;
+      || Array.isArray(value.agentPresets)) return invalidWorkspaceConfig('agentPresets', 'expected-object');
+    for (const [index, [botId, agentPreset]] of Object.entries(value.agentPresets).entries()) {
+      if (!/^[A-Za-z0-9_-]{1,128}$/.test(botId)) return invalidWorkspaceConfig(`agentPresets[${index}].key`, 'invalid-identifier');
       try {
         const normalized = validateAgentPresetId(agentPreset);
-        if (!normalized) return null;
+        if (!normalized) return invalidWorkspaceConfig(`agentPresets[${index}].value`, 'invalid-agent-preset');
         agentPresets[botId] = normalized;
       } catch {
-        return null;
+        return invalidWorkspaceConfig(`agentPresets[${index}].value`, 'invalid-agent-preset');
       }
     }
   }
   const models = {};
   if (value.models !== undefined) {
     if (!value.models || typeof value.models !== 'object' || Array.isArray(value.models)) {
-      return null;
+      return invalidWorkspaceConfig('models', 'expected-object');
     }
-    for (const [botId, model] of Object.entries(value.models)) {
-      if (!/^[A-Za-z0-9_-]{1,128}$/.test(botId)) return null;
+    for (const [index, [botId, model]] of Object.entries(value.models).entries()) {
+      if (!/^[A-Za-z0-9_-]{1,128}$/.test(botId)) return invalidWorkspaceConfig(`models[${index}].key`, 'invalid-identifier');
       try {
         const normalized = validateModelSelection(model);
-        if (!normalized) return null;
+        if (!normalized) return invalidWorkspaceConfig(`models[${index}].value`, 'invalid-model-selection');
         models[botId] = normalized;
       } catch {
-        return null;
+        return invalidWorkspaceConfig(`models[${index}].value`, 'invalid-model-selection');
       }
     }
   }
@@ -292,9 +301,8 @@ function normalizeDocument(value) {
       }
     }
   }
-  if (value.version === 1 && value.deliveryTargets !== undefined) return null;
+  if (value.version === 1 && value.deliveryTargets !== undefined) return invalidWorkspaceConfig('deliveryTargets', 'unexpected-field');
   const deliveryTargets = normalizeDeliveryTargets(value.deliveryTargets, { version: value.version });
-  if (!deliveryTargets) return null;
   const aliases = Object.create(null);
   if (value.aliases && typeof value.aliases === 'object' && !Array.isArray(value.aliases)) {
     for (const [botId, alias] of Object.entries(value.aliases)) {
@@ -421,7 +429,6 @@ export class BotWorkspaceStore {
   async load() {
     try {
       const normalized = normalizeDocument(JSON.parse(await readFile(this.#path, 'utf8')));
-      if (!normalized) throw new Error('dsh-im workspace config is invalid');
       this.#version = normalized.version;
       this.#workspaces = normalized.workspaces;
       this.#agentPresets = normalized.agentPresets;
@@ -432,7 +439,7 @@ export class BotWorkspaceStore {
       this.#accessPolicies = normalized.accessPolicies;
       this.#conversationWorkspaces = normalized.conversationWorkspaces;
     } catch (error) {
-      if (error?.code !== 'ENOENT') throw error;
+      if (error?.code !== 'ENOENT') throw withConfigResource(error, 'workspace-config');
       this.#version = 1;
       this.#workspaces = {};
       this.#agentPresets = {};
@@ -1371,6 +1378,18 @@ export class BotWorkspaceStore {
       await this.#persist();
       return;
     }
+    try {
+      const parent = await stat(dirname(this.#path));
+      if (!parent.isDirectory()) {
+        const error = new Error('workspace config parent is not a directory');
+        error.code = 'ENOTDIR';
+        throw error;
+      }
+    } catch (error) {
+      if (error?.code !== 'ENOENT') throw error;
+      this.#dirtyRemovals.clear();
+      return;
+    }
     try {
       await unlink(this.#path);
       this.#dirtyRemovals.clear();
@@ -2277,7 +2296,8 @@ export function createWorkspaceAwareController(controller, {
           await state.clearSessions();
         } catch (error) {
           console.warn(
-            `[dsh-im] ignored session cleanup failure while deleting bot ${botId}:`,
+            '[dsh-im] ignored session cleanup failure while deleting bot:',
+            botId,
             error?.message ?? error,
           );
         }

package/src/channels/shared/config-read-error.mjs

@@ -0,0 +1,24 @@
+// Metadata belongs to the validation/read boundary, never to parser excerpts or
+// arbitrary error properties. Keep the original exception type/message so other
+// channels retain their existing startup classification.
+const details = new WeakMap();
+
+export function configValidationError(message, field, issue) {
+  const error = new Error(message);
+  details.set(error, { reason: 'invalid-config', field, issue });
+  return error;
+}
+
+export function withConfigResource(error, resource) {
+  if (error && typeof error === 'object') {
+    details.set(error, {
+      ...details.get(error), resource,
+      ...(error instanceof SyntaxError ? { reason: 'invalid-json' } : {}),
+    });
+  }
+  return error;
+}
+
+export function configReadErrorDetails(error) {
+  return details.get(error);
+}

package/src/channels/shared/harness-client.mjs

@@ -893,7 +893,7 @@ export class HarnessClient {
         stdio: ['ignore', 'inherit', 'inherit'],
       });
       this.#managedProcess.on('error', (error) => {
-        console.error(`[${this.#logPrefix}] failed to start Harness:`, error.message);
+        console.error('[dsh-im] failed to start Harness:', this.#logPrefix, error.message);
       });
     }
 
@@ -1123,7 +1123,7 @@ export class HarnessClient {
         });
       } catch (error) {
         if (signal.aborted) return;
-        console.warn(`[${this.#logPrefix}] Harness interaction stream disconnected:`, error.message);
+        console.warn('[dsh-im] Harness interaction stream disconnected:', this.#logPrefix, error.message);
       }
       if (signal.aborted) return;
       try {
@@ -1462,7 +1462,7 @@ export class HarnessClient {
           deliveredArtifactCount += 1;
         } catch (error) {
           outboundArtifactRegistry.release(artifact);
-          console.warn(`[${this.#logPrefix}] ignored an artifact handoff failure:`, error.message);
+          console.warn('[dsh-im] ignored an artifact handoff failure:', this.#logPrefix, error.message);
         }
       }
       return deliveredArtifactCount;
@@ -1534,7 +1534,8 @@ export class HarnessClient {
         } catch (stagingError) {
           if (signal?.aborted) throw signal.reason ?? stagingError;
           console.warn(
-            `[${this.#logPrefix}] unable to restage rejected images as workspace files:`,
+            '[dsh-im] unable to restage rejected images as workspace files:',
+            this.#logPrefix,
             stagingError?.message ?? String(stagingError),
           );
           throw error;
@@ -1586,7 +1587,7 @@ export class HarnessClient {
               try {
                 await onUpdate(update);
               } catch (error) {
-                console.warn(`[${this.#logPrefix}] ignored a progress update failure:`, error.message);
+                console.warn('[dsh-im] ignored a progress update failure:', this.#logPrefix, error.message);
               }
             }
           }
@@ -1643,7 +1644,7 @@ export class HarnessClient {
           try {
             await staged?.cleanup?.();
           } catch (error) {
-            console.warn(`[${this.#logPrefix}] unable to clean inbound files:`, error.message);
+            console.warn('[dsh-im] unable to clean inbound files:', this.#logPrefix, error.message);
           }
         }
       }
@@ -1677,7 +1678,7 @@ export class HarnessClient {
       try {
         onOpen?.();
       } catch (error) {
-        console.warn(`[${this.#logPrefix}] ignored an interaction open callback failure:`, error.message);
+        console.warn('[dsh-im] ignored an interaction open callback failure:', this.#logPrefix, error.message);
       }
       if (ownership) {
         void this.#refreshInteractionOwnerships(sessionId, signal).then(() => {
@@ -1769,7 +1770,7 @@ export class HarnessClient {
         if (!ownershipReady) bufferedEnvelopes.push(envelope);
         else processEnvelope(envelope);
       } catch (error) {
-        console.warn(`[${this.#logPrefix}] ignored a malformed Harness interaction frame:`, error.message);
+        console.warn('[dsh-im] ignored a malformed Harness interaction frame:', this.#logPrefix, error.message);
       }
     };
     try {
@@ -1806,7 +1807,7 @@ export class HarnessClient {
             try {
               onReconnect?.();
             } catch (error) {
-              console.warn(`[${this.#logPrefix}] mux reconnect hook failed:`, error.message);
+              console.warn('[dsh-im] mux reconnect hook failed:', this.#logPrefix, error.message);
             }
           },
           onEnvelope: (envelope) => {
@@ -1822,13 +1823,13 @@ export class HarnessClient {
                 || typeof payload.event !== 'object') return;
               onSessionEvent({ sessionId: payload.sessionId, event: payload.event });
             } catch (error) {
-              console.warn(`[${this.#logPrefix}] ignored a malformed global mux frame:`, error.message);
+              console.warn('[dsh-im] ignored a malformed global mux frame:', this.#logPrefix, error.message);
             }
           },
         });
       } catch (error) {
         if (signal.aborted) return;
-        console.warn(`[${this.#logPrefix}] Harness event mux disconnected:`, error.message);
+        console.warn('[dsh-im] Harness event mux disconnected:', this.#logPrefix, error.message);
       }
       if (signal.aborted) return;
       try {
@@ -1848,7 +1849,7 @@ export class HarnessClient {
       rpcId: `${this.#rpcIdPrefix}-${randomUUID()}`,
       ...options,
       onMalformed: (error) => {
-        console.warn(`[${this.#logPrefix}] ignored a malformed Harness mux frame:`, error.message);
+        console.warn('[dsh-im] ignored a malformed Harness mux frame:', this.#logPrefix, error.message);
       },
     });
   }

package/src/channels/shared/harness-question.mjs

@@ -16,7 +16,13 @@ export function validHarnessQuestion(question) {
       ))));
 }
 
-export function harnessQuestionText(question, index, total, { requiresMention = false } = {}) {
+/** Render the question prompt. `hasButtons` only swaps the closing hint: the
+ * numbered list stays, because a channel whose keyboard fails still answers by text.
+ */
+export function harnessQuestionText(question, index, total, {
+  requiresMention = false,
+  hasButtons = false,
+} = {}) {
   const lines = [];
   const progress = total > 1 ? `（${index + 1}/${total}）` : '';
   lines.push(t('DeepSeek Harness 需要你补充信息{progress}：', { progress }));
@@ -34,7 +40,9 @@ export function harnessQuestionText(question, index, total, { requiresMention =
     });
     lines.push('', question.multiSelect === true
       ? t('请回复选项序号或文字；多选用逗号分隔，也可补充其他内容。')
-      : t('请回复一个选项序号或文字，也可直接输入其他答案。'));
+      : hasButtons
+        ? t('请点击下方按钮选择，也可直接回复文字。')
+        : t('请回复一个选项序号或文字，也可直接输入其他答案。'));
   } else {
     lines.push('', t('请直接回复你的答案。'));
   }

package/src/channels/shared/i18n-en/qq.mjs

@@ -1,5 +1,8 @@
 // English translations (qq area). Keys are exact Chinese literals passed to t().
 export default {
+  '无法读取 QQ 本地状态，请检查数据目录及访问权限。': 'Unable to read local QQ state. Check the data directory and access permissions.',
+  'QQ 本地状态已损坏，但无法备份，原文件已保留。': 'Local QQ state is corrupt and could not be backed up. The original file has been preserved.',
+  '无法保存 QQ 本地状态，请检查磁盘空间及目录写入权限。': 'Unable to save local QQ state. Check disk space and directory write permissions.',
   '返回主菜单': 'Back to main menu',
   '模式／预设': 'Mode / preset',
   '归档显示': 'Archived sessions',

package/src/channels/shared/i18n-en/shared-a.mjs

@@ -226,4 +226,15 @@ export default {
     'Failed to submit the answer. Please resend your answer to the current question.',
   '检测到这个 Session 中遗留的待回答问题，已安全取消并继续处理你刚才的消息。':
     'A pending question left over in this Session was detected. It has been safely cancelled, and your latest message is being processed.',
+  // Inline-keyboard question cards (text-harness-bridge.mjs).
+  '该问题已处理，无需再次选择。':
+    'This question has already been handled; no further choice is needed.',
+  '只有发起当前任务的用户可以处理这条问题。':
+    'Only the user who started this task can answer this question.',
+  '正在提交你的选择，请稍候。': 'Submitting your choice, please wait.',
+  '这个选项已失效，请使用最新一条问题。':
+    'This option has expired. Please use the most recent question message.',
+  '多选问题请直接回复文字。':
+    'Please answer a multi-select question by replying with text.',
+  '已选择：{label}': 'Selected: {label}',
 };

package/src/channels/shared/i18n-en/shared-c.mjs

@@ -83,6 +83,8 @@ export default {
     'Reply with option numbers or text; separate multiple choices with commas, or add anything else.',
   '请回复一个选项序号或文字，也可直接输入其他答案。':
     'Reply with an option number or its text, or type your own answer directly.',
+  '请点击下方按钮选择，也可直接回复文字。':
+    'Tap a button below to choose, or reply with text directly.',
   '请直接回复你的答案。': 'Please reply with your answer directly.',
   '群聊中请 @机器人 后发送答案。':
     'In group chats, please @ the bot before sending your answer.',

package/src/channels/shared/semantic/artifact.mjs

@@ -371,7 +371,7 @@ export class OutboundArtifactRegistry {
     const agent = exec?.agent;
     const sessionId = agent?.session?.header?.id;
     const workspace = agent?.session?.header?.cwd;
-    const turn = currentTurn(agent);
+    const turn = this.#openTurns.get(sessionId) ?? currentTurn(agent);
     if (typeof sessionId !== 'string' || !sessionId
       || typeof workspace !== 'string' || !workspace || turn === null) {
       throw artifactError(