opencode-pilot 0.18.1 → 0.18.3

package/AGENTS.md

@@ -61,13 +61,14 @@ npx opencode-pilot status
 
 ## Configuration
 
-Config file: `~/.config/opencode-pilot/config.yaml`
+Config file: `~/.config/opencode/pilot/config.yaml`
 
 Configuration has these sections:
-- `tools` - field mappings for MCP servers
-- `sources` - polling sources with generic MCP tool references
-- `repos` - per-repository settings (use YAML anchors to share config)
+- `defaults` - default values applied to all sources
+- `repos_dir` - directory to auto-discover repos via git remotes
+- `sources` - polling sources with presets, shorthand, or full MCP tool config
+- `tools` - field mappings to normalize different MCP APIs
 
-Template files: `~/.config/opencode-pilot/templates/*.md`
+Template files: `~/.config/opencode/pilot/templates/*.md`
 
 See [examples/config.yaml](examples/config.yaml) for a complete example.

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.1",
+  "version": "0.18.3",
   "type": "module",
   "main": "plugin/index.js",
   "description": "Automation daemon for OpenCode - polls for work and spawns sessions",

package/service/poller.js

@@ -379,9 +379,7 @@ export async function pollGenericSource(source, options = {}) {
 /**
  * Fetch issue comments using gh CLI
  * 
- * The GitHub MCP server doesn't have a tool to list issue comments,
- * so we use gh CLI directly. This fetches the conversation thread
- * where bots like Linear post their comments.
+ * Fetches the conversation thread where bots like Linear post their comments.
  * 
  * @param {string} owner - Repository owner
  * @param {string} repo - Repository name
@@ -409,19 +407,50 @@ async function fetchIssueCommentsViaCli(owner, repo, number, timeout) {
   }
 }
 
+/**
+ * Fetch PR review comments using gh CLI
+ * 
+ * Fetches inline code review comments on a PR.
+ * 
+ * @param {string} owner - Repository owner
+ * @param {string} repo - Repository name
+ * @param {number} number - PR number
+ * @param {number} timeout - Timeout in ms
+ * @returns {Promise<Array>} Array of comment objects
+ */
+async function fetchPrReviewCommentsViaCli(owner, repo, number, timeout) {
+  const { exec } = await import('child_process');
+  const { promisify } = await import('util');
+  const execAsync = promisify(exec);
+  
+  try {
+    const { stdout } = await Promise.race([
+      execAsync(`gh api repos/${owner}/${repo}/pulls/${number}/comments`),
+      createTimeout(timeout, "gh api call for PR comments"),
+    ]);
+    
+    const comments = JSON.parse(stdout);
+    return Array.isArray(comments) ? comments : [];
+  } catch (err) {
+    console.error(`[poller] Error fetching PR review comments via gh: ${err.message}`);
+    return [];
+  }
+}
+
 /**
  * Fetch comments for a GitHub issue/PR and enrich the item
  * 
- * Fetches BOTH types of comments:
- * 1. PR review comments (inline code comments) via MCP github_get_pull_request_comments
- * 2. Issue comments (conversation thread) via gh CLI
+ * Fetches BOTH types of comments using gh CLI:
+ * 1. PR review comments (inline code comments) via gh api pulls/{number}/comments
+ * 2. Issue comments (conversation thread) via gh api issues/{number}/comments
  * 
- * This is necessary because bots like Linear post to issue comments, not PR review comments.
+ * This is necessary because:
+ * - Bots like Linear post to issue comments, not PR review comments
+ * - Human reviewers post inline feedback as PR review comments
  * 
- * @param {object} item - Item with owner, repo_short, and number fields
+ * @param {object} item - Item with repository_full_name and number fields
  * @param {object} [options] - Options
  * @param {number} [options.timeout] - Timeout in ms (default: 30000)
- * @param {string} [options.opencodeConfigPath] - Path to opencode.json for MCP config
  * @returns {Promise<Array>} Array of comment objects (merged from both endpoints)
  */
 export async function fetchGitHubComments(item, options = {}) {
@@ -443,61 +472,20 @@ export async function fetchGitHubComments(item, options = {}) {
     return [];
   }
   
-  let mcpConfig;
   try {
-    mcpConfig = getMcpConfig("github", options.opencodeConfigPath);
-  } catch {
-    console.error("[poller] GitHub MCP not configured, cannot fetch comments");
-    return [];
-  }
-  
-  const client = new Client({ name: "opencode-pilot", version: "1.0.0" });
-  
-  try {
-    const transport = await createTransport(mcpConfig);
-    
-    await Promise.race([
-      client.connect(transport),
-      createTimeout(timeout, "MCP connection for comments"),
-    ]);
-    
-    // Fetch both PR review comments (via MCP) AND issue comments (via gh CLI) in parallel
-    const [prCommentsResult, issueComments] = await Promise.all([
-      // PR review comments via MCP (may not be available on all MCP servers)
-      client.callTool({ 
-        name: "github_get_pull_request_comments", 
-        arguments: { owner, repo, pull_number: number } 
-      }).catch(() => null), // Gracefully handle if tool doesn't exist
-      // Issue comments via gh CLI (conversation thread where Linear bot posts)
+    // Fetch both PR review comments AND issue comments in parallel via gh CLI
+    const [prComments, issueComments] = await Promise.all([
+      // PR review comments (inline code comments from reviewers)
+      fetchPrReviewCommentsViaCli(owner, repo, number, timeout),
+      // Issue comments (conversation thread where Linear bot posts)
       fetchIssueCommentsViaCli(owner, repo, number, timeout),
     ]);
     
-    // Parse PR review comments
-    let prComments = [];
-    const prText = prCommentsResult?.content?.[0]?.text;
-    if (prText) {
-      try {
-        const parsed = JSON.parse(prText);
-        prComments = Array.isArray(parsed) ? parsed : [];
-      } catch {
-        // Ignore parse errors
-      }
-    }
-    
     // Return merged comments from both sources
     return [...prComments, ...issueComments];
   } catch (err) {
     console.error(`[poller] Error fetching comments: ${err.message}`);
     return [];
-  } finally {
-    try {
-      await Promise.race([
-        client.close(),
-        new Promise(resolve => setTimeout(resolve, 3000)),
-      ]);
-    } catch {
-      // Ignore close errors
-    }
   }
 }
 

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/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 () => {