@xmanrui/dsh-im 4.10.0 → 4.12.0

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

@@ -24,6 +24,8 @@ import { watchHarnessMux } from './harness-mux.mjs';
 const interactionRegistries = new Map();
 const hostInteractionRegistries = new WeakMap();
 const MAX_ERROR_CLASSIFICATION_BYTES = 64;
+const IM_INPUT_ORIGIN_TTL_MS = 30 * 60 * 1000;
+const MAX_IM_INPUT_ORIGINS = 4096;
 
 async function smallResponseText(response) {
   const stream = response?.body;
@@ -91,6 +93,7 @@ function interactionRegistry(scope) {
       ownerships: new Map(),
       claims: new Map(),
       controls: new WeakMap(),
+      imInputOrigins: new Map(),
       nextOrder: 0,
     };
     registries.set(scope, registry);
@@ -98,6 +101,34 @@ function interactionRegistry(scope) {
   return registry;
 }
 
+function pruneImInputOrigins(origins, now = Date.now()) {
+  for (const [rpcId, expiresAt] of origins) {
+    if (expiresAt > now) continue;
+    origins.delete(rpcId);
+  }
+  while (origins.size > MAX_IM_INPUT_ORIGINS) {
+    origins.delete(origins.keys().next().value);
+  }
+}
+
+function registerImInputOrigin(registry, rpcId) {
+  const origins = registry.imInputOrigins;
+  pruneImInputOrigins(origins);
+  origins.delete(rpcId);
+  origins.set(rpcId, Date.now() + IM_INPUT_ORIGIN_TTL_MS);
+  pruneImInputOrigins(origins);
+  return () => origins.delete(rpcId);
+}
+
+/** Consume a dsh-im prompt id while handling its durable user/message event. */
+export function consumeDshImInputOrigin(scope, rpcId) {
+  if (!scope || !['object', 'function', 'string'].includes(typeof scope)
+    || typeof rpcId !== 'string' || !rpcId) return false;
+  const origins = interactionRegistry(scope).imInputOrigins;
+  pruneImInputOrigins(origins);
+  return origins.delete(rpcId);
+}
+
 // A Host RPC may not accept cancellation itself. Bound the caller's wait
 // without retrying an operation that the Host may already have accepted.
 function callWithSignal(call, signal) {
@@ -311,14 +342,59 @@ function sleep(ms, signal) {
   });
 }
 
