@xmanrui/dsh-im 4.17.0 → 4.18.0

package/src/channels/imessage/runtime.mjs

@@ -0,0 +1,98 @@
+import { sendRememberedConnectionTest } from '../shared/connection-test.mjs';
+import { MacOSMessagesApi, normalizeIMessage } from './imessage-api.mjs';
+import { createIMessageBridgeStatus, IMessageHarnessBridge } from './imessage-bridge.mjs';
+
+const DEFAULT_POLL_INTERVAL_MS = 2_000;
+
+class IMessageBotClient {
+  #api;
+  #signal;
+  constructor(api, signal) { this.#api = api; this.#signal = signal; }
+  sendText(target, text) {
+    return this.#api.sendText({
+      chatGuid: target.chatGuid,
+      address: target.address,
+      text,
+      signal: this.#signal,
+    });
+  }
+  sendTyping() { return Promise.resolve(); }
+}
+
+export function createIMessageRuntimeStatus() {
+  return { startedAt: null, ready: false, connectionState: 'idle', harnessReachable: false,
+    lastCheckedAt: null, lastConnectedAt: null, lastError: null, ...createIMessageBridgeStatus() };
+}
+
+export class IMessageRuntime {
+  #config; #token; #harness; #state; #contextEnhancement; #accessPolicy; #logger;
+  #replyTimeoutMs; #pollIntervalMs; #createApi; #status = createIMessageRuntimeStatus();
+  #api; #bridge; #abortController; #timer; #polling; #stopped = true;
+  constructor({ config, token, harness, state, contextEnhancement, accessPolicy, logger = console,
+    replyTimeoutMs = 600_000, pollIntervalMs = DEFAULT_POLL_INTERVAL_MS,
+    createApi = (options) => new MacOSMessagesApi(options) }) {
+    if (!config || !token || !harness || !state) throw new TypeError('IMessageRuntime requires config, token, Harness, and state');
+    this.#config = config; this.#token = token; this.#harness = harness; this.#state = state;
+    this.#contextEnhancement = contextEnhancement; this.#accessPolicy = accessPolicy; this.#logger = logger;
+    this.#replyTimeoutMs = replyTimeoutMs; this.#pollIntervalMs = pollIntervalMs; this.#createApi = createApi;
+  }
+  get status() { return structuredClone(this.#status); }
+  async sendConnectionTest(text) {
+    if (!this.#status.ready || !this.#api) { const error = new Error('iMessage gateway is not connected'); error.code = 'test-target-unavailable'; throw error; }
+    await sendRememberedConnectionTest({
+      state: this.#state,
+      text,
+      channelLabel: 'iMessage',
+      send: (target, value) => this.#api.sendText({
+        chatGuid: target.chatGuid, address: target.address, text: value,
+      }),
+    });
+  }
+  async sendProactiveText(target, text, options = {}) {
+    if (!this.#status.ready || !this.#api) { const error = new Error('iMessage gateway is not connected'); error.code = 'bot-not-connected'; throw error; }
+    const chatGuid = target?.route?.chatGuid;
+    if (!chatGuid) { const error = new TypeError('Invalid iMessage proactive delivery target'); error.code = 'invalid-target'; throw error; }
+    await this.#api.sendText({ chatGuid, text, signal: options.signal });
+    return { sent: true };
+  }
+  async start() {
+    if (this.#status.ready) return this.status;
+    await this.stop(); this.#stopped = false; this.#status.startedAt = new Date().toISOString(); this.#status.connectionState = 'connecting';
+    this.#abortController = new AbortController();
+    try {
+      await this.#harness.ensureRunning(); this.#status.harnessReachable = true;
+      this.#api = this.#createApi({ signal: this.#abortController.signal });
+      const permissions = await this.#api.getPermissions();
+      if (permissions.database !== 'granted' || permissions.automation !== 'granted') {
+        const error = new Error('macOS Messages permissions are required');
+        error.code = 'messages-permission-required';
+        error.permissions = permissions;
+        throw error;
+      }
+      if (this.#state.cursor() === null && typeof this.#api.getLatestMessageRowId === 'function') {
+        await this.#state.setCursor(await this.#api.getLatestMessageRowId());
+      }
+      const client = new IMessageBotClient(this.#api, this.#abortController.signal);
+      this.#bridge = new IMessageHarnessBridge({ bot: client, harness: this.#harness, state: this.#state,
+        contextEnhancement: this.#contextEnhancement, accessPolicy: this.#accessPolicy, status: this.#status,
+        logger: this.#logger, replyTimeoutMs: this.#replyTimeoutMs, signal: this.#abortController.signal });
+      this.#status.ready = true; this.#status.connectionState = 'connected'; this.#status.lastConnectedAt = Date.now();
+      this.#schedulePoll(0); return this.status;
+    } catch (error) { this.#status.ready = false; this.#status.connectionState = 'failed'; this.#status.lastError = error.message; await this.stop(); throw error; }
+  }
+  async stop() { this.#stopped = true; clearTimeout(this.#timer); this.#timer = null; this.#abortController?.abort(); await this.#polling?.catch(() => {}); this.#polling = null; this.#bridge = null; this.#api = null; this.#status.ready = false; }
+  #schedulePoll(delay) { if (this.#stopped) return; this.#timer = setTimeout(() => { this.#polling = this.#poll().finally(() => this.#schedulePoll(this.#pollIntervalMs)); }, delay); this.#timer.unref?.(); }
+  async #poll() {
+    if (!this.#api || !this.#bridge || this.#stopped) return;
+    try {
+      const rows = await this.#api.listMessages({ after: this.#state.cursor() ?? 0, limit: 100 });
+      const messages = Array.isArray(rows) ? rows : rows?.messages ?? rows?.data ?? [];
+      for (const raw of messages) {
+        const message = normalizeIMessage(raw, { botId: this.#config.platformId });
+        if (message) await this.#bridge.accept(message);
+        if (Number.isSafeInteger(raw.rowid)) await this.#state.setCursor(raw.rowid);
+      }
+      this.#status.lastCheckedAt = Date.now(); this.#status.lastError = null;
+    } catch (error) { if (!this.#stopped) { this.#status.lastError = error.message; this.#logger.warn?.('[dsh-im:imessage] polling failed', error); } }
+  }
+}

package/src/channels/imessage/state-store.mjs

@@ -0,0 +1,3 @@
+import { ConversationStateStore } from '../shared/conversation-state-store.mjs';
+
+export class IMessageStateStore extends ConversationStateStore {}

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

@@ -89,8 +89,8 @@ export default {
     'The Workspace or Session state just changed. Please send this message again.',
   '当前工作区不存在或暂不可用。请重新选择工作区后重试。':
     'The current Workspace does not exist or is unavailable. Select another Workspace and try again.',
-  '当前 Agent Preset 不存在或暂不可用。请发送 /presetlist 后重新选择。':
-    'The current Agent Preset does not exist or is unavailable. Send /presetlist and select another one.',
+  '当前 Agent Preset 无法使用。请发送 /presetlist 查看可用项，使用 /preset <序号或 ID> 重新选择，再发送 /new 创建新会话后重试。如需继续原会话，请联系管理员恢复原 Preset。':
+    'The current Agent Preset is unavailable. Send /presetlist to see available options, select one with /preset <index or ID>, then send /new to create a new Session and try again. To continue the original Session, ask an administrator to restore the original Preset.',
   '回复已经生成，但机器人没有发送权限。请联系管理员检查渠道权限或重新绑定机器人。':
     'The reply was generated, but the bot cannot send it. Ask an administrator to check channel permissions or reconnect the bot.',
   '回复已经生成，但当前渠道正在限流，暂时无法发送。请稍后重试。':

package/src/channels/shared/message-failure.mjs

@@ -77,7 +77,7 @@ const FAILURE_MESSAGES = Object.freeze({
   WORKSPACE_UNAVAILABLE:
     '当前工作区不存在或暂不可用。请重新选择工作区后重试。',
   PRESET_UNAVAILABLE:
-    '当前 Agent Preset 不存在或暂不可用。请发送 /presetlist 后重新选择。',
+    '当前 Agent Preset 无法使用。请发送 /presetlist 查看可用项，使用 /preset <序号或 ID> 重新选择，再发送 /new 创建新会话后重试。如需继续原会话，请联系管理员恢复原 Preset。',
   CHANNEL_PERMISSION:
     '回复已经生成，但机器人没有发送权限。请联系管理员检查渠道权限或重新绑定机器人。',
   CHANNEL_RATE_LIMIT:
@@ -133,7 +133,7 @@ function failureCode(error) {
   if (code === 'agent-busy') return 'SESSION_BUSY';
   if (code === 'workspace-session-stale') return 'SESSION_STALE';
   if (code.startsWith('workspace-')) return 'WORKSPACE_UNAVAILABLE';
-  if (code.startsWith('agent-preset-')) return 'PRESET_UNAVAILABLE';
+  if (/^agent-preset[-/]/u.test(code)) return 'PRESET_UNAVAILABLE';
   if (code.startsWith('image-') || code.startsWith('inbound-file-')
     || code === 'attachment-error') return 'INPUT_INVALID';
 
@@ -170,8 +170,8 @@ function safeReferenceId(value) {
 }
 
 function safeFailureReason(value) {
-  if (typeof value !== 'string' || !/^[A-Za-z0-9_-]{1,64}$/u.test(value)) return null;
-  return value.toUpperCase().replaceAll('-', '_');
+  if (typeof value !== 'string' || !/^[A-Za-z0-9_/-]{1,64}$/u.test(value)) return null;
+  return value.toUpperCase().replace(/[-/]/gu, '_');
 }
 
 export function classifyMessageFailure(error, {
@@ -190,7 +190,7 @@ export function classifyMessageFailure(error, {
     : classifiedCode;
   return Object.freeze({
     code,
-    reason: safeReason ?? code,
+    reason: safeReason ?? safeFailureReason(error?.code) ?? code,
     message: typeof userMessage === 'string' && userMessage.trim()
       ? userMessage.trim()
       : t(FAILURE_MESSAGES[code]),

package/src/channels/shared/session-channel-labels.mjs

@@ -8,6 +8,7 @@ export const SESSION_CHANNEL_LABELS = Object.freeze(Object.fromEntries(Object.en
   telegram: ['Telegram', 'Telegram'],
   discord: ['Discord', 'Discord'],
   whatsapp: ['WhatsApp', 'WhatsApp'],
+  imessage: ['iMessage', 'iMessage'],
   office: ['AI Office', 'AI Office'],
 }).map(([channel, labels]) => [channel, Object.freeze(labels)])));