lark-coding-assistant 0.2.7 → 0.2.8

package/dist/daemon-entry.js

@@ -450,6 +450,7 @@ var SessionReconciler = class {
   misses = /* @__PURE__ */ new Map();
   async reconcile(input, discover = false, signal) {
     const sessions = { ...input.sessions };
+    const removedSessions = [];
     let changed = false;
     for (const [id, session] of Object.entries(sessions)) {
       if (signal?.aborted) throw signal.reason;
@@ -467,9 +468,14 @@ var SessionReconciler = class {
         continue;
       }
       if (result2.status === "dead") {
+        const terminalOutput = await this.tmux.capture(result2.pane.paneId, 80, signal).catch((error) => {
+          void this.log(`failed to capture dead tmux pane ${result2.pane.paneId}: ${errorMessage2(error)}`);
+          return "";
+        });
         await this.tmux.killSession(result2.pane.sessionName, signal).catch((error) => this.log(
           `failed to clean dead tmux session ${result2.pane.sessionName}: ${errorMessage2(error)}`
         ));
+        removedSessions.push({ session, pane: result2.pane, terminalOutput });
         delete sessions[id];
         this.misses.delete(id);
         changed = true;
@@ -478,6 +484,7 @@ var SessionReconciler = class {
       const misses = (this.misses.get(id) ?? 0) + 1;
       this.misses.set(id, misses);
       if (misses < this.missingThreshold) continue;
+      removedSessions.push({ session });
       delete sessions[id];
       this.misses.delete(id);
       changed = true;
@@ -489,7 +496,7 @@ var SessionReconciler = class {
     if (activeSessionId !== input.activeSessionId) changed = true;
     const removedActive = input.activeSessionId && !sessions[input.activeSessionId] ? input.sessions?.[input.activeSessionId] : void 0;
     const state = changed ? { ...input, sessions, activeSessionId, updatedAt: Date.now() } : input;
-    return { state, liveSessions: Object.values(sessions), removedActive, changed };
+    return { state, liveSessions: Object.values(sessions), removedActive, removedSessions, changed };
   }
   async confirm(session, signal) {
     const direct = await this.tmux.inspectStatus(session.paneId, signal);
@@ -3222,6 +3229,10 @@ var AssistantDaemon = class {
       }
       case "start":
         return this.startSession(request.sessionId, request.cwd, request.agent, request.resume);
+      case "reconcile": {
+        await this.reconcileSessions(true);
+        return { ok: true };
+      }
       case "status":
         return { ok: true, value: await this.runtimeStatus(request.sessionId) };
       case "tail":
@@ -3333,11 +3344,6 @@ var AssistantDaemon = class {
       agentVersion,
       updatedAt: Date.now()
     };
-    const pendingClaim = this.pendingAgentSessionClaims.get(sessionId);
-    if (pendingClaim) {
-      const claimed = this.claimStartingAgentSession(session, pendingClaim);
-      if (!claimed.ok) return claimed;
-    }
     if (resume && resume.mode !== "picker") {
       const initialClaim = await context.stage(
         "agent-identity",
@@ -3376,11 +3382,6 @@ var AssistantDaemon = class {
       ));
       await this.rememberSessionWorkspace(session.cwd);
     }
-    const lateClaim = this.pendingAgentSessionClaims.get(sessionId);
-    if (lateClaim) {
-      const claimed = this.claimStartingAgentSession(session, lateClaim);
-      if (!claimed.ok) return claimed;
-    }
     try {
       await context.stage("metadata", () => this.tmux.writeMetadata(pane.sessionName, {
         managed: true,
@@ -4654,20 +4655,56 @@ ${escapeFence2(output).slice(-6500)}
     if (session && session.agent !== candidate.agent) {
       return { ok: false, error: "agent-session candidate does not match managed session" };
     }
-    const owner = this.findAgentSessionOwner(candidate.agent, candidate.agentSessionId, candidate.sessionId);
-    if (owner) {
+    if (!session) {
       this.pendingAgentSessionClaims.set(candidate.sessionId, candidate);
       await this.log(
-        `agent session conflict: session=${candidate.sessionId} agent=${candidate.agent} agentSession=${candidate.agentSessionId} owner=${owner.id}`
+        `agent session hook candidate awaiting managed session: session=${candidate.sessionId} agent=${candidate.agent} agentSession=${candidate.agentSessionId}`
       );
-      setTimeout(() => void this.rejectDuplicateAgentSession(candidate, owner), 100);
-      return fail(agentSessionInUse(candidate.sessionId, owner.id, candidate.agentSessionId));
+      return { ok: true };
     }
-    if (!session) {
-      this.pendingAgentSessionClaims.set(candidate.sessionId, candidate);
+    if (session.agentSessionId) {
+      this.pendingAgentSessionClaims.delete(session.id);
+      if (session.agentSessionId !== candidate.agentSessionId) {
+        await this.log(
+          `ignored agent session hook candidate: session=${session.id} agent=${session.agent} hookSession=${candidate.agentSessionId} confirmedSession=${session.agentSessionId}`
+        );
+      }
       return { ok: true };
     }
-    if (session.agentSessionId === candidate.agentSessionId) return { ok: true };
+    this.pendingAgentSessionClaims.set(candidate.sessionId, candidate);
+    const agentSessionId = await this.resolvePaneNativeAgentSessionId(session);
+    if (!agentSessionId) return { ok: true };
+    if (agentSessionId !== candidate.agentSessionId) {
+      await this.log(
+        `ignored stale agent session hook candidate: session=${session.id} agent=${session.agent} hookSession=${candidate.agentSessionId} pidSession=${agentSessionId}`
+      );
+    }
+    const confirmed = { ...candidate, agentSessionId, source: "pid-confirmed" };
+    const owner = this.findAgentSessionOwner(session.agent, agentSessionId, session.id);
+    if (owner) {
+      await this.log(
+        `confirmed agent session conflict: session=${session.id} agent=${session.agent} agentSession=${agentSessionId} owner=${owner.id}`
+      );
+      await this.rejectDuplicateAgentSession(confirmed, owner);
+      return fail(agentSessionInUse(session.id, owner.id, agentSessionId));
+    }
+    return this.persistConfirmedAgentSessionClaim(session, confirmed);
+  }
+  async resolvePaneNativeAgentSessionId(session) {
+    let pane;
+    try {
+      pane = await this.tmux.inspect(session.paneId);
+    } catch (error) {
+      void this.log(`failed to inspect pane for native session: session=${session.id} error=${errorMessage3(error)}`);
+      return void 0;
+    }
+    if (!pane || pane.dead) return void 0;
+    return resolveNativeAgentSessionId(session.agent, pane.pid).catch((error) => {
+      void this.log(`failed to resolve native agent session for ${session.id}: ${errorMessage3(error)}`);
+      return void 0;
+    });
+  }
+  async persistConfirmedAgentSessionClaim(session, candidate) {
     const updated = { ...session, agentSessionId: candidate.agentSessionId, updatedAt: Date.now() };
     this.state = {
       ...this.state,
@@ -4692,12 +4729,7 @@ ${escapeFence2(output).slice(-6500)}
   async refreshNativeAgentSessionClaims() {
     for (const session of Object.values(this.state.sessions ?? {})) {
       if (session.agentSessionId) continue;
-      const pane = await this.tmux.inspect(session.paneId);
-      if (!pane || pane.dead) continue;
-      const agentSessionId = await resolveNativeAgentSessionId(session.agent, pane.pid).catch((error) => {
-        void this.log(`failed to resolve native agent session for ${session.id}: ${errorMessage3(error)}`);
-        return void 0;
-      });
+      const agentSessionId = await this.resolvePaneNativeAgentSessionId(session);
       if (!agentSessionId) continue;
       await this.handleAgentSessionStarted({
         sessionId: session.id,
@@ -4717,11 +4749,6 @@ ${escapeFence2(output).slice(-6500)}
         session.agentSessionId = committedClaim2;
         return { ok: true };
       }
-      const pending2 = this.pendingAgentSessionClaims.get(session.id);
-      if (pending2) {
-        const claimed = this.claimStartingAgentSession(session, pending2);
-        if (!claimed.ok || session.agentSessionId) return claimed;
-      }
       if (signal?.aborted) throw signal.reason;
       const pane2 = await this.tmux.inspect(session.paneId, signal);
       if (signal?.aborted) throw signal.reason;
@@ -4746,8 +4773,6 @@ ${escapeFence2(output).slice(-6500)}
     const pane = await this.tmux.inspect(session.paneId, signal);
     if (signal?.aborted) throw signal.reason;
     if (!pane || pane.dead) return fail(await this.startupExitedError(session, pane));
-    const pending = this.pendingAgentSessionClaims.get(session.id);
-    if (pending) return this.claimStartingAgentSession(session, pending);
     const committedClaim = this.state.sessions?.[session.id]?.agentSessionId;
     if (committedClaim) {
       session.agentSessionId = committedClaim;
@@ -4900,6 +4925,22 @@ ${output}`
       ).catch((error) => this.log(`exit notification failed: ${errorMessage3(error)}`));
     }
     this.state = result2.state;
+    for (const removed of result2.removedSessions) {
+      const exitStatus = removed.pane?.exitStatus;
+      if (exitStatus === void 0 || exitStatus === 0) continue;
+      const terminalExcerpt = startupTerminalExcerpt(tailScreen(removed.terminalOutput ?? "", 80).slice(-3e3));
+      await this.rememberSessionExitEvent({
+        sessionId: removed.session.id,
+        agent: removed.session.agent,
+        reason: "agent-exited",
+        exitStatus,
+        terminalExcerpt: terminalExcerpt || void 0,
+        occurredAt: Date.now()
+      });
+      await this.log(
+        `agent exited: session=${removed.session.id} agent=${removed.session.agent} exit=${exitStatus}`
+      );
+    }
     for (const sessionId of this.pendingResumePickers.keys()) {
       if (!this.state.sessions?.[sessionId]) this.pendingResumePickers.delete(sessionId);
     }