claude-coder 1.8.2 → 1.8.3

package/src/commands/auth.js

@@ -1,240 +1,290 @@
-'use strict';
-
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
-const { execSync } = require('child_process');
-const { loadConfig, log } = require('../common/config');
-const { assets } = require('../common/assets');
-const { appendGitignore } = require('../common/utils');
-
-function updateGitignore(entry) {
-  if (appendGitignore(assets.projectRoot, entry)) {
-    log('ok', `.gitignore 已添加: ${entry}`);
-  }
-}
-
-function updateMcpConfig(mcpPath, mode) {
-  let mcpConfig = {};
-  if (fs.existsSync(mcpPath)) {
-    try { mcpConfig = JSON.parse(fs.readFileSync(mcpPath, 'utf8')); } catch {}
-  }
-
-  if (!mcpConfig.mcpServers) mcpConfig.mcpServers = {};
-
-  const args = ['@playwright/mcp@latest'];
-  const projectRoot = assets.projectRoot;
-
-  switch (mode) {
-    case 'persistent': {
-      const browserProfilePath = assets.path('browserProfile');
-      const relProfile = path.relative(projectRoot, browserProfilePath).split(path.sep).join('/');
-      args.push(`--user-data-dir=${relProfile}`);
-      break;
-    }
-    case 'isolated': {
-      const playwrightAuthPath = assets.path('playwrightAuth');
-      const relAuth = path.relative(projectRoot, playwrightAuthPath).split(path.sep).join('/');
-      args.push('--isolated', `--storage-state=${relAuth}`);
-      break;
-    }
-    case 'extension':
-      args.push('--extension');
-      break;
-  }
-
-  mcpConfig.mcpServers.playwright = { command: 'npx', args };
-  fs.writeFileSync(mcpPath, JSON.stringify(mcpConfig, null, 2) + '\n', 'utf8');
-  log('ok', `.mcp.json 已配置 Playwright MCP (${mode} 模式)`);
-}
-
-function enableMcpPlaywrightEnv() {
-  const envPath = assets.path('env');
-  if (!envPath || !fs.existsSync(envPath)) return;
-
-  let content = fs.readFileSync(envPath, 'utf8');
-  if (/^MCP_PLAYWRIGHT=/m.test(content)) {
-    content = content.replace(/^MCP_PLAYWRIGHT=.*/m, 'MCP_PLAYWRIGHT=true');
-  } else {
-    const suffix = content.endsWith('\n') ? '' : '\n';
-    content += `${suffix}MCP_PLAYWRIGHT=true\n`;
-  }
-  fs.writeFileSync(envPath, content, 'utf8');
-  log('ok', '.claude-coder/.env 已设置 MCP_PLAYWRIGHT=true');
-}
-
-async function authPersistent(url) {
-  const profileDir = assets.path('browserProfile');
-  if (!fs.existsSync(profileDir)) fs.mkdirSync(profileDir, { recursive: true });
-
-  const lockFile = path.join(profileDir, 'SingletonLock');
-  if (fs.existsSync(lockFile)) {
-    fs.unlinkSync(lockFile);
-    log('warn', '已清理残留的 SingletonLock（上次浏览器未正常关闭）');
-  }
-
-  console.log('操作步骤:');
-  console.log('  1. 浏览器将自动打开，请手动完成登录');
-  console.log('  2. 登录成功后关闭浏览器窗口');
-  console.log('  3. 登录状态将保存在持久化配置中');
-  console.log('  4. MCP 后续会话自动复用此登录状态');
-  console.log('');
-
-  const scriptContent = [
-    `let chromium;`,
-    `try { chromium = require('playwright').chromium; } catch {`,
-    `  try { chromium = require('@playwright/test').chromium; } catch {`,
-    `    console.error('错误: 未找到 playwright 模块');`,
-    `    console.error('请安装: npx playwright install chromium');`,
-    `    process.exit(1);`,
-    `  }`,
-    `}`,
-    `(async () => {`,
-    `  const ctx = await chromium.launchPersistentContext(${JSON.stringify(profileDir)}, { headless: false });`,
-    `  const page = ctx.pages()[0] || await ctx.newPage();`,
-    `  try { await page.goto(${JSON.stringify(url)}); } catch {}`,
-    `  console.log('请在浏览器中完成登录后关闭窗口...');`,
-    `  await new Promise(r => {`,
-    `    ctx.on('close', r);`,
-    `    const t = setInterval(() => { try { if (!ctx.pages().length) { clearInterval(t); r(); } } catch { clearInterval(t); r(); } }, 2000);`,
-    `  });`,
-    `  try { await ctx.close(); } catch {}`,
-    `})().then(() => process.exit(0)).catch(() => process.exit(0));`,
-  ].join('\n');
-
-  const tmpScript = path.join(os.tmpdir(), `pw-auth-${Date.now()}.js`);
-  fs.writeFileSync(tmpScript, scriptContent);
-
-  const helperModules = path.join(__dirname, '..', 'node_modules');
-  const existingNodePath = process.env.NODE_PATH || '';
-  const nodePath = existingNodePath ? `${helperModules}:${existingNodePath}` : helperModules;
-  const projectRoot = assets.projectRoot;
-
-  let scriptOk = false;
-  try {
-    execSync(`node "${tmpScript}"`, {
-      stdio: 'inherit',
-      cwd: projectRoot,
-      env: { ...process.env, NODE_PATH: nodePath },
-    });
-    scriptOk = true;
-  } catch {
-    const profileFiles = fs.readdirSync(profileDir);
-    scriptOk = profileFiles.length > 2;
-    if (!scriptOk) {
-      log('error', 'Playwright 启动失败，且未检测到有效的浏览器配置');
-      log('info', '请确保已安装 Chromium: npx playwright install chromium');
-      try { fs.unlinkSync(tmpScript); } catch {}
-      return;
-    }
-    log('warn', '浏览器退出码非零，但已检测到有效配置，继续...');
-  }
-
-  try { fs.unlinkSync(tmpScript); } catch {}
-
-  const mcpPath = assets.path('mcpConfig');
-  log('ok', '登录状态已保存到持久化配置');
-  updateMcpConfig(mcpPath, 'persistent');
-  updateGitignore('.claude-coder/.runtime/browser-profile');
-  enableMcpPlaywrightEnv();
-
-  console.log('');
-  log('ok', '配置完成！');
-  const relProfile = path.relative(projectRoot, profileDir);
-  log('info', `MCP 使用 persistent 模式 (user-data-dir: ${relProfile})`);
-  log('info', '如需更新登录状态，重新运行 claude-coder auth');
-}
-
-async function authIsolated(url) {
-  const playwrightAuthPath = assets.path('playwrightAuth');
-  const projectRoot = assets.projectRoot;
-
-  console.log('操作步骤:');
-  console.log('  1. 浏览器将自动打开，请手动完成登录');
-  console.log('  2. 登录成功后关闭浏览器窗口');
-  console.log('  3. 登录状态（cookies + localStorage）将保存到 playwright-auth.json');
-  console.log('  4. MCP 每次会话自动从此文件加载初始状态');
-  console.log('');
-
-  try {
-    execSync(
-      `npx playwright codegen --save-storage="${playwrightAuthPath}" "${url}"`,
-      { stdio: 'inherit', cwd: projectRoot }
-    );
-  } catch (err) {
-    if (!fs.existsSync(playwrightAuthPath)) {
-      log('error', `Playwright 登录状态导出失败: ${err.message}`);
-      log('info', '请确保已安装: npx playwright install chromium');
-      return;
-    }
-  }
-
-  if (!fs.existsSync(playwrightAuthPath)) {
-    log('error', '未检测到导出的登录状态文件');
-    return;
-  }
-
-  const mcpPath = assets.path('mcpConfig');
-  log('ok', '登录状态已保存到 playwright-auth.json');
-  updateMcpConfig(mcpPath, 'isolated');
-  updateGitignore('.claude-coder/playwright-auth.json');
-  enableMcpPlaywrightEnv();
-
-  console.log('');
-  log('ok', '配置完成！');
-  log('info', 'MCP 使用 isolated 模式 (storage-state)');
-  log('info', 'cookies 和 localStorage 每次会话自动从 playwright-auth.json 加载');
-  log('info', '如需更新登录状态，重新运行 claude-coder auth');
-}
-
-function authExtension() {
-  console.log('Extension 模式说明:');
-  console.log('');
-  console.log('  此模式通过 Chrome 扩展连接到您正在运行的浏览器。');
-  console.log('  MCP 将直接使用浏览器中已有的登录态和扩展。');
-  console.log('');
-  console.log('  前置条件:');
-  console.log('  1. 安装 "Playwright MCP Bridge" Chrome/Edge 扩展');
-  console.log('     https://chromewebstore.google.com/detail/playwright-mcp-bridge/mmlmfjhmonkocbjadbfplnigmagldckm');
-  console.log('  2. 确保浏览器已启动且扩展已启用');
-  console.log('  3. 无需额外认证操作，您的浏览器登录态将自动可用');
-  console.log('');
-
-  const mcpPath = assets.path('mcpConfig');
-  updateMcpConfig(mcpPath, 'extension');
-  enableMcpPlaywrightEnv();
-
-  console.log('');
-  log('ok', '配置完成！');
-  log('info', 'MCP 使用 extension 模式（连接真实浏览器）');
-  log('info', '确保 Chrome/Edge 已运行且 Playwright MCP Bridge 扩展已启用');
-}
-
-async function auth(url) {
-  assets.ensureDirs();
-  const config = loadConfig();
-  const mode = config.playwrightMode;
-  const targetUrl = url || 'http://localhost:3000';
-
-  log('info', `Playwright 模式: ${mode}`);
-  log('info', `目标 URL: ${targetUrl}`);
-  console.log('');
-
-  switch (mode) {
-    case 'persistent':
-      await authPersistent(targetUrl);
-      break;
-    case 'isolated':
-      await authIsolated(targetUrl);
-      break;
-    case 'extension':
-      authExtension();
-      break;
-    default:
-      log('error', `未知的 Playwright 模式: ${mode}`);
-      log('info', '请运行 claude-coder setup 重新配置');
-      return;
-  }
-}
-
-module.exports = { auth, updateMcpConfig };
+'use strict';
+
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const { execSync } = require('child_process');
+const { loadConfig, log } = require('../common/config');
+const { assets } = require('../common/assets');
+const { appendGitignore } = require('../common/utils');
+
+function resolvePlaywright() {
+  const { createRequire } = require('module');
+  const pkg = 'playwright';
+
+  try {
+    return path.dirname(require.resolve(`${pkg}/package.json`));
+  } catch {}
+
+  try {
+    const r = createRequire(path.join(process.cwd(), 'noop.js'));
+    return path.dirname(r.resolve(`${pkg}/package.json`));
+  } catch {}
+
+  try {
+    const globalRoot = execSync('npm root -g', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+    const pkgJsonPath = path.join(globalRoot, pkg, 'package.json');
+    if (fs.existsSync(pkgJsonPath)) return path.join(globalRoot, pkg);
+  } catch {}
+
+  return null;
+}
+
+function normalizeUrl(url) {
+  if (!url) return null;
+  return /^https?:\/\//.test(url) ? url : `http://${url}`;
+}
+
+function updateGitignore(entry) {
+  if (appendGitignore(assets.projectRoot, entry)) {
+    log('ok', `.gitignore 已添加: ${entry}`);
+  }
+}
+
+function updateMcpConfig(mcpPath, mode) {
+  let mcpConfig = {};
+  if (fs.existsSync(mcpPath)) {
+    try { mcpConfig = JSON.parse(fs.readFileSync(mcpPath, 'utf8')); } catch {}
+  }
+
+  if (!mcpConfig.mcpServers) mcpConfig.mcpServers = {};
+
+  const args = ['@playwright/mcp@latest'];
+  const projectRoot = assets.projectRoot;
+
+  switch (mode) {
+    case 'persistent': {
+      const browserProfilePath = assets.path('browserProfile');
+      const relProfile = path.relative(projectRoot, browserProfilePath).split(path.sep).join('/');
+      args.push(`--user-data-dir=${relProfile}`);
+      break;
+    }
+    case 'isolated': {
+      const playwrightAuthPath = assets.path('playwrightAuth');
+      const relAuth = path.relative(projectRoot, playwrightAuthPath).split(path.sep).join('/');
+      args.push('--isolated', `--storage-state=${relAuth}`);
+      break;
+    }
+    case 'extension':
+      args.push('--extension');
+      break;
+  }
+
+  mcpConfig.mcpServers.playwright = { command: 'npx', args };
+  fs.writeFileSync(mcpPath, JSON.stringify(mcpConfig, null, 2) + '\n', 'utf8');
+  log('ok', `.mcp.json 已配置 Playwright MCP (${mode} 模式)`);
+}
+
+function enableMcpPlaywrightEnv() {
+  const envPath = assets.path('env');
+  if (!envPath || !fs.existsSync(envPath)) return;
+
+  let content = fs.readFileSync(envPath, 'utf8');
+  if (/^MCP_PLAYWRIGHT=/m.test(content)) {
+    content = content.replace(/^MCP_PLAYWRIGHT=.*/m, 'MCP_PLAYWRIGHT=true');
+  } else {
+    const suffix = content.endsWith('\n') ? '' : '\n';
+    content += `${suffix}MCP_PLAYWRIGHT=true\n`;
+  }
+  fs.writeFileSync(envPath, content, 'utf8');
+  log('ok', '.claude-coder/.env 已设置 MCP_PLAYWRIGHT=true');
+}
+
+// ─────────────────────────────────────────────────────────────
+// 浏览器脚本（session cookie 自动持久化）
+// ─────────────────────────────────────────────────────────────
+
+function buildBrowserScript(playwrightDir, profileDir, url) {
+  const thirtyDays = Math.floor(Date.now() / 1000) + 86400 * 30;
+  return [
+    `const { chromium } = require(${JSON.stringify(playwrightDir)});`,
+    `(async () => {`,
+    `  const ctx = await chromium.launchPersistentContext(${JSON.stringify(profileDir)}, { headless: false });`,
+    `  const page = ctx.pages()[0] || await ctx.newPage();`,
+    `  try { await page.goto(${JSON.stringify(url)}); } catch {}`,
+    `  console.log('请在浏览器中完成操作后关闭窗口...');`,
+    `  const persistSessionCookies = async () => {`,
+    `    try {`,
+    `      const cookies = await ctx.cookies();`,
+    `      const session = cookies.filter(c => c.expires === -1);`,
+    `      if (session.length > 0) {`,
+    `        await ctx.addCookies(session.map(c => ({ ...c, expires: ${thirtyDays} })));`,
+    `        console.log('已将 ' + session.length + ' 个 session cookie 转为持久化');`,
+    `      }`,
+    `    } catch {}`,
+    `  };`,
+    `  ctx.on('page', p => p.on('close', () => persistSessionCookies()));`,
+    `  for (const p of ctx.pages()) p.on('close', () => persistSessionCookies());`,
+    `  await new Promise(r => {`,
+    `    ctx.on('close', r);`,
+    `    const t = setInterval(async () => {`,
+    `      try {`,
+    `        if (!ctx.pages().length) { clearInterval(t); await persistSessionCookies(); r(); }`,
+    `      } catch { clearInterval(t); r(); }`,
+    `    }, 2000);`,
+    `  });`,
+    `  try { await ctx.close(); } catch {}`,
+    `})().then(() => process.exit(0)).catch(() => process.exit(0));`,
+  ].join('\n');
+}
+
+function runBrowserScript(script, cwd) {
+  const tmpScript = path.join(os.tmpdir(), `pw-auth-${Date.now()}.js`);
+  fs.writeFileSync(tmpScript, script);
+  try {
+    execSync(`node "${tmpScript}"`, { stdio: 'inherit', cwd });
+    return true;
+  } catch {
+    return false;
+  } finally {
+    try { fs.unlinkSync(tmpScript); } catch {}
+  }
+}
+
+// ─────────────────────────────────────────────────────────────
+// auth 模式实现
+// ─────────────────────────────────────────────────────────────
+
+async function authPersistent(url) {
+  const playwrightDir = resolvePlaywright();
+  if (!playwrightDir) {
+    log('error', '未找到 playwright 模块');
+    log('info', '请安装: npm install -g playwright && npx playwright install chromium');
+    return;
+  }
+
+  const profileDir = assets.path('browserProfile');
+  if (!fs.existsSync(profileDir)) fs.mkdirSync(profileDir, { recursive: true });
+
+  const lockFile = path.join(profileDir, 'SingletonLock');
+  if (fs.existsSync(lockFile)) {
+    fs.unlinkSync(lockFile);
+    log('warn', '已清理残留的 SingletonLock（上次浏览器未正常关闭）');
+  }
+
+  console.log('操作步骤:');
+  console.log('  1. 浏览器将自动打开，请手动完成登录');
+  console.log('  2. 登录成功后关闭浏览器窗口');
+  console.log('  3. 登录状态将保存在持久化配置中（session cookie 自动转持久化）');
+  console.log('  4. MCP 后续会话自动复用此登录状态');
+  console.log('');
+
+  const script = buildBrowserScript(playwrightDir, profileDir, url);
+  const projectRoot = assets.projectRoot;
+
+  const ok = runBrowserScript(script, projectRoot);
+  if (!ok) {
+    const profileFiles = fs.readdirSync(profileDir);
+    if (profileFiles.length <= 2) {
+      log('error', 'Playwright 启动失败，且未检测到有效的浏览器配置');
+      log('info', '请确保已安装 Chromium: npx playwright install chromium');
+      return;
+    }
+    log('warn', '浏览器退出码非零，但已检测到有效配置，继续...');
+  }
+
+  const mcpPath = assets.path('mcpConfig');
+  log('ok', '登录状态已保存到持久化配置');
+  updateMcpConfig(mcpPath, 'persistent');
+  updateGitignore('.claude-coder/.runtime/browser-profile');
+  enableMcpPlaywrightEnv();
+
+  console.log('');
+  log('ok', '配置完成！');
+  const relProfile = path.relative(projectRoot, profileDir);
+  log('info', `MCP 使用 persistent 模式 (user-data-dir: ${relProfile})`);
+  log('info', '验证: 再次运行 claude-coder auth <URL>，浏览器应直接进入已登录状态');
+}
+
+async function authIsolated(url) {
+  const playwrightAuthPath = assets.path('playwrightAuth');
+  const projectRoot = assets.projectRoot;
+
+  console.log('操作步骤:');
+  console.log('  1. 浏览器将自动打开，请手动完成登录');
+  console.log('  2. 登录成功后关闭浏览器窗口');
+  console.log('  3. 登录状态（cookies + localStorage）将保存到 playwright-auth.json');
+  console.log('  4. MCP 每次会话自动从此文件加载初始状态');
+  console.log('');
+
+  try {
+    execSync(
+      `npx playwright codegen --save-storage="${playwrightAuthPath}" "${url}"`,
+      { stdio: 'inherit', cwd: projectRoot }
+    );
+  } catch (err) {
+    if (!fs.existsSync(playwrightAuthPath)) {
+      log('error', `Playwright 登录状态导出失败: ${err.message}`);
+      log('info', '请确保已安装: npx playwright install chromium');
+      return;
+    }
+  }
+
+  if (!fs.existsSync(playwrightAuthPath)) {
+    log('error', '未检测到导出的登录状态文件');
+    return;
+  }
+
+  const mcpPath = assets.path('mcpConfig');
+  log('ok', '登录状态已保存到 playwright-auth.json');
+  updateMcpConfig(mcpPath, 'isolated');
+  updateGitignore('.claude-coder/playwright-auth.json');
+  enableMcpPlaywrightEnv();
+
+  console.log('');
+  log('ok', '配置完成！');
+  log('info', 'MCP 使用 isolated 模式 (storage-state)');
+  log('info', 'cookies 和 localStorage 每次会话自动从 playwright-auth.json 加载');
+}
+
+function authExtension() {
+  console.log('Extension 模式说明:');
+  console.log('');
+  console.log('  此模式通过 Chrome 扩展连接到您正在运行的浏览器。');
+  console.log('  MCP 将直接使用浏览器中已有的登录态和扩展。');
+  console.log('');
+  console.log('  前置条件:');
+  console.log('  1. 安装 "Playwright MCP Bridge" Chrome/Edge 扩展');
+  console.log('     https://chromewebstore.google.com/detail/playwright-mcp-bridge/mmlmfjhmonkocbjadbfplnigmagldckm');
+  console.log('  2. 确保浏览器已启动且扩展已启用');
+  console.log('  3. 无需额外认证操作，您的浏览器登录态将自动可用');
+  console.log('');
+
+  const mcpPath = assets.path('mcpConfig');
+  updateMcpConfig(mcpPath, 'extension');
+  enableMcpPlaywrightEnv();
+
+  console.log('');
+  log('ok', '配置完成！');
+  log('info', 'MCP 使用 extension 模式（连接真实浏览器）');
+  log('info', '确保 Chrome/Edge 已运行且 Playwright MCP Bridge 扩展已启用');
+}
+
+async function auth(url) {
+  assets.ensureDirs();
+  const config = loadConfig();
+  const mode = config.playwrightMode;
+  const targetUrl = normalizeUrl(url) || 'http://localhost:3000';
+
+  log('info', `Playwright 模式: ${mode}`);
+  log('info', `目标 URL: ${targetUrl}`);
+  console.log('');
+
+  switch (mode) {
+    case 'persistent':
+      await authPersistent(targetUrl);
+      break;
+    case 'isolated':
+      await authIsolated(targetUrl);
+      break;
+    case 'extension':
+      authExtension();
+      break;
+    default:
+      log('error', `未知的 Playwright 模式: ${mode}`);
+      log('info', '请运行 claude-coder setup 重新配置');
+      return;
+  }
+}
+
+module.exports = { auth, updateMcpConfig };