@modesto_ma/dsh-channels 0.5.0-beta.6 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modesto_ma/dsh-channels",
-  "version": "0.5.0-beta.6",
+  "version": "0.5.0",
   "description": "DeepSeek Harness (DSH) 飞书渠道插件：一个 dsh 实例对应一个飞书机器人，私聊/群聊/话题群 @ 触发会话，话题绑定 session，卡片 2.0 流式回复；Web 左侧栏提供「飞书渠道」状态与常用配置面板",
   "repository": {
     "type": "git",

package/src/access/cards.ts

@@ -49,6 +49,8 @@ export interface UserRequestCardInput {
   requesterName?: string
   /** Opaque request token. */
   token: string
+  /** Whether whitelisted users may also use private chats (`dmAllowWhitelist`). */
+  dmAllowWhitelist?: boolean
   /** Render timestamp (defaults to now). */
   now?: number
 }
@@ -158,7 +160,9 @@ export function buildUserRequestCard(input: UserRequestCardInput): object {
   }
   elements.push(field('申请时间', formatTime(input.now)))
   elements.push(divider())
-  elements.push(note('授权后该用户可在所有已授权群里使用；私聊仍仅管理员可用。'))
+  elements.push(note(input.dmAllowWhitelist === true
+    ? '授权后该用户可在所有已授权群里使用，也可以私聊机器人。'
+    : '授权后该用户可在所有已授权群里使用；私聊仍仅管理员可用。'))
   elements.push(decisionButtons(input.token, '授权用户', '忽略'))
   return standaloneCard('**🙋 用户授权申请**', elements)
 }

package/src/access/controller.ts

@@ -6,14 +6,15 @@
  * matrix lives in `policy.ts`; this module owns the user-facing behavior on
  * denial:
  *
- *  - private chats: non-administrators get one fixed notice (10 s per-sender
+ *  - private chats: denied senders (non-administrators, or non-whitelisted
+ *    users with `dmAllowWhitelist`) get one fixed notice (10 s per-sender
  *    cooldown); with no administrator configured they get the bootstrap
  *    notice instead;
  *  - group chats: fully silent, except that addressed denials call back into
  *    the authorization-request lifecycle so the administrator can be asked;
  *  - slash commands: `/userid` stays available to every private sender, the
  *    administrator's commands always pass (including inside an unauthorized
- *    group), everything else must pass admission.
+ *    group), everything else must pass admission (in private chats too).
  *
  * The controller never creates a Session or a workspace.
  *
@@ -30,6 +31,9 @@ import type { AccessStore, AccessStoreSnapshot } from './store.ts'
 /** Fixed private-chat notice for non-administrators (no model call). */
 export const DM_DENY_TEXT = '非管理员禁用私聊功能哦～如需使用，请在管理员授权的群里 @ 我；或联系管理员把你的 user_id 加入白名单。'
 
+/** Fixed private-chat notice for non-whitelisted users while `dmAllowWhitelist` is on. */
+export const DM_DENY_WHITELIST_TEXT = '你还不在白名单里，暂时不能私聊哦～发送 /userid 查看你的 user_id，请管理员加入白名单后即可使用。'
+
 /** Fixed private-chat notice while no administrator is configured. */
 export const DM_UNCONFIGURED_TEXT = '机器人尚未配置管理员。发送 /userid 可查看你的 user_id，交给部署者配置后即可启用。'
 
