@xyagent/cli 0.0.1

package/src-ext/commands/reload.mjs

@@ -0,0 +1,78 @@
+// `agentlink reload` 子命令。
+//
+// 目的：开发者更新 agentlink-cli 源码后，长寿 agent 进程（claude / codex /
+// openclaw / hermes）不会自动重新加载模块 —— 必须重启进程。此命令封装
+// 三端（launchd / systemd-user / schtasks）的重启动作。
+//
+// 用法：
+//   agentlink reload              # 重启所有已安装的 runtime service
+//   agentlink reload -r claude    # 只重启指定 runtime
+//   agentlink reload --json       # 机器可读输出
+//
+// 未安装的 runtime service 会显示 SKIP（not-installed），不视为错误。
+
+import process from "node:process";
+import { serviceReload, serviceReloadAll } from "../service/serviceManager.mjs";
+
+/**
+ * @param {{ options: { runtime?: string, json?: boolean }, log: any }} ctx
+ */
+export async function runReloadCommand({ options, log }) {
+  const runtime = (options.runtime || "").trim().toLowerCase();
+  const json = !!options.json;
+  const rlLog = log.child({ comp: "reload" });
+
+  let results;
+  try {
+    results = runtime
+      ? { [runtime]: serviceReload(runtime) }
+      : serviceReloadAll();
+  } catch (err) {
+    const msg = err?.message || String(err);
+    rlLog.error("reload.failed", "reload command failed", { err: msg });
+    if (json) {
+      process.stdout.write(JSON.stringify({ ok: false, error: msg }) + "\n");
+    } else {
+      process.stderr.write(`reload failed: ${msg}\n`);
+    }
+    process.exit(1);
+  }
+
+  if (json) {
+    process.stdout.write(JSON.stringify({ ok: true, results }, null, 2) + "\n");
+    return;
+  }
+
+  // 人类可读输出：每行一条 runtime 的结果
+  let hasError = false;
+  const pad = (s, n) => String(s).padEnd(n);
+  for (const [rt, r] of Object.entries(results)) {
+    const statusTag = formatStatus(r);
+    const detail = formatDetail(r);
+    process.stdout.write(`${pad(rt, 9)} ${statusTag}${detail ? "  " + detail : ""}\n`);
+    if (r.status === "error") hasError = true;
+  }
+  rlLog.info("reload.done", "reload finished", { results });
+  if (hasError) process.exit(1);
+}
+
+function formatStatus(r) {
+  switch (r.status) {
+    case "restarted":      return "OK";
+    case "not-installed":  return "SKIP";
+    case "error":          return "ERR";
+    default:               return r.status || "?";
+  }
+}
+
+function formatDetail(r) {
+  if (r.status === "error") return r.error || "";
+  if (r.status === "not-installed") {
+    return `(${r.backend}: 未安装)`;
+  }
+  if (r.status === "restarted") {
+    const tgt = r.label || r.unit || r.task || "";
+    return `(${r.backend}: ${tgt})`;
+  }
+  return "";
+}

package/src-ext/commands/service.mjs

@@ -0,0 +1,64 @@
+// `agentlink-agent service <install|uninstall|status> -r <runtime>` 子命令。
+//
+// 老 agentlink 的 `agentlink service install/uninstall/status` 只对 openclaw/hermes
+// 生效。新 runtime (claude/codex) 走这里，实现对齐。
+
+import process from "node:process";
+import {
+  serviceInstall,
+  serviceUninstall,
+  serviceStatus,
+} from "../service/serviceManager.mjs";
+
+export async function runServiceCommand({ options, positional, log }) {
+  const action = (positional[0] || "").toLowerCase();
+  const runtime = options.runtime || options.r || positional[1] || "";
+  if (!runtime) {
+    process.stderr.write("service 子命令需要 -r claude|codex\n");
+    process.exit(2);
+  }
+  const svcLog = log.child({ comp: "service", rt: runtime });
+
+  try {
+    switch (action) {
+      case "install": {
+        const r = await serviceInstall(runtime, svcLog);
+        svcLog.info("service.install.done", "service installed", r);
+        process.stdout.write(`service installed (backend=${r.backend})\n`);
+        return;
+      }
+      case "uninstall":
+      case "stop": {
+        const r = serviceUninstall(runtime, svcLog);
+        svcLog.info("service.uninstall.done", "service uninstalled", r);
+        process.stdout.write(`service uninstalled (backend=${r.backend})\n`);
+        return;
+      }
+      case "status": {
+        const r = serviceStatus(runtime);
+        svcLog.info("service.status", "status checked", r);
+        process.stdout.write(`backend=${r.backend} running=${r.running}${r.pid ? ` pid=${r.pid}` : ""}\n`);
+        return;
+      }
+      case "restart": {
+        svcLog.info("service.restart", "uninstall+install cycle");
+        serviceUninstall(runtime, svcLog);
+        const r = await serviceInstall(runtime, svcLog);
+        process.stdout.write(`service restarted (backend=${r.backend})\n`);
+        return;
+      }
+      case "":
+        process.stderr.write("usage: agentlink-agent service <install|uninstall|status|restart> -r <runtime>\n");
+        process.exit(2);
+      default:
+        process.stderr.write(`unknown service action: ${action}\n`);
+        process.exit(2);
+    }
+  } catch (err) {
+    svcLog.error("service.action.failed", "service action failed", {
+      action, err: err?.message || String(err),
+    });
+    process.stderr.write(`${err?.message || err}\n`);
+    process.exit(1);
+  }
+}

