opencode-pilot 0.25.1 → 0.27.0

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.12.tar.gz"
-  sha256 "ea6f7ba7814225f9e312143f0222777bf4094da87cdbadad1e6589208c5323ab"
+  url "https://github.com/athal7/opencode-pilot/archive/refs/tags/v0.26.0.tar.gz"
+  sha256 "2dc50f9d92e16bcbc3e5956f26bf53d3613c0f3ce756204ea050bf0faba4d9f4"
   license "MIT"
 
   depends_on "node"

package/examples/config.yaml

@@ -38,7 +38,7 @@ sources:
   # PR presets have detect_stacks: true by default, enabling session reuse
   # across stacked PRs (where one PR's head branch = another's base branch)
   - preset: github/review-requests
-    # Per-source model override (takes precedence over defaults.model)
+    # Per-source model override (takes precedence over defaults.model and repos.*.model)
     # model: anthropic/claude-haiku-3.5
 
   # PRs needing attention (conflicts OR human feedback)
@@ -94,9 +94,16 @@ sources:
 
 # Explicit repo mappings (overrides repos_dir auto-discovery)
 # Only needed if a repo isn't in repos_dir or needs custom settings
+# Repos can also specify per-directory overrides for model, agent, and prompt.
+# Priority: source override > repo override > defaults
 # repos:
 #   myorg/backend:
 #     path: ~/code/backend
+#     # Per-directory model override (overrides defaults.model, overridden by source.model)
+#     # model: anthropic/claude-sonnet-4-20250514
+#   myorg/legacy-service:
+#     path: ~/code/legacy-service
+#     model: anthropic/claude-haiku-3.5  # use cheaper model for this repo
 
 # Cleanup config (optional, sensible defaults)
 # cleanup:

package/package.json

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

package/service/actions.js

@@ -35,6 +35,62 @@ import os from "os";
 // These are generous upper bounds — if exceeded, the server is genuinely stuck.
 export const HEADER_TIMEOUT_MS = 60_000;
 
+/**
+ * Read model configuration from a target directory's OpenCode config file.
+ *
+ * Looks for `.opencode/opencode.json` (or `.jsonc`) in `dir`. If an `agentName`
+ * is provided, the per-agent model (`.agent.<name>.model`) takes precedence
+ * over the global `.model` value. Returns `{}` when no file is found or the
+ * file cannot be parsed.
+ *
+ * @param {string} dir - Absolute path to the target project directory
+ * @param {string} [agentName] - Optional agent name for per-agent model lookup
+ * @returns {{ model?: string }} Extracted config fields
+ */
+export function readTargetOpencodeConfig(dir, agentName) {
+  const candidates = [
+    path.join(dir, '.opencode', 'opencode.json'),
+    path.join(dir, '.opencode', 'opencode.jsonc'),
+  ];
+
+  let raw;
+  for (const candidate of candidates) {
+    if (existsSync(candidate)) {
+      try {
+        raw = readFileSync(candidate, 'utf-8');
+      } catch {
+        return {};
+      }
+      break;
+    }
+  }
+
+  if (!raw) return {};
+
+  let parsed;
+  try {
+    // Strip single-line comments for .jsonc support before parsing
+    const stripped = raw.replace(/\/\/[^\n]*/g, '');
+    parsed = JSON.parse(stripped);
+  } catch {
+    return {};
+  }
+
+  const result = {};
+
+  // Per-agent model takes priority over global model
+  const agentModel = agentName && parsed.agent?.[agentName]?.model;
+  const globalModel = parsed.model;
+
+  if (agentModel) {
+    result.model = agentModel;
+  } else if (globalModel) {
+    result.model = globalModel;
+  }
+
+  return result;
+}
+
 /**
  * Parse a slash command from the beginning of a prompt
  * Returns null if the prompt doesn't start with a slash command
@@ -363,13 +419,34 @@ export function buildPromptFromTemplate(templateName, item, templatesDir) {
 
 /**
  * Merge source, repo config, and defaults into action config
- * Priority: source > repo > defaults
- * @param {object} source - Source configuration
+ * Priority: explicit source > repo > defaults
+ * @param {object} source - Source configuration (may include _explicit tracking from normalizeSource)
  * @param {object} repoConfig - Repository configuration
  * @param {object} defaults - Default configuration
+ * @param {object} [targetDirConfig] - Optional model config read from the target dir's opencode config.
+ *   Used as a low-priority fallback: only applied when no model is set by source, repo, or defaults.
  * @returns {object} Merged action config
  */