@@ -123,8 +127,9 @@ export class AccessController {
   /**
    * Slash-command admission. Runs before any command card/topic/Session side
    * effect. `open` mode keeps the legacy behavior; otherwise private chats
-   * stay administrator-only (with `/userid` as the bootstrap exception) and
-   * group chats must pass the full admission matrix; the administrator is
+   * admit whoever the admission matrix admits (with `/userid` as the
+   * bootstrap exception) and group chats must pass the full admission
+   * matrix; the administrator is
    * never constrained by the whitelists, so all of their commands pass even
    * inside an unauthorized group (`/auth` is the in-conversation grant
    * entry).
@@ -136,7 +141,7 @@ export class AccessController {
         // `/userid` is the bootstrap entry for everyone: it only echoes the
         // sender's own user_id and has no storage/model side effect.
         if (commandName === 'userid') return true
-        if (this.isAdmin(msg.senderId)) return true
+        if (this.decide(msg).kind === 'allow') return true
         await this.noticeDeniedDm(msg)
         return false
       }
@@ -207,7 +212,10 @@ export class AccessController {
     const last = this.dmNoticeAt.get(msg.senderId)
     if (last !== undefined && now - last < DM_NOTICE_COOLDOWN_MS) return
     this.dmNoticeAt.set(msg.senderId, now)
-    const text = this.config().adminUserId === undefined ? DM_UNCONFIGURED_TEXT : DM_DENY_TEXT
+    const config = this.config()
+    const text = config.adminUserId === undefined
+      ? DM_UNCONFIGURED_TEXT
+      : config.dmAllowWhitelist ? DM_DENY_WHITELIST_TEXT : DM_DENY_TEXT
     await this.sendText(msg.chatId, text, msg.messageId)
   }
 

package/src/access/policy.ts

@@ -11,7 +11,9 @@
  * Access model:
  *  - the administrator may start/continue a conversation in any private chat
  *    or any group, regardless of the whitelists;
- *  - private chats: non-administrators are refused;
+ *  - private chats: non-administrators are refused, unless
+ *    `dmAllowWhitelist` is on and their user_id is on the global user
+ *    whitelist;
  *  - group chats: non-administrators need the group to be authorized AND
  *    their user_id to be on the global user whitelist.
  *
@@ -56,7 +58,7 @@ export type AccessDecision =
   }
 
 /** The configuration slice admission reads (allows easy fakes in tests). */
-export type AccessPolicyConfig = Pick<FeishuConfig, 'accessMode' | 'adminUserId'>
+export type AccessPolicyConfig = Pick<FeishuConfig, 'accessMode' | 'adminUserId' | 'dmAllowWhitelist'>
 
 /** True when `userId` is exactly the configured administrator. */
 export function isAdminUserId(
@@ -90,6 +92,9 @@ export function decideAccess(
   if (subject.senderId.trim() === admin) return { kind: 'allow', reason: 'admin' }
 
   if (subject.chatType === 'p2p') {
+    if (config.dmAllowWhitelist && snapshot.users.has(subject.senderId)) {
+      return { kind: 'allow', reason: 'authorized-user' }
+    }
     return { kind: 'deny', reason: 'dm-non-admin' }
   }
 

package/src/access/requests.ts

@@ -350,6 +350,7 @@ export class AccessRequests {
         ...(groupName === undefined ? {} : { groupName }),
         ...(msg.senderName === undefined ? {} : { requesterName: msg.senderName }),
         token: record.token,
+        dmAllowWhitelist: this.config().dmAllowWhitelist,
         now,
       }), record)
       return true

package/src/config.ts

@@ -384,13 +384,20 @@ export const configSchema = z.object({
    * Admission policy for inbound Feishu traffic.
    *
    * - `guarded` (default): only the configured administrator can talk in
-   *   private chats, and a group conversation additionally requires the group
-   *   to be authorized and the sender to be the administrator or an explicitly
+   *   private chats (plus whitelisted users when `dmAllowWhitelist` is on),
+   *   and a group conversation additionally requires the group to be
+   *   authorized and the sender to be the administrator or an explicitly
    *   authorized user.
    * - `open`: legacy behavior — any user inside the app's availability scope
    *   can start a conversation. Debug/compatibility only; unsafe.
    */
   accessMode: z.enum(['open', 'guarded']).default('guarded'),
+  /**
+   * In `guarded` mode, also admit users on the global user whitelist
+   * (`/auth user`) in private chats. Off by default: private chats stay
+   * administrator-only. Each private-chat user already has an own workspace.
+   */
+  dmAllowWhitelist: z.boolean().default(false),
   /**
    * The unique administrator's Feishu `user_id`. Set it in the Web
    * settings panel (or the profile config). Get it by sending `/userid` to the

package/src/domain.ts

@@ -217,8 +217,8 @@ export type AccessGroupRecord = z.infer<typeof accessGroupRecordSchema>
 
 /**
  * One authorized user (`user_id`), global across every authorized group.
- * Private chats are administrator-only, so this grant only affects group
- * conversations.
+ * Private chats are administrator-only unless `dmAllowWhitelist` is on, so
+ * by default this grant only affects group conversations.
  */
 export const accessUserRecordSchema = z.object({
   /** Feishu `user_id` — also the table key. */

package/src/service.ts

@@ -1922,6 +1922,7 @@ export class FeishuService {
         await this.delivery.standaloneReply(msg, standaloneInfoCard('**🔐 访问授权状态**', [
           `**准入模式**：\`${this.config.accessMode}\``,
           `**管理员**：${this.adminStatusLine()}`,
+          `**私聊**：${this.config.dmAllowWhitelist ? '管理员与白名单用户' : '仅管理员'}`,
           ...(msg.chatType === 'group'
             ? [`**本群**：${this.accessStore.hasGroup(msg.chatId) ? '已授权' : '未授权'}（\`${msg.chatId}\`）`]
             : []),

package/src/settings/contract.ts

@@ -164,6 +164,7 @@ export const EDITABLE_KEYS = [
   'promptContextTimeoutMs',
   // 准入与授权（白名单由「访问授权」tab 的列表管理）
   'accessMode',
+  'dmAllowWhitelist',
   'adminUserId',
   'authRequestTtlDays',
   // 知识库（顶层 `wikiRoots` 字符串列表；为空时不挂载任何知识库工具）

package/src/settings/surface.ts

@@ -153,6 +153,7 @@ const BOOLEAN_KEYS = new Set<EditableKey>([
   'welcomeOnboarding',
   'slashCommandPanel',
   'allowPermissionSwitch',
+  'dmAllowWhitelist',
   'acceptAttachments',
   'prefetchImages',
   'feishuTools.attachmentFetch',
@@ -401,7 +402,13 @@ const FIELD_META: Record<EditableKey, FieldMeta> = {
     label: '调试模式',
     group: 'access',
     summary: '打开后所有人都能聊，不安全，只在调试时用',
-    help: '关闭时（默认）：管理员随时可用；非管理员私聊会被拒绝；群聊要同时满足群已授权、发言人在用户白名单里。授权入口有三个：群里 /auth 命令、授权卡、本页。撤销立即生效。',
+    help: '关闭时（默认）：管理员随时可用；非管理员私聊会被拒绝（打开「白名单用户可私聊」后白名单用户也可以）；群聊要同时满足群已授权、发言人在用户白名单里。授权入口有三个：群里 /auth 命令、授权卡、本页。撤销立即生效。',
+  },
+  dmAllowWhitelist: {
+    label: '白名单用户可私聊',
+    group: 'access',
+    summary: '关闭时私聊仅管理员可用',
+    help: '打开后「已授权用户」里的人也可以私聊机器人，各自使用独立的私聊工作区，能力与群聊相同；不在白名单的人仍收到固定提示。撤销用户立即生效。',
   },
   adminUserId: {
     label: '管理员 user_id',