@znmin/claude-remote-cli 0.3.2 → 0.4.1

package/src/remote-claude.js

@@ -1,39 +1,39 @@
-import { quote } from './system.js';
-
-export const remoteEnvironment = 'export PATH="$HOME/.local/bin:$PATH"; ';
-
-export function ensureRemoteClaude(command) {
-  const missing = command === 'claude' ? `
-  echo '服务器未安装 Claude Code，正在执行官方安装流程……' >&2
-  (
-    set -e
-    installer=$(mktemp "\${TMPDIR:-/tmp}/claude-remote-install.XXXXXXXX")
-    trap 'rm -f -- "$installer"' EXIT
-    if command -v curl >/dev/null 2>&1; then
-      curl -fSL </dev/null --connect-timeout 20 --max-time 120 --retry 2 \\
-        --output "$installer" https://claude.ai/install.sh
-    elif command -v wget >/dev/null 2>&1; then
-      wget </dev/null --timeout=120 --tries=3 --output-document="$installer" https://claude.ai/install.sh
-    else
-      echo '自动安装需要服务器提供 curl 或 wget，请先安装其中一个工具。' >&2
-      exit 127
-    fi
-    if ! bash "$installer" >&2 </dev/null; then
-      echo 'Claude Code 官方安装失败，请检查上述输出、网络连接和目录权限后重试。' >&2
-      exit 1
-    fi
-  )
-  hash -r
-  if ! command -v claude >/dev/null 2>&1; then
-    echo '安装器已退出，但仍找不到 Claude Code。请检查 ~/.local/bin/claude 或通过 --claude 指定绝对路径。' >&2
-    exit 127
-  fi
-  echo 'Claude Code 已安装，首次启动时请按提示完成账号认证。' >&2
-` : `
-  echo ${quote('找不到配置的 Claude 程序：' + command + '。请修正 --claude 路径，或配置 --claude claude 使用自动安装。')} >&2
-  exit 127
-`;
-  // A failed download/installer must stop before any project directory is created or synced.
-  return 'set -e\n' + remoteEnvironment + '\n' +
-    `if ! command -v ${quote(command)} >/dev/null 2>&1; then\n${missing}fi\n`;
-}
+import { quote } from './system.js';
+
+export const remoteEnvironment = 'export PATH="$HOME/.local/bin:$PATH"; ';
+
+export function ensureRemoteClaude(command) {
+  const missing = command === 'claude' ? `
+  echo '服务器未安装 Claude Code，正在执行官方安装流程……' >&2
+  (
+    set -e
+    installer=$(mktemp "\${TMPDIR:-/tmp}/claude-remote-install.XXXXXXXX")
+    trap 'rm -f -- "$installer"' EXIT
+    if command -v curl >/dev/null 2>&1; then
+      curl -fSL </dev/null --connect-timeout 20 --max-time 120 --retry 2 \\
+        --output "$installer" https://claude.ai/install.sh
+    elif command -v wget >/dev/null 2>&1; then
+      wget </dev/null --timeout=120 --tries=3 --output-document="$installer" https://claude.ai/install.sh
+    else
+      echo '自动安装需要服务器提供 curl 或 wget，请先安装其中一个工具。' >&2
+      exit 127
+    fi
+    if ! bash "$installer" >&2 </dev/null; then
+      echo 'Claude Code 官方安装失败，请检查上述输出、网络连接和目录权限后重试。' >&2
+      exit 1
+    fi
+  )
+  hash -r
+  if ! command -v claude >/dev/null 2>&1; then
+    echo '安装器已退出，但仍找不到 Claude Code。请检查 ~/.local/bin/claude 或通过 --claude 指定绝对路径。' >&2
+    exit 127
+  fi
+  echo 'Claude Code 已安装，首次启动时请按提示完成账号认证。' >&2
+` : `
+  echo ${quote('找不到配置的 Claude 程序：' + command + '。请修正 --claude 路径，或配置 --claude claude 使用自动安装。')} >&2
+  exit 127
+`;
+  // A failed download/installer must stop before any project directory is created or synced.
+  return 'set -e\n' + remoteEnvironment + '\n' +
+    `if ! command -v ${quote(command)} >/dev/null 2>&1; then\n${missing}fi\n`;
+}

package/src/remote-clipboard.js