-export function getActionConfig(source, repoConfig, defaults) {
+export function getActionConfig(source, repoConfig, defaults, targetDirConfig = {}) {
+  // _explicit tracks fields set directly on the source (not inherited from defaults).
+  // When _explicit is absent (e.g., tests constructing source objects directly), fall
+  // back to treating non-undefined source fields as explicit.
+  const explicit = source._explicit;
+
+  const resolveField = (field) => {
+    if (explicit) {
+      if (explicit[field] !== undefined) return explicit[field];
+      if (repoConfig[field] !== undefined) return repoConfig[field];
+      if (defaults[field] !== undefined) return defaults[field];
+      return targetDirConfig[field];
+    }
+    // No tracking: source wins, then repo, then defaults, then target dir
+    if (source[field] !== undefined) return source[field];
+    if (repoConfig[field] !== undefined) return repoConfig[field];
+    if (defaults[field] !== undefined) return defaults[field];
+    return targetDirConfig[field];
+  };
+
   return {
     // Defaults first
     ...defaults,
@@ -380,11 +457,11 @@ export function getActionConfig(source, repoConfig, defaults) {
       ...(defaults.session || {}),
       ...(repoConfig.session || {}),
     },
-    // Source-level overrides (highest priority)
-    ...(source.prompt && { prompt: source.prompt }),
-    ...(source.agent && { agent: source.agent }),
-    ...(source.model && { model: source.model }),
-    ...(source.working_dir && { working_dir: source.working_dir }),
+    // Operational fields with correct priority: explicit source > repo > defaults
+    ...(resolveField('prompt') && { prompt: resolveField('prompt') }),
+    ...(resolveField('agent') && { agent: resolveField('agent') }),
+    ...(resolveField('model') && { model: resolveField('model') }),
+    ...(resolveField('working_dir') && { working_dir: resolveField('working_dir') }),
   };
 }
 
@@ -960,6 +1037,8 @@ async function executeInDirectory(serverUrl, sessionCtx, item, config, options =
       command: apiCommand,
       directory: cwd,
       dryRun: true,
+      ...(config.model && { model: config.model }),
+      ...(config.agent && { agent: config.agent }),
     };
   }
   
@@ -1005,6 +1084,17 @@ export async function executeAction(item, config, options = {}) {
   }
   
   const baseCwd = expandPath(workingDir);
+
+  // Apply target directory's opencode config as a low-priority fallback for model.
+  // This reads <baseCwd>/.opencode/opencode.json and uses its model settings only
+  // when no model is specified in the pilot config (source > repo > defaults).
+  if (!config.model) {
+    const targetDirConfig = readTargetOpencodeConfig(baseCwd, config.agent);
+    if (targetDirConfig.model) {
+      debug(`executeAction: using target dir model=${targetDirConfig.model} from ${baseCwd}/.opencode/opencode.json`);
+      config = { ...config, model: targetDirConfig.model };
+    }
+  }
   
   // Discover running opencode server for this directory
   const discoverFn = options.discoverServer || discoverOpencodeServer;

package/service/poll-service.js

