opencode-pilot 0.12.0 → 0.13.1

package/README.md

@@ -106,20 +106,6 @@ When using `server_port` to attach sessions to a global OpenCode server (e.g., O
 
 **Upstream issue**: [anomalyco/opencode#7376](https://github.com/anomalyco/opencode/issues/7376)
 
-### Working directory doesn't switch when templates create worktrees/devcontainers
-
-When a template instructs the agent to create a git worktree or switch to a devcontainer, OpenCode's internal working directory context (`Instance.directory`) doesn't update. This means:
-
-- The "Session changes" panel shows diffs from the original directory
-- File tools may resolve paths relative to the wrong location
-- The agent works in the new directory, but OpenCode doesn't follow
-
-**Workaround**: Start OpenCode directly in the target directory, or use separate terminal sessions.
-
-**Upstream issue**: [anomalyco/opencode#6697](https://github.com/anomalyco/opencode/issues/6697)
-
-**Related**: [opencode-devcontainers#103](https://github.com/athal7/opencode-devcontainers/issues/103)
-
 ## Related
 
 - [opencode-devcontainers](https://github.com/athal7/opencode-devcontainers) - Run multiple devcontainer instances for OpenCode

package/bin/opencode-pilot

@@ -39,8 +39,8 @@ function findServiceDir() {
 const serviceDir = findServiceDir();
 
 // Paths
-const PILOT_CONFIG_FILE = join(os.homedir(), ".config/opencode-pilot/config.yaml");
-const PILOT_TEMPLATES_DIR = join(os.homedir(), ".config/opencode-pilot/templates");
+const PILOT_CONFIG_FILE = join(os.homedir(), ".config/opencode/pilot/config.yaml");
+const PILOT_TEMPLATES_DIR = join(os.homedir(), ".config/opencode/pilot/templates");
 
 // Default port
 const DEFAULT_PORT = 4097;
@@ -231,7 +231,7 @@ async function configCommand() {
     console.log(`Config file not found: ${PILOT_CONFIG_FILE}`);
     console.log("");
     console.log("Create one by copying the example:");
-    console.log("  cp node_modules/opencode-pilot/examples/config.yaml ~/.config/opencode-pilot/config.yaml");
+    console.log("  cp node_modules/opencode-pilot/examples/config.yaml ~/.config/opencode/pilot/config.yaml");
     process.exit(1);
   }
 
@@ -666,7 +666,7 @@ async function clearCommand(flags) {
       // No flags - show current state summary
       console.log("Poll state summary:");
       console.log(`  Total entries: ${beforeCount}`);
-      console.log(`  State file: ~/.config/opencode-pilot/poll-state.json`);
+      console.log(`  State file: ~/.config/opencode/pilot/poll-state.json`);
       console.log("");
       console.log("Usage:");
       console.log("  opencode-pilot clear --all           Clear all entries");

package/package.json

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

package/plugin/index.js

@@ -10,7 +10,7 @@ import { homedir } from 'os'
 import YAML from 'yaml'
 
 const DEFAULT_PORT = 4097
-const CONFIG_PATH = join(homedir(), '.config', 'opencode-pilot', 'config.yaml')
+const CONFIG_PATH = join(homedir(), '.config', 'opencode', 'pilot', 'config.yaml')
 
 /**
  * Load port from config file

package/service/poller.js

@@ -67,15 +67,33 @@ export function applyMappings(item, mappings) {
 
 /**
  * Get tool configuration from a source
+ * Supports both MCP tools and CLI commands.
+ * 
  * @param {object} source - Source configuration from config.yaml
- * @returns {object} Tool configuration
+ * @returns {object} Tool configuration with type indicator
  */
 export function getToolConfig(source) {
-  if (!source.tool || !source.tool.mcp || !source.tool.name) {
-    throw new Error(`Source '${source.name || 'unknown'}' missing tool configuration (requires tool.mcp and tool.name)`);
+  if (!source.tool) {
+    throw new Error(`Source '${source.name || 'unknown'}' missing tool configuration`);
+  }
+
+  // CLI command support
+  if (source.tool.command) {
+    return {
+      type: 'cli',
+      command: source.tool.command,
+      args: source.args || {},
+      idTemplate: source.item?.id || null,
+    };
+  }
+
+  // MCP tool support (existing behavior)
+  if (!source.tool.mcp || !source.tool.name) {
+    throw new Error(`Source '${source.name || 'unknown'}' missing tool configuration (requires tool.mcp and tool.name, or tool.command)`);
   }
 
   return {
+    type: 'mcp',
     mcpServer: source.tool.mcp,
     toolName: source.tool.name,
     args: source.args || {},
@@ -214,7 +232,84 @@ function createTimeout(ms, operation) {
 }
 
 /**
- * Poll a source using MCP tools
+ * Execute a CLI command and return parsed JSON output
+ * 
+ * @param {string|string[]} command - Command to execute (string or array)
+ * @param {object} args - Arguments to substitute into command
+ * @param {number} timeout - Timeout in ms
+ * @returns {Promise<string>} Command output
+ */
+async function executeCliCommand(command, args, timeout) {
+  const { exec } = await import('child_process');
+  const { promisify } = await import('util');
+  const execAsync = promisify(exec);
+
+  // Build command string
+  let cmdStr;
+  if (Array.isArray(command)) {
+    // Substitute args into command array
+    const expandedCmd = command.map(part => {
+      if (typeof part === 'string' && part.startsWith('$')) {
+        const argName = part.slice(1);
+        return args[argName] !== undefined ? String(args[argName]) : part;
+      }
+      return part;
+    });
+    // Quote parts with spaces
+    cmdStr = expandedCmd.map(p => p.includes(' ') ? `"${p}"` : p).join(' ');
+  } else {
+    // String command - substitute ${argName} patterns
+    cmdStr = command.replace(/\$\{(\w+)\}/g, (_, name) => {
+      return args[name] !== undefined ? String(args[name]) : '';
+    });
+  }
+
+  const { stdout } = await Promise.race([
+    execAsync(cmdStr, { env: { ...process.env } }),
+    createTimeout(timeout, `CLI command: ${cmdStr.slice(0, 50)}...`),
+  ]);
+
+  return stdout;
+}
+
+/**
+ * Poll a source using CLI command
+ * 
+ * @param {object} source - Source configuration from config.yaml
+ * @param {object} toolConfig - Tool config from getToolConfig()
+ * @param {object} [options] - Additional options
+ * @param {number} [options.timeout] - Timeout in ms (default: 30000)
+ * @param {object} [options.toolProviderConfig] - Tool provider config (response_key, mappings)
+ * @returns {Promise<Array>} Array of items from the source with IDs and mappings applied
+ */
+async function pollCliSource(source, toolConfig, options = {}) {
+  const timeout = options.timeout || DEFAULT_MCP_TIMEOUT;
+  const toolProviderConfig = options.toolProviderConfig || {};
+  const responseKey = toolProviderConfig.response_key;
+  const mappings = toolProviderConfig.mappings || null;
+
+  try {
+    const output = await executeCliCommand(toolConfig.command, toolConfig.args, timeout);
+    
+    if (!output || !output.trim()) return [];
+
+    const rawItems = parseJsonArray(output, source.name, responseKey);
+
+    // Apply field mappings before transforming
+    const mappedItems = mappings
+      ? rawItems.map(item => applyMappings(item, mappings))
+      : rawItems;
+
+    // Transform items (add IDs)
+    return transformItems(mappedItems, toolConfig.idTemplate);
+  } catch (err) {
+    console.error(`[poller] CLI command failed for ${source.name}: ${err.message}`);
+    return [];
+  }
+}
+
+/**
+ * Poll a source using MCP tools or CLI commands
  * 
  * @param {object} source - Source configuration from config.yaml
  * @param {object} [options] - Additional options
@@ -225,6 +320,13 @@ function createTimeout(ms, operation) {
  */
 export async function pollGenericSource(source, options = {}) {
   const toolConfig = getToolConfig(source);
+
+  // Route to CLI handler if command-based
+  if (toolConfig.type === 'cli') {
+    return pollCliSource(source, toolConfig, options);
+  }
+
+  // MCP-based polling (existing behavior)
   const timeout = options.timeout || DEFAULT_MCP_TIMEOUT;
   const toolProviderConfig = options.toolProviderConfig || {};
   const responseKey = toolProviderConfig.response_key;

package/service/repo-config.js

@@ -1,7 +1,7 @@
 /**
  * repo-config.js - Configuration management
  *
- * Manages configuration stored in ~/.config/opencode-pilot/config.yaml
+ * 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)

package/test/unit/poller.test.js

@@ -57,6 +57,60 @@ describe('poller.js', () => {
     });
   });
 
+  describe('getToolConfig', () => {
+    test('returns MCP config for mcp-based sources', async () => {
+      const { getToolConfig } = await import('../../service/poller.js');
+      
+      const source = {
+        name: 'test-source',
+        tool: { mcp: 'github', name: 'search_issues' },
+        args: { q: 'is:open' },
+        item: { id: '{html_url}' }
+      };
+      
+      const config = getToolConfig(source);
+      assert.strictEqual(config.type, 'mcp');
+      assert.strictEqual(config.mcpServer, 'github');
+      assert.strictEqual(config.toolName, 'search_issues');
+      assert.deepStrictEqual(config.args, { q: 'is:open' });
+      assert.strictEqual(config.idTemplate, '{html_url}');
+    });
+
+    test('returns CLI config for command-based sources', async () => {
+      const { getToolConfig } = await import('../../service/poller.js');
+      
+      const source = {
+        name: 'test-source',
+        tool: { command: ['granola-cli', 'meetings', 'list', '20'] },
+        item: { id: 'meeting:{id}' }
+      };
+      
+      const config = getToolConfig(source);
+      assert.strictEqual(config.type, 'cli');
+      assert.deepStrictEqual(config.command, ['granola-cli', 'meetings', 'list', '20']);
+      assert.strictEqual(config.idTemplate, 'meeting:{id}');
+    });
+
+    test('throws for sources missing tool config', async () => {
+      const { getToolConfig } = await import('../../service/poller.js');
+      
+      const source = { name: 'bad-source' };
+      
+      assert.throws(() => getToolConfig(source), /missing tool configuration/);
+    });
+
+    test('throws for mcp sources missing name', async () => {
+      const { getToolConfig } = await import('../../service/poller.js');
+      
+      const source = {
+        name: 'bad-source',
+        tool: { mcp: 'github' } // missing name
+      };
+      
+      assert.throws(() => getToolConfig(source), /missing tool configuration/);
+    });
+  });
+
   describe('createPoller', () => {
     test('creates poller with state tracking', async () => {
       const { createPoller } = await import('../../service/poller.js');