oasis_test_v2 2.2.112 → 2.2.113

package/dist/feishu/wrapper.sh

@@ -11,13 +11,15 @@
 #   LARK_BIN          — 真实 lark-cli 绝对路径（避免递归调用自身）
 #   FEISHU_CREDS_FILE — 凭据文件路径（内含 export LARKSUITE_CLI_* 行）
 #
-# 按 Agent 限制可用模块（产品反馈「飞书连接器·按 Agent 的权限模型」）：凭据文件里有
-# OASIS_FEISHU_ALLOW 时，只放行所选模块的 `lark-cli <domain>` 与 `lark-cli api <METHOD> /open-apis/<service>/…`，
-# 机器人与用户身份一样拦（bot 的企业 token 能调应用开通的全集，飞书侧分不开）。放行表由 inject() 按
-# FEISHU_AUTH_SELECTION 算好写入（feishuModulePolicyEnv），这里不认识任何模块，只查表。
+# 按 Agent 限制可用模块（产品反馈「飞书连接器·按 Agent 的权限模型」）：只放行所选模块的
+# `lark-cli <domain> …` 与 `lark-cli api <METHOD> /open-apis/<service>/…`，机器人与用户身份一样拦
+# （bot 的企业 token 能调应用开通的全集，飞书侧分不开）。放行表由 inject() 按 FEISHU_AUTH_SELECTION
+# 算好写入凭据文件（feishuModulePolicyEnv），这里不认识任何模块，只按规则表（OASIS_FEISHU_RULES）查。
+# 共用的 drive 命令/接口按子命令、路径细分。**没有放行表、没有有效选择都按一个模块都没开放拦**，不会退成不限制。
 # 被拦时照 lark-cli 的错误形状往 stderr 打一段 JSON、退出码 3（与 lark-cli 自己的鉴权失败同码）。
 
 set -euo pipefail
+shopt -s extglob   # 放行规则用 +([!/]) / ?(/*) 表示「一段」「零到多段」
 
 OASIS_BIN_VAR="LARK_BIN"
 OASIS_CMD_NAME="lark-cli"
@@ -28,7 +30,7 @@ oasis_resolve_bin
 oasis_check_available
 
 # 放行表只认凭据文件里的：先清掉 agent 环境里可能带进来的同名变量。
-unset OASIS_FEISHU_ALLOW OASIS_FEISHU_NEED OASIS_FEISHU_MODULES
+unset OASIS_FEISHU_POLICY OASIS_FEISHU_ALLOW OASIS_FEISHU_RULES OASIS_FEISHU_LABELS OASIS_FEISHU_MODULES
 
 # Load feishu credentials into THIS process only (not visible to the agent).
 if [ -n "${FEISHU_CREDS_FILE:-}" ] && [ -f "${FEISHU_CREDS_FILE}" ]; then
@@ -41,34 +43,82 @@ FEISHU_NEUTRAL_COMMANDS=" help schema skills whoami doctor completion auth confi
 # 任何模块都放行的接口 service；与 scopes.ts FEISHU_NEUTRAL_API_SERVICES 同一份。
 FEISHU_NEUTRAL_API=" authen auth "
 
