squadrant 0.20.1 → 0.20.2

package/dist/squadrantd.js

@@ -9628,6 +9628,7 @@ import os12 from "os";
 import path20 from "path";
 
 // packages/agents/dist/opencode/http-channel.js
+init_dist2();
 var OpencodeHttpChannel = class {
   name = "opencode-http";
   agent = "opencode";
@@ -9636,12 +9637,16 @@ var OpencodeHttpChannel = class {
   fetchImpl;
   portFor;
   sessionFor;
+  directoryFor;
+  createdAfterFor;
   timeoutMs;
   log;
   constructor(deps) {
     this.fetchImpl = deps.fetchImpl ?? fetch;
     this.portFor = deps.portFor;
     this.sessionFor = deps.sessionFor;
+    this.directoryFor = deps.directoryFor;
+    this.createdAfterFor = deps.createdAfterFor;
     this.timeoutMs = deps.timeoutMs ?? 5e3;
     this.log = deps.log;
   }
@@ -9694,11 +9699,24 @@ var OpencodeHttpChannel = class {
    * are tried. This is a capability probe, NOT a version comparison — the honest
    * check is "does this route answer", and neither path is a promised-stable
    * contract. Re-run the smoke suite when opencode is upgraded.
+   *
+   * #787: when the crew's directory is known, resolve by EXACT directory
+   * (realpath-normalized) and never fall back to the project-wide newest.
+   * GET /session is project-scoped (shared by every worktree of the repo), so
+   * "newest" can be a sibling crew's — prompt_async at that id would run the
+   * message in the wrong session.
+   *
+   * #789: opencode creates a session lazily (nothing exists until the first turn),
+   * so a reused worktree dir can hold a prior crew's session. When the crew's
+   * createdAt is known, also require the candidate to have been created at/after
+   * it — otherwise a send resolves a stale session the live TUI is not showing.
    */
   async resolveSession(taskId, port) {
     const cached = this.sessionByTask.get(taskId);
     if (cached)
       return cached;
+    const directory = this.directoryFor?.(taskId);
+    const createdAfterMs = this.createdAfterFor?.(taskId);
     for (const path23 of ["/session?", "/api/session?"]) {
       let res;
       try {
@@ -9716,11 +9734,11 @@ var OpencodeHttpChannel = class {
       }
       if (!Array.isArray(sessions) || sessions.length === 0)
         continue;
-      const newest = sessions.reduce((a, b) => (b.time?.updated ?? 0) > (a.time?.updated ?? 0) ? b : a);
-      if (!newest?.id)
+      const resolved = directory ? newestSessionInDirectory(sessions, directory, createdAfterMs) : sessions.reduce((a, b) => (b.time?.updated ?? 0) > (a.time?.updated ?? 0) ? b : a).id;
+      if (!resolved)
         continue;
-      this.sessionByTask.set(taskId, newest.id);
-      return newest.id;
+      this.sessionByTask.set(taskId, resolved);
+      return resolved;
     }
     return void 0;
   }