oasis_test_v2 2.2.110 → 2.2.111

package/dist/index.js

@@ -19978,14 +19978,27 @@ async function sendFeishuBotTextToUser(input) {
   const body2 = await resp.json();
   if (body2.code !== 0) throw new Error(`feishu bot \u79C1\u4FE1\u5931\u8D25: code=${String(body2.code)} ${body2.msg ?? ""}`.trim());
 }
+async function lookupFeishuOpenIdByEmail(input) {
+  const token2 = await (input.fetchTenantToken ?? fetchFeishuTenantAccessToken)(input.appId, input.appSecret);
+  if (!token2) throw new Error("\u6362\u4F01\u4E1A token \u5931\u8D25\uFF0C\u672A\u80FD\u6309\u90AE\u7BB1\u67E5\u98DE\u4E66\u7528\u6237");
+  const resp = await (input.fetchImpl ?? fetch)(`${FEISHU_BATCH_GET_ID_URL}?user_id_type=open_id`, {
+    method: "POST",
+    headers: { "content-type": "application/json; charset=utf-8", authorization: `Bearer ${token2}` },
+    body: JSON.stringify({ emails: [input.email], include_resigned: false })
+  });
+  const body2 = await resp.json();
+  if (body2.code !== 0) throw new Error(`feishu \u6309\u90AE\u7BB1\u67E5\u7528\u6237\u5931\u8D25: code=${String(body2.code)} ${body2.msg ?? ""}`.trim());
+  const hit = body2.data?.user_list?.find((u) => u.email?.toLowerCase() === input.email.toLowerCase() && u.user_id);
+  return hit?.user_id ?? null;
+}
 function feishuUserAuthInvalidText(input) {
   const head = `\u300C${input.agentName}\u300D\u7684\u98DE\u4E66\u7528\u6237\u6388\u6743\u5DF2\u5931\u6548\uFF08\u6388\u6743\u88AB\u64A4\u9500\u6216\u957F\u65F6\u95F4\u65E0\u6CD5\u7EED\u671F\uFF09\uFF0C\u4EE5\u4F60\u8EAB\u4EFD\u8C03\u7528\u98DE\u4E66\u7684\u529F\u80FD\u6682\u65F6\u7528\u4E0D\u4E86\uFF0Cbot \u8EAB\u4EFD\u4E0D\u53D7\u5F71\u54CD\u3002`;
   return input.link ? `${head}
-\u70B9\u8FD9\u4E2A\u94FE\u63A5\u91CD\u65B0\u6388\u6743\uFF08\u9700\u7528\u539F\u6388\u6743\u4EBA\u7684\u98DE\u4E66\u8D26\u53F7\u767B\u5F55\uFF0C7 \u5929\u5185\u6709\u6548\uFF09\uFF1A
+\u70B9\u8FD9\u4E2A\u94FE\u63A5\u91CD\u65B0\u6388\u6743\uFF08\u9700\u7528\u6536\u5230\u8FD9\u6761\u79C1\u4FE1\u7684\u98DE\u4E66\u8D26\u53F7\u767B\u5F55\uFF0C7 \u5929\u5185\u6709\u6548\uFF09\uFF1A
 ${input.link}` : `${head}
 \u8BF7\u5230 Oasis \u8BE5 Agent \u7684\u300C\u8FDE\u63A5\u5668\u300D\u9875\u91CD\u65B0\u6388\u6743\u98DE\u4E66\u3002`;
 }
