lark-coding-assistant 0.1.3 → 0.2.0

package/dist/cli.js

@@ -1,6 +1,6 @@
 // src/cli.ts
 import { randomBytes as randomBytes2 } from "crypto";
-import { access, readFile as readFile3 } from "fs/promises";
+import { readFile as readFile3 } from "fs/promises";
 import { spawn as spawn3 } from "child_process";
 import { fileURLToPath } from "url";
 import { resolve } from "path";
@@ -64,6 +64,14 @@ async function writeJsonAtomic(path, value, mode = 384) {
   await chmod(path, mode);
 }
 
+// src/agents/types.ts
+var AGENT_IDS = ["codex", "traex", "claude"];
+function normalizeAgentId(value) {
+  if (value === "trae-cli") return "traex";
+  if (value === "claude-code") return "claude";
+  return AGENT_IDS.includes(value) ? value : void 0;
+}
+
 // src/core/store.ts
 var AppStore = class {
   constructor(paths2) {
@@ -80,8 +88,21 @@ var AppStore = class {
       chmod2(this.paths.logsDir, 448)
     ]);
   }
-  loadConfig() {
-    return readJson(this.paths.config);
+  async loadConfig() {
+    const config = await readJson(this.paths.config);
+    if (!config) return void 0;
+    const binaries = config.agentBinaries ?? {};
+    return {
+      tenant: config.tenant,
+      appId: config.appId,
+      tmuxBinary: config.tmuxBinary,
+      agentBinaries: {
+        codex: binaries.codex ?? "codex",
+        traex: binaries.traex ?? binaries["trae-cli"] ?? "trae-cli",
+        claude: binaries.claude ?? binaries["claude-code"] ?? "claude"
+      },
+      pollIntervalMs: config.pollIntervalMs
+    };
   }
   saveConfig(config) {
     return writeJsonAtomic(this.paths.config, config);
@@ -93,7 +114,13 @@ var AppStore = class {
     return writeJsonAtomic(this.paths.secrets, secrets);
   }
   async loadState() {
-    return await readJson(this.paths.state) ?? emptyState();
+    const state = await readJson(this.paths.state);
+    if (!state) return emptyState();
+    const sessions = Object.fromEntries(Object.entries(state.sessions ?? {}).flatMap(([id, session]) => {
+      const agent = normalizeAgentId(session.agent);
+      return agent ? [[id, { ...session, agent }]] : [];
+    }));
+    return { ...state, sessions };
   }
   saveState(state) {
     return writeJsonAtomic(this.paths.state, state);
@@ -198,7 +225,7 @@ function resolveResumeOption(options) {
   const modes = [options.resume !== void 0, options.resumeLast, options.resumeAll].filter(Boolean).length;
   if (modes > 1) {
     throw new AppError(
-      "INVALID_OPTIONS",
+      "INVALID_RESUME",
       "--resume, --resume-last, and --resume-all cannot be used together",
       { reason: "--resume\u3001--resume-last \u548C --resume-all \u4E0D\u80FD\u540C\u65F6\u4F7F\u7528" }
     );
@@ -252,12 +279,12 @@ var CODEX_DIALECT = {
 };
 var TRAE_DIALECT = {
   ...CODEX_DIALECT,
-  id: "trae-cli",
+  id: "traex",
   headerPatterns: [...commonHeaders, /^\s*Question\s+\d+\/\d+/i],
   customInputControls: [/^(?:other|none of the above|add notes)$/i]
 };
 var CLAUDE_DIALECT = {
-  id: "claude-code",
+  id: "claude",
   headerPatterns: [
     ...commonHeaders,
     /^\s*(?:←\s*)?[☐☑☒]\s+.+?(?:\s+✔\s+Submit\s*→)?\s*$/i,
@@ -591,11 +618,18 @@ function lastMatchingIndex(lines, pattern) {
 // src/agents/stop-hook.ts
 function codexStyleStopHookArgs(command) {
   const hook = `{hooks=[{type="command",command=${JSON.stringify(command)},timeout=5}]}`;
-  return ["--dangerously-bypass-hook-trust", "-c", `hooks.Stop=[${hook}]`];
+  return [
+    "--dangerously-bypass-hook-trust",
+    "-c",
+    `hooks.SessionStart=[${hook}]`,
+    "-c",
+    `hooks.Stop=[${hook}]`
+  ];
 }
 function claudeStopHookArgs(command) {
   return ["--settings", JSON.stringify({
     hooks: {
+      SessionStart: [{ hooks: [{ type: "command", command, timeout: 5 }] }],
       Stop: [{ hooks: [{ type: "command", command, timeout: 5 }] }]
     }
   })];
@@ -604,7 +638,7 @@ function claudeStopHookArgs(command) {
 // src/agents/codex.ts
 var codexAdapter = {
   id: "codex",
-  displayName: "Codex",
+  displayName: "codex",
   groupOrder: 10,
   binary: (config) => config.agentBinaries.codex,
   versionArgs: ["--version"],
@@ -617,10 +651,10 @@ var codexAdapter = {
 
 // src/agents/trae-cli.ts
 var traeCliAdapter = {
-  id: "trae-cli",
-  displayName: "Trae CLI",
+  id: "traex",
+  displayName: "traex",
   groupOrder: 20,
-  binary: (config) => config.agentBinaries["trae-cli"],
+  binary: (config) => config.agentBinaries.traex,
   versionArgs: ["--version"],
   buildLaunchArgs: ({ resume, stopHookCommand }) => [
     ...codexStyleStopHookArgs(stopHookCommand),
@@ -631,10 +665,10 @@ var traeCliAdapter = {
 
 // src/agents/claude-code.ts
 var claudeCodeAdapter = {
-  id: "claude-code",
-  displayName: "Claude Code",
+  id: "claude",
+  displayName: "claude",
   groupOrder: 30,
-  binary: (config) => config.agentBinaries["claude-code"],
+  binary: (config) => config.agentBinaries.claude,
   versionArgs: ["--version"],
   buildLaunchArgs: ({ resume, stopHookCommand }) => [
     ...claudeStopHookArgs(stopHookCommand),
@@ -643,9 +677,6 @@ var claudeCodeAdapter = {
   detectScreen: detectClaudeScreen
 };
 
-// src/agents/types.ts
-var AGENT_IDS = ["codex", "trae-cli", "claude-code"];
-
 // src/agents/registry.ts
 var adapters = /* @__PURE__ */ new Map([
   [codexAdapter.id, codexAdapter],
@@ -657,9 +688,6 @@ function getAgentAdapter(id) {
   if (!adapter) throw new Error(`unsupported coding agent: ${id}`);
   return adapter;
 }
-function isAgentId(value) {
-  return AGENT_IDS.includes(value);
-}
 
 // src/daemon/lifecycle.ts
 import { mkdir as mkdir3, open as open2, readFile as readFile2 } from "fs/promises";
@@ -676,6 +704,13 @@ async function daemonInfo(paths2, timeoutMs = 500) {
 async function startDaemonProcess(paths2, daemonEntry, readyTimeoutMs = 5e3) {
   const existing = await daemonInfo(paths2);
   if (existing) return existing;
+  const health = await daemonHealth(paths2);
+  if (health.status === "running") return health.info;
+  if (health.status === "unresponsive") {
+    throw new AppError("DAEMON_UNRESPONSIVE", "daemon process is alive but its control socket is unresponsive", {
+      pid: health.pid
+    });
+  }
   await Promise.all([
     mkdir3(paths2.runtimeDir, { recursive: true, mode: 448 }),
     mkdir3(paths2.logsDir, { recursive: true, mode: 448 })
@@ -701,6 +736,25 @@ async function startDaemonProcess(paths2, daemonEntry, readyTimeoutMs = 5e3) {
   }
   throw new Error("daemon did not become ready");
 }
+async function daemonHealth(paths2, probe = defaultHealthProbe) {
+  for (let attempt = 0; attempt < 3; attempt += 1) {
+    const info = await probe.ping(paths2, 400);
+    if (info) return { status: "running", info };
+    if (attempt < 2) await probe.wait(80);
+  }
+  const pid = await probe.readPid(paths2);
+  if (validPid(pid) && probe.processIsAlive(pid) && await probe.isCurrentDaemonProcess(pid)) {
+    return { status: "unresponsive", pid };
+  }
+  return { status: "stopped" };
+}
+var defaultHealthProbe = {
+  ping: daemonInfo,
+  readPid: async (paths2) => Number.parseInt(await readFile2(paths2.pid, "utf8").catch(() => ""), 10),
+  processIsAlive,
+  isCurrentDaemonProcess,
+  wait: delay
+};
 async function stopDaemonProcess(paths2) {
   const info = await daemonInfo(paths2);
   if (!info) return stopDaemonByPid(paths2);
@@ -794,6 +848,37 @@ function formatKnownError(error, context) {
         `  lark-coding-assistant attach ${sessionId}`,
         "  lark-coding-assistant start --name <\u65B0\u540D\u79F0>"
       ];
+    case "AGENT_SESSION_IN_USE": {
+      const ownerSessionId = safeValue(context.ownerSessionId, "\u73B0\u6709 session");
+      return [
+        `\u65E0\u6CD5\u542F\u52A8 session\u300C${sessionId}\u300D\uFF1A\u5BF9\u5E94\u7684 Agent \u539F\u751F session \u5DF2\u7531\u300C${ownerSessionId}\u300D\u8FDE\u63A5\u3002`,
+        "",
+        "\u8BF7\u76F4\u63A5\u8FDE\u63A5\u73B0\u6709 session\uFF1A",
+        `  lark-coding-assistant attach ${ownerSessionId}`
+      ];
+    }
+    case "AGENT_EXITED_DURING_STARTUP": {
+      const exitStatus = typeof context.exitStatus === "number" ? `\uFF08\u9000\u51FA\u7801 ${context.exitStatus}\uFF09` : "";
+      return [
+        `Agent \u542F\u52A8\u540E\u7ACB\u5373\u9000\u51FA${exitStatus}\uFF0Csession\u300C${sessionId}\u300D\u672A\u521B\u5EFA\u3002`,
+        "",
+        "\u539F\u59CB\u9519\u8BEF\uFF1A",
+        safeValue(context.terminalExcerpt, "Agent \u672A\u8F93\u51FA\u53EF\u7528\u9519\u8BEF\u4FE1\u606F\u3002"),
+        "",
+        "\u53EF\u67E5\u770B\u65E5\u5FD7\u6216\u6539\u4E3A\u542F\u52A8\u65B0\u4F1A\u8BDD\uFF1A",
+        "  lark-coding-assistant logs",
+        `  lark-coding-assistant start --name ${sessionId} --agent ${safeValue(context.agent, "codex")}`
+      ];
+    }
+    case "AGENT_IDENTITY_TIMEOUT":
+      return [
+        `\u65E0\u6CD5\u786E\u8BA4\u6062\u590D\u76EE\u6807\uFF0Csession\u300C${sessionId}\u300D\u672A\u521B\u5EFA\u3002`,
+        "Agent \u4ECD\u5728\u8FD0\u884C\uFF0C\u4F46 LCA \u672A\u80FD\u8BC6\u522B\u539F\u751F session ID\u3002",
+        "",
+        "\u4E34\u65F6 tmux \u5DF2\u6E05\u7406\uFF0C\u8BF7\u67E5\u770B\u65E5\u5FD7\u540E\u91CD\u8BD5\u6216\u542F\u52A8\u65B0\u4F1A\u8BDD\uFF1A",
+        "  lark-coding-assistant logs",
+        `  lark-coding-assistant start --name ${sessionId} --agent ${safeValue(context.agent, "codex")}`
+      ];
     case "SESSION_NOT_FOUND":
       return [
         `\u627E\u4E0D\u5230 session\u300C${sessionId}\u300D\u3002`,
@@ -827,6 +912,19 @@ function formatKnownError(error, context) {
         "",
         "\u8BF7\u8FD0\u884C lark-coding-assistant --help \u67E5\u770B\u53EF\u7528\u53C2\u6570\u3002"
       ];
+    case "INVALID_RESUME":
+      return [
+        `\u6062\u590D\u53C2\u6570\u65E0\u6548\uFF1A${safeValue(context.reason, error.message)}`,
+        "",
+        "\u8BF7\u53EA\u9009\u62E9\u4E00\u79CD\u6062\u590D\u65B9\u5F0F\uFF0C\u5E76\u68C0\u67E5\u5386\u53F2 session ID\u3002"
+      ];
+    case "START_FAILED":
+      return [
+        `\u65E0\u6CD5\u542F\u52A8 session\u300C${sessionId}\u300D\u3002`,
+        "",
+        "\u8BF7\u68C0\u67E5\u5DE5\u4F5C\u76EE\u5F55\u3001Agent \u5B89\u88C5\u548C daemon \u65E5\u5FD7\uFF1A",
+        "  lark-coding-assistant logs"
+      ];
     case "DAEMON_UNAVAILABLE":
       return [
         "\u65E0\u6CD5\u8FDE\u63A5 bridge daemon\u3002",
@@ -835,6 +933,13 @@ function formatKnownError(error, context) {
         "  lark-coding-assistant daemon restart",
         "  lark-coding-assistant logs"
       ];
+    case "DAEMON_UNRESPONSIVE":
+      return [
+        "bridge daemon \u8FDB\u7A0B\u4ECD\u5728\u8FD0\u884C\uFF0C\u4F46\u63A7\u5236\u901A\u9053\u65E0\u54CD\u5E94\u3002",
+        "",
+        "\u8BF7\u91CD\u542F daemon\uFF1B\u73B0\u6709 coding-agent/tmux sessions \u4F1A\u4FDD\u7559\uFF1A",
+        "  lark-coding-assistant daemon restart"
+      ];
     case "REQUEST_TIMEOUT":
       return [
         "bridge daemon \u672A\u53CA\u65F6\u54CD\u5E94\u3002",
@@ -888,6 +993,37 @@ function debugStack(error) {
   return values.join("\nCaused by:\n");
 }
 
+// src/session/start-request.ts
+import { stat } from "fs/promises";
+import { isAbsolute } from "path";
+async function validateStartSessionRequest(request) {
+  if (!validSessionId(request.sessionId)) {
+    throw new AppError(
+      "INVALID_SESSION_NAME",
+      "session name must use letters, digits, underscore, or dash",
+      { sessionId: request.sessionId }
+    );
+  }
+  if (!isAbsolute(request.cwd)) {
+    throw new AppError("INVALID_CWD", "working directory must be absolute", { cwd: request.cwd });
+  }
+  const info = await stat(request.cwd).catch((error) => {
+    throw new AppError("INVALID_CWD", `working directory is unavailable: ${request.cwd}`, { cwd: request.cwd }, { cause: error });
+  });
+  if (!info.isDirectory()) {
+    throw new AppError("INVALID_CWD", `working directory is not a directory: ${request.cwd}`, { cwd: request.cwd });
+  }
+  if (request.resume?.mode === "session" && !request.resume.sessionId.trim()) {
+    throw new AppError("INVALID_RESUME", "resume session id must not be empty", {
+      reason: "\u6062\u590D\u5386\u53F2\u4F1A\u8BDD\u65F6\u5FC5\u987B\u63D0\u4F9B session ID"
+    });
+  }
+  return request;
+}
+function validSessionId(value) {
+  return /^[a-zA-Z0-9_-]{1,40}$/.test(value);
+}
+
 // src/cli.ts
 var program = new Command();
 var paths = resolveAppPaths();
@@ -897,14 +1033,14 @@ var packageInfo = JSON.parse(
 );
 program.name("lark-coding-assistant").version(packageInfo.version);
 program.command("init").description("Configure Feishu/Lark PersonalAgent").action(runInit);
-program.command("start").option("-n, --name <name>", "Session name", "default").option("--agent <agent>", "Coding agent (codex, trae-cli, or claude-code)", parseAgentId, "codex").option("--cwd <path>", "Coding agent working directory").option("--resume [session-id]", "Resume agent session; omit the ID to open the picker").option("--resume-last", "Resume the most recent agent session in this working directory").option("--resume-all", "Show all agent sessions in the resume picker").action(runStart);
+program.command("start").option("-n, --name <name>", "Session name", "default").option("--agent <agent>", "Coding agent (codex, traex, or claude)", parseAgentId, "codex").option("--cwd <path>", "Coding agent working directory").option("--resume [session-id]", "Resume agent session; omit the ID to open the picker").option("--resume-last", "Resume the most recent agent session in this working directory").option("--resume-all", "Show all agent sessions in the resume picker").action(runStart);
 program.command("attach").argument("[name]", "Session name", "default").description("Attach local terminal to coding-agent tmux session").action(runAttach);
 program.command("bind-code").description("Generate a new one-time Lark binding code").action(runBindCode);
 program.command("status").argument("[name]", "Session name").description("Show daemon and session status").action(runStatus);
 program.command("stop").argument("[name]", "Session name").description("Stop managed coding-agent/tmux session").action(runStop);
 program.command("logs").option("-n, --lines <count>", "Number of lines", "100").action(runLogs);
 program.command("reset-owner").description("Clear persistent Lark owner").action(runResetOwner);
-var daemonCommand = program.command("daemon").description("Manage the Lark bridge daemon");
+var daemonCommand = program.command("daemon").description("Start or manage the Lark bridge daemon").action(runDaemonStart);
 daemonCommand.command("start").description("Start the bridge daemon").action(runDaemonStart);
 daemonCommand.command("stop").description("Stop the bridge daemon without stopping coding-agent sessions").action(runDaemonStop);
 daemonCommand.command("restart").description("Restart the bridge daemon without stopping coding-agent sessions").action(runDaemonRestart);
@@ -956,7 +1092,7 @@ ${url}
     tenant: registeredTenant,
     appId: registration.client_id,
     tmuxBinary: "tmux",
-    agentBinaries: { codex: "codex", "trae-cli": "trae-cli", "claude-code": "claude" },
+    agentBinaries: { codex: "codex", traex: "trae-cli", claude: "claude" },
     pollIntervalMs: 650
   };
   const previousState = await store.loadState();
@@ -983,18 +1119,18 @@ ${url}
 async function runStart(options) {
   const cwd = resolve(options.cwd ?? process.cwd());
   const resume = resolveResumeOption(options);
-  await access(cwd).catch((error) => {
-    throw new AppError("INVALID_CWD", `working directory is unavailable: ${cwd}`, { cwd }, { cause: error });
+  const request = await validateStartSessionRequest({
+    sessionId: options.name,
+    agent: options.agent,
+    cwd,
+    resume
   });
   await ensureInitialized();
   await preflight(options.agent);
   await ensureDaemon();
   const value = await daemonValue({
     method: "start",
-    cwd,
-    sessionId: options.name,
-    agent: options.agent,
-    resume
+    ...request
   });
   if (value.binding.mode === "reused") {
     console.log("\n\u5DF2\u81EA\u52A8\u6CBF\u7528\u539F\u6709\u98DE\u4E66/Lark \u79C1\u804A\u7ED1\u5B9A\u3002\n");
@@ -1062,7 +1198,12 @@ async function runStatus(name) {
     console.log(JSON.stringify(response.value, null, 2));
   } catch {
     const state = await store.loadState();
-    console.log(JSON.stringify({ daemon: "stopped", state }, null, 2));
+    const health = await daemonHealth(paths);
+    console.log(JSON.stringify({
+      daemon: health.status,
+      ...health.status === "unresponsive" ? { daemonPid: health.pid } : {},
+      state
+    }, null, 2));
   }
 }
 async function runStop(name) {
@@ -1100,12 +1241,22 @@ async function runDaemonRestart() {
   console.log(`Bridge daemon restarted (PID ${info.pid}, version ${info.version}). Coding-agent/tmux sessions were preserved.`);
 }
 async function runDaemonStatus() {
-  const info = await daemonInfo(paths);
-  if (!info) {
+  const health = await daemonHealth(paths);
+  if (health.status === "stopped") {
     console.log(`Bridge daemon: stopped
 CLI version: ${packageInfo.version}`);
     return;
   }
+  if (health.status === "unresponsive") {
+    console.log([
+      "Bridge daemon: unresponsive",
+      `PID: ${health.pid}`,
+      `CLI version: ${packageInfo.version}`,
+      "\u5EFA\u8BAE\u8FD0\u884C\uFF1Alark-coding-assistant daemon restart"
+    ].join("\n"));
+    return;
+  }
+  const info = health.info;
   console.log([
     "Bridge daemon: running",
     `PID: ${info.pid}`,
@@ -1128,12 +1279,13 @@ async function preflight(agentId) {
   ]);
 }
 function parseAgentId(value) {
-  if (!isAgentId(value)) {
+  const agent = normalizeAgentId(value);
+  if (!agent) {
     throw new AppError("INVALID_OPTIONS", `unsupported coding agent: ${value}`, {
       reason: `\u4E0D\u652F\u6301 coding agent\u300C${value}\u300D`
     });
   }
-  return value;
+  return agent;
 }
 async function ensureDaemon() {
   const info = await daemonInfo(paths);