@xmanrui/dsh-im 1.1.0 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "把九种 IM 机器人和公网 AI Office 接入本机 DeepSeek Harness。 Connect nine IM channels and a public AI Office to a local DeepSeek Harness.",
   "keywords": [
     "deepseek-harness",

package/plugin-src/client/channels/whatsapp/api.js

@@ -9,6 +9,7 @@ export const WHATSAPP_ENDPOINTS = Object.freeze({
   cancelProvisioning: 'provision.cancel',
   reconnectBot: 'bot.reconnect',
   deleteBot: 'bot.delete',
+  setAccessPolicy: 'bot.access-policy.set',
   setWorkspace: 'bot.workspace.set',
   setAgentPreset: SET_AGENT_PRESET_ENDPOINT,
 });
@@ -86,6 +87,16 @@ function normalizeBot(value) {
     state: connected ? 'connected' : state,
     workspace: text(value.workspace, '', 4_096),
     agentPreset: normalizeAgentPresetId(value.agentPreset),
+    accessPolicy: {
+      accessMode: ['self-only', 'private-allowlist', 'open'].includes(
+        value.accessPolicy?.accessMode,
+      ) ? value.accessPolicy.accessMode : 'self-only',
+      allowedNumbers: Array.isArray(value.accessPolicy?.allowedNumbers)
+        ? [...new Set(value.accessPolicy.allowedNumbers.filter((entry) => (
+            typeof entry === 'string' && /^[1-9]\d{4,14}$/.test(entry)
+          )))]
+        : [],
+    },
     bot: {
       name: text(value.bot?.name, 'WhatsApp机器人', 100),
       idMasked: text(value.bot?.idMasked, 'WhatsApp账号', 140),

package/plugin-src/client/channels/whatsapp/index.js

@@ -25,6 +25,119 @@ import { installWhatsappStyles } from './styles.js';
 
 const ACTIVE_STATES = new Set(['pending', 'connecting']);
 
+function accessPolicyFor(account) {
+  const accessMode = ['self-only', 'private-allowlist', 'open'].includes(
+    account?.accessPolicy?.accessMode,
+  ) ? account.accessPolicy.accessMode : 'self-only';
+  return {
+    accessMode,
+    allowedNumbers: Array.isArray(account?.accessPolicy?.allowedNumbers)
+      ? account.accessPolicy.allowedNumbers : [],
+  };
+}
+
+function allowedNumbersFromText(value) {
+  const entries = value.split(/\r?\n/).map((entry) => entry.trim()).filter(Boolean);
+  const normalized = entries.map((entry) => entry.replace(/^\+/, ''));
+  if (normalized.some((entry) => !/^[1-9]\d{4,14}$/.test(entry))) {
+    throw new TypeError('电话号码必须包含国家或地区代码，每行一个。');
+  }
+  return [...new Set(normalized)];
+}
+
+export function WhatsappAccessSettings({ account, busy = false, onSave }) {
+  const policy = accessPolicyFor(account);
+  const sourceNumbers = policy.allowedNumbers.join('\n');
+  const helpId = React.useId();
+  const [accessMode, setAccessMode] = React.useState(policy.accessMode);
+  const [allowedNumbers, setAllowedNumbers] = React.useState(sourceNumbers);
+  const [error, setError] = React.useState(null);
+
+  React.useEffect(() => {
+    setAccessMode(policy.accessMode);
+    setAllowedNumbers(sourceNumbers);
+    setError(null);
+  }, [policy.accessMode, sourceNumbers]);
+
+  const save = async (event) => {
+    event.preventDefault();
+    setError(null);
+    try {
+      const normalized = allowedNumbersFromText(allowedNumbers);
+      if (typeof onSave !== 'function') throw new Error('WhatsApp 访问设置暂不可用。');
+      await onSave({ accessMode, allowedNumbers: normalized });
+    } catch (caught) {
+      setError(caught?.message ?? 'WhatsApp 访问设置保存失败。');
+    }
+  };
+
+  const allowlistEnabled = accessMode === 'private-allowlist';
+  const labels = {
+    'self-only': '仅自己模式',
+    'private-allowlist': '指定联系人模式',
+    open: '开放响应模式',
+  };
+  return h('form', { className: 'dwa-access', onSubmit: save },
+    h('div', { className: 'dwa-accessHeading' },
+      h('strong', null, '访问设置'),
+      h('span', { className: 'dwa-accessStatus' },
+        h('span', { className: 'dwa-accessBadge', 'data-mode': policy.accessMode },
+          ['已生效：', labels[policy.accessMode]]),
+        h('span', { className: 'dwa-accessHelp' },
+          h('button', {
+            type: 'button',
+            className: 'dwa-accessHelpButton',
+            'aria-label': '查看 WhatsApp 访问模式说明',
+            'aria-describedby': helpId,
+          }, h('span', { 'aria-hidden': 'true' }, '?')),
+          h('span', { id: helpId, className: 'dwa-accessTooltip', role: 'tooltip' },
+            h('span', { className: 'dwa-accessTooltipItem' },
+              h('strong', null, '仅自己模式'),
+              h('span', null, '只响应已绑定 WhatsApp 账号的自聊消息。')),
+            h('span', { className: 'dwa-accessTooltipItem' },
+              h('strong', null, '指定联系人模式'),
+              h('span', null, '响应自聊和白名单联系人的私聊，忽略群聊。')),
+            h('span', { className: 'dwa-accessTooltipItem' },
+              h('strong', null, '开放响应模式'),
+              h('span', null, '响应所有私聊，以及群聊中的提及或回复。')))))),
+    h('label', { className: 'dwa-accessField' },
+      h('span', null, '模式'),
+      h('select', {
+        value: accessMode,
+        disabled: busy,
+        'aria-label': 'WhatsApp 访问模式',
+        onChange: (event) => { setAccessMode(event.target.value); setError(null); },
+      },
+      h('option', { value: 'self-only' }, '仅自己模式（默认）'),
+      h('option', { value: 'private-allowlist' }, '指定联系人模式'),
+      h('option', { value: 'open' }, '开放响应模式'))),
+    allowlistEnabled
+      ? h('label', { className: 'dwa-accessField' },
+          h('span', null, '允许私聊的 WhatsApp 电话号码'),
+          h('textarea', {
+            value: allowedNumbers,
+            disabled: busy,
+            rows: 3,
+            placeholder: '每行一个含国家或地区代码的号码',
+            'aria-label': '允许私聊的 WhatsApp 电话号码',
+            onChange: (event) => { setAllowedNumbers(event.target.value); setError(null); },
+          }),
+          h('small', null, '可以包含开头的 +，保存时会自动移除。'))
+      : null,
+    allowlistEnabled && allowedNumbers.trim() === ''
+      ? h('p', { className: 'dwa-accessWarning', role: 'status' },
+          '白名单为空；保存后将只接受自聊消息。')
+      : null,
+    error ? h('p', { className: 'dwa-accessError', role: 'alert' }, error) : null,
+    h('div', { className: 'dwa-accessActions' },
+      h('button', {
+        type: 'submit',
+        className: 'ddt-button',
+        'data-kind': 'secondary',
+        disabled: busy,
+      }, busy ? '正在保存…' : '保存访问设置')));
+}
+
 const Button = React.forwardRef(function Button(
   { children, kind = 'secondary', className = '', ...props },
   ref,
@@ -180,6 +293,7 @@ export function WhatsappAccountCard({
   onReconnect,
   onWorkspaceSave,
   onAgentPresetSave,
+  onAccessPolicySave,
   onRequestRemove,
   onConfirmRemove,
   onCancelRemove,
@@ -216,6 +330,11 @@ export function WhatsappAccountCard({
         disabled: Boolean(busy),
         onSave: onAgentPresetSave,
       }),
+      h(WhatsappAccessSettings, {
+        account,
+        busy: Boolean(busy),
+        onSave: onAccessPolicySave,
+      }),
       h('div', { className: 'ddt-accountFooter dim-cardFooter' },
         h('div', { className: 'dim-cardFooterLayout' },
           h('div', { className: 'ddt-actions dim-cardActions' },
@@ -469,6 +588,12 @@ export function WhatsappSettingsTab({ rpcCall }) {
               WHATSAPP_ENDPOINTS.setAgentPreset,
               { botId: account.botId, agentPreset },
             ),
+            onAccessPolicySave: (accessPolicy) => botAction(
+              account,
+              'access',
+              WHATSAPP_ENDPOINTS.setAccessPolicy,
+              { botId: account.botId, ...accessPolicy },
+            ),
             onRequestRemove: () => setRemoveTarget(account.botId),
             onCancelRemove: () => setRemoveTarget(null),
             onConfirmRemove: async () => {

package/plugin-src/client/channels/whatsapp/styles.js

@@ -4,6 +4,31 @@ const CSS = String.raw`
 .dwa-page { --ddt-accent: #25d366; --ddt-accent-deep: #128c7e; --ddt-accent-wash: #eafbf0; }
 .dwa-avatar { color: #fff; background: #25d366; }
 .dwa-avatar svg { display: block; }
+.dwa-access { display: grid; gap: 10px; padding: 12px; border: 1px solid var(--dsw-alias-border-l2, #dfe1e5); border-radius: 10px; background: var(--dsw-alias-bg-layer-2, #f7f8fa); }
+.dwa-accessHeading { display: flex; align-items: center; justify-content: space-between; gap: 12px; }
+.dwa-accessHeading > strong { font-size: 13px; }
+.dwa-accessStatus { min-width: 0; display: inline-flex; align-items: center; justify-content: flex-end; gap: 6px; }
+.dwa-accessBadge { flex: none; padding: 3px 8px; border-radius: 999px; color: #08785f; background: #eafbf0; font-size: 11px; font-weight: 700; }
+.dwa-accessBadge[data-mode="private-allowlist"] { color: #0f6f8f; background: #eaf7fd; }
+.dwa-accessBadge[data-mode="open"] { color: #a15c00; background: #fff3d6; }
+.dwa-accessHelp { position: relative; display: inline-flex; flex: none; }
+.dwa-accessHelpButton { width: 20px; height: 20px; display: grid; place-items: center; padding: 0; border: 1px solid color-mix(in srgb, #25d366 34%, var(--dsw-alias-border-l2, #dfe1e5)); border-radius: 50%; color: #128c7e; background: var(--dsw-alias-bg-layer-1, #fff); font: inherit; font-size: 12px; line-height: 1; font-weight: 750; cursor: help; }
+.dwa-accessTooltip { position: absolute; top: calc(100% + 8px); right: 0; z-index: 30; width: 270px; max-width: min(290px, calc(100vw - 48px)); display: grid; gap: 8px; padding: 10px 11px; border: 1px solid var(--dsw-alias-border-l2, #dfe1e5); border-radius: 9px; color: var(--dsw-alias-label-primary, #1f2329); background: var(--dsw-alias-bg-layer-3, #fff); box-shadow: 0 10px 28px rgb(31 35 41 / 16%); opacity: 0; visibility: hidden; transform: translateY(-3px); pointer-events: none; transition: opacity .15s ease, transform .15s ease, visibility .15s ease; }
+.dwa-accessTooltipItem { display: grid; gap: 2px; }
+.dwa-accessTooltipItem + .dwa-accessTooltipItem { padding-top: 8px; border-top: 1px solid var(--dsw-alias-border-l2, #eef0f3); }
+.dwa-accessTooltipItem strong { font-size: 12px; line-height: 17px; }
+.dwa-accessTooltipItem > span { color: var(--dsw-alias-label-secondary, #646a73); font-size: 11px; line-height: 16px; }
+.dwa-accessHelp:hover .dwa-accessTooltip, .dwa-accessHelp:focus-within .dwa-accessTooltip { opacity: 1; visibility: visible; transform: translateY(0); }
+.dwa-accessField { display: grid; gap: 5px; color: var(--dsw-alias-label-primary, #1f2329); font-size: 12px; font-weight: 600; }
+.dwa-accessField select, .dwa-accessField textarea { width: 100%; box-sizing: border-box; border: 1px solid var(--dsw-alias-border-l1, #c9cdd4); border-radius: 7px; color: inherit; background: var(--dsw-alias-bg-layer-1, #fff); font: inherit; font-weight: 400; }
+.dwa-accessField select { height: 34px; padding: 0 9px; }
+.dwa-accessField textarea { min-height: 68px; padding: 8px 9px; resize: vertical; font-family: ui-monospace, SFMono-Regular, Menlo, monospace; }
+.dwa-accessField textarea:disabled { color: var(--dsw-alias-label-tertiary, #8f959e); background: var(--dsw-alias-bg-module-platform, #f2f3f5); cursor: not-allowed; resize: none; opacity: 1; }
+.dwa-accessField small { color: var(--dsw-alias-label-secondary, #646a73); font-weight: 400; }
+.dwa-accessWarning, .dwa-accessError { margin: 0; font-size: 12px; line-height: 1.5; }
+.dwa-accessWarning { color: #a15c00; }
+.dwa-accessError { color: var(--dsw-alias-state-error-primary, #d83931); }
+.dwa-accessActions { display: flex; justify-content: flex-end; }
 `;
 
 export function installWhatsappStyles() {

package/plugin-src/client/i18n.js

@@ -360,6 +360,24 @@ const EN = Object.freeze({
   '正在建立安全的关联设备会话。': 'Creating a secure linked-device session.',
   '关联设备正在接入 DeepSeek Harness。': 'Linking the device to DeepSeek Harness.',
   'WhatsApp Web 关联设备运行正常': 'WhatsApp linked device is healthy',
+  '查看 WhatsApp 访问模式说明': 'View WhatsApp access mode details',
+  'WhatsApp 访问模式': 'WhatsApp access mode',
+  '仅自己模式': 'Only me',
+  '指定联系人模式': 'Selected contacts',
+  '开放响应模式': 'Open responses',
+  '仅自己模式（默认）': 'Only me (default)',
+  '已生效：': 'Active: ',
+  '只响应已绑定 WhatsApp 账号的自聊消息。': 'Only respond to self-chat messages from the linked WhatsApp account.',
+  '响应自聊和白名单联系人的私聊，忽略群聊。': 'Respond to self-chat and allowlisted direct messages; ignore group messages.',
+  '响应所有私聊，以及群聊中的提及或回复。': 'Respond to all direct messages and to group mentions or replies.',
+  '允许私聊的 WhatsApp 电话号码': 'WhatsApp phone numbers allowed to send direct messages',
+  '每行一个含国家或地区代码的号码': 'One number with country or region code per line',
+  '可以包含开头的 +，保存时会自动移除。': 'A leading + is allowed and removed when saved.',
+  '仅指定联系人模式使用白名单，切换模式时会保留。': 'Only Selected contacts uses the allowlist; it is retained when modes change.',
+  '白名单为空；保存后将只接受自聊消息。': 'The allowlist is empty; only self-chat messages will be accepted after saving.',
+  '电话号码必须包含国家或地区代码，每行一个。': 'Each phone number must include a country or region code on its own line.',
+  'WhatsApp 访问设置暂不可用。': 'WhatsApp access settings are currently unavailable.',
+  'WhatsApp 访问设置保存失败。': 'Could not save WhatsApp access settings.',
   'Bot API 长轮询': 'Bot API long polling',
   ' Gateway 长连接': ' Gateway persistent connection',
   'Gateway 长连接': 'Gateway persistent connection',

package/plugin-src/host/channels/whatsapp/rpc.mjs

@@ -1,6 +1,7 @@
 import QRCode from 'qrcode';
 
 import { publicConnectionTestResult } from '../../../../src/channels/shared/connection-test.mjs';
+import { normalizeWhatsappAccessPolicy } from '../../../../src/channels/whatsapp/config-store.mjs';
 import { resolveRpcAuthority } from '../../rpc-authority.mjs';
 import { publicWorkspaceError, SET_WORKSPACE_ENDPOINT, validWorkspacePayload } from '../shared/workspace-rpc.mjs';
 import { SET_AGENT_PRESET_ENDPOINT, validAgentPresetPayload } from '../shared/agent-preset-rpc.mjs';
@@ -13,6 +14,7 @@ export const WHATSAPP_ENDPOINTS = Object.freeze({
   cancelProvisioning: 'provision.cancel',
   reconnectBot: 'bot.reconnect',
   deleteBot: 'bot.delete',
+  setAccessPolicy: 'bot.access-policy.set',
   setWorkspace: SET_WORKSPACE_ENDPOINT,
   setAgentPreset: SET_AGENT_PRESET_ENDPOINT,
 });
@@ -50,6 +52,17 @@ function payloadFailure(endpoint, payload) {
     return exactKeys(payload, ['botId', 'confirm']) && validId(payload.botId)
       && payload.confirm === true ? null : 'bot.delete requires a botId and confirm=true.';
   }
+  if (endpoint === WHATSAPP_ENDPOINTS.setAccessPolicy) {
+    if (!exactKeys(payload, ['botId', 'accessMode', 'allowedNumbers'])
+      || Object.keys(payload).length !== 3
+      || !validId(payload.botId)) return '请输入有效的 WhatsApp 访问模式和电话号码。';
+    try {
+      normalizeWhatsappAccessPolicy(payload);
+      return null;
+    } catch {
+      return '请输入有效的 WhatsApp 访问模式和电话号码。';
+    }
+  }
   if (endpoint === WHATSAPP_ENDPOINTS.setWorkspace) {
     return validWorkspacePayload(payload)
       ? null : '请输入工作区绝对路径。';
@@ -92,7 +105,7 @@ async function publicStatus(value, encodeQr) {
 }
 
 export function createWhatsappRpcHandler(controller, { encodeQr = qrDataUrl } = {}) {
-  for (const method of ['status', 'startProvisioning', 'registrationStatus', 'cancelProvisioning', 'reconnectBot', 'deleteBot']) {
+  for (const method of ['status', 'startProvisioning', 'registrationStatus', 'cancelProvisioning', 'reconnectBot', 'deleteBot', 'setAccessPolicy']) {
     if (typeof controller?.[method] !== 'function') {
       throw new TypeError(`A complete WhatsApp controller is required (${method})`);
     }
@@ -166,6 +179,11 @@ export function createWhatsappRpcHandler(controller, { encodeQr = qrDataUrl } =
           await controller.updateAgentPreset(payload.botId, payload.agentPreset),
           cachedEncode,
         );
+      } else if (endpoint === WHATSAPP_ENDPOINTS.setAccessPolicy) {
+        value = await publicStatus(
+          await controller.setAccessPolicy(payload.botId, normalizeWhatsappAccessPolicy(payload)),
+          cachedEncode,
+        );
       } else {
         value = await publicStatus(await controller.deleteBot(payload.botId), cachedEncode);
       }

package/src/channels/whatsapp/config-store.mjs

@@ -5,6 +5,13 @@ import { dirname } from 'node:path';
 const EMPTY_DOCUMENT = Object.freeze({ version: 2, bots: Object.freeze([]) });
 const BOT_ID_PATTERN = /^whatsapp_[a-f0-9]{24}$/;
 const AUTH_DIRECTORY_PATTERN = /^[a-f0-9-]{36}$/;
+const WHATSAPP_PHONE_NUMBER = /^[1-9]\d{4,14}$/;
+
+export const WHATSAPP_ACCESS_MODES = Object.freeze({
+  selfOnly: 'self-only',
+  privateAllowlist: 'private-allowlist',
+  open: 'open',
+});
 
 function cleanString(value) {
   return typeof value === 'string' && value.trim() ? value.trim() : null;
@@ -28,6 +35,35 @@ export function maskWhatsappAccount(accountJid) {
   return `${digits.slice(0, 4)}••••${digits.slice(-4)}`;
 }
 
+export function normalizeWhatsappAllowedNumbers(value) {
+  if (value === undefined) return Object.freeze([]);
+  if (!Array.isArray(value)) {
+    throw new TypeError('allowedNumbers must be an array of WhatsApp phone numbers');
+  }
+  const normalized = value.map((entry) => {
+    const number = typeof entry === 'string' ? entry.trim().replace(/^\+/, '') : '';
+    if (!WHATSAPP_PHONE_NUMBER.test(number)) {
+      throw new TypeError('allowedNumbers contains an invalid WhatsApp phone number');
+    }
+    return number;
+  });
+  return Object.freeze([...new Set(normalized)]);
+}
+
+export function normalizeWhatsappAccessPolicy(value = {}) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    throw new TypeError('WhatsApp access policy must be an object');
+  }
+  const accessMode = value.accessMode ?? WHATSAPP_ACCESS_MODES.selfOnly;
+  if (!Object.values(WHATSAPP_ACCESS_MODES).includes(accessMode)) {
+    throw new TypeError('WhatsApp accessMode is invalid');
+  }
+  return Object.freeze({
+    accessMode,
+    allowedNumbers: normalizeWhatsappAllowedNumbers(value.allowedNumbers),
+  });
+}
+
 export class WhatsappConfigStore {
   #path;
   #value = EMPTY_DOCUMENT;
@@ -112,6 +148,12 @@ export class WhatsappConfigStore {
     if (!accountJid || !botId || !authDirectory || !name
       || !BOT_ID_PATTERN.test(botId) || !AUTH_DIRECTORY_PATTERN.test(authDirectory)
       || deriveWhatsappBotId(accountJid) !== botId) return null;
+    let accessPolicy;
+    try {
+      accessPolicy = normalizeWhatsappAccessPolicy(value);
+    } catch {
+      return null;
+    }
     return Object.freeze({
       botId,
       accountJid,
@@ -119,6 +161,7 @@ export class WhatsappConfigStore {
       name,
       createdAt: cleanString(value.createdAt) ?? new Date().toISOString(),
       connectedAt: cleanString(value.connectedAt),
+      ...accessPolicy,
     });
   }
 

package/src/channels/whatsapp/whatsapp-controller.mjs

@@ -1,7 +1,11 @@
 import { randomUUID } from 'node:crypto';
 
 import { connectionTestMessage } from '../shared/connection-test.mjs';
-import { deriveWhatsappBotId, maskWhatsappAccount } from './config-store.mjs';
+import {
+  deriveWhatsappBotId,
+  maskWhatsappAccount,
+  normalizeWhatsappAccessPolicy,
+} from './config-store.mjs';
 
 const ACTIVE_ATTEMPT_STATES = new Set(['starting', 'pending', 'connecting']);
 const TERMINAL_ATTEMPT_STATES = new Set(['connected', 'failed', 'cancelled']);
@@ -218,6 +222,20 @@ export class WhatsappController {
     });
   }
 
+  async setAccessPolicy(botId, value) {
+    if (this.#closed) throw new Error('WhatsApp controller is closed');
+    const accessPolicy = normalizeWhatsappAccessPolicy(value);
+    await this.#withBotTransition(botId, async () => {
+      if (this.#closed) throw new Error('WhatsApp controller is closed');
+      const config = this.#configStore.get(botId);
+      if (!config) throw new Error('Unknown WhatsApp bot');
+      const saved = await this.#configStore.save({ ...config, ...accessPolicy });
+      this.#runtimes.get(botId)?.setAccessPolicy?.(saved);
+      this.#touch();
+    });
+    return this.status();
+  }
+
   async deleteBot(botId) {
     const config = this.#configStore.get(botId);
     if (!config) throw new Error('Unknown WhatsApp bot');
@@ -266,6 +284,7 @@ export class WhatsappController {
           messagesReceived: runtimeStatus?.messagesReceived ?? 0,
           messagesReplied: runtimeStatus?.messagesReplied ?? 0,
         },
+        accessPolicy: normalizeWhatsappAccessPolicy(config),
         error: structuredClone(this.#errors.get(config.botId) ?? null),
       };
     });
@@ -310,6 +329,8 @@ export class WhatsappController {
       name: identity.name,
       createdAt: previous?.createdAt ?? new Date().toISOString(),
       connectedAt: new Date().toISOString(),
+      accessMode: previous?.accessMode,
+      allowedNumbers: previous?.allowedNumbers,
     };
     try {
       if (record.controller.signal.aborted || this.#closed) throw Object.assign(new Error(), { name: 'AbortError' });

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

@@ -10,6 +10,10 @@ import { splitMessageText } from '../shared/editable-message-stream.mjs';
 import { ImagePromptError } from '../shared/image-prompt.mjs';
 import { trackOutboundArtifactProviderPromise } from '../shared/semantic/artifact.mjs';
 import { createWhatsappBridgeStatus, WhatsappHarnessBridge } from './whatsapp-bridge.mjs';
+import {
+  WHATSAPP_ACCESS_MODES,
+  normalizeWhatsappAccessPolicy,
+} from './config-store.mjs';
 import { createWhatsappWebSession } from './whatsapp-web-session.mjs';
 
 const IMAGE_MEDIA_TYPES = new Set(['image/jpeg', 'image/png', 'image/webp', 'image/gif']);
@@ -181,6 +185,7 @@ export function normalizeWhatsappMessage(message, accountJid, {
     && [remoteJid, alternateRemoteJid].some((jid) => jid && areJidsSameUser(jid, accountJid));
   if (fromMe && !selfChat) return null;
   const senderJid = selfChat ? accountJid : group ? message.key.participant : remoteJid;
+  const senderAlternateJid = group ? message.key.participantAlt : alternateRemoteJid;
   if (typeof senderJid !== 'string' || !senderJid) return null;
   const viewOnce = hasViewOnceWrapper(message.message);
   const content = normalizeMessageContent(message.message);
@@ -194,6 +199,7 @@ export function normalizeWhatsappMessage(message, accountJid, {
     messageId: `${remoteJid}:${messageId}`,
     providerMessageId: messageId,
     senderId: senderJid,
+    senderAlternateId: typeof senderAlternateJid === 'string' ? senderAlternateJid : '',
     senderIsBot: false,
     kind: group ? 'group' : 'direct',
     conversationId: remoteJid,
@@ -205,6 +211,22 @@ export function normalizeWhatsappMessage(message, accountJid, {
   };
 }
 
+export function whatsappInboundAllowed(message, {
+  accessMode = WHATSAPP_ACCESS_MODES.selfOnly,
+  allowedNumbers = new Set(),
+} = {}) {
+  if (accessMode === WHATSAPP_ACCESS_MODES.open) return true;
+  if (message?.kind !== 'direct') return false;
+  if (message.selfChat === true) return true;
+  if (accessMode !== WHATSAPP_ACCESS_MODES.privateAllowlist
+    || !(allowedNumbers instanceof Set)) return false;
+  const senderJids = [message.senderId, message.senderAlternateId]
+    .filter((jid) => typeof jid === 'string' && jid.endsWith('@s.whatsapp.net'));
+  return [...allowedNumbers].some((number) => senderJids.some((jid) => (
+    areJidsSameUser(jid, `${number}@s.whatsapp.net`)
+  )));
+}
+
 class RecentWhatsappOutboundIds {
   #ids = new Map();
 
@@ -390,6 +412,8 @@ export class WhatsappRuntime {
   #replyTimeoutMs;
   #connectTimeoutMs;
   #mediaUploadTimeoutMs;
+  #accessMode;
+  #allowedPrivateNumbers;
   #createSession;
   #status = createWhatsappRuntimeStatus();
   #abortController = null;
@@ -427,12 +451,21 @@ export class WhatsappRuntime {
       WHATSAPP_MEDIA_UPLOAD_TIMEOUT_MS,
     );
     this.#createSession = createSession;
+    this.setAccessPolicy(config);
   }
 
   get status() {
     return structuredClone(this.#status);
   }
 
+  setAccessPolicy(value) {
+    const policy = normalizeWhatsappAccessPolicy(value);
+    this.#accessMode = policy.accessMode;
+    this.#allowedPrivateNumbers = new Set(policy.allowedNumbers);
+    this.#config = { ...this.#config, ...policy };
+    return policy;
+  }
+
   async start() {
     if (this.#status.ready && this.#session) return this.status;
     if (this.#starting) return this.#starting;
@@ -466,6 +499,14 @@ export class WhatsappRuntime {
           const message = normalizeWhatsappMessage(raw, this.#config.accountJid);
           if (!message || outboundIds.has(message.providerMessageId) || !this.#bridge) return;
           this.#status.lastCheckedAt = Date.now();
+          if (!whatsappInboundAllowed(message, {
+            accessMode: this.#accessMode,
+            allowedNumbers: this.#allowedPrivateNumbers,
+          })) {
+            this.#status.messagesRejected += 1;
+            this.#status.lastRejectedAt = new Date().toISOString();
+            return;
+          }
           await this.#bridge.accept(message);
         },
         onDisconnect: ({ error }) => {