claude-simple 0.2.20 → 0.2.22

package/README.md

@@ -80,6 +80,12 @@ Edge-only env (when connecting to a hub):
 | `MACHINE_ID`   | Unique id for this host (default: hostname)      |
 | `LOCAL_PORT`   | Local bind port (default `13000`, `127.0.0.1`)  |
 
+### macOS Edge：需要登录态的 CLI
+
+如果 Edge 要运行 **AGY / Antigravity** 等把 OAuth token 放在 macOS Keychain 的 CLI，必须以当前登录用户的 **LaunchAgent**（`gui/<uid>`）运行，不能使用 system LaunchDaemon。`HOME`、PATH 和 `~/.gemini` 文件齐全仍不足以访问用户 Keychain。
+
+`claude-edge migrate-user-agent` 可将旧的 macOS system Edge 迁移到用户会话。对只使用无用户凭据的后台 agent，system service 仍可选；默认建议使用用户 LaunchAgent。
+
 ## Features
 
 ### Chat

package/bin/edge-ctl.js

@@ -12,8 +12,13 @@ import os from 'os';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-const LAUNCHD_LABEL = 'system/com.claude-simple.edge';
-const LAUNCHD_PLIST = '/Library/LaunchDaemons/com.claude-simple.edge.plist';
+const DAEMON_LABEL = 'system/com.claude-simple.edge';
+const DAEMON_PLIST = '/Library/LaunchDaemons/com.claude-simple.edge.plist';
+const AGENT_NAME = 'com.claude-simple.edge';
+const USER_ID = typeof process.getuid === 'function' ? process.getuid() : 0;
+const AGENT_DOMAIN = `gui/${USER_ID}`;
+const AGENT_LABEL = `${AGENT_DOMAIN}/${AGENT_NAME}`;
+const AGENT_PLIST = path.join(os.homedir(), 'Library', 'LaunchAgents', `${AGENT_NAME}.plist`);
 const SYSTEMD_UNIT = 'claude-simple-edge.service';
 const MAC_OUT = path.join(os.homedir(), '.claude-simple-edge', 'edge.out.log');
 const MAC_ERR = path.join(os.homedir(), '.claude-simple-edge', 'edge.err.log');