+feishu_reply_blocked() {
+  printf '{\n  "ok": false,\n  "error": {\n    "type": "oasis_module_blocked",\n    "message": "%s",\n    "hint": "%s"\n  }\n}\n' "$1" "$2" >&2
+  exit 3
+}
+
 feishu_blocked() {
-  # $1 = 放行表里的键（cmd:<domain> / api:<service>）；$2 = 给人看的命令写法（已过滤成安全字符）。
-  local key="$1" shown="$2" need="" message hint
-  local entry
-  for entry in ${OASIS_FEISHU_NEED:-}; do
-    if [ "${entry%%=*}" = "$key" ]; then need="${entry#*=}"; break; fi
-  done
-  if [ -n "$need" ]; then
-    message="本 agent 的飞书连接器没有开放「${need}」模块，${shown} 已被 Oasis 拦下（机器人与用户身份都不可用）。当前开放的模块：${OASIS_FEISHU_MODULES:-无}。"
-    hint="如需使用，请让配置人在 Oasis 里这个 agent 的飞书连接器详情点「重新连接」，勾选「${need}」后完成授权。"
-  else
-    message="${shown} 不属于任何可勾选的飞书功能模块；本 agent 的飞书调用已按模块限制，Oasis 不放行它。当前开放的模块：${OASIS_FEISHU_MODULES:-无}。"
-    hint="请改用已开放模块对应的 lark-cli 命令；确需此能力请联系 Oasis 管理员。"
+  # $1 = 规则要求的模块（逗号分隔，空 = 不属于任何模块）；$2 = 给人看的命令写法（已过滤成安全字符）。
+  local mods="$1" shown="$2" need="" m entry label
+  local reconnect="请让配置人在 Oasis 里这个 agent 的飞书连接器详情点「重新连接」"
+  case "${OASIS_FEISHU_POLICY:-}" in
+    ok) ;;
+    none)
+      feishu_reply_blocked "本 agent 的飞书连接器还没有保存过可用模块的选择，Oasis 按「一个模块都没开放」处理，${shown} 已被拦下（机器人与用户身份都不可用）。" \
+        "${reconnect}，勾选需要的模块后完成授权。" ;;
+    invalid)
+      feishu_reply_blocked "本 agent 的飞书连接器保存的模块选择无法识别，Oasis 按「一个模块都没开放」处理，${shown} 已被拦下（机器人与用户身份都不可用）。" \
+        "${reconnect}，重新勾选模块后完成授权。" ;;
+    *)
+      feishu_reply_blocked "本次运行没有拿到飞书模块放行表，Oasis 不放行 ${shown}（机器人与用户身份都不可用）。" \
+        "请重新发起任务；仍出现请联系 Oasis 管理员检查飞书连接器。" ;;
+  esac
+  if [ -n "$mods" ]; then
+    for m in ${mods//,/ }; do
+      label="$m"
+      for entry in ${OASIS_FEISHU_LABELS:-}; do
+        if [ "${entry%%=*}" = "$m" ]; then label="${entry#*=}"; break; fi
+      done
+      need="${need:+${need}」或「}${label}"
+    done
+    feishu_reply_blocked "本 agent 的飞书连接器没有开放「${need}」模块，${shown} 已被 Oasis 拦下（机器人与用户身份都不可用）。当前开放的模块：${OASIS_FEISHU_MODULES:-无}。" \
+      "如需使用，${reconnect}，勾选「${need}」后完成授权。"
   fi
-  printf '{\n  "ok": false,\n  "error": {\n    "type": "oasis_module_blocked",\n    "message": "%s",\n    "hint": "%s"\n  }\n}\n' "$message" "$hint" >&2
-  exit 3
+  feishu_reply_blocked "${shown} 不属于任何可勾选的飞书功能模块；本 agent 的飞书调用已按模块限制，Oasis 不放行它。当前开放的模块：${OASIS_FEISHU_MODULES:-无}。" \
+    "请改用已开放模块对应的 lark-cli 命令；共用的 drive 子命令须紧跟在 drive 之后写。确需此能力请联系 Oasis 管理员。"
 }
 
 # 只把「看起来像命令名 / service 名」的字符串回显出来，其余一律写成占位——它要进 JSON。
 feishu_safe() {
   case "$1" in
-    ''|*[!A-Za-z0-9_.-]*) printf '%s' "该命令" ;;
+    ''|*[!A-Za-z0-9_.+-]*) printf '%s' "该命令" ;;
+    *) printf '%s' "$1" ;;
+  esac
+}
+
+# 按规则表判 $1（cmd/<domain>/… 或 api/<METHOD>/<service>/…）：命中且所需模块里有一个已放行 → 放行；
+# 命中但都没放行 → 拦并说缺哪个；一条都没命中 → 拦（不属于任何模块）。
+feishu_check_key() {
+  local key="$1" shown="$2" entry pat mods m
+  set -f
+  for entry in ${OASIS_FEISHU_RULES:-}; do
+    pat="${entry%=*}"; mods="${entry##*=}"
+    # shellcheck disable=SC2254
+    case "$key" in
+      $pat)
+        set +f
+        if [ "${OASIS_FEISHU_POLICY:-}" = "ok" ]; then
+          for m in ${mods//,/ }; do
+            case "${OASIS_FEISHU_ALLOW:-}" in *" $m "*) return 0 ;; esac
+          done
+        fi
+        feishu_blocked "$mods" "$shown" ;;
+    esac
+  done
+  set +f
+  feishu_blocked "" "$shown"
+}
+
+# 命令行里的一个词能不能原样进规则 key：只允许命令名字符，其余写成 ?（不会命中任何规则）。
+feishu_seg() {
+  case "$1" in
+    ''|*[!A-Za-z0-9_.+-]*) printf '?' ;;
     *) printf '%s' "$1" ;;
   esac
 }
 
 feishu_enforce_modules() {
-  [ -n "${OASIS_FEISHU_ALLOW:-}" ] || return 0   # 没保存过模块选择：不限制
   local args=("$@") i=0 n=$# cmd=""
   # 跳过命令前的全局参数（--profile X、-h/--help、-v/--version）。
   while [ "$i" -lt "$n" ]; do
@@ -82,8 +132,8 @@ feishu_enforce_modules() {
   case "$FEISHU_NEUTRAL_COMMANDS" in *" $cmd "*) return 0 ;; esac
 
   if [ "$cmd" = "api" ]; then
-    # lark-cli api <METHOD> <path> [flags]：取 api 之后第二个位置参数为 path（跳过带值的参数）。
-    local pos=0 path="" a
+    # lark-cli api <METHOD> <path> [flags]：api 之后第一、二个位置参数为 method、path（跳过带值的参数）。
+    local pos=0 method="" path="" a
     i=$((i + 1))
     while [ "$i" -lt "$n" ]; do
       a="${args[$i]}"
@@ -92,27 +142,49 @@ feishu_enforce_modules() {
         -*) i=$((i + 1)); continue ;;
       esac
       pos=$((pos + 1))
+      if [ "$pos" -eq 1 ]; then method="$a"; fi
       if [ "$pos" -eq 2 ]; then path="$a"; break; fi
       i=$((i + 1))
     done
     [ -n "$path" ] || return 0                   # 没给 path：lark-cli 自己报用法错，不会发请求
-    # 归一成 <service>/…：lark-cli 接受完整 URL、/open-apis/ 前缀可省、前导斜杠可省。
+    # 归一成 <service>/…：lark-cli 接受完整 URL、/open-apis/ 前缀可省、前导斜杠可省；连续斜杠并成一个。
     local p="$path"
     p="${p#http://}"; p="${p#https://}"
     case "$path" in http://*|https://*) p="${p#*/}" ;; esac
     while [ "${p#/}" != "$p" ]; do p="${p#/}"; done
     p="${p#open-apis/}"
     while [ "${p#/}" != "$p" ]; do p="${p#/}"; done
-    # 路径里带 .. 或百分号编码的，不去猜它最后落到哪个 service——直接拒。
-    case "$p" in *..*|*%*|*\\*) feishu_blocked "api:?" "lark-cli api（路径含 .. 或编码字符）" ;; esac
-    local svc="${p%%[/?#]*}"
+    p="${p%%[?#]*}"
+    while [ "${p//\/\//\/}" != "$p" ]; do p="${p//\/\//\/}"; done
+    # 路径里带 ..、. 段或百分号编码的，不去猜它最后落到哪个接口——直接拒。
+    case "/$p/" in *..*|*%*|*\\*|*/./*) feishu_blocked "" "lark-cli api（路径含 .. 或编码字符）" ;; esac
+    local svc="${p%%/*}"
     case "$FEISHU_NEUTRAL_API" in *" $svc "*) return 0 ;; esac
-    case "$OASIS_FEISHU_ALLOW" in *" api:$svc "*) return 0 ;; esac
-    feishu_blocked "api:$svc" "lark-cli api …/open-apis/$(feishu_safe "$svc")/…"
+    case "$p" in *[!A-Za-z0-9_./:-]*) feishu_blocked "" "lark-cli api（路径含非法字符）" ;; esac
+    # 方法名转大写（macOS 自带 bash 3.2 没有 ${x^^}）。
+    method="$(feishu_seg "$method" | tr '[:lower:]' '[:upper:]')"
+    feishu_check_key "api/$method/$p" "lark-cli api …/open-apis/$(feishu_safe "$svc")/…"
+    return 0
   fi
 
-  case "$OASIS_FEISHU_ALLOW" in *" cmd:$cmd "*) return 0 ;; esac
-  feishu_blocked "cmd:$cmd" "lark-cli $(feishu_safe "$cmd")"
+  # lark-cli <domain> [子命令] [方法]：只取紧跟在 domain 后面的词（drive 这类共用 domain 按子命令分模块）；
+  # domain 后面先出现参数的，key 里记成「-」，共用 domain 的细分规则一条都不会命中。
+  local key="cmd/$(feishu_seg "$cmd")" depth=0 j=$((i + 1)) only_help=1 w
+  while [ "$j" -lt "$n" ]; do
+    case "${args[$j]}" in -h|--help) ;; *) only_help=0 ;; esac
+    j=$((j + 1))
+  done
+  [ "$only_help" -eq 1 ] && [ $((i + 1)) -lt "$n" ] && return 0   # lark-cli <domain> --help
+  j=$((i + 1))
+  while [ "$j" -lt "$n" ] && [ "$depth" -lt 2 ]; do
+    w="${args[$j]}"
+    case "$w" in -*) key="$key/-"; break ;; esac
+    key="$key/$(feishu_seg "$w")"
+    depth=$((depth + 1)); j=$((j + 1))
+  done
+  local shown="lark-cli $(feishu_safe "$cmd")"
+  [ "$depth" -ge 1 ] && shown="$shown $(feishu_safe "${args[$((i + 1))]}")"
+  feishu_check_key "$key" "$shown"
 }
 
 feishu_enforce_modules "$@"

package/dist/index.js

@@ -19673,49 +19673,69 @@ function feishuAuthSelectionRecord(sel, sendAsUserRequested, tokenResponse) {
     ...granted ? { grantedScopes: granted } : {}
   };
 }
-function feishuModulePolicyEnv(modules) {
-  const picked = modules.filter((m2) => FEISHU_MODULE_ACCESS[m2]);
-  if (picked.length === 0) return null;
-  const allow = /* @__PURE__ */ new Set();
-  for (const m2 of picked) {
-    for (const c of FEISHU_MODULE_ACCESS[m2].commands) allow.add(`cmd:${c}`);
-    for (const s2 of FEISHU_MODULE_ACCESS[m2].apiServices) allow.add(`api:${s2}`);
-  }
-  const need2 = /* @__PURE__ */ new Map();
-  for (const [m2, a] of Object.entries(FEISHU_MODULE_ACCESS)) {
-    for (const k2 of [...a.commands.map((c) => `cmd:${c}`), ...a.apiServices.map((s2) => `api:${s2}`)]) {
-      if (allow.has(k2)) continue;
-      need2.set(k2, [...need2.get(k2) ?? [], (FEISHU_MODULE_LABELS[m2] ?? m2).replace(/\s+/g, "")]);
-    }
-  }
-  return {
-    OASIS_FEISHU_ALLOW: ` ${[...allow].sort().join(" ")} `,
-    OASIS_FEISHU_NEED: ` ${[...need2].sort(([a], [b2]) => a.localeCompare(b2)).map(([k2, v2]) => `${k2}=${v2.join("/")}`).join(" ")} `,
-    OASIS_FEISHU_MODULES: picked.map((m2) => FEISHU_MODULE_LABELS[m2] ?? m2).join("\u3001")
-  };
+function feishuModuleRules() {
+  const own3 = Object.entries(FEISHU_MODULE_ACCESS).flatMap(([m2, a]) => [
+    ...a.commands.map((c) => ({ pattern: `cmd/${c}/**`, modules: [m2] })),
+    ...a.apiServices.map((s2) => ({ pattern: `api/*/${s2}/**`, modules: [m2] }))
+  ]);
+  return [...own3, ...FEISHU_SHARED_RULES];
 }