@@ -0,0 +1,97 @@
+import { quote } from './system.js';
+
+// Claude Code on Linux reads a pasted image by running
+//   xclip -selection clipboard -t TARGETS -o      (is there an image?)
+//   xclip -selection clipboard -t image/png -o    (write it to a file)
+// This stand-in is put first on the remote Claude's PATH and answers those two
+// reads with the image on the LOCAL clipboard, fetched through the SSH reverse
+// tunnel. Every other call is passed on to the real xclip, if any.
+// The token stays in a 0600 file read with `curl -H @file`, so it never
+// appears in a process list on the server.
+export const XCLIP_SHIM = `#!/bin/sh
+# claude-remote: serve clipboard image reads from the LOCAL computer.
+dir=$(cd -- "$(dirname -- "$0")" && pwd -P)
+selection=primary target= output= previous=
+for argument in "$@"; do
+  case $previous in
+    -selection|-sel) selection=$argument ;;
+    -t|-target) target=$argument ;;
+  esac
+  case $argument in -o|-out) output=1 ;; esac
+  previous=$argument
+done
+
+real() {
+  PATH=$(printf '%s' "$PATH" | tr ':' '\\n' | grep -vxF -- "$dir" | paste -s -d: -)
+  export PATH
+  command -v xclip >/dev/null 2>&1 || exit 1
+  exec xclip "$@"
+}
+
+# Download the LOCAL clipboard image to $1; fails when there is none (HTTP 204).
+fetch() {
+  part=$1.part
+  rm -f -- "$part"
+  if command -v curl >/dev/null 2>&1; then
+    curl -sf --max-time 20 -H @"$dir/header" -o "$part" "$(cat -- "$dir/url")" 2>/dev/null
+  elif command -v python3 >/dev/null 2>&1; then
+    python3 - "$dir" "$part" <<'PYTHON' 2>/dev/null
+import sys, urllib.request
+directory, target = sys.argv[1], sys.argv[2]
+name, value = open(directory + '/header').read().strip().split(': ', 1)
+request = urllib.request.Request(open(directory + '/url').read().strip(), headers={name: value})
+with urllib.request.urlopen(request, timeout=20) as response, open(target, 'wb') as output:
+    output.write(response.read())
+PYTHON
+  else
+    return 1
+  fi
+  if [ -s "$part" ]; then mv -f -- "$part" "$1"; else rm -f -- "$part"; return 1; fi
+}
+
+if [ "$output" = 1 ] && [ "$selection" = clipboard ]; then
+  cache=$dir/clipboard.png
+  case $target in
+    TARGETS)
+      fetch "$cache" || exit 1
+      printf 'TARGETS\\nimage/png\\n'
+      exit 0 ;;
+    image/png)
+      # Reuse the image fetched by the TARGETS check a moment ago.
+      modified=$(stat -c %Y -- "$cache" 2>/dev/null || stat -f %m -- "$cache" 2>/dev/null || echo 0)
+      age=$(( $(date +%s) - modified ))
+      if [ ! -s "$cache" ] || [ "$age" -gt 30 ]; then fetch "$cache" || exit 1; fi
+      cat -- "$cache"
+      rm -f -- "$cache"
+      exit 0 ;;
+  esac
+fi
+real "$@"
+`;
+
+// Claude Code on Linux pastes images with Ctrl+V only, but Windows terminals
+// keep Ctrl+V for their own paste, so Windows users press Alt+V as they would
+// locally. This binding is honoured even with --restricted.
+export const ALT_V_BINDING = { context: 'Chat', bindings: { 'alt+v': 'chat:imagePaste' } };
+export const KEYBINDING_MISSING = 'CLAUDE_REMOTE_ALT_V_MISSING';
+
+// Creates ~/.claude/keybindings.json with the Alt+V binding when it does not
+// exist. An existing file is never edited; KEYBINDING_MISSING is printed
+// instead when it has no Alt+V entry, so the user can add it.
+export function ensureAltVBinding() {
+  const file = '"$HOME/.claude/keybindings.json"';
+  // Failing to write is not fatal: Ctrl+V still works where the terminal allows it.
+  return 'if [ ! -e ' + file + ' ]; then { mkdir -p -- "$HOME/.claude" && printf \'%s\\n\' ' +
+    quote(JSON.stringify({ bindings: [ALT_V_BINDING] }, null, 2)) + ' > ' + file + '; } 2>/dev/null || true\n' +
+    'elif ! grep -qi \'"alt+v"\' ' + file + ' 2>/dev/null; then echo ' + KEYBINDING_MISSING + '\nfi\n';
+}
+
+// Shell lines that install the stand-in into `directory` (an already quoted
+// remote path). The Authorization header is read from the next stdin line.
+export function installClipboardShim(directory, url) {
+  return 'mkdir -m 700 -- ' + directory + '\n' +
+    'IFS= read -r line; printf \'%s\\n\' "$line" > ' + directory + '/header\n' +
+    'printf \'%s\\n\' ' + url + ' > ' + directory + '/url\n' +
+    'cat > ' + directory + "/xclip <<'CLAUDE_REMOTE_XCLIP'\n" + XCLIP_SHIM + 'CLAUDE_REMOTE_XCLIP\n' +
+    'chmod 700 -- ' + directory + '/xclip\n';
+}

