fix: address review feedback on OpenCode adapter (#29)

- Use AGENTS.md instead of .opencode/instructions.md (per OpenCode docs)
- Fix opencode.json config: model uses provider/model format, provider is object with npm package
- Fix runner CLI: use `opencode run --prompt` for single-shot mode
- Fix process.exit() before finally cleanup — move cleanup before exit
- Extract shared buildComplianceSection to src/adapters/shared.ts (dedup from copilot.ts)
- Fix importer to read AGENTS.md and parse provider/model format
- Fix git auto-detection to check opencode.json instead of .opencode/

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: shreyas-lyzr

src/adapters/copilot.ts

@@ -3,6 +3,7 @@ import { join, resolve } from 'node:path';
 import yaml from 'js-yaml';
 import { loadAgentManifest, loadFileIfExists } from '../utils/loader.js';
 import { loadAllSkills, getAllowedTools } from '../utils/skill-loader.js';
+import { buildComplianceSection } from './shared.js';
 
 /**
  * Export a gitagent to GitHub Copilot CLI format.
@@ -204,65 +205,3 @@ function collectSkills(agentDir: string): Array<{ name: string; content: string
   return skills;
 }
 
-function buildComplianceSection(compliance: NonNullable<ReturnType<typeof loadAgentManifest>['compliance']>): string {
-  const c = compliance;
-  const constraints: string[] = [];
-
-  if (c.supervision?.human_in_the_loop === 'always') {
-    constraints.push('- All decisions require human approval before execution');
-  }
-  if (c.supervision?.escalation_triggers) {
-    constraints.push('- Escalate to human supervisor when:');
-    for (const trigger of c.supervision.escalation_triggers) {
-      for (const [key, value] of Object.entries(trigger)) {
-        constraints.push(`  - ${key}: ${value}`);
-      }
-    }
-  }
-  if (c.communications?.fair_balanced) {
-    constraints.push('- All communications must be fair and balanced (FINRA 2210)');
-  }
-  if (c.communications?.no_misleading) {
-    constraints.push('- Never make misleading, exaggerated, or promissory statements');
-  }
-  if (c.data_governance?.pii_handling === 'redact') {
-    constraints.push('- Redact all PII from outputs');
-  }
-  if (c.data_governance?.pii_handling === 'prohibit') {
-    constraints.push('- Do not process any personally identifiable information');
-  }
-
-  if (c.segregation_of_duties) {
-    const sod = c.segregation_of_duties;
-    constraints.push('- Segregation of duties is enforced:');
-    if (sod.assignments) {
-      for (const [agentName, roles] of Object.entries(sod.assignments)) {
-        constraints.push(`  - Agent "${agentName}" has role(s): ${roles.join(', ')}`);
-      }
-    }
-    if (sod.conflicts) {
-      constraints.push('- Duty separation rules (no single agent may hold both):');
-      for (const [a, b] of sod.conflicts) {
-        constraints.push(`  - ${a} and ${b}`);
-      }
-    }
-    if (sod.handoffs) {
-      constraints.push('- The following actions require multi-agent handoff:');
-      for (const h of sod.handoffs) {
-        constraints.push(`  - ${h.action}: must pass through roles ${h.required_roles.join(' → ')}${h.approval_required !== false ? ' (approval required)' : ''}`);
-      }
-    }
-    if (sod.isolation?.state === 'full') {
-      constraints.push('- Agent state/memory is fully isolated per role');
-    }
-    if (sod.isolation?.credentials === 'separate') {
-      constraints.push('- Credentials are segregated per role');
-    }
-    if (sod.enforcement === 'strict') {
-      constraints.push('- SOD enforcement is STRICT — violations will block execution');
-    }
-  }
-
-  if (constraints.length === 0) return '';
-  return `## Compliance Constraints\n\n${constraints.join('\n')}`;
-}

src/adapters/opencode.ts

@@ -3,13 +3,14 @@ import { join, resolve } from 'node:path';
 import yaml from 'js-yaml';
 import { loadAgentManifest, loadFileIfExists } from '../utils/loader.js';
 import { loadAllSkills, getAllowedTools } from '../utils/skill-loader.js';
+import { buildComplianceSection } from './shared.js';
 
 /**
  * Export a gitagent to OpenCode format.
  *
  * OpenCode (sst/opencode) uses:
- *   - .opencode/instructions.md   (custom agent instructions)
- *   - opencode.json               (project configuration)
+ *   - AGENTS.md              (custom agent instructions, project root)
+ *   - opencode.json          (project configuration)
  *
  * Returns structured output with all files that should be written.
  */
@@ -35,7 +36,7 @@ export function exportToOpenCodeString(dir: string): string {
   const exp = exportToOpenCode(dir);
   const parts: string[] = [];
 
-  parts.push('# === .opencode/instructions.md ===');
+  parts.push('# === AGENTS.md ===');
   parts.push(exp.instructions);
   parts.push('\n# === opencode.json ===');
   parts.push(JSON.stringify(exp.config, null, 2));
@@ -177,8 +178,12 @@ function buildConfig(manifest: ReturnType<typeof loadAgentManifest>): Record<str
   if (manifest.model?.preferred) {
     const model = manifest.model.preferred;
     const provider = inferProvider(model);
-    config.provider = provider;
-    config.model = model;
+    config.model = `${provider}/${model}`;
+    config.provider = {
+      [provider]: {
+        npm: getNpmPackage(provider),
+      },
+    };
   }
 
   return config;
@@ -193,65 +198,13 @@ function inferProvider(model: string): string {
   return 'openai';
 }
 
-function buildComplianceSection(compliance: NonNullable<ReturnType<typeof loadAgentManifest>['compliance']>): string {
-  const c = compliance;
-  const constraints: string[] = [];
-
-  if (c.supervision?.human_in_the_loop === 'always') {
-    constraints.push('- All decisions require human approval before execution');
-  }
-  if (c.supervision?.escalation_triggers) {
-    constraints.push('- Escalate to human supervisor when:');
-    for (const trigger of c.supervision.escalation_triggers) {
-      for (const [key, value] of Object.entries(trigger)) {
-        constraints.push(`  - ${key}: ${value}`);
-      }
-    }
-  }
-  if (c.communications?.fair_balanced) {
-    constraints.push('- All communications must be fair and balanced (FINRA 2210)');
-  }
-  if (c.communications?.no_misleading) {
-    constraints.push('- Never make misleading, exaggerated, or promissory statements');
-  }
-  if (c.data_governance?.pii_handling === 'redact') {
-    constraints.push('- Redact all PII from outputs');
-  }
-  if (c.data_governance?.pii_handling === 'prohibit') {
-    constraints.push('- Do not process any personally identifiable information');
-  }
-
-  if (c.segregation_of_duties) {
-    const sod = c.segregation_of_duties;
-    constraints.push('- Segregation of duties is enforced:');
-    if (sod.assignments) {
-      for (const [agentName, roles] of Object.entries(sod.assignments)) {
-        constraints.push(`  - Agent "${agentName}" has role(s): ${roles.join(', ')}`);
-      }
-    }
-    if (sod.conflicts) {
-      constraints.push('- Duty separation rules (no single agent may hold both):');
-      for (const [a, b] of sod.conflicts) {
-        constraints.push(`  - ${a} and ${b}`);
-      }
-    }
-    if (sod.handoffs) {
-      constraints.push('- The following actions require multi-agent handoff:');
-      for (const h of sod.handoffs) {
-        constraints.push(`  - ${h.action}: must pass through roles ${h.required_roles.join(' → ')}${h.approval_required !== false ? ' (approval required)' : ''}`);
-      }
-    }
-    if (sod.isolation?.state === 'full') {
-      constraints.push('- Agent state/memory is fully isolated per role');
-    }
-    if (sod.isolation?.credentials === 'separate') {
-      constraints.push('- Credentials are segregated per role');
-    }
-    if (sod.enforcement === 'strict') {
-      constraints.push('- SOD enforcement is STRICT — violations will block execution');
-    }
-  }
-
-  if (constraints.length === 0) return '';
-  return `## Compliance Constraints\n\n${constraints.join('\n')}`;
+function getNpmPackage(provider: string): string {
+  const packages: Record<string, string> = {
+    anthropic: '@ai-sdk/anthropic',
+    openai: '@ai-sdk/openai',
+    google: '@ai-sdk/google',
+    deepseek: '@ai-sdk/deepseek',
+    ollama: '@ai-sdk/ollama',
+  };
+  return packages[provider] || `@ai-sdk/${provider}`;
 }

src/adapters/shared.ts

@@ -0,0 +1,68 @@
+import { loadAgentManifest } from '../utils/loader.js';
+
+/**
+ * Build a markdown compliance constraints section from a gitagent manifest.
+ * Shared across adapters that emit markdown instructions.
+ */
+export function buildComplianceSection(compliance: NonNullable<ReturnType<typeof loadAgentManifest>['compliance']>): string {
+  const c = compliance;
+  const constraints: string[] = [];
+
+  if (c.supervision?.human_in_the_loop === 'always') {
+    constraints.push('- All decisions require human approval before execution');
+  }
+  if (c.supervision?.escalation_triggers) {
+    constraints.push('- Escalate to human supervisor when:');
+    for (const trigger of c.supervision.escalation_triggers) {
+      for (const [key, value] of Object.entries(trigger)) {
+        constraints.push(`  - ${key}: ${value}`);
+      }
+    }
+  }
+  if (c.communications?.fair_balanced) {
+    constraints.push('- All communications must be fair and balanced (FINRA 2210)');
+  }
+  if (c.communications?.no_misleading) {
+    constraints.push('- Never make misleading, exaggerated, or promissory statements');
+  }
+  if (c.data_governance?.pii_handling === 'redact') {
+    constraints.push('- Redact all PII from outputs');
+  }
+  if (c.data_governance?.pii_handling === 'prohibit') {
+    constraints.push('- Do not process any personally identifiable information');
+  }
+
+  if (c.segregation_of_duties) {
+    const sod = c.segregation_of_duties;
+    constraints.push('- Segregation of duties is enforced:');
+    if (sod.assignments) {
+      for (const [agentName, roles] of Object.entries(sod.assignments)) {
+        constraints.push(`  - Agent "${agentName}" has role(s): ${roles.join(', ')}`);
+      }
+    }
+    if (sod.conflicts) {
+      constraints.push('- Duty separation rules (no single agent may hold both):');
+      for (const [a, b] of sod.conflicts) {
+        constraints.push(`  - ${a} and ${b}`);
+      }
+    }
+    if (sod.handoffs) {
+      constraints.push('- The following actions require multi-agent handoff:');
+      for (const h of sod.handoffs) {
+        constraints.push(`  - ${h.action}: must pass through roles ${h.required_roles.join(' → ')}${h.approval_required !== false ? ' (approval required)' : ''}`);
+      }
+    }
+    if (sod.isolation?.state === 'full') {
+      constraints.push('- Agent state/memory is fully isolated per role');
+    }
+    if (sod.isolation?.credentials === 'separate') {
+      constraints.push('- Credentials are segregated per role');
+    }
+    if (sod.enforcement === 'strict') {
+      constraints.push('- SOD enforcement is STRICT — violations will block execution');
+    }
+  }
+
+  if (constraints.length === 0) return '';
+  return `## Compliance Constraints\n\n${constraints.join('\n')}`;
+}

src/commands/import.ts

@@ -190,18 +190,18 @@ function importFromCrewAI(sourcePath: string, targetDir: string): void {
 function importFromOpenCode(sourcePath: string, targetDir: string): void {
   const sourceDir = resolve(sourcePath);
 
-  // Look for .opencode/instructions.md or opencode.json
-  const instructionsPath = join(sourceDir, '.opencode', 'instructions.md');
+  // Look for AGENTS.md (OpenCode's instruction file) or opencode.json
+  const agentsMdPath = join(sourceDir, 'AGENTS.md');
   const configPath = join(sourceDir, 'opencode.json');
 
   let instructions = '';
   let config: Record<string, unknown> = {};
 
-  if (existsSync(instructionsPath)) {
-    instructions = readFileSync(instructionsPath, 'utf-8');
-    info('Found .opencode/instructions.md');
+  if (existsSync(agentsMdPath)) {
+    instructions = readFileSync(agentsMdPath, 'utf-8');
+    info('Found AGENTS.md');
   } else {
-    throw new Error('No .opencode/instructions.md found in source directory');
+    throw new Error('No AGENTS.md found in source directory');
   }
 
   if (existsSync(configPath)) {
@@ -213,8 +213,9 @@ function importFromOpenCode(sourcePath: string, targetDir: string): void {
 
   const dirName = basename(sourceDir);
 
-  // Determine model from opencode.json
-  const model = (config.model as string) || undefined;
+  // Determine model from opencode.json (format: "provider/model-id")
+  const rawModel = (config.model as string) || undefined;
+  const model = rawModel?.includes('/') ? rawModel.split('/').slice(1).join('/') : rawModel;
   const agentYaml: Record<string, unknown> = {
     spec_version: '0.1.0',
     name: dirName.toLowerCase().replace(/[^a-z0-9-]/g, '-'),

src/runners/git.ts

@@ -182,8 +182,8 @@ function detectAdapter(agentDir: string, manifest: AgentManifest): string {
     info('Auto-detected adapter: github (from .github_models)');
     return 'github';
   }
-  if (existsSync(join(agentDir, '.opencode')) || existsSync(join(agentDir, 'opencode.json'))) {
-    info('Auto-detected adapter: opencode (from .opencode/ or opencode.json)');
+  if (existsSync(join(agentDir, 'opencode.json'))) {
+    info('Auto-detected adapter: opencode (from opencode.json)');
     return 'opencode';
   }
 

src/runners/opencode.ts

@@ -15,13 +15,13 @@ export interface OpenCodeRunOptions {
  * Run a gitagent agent using OpenCode (sst/opencode).
  *
  * Creates a temporary workspace with:
- *   - .opencode/instructions.md  (agent instructions)
- *   - opencode.json              (provider + model config)
+ *   - AGENTS.md       (agent instructions)
+ *   - opencode.json   (provider + model config)
  *
  * Then launches `opencode` in that workspace. OpenCode reads both files
  * automatically on startup.
  *
- * Supports both interactive mode (no prompt) and single-shot mode (-p).
+ * Supports both interactive mode (no prompt) and single-shot mode (`opencode run -p`).
  */
 export function runWithOpenCode(agentDir: string, manifest: AgentManifest, options: OpenCodeRunOptions = {}): void {
   const exp = exportToOpenCode(agentDir);
@@ -30,50 +30,46 @@ export function runWithOpenCode(agentDir: string, manifest: AgentManifest, optio
   const workspaceDir = join(tmpdir(), `gitagent-opencode-${randomBytes(4).toString('hex')}`);
   mkdirSync(workspaceDir, { recursive: true });
 
-  // Write .opencode/instructions.md
-  const instructionsDir = join(workspaceDir, '.opencode');
-  mkdirSync(instructionsDir, { recursive: true });
-  writeFileSync(join(instructionsDir, 'instructions.md'), exp.instructions, 'utf-8');
+  // Write AGENTS.md at project root
+  writeFileSync(join(workspaceDir, 'AGENTS.md'), exp.instructions, 'utf-8');
 
   // Write opencode.json
   writeFileSync(join(workspaceDir, 'opencode.json'), JSON.stringify(exp.config, null, 2), 'utf-8');
 
   info(`Workspace prepared at ${workspaceDir}`);
-  info(`  .opencode/instructions.md, opencode.json`);
+  info(`  AGENTS.md, opencode.json`);
   if (manifest.model?.preferred) {
     info(`  Model: ${manifest.model.preferred}`);
   }
 
   // Build opencode CLI args
   const args: string[] = [];
 
-  // If a prompt is provided, pass it for single-shot mode
+  // Single-shot mode uses `opencode run --prompt "..."`, interactive is just `opencode`
   if (options.prompt) {
-    args.push('--prompt', options.prompt);
+    args.push('run', '--prompt', options.prompt);
   }
 
   info(`Launching OpenCode agent "${manifest.name}"...`);
   if (!options.prompt) {
     info('Starting interactive mode. Type your messages to chat.');
   }
 
-  try {
-    const result = spawnSync('opencode', args, {
-      stdio: 'inherit',
-      cwd: workspaceDir,
-      env: { ...process.env },
-    });
+  const result = spawnSync('opencode', args, {
+    stdio: 'inherit',
+    cwd: workspaceDir,
+    env: { ...process.env },
+  });
 
-    if (result.error) {
-      error(`Failed to launch OpenCode: ${result.error.message}`);
-      info('Make sure OpenCode is installed: npm install -g opencode');
-      info('Or: brew install sst/tap/opencode');
-      process.exit(1);
-    }
+  // Cleanup temp workspace before exiting
+  try { rmSync(workspaceDir, { recursive: true, force: true }); } catch { /* ignore */ }
 
-    process.exit(result.status ?? 0);
-  } finally {
-    // Cleanup temp workspace
-    try { rmSync(workspaceDir, { recursive: true, force: true }); } catch { /* ignore */ }
+  if (result.error) {
+    error(`Failed to launch OpenCode: ${result.error.message}`);
+    info('Make sure OpenCode is installed: npm install -g opencode');
+    info('Or: brew install sst/tap/opencode');
+    process.exit(1);
   }
+
+  process.exit(result.status ?? 0);
 }