openyida 2026.4.2-beta.7 → 2026.4.2-beta.8

package/lib/auth/login.js

@@ -1,16 +1,16 @@
 /**
- * login.js - 宜搭登录态管理
+ * login.js - 宜搭登录态管理（Playwright 扫码登录）
  *
  * 登录策略（按优先级）：
  *   1. 本地 Cookie 缓存（最快）
- *   2. CDP 协议连接本地 Chrome（无需下载 Chromium）
- *   3. Playwright 内置 Chromium 扫码登录（兜底）
+ *   2. 本地 Chrome（channel: 'chrome'）
+ *   3. Playwright 内置 Chromium（兜底）
  *
  * 导出函数：
- *   ensureLogin()          - 确保有效登录态（优先缓存，否则触发浏览器登录）
+ *   ensureLogin()          - 确保有效登录态（优先缓存，否则扫码）
  *   checkLoginOnly()       - 仅检查登录态，不触发登录
  *   refreshCsrfFromCache() - 从缓存 Cookie 重新提取 csrf_token
- *   interactiveLogin()     - 打开浏览器扫码登录（Playwright 模式，作为兜底）
+ *   interactiveLogin()     - 打开浏览器扫码登录（需要 playwright）
  *   saveCookieCache()      - 保存 Cookie 到本地缓存（供 qr-login.js 使用）
  *   logout()               - 退出登录，清空 Cookie 缓存
  */
@@ -156,9 +156,7 @@ function ensureLogin() {
     }
   }
 
-  // 优先 CDP 连接本地 Chrome，失败时降级为 Playwright 扫码登录
-  const { loginWithCdpOrPlaywright } = require('./login-cdp');
-  return loginWithCdpOrPlaywright({ loginUrl: loadConfig().loginUrl });
+  return interactiveLogin();
 }
 
 // ── Playwright 扫码登录 ───────────────────────────────

package/lib/core/doctor.js

@@ -195,9 +195,15 @@ class EnvironmentChecker {
   }
 
   checkPlaywrightInstalled() {
-    // 1. 检查 playwright npm 包是否安装
     try {
       require.resolve('playwright');
+      return {
+        id: 'env-playwright',
+        label: 'Playwright 已安装',
+        passed: true,
+        severity: Severity.INFO,
+        fixType: null,
+      };
     } catch {
       return {
         id: 'env-playwright',
@@ -206,40 +212,7 @@ class EnvironmentChecker {
         severity: Severity.ERROR,
         message: 'Playwright 未安装',
         fixType: FixType.COMMAND,
-        fixCommand: 'npm install playwright && npx playwright install chromium',
-      };
-    }
-
-    // 2. 检查 Chromium 二进制是否存在于用户目录（postinstall 已自动安装）
-    try {
-      const { chromium } = require('playwright');
-      const chromiumPath = chromium.executablePath();
-      if (chromiumPath && fs.existsSync(chromiumPath)) {
-        return {
-          id: 'env-playwright',
-          label: `Playwright + Chromium 已就绪`,
-          passed: true,
-          severity: Severity.INFO,
-          fixType: null,
-        };
-      }
-      return {
-        id: 'env-playwright',
-        label: 'Chromium 浏览器检测',
-        passed: false,
-        severity: Severity.ERROR,
-        message: `Chromium 未安装（期望路径：${chromiumPath || '未知'}）`,
-        fixType: FixType.AUTO,
-        fixAction: 'install-chromium',
-      };
-    } catch {
-      // playwright API 不可用，降级为仅检查包安装
-      return {
-        id: 'env-playwright',
-        label: 'Playwright 已安装',
-        passed: true,
-        severity: Severity.INFO,
-        fixType: null,
+        fixCommand: 'npm install playwright',
       };
     }
   }
@@ -742,28 +715,6 @@ class FixEngine {
         };
       }
 