package/src/ssh-auth.js

@@ -1,113 +1,113 @@
-import * as fs from 'node:fs/promises';
-import path from 'node:path';
-import os from 'node:os';
-import { createHash } from 'node:crypto';
-import { sshBase } from './ssh.js';
-import { exists, quote, which, withLock } from './system.js';
-import { parseSSHPolicy, sshPolicyScript } from './ssh-policy.js';
-
-// Force a new public-key connection: an existing multiplexed/password session
-// must never be mistaken for successful key authentication.
-const probeOptions = ['-o', 'BatchMode=yes', '-o', 'PreferredAuthentications=publickey',
-  '-o', 'ControlPath=none', '-o', 'ControlMaster=no'];
-
-export function authorizeKeyScript(publicKey) {
-  if (!/^ssh-ed25519 [A-Za-z0-9+/]+={0,3}(?: [^\r\n]*)?$/.test(publicKey))
-    throw new Error('专用 SSH 公钥格式无效。');
-  return 'set -eu; umask 077; mkdir -p "$HOME/.ssh"; chmod 700 "$HOME/.ssh"; ' +
-    'touch "$HOME/.ssh/authorized_keys"; chmod 600 "$HOME/.ssh/authorized_keys"; ' +
-    'key=' + quote(publicKey) + '; ' +
-    'if ! grep -qxF -- "$key" "$HOME/.ssh/authorized_keys"; then ' +
-    // A pre-existing file need not end with a newline.
-    'printf "\\n%s\\n" "$key" >> "$HOME/.ssh/authorized_keys"; fi';
-}
-
-export async function ensureSSH(client, config, { enablePubkey = false } = {}) {
-  if (!await which('ssh', client.env.PATH)) throw new Error('找不到系统 SSH 客户端。');
-  const run = (args, options = {}) => client.execute('ssh', [...sshBase(config), ...args],
-    { env: client.env, timeout: 30000, ...options });
-  const probe = async (identity = []) => (await run([...probeOptions, ...identity, config.host, 'true'],
-    { capture: true, check: false })).code === 0;
-  if (await probe()) return;
-  if (!client.tty) throw new Error('SSH 免密连接尚不可用。请在交互终端运行 claude-remote setup-ssh，完成首次登录及密钥授权；也请检查服务器地址和主机指纹。');
-  if (!await which('ssh-keygen', client.env.PATH)) throw new Error('找不到 ssh-keygen，请安装 OpenSSH 客户端。');
-
-  const directory = path.join(client.home, '.ssh', 'claude-remote');
-  // Windows OpenSSH cannot share one login through a control socket, so each
-  // step there opens its own connection and may ask for the password again.
-  const multiplex = (client.platform ?? process.platform) !== 'win32';
-  await withLock(path.join(directory, 'setup'), async () => {
-    if (await probe()) return;
-    let temporary, socket;
-    const login = args => multiplex ? ['-S', socket, ...args] : args;
-    // Without multiplexing, prompts belong to these commands: keep them visible and allow time to answer.
-    const prompted = multiplex ? {} : { prompt: true, timeout: 180000 };
-    try {
-      if (multiplex) {
-        const base = os.tmpdir().length > 55 ? '/tmp' : os.tmpdir();
-        temporary = await fs.mkdtemp(path.join(base, 'ccra-'));
-        socket = path.join(temporary, 'ssh');
-        client.log('请按提示完成 SSH 验证。');
-        // Authenticate once; subsequent installation reuses this private socket.
-        // Do not capture authentication output or handle passwords in JavaScript.
-        await run(['-M', '-S', socket, '-o', 'ControlPersist=no', '-o', 'ControlMaster=yes',
-          '-f', '-N', config.host], { timeout: 180000, capture: false });
-      } else client.log('请按提示完成 SSH 验证。Windows 的 OpenSSH 不支持连接复用，可能需要输入两次密码。');
-      const inspect = await run(login([config.host, 'sh -c ' + quote(sshPolicyScript({ enable: enablePubkey }))]),
-        { capture: true, ...prompted });
-      const policy = parseSSHPolicy(inspect.stdout);
-      if (policy.backup) client.log('已开启公钥登录。配置备份：' + policy.backup);
-      if (policy.pubkeyauthentication === 'no')
-        throw new Error('服务器关闭了公钥登录（PubkeyAuthentication no），尚未生成或添加密钥。' +
-          (policy.uid === '0' ? '如需开启，请运行：claude-remote setup-ssh --enable-pubkey（备份配置、校验后重新加载，保留密码登录）。' :
-            '请联系管理员开启该账号的公钥登录，再运行 claude-remote setup-ssh。'));
-      if (policy.authenticationmethods && policy.authenticationmethods !== 'any' &&
-          !policy.authenticationmethods.split(/\s+/).includes('publickey'))
-        throw new Error('服务器 AuthenticationMethods=' + policy.authenticationmethods +
-          '，不允许仅凭公钥登录；请联系管理员确认认证策略。未修改该策略，尚未生成或添加密钥。');
-      if (policy.status !== 'ok') {
-        if (enablePubkey) throw new Error('无法读取服务器有效 SSH 配置，未自动修改服务器策略；请联系管理员检查。');
-        client.debug('无法读取服务器 SSH 策略，尝试普通公钥授权。');
-      }
-      const id = createHash('sha256').update(config.host + '\0' + (config.port ?? '')).digest('hex').slice(0, 20);
-      const key = path.join(directory, 'id_ed25519_' + id);
-      await fs.chmod(directory, 0o700);
-      if (!await exists(key)) {
-        if (await exists(key + '.pub')) throw new Error('专用 SSH 私钥缺失但公钥仍存在，请检查：' + key);
-        client.debug('创建专用 SSH 密钥：' + key);
-        await client.execute('ssh-keygen', ['-q', '-t', 'ed25519', '-N', '', '-C', 'claude-remote-cli', '-f', key],
-          { env: client.env, capture: true, timeout: 30000 });
-      }
-      await fs.chmod(key, 0o600);
-      // Derive from the private key so an outdated .pub file cannot authorize
-      // the wrong key. Never transmit the private key.
-      const derived = await client.execute('ssh-keygen', ['-y', '-P', '', '-f', key],
-        { env: client.env, capture: true, timeout: 30000 });
-      const publicKey = derived.stdout.trim();
-      const script = authorizeKeyScript(publicKey);
-      await run(login([config.host, 'sh -c ' + quote(script)]), { capture: false, ...(multiplex ? {} : { timeout: 180000 }) });
-      if (!await probe(['-i', key, '-o', 'IdentitiesOnly=yes', '-o', 'IdentityAgent=none']))
-        throw new Error('公钥已添加，但独立密钥登录验证失败。请检查服务器的公钥登录策略和 authorized_keys 设置；未修改本机 SSH 配置。');
-
-      // SSH's ordinary config also makes the key available to Mutagen and scp.
-      // IdentityFile is additive; do not replace existing host/user/proxy rules.
-      const configFile = path.join(client.home, '.ssh', 'config');
-      const host = config.host.split('@').at(-1);
-      // Forward slashes avoid backslash escaping differences between OpenSSH versions on Windows.
-      const file = (client.platform ?? process.platform) === 'win32' ? key.replaceAll('\\', '/') : key;
-      const escaped = file.replaceAll('%', '%%').replaceAll('\\', '\\\\').replaceAll('"', '\\"');
-      const block = `\n# claude-remote-cli ${id}\nHost ${host}\n  IdentityFile "${escaped}"\nHost *\n`;
-      const previous = await fs.readFile(configFile, 'utf8').catch(error => {
-        if (error.code === 'ENOENT') return ''; throw error;
-      });
-      if (!previous.includes(block)) await fs.appendFile(configFile, block, { mode: 0o600 });
-      if (!await probe()) throw new Error('密钥已授权，但默认 SSH 配置验证失败。请检查 ~/.ssh/config 的 IdentityFile 和 IdentitiesOnly 设置。');
-      client.debug('SSH 免密登录已配置并验证成功。');
-    } finally {
-      if (multiplex) {
-        if (socket) await run(['-S', socket, '-O', 'exit', config.host], { capture: true, check: false, timeout: 5000 }).catch(() => {});
-        if (temporary) await fs.rm(temporary, { recursive: true, force: true });
-      }
-    }
-  });
-}
+import * as fs from 'node:fs/promises';
+import path from 'node:path';
+import os from 'node:os';
+import { createHash } from 'node:crypto';
+import { sshBase } from './ssh.js';
+import { exists, quote, which, withLock } from './system.js';
+import { parseSSHPolicy, sshPolicyScript } from './ssh-policy.js';
+
+// Force a new public-key connection: an existing multiplexed/password session
+// must never be mistaken for successful key authentication.
+const probeOptions = ['-o', 'BatchMode=yes', '-o', 'PreferredAuthentications=publickey',
+  '-o', 'ControlPath=none', '-o', 'ControlMaster=no'];
+
+export function authorizeKeyScript(publicKey) {
+  if (!/^ssh-ed25519 [A-Za-z0-9+/]+={0,3}(?: [^\r\n]*)?$/.test(publicKey))
+    throw new Error('专用 SSH 公钥格式无效。');
+  return 'set -eu; umask 077; mkdir -p "$HOME/.ssh"; chmod 700 "$HOME/.ssh"; ' +
+    'touch "$HOME/.ssh/authorized_keys"; chmod 600 "$HOME/.ssh/authorized_keys"; ' +
+    'key=' + quote(publicKey) + '; ' +
+    'if ! grep -qxF -- "$key" "$HOME/.ssh/authorized_keys"; then ' +
+    // A pre-existing file need not end with a newline.
+    'printf "\\n%s\\n" "$key" >> "$HOME/.ssh/authorized_keys"; fi';
+}
+
+export async function ensureSSH(client, config, { enablePubkey = false } = {}) {
+  if (!await which('ssh', client.env.PATH)) throw new Error('找不到系统 SSH 客户端。');
+  const run = (args, options = {}) => client.execute('ssh', [...sshBase(config), ...args],
+    { env: client.env, timeout: 30000, ...options });
+  const probe = async (identity = []) => (await run([...probeOptions, ...identity, config.host, 'true'],
+    { capture: true, check: false })).code === 0;
+  if (await probe()) return;
+  if (!client.tty) throw new Error('SSH 免密连接尚不可用。请在交互终端运行 claude-remote setup-ssh，完成首次登录及密钥授权；也请检查服务器地址和主机指纹。');
+  if (!await which('ssh-keygen', client.env.PATH)) throw new Error('找不到 ssh-keygen，请安装 OpenSSH 客户端。');
+
+  const directory = path.join(client.home, '.ssh', 'claude-remote');
+  // Windows OpenSSH cannot share one login through a control socket, so each
+  // step there opens its own connection and may ask for the password again.
+  const multiplex = (client.platform ?? process.platform) !== 'win32';
+  await withLock(path.join(directory, 'setup'), async () => {
+    if (await probe()) return;
+    let temporary, socket;
+    const login = args => multiplex ? ['-S', socket, ...args] : args;
+    // Without multiplexing, prompts belong to these commands: keep them visible and allow time to answer.
+    const prompted = multiplex ? {} : { prompt: true, timeout: 180000 };
+    try {
+      if (multiplex) {
+        const base = os.tmpdir().length > 55 ? '/tmp' : os.tmpdir();
+        temporary = await fs.mkdtemp(path.join(base, 'ccra-'));
+        socket = path.join(temporary, 'ssh');
+        client.log('请按提示完成 SSH 验证。');
+        // Authenticate once; subsequent installation reuses this private socket.
+        // Do not capture authentication output or handle passwords in JavaScript.
+        await run(['-M', '-S', socket, '-o', 'ControlPersist=no', '-o', 'ControlMaster=yes',
+          '-f', '-N', config.host], { timeout: 180000, capture: false });
+      } else client.log('请按提示完成 SSH 验证。Windows 的 OpenSSH 不支持连接复用，可能需要输入两次密码。');
+      const inspect = await run(login([config.host, 'sh -c ' + quote(sshPolicyScript({ enable: enablePubkey }))]),
+        { capture: true, ...prompted });
+      const policy = parseSSHPolicy(inspect.stdout);
+      if (policy.backup) client.log('已开启公钥登录。配置备份：' + policy.backup);
+      if (policy.pubkeyauthentication === 'no')
+        throw new Error('服务器关闭了公钥登录（PubkeyAuthentication no），尚未生成或添加密钥。' +
+          (policy.uid === '0' ? '如需开启，请运行：claude-remote setup-ssh --enable-pubkey（备份配置、校验后重新加载，保留密码登录）。' :
+            '请联系管理员开启该账号的公钥登录，再运行 claude-remote setup-ssh。'));
+      if (policy.authenticationmethods && policy.authenticationmethods !== 'any' &&
+          !policy.authenticationmethods.split(/\s+/).includes('publickey'))
+        throw new Error('服务器 AuthenticationMethods=' + policy.authenticationmethods +
+          '，不允许仅凭公钥登录；请联系管理员确认认证策略。未修改该策略，尚未生成或添加密钥。');
+      if (policy.status !== 'ok') {
+        if (enablePubkey) throw new Error('无法读取服务器有效 SSH 配置，未自动修改服务器策略；请联系管理员检查。');
+        client.debug('无法读取服务器 SSH 策略，尝试普通公钥授权。');
+      }
+      const id = createHash('sha256').update(config.host + '\0' + (config.port ?? '')).digest('hex').slice(0, 20);
+      const key = path.join(directory, 'id_ed25519_' + id);
+      await fs.chmod(directory, 0o700);
+      if (!await exists(key)) {
+        if (await exists(key + '.pub')) throw new Error('专用 SSH 私钥缺失但公钥仍存在，请检查：' + key);
+        client.debug('创建专用 SSH 密钥：' + key);
+        await client.execute('ssh-keygen', ['-q', '-t', 'ed25519', '-N', '', '-C', 'claude-remote-cli', '-f', key],
+          { env: client.env, capture: true, timeout: 30000 });
+      }
+      await fs.chmod(key, 0o600);
+      // Derive from the private key so an outdated .pub file cannot authorize
+      // the wrong key. Never transmit the private key.
+      const derived = await client.execute('ssh-keygen', ['-y', '-P', '', '-f', key],
+        { env: client.env, capture: true, timeout: 30000 });
+      const publicKey = derived.stdout.trim();
+      const script = authorizeKeyScript(publicKey);
+      await run(login([config.host, 'sh -c ' + quote(script)]), { capture: false, ...(multiplex ? {} : { timeout: 180000 }) });
+      if (!await probe(['-i', key, '-o', 'IdentitiesOnly=yes', '-o', 'IdentityAgent=none']))
+        throw new Error('公钥已添加，但独立密钥登录验证失败。请检查服务器的公钥登录策略和 authorized_keys 设置；未修改本机 SSH 配置。');
+
+      // SSH's ordinary config also makes the key available to Mutagen and scp.
+      // IdentityFile is additive; do not replace existing host/user/proxy rules.
+      const configFile = path.join(client.home, '.ssh', 'config');
+      const host = config.host.split('@').at(-1);
+      // Forward slashes avoid backslash escaping differences between OpenSSH versions on Windows.
+      const file = (client.platform ?? process.platform) === 'win32' ? key.replaceAll('\\', '/') : key;
+      const escaped = file.replaceAll('%', '%%').replaceAll('\\', '\\\\').replaceAll('"', '\\"');
+      const block = `\n# claude-remote-cli ${id}\nHost ${host}\n  IdentityFile "${escaped}"\nHost *\n`;
+      const previous = await fs.readFile(configFile, 'utf8').catch(error => {
+        if (error.code === 'ENOENT') return ''; throw error;
+      });
+      if (!previous.includes(block)) await fs.appendFile(configFile, block, { mode: 0o600 });
+      if (!await probe()) throw new Error('密钥已授权，但默认 SSH 配置验证失败。请检查 ~/.ssh/config 的 IdentityFile 和 IdentitiesOnly 设置。');
+      client.debug('SSH 免密登录已配置并验证成功。');
+    } finally {
+      if (multiplex) {
+        if (socket) await run(['-S', socket, '-O', 'exit', config.host], { capture: true, check: false, timeout: 5000 }).catch(() => {});
+        if (temporary) await fs.rm(temporary, { recursive: true, force: true });
+      }
+    }
+  });
+}

