@modesto_ma/dsh-channels 0.4.0 → 0.5.0-beta.1

package/src/session/manager.ts

@@ -293,7 +293,7 @@ export class SessionManager {
     const workspacePath = record.workspacePath
     const workspace = await this.deps.ctx.workspaceRegistry.create(
       workspacePath,
-      workspaceTitleFor(record.chatType, record.chatId, record.senderOpenId),
+      workspaceTitleFor(record.chatType, record.chatId, record.senderUserId),
     )
 
     let newHandle: AgentHandle | undefined

package/src/session/routes.ts

@@ -135,8 +135,7 @@ export class RouteStore {
 
   /**
    * Retire one active thread route into a persistent tombstone regardless of
-   * the configured TTL. Used by the workspace-retention cleanup, which may
-   * close topics earlier than the route TTL.
+   * the configured TTL.
    */
   async retire(key: string, now = Date.now()): Promise<ExpiredRouteRecord | undefined> {
     const record = this.get(key)
@@ -145,7 +144,7 @@ export class RouteStore {
       key,
       chatId: record.chatId,
       chatType: record.chatType,
-      senderOpenId: record.senderOpenId,
+      senderUserId: record.senderUserId,
       expiredAt: now,
       workspacePath: record.workspacePath,
       ...(record.sessionDir === undefined ? {} : { sessionDir: record.sessionDir }),

package/src/settings/contract.ts

@@ -20,13 +20,11 @@ export const CREDENTIALS_ROUTE = '/dsh-channels/credentials'
 export const RECONNECT_ROUTE = '/dsh-channels/reconnect'
 /** 模型/推理档位/预设选择器的宿主目录（provider → model → effort 级联刷新）。 */
 export const CATALOG_ROUTE = '/dsh-channels/catalog'
-/** 手动执行一次过期目录清理（POST，无请求体）。 */
-export const CLEANUP_ROUTE = '/dsh-channels/cleanup'
 /** 访问与授权只读快照（GET/HEAD）：准入模式、管理员、群/用户白名单、待处理申请。 */
 export const ACCESS_ROUTE = '/dsh-channels/access'
 /** 群白名单增删（POST/DELETE，body `{ chatId, name? }` / `{ chatId }`）。 */
 export const ACCESS_GROUPS_ROUTE = '/dsh-channels/access/groups'
-/** 用户白名单增删（POST/DELETE，body `{ openId, name? }` / `{ openId }`）。 */
+/** 用户白名单增删（POST/DELETE，body `{ userId, name? }` / `{ userId }`）。 */
 export const ACCESS_USERS_ROUTE = '/dsh-channels/access/users'
 /** 结算一条待处理授权申请（POST，body `{ token, decision }`）。 */
 export const ACCESS_REQUESTS_ROUTE = '/dsh-channels/access/requests'
@@ -56,16 +54,15 @@ export const PICK_DIRECTORY_ROUTE = '/dsh-channels/pick-directory'
 export const EDITABLE_KEYS = [
   // 工作区
   'baseDir',
-  'workspaceRetention',
-  'workspaceRetentionAuto',
   // 行为
   'dmMode',
   'requireMention',
   'threadFallback',
   'welcomeOnboarding',
+  'slashCommandPanel',
   'allowPermissionSwitch',
   // 准入与授权（管理员/准入模式/申请有效期；白名单由「访问与授权」卡片管理）
-  'adminOpenId',
+  'adminUserId',
   'accessMode',
   'authRequestTtlDays',
   // 内容与附件（v2 管线；`feishuTools.*` 是嵌套配置，覆盖层仍写成嵌套对象）
@@ -76,8 +73,6 @@ export const EDITABLE_KEYS = [
   'prefetchImageMaxBytes',
   'prefetchTotalMaxBytes',
   'historyBootstrapLimit',
-  'pendingAttachmentTtlMs',
-  'pendingAttachmentLimit',
   // 模型工具（feishuTools 子项）
   'feishuTools.attachmentFetch',
   'feishuTools.attachmentFetchMaxResources',
@@ -85,6 +80,7 @@ export const EDITABLE_KEYS = [
   'feishuTools.attachmentFetchTimeoutMs',
   'feishuTools.topicMessages',
   'feishuTools.topicMessagesTimeoutMs',
+  'feishuTools.sendFile',
   'promptContextTimeoutMs',
   // 模型
   'provider',
@@ -106,6 +102,7 @@ export type EditableKey = (typeof EDITABLE_KEYS)[number]
 export const RESTART_KEYS = [
   'dmMode',
   'requireMention',
+  'slashCommandPanel',
   'refreshMs',
   'statusRefreshMs',
   'loggerLevel',
@@ -266,8 +263,40 @@ export interface ChannelStatusWire {
   overlayPath: string
   /** 正在连接或重连时为 true，此时面板的写操作按钮禁用。 */
   busy: boolean
+  /** 连接后的权限自检结果；未连接或自检尚未完成时缺省。 */
+  scopeCheck?: ScopeCheckWire
+  /** 连接后飞书原生斜杠指令面板的同步结果；未连接或同步尚未完成时缺省。 */
+  slashCommandSync?: SlashCommandSyncWire
 }
 
+/** One plugin need whose scopes are all missing. */
+export interface MissingScopeWire {
+  /** Scope names, preferred first; granting any one satisfies the need. */
+  scopes: string[]
+  /** `required` breaks a core path; `optional` only degrades a feature. */
+  level: 'required' | 'optional'
+  /** What the plugin loses without it. */
+  purpose: string
+  /** Developer-console permission page filtered to the preferred scope. */
+  consoleUrl: string
+}
+
+/** Post-connect scope self-check outcome. */
+export type ScopeCheckWire =
+  /** Every applicable need is granted. */
+  | { state: 'ok'; checkedAt: number }
+  /** Some needs are missing; `consoleUrl` opens the console filtered to all of them. */
+  | { state: 'missing'; checkedAt: number; missing: MissingScopeWire[]; consoleUrl: string }
+  /** The grant list could not be read; `error` carries the Feishu reason. */
+  | { state: 'error'; checkedAt: number; error: string }
+
+/** Post-connect native slash-command panel sync outcome. */
+export type SlashCommandSyncWire =
+  /** The panel lists exactly the registry commands; counts are this sync's writes. */
+  | { state: 'ok'; checkedAt: number; created: number; updated: number; removed: number; total: number }
+  /** A Feishu call failed; `error` carries the Feishu reason. */
+  | { state: 'error'; checkedAt: number; error: string }
+
 /** The whole editable configuration surface, with provenance. */
 export interface PanelConfigWire {
   /** profile `cordis.patch.yml` 提供的值（覆盖层之下）。 */
@@ -298,9 +327,9 @@ export interface AccessGroupWire {
   addedAt: number
 }
 
-/** One authorized user `open_id` (global across every authorized group). */
+/** One authorized user `user_id` (global across every authorized group). */
 export interface AccessUserWire {
-  openId: string
+  userId: string
   /** Display name captured at authorization time. */
   name?: string
   /** Which authorization entry produced the grant. */
@@ -314,7 +343,7 @@ export interface AccessRequestWire {
   /** Opaque token; never derived from the target id. */
   token: string
   kind: 'group' | 'user'
-  /** `chat_id` for a group request, `open_id` for a user request. */
+  /** `chat_id` for a group request, `user_id` for a user request. */
   targetId: string
   /** Display name of the requested target (group name / user name), when known. */
   name?: string
@@ -337,9 +366,14 @@ export interface AccessRequestWire {
 export interface AccessWire {
   mode: 'open' | 'guarded'
   admin: {
-    openId?: string
+    /** The effective administrator: configured `adminUserId`, else the app owner. */
+    userId?: string
+    /** Where `userId` came from: explicit config or the app-owner fallback. */
+    source?: 'config' | 'owner'
     /** false while guarded mode would refuse every conversation (fail closed). */
     configured: boolean
+    /** Why the app-owner fallback is unavailable, when its lookup failed. */
+    ownerLookupError?: string
   }
   /**
    * Whether the persisted whitelists were loaded. While the channel holds no
@@ -361,51 +395,10 @@ export type AccessMutationResponse =
 export interface PanelWire {
   status: ChannelStatusWire
   config: PanelConfigWire
-  cleanup: CleanupPreviewWire
   /** 访问与授权卡片的数据（准入模式、管理员、白名单、待处理申请）。 */
   access: AccessWire
 }
 
-/**
- * What the workspace-retention cleanup would delete right now. Counts are
- * zero and `error` is set when the Host cannot compute the preview (for
- * example the cleanup seam is unavailable); the panel stays usable.
- */
-export interface CleanupPreviewWire {
-  /** Effective `workspaceRetention` value (`off` / `7d` / `30d` / `90d` / `180d`). */
-  retention: string
-  /** Retention threshold in milliseconds; absent when `retention` is `off`. */
-  thresholdMs?: number
-  /** Periodic cleanup runs at startup and once per day. */
-  auto: boolean
-  /** Plugin-created workspaces under the current baseDir (user projects). */
-  workspaces: number
-  /** Directories older than the threshold (legacy topic workspaces + per-topic dirs). */
-  candidates: number
-  /** Total bytes currently occupied by the candidates. */
-  candidateBytes: number
-  /** Why the preview could not be computed (counts are zero then). */
-  error?: string
-}
-
-/** Outcome of one manual cleanup run (partial failures do not abort the run). */
-export interface CleanupRunWire {
-  ok: boolean
-  deletedWorkspaces: number
-  /** Per-topic working directories removed (current layout). */
-  deletedSessionDirs: number
-  retiredRoutes: number
-  freedBytes: number
-  /** One `path: message` line per directory that could not be deleted. */
-  failures: string[]
-  error?: string
-}
-
-/** `POST /dsh-channels/cleanup` response. */
-export type CleanupResponse =
-  | { ok: true; panel: PanelWire; result: CleanupRunWire }
-  | { ok: false; error: string }
-
 /**
  * `POST /dsh-channels/pick-directory` response. `canceled` is a normal
  * outcome (the operator dismissed the OS dialog), not an error; `path` is an
@@ -540,6 +533,21 @@ export const PANEL_COPY = {
   statusSummaryConnecting: '正在连接飞书长连接…',
   statusSummaryError: '最近一次连接飞书失败，请检查凭据与网络后重试。',
   lastError: '最近一次连接失败',
+  scopeCheckTitle: '权限自检',
+  scopeCheckOk: '已开通插件需要的全部飞书权限。',
+  scopeCheckMissing: '以下飞书权限未开通，开通后需在开发者后台发布新版本：',
+  scopeCheckOpenAll: '在开发者后台开通全部缺失权限',
+  scopeCheckOpenOne: '去开通',
+  scopeCheckOptional: '可选',
+  scopeCheckRequired: '必需',
+  scopeCheckError: '无法读取应用的权限授予状态：',
+  slashCommandSyncTitle: '斜杠指令面板',
+  slashCommandSyncOk: '插件命令已同步到飞书原生斜杠指令面板，在聊天框输入 / 即可选择（飞书客户端约 5 分钟后刷新）。',
+  slashCommandSyncTotal: '命令数',
+  slashCommandSyncCreated: '本次新增',
+  slashCommandSyncUpdated: '本次更新',
+  slashCommandSyncRemoved: '本次删除',
+  slashCommandSyncError: '同步飞书原生斜杠指令面板失败（不影响直接输入命令）：',
   missingConfig: '缺少配置',
   statusHintUnconfigured: '配置完成后插件会自动连接；也可以稍后在本页手动连接。',
   connectionInfo: '连接信息',
@@ -588,9 +596,9 @@ export const PANEL_COPY = {
   credentialsPendingHint: '填写后点「保存凭据」；两项齐全时插件会自动连接飞书。',
   // ---- tabs / forms -------------------------------------------------------
   connectionTabHelp: '连接状态与飞书应用凭据。凭据不完整时不会连接飞书。',
-  sessionsTabHelp: '私聊、群聊触发方式与入站内容：附件存储/预取、静默登记保留、模型工具开关与读取预算；「需重连」项在下次连接时读取。',
+  sessionsTabHelp: '私聊、群聊触发方式与入站内容：附件存储/预取、模型工具开关与读取预算；「需重连」项在下次连接时读取。',
   modelTabHelp: '飞书会话使用的模型服务商、模型、推理档位与 Agent 预设；下拉选项来自宿主机实时目录，保存后对新会话生效。',
-  workspaceTabHelp: '每个用户一个工作区（模型/工具产生文件的落点），每个话题在其中拥有独立工作目录；只影响之后新建的话题。入站附件默认存于 DSH 原生附件库，不占用话题目录，也不会被这里的目录清理删除。',
+  workspaceTabHelp: '每个用户一个工作区（模型/工具产生文件的落点），每个话题在其中拥有独立工作目录；只影响之后新建的话题。入站附件默认存于 DSH 原生附件库，不占用话题目录。插件不会自动删除工作区或话题目录；过期目录可手动删除，话题下次对话时会重建空目录。',
   accessTabHelp: '准入采用 fail-closed：管理员不受白名单限制，非管理员私聊会被拒绝，群聊需要「群已授权 + 用户在白名单」两层同时命中。',
   advancedTabHelp: '流式刷新等低层参数、Web 覆盖文件与只读信息。',
   save: '保存更改',
@@ -637,37 +645,12 @@ export const PANEL_COPY = {
   advancedHelp: '这些值来自 profile 配置，不能在面板里编辑。',
   readOnlyCard: '部署级参数',
   // ---- model --------------------------------------------------------------
-  // ---- cleanup ------------------------------------------------------------
-  cleanupCard: '目录清理',
-  cleanupCardHelp: '只清理工作区与 Agent 产物：删除超过保留期且不再活跃的飞书话题目录、旧版本按话题建立的工作区目录，以及这些目录内 Agent 产生的文件；不影响 Session 附件——入站图片/文件默认存于 DSH 原生附件库，不随目录清理删除。用户工作区本身与 DSH 会话日志也不会删除。删除不可恢复：相关旧话题会失效并提示已过期。',
-  cleanupRetention: '保留期',
-  cleanupAutoLabel: '自动清理',
-  cleanupCandidates: '可清理目录',
-  cleanupWorkspaces: '插件工作区',
-  cleanupCandidateBytes: '预计释放空间',
-  cleanupRetentionOff: '关闭（不删除）',
-  cleanupAutoOn: '已开启（启动时 + 每天一次）',
-  cleanupAutoOff: '已关闭（仅手动执行）',
-  cleanupAutoInactive: '未执行（保留期为关闭）',
-  cleanupNow: '立即清理',
-  cleanupRunning: '清理中…',
-  cleanupConfirm: '确定清理过期目录吗？只清理工作区与 Agent 产物，不影响 Session 附件；但这些目录内未提交的文件会被删除，且操作不可恢复。',
-  cleanupConfirmHint: '删除前会再次确认；保留期为「关闭」或没有过期目录时按钮不可用。',
-  cleanupDisabledOff: '保留策略为「关闭」：请先在上方「过期目录保留期」中选择保留天数。',
-  cleanupDisabledEmpty: '没有超过保留期的过期目录。',
-  cleanupPreviewFailed: '无法读取清理预览',
-  cleanupDone: '清理完成',
-  cleanupFailed: '清理失败',
-  cleanupDeleted: '已删除工作区',
-  cleanupDeletedDirs: '话题目录',
-  cleanupRetired: '已清理话题路由',
-  cleanupFreed: '释放空间',
-  cleanupFailures: '以下目录未能删除：',
   // ---- access -------------------------------------------------------------
   accessCard: '访问与授权',
-  accessCardHelp: '准入采用 fail-closed：管理员不受白名单限制（私聊、任意群聊都可直接对话）；非管理员私聊会被拒绝，群聊需要「群已授权 + 用户在白名单」两层同时命中。管理员与准入模式在上方「准入与授权」中编辑；私聊机器人发送 /userid 获取自己的 open_id。',
+  accessCardHelp: '准入采用 fail-closed：管理员不受白名单限制（私聊、任意群聊都可直接对话）；非管理员私聊会被拒绝，群聊需要「群已授权 + 用户在白名单」两层同时命中。管理员与准入模式在上方「准入与授权」中编辑；私聊机器人发送 /userid 获取自己的 user_id。',
   accessModeOpenWarning: '当前准入模式为开放（open）：应用可用范围内的任何人都能开启对话。该模式不安全，仅建议调试时使用。',
-  accessAdminMissingWarning: '当前准入=guarded 但未配置管理员，所有对话都会被拒绝。请在上方「准入与授权」填写管理员 open_id。',
+  accessAdminMissingWarning: '当前准入=guarded 但未配置管理员，也无法自动使用应用所有者，所有对话都会被拒绝。请在上方「准入与授权」填写管理员 user_id（私聊机器人发送 /userid 获取；私聊模式关闭时 /userid 不可用，可在飞书管理后台的成员详情里查看用户 ID）。',
+  accessAdminOwnerNotice: '未配置管理员，已自动使用应用所有者作为管理员：',
   accessGroupsTitle: '已授权群',
   accessGroupsEmpty: '尚未授权任何群。机器人被拉进群后，管理员会收到带 chat_id 的群信息卡；也可在群内发送 /groupid 获取。',
   accessUsersTitle: '已授权用户',
@@ -676,7 +659,7 @@ export const PANEL_COPY = {
   accessRequestsEmpty: '没有待处理的授权申请。',
   accessGroupChatIdPlaceholder: '群 chat_id（oc_…）',
   accessGroupNamePlaceholder: '群名（可选）',
-  accessUserOpenIdPlaceholder: '用户 open_id（ou_…）',
+  accessUserIdPlaceholder: '用户 user_id',
   accessUserNamePlaceholder: '昵称（可选）',
   accessAddGroup: '添加群',
   accessAddUser: '添加用户',
@@ -698,5 +681,5 @@ export const PANEL_COPY = {
   accessRequestAllowed: '已授权',
   accessRequestDenied: '已忽略',
   accessHints: '三种授权入口：群内 /auth 命令、入群与用户授权卡、本面板。撤销立即生效；白名单只约束非管理员（管理员在任何私聊/群聊都直接放行），非管理员需要群和用户两层同时命中。',
-  accessChatIdHint: 'chat_id 可从入群群信息卡或群内 /groupid 获取；open_id 可私聊机器人发送 /userid 获取。',
+  accessChatIdHint: 'chat_id 可从入群群信息卡或群内 /groupid 获取；user_id 可私聊机器人发送 /userid 获取。',
 } as const

package/src/settings/routes.ts

@@ -1,6 +1,6 @@
 /**
  * Web 设置面板的 HTTP 路由：status / panel / catalog / config(PUT,DELETE) /
- * credentials(PUT,DELETE) / reconnect / cleanup / access。
+ * credentials(PUT,DELETE) / reconnect / access。
  *
  * 路由注册进宿主可选的 `webServer` 服务（headless profile 没有它时面板自然
  * 不存在，飞书通道不受影响）。写操作额外做同源校验 —— 本机非回环绑定下
@@ -20,7 +20,6 @@ import {
   ACCESS_ROUTE,
   ACCESS_USERS_ROUTE,
   CATALOG_ROUTE,
-  CLEANUP_ROUTE,
   CONFIG_ROUTE,
   CREDENTIALS_ROUTE,
   PANEL_ROUTE,
@@ -310,19 +309,6 @@ export function registerSettingsRoutes(server: HostWebServer, surface: SettingsS
         sendJson(res, result.ok ? 200 : (result.unconfigured === true ? 400 : 500), result)
       }),
     }),
-    server.register({
-      kind: 'exact',
-      path: CLEANUP_ROUTE,
-      handler: guarded(async (req, res) => {
-        if (!allowOnly(req, res, ['POST'])) return
-        if (!isSameOriginRequest(req)) {
-          forbiddenWrite(res)
-          return
-        }
-        const result = await surface.runCleanup()
-        sendJson(res, result.ok ? 200 : 500, result)
-      }),
-    }),
     server.register({
       kind: 'exact',
       path: PICK_DIRECTORY_ROUTE,
@@ -404,8 +390,8 @@ export function registerSettingsRoutes(server: HostWebServer, surface: SettingsS
         const payload = await readAccessBody(req, res)
         if (payload === undefined) return
         const result = methodOf(req) === 'DELETE'
-          ? await surface.removeAccessUser(payload.openId)
-          : await surface.saveAccessUser(payload.openId, payload.name)
+          ? await surface.removeAccessUser(payload.userId)
+          : await surface.saveAccessUser(payload.userId, payload.name)
         sendJson(res, result.ok ? 200 : 400, result)
       }),
     }),