opencode-pilot 0.5.1 → 0.6.0

package/AGENTS.md

@@ -36,7 +36,15 @@ gh release list -R athal7/opencode-pilot -L 1
 npm view opencode-pilot version
 ```
 
-### 3. Restart Service
+### 3. Clear OpenCode Plugin Cache
+
+OpenCode caches plugins at `~/.cache/opencode/node_modules/`. Clear the cache to pick up the new version:
+
+```bash
+rm -rf ~/.cache/opencode/node_modules/opencode-pilot
+```
+
+### 4. Restart Service
 
 If the service is running, restart it:
 
@@ -45,7 +53,7 @@ If the service is running, restart it:
 npx opencode-pilot start
 ```
 
-### 4. Verify Upgrade
+### 5. Verify Upgrade
 
 ```bash
 npx opencode-pilot status

package/bin/opencode-pilot

@@ -361,30 +361,29 @@ async function configCommand() {
 // ============================================================================
 
 async function testSourceCommand(sourceName) {
+  // Load sources using getSources() to expand presets
+  const { loadRepoConfig, getSources } = await import(join(serviceDir, "repo-config.js"));
+  loadRepoConfig(PILOT_CONFIG_FILE);
+  
+  let sources;
+  try {
+    sources = getSources();
+  } catch (err) {
+    console.error(`Failed to load sources: ${err.message}`);
+    process.exit(1);
+  }
+
   if (!sourceName) {
     console.error("Usage: opencode-pilot test-source <source-name>");
     console.error("");
     console.error("Available sources:");
     
-    // Load and show available sources
-    if (existsSync(PILOT_CONFIG_FILE)) {
-      try {
-        const { default: YAML } = await import("yaml");
-        const content = readFileSync(PILOT_CONFIG_FILE, "utf8");
-        const config = YAML.parse(content);
-        const sources = config.sources || [];
-        if (sources.length === 0) {
-          console.error("  (no sources configured)");
-        } else {
-          for (const s of sources) {
-            console.error(`  ${s.name}`);
-          }
-        }
-      } catch (err) {
-        console.error(`  Error loading config: ${err.message}`);
-      }
+    if (sources.length === 0) {
+      console.error("  (no sources configured)");
     } else {
-      console.error("  (config file not found)");
+      for (const s of sources) {
+        console.error(`  ${s.name}`);
+      }
     }
     process.exit(1);
   }
@@ -393,18 +392,7 @@ async function testSourceCommand(sourceName) {
   console.log("=".repeat(40));
   console.log("");
 
-  // Load config
-  if (!existsSync(PILOT_CONFIG_FILE)) {
-    console.error(`Config file not found: ${PILOT_CONFIG_FILE}`);
-    process.exit(1);
-  }
-
-  const { default: YAML } = await import("yaml");
-  const content = readFileSync(PILOT_CONFIG_FILE, "utf8");
-  const config = YAML.parse(content);
-
   // Find source
-  const sources = config.sources || [];
   const source = sources.find(s => s.name === sourceName);
   
   if (!source) {
@@ -429,19 +417,24 @@ async function testSourceCommand(sourceName) {
   if (source.prompt) console.log(`  prompt: ${source.prompt}`);
   if (source.agent) console.log(`  agent: ${source.agent}`);
 
-  // Show mappings
-  const tools = config.tools || {};
+  // Show mappings (using getToolProviderConfig which includes preset defaults)
+  const { getToolProviderConfig } = await import(join(serviceDir, "repo-config.js"));
   const provider = source.tool?.mcp;
-  const mappings = tools[provider]?.mappings;
+  const toolProviderConfig = getToolProviderConfig(provider);
+  const mappings = toolProviderConfig?.mappings;
   
   console.log("");
   console.log("Field Mappings:");
-  if (mappings) {
+  if (mappings && Object.keys(mappings).length > 0) {
     for (const [target, sourcePath] of Object.entries(mappings)) {
       console.log(`  ${target} ← ${sourcePath}`);
     }
   } else {
-    console.log(`  (no mappings configured for provider '${provider}')`);
+    console.log(`  (no mappings for provider '${provider}')`);
+  }
+  
+  if (toolProviderConfig?.response_key) {
+    console.log(`  response_key: ${toolProviderConfig.response_key}`);
   }
 
   // Fetch items
@@ -453,8 +446,8 @@ async function testSourceCommand(sourceName) {
     const pollerPath = join(serviceDir, "poller.js");
     const { pollGenericSource, applyMappings } = await import(pollerPath);
     
-    // Fetch items with mappings applied
-    const items = await pollGenericSource(source, { mappings });
+    // Fetch items with tool provider config (includes mappings and response_key)
+    const items = await pollGenericSource(source, { toolProviderConfig });
     
     console.log(`Found ${items.length} item(s)`);
     console.log("");

package/examples/config.yaml

@@ -29,9 +29,12 @@ sources:
   - preset: github/review-requests
     prompt: review
 
-  # My PRs that have change requests
+  # My PRs that have change requests (filter to specific repos)
   - preset: github/my-prs-feedback
     prompt: review-feedback
+    repos:                           # Optional: filter to specific repos
+      - myorg/backend
+      - myorg/frontend
 
   # Linear issues (requires teamId and assigneeId)
   # Find IDs via: opencode-pilot discover linear
@@ -82,6 +85,19 @@ sources:
 #       title: name
 #       body: notes
 
+# =============================================================================
+# REPOS - Map GitHub repos to local paths (OPTIONAL)
+#
+# GitHub presets automatically resolve the repo from each item's
+# repository.full_name field. Add entries here to map repos to local paths.
+# =============================================================================
+# repos:
+#   myorg/backend:
+#     path: ~/code/backend
+#
+#   myorg/frontend:
+#     path: ~/code/frontend
+
 # =============================================================================
 # Available presets (no tools config needed):
 #   github/my-issues        - Issues assigned to me

package/package.json

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

package/service/poll-service.js

@@ -9,7 +9,7 @@
  * 5. Track processed items to avoid duplicates
  */
 
-import { loadRepoConfig, getRepoConfig, getAllSources, getToolProviderConfig } from "./repo-config.js";
+import { loadRepoConfig, getRepoConfig, getAllSources, getToolProviderConfig, resolveRepoForItem } from "./repo-config.js";
 import { createPoller, pollGenericSource } from "./poller.js";
 import { evaluateReadiness, sortByPriority } from "./readiness.js";
 import { executeAction, buildCommand } from "./actions.js";
@@ -52,6 +52,25 @@ export function buildActionConfigFromSource(source, repoConfig) {
   };
 }
 
+/**
+ * Build action config for a specific item, resolving repo from item fields
+ * Uses source.repo template (e.g., "{repository.full_name}") to look up repo config
+ * @param {object} source - Source configuration
+ * @param {object} item - Item from the source (contains repo info)
+ * @returns {object} Merged action config
+ */
+export function buildActionConfigForItem(source, item) {
+  // Resolve repo key from item using source.repo template
+  const repoKeys = resolveRepoForItem(source, item);
+  const repoKey = repoKeys.length > 0 ? repoKeys[0] : null;
+  
+  // Get repo config (returns empty object if repo not configured)
+  const repoConfig = repoKey ? getRepoConfig(repoKey) : {};
+  
+  // Build config with repo config as base, source overrides on top
+  return buildActionConfigFromSource(source, repoConfig);
+}
+
 // Global state
 let pollingInterval = null;
 let pollerInstance = null;
@@ -87,8 +106,6 @@ export async function pollOnce(options = {}) {
   // Process each source
   for (const source of sources) {
     const sourceName = source.name || 'unknown';
-    const repoKey = source.name || 'default';
-    const repoConfig = getRepoConfig(repoKey) || {};
 
     if (!hasToolConfig(source)) {
       console.error(`[poll] Source '${sourceName}' missing tool configuration (requires tool.mcp and tool.name)`);
@@ -112,21 +129,28 @@ export async function pollOnce(options = {}) {
     // Evaluate readiness and filter
     const readyItems = items
       .map((item) => {
+        // Resolve repo from item for per-item config
+        const repoKeys = resolveRepoForItem(source, item);
+        const repoKey = repoKeys.length > 0 ? repoKeys[0] : null;
+        const repoConfig = repoKey ? getRepoConfig(repoKey) : {};
+        
         const readiness = evaluateReadiness(item, repoConfig);
         debug(`Item ${item.id}: ready=${readiness.ready}, reason=${readiness.reason || 'none'}`);
         return {
           ...item,
-          repo_key: repoKey,
-          repo_short: repoKey.split("/").pop(),
+          repo_key: repoKey || sourceName,
+          repo_short: repoKey ? repoKey.split("/").pop() : sourceName,
           _readiness: readiness,
+          _repoConfig: repoConfig,
         };
       })
       .filter((item) => item._readiness.ready);
     
     debug(`${readyItems.length} items ready out of ${items.length}`);
 
-    // Sort by priority
-    const sortedItems = sortByPriority(readyItems, repoConfig);
+    // Sort by priority (use first item's repo config or empty)
+    const sortConfig = readyItems.length > 0 ? readyItems[0]._repoConfig : {};
+    const sortedItems = sortByPriority(readyItems, sortConfig);
 
     // Process ready items
     debug(`Processing ${sortedItems.length} sorted items`);
@@ -138,8 +162,8 @@ export async function pollOnce(options = {}) {
       }
 
       debug(`Executing action for ${item.id}`);
-      // Build action config from source (includes agent, model, prompt, working_dir)
-      const actionConfig = buildActionConfigFromSource(source, repoConfig);
+      // Build action config from source and item (resolves repo from item fields)
+      const actionConfig = buildActionConfigForItem(source, item);
 
       // Execute or dry-run
       if (dryRun) {

package/service/presets/github.yaml

@@ -15,6 +15,7 @@ my-issues:
     q: "is:issue assignee:@me state:open"
   item:
     id: "{html_url}"
+  repo: "{repository.full_name}"
 
 review-requests:
   name: review-requests
@@ -25,6 +26,7 @@ review-requests:
     q: "is:pr review-requested:@me state:open"
   item:
     id: "{html_url}"
+  repo: "{repository.full_name}"
 
 my-prs-feedback:
   name: my-prs-feedback
@@ -35,3 +37,4 @@ my-prs-feedback:
     q: "is:pr author:@me state:open review:changes_requested"
   item:
     id: "{html_url}"
+  repo: "{repository.full_name}"

package/service/repo-config.js

@@ -234,20 +234,31 @@ export function getTemplate(templateName, templatesDir) {
  * @returns {Array<string>} Array of repo keys
  */
 export function resolveRepoForItem(source, item) {
-  // Multi-repo: explicit repos array
-  if (Array.isArray(source.repos)) {
-    return source.repos;
-  }
-
-  // Single repo from field reference (e.g., "{repository.full_name}")
+  // Resolve repo from item using template (e.g., "{repository.full_name}")
+  let resolvedRepo = null;
   if (typeof source.repo === "string") {
     const resolved = expandTemplate(source.repo, item);
-    // Only return if actually resolved (not still a template)
+    // Only use if actually resolved (not still a template)
     if (resolved && !resolved.includes("{")) {
-      return [resolved];
+      resolvedRepo = resolved;
     }
   }
 
+  // If source.repos is an array, use it as an allowlist filter
+  if (Array.isArray(source.repos)) {
+    // If we resolved a repo from the item, check if it's in the allowlist
+    if (resolvedRepo) {
+      return source.repos.includes(resolvedRepo) ? [resolvedRepo] : [];
+    }
+    // No repo template - return empty (can't match without item context)
+    return [];
+  }
+
+  // No allowlist - return the resolved repo if we have one
+  if (resolvedRepo) {
+    return [resolvedRepo];
+  }
+
   // No repo configuration - repo-agnostic source
   return [];
 }

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

@@ -139,4 +139,142 @@ sources:
     });
 
   });
+
+  describe('per-item repo resolution', () => {
+    test('resolves repo config from item using source.repo template', async () => {
+      const config = `
+repos:
+  myorg/backend:
+    path: ~/code/backend
+    prompt: worktree
+    session:
+      name: "issue-{number}"
+
+sources:
+  - preset: github/my-issues
+`;
+      writeFileSync(configPath, config);
+
+      const { loadRepoConfig, getSources, getRepoConfig, resolveRepoForItem } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      
+      const source = getSources()[0];
+      const item = { 
+        repository: { full_name: 'myorg/backend' },
+        number: 123,
+        html_url: 'https://github.com/myorg/backend/issues/123'
+      };
+      
+      // Source should have repo field from preset
+      assert.strictEqual(source.repo, '{repository.full_name}');
+      
+      // resolveRepoForItem should extract repo key from item
+      const repoKeys = resolveRepoForItem(source, item);
+      assert.deepStrictEqual(repoKeys, ['myorg/backend']);
+      
+      // getRepoConfig should return the repo settings
+      const repoConfig = getRepoConfig(repoKeys[0]);
+      assert.strictEqual(repoConfig.path, '~/code/backend');
+      assert.strictEqual(repoConfig.prompt, 'worktree');
+      assert.deepStrictEqual(repoConfig.session, { name: 'issue-{number}' });
+    });
+
+    test('falls back gracefully when repo not in config', async () => {
+      const config = `
+repos:
+  myorg/backend:
+    path: ~/code/backend
+
+sources:
+  - preset: github/my-issues
+`;
+      writeFileSync(configPath, config);
+
+      const { loadRepoConfig, getSources, getRepoConfig, resolveRepoForItem } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      
+      const source = getSources()[0];
+      const item = { 
+        repository: { full_name: 'unknown/repo' },
+        number: 456
+      };
+      
+      // resolveRepoForItem should extract repo key from item
+      const repoKeys = resolveRepoForItem(source, item);
+      assert.deepStrictEqual(repoKeys, ['unknown/repo']);
+      
+      // getRepoConfig should return empty object for unknown repo
+      const repoConfig = getRepoConfig(repoKeys[0]);
+      assert.deepStrictEqual(repoConfig, {});
+    });
+  });
+
+  describe('buildActionConfigForItem', () => {
+    test('uses repo config resolved from item', async () => {
+      const config = `
+repos:
+  myorg/backend:
+    path: ~/code/backend
+    prompt: repo-prompt
+    session:
+      name: "issue-{number}"
+
+sources:
+  - preset: github/my-issues
+    prompt: source-prompt
+`;
+      writeFileSync(configPath, config);
+
+      const { loadRepoConfig } = await import('../../service/repo-config.js');
+      const { buildActionConfigForItem } = await import('../../service/poll-service.js');
+      loadRepoConfig(configPath);
+      
+      const source = {
+        name: 'my-issues',
+        repo: '{repository.full_name}',
+        prompt: 'source-prompt'
+      };
+      const item = { 
+        repository: { full_name: 'myorg/backend' },
+        number: 123
+      };
+      
+      const actionConfig = buildActionConfigForItem(source, item);
+      
+      // Should use repo path from repos config
+      assert.strictEqual(actionConfig.repo_path, '~/code/backend');
+      // Source prompt should override repo prompt
+      assert.strictEqual(actionConfig.prompt, 'source-prompt');
+      // Session should come from repo config
+      assert.deepStrictEqual(actionConfig.session, { name: 'issue-{number}' });
+    });
+
+    test('falls back to source working_dir when repo not configured', async () => {
+      const config = `
+sources:
+  - preset: github/my-issues
+    working_dir: ~/default/path
+`;
+      writeFileSync(configPath, config);
+
+      const { loadRepoConfig } = await import('../../service/repo-config.js');
+      const { buildActionConfigForItem } = await import('../../service/poll-service.js');
+      loadRepoConfig(configPath);
+      
+      const source = {
+        name: 'my-issues',
+        repo: '{repository.full_name}',
+        working_dir: '~/default/path'
+      };
+      const item = { 
+        repository: { full_name: 'unknown/repo' },
+        number: 456
+      };
+      
+      const actionConfig = buildActionConfigForItem(source, item);
+      
+      // Should use source working_dir since repo not in config
+      assert.strictEqual(actionConfig.working_dir, '~/default/path');
+    });
+  });
 });

package/test/unit/repo-config.test.js

@@ -423,7 +423,7 @@ sources:
       assert.deepStrictEqual(repos, ['myorg/backend']);
     });
 
-    test('resolves multiple repos from repos array', async () => {
+    test('repos array without repo template returns empty (needs item context)', async () => {
       writeFileSync(configPath, `
 sources:
   - name: cross-repo