package/src/ssh-policy.js

@@ -1,92 +1,92 @@
-import { quote } from './system.js';
-
-// configFile is injectable only for isolated filesystem tests, never a CLI flag.
-export function sshPolicyScript({ enable = false, configFile = '/etc/ssh/sshd_config', procRoot = '/proc' } = {}) {
-  return `# claude-remote-ssh-policy
-set -eu
-sshd=$(command -v sshd || true)
-if [ -z "$sshd" ] && [ -x /usr/sbin/sshd ]; then sshd=/usr/sbin/sshd; fi
-printf 'uid=%s\\n' "$(id -u)"
-if [ -z "$sshd" ]; then printf 'status=unavailable\\n'; exit 0; fi
-set -- \${SSH_CONNECTION:-}
-connection="user=$(id -un)"
-if [ "$#" -eq 4 ]; then connection="$connection,addr=$1,host=$1,laddr=$3,lport=$4"; fi
-policy() { "$sshd" -T -C "$connection"; }
-if ! current=$(policy 2>/dev/null); then printf 'status=unavailable\\n'; exit 0; fi
-${enable ? `
-if printf '%s\\n' "$current" | grep -qx 'pubkeyauthentication no'; then
-  printf '%s\\n' "$current" | grep -Eq '^authenticationmethods (any|([^ ]+ )*publickey)( |$)' || {
-    echo '服务器要求额外认证，未修改认证策略。' >&2; exit 1;
-  }
-  [ "$(id -u)" = 0 ] || { echo '自动开启公钥登录需要 root；请由管理员配置。' >&2; exit 1; }
-  [ "$(uname -s)" = Linux ] || { echo '自动开启仅支持 Linux systemd 的标准 SSH 服务。' >&2; exit 1; }
-  service=
-  for name in ssh.service sshd.service; do
-    if systemctl is-active --quiet "$name"; then service=$name; break; fi
-  done
-  [ -n "$service" ] || { echo '无法确认正在运行的 SSH 服务，未修改配置。' >&2; exit 1; }
-  pid=$(systemctl show "$service" --property=MainPID --value)
-  case "$pid" in ''|*[!0-9]*|0) echo '无法确认 SSH 服务进程，未修改配置。' >&2; exit 1;; esac
-  process_file=${quote(procRoot)}/"$pid"/cmdline
-  [ -r "$process_file" ] || { echo '无法读取 SSH 服务参数，未修改配置。' >&2; exit 1; }
-  process_args=$(tr '\\000' ' ' < "$process_file")
-  invocation=$(systemctl show "$service" --property=ExecStart --property=Environment)
-  case "$invocation $process_args" in
-    *' -f'*|*' -o'*) echo 'SSH 服务使用自定义参数，请由管理员配置；未修改配置。' >&2; exit 1;;
-  esac
-  file=${quote(configFile)}
-  [ -f "$file" ] && [ ! -L "$file" ] || { echo 'SSH 配置不是普通文件，未修改配置。' >&2; exit 1; }
-  backup=$(mktemp "$file.claude-remote.XXXXXX")
-  cp -p "$file" "$backup"
-  changed=0
-  candidate=
-  rollback() {
-    code=$?
-    trap - EXIT HUP INT TERM
-    if [ -n "$candidate" ]; then rm -f "$candidate"; fi
-    if [ "$changed" = 1 ]; then
-      cp -p "$backup" "$file"
-      if ! "$sshd" -t || ! systemctl reload "$service"; then
-        echo "恢复后的 SSH 配置校验或重新加载失败，请使用备份检查：$backup" >&2
-      fi
-      echo "开启失败，已恢复原配置；备份：$backup" >&2
-    fi
-    exit "$code"
-  }
-  trap rollback EXIT
-  trap 'exit 1' HUP INT TERM
-  # First global value wins, including over later Include files. Restrictive
-  # Match rules must pass the connection-specific check or we roll back.
-  candidate=$(mktemp "$file.claude-remote-stage.XXXXXX")
-  cp -p "$backup" "$candidate"
-  { printf 'PubkeyAuthentication yes\\n'; cat "$backup"; } > "$candidate"
-  changed=1
-  mv -f "$candidate" "$file"
-  "$sshd" -t
-  current=$(policy)
-  printf '%s\\n' "$current" | grep -qx 'pubkeyauthentication yes' || {
-    echo '当前账号的 Match 策略仍禁止公钥登录。' >&2; exit 1;
-  }
-  systemctl reload "$service"
-  changed=0
-  trap - EXIT HUP INT TERM
-  printf 'backup=%s\\n' "$backup"
-fi
-` : ''}
-printf 'status=ok\\n'
-printf '%s\\n' "$current" | while IFS=' ' read -r key value; do
-  case "$key" in pubkeyauthentication|authenticationmethods|authorizedkeysfile|permitrootlogin)
-    printf '%s=%s\\n' "$key" "$value";;
-  esac
-done
-`;
-}
-
-export function parseSSHPolicy(output) {
-  const result = {};
-  for (const line of output.split(/\r?\n/)) {
-    const index = line.indexOf('=');
-    if (index > 0) result[line.slice(0, index)] = line.slice(index + 1);
-  }
-  return result;
-}
+import { quote } from './system.js';
+
+// configFile is injectable only for isolated filesystem tests, never a CLI flag.
+export function sshPolicyScript({ enable = false, configFile = '/etc/ssh/sshd_config', procRoot = '/proc' } = {}) {
+  return `# claude-remote-ssh-policy
+set -eu
+sshd=$(command -v sshd || true)
+if [ -z "$sshd" ] && [ -x /usr/sbin/sshd ]; then sshd=/usr/sbin/sshd; fi
+printf 'uid=%s\\n' "$(id -u)"
+if [ -z "$sshd" ]; then printf 'status=unavailable\\n'; exit 0; fi
+set -- \${SSH_CONNECTION:-}
+connection="user=$(id -un)"
+if [ "$#" -eq 4 ]; then connection="$connection,addr=$1,host=$1,laddr=$3,lport=$4"; fi
+policy() { "$sshd" -T -C "$connection"; }
+if ! current=$(policy 2>/dev/null); then printf 'status=unavailable\\n'; exit 0; fi
+${enable ? `
+if printf '%s\\n' "$current" | grep -qx 'pubkeyauthentication no'; then
+  printf '%s\\n' "$current" | grep -Eq '^authenticationmethods (any|([^ ]+ )*publickey)( |$)' || {
+    echo '服务器要求额外认证，未修改认证策略。' >&2; exit 1;
+  }
+  [ "$(id -u)" = 0 ] || { echo '自动开启公钥登录需要 root；请由管理员配置。' >&2; exit 1; }
+  [ "$(uname -s)" = Linux ] || { echo '自动开启仅支持 Linux systemd 的标准 SSH 服务。' >&2; exit 1; }
+  service=
+  for name in ssh.service sshd.service; do
+    if systemctl is-active --quiet "$name"; then service=$name; break; fi
+  done
+  [ -n "$service" ] || { echo '无法确认正在运行的 SSH 服务，未修改配置。' >&2; exit 1; }
+  pid=$(systemctl show "$service" --property=MainPID --value)
+  case "$pid" in ''|*[!0-9]*|0) echo '无法确认 SSH 服务进程，未修改配置。' >&2; exit 1;; esac
+  process_file=${quote(procRoot)}/"$pid"/cmdline
+  [ -r "$process_file" ] || { echo '无法读取 SSH 服务参数，未修改配置。' >&2; exit 1; }
+  process_args=$(tr '\\000' ' ' < "$process_file")
+  invocation=$(systemctl show "$service" --property=ExecStart --property=Environment)
+  case "$invocation $process_args" in
+    *' -f'*|*' -o'*) echo 'SSH 服务使用自定义参数，请由管理员配置；未修改配置。' >&2; exit 1;;
+  esac
+  file=${quote(configFile)}
+  [ -f "$file" ] && [ ! -L "$file" ] || { echo 'SSH 配置不是普通文件，未修改配置。' >&2; exit 1; }
+  backup=$(mktemp "$file.claude-remote.XXXXXX")
+  cp -p "$file" "$backup"
+  changed=0
+  candidate=
+  rollback() {
+    code=$?
+    trap - EXIT HUP INT TERM
+    if [ -n "$candidate" ]; then rm -f "$candidate"; fi
+    if [ "$changed" = 1 ]; then
+      cp -p "$backup" "$file"
+      if ! "$sshd" -t || ! systemctl reload "$service"; then
+        echo "恢复后的 SSH 配置校验或重新加载失败，请使用备份检查：$backup" >&2
+      fi
+      echo "开启失败，已恢复原配置；备份：$backup" >&2
+    fi
+    exit "$code"
+  }
+  trap rollback EXIT
+  trap 'exit 1' HUP INT TERM
+  # First global value wins, including over later Include files. Restrictive
+  # Match rules must pass the connection-specific check or we roll back.
+  candidate=$(mktemp "$file.claude-remote-stage.XXXXXX")
+  cp -p "$backup" "$candidate"
+  { printf 'PubkeyAuthentication yes\\n'; cat "$backup"; } > "$candidate"
+  changed=1
+  mv -f "$candidate" "$file"
+  "$sshd" -t
+  current=$(policy)
+  printf '%s\\n' "$current" | grep -qx 'pubkeyauthentication yes' || {
+    echo '当前账号的 Match 策略仍禁止公钥登录。' >&2; exit 1;
+  }
+  systemctl reload "$service"
+  changed=0
+  trap - EXIT HUP INT TERM
+  printf 'backup=%s\\n' "$backup"
+fi
+` : ''}
+printf 'status=ok\\n'
+printf '%s\\n' "$current" | while IFS=' ' read -r key value; do
+  case "$key" in pubkeyauthentication|authenticationmethods|authorizedkeysfile|permitrootlogin)
+    printf '%s=%s\\n' "$key" "$value";;
+  esac
+done
+`;
+}
+
+export function parseSSHPolicy(output) {
+  const result = {};
+  for (const line of output.split(/\r?\n/)) {
+    const index = line.indexOf('=');
+    if (index > 0) result[line.slice(0, index)] = line.slice(index + 1);
+  }
+  return result;
+}

