opencode-pilot 0.24.7 → 0.24.8

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.7.tar.gz"
+  sha256 "3d97d488ca8695f9785171e767b8a7a3eb65d2a8c5aca9eab3862b70cf6fc144"
   license "MIT"
 
   depends_on "node"

package/package.json

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

package/service/actions.js

@@ -639,17 +639,26 @@ export async function sendMessageToSession(serverUrl, sessionId, directory, prom
  * @param {string} directory - Working directory to match
  * @param {object} [options] - Options
  * @param {function} [options.fetch] - Custom fetch function (for testing)
+ * @param {string} [options.projectDirectory] - Project directory for session lookup
+ *   (used instead of directory when provided, so sessions created with the project
+ *   directory are found instead of old worktree-scoped sessions)
  * @returns {Promise<object|null>} Session to reuse, or null
  */
 export async function findReusableSession(serverUrl, directory, options = {}) {
+  // Use project directory for session lookup when available.
+  // Sessions created with v0.24.7+ are scoped to the project directory,
+  // while messages use the worktree directory. Query the project directory
+  // to find correctly-scoped sessions.
+  const lookupDirectory = options.projectDirectory || directory;
+  
   // Get sessions for this directory
   const sessions = await listSessions(serverUrl, { 
-    directory, 
+    directory: lookupDirectory, 
     fetch: options.fetch 
   });
   
   if (sessions.length === 0) {
-    debug(`findReusableSession: no sessions found for ${directory}`);
+    debug(`findReusableSession: no sessions found for ${lookupDirectory}`);
     return null;
   }
   
@@ -657,11 +666,11 @@ export async function findReusableSession(serverUrl, directory, options = {}) {
   const activeSessions = sessions.filter(s => !isSessionArchived(s));
   
   if (activeSessions.length === 0) {
-    debug(`findReusableSession: all ${sessions.length} sessions are archived for ${directory}`);
+    debug(`findReusableSession: all ${sessions.length} sessions are archived for ${lookupDirectory}`);
     return null;
   }
   
-  debug(`findReusableSession: found ${activeSessions.length} active sessions for ${directory}`);
+  debug(`findReusableSession: found ${activeSessions.length} active sessions for ${lookupDirectory}`);
   
   // Get statuses to prefer idle sessions
   const statuses = await getSessionStatuses(serverUrl, { fetch: options.fetch });
@@ -886,7 +895,10 @@ async function executeInDirectory(serverUrl, cwd, item, config, options = {}, pr
   const reuseActiveSession = config.reuse_active_session !== false; // default true
   
   if (reuseActiveSession && !options.dryRun) {
-    const existingSession = await findReusableSession(serverUrl, cwd, { fetch: options.fetch });
+    const existingSession = await findReusableSession(serverUrl, cwd, { 
+      fetch: options.fetch,
+      projectDirectory: projectDirectory,
+    });
     
     if (existingSession) {
       debug(`executeInDirectory: found reusable session ${existingSession.id} for ${cwd}`);

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

@@ -621,6 +621,71 @@ 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("session reuse queries by project directory, not worktree directory", async () => {
+    // This tests the key fix: when reprocessing an item with a worktree,
+    // findReusableSession should query by the project directory (e.g., /proj)
+    // so it finds sessions created with correct scoping (v0.24.7+), rather
+    // than finding old sessions created with the worktree directory (projectID "global").
+    
+    let sessionQueryDirectory = null;
+    let sessionCreated = false;
+    
+    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": (req) => {
+        sessionQueryDirectory = req.directory;
+        // Return a session ONLY if queried by project directory
+        if (req.directory === "/proj") {
+          return {
+            body: [{ id: "ses_proj_scoped", directory: "/proj", time: { created: 1000, updated: 2000 } }],
+          };
+        }
+        // Old worktree-scoped sessions should NOT be found when querying by project dir
+        return { body: [] };
+      },
+      "GET /session/status": () => ({ body: {} }),
+      "POST /session": (req) => {
+        sessionCreated = true;
+        return { body: { id: "ses_new" } };
+      },
+      "PATCH /session/ses_proj_scoped": () => ({ body: {} }),
+      "POST /session/ses_proj_scoped/message": () => ({ body: { success: true } }),
+      "POST /session/ses_proj_scoped/command": () => ({ body: { success: true } }),
+      "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");
+    // The session lookup should use the PROJECT directory, not the worktree directory
+    assert.strictEqual(sessionQueryDirectory, "/proj",
+      "findReusableSession should query by project directory, not worktree");
+    // Should reuse the project-scoped session, NOT create a new one
+    assert.strictEqual(result.sessionReused, true, "Should reuse the project-scoped session");
+    assert.strictEqual(sessionCreated, false, "Should NOT create a new session when project-scoped session exists");
+  });
 });
 
 describe("integration: cross-source deduplication", () => {

package/test/unit/actions.test.js

@@ -2147,6 +2147,60 @@ Check for bugs and security issues.`;
       assert.strictEqual(result.id, 'ses_new');
     });
 
+    test('uses projectDirectory for session lookup when provided', async () => {
+      const { findReusableSession } = await import('../../service/actions.js');
+      
+      let queriedDirectory = null;
+      const mockFetch = async (url) => {
+        if (url.includes('/session/status')) {
+          return { ok: true, json: async () => ({}) };
+        }
+        // Capture the directory used in the session query
+        const urlObj = new URL(url);
+        queriedDirectory = urlObj.searchParams.get('directory');
+        return {
+          ok: true,
+          json: async () => [
+            { id: 'ses_proj', time: { created: 1000, updated: 2000 } },
+          ],
+        };
+      };
+      
+      const result = await findReusableSession('http://localhost:4096', '/worktree/pr-415', { 
+        fetch: mockFetch,
+        projectDirectory: '/home/user/code/odin',
+      });
+      
+      assert.strictEqual(result.id, 'ses_proj');
+      assert.strictEqual(queriedDirectory, '/home/user/code/odin',
+        'Should query sessions using projectDirectory, not the worktree directory');
+    });
+
+    test('falls back to directory when projectDirectory not provided', async () => {
+      const { findReusableSession } = await import('../../service/actions.js');
+      
+      let queriedDirectory = null;
+      const mockFetch = async (url) => {
+        if (url.includes('/session/status')) {
+          return { ok: true, json: async () => ({}) };
+        }
+        const urlObj = new URL(url);
+        queriedDirectory = urlObj.searchParams.get('directory');
+        return {
+          ok: true,
+          json: async () => [
+            { id: 'ses_1', time: { created: 1000, updated: 2000 } },
+          ],
+        };
+      };
+      
+      const result = await findReusableSession('http://localhost:4096', '/test/dir', { fetch: mockFetch });
+      
+      assert.strictEqual(result.id, 'ses_1');
+      assert.strictEqual(queriedDirectory, '/test/dir',
+        'Should query sessions using directory when projectDirectory not provided');
+    });
+
     test('falls back to busy session when no idle available', async () => {
       const { findReusableSession } = await import('../../service/actions.js');