alink-cli 0.6.0 → 0.6.2

package/README.md

@@ -12,12 +12,20 @@ One command on your work machine links it to AgentLink so you can drive your loc
 npx alink-cli --token al1.xxxxxxxx
 ```
 
-首次成功连上后，凭证会存到 `~/.agentlink/credential`（权限 `0600`）。之后在同一台机器上**直接裸跑**即可，命令行 token 只需出现这一次：
+首次成功连上后，凭证会存到 `~/.agentlink/credential`（权限 `0600`）。之后在同一台机器上**直接裸跑**即可，命令行 token 只需出现这一次；裸跑会默认转入后台，日志在 `~/.agentlink/daemon.log`：
 
 ```bash
 npx alink-cli
 ```
 
+需要手动改凭证时：
+
+```bash
+npx alink-cli credential set al1.xxxxxxxx
+npx alink-cli credential show
+npx alink-cli credential clear
+```
+
 ## 参数 Options
 
 | 参数 | 说明 | 默认值 |
@@ -26,6 +34,9 @@ npx alink-cli
 | `--hub <wss://…>` | 要连接的 hub 地址。 | `wss://link.harmopath.com`（官方 hub） |
 | `--dir <path>` | 工作目录根，可重复给多次；运行时可用其下任意子目录，网页里以目录树浏览。 | 当前目录 `process.cwd()` |
 | `--tunnel` | 不连任何 hub：本地起一个 hub + 免费 Cloudflare 隧道，打印公网链接（需 `cloudflared`）。与 `--hub` 互斥。 | — |
+| `credential [status|path|show|set|clear]` | 查看路径、明文显示、手动覆盖或删除本机保存的凭证。 | `~/.agentlink/credential` |
+| `qr` | 在终端打印本机凭证二维码，同时输出整串凭证供手动粘贴。 | 读取已保存凭证 |
+| `status` / `logs -f` / `stop` / `restart` | 查看、跟随日志、停止或重启后台 daemon。 | — |
 | `--help`, `-h` | 显示用法。 | — |
 
 ## 自建 hub Self-hosting

package/bin/agentlink.js

@@ -22,7 +22,7 @@ import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 
-const OFFICIAL_HUB = "wss://link.harmopath.com";
+const OFFICIAL_HUB = process.env.AGENTLINK_DEFAULT_HUB || "wss://link.harmopath.com";
 
 // 凭证文件与 daemon 的状态目录同根（默认 ~/.agentlink，可用 AGENTLINK_STATE_DIR
 // 覆盖，测试用），文件名固定为 credential。
@@ -68,6 +68,51 @@ function persistCredential(token) {
   chmodSync(CREDENTIAL_FILE, 0o600);
 }
 
