opencode-pilot 0.9.2 → 0.10.0

package/README.md

@@ -45,6 +45,7 @@ See [examples/config.yaml](examples/config.yaml) for a complete example with all
 
 ### Key Sections
 
+- **`server_port`** - Preferred OpenCode server port (e.g., `4096`). When multiple OpenCode instances are running, pilot attaches sessions to this port.
 - **`defaults`** - Default values applied to all sources
 - **`sources`** - What to poll (presets, shorthand, or full config)
 - **`tools`** - Field mappings to normalize different MCP APIs

package/examples/config.yaml

@@ -1,6 +1,11 @@
 # Example config.yaml for opencode-pilot
 # Copy to ~/.config/opencode-pilot/config.yaml
 
+# Preferred OpenCode server port for attaching sessions
+# When multiple OpenCode instances are running, pilot will attach new sessions
+# to this port. If not set, pilot discovers servers automatically.
+# server_port: 4096
+
 defaults:
   agent: plan
   prompt: default

package/package.json

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

package/service/actions.js

@@ -9,6 +9,7 @@ import { spawn, execSync } from "child_process";
 import { readFileSync, existsSync } from "fs";
 import { debug } from "./logger.js";
 import { getNestedValue } from "./utils.js";
+import { getServerPort } from "./repo-config.js";
 import path from "path";
 import os from "os";
 
@@ -99,23 +100,27 @@ function isServerHealthy(project) {
  * Discover a running opencode server that matches the target directory
  * 
  * Queries all running opencode servers and finds the best match based on:
- * 1. Exact sandbox match (highest priority)
- * 2. Exact worktree match
- * 3. Target is subdirectory of worktree
+ * 1. Configured server_port (highest priority if set and healthy)
+ * 2. Exact sandbox match
+ * 3. Exact worktree match
+ * 4. Target is subdirectory of worktree
+ * 5. Global server (worktree="/") as fallback
  * 
- * NOTE: Global servers (worktree="/") are NOT used - sessions spawned via
- * pilot should run in isolated mode rather than attach to the global project,
- * since the global project doesn't have the right working directory context.
+ * Global servers are used as a fallback when no project-specific match is found,
+ * since OpenCode Desktop may be connected to a global server that can display
+ * sessions for any project.
  * 
  * @param {string} targetDir - The directory we want to work in
  * @param {object} [options] - Options for testing/mocking
  * @param {function} [options.getPorts] - Function to get server ports
  * @param {function} [options.fetch] - Function to fetch URLs
+ * @param {number} [options.preferredPort] - Preferred port to use (overrides config)
  * @returns {Promise<string|null>} Server URL (e.g., "http://localhost:4096") or null
  */
 export async function discoverOpencodeServer(targetDir, options = {}) {
   const getPorts = options.getPorts || getOpencodePorts;
   const fetchFn = options.fetch || fetch;
+  const preferredPort = options.preferredPort ?? getServerPort();
   
   const ports = await getPorts();
   if (ports.length === 0) {
@@ -123,10 +128,28 @@ export async function discoverOpencodeServer(targetDir, options = {}) {
     return null;
   }
   
-  debug(`discoverOpencodeServer: checking ${ports.length} servers for ${targetDir}`);
+  debug(`discoverOpencodeServer: checking ${ports.length} servers for ${targetDir}, preferredPort=${preferredPort}`);
+  
+  // If preferred port is configured and running, check it first
+  if (preferredPort && ports.includes(preferredPort)) {
+    const url = `http://localhost:${preferredPort}`;
+    try {
+      const response = await fetchFn(`${url}/project/current`);
+      if (response.ok) {
+        const project = await response.json();
+        if (isServerHealthy(project)) {
+          debug(`discoverOpencodeServer: using preferred port ${preferredPort}`);
+          return url;
+        }
+      }
+    } catch (err) {
+      debug(`discoverOpencodeServer: preferred port ${preferredPort} error: ${err.message}`);
+    }
+  }
   
   let bestMatch = null;
   let bestScore = 0;
+  let globalServer = null;
   
   for (const port of ports) {
     const url = `http://localhost:${port}`;
@@ -148,9 +171,10 @@ export async function discoverOpencodeServer(targetDir, options = {}) {
       const worktree = project.worktree || '/';
       const sandboxes = project.sandboxes || [];
       
-      // Skip global servers - pilot sessions should run isolated
+      // Track global server as fallback (but prefer project-specific matches)
       if (worktree === '/') {
-        debug(`discoverOpencodeServer: ${url} is global project, skipping`);
+        debug(`discoverOpencodeServer: ${url} is global project, tracking as fallback`);
+        globalServer = url;
         continue;
       }
       
@@ -166,8 +190,10 @@ export async function discoverOpencodeServer(targetDir, options = {}) {
     }
   }
   
-  debug(`discoverOpencodeServer: best match=${bestMatch} score=${bestScore}`);
-  return bestMatch;
+  // Use project-specific match if found, otherwise fall back to global server
+  const result = bestMatch || globalServer;
+  debug(`discoverOpencodeServer: best match=${bestMatch} score=${bestScore}, global=${globalServer}, using=${result}`);
+  return result;
 }
 
 // Default templates directory

package/service/repo-config.js

@@ -310,6 +310,15 @@ export function getCleanupTtlDays() {
   return config?.cleanup?.ttl_days ?? 30;
 }
 
+/**
+ * Get preferred OpenCode server port from config
+ * @returns {number|null} Port number or null if not configured
+ */
+export function getServerPort() {
+  const config = getRawConfig();
+  return config?.server_port ?? null;
+}
+
 /**
  * Clear config cache (for testing)
  */

package/test/unit/actions.test.js

@@ -394,7 +394,7 @@ describe('actions.js', () => {
       assert.strictEqual(result, 'http://localhost:4000');
     });
 
-    test('skips global project servers', async () => {
+    test('uses global project server as fallback when no specific match', async () => {
       const { discoverOpencodeServer } = await import('../../service/actions.js');
       
       const mockPorts = async () => [3000];
@@ -406,13 +406,13 @@ describe('actions.js', () => {
         return { ok: false };
       };
       
-      // Global servers should be skipped - pilot sessions should run isolated
+      // Global servers should be used as fallback when no project-specific match
       const result = await discoverOpencodeServer('/Users/test/random/path', { 
         getPorts: mockPorts,
         fetch: mockFetch
       });
       
-      assert.strictEqual(result, null);
+      assert.strictEqual(result, 'http://localhost:3000');
     });
 
     test('returns null when fetch fails for all servers', async () => {