@xyagent/cli 1.0.0 → 1.1.0

package/src-ext/runtime/opencode/index.mjs

@@ -0,0 +1,48 @@
+import { runHeadlessCliBridge } from "../_shared/headlessCliBridge.mjs";
+import { recordBridgedSession } from "../_shared/bridgedSessionLedger.mjs";
+import { probeBinary, runNdjsonProcess } from "../_shared/ndjsonProcess.mjs";
+import { resolveWorkspaceCwd } from "../_shared/resolveWorkspaceCwd.mjs";
+
+export function opencodePreflight() {
+  return probeBinary("opencode");
+}
+
+export function translateOpenCodeEvent(event) {
+  if (event?.type === "error") {
+    const message = event.error?.message || event.message || "OpenCode runtime error";
+    throw new Error(String(message));
+  }
+  if (event?.type === "text" && event.part?.text) {
+    return { event: "response.output_text.delta", delta: String(event.part.text) };
+  }
+  return null;
+}
+
+export function createOpenCodeInvoke({ fallbackWorkspace, log, runProcess = runNdjsonProcess }) {
+  const sessions = new Map();
+  return async ({ thread_id, input, workspace_path, resume_session_id, onChunk, onProcess }) => {
+    const { cwd } = resolveWorkspaceCwd({ workspacePath: workspace_path, fallbackWorkspace, runtime: "opencode", log });
+    const args = ["run", "--format", "json", "--dir", cwd];
+    const model = String(process.env.AGENTLINK_OPENCODE_MODEL || "").trim();
+    if (model) args.push("--model", model);
+    const prior = sessions.get(thread_id) || resume_session_id;
+    if (prior) args.push("--session", prior);
+    args.push(String(input || ""));
+    await runProcess({
+      binary: "opencode",
+      args,
+      cwd,
+      parseEvent: translateOpenCodeEvent,
+      onChunk,
+      onProcess,
+      onSession: (id) => {
+        sessions.set(thread_id, id);
+        recordBridgedSession("opencode", id); // 打标：桥接产生的 CLI 会话，导入时跳过
+      },
+    });
+  };
+}
+
+export async function runOpenCodeBridge({ options, log }) {
+  return runHeadlessCliBridge({ runtime: "opencode", options, log, preflight: opencodePreflight, createInvoke: createOpenCodeInvoke });
+}

package/src-ext/runtime/opencode/mcpConfigAdapter.mjs

@@ -0,0 +1,15 @@
+import os from "node:os";
+import path from "node:path";
+
+import { createJsonMcpConfigAdapter } from "../_shared/jsonMcpConfigAdapter.mjs";
+
+export const fileExtension = "json";
+
+const adapter = createJsonMcpConfigAdapter({
+  resolvePath: () => process.env.OPENCODE_CONFIG || path.join(os.homedir(), ".config", "opencode", "opencode.json"),
+  readServers: (config) => config.mcp || (config.mcp = {}),
+  writeServers: (config, servers) => { config.mcp = servers; },
+  desiredEntry: (args) => ({ type: "local", command: ["node", ...args], enabled: true }),
+});
+
+export const { read, register, deregister, status } = adapter;

package/src-ext/runtime/opencode/preflight.mjs

