oasis_test_v2 2.2.107 → 2.2.108

package/dist/index.js

@@ -206747,6 +206747,35 @@ var init_host_isolation = __esm({
 });
 
 // ../connectors/src/feishu/index.ts
+async function fetchFeishuTenantAccessToken(appId, appSecret) {
+  try {
+    const resp = await fetch(FEISHU_TENANT_TOKEN_URL, {
+      method: "POST",
+      headers: { "Content-Type": "application/json; charset=utf-8" },
+      body: JSON.stringify({ app_id: appId, app_secret: appSecret }),
+      signal: AbortSignal.timeout(TENANT_TOKEN_TIMEOUT_MS)
+    });
+    const data = await resp.json();
+    if (!resp.ok || data.code !== 0 || typeof data.tenant_access_token !== "string" || !data.tenant_access_token) {
+      log("[feishu]", `\u6362\u4F01\u4E1A token \u5931\u8D25\uFF08\u672C\u8F6E bot \u8EAB\u4EFD\u4E0D\u53EF\u7528\uFF09: HTTP ${resp.status} code=${String(data.code)} ${String(data.msg ?? "")}`.trim());
+      return null;
+    }
+    return data.tenant_access_token;
+  } catch (err) {
+    log("[feishu]", `\u6362\u4F01\u4E1A token \u5931\u8D25\uFF08\u672C\u8F6E bot \u8EAB\u4EFD\u4E0D\u53EF\u7528\uFF09: ${String(err?.message ?? err).slice(0, 200)}`);
+    return null;
+  }
+}
+function previousTenantToken(credsFile, appId) {
+  if (!credsFile) return null;
+  try {
+    const prev = readSessionCredsFile(credsFile);
+    if (prev["LARKSUITE_CLI_APP_ID"] !== appId) return null;
+    return prev["LARKSUITE_CLI_TENANT_ACCESS_TOKEN"] || null;
+  } catch {
+    return null;
+  }
+}
 function parseFeishuTokenResponse(data, nowMs) {
   const accessToken = String(data["access_token"] ?? "");
   const refreshToken = String(data["refresh_token"] ?? "");
@@ -206765,7 +206794,7 @@ function parseFeishuTokenResponse(data, nowMs) {
     expiresAt: new Date(expiresAtMs)
   };
 }