@@ -444,7 +444,8 @@ sources:
       const item = { number: 123 };
       const repos = resolveRepoForItem(source, item);
 
-      assert.deepStrictEqual(repos, ['myorg/backend', 'myorg/frontend']);
+      // Without a repo template, can't resolve from item - returns empty
+      assert.deepStrictEqual(repos, []);
     });
 
     test('returns empty array when no repo config', async () => {
@@ -614,6 +615,50 @@ sources:
       
       assert.throws(() => getSources(), /Unknown preset: unknown\/preset/);
     });
+
+    test('github presets include repo field for automatic resolution', async () => {
+      writeFileSync(configPath, `
+sources:
+  - preset: github/my-issues
+  - preset: github/review-requests
+  - preset: github/my-prs-feedback
+`);
+
+      const { loadRepoConfig, getSources, resolveRepoForItem } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      const sources = getSources();
+
+      // All GitHub presets should have repo field for automatic resolution
+      const mockItem = { repository: { full_name: 'myorg/backend' } };
+      
+      for (const source of sources) {
+        assert.strictEqual(source.repo, '{repository.full_name}', `Preset ${source.name} should have repo field`);
+        const repos = resolveRepoForItem(source, mockItem);
+        assert.deepStrictEqual(repos, ['myorg/backend'], `Preset ${source.name} should resolve repo from item`);
+      }
+    });
+
+    test('source.repos acts as allowlist filter', async () => {
+      writeFileSync(configPath, `
+sources:
+  - preset: github/my-issues
+    repos:
+      - myorg/backend
+      - myorg/frontend
+`);
+
+      const { loadRepoConfig, getSources, resolveRepoForItem } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      const source = getSources()[0];
+
+      // Item from allowed repo should resolve
+      const allowedItem = { repository: { full_name: 'myorg/backend' } };
+      assert.deepStrictEqual(resolveRepoForItem(source, allowedItem), ['myorg/backend']);
+
+      // Item from non-allowed repo should return empty (filtered out)
+      const filteredItem = { repository: { full_name: 'other/repo' } };
+      assert.deepStrictEqual(resolveRepoForItem(source, filteredItem), []);
+    });
   });
 
   describe('shorthand syntax', () => {