oasis_test_v2 2.2.114 → 2.2.115

package/dist/index.js

@@ -20789,6 +20789,9 @@ ${input.link}` : `${head}
 function feishuPendingApprovalNotice(modules) {
   return `${moduleNames(modules)}\u542B\u9700\u98DE\u4E66\u7BA1\u7406\u5458\u5BA1\u6279\u7684\u6743\u9650\uFF0C\u5DF2\u63D0\u4EA4\u5BA1\u6279\u3002\u6279\u51C6\u540E\u4F1A\u5728\u98DE\u4E66\u79C1\u4FE1\u901A\u77E5\u4F60\uFF0C\u70B9\u4E00\u4E0B\u5373\u53EF\u8865\u4E0A\u8FD9\u90E8\u5206\u6743\u9650\uFF1B\u5DF2\u6709\u7684\u98DE\u4E66\u80FD\u529B\u4E0D\u53D7\u5F71\u54CD\u3002`;
 }
+function feishuApprovalUnconfirmedNotice(modules, expired) {
+  return `${expired ? "\u6388\u6743\u9875\u5DF2\u8D85\u65F6\uFF0C" : ""}\u98DE\u4E66\u8FD9\u4E00\u8F6E\u6CA1\u6709\u7ED9\u51FA\u6388\u6743\uFF0COasis \u65E0\u6CD5\u786E\u8BA4\u4F60\u662F\u5426\u5728\u6388\u6743\u9875\u5BF9${moduleNames(modules)}\u7684\u6743\u9650\u70B9\u4E86\u300C\u7533\u8BF7\u300D\u3002\u5982\u679C\u70B9\u4E86\uFF0C\u8BF7\u9009\u300C\u6211\u70B9\u4E86\u7533\u8BF7\u300D\uFF0C\u6279\u51C6\u540E\u4F1A\u5728\u98DE\u4E66\u79C1\u4FE1\u901A\u77E5\u4F60\u8865\u6388\u6743\uFF1B\u6CA1\u70B9\uFF08\u6216\u70B9\u7684\u662F\u62D2\u7EDD\uFF09\u7684\u8BDD\u91CD\u65B0\u53D1\u8D77\u6388\u6743\u5373\u53EF\u3002\u5DF2\u6709\u7684\u98DE\u4E66\u80FD\u529B\u4E0D\u53D7\u5F71\u54CD\u3002`;
+}
 var FEISHU_AUTH_PENDING_APPROVAL_VAR, FEISHU_PENDING_APPROVAL_WATCH_MS, FEISHU_APPROVED_SUPPLEMENT_KEEP_MS, AUTO_APPROVED2, userScopeIndex, isGranted, moduleNames;
 var init_pending_approval = __esm({
   "../connectors/src/feishu/pending-approval.ts"() {
@@ -24796,7 +24799,7 @@ function createFeishuReauth(deps) {
         message: `\u8FD9\u4E2A\u94FE\u63A5\u53EA\u80FD\u7531\u539F\u6388\u6743\u4EBA\u672C\u4EBA\u4F7F\u7528\u3002\u4F60${who.name ? `\uFF08${who.name}\uFF09` : ""}\u4E0D\u662F\u539F\u6388\u6743\u4EBA\uFF0C\u672C\u6B21\u6388\u6743\u672A\u4FDD\u5B58\uFF0C\u539F\u6388\u6743\u4FDD\u6301\u4E0D\u53D8\u3002`
       };
     }
-    await withConnectorCredentialLock("feishu", claims.actorId, async () => {
+    const supplement = await withConnectorCredentialLock("feishu", claims.actorId, async () => {
       const pending2 = claims.purpose === "supplement" ? await readFeishuPendingApproval(store, claims.actorId) : null;
       await persistFeishuUserAuthorization(store, claims.actorId, data, now(), {
         openId: who.openId,
@@ -24811,19 +24814,48 @@ function createFeishuReauth(deps) {
         connectorId: "feishu",
         encrypted: false
       });
-      if (pending2) {
-        const granted = record10.grantedScopes ? new Set(record10.grantedScopes) : null;
-        const still = granted ? pending2.pendingScopes.filter((x2) => !granted.has(x2)) : [];
-        if (still.length === 0) await clearFeishuPendingApproval(store, claims.actorId);
-        else {
-          const next = { ...pending2, pendingScopes: still };
-          delete next.approvedAt;
-          delete next.notice;
-          await writeFeishuPendingApproval(store, claims.actorId, next);
-        }
-      }
-    });
-    await deps.onRestored?.(claims, { openId: who.openId, ...who.name ? { userName: who.name } : {} }).catch((e) => warn(`onRestored: ${String(e)}`));
+      if (claims.purpose !== "supplement") return null;
+      if (!record10.grantedScopes) return "unknown";
+      if (!pending2) {
+        const granted2 = new Set(record10.grantedScopes);
+        const wanted = scopesForSelection(sel, sendAsUserRequested).filter((x2) => x2 !== "offline_access");
+        return wanted.every((x2) => granted2.has(x2)) ? "complete" : "short";
+      }
+      const granted = new Set(record10.grantedScopes);
+      const still = pending2.pendingScopes.filter((x2) => !granted.has(x2));
+      if (still.length === 0) {
+        await clearFeishuPendingApproval(store, claims.actorId);
+        return "complete";
+      }
+      const next = { ...pending2, pendingScopes: still };
+      delete next.approvedAt;
+      delete next.notice;
+      await writeFeishuPendingApproval(store, claims.actorId, next);
+      return "partial";
+    });
+    const userName = who.name ? { userName: who.name } : {};
+    if (supplement === "partial") {
+      return {
+        state: "incomplete",
+        ...userName,
+        message: "\u6388\u6743\u5DF2\u4FDD\u5B58\uFF0C\u4F46\u98DE\u4E66\u8FD9\u6B21\u6CA1\u6709\u7ED9\u9F50\u7BA1\u7406\u5458\u6279\u51C6\u7684\u6743\u9650\uFF0C\u8FD8\u5DEE\u7684\u90E8\u5206\u7EE7\u7EED\u7B49\u5F85\u5BA1\u6279\uFF1B\u6279\u51C6\u540E\u4F1A\u518D\u79C1\u4FE1\u901A\u77E5\u4F60\u3002\u5DF2\u6709\u7684\u98DE\u4E66\u80FD\u529B\u4E0D\u53D7\u5F71\u54CD\u3002"
+      };
+    }
+    if (supplement === "short") {
+      return {
+        state: "incomplete",
+        ...userName,
+        message: "\u6388\u6743\u5DF2\u4FDD\u5B58\uFF0C\u4F46\u98DE\u4E66\u8FD9\u6B21\u6CA1\u6709\u7ED9\u9F50\u6240\u7533\u8BF7\u7684\u6743\u9650\u3002\u53EF\u5728 Oasis \u8FDE\u63A5\u5668\u8BE6\u60C5\u67E5\u770B\u5DF2\u5F00\u901A\u7684\u529F\u80FD\uFF0C\u9700\u8981\u65F6\u91CD\u65B0\u8FDE\u63A5\u98DE\u4E66\u3002"
+      };
+    }
+    if (supplement === "unknown") {
+      return {
+        state: "incomplete",
+        ...userName,
+        message: "\u6388\u6743\u5DF2\u4FDD\u5B58\uFF0C\u4F46\u98DE\u4E66\u6CA1\u6709\u56DE\u62A5\u8FD9\u6B21\u6388\u4E88\u4E86\u54EA\u4E9B\u6743\u9650\uFF0C\u65E0\u6CD5\u786E\u8BA4\u7BA1\u7406\u5458\u6279\u51C6\u7684\u6743\u9650\u662F\u5426\u5DF2\u8865\u4E0A\u3002\u53EF\u5728 Oasis \u8FDE\u63A5\u5668\u8BE6\u60C5\u67E5\u770B\uFF1B\u4ECD\u663E\u793A\u5F85\u8865\u6388\u6743\u7684\u8BDD\uFF0C\u518D\u70B9\u4E00\u6B21\u94FE\u63A5\u5373\u53EF\u3002"
+      };
+    }
+    await deps.onRestored?.(claims, { openId: who.openId, ...userName }).catch((e) => warn(`onRestored: ${String(e)}`));
     return { state: "restored", ...who.name ? { userName: who.name } : {} };
   };
   const watch = async (deviceCode, entry, ctx) => {
@@ -212296,6 +212328,35 @@ async function feishuModuleAccess(store, actorId, fetchScopes = fetchFeishuAppSc
     ...botCheckError ? { botCheckError } : {}
   };
 }
+async function saveFeishuModuleSelection(store, actorId, body2) {
+  const read3 = (key2) => store.revealResolvedVariable(key2, actorId).catch(() => null);
+  if (!await read3("FEISHU_APP_ID") || !await read3("FEISHU_APP_SECRET")) return { ok: false, error: "no_app" };
+  const sel = normalizeFeishuAuthSelection({ modules: Array.isArray(body2.modules) ? body2.modules : [] });
+  if (!sel) return { ok: false, error: "empty" };
+  let prev = {};
+  const raw = await read3(FEISHU_AUTH_SELECTION_VAR);
+  try {
+    prev = raw ? JSON.parse(raw) ?? {} : {};
+  } catch {
+    prev = {};
+  }
+  const grantedScopes = Array.isArray(prev.grantedScopes) ? prev.grantedScopes.filter((s2) => typeof s2 === "string") : void 0;
+  const sendAsUser = prev.sendAsUser === true;
+  const record10 = {
+    modules: sel.modules,
+    sendAsUser,
+    sendAsUserRequested: sendAsUser && prev.sendAsUserRequested === true,
+    ...grantedScopes ? { grantedScopes } : {}
+  };
+  await store.putVariable({
+    key: FEISHU_AUTH_SELECTION_VAR,
+    value: JSON.stringify(record10),
+    ...actorId ? { scope: "personal", actorId } : { scope: "global" },
+    connectorId: "feishu",
+    encrypted: false
+  });
+  return { ok: true, record: record10 };
+}
 var init_feishu_module_access = __esm({
   "../server/src/feishu-module-access.ts"() {
     "use strict";
@@ -212305,14 +212366,7 @@ var init_feishu_module_access = __esm({
 
 // ../server/src/feishu-pending-approval.ts
 async function recordFeishuPendingApproval(input) {
-  const requested = scopesForSelection(input.selection, input.sendAsUserRequested);
-  let appScopes = null;
-  try {
-    appScopes = await (input.fetchScopes ?? fetchFeishuAppScopes)(input.appId, input.appSecret);
-  } catch (e) {
-    (input.warn ?? ((m2) => console.warn(`[feishu-oauth] ${m2}`)))(`\u5E94\u7528\u6743\u9650\u5217\u8868\u67E5\u8BE2\u5931\u8D25\uFF0C\u5F85\u5BA1\u6279\u6309\u514D\u5BA1\u96C6\u5408\u4F30\u7B97: ${String(e)}`);
-  }
-  const pendingScopes = feishuPendingApprovalScopes({ requested, granted: input.granted, appScopes });
+  const pendingScopes = await pendingApprovalScopes(input);
   if (pendingScopes.length === 0) {
     if (input.granted) {
       await withConnectorCredentialLock("feishu", input.actorId, () => clearFeishuPendingApproval(input.store, input.actorId));
@@ -212332,6 +212386,22 @@ async function recordFeishuPendingApproval(input) {
   const modules = feishuPendingApprovalModules(record10);
   return { modules, scopes: pendingScopes, notice: feishuPendingApprovalNotice(modules) };
 }
+async function pendingApprovalScopes(input) {
+  const requested = scopesForSelection(input.selection, input.sendAsUserRequested);
+  let appScopes = null;
+  try {
+    appScopes = await (input.fetchScopes ?? fetchFeishuAppScopes)(input.appId, input.appSecret);
+  } catch (e) {
+    (input.warn ?? ((m2) => console.warn(`[feishu-oauth] ${m2}`)))(`\u5E94\u7528\u6743\u9650\u5217\u8868\u67E5\u8BE2\u5931\u8D25\uFF0C\u5F85\u5BA1\u6279\u6309\u514D\u5BA1\u96C6\u5408\u4F30\u7B97: ${String(e)}`);
+  }
+  return feishuPendingApprovalScopes({ requested, granted: input.granted, appScopes });
+}
+async function assessFeishuApprovalUnconfirmed(input) {
+  const scopes = await pendingApprovalScopes(input);
+  if (scopes.length === 0) return null;
+  const modules = feishuPendingApprovalModules({ modules: input.selection.modules, pendingScopes: scopes });
+  return { modules, scopes, notice: feishuApprovalUnconfirmedNotice(modules, input.expired) };
+}
 var init_feishu_pending_approval = __esm({
   "../server/src/feishu-pending-approval.ts"() {
     "use strict";
@@ -218543,6 +218613,27 @@ ${composed}`;
             }
             return;
           }
+          if (url.pathname === "/api/connectors/feishu/modules" && req.method === "POST") {
+            try {
+              const body2 = JSON.parse(rawBody || "{}");
+              const svc = await connectorActorsService();
+              if (!svc) throw new Error("actors service unavailable");
+              const denied = await connectorWriteDenied(svc, body2.actorId, "\u8C03\u6574\u98DE\u4E66\u63A5\u5165\u529F\u80FD");
+              if (denied) {
+                writeApiError(res, denied);
+                return;
+              }
+              const saved = await saveFeishuModuleSelection(svc, body2.actorId, body2);
+              if (!saved.ok) {
+                res.writeHead(saved.error === "no_app" ? 409 : 400, { "content-type": "application/json" }).end(JSON.stringify({ error: saved.error === "no_app" ? "\u8FD8\u6CA1\u6709\u914D\u7F6E\u98DE\u4E66\u5E94\u7528\uFF0C\u8BF7\u5148\u5B8C\u6210\u8FDE\u63A5" : "\u8BF7\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u529F\u80FD\u6A21\u5757" }));
+                return;
+              }
+              res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({ ok: true, modules: saved.record.modules }));
+            } catch (e) {
+              res.writeHead(500).end(JSON.stringify({ error: String(e) }));
+            }
+            return;
+          }
           if (url.pathname === "/api/connectors/feishu/login/start" && req.method === "POST") {
             const startBody = JSON.parse(rawBody);
             const { appId, actorId } = startBody;
@@ -218612,6 +218703,51 @@ ${composed}`;
             }
             return;
           }
+          if (url.pathname === "/api/connectors/feishu/login/confirm-application" && req.method === "POST") {
+            const { appId, deviceCode, actorId } = JSON.parse(rawBody);
+            if (!appId || !deviceCode) {
+              res.writeHead(400).end(JSON.stringify({ error: "appId and deviceCode required" }));
+              return;
+            }
+            try {
+              const devicePending = opts.connectorAuthPending?.githubApp;
+              const started = devicePending ? await devicePending.get(feishuDevicePendingKey(deviceCode), Date.now()) : { status: "missing" };
+              if (started.status !== "found") {
+                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;
+              }
+              if (v2["ended"] !== "no_token") {
+                res.writeHead(409).end(JSON.stringify({ ok: false, error: "\u8FD9\u6B21\u6388\u6743\u6CA1\u6709\u5904\u5728\u300C\u5F85\u786E\u8BA4\u662F\u5426\u5DF2\u7533\u8BF7\u300D\u7684\u72B6\u6001\uFF0C\u65E0\u9700\u786E\u8BA4" }));
+                return;
+              }
+              const selection = normalizeFeishuAuthSelection({ modules: v2["modules"], sendAsUser: v2["sendAsUser"] });
+              const confirmSvc = await connectorActorsService();
+              const appSecret = confirmSvc ? await confirmSvc.revealResolvedVariable("FEISHU_APP_SECRET", actorId) : null;
+              if (!selection || !confirmSvc || !appSecret) {
+                res.writeHead(409).end(JSON.stringify({ ok: false, restart: true, error: "\u8FD9\u6B21\u6388\u6743\u7684\u767B\u8BB0\u5DF2\u635F\u574F\u6216\u5E94\u7528\u51ED\u636E\u5DF2\u4E0D\u5B58\u5728\uFF0C\u8BF7\u91CD\u65B0\u53D1\u8D77\u6388\u6743" }));
+                return;
+              }
+              const pendingApproval = await recordFeishuPendingApproval({
+                store: confirmSvc,
+                actorId,
+                appId,
+                appSecret,
+                selection,
+                sendAsUserRequested: selection.sendAsUser && v2["sendAsUserRequested"] === true,
+                ...isHumanActorId(actor) ? { applicant: actor } : {},
+                now: Date.now()
+              });
+              res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify(pendingApproval ? { ok: true, pendingApproval: { modules: pendingApproval.modules, scopes: pendingApproval.scopes }, notice: pendingApproval.notice } : { ok: false, error: "\u8FD9\u4E9B\u6743\u9650\u73B0\u5728\u5DF2\u7ECF\u53EF\u7528\uFF08\u7BA1\u7406\u5458\u53EF\u80FD\u5DF2\u6279\u51C6\uFF09\uFF0C\u8BF7\u91CD\u65B0\u53D1\u8D77\u6388\u6743\u5B8C\u6210\u8FDE\u63A5" }));
+            } catch (e) {
+              res.writeHead(500).end(JSON.stringify({ error: String(e) }));
+            }
+            return;
+          }
           if (url.pathname === "/api/connectors/feishu/login/poll" && req.method === "POST") {
             const { appId, deviceCode, actorId } = JSON.parse(rawBody);
             if (!appId || !deviceCode) {
@@ -218645,22 +218781,22 @@ ${composed}`;
                 polled = await pollFeishuDeviceToken({ appId, appSecret, deviceCode });
               } catch (e) {
                 if (!(e instanceof FeishuDeviceFlowError) || !pollSvc) throw e;
-                const pendingApproval2 = await recordFeishuPendingApproval({
-                  store: pollSvc,
-                  actorId,
+                const expired = e.code === "expired_token" || e.code === "invalid_grant";
+                const unconfirmed = await assessFeishuApprovalUnconfirmed({
                   appId,
                   appSecret,
                   selection: startedSelection.selection,
                   sendAsUserRequested: startedSelection.sendAsUserRequested,
-                  ...isHumanActorId(actor) ? { applicant: actor } : {},
-                  now: Date.now()
+                  expired
                 });
-                const expired = e.code === "expired_token" || e.code === "invalid_grant";
-                res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify(pendingApproval2 ? {
+                if (unconfirmed && devicePending) {
+                  await devicePending.patch(feishuDevicePendingKey(deviceCode), { ended: "no_token", endedCode: e.code });
+                }
+                res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify(unconfirmed ? {
                   ok: false,
                   final: true,
-                  pendingApproval: { modules: pendingApproval2.modules, scopes: pendingApproval2.scopes },
-                  notice: expired ? `\u6388\u6743\u9875\u5DF2\u8D85\u65F6\u3002\u5982\u679C\u4F60\u5728\u6388\u6743\u9875\u70B9\u4E86\u300C\u7533\u8BF7\u300D\uFF1A${pendingApproval2.notice}\u6CA1\u70B9\u7684\u8BDD\u91CD\u65B0\u53D1\u8D77\u6388\u6743\u5373\u53EF\u3002` : pendingApproval2.notice
+                  approvalUnconfirmed: { modules: unconfirmed.modules, scopes: unconfirmed.scopes },
+                  notice: unconfirmed.notice
                 } : {
                   ok: false,
                   final: true,
@@ -301399,7 +301535,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
     }
   }
 }
-var CLI_VERSION = "2.2.114" ? "2.2.114" : "dev";
+var CLI_VERSION = "2.2.115" ? "2.2.115" : "dev";
 function apiHeaders(token2, company) {
   const headers = {
     authorization: `Bearer ${token2}`,
@@ -305570,7 +305706,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.114" : "dev";
+var PKG_VERSION = true ? "2.2.115" : "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.114",
+  "version": "2.2.115",
   "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": "46e4f9275679ea8eec37f0f1e30b45cc48e3e70c"
+    "sourceHead": "9c025c6edd39870a4e40a29026007109bbec04cf"
   }
 }