+if (rawArgs[0] === "credential" || rawArgs[0] === "cred") {
+  ctlCredential(rawArgs.slice(1));
+  process.exit(0);
+}
+
+function ctlCredential(args) {
+  const cmd = args[0] || "status";
+  if (cmd === "path") {
+    console.log(CREDENTIAL_FILE);
+    return;
+  }
+  if (cmd === "status") {
+    console.log(`[agentlink] 凭证文件: ${CREDENTIAL_FILE}`);
+    console.log(readCredentialFile() ? "[agentlink] 已保存凭证。用 credential show 查看，credential set 修改。" : "[agentlink] 未保存凭证。用 credential set <凭证> 写入。");
+    return;
+  }
+  if (cmd === "show") {
+    const token = readCredentialFile();
+    if (!token) {
+      console.error("[agentlink] 还没有保存凭证。");
+      process.exit(1);
+    }
+    console.log(token);
+    return;
+  }
+  if (cmd === "set") {
+    const raw = args[1] === "-" ? readFileSync(0, "utf-8") : args[1];
+    const token = raw?.trim();
+    if (!token || /\s/.test(token)) {
+      console.error("[agentlink] 用法: alink-cli credential set <al1.…>  或  alink-cli credential set - < token.txt");
+      process.exit(1);
+    }
+    persistCredential(token);
+    console.log(`[agentlink] 凭证已保存到 ${CREDENTIAL_FILE}（0600）。`);
+    return;
+  }
+  if (cmd === "clear") {
+    rmSync(CREDENTIAL_FILE, { force: true });
+    console.log(`[agentlink] 已删除 ${CREDENTIAL_FILE}。`);
+    return;
+  }
+  console.error("[agentlink] 用法: alink-cli credential [status|path|show|set|clear]");
+  process.exit(1);
+}
+
 // `qr` 子命令：在终端打印本机凭证的二维码（含 E2EE 密钥段）+ 指纹——给新手机
 // 的「录入密钥」扫。凭证从 --token / AGENTLINK_TOKEN / 落盘文件取，不联网。
 if (rawArgs[0] === "qr") {
@@ -87,6 +132,9 @@ if (rawArgs[0] === "qr") {
   const fp = createHash("sha256").update(Buffer.from(enckey, "base64url")).digest("hex").slice(0, 8);
   console.log("用手机 AgentLink 的「录入密钥」扫下面的二维码：\n");
   renderQr(token);
+  console.log("\n凭证信息（无法扫码时可手动粘贴）：\n");
+  console.log(token);
+  console.log("");
   console.log(`密钥指纹 ${fp} —— 与手机上显示的一致即可放心保存。`);
   process.exit(0);
 }
@@ -95,7 +143,8 @@ if (rawArgs[0] === "qr") {
 // 后台管理子命令：start / stop / status / logs / restart。
 // `start` 把 daemon 挂到后台（detached，日志写 ~/.agentlink/daemon.log，进程
 // 元数据写 daemon.json），其余子命令围着这两个文件 + daemon 自己维护的
-// status.json 转。裸跑仍是前台——首次扫码配对必须能看见终端里的二维码。
+// status.json 转。首次无凭证裸跑仍是前台——扫码配对必须能看见终端里的二维码；
+// 已有凭证的裸跑默认转后台。
 
 const DAEMON_JSON = join(STATE_DIR, "daemon.json");
 const DAEMON_LOG = join(STATE_DIR, "daemon.log");
@@ -145,7 +194,7 @@ function sleep(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
 
-async function ctlStart(args) {
+async function ctlStart(args, { alreadyOk = false } = {}) {
   if (hasFlag("tunnel", args)) {
     console.error("[agentlink] --tunnel 模式带着 cloudflared 子进程，请前台运行（不支持 start）。");
     process.exit(1);
@@ -156,7 +205,13 @@ async function ctlStart(args) {
   }
   const already = runningDaemon();
   if (already) {
-    console.error(`[agentlink] 已在后台运行 (pid ${already.pid})。要重启用 alink-cli restart。`);
+    const msg = `[agentlink] 已在后台运行 (pid ${already.pid})。要重启用 alink-cli restart。`;
+    if (alreadyOk) {
+      console.log(msg);
+      console.log(`[agentlink] 日志: ${DAEMON_LOG}`);
+      return;
+    }
+    console.error(msg);
     process.exit(1);
   }
   // 凭证前置检查：后台进程没法扫码配对（二维码只会写进日志文件），所以
@@ -175,7 +230,7 @@ async function ctlStart(args) {
   const child = spawn(process.execPath, [fileURLToPath(import.meta.url), ...args], {
     detached: true,
     stdio: ["ignore", logFd, logFd],
-    env: process.env,
+    env: { ...process.env, AGENTLINK_FOREGROUND: "1" },
   });
   child.unref();
   writeFileSync(DAEMON_JSON, JSON.stringify({ pid: child.pid, args, startedAt: Date.now() }));
@@ -308,6 +363,11 @@ async function ctlRestart(args) {
   await ctlStart(startArgs);
 }
 
+if (rawArgs.length === 0 && !process.env.AGENTLINK_FOREGROUND && (process.env.AGENTLINK_TOKEN || readCredentialFile())) {
+  await ctlStart([], { alreadyOk: true });
+  process.exit(0);
+}
+
 // `local` 子命令 = 同机驾驶舱：本地起 single 模式 hub + daemon，自动开浏览器，
 // 不遥控。归一成 daemon 认的 --local flag（daemon 参数不收 positional）。既接受
 // `npx alink-cli local`，也接受 `npx alink-cli --local`。
@@ -390,13 +450,14 @@ function printHelp() {
       `用法: npx ${self} [--hub <wss://…>] [--dir <目录>]…`,
       `      npx ${self} local [--dir …]    # 同机驾驶舱：本地起 hub 并自动开浏览器，不遥控`,
       `      npx ${self} qr                 # 终端打印本机凭证二维码（给新手机录密钥）`,
+      `      npx ${self} credential set <凭证> # 手动写入 / 修改本机保存的凭证`,
       `      npx ${self} start [--dir …]    # 后台运行（先前台配对过一次）`,
       `      npx ${self} status|logs [-f]|stop|restart`,
       ``,
       `把当前这台工作机接入 AgentLink，随时随地遥控本机的编码 agent。`,
       `首次裸跑会进入扫码配对：加密密钥在这台电脑上生成，终端打出二维码，`,
       `用手机 AgentLink 的「添加机器」扫一下即绑定——密钥只走二维码，不经过服务器。`,
-      `绑定后可用 start 挂到后台（日志 ~/.agentlink/daemon.log），status 看连接`,
+      `绑定后裸跑会默认挂到后台（日志 ~/.agentlink/daemon.log），status 看连接`,
       `状态，logs -f 跟日志，stop/restart 停止或重启。`,
       ``,
       `参数:`,
@@ -404,6 +465,8 @@ function printHelp() {
       `  --token <token>  直接给机器凭证（al1.… 整串，如从别处迁移）。首次成功连上后`,
       `                   存到 ~/.agentlink/credential（0600），之后裸跑自动复用。`,
       `                   也可用环境变量 AGENTLINK_TOKEN 提供（--token 优先）。`,
+      `  credential       管理本机保存的凭证：status/path/show/set/clear。show 会明文打印`,
+      `                   凭证；set 直接覆盖 ~/.agentlink/credential。`,
       `  --hub <url>      hub 地址，缺省官方 hub ${OFFICIAL_HUB}。`,
       `  --dir <path>     工作目录根，可重复；缺省当前目录。运行时可用其下任意子目录。`,
       `  --tunnel         不连任何 hub：本地起 hub + 免费 Cloudflare 隧道并打印公网链接`,

package/dist/daemon.js

@@ -4899,6 +4899,7 @@ var claude = {
   // configured with (settings.json / ~/.claude.json), merged ahead of these.
   models: ["opus", "sonnet", "haiku"],
   probeModels: async () => probeClaudeModels(),
+  command: "claude",
   acp: { bin: "claude-code-acp", args: [] }
 };
 
@@ -4928,6 +4929,7 @@ var codex = {
   // (incl. custom/proxy models), merged ahead of these aliases.
   models: ["gpt-5-codex", "gpt-5", "o3"],
   probeModels: async () => probeCodexModels(),
+  command: "codex",
   acp: { bin: "codex-acp", args: [] }
 };
 
@@ -4962,7 +4964,8 @@ var REGISTRY = [claude, codex, gemini, qwen, kimi];
 function detectAgents() {
   return REGISTRY.flatMap((def) => {
     const bin = resolveBin(def.acp.bin);
-    return bin ? [{ ...def, bin }] : [];
+    const command = def.command ? resolveBin(def.command) : bin;
+    return bin && command ? [{ ...def, bin }] : [];
   });
 }
 function getAgent(id) {
@@ -23197,7 +23200,12 @@ function toolContentText(content) {
   }
   return parts.filter(Boolean).join("\n");
 }
-function routeUpdate(update, onEvent) {
+function cleanTitle(v) {
+  if (typeof v !== "string") return void 0;
+  const title = v.split("\n").find((line) => line.trim())?.trim();
+  return title ? title.slice(0, 200) : void 0;
+}
+function routeUpdate(update, onEvent, onTitle) {
   switch (update.sessionUpdate) {
     case "agent_message_chunk": {
       const t = textOf(update.content);
@@ -23222,6 +23230,11 @@ function routeUpdate(update, onEvent) {
       }
       return;
     }
+    case "session_info_update": {
+      const title = cleanTitle(update.title);
+      if (title) onTitle?.(title);
+      return;
+    }
     default:
       return;
   }
@@ -23254,7 +23267,7 @@ async function runAcp(o) {
     Readable.toWeb(child.stdout)
   );
   const app = client({ name: "agentlink" }).onNotification("session/update", async (ctx) => {
-    routeUpdate(ctx.params.update, o.onEvent);
+    routeUpdate(ctx.params.update, o.onEvent, o.onTitle);
   }).onRequest("session/request_permission", async (ctx) => handlePermission(ctx.params, o.requestPermission));
   const killChild = () => {
     try {
@@ -23479,76 +23492,9 @@ var RUNS_DIR = join4(STATE_DIR, "runs");
 var CONVS_FILE = join4(STATE_DIR, "conversations.json");
 var ENCKEYS_FILE = join4(STATE_DIR, "enckeys.json");
 var MAX_RUN_BYTES = 512 * 1024;
-var MAX_RUNS_PER_CONVERSATION = 100;
-function isValidConversationId(id) {
-  return typeof id === "string" && /^[A-Za-z0-9_-]{1,64}$/.test(id);
-}
 function ensureDirs() {
   mkdirSync(RUNS_DIR, { recursive: true });
 }
-function loadConversations() {
-  try {
-    const parsed = JSON.parse(readFileSync3(CONVS_FILE, "utf-8"));
-    return Array.isArray(parsed) ? parsed.filter((c) => isValidConversationId(c?.id)) : [];
-  } catch {
-    return [];
-  }
-}
-function saveConversations(convs) {
-  ensureDirs();
-  const tmp = CONVS_FILE + ".tmp";
-  writeFileSync(tmp, JSON.stringify(convs, null, 1));
-  renameSync(tmp, CONVS_FILE);
-}
-function listConversations() {
-  return loadConversations().sort((a, b) => b.lastActiveAt - a.lastActiveAt);
-}
-function putConversation(patch) {
-  if (!isValidConversationId(patch?.id)) return { error: "conversation.id is missing or malformed" };
-  const strOrUndef = (v) => typeof v === "string" ? v : void 0;
-  const numOrUndef = (v) => typeof v === "number" && Number.isFinite(v) ? v : void 0;
-  const convs = loadConversations();
-  const existing = convs.find((c) => c.id === patch.id);
-  const merged = {
-    id: patch.id,
-    agent: strOrUndef(patch.agent) ?? existing?.agent ?? "",
-    dir: strOrUndef(patch.dir) ?? existing?.dir ?? "",
-    title: strOrUndef(patch.title) ?? existing?.title ?? "",
-    createdAt: numOrUndef(patch.createdAt) ?? existing?.createdAt ?? 0,
-    lastActiveAt: numOrUndef(patch.lastActiveAt) ?? existing?.lastActiveAt ?? 0
-  };
-  const model = patch.model === "" ? void 0 : strOrUndef(patch.model) ?? existing?.model;
-  if (model !== void 0) merged.model = model;
-  const sessionId = patch.sessionId === "" ? void 0 : strOrUndef(patch.sessionId) ?? existing?.sessionId;
-  if (sessionId !== void 0) merged.sessionId = sessionId;
-  const archived = typeof patch.archived === "boolean" ? patch.archived : existing?.archived;
-  if (archived === true) merged.archived = true;
-  const takeover = typeof patch.takeover === "boolean" ? patch.takeover : existing?.takeover;
-  if (takeover === true) merged.takeover = true;
-  if (!merged.agent || !merged.dir || !merged.title || !merged.createdAt || !merged.lastActiveAt) {
-    return { error: "creating a conversation requires agent, dir, title, createdAt and lastActiveAt" };
-  }
-  const next = existing ? convs.map((c) => c.id === merged.id ? merged : c) : [...convs, merged];
-  saveConversations(next);
-  return { conversation: merged };
-}
-function deleteConversation(id) {
-  if (!isValidConversationId(id)) return;
-  saveConversations(loadConversations().filter((c) => c.id !== id));
-  rmSync(join4(RUNS_DIR, id), { recursive: true, force: true });
-}
-function clearConversations() {
-  rmSync(CONVS_FILE, { force: true });
-  rmSync(RUNS_DIR, { recursive: true, force: true });
-}
-function touchConversation(id, patch) {
-  const convs = loadConversations();
-  const conv = convs.find((c) => c.id === id);
-  if (!conv) return;
-  if (patch.lastActiveAt) conv.lastActiveAt = patch.lastActiveAt;
-  if (patch.sessionId) conv.sessionId = patch.sessionId;
-  saveConversations(convs);
-}
 function saveEnckey(machineId, enckey) {
   try {
     ensureDirs();
@@ -23568,112 +23514,18 @@ function saveEnckey(machineId, enckey) {
     return false;
   }
 }
-var openRuns = /* @__PURE__ */ new Set();
-function recordRun(conversationId, meta3) {
-  if (!isValidConversationId(conversationId)) return null;
-  const dir = join4(RUNS_DIR, conversationId);
-  const startedAt = Date.now();
-  const file2 = join4(dir, `${startedAt}-${meta3.runId}.jsonl`);
-  try {
-    mkdirSync(dir, { recursive: true });
-    const files = readdirSync2(dir).filter((f) => f.endsWith(".jsonl")).sort();
-    for (const old of files.slice(0, Math.max(0, files.length - (MAX_RUNS_PER_CONVERSATION - 1)))) {
-      rmSync(join4(dir, old), { force: true });
-    }
-    appendFileSync(file2, JSON.stringify({ kind: "meta", startedAt, ...meta3 }) + "\n");
-  } catch {
-    return null;
-  }
-  openRuns.add(meta3.runId);
-  touchConversation(conversationId, { lastActiveAt: startedAt });
-  let bytes = 0;
-  let truncated = false;
-  const append = (line) => {
-    try {
-      appendFileSync(file2, JSON.stringify(line) + "\n");
-    } catch {
-    }
-  };
-  return {
-    event(e, stored) {
-      if (e.type === "session") touchConversation(conversationId, { sessionId: e.id });
-      if (truncated) return;
-      const line = JSON.stringify({ kind: "event", event: stored ?? e }) + "\n";
-      bytes += line.length;
-      if (bytes > MAX_RUN_BYTES) {
-        truncated = true;
-        append({ kind: "truncated" });
-        return;
-      }
-      try {
-        appendFileSync(file2, line);
-      } catch {
-      }
-    },
-    done(code, error51) {
-      openRuns.delete(meta3.runId);
-      append({ kind: "done", code, ...error51 !== void 0 ? { error: error51 } : {} });
-      touchConversation(conversationId, { lastActiveAt: Date.now() });
-    }
-  };
-}
-function history(conversationId) {
-  if (!isValidConversationId(conversationId)) return [];
-  const dir = join4(RUNS_DIR, conversationId);
-  if (!existsSync2(dir)) return [];
-  const runs = [];
-  for (const name of readdirSync2(dir).filter((f) => f.endsWith(".jsonl")).sort()) {
-    let run = null;
-    let text;
-    try {
-      text = readFileSync3(join4(dir, name), "utf-8");
-    } catch {
-      continue;
-    }
-    for (const raw of text.split("\n")) {
-      if (!raw.trim()) continue;
-      let line;
-      try {
-        line = JSON.parse(raw);
-      } catch {
-        continue;
-      }
-      if (line.kind === "meta") {
-        run = {
-          runId: line.runId,
-          agent: line.agent,
-          prompt: line.prompt,
-          ...line.cwd !== void 0 ? { cwd: line.cwd } : {},
-          ...line.model !== void 0 ? { model: line.model } : {},
-          startedAt: line.startedAt,
-          status: "disconnected",
-          // upgraded below by done / openRuns
-          truncated: false,
-          events: []
-        };
-      } else if (run && line.kind === "event") {
-        if ("type" in line.event && line.event.type === "session") run.sessionId = line.event.id;
-        run.events.push(line.event);
-      } else if (run && line.kind === "truncated") {
-        run.truncated = true;
-      } else if (run && line.kind === "done") {
-        run.status = "done";
-        run.code = line.code;
-        if (line.error !== void 0) run.error = line.error;
-      }
-    }
-    if (!run) continue;
-    if (run.status !== "done" && openRuns.has(run.runId)) run.status = "running";
-    if (run.status === "disconnected") run.error = "daemon disconnected";
-    runs.push(run);
-  }
-  return runs;
-}
 
 // src/sessions.ts
-import { closeSync, openSync, readdirSync as readdirSync3, readSync, readFileSync as readFileSync4, statSync } from "node:fs";
+import {
+  closeSync,
+  openSync,
+  readFileSync as readFileSync4,
+  readSync,
+  readdirSync as readdirSync3,
+  statSync
+} from "node:fs";
 import { homedir as homedir5 } from "node:os";
-import { join as join5 } from "node:path";
+import { basename, join as join5 } from "node:path";
 
 // ../core/src/session-archive.ts
 function resultText(content) {
@@ -23802,7 +23654,8 @@ function parseClaudeArchive(text, opts) {
 function claudeArchiveMeta(headText, tailText) {
   let sessionId;
   let cwd;
-  let title = "";
+  let promptTitle = "";
+  let aiTitle = "";
   for (const raw of headText.split("\n")) {
     if (!raw.trim()) continue;
     let obj;
@@ -23813,28 +23666,35 @@ function claudeArchiveMeta(headText, tailText) {
     }
     if (typeof obj.sessionId === "string" && !sessionId) sessionId = obj.sessionId;
     if (typeof obj.cwd === "string" && !cwd) cwd = obj.cwd;
-    if (!title && obj.type === "user" && obj.message && typeof obj.message === "object") {
+    if (obj.type === "ai-title" && typeof obj.title === "string" && obj.title.trim()) {
+      aiTitle = firstLine(obj.title);
+    }
+    if (!promptTitle && obj.type === "user" && obj.message && typeof obj.message === "object") {
       const msg = obj.message;
-      if (isHumanPrompt(msg)) title = firstLine(userText(msg));
+      if (isHumanPrompt(msg)) promptTitle = firstLine(userText(msg));
     }
-    if (sessionId && cwd && title) break;
+    if (sessionId && cwd && aiTitle) break;
   }
   let lastLine = "";
+  let tailAiTitle = "";
   const tailLines = tailText.split("\n").filter((l) => l.trim());
-  for (let i = tailLines.length - 1; i >= 0 && !lastLine; i--) {
+  for (let i = tailLines.length - 1; i >= 0 && (!lastLine || !tailAiTitle); i--) {
     let obj;
     try {
       obj = JSON.parse(tailLines[i]);
     } catch {
       continue;
     }
+    if (!tailAiTitle && obj.type === "ai-title" && typeof obj.title === "string" && obj.title.trim()) {
+      tailAiTitle = firstLine(obj.title);
+    }
     if ((obj.type === "assistant" || obj.type === "user") && obj.message && typeof obj.message === "object") {
       const msg = obj.message;
       const text = obj.type === "assistant" ? assistantText(msg) : isHumanPrompt(msg) ? userText(msg) : "";
-      if (text.trim()) lastLine = firstLine(text);
+      if (!lastLine && text.trim()) lastLine = firstLine(text);
     }
   }
-  return { ...sessionId ? { sessionId } : {}, ...cwd ? { cwd } : {}, title, lastLine };
+  return { ...sessionId ? { sessionId } : {}, ...cwd ? { cwd } : {}, title: tailAiTitle || aiTitle || promptTitle, lastLine };
 }
 function assistantText(message) {
   const content = message.content;
@@ -23852,122 +23712,257 @@ function firstLine(s) {
   const line = s.split("\n").find((l) => l.trim()) ?? "";
   return line.trim();
 }
-
-// src/sessions.ts
-function claudeProjectsDir() {
-  const base = process.env.AGENTLINK_CLAUDE_HOME || join5(homedir5(), ".claude");
-  return join5(base, "projects");
-}
-var META_SLICE_BYTES = 64 * 1024;
-var MAX_SESSIONS = 40;
-var MAX_HISTORY_TURNS = 40;
-var SESSION_ID_RE = /^[A-Za-z0-9_-]{1,128}$/;
-function readHeadTail(path, size) {
-  if (size <= META_SLICE_BYTES * 2) {
-    const whole = readFileSync4(path, "utf-8");
-    return { head: whole, tail: whole };
-  }
-  const fd = openSync(path, "r");
-  try {
-    const headBuf = Buffer.alloc(META_SLICE_BYTES);
-    readSync(fd, headBuf, 0, META_SLICE_BYTES, 0);
-    const tailBuf = Buffer.alloc(META_SLICE_BYTES);
-    readSync(fd, tailBuf, 0, META_SLICE_BYTES, size - META_SLICE_BYTES);
-    const tail = tailBuf.toString("utf-8");
-    return { head: headBuf.toString("utf-8"), tail: tail.slice(tail.indexOf("\n") + 1) };
-  } finally {
-    closeSync(fd);
-  }
+function codexPayload(obj) {
+  return obj.payload && typeof obj.payload === "object" ? obj.payload : null;
 }
-function scanClaudeSessions() {
-  const root = claudeProjectsDir();
-  let projectDirs;
-  try {
-    projectDirs = readdirSync3(root, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => join5(root, e.name));
-  } catch {
-    return [];
-  }
-  const candidates = [];
-  for (const dir of projectDirs) {
-    let entries;
+function codexMessage(payload) {
+  return typeof payload.message === "string" ? payload.message : "";
+}
+function parseCodexArchive(text, opts) {
+  const maxTurns = opts?.maxTurns ?? Infinity;
+  const turns = [];
+  let current = null;
+  let sessionId;
+  let cwd;
+  let omitted = 0;
+  const openTurn = (prompt, startedAt) => {
+    current = { prompt, events: [], ...startedAt !== void 0 ? { startedAt } : {} };
+    turns.push(current);
+  };
+  for (const raw of text.split("\n")) {
+    if (!raw.trim()) continue;
+    let obj;
     try {
-      entries = readdirSync3(dir).filter((f) => f.endsWith(".jsonl"));
+      obj = JSON.parse(raw);
     } catch {
+      omitted++;
       continue;
     }
-    for (const name of entries) {
-      const file2 = join5(dir, name);
-      try {
-        const st = statSync(file2);
-        if (!st.isFile() || st.size === 0) continue;
-        candidates.push({ file: file2, sessionId: name.replace(/\.jsonl$/, ""), mtime: st.mtimeMs, size: st.size });
-      } catch {
+    const payload = codexPayload(obj);
+    if (!payload) continue;
+    if (obj.type === "session_meta") {
+      if (!sessionId && typeof payload.id === "string") sessionId = payload.id;
+      if (!cwd && typeof payload.cwd === "string") cwd = payload.cwd;
+      continue;
+    }
+    if (obj.type === "event_msg" && payload.type === "user_message") {
+      const prompt = codexMessage(payload);
+      if (prompt.trim()) openTurn(prompt, tsOf(obj));
+      continue;
+    }
+    if (obj.type === "event_msg" && payload.type === "agent_message") {
+      const message = codexMessage(payload);
+      if (message) {
+        if (!current) openTurn("", tsOf(obj));
+        current.events.push({ type: "text", text: message });
+      }
+      continue;
+    }
+    if (obj.type !== "response_item") continue;
+    const itemType = payload.type;
+    if (itemType === "custom_tool_call" || itemType === "function_call") {
+      if (!current) openTurn("", tsOf(obj));
+      let input = payload.input ?? null;
+      if (typeof input === "string") {
+        try {
+          input = JSON.parse(input);
+        } catch {
+        }
       }
+      current.events.push({
+        type: "tool_use",
+        id: String(payload.call_id ?? payload.id ?? ""),
+        name: String(payload.name ?? "tool"),
+        input
+      });
+    } else if (itemType === "custom_tool_call_output" || itemType === "function_call_output") {
+      if (!current) openTurn("", tsOf(obj));
+      current.events.push({
+        type: "tool_result",
+        toolUseId: String(payload.call_id ?? ""),
+        content: resultText(payload.output),
+        isError: false
+      });
     }
   }
-  candidates.sort((a, b) => b.mtime - a.mtime);
-  const sessions = [];
-  for (const c of candidates.slice(0, MAX_SESSIONS)) {
-    let meta3;
+  const truncatedEarlier = turns.length > maxTurns;
+  return {
+    sessionId,
+    cwd,
+    turns: truncatedEarlier ? turns.slice(turns.length - maxTurns) : turns,
+    omitted,
+    truncatedEarlier
+  };
+}
+function codexArchiveMeta(headText, tailText) {
+  let sessionId;
+  let cwd;
+  let title = "";
+  for (const raw of headText.split("\n")) {
+    if (!raw.trim()) continue;
     try {
-      const { head, tail } = readHeadTail(c.file, c.size);
-      meta3 = claudeArchiveMeta(head, tail);
+      const obj = JSON.parse(raw);
+      const payload = codexPayload(obj);
+      if (!payload) continue;
+      if (obj.type === "session_meta") {
+        if (!sessionId && typeof payload.id === "string") sessionId = payload.id;
+        if (!cwd && typeof payload.cwd === "string") cwd = payload.cwd;
+      } else if (!title && obj.type === "event_msg" && payload.type === "user_message") {
+        title = firstLine(codexMessage(payload));
+      }
+    } catch {
+    }
+  }
+  let lastLine = "";
+  const lines = tailText.split("\n").filter((line) => line.trim());
+  for (let i = lines.length - 1; i >= 0 && !lastLine; i--) {
+    try {
+      const obj = JSON.parse(lines[i]);
+      const payload = codexPayload(obj);
+      if (payload && obj.type === "event_msg" && (payload.type === "agent_message" || payload.type === "user_message")) {
+        lastLine = firstLine(codexMessage(payload));
+      }
+    } catch {
+    }
+  }
+  return {
+    ...sessionId ? { sessionId } : {},
+    ...cwd ? { cwd } : {},
+    title,
+    lastLine
+  };
+}
+
+// src/sessions.ts
+var LIST_LIMIT = 100;
+var CANDIDATE_LIMIT = 300;
+var SLICE_BYTES = 64 * 1024;
+var HISTORY_TURNS = 100;
+function archiveRoot(agent) {
+  if (agent === "claude") {
+    return join5(process.env.AGENTLINK_CLAUDE_HOME || join5(homedir5(), ".claude"), "projects");
+  }
+  return join5(
+    process.env.AGENTLINK_CODEX_HOME || process.env.CODEX_HOME || join5(homedir5(), ".codex"),
+    "sessions"
+  );
+}
+function validSessionId(id) {
+  return /^[A-Za-z0-9._-]{1,128}$/.test(id);
+}
+function archiveFiles(root, maxDepth) {
+  const files = [];
+  const stack = [{ dir: root, depth: 0 }];
+  while (stack.length > 0) {
+    const next = stack.pop();
+    let entries;
+    try {
+      entries = readdirSync3(next.dir, { withFileTypes: true });
     } catch {
       continue;
     }
-    sessions.push({
-      agent: "claude",
-      sessionId: c.sessionId,
-      ...meta3.cwd ? { cwd: meta3.cwd } : {},
-      title: meta3.title || "(\u65E0\u6807\u9898\u4F1A\u8BDD)",
-      lastLine: meta3.lastLine,
-      mtime: Math.round(c.mtime)
-    });
+    for (const entry of entries) {
+      const path = join5(next.dir, entry.name);
+      if (entry.isDirectory() && next.depth < maxDepth) {
+        stack.push({ dir: path, depth: next.depth + 1 });
+      } else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
+        try {
+          files.push({ path, mtime: statSync(path).mtimeMs });
+        } catch {
+        }
+      }
+    }
   }
-  return sessions;
+  return files.sort((a, b) => b.mtime - a.mtime).slice(0, CANDIDATE_LIMIT);
 }
-function findClaudeArchive(sessionId) {
-  const root = claudeProjectsDir();
-  const target = `${sessionId}.jsonl`;
-  let projectDirs;
+function readHeadTail(path) {
+  const size = statSync(path).size;
+  const fd = openSync(path, "r");
   try {
-    projectDirs = readdirSync3(root, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
-  } catch {
-    return null;
+    const headSize = Math.min(size, SLICE_BYTES);
+    const tailSize = Math.min(size, SLICE_BYTES);
+    const head = Buffer.alloc(headSize);
+    const tail = Buffer.alloc(tailSize);
+    readSync(fd, head, 0, headSize, 0);
+    readSync(fd, tail, 0, tailSize, Math.max(0, size - tailSize));
+    return {
+      head: head.toString("utf8"),
+      tail: tail.toString("utf8")
+    };
+  } finally {
+    closeSync(fd);
   }
-  for (const d of projectDirs) {
-    const file2 = join5(root, d, target);
+}
+function scanAgent(agent) {
+  const root = archiveRoot(agent);
+  const depth = agent === "claude" ? 2 : 4;
+  const sessions = [];
+  for (const file2 of archiveFiles(root, depth)) {
     try {
-      if (statSync(file2).isFile()) return file2;
+      const { head, tail } = readHeadTail(file2.path);
+      const meta3 = agent === "claude" ? claudeArchiveMeta(head, tail) : codexArchiveMeta(head, tail);
+      const filenameId = basename(file2.path, ".jsonl");
+      const sessionId = meta3.sessionId || (agent === "codex" ? filenameId.match(/([A-Za-z0-9]+(?:-[A-Za-z0-9]+){4})$/)?.[1] : filenameId);
+      if (!sessionId || !validSessionId(sessionId)) continue;
+      sessions.push({
+        agent,
+        sessionId,
+        ...meta3.cwd ? { cwd: meta3.cwd } : {},
+        title: meta3.title || "(\u65E0\u6807\u9898\u4F1A\u8BDD)",
+        lastLine: meta3.lastLine,
+        mtime: file2.mtime
+      });
     } catch {
     }
   }
-  return null;
+  return sessions;
 }
-function claudeSessionHistory(agent, sessionId) {
-  if (agent !== "claude") return { error: `session takeover supports claude only in M1 (got "${agent}")` };
-  if (!SESSION_ID_RE.test(sessionId)) return { error: "malformed sessionId" };
-  const file2 = findClaudeArchive(sessionId);
-  if (!file2) return { error: `no archive found for session "${sessionId}"` };
-  let text;
-  try {
-    text = readFileSync4(file2, "utf-8");
-  } catch (err) {
-    return { error: `cannot read archive: ${err instanceof Error ? err.message : String(err)}` };
-  }
-  const parsed = parseClaudeArchive(text, { maxTurns: MAX_HISTORY_TURNS });
-  const runs = parsed.turns.map((turn, i) => ({
-    runId: `${sessionId}~${i}`,
-    agent: "claude",
+function scanClaudeSessions() {
+  return scanAgent("claude").slice(0, LIST_LIMIT);
+}
+function scanCodexSessions() {
+  return scanAgent("codex").slice(0, LIST_LIMIT);
+}
+function scanNativeSessions() {
+  return [...scanClaudeSessions(), ...scanCodexSessions()].sort((a, b) => b.mtime - a.mtime).slice(0, LIST_LIMIT);
+}
+function archivePath(agent, sessionId) {
+  if (!validSessionId(sessionId)) return null;
+  const suffix = agent === "claude" ? `${sessionId}.jsonl` : `-${sessionId}.jsonl`;
+  return archiveFiles(archiveRoot(agent), agent === "claude" ? 2 : 4).find((file2) => file2.path.endsWith(suffix))?.path ?? null;
+}
+function runsFromParsed(agent, sessionId, parsed) {
+  return parsed.turns.map((turn, index) => ({
+    runId: `native-${agent}-${sessionId}-${index}`,
+    agent,
     prompt: turn.prompt,
     ...parsed.cwd ? { cwd: parsed.cwd } : {},
     sessionId,
     startedAt: turn.startedAt ?? 0,
     status: "done",
+    code: 0,
     truncated: false,
     events: turn.events
   }));
-  return { runs, truncatedEarlier: parsed.truncatedEarlier };
+}
+function nativeSessionHistory(agent, sessionId) {
+  if (agent !== "claude" && agent !== "codex") {
+    return { error: `session takeover does not support "${agent}"` };
+  }
+  const path = archivePath(agent, sessionId);
+  if (!path) return { error: `${agent} session "${sessionId}" was not found` };
+  try {
+    const text = readFileSync4(path, "utf8");
+    const parsed = agent === "claude" ? parseClaudeArchive(text, { maxTurns: HISTORY_TURNS }) : parseCodexArchive(text, { maxTurns: HISTORY_TURNS });
+    return {
+      runs: runsFromParsed(agent, sessionId, parsed),
+      truncatedEarlier: parsed.truncatedEarlier
+    };
+  } catch (err) {
+    return {
+      error: `cannot read ${agent} session "${sessionId}": ${err instanceof Error ? err.message : String(err)}`
+    };
+  }
 }
 
 // src/tunnel.ts
@@ -24347,26 +24342,43 @@ async function probeVersion(bin) {
   return first || void 0;
 }
 async function probeAgents() {
-  return Promise.all(
+  const agents2 = await Promise.all(
     REGISTRY.map(async (def) => {
-      const bin = getAgent(def.id)?.bin;
-      if (!bin) return { id: def.id, label: def.label, detected: false, models: def.models };
+      const adapter = getAgent(def.id);
+      if (!adapter) return { id: def.id, label: def.label, detected: false, models: def.models };
       const [version2, probed] = await Promise.all([
-        probeVersion(bin),
-        def.probeModels ? def.probeModels(bin) : Promise.resolve([])
+        probeVersion(resolveBin(def.command ?? def.acp.bin) ?? adapter.bin),
+        def.probeModels ? def.probeModels(adapter.bin) : Promise.resolve([])
       ]);
       const models = [.../* @__PURE__ */ new Set([...probed, ...def.models])];
       return {
         id: def.id,
         label: def.label,
         detected: true,
-        bin,
+        bin: adapter.bin,
         models,
         ...version2 ? { version: version2 } : {},
         ...APPROVAL ? { approval: true } : {}
       };
     })
   );
+  let joycodeBin = resolveBin("joycode");
+  if (!joycodeBin) {
+    try {
+      joycodeBin = realpathSync("/Applications/JoyCode.app/Contents/Resources/app/bin/joycode");
+    } catch {
+    }
+  }
+  if (joycodeBin) {
+    agents2.push({
+      id: "joycode",
+      label: "JoyCode\uFF08\u5DF2\u5B89\u88C5\uFF0C\u6682\u65E0\u63A5\u7BA1\u63A5\u53E3\uFF09",
+      detected: false,
+      bin: joycodeBin,
+      models: []
+    });
+  }
+  return agents2;
 }
 var running = /* @__PURE__ */ new Map();
 var approvalRuns = /* @__PURE__ */ new Map();
@@ -24397,7 +24409,7 @@ function handleRun(ws, { requestId, agent: agentId, prompt: rawPrompt, sessionId
   };
   const adapter = getAgent(agentId);
   if (!adapter) return fail(`agent "${agentId}" not found`);
-  const { plain: prompt, stored: storedPrompt } = decodePrompt(rawPrompt);
+  const { plain: prompt } = decodePrompt(rawPrompt);
   if (typeof prompt !== "string") {
     return fail(ENCKEY ? `malformed run message: prompt could not be decrypted (wrong key?)` : `malformed run message: prompt is not a string`);
   }
@@ -24407,13 +24419,6 @@ function handleRun(ws, { requestId, agent: agentId, prompt: rawPrompt, sessionId
     if (!real) return fail(`cwd rejected: ${error51}`);
     runCwd = real;
   }
-  const recorder = recordRun(conversationId, {
-    runId: requestId,
-    agent: agentId,
-    prompt: storedPrompt,
-    ...cwd !== void 0 ? { cwd } : {},
-    ...typeof model === "string" && model ? { model } : {}
-  });
   runAcpPath(ws, {
     requestId,
     adapter,
@@ -24422,8 +24427,7 @@ function handleRun(ws, { requestId, agent: agentId, prompt: rawPrompt, sessionId
     runCwd,
     model: typeof model === "string" && model ? model : void 0,
     conversationId,
-    notifyDetail,
-    recorder
+    notifyDetail
   });
 }
 var NOTIFY_TITLE_MAX = 200;
@@ -24437,7 +24441,7 @@ function approvalNotify(tool, input) {
   return { title: `\u5BA1\u6279\uFF1A${tool}`.slice(0, NOTIFY_TITLE_MAX), summary: firstLine2.slice(0, NOTIFY_SUMMARY_MAX) };
 }
 function runAcpPath(ws, opts) {
-  const { requestId, adapter, recorder } = opts;
+  const { requestId, adapter } = opts;
   console.log(`[daemon] requestId=${requestId} starting ${adapter.id} via ACP (approval=${APPROVAL}, cwd=${opts.runCwd})`);
   let lastText;
   const emitEvent = (evt) => {
@@ -24445,10 +24449,8 @@ function runAcpPath(ws, opts) {
     if (ENCKEY) {
       const capped = truncateEventContent(evt);
       const envelope = encryptEvent(ENCKEY, capped);
-      recorder?.event(capped, envelope);
       send(ws, { type: "event", requestId, event: envelope });
     } else {
-      recorder?.event(evt);
       send(ws, { type: "event", requestId, event: evt });
     }
   };
@@ -24469,10 +24471,8 @@ function runAcpPath(ws, opts) {
           if (ENCKEY) {
             const capped = truncateEventContent(evt);
             wireEvent = encryptEvent(ENCKEY, capped);
-            if (!renotify) recorder?.event(capped, wireEvent);
           } else {
             wireEvent = evt;
-            if (!renotify) recorder?.event(evt);
           }
           send(ws, {
             type: "permission_request",
@@ -24521,7 +24521,6 @@ function runAcpPath(ws, opts) {
     if (error51) done.error = error51;
     if (opts.notifyDetail === true) done.notify = { title: adapter.id, summary: notifySummary(lastText) };
     console.log(`[daemon] requestId=${requestId} closed code=${code}${error51 ? ` error=${error51}` : ""} (ACP)`);
-    recorder?.done(code, error51);
     send(ws, done);
   });
 }
@@ -24607,30 +24606,28 @@ function handleListdir(ws, { requestId, path }) {
   }
 }
 function handleConvList(ws, requestId) {
-  send(ws, { type: "conv_list_result", requestId, conversations: listConversations() });
+  send(ws, { type: "conv_list_result", requestId, conversations: [] });
 }
-function handleConvPut(ws, requestId, conversation) {
-  if (typeof conversation !== "object" || conversation === null) {
-    return send(ws, { type: "conv_put_result", requestId, error: "malformed conv_put: conversation is not an object" });
-  }
-  const { conversation: merged, error: error51 } = putConversation(conversation);
-  send(ws, { type: "conv_put_result", requestId, ...merged ? { conversation: merged } : {}, ...error51 ? { error: error51 } : {} });
+function handleConvPut(ws, requestId, _conversation) {
+  send(ws, {
+    type: "conv_put_result",
+    requestId,
+    error: "AgentLink conversation storage is disabled; use native sessions"
+  });
 }
-function handleConvDelete(ws, requestId, id) {
-  if (typeof id === "string") deleteConversation(id);
+function handleConvDelete(ws, requestId, _id) {
   send(ws, { type: "conv_delete_result", requestId });
 }
 function handleConvClear(ws, requestId) {
-  clearConversations();
   send(ws, { type: "conv_clear_result", requestId });
 }
-function handleHistory(ws, requestId, conversationId) {
-  send(ws, { type: "history_result", requestId, runs: history(conversationId) });
+function handleHistory(ws, requestId, _conversationId) {
+  send(ws, { type: "history_result", requestId, runs: [] });
 }
 function handleScanSessions(ws, requestId) {
   let sessions;
   try {
-    const list = scanClaudeSessions();
+    const list = scanNativeSessions();
     sessions = ENCKEY ? encryptEvent(ENCKEY, list) : list;
   } catch (err) {
     return send(ws, { type: "scan_sessions_result", requestId, sessions: ENCKEY ? void 0 : [], error: err instanceof Error ? err.message : String(err) });
@@ -24641,7 +24638,7 @@ function handleSessionHistory(ws, requestId, agent, sessionId) {
   if (typeof agent !== "string" || typeof sessionId !== "string") {
     return send(ws, { type: "session_history_result", requestId, runs: [], error: "malformed session_history: agent and sessionId are required" });
   }
-  const result = claudeSessionHistory(agent, sessionId);
+  const result = nativeSessionHistory(agent, sessionId);
   if ("error" in result) {
     return send(ws, { type: "session_history_result", requestId, runs: [], error: result.error });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alink-cli",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "一条命令把工作机接入 AgentLink，随时随地遥控本机的编码 agent。One command to link your machine to AgentLink and control your coding agents from anywhere.",
   "license": "MIT",
   "repository": {
@@ -53,6 +53,8 @@
     "ws": "^8.18.0"
   },
   "dependencies": {
-    "@agentclientprotocol/sdk": "^1.3.0"
+    "@agentclientprotocol/codex-acp": "1.1.9",
+    "@agentclientprotocol/sdk": "^1.3.0",
+    "@zed-industries/claude-code-acp": "0.16.2"
   }
 }