squadrant 0.20.0 → 0.20.2

package/dist/index.js

@@ -11887,6 +11887,7 @@ var init_api_key_approval = __esm({
 var OpencodeHttpChannel;
 var init_http_channel = __esm({
   "packages/agents/dist/opencode/http-channel.js"() {
+    init_dist2();
     OpencodeHttpChannel = class {
       name = "opencode-http";
       agent = "opencode";
@@ -11895,12 +11896,16 @@ var init_http_channel = __esm({
       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;
       }
@@ -11953,11 +11958,24 @@ var init_http_channel = __esm({
        * 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 path39 of ["/session?", "/api/session?"]) {
           let res;
           try {
@@ -11975,11 +11993,11 @@ var init_http_channel = __esm({
           }
           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;
       }
@@ -14659,7 +14677,57 @@ function writePerCrewOpencodeConfig(o) {
       websearch: "allow",
       task: "allow",
       lsp: "allow",
-      external_directory: { "**": "allow" }
+      // unlike most permission keys, external_directory defaults to "ask" in
+      // opencode. The catch-all is deliberately "ask" (not "allow") so unknown
+      // external paths stay human-gated — least privilege. Trusted AI/config/
+      // memory/tmp dirs are allow-listed explicitly below; each dir is listed
+      // both as the bare path AND as `<dir>/**`, so the directory itself is
+      // reachable, not only its contents.
+      //
+      // Ordering: opencode evaluates patterns last-match-wins, so the catch-all
+      // goes FIRST and the specific allows follow. If a future version resolves
+      // first-match instead, the failure mode is over-prompting (visible, safe)
+      // rather than a silent allow-all (invisible, unsafe).
+      external_directory: {
+        "**": "ask",
+        "/tmp": "allow",
+        "/tmp/**": "allow",
+        "/private/tmp": "allow",
+        "/private/tmp/**": "allow",
+        "/var/folders": "allow",
+        "/var/folders/**": "allow",
+        "~/.config/squadrant": "allow",
+        "~/.config/squadrant/**": "allow",
+        "~/.config/opencode": "allow",
+        "~/.config/opencode/**": "allow",
+        "~/.config/cmux": "allow",
+        "~/.config/cmux/**": "allow",
+        "~/.opencode": "allow",
+        "~/.opencode/**": "allow",
+        "~/.local/share/opencode": "allow",
+        "~/.local/share/opencode/**": "allow",
+        "~/.local/share/claude": "allow",
+        "~/.local/share/claude/**": "allow",
+        "~/.cache/opencode": "allow",
+        "~/.cache/opencode/**": "allow",
+        "~/.claude": "allow",
+        "~/.claude/**": "allow",
+        "~/.claude.json": "allow",
+        "~/squadrant-hub": "allow",
+        "~/squadrant-hub/**": "allow",
+        "~/.claude-mem": "allow",
+        "~/.claude-mem/**": "allow",
+        "~/.agents": "allow",
+        "~/.agents/**": "allow",
+        "~/.cmuxterm": "allow",
+        "~/.cmuxterm/**": "allow",
+        "~/.codex": "allow",
+        "~/.codex/**": "allow",
+        "~/.cursor": "allow",
+        "~/.cursor/**": "allow",
+        "~/.gemini": "allow",
+        "~/.gemini/**": "allow"
+      }
     }
   };
   writeFileSync11(file, JSON.stringify(config, null, 2));
@@ -15974,6 +16042,14 @@ async function runCrewSend2(project, name, message, opts) {
   const controlChannels = [
     new OpencodeHttpChannel({
       portFor: (taskId) => tasks.find((t) => t.id === taskId)?.serverPort,
+      // #787: scope resolution to the crew's own worktree (TaskRecord.cwd).
+      // opencode's GET /session is project-scoped, so without this the channel
+      // can target a newer sibling crew's / the captain's session.
+      directoryFor: (taskId) => tasks.find((t) => t.id === taskId)?.cwd,
+      // #789: opencode creates sessions lazily, so a reused worktree dir can hold
+      // a prior crew's session. Gate on the crew's createdAt so a stale session
+      // the live TUI is not showing is never selected.
+      createdAfterFor: (taskId) => tasks.find((t) => t.id === taskId)?.createdAt,
       log: (m) => console.error(chalk10.dim(m))
     }),
     new ClaudePeerChannel({
@@ -18016,6 +18092,10 @@ var launchCommand = new Command14("launch").description(
       hadFailure = true;
       return;
     }
+    let captainOpencodeConfigPath;
+    if (isOpencodeCaptain && projectName) {
+      captainOpencodeConfigPath = writePerCrewOpencodeConfig({ stateRoot, project: projectName, taskId: "captain" });
+    }
     const priorRecord = projectName ? readCaptainAddress(stateRoot, projectName) : null;
     const captainPort = isOpencodeCaptain ? await getFreePort() : void 0;
     let opencodeResumeSessionId;
@@ -18036,7 +18116,7 @@ var launchCommand = new Command14("launch").description(
           }
           const captainBoot = isOpencodeCaptain ? { port: captainPort, sessionId: pickResumeSessionId(priorRecord, "opencode", forceFresh) } : void 0;
           opencodeResumeSessionId = captainBoot?.sessionId;
-          return buildAgentCmd(
+          const baseCmd = buildAgentCmd(
             agentName,
             registry,
             role,
@@ -18049,6 +18129,7 @@ var launchCommand = new Command14("launch").description(
             thinking,
             captainBoot
           );
+          return captainOpencodeConfigPath ? `OPENCODE_CONFIG=${captainOpencodeConfigPath} ${baseCmd}` : baseCmd;
         },
         initialPrompt,
         runtime,