openyida 2026.5.9-beta.0 → 2026.5.9-beta.2

package/lib/auth/qr-login.js

@@ -483,12 +483,15 @@ async function fetchLegacyQrCodeUrl(baseUrl, cookieHeader) {
   };
 }
 
-async function fetchDingtalkOAuthQrCodeUrl(loginPageUrl, cookieHeader) {
+async function fetchDingtalkOAuthQrCodeUrl(loginPageUrl, cookieHeader, options = {}) {
   const parsedLoginUrl = new URL(loginPageUrl);
   const origin = parsedLoginUrl.origin;
   const apiUrl = `${origin}/oauth2/generate_qrcode`;
+  const targetCorpId = getTargetCorpId(options);
 
-  const response = await fetchPost(apiUrl, buildOAuthPostData(loginPageUrl), {
+  const response = await fetchPost(apiUrl, buildOAuthPostData(loginPageUrl, {
+    ...(targetCorpId ? { corpId: targetCorpId } : {}),
+  }), {
     cookieHeader,
     referer: loginPageUrl,
     origin,
@@ -522,6 +525,7 @@ async function fetchDingtalkOAuthQrCodeUrl(loginPageUrl, cookieHeader) {
       loginPageUrl,
       origin,
       code,
+      corpId: targetCorpId,
     },
   };
 }
@@ -534,9 +538,9 @@ async function fetchDingtalkOAuthQrCodeUrl(loginPageUrl, cookieHeader) {
  * @param {string} loginPageUrl
  * @returns {Promise<{ qrUrl: string, state: string, cookieHeader: string, context: object }>}
  */
-async function fetchQrCodeUrl(baseUrl, cookieHeader, loginPageUrl) {
+async function fetchQrCodeUrl(baseUrl, cookieHeader, loginPageUrl, options = {}) {
   if (isDingtalkOAuthChallengeUrl(loginPageUrl)) {
-    return fetchDingtalkOAuthQrCodeUrl(loginPageUrl, cookieHeader);
+    return fetchDingtalkOAuthQrCodeUrl(loginPageUrl, cookieHeader, options);
   }
 
   return fetchLegacyQrCodeUrl(baseUrl, cookieHeader);
@@ -546,7 +550,7 @@ async function postDingtalkOAuthLoginWithQr(context, cookieHeader, extraParams =
   const pollUrl = `${context.origin}/oauth2/login_with_qr`;
   const response = await fetchPost(pollUrl, buildOAuthPostData(context.loginPageUrl, {
     code: context.code,
-    exclusiveCorpId: '',
+    ...(context.corpId ? { corpId: context.corpId } : {}),
     stayLogin: false,
     ...extraParams,
   }), {
@@ -585,7 +589,7 @@ async function pollDingtalkQrCodeStatus(state, cookieHeader, onWaiting, context,
 
     const { parsed, cookieHeader: updatedCookieHeader } = await postLoginWithQr(context, cookieHeader, {
       code: state,
-      exclusiveCorpId: targetCorpId || '',
+      ...(targetCorpId ? { corpId: targetCorpId } : {}),
       stayLogin: false,
     });
     cookieHeader = updatedCookieHeader;
@@ -724,7 +728,7 @@ async function exchangeDingtalkOAuthResult(baseUrl, loginResult, cookieHeader, c
     selectedCorp = await resolveCorpSelection(corpList, options);
 
     const retryResult = await postLoginWithQr(context, cookieHeader, {
-      exclusiveCorpId: selectedCorp.corpId,
+      corpId: selectedCorp.corpId,
     });
     cookieHeader = retryResult.cookieHeader;
     const parsed = retryResult.parsed;
@@ -753,6 +757,15 @@ async function exchangeDingtalkOAuthResult(baseUrl, loginResult, cookieHeader, c
   };
 }
 
+async function resolveDingtalkOAuthCorpForFreshQr(loginResult, options = {}) {
+  if (!shouldChooseDingtalkOAuthOrganization(loginResult)) {return null;}
+  if (getTargetCorpId(options)) {return null;}
+
+  const corpList = normalizeDingtalkOAuthOrgList(loginResult.orgList);
+  if (corpList.length === 0) {return null;}
+  return resolveCorpSelection(corpList, options);
+}
+
 /**
  * Step 5：获取用户可访问的组织列表。
  * @param {string} baseUrl
@@ -1053,7 +1066,9 @@ async function startCodexQrLogin(options = {}) {
   const session = await fetchInitialSession(baseUrl, options);
   let { cookieHeader } = session;
   const { loginPageUrl } = session;
-  const { qrUrl, state, cookieHeader: updatedCookieHeader, context } = await fetchQrCodeUrl(baseUrl, cookieHeader, loginPageUrl);
+  const { qrUrl, state, cookieHeader: updatedCookieHeader, context } = await fetchQrCodeUrl(baseUrl, cookieHeader, loginPageUrl, {
+    corpId: targetCorpId,
+  });
   cookieHeader = updatedCookieHeader;
 
   let imageWritten = false;
@@ -1199,6 +1214,7 @@ async function selectCodexQrCorp(sessionFile, options = {}) {
 async function qrLogin(options = {}) {
   // 优先使用传入的 baseUrl，否则从环境配置解析（支持私有化）
   let baseUrl = (options.baseUrl || resolveEndpoint(null)).replace(/\/+$/, '');
+  const targetCorpId = getTargetCorpId(options);
 
   const { banner: qBanner, step: qStep, info: qInfo, success: qSuccess, warn: qWarn, label: qLabel, sep: qSep } = require('../core/chalk');
 
@@ -1214,7 +1230,9 @@ async function qrLogin(options = {}) {
   qStep(2, t('qr_login.step_get_qr'));
   let qrUrl, state, context;
   try {
-    ({ qrUrl, state, cookieHeader, context } = await fetchQrCodeUrl(baseUrl, cookieHeader, loginPageUrl));
+    ({ qrUrl, state, cookieHeader, context } = await fetchQrCodeUrl(baseUrl, cookieHeader, loginPageUrl, {
+      corpId: targetCorpId,
+    }));
   } catch (err) {
     throw new Error(t('qr_login.get_qr_error', err.message));
   }
@@ -1242,7 +1260,10 @@ async function qrLogin(options = {}) {
           scannedMessageShown = true;
         }
       },
-      context
+      context,
+      {
+        corpId: targetCorpId,
+      }
     ));
   } catch (err) {
     throw new Error(t('qr_login.poll_error', err.message));
@@ -1255,8 +1276,18 @@ async function qrLogin(options = {}) {
   let selectedCorp = null;
   try {
     if (context && context.type === 'dingtalk_oauth') {
+      selectedCorp = await resolveDingtalkOAuthCorpForFreshQr(loginResult, options);
+      if (selectedCorp && !options.retryWithSelectedCorp) {
+        qSuccess(t('qr_login.corp_selected', selectedCorp.corpName));
+        return qrLogin({
+          ...options,
+          corpId: selectedCorp.corpId,
+          retryWithSelectedCorp: true,
+        });
+      }
+
       const exchangeResult = await exchangeDingtalkOAuthResult(baseUrl, loginResult, cookieHeader, context, {
-        corpId: options.corpId,
+        corpId: targetCorpId,
       });
       ({ cookieHeader, baseUrl, selectedCorp } = exchangeResult);
       if (selectedCorp) {
@@ -1282,7 +1313,7 @@ async function qrLogin(options = {}) {
   // Step 7: 选择组织（如果有多个）
   if (!selectedCorp && corpList.length > 0) {
     try {
-      selectedCorp = await resolveCorpSelection(corpList, { corpId: options.corpId });
+      selectedCorp = await resolveCorpSelection(corpList, { corpId: targetCorpId });
       qSuccess(t('qr_login.corp_selected', selectedCorp.corpName));
 
       // 切换到目标组织
@@ -1339,7 +1370,9 @@ module.exports = {
     selectCorpById,
     resolveCorpSelection,
     exchangeDingtalkOAuthResult,
+    resolveDingtalkOAuthCorpForFreshQr,
     pollDingtalkQrCodeStatus,
+    buildOAuthPostData,
     buildCodexCorpInteraction,
     buildCodexPollCommand,
     getTargetCorpId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openyida",
-  "version": "2026.5.9-beta.0",
+  "version": "2026.5.9-beta.2",
   "description": "OpenYida CLI - 宜搭低代码 AI 开发工具（安装即用，零配置）",
   "bin": {
     "openyida": "bin/yida.js",