@@ -28,6 +33,7 @@ function usage(code = 0) {
   logs       Last 80 lines of stdout (or journal on Linux)
   logs -f    Follow logs
   logs err   Stderr only (launchd)
+  migrate-user-agent  Move macOS Edge into the login session (required for Keychain-backed AGY auth)
 
 Also installed as: claude-simple-edge, edge-daemon
 `;
@@ -51,19 +57,79 @@ function hasCmd(cmd) {
 
 function detectBackend() {
   if (process.platform === 'darwin') {
-    if (fs.existsSync(LAUNCHD_PLIST)) return 'launchd';
-    const r = run('launchctl', ['print', LAUNCHD_LABEL]);
+    // A user LaunchAgent can access the login Keychain. Prefer it over the
+    // legacy system LaunchDaemon, which intentionally cannot access it.
+    if (run('launchctl', ['print', AGENT_LABEL]).status === 0 || fs.existsSync(AGENT_PLIST)) return 'launchd-user';
+    if (fs.existsSync(DAEMON_PLIST)) return 'launchd';
+    const r = run('launchctl', ['print', DAEMON_LABEL]);
     if (r.status === 0) return 'launchd';
   }
   if (hasCmd('systemctl')) {
     const r = run('systemctl', ['cat', SYSTEMD_UNIT]);
     if (r.status === 0) return 'systemd';
   }
-  if (process.platform === 'darwin') return 'launchd';
+  if (process.platform === 'darwin') return 'launchd-user';
   if (process.platform === 'linux') return 'systemd';
   return null;
 }
 
+function macTarget(backend) {
+  return backend === 'launchd-user'
+    ? { domain: AGENT_DOMAIN, label: AGENT_LABEL, plist: AGENT_PLIST, user: true }
+    : { domain: 'system', label: DAEMON_LABEL, plist: DAEMON_PLIST, user: false };
+}
+
+function plistEscape(value) {
+  return String(value).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&apos;');
+}
+
+function readDaemonEnvironment() {
+  const r = run('plutil', ['-extract', 'EnvironmentVariables', 'json', '-o', '-', DAEMON_PLIST]);
+  if (r.status !== 0) throw new Error(r.stderr || 'cannot read the existing Edge environment');
+  return JSON.parse(r.stdout);
+}
+
+function userAgentPlist(env) {
+  const client = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'client.js');
+  const pairs = Object.entries(env).sort(([a], [b]) => a.localeCompare(b)).map(([key, value]) =>
+    `\t\t<key>${plistEscape(key)}</key>\n\t\t<string>${plistEscape(value)}</string>`).join('\n');
+  return `<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0">\n<dict>\n\t<key>Label</key>\n\t<string>${AGENT_NAME}</string>\n\t<key>EnvironmentVariables</key>\n\t<dict>\n${pairs}\n\t</dict>\n\t<key>KeepAlive</key>\n\t<true/>\n\t<key>ProcessType</key>\n\t<string>Background</string>\n\t<key>ProgramArguments</key>\n\t<array>\n\t\t<string>${plistEscape(process.execPath)}</string>\n\t\t<string>${plistEscape(client)}</string>\n\t</array>\n\t<key>RunAtLoad</key>\n\t<true/>\n\t<key>StandardErrorPath</key>\n\t<string>${plistEscape(MAC_ERR)}</string>\n\t<key>StandardOutPath</key>\n\t<string>${plistEscape(MAC_OUT)}</string>\n\t<key>ThrottleInterval</key>\n\t<integer>3</integer>\n\t<key>WorkingDirectory</key>\n\t<string>${plistEscape(path.join(os.homedir(), '.claude-simple-edge'))}</string>\n</dict>\n</plist>\n`;
+}
+
+function cmdMigrateUserAgent() {
+  if (process.platform !== 'darwin') fail('user LaunchAgent migration is only needed on macOS');
+  let inherited;
+  try { inherited = readDaemonEnvironment(); }
+  catch (e) { fail(e.message); }
+  const home = os.homedir();
+  const prefix = [path.join(home, '.local', 'bin'), path.join(home, '.grok', 'bin'), process.env.PATH, inherited.PATH]
+    .filter(Boolean).join(':');
+  const env = {
+    ...inherited,
+    HOME: home, USER: process.env.USER || os.userInfo().username, LOGNAME: process.env.LOGNAME || os.userInfo().username,
+    PATH: [...new Set(prefix.split(':').filter(Boolean))].join(':'),
+  };
+  const dir = path.dirname(AGENT_PLIST);
+  try {
+    fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
+    const temp = `${AGENT_PLIST}.tmp-${process.pid}`;
+    fs.writeFileSync(temp, userAgentPlist(env), { mode: 0o600 });
+    // Stop the legacy daemon before the user agent claims the same loopback
+    // port. This calls the existing privileged edge command when available.
+    const stop = run(process.execPath, [fileURLToPath(import.meta.url), 'stop']);
+    if (stop.status !== 0) throw new Error('could not stop the legacy system Edge; run `claude-edge stop` once, then retry');
+    fs.renameSync(temp, AGENT_PLIST);
+    run('launchctl', ['bootout', AGENT_LABEL]); // harmless if it was not loaded
+    const boot = run('launchctl', ['bootstrap', AGENT_DOMAIN, AGENT_PLIST]);
+    if (boot.status !== 0) throw new Error(boot.stderr || 'could not bootstrap user Edge agent');
+    const start = run('launchctl', ['kickstart', '-k', AGENT_LABEL]);
+    if (start.status !== 0) throw new Error(start.stderr || 'could not start user Edge agent');
+  } catch (e) {
+    fail(`migration failed: ${e.message}`);
+  }
+  console.log(`migrated to user LaunchAgent: ${AGENT_LABEL}`);
+}
+
 function isRoot() {
   return typeof process.getuid === 'function' && process.getuid() === 0;
 }
