opencode-pilot 0.18.0 → 0.18.2

package/README.md

@@ -65,11 +65,10 @@ Three ways to configure sources, from simplest to most flexible:
 
 - `github/my-issues` - Issues assigned to me
 - `github/review-requests` - PRs needing my review
-- `github/my-prs-feedback` - My PRs with comments/feedback (simple trigger)
-- `github/my-prs-attention` - My PRs needing attention (conflicts OR feedback, with dynamic labeling)
+- `github/my-prs-attention` - My PRs needing attention (conflicts OR human feedback)
 - `linear/my-issues` - Linear tickets (requires `teamId`, `assigneeId`)
 
-**Tip:** Use `my-prs-attention` instead of `my-prs-feedback` if you also want to detect merge conflicts. The session name will indicate which condition(s) triggered it: "Conflicts: {title}", "Feedback: {title}", or "Conflicts+Feedback: {title}".
+Session names for `my-prs-attention` indicate the condition: "Conflicts: {title}", "Feedback: {title}", or "Conflicts+Feedback: {title}".
 
 ### Prompt Templates
 

package/examples/config.yaml

@@ -27,16 +27,13 @@ sources:
 
   - preset: github/review-requests
 
-  # PRs needing attention (conflicts OR feedback) - recommended over my-prs-feedback
+  # PRs needing attention (conflicts OR human feedback)
   # Session names dynamically indicate the condition: "Conflicts: ...", "Feedback: ...", or "Conflicts+Feedback: ..."
   - preset: github/my-prs-attention
     repos:
       - myorg/backend
       - myorg/frontend
 
-  # Alternative: Simple feedback-only trigger (use my-prs-attention for conflicts too)
-  # - preset: github/my-prs-feedback
-
   # Linear (requires teamId and assigneeId)
   - preset: linear/my-issues
     args:
@@ -92,4 +89,4 @@ sources:
 #   ttl_days: 30
 
 # Available presets: github/my-issues, github/review-requests,
-# github/my-prs-feedback, github/my-prs-attention, linear/my-issues
+# github/my-prs-attention, linear/my-issues

package/examples/templates/review-feedback.md

@@ -1,7 +1,7 @@
-Address the review feedback on this PR:
+Address the review feedback or merge conflicts on this PR:
 
 {title}
 
 {html_url}
 
-Focus only on unresolved review comments. Read each comment, make the requested changes, and respond to the reviewer. Skip any conversations that are already resolved.
+Focus on unresolved review comments and merge conflicts. Make the requested changes and respond to reviewers. Skip any conversations that are already resolved.

package/package.json

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

package/service/poll-service.js

