opencode-pilot 0.24.8 → 0.24.10

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.7.tar.gz"
-  sha256 "3d97d488ca8695f9785171e767b8a7a3eb65d2a8c5aca9eab3862b70cf6fc144"
+  url "https://github.com/athal7/opencode-pilot/archive/refs/tags/v0.24.9.tar.gz"
+  sha256 "b477a5677fb80456db3f4f6464dd2071d0efb56bdd29b8a8fc01e5d56638f588"
   license "MIT"
 
   depends_on "node"

package/package.json

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

package/service/actions.js

@@ -639,26 +639,17 @@ 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: lookupDirectory, 
+    directory, 
     fetch: options.fetch 
   });
   
   if (sessions.length === 0) {
-    debug(`findReusableSession: no sessions found for ${lookupDirectory}`);
+    debug(`findReusableSession: no sessions found for ${directory}`);
     return null;
   }
   
@@ -666,11 +657,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 ${lookupDirectory}`);
+    debug(`findReusableSession: all ${sessions.length} sessions are archived for ${directory}`);
     return null;
   }
   
-  debug(`findReusableSession: found ${activeSessions.length} active sessions for ${lookupDirectory}`);
+  debug(`findReusableSession: found ${activeSessions.length} active sessions for ${directory}`);
   
   // Get statuses to prefer idle sessions
   const statuses = await getSessionStatuses(serverUrl, { fetch: options.fetch });
@@ -696,16 +687,17 @@ export async function findReusableSession(serverUrl, directory, options = {}) {
 export async function createSessionViaApi(serverUrl, directory, prompt, options = {}) {
   const fetchFn = options.fetch || fetch;
   const headerTimeout = options.headerTimeout || HEADER_TIMEOUT_MS;
-  // Use project directory for session creation (determines projectID in OpenCode).
-  // The working directory (which may be a worktree) is used for messages/commands.
   const projectDir = options.projectDirectory || directory;
   
   let session = null;
   
   try {
-    // Step 1: Create session scoped to the project directory
+    // Step 1: Create session with the working directory (may be a worktree).
+    // This sets the session's working directory so the agent operates in the
+    // correct location. For worktree sessions, the server may assign
+    // projectID 'global' since sandbox paths don't match project worktrees.
     const sessionUrl = new URL('/session', serverUrl);
-    sessionUrl.searchParams.set('directory', projectDir);
+    sessionUrl.searchParams.set('directory', directory);
     
     const createResponse = await fetchFn(sessionUrl.toString(), {
       method: 'POST',
@@ -721,14 +713,20 @@ export async function createSessionViaApi(serverUrl, directory, prompt, options
     session = await createResponse.json();
     debug(`createSessionViaApi: created session ${session.id} in ${directory}`);
     
-    // Step 2: Update session title if provided
-    if (options.title) {
+    // Step 2: Update session - always PATCH with project directory when it
+    // differs from the working directory (worktree case). This re-associates
+    // the session with the correct project so it appears in the UI.
+    // Also set the title if provided.
+    const needsProjectScoping = projectDir !== directory;
+    if (options.title || needsProjectScoping) {
       const updateUrl = new URL(`/session/${session.id}`, serverUrl);
       updateUrl.searchParams.set('directory', projectDir);
+      const patchBody = {};
+      if (options.title) patchBody.title = options.title;
       await fetchFn(updateUrl.toString(), {
         method: 'PATCH',
         headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ title: options.title }),
+        body: JSON.stringify(patchBody),
       });
     }
     
@@ -891,14 +889,16 @@ 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) {
-    const existingSession = await findReusableSession(serverUrl, cwd, { 
-      fetch: options.fetch,
-      projectDirectory: projectDirectory,
-    });
+  if (reuseActiveSession && !inWorktree && !options.dryRun) {
+    const existingSession = await findReusableSession(serverUrl, cwd, { fetch: options.fetch });
     
     if (existingSession) {
       debug(`executeInDirectory: found reusable session ${existingSession.id} for ${cwd}`);

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

@@ -564,9 +564,9 @@ describe("integration: worktree creation with worktree_name", () => {
     assert.ok(worktreeCreateCalled, "Should create worktree when worktree_name is configured");
     assert.strictEqual(createdWorktreeName, "pr-42", "Should expand worktree_name template");
     assert.ok(sessionCreated, "Should create session");
-    // Session creation uses the project directory (for correct projectID scoping)
-    // The worktree path is used for messages/commands (file operations)
-    assert.strictEqual(sessionDirectory, "/proj", "Session should be scoped to project directory");
+    // Session creation uses the worktree directory (sets working directory)
+    // The PATCH with project directory re-associates it with the correct project
+    assert.strictEqual(sessionDirectory, "/worktree/pr-42", "Session should be created in worktree directory");
   });
 
   it("reuses stored directory when reprocessing same item", async () => {
@@ -618,18 +618,20 @@ describe("integration: worktree creation with worktree_name", () => {
     assert.ok(result.success, "Action should succeed");
     // Should NOT create a new worktree since we have existing_directory
     assert.strictEqual(worktreeCreateCalled, false, "Should NOT create new worktree when existing_directory provided");
-    // Session creation uses the project directory (for correct projectID scoping)
-    assert.strictEqual(sessionDirectory, "/proj", "Session should be scoped to project directory");
+    // Session creation uses the existing worktree directory (sets working directory)
+    assert.strictEqual(sessionDirectory, existingWorktreeDir, "Session should be created in existing worktree 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").
+  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 sessionQueryDirectory = null;
+    let sessionListQueried = false;
     let sessionCreated = false;
+    let sessionCreateDirectory = null;
+    let patchDirectory = null;
     
     const existingWorktreeDir = "/worktree/calm-wizard";
     
@@ -643,26 +645,20 @@ describe("integration: worktree creation with worktree_name", () => {
       "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
+      "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_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: {} }),
+      "PATCH /session/ses_new": (req) => {
+        patchDirectory = req.query?.directory;
+        return { body: {} };
+      },
       "POST /session/ses_new/message": () => ({ body: { success: true } }),
       "POST /session/ses_new/command": () => ({ body: { success: true } }),
     });
@@ -679,12 +675,16 @@ describe("integration: worktree creation with worktree_name", () => {
     );
 
     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");
+    // 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 with the worktree directory (correct working dir)
+    assert.ok(sessionCreated, "Should create a new session");
+    assert.strictEqual(sessionCreateDirectory, existingWorktreeDir,
+      "Session should be created in worktree directory");
+    // PATCH re-associates the session with the correct project
+    assert.strictEqual(patchDirectory, "/proj",
+      "PATCH should use project directory for correct project scoping");
   });
 });
 

package/test/unit/actions.test.js

@@ -981,9 +981,9 @@ Check for bugs and security issues.`;
       // Should NOT call worktree endpoints when existing_directory is provided
       assert.strictEqual(worktreeListCalled, false, 'Should NOT list worktrees');
       assert.strictEqual(worktreeCreateCalled, false, 'Should NOT create worktree');
