opencode-pilot 0.25.0 → 0.26.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.25.1.tar.gz"
+  sha256 "f8be5b0d08bdd45d5c0155bf40e8930c431fc7a6e6ec77d422bb89471fe91cdc"
   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.0",
+  "version": "0.26.0",
   "type": "module",
   "main": "plugin/index.js",
   "description": "Automation daemon for OpenCode - polls for work and spawns sessions",

package/service/actions.js

@@ -363,13 +363,30 @@ 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
  * @returns {object} Merged action config
  */
 export function getActionConfig(source, repoConfig, defaults) {
+  // _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];
+      return defaults[field];
+    }
+    // No tracking: source wins, then repo, then defaults
+    if (source[field] !== undefined) return source[field];
+    if (repoConfig[field] !== undefined) return repoConfig[field];
+    return defaults[field];
+  };
+
   return {
     // Defaults first
     ...defaults,
@@ -380,11 +397,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') }),
   };
 }
 

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/poller.js

@@ -1215,7 +1215,20 @@ export function createPoller(options = {}) {
       if (!meta) return false; // Not processed before
       
       // Check if item reappeared after being missing (e.g., uncompleted reminder)
+      // Exception: suppress reprocessing when the item cycled through an intermediate
+      // state (e.g., Linear: In Progress -> In Review -> In Progress). If the stored
+      // state and the current state are both "in progress", the issue just passed
+      // through code review and back — no new work is needed.
       if (meta.wasUnseen) {
+        const storedState = meta.itemState;
+        const currentState = item.state || item.status;
+        if (storedState && currentState) {
+          const stored = storedState.toLowerCase();
+          const current = currentState.toLowerCase();
+          if (stored === 'in progress' && current === 'in progress') {
+            return false;
+          }
+        }
         return true;
       }
       

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/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');
+    });
   });
 });

package/test/unit/poller.test.js

@@ -746,6 +746,25 @@ describe('poller.js', () => {
       );
     });
 
+    test('shouldReprocess returns false when Linear issue cycles in_progress -> code_review -> in_progress', async () => {
+      const { createPoller } = await import('../../service/poller.js');
+
+      const poller = createPoller({ stateFile });
+      // Issue was processed while in_progress
+      poller.markProcessed('linear:ENG-1', { source: 'linear', itemState: 'In Progress' });
+
+      // Issue moved to In Review - disappears from the "my ready issues" poll
+      poller.markUnseen('linear', []);
+
+      // Issue moved back to In Progress - reappears
+      const item = { id: 'linear:ENG-1', status: 'In Progress' };
+      assert.strictEqual(
+        poller.shouldReprocess(item, { reprocessOn: ['status'] }),
+        false,
+        'should NOT reprocess: issue cycled through code review and returned to same in_progress state'
+      );
+    });
+
     test('shouldReprocess returns true for reappeared item (e.g., uncompleted reminder)', async () => {
       const { createPoller } = await import('../../service/poller.js');