@@ -32,12 +32,29 @@ export function hasToolConfig(source) {
 
 /**
  * Build action config from source and repo config
- * Source fields override repo config fields
- * @param {object} source - Source configuration
+ * Priority for operational fields: explicit source > repo > defaults (baked into source)
+ * @param {object} source - Source configuration (may include _explicit tracking of explicitly-set fields)
  * @param {object} repoConfig - Repository configuration
  * @returns {object} Merged action config
  */
 export function buildActionConfigFromSource(source, repoConfig) {
+  // _explicit tracks fields set directly on the source (not inherited from defaults).
+  // When _explicit is absent (e.g., tests constructing source objects directly), fall
+  // back to treating source fields as explicit.
+  const explicit = source._explicit;
+
+  // Resolve each operational field using priority: explicit source > repo > defaults (source)
+  const resolveField = (field) => {
+    if (explicit) {
+      // Normalization tracked explicit fields: use them in priority order
+      if (explicit[field] !== undefined) return explicit[field];
+      if (repoConfig[field] !== undefined) return repoConfig[field];
+      return source[field]; // defaults (baked into source)
+    }
+    // No tracking available (e.g., raw source in tests): source wins, then repo
+    return source[field] !== undefined ? source[field] : repoConfig[field];
+  };
+
   return {
     // Repo config as base
     ...repoConfig,
@@ -45,11 +62,11 @@ export function buildActionConfigFromSource(source, repoConfig) {
     repo_path: source.working_dir || repoConfig.path || repoConfig.repo_path,
     // Session from source or repo
     session: source.session || repoConfig.session || {},
-    // Source-level overrides (highest priority)
-    ...(source.prompt && { prompt: source.prompt }),
-    ...(source.agent && { agent: source.agent }),
-    ...(source.model && { model: source.model }),
-    ...(source.working_dir && { working_dir: source.working_dir }),
+    // Operational fields with correct priority
+    ...(resolveField('prompt') && { prompt: resolveField('prompt') }),
+    ...(resolveField('agent') && { agent: resolveField('agent') }),
+    ...(resolveField('model') && { model: resolveField('model') }),
+    ...(resolveField('working_dir') && { working_dir: resolveField('working_dir') }),
     ...(source.worktree_name && { worktree_name: source.worktree_name }),
   };
 }

package/service/repo-config.js

@@ -230,10 +230,22 @@ function normalizeSource(source, defaults) {
   }
 
   // Apply defaults (source values take precedence)
-  return {
+  const merged = {
     ...defaults,
     ...normalized,
   };
+
+  // Track which operational fields were explicitly set in the source (not inherited from defaults).
+  // This allows downstream config builders to apply the correct priority:
+  //   explicit source > repo > defaults
+  merged._explicit = {};
+  for (const field of ['model', 'agent', 'prompt', 'working_dir']) {
+    if (normalized[field] !== undefined) {
+      merged._explicit[field] = normalized[field];
+    }
+  }
+
+  return merged;
 }
 
 /**

package/test/unit/actions.test.js

@@ -281,6 +281,121 @@ Check for bugs and security issues.`;
 
   });
 
+  describe('readTargetOpencodeConfig', () => {
+    test('returns global model from .opencode/opencode.json', async () => {
+      const { readTargetOpencodeConfig } = await import('../../service/actions.js');
+
+      const opencodeDir = join(tempDir, '.opencode');
+      mkdirSync(opencodeDir);
+      writeFileSync(join(opencodeDir, 'opencode.json'), JSON.stringify({
+        model: 'anthropic/claude-haiku-3.5'
+      }));
+
+      const result = readTargetOpencodeConfig(tempDir);
+      assert.strictEqual(result.model, 'anthropic/claude-haiku-3.5');
+    });
+
+    test('returns per-agent model from .opencode/opencode.json', async () => {
+      const { readTargetOpencodeConfig } = await import('../../service/actions.js');
+
+      const opencodeDir = join(tempDir, '.opencode');
+      mkdirSync(opencodeDir);
+      writeFileSync(join(opencodeDir, 'opencode.json'), JSON.stringify({
+        model: 'anthropic/claude-sonnet-4-20250514',
+        agent: {
+          plan: { model: 'anthropic/claude-haiku-3.5' }
+        }
+      }));
+
+      const result = readTargetOpencodeConfig(tempDir, 'plan');
+      assert.strictEqual(result.model, 'anthropic/claude-haiku-3.5');
+    });
+
+    test('falls back to global model when agent has no model', async () => {
+      const { readTargetOpencodeConfig } = await import('../../service/actions.js');
+
+      const opencodeDir = join(tempDir, '.opencode');
+      mkdirSync(opencodeDir);
+      writeFileSync(join(opencodeDir, 'opencode.json'), JSON.stringify({
+        model: 'anthropic/claude-opus-4',
+        agent: {
+          plan: { temperature: 0.5 }
+        }
+      }));
+
+      const result = readTargetOpencodeConfig(tempDir, 'plan');
+      assert.strictEqual(result.model, 'anthropic/claude-opus-4');
+    });
+
+    test('returns empty object when no .opencode/opencode.json exists', async () => {
+      const { readTargetOpencodeConfig } = await import('../../service/actions.js');
+
+      const result = readTargetOpencodeConfig(tempDir);
+      assert.deepStrictEqual(result, {});
+    });
+
+    test('returns empty object when .opencode/opencode.json is malformed', async () => {
+      const { readTargetOpencodeConfig } = await import('../../service/actions.js');
+
+      const opencodeDir = join(tempDir, '.opencode');
+      mkdirSync(opencodeDir);
+      writeFileSync(join(opencodeDir, 'opencode.json'), 'not valid json {{{');
+
+      const result = readTargetOpencodeConfig(tempDir);
+      assert.deepStrictEqual(result, {});
+    });
+  });
+
+  describe('getActionConfig with target dir opencode config', () => {
+    test('uses target-dir model when no pilot model is set', async () => {
+      const { getActionConfig } = await import('../../service/actions.js');
+
+      const source = { name: 'my-issues' };
+      const repoConfig = { path: tempDir };
+      const defaults = {};
+      const targetDirConfig = { model: 'anthropic/claude-haiku-3.5' };
+
+      const config = getActionConfig(source, repoConfig, defaults, targetDirConfig);
+      assert.strictEqual(config.model, 'anthropic/claude-haiku-3.5');
+    });
+
+    test('pilot model overrides target-dir model', async () => {
+      const { getActionConfig } = await import('../../service/actions.js');
+
+      const source = { name: 'my-issues', model: 'anthropic/claude-opus-4' };
+      const repoConfig = { path: tempDir };
+      const defaults = {};
+      const targetDirConfig = { model: 'anthropic/claude-haiku-3.5' };
+
+      const config = getActionConfig(source, repoConfig, defaults, targetDirConfig);
+      assert.strictEqual(config.model, 'anthropic/claude-opus-4');
+    });
+
+    test('defaults model overrides target-dir model', async () => {
+      const { getActionConfig } = await import('../../service/actions.js');
+
+      const source = { name: 'my-issues' };
+      const repoConfig = { path: tempDir };
+      const defaults = { model: 'anthropic/claude-sonnet-4-20250514' };
+      const targetDirConfig = { model: 'anthropic/claude-haiku-3.5' };
+
+      const config = getActionConfig(source, repoConfig, defaults, targetDirConfig);
+      assert.strictEqual(config.model, 'anthropic/claude-sonnet-4-20250514');
+    });
+
+    test('target-dir model used when only defaults have no model', async () => {
+      const { getActionConfig } = await import('../../service/actions.js');
+
+      const source = { name: 'my-issues' };
+      const repoConfig = { path: tempDir };
+      const defaults = {};
+      const targetDirConfig = { model: 'openai/gpt-4o' };
+
+      const config = getActionConfig(source, repoConfig, defaults, targetDirConfig);
+      assert.strictEqual(config.model, 'openai/gpt-4o');
+    });
+  });
+
   describe('buildCommand', () => {
     test('builds display string for API call', async () => {
       const { buildCommand } = await import('../../service/actions.js');
@@ -989,6 +1104,64 @@ Check for bugs and security issues.`;
       assert.strictEqual(result.directory, '/data/worktree/calm-wizard',
         'Result should include worktree directory');
     });
+
+    test('uses target dir opencode config model when no pilot model set (dry run)', async () => {
+      const { executeAction } = await import('../../service/actions.js');
+
+      // Write .opencode/opencode.json into the temp project dir
+      const opencodeDir = join(tempDir, '.opencode');
+      mkdirSync(opencodeDir, { recursive: true });
+      writeFileSync(join(opencodeDir, 'opencode.json'), JSON.stringify({
+        model: 'anthropic/claude-haiku-3.5'
+      }));
+
+      const item = { number: 1, title: 'Fix bug' };
+      const config = {
+        path: tempDir,
+        prompt: 'default',
+        agent: 'plan',
+        // No model set in pilot config
+      };
+
+      const mockDiscoverServer = async () => 'http://localhost:4096';
+      const result = await executeAction(item, config, {
+        dryRun: true,
+        discoverServer: mockDiscoverServer,
+      });
+
+      assert.ok(result.dryRun);
+      assert.strictEqual(result.model, 'anthropic/claude-haiku-3.5',
+        'Should use target dir model as fallback');
+    });
+
+    test('target dir opencode config model does not override pilot model (dry run)', async () => {
+      const { executeAction } = await import('../../service/actions.js');
+
+      // Write .opencode/opencode.json into the temp project dir
+      const opencodeDir = join(tempDir, '.opencode');
+      mkdirSync(opencodeDir, { recursive: true });
+      writeFileSync(join(opencodeDir, 'opencode.json'), JSON.stringify({
+        model: 'anthropic/claude-haiku-3.5'
+      }));
+
+      const item = { number: 1, title: 'Fix bug' };
+      const config = {
+        path: tempDir,
+        prompt: 'default',
+        agent: 'plan',
+        model: 'anthropic/claude-opus-4',  // Pilot model is set — should win
+      };
+
+      const mockDiscoverServer = async () => 'http://localhost:4096';
+      const result = await executeAction(item, config, {
+        dryRun: true,
+        discoverServer: mockDiscoverServer,
+      });
+
+      assert.ok(result.dryRun);
+      assert.strictEqual(result.model, 'anthropic/claude-opus-4',
+        'Pilot model should override target dir model');
+    });
   });
 
   describe('createSessionViaApi', () => {

package/test/unit/poll-service.test.js

@@ -378,5 +378,107 @@ sources:
       // Should use source working_dir since repo not in config
       assert.strictEqual(actionConfig.working_dir, '~/default/path');
     });
+
+    test('repo model overrides defaults model', async () => {
+      const config = `
+defaults:
+  model: anthropic/claude-haiku-3.5
+
+repos:
+  myorg/backend:
+    path: ~/code/backend
+    model: anthropic/claude-sonnet-4-20250514
+
+sources:
+  - preset: github/my-issues
+`;
+      writeFileSync(configPath, config);
+
+      const { loadRepoConfig, getSources } = await import('../../service/repo-config.js');
+      const { buildActionConfigForItem } = await import('../../service/poll-service.js');
+      loadRepoConfig(configPath);
+      const sources = getSources();
+      
+      const item = { 
+        repository: { nameWithOwner: 'myorg/backend' },
+        number: 123,
+        title: 'Fix bug',
+        url: 'https://github.com/myorg/backend/issues/123'
+      };
+      
+      const actionConfig = buildActionConfigForItem(sources[0], item);
+      
+      // Repo model should override the default model
+      assert.strictEqual(actionConfig.model, 'anthropic/claude-sonnet-4-20250514',
+        'repo model should override defaults.model');
+    });
+
+    test('explicit source model overrides repo model', async () => {
+      const config = `
+defaults:
+  model: anthropic/claude-haiku-3.5
+
+repos:
+  myorg/backend:
+    path: ~/code/backend
+    model: anthropic/claude-sonnet-4-20250514
+
+sources:
+  - preset: github/my-issues
+    model: anthropic/claude-opus-4
+`;
+      writeFileSync(configPath, config);
+
+      const { loadRepoConfig, getSources } = await import('../../service/repo-config.js');
+      const { buildActionConfigForItem } = await import('../../service/poll-service.js');
+      loadRepoConfig(configPath);
+      const sources = getSources();
+      
+      const item = { 
+        repository: { nameWithOwner: 'myorg/backend' },
+        number: 123,
+        title: 'Fix bug',
+        url: 'https://github.com/myorg/backend/issues/123'
+      };
+      
+      const actionConfig = buildActionConfigForItem(sources[0], item);
+      
+      // Explicit source model should win over repo and defaults
+      assert.strictEqual(actionConfig.model, 'anthropic/claude-opus-4',
+        'explicit source model should override repo model and defaults');
+    });
+
+    test('defaults model used when neither source nor repo specifies model', async () => {
+      const config = `
+defaults:
+  model: anthropic/claude-haiku-3.5
+
+repos:
+  myorg/backend:
+    path: ~/code/backend
+
+sources:
+  - preset: github/my-issues
+`;
+      writeFileSync(configPath, config);
+
+      const { loadRepoConfig, getSources } = await import('../../service/repo-config.js');
+      const { buildActionConfigForItem } = await import('../../service/poll-service.js');
+      loadRepoConfig(configPath);
+      const sources = getSources();
+      
+      const item = { 
+        repository: { nameWithOwner: 'myorg/backend' },
+        number: 123,
+        title: 'Fix bug',
+        url: 'https://github.com/myorg/backend/issues/123'
+      };
+      
+      const actionConfig = buildActionConfigForItem(sources[0], item);
+      
+      // Should fall back to defaults.model
+      assert.strictEqual(actionConfig.model, 'anthropic/claude-haiku-3.5',
+        'defaults model should be used when neither source nor repo sets model');
+    });
   });
 });