-var FEISHU_DEVICE_AUTHORIZATION_URL, FEISHU_USER_INFO_URL, FEISHU_SEND_MESSAGE_URL;
+var FEISHU_DEVICE_AUTHORIZATION_URL, FEISHU_USER_INFO_URL, FEISHU_SEND_MESSAGE_URL, FEISHU_BATCH_GET_ID_URL;
 var init_user_auth = __esm({
   "../connectors/src/feishu/user-auth.ts"() {
     "use strict";
@@ -19993,6 +20006,7 @@ var init_user_auth = __esm({
     FEISHU_DEVICE_AUTHORIZATION_URL = "https://accounts.feishu.cn/oauth/v1/device_authorization";
     FEISHU_USER_INFO_URL = "https://open.feishu.cn/open-apis/authen/v1/user_info";
     FEISHU_SEND_MESSAGE_URL = "https://open.feishu.cn/open-apis/im/v1/messages";
+    FEISHU_BATCH_GET_ID_URL = "https://open.feishu.cn/open-apis/contact/v3/users/batch_get_id";
   }
 });
 
@@ -20569,6 +20583,16 @@ async function persistFeishuUserAuthorization(store, actorId, data, nowMs, who =
   await put3(FEISHU_AUTHORIZED_BY_VAR, who.authorizedBy);
   await store.deleteVariable(FEISHU_USER_AUTH_INVALID_VAR, actorId);
 }
+async function readFeishuUserAuthInvalid(store, actorId) {
+  const raw = await store.revealVariable(FEISHU_USER_AUTH_INVALID_VAR, actorId).catch(() => null);
+  if (!raw) return null;
+  try {
+    const m2 = JSON.parse(raw);
+    return typeof m2?.at === "string" ? m2 : null;
+  } catch {
+    return null;
+  }
+}
 async function markFeishuUserAuthInvalid(store, actorId, marker) {
   await store.putVariable({
     key: FEISHU_USER_AUTH_INVALID_VAR,
@@ -23421,6 +23445,7 @@ var init_scheduled_refresh = __esm({
                   counts2[outcome.status] = (counts2[outcome.status] ?? 0) + 1;
                 }
               }
+              await this.deps.afterCompany?.(companyId, store).catch((error2) => this.deps.warn(new Error(`\u5B9A\u65F6\u7EED\u671F\u6536\u5C3E company=${companyId}: ${String(error2)}`)));
             } catch (error2) {
               this.deps.warn(new Error(`\u5B9A\u65F6\u7EED\u671F company=${companyId}: ${String(error2)}`));
             }
@@ -24524,7 +24549,7 @@ function feishuReauthUrl(apiBase, token2) {
   return `${apiBase.replace(/\/+$/, "")}/api/connectors/feishu/reauth?t=${encodeURIComponent(token2)}`;
 }
 async function issueFeishuReauthToken(links, store, claims) {
-  const openId = await store.revealVariable(FEISHU_USER_OPEN_ID_VAR, claims.actorId).catch(() => null);
+  const openId = await store.revealVariable(FEISHU_USER_OPEN_ID_VAR, claims.actorId).catch(() => null) || claims.fallbackSubject;
   if (!openId) return null;
   return links.issue({
     companyId: claims.companyId,
@@ -218072,6 +218097,12 @@ ${composed}`;
               res.writeHead(400).end(JSON.stringify({ error: "\u8BF7\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u529F\u80FD\u6A21\u5757" }));
               return;
             }
+            const devicePending = opts.connectorAuthPending?.githubApp;
+            if (!devicePending) {
+              console.error("[feishu-oauth] connectorAuthPending store unavailable \u2014 refusing to start device auth");
+              res.writeHead(503).end(JSON.stringify({ error: "\u6388\u6743\u767B\u8BB0\u670D\u52A1\u6682\u4E0D\u53EF\u7528\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5" }));
+              return;
+            }
             try {
               const startSvc = await connectorActorsService();
               const appSecret = startSvc ? await startSvc.revealResolvedVariable("FEISHU_APP_SECRET", actorId) : null;
@@ -218095,26 +218126,21 @@ ${composed}`;
                 scopes: scopesForSelection(selection, sendAsUserRequested)
               });
               if (!deviceCode) throw new Error("no device_code in response");
-              const devicePending = opts.connectorAuthPending?.githubApp;
-              if (devicePending) {
-                const now = Date.now();
-                await devicePending.put({
-                  state: feishuDevicePendingKey(deviceCode),
-                  ...currentCompanyId ? { companyId: currentCompanyId } : {},
-                  value: {
-                    connector: "feishu",
-                    appId,
-                    actorId: actorId ?? "",
-                    modules: selection.modules,
-                    sendAsUser: selection.sendAsUser,
-                    sendAsUserRequested
-                  },
-                  createdAtMs: now,
-                  expiresAtMs: now + FEISHU_DEVICE_PENDING_TTL_MS
-                });
-              } else {
-                console.error("[feishu-oauth] connectorAuthPending store unavailable \u2014 auth selection will not be saved");
-              }
+              const now = Date.now();
+              await devicePending.put({
+                state: feishuDevicePendingKey(deviceCode),
+                ...currentCompanyId ? { companyId: currentCompanyId } : {},
+                value: {
+                  connector: "feishu",
+                  appId,
+                  actorId: actorId ?? "",
+                  modules: selection.modules,
+                  sendAsUser: selection.sendAsUser,
+                  sendAsUserRequested
+                },
+                createdAtMs: now,
+                expiresAtMs: now + FEISHU_DEVICE_PENDING_TTL_MS
+              });
               res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({
                 verificationUrl,
                 deviceCode,
@@ -218137,18 +218163,22 @@ ${composed}`;
             try {
               const devicePending = opts.connectorAuthPending?.githubApp;
               const started = devicePending ? await devicePending.get(feishuDevicePendingKey(deviceCode), Date.now()) : { status: "missing" };
-              let startedSelection = null;
-              if (started.status === "found") {
-                const v2 = started.value.value;
-                if (v2["appId"] !== appId || v2["actorId"] !== (actorId ?? "") || (started.value.companyId ?? "") !== (currentCompanyId ?? "")) {
-                  res.writeHead(400).end(JSON.stringify({ error: "\u8FD9\u6B21\u6388\u6743\u4E0D\u662F\u7531\u5F53\u524D\u5E94\u7528\u6216\u5458\u5DE5\u53D1\u8D77\u7684\uFF0C\u8BF7\u91CD\u65B0\u53D1\u8D77\u6388\u6743" }));
-                  return;
-                }
-                const selection = normalizeFeishuAuthSelection({ modules: v2["modules"], sendAsUser: v2["sendAsUser"] });
-                if (selection) {
-                  startedSelection = { selection, sendAsUserRequested: selection.sendAsUser && v2["sendAsUserRequested"] === true };
-                }
+              if (started.status !== "found") {
+                console.error(`[feishu-oauth] no login/start registration for this device code (${started.status}) \u2014 refusing token exchange`);
+                res.writeHead(409).end(JSON.stringify({ ok: false, restart: true, error: "\u8FD9\u6B21\u6388\u6743\u7684\u767B\u8BB0\u5DF2\u5931\u6548\uFF08\u8D85\u65F6\u6216\u670D\u52A1\u5DF2\u66F4\u65B0\uFF09\uFF0C\u8BF7\u91CD\u65B0\u53D1\u8D77\u6388\u6743" }));
+                return;
               }
+              const v2 = started.value.value;
+              if (v2["appId"] !== appId || v2["actorId"] !== (actorId ?? "") || (started.value.companyId ?? "") !== (currentCompanyId ?? "")) {
+                res.writeHead(400).end(JSON.stringify({ ok: false, restart: true, error: "\u8FD9\u6B21\u6388\u6743\u4E0D\u662F\u7531\u5F53\u524D\u5E94\u7528\u6216\u5458\u5DE5\u53D1\u8D77\u7684\uFF0C\u8BF7\u91CD\u65B0\u53D1\u8D77\u6388\u6743" }));
+                return;
+              }
+              const selection = normalizeFeishuAuthSelection({ modules: v2["modules"], sendAsUser: v2["sendAsUser"] });
+              if (!selection) {
+                res.writeHead(409).end(JSON.stringify({ ok: false, restart: true, error: "\u8FD9\u6B21\u6388\u6743\u7684\u767B\u8BB0\u5DF2\u635F\u574F\uFF0C\u8BF7\u91CD\u65B0\u53D1\u8D77\u6388\u6743" }));
+                return;
+              }
+              const startedSelection = { selection, sendAsUserRequested: selection.sendAsUser && v2["sendAsUserRequested"] === true };
               const pollSvc = await connectorActorsService();
               const appSecret = pollSvc ? await pollSvc.revealResolvedVariable("FEISHU_APP_SECRET", actorId) : null;
               if (!appSecret) throw new Error("FEISHU_APP_SECRET not found \u2014 please complete app setup first");
@@ -218174,18 +218204,14 @@ ${composed}`;
                   ...isHumanActorId(actor) ? { authorizedBy: actor } : {}
                 }));
                 const nameScope = actorId ? { scope: "personal", actorId } : { scope: "global" };
-                if (startedSelection) {
-                  const record10 = feishuAuthSelectionRecord(startedSelection.selection, startedSelection.sendAsUserRequested, data);
-                  await svc.putVariable({
-                    key: FEISHU_AUTH_SELECTION_VAR,
-                    value: JSON.stringify(record10),
-                    ...nameScope,
-                    connectorId: "feishu",
-                    encrypted: false
-                  });
-                } else {
-                  console.error(`[feishu-oauth] no login/start registration for this device code (${started.status}) \u2014 auth selection not saved`);
-                }
+                const record10 = feishuAuthSelectionRecord(startedSelection.selection, startedSelection.sendAsUserRequested, data);
+                await svc.putVariable({
+                  key: FEISHU_AUTH_SELECTION_VAR,
+                  value: JSON.stringify(record10),
+                  ...nameScope,
+                  connectorId: "feishu",
+                  encrypted: false
+                });
                 if (!who.openId) console.error("[feishu-oauth] user_info \u672A\u53D6\u5230\u6388\u6743\u4EBA open_id\uFF1A\u6388\u6743\u5931\u6548\u65F6\u65E0\u6CD5\u79C1\u4FE1\u672C\u4EBA\u3001\u4E5F\u7B7E\u4E0D\u51FA\u4E00\u952E\u91CD\u65B0\u6388\u6743\u94FE\u63A5");
                 try {
                   const secret = await svc.revealResolvedVariable("FEISHU_APP_SECRET", actorId);
@@ -286671,6 +286697,7 @@ function createTodoRuntime(options) {
 init_src();
 init_src3();
 init_src11();
+var MAX_NOTICE_ATTEMPTS = 36;
 function createConnectorRenewalRuntime(options) {
   const now = () => options.now?.() ?? Date.now();
   const agentName = async (companyId, actorId) => {
@@ -286679,13 +286706,17 @@ function createConnectorRenewalRuntime(options) {
     const hit = (await svc?.listActors().catch(() => []))?.find((a) => a.id === actorId);
     return hit?.name || actorId;
   };
-  const notifyFeishuUser = async (store, actorId, text7) => {
-    const openId = await store.revealVariable(FEISHU_USER_OPEN_ID_VAR, actorId);
-    if (!openId) return "no-open-id";
+  const appCredentials = async (store, actorId) => {
     const appId = await store.revealResolvedVariable("FEISHU_APP_ID", actorId);
     const appSecret = await store.revealResolvedVariable("FEISHU_APP_SECRET", actorId);
-    if (!appId || !appSecret) return "no-app";
-    await sendFeishuBotTextToUser({ appId, appSecret, openId, text: text7 });
+    return appId && appSecret ? { appId, appSecret } : null;
+  };
+  const notifyFeishuUser = async (store, actorId, text7, openId) => {
+    const to = openId || await store.revealVariable(FEISHU_USER_OPEN_ID_VAR, actorId);
+    if (!to) return "no-open-id";
+    const app = await appCredentials(store, actorId);
+    if (!app) return "no-app";
+    await sendFeishuBotTextToUser({ ...app, openId: to, text: text7 });
     return "sent";
   };
   const recipientsFor = async (companyId, store, actorId) => {
@@ -286701,36 +286732,110 @@ function createConnectorRenewalRuntime(options) {
     }
     return [...out];
   };
-  const onFeishuInvalidated = async (e, store) => {
-    const at2 = new Date(now()).toISOString();
-    await markFeishuUserAuthInvalid(store, e.actorId, { at: at2, reason: e.outcome.detail ?? "\u7EED\u671F\u6750\u6599\u5DF2\u5931\u6548" });
-    const name = await agentName(e.companyId, e.actorId);
-    const token2 = await issueFeishuReauthToken(options.links, store, { companyId: e.companyId, actorId: e.actorId, purpose: "reauth" });
-    const link = token2 && options.apiBase ? feishuReauthUrl(options.apiBase, token2) : void 0;
-    const ledger = await options.notifications(e.companyId);
-    if (ledger) {
-      const fresh = [];
-      for (const recipient of await recipientsFor(e.companyId, store, e.actorId)) {
-        const row = await ledger.insert({
-          recipient,
-          category: "connector",
-          kind: "feishu-auth-invalid",
-          // 每次失效一条：键里带失效时刻，重新授权后再失效还会再提醒；同一次失效重复扫描不重发（唯一约束）。
-          sourceKey: `connector:feishu:${e.actorId ?? "org"}@invalid:${at2}`,
-          title: `\u300C${name}\u300D\u7684\u98DE\u4E66\u7528\u6237\u6388\u6743\u5DF2\u5931\u6548\uFF0C\u9700\u8981\u91CD\u65B0\u6388\u6743`,
-          ...e.actorId ? { actorId: e.actorId } : {},
-          enteredAt: at2
-        });
-        if (row.enteredAt === at2) fresh.push(row);
+  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 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);
+    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 (recipients.length === 0) console.warn(`[credential-refresh] \u98DE\u4E66\u6388\u6743\u5931\u6548\u7AD9\u5185\u901A\u77E5\u6CA1\u6709\u6536\u4EF6\u4EBA actor=${actorId ?? "-"}`);
+        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)}`));
       }
-      if (fresh.length > 0) options.onNotifications?.(e.companyId, fresh);
     }
-    try {
-      const sent = await notifyFeishuUser(store, e.actorId, feishuUserAuthInvalidText({ agentName: name, ...link ? { link } : {} }));
-      if (sent !== "sent") console.warn(`[credential-refresh] \u98DE\u4E66\u6388\u6743\u5931\u6548\u79C1\u4FE1\u672A\u53D1\uFF08${sent}\uFF09actor=${e.actorId ?? "-"}`);
-    } catch (err) {
-      options.warn(new Error(`\u98DE\u4E66\u6388\u6743\u5931\u6548\u79C1\u4FE1\u53D1\u9001\u5931\u8D25 actor=${e.actorId ?? "-"}: ${String(err)}`));
+    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;
+        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`);
+        } else {
+          const token2 = await issueFeishuReauthToken(options.links, store, {
+            companyId,
+            actorId,
+            purpose: "reauth",
+            ...recovered ? { fallbackSubject: recovered } : {}
+          });
+          const link = token2 && options.apiBase ? feishuReauthUrl(options.apiBase, token2) : void 0;
+          await notifyFeishuUser(store, actorId, feishuUserAuthInvalidText({ agentName: name, ...link ? { link } : {} }), openId);
+          state.dm = "sent";
+        }
+      } catch (err) {
+        options.warn(new Error(`\u98DE\u4E66\u6388\u6743\u5931\u6548\u79C1\u4FE1\u53D1\u9001\u5931\u8D25\uFF08${who}\uFF0C\u4E0B\u4E00\u62CD\u91CD\u8BD5\uFF09: ${String(err)}`));
+      }
+    }
+    if ((!state.inApp || state.dm === "pending") && state.attempts >= MAX_NOTICE_ATTEMPTS) {
+      options.warn(new Error(`\u98DE\u4E66\u6388\u6743\u5931\u6548\u63D0\u9192\u8865\u53D1 ${state.attempts} \u6B21\u4ECD\u672A\u9001\u5230\uFF0C\u653E\u5F03 actor=${actorId ?? "-"} \u7AD9\u5185=${String(state.inApp)} \u79C1\u4FE1=${state.dm}`));
+    }
+    return state;
+  };
+  const saveNoticeState = async (store, actorId, at2, notice) => {
+    await withConnectorCredentialLock("feishu", actorId, async () => {
+      const current = await readFeishuUserAuthInvalid(store, actorId);
+      if (current?.at !== at2) return;
+      await markFeishuUserAuthInvalid(store, actorId, { ...current, notice });
+    });
+  };
+  const handledThisSweep = /* @__PURE__ */ new Set();
+  const sweepKey = (companyId, actorId) => JSON.stringify([companyId, actorId ?? ""]);
+  const onFeishuInvalidated = async (e, store) => {
+    const marker = {
+      at: new Date(now()).toISOString(),
+      reason: e.outcome.detail ?? "\u7EED\u671F\u6750\u6599\u5DF2\u5931\u6548",
+      notice: { inApp: false, dm: "pending", attempts: 0 }
+    };
+    await markFeishuUserAuthInvalid(store, e.actorId, marker);
+    handledThisSweep.add(sweepKey(e.companyId, e.actorId));
+    await saveNoticeState(store, e.actorId, marker.at, await deliverInvalidNotice(e.companyId, store, e.actorId, marker));
+  };
+  const retryPendingNotices = async (companyId, store) => {
+    const svc = await options.actors(companyId);
+    if (!svc) return;
+    const ids2 = [void 0, ...(await svc.listActors({ status: "active" })).map((a) => a.id)];
+    for (const actorId of ids2) {
+      if (handledThisSweep.delete(sweepKey(companyId, actorId))) continue;
+      const marker = await readFeishuUserAuthInvalid(store, actorId);
+      const n = marker?.notice;
+      if (!marker || !n || n.inApp && n.dm !== "pending" || n.attempts >= MAX_NOTICE_ATTEMPTS) continue;
+      try {
+        await saveNoticeState(store, actorId, marker.at, await deliverInvalidNotice(companyId, store, actorId, marker));
+      } catch (err) {
+        options.warn(new Error(`\u98DE\u4E66\u6388\u6743\u5931\u6548\u63D0\u9192\u8865\u53D1\u5931\u8D25 actor=${actorId ?? "-"}: ${String(err)}`));
+      }
     }
+    for (const k2 of handledThisSweep) if (JSON.parse(k2)[0] === companyId) handledThisSweep.delete(k2);
   };
   const onFeishuRenewed = async (e, store) => {
     if (await store.revealVariable(FEISHU_USER_OPEN_ID_VAR, e.actorId)) return;
@@ -286770,6 +286875,7 @@ function createConnectorRenewalRuntime(options) {
     onRenewed: async (e, store) => {
       if (e.connector.config.slug === "feishu") await onFeishuRenewed(e, store);
     },
+    afterCompany: retryPendingNotices,
     warn: options.warn,
     ...options.now ? { now: options.now } : {}
   });
@@ -286790,7 +286896,8 @@ function createConnectorRenewalRuntime(options) {
       await notifyFeishuUser(
         store,
         claims.actorId,
-        `\u6709\u4EBA\u7528\u53E6\u4E00\u4E2A\u98DE\u4E66\u8D26\u53F7${who.userName ? `\uFF08${who.userName}\uFF09` : ""}\u6253\u5F00\u4E86\u300C${name}\u300D\u7684\u91CD\u65B0\u6388\u6743\u94FE\u63A5\uFF0C\u5DF2\u88AB\u62D2\u7EDD\uFF0C\u6388\u6743\u672A\u6539\u53D8\u3002`
+        `\u6709\u4EBA\u7528\u53E6\u4E00\u4E2A\u98DE\u4E66\u8D26\u53F7${who.userName ? `\uFF08${who.userName}\uFF09` : ""}\u6253\u5F00\u4E86\u300C${name}\u300D\u7684\u91CD\u65B0\u6388\u6743\u94FE\u63A5\uFF0C\u5DF2\u88AB\u62D2\u7EDD\uFF0C\u6388\u6743\u672A\u6539\u53D8\u3002`,
+        claims.subject
       ).catch(() => void 0);
     }
   });
@@ -290573,6 +290680,11 @@ async function startServe(opts) {
       auditSink.notifyNotificationsChanged(recipients);
     },
     boundHuman: async (agentId, companyId) => (await (await resolveAssistantsCtx(companyId)).service.getByAgent(agentId))?.humanActorId ?? null,
+    // 成员表行上带 actorId；邮箱在控制面账号上（登录时验证过）。
+    memberEmail: async (humanId, companyId) => {
+      const row = (await controlPlaneStore.listMembers(companyId)).find((m2) => m2.actorId === humanId);
+      return row ? (await controlPlaneStore.getAccount(row.accountId))?.email ?? null : null;
+    },
     links: createConnectorReauthLinkIssuer({ secretFile: path30.join(opts.dir, "connector-reauth-link-secret") }),
     apiBase: remoteApiUrl,
     warn: (error2) => console.warn(`[credential-refresh] ${String(error2)}`)
@@ -300664,7 +300776,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
     }
   }
 }
-var CLI_VERSION = "2.2.110" ? "2.2.110" : "dev";
+var CLI_VERSION = "2.2.111" ? "2.2.111" : "dev";
 function apiHeaders(token2, company) {
   const headers = {
     authorization: `Bearer ${token2}`,
@@ -304835,7 +304947,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.110" : "dev";
+var PKG_VERSION = true ? "2.2.111" : "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.110",
+  "version": "2.2.111",
   "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": "99b875d0c03fed8cad9ca484f28f05e3a304c3f1"
+    "sourceHead": "05ed7c1a9a41f19b4919fc9398095d0b3ceefaf7"
   }
 }