@@ -0,0 +1,72 @@
+// opencode 预检：
+//   - 二进制存在（PATH 上能 spawn 到 `opencode`）
+//   - 版本号 best-effort 解析（只作展示/日志，不参与 installed 判定）
+//
+// 🔴 刻意与 src-ext/runtime/codex/preflight.mjs **同构**（同返回形状、同 5s 超时、
+// 同 ENOENT 专属分支），不为 opencode 另造探测范式：本仓判「runtime 装没装」只有
+// 一套办法 —— 直接问它自己的二进制。
+//
+// ⚠️ 不得拿 `agentlink-agent` 的存在当作「opencode 已安装」信号：agentlink-agent
+// 是 @xyagent/cli 自带的桥进程，永远在位，用它判定会把没装 opencode 的机器误报成
+// 已安装（这个坑 detectInstalledRuntimes 的注释里对 hermes 已经踩过一次）。
+//
+// spawnImpl 可注入（沿用仓内 `consumePairCode({ fetchImpl })` 的注入范式），
+// 让单测无需真装 opencode 就能确定性覆盖四条分支。
+
+import { spawnSync } from "node:child_process";
+import process from "node:process";
+
+const PREFLIGHT_TIMEOUT_MS = 5000;
+
+const INSTALL_HINT =
+  "未找到 `opencode` 命令。请先安装 opencode CLI（并确保它在当前 shell 的 PATH 里）。";
+
+/**
+ * @param {{ log?: object, spawnImpl?: Function }} [opts]
+ * @returns {{ ok: boolean, version?: string, error?: string, hint?: string }}
+ */
+export function opencodePreflight({ log, spawnImpl } = {}) {
+  const isWin = process.platform === "win32";
+  const pfLog = log ? log.child({ comp: "child", stage: "preflight" }) : null;
+  const spawn = spawnImpl || spawnSync;
+
+  let res;
+  try {
+    res = spawn("opencode", ["--version"], {
+      encoding: "utf8",
+      timeout: PREFLIGHT_TIMEOUT_MS,
+      shell: isWin ? true : false,
+    });
+  } catch (err) {
+    pfLog?.error("bridge.preflight.fail", "spawn threw", { err: err?.message || String(err) });
+    return { ok: false, error: err?.message || String(err), hint: INSTALL_HINT };
+  }
+  if (!res) {
+    return { ok: false, error: "opencode --version returned no result", hint: INSTALL_HINT };
+  }
+  if (res.error) {
+    const isENOENT = res.error.code === "ENOENT";
+    pfLog?.error("bridge.preflight.fail", "spawn errored", {
+      code: res.error.code, err: res.error.message,
+    });
+    return {
+      ok: false,
+      error: res.error.message,
+      hint: isENOENT ? INSTALL_HINT : `spawn opencode 失败（${res.error.code || "unknown"}）`,
+    };
+  }
+  if (res.status !== 0) {
+    const stderr = String(res.stderr ?? "").trim().split(/\r?\n/)[0] || "";
+    return {
+      ok: false,
+      error: `opencode --version exit ${res.status}${stderr ? `: ${stderr}` : ""}`,
+      hint: "opencode 启动报错，请先在终端手动跑一次 `opencode --version` 确认可用。",
+    };
+  }
+
+  // 版本只取首行做展示；解析不出来**不**影响 ok —— installed 由 exit 0 决定，
+  // 与 detectInstalledRuntimes 的两阶段探测保持同一口径。
+  const version = String(res.stdout ?? "").trim().split(/\r?\n/)[0] || "";
+  pfLog?.info("bridge.preflight.pass", "opencode binary ok", { version });
+  return { ok: true, version };
+}

package/src-ext/runtime/qwen/index.mjs

@@ -0,0 +1,42 @@
+
+import { runHeadlessCliBridge } from "../_shared/headlessCliBridge.mjs";
+import { recordBridgedSession } from "../_shared/bridgedSessionLedger.mjs";
+import { probeBinary, runNdjsonProcess } from "../_shared/ndjsonProcess.mjs";
+import { resolveWorkspaceCwd } from "../_shared/resolveWorkspaceCwd.mjs";
+import { translateClaudeSchemaEvent } from "../_shared/claudeSchemaEvent.mjs";
+
+export function qwenPreflight() {
+  const result = probeBinary("qwen");
+  if (!result.ok) result.hint = "请先安装 Qwen Code，并执行 qwen 登录完成认证。";
+  return result;
+}
+
+export function buildQwenArgs({ input, sessionId }) {
+  const args = ["--prompt", String(input || ""), "--output-format", "stream-json", "--yolo"];
+  if (sessionId) args.push("--resume", sessionId);
+  return args;
+}
+
+export function createQwenInvoke({ fallbackWorkspace, log, runProcess = runNdjsonProcess }) {
+  const sessions = new Map();
+  return async ({ thread_id, input, workspace_path, resume_session_id, onChunk, onProcess }) => {
+    const { cwd } = resolveWorkspaceCwd({ workspacePath: workspace_path, fallbackWorkspace, runtime: "qwen", log });
+    await runProcess({
+      binary: "qwen",
+      args: buildQwenArgs({ input, sessionId: sessions.get(thread_id) || resume_session_id || null }),
+      cwd,
+      env: { QWEN_CODE_SUPPRESS_YOLO_WARNING: "1" },
+      parseEvent: translateClaudeSchemaEvent,
+      onChunk,
+      onProcess,
+      onSession: (id) => {
+        sessions.set(thread_id, id);
+        recordBridgedSession("qwen", id); // 打标：桥接产生的 CLI 会话，导入时跳过
+      },
+    });
+  };
+}
+
+export async function runQwenBridge({ options, log }) {
+  return runHeadlessCliBridge({ runtime: "qwen", options, log, preflight: qwenPreflight, createInvoke: createQwenInvoke });
+}