-      case 'install-chromium': {
-        try {
-          const { execSync } = require('child_process');
-          console.log('\n  🌐 正在安装 Chromium 浏览器（请稍候）...');
-          execSync('npx playwright install chromium', {
-            stdio: 'inherit',
-            timeout: 300_000,
-          });
-          return {
-            id: issue.id,
-            fixed: true,
-            message: 'Chromium 安装完成',
-          };
-        } catch (error) {
-          return {
-            id: issue.id,
-            fixed: false,
-            message: `Chromium 安装失败，请手动运行：npx playwright install chromium（${error.message}）`,
-          };
-        }
-      }
-
       case 'init-project': {
         try {
           const copy = require('./copy');

package/package.json

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

package/yida-skills/SKILL.md

@@ -4,7 +4,7 @@ description: >
   宜搭低代码平台 AI 开发入口。一句话生成完整应用：创建应用、表单设计、自定义页面、流程配置、数据管理。
   当用户提到"宜搭"、"yida"、"低代码"、"创建应用"、"创建表单"、"发布页面"、"搭建"、"系统"、"应用"时触发。
 metadata:
-  version: 2026.04.02-beta.7
+  version: 2026.04.02-beta.8
 ---
 
 # 宜搭 AI 应用开发指南

package/lib/auth/login-cdp.js

@@ -1,315 +0,0 @@
-/**
- * login-cdp.js - 优先 CDP 协议登录，降级 Playwright 扫码登录
- *
- * 登录策略（按优先级）：
- *   1. CDP 模式：启动本地已安装的 Chrome，通过 CDP 协议连接，无需下载 Chromium
- *   2. Playwright 模式：CDP 不可用时，降级为 playwright 内置 Chromium 扫码登录
- *
- * 导出函数：
- *   loginWithCdpOrPlaywright() - 执行完整登录流程（CDP 优先）
- *   findLocalChrome()          - 查找本地 Chrome 可执行文件路径
- *   launchChromeWithCdp()      - 启动 Chrome 并开启 CDP 调试端口
- */
-
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-const { execSync, spawn } = require('child_process');
-const { extractInfoFromCookies } = require('../core/utils');
-const { saveCookieCache, interactiveLogin } = require('./login');
-const { t } = require('../core/i18n');
-
-const DEFAULT_LOGIN_URL = 'https://www.aliwork.com/workPlatform';
-const CDP_PORT = 19222;
-const CDP_CONNECT_TIMEOUT_MS = 8000;
-const LOGIN_POLL_INTERVAL_MS = 2000;
-const LOGIN_TIMEOUT_MS = 600_000; // 10 分钟
-
-// ── 本地 Chrome 路径查找 ──────────────────────────────
-
-/**
- * 按平台查找本地已安装的 Chrome / Chromium 可执行文件。
- * @returns {string|null} 可执行文件路径，找不到返回 null
- */
-function findLocalChrome() {
-  const platform = os.platform();
-
-  const candidates = {
-    darwin: [
-      '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
-      '/Applications/Chromium.app/Contents/MacOS/Chromium',
-      '/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary',
-      path.join(os.homedir(), 'Applications/Google Chrome.app/Contents/MacOS/Google Chrome'),
-    ],
-    win32: [
-      'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe',
-      'C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe',
-      path.join(os.homedir(), 'AppData\\Local\\Google\\Chrome\\Application\\chrome.exe'),
-    ],
-    linux: [
-      '/usr/bin/google-chrome',
-      '/usr/bin/google-chrome-stable',
-      '/usr/bin/chromium-browser',
-      '/usr/bin/chromium',
-      '/snap/bin/chromium',
-    ],
-  };
-
-  const platformCandidates = candidates[platform] || candidates.linux;
-  for (const chromePath of platformCandidates) {
-    if (fs.existsSync(chromePath)) {
-      return chromePath;
-    }
-  }
-
-  // 尝试从 PATH 中查找
-  try {
-    const whichResult = execSync('which google-chrome || which chromium-browser || which chromium', {
-      encoding: 'utf-8',
-      stdio: ['pipe', 'pipe', 'pipe'],
-    }).trim().split('\n')[0];
-    if (whichResult && fs.existsSync(whichResult)) {
-      return whichResult;
-    }
-  } catch {
-    // 找不到，忽略
-  }
-
-  return null;
-}
-
-// ── CDP 连接工具 ──────────────────────────────────────
-
-/**
- * 等待 CDP 调试端口就绪（轮询 /json/version）。
- * @param {number} port
- * @param {number} timeoutMs
- * @returns {Promise<boolean>}
- */
-function waitForCdpPort(port, timeoutMs) {
-  return new Promise((resolve) => {
-    const deadline = Date.now() + timeoutMs;
-    const http = require('http');
-
-    function poll() {
-      if (Date.now() > deadline) {
-        resolve(false);
-        return;
-      }
-      const req = http.get(`http://127.0.0.1:${port}/json/version`, (res) => {
-        resolve(res.statusCode === 200);
-      });
-      req.on('error', () => {
-        setTimeout(poll, 300);
-      });
-      req.setTimeout(500, () => {
-        req.destroy();
-        setTimeout(poll, 300);
-      });
-    }
-
-    poll();
-  });
-}
-
-/**
- * 启动本地 Chrome 并开启 CDP 调试端口。
- * @param {string} chromePath - Chrome 可执行文件路径
- * @param {string} loginUrl - 登录页 URL
- * @returns {{ process: ChildProcess, userDataDir: string } | null}
- */
-function launchChromeWithCdp(chromePath, loginUrl) {
-  const userDataDir = path.join(os.tmpdir(), `yidacli-chrome-${Date.now()}`);
-  fs.mkdirSync(userDataDir, { recursive: true });
-
-  const args = [
-    `--remote-debugging-port=${CDP_PORT}`,
-    `--user-data-dir=${userDataDir}`,
-    '--no-first-run',
-    '--no-default-browser-check',
-    '--disable-default-apps',
-    loginUrl,
-  ];
-
-  try {
-    const chromeProcess = spawn(chromePath, args, {
-      detached: false,
-      stdio: 'ignore',
-    });
-    return { process: chromeProcess, userDataDir };
-  } catch {
-    return null;
-  }
-}
-
-// ── Cookie 轮询等待 ───────────────────────────────────
-
-/**
- * 通过 playwright CDP 连接，轮询等待 tianshu_csrf_token Cookie 出现。
- * @param {object} context - playwright BrowserContext
- * @returns {Promise<{ cookies: Array, baseUrl: string } | null>}
- */
-async function pollForLoginCookies(context) {
-  const deadline = Date.now() + LOGIN_TIMEOUT_MS;
-
-  while (Date.now() < deadline) {
-    await new Promise((resolve) => setTimeout(resolve, LOGIN_POLL_INTERVAL_MS));
-
-    const cookies = await context.cookies();
-    const csrfCookie = cookies.find((cookie) => cookie.name === 'tianshu_csrf_token' && cookie.value);
-
-    if (!csrfCookie) {
-      continue;
-    }
-
-    // 提取 baseUrl（优先用 yida_user_cookie 的 domain）
-    let baseUrl = 'https://www.aliwork.com';
-    const yidaCookie = cookies.find((cookie) => cookie.name === 'yida_user_cookie');
-    if (yidaCookie && yidaCookie.domain && yidaCookie.domain.includes('aliwork.com')) {
-      baseUrl = 'https://' + yidaCookie.domain.replace(/^\./, '');
-    } else if (csrfCookie.domain && csrfCookie.domain !== '.aliwork.com') {
-      baseUrl = 'https://' + csrfCookie.domain.replace(/^\./, '');
-    }
-
-    return { cookies, baseUrl };
-  }
-
-  return null;
-}
-
-// ── CDP 登录主流程 ────────────────────────────────────
-
-/**
- * 尝试通过 CDP 协议连接本地 Chrome 完成登录。
- * @param {string} loginUrl
- * @returns {Promise<object|null>} loginResult 或 null（失败时）
- */
-async function loginViaCdp(loginUrl) {
-  const chromePath = findLocalChrome();
-  if (!chromePath) {
-    console.error('  ℹ️  未找到本地 Chrome，将使用 Playwright 内置 Chromium');
-    return null;
-  }
-
-  console.error(`  🌐 检测到本地 Chrome：${chromePath}`);
-  console.error(`  🔗 正在通过 CDP 协议连接（端口 ${CDP_PORT}）...`);
-
-  // 检查端口是否已被占用（Chrome 已在运行）
-  const portAlreadyOpen = await waitForCdpPort(CDP_PORT, 500);
-  let chromeProcess = null;
-  let userDataDir = null;
-
-  if (!portAlreadyOpen) {
-    const launched = launchChromeWithCdp(chromePath, loginUrl);
-    if (!launched) {
-      console.error('  ⚠️  Chrome 启动失败，降级为 Playwright 模式');
-      return null;
-    }
-    chromeProcess = launched.process;
-    userDataDir = launched.userDataDir;
-
-    const ready = await waitForCdpPort(CDP_PORT, CDP_CONNECT_TIMEOUT_MS);
-    if (!ready) {
-      console.error('  ⚠️  CDP 端口未就绪，降级为 Playwright 模式');
-      if (chromeProcess) { chromeProcess.kill(); }
-      return null;
-    }
-  } else {
-    console.error('  ℹ️  检测到 Chrome 已在运行，直接连接');
-  }
-
-  let playwright;
-  try {
-    playwright = require('playwright');
-  } catch {
-    console.error('  ⚠️  playwright 未安装，降级为扫码模式');
-    if (chromeProcess) { chromeProcess.kill(); }
-    return null;
-  }
-
-  let browser = null;
-  try {
-    browser = await playwright.chromium.connectOverCDP(`http://127.0.0.1:${CDP_PORT}`);
-    const contexts = browser.contexts();
-    const context = contexts.length > 0 ? contexts[0] : await browser.newContext();
-
-    // 导航到登录页（如果当前页面不是登录页）
-    const pages = context.pages();
-    const loginPage = pages.length > 0 ? pages[0] : await context.newPage();
-    const currentUrl = loginPage.url();
-    if (!currentUrl.includes('aliwork.com')) {
-      await loginPage.goto(loginUrl, { timeout: 30000 });
-    }
-
-    console.error('  ⏳ 请在浏览器中完成宜搭登录（最多等待 10 分钟）...');
-
-    const result = await pollForLoginCookies(context);
-    if (!result) {
-      console.error('  ⏰ 登录超时（10 分钟），请重试');
-      return null;
-    }
-
-    console.error('  ✅ CDP 登录成功！');
-    return result;
-  } catch (error) {
-    console.error(`  ⚠️  CDP 连接失败（${error.message}），降级为 Playwright 模式`);
-    return null;
-  } finally {
-    if (browser) {
-      try { await browser.disconnect(); } catch { /* ignore */ }
-    }
-    if (chromeProcess) {
-      try { chromeProcess.kill(); } catch { /* ignore */ }
-    }
-    if (userDataDir) {
-      try { fs.rmSync(userDataDir, { recursive: true, force: true }); } catch { /* ignore */ }
-    }
-  }
-}
-
-// ── 对外入口 ──────────────────────────────────────────
-
-/**
- * 登录主入口：优先 CDP 连接本地 Chrome，失败时降级为 Playwright 扫码登录。
- *
- * @param {object} [options]
- * @param {string} [options.loginUrl] - 登录页 URL，默认读取 config.json
- * @returns {object} loginResult { csrf_token, corp_id, user_id, base_url, cookies }
- */
-async function loginWithCdpOrPlaywright(options = {}) {
-  const loginUrl = options.loginUrl || DEFAULT_LOGIN_URL;
-
-  console.error('\n🔐 正在打开浏览器，请扫码登录...');
-
-  // 策略 1：CDP 连接本地 Chrome
-  const cdpResult = await loginViaCdp(loginUrl);
-  if (cdpResult) {
-    const { csrfToken, corpId, userId } = extractInfoFromCookies(cdpResult.cookies);
-    if (!csrfToken) {
-      console.error('  ⚠️  CDP 登录后未找到 csrf_token，降级为 Playwright 模式');
-    } else {
-      saveCookieCache(cdpResult.cookies, cdpResult.baseUrl);
-      console.error(`  🔑 csrf_token: ${csrfToken.slice(0, 16)}...`);
-      if (corpId) { console.error(`  🏢 组织 ID: ${corpId}`); }
-      return {
-        csrf_token: csrfToken,
-        corp_id: corpId,
-        user_id: userId,
-        base_url: cdpResult.baseUrl,
-        cookies: cdpResult.cookies,
-      };
-    }
-  }
-
-  // 策略 2：降级为 Playwright 扫码登录
-  console.error('  📱 使用 Playwright 内置 Chromium 登录...');
-  return interactiveLogin();
-}
-
-module.exports = {
-  loginWithCdpOrPlaywright,
-  findLocalChrome,
-  launchChromeWithCdp,
-};