-      // Session creation uses project directory (for correct projectID scoping)
-      assert.strictEqual(sessionDirectory, '/data/proj', 
-        'Session creation should use project directory, not worktree');
+      // Session creation uses the worktree directory (sets correct working directory)
+      assert.strictEqual(sessionDirectory, '/data/worktree/calm-wizard', 
+        'Session creation should use worktree directory for correct working dir');
       // Result directory is the worktree (where file operations happen)
       assert.strictEqual(result.directory, '/data/worktree/calm-wizard',
         'Result should include worktree directory');
@@ -1042,11 +1042,12 @@ Check for bugs and security issues.`;
       assert.ok(messageUrl.includes('%2Fpath%2Fto%2Fproject'), 'Message URL should include encoded directory path');
     });
 
-    test('uses projectDirectory for session creation, working directory for messages', async () => {
+    test('creates session with worktree directory, patches with project directory for scoping', async () => {
       const { createSessionViaApi } = await import('../../service/actions.js');
       
       const mockSessionId = 'ses_test_proj';
       let createUrl = null;
+      let patchUrl = null;
       let messageUrl = null;
       
       const mockFetch = async (url, opts) => {
@@ -1057,6 +1058,11 @@ Check for bugs and security issues.`;
           return { ok: true, json: async () => ({ id: mockSessionId }) };
         }
         
+        if (urlObj.pathname.includes(`/session/${mockSessionId}`) && opts?.method === 'PATCH') {
+          patchUrl = url;
+          return { ok: true, json: async () => ({}) };
+        }
+        
         if (urlObj.pathname.includes('/message') && opts?.method === 'POST') {
           messageUrl = url;
           return { ok: true, json: async () => ({ success: true }) };
@@ -1075,13 +1081,18 @@ Check for bugs and security issues.`;
         }
       );
       
-      // Session creation should use the project directory (for correct projectID scoping)
-      assert.ok(createUrl.includes('%2Fhome%2Fuser%2Fcode%2Fodin'), 
-        'Session creation should use projectDirectory');
-      assert.ok(!createUrl.includes('worktree'), 
-        'Session creation should NOT use the worktree path');
+      // Session creation should use the worktree directory (sets working directory)
+      assert.ok(createUrl.includes('worktree'), 
+        'Session creation should use the worktree path');
+      assert.ok(createUrl.includes('pr-415'), 
+        'Session creation should use the worktree path');
       
-      // Message should use the working directory (for file operations in the worktree)
+      // PATCH should use the project directory (re-associates with correct project)
+      assert.ok(patchUrl, 'PATCH should be called for project scoping');
+      assert.ok(patchUrl.includes('%2Fhome%2Fuser%2Fcode%2Fodin'), 
+        'PATCH should use projectDirectory for project scoping');
+      
+      // Message should use the working directory (worktree)
       assert.ok(messageUrl.includes('worktree'), 
         'Message should use the worktree working directory');
       assert.ok(messageUrl.includes('pr-415'), 
@@ -2147,60 +2158,6 @@ 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');