package/src-ext/core/accountResolver.mjs

@@ -0,0 +1,137 @@
+// accountResolver —— 从本地凭证文件里解析出 CLI 登录账号（邮箱）。
+//
+// Codex   : ~/.codex/auth.json
+//   常见字段：tokens.id_token（JWT，payload.email）/ account.email / email
+// Claude  : ~/.claude/.credentials.json  或  ~/.config/claude/.credentials.json
+//   常见字段：claudeAiOauth.email / account.email / email
+//
+// 失败策略：任何读取/解析失败 → 返回 null，调用方不报错，快照里 account 为空。
+
+import { promises as fs } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { execFileSync } from "node:child_process";
+
+/**
+ * @param {"codex"|"claude"} runtime
+ * @returns {Promise<string|null>}
+ */
+export async function resolveCliAccount(runtime) {
+  try {
+    if (runtime === "codex") return await readCodexAccount();
+    if (runtime === "claude") return await readClaudeAccount();
+  } catch {
+    // 静默兜底 —— 账号只是展示用，缺失不阻塞。
+  }
+  return null;
+}
+
+async function readCodexAccount() {
+  const home = os.homedir();
+  // Codex 在三端都把配置放在 ~/.codex（包括 Windows 的 %USERPROFILE%\.codex）
+  const candidates = [path.join(home, ".codex", "auth.json")];
+  // Windows 额外加 %APPDATA%\codex\auth.json 兜底
+  if (process.platform === "win32" && process.env.APPDATA) {
+    candidates.push(path.join(process.env.APPDATA, "codex", "auth.json"));
+  }
+  for (const file of candidates) {
+    const obj = await readJsonSafe(file);
+    if (!obj) continue;
+    const email = pickEmail(obj) || decodeJwtEmail(obj?.tokens?.id_token) || decodeJwtEmail(obj?.id_token);
+    if (email) return email;
+  }
+  return null;
+}
+
+async function readClaudeAccount() {
+  // 三端凭证存储位置不同：
+  //   - macOS:   Keychain, item name "Claude Code-credentials"
+  //   - Linux:   ~/.claude/.credentials.json 或 ~/.config/claude/.credentials.json
+  //   - Windows: %APPDATA%\claude\.credentials.json
+  // 读出来的 JSON 里 OAuth token 是 opaque（sk-ant-oat01-...），不是 JWT，
+  // 没法反解 email。只能把 `subscriptionType`（team / pro / max / free）作为
+  // 账号标识展示。
+  let obj = null;
+
+  if (process.platform === "darwin") {
+    obj = readMacKeychainJson("Claude Code-credentials");
+  }
+  if (!obj) {
+    const home = os.homedir();
+    const candidates = [
+      path.join(home, ".claude", ".credentials.json"),
+      path.join(home, ".config", "claude", ".credentials.json"),
+    ];
+    if (process.platform === "win32" && process.env.APPDATA) {
+      candidates.push(path.join(process.env.APPDATA, "claude", ".credentials.json"));
+    }
+    for (const file of candidates) {
+      obj = await readJsonSafe(file);
+      if (obj) break;
+    }
+  }
+  if (!obj) return null;
+
+  // 优先 email（若将来 claude 真把 email 写进来），再回退到 subscriptionType
+  const email =
+    pickEmail(obj) ||
+    pickEmail(obj?.claudeAiOauth) ||
+    pickEmail(obj?.account) ||
+    decodeJwtEmail(obj?.claudeAiOauth?.accessToken) ||
+    decodeJwtEmail(obj?.accessToken);
+  if (email) return email;
+
+  const sub =
+    obj?.claudeAiOauth?.subscriptionType ||
+    obj?.subscriptionType ||
+    obj?.account?.subscription ||
+    obj?.plan;
+  if (sub && typeof sub === "string") return `Claude ${sub}`.trim();
+  return null;
+}
+
+function readMacKeychainJson(service) {
+  try {
+    const out = execFileSync("/usr/bin/security",
+      ["find-generic-password", "-s", service, "-w"],
+      { encoding: "utf8", timeout: 3000, stdio: ["ignore", "pipe", "ignore"] }
+    ).trim();
+    if (!out || !out.startsWith("{")) return null;
+    return JSON.parse(out);
+  } catch {
+    return null;
+  }
+}
+
+function pickEmail(o) {
+  if (!o || typeof o !== "object") return null;
+  const candidates = [o.email, o.user_email, o.account_email, o?.account?.email];
+  for (const v of candidates) {
+    if (typeof v === "string" && v.includes("@")) return v;
+  }
+  return null;
+}
+
+function decodeJwtEmail(token) {
+  if (typeof token !== "string" || token.split(".").length < 2) return null;
+  try {
+    const payload = token.split(".")[1];
+    const pad = payload + "=".repeat((4 - payload.length % 4) % 4);
+    const normalized = pad.replace(/-/g, "+").replace(/_/g, "/");
+    const json = Buffer.from(normalized, "base64").toString("utf8");
+    const obj = JSON.parse(json);
+    const email = pickEmail(obj) || obj?.https_email || obj?.["https://api.openai.com/profile"]?.email;
+    return typeof email === "string" && email.includes("@") ? email : null;
+  } catch {
+    return null;
+  }
+}
+
+async function readJsonSafe(file) {
+  try {
+    const buf = await fs.readFile(file, "utf8");
+    return JSON.parse(buf);
+  } catch {
+    return null;
+  }
+}

