@znmin/claude-remote-cli 0.3.1 → 0.3.2

package/README.md

@@ -25,14 +25,14 @@ npm install -g git+https://github.com/znmin/claude-remote-cli.git
 也可以从已下载的分发包安装：
 
 ```bash
-npm install -g ./znmin-claude-remote-cli-0.3.1.tgz
+npm install -g ./znmin-claude-remote-cli-0.3.2.tgz
 ```
 
-若系统 npm 全局目录不可写，可使用 `npm install -g --prefix "$HOME/.local" ./znmin-claude-remote-cli-0.3.1.tgz`，并确保 `~/.local/bin` 在 PATH 中；卸载时也使用相同的 `--prefix`。
+若系统 npm 全局目录不可写，可使用 `npm install -g --prefix "$HOME/.local" ./znmin-claude-remote-cli-0.3.2.tgz`，并确保 `~/.local/bin` 在 PATH 中；卸载时也使用相同的 `--prefix`。
 
 npm 中不带作用域的 `claude-remote-cli` 属于其他项目。本项目使用独立的 `@znmin/claude-remote-cli` 作用域包名；请安装完整包名，或使用上述 GitHub 地址及本项目分发的 `.tgz` 文件。
 
-依赖按模式准备：本地模式首次启动准备 Playwright Chromium，服务器模式首次启动准备 Mutagen 0.18.1。Mutagen 复用 PATH 中的匹配版本，或从官方 GitHub Release 下载并校验内置 SHA-256。浏览器和同步组件需要网络和额外磁盘空间；npm 安装本身不强制下载这些二进制文件。
+依赖按模式准备：本地模式优先使用本机已安装的 Google Chrome，其次 Microsoft Edge（Windows 10/11 自带），都没有时首次启动下载 Playwright Chromium；服务器模式首次启动准备 Mutagen 0.18.1。Mutagen 复用 PATH 中的匹配版本，或从官方 GitHub Release 下载并校验内置 SHA-256。浏览器和同步组件需要网络和额外磁盘空间；npm 安装本身不强制下载这些二进制文件。
 
 ### Windows（0.3.0）
 
@@ -160,7 +160,7 @@ Git、npm、pnpm、Python、Go、Docker、数据库 CLI、`gh` 等共用本地
 
 0.2.5 起，普通公开资料查询优先使用服务器上的 Claude 原生 `WebSearch` / `WebFetch`，不打开本地浏览器；服务器的文件、终端和浏览器执行工具仍不开放。原生搜索/网页读取是否可用取决于服务器 Claude 的账号、服务商和策略；如果不可用或查询失败，会先说明并征求用户意见，再回退本地浏览器。本地开发页面、localhost/局域网地址、交互测试、截图和交互登录仍使用本地浏览器，不交给服务器 WebFetch。该选择通过工具白名单及提示词约定实现，不是对模型每次路由选择的硬性拦截。
 
-浏览器使用独立窗口和临时上下文，不读取日常 Chrome 的登录态。启动本地模式时准备相应浏览器版本，后续使用缓存；收到浏览器工具调用时才打开窗口。可以打开本机 localhost，填写表单、点击、截图和读取控制台错误。
+浏览器使用独立窗口和临时上下文，即使使用本机 Chrome/Edge 也不读取日常的书签、登录态和 Cookie。默认依次选择本机 Chrome、Edge，都没有时启动本地模式下载 Playwright Chromium 并缓存；可用 `CLAUDE_REMOTE_BROWSER` 指定。自动选择的本机浏览器无法启动时会提示并改用 Chromium。收到浏览器工具调用时才打开窗口。可以打开本机 localhost，填写表单、点击、截图和读取控制台错误。
 
 ```bash
 claude-remote install-browser
@@ -187,7 +187,7 @@ claude-remote flush                # 等待当前项目完成一次同步
 claude-remote stop                 # 停止当前目录在当前配置服务器上的同步
 claude-remote stop --all           # 停止本工具的所有同步会话
 claude-remote stop --name 名称     # 按 status 中的名称停止旧服务器上的映射
-claude-remote doctor               # 检查本地安装（含 Node 版本、SSH 工具、本地浏览器缓存）和服务器配置，不连接服务器
+claude-remote doctor               # 检查本地安装（含 Node 版本、SSH 工具、使用的本地浏览器）和服务器配置，不连接服务器
 claude-remote install-sync         # 手动重试同步工具准备
 claude-remote --help
 ```
