opencode-pilot 0.3.0 → 0.5.0

package/README.md

@@ -9,6 +9,7 @@ Automation daemon for [OpenCode](https://github.com/sst/opencode) - polls for wo
 - **Polling automation** - Automatically start sessions from GitHub issues, Linear tickets, etc.
 - **Readiness evaluation** - Check labels, dependencies, and priority before starting work
 - **Template-based prompts** - Customize prompts with placeholders for issue data
+- **Built-in presets** - Common patterns like "my GitHub issues" work out of the box
 
 ## Installation
 
@@ -44,10 +45,26 @@ See [examples/config.yaml](examples/config.yaml) for a complete example with all
 
 ### Key Sections
 
-- **`sources`** - What to poll (GitHub issues, Linear tickets, etc.)
+- **`defaults`** - Default values applied to all sources
+- **`sources`** - What to poll (presets, shorthand, or full config)
 - **`tools`** - Field mappings to normalize different MCP APIs
 - **`repos`** - Repository paths and settings (use YAML anchors to share config)
 
+### Source Syntax
+
+Three ways to configure sources, from simplest to most flexible:
+
+1. **Presets** - Built-in definitions for common patterns (`github/my-issues`, `github/review-requests`, etc.)
+2. **GitHub shorthand** - Simple `github: "query"` syntax for custom GitHub searches
+3. **Full syntax** - Complete control with `tool`, `args`, and `item` for any MCP source
+
+### Available Presets
+
+- `github/my-issues` - Issues assigned to me
+- `github/review-requests` - PRs needing my review
+- `github/my-prs-feedback` - My PRs with change requests
+- `linear/my-issues` - Linear tickets (requires `teamId`, `assigneeId`)
+
 ### Prompt Templates
 
 Create prompt templates as markdown files in `~/.config/opencode-pilot/templates/`. Templates support placeholders like `{title}`, `{body}`, `{number}`, `{html_url}`, etc.

package/examples/config.yaml

@@ -4,63 +4,88 @@
 # Also create templates/ directory with prompt template files
 
 # =============================================================================
-# SERVICE - Daemon configuration
+# DEFAULTS - Applied to all sources (source values override these)
 # =============================================================================
-# port: 4097                        # HTTP port for health checks (default: 4097)
+defaults:
+  agent: plan                        # Default agent for all sources
+  prompt: default                    # Default prompt template
 
 # =============================================================================
-# TOOLS - Field mappings for MCP servers (normalize different APIs)
-# =============================================================================
-tools:
-  github:
-    mappings: {}                    # GitHub already uses standard field names
-
-  linear:
-    mappings:
-      body: title                         # Use title as body
-      number: "url:/([A-Z0-9]+-[0-9]+)/"  # Extract PROJ-123 from URL
-
-# =============================================================================
-# SOURCES - What to poll (generic MCP tool references)
+# SOURCES - What to poll
+#
+# Three syntax options:
+#   1. Presets: Use built-in presets for common patterns
+#   2. Shorthand: Use `github: "query"` for GitHub sources
+#   3. Full: Specify tool, args, item for custom sources
 # =============================================================================
 sources:
+  # ----- PRESET SYNTAX (recommended for common patterns) -----
+  
   # GitHub issues assigned to me
-  - name: my-issues
-    tool:
-      mcp: github
-      name: search_issues
-    args:
-      q: "is:issue assignee:@me state:open"
-    item:
-      id: "{html_url}"
+  - preset: github/my-issues
     prompt: worktree
-    agent: plan
 
-  # GitHub PRs needing review
-  - name: review-requests
-    tool:
-      mcp: github
-      name: search_issues
-    args:
-      q: "is:pr review-requested:@me state:open"
-    item:
-      id: "{html_url}"
+  # GitHub PRs needing my review
+  - preset: github/review-requests
     prompt: review
-    agent: plan
 
-  # Linear issues
-  # NOTE: Replace teamId and assigneeId with your actual Linear UUIDs
-  # Find these via: linear_list_teams and check user IDs in team members
-  - name: linear-work
-    tool:
-      mcp: linear
-      name: list_issues
+  # My PRs that have change requests
+  - preset: github/my-prs-feedback
+    prompt: review-feedback
+
+  # Linear issues (requires teamId and assigneeId)
+  # Find IDs via: opencode-pilot discover linear
+  - preset: linear/my-issues
     args:
       teamId: "your-team-uuid"      # Replace with actual team UUID
       assigneeId: "your-user-uuid"  # Replace with actual user UUID
-      status: "Todo"
-    item:
-      id: "linear:{id}"
+      status: "In Progress"
     working_dir: ~/code/myproject
     prompt: worktree
-    agent: plan
+
+  # ----- SHORTHAND SYNTAX (for custom GitHub queries) -----
+  
+  # Custom GitHub query with shorthand
+  # - name: urgent-issues
+  #   github: "is:issue assignee:@me label:urgent state:open"
+  #   prompt: worktree
+
+  # ----- FULL SYNTAX (for non-GitHub sources or full control) -----
+  
+  # Apple Reminders example (requires tools config below)
+  # - name: agent-tasks
+  #   tool:
+  #     mcp: apple-reminders
+  #     name: list_reminders
+  #   args:
+  #     list_name: "Agent Tasks"
+  #     completed: false
+  #   item:
+  #     id: "reminder:{id}"
+  #   prompt: agent-planning
+  #   working_dir: ~
+
+# =============================================================================
+# TOOLS - Field mappings for custom MCP servers (OPTIONAL)
+#
+# Note: GitHub and Linear presets include built-in mappings.
+# Only needed for custom sources or to override preset defaults.
+#
+# Each tool provider can specify:
+#   response_key: Key to extract array from response (e.g., "reminders")
+#   mappings: Field name translations (e.g., { body: "notes" })
+# =============================================================================
+# tools:
+#   apple-reminders:
+#     response_key: reminders
+#     mappings:
+#       title: name
+#       body: notes
+
+# =============================================================================
+# Available presets (no tools config needed):
+#   github/my-issues        - Issues assigned to me
+#   github/review-requests  - PRs needing my review  
+#   github/my-prs-feedback  - My PRs with change requests
+#   linear/my-issues        - Linear tickets (requires teamId, assigneeId)
+# =============================================================================

package/examples/templates/devcontainer.md

@@ -0,0 +1,9 @@
+/devcontainer {html_url}
+
+Work on this issue in an isolated devcontainer:
+
+{title}
+
+{body}
+
+Complete the implementation and create a PR when ready.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-pilot",
-  "version": "0.3.0",
+  "version": "0.5.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, getToolMappings } from "./repo-config.js";
+import { loadRepoConfig, getRepoConfig, getAllSources, getToolProviderConfig } from "./repo-config.js";
 import { createPoller, pollGenericSource } from "./poller.js";
 import { evaluateReadiness, sortByPriority } from "./readiness.js";
 import { executeAction, buildCommand } from "./actions.js";
@@ -100,8 +100,8 @@ export async function pollOnce(options = {}) {
     // Fetch items from source
     if (!skipMcp) {
       try {
-        const mappings = getToolMappings(source.tool.mcp);
-        items = await pollGenericSource(source, { mappings });
+        const toolProviderConfig = getToolProviderConfig(source.tool.mcp);
+        items = await pollGenericSource(source, { toolProviderConfig });
         debug(`Fetched ${items.length} items from ${sourceName}`);
       } catch (err) {
         console.error(`[poll] Error fetching from ${sourceName}: ${err.message}`);

package/service/poller.js

@@ -107,14 +107,28 @@ export function transformItems(items, idTemplate) {
 
 /**
  * Parse JSON text as an array with error handling
+ * @param {string} text - JSON text to parse
+ * @param {string} sourceName - Source name for error logging
+ * @param {string} [responseKey] - Key to extract array from response object
+ * @returns {Array} Parsed array of items
  */
-function parseJsonArray(text, sourceName) {
+export function parseJsonArray(text, sourceName, responseKey) {
   try {
     const data = JSON.parse(text);
+    
+    // If already an array, return it
     if (Array.isArray(data)) return data;
-    if (data.items) return data.items;
-    if (data.issues) return data.issues;
-    if (data.nodes) return data.nodes;
+    
+    // If response_key is configured, use it to extract the array
+    if (responseKey) {
+      const items = data[responseKey];
+      if (Array.isArray(items)) return items;
+      // response_key was specified but not found or not an array
+      console.error(`[poller] Response key '${responseKey}' not found or not an array in ${sourceName} response`);
+      return [];
+    }
+    
+    // No response_key - wrap single object as array
     return [data];
   } catch (err) {
     console.error(`[poller] Failed to parse ${sourceName} response:`, err.message);
@@ -206,13 +220,15 @@ function createTimeout(ms, operation) {
  * @param {object} [options] - Additional options
  * @param {number} [options.timeout] - Timeout in ms (default: 30000)
  * @param {string} [options.opencodeConfigPath] - Path to opencode.json for MCP config
- * @param {object} [options.mappings] - Field mappings to apply to items
+ * @param {object} [options.toolProviderConfig] - Tool provider config (response_key, mappings)
  * @returns {Promise<Array>} Array of items from the source with IDs and mappings applied
  */
 export async function pollGenericSource(source, options = {}) {
   const toolConfig = getToolConfig(source);
   const timeout = options.timeout || DEFAULT_MCP_TIMEOUT;
-  const mappings = options.mappings || null;
+  const toolProviderConfig = options.toolProviderConfig || {};
+  const responseKey = toolProviderConfig.response_key;
+  const mappings = toolProviderConfig.mappings || null;
   const mcpConfig = getMcpConfig(toolConfig.mcpServer, options.opencodeConfigPath);
   const client = new Client({ name: "opencode-pilot", version: "1.0.0" });
 
@@ -235,7 +251,7 @@ export async function pollGenericSource(source, options = {}) {
     const text = result.content?.[0]?.text;
     if (!text) return [];
     
-    const rawItems = parseJsonArray(text, source.name);
+    const rawItems = parseJsonArray(text, source.name, responseKey);
     
     // Apply field mappings before transforming
     const mappedItems = mappings 

package/service/presets/github.yaml

@@ -0,0 +1,37 @@
+# GitHub source presets
+
+# Provider-level config (applies to all GitHub presets)
+_provider:
+  response_key: items
+  mappings: {}
+
+# Presets
+my-issues:
+  name: my-issues
+  tool:
+    mcp: github
+    name: search_issues
+  args:
+    q: "is:issue assignee:@me state:open"
+  item:
+    id: "{html_url}"
+
+review-requests:
+  name: review-requests
+  tool:
+    mcp: github
+    name: search_issues
+  args:
+    q: "is:pr review-requested:@me state:open"
+  item:
+    id: "{html_url}"
+
+my-prs-feedback:
+  name: my-prs-feedback
+  tool:
+    mcp: github
+    name: search_issues
+  args:
+    q: "is:pr author:@me state:open review:changes_requested"
+  item:
+    id: "{html_url}"

package/service/presets/index.js

@@ -0,0 +1,157 @@
+/**
+ * presets/index.js - Built-in source presets for common patterns
+ *
+ * Presets reduce config verbosity by providing sensible defaults
+ * for common polling sources like GitHub issues and Linear tickets.
+ * 
+ * Presets are loaded from YAML files in this directory.
+ * Each file can include a _provider key with provider-level config
+ * (response_key, mappings) that applies to all presets for that provider.
+ */
+
+import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+import YAML from "yaml";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+// Cache for loaded provider data
+const providerCache = {};
+
+/**
+ * Load provider data from a YAML file
+ * @param {string} provider - Provider name (e.g., "github", "linear")
+ * @returns {object} Provider data with presets and _provider config
+ */
+function loadProviderData(provider) {
+  if (providerCache[provider]) {
+    return providerCache[provider];
+  }
+
+  const filePath = path.join(__dirname, `${provider}.yaml`);
+  if (!fs.existsSync(filePath)) {
+    providerCache[provider] = { presets: {}, providerConfig: null };
+    return providerCache[provider];
+  }
+  
+  try {
+    const content = fs.readFileSync(filePath, "utf-8");
+    const data = YAML.parse(content) || {};
+    
+    // Extract _provider config and presets
+    const { _provider, ...presets } = data;
+    
+    providerCache[provider] = {
+      presets,
+      providerConfig: _provider || null,
+    };
+    return providerCache[provider];
+  } catch (err) {
+    console.error(`Warning: Failed to load presets from ${filePath}: ${err.message}`);
+    providerCache[provider] = { presets: {}, providerConfig: null };
+    return providerCache[provider];
+  }
+}
+
+/**
+ * Build the full presets registry from YAML files
+ * Format: "provider/preset-name" -> preset config
+ */
+function buildPresetsRegistry() {
+  const registry = {};
+  const providers = ["github", "linear"];
+  
+  for (const provider of providers) {
+    const { presets } = loadProviderData(provider);
+    for (const [name, config] of Object.entries(presets)) {
+      registry[`${provider}/${name}`] = config;
+    }
+  }
+  
+  return registry;
+}
+
+// Load presets once at module initialization
+const PRESETS = buildPresetsRegistry();
+
+/**
+ * Get a preset by name
+ * @param {string} presetName - Preset identifier (e.g., "github/my-issues")
+ * @returns {object|null} Preset configuration or null if not found
+ */
+export function getPreset(presetName) {
+  return PRESETS[presetName] || null;
+}
+
+/**
+ * Get provider config (response_key, mappings) for a provider
+ * @param {string} provider - Provider name (e.g., "github", "linear")
+ * @returns {object|null} Provider config or null if not found
+ */
+export function getProviderConfig(provider) {
+  const { providerConfig } = loadProviderData(provider);
+  return providerConfig;
+}
+
+/**
+ * List all available preset names
+ * @returns {string[]} Array of preset names
+ */
+export function listPresets() {
+  return Object.keys(PRESETS);
+}
+
+/**
+ * Expand a preset into a full source configuration
+ * User config is merged on top of preset defaults
+ * @param {string} presetName - Preset identifier
+ * @param {object} userConfig - User's source config (overrides preset)
+ * @returns {object} Merged source configuration
+ * @throws {Error} If preset is unknown
+ */
+export function expandPreset(presetName, userConfig) {
+  const preset = getPreset(presetName);
+  if (!preset) {
+    throw new Error(`Unknown preset: ${presetName}`);
+  }
+
+  // Deep merge: preset as base, user config on top
+  return {
+    ...preset,
+    ...userConfig,
+    // Merge nested objects specially
+    tool: userConfig.tool || preset.tool,
+    args: {
+      ...preset.args,
+      ...(userConfig.args || {}),
+    },
+    item: userConfig.item || preset.item,
+    // Remove the preset key from final output
+    preset: undefined,
+  };
+}
+
+/**
+ * Expand GitHub shorthand syntax into full source config
+ * @param {string} query - GitHub search query
+ * @param {object} userConfig - Rest of user's source config
+ * @returns {object} Full source configuration
+ */
+export function expandGitHubShorthand(query, userConfig) {
+  return {
+    ...userConfig,
+    tool: {
+      mcp: "github",
+      name: "search_issues",
+    },
+    args: {
+      q: query,
+    },
+    item: {
+      id: "{html_url}",
+    },
+    // Remove the github key from final output
+    github: undefined,
+  };
+}

package/service/presets/linear.yaml

@@ -0,0 +1,19 @@
+# Linear source presets
+
+# Provider-level config (applies to all Linear presets)
+_provider:
+  response_key: nodes
+  mappings:
+    body: title
+    number: "url:/([A-Z0-9]+-[0-9]+)/"
+
+# Presets
+my-issues:
+  name: my-issues
+  tool:
+    mcp: linear
+    name: list_issues
+  args: {}
+    # teamId and assigneeId are required - user must provide
+  item:
+    id: "linear:{id}"

package/service/repo-config.js

@@ -3,8 +3,9 @@
  *
  * Manages configuration stored in ~/.config/opencode-pilot/config.yaml
  * Supports:
+ * - defaults: default values applied to all sources
  * - repos: per-repository settings (use YAML anchors for sharing)
- * - sources: polling sources with generic tool references
+ * - sources: polling sources with generic tool references, presets, or shorthand
  * - tools: field mappings for normalizing MCP responses
  * - templates: prompt templates stored as markdown files
  */
@@ -14,6 +15,7 @@ import path from "path";
 import os from "os";
 import YAML from "yaml";
 import { getNestedValue } from "./utils.js";
+import { expandPreset, expandGitHubShorthand, getProviderConfig } from "./presets/index.js";
 
 // Default config path
 const DEFAULT_CONFIG_PATH = path.join(
@@ -100,13 +102,53 @@ export function getRepoConfig(repoKey) {
   return repoConfig;
 }
 
+/**
+ * Normalize a single source config
+ * Expands presets, shorthand syntax, and applies defaults
+ * @param {object} source - Raw source config
+ * @param {object} defaults - Default values to apply
+ * @returns {object} Normalized source config
+ */
+function normalizeSource(source, defaults) {
+  let normalized = { ...source };
+
+  // Expand preset if present
+  if (source.preset) {
+    normalized = expandPreset(source.preset, source);
+  }
+
+  // Expand GitHub shorthand if present
+  if (source.github) {
+    normalized = expandGitHubShorthand(source.github, source);
+  }
+
+  // Apply defaults (source values take precedence)
+  return {
+    ...defaults,
+    ...normalized,
+  };
+}
+
 /**
  * Get all top-level sources (for polling)
- * @returns {Array} Array of source configurations
+ * Expands presets and shorthand syntax, applies defaults
+ * @returns {Array} Array of normalized source configurations
  */
 export function getSources() {
   const config = getRawConfig();
-  return config.sources || [];
+  const rawSources = config.sources || [];
+  const defaults = config.defaults || {};
+
+  return rawSources.map((source) => normalizeSource(source, defaults));
+}
+
+/**
+ * Get defaults section from config
+ * @returns {object} Defaults configuration or empty object
+ */
+export function getDefaults() {
+  const config = getRawConfig();
+  return config.defaults || {};
 }
 
 /**
@@ -134,6 +176,40 @@ export function getToolMappings(provider) {
   return toolConfig.mappings;
 }
 
+/**
+ * Get full tool provider configuration (response_key, mappings, etc.)
+ * Checks user config first, then falls back to preset provider defaults
+ * @param {string} provider - Tool provider name (e.g., "github", "linear", "apple-reminders")
+ * @returns {object|null} Tool config including response_key and mappings, or null if not configured
+ */
+export function getToolProviderConfig(provider) {
+  const config = getRawConfig();
+  const tools = config.tools || {};
+  const userToolConfig = tools[provider];
+  
+  // Get preset provider config as fallback
+  const presetProviderConfig = getProviderConfig(provider);
+
+  // If user has config, merge with preset defaults (user takes precedence)
+  if (userToolConfig) {
+    if (presetProviderConfig) {
+      return {
+        ...presetProviderConfig,
+        ...userToolConfig,
+        // Deep merge mappings
+        mappings: {
+          ...(presetProviderConfig.mappings || {}),
+          ...(userToolConfig.mappings || {}),
+        },
+      };
+    }
+    return userToolConfig;
+  }
+
+  // Fall back to preset provider config
+  return presetProviderConfig;
+}
+
 /**
  * Load a template from the templates directory
  * @param {string} templateName - Template name (without .md extension)

package/test/unit/poller.test.js

@@ -312,6 +312,65 @@ describe('poller.js', () => {
     });
   });
 
+  describe('parseJsonArray', () => {
+    test('parses direct array response', async () => {
+      const { parseJsonArray } = await import('../../service/poller.js');
+      
+      const text = JSON.stringify([{ id: '1' }, { id: '2' }]);
+      const result = parseJsonArray(text, 'test');
+      
+      assert.strictEqual(result.length, 2);
+      assert.strictEqual(result[0].id, '1');
+    });
+
+    test('extracts array using response_key', async () => {
+      const { parseJsonArray } = await import('../../service/poller.js');
+      
+      const text = JSON.stringify({
+        reminders: [
+          { id: 'reminder-1', name: 'Task 1', completed: false },
+          { id: 'reminder-2', name: 'Task 2', completed: false },
+          { id: 'reminder-3', name: 'Task 3', completed: false }
+        ],
+        count: 3
+      });
+      const result = parseJsonArray(text, 'agent-tasks', 'reminders');
+      
+      assert.strictEqual(result.length, 3);
+      assert.strictEqual(result[0].id, 'reminder-1');
+      assert.strictEqual(result[0].name, 'Task 1');
+      assert.strictEqual(result[1].id, 'reminder-2');
+      assert.strictEqual(result[2].id, 'reminder-3');
+    });
+
+    test('wraps single object as array when no response_key', async () => {
+      const { parseJsonArray } = await import('../../service/poller.js');
+      
+      const text = JSON.stringify({ id: '1', title: 'Single item' });
+      const result = parseJsonArray(text, 'test');
+      
+      assert.strictEqual(result.length, 1);
+      assert.strictEqual(result[0].id, '1');
+    });
+
+    test('returns empty array for invalid JSON', async () => {
+      const { parseJsonArray } = await import('../../service/poller.js');
+      
+      const result = parseJsonArray('not valid json', 'test');
+      
+      assert.strictEqual(result.length, 0);
+    });
+
+    test('returns empty array when response_key not found', async () => {
+      const { parseJsonArray } = await import('../../service/poller.js');
+      
+      const text = JSON.stringify({ items: [{ id: '1' }] });
+      const result = parseJsonArray(text, 'test', 'reminders');
+      
+      assert.strictEqual(result.length, 0);
+    });
+  });
+
   describe('transformItems with mappings', () => {
     test('applies mappings to all items', async () => {
       const { transformItems, applyMappings } = await import('../../service/poller.js');

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

@@ -314,6 +314,84 @@ sources: []
       
       assert.strictEqual(mappings, null);
     });
+
+    test('getToolProviderConfig returns full tool config with response_key', async () => {
+      writeFileSync(configPath, `
+tools:
+  apple-reminders:
+    response_key: reminders
+    mappings:
+      body: notes
+
+sources: []
+`);
+
+      const { loadRepoConfig, getToolProviderConfig } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      
+      const toolConfig = getToolProviderConfig('apple-reminders');
+      
+      assert.strictEqual(toolConfig.response_key, 'reminders');
+      assert.deepStrictEqual(toolConfig.mappings, { body: 'notes' });
+    });
+
+    test('getToolProviderConfig returns config without response_key', async () => {
+      writeFileSync(configPath, `
+tools:
+  github:
+    mappings:
+      url: html_url
+
+sources: []
+`);
+
+      const { loadRepoConfig, getToolProviderConfig } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      
+      const toolConfig = getToolProviderConfig('github');
+      
+      // GitHub preset has response_key: items, user config doesn't override it
+      assert.strictEqual(toolConfig.response_key, 'items');
+      assert.deepStrictEqual(toolConfig.mappings, { url: 'html_url' });
+    });
+
+    test('getToolProviderConfig falls back to preset provider config', async () => {
+      writeFileSync(configPath, `
+sources: []
+`);
+
+      const { loadRepoConfig, getToolProviderConfig } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      
+      // Linear preset has provider config with response_key and mappings
+      const toolConfig = getToolProviderConfig('linear');
+      
+      assert.strictEqual(toolConfig.response_key, 'nodes');
+      assert.strictEqual(toolConfig.mappings.body, 'title');
+      assert.strictEqual(toolConfig.mappings.number, 'url:/([A-Z0-9]+-[0-9]+)/');
+    });
+
+    test('getToolProviderConfig merges user config with preset defaults', async () => {
+      writeFileSync(configPath, `
+tools:
+  linear:
+    mappings:
+      custom_field: some_source
+
+sources: []
+`);
+
+      const { loadRepoConfig, getToolProviderConfig } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      
+      const toolConfig = getToolProviderConfig('linear');
+      
+      // Should have preset response_key
+      assert.strictEqual(toolConfig.response_key, 'nodes');
+      // Should have preset mappings plus user mappings
+      assert.strictEqual(toolConfig.mappings.body, 'title');
+      assert.strictEqual(toolConfig.mappings.custom_field, 'some_source');
+    });
   });
 
   describe('repo resolution for sources', () => {
@@ -438,4 +516,217 @@ repos:
       assert.strictEqual(repoKey, null);
     });
   });
+
+  describe('presets', () => {
+    test('expands github/my-issues preset', async () => {
+      writeFileSync(configPath, `
+sources:
+  - preset: github/my-issues
+    prompt: worktree
+`);
+
+      const { loadRepoConfig, getSources } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      const sources = getSources();
+
+      assert.strictEqual(sources.length, 1);
+      assert.strictEqual(sources[0].name, 'my-issues');
+      assert.deepStrictEqual(sources[0].tool, { mcp: 'github', name: 'search_issues' });
+      assert.strictEqual(sources[0].args.q, 'is:issue assignee:@me state:open');
+      assert.strictEqual(sources[0].item.id, '{html_url}');
+      assert.strictEqual(sources[0].prompt, 'worktree');
+    });
+
+    test('expands github/review-requests preset', async () => {
+      writeFileSync(configPath, `
+sources:
+  - preset: github/review-requests
+`);
+
+      const { loadRepoConfig, getSources } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      const sources = getSources();
+
+      assert.strictEqual(sources[0].name, 'review-requests');
+      assert.strictEqual(sources[0].args.q, 'is:pr review-requested:@me state:open');
+    });
+
+    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');
+      assert.strictEqual(sources[0].args.q, 'is:pr author:@me state:open review:changes_requested');
+    });
+
+    test('expands linear/my-issues preset with required args', async () => {
+      writeFileSync(configPath, `
+sources:
+  - preset: linear/my-issues
+    args:
+      teamId: "team-uuid-123"
+      assigneeId: "user-uuid-456"
+`);
+
+      const { loadRepoConfig, getSources } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      const sources = getSources();
+
+      assert.strictEqual(sources[0].name, 'my-issues');
+      assert.deepStrictEqual(sources[0].tool, { mcp: 'linear', name: 'list_issues' });
+      assert.strictEqual(sources[0].args.teamId, 'team-uuid-123');
+      assert.strictEqual(sources[0].args.assigneeId, 'user-uuid-456');
+    });
+
+    test('user config overrides preset values', async () => {
+      writeFileSync(configPath, `
+sources:
+  - preset: github/my-issues
+    name: custom-name
+    args:
+      q: "is:issue assignee:@me state:open label:urgent"
+    agent: plan
+`);
+
+      const { loadRepoConfig, getSources } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      const sources = getSources();
+
+      assert.strictEqual(sources[0].name, 'custom-name');
+      assert.strictEqual(sources[0].args.q, 'is:issue assignee:@me state:open label:urgent');
+      assert.strictEqual(sources[0].agent, 'plan');
+    });
+
+    test('throws error for unknown preset', async () => {
+      writeFileSync(configPath, `
+sources:
+  - preset: unknown/preset
+`);
+
+      const { loadRepoConfig, getSources } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      
+      assert.throws(() => getSources(), /Unknown preset: unknown\/preset/);
+    });
+  });
+
+  describe('shorthand syntax', () => {
+    test('expands github shorthand to full source', async () => {
+      writeFileSync(configPath, `
+sources:
+  - name: my-issues
+    github: "is:issue assignee:@me state:open"
+    prompt: worktree
+`);
+
+      const { loadRepoConfig, getSources } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      const sources = getSources();
+
+      assert.strictEqual(sources.length, 1);
+      assert.strictEqual(sources[0].name, 'my-issues');
+      assert.deepStrictEqual(sources[0].tool, { mcp: 'github', name: 'search_issues' });
+      assert.strictEqual(sources[0].args.q, 'is:issue assignee:@me state:open');
+      assert.strictEqual(sources[0].item.id, '{html_url}');
+      assert.strictEqual(sources[0].prompt, 'worktree');
+    });
+
+    test('shorthand works with other source fields', async () => {
+      writeFileSync(configPath, `
+sources:
+  - name: urgent-issues
+    github: "is:issue assignee:@me label:urgent"
+    agent: plan
+    working_dir: ~/code/myproject
+`);
+
+      const { loadRepoConfig, getSources } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      const sources = getSources();
+
+      assert.strictEqual(sources[0].agent, 'plan');
+      assert.strictEqual(sources[0].working_dir, '~/code/myproject');
+    });
+  });
+
+  describe('defaults section', () => {
+    test('applies defaults to sources without those fields', async () => {
+      writeFileSync(configPath, `
+defaults:
+  agent: plan
+  prompt: default
+
+sources:
+  - preset: github/my-issues
+  - preset: github/review-requests
+    prompt: review
+`);
+
+      const { loadRepoConfig, getSources } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      const sources = getSources();
+
+      // First source gets both defaults
+      assert.strictEqual(sources[0].agent, 'plan');
+      assert.strictEqual(sources[0].prompt, 'default');
+      
+      // Second source overrides prompt but gets agent default
+      assert.strictEqual(sources[1].agent, 'plan');
+      assert.strictEqual(sources[1].prompt, 'review');
+    });
+
+    test('source values override defaults', async () => {
+      writeFileSync(configPath, `
+defaults:
+  agent: plan
+  model: claude-3-sonnet
+
+sources:
+  - preset: github/my-issues
+    agent: architect
+`);
+
+      const { loadRepoConfig, getSources } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      const sources = getSources();
+
+      assert.strictEqual(sources[0].agent, 'architect');
+      assert.strictEqual(sources[0].model, 'claude-3-sonnet');
+    });
+
+    test('getDefaults returns defaults section', async () => {
+      writeFileSync(configPath, `
+defaults:
+  agent: plan
+  prompt: default
+  working_dir: ~/code
+`);
+
+      const { loadRepoConfig, getDefaults } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      const defaults = getDefaults();
+
+      assert.strictEqual(defaults.agent, 'plan');
+      assert.strictEqual(defaults.prompt, 'default');
+      assert.strictEqual(defaults.working_dir, '~/code');
+    });
+
+    test('getDefaults returns empty object when no defaults', async () => {
+      writeFileSync(configPath, `
+sources: []
+`);
+
+      const { loadRepoConfig, getDefaults } = await import('../../service/repo-config.js');
+      loadRepoConfig(configPath);
+      const defaults = getDefaults();
+
+      assert.deepStrictEqual(defaults, {});
+    });
+  });
 });