@@ -124,7 +124,12 @@ export async function pollOnce(options = {}) {
     // Fetch items from source
     if (!skipMcp) {
       try {
-        toolProviderConfig = getToolProviderConfig(source.tool.mcp);
+        // Get provider config - for MCP sources use source.tool.mcp, for CLI sources detect provider
+        let provider = source.tool.mcp;
+        if (!provider && Array.isArray(source.tool?.command) && source.tool.command[0] === 'gh') {
+          provider = 'github'; // CLI-based GitHub source
+        }
+        toolProviderConfig = getToolProviderConfig(provider);
         items = await pollGenericSource(source, { toolProviderConfig });
         debug(`Fetched ${items.length} items from ${sourceName}`);
         

package/service/poller.js

@@ -12,7 +12,7 @@ import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import fs from "fs";
 import path from "path";
 import os from "os";
-import { getNestedValue } from "./utils.js";
+import { getNestedValue, hasNonBotFeedback } from "./utils.js";
 
 /**
  * Expand template string with item fields
@@ -501,6 +501,22 @@ export async function fetchGitHubComments(item, options = {}) {
   }
 }
 
+/**
+ * Check if a source is a GitHub source (MCP or CLI-based)
+ * @param {object} source - Source configuration
+ * @returns {boolean} True if this is a GitHub source
+ */
+function isGitHubSource(source) {
+  // MCP-based GitHub source
+  if (source.tool?.mcp === "github") return true;
+  
+  // CLI-based GitHub source (uses gh command)
+  const command = source.tool?.command;
+  if (Array.isArray(command) && command[0] === "gh") return true;
+  
+  return false;
+}
+
 /**
  * Enrich items with comments for bot filtering
  * 
@@ -514,7 +530,7 @@ export async function fetchGitHubComments(item, options = {}) {
  */
 export async function enrichItemsWithComments(items, source, options = {}) {
   // Skip if not configured or not a GitHub source
-  if (!source.filter_bot_comments || source.tool?.mcp !== "github") {
+  if (!source.filter_bot_comments || !isGitHubSource(source)) {
     return items;
   }
   
@@ -618,16 +634,11 @@ export function computeAttentionLabels(items, source) {
       reasons.push('Conflicts');
     }
     
-    // Check for human feedback (non-bot, non-author comments)
+    // Check for human feedback using the shared hasNonBotFeedback utility
+    // This properly handles known bots like 'linear' that don't have [bot] suffix
     if (item._comments && item._comments.length > 0) {
       const authorUsername = item.user?.login || item.author?.login;
-      const hasHumanFeedback = item._comments.some(comment => {
-        const commenter = comment.user?.login || comment.author?.login;
-        const isBot = commenter?.includes('[bot]') || comment.user?.type === 'Bot';
-        const isAuthor = commenter === authorUsername;
-        return !isBot && !isAuthor;
-      });
-      if (hasHumanFeedback) {
+      if (hasNonBotFeedback(item._comments, authorUsername)) {
         reasons.push('Feedback');
       }
     }

package/service/presets/github.yaml

@@ -37,23 +37,6 @@ review-requests:
   session:
     name: "Review: {title}"
 
-my-prs-feedback:
-  name: my-prs-feedback
-  tool:
-    # comments:>0 filter ensures only PRs with feedback are returned
-    command: ["gh", "search", "prs", "--author=@me", "--state=open", "comments:>0", "--json", "number,title,url,repository,state,body,updatedAt,commentsCount"]
-  item:
-    id: "{url}"
-  repo: "{repository.nameWithOwner}"
-  prompt: review-feedback
-  session:
-    name: "Feedback: {title}"
-  # Reprocess when PR is updated (new commits pushed, new comments, etc.)
-  # This ensures we re-trigger after addressing review feedback
-  reprocess_on:
-    - state
-    - updatedAt
-
 my-prs-attention:
   name: my-prs-attention
   tool:

package/test/unit/poller.test.js

@@ -1013,5 +1013,25 @@ describe('poller.js', () => {
       assert.strictEqual(result[0]._attention_label, 'PR');
       assert.strictEqual(result[0]._has_attention, false);
     });
+
+    test('ignores known bots without [bot] suffix (e.g., linear)', async () => {
+      const { computeAttentionLabels } = await import('../../service/poller.js');
+      
+      const items = [{
+        number: 123,
+        title: 'Test PR',
+        user: { login: 'author' },
+        _mergeable: 'MERGEABLE',
+        _comments: [
+          // Linear bot posts linkback comments without [bot] suffix
+          { user: { login: 'linear', type: 'User' }, body: '<!-- linear-linkback -->' }
+        ]
+      }];
+      
+      const result = computeAttentionLabels(items, {});
+      
+      assert.strictEqual(result[0]._attention_label, 'PR');
+      assert.strictEqual(result[0]._has_attention, false);
+    });
   });
 });

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

@@ -679,24 +679,6 @@ sources:
       assert.ok(sources[0].tool.command.includes('--review-requested=@me'), 'command should include review-requested filter');
     });
 
-    test('expands github/my-prs-feedback preset', async () => {
-      writeFileSync(configPath, `
-sources:
-  - preset: github/my-prs-feedback
-`);
-
-      const { loadRepoConfig, getSources } = await import('../../service/repo-config.js');
-      loadRepoConfig(configPath);
-      const sources = getSources();
-
-      assert.strictEqual(sources[0].name, 'my-prs-feedback');
-      // GitHub presets now use gh CLI instead of MCP
-      assert.ok(sources[0].tool.command.includes('--author=@me'), 'command should include author filter');
-      assert.ok(sources[0].tool.command.includes('comments:>0'), 'command should filter for PRs with comments');
-      // This preset includes updatedAt in reprocess_on to catch new commits
-      assert.deepStrictEqual(sources[0].reprocess_on, ['state', 'updatedAt']);
-    });
-
     test('expands github/my-prs-attention preset', async () => {
       writeFileSync(configPath, `
 sources:
@@ -774,7 +756,6 @@ sources:
 sources:
   - preset: github/my-issues
   - preset: github/review-requests
-  - preset: github/my-prs-feedback
   - preset: github/my-prs-attention
 `);
 
@@ -860,7 +841,6 @@ sources:
 sources:
   - preset: github/my-issues
   - preset: github/review-requests
-  - preset: github/my-prs-feedback
   - preset: github/my-prs-attention
 `);
 
@@ -874,11 +854,8 @@ sources:
       // review-requests: "Review: {title}"
       assert.strictEqual(sources[1].session.name, 'Review: {title}', 'review-requests should prefix with Review:');
       
-      // my-prs-feedback: "Feedback: {title}"
-      assert.strictEqual(sources[2].session.name, 'Feedback: {title}', 'my-prs-feedback should prefix with Feedback:');
-      
       // my-prs-attention: "{_attention_label}: {title}" (dynamic based on detected conditions)
-      assert.ok(sources[3].session.name.includes('_attention_label'), 'my-prs-attention should use dynamic label');
+      assert.ok(sources[2].session.name.includes('_attention_label'), 'my-prs-attention should use dynamic label');
     });
 
     test('linear preset includes session name', async () => {