@@ -229,6 +229,7 @@ CLAUDE_REMOTE_DEBUG=1 claude
 | 变量 | 用途 |
 | --- | --- |
 | `CLAUDE_REMOTE_MODE` | 临时选择 `local` 或 `remote` |
+| `CLAUDE_REMOTE_BROWSER` | 本地浏览器：`chrome`、`msedge` 或 `chromium`（Playwright 自带）；未设置时按 Chrome、Edge、Chromium 顺序自动选择 |
 | `CLAUDE_REMOTE_HEADLESS` | `1` 无窗口浏览器，`0` 可见窗口，覆盖配置 |
 | `CLAUDE_REMOTE_HOST` | 临时 SSH 别名或 user@host |
 | `CLAUDE_REMOTE_PORT` | 临时 SSH 端口 |
@@ -256,7 +257,7 @@ npm run test:windows   # Windows 上运行的客户端测试（CI 在 windows-la
 CLAUDE_REMOTE_INTEGRATION=1 CLAUDE_REMOTE_BROWSER_TEST=1 npm test
 
 npm pack
-npm install -g ./znmin-claude-remote-cli-0.3.1.tgz
+npm install -g ./znmin-claude-remote-cli-0.3.2.tgz
 
 # 确定包名、版本和使用条款后，使用有发布权限的 npm 账号发布
 npm login

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@znmin/claude-remote-cli",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Run Claude Code on an SSH server from macOS, Linux or Windows with local filesystem, terminal and browser tools, or remote bidirectional sync",
   "type": "module",
   "license": "UNLICENSED",
@@ -31,7 +31,7 @@
     "postinstall": "node scripts/postinstall.js",
     "lint": "eslint .",
     "test": "node --test test/*.test.js",