package/src-ext/core/activeRuns.mjs

@@ -0,0 +1,76 @@
+/**
+ * activeRuns.mjs — bridge 进程内「活跃 run → kill 句柄」登记表。
+ *
+ * 用途：App 停止按钮发 `sessions.abort` / `chat.abort` RPC（经 relay 长轮询
+ * 到达 bridge），runtime 的 RPC 分支据 sessionKey / runId 找到正在执行的
+ * spawn 子进程并 kill（P0：停止按钮不生效）。
+ *
+ * 一个 registry 实例由单个 runtime handler 闭包持有（bridge 进程 = 单 runtime）。
+ */
+
+/**
+ * @returns {{
+ *   register: (entry: {sessionKey?: string|null, threadId?: string|null, runId?: string|null, kill: (reason?: string) => void}) => () => void,
+ *   abort: (params?: {key?: string, runId?: string}) => {aborted: number, matched: string[]},
+ *   size: () => number,
+ * }}
+ */
+export function createActiveRunRegistry({ log } = {}) {
+  /** @type {Map<number, {sessionKey: string, threadId: string, runId: string, kill: Function}>} */
+  const runs = new Map();
+  let seq = 0;
+
+  function register({ sessionKey, threadId, runId, kill }) {
+    if (typeof kill !== "function") throw new Error("activeRuns.register: kill must be a function");
+    const id = ++seq;
+    runs.set(id, {
+      sessionKey: String(sessionKey || ""),
+      threadId: String(threadId || ""),
+      runId: String(runId || ""),
+      kill,
+    });
+    return () => runs.delete(id);
+  }
+
+  /**
+   * 杀掉匹配的活跃 run。匹配顺序：
+   *   1. runId 精确命中
+   *   2. key 命中 sessionKey 或 threadId
+   *   3. 都没命中且当前只有一个活跃 run → 杀它（key 口径不一致的兜底，
+   *      单会话场景下用户意图无歧义）
+   */
+  function abort({ key, runId } = {}) {
+    const wantRun = String(runId || "").trim();
+    const wantKey = String(key || "").trim();
+    let targets = [];
+    if (wantRun) {
+      targets = [...runs.entries()].filter(([, r]) => r.runId === wantRun);
+    }
+    if (targets.length === 0 && wantKey) {
+      targets = [...runs.entries()].filter(
+        ([, r]) => r.sessionKey === wantKey || r.threadId === wantKey,
+      );
+    }
+    if (targets.length === 0 && runs.size === 1) {
+      targets = [...runs.entries()];
+      log?.info?.("activeRuns.abort.fallback",
+        "abort key matched nothing, killing the single active run",
+        { key: wantKey, runId: wantRun });
+    }
+    const matched = [];
+    for (const [id, r] of targets) {
+      runs.delete(id);
+      matched.push(r.runId || r.threadId || String(id));
+      try {
+        r.kill("remote-abort");
+      } catch (err) {
+        log?.warn?.("activeRuns.abort.kill_failed", "kill threw", {
+          runId: r.runId, err: err?.message || String(err),
+        });
+      }
+    }
+    return { aborted: matched.length, matched };
+  }
+
+  return { register, abort, size: () => runs.size };
+}

