openyida 2026.4.20 → 2026.4.24

package/lib/auth/login.js

@@ -106,6 +106,7 @@ function refreshCsrfFromCache() {
   if (!cookieData || !cookieData.cookies) {
     const { error: chalkError } = require('../core/chalk');
     chalkError(t('login.no_cookie_cache'));
+    return null;
   }
 
   const { csrfToken, corpId, userId } = extractInfoFromCookies(cookieData.cookies);
@@ -113,6 +114,7 @@ function refreshCsrfFromCache() {
   if (!csrfToken) {
     const { error: chalkError2 } = require('../core/chalk');
     chalkError2(t('login.no_csrf_in_cache'));
+    return null;
   }
 
   const baseUrl = resolveBaseUrl(cookieData);
@@ -217,6 +219,7 @@ function interactiveLogin() {
   if (!playwrightPath) {
     const { error: chalkError3 } = require('../core/chalk');
     chalkError3(t('login.no_playwright'), { hint: `${t('login.playwright_install1')}\n  ${t('login.playwright_install2')}` });
+    return null;
   }
 
   const { c: lc, info: chalkInfo, label: chalkLabel2 } = require('../core/chalk');
@@ -303,6 +306,7 @@ const { URL } = require('url');
     if (!csrfToken) {
       const { error: chalkError4 } = require('../core/chalk');
       chalkError4(t('login.no_csrf_in_cookie'));
+      return null;
     }
 
     saveCookieCache(result.cookies, result.base_url);
@@ -329,16 +333,32 @@ const { URL } = require('url');
  * 退出登录：清空项目级 Cookie 文件。
  */
 function logout() {
-  const { c, banner, label, success: chalkSuccess4, warn: chalkWarn, hint: chalkHint, sep } = require('../core/chalk');
+  const { banner, label, success: chalkSuccess4, warn: chalkWarn, hint: chalkHint, sep } = require('../core/chalk');
 
   banner(t('login.logout_title'));
 
   const projectRoot = findProjectRoot();
-  const projectCookieFile = path.join(projectRoot, '.cache', 'cookies.json');
-  label('Cookie', projectCookieFile);
 
-  if (fs.existsSync(projectCookieFile)) {
-    fs.unlinkSync(projectCookieFile);
+  // 删除当前环境对应的 Cookie 文件（多环境隔离）
+  const { getCookieFilePath } = require('../core/env-manager');
+  const envCookieFile = getCookieFilePath(projectRoot);
+  // 兼容旧版：同时删除 cookies.json（历史遗留文件）
+  const legacyCookieFile = path.join(projectRoot, '.cache', 'cookies.json');
+
+  label('Cookie (env)', envCookieFile);
+  if (envCookieFile !== legacyCookieFile) {
+    label('Cookie (legacy)', legacyCookieFile);
+  }
+
+  let deleted = false;
+  for (const cookieFile of [envCookieFile, legacyCookieFile]) {
+    if (fs.existsSync(cookieFile)) {
+      fs.unlinkSync(cookieFile);
+      deleted = true;
+    }
+  }
+
+  if (deleted) {
     chalkSuccess4(t('login.logout_success'));
     chalkHint(t('login.logout_hint'));
   } else {

package/lib/core/doctor.js

@@ -254,44 +254,33 @@ class EnvironmentChecker {
   }
 
   checkLoginStatus() {
-    const cookiePath = path.join(this.projectRoot, '.cache', 'cookies.json');
-    if (!fs.existsSync(cookiePath)) {
-      return {
-        id: 'env-login',
-        label: '宜搭登录态',
-        passed: false,
-        severity: Severity.WARNING,
-        message: '未登录（运行 yida login 登录）',
-        fixType: FixType.COMMAND,
-        fixCommand: 'yida login',
-      };
-    }
+    // 使用统一的 loadCookieData 加载登录态（兼容多环境 cookie 文件）
+    const { loadCookieData } = require('./utils');
+    const cookieData = loadCookieData(this.projectRoot);
 
-    try {
-      const cookieData = JSON.parse(fs.readFileSync(cookiePath, 'utf-8'));
-      const cookies = Array.isArray(cookieData) ? cookieData : cookieData.cookies || [];
-      const hasToken = cookies.some((c) => c.name === 'tianshu_csrf_token');
-      const passed = hasToken;
-      return {
-        id: 'env-login',
-        label: `宜搭登录态：${passed ? '已登录' : 'Cookie 存在但可能已过期'}`,
-        passed,
-        severity: passed ? Severity.INFO : Severity.WARNING,
-        message: passed ? null : 'Cookie 可能已过期，运行 yida login 重新登录',
-        fixType: passed ? null : FixType.COMMAND,
-        fixCommand: passed ? null : 'yida login',
-      };
-    } catch {
+    if (!cookieData || !cookieData.cookies || cookieData.cookies.length === 0) {
       return {
         id: 'env-login',
         label: '宜搭登录态',
         passed: false,
         severity: Severity.WARNING,
-        message: 'Cookie 文件损坏',
+        message: '未登录（运行 openyida login 登录）',
         fixType: FixType.COMMAND,
-        fixCommand: 'yida login',
+        fixCommand: 'openyida login --qr',
       };
     }
+
+    const hasToken = cookieData.cookies.some((c) => c.name === 'tianshu_csrf_token');
+    const passed = hasToken;
+    return {
+      id: 'env-login',
+      label: `宜搭登录态：${passed ? '已登录' : 'Cookie 存在但可能已过期'}`,
+      passed,
+      severity: passed ? Severity.INFO : Severity.WARNING,
+      message: passed ? null : 'Cookie 可能已过期，运行 openyida login 重新登录',
+      fixType: passed ? null : FixType.COMMAND,
+      fixCommand: passed ? null : 'openyida login --qr',
+    };
   }
 
   async checkNetwork() {
@@ -407,7 +396,7 @@ class VersionChecker {
       label: `openyida 版本：${installedVersion}（SKILL 期望：${skillVersion}）`,
       passed,
       severity: passed ? Severity.INFO : Severity.WARNING,
-      message: passed ? null : `版本不匹配，建议升级到最新版`,
+      message: passed ? null : '版本不匹配，建议升级到最新版',
       fixType: passed ? null : FixType.COMMAND,
       fixCommand: passed ? null : 'npm install -g openyida@latest',
     }];

package/lib/core/update.js

@@ -13,6 +13,7 @@ const { execSync } = require('child_process');
 const { fetchLatestVersion, isNewer } = require('./check-update');
 const { t } = require('./i18n');
 const { warn } = require('./chalk');
+const { getNpmExecutable } = require('./utils');
 
 // ── ANSI 颜色常量 ──────────────────────────────────
 const RESET   = '\x1b[0m';
@@ -64,8 +65,8 @@ function renderStatusTable(rows) {
  */
 function detectPackageManager() {
   try {
-    const npmRoot = execSync('npm root -g', { encoding: 'utf8', timeout: 5000 }).trim();
-    const globalPath = execSync('npm prefix -g', { encoding: 'utf8', timeout: 5000 }).trim();
+    const npmRoot = execSync(`${getNpmExecutable()} root -g`, { encoding: 'utf8', timeout: 5000 }).trim();
+    const globalPath = execSync(`${getNpmExecutable()} prefix -g`, { encoding: 'utf8', timeout: 5000 }).trim();
     if (globalPath && npmRoot) {
       return 'npm';
     }
@@ -128,7 +129,7 @@ async function runUpdate(currentVersion) {
   const installSpinner = createSpinner(t('update.installing'));
 
   try {
-    execSync('npm install -g openyida@latest', {
+    execSync(`${getNpmExecutable()} install -g openyida@latest`, {
       stdio: ['pipe', 'pipe', 'pipe'],
       timeout: 120000,
     });

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "openyida",
-  "version": "2026.04.20",
+  "version": "2026.4.24",
   "description": "OpenYida CLI - 宜搭低代码 AI 开发工具（安装即用，零配置）",
   "bin": {
-    "openyida": "./bin/yida.js",
-    "yida": "./bin/yida.js"
+    "openyida": "bin/yida.js",
+    "yida": "bin/yida.js"
   },
   "files": [
     "bin/",