-function assistantMessageText(event) {
-  return (event?.data?.message?.content ?? [])
-    .filter((part) => part.type === 'text' && typeof part.text === 'string')
+/** Join only visible text blocks from one Harness message payload. */
+export function textFromHarnessContent(content) {
+  return (Array.isArray(content) ? content : [])
+    .filter((part) => part?.type === 'text' && typeof part.text === 'string')
     .map((part) => part.text)
     .join('\n')
     .trim();
 }
 
+function assistantMessageText(event) {
+  return textFromHarnessContent(event?.data?.message?.content);
+}
+
+/** Aggregate assistant text in stable step/index order for one Harness Turn. */
+export class AssistantTextAccumulator {
+  #steps = new Map();
+  #legacyText = '';
+
+  appendDelta(step, index, text) {
+    if (typeof text !== 'string' || !text) return;
+    const stepNumber = Number.isSafeInteger(step) ? step : 0;
+    const partIndex = Number.isSafeInteger(index) ? index : 0;
+    this.#legacyText = '';
+    const parts = this.#steps.get(stepNumber) ?? new Map();
+    parts.set(partIndex, (parts.get(partIndex) ?? '') + text);
+    this.#steps.set(stepNumber, parts);
+  }
+
+  setCanonical(step, text) {
+    if (typeof text !== 'string' || !text.trim()) return;
+    if (!Number.isSafeInteger(step)) {
+      this.#steps.clear();
+      this.#legacyText = text.trim();
+      return;
+    }
+    this.#legacyText = '';
+    this.#steps.set(step, new Map([[0, text.trim()]]));
+  }
+
+  get text() {
+    if (this.#steps.size === 0) return this.#legacyText;
+    return [...this.#steps.entries()]
+      .sort(([left], [right]) => left - right)
+      .map(([, parts]) => [...parts.entries()]
+        .sort(([left], [right]) => left - right)
+        .map(([, text]) => text)
+        .join('\n')
+        .trim())
+      .filter(Boolean)
+      .join('\n\n');
+  }
+}
+
 function nonEmptyText(value) {
   return typeof value === 'string' && value.trim() ? value.trim() : null;
 }
@@ -418,7 +494,7 @@ export class HarnessReplyTracker {
   #lastSeq;
   #openTurn = null;
   #targetTurn = null;
-  #stepText = new Map();
+  #assistantText = new AssistantTextAccumulator();
   #latestText = '';
   #finished = false;
   #reason = null;
@@ -455,6 +531,12 @@ export class HarnessReplyTracker {
     return this.#targetTurn;
   }
 
+  #commitText(text, pushUpdate) {
+    if (!text || text === this.#latestText) return;
+    this.#latestText = text;
+    pushUpdate({ type: 'text', text });
+  }
+
   consumeAll(entries) {
     const updates = [];
     // 同一批轮询内的 text 帧只保留最新累积，其余事件逐帧透出，
@@ -499,28 +581,16 @@ export class HarnessReplyTracker {
       if (event.type === 'assistant/chunk' && event.data?.chunk?.type === 'text-delta') {
         const step = event.data?.step ?? 0;
         const index = event.data.chunk.index ?? 0;
-        const key = `${step}:${index}`;
-        this.#stepText.set(key, (this.#stepText.get(key) ?? '') + event.data.chunk.text);
-        const prefix = `${step}:`;
-        const text = [...this.#stepText.entries()]
-          .filter(([partKey]) => partKey.startsWith(prefix))
-          .sort(([left], [right]) => Number(left.split(':')[1]) - Number(right.split(':')[1]))
-          .map(([, part]) => part)
-          .join('\n')
-          .trim();
-        if (text && text !== this.#latestText) {
-          this.#latestText = text;
-          pushUpdate({ type: 'text', text });
-        }
+        this.#assistantText.appendDelta(step, index, event.data.chunk.text);
+        this.#commitText(this.#assistantText.text, pushUpdate);
         continue;
       }
 
       if (event.type === 'assistant/message') {
         const text = assistantMessageText(event);
-        if (text && text !== this.#latestText) {
-          this.#latestText = text;
-          pushUpdate({ type: 'text', text });
-        }
+        const step = Number.isSafeInteger(event.data?.step) ? event.data.step : null;
+        this.#assistantText.setCanonical(step, text);
+        this.#commitText(this.#assistantText.text, pushUpdate);
         continue;
       }
 
@@ -1188,31 +1258,40 @@ export class HarnessClient {
     const ownership = await this.#refreshControlOwnership(sessionId, control, options);
     if (!ownership || ownership.stopRequested) return false;
     if (this.#activeControlOwnership(sessionId, control) !== ownership) return false;
-    if (this.#controlExecutor) {
-      const accepted = this.#controlExecutor({
-        sessionId,
-        expectedTurn: ownership.turn,
-        promptRpcId: ownership.promptRpcId,
-        action: 'steer',
-        text,
-      });
-      if (accepted && typeof accepted.then === 'function') {
-        throw new TypeError('controlExecutor must return synchronously');
-      }
-      if (accepted !== undefined) {
-        if (typeof accepted !== 'boolean') {
-          throw new TypeError('controlExecutor must return a boolean or undefined');
+    const inputRpcId = `${this.#rpcIdPrefix}-steer-${randomUUID()}`;
+    const releaseInputOrigin = registerImInputOrigin(this.#interactionRegistry, inputRpcId);
+    try {
+      if (this.#controlExecutor) {
+        const accepted = this.#controlExecutor({
+          sessionId,
+          expectedTurn: ownership.turn,
+          promptRpcId: ownership.promptRpcId,
+          inputRpcId,
+          action: 'steer',
+          text,
+        });
+        if (accepted && typeof accepted.then === 'function') {
+          throw new TypeError('controlExecutor must return synchronously');
+        }
+        if (accepted !== undefined) {
+          if (typeof accepted !== 'boolean') {
+            throw new TypeError('controlExecutor must return a boolean or undefined');
+          }
+          if (!accepted) releaseInputOrigin();
+          return accepted;
         }
-        return accepted;
       }
+      await this.rpc('session.prompt', {
+        sessionId,
+        mode: 'steer',
+        content: [{ type: 'text', text }],
+        clientTimeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+      }, 30_000, { ...options, rpcId: inputRpcId });
+      return true;
+    } catch (error) {
+      releaseInputOrigin();
+      throw error;
     }
-    await this.rpc('session.prompt', {
-      sessionId,
-      mode: 'steer',
-      content: [{ type: 'text', text }],
-      clientTimeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
-    }, 30_000, options);
-    return true;
   }
 
   #consumeInteractionOwnerships(sessionId, entries) {
@@ -1302,6 +1381,7 @@ export class HarnessClient {
     );
     const baselineSeq = Math.max(-1, ...(before.events ?? []).map(({ event }) => event.seq ?? -1));
     const promptRpcId = `${this.#rpcIdPrefix}-${randomUUID()}`;
+    const releasePromptInputOrigin = registerImInputOrigin(this.#interactionRegistry, promptRpcId);
     const tracker = new HarnessReplyTracker({ promptRpcId, afterSeq: baselineSeq });
     const interactionController = onInteraction || onInteractionResolved
       ? new AbortController()
@@ -1518,6 +1598,7 @@ export class HarnessClient {
         throw turnStoppedError();
       }
     } finally {
+      releasePromptInputOrigin();
       if (!promptAccepted || turnFinished) {
         for (const staged of stagedBatches) {
           try {

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

@@ -1,5 +1,29 @@
 // English translations (wecom area). Keys are exact Chinese literals passed to t().
 export default {
+  '/menu 或 /m  打开可点击的功能菜单': '/menu or /m  Open the interactive menu',
+  '保持当前': 'Keep current',
+  '会话': 'Session',
+  '模型': 'Model',
+  '预设': 'Preset',
+  '跟随默认模型': 'Default model',
+  '跟随 Host 默认': 'Follow Host default',
+  '新会话': 'New session',
+  '上一页': 'Previous',
+  '下一页': 'Next',
+  '返回': 'Back',
+  '更多选项…': 'More options…',
+  '选择会话、模型或预设后，点击应用设置。': 'Choose a session, model or preset, then apply settings.',
+  '应用设置': 'Apply settings',
+  '工作区与任务': 'Workspace & tasks',
+  '应用选择': 'Apply selection',
+  '请选择一个选项后再应用。': 'Select one option before applying.',
+  '设置未改变。': 'Settings unchanged.',
+  '已收到操作，请查看下方结果。': 'Action received. See the result below.',
+  '重新打开菜单': 'Reopen menu',
+  '暂无可用选项。': 'No options are available.',
+  '预设仅用于之后的新会话。': 'Presets apply to future new sessions.',
+  '部分模型暂不可用，可稍后重试。': 'Some models are unavailable. Try again later.',
+  '工作区已变化，请从新菜单重新选择。': 'The workspace changed. Please select again from the new menu.',
   // Help text (wecom-bridge.mjs)
   '企业微信机器人已连接 DeepSeek Harness。': 'The Enterprise WeChat bot is connected to DeepSeek Harness.',
 

package/src/channels/shared/model-setting.mjs

@@ -0,0 +1,110 @@
+const MAX_PROVIDER_ID_LENGTH = 256;
+const MAX_MODEL_ID_LENGTH = 1_024;
+const MAX_LABEL_LENGTH = 256;
+const UNSAFE_DISPLAY_TEXT = /[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]+/gu;
+const UNSAFE_ID_TEXT = /[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]/u;
+
+function cleanId(value, maxLength) {
+  if (typeof value !== 'string') return '';
+  const id = value.trim();
+  if (!id || id.length > maxLength || UNSAFE_ID_TEXT.test(id)) return '';
+  return id;
+}
+
+function cleanLabel(value, fallback) {
+  if (typeof value !== 'string') return fallback;
+  const label = value.replace(UNSAFE_DISPLAY_TEXT, ' ').replace(/\s+/gu, ' ').trim();
+  return label ? label.slice(0, MAX_LABEL_LENGTH) : fallback;
+}
+
+export const EMPTY_MODEL_CATALOG = Object.freeze({
+  groups: Object.freeze([]),
+  failures: Object.freeze([]),
+});
+
+export function normalizeModelSelection(value) {
+  if (value == null) return null;
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return null;
+  const provider = cleanId(value.provider, MAX_PROVIDER_ID_LENGTH);
+  const model = cleanId(value.model, MAX_MODEL_ID_LENGTH);
+  return provider && model ? { provider, model } : null;
+}
+
+export function validateModelSelection(value) {
+  if (value == null || value === '') return null;
+  const selection = normalizeModelSelection(value);
+  if (!selection) {
+    const error = new Error('模型无效。');
+    error.code = 'model-selection-invalid';
+    throw error;
+  }
+  return selection;
+}
+
+export function sameModelSelection(left, right) {
+  return left?.provider === right?.provider && left?.model === right?.model;
+}
+
+export function modelSelectionId(value) {
+  const selection = normalizeModelSelection(value);
+  return selection ? `${selection.provider}/${selection.model}` : '';
+}
+
+export function normalizeModelCatalog(value) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    return { groups: [], failures: [] };
+  }
+  const groups = [];
+  const seen = new Set();
+  for (const candidate of Array.isArray(value.groups) ? value.groups : []) {
+    if (!candidate || typeof candidate !== 'object' || Array.isArray(candidate)) continue;
+    const provider = cleanId(candidate.id, MAX_PROVIDER_ID_LENGTH);
+    if (!provider) continue;
+    const models = [];
+    for (const entry of Array.isArray(candidate.models) ? candidate.models : []) {
+      if (!entry || typeof entry !== 'object' || Array.isArray(entry)) continue;
+      const model = cleanId(entry.id, MAX_MODEL_ID_LENGTH);
+      if (!model) continue;
+      const key = `${provider}\u0000${model}`;
+      if (seen.has(key)) continue;
+      seen.add(key);
+      models.push({
+        id: model,
+        name: cleanLabel(entry.name, model),
+      });
+    }
+    if (models.length > 0) {
+      groups.push({
+        id: provider,
+        name: cleanLabel(candidate.name, provider),
+        models,
+      });
+    }
+  }
+  const failures = [];
+  for (const candidate of Array.isArray(value.failures) ? value.failures : []) {
+    if (!candidate || typeof candidate !== 'object' || Array.isArray(candidate)) continue;
+    const id = cleanId(candidate.id, MAX_PROVIDER_ID_LENGTH);
+    if (!id) continue;
+    failures.push({ id, name: cleanLabel(candidate.name, id) });
+  }
+  return { groups, failures };
+}
+
+export function modelCatalogHas(catalog, selection) {
+  const normalized = normalizeModelSelection(selection);
+  if (!normalized) return false;
+  return normalizeModelCatalog(catalog).groups.some(
+    (group) => group.id === normalized.provider
+      && group.models.some((model) => model.id === normalized.model),
+  );
+}
+
+export async function listModelCatalog(harness, options = {}) {
+  try {
+    if (typeof harness?.listModels !== 'function') return normalizeModelCatalog(null);
+    return normalizeModelCatalog(await harness.listModels(options));
+  } catch {
+    return normalizeModelCatalog(null);
+  }
+}