package/src/ssh.js

@@ -1,16 +1,16 @@
-import { quote } from './system.js';
-
-export function sshBase(config) {
-  const args = ['-o', 'ConnectTimeout=15', '-o', 'ServerAliveInterval=15', '-o', 'ServerAliveCountMax=3'];
-  if (config.port != null) args.push('-p', String(config.port));
-  return args;
-}
-
-export function sshArgs(config, script, { interactive = false, tty = false, input = false, controlPath } = {}) {
-  const args = sshBase(config);
-  if (!interactive && !input) args.push('-n');
-  if (tty) args.push('-tt');
-  if (controlPath) args.push('-S', controlPath, '-o', 'ControlMaster=no');
-  args.push(config.host, 'bash -lc ' + quote(script));
-  return args;
-}
+import { quote } from './system.js';
+
+export function sshBase(config) {
+  const args = ['-o', 'ConnectTimeout=15', '-o', 'ServerAliveInterval=15', '-o', 'ServerAliveCountMax=3'];
+  if (config.port != null) args.push('-p', String(config.port));
+  return args;
+}
+
+export function sshArgs(config, script, { interactive = false, tty = false, input = false, controlPath } = {}) {
+  const args = sshBase(config);
+  if (!interactive && !input) args.push('-n');
+  if (tty) args.push('-tt');
+  if (controlPath) args.push('-S', controlPath, '-o', 'ControlMaster=no');
+  args.push(config.host, 'bash -lc ' + quote(script));
+  return args;
+}