lark-coding-assistant 0.2.6 → 0.2.8

package/dist/cli.js

@@ -939,13 +939,28 @@ function formatKnownError(error, context) {
     }
     case "AGENT_SESSION_IN_USE": {
       const ownerSessionId = safeValue(context.ownerSessionId, "\u73B0\u6709 session");
+      const agentSessionId = typeof context.agentSessionId === "string" ? safeValue(context.agentSessionId, "") : void 0;
       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`,
+        ...agentSessionId ? ["", `\u539F\u751F session ID\uFF1A${agentSessionId}`] : [],
         "",
         "\u8BF7\u76F4\u63A5\u8FDE\u63A5\u73B0\u6709 session\uFF1A",
         `  lark-coding-assistant attach ${ownerSessionId}`
       ];
     }
+    case "AGENT_EXITED": {
+      const exitStatus = typeof context.exitStatus === "number" ? `\uFF08\u9000\u51FA\u7801 ${context.exitStatus}\uFF09` : "";
+      return [
+        `Agent \u5DF2\u9000\u51FA${exitStatus}\uFF0Csession\u300C${sessionId}\u300D\u5DF2\u5173\u95ED\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\u91CD\u65B0\u542F\u52A8\uFF1A",
+        "  lark-coding-assistant logs",
+        `  lark-coding-assistant start --name ${sessionId} --agent ${safeValue(context.agent, "codex")}`
+      ];
+    }
     case "AGENT_EXITED_DURING_STARTUP": {
       const exitStatus = typeof context.exitStatus === "number" ? `\uFF08\u9000\u51FA\u7801 ${context.exitStatus}\uFF09` : "";
       return [
@@ -1449,7 +1464,11 @@ async function attachLocal(name) {
   const state = await store.loadState();
   const config = await store.loadConfig();
   const session = state.sessions?.[name];
-  if (!session) throw new AppError("SESSION_NOT_FOUND", `no managed session: ${name}`, { sessionId: name });
+  if (!session) {
+    const exitEvent2 = state.recentSessionExits?.[name];
+    if (exitEvent2) throw sessionExitError(exitEvent2);
+    throw new AppError("SESSION_NOT_FOUND", `no managed session: ${name}`, { sessionId: name });
+  }
   if (!config) throw new AppError("NOT_INITIALIZED", "not initialized");
   try {
     await runFile(config.tmuxBinary, ["has-session", "-t", `=${session.sessionName}`]);
@@ -1459,10 +1478,13 @@ async function attachLocal(name) {
         binary: config.tmuxBinary
       }, { cause: error });
     }
+    const exitEvent2 = (await store.loadState()).recentSessionExits?.[name];
+    if (exitEvent2) throw sessionExitError(exitEvent2);
     throw new AppError("SESSION_NOT_FOUND", `managed session is no longer running: ${name}`, {
       sessionId: name
     }, { cause: error });
   }
+  const attachedAt = Date.now();
   const child = spawn3(config.tmuxBinary, ["attach-session", "-t", `=${session.sessionName}`], { stdio: "inherit" });
   const code = await new Promise((resolveExit, reject) => {
     child.once("error", (error) => {
@@ -1476,8 +1498,37 @@ async function attachLocal(name) {
     });
     child.once("exit", resolveExit);
   });
+  await requestDaemon(paths.socket, { method: "reconcile" }, 2500).catch(() => void 0);
+  const exitEvent = (await store.loadState()).recentSessionExits?.[name];
+  if (exitEvent && exitEvent.occurredAt >= attachedAt) {
+    throw sessionExitError(exitEvent);
+  }
   if (code && code !== 0) process.exitCode = code;
 }
+function sessionExitError(event) {
+  if (event.reason === "agent-exited") {
+    return new AppError(
+      "AGENT_EXITED",
+      `agent exited: ${event.sessionId}`,
+      {
+        sessionId: event.sessionId,
+        agent: event.agent,
+        exitStatus: event.exitStatus,
+        terminalExcerpt: event.terminalExcerpt
+      }
+    );
+  }
+  return new AppError(
+    "AGENT_SESSION_IN_USE",
+    `agent session is already managed by ${event.ownerSessionId ?? "another session"}`,
+    {
+      sessionId: event.sessionId,
+      agent: event.agent,
+      agentSessionId: event.agentSessionId,
+      ownerSessionId: event.ownerSessionId
+    }
+  );
+}
 async function runStatus(name) {
   try {
     const [response, health] = await Promise.all([