-var import_node_child_process14, import_node_util4, import_node_path16, import_node_url3, import_promises9, execFileAsync2, __dirname2, FEISHU_WELL_KNOWN_SKILLS_BASE, FEISHU_TOKEN_URL, FeishuConnector;
+var import_node_child_process14, import_node_util4, import_node_path16, import_node_url3, import_promises9, execFileAsync2, __dirname2, FEISHU_WELL_KNOWN_SKILLS_BASE, FEISHU_TOKEN_URL, FEISHU_TENANT_TOKEN_URL, TENANT_TOKEN_TIMEOUT_MS, FeishuConnector;
 var init_feishu = __esm({
   "../connectors/src/feishu/index.ts"() {
     "use strict";
@@ -206775,10 +206804,13 @@ var init_feishu = __esm({
     import_node_url3 = require("node:url");
     import_promises9 = require("node:fs/promises");
     init_base();
+    init_logger();
     execFileAsync2 = (0, import_node_util4.promisify)(import_node_child_process14.execFile);
     __dirname2 = (0, import_node_path16.dirname)((0, import_node_url3.fileURLToPath)(__esm_import_meta_url));
     FEISHU_WELL_KNOWN_SKILLS_BASE = "https://open.feishu.cn/.well-known/skills";
     FEISHU_TOKEN_URL = "https://open.feishu.cn/open-apis/authen/v2/oauth/token";
+    FEISHU_TENANT_TOKEN_URL = "https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal";
+    TENANT_TOKEN_TIMEOUT_MS = 5e3;
     FeishuConnector = class extends CliConnector {
       config = {
         slug: "feishu",
@@ -206876,9 +206908,12 @@ var init_feishu = __esm({
       /** 厂商技能包源——平台自动拉取飞书官方技能包时用。 */
       wellKnownSkillsBase = FEISHU_WELL_KNOWN_SKILLS_BASE;
       larkBin;
-      constructor(larkBin) {
+      fetchTenantToken;
+      /** `fetchTenantToken` 只给测试替换（不打真飞书）；生产一律用 {@link fetchFeishuTenantAccessToken}。 */
+      constructor(larkBin, opts = {}) {
         super(__dirname2);
         this.larkBin = larkBin ?? this.resolveLarkBin();
+        this.fetchTenantToken = opts.fetchTenantToken ?? fetchFeishuTenantAccessToken;
       }
       /**
        * 解析 user_info 的 JSON。lark-cli 的 `ok:false` 也是**退出码 0** 的正常输出，
@@ -206909,6 +206944,7 @@ var init_feishu = __esm({
       /**
        * Agent run 开始：把凭据作为 lark-cli「外部凭据」写进凭据文件（不进 agent env）。
        * credentials 接受：app_id, app_secret, user_access_token?（及其 FEISHU_* 别名）。
+       * 企业 token 不随 job 下发，由这里用 app_id/app_secret 现换（换不到只是本轮没有 bot 身份，不抛）。
        *
        * 注入的 sessionEnv 键（全部非敏感）：
        *   FEISHU_CREDS_FILE — 凭据文件路径，wrapper source 它
@@ -206921,9 +206957,11 @@ var init_feishu = __esm({
         if (!appId) throw new Error("feishu inject: missing app_id");
         if (!appSecret) throw new Error("feishu inject: missing app_secret");
         const userAccessToken = credentials2["user_access_token"] ?? credentials2["FEISHU_USER_ACCESS_TOKEN"];
+        const tenantAccessToken = this.isSimulated() ? null : await this.fetchTenantToken(appId, appSecret) ?? previousTenantToken(sessionEnv.get("FEISHU_CREDS_FILE"), appId);
         const creds = await writeSessionCredsFile(this.config.slug, {
           LARKSUITE_CLI_APP_ID: appId,
           LARKSUITE_CLI_APP_SECRET: appSecret,
+          ...tenantAccessToken ? { LARKSUITE_CLI_TENANT_ACCESS_TOKEN: tenantAccessToken } : {},
           ...userAccessToken ? { LARKSUITE_CLI_USER_ACCESS_TOKEN: userAccessToken } : {}
         }, sessionEnv.get("FEISHU_RUN_TMPDIR"));
         const configDir = (0, import_node_path16.join)(creds.dir, "lark-config");
@@ -210646,7 +210684,7 @@ async function prepareConnectorsForJob(job, deps) {
       await connector.inject(credentials2, sessionEnv);
       for (const [k2, v2] of sessionEnv) envOverrides[k2] = v2;
       cleanups.push(() => connector.cleanup(sessionEnv));
-      injected.set(slug5, { connector, sessionEnv, credsFingerprint: credentialsFingerprint(credentials2) });
+      injected.set(slug5, { connector, sessionEnv, credentials: credentials2, credsFingerprint: credentialsFingerprint(credentials2) });
       status.credsReady = true;
     } catch (err) {
       status.error = String(err);
@@ -210772,7 +210810,12 @@ async function renewInjectedCredentials(injected, fetchCredentials) {
   try {
     fresh = await fetchCredentials();
   } catch (err) {
-    for (const slug5 of injected.keys()) outcome.failed.push({ slug: slug5, error: String(err) });
+    for (const [slug5, target] of injected) {
+      outcome.failed.push({ slug: slug5, error: String(err) });
+      await target.connector.inject(target.credentials, target.sessionEnv).catch((reErr) => {
+        log("[node-connectors]", `\u26A0 \u7EED\u671F\uFF1A${slug5} \u6309\u65E7\u51ED\u636E\u91CD\u6CE8\u5931\u8D25: ${String(reErr)}`);
+      });
+    }
     log("[node-connectors]", `\u7EED\u671F\uFF1A\u5411 server \u53D6\u51ED\u636E\u5931\u8D25\uFF0C\u672C\u8F6E\u6CBF\u7528\u65E7\u51ED\u636E: ${String(err)}`);
     return outcome;
   }
@@ -210781,6 +210824,7 @@ async function renewInjectedCredentials(injected, fetchCredentials) {
     if (!target) continue;
     try {
       await target.connector.inject(credentials2, target.sessionEnv);
+      target.credentials = credentials2;
       const fingerprint2 = credentialsFingerprint(credentials2);
       if (fingerprint2 !== target.credsFingerprint) {
         target.credsFingerprint = fingerprint2;
@@ -299347,7 +299391,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
     }
   }
 }
-var CLI_VERSION = "2.2.107" ? "2.2.107" : "dev";
+var CLI_VERSION = "2.2.108" ? "2.2.108" : "dev";
 function apiHeaders(token2, company) {
   const headers = {
     authorization: `Bearer ${token2}`,
@@ -303518,7 +303562,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.107" : "dev";
+var PKG_VERSION = true ? "2.2.108" : "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.107",
+  "version": "2.2.108",
   "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": "180e4e814716f1a7eb4870a1f88cd4d10398d726"
+    "sourceHead": "a953575106dcf944d7b32f0eca289792092539ff"
   }
 }