@@ -125,25 +191,26 @@ function tailFile(file, n) {
 }
 
 function cmdStatus(backend) {
-  ensureRoot();
-  if (backend === 'launchd') {
-    const r = runRoot('launchctl', ['print', LAUNCHD_LABEL]);
+  if (backend === 'launchd') ensureRoot();
+  if (backend === 'launchd' || backend === 'launchd-user') {
+    const target = macTarget(backend);
+    const r = runRoot('launchctl', ['print', target.label]);
     if (r.status !== 0) {
-      console.log(`service:   ${LAUNCHD_LABEL}`);
+      console.log(`service:   ${target.label}`);
       console.log('state:     not-loaded');
-      console.log(`plist:     ${LAUNCHD_PLIST}`);
+      console.log(`plist:     ${target.plist}`);
       if (r.stderr) console.log(r.stderr.trim());
       return;
     }
     const info = parseLaunchdPrint(r.stdout);
     const machine = r.stdout.match(/MACHINE_ID => (\S+)/)?.[1] || process.env.MACHINE_ID || '-';
-    console.log(`service:   ${LAUNCHD_LABEL}`);
+    console.log(`service:   ${target.label}`);
     console.log(`machine:   ${machine}`);
     console.log(`state:     ${info.state}`);
     console.log(`pid:       ${info.pid}`);
     console.log(`runs:      ${info.runs}`);
     console.log(`listen:    ${listenPort()}`);
-    console.log(`plist:     ${LAUNCHD_PLIST}`);
+    console.log(`plist:     ${target.plist}`);
     console.log(`stdout:    ${MAC_OUT}`);
     console.log(`stderr:    ${MAC_ERR}`);
     const last = tailFile(MAC_OUT, 8);
@@ -174,15 +241,16 @@ function cmdStatus(backend) {
 }
 
 function cmdStart(backend) {
-  ensureRoot();
-  if (backend === 'launchd') {
-    runRoot('launchctl', ['enable', LAUNCHD_LABEL]);
-    const loaded = runRoot('launchctl', ['print', LAUNCHD_LABEL]);
+  if (backend === 'launchd') ensureRoot();
+  if (backend === 'launchd' || backend === 'launchd-user') {
+    const target = macTarget(backend);
+    runRoot('launchctl', ['enable', target.label]);
+    const loaded = runRoot('launchctl', ['print', target.label]);
     if (loaded.status !== 0) {
-      const b = runRoot('launchctl', ['bootstrap', 'system', LAUNCHD_PLIST]);
+      const b = runRoot('launchctl', ['bootstrap', target.domain, target.plist]);
       if (b.status !== 0) fail('bootstrap failed', b.stderr || b.stdout);
     }
-    const k = runRoot('launchctl', ['kickstart', '-k', LAUNCHD_LABEL]);
+    const k = runRoot('launchctl', ['kickstart', '-k', target.label]);
     if (k.status !== 0) fail('start failed', k.stderr || k.stdout);
     console.log('started');
     return;
@@ -193,10 +261,11 @@ function cmdStart(backend) {
 }
 
 function cmdStop(backend) {
-  ensureRoot();
-  if (backend === 'launchd') {
-    runRoot('launchctl', ['disable', LAUNCHD_LABEL]);
-    runRoot('launchctl', ['bootout', LAUNCHD_LABEL]);
+  if (backend === 'launchd') ensureRoot();
+  if (backend === 'launchd' || backend === 'launchd-user') {
+    const target = macTarget(backend);
+    runRoot('launchctl', ['disable', target.label]);
+    runRoot('launchctl', ['bootout', target.label]);
     console.log('stopped');
     return;
   }
@@ -206,15 +275,16 @@ function cmdStop(backend) {
 }
 
 function cmdRestart(backend) {
-  ensureRoot();
-  if (backend === 'launchd') {
-    runRoot('launchctl', ['enable', LAUNCHD_LABEL]);
-    const loaded = runRoot('launchctl', ['print', LAUNCHD_LABEL]);
+  if (backend === 'launchd') ensureRoot();
+  if (backend === 'launchd' || backend === 'launchd-user') {
+    const target = macTarget(backend);
+    runRoot('launchctl', ['enable', target.label]);
+    const loaded = runRoot('launchctl', ['print', target.label]);
     if (loaded.status !== 0) {
-      const b = runRoot('launchctl', ['bootstrap', 'system', LAUNCHD_PLIST]);
+      const b = runRoot('launchctl', ['bootstrap', target.domain, target.plist]);
       if (b.status !== 0) fail('bootstrap failed', b.stderr || b.stdout);
     }
-    const k = runRoot('launchctl', ['kickstart', '-k', LAUNCHD_LABEL]);
+    const k = runRoot('launchctl', ['kickstart', '-k', target.label]);
     if (k.status !== 0) fail('restart failed', k.stderr || k.stdout);
     console.log('restarted');
     return;
@@ -226,7 +296,7 @@ function cmdRestart(backend) {
 
 function cmdLogs(backend, mode) {
   if (backend === 'systemd') ensureRoot();
-  if (backend === 'launchd') {
+  if (backend === 'launchd' || backend === 'launchd-user') {
     if (mode === '-f' || mode === '--follow') {
       const child = spawn('tail', ['-n', '50', '-F', MAC_OUT, MAC_ERR], { stdio: 'inherit' });
       child.on('exit', (c) => process.exit(c || 0));
@@ -261,6 +331,10 @@ const backend = detectBackend();
 if (!backend) fail('no launchd/systemd edge service found');
 
 switch (cmd) {
+  case 'migrate-user-agent':
+  case 'migrate':
+    cmdMigrateUserAgent();
+    break;
   case 'status':
     cmdStatus(backend);
     break;