-    "test:windows": "node --test test/windows.test.js test/local-tools.test.js",
+    "test:windows": "node --test test/windows.test.js test/local-tools.test.js test/browser-choice.test.js",
     "prepublishOnly": "npm run lint && npm test"
   },
   "keywords": [

package/src/cli.js

@@ -68,6 +68,16 @@ export function executionOptions(args) {
   return { mode, forwarded };
 }
 
+// Mirrors Client: configure saves new setups as local; a saved server without
+// a mode predates local mode and stays remote.
+export function defaultModeLabel(config, env = {}) {
+  if (env.CLAUDE_REMOTE_MODE) return `${env.CLAUDE_REMOTE_MODE}（环境变量 CLAUDE_REMOTE_MODE）`;
+  if (config.mode) return config.mode;
+  if (config.host) return 'remote（旧配置）';
+  if (env.CLAUDE_REMOTE_HOST) return 'remote（未保存配置）';
+  return 'local（配置服务器后的默认值）';
+}
+
 export async function main(asClaude, args = process.argv.slice(2), client = new Client()) {
   if (asClaude) {
     const options = executionOptions(args);
@@ -114,8 +124,9 @@ export async function main(asClaude, args = process.argv.slice(2), client = new
   }
   if (action === 'install-sync') { console.log('同步工具：' + await ensureMutagen({ env: client.env })); return 0; }
   if (action === 'install-browser') {
-    const { installBrowser } = await import('./local/browser.js');
-    await installBrowser(client.log, { debug: client.debug }); console.log('浏览器已就绪。'); return 0;
+    const { browserName, installBrowser } = await import('./local/browser.js');
+    const choice = await installBrowser(client.log, { debug: client.debug, env: client.env });
+    console.log(`浏览器已就绪：${browserName(choice)}（${choice.file}）${choice.kind === 'chromium' ? '' : '，无需下载'}`); return 0;
   }
   if (action === 'doctor') {
     const [major, minor] = process.versions.node.split('.').map(Number);
@@ -131,16 +142,21 @@ export async function main(asClaude, args = process.argv.slice(2), client = new
       for (const line of await conflictReport(client.env)) console.log(line);
     }
     try {
-      const { browserReady } = await import('./local/browser.js');
-      const { chromium } = await import('playwright');
-      const ready = await browserReady();
-      console.log(`本地浏览器：${ready ? chromium.executablePath() : '尚未准备（本地模式首次启动或 claude-remote install-browser 时下载）'}`);
+      const { browserName, browserReady, chooseBrowser } = await import('./local/browser.js');
+      const choice = await chooseBrowser(client.env);
+      if (choice.kind !== 'chromium') console.log(`本地浏览器：${browserName(choice)}（${choice.file}），无需下载`);
+      else {
+        const { chromium } = await import('playwright');
+        const ready = await browserReady();
+        console.log(`本地浏览器：${browserName(choice)}，${ready ? chromium.executablePath() : '尚未准备（本地模式首次启动或 claude-remote install-browser 时下载）'}` +
+          (choice.explicit ? '' : '；安装 Chrome 或 Edge 后可直接使用'));
+      }
     } catch (error) { console.log('本地浏览器：无法检查（' + error.message + '）'); }
     const cached = cachedBinary(client.env);
     console.log(`同步工具：${client.env.CLAUDE_REMOTE_MUTAGEN || (await exists(cached) ? cached : await which('mutagen', client.env.PATH)) || '首次使用时自动下载'}（目标版本 ${VERSION}）`);
     const config = await readJSON(client.configFile, {});
     console.log(`配置：${client.configFile}\n服务器：${client.env.CLAUDE_REMOTE_HOST || config.host || '尚未配置'}`);
-    console.log(`默认模式：${client.env.CLAUDE_REMOTE_MODE || config.mode || 'remote（旧配置）'}`);
+    console.log(`默认模式：${defaultModeLabel(config, client.env)}`);
     return 0;
   }
   throw new Error(`未知命令 ${action}。运行 claude-remote --help 查看用法。`);

package/src/local/browser.js

@@ -21,7 +21,48 @@ export async function browserReady() {
   catch (error) { if (error.code === 'ENOENT') return false; throw error; }
 }
 
-export async function installBrowser(log = console.error, { debug = () => {}, force = false } = {}) {
+const BROWSER_NAMES = { chrome: 'Google Chrome', msedge: 'Microsoft Edge', chromium: 'Chromium（Playwright 自带）' };
+
+// Standard install locations of Chrome and Edge. Windows checks per-machine
+// and per-user installs; Edge ships with Windows 10/11.
+export function systemBrowserCandidates(kind, env = process.env, platform = process.platform, home = os.homedir()) {
+  if (platform === 'win32') {
+    const relative = kind === 'chrome' ? ['Google', 'Chrome', 'Application', 'chrome.exe'] : ['Microsoft', 'Edge', 'Application', 'msedge.exe'];
+    const bases = [env.ProgramFiles, env.ProgramW6432, env['ProgramFiles(x86)'], env.LOCALAPPDATA].filter(Boolean);
+    return [...new Set(bases.map(base => path.win32.join(base, ...relative)))];
+  }
+  if (platform === 'darwin') {
+    const app = kind === 'chrome' ? 'Google Chrome' : 'Microsoft Edge';
+    return ['/Applications', path.join(home, 'Applications')].map(directory => path.join(directory, app + '.app', 'Contents', 'MacOS', app));
+  }
+  return kind === 'chrome' ? ['/opt/google/chrome/chrome'] : ['/opt/microsoft/msedge/msedge'];
+}
+
+// CLAUDE_REMOTE_BROWSER picks one explicitly; otherwise an installed Chrome,
+// then Edge, and only without either the downloaded Chromium.
+export async function chooseBrowser(env = process.env, { platform = process.platform, home = os.homedir(),
+  fileExists = file => exists(file).catch(() => false) } = {}) {
+  const wanted = (env.CLAUDE_REMOTE_BROWSER || '').trim().toLowerCase();
+  if (wanted && !(wanted in BROWSER_NAMES)) throw new Error('CLAUDE_REMOTE_BROWSER 只能是 chrome、msedge 或 chromium。');
+  if (wanted === 'chromium') return { kind: 'chromium', explicit: true };
+  for (const kind of wanted ? [wanted] : ['chrome', 'msedge'])
+    for (const file of systemBrowserCandidates(kind, env, platform, home))
+      if (await fileExists(file)) return { kind, file, explicit: Boolean(wanted) };
+  if (wanted) throw new Error(`找不到 ${BROWSER_NAMES[wanted]}。请安装后重试，或去掉 CLAUDE_REMOTE_BROWSER 改为自动选择。`);
+  return { kind: 'chromium', explicit: false };
+}
+
+export const browserName = choice => BROWSER_NAMES[choice.kind];
+
+// Returns the browser to launch. A system browser needs no download.
+export async function installBrowser(log = console.error, { debug = () => {}, force = false, env = process.env } = {}) {
+  const choice = await chooseBrowser(env);
+  if (choice.kind !== 'chromium') { debug(`使用系统浏览器：${browserName(choice)}（${choice.file}）`); return choice; }
+  await installChromium(log, { debug, force });
+  return { ...choice, file: chromium.executablePath() };
+}
+
+export async function installChromium(log = console.error, { debug = () => {}, force = false } = {}) {
   if (!force && await browserReady()) { debug('浏览器缓存可用：' + chromium.executablePath()); return; }
   if (force) preparation = null;
   if (!preparation) preparation = (async () => {
@@ -80,19 +121,34 @@ function collectElements({ limit, textLimit }) {
 }
 
 export class Browser {
-  constructor({ headless = false, log = console.error } = {}) {
-    this.headless = headless; this.log = log; this.pages = new Map(); this.logs = new Map();
+  constructor({ headless = false, log = console.error, env = process.env } = {}) {
+    this.headless = headless; this.log = log; this.env = env; this.pages = new Map(); this.logs = new Map();
+  }
+
+  async launchChromium() {
+    await installChromium(this.log);
+    try { return await chromium.launch({ headless: this.headless }); }
+    catch (error) {
+      // The cache marker may be stale (e.g. browsers removed by hand): reinstall once.
+      if (!/Executable doesn't exist|executable/i.test(error.message)) throw error;
+      await installChromium(this.log, { force: true });
+      return chromium.launch({ headless: this.headless });
+    }
   }
 
   async start() {
     if (!this.starting) this.starting = (async () => {
-      await installBrowser(this.log);
-      try { this.browser = await chromium.launch({ headless: this.headless }); }
-      catch (error) {
-        // The cache marker may be stale (e.g. browsers removed by hand): reinstall once.
-        if (!/Executable doesn't exist|executable/i.test(error.message)) throw error;
-        await installBrowser(this.log, { force: true });
-        this.browser = await chromium.launch({ headless: this.headless });
+      const choice = await installBrowser(this.log, { env: this.env });
+      if (choice.kind === 'chromium') this.browser = await this.launchChromium();
+      else {
+        // Each launch uses a fresh temporary profile, never the user's own.
+        try { this.browser = await chromium.launch({ headless: this.headless, executablePath: choice.file }); }
+        catch (error) {
+          const reason = error.message.split('\n')[0];
+          if (choice.explicit) throw new Error(`无法启动 ${browserName(choice)}：${reason}`);
+          this.log(`无法启动 ${browserName(choice)}，改用 Playwright 自带 Chromium：${reason}`);
+          this.browser = await this.launchChromium();
+        }
       }
       this.browser.on('disconnected', () => { this.starting = null; this.context = null; this.browser = null; this.pages.clear(); this.logs.clear(); });
       this.context = await this.browser.newContext({ viewport: { width: 1280, height: 800 } });

package/src/local/server.js

@@ -44,7 +44,7 @@ const selector = z.string().min(1).max(4000);
 export async function startLocalServer({ root, env = process.env, headless = false, browser, log = console.error } = {}) {
   const workspace = new Workspace(await fs.realpath(root));
   const processes = new Processes(workspace, env);
-  browser ||= new Browser({ headless, log });
+  browser ||= new Browser({ headless, log, env });
   const token = randomBytes(32).toString('hex');
   const transports = new Set();
   let closing = false;

package/src/local-mode.js

@@ -129,7 +129,7 @@ export async function launchLocal(client, config, extra, dependencies = {}) {
   const prompt = localPrompt(root, { instructions: await projectInstructions(root), appended: extractAppendedPrompts(extra).prompts,
     platform: client.platform });
   // Prepare the browser while SSH connects; it is only needed before Claude starts.
-  const browserReady = (dependencies.installBrowser || installBrowser)(client.log, { debug: client.debug });
+  const browserReady = (dependencies.installBrowser || installBrowser)(client.log, { debug: client.debug, env: client.env });
   browserReady.catch(() => {}); // Reported when awaited below.
   let gateway, tunnel, configFile, promptFile, cleaning;
   const hash = createHash('sha256').update(config.client_id + '\0' + root).digest('hex').slice(0, 24);