-function feishuSelectedModules(raw) {
-  if (!raw) return [];
+function ruleToExtglob(pattern) {
+  const tail = pattern.endsWith("/**");
+  const body2 = (tail ? pattern.slice(0, -3) : pattern).split("/").map((seg) => seg === "*" ? "+([!/])" : seg).join("/");
+  return tail ? `${body2}?(/*)` : body2;
+}
+function feishuParseSelection(raw) {
+  if (!raw) return { state: "none", modules: [] };
+  let parsed;
   try {
-    const parsed = JSON.parse(raw);
-    return Array.isArray(parsed.modules) ? parsed.modules.filter((m2) => typeof m2 === "string" && !!FEISHU_MODULE_ACCESS[m2]) : [];
+    parsed = JSON.parse(raw);
   } catch {
-    return [];
+    return { state: "invalid", modules: [] };
   }
+  const modules = Array.isArray(parsed?.modules) ? [...new Set(parsed.modules.filter((m2) => typeof m2 === "string" && !!FEISHU_MODULE_ACCESS[m2]))] : [];
+  return modules.length > 0 ? { state: "ok", modules } : { state: "invalid", modules: [] };
+}
+function feishuModulePolicyEnv(selection) {
+  const picked = selection.state === "ok" ? selection.modules.filter((m2) => FEISHU_MODULE_ACCESS[m2]) : [];
+  const label2 = (m2) => (FEISHU_MODULE_LABELS[m2] ?? m2).replace(/\s+/g, "");
+  return {
+    OASIS_FEISHU_POLICY: picked.length > 0 ? "ok" : selection.state === "ok" ? "invalid" : selection.state,
+    OASIS_FEISHU_ALLOW: ` ${picked.join(" ")} `,
+    OASIS_FEISHU_RULES: feishuModuleRules().map((r) => `${ruleToExtglob(r.pattern)}=${r.modules.join(",")}`).join(" "),
+    OASIS_FEISHU_LABELS: Object.keys(FEISHU_MODULE_ACCESS).map((m2) => `${m2}=${label2(m2)}`).join(" "),
+    OASIS_FEISHU_MODULES: picked.map((m2) => FEISHU_MODULE_LABELS[m2] ?? m2).join("\u3001")
+  };
 }
 function feishuModuleAccessReport(input) {
   const granted = input.grantedScopes ? new Set(input.grantedScopes) : null;
-  const tenant = (input.appScopes ?? []).filter((s2) => s2.scope_type === "tenant" && s2.scope_name);
+  const tenant = /* @__PURE__ */ new Map();
+  for (const s2 of input.appScopes ?? []) {
+    if (s2.scope_type !== "tenant" || !s2.scope_name) continue;
+    const ok3 = s2.grant_status === void 0 || s2.grant_status === 1;
+    tenant.set(s2.scope_name, (tenant.get(s2.scope_name) ?? false) || ok3);
+  }
   return input.modules.filter((m2) => FEISHU_MODULE_ACCESS[m2]).map((m2) => {
-    const prefixes = FEISHU_MODULE_ACCESS[m2].botScopePrefixes;
-    const mine = tenant.filter((s2) => prefixes.some((p2) => s2.scope_name.startsWith(p2)));
-    const bot = input.appScopes === null ? "unknown" : mine.some((s2) => s2.grant_status === void 0 || s2.grant_status === 1) ? "granted" : mine.length > 0 ? "pending" : "missing";
+    const gaps = [];
+    let anyGranted = false;
+    let anyPending = false;
+    for (const cap of FEISHU_MODULE_ACCESS[m2].botCapabilities) {
+      if (cap.anyOf.some((s2) => tenant.get(s2) === true)) {
+        anyGranted = true;
+        continue;
+      }
+      const pending = cap.anyOf.some((s2) => tenant.has(s2));
+      if (pending) anyPending = true;
+      gaps.push({ label: cap.label, state: pending ? "pending" : "missing", scopes: [...cap.anyOf] });
+    }
+    const bot = input.appScopes === null ? "unknown" : gaps.length === 0 ? "granted" : anyGranted ? "partial" : anyPending ? "pending" : "missing";
     const missingUserScopes = granted ? (FEISHU_DOMAIN_SCOPES[m2]?.scopes ?? []).filter((s2) => !granted.has(s2)) : [];
-    const user = input.userAuthInvalid ? "invalid" : !input.hasUserAuth ? "none" : missingUserScopes.length > 0 ? "partial" : "granted";
+    const user = input.userAuthInvalid ? "invalid" : !input.hasUserAuth ? "none" : !granted ? "unknown" : missingUserScopes.length > 0 ? "partial" : "granted";
     return {
       id: m2,
       label: FEISHU_MODULE_LABELS[m2] ?? m2,
       bot,
+      missingBotCapabilities: bot === "unknown" ? [] : gaps,
       user,
       missingUserScopes: user === "partial" ? missingUserScopes : []
     };
@@ -19730,7 +19750,7 @@ function feishuSendAsUserState(sel) {
 function feishuAppPermissionConsoleUrl(appId) {
   return `https://open.feishu.cn/app/${encodeURIComponent(appId)}/auth`;
 }
-var FEISHU_BASIC_SCOPES, FEISHU_DOMAIN_SCOPES, FEISHU_USER_SCOPES, FEISHU_USER_SCOPE_STRING, FEISHU_SEND_AS_USER_SCOPE, FEISHU_AUTH_SELECTION_VAR, AUTO_APPROVED, FEISHU_MODULE_ACCESS, FEISHU_MODULE_LABELS;
+var FEISHU_BASIC_SCOPES, FEISHU_DOMAIN_SCOPES, FEISHU_USER_SCOPES, FEISHU_USER_SCOPE_STRING, FEISHU_SEND_AS_USER_SCOPE, FEISHU_AUTH_SELECTION_VAR, AUTO_APPROVED, FEISHU_MODULE_ACCESS, DRIVE_DOCS_ONLY_SHORTCUTS, DRIVE_DOCS_ONLY_RESOURCES, DRIVE_SHARED_SHORTCUTS, FEISHU_SHARED_RULES, FEISHU_MODULE_LABELS;
 var init_scopes = __esm({
   "../connectors/src/feishu/scopes.ts"() {
     "use strict";
@@ -20134,25 +20154,154 @@ var init_scopes = __esm({
     FEISHU_AUTH_SELECTION_VAR = "FEISHU_AUTH_SELECTION";
     AUTO_APPROVED = new Set(FEISHU_BASIC_SCOPES);
     FEISHU_MODULE_ACCESS = {
-      im: { commands: ["im"], apiServices: ["im"], botScopePrefixes: ["im:"] },
-      calendar: { commands: ["calendar"], apiServices: ["calendar"], botScopePrefixes: ["calendar:"] },
-      docs: { commands: ["docs", "drive", "markdown", "mindnotes"], apiServices: ["docx", "doc", "docs", "drive", "mindnote", "mindnotes", "suite"], botScopePrefixes: ["docs:", "docx:", "space:"] },
-      drive: { commands: ["drive", "markdown"], apiServices: ["drive"], botScopePrefixes: ["drive:"] },
-      sheets: { commands: ["sheets"], apiServices: ["sheets"], botScopePrefixes: ["sheets:"] },
-      base: { commands: ["base"], apiServices: ["bitable", "base"], botScopePrefixes: ["base:", "bitable:"] },
-      wiki: { commands: ["wiki"], apiServices: ["wiki"], botScopePrefixes: ["wiki:"] },
-      slides: { commands: ["slides"], apiServices: ["slides", "slides_ai"], botScopePrefixes: ["slides:"] },
-      task: { commands: ["task"], apiServices: ["task"], botScopePrefixes: ["task:"] },
-      approval: { commands: ["approval"], apiServices: ["approval"], botScopePrefixes: ["approval:"] },
-      mail: { commands: ["mail"], apiServices: ["mail"], botScopePrefixes: ["mail:"] },
-      minutes: { commands: ["minutes"], apiServices: ["minutes"], botScopePrefixes: ["minutes:"] },
-      vc: { commands: ["vc", "note"], apiServices: ["vc"], botScopePrefixes: ["vc:"] },
-      contact: { commands: ["contact"], apiServices: ["contact", "search"], botScopePrefixes: ["contact:"] },
-      okr: { commands: ["okr"], apiServices: ["okr"], botScopePrefixes: ["okr:"] },
-      attendance: { commands: ["attendance"], apiServices: ["attendance"], botScopePrefixes: ["attendance:"] },
-      board: { commands: ["whiteboard"], apiServices: ["board"], botScopePrefixes: ["board:"] },
-      spark: { commands: ["apps"], apiServices: ["spark"], botScopePrefixes: ["spark:"] }
-    };
+      im: { commands: ["im"], apiServices: ["im"], botCapabilities: [
+        { label: "\u53D1\u6D88\u606F", anyOf: ["im:message:send_as_bot", "im:message", "im:message:send"] },
+        { label: "\u8BFB\u6D88\u606F", anyOf: ["im:message:readonly", "im:message", "im:message.group_msg", "im:message.p2p_msg:readonly", "im:message.group_at_msg:readonly"] },
+        { label: "\u7FA4\u4FE1\u606F", anyOf: ["im:chat:readonly", "im:chat:read", "im:chat"] }
+      ] },
+      calendar: { commands: ["calendar"], apiServices: ["calendar"], botCapabilities: [
+        { label: "\u8BFB\u65E5\u7A0B", anyOf: ["calendar:calendar:readonly", "calendar:calendar", "calendar:calendar:read", "calendar:calendar.event:read"] },
+        { label: "\u5199\u65E5\u7A0B", anyOf: ["calendar:calendar", "calendar:calendar.event:create", "calendar:calendar.event:update"] }
+      ] },
+      docs: { commands: ["docs", "mindnotes"], apiServices: ["docx", "doc", "docs", "mindnote", "mindnotes", "suite"], botCapabilities: [
+        { label: "\u8BFB\u6587\u6863", anyOf: ["docx:document:readonly", "docx:document", "docs:document.content:read", "docs:doc:readonly", "docs:doc"] },
+        { label: "\u5199\u6587\u6863", anyOf: ["docx:document", "docx:document:create", "docx:document:write_only", "docs:doc"] }
+      ] },
+      drive: { commands: ["markdown"], apiServices: [], botCapabilities: [
+        { label: "\u4E0B\u8F7D\u6587\u4EF6", anyOf: ["drive:drive:readonly", "drive:drive", "drive:file:download", "drive:file:readonly", "drive:file"] },
+        { label: "\u4E0A\u4F20\u6587\u4EF6", anyOf: ["drive:drive", "drive:file:upload", "drive:file"] }
+      ] },
+      sheets: { commands: ["sheets"], apiServices: ["sheets"], botCapabilities: [
+        { label: "\u8BFB\u8868\u683C", anyOf: ["sheets:spreadsheet:readonly", "sheets:spreadsheet", "sheets:spreadsheet:read"] },
+        { label: "\u5199\u8868\u683C", anyOf: ["sheets:spreadsheet", "sheets:spreadsheet:write_only", "sheets:spreadsheet:create"] }
+      ] },
+      base: { commands: ["base"], apiServices: ["bitable", "base"], botCapabilities: [
+        { label: "\u8BFB\u8BB0\u5F55", anyOf: ["bitable:app:readonly", "bitable:app", "base:record:read", "base:app:read"] },
+        { label: "\u5199\u8BB0\u5F55", anyOf: ["bitable:app", "base:record:create", "base:record:update"] }
+      ] },
+      wiki: { commands: ["wiki"], apiServices: ["wiki"], botCapabilities: [
+        { label: "\u8BFB\u77E5\u8BC6\u5E93", anyOf: ["wiki:wiki:readonly", "wiki:wiki", "wiki:node:read", "wiki:space:read"] },
+        { label: "\u5199\u77E5\u8BC6\u5E93", anyOf: ["wiki:wiki", "wiki:node:create", "wiki:space:write_only"] }
+      ] },
+      slides: { commands: ["slides"], apiServices: ["slides", "slides_ai"], botCapabilities: [
+        { label: "\u8BFB\u5E7B\u706F\u7247", anyOf: ["slides:presentation:read", "slides:presentation:readonly", "slides:presentation"] },
+        { label: "\u5199\u5E7B\u706F\u7247", anyOf: ["slides:presentation:update", "slides:presentation:write_only", "slides:presentation:create", "slides:presentation"] }
+      ] },
+      task: { commands: ["task"], apiServices: ["task"], botCapabilities: [
+        { label: "\u8BFB\u4EFB\u52A1", anyOf: ["task:task:read", "task:task:readonly", "task:task"] },
+        { label: "\u5199\u4EFB\u52A1", anyOf: ["task:task:write", "task:task"] }
+      ] },
+      approval: { commands: ["approval"], apiServices: ["approval"], botCapabilities: [
+        { label: "\u8BFB\u5BA1\u6279", anyOf: ["approval:instance:read", "approval:approval:readonly", "approval:approval"] },
+        { label: "\u5904\u7406\u5BA1\u6279", anyOf: ["approval:instance:write", "approval:task:write", "approval:approval"] }
+      ] },
+      mail: { commands: ["mail"], apiServices: ["mail"], botCapabilities: [
+        { label: "\u8BFB\u90AE\u4EF6", anyOf: ["mail:user_mailbox.message:readonly", "mail:user_mailbox:readonly", "mail:user_mailbox"] }
+      ] },
+      minutes: { commands: ["minutes"], apiServices: ["minutes"], botCapabilities: [
+        { label: "\u8BFB\u5999\u8BB0", anyOf: ["minutes:minutes:readonly", "minutes:minutes", "minutes:minutes.search:read"] }
+      ] },
+      vc: { commands: ["vc", "note"], apiServices: ["vc"], botCapabilities: [
+        { label: "\u8BFB\u4F1A\u8BAE", anyOf: ["vc:meeting:readonly", "vc:meeting", "vc:meeting.meetingevent:read", "vc:record:readonly"] }
+      ] },
+      contact: { commands: ["contact"], apiServices: ["contact"], botCapabilities: [
+        { label: "\u8BFB\u901A\u8BAF\u5F55", anyOf: ["contact:user.base:readonly", "contact:contact:readonly_as_app", "contact:contact:readonly", "contact:contact", "contact:user.basic_profile:readonly"] }
+      ] },
+      okr: { commands: ["okr"], apiServices: ["okr"], botCapabilities: [
+        { label: "\u8BFB OKR", anyOf: ["okr:okr:readonly", "okr:okr", "okr:okr:read"] }
+      ] },
+      attendance: { commands: ["attendance"], apiServices: ["attendance"], botCapabilities: [
+        { label: "\u8BFB\u8003\u52E4", anyOf: ["attendance:task:readonly", "attendance:record:read", "attendance:task"] }
+      ] },
+      board: { commands: ["whiteboard"], apiServices: ["board"], botCapabilities: [
+        { label: "\u8BFB\u767D\u677F", anyOf: ["board:whiteboard:node:read"] },
+        { label: "\u5199\u767D\u677F", anyOf: ["board:whiteboard:node:create"] }
+      ] },
+      spark: { commands: ["apps"], apiServices: ["spark"], botCapabilities: [
+        { label: "\u8BFB\u5E94\u7528", anyOf: ["spark:app:read"] },
+        { label: "\u5199\u5E94\u7528", anyOf: ["spark:app:write"] }
+      ] }
+    };
+    DRIVE_DOCS_ONLY_SHORTCUTS = [
+      // 评论
+      "+add-comment",
+      "+add-reply",
+      "+batch-query-comments",
+      "+delete-reply",
+      "+list-comments",
+      "+list-replies",
+      "+react-reply",
+      "+resolve-comment",
+      "+restore-comment",
+      "+update-reply",
+      // 协作者与分享权限
+      "+apply-permission",
+      "+member-add",
+      "+member-list",
+      "+member-remove",
+      "+permission-get-setting",
+      // 导入导出、搜索、密级
+      "+export",
+      "+export-download",
+      "+import",
+      "+search",
+      "+secure-label-list",
+      "+secure-label-update"
+    ];
+    DRIVE_DOCS_ONLY_RESOURCES = [
+      "file.comment.reply.reactions",
+      "file.comment.replys",
+      "file.comments",
+      "permission.members",
+      "permission.public",
+      "user"
+    ];
+    DRIVE_SHARED_SHORTCUTS = ["+copy", "+create-folder", "+create-shortcut", "+delete", "+move", "+update-title", "+inspect", "+task_result"];
+    FEISHU_SHARED_RULES = [
+      ...DRIVE_DOCS_ONLY_SHORTCUTS.map((s2) => ({ pattern: `cmd/drive/${s2}/**`, modules: ["docs"] })),
+      ...DRIVE_DOCS_ONLY_RESOURCES.map((r) => ({ pattern: `cmd/drive/${r}/*/**`, modules: ["docs"] })),
+      ...DRIVE_SHARED_SHORTCUTS.map((s2) => ({ pattern: `cmd/drive/${s2}/**`, modules: ["docs", "drive"] })),
+      ...["copy", "create_folder", "patch"].map((m2) => ({ pattern: `cmd/drive/files/${m2}/**`, modules: ["docs", "drive"] })),
+      { pattern: "cmd/drive/metas/*/**", modules: ["docs", "drive"] },
+      // drive 后面先写参数再写子命令的（`drive --as bot +add-comment`），认不出子命令归谁——谁都不放行。
+      { pattern: "cmd/drive/-/**", modules: [] },
+      { pattern: "cmd/drive/**", modules: ["drive"] },
+      ...[
+        "drive/v1/permissions/**",
+        "drive/v2/permissions/**",
+        "drive/permission/**",
+        "drive/v1/files/*/comments/**",
+        "drive/v1/files/*/new_comments/**",
+        "drive/v2/files/*/comments/**",
+        "drive/v2/files/*/likes/**",
+        "drive/v1/files/*/subscribe/**",
+        "drive/v1/files/*/get_subscribe/**",
+        "drive/v1/files/*/delete_subscribe/**",
+        "drive/v1/files/*/subscriptions/**",
+        "drive/v1/user/**",
+        "drive/v1/import_tasks/**",
+        "drive/v1/export_tasks/**",
+        "drive/v1/medias/**",
+        "drive/v2/files/*/secure_label/**",
+        "drive/v2/my_secure_labels/**"
+      ].map((p2) => ({ pattern: `api/*/${p2}`, modules: ["docs"] })),
+      ...[
+        "*/drive/v1/files/create_folder/**",
+        "*/drive/v1/files/create_shortcut/**",
+        "*/drive/v1/files/task_check/**",
+        "*/drive/v1/files/*/move/**",
+        "*/drive/v1/files/*/copy/**",
+        "DELETE/drive/v1/files/*",
+        "PATCH/drive/v1/files/*",
+        "*/drive/v1/metas/**",
+        "*/drive/v2/files/query_by_token/**",
+        "*/drive/explorer/**"
+      ].map((p2) => ({ pattern: `api/${p2}`, modules: ["docs", "drive"] })),
+      { pattern: "api/*/drive/**", modules: ["drive"] },
+      { pattern: "api/*/search/v1/user/**", modules: ["contact"] },
+      { pattern: "api/*/search/v2/message/**", modules: ["im"] },
+      { pattern: "api/*/search/v2/doc_wiki/**", modules: ["docs", "wiki"] }
+    ];
     FEISHU_MODULE_LABELS = {
       im: "\u5373\u65F6\u6D88\u606F",
       calendar: "\u65E5\u5386",
@@ -20403,7 +20552,7 @@ var init_feishu = __esm({
         if (!appSecret) throw new Error("feishu inject: missing app_secret");
         const userAccessToken = credentials2["user_access_token"] ?? credentials2["FEISHU_USER_ACCESS_TOKEN"];
         const modulePolicy = feishuModulePolicyEnv(
-          feishuSelectedModules(credentials2["auth_selection"] ?? credentials2[FEISHU_AUTH_SELECTION_VAR])
+          feishuParseSelection(credentials2["auth_selection"] ?? credentials2[FEISHU_AUTH_SELECTION_VAR])
         );
         const tenantAccessToken = this.isSimulated() ? null : await this.fetchTenantToken(appId, appSecret) ?? previousTenantToken(sessionEnv.get("FEISHU_CREDS_FILE"), appId);
         const creds = await writeSessionCredsFile(this.config.slug, {
@@ -20411,7 +20560,7 @@ var init_feishu = __esm({
           LARKSUITE_CLI_APP_SECRET: appSecret,
           ...tenantAccessToken ? { LARKSUITE_CLI_TENANT_ACCESS_TOKEN: tenantAccessToken } : {},
           ...userAccessToken ? { LARKSUITE_CLI_USER_ACCESS_TOKEN: userAccessToken } : {},
-          ...modulePolicy ?? {}
+          ...modulePolicy
         }, sessionEnv.get("FEISHU_RUN_TMPDIR"));
         const configDir = (0, import_node_path12.join)(creds.dir, "lark-config");
         await (0, import_promises5.mkdir)(configDir, { recursive: true, mode: 448 });
@@ -212007,10 +212156,10 @@ async function feishuModuleAccess(store, actorId, fetchScopes = fetchFeishuAppSc
   const appSecret = await read3("FEISHU_APP_SECRET");
   if (!appId || !appSecret) return { configured: false };
   const rawSelection = await read3(FEISHU_AUTH_SELECTION_VAR);
-  const modules = feishuSelectedModules(rawSelection);
+  const { state: selection, modules } = feishuParseSelection(rawSelection);
   let parsed = {};
   try {
-    parsed = rawSelection ? JSON.parse(rawSelection) : {};
+    parsed = rawSelection ? JSON.parse(rawSelection) ?? {} : {};
   } catch {
     parsed = {};
   }
@@ -212028,7 +212177,7 @@ async function feishuModuleAccess(store, actorId, fetchScopes = fetchFeishuAppSc
   }
   return {
     configured: true,
-    restricted: modules.length > 0,
+    selection,
     modules: feishuModuleAccessReport({ modules, grantedScopes, hasUserAuth, userAuthInvalid, appScopes }),
     hasUserAuth,
     userAuthInvalid,
@@ -286888,53 +287037,43 @@ function createConnectorRenewalRuntime(options) {
     return "sent";
   };
   const recipientsFor = async (companyId, store, actorId) => {
-    const out = /* @__PURE__ */ new Set();
     const by = await store.revealVariable(FEISHU_AUTHORIZED_BY_VAR, actorId).catch(() => null);
-    if (by && isHumanActorId(by)) out.add(by);
-    if (out.size === 0 && actorId) {
-      if (isHumanActorId(actorId)) out.add(actorId);
-      else {
-        const human = await options.boundHuman(actorId, companyId).catch(() => null);
-        if (human) out.add(human);
-      }
-    }
-    return [...out];
+    if (by && isHumanActorId(by)) return { recipients: [by], authorizer: by };
+    if (!actorId) return { recipients: [], authorizer: null };
+    if (isHumanActorId(actorId)) return { recipients: [actorId], authorizer: null };
+    const human = await options.boundHuman(actorId, companyId).catch(() => null);
+    return { recipients: human ? [human] : [], authorizer: null };
   };
-  const recoverOpenId = async (companyId, app, recipients) => {
-    for (const human of recipients) {
-      const email2 = await options.memberEmail?.(human, companyId).catch(() => null);
-      if (!email2) continue;
-      const openId = await lookupFeishuOpenIdByEmail({ ...app, email: email2 });
-      if (openId) return openId;
-    }
-    return null;
+  const recoverOpenId = async (companyId, app, authorizer) => {
+    const email2 = await options.memberEmail?.(authorizer, companyId).catch(() => null);
+    return email2 ? lookupFeishuOpenIdByEmail({ ...app, email: email2 }) : null;
   };
   const deliverInvalidNotice = async (companyId, store, actorId, marker) => {
     const prev = marker.notice ?? { inApp: false, dm: "pending", attempts: 0 };
     const state = { ...prev, attempts: prev.attempts + 1 };
     const who = `actor=${actorId ?? "-"} \u7B2C ${state.attempts}/${MAX_NOTICE_ATTEMPTS} \u6B21`;
     const name = await agentName(companyId, actorId);
-    const recipients = await recipientsFor(companyId, store, actorId);
+    const { recipients, authorizer } = await recipientsFor(companyId, store, actorId);
+    const unverified = !authorizer && !await store.revealVariable(FEISHU_USER_OPEN_ID_VAR, actorId).catch(() => "?");
     if (!state.inApp) {
       try {
         const ledger = await options.notifications(companyId);
-        if (ledger) {
-          const rows = [];
-          for (const recipient of recipients) {
-            rows.push(await ledger.insert({
-              recipient,
-              category: "connector",
-              kind: "feishu-auth-invalid",
-              // 每次失效一条：键里带失效时刻，重新授权后再失效还会再提醒；同一次失效补发 / 重复扫描不重发（唯一约束）。
-              sourceKey: `connector:feishu:${actorId ?? "org"}@invalid:${marker.at}`,
-              title: `\u300C${name}\u300D\u7684\u98DE\u4E66\u7528\u6237\u6388\u6743\u5DF2\u5931\u6548\uFF0C\u9700\u8981\u91CD\u65B0\u6388\u6743`,
-              ...actorId ? { actorId } : {},
-              enteredAt: marker.at
-            }));
-          }
-          if (rows.length > 0) options.onNotifications?.(companyId, rows);
+        if (!ledger) throw new Error("\u8BE5\u516C\u53F8\u7684\u901A\u77E5\u53F0\u8D26\u4E0D\u53EF\u7528");
+        if (recipients.length === 0) throw new Error("\u6CA1\u6709\u6536\u4EF6\u4EBA\uFF08\u6CA1\u8BB0\u6388\u6743\u4EBA\u3001\u5458\u5DE5\u4E5F\u6CA1\u6709\u7ED1\u5B9A\u771F\u4EBA\uFF09");
+        const rows = [];
+        for (const recipient of recipients) {
+          rows.push(await ledger.insert({
+            recipient,
+            category: "connector",
+            kind: "feishu-auth-invalid",
+            // 每次失效一条：键里带失效时刻，重新授权后再失效还会再提醒；同一次失效补发 / 重复扫描不重发（唯一约束）。
+            sourceKey: `connector:feishu:${actorId ?? "org"}@invalid:${marker.at}`,
+            title: unverified ? `\u300C${name}\u300D\u7684\u98DE\u4E66\u7528\u6237\u6388\u6743\u5DF2\u5931\u6548\uFF0C\u8BF7\u5230\u8FDE\u63A5\u5668\u9875\u91CD\u65B0\u8FDE\u63A5` : `\u300C${name}\u300D\u7684\u98DE\u4E66\u7528\u6237\u6388\u6743\u5DF2\u5931\u6548\uFF0C\u9700\u8981\u91CD\u65B0\u6388\u6743`,
+            ...actorId ? { actorId } : {},
+            enteredAt: marker.at
+          }));
         }
-        if (recipients.length === 0) console.warn(`[credential-refresh] \u98DE\u4E66\u6388\u6743\u5931\u6548\u7AD9\u5185\u901A\u77E5\u6CA1\u6709\u6536\u4EF6\u4EBA actor=${actorId ?? "-"}`);
+        options.onNotifications?.(companyId, rows);
         state.inApp = true;
       } catch (err) {
         options.warn(new Error(`\u98DE\u4E66\u6388\u6743\u5931\u6548\u7AD9\u5185\u901A\u77E5\u672A\u5199\u5165\uFF08${who}\uFF0C\u4E0B\u4E00\u62CD\u91CD\u8BD5\uFF09: ${String(err)}`));
@@ -286943,12 +287082,13 @@ function createConnectorRenewalRuntime(options) {
     if (state.dm === "pending") {
       try {
         const app = await appCredentials(store, actorId);
-        const stored = await store.revealVariable(FEISHU_USER_OPEN_ID_VAR, actorId);
-        const recovered = !stored && app ? await recoverOpenId(companyId, app, recipients) : null;
-        const openId = stored || recovered;
+        const storedOpenId = await store.revealVariable(FEISHU_USER_OPEN_ID_VAR, actorId);
+        const recovered = !storedOpenId && app && authorizer ? await recoverOpenId(companyId, app, authorizer) : null;
+        const openId = storedOpenId || recovered;
         if (!app || !openId) {
           state.dm = "unavailable";
-          console.warn(`[credential-refresh] \u98DE\u4E66\u6388\u6743\u5931\u6548\u79C1\u4FE1\u65E0\u4ECE\u53D1\u51FA\uFF08${app ? "\u6CA1\u8BB0\u6388\u6743\u4EBA\u3001\u901A\u8BAF\u5F55\u4E5F\u6CA1\u6309\u6210\u5458\u90AE\u7BB1\u627E\u5230\u672C\u4EBA" : "\u6CA1\u6709\u5E94\u7528\u51ED\u636E"}\uFF09actor=${actorId ?? "-"}\uFF1B\u53EA\u6709\u7AD9\u5185\u901A\u77E5`);
+          const why = !app ? "\u6CA1\u6709\u5E94\u7528\u51ED\u636E" : unverified ? "\u6CA1\u8BB0\u539F\u6388\u6743\u4EBA\uFF0C\u6838\u5B9E\u4E0D\u4E86\u672C\u4EBA\uFF0C\u4E0D\u7B7E\u94FE\u63A5\uFF1B\u9700\u5230\u8FDE\u63A5\u5668\u9875\u91CD\u65B0\u8FDE\u63A5" : "\u901A\u8BAF\u5F55\u6CA1\u6309\u539F\u6388\u6743\u4EBA\u7684\u8D26\u53F7\u90AE\u7BB1\u627E\u5230\u4ED6";
+          console.warn(`[credential-refresh] \u98DE\u4E66\u6388\u6743\u5931\u6548\u79C1\u4FE1\u65E0\u4ECE\u53D1\u51FA\uFF08${why}\uFF09actor=${actorId ?? "-"}\uFF1B\u53EA\u6709\u7AD9\u5185\u901A\u77E5`);
         } else {
           const token2 = await issueFeishuReauthToken(options.links, store, {
             companyId,
@@ -300944,7 +301084,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
     }
   }
 }
-var CLI_VERSION = "2.2.112" ? "2.2.112" : "dev";
+var CLI_VERSION = "2.2.113" ? "2.2.113" : "dev";
 function apiHeaders(token2, company) {
   const headers = {
     authorization: `Bearer ${token2}`,
@@ -305115,7 +305255,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.112" : "dev";
+var PKG_VERSION = true ? "2.2.113" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test_v2",
-  "version": "2.2.112",
+  "version": "2.2.113",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"
@@ -26,6 +26,6 @@
     "node": ">=20"
   },
   "oasisRelease": {
-    "sourceHead": "278bdc2558b23bd381c4c3007a8d40330244edc1"
+    "sourceHead": "590c9d80c3286fa10fdb0eb14de96140b1520130"
   }
 }