package/src-ext/core/agentlinkToolsBootstrap.mjs

@@ -0,0 +1,75 @@
+// agentlinkToolsBootstrap.mjs — 给 4 个 runtime 用的一站式启动 helper。
+//
+// 每个 runtime 的 index.mjs 在 createRelayWorker 之后调一次:
+//   const tools = await bootstrapAgentlinkTools({
+//     runtime, gwId, relayUrl, bridgeToken, worker, log, version,
+//     getLastRequestId: () => lastRequestId,
+//   });
+// 之后:
+//   - agentlinkToolsServer 已起,discovery 文件已写
+//   - agentlink_change_title / notify_user / attach_file 工具对 MCP 客户端可见
+//   - 进程退出时(SIGINT/SIGTERM)自动清 discovery 文件 + 关 server
+//
+// 给同一 bridge 内多次调用是安全的(底层 lifecycle 模块的 cleanupInstalled
+// flag 保证 handler 只装一次);但实际只会有一个 runtime 入口。
+
+import { createAgentlinkToolsRegistry } from "./agentlinkToolsRegistry.mjs";
+import { startToolsServerAndPublishDiscovery } from "./toolsServerLifecycle.mjs";
+import { createPathAttachScanner } from "./bridgeAttachAutoScanner.mjs";
+
+/**
+ * @param {object} opts
+ * @param {string} opts.runtime           "claude"|"codex"|"hermes"|"openclaw"|"picoclaw"
+ * @param {string} opts.gwId              gateway id (= clientUserID 跨 pair_session 反查的键)
+ * @param {string} opts.relayUrl          relay base URL
+ * @param {string} opts.bridgeToken       gateway/client token, used by attach 工具调 relay sign/commit
+ * @param {object} opts.worker            createRelayWorker 返回的实例
+ * @param {object} opts.log
+ * @param {string} [opts.version]         npm_cli 包版本(写入 discovery 文件)
+ * @param {() => string|null} opts.getLastRequestId 闭包:返回当前 in-flight requestId,
+ *                                                  无 in-flight 时返回 null(publishEvent 走 no-op)
+ * @returns {Promise<{ registry, port, baseUrl, authToken, discoveryPath, stop }>}
+ */
+export async function bootstrapAgentlinkTools(opts) {
+  const { runtime, gwId, relayUrl, bridgeToken, worker, log, version, getLastRequestId } = opts;
+  if (!runtime) throw new Error("bootstrapAgentlinkTools: runtime required");
+  if (!gwId) throw new Error("bootstrapAgentlinkTools: gwId required");
+  if (!relayUrl) throw new Error("bootstrapAgentlinkTools: relayUrl required");
+  if (!bridgeToken) throw new Error("bootstrapAgentlinkTools: bridgeToken required");
+  if (!worker) throw new Error("bootstrapAgentlinkTools: worker required");
+  if (typeof getLastRequestId !== "function") {
+    throw new Error("bootstrapAgentlinkTools: getLastRequestId function required");
+  }
+  if (!log) throw new Error("bootstrapAgentlinkTools: log required");
+
+  // publishEvent 闭包:每次工具触发时读「当前」lastRequestId,在 in-flight 期间
+  // 投递到 worker.publishEvent;无 in-flight 时 silently 不发(避免投递到无 owner
+  // 的 requestId)。
+  const publishEvent = async (event) => {
+    const rid = getLastRequestId();
+    if (!rid) return false;
+    return worker.publishEvent(rid, event);
+  };
+
+  const registry = createAgentlinkToolsRegistry({
+    publishEvent,
+    runtime,
+    log,
+    relayConfig: { baseUrl: relayUrl, gatewayId: gwId, token: bridgeToken },
+  });
+
+  const lifecycle = await startToolsServerAndPublishDiscovery({
+    registry, log, version,
+  });
+
+  // 自动路径扫描器：runtime 在 assistant text delta 上调 scanner.createTurnAccumulator()
+  // → append(delta) → flush()。所有 attach 都走 registry.dispatch("agentlink_attach_file"),
+  // 复用 denylist / sha256 dedup / COS PUT / audit / publishEvent 全套流水。
+  const scanner = createPathAttachScanner({ registry, log });
+
+  log.info("agentlink_tools.bootstrap.ready", "tools server up + discovery published", {
+    runtime, gwId, port: lifecycle.port, discoveryPath: lifecycle.discoveryPath,
+  });
+
+  return { registry, scanner, ...lifecycle };
+}