package/src-ext/service/serviceManager.mjs

@@ -12,6 +12,7 @@
 // 所以调用前必须先跑过 `agentlink pair <code> -r <runtime>` —— ensureState 会校验。
 
 import fs from "node:fs";
+import { createHash } from "node:crypto";
 import os from "node:os";
 import path from "node:path";
 import process from "node:process";
@@ -19,7 +20,30 @@ import { spawnSync } from "node:child_process";
 import { readPairState } from "../core/pairCodeClient.mjs";
 import { ensureDefaultWorkspace, defaultWorkspacePath } from "../core/defaultWorkspace.mjs";
 
-const SERVICE_RUNTIMES = new Set(["claude", "codex"]);
+const SERVICE_RUNTIMES = new Set([
+  "claude", "codex", "cursor", "opencode", "qwen", "kimi", "codebuddy",
+]);
+const SERVICE_SCOPE_HASH_LENGTH = 12;
+
+function resolveAgentlinkHome() {
+  const configured = String(process.env.AGENTLINK_HOME ?? "").trim();
+  return configured || path.join(os.homedir(), ".agentlink");
+}
+
+export function serviceScopeSuffixFor(agentlinkHome, defaultAgentlinkHome) {
+  const currentHome = path.resolve(agentlinkHome);
+  const defaultHome = path.resolve(defaultAgentlinkHome);
+  if (currentHome === defaultHome) return "";
+  const digest = createHash("sha256").update(currentHome).digest("hex");
+  return `-${digest.slice(0, SERVICE_SCOPE_HASH_LENGTH)}`;
+}
+
+function serviceScopeSuffix() {
+  return serviceScopeSuffixFor(
+    resolveAgentlinkHome(),
+    path.join(os.homedir(), ".agentlink"),
+  );
+}
 
 /**
  * reload 用的 runtime 清单 —— 比 install 集合更广：也覆盖 openclaw/hermes
@@ -42,6 +66,31 @@ const ALL_RELOAD_TARGETS = {
     linux: "agentlink-agent-codex.service",
     win:   "Agentlink\\Agent-codex",
   },
+  cursor: {
+    mac:   "com.agentlink.agent.cursor",
+    linux: "agentlink-agent-cursor.service",
+    win:   "Agentlink\\Agent-cursor",
+  },
+  opencode: {
+    mac:   "com.agentlink.agent.opencode",
+    linux: "agentlink-agent-opencode.service",
+    win:   "Agentlink\\Agent-opencode",
+  },
+  qwen: {
+    mac:   "com.agentlink.agent.qwen",
+    linux: "agentlink-agent-qwen.service",
+    win:   "Agentlink\\Agent-qwen",
+  },
+  kimi: {
+    mac:   "com.agentlink.agent.kimi",
+    linux: "agentlink-agent-kimi.service",
+    win:   "Agentlink\\Agent-kimi",
+  },
+  codebuddy: {
+    mac:   "com.agentlink.agent.codebuddy",
+    linux: "agentlink-agent-codebuddy.service",
+    win:   "Agentlink\\Agent-codebuddy",
+  },
   openclaw: {
     mac:   "com.agentlink.bridge",
     linux: "agentlink-bridge.service",
@@ -54,6 +103,18 @@ const ALL_RELOAD_TARGETS = {
   },
 };
 
+function reloadTarget(runtime) {
+  const target = ALL_RELOAD_TARGETS[runtime];
+  if (!target) return null;
+  const scope = serviceScopeSuffix();
+  if (!scope) return target;
+  return {
+    mac: `${target.mac}${scope}`,
+    linux: target.linux.replace(/\.service$/, `${scope}.service`),
+    win: `${target.win}${scope}`,
+  };
+}
+
 function ensureRuntime(runtime) {
   if (!SERVICE_RUNTIMES.has(runtime)) {
     throw new Error(`service runtime must be one of: ${[...SERVICE_RUNTIMES].join(", ")}`);
@@ -95,7 +156,7 @@ function agentBinPath() {
 }
 
 // ===== macOS launchd =====
-function macLabel(runtime) { return `com.agentlink.agent.${runtime}`; }
+function macLabel(runtime) { return `com.agentlink.agent.${runtime}${serviceScopeSuffix()}`; }
 function macPlistPath(runtime) {
   return path.join(os.homedir(), "Library", "LaunchAgents", `${macLabel(runtime)}.plist`);
 }
@@ -114,7 +175,7 @@ function macUid() {
  * "进程未运行起来"，反复 pair / 残留旧 plist 更易触发。
  *
  * 健壮序列（与 bin/agentlink 的 installBridgeServiceMac 对齐）：
- *   bootout    —— 现代 unload，先拆掉任何同 label 的旧实例（幂等，未加载也无妨）
+ *   bootout    —— 先按 service target 拆掉任何同 label 的旧实例（幂等，未加载也无妨）
  *   bootstrap  —— 把 job 加载进 GUI domain
  *   enable     —— 清掉上一次 unload -w / disable 留下的 stale "disabled" override
  *   kickstart -k —— 强制真正运行（已在跑则重启），不再靠 RunAtLoad 的运气
@@ -125,6 +186,9 @@ export function buildMacInstallSteps({ uid, label, plistPath }) {
   const domain = `gui/${uid}`;
   const service = `gui/${uid}/${label}`;
   return [
+    // 不能只按 plistPath bootout：同 label 的旧 job 可能来自已删掉的临时 HOME。
+    { cmd: "launchctl", args: ["bootout", service] },
+    // 兼容历史按 plist 加载的实例；上一步未命中时仍尽力清理。
     { cmd: "launchctl", args: ["bootout", domain, plistPath] },
     { cmd: "launchctl", args: ["bootstrap", domain, plistPath] },
     { cmd: "launchctl", args: ["enable", service] },
@@ -132,12 +196,51 @@ export function buildMacInstallSteps({ uid, label, plistPath }) {
   ];
 }
 
+/**
+ * 执行并验证 macOS 安装步骤。注入 spawn 使测试不必触碰真实 gui/<uid> launchd 域。
+ */
+export function runMacInstallSteps({ steps, plistPath, service, spawn = spawnSync, log }) {
+  let bootstrapOk = false;
+  let kickstart = null;
+  for (const step of steps) {
+    const verb = step.args[0];
+    const result = spawn(step.cmd, step.args, { encoding: "utf8" });
+    // bootout 对未加载的 job 必然失败，安装仍应是幂等的。
+    if (verb === "bootout") continue;
+    if (verb === "bootstrap") {
+      bootstrapOk = result.status === 0;
+      continue;
+    }
+    if (verb === "enable") continue;
+    if (verb === "kickstart") kickstart = result;
+  }
+
+  if (!kickstart || kickstart.status !== 0) {
+    log?.warn("service.install", "modern launchctl sequence failed, falling back to load -w", {
+      bootstrap_ok: bootstrapOk,
+    });
+    const fallback = spawn("launchctl", ["load", "-w", plistPath], { encoding: "utf8" });
+    if (fallback.status !== 0) {
+      throw new Error("launchctl bootstrap/kickstart failed");
+    }
+  }
+
+  const printed = spawn("launchctl", ["print", service], { encoding: "utf8" });
+  if (printed.status !== 0) {
+    throw new Error(`launchctl install verification failed for ${service}`);
+  }
+  const loadedPath = parseLaunchctlPrint(printed.stdout).path;
+  if (loadedPath !== plistPath) {
+    throw new Error(`launchctl loaded unexpected plist for ${service}`);
+  }
+}
+
 /**
  * 解析 `launchctl print gui/<uid>/<label>` 的关键字段。纯函数，便于单测。
  * 只有 print 能暴露 `runs`，识破 pid 文件看不出的 "loaded but runs=0" 陷阱。
  */
 export function parseLaunchctlPrint(out) {
-  const h = { state: null, pid: null, runs: null, lastExitCode: null };
+  const h = { state: null, pid: null, runs: null, lastExitCode: null, path: null };
   for (const line of String(out || "").split(/\r?\n/)) {
     const t = line.trim();
     let m;
@@ -145,6 +248,7 @@ export function parseLaunchctlPrint(out) {
     else if ((m = t.match(/^pid\s*=\s*(\d+)$/))) h.pid = Number(m[1]);
     else if ((m = t.match(/^runs\s*=\s*(\d+)$/))) h.runs = Number(m[1]);
     else if ((m = t.match(/^last exit code\s*=\s*(\d+)$/))) h.lastExitCode = Number(m[1]);
+    else if ((m = t.match(/^path\s*=\s*(.+)$/))) h.path = m[1].trim();
   }
   h.running = (h.state || "").toLowerCase() === "running" || (h.pid != null && h.pid > 0);
   return h;
@@ -156,13 +260,13 @@ async function macInstall(runtime, log) {
   const state = ensureStateOrFail(runtime);
   const label = macLabel(runtime);
   const plistPath = macPlistPath(runtime);
-  const logDir = path.join(os.homedir(), ".agentlink", "logs");
+  const logDir = path.join(resolveAgentlinkHome(), "logs");
   fs.mkdirSync(logDir, { recursive: true });
 
-  // align-runtime-default-workspace: 仅 claude/codex 注入 WorkingDirectory
+  // 所有 bridge runtime 都使用自己的默认工作区，避免服务从不确定目录启动。
   // install 前确保目录存在（否则 launchd 因 WorkingDirectory 不存在拒绝启动）
   let workingDirectory = null;
-  if (runtime === "claude" || runtime === "codex") {
+  if (SERVICE_RUNTIMES.has(runtime)) {
     workingDirectory = await ensureDefaultWorkspace(runtime);
   }
   const stdoutLog = path.join(logDir, `service-${runtime}.out.log`);
@@ -203,6 +307,7 @@ async function macInstall(runtime, log) {
   <key>EnvironmentVariables</key>
   <dict>
     <key>AGENTLINK_RELAY_URL</key><string>${escapeXml(state.relay_url)}</string>
+    <key>AGENTLINK_HOME</key><string>${escapeXml(resolveAgentlinkHome())}</string>
     <key>AGENTLINK_AGENT_LOG_LEVEL</key><string>info</string>
     <key>PATH</key><string>${escapeXml(mergedPath)}</string>
     <key>HOME</key><string>${escapeXml(os.homedir())}</string>
@@ -220,35 +325,7 @@ async function macInstall(runtime, log) {
   // 现代序列 bootout→bootstrap→enable→kickstart（见 buildMacInstallSteps 注释）。
   const uid = macUid();
   const steps = buildMacInstallSteps({ uid, label, plistPath });
-  let bootstrapOk = false;
-  let kickstart = null;
-  for (const step of steps) {
-    const verb = step.args[0];
-    const r = spawnSync(step.cmd, step.args, { encoding: "utf8" });
-    // bootout 对未加载的 job 必然失败——幂等忽略。
-    if (verb === "bootout") continue;
-    if (verb === "bootstrap") {
-      bootstrapOk = r.status === 0;
-      // bootstrap 失败常见于 job 已加载（EALREADY/5）；enable+kickstart 仍可救回，
-      // 故不在此抛错，留到最后看 kickstart 结果。
-      continue;
-    }
-    if (verb === "enable") continue; // 清 disabled override，失败无妨
-    if (verb === "kickstart") kickstart = r;
-  }
-
-  if (!kickstart || kickstart.status !== 0) {
-    // 现代序列没能拉起——回退 legacy load -w 兜底（与 bin/agentlink 一致）。
-    log?.warn("service.install", "modern launchctl sequence failed, falling back to load -w", {
-      bootstrap_ok: bootstrapOk,
-      kickstart_err: (kickstart?.stderr || kickstart?.stdout || "").trim(),
-    });
-    const fallback = spawnSync("launchctl", ["load", "-w", plistPath], { encoding: "utf8" });
-    if (fallback.status !== 0) {
-      const msg = (kickstart?.stderr || kickstart?.stdout || fallback.stderr || fallback.stdout || "").trim();
-      throw new Error(`launchctl bootstrap/kickstart failed: ${msg || "unknown"}`);
-    }
-  }
+  runMacInstallSteps({ steps, plistPath, service: `gui/${uid}/${label}`, log });
   return { backend: "launchd", path: plistPath, label, logs: { out: stdoutLog, err: stderrLog } };
 }
 
@@ -285,7 +362,7 @@ function macStatus(runtime) {
 }
 
 // ===== Linux systemd (user) =====
-function sdUnitName(runtime) { return `agentlink-agent-${runtime}.service`; }
+function sdUnitName(runtime) { return `agentlink-agent-${runtime}${serviceScopeSuffix()}.service`; }
 function sdUnitPath(runtime) {
   return path.join(os.homedir(), ".config", "systemd", "user", sdUnitName(runtime));
 }
@@ -305,13 +382,13 @@ async function sdInstall(runtime, log) {
   const node = process.execPath;
   const state = ensureStateOrFail(runtime);
   const unitPath = sdUnitPath(runtime);
-  const logDir = path.join(os.homedir(), ".agentlink", "logs");
+  const logDir = path.join(resolveAgentlinkHome(), "logs");
   fs.mkdirSync(logDir, { recursive: true });
 
   // align-runtime-default-workspace: 仅 claude/codex 注入 WorkingDirectory
   // install 前确保目录存在（否则 systemd 因 WorkingDirectory 不存在拒绝启动）
   let workingDirectoryLine = "";
-  if (runtime === "claude" || runtime === "codex") {
+  if (SERVICE_RUNTIMES.has(runtime)) {
     const wsPath = await ensureDefaultWorkspace(runtime);
     workingDirectoryLine = `WorkingDirectory=${wsPath}`;
   }
@@ -327,6 +404,7 @@ After=network-online.target
 [Service]
 Type=simple
 Environment=AGENTLINK_RELAY_URL=${state.relay_url}
+Environment=AGENTLINK_HOME=${resolveAgentlinkHome()}
 Environment=AGENTLINK_AGENT_LOG_LEVEL=info
 Environment=PATH=${pathEnv}
 Environment=HOME=${os.homedir()}${workingDirectoryLine ? `\n${workingDirectoryLine}` : ""}
@@ -463,7 +541,7 @@ export function serviceReloadAll() {
 
 // macOS reload
 function macReload(runtime) {
-  const label = ALL_RELOAD_TARGETS[runtime].mac;
+  const label = reloadTarget(runtime).mac;
   const uid = typeof process.getuid === "function" ? process.getuid() : 0;
   const ref = `gui/${uid}/${label}`;
   const present = spawnSync("launchctl", ["print", ref], { encoding: "utf8" });
@@ -480,7 +558,7 @@ function macReload(runtime) {
 
 // Linux systemd user reload
 function sdReload(runtime) {
-  const unit = ALL_RELOAD_TARGETS[runtime].linux;
+  const unit = reloadTarget(runtime).linux;
   // list-unit-files 可同时检测 masked/enabled/disabled；exit 0 表示 unit 存在。
   // 另一种探测：`systemctl --user cat <unit>` —— 不存在会返回非 0。
   const probe = spawnSync("systemctl", ["--user", "cat", unit], { encoding: "utf8" });
@@ -497,7 +575,7 @@ function sdReload(runtime) {
 
 // Windows schtasks reload
 function winReload(runtime) {
-  const task = ALL_RELOAD_TARGETS[runtime].win;
+  const task = reloadTarget(runtime).win;
   const probe = spawnSync("schtasks", ["/Query", "/TN", task, "/FO", "LIST"], { encoding: "utf8" });
   if (probe.status !== 0) {
     return { status: "not-installed", backend: "schtasks", task };