opencode-pilot 0.24.7 → 0.24.9

package/Formula/opencode-pilot.rb

@@ -1,8 +1,8 @@
 class OpencodePilot < Formula
   desc "Automation daemon for OpenCode - polls GitHub/Linear issues and spawns sessions"
   homepage "https://github.com/athal7/opencode-pilot"
-  url "https://github.com/athal7/opencode-pilot/archive/refs/tags/v0.24.6.tar.gz"
-  sha256 "60f487bfbe6209da3687d854b848b920791dde739046fd72bf75594d6e5e6163"
+  url "https://github.com/athal7/opencode-pilot/archive/refs/tags/v0.24.8.tar.gz"
+  sha256 "23b550fd74fee8f2fd8c60c8358f67065ee77af921fdc3bc2ff26a6cfef68ae6"
   license "MIT"
 
   depends_on "node"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-pilot",
-  "version": "0.24.7",
+  "version": "0.24.9",
   "type": "module",
   "main": "plugin/index.js",
   "description": "Automation daemon for OpenCode - polls for work and spawns sessions",

package/service/actions.js

@@ -882,10 +882,15 @@ async function executeInDirectory(serverUrl, cwd, item, config, options = {}, pr
     }
   }
   
-  // Check if we should try to reuse an existing session
+  // Check if we should try to reuse an existing session.
+  // Skip reuse when working in a worktree (projectDirectory differs from cwd),
+  // because querying by worktree dir finds old sessions with projectID "global",
+  // and querying by project dir finds unrelated sessions for other PRs.
+  // Each worktree should get its own correctly-scoped session.
   const reuseActiveSession = config.reuse_active_session !== false; // default true
+  const inWorktree = projectDirectory && projectDirectory !== cwd;
   
-  if (reuseActiveSession && !options.dryRun) {
+  if (reuseActiveSession && !inWorktree && !options.dryRun) {
     const existingSession = await findReusableSession(serverUrl, cwd, { fetch: options.fetch });
     
     if (existingSession) {

package/test/integration/session-reuse.test.js

@@ -621,6 +621,64 @@ describe("integration: worktree creation with worktree_name", () => {
     // Session creation uses the project directory (for correct projectID scoping)
     assert.strictEqual(sessionDirectory, "/proj", "Session should be scoped to project directory");
   });
+
+  it("skips session reuse when working in a worktree", async () => {
+    // When working in a worktree (projectDirectory differs from cwd), session
+    // reuse is skipped entirely. Querying by worktree dir finds old sessions
+    // with projectID "global", querying by project dir finds unrelated sessions
+    // for other PRs. Each worktree should get its own correctly-scoped session.
+    
+    let sessionListQueried = false;
+    let sessionCreated = false;
+    let sessionCreateDirectory = null;
+    
+    const existingWorktreeDir = "/worktree/calm-wizard";
+    
+    mockServer = await createMockServer({
+      "GET /project": () => ({
+        body: [{ id: "proj_1", worktree: "/proj", sandboxes: [], time: { created: 1 } }],
+      }),
+      "GET /project/current": () => ({
+        body: { id: "proj_1", worktree: "/proj", sandboxes: [], time: { created: 1 } },
+      }),
+      "GET /experimental/worktree": () => ({
+        body: [existingWorktreeDir],
+      }),
+      "GET /session": () => {
+        sessionListQueried = true;
+        return { body: [] };
+      },
+      "GET /session/status": () => ({ body: {} }),
+      "POST /session": (req) => {
+        sessionCreated = true;
+        sessionCreateDirectory = req.query?.directory;
+        return { body: { id: "ses_new" } };
+      },
+      "PATCH /session/ses_new": () => ({ body: {} }),
+      "POST /session/ses_new/message": () => ({ body: { success: true } }),
+      "POST /session/ses_new/command": () => ({ body: { success: true } }),
+    });
+
+    const result = await executeAction(
+      { number: 42, title: "Review PR" },
+      { 
+        path: "/proj", 
+        prompt: "review",
+        worktree_name: "pr-{number}",
+        existing_directory: existingWorktreeDir,
+      },
+      { discoverServer: async () => mockServer.url }
+    );
+
+    assert.ok(result.success, "Action should succeed");
+    // Should NOT query for existing sessions when in a worktree
+    assert.strictEqual(sessionListQueried, false,
+      "Should skip session reuse entirely when in a worktree");
+    // Should create a new session scoped to the project directory
+    assert.ok(sessionCreated, "Should create a new session");
+    assert.strictEqual(sessionCreateDirectory, "/proj",
+      "New session should be scoped to project directory");
+  });
 });
 
 describe("integration: cross-source deduplication", () => {