openyida 2026.5.26 → 2026.5.27-beta.0

package/bin/yida.js

@@ -27,6 +27,7 @@ function isAgentEnvironment(env) {
     env.CLAUDE_CODE ||
     env.CLAUDE_CODE_ENTRYPOINT ||
     env.OPENCODE ||
+    env.OPENCODE_CLIENT ||
     env.QODER_IDE ||
     env.QODER_AGENT ||
     env.QODERCLI_INTEGRATION_MODE ||
@@ -287,7 +288,7 @@ function noteLoginCommandResult(result) {
 
 function isAgentConversationEnvironment() {
   const { detectActiveTool } = require('../lib/core/utils');
-  return !!detectActiveTool();
+  return !!detectActiveTool() || process.env.OPENYIDA_AGENT_MODE === '1';
 }
 
 function shouldUseBrowserHandoffLogin(cliArgs) {
@@ -303,12 +304,13 @@ function shouldUseAgentLogin(cliArgs) {
 }
 
 function shouldUsePlaywrightFallbackInAgentLogin() {
-  const { detectActiveTool } = require('../lib/core/utils');
-  const activeTool = detectActiveTool();
-  if (activeTool && activeTool.tool === 'wukong') {
-    return false;
-  }
-  return process.env.OPENYIDA_AGENT_PLAYWRIGHT_FALLBACK === '1';
+  const { hasDesktopEnvironment } = require('../lib/core/utils');
+  return hasDesktopEnvironment() || process.env.OPENYIDA_AGENT_PLAYWRIGHT_FALLBACK === '1';
+}
+
+function shouldUseDesktopBrowserLogin() {
+  const { hasDesktopEnvironment } = require('../lib/core/utils');
+  return hasDesktopEnvironment();
 }
 
 function shouldUseCodexQrLogin(cliArgs) {
@@ -479,12 +481,6 @@ async function main() {
         } else {
           const { detectActiveTool } = require('../lib/core/utils');
           const activeTool = detectActiveTool();
-          if (activeTool && activeTool.tool === 'wukong') {
-            const { codexLogin } = require('../lib/auth/codex-login');
-            const result = await codexLogin({ tool: 'wukong' });
-            printLoginResult(result);
-            break;
-          }
           const { interactiveLogin } = require('../lib/auth/login');
           const browserResult = interactiveLogin({
             playwrightFallback: shouldUsePlaywrightFallbackInAgentLogin(),
@@ -493,10 +489,10 @@ async function main() {
             printLoginResult(browserResult);
           } else {
             // CDP/Playwright 失败后的兜底策略：
-            // QoderWork 有 in-app browser，优先使用 browser handoff；其余走终端二维码
-            if (activeTool && activeTool.tool === 'qoderwork') {
+            // Wukong/QoderWork 有 in-app browser，优先使用 browser handoff；其余走 AI 对话框 QR handoff。
+            if (activeTool && (activeTool.tool === 'wukong' || activeTool.tool === 'qoderwork')) {
               const { codexLogin } = require('../lib/auth/codex-login');
-              const result = await codexLogin({ tool: 'qoderwork' });
+              const result = await codexLogin({ tool: activeTool.tool });
               printLoginResult(result);
             } else {
               const { startCodexQrLogin } = require('../lib/auth/qr-login');
@@ -520,6 +516,14 @@ async function main() {
           printLoginResult(cachedResult);
           break;
         }
+        if (shouldUseDesktopBrowserLogin()) {
+          const { interactiveLogin } = require('../lib/auth/login');
+          const browserResult = interactiveLogin({ playwrightFallback: true });
+          if (browserResult) {
+            printLoginResult(browserResult);
+            break;
+          }
+        }
         const { qrLogin } = require('../lib/auth/qr-login');
         const result = await qrLogin({ corpId: getArgValue(loginArgs, '--corp-id') });
         printLoginResult(result);
@@ -540,9 +544,25 @@ async function main() {
       if (subCommand === 'status') {
         authStatus();
       } else if (subCommand === 'login') {
-        const authArgs = [subCommand, ...applyLoginEnvironmentFlags(args.slice(1))];
-        const loginType = shouldUseBrowserHandoffLogin(authArgs) ? 'browser' : 'qrcode';
-        await authLogin({ type: loginType, corpId: getArgValue(authArgs, '--corp-id') });
+        const authArgs = applyLoginEnvironmentFlags(args.slice(1));
+        let loginType = 'qrcode';
+        if (authArgs.includes('--codex')) {
+          loginType = 'codex';
+        } else if (authArgs.includes('--qoder')) {
+          loginType = 'qoder';
+        } else if (authArgs.includes('--wukong')) {
+          loginType = 'wukong';
+        } else if (authArgs.includes('--browser')) {
+          loginType = 'browser';
+        }
+        const result = await authLogin({
+          type: loginType,
+          corpId: getArgValue(authArgs, '--corp-id'),
+          forceTerminalQr: authArgs.includes('--qr'),
+        });
+        if (result) {
+          printLoginResult(result);
+        }
       } else if (subCommand === 'refresh') {
         authRefresh();
       } else if (subCommand === 'logout') {

package/lib/auth/auth.js

@@ -18,8 +18,8 @@
 
 const fs = require('fs');
 const path = require('path');
-const { findProjectRoot, loadCookieData, extractInfoFromCookies, resolveBaseUrl } = require('../core/utils');
-const { logout, checkLoginOnly } = require('./login');
+const { findProjectRoot, loadCookieData, extractInfoFromCookies, resolveBaseUrl, detectActiveTool, hasDesktopEnvironment } = require('../core/utils');
+const { logout, checkLoginOnly, interactiveLogin } = require('./login');
 const { t } = require('../core/i18n');
 
 const AUTH_CACHE_FILE = '.cache/auth.json';
@@ -135,7 +135,7 @@ function authStatus() {
  * @returns {Promise<object>|object} 登录结果
  */
 async function authLogin(options = {}) {
-  const { type = 'qrcode', corpId } = options;
+  const { type = 'qrcode', corpId, forceTerminalQr = false } = options;
 
   const { c, info, success: chalkSuccess, label } = require('../core/chalk');
   info(t('auth.login_start', type));
@@ -143,14 +143,21 @@ async function authLogin(options = {}) {
   // 调用现有的登录逻辑
   let result;
   const cachedResult = checkLoginOnly({ includeSecrets: true });
-  if (type === 'browser' || type === 'codex' || type === 'qoder' || type === 'wukong') {
-    result = cachedResult.status === 'ok'
-      ? cachedResult
-      : await require('./codex-login').codexLogin();
+  if (cachedResult.status === 'ok') {
+    result = cachedResult;
+  } else if (type === 'browser') {
+    result = interactiveLogin({ playwrightFallback: true });
+  } else if (type === 'codex' || type === 'qoder' || type === 'wukong') {
+    result = await require('./codex-login').codexLogin({
+      tool: type,
+    });
+  } else if (type === 'qrcode' && !forceTerminalQr && isAgentConversationEnvironment()) {
+    result = await loginInAgentConversation({ corpId });
+  } else if (type === 'qrcode' && !forceTerminalQr && hasDesktopEnvironment()) {
+    result = interactiveLogin({ playwrightFallback: true }) ||
+      await require('./qr-login').qrLogin({ corpId });
   } else {
-    result = cachedResult.status === 'ok'
-      ? cachedResult
-      : await require('./qr-login').qrLogin({ corpId });
+    result = await require('./qr-login').qrLogin({ corpId });
   }
 
   if (!result) {
@@ -178,6 +185,31 @@ async function authLogin(options = {}) {
   return result;
 }
 
+function isAgentConversationEnvironment() {
+  return !!detectActiveTool() || process.env.OPENYIDA_AGENT_MODE === '1';
+}
+
+function shouldUsePlaywrightFallbackInAgentLogin() {
+  return hasDesktopEnvironment() || process.env.OPENYIDA_AGENT_PLAYWRIGHT_FALLBACK === '1';
+}
+
+async function loginInAgentConversation(options = {}) {
+  const activeTool = detectActiveTool();
+
+  const browserResult = interactiveLogin({
+    playwrightFallback: shouldUsePlaywrightFallbackInAgentLogin(),
+  });
+  if (browserResult) {
+    return browserResult;
+  }
+
+  if (activeTool && (activeTool.tool === 'wukong' || activeTool.tool === 'qoderwork')) {
+    return require('./codex-login').codexLogin({ tool: activeTool.tool });
+  }
+
+  return require('./qr-login').startCodexQrLogin({ corpId: options.corpId });
+}
+
 // ── 刷新登录态 ────────────────────────────────────────
 
 /**

package/lib/core/utils.js

@@ -101,8 +101,9 @@ function detectActiveTool() {
   }
 
   // OpenCode
-  // Windows 上配置目录为 ~/.config/opencode，macOS/Linux 为 ~/.opencode
-  if (env.OPENCODE) {
+  // Windows 上配置目录为 ~/.config/opencode，macOS/Linux 为 ~/.opencode。
+  // OpenCode 当前运行时会暴露 OPENCODE_CLIENT；保留 OPENCODE 兼容旧检测。
+  if (env.OPENCODE || env.OPENCODE_CLIENT) {
     const opencodeDirName = process.platform === 'win32'
       ? path.join('.config', 'opencode')
       : '.opencode';
@@ -141,6 +142,30 @@ function detectActiveTool() {
   return null;
 }
 
+function hasDesktopEnvironment(env = process.env, platform = process.platform) {
+  if (env.OPENYIDA_FORCE_TERMINAL_QR === '1') {
+    return false;
+  }
+  if (env.OPENYIDA_ASSUME_DESKTOP === '1') {
+    return true;
+  }
+  if (env.CI || env.CODEX_CI) {
+    return false;
+  }
+  if (platform === 'darwin' || platform === 'win32') {
+    return true;
+  }
+  if (platform === 'linux') {
+    return !!(
+      env.DISPLAY ||
+      env.WAYLAND_DISPLAY ||
+      env.MIR_SOCKET ||
+      ['x11', 'wayland'].includes(String(env.XDG_SESSION_TYPE || '').toLowerCase())
+    );
+  }
+  return false;
+}
+
 /**
  * 解析悟空工作区根目录。
  *
@@ -700,6 +725,7 @@ async function requestWithAutoLogin(requestFn, authRef) {
 
 module.exports = {
   detectActiveTool,
+  hasDesktopEnvironment,
   findProjectRoot,
   extractInfoFromCookies,
   loadCookieData,

package/package.json

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