@xmanrui/dsh-im 4.10.0 → 4.12.0

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

@@ -9,6 +9,7 @@ export const DELIVERY_ENDPOINTS = Object.freeze({
   createTarget: 'target.create',
   updateTarget: 'target.update',
   deleteTarget: 'target.delete',
+  setSessionSync: 'target.session-sync.set',
   testTarget: 'target.test',
 });
 
@@ -22,6 +23,7 @@ const PUBLIC_ERRORS = new Set([
   'bot-not-connected',
   'target-rejected',
   'delivery-failed',
+  'session-sync-unavailable',
   'cancelled',
 ]);
 
@@ -85,6 +87,11 @@ function validPayload(endpoint, payload) {
       || (exactKeys(payload, ['botId', 'target'])
         && validBotId(payload.botId) && validDraftTarget(payload.target));
   }
+  if (endpoint === DELIVERY_ENDPOINTS.setSessionSync) {
+    return exactKeys(payload, ['botId', 'targetId', 'enabled'])
+      && validBotId(payload.botId) && validTargetId(payload.targetId)
+      && typeof payload.enabled === 'boolean';
+  }
   return exactKeys(payload, ['botId', 'targetId'])
     && validBotId(payload.botId) && validTargetId(payload.targetId);
 }
@@ -131,6 +138,11 @@ export function createDeliveryRpcHandler(service) {
         value = await service.updateTarget(payload.botId, payload.targetId, payload.target);
       } else if (endpoint === DELIVERY_ENDPOINTS.deleteTarget) {
         value = await service.deleteTarget(payload.botId, payload.targetId);
+      } else if (endpoint === DELIVERY_ENDPOINTS.setSessionSync) {
+        if (typeof service.setSessionSync !== 'function') {
+          throw new TypeError('Session sync is unavailable');
+        }
+        value = await service.setSessionSync(payload.botId, payload.targetId, payload.enabled);
       } else {
         value = await service.send(
           payload.botId,

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

@@ -25,9 +25,16 @@ const DELIVERY_ERROR_CODES = new Set([
   'bot-not-connected',
   'target-rejected',
   'delivery-failed',
+  'session-sync-unavailable',
   'cancelled',
 ]);
 
+const SESSION_SYNC_METHODS = Object.freeze([
+  'setSessionSync',
+  'listSessionSyncTargets',
+  'sendSessionSyncText',
+]);
+
 function deliveryError(code, message = code, options) {
   const error = new Error(message, options);
   error.code = code;
@@ -93,8 +100,29 @@ function validateAdapter(adapter) {
   return adapter;
 }
 
+function sessionSyncState(value, available) {
+  const enabled = value?.enabled === true;
+  if (!available) return { enabled, state: 'unavailable' };
+  const state = value?.state;
+  if (['off', 'active', 'waiting', 'unavailable'].includes(state)) {
+    return { enabled, state };
+  }
+  return { enabled: false, state: 'unavailable' };
+}
+
 export class DeliveryService {
   #adapters = new Map();
+  #unavailableSessionSyncChannels;
+
+  constructor({ unavailableSessionSyncChannels = [] } = {}) {
+    if (!Array.isArray(unavailableSessionSyncChannels)
+      || unavailableSessionSyncChannels.some((channel) => (
+        typeof channel !== 'string' || !CHANNEL_PATTERN.test(channel)
+      ))) {
+      throw new TypeError('unavailableSessionSyncChannels must contain valid channel ids');
+    }
+    this.#unavailableSessionSyncChannels = new Set(unavailableSessionSyncChannels);
+  }
 
   registerAdapter(value) {
     const adapter = validateAdapter(value);
@@ -113,7 +141,15 @@ export class DeliveryService {
     try {
       const targets = await adapter.listTargets(id);
       if (!Array.isArray(targets)) throw new TypeError('Adapter returned invalid targets');
-      return { botId: id, channel: adapter.channel, targets };
+      const available = this.#supportsSessionSync(adapter);
+      return {
+        botId: id,
+        channel: adapter.channel,
+        targets: targets.map((target) => ({
+          ...target,
+          sessionSync: sessionSyncState(target?.sessionSync, available),
+        })),
+      };
     } catch (error) {
       throw publicOperationError(error);
     }
@@ -188,6 +224,72 @@ export class DeliveryService {
     }
   }
 
+  async setSessionSync(botId, targetId, enabled) {
+    const id = botIdOf(botId);
+    const targetKey = targetIdOf(targetId);
+    if (typeof enabled !== 'boolean') throw deliveryError('bad-request', 'Invalid enabled state');
+    const adapter = await this.#adapterFor(id);
+    const hasMethods = SESSION_SYNC_METHODS.every((method) => typeof adapter[method] === 'function');
+    if (!hasMethods || (enabled && !this.#supportsSessionSync(adapter))) {
+      throw deliveryError('session-sync-unavailable', 'Session sync is unavailable');
+    }
+    try {
+      return await adapter.setSessionSync(id, targetKey, enabled);
+    } catch (error) {
+      throw publicOperationError(error);
+    }
+  }
+
+  async listSessionSyncTargets(sessionId) {
+    if (typeof sessionId !== 'string' || !sessionId) {
+      throw deliveryError('bad-request', 'Invalid Session id');
+    }
+    const targets = [];
+    for (const { adapter } of this.#adapters.values()) {
+      if (!this.#supportsSessionSync(adapter)) continue;
+      try {
+        const listed = await adapter.listSessionSyncTargets(sessionId);
+        if (!Array.isArray(listed)) throw new TypeError('Adapter returned invalid sync targets');
+        for (const target of listed) {
+          targets.push({
+            channel: adapter.channel,
+            botId: botIdOf(target?.botId),
+            targetId: targetIdOf(target?.targetId),
+          });
+        }
+      } catch (error) {
+        console.warn(
+          `[dsh-im] ignored ${adapter.channel} Session sync target lookup failure`
+            + ` (${error?.code ?? error?.name ?? 'unknown-error'})`,
+        );
+      }
+    }
+    return targets;
+  }
+
+  async sendSessionSyncText(botId, targetId, sessionId, text, { signal } = {}) {
+    const id = botIdOf(botId);
+    const targetKey = targetIdOf(targetId);
+    if (typeof sessionId !== 'string' || !sessionId
+      || typeof text !== 'string' || !text.trim()) {
+      throw deliveryError('bad-request', 'Invalid session sync delivery');
+    }
+    cancellation(signal);
+    const adapter = await this.#adapterFor(id);
+    if (!this.#supportsSessionSync(adapter)) {
+      throw deliveryError('session-sync-unavailable', 'Session sync is unavailable');
+    }
+    try {
+      await adapter.sendSessionSyncText(id, targetKey, sessionId, text, { signal });
+      return { sent: true };
+    } catch (error) {
+      if (signal?.aborted || error?.name === 'AbortError' || error?.code === 'ABORT_ERR') {
+        throw deliveryError('cancelled', 'Request cancelled', { cause: error });
+      }
+      throw publicOperationError(error);
+    }
+  }
+
   async send(botId, targetIdOrDraft, text, { signal } = {}) {
     const id = botIdOf(botId);
     const targetKey = typeof targetIdOrDraft === 'string'
@@ -232,8 +334,13 @@ export class DeliveryService {
     }
     throw deliveryError('unknown-bot', 'Unknown bot');
   }
+
+  #supportsSessionSync(adapter) {
+    return !this.#unavailableSessionSyncChannels.has(adapter.channel)
+      && SESSION_SYNC_METHODS.every((method) => typeof adapter[method] === 'function');
+  }
 }
 
-export function createDeliveryService() {
-  return new DeliveryService();
+export function createDeliveryService(options) {
+  return new DeliveryService(options);
 }

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

@@ -115,6 +115,52 @@ export function deliverySuggestionFromConversationKey(channel, key) {
   }
 }
 
+/** Convert only a persisted private-chat key into its stable delivery route. */
+export function privateDeliverySuggestionFromConversationKey(channel, key) {
+  const separator = typeof key === 'string' ? key.indexOf(':') : -1;
+  const prefix = separator > 0 ? key.slice(0, separator) : '';
+  const privatePrefix = {
+    weixin: 'p2p',
+    feishu: 'p2p',
+    dingtalk: 'p2p',
+    wecom: 'direct',
+    qq: 'c2c',
+    slack: 'direct',
+    telegram: 'direct',
+    discord: 'direct',
+    whatsapp: 'direct',
+  }[channel];
+  if (!privatePrefix || prefix !== privatePrefix) return null;
+  return deliverySuggestionFromConversationKey(channel, key);
+}
+
+function routeIdentity(value) {
+  if (!isRecord(value?.route) || typeof value.kind !== 'string') return null;
+  return JSON.stringify([
+    value.kind,
+    Object.keys(value.route).sort().map((key) => [key, value.route[key]]),
+  ]);
+}
+
+/** Check that one saved private conversation key still identifies this target route. */
+export function privateConversationKeyMatchesTarget(channel, key, target) {
+  const suggestion = privateDeliverySuggestionFromConversationKey(channel, key);
+  const suggestionIdentity = routeIdentity(suggestion);
+  return suggestionIdentity !== null && suggestionIdentity === routeIdentity(target);
+}
+
+/** Resolve exactly one current private conversation for a normalized delivery target. */
+export function resolvePrivateConversationKey(channel, sessions, target) {
+  if (!CHANNELS.has(channel) || !isRecord(sessions)) return null;
+  const matches = [];
+  for (const [key, sessionId] of Object.entries(sessions)) {
+    if (typeof sessionId !== 'string' || !sessionId) continue;
+    if (privateConversationKeyMatchesTarget(channel, key, target)) matches.push(key);
+    if (matches.length > 1) return null;
+  }
+  return matches[0] ?? null;
+}
+
 /**
  * Extract and de-duplicate stable delivery routes from a persisted sessions map.
  * Session ids and every other state field are intentionally ignored.

package/plugin-src/host/harness-session-coordinator.mjs

@@ -55,12 +55,12 @@ function deepFreeze(value) {
   return Object.freeze(value);
 }
 
-function steeringMessage(text) {
+function steeringMessage(text, rpcId) {
   return deepFreeze({
     id: randomUUID(),
     role: 'user',
     content: [{ type: 'text', text }],
-    source: { kind: 'user' },
+    source: { kind: 'user', rpcId },
   });
 }
 
@@ -71,7 +71,7 @@ function agentBusyError(cause) {
 }
 
 function createControlExecutor(agents) {
-  return ({ sessionId, expectedTurn, promptRpcId, action, text }) => {
+  return ({ sessionId, expectedTurn, promptRpcId, inputRpcId, action, text }) => {
     const agent = agents.get(sessionId);
     // An unattached Session cannot be coordinated in-process. Let the client
     // retain its legacy HTTP path for deployments where attachment is lazy.
@@ -83,10 +83,11 @@ function createControlExecutor(agents) {
       return true;
     }
     if (action === 'steer') {
-      if (typeof text !== 'string' || !text.trim()) return false;
+      if (typeof text !== 'string' || !text.trim()
+        || typeof inputRpcId !== 'string' || !inputRpcId) return false;
       // inject() never wakes an idle driver. Because validation and injection
       // share one JS tick, this context can only target this live turn's next step.
-      agent.inject(steeringMessage(text));
+      agent.inject(steeringMessage(text, inputRpcId));
       return true;
     }
     throw new TypeError(`Unsupported Harness control action: ${String(action)}`);

package/plugin-src/host/index.mjs

@@ -14,6 +14,7 @@ import { installDeliveryRpc } from './delivery-rpc.mjs';
 import { installDeliveryHttp } from './delivery-http.mjs';
 import { createDeliveryService } from './delivery-service.mjs';
 import { installInboundTtlRpc } from './inbound-ttl-rpc.mjs';
+import { installSessionSyncCoordinator } from './session-sync-coordinator.mjs';
 import { installUpdateRpc } from './update-rpc.mjs';
 
 export const name = 'dsh-im-host';
@@ -36,6 +37,8 @@ export function createImHostPlugin(internals = {}) {
   const startInboundTtl = internals.installInboundTtlRpc ?? installInboundTtlRpc;
   const startDelivery = internals.installDeliveryRpc ?? installDeliveryRpc;
   const startDeliveryHttp = internals.installDeliveryHttp ?? installDeliveryHttp;
+  const startSessionSync = internals.installSessionSyncCoordinator
+    ?? installSessionSyncCoordinator;
   const makeDeliveryService = internals.createDeliveryService ?? createDeliveryService;
   const startFeishu = internals.applyFeishu ?? applyFeishu;
   const startWeixin = internals.applyWeixin ?? applyWeixin;
@@ -63,7 +66,11 @@ export function createImHostPlugin(internals = {}) {
     name,
     inject,
     async apply(ctx, config = {}) {
-      const deliveryService = makeDeliveryService();
+      const unavailableSessionSyncChannels = channels
+        .map(([channel]) => channel)
+        .filter((channel) => channel !== 'office'
+          && config[channel]?.harnessBaseUrl !== undefined);
+      const deliveryService = makeDeliveryService({ unavailableSessionSyncChannels });
       if (typeof ctx?.provide === 'function') {
         ctx.provide('dshIm', Object.freeze({
           send: (botId, targetId, text, options) => (
@@ -135,6 +142,16 @@ export function createImHostPlugin(internals = {}) {
     if (failures.length === channels.length) {
       throw new AggregateError(failures, 'dsh-im failed to activate every channel');
     }
+    if (typeof ctx?.on === 'function') {
+      try {
+        startSessionSync(ctx, deliveryService, {
+          logger,
+          inputScope: ctx.root ?? ctx,
+        });
+      } catch (error) {
+        logger.error?.('[dsh-im] failed to activate Session sync; continuing with channels', error);
+      }
+    }
   }
 }
 

package/plugin-src/host/session-sync-coordinator.mjs

@@ -0,0 +1,217 @@
+import {
+  AssistantTextAccumulator,
+  consumeDshImInputOrigin,
+  textFromHarnessContent,
+} from '../../src/channels/shared/harness-client.mjs';
+
+const DSH_USER_PREFIX = '[来自 DSH]\n';
+const DSH_ASSISTANT_PREFIX = '[DSH 助手]\n';
+
+function completedTurn(reason) {
+  return (typeof reason === 'string' ? reason : reason?.kind) === 'completed';
+}
+
+function recipientKey(target) {
+  return JSON.stringify([target.channel, target.botId, target.targetId]);
+}
+
+function sessionIdOf(session) {
+  const value = session?.id ?? session?.sessionId;
+  return typeof value === 'string' && value ? value : null;
+}
+
+function userInputOrigin(scope, event) {
+  const source = event?.data?.source;
+  if (source?.kind !== 'user' || typeof source.rpcId !== 'string' || !source.rpcId) {
+    return 'other';
+  }
+  return consumeDshImInputOrigin(scope, source.rpcId) ? 'im' : 'dsh';
+}
+
+function validRecipient(target) {
+  return target && typeof target === 'object'
+    && typeof target.channel === 'string' && target.channel
+    && typeof target.botId === 'string' && target.botId
+    && typeof target.targetId === 'string' && target.targetId;
+}
+
+export function createSessionSyncCoordinator({ deliveryService, logger = console }) {
+  if (typeof deliveryService?.listSessionSyncTargets !== 'function'
+    || typeof deliveryService?.sendSessionSyncText !== 'function') {
+    throw new TypeError('Session sync requires a complete delivery service');
+  }
+
+  const turns = new Map();
+  const tails = new Map();
+  let closed = false;
+
+  const logFailure = (phase, target, error) => {
+    logger.warn?.(
+      `[dsh-im] ignored Session sync ${phase} failure`
+        + (target ? ` (${target.channel}/${target.botId}/${target.targetId})` : '')
+        + ` [${error?.code ?? error?.name ?? 'unknown-error'}]`,
+    );
+  };
+
+  const deliver = async (sessionId, targets, text, phase) => {
+    const unique = new Map();
+    for (const target of targets) {
+      if (validRecipient(target)) unique.set(recipientKey(target), target);
+    }
+    const entries = [...unique.entries()];
+    const results = await Promise.allSettled(entries.map(([, target]) => (
+      deliveryService.sendSessionSyncText(
+        target.botId,
+        target.targetId,
+        sessionId,
+        text,
+      )
+    )));
+    const successful = new Map();
+    results.forEach((result, index) => {
+      const [key, target] = entries[index];
+      if (result.status === 'fulfilled') successful.set(key, target);
+      else logFailure(phase, target, result.reason);
+    });
+    return successful;
+  };
+
+  const processEvent = async (sessionId, event, origin) => {
+    if (closed || !event || typeof event !== 'object') return;
+
+    if (event.type === 'turn/start') {
+      const turn = event.data?.turn;
+      if (!Number.isSafeInteger(turn)) return;
+      turns.set(sessionId, {
+        turn,
+        step: null,
+        origin: 'unknown',
+        recipients: null,
+        assistant: new AssistantTextAccumulator(),
+      });
+      return;
+    }
+
+    const state = turns.get(sessionId);
+    if (!state) return;
+
+    if (event.type === 'step/start') {
+      if (event.data?.turn !== undefined && event.data.turn !== state.turn) return;
+      state.step = Number.isSafeInteger(event.data?.step) ? event.data.step : null;
+      return;
+    }
+
+    if (event.type === 'step/end') {
+      if (event.data?.turn !== undefined && event.data.turn !== state.turn) return;
+      if (event.data?.step === undefined || event.data.step === state.step) state.step = null;
+      return;
+    }
+
+    if (event.type === 'user/message') {
+      if (event.surfaceOp !== 'append') return;
+      if (state.origin === 'unknown') state.origin = origin;
+      if (state.origin !== 'dsh' || origin !== 'dsh') return;
+      const text = textFromHarnessContent(event.data?.content);
+      if (!text) return;
+
+      let targets;
+      try {
+        targets = await deliveryService.listSessionSyncTargets(sessionId);
+      } catch (error) {
+        logFailure('lookup', null, error);
+        targets = [];
+      }
+      const successful = await deliver(
+        sessionId,
+        targets,
+        `${DSH_USER_PREFIX}${text}`,
+        'user delivery',
+      );
+      if (state.recipients === null) {
+        state.recipients = successful;
+      } else {
+        for (const key of [...state.recipients.keys()]) {
+          if (!successful.has(key)) state.recipients.delete(key);
+        }
+      }
+      return;
+    }
+
+    if (event.type === 'assistant/message') {
+      if (state.origin !== 'dsh' || event.surfaceOp !== 'append'
+        || event.data?.interrupted === true
+        || (event.data?.turn !== undefined && event.data.turn !== state.turn)) return;
+      const text = textFromHarnessContent(event.data?.message?.content);
+      const step = Number.isSafeInteger(event.data?.step) ? event.data.step : state.step;
+      state.assistant.setCanonical(step, text);
+      return;
+    }
+
+    if (event.type !== 'turn/end' || event.data?.turn !== state.turn) return;
+    turns.delete(sessionId);
+    if (state.origin !== 'dsh' || !completedTurn(event.data?.reason)
+      || !state.recipients?.size || !state.assistant.text) return;
+    await deliver(
+      sessionId,
+      state.recipients.values(),
+      `${DSH_ASSISTANT_PREFIX}${state.assistant.text}`,
+      'assistant delivery',
+    );
+  };
+
+  const enqueue = (sessionId, event, origin = 'other') => {
+    if (closed || typeof sessionId !== 'string' || !sessionId) return Promise.resolve();
+    const previous = tails.get(sessionId) ?? Promise.resolve();
+    const task = previous.then(
+      () => processEvent(sessionId, event, origin),
+      () => processEvent(sessionId, event, origin),
+    );
+    const tail = task.catch((error) => logFailure('event handling', null, error)).finally(() => {
+      if (tails.get(sessionId) === tail) tails.delete(sessionId);
+    });
+    tails.set(sessionId, tail);
+    return tail;
+  };
+
+  return Object.freeze({
+    enqueue,
+    async whenIdle() {
+      while (tails.size > 0) await Promise.allSettled([...tails.values()]);
+    },
+    close() {
+      closed = true;
+      turns.clear();
+    },
+  });
+}
+
+export function installSessionSyncCoordinator(ctx, deliveryService, {
+  logger = console,
+  inputScope = ctx?.root ?? ctx,
+} = {}) {
+  if (typeof ctx?.on !== 'function') {
+    throw new TypeError('Session sync requires Host session events');
+  }
+  const coordinator = createSessionSyncCoordinator({ deliveryService, logger });
+  const disposeEvent = ctx.on('session/event', (session, event) => {
+    const sessionId = sessionIdOf(session);
+    if (!sessionId) return;
+    // Origin lookup must be synchronous: the originating ask may clean its id
+    // immediately after this event callback returns.
+    const origin = event?.type === 'user/message'
+      ? userInputOrigin(inputScope, event)
+      : 'other';
+    void coordinator.enqueue(sessionId, event, origin);
+  }, { global: true });
+  let disposed = false;
+  const close = () => {
+    if (disposed) return;
+    disposed = true;
+    disposeEvent?.();
+    coordinator.close();
+  };
+  if (typeof ctx.effect === 'function') {
+    ctx.effect(() => close, 'dsh-im: Session sync coordinator');
+  }
+  return Object.freeze({ ...coordinator, close });
+}

package/scripts/verify-package.mjs

@@ -141,15 +141,21 @@ if ((client.match(/\.slots\.inject\(\s*["']settings\.section["']/gu) ?? []).leng
 if (client.includes('settings.plugins.tab') || clientSources.includes('settings.plugins.tab')) {
   throw new Error('client source or bundle still contains the legacy Plugins-tab settings entry');
 }
-// Connections still have no channel-enable toggle. Only the shared context
-// editor owns checkable inputs. Its reusable scope component contains one
-// switch template and one mapped field-input template; it renders both twice.
+// Connections still have no channel-enable toggle. Checkable inputs are owned
+// only by the shared context editor and the saved-target Session sync row.
+// The context editor contains one switch template and one mapped field-input
+// template; the delivery target adds one ordinary checkbox template.
 const contextEditorSource = await readFile(resolve(root, 'plugin-src/client/context-enhancement.js'), 'utf8');
-const otherClientSources = clientSources.replace(contextEditorSource, '');
+const deliverySettingsSource = await readFile(resolve(root, 'plugin-src/client/delivery-settings.js'), 'utf8');
+const otherClientSources = clientSources
+  .replace(contextEditorSource, '')
+  .replace(deliverySettingsSource, '');
 if (/role:\s*["']switch|type:\s*["']checkbox/.test(otherClientSources)
+  || (deliverySettingsSource.match(/type:\s*["']checkbox["']/g) ?? []).length !== 1
+  || /role:\s*["']switch["']/u.test(deliverySettingsSource)
   || (client.match(/role:\s*["']switch["']/g) ?? []).length !== 1
-  || (client.match(/type:\s*["']checkbox["']/g) ?? []).length !== 2) {
-  throw new Error('checkable inputs must be limited to the context-enhancement editor');
+  || (client.match(/type:\s*["']checkbox["']/g) ?? []).length !== 3) {
+  throw new Error('checkable inputs must be limited to context enhancement and Session sync');
 }
 for (const marker of ['bot.context-enhancement.set', '<dsh_im_source>', '<dsh_im_source_guidance>']) {
   if (!host.includes(marker) || !client.includes(marker)) {