ocpipe 0.6.10 → 0.6.11

package/README.md

@@ -1,5 +1,5 @@
 <p align="center"><strong>ocpipe</strong></p>
-<p align="center">Build LLM pipelines with <a href="https://github.com/sst/opencode">OpenCode</a>, <a href="https://github.com/anthropics/claude-code">Claude Code</a>, Oh My Pi, Pi, and <a href="https://zod.dev">Zod</a>.</p>
+<p align="center">Build LLM pipelines with Oh My Pi, OpenCode, Claude Code, Codex, Pi, and <a href="https://zod.dev">Zod</a>.</p>
 <p align="center">Inspired by <a href="https://github.com/stanfordnlp/dspy">DSPy</a>.</p>
 <p align="center">
   <a href="https://www.npmjs.com/package/ocpipe"><img alt="npm" src="https://img.shields.io/npm/v/ocpipe?style=flat-square" /></a>
@@ -11,7 +11,7 @@
 - **Type-safe** Define inputs and outputs with Zod schemas
 - **Modular** Compose modules into complex pipelines
 - **Checkpoints** Resume from any step
-- **Multi-backend** Choose between OpenCode (75+ providers), Claude Code SDK, Codex SDK, Oh My Pi, or Pi
+- **Multi-backend** Choose between Oh My Pi, OpenCode, Claude Code SDK, Codex SDK, or Pi
 - **Auto-correction** Fixes schema mismatches automatically
 
 ### Quick Start
@@ -32,8 +32,9 @@ const Greet = signature({
 const pipeline = new Pipeline(
   {
     name: 'hello-world',
-    defaultModel: { providerID: 'opencode', modelID: 'minimax-m2.1-free' },
-    defaultAgent: 'default',
+    defaultModel: { backend: 'omp', modelID: 'gpt-5.5' },
+    checkpointDir: './ckpt',
+    logDir: './logs',
   },
   createBaseState,
 )
@@ -49,24 +50,28 @@ type GreetOut = InferOutputs<typeof Greet> // { greeting: string }
 
 ### Backends
 
-ocpipe supports five backends for running LLM agents:
+ocpipe supports five backends for running LLM prompts:
 
-**OpenCode** (default) - Requires `opencode` CLI in your PATH. Supports 75+ providers.
+**Oh My Pi** (default) - Uses the `omp` CLI in headless JSON print mode.
 
 ```typescript
 const pipeline = new Pipeline(
   {
     name: 'my-pipeline',
-    defaultModel: {
-      providerID: 'anthropic',
-      modelID: 'claude-sonnet-4-20250514',
-    },
-    defaultAgent: 'default',
+    defaultModel: { backend: 'omp', modelID: 'gpt-5.5' },
+    omp: { command: 'omp', approvalMode: 'yolo', thinking: 'high' },
   },
   createBaseState,
 )
 ```
 
+**OpenCode** - Uses the `opencode` CLI. ocpipe passes prompt files directly and does not create or reference `.opencode/agents` definitions.
+
+```typescript
+defaultModel: { backend: 'opencode', providerID: 'anthropic', modelID: 'claude-sonnet-4' },
+opencode: { command: 'opencode' },
+```
+
 **Claude Code** - Uses `@anthropic-ai/claude-agent-sdk`. Install as a peer dependency.
 
 ```typescript
@@ -83,13 +88,6 @@ defaultModel: { backend: 'codex', modelID: 'gpt-5.4' },
 codex: { sandbox: 'read-only', reasoningEffort: 'high' },
 ```
 
-**Oh My Pi** - Uses the `omp` CLI in headless JSON print mode.
-
-```typescript
-defaultModel: { backend: 'omp', modelID: 'gpt-5.5' },
-omp: { command: 'omp', approvalMode: 'yolo', thinking: 'high' },
-```
-
 **Pi** - Uses the `pi` coding-agent CLI JSONL RPC mode.
 
 ```typescript
@@ -99,10 +97,9 @@ pi: { command: 'pi' },
 
 ### Requirements
 
-**For OpenCode backend:** Currently requires [this OpenCode fork](https://github.com/paralin/opencode). Once the following PRs are merged, the official release will work:
+**For Oh My Pi:** Install the `omp` CLI and authenticate the models it uses.
 
-- [#5426](https://github.com/anomalyco/opencode/pull/5426) - Adds session export command
-- [#5339](https://github.com/anomalyco/opencode/pull/5339) - Adds `--tools` flag to limit available tools (optional)
+**For OpenCode backend:** Install the `opencode` CLI and authenticate the providers it uses. ocpipe does not require a `.opencode` directory.
 
 **For Claude Code backend:** Install the SDK as a peer dependency:
 
@@ -126,6 +123,6 @@ bun add @openai/codex-sdk
 
 ---
 
-[Discord](https://discord.gg/opencode) · [OpenCode](https://github.com/sst/opencode)
+[Oh My Pi](https://github.com/aperturerobotics/oh-my-pi) · [OpenCode](https://github.com/sst/opencode)
 
 <sub>An [Aperture Robotics](https://github.com/aperturerobotics) project.</sub>

package/example/correction.ts

@@ -71,8 +71,7 @@ async function main() {
   const pipeline = new Pipeline(
     {
       name: 'correction-demo',
-      defaultModel: { providerID: 'opencode', modelID: 'minimax-m2.1-free' },
-      defaultAgent: 'default',
+      defaultModel: { backend: 'omp', modelID: 'gpt-5.5' },
       checkpointDir: './ckpt',
       logDir: './logs',
     },

package/example/index.ts

@@ -3,9 +3,8 @@
  *
  * Demonstrates running an ocpipe module in a pipeline.
  *
- * Usage:
- *   npx tsx example/index.ts              # Use opencode backend
- *   npx tsx example/index.ts --claude-code # Use claude-code backend
+ *   npx tsx example/index.ts               # Use OMP backend
+ *   npx tsx example/index.ts --claude-code # Use Claude Code backend
  */
 
 import { Pipeline, createBaseState } from '../src/index.js'
@@ -18,10 +17,10 @@ async function main() {
   const pipeline = new Pipeline(
     {
       name: 'hello-world',
-      defaultModel: useClaudeCode
-        ? { backend: 'claude-code', modelID: 'sonnet' }
-        : { providerID: 'opencode', modelID: 'minimax-m2.1-free' },
-      defaultAgent: useClaudeCode ? 'claude-code' : 'default',
+      defaultModel:
+        useClaudeCode ?
+          { backend: 'claude-code', modelID: 'sonnet' }
+        : { backend: 'omp', modelID: 'gpt-5.5' },
       checkpointDir: './ckpt',
       logDir: './logs',
     },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ocpipe",
-  "version": "0.6.10",
-  "description": "SDK for LLM pipelines with OpenCode, Codex, and Zod",
+  "version": "0.6.11",
+  "description": "SDK for LLM pipelines with OpenCode, OMP, Codex, Claude Code, Pi, and Zod",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",
@@ -17,9 +17,10 @@
   "author": "s4wave",
   "keywords": [
     "dspy",
-    "llm",
+    "omp",
     "opencode",
     "codex",
+    "claude-code",
     "typescript",
     "ai",
     "workflow",

package/src/agent.ts

@@ -1,41 +1,38 @@
 /**
  * ocpipe agent integration.
  *
- * Dispatches to OpenCode CLI, Claude Code SDK, Codex SDK, or Pi based on backend
- * configuration.
+ * Dispatches prompts to configured coding-agent backends.
  */
 
 import { spawn } from 'child_process'
-import { mkdir, writeFile, unlink } from 'fs/promises'
+import { randomUUID } from 'crypto'
+import { mkdir, unlink, writeFile } from 'fs/promises'
 import { join } from 'path'
 import { PROJECT_ROOT, TMP_DIR } from './paths.js'
+import type { RunAgentOptions, RunAgentResult } from './types.js'
 import { runOmpAgent } from './omp.js'
 import { runPiAgent } from './pi.js'
-import type { RunAgentOptions, RunAgentResult } from './types.js'
-
-/** Get command and args to invoke opencode from PATH */
-function getOpencodeCommand(args: string[]): { cmd: string; args: string[] } {
-  return { cmd: 'opencode', args }
-}
 
-/** runAgent dispatches to the appropriate backend based on model configuration. */
+/** runAgent dispatches to the selected backend. */
 export async function runAgent(
   options: RunAgentOptions,
 ): Promise<RunAgentResult> {
-  const backend = options.model.backend ?? 'opencode'
+  const backend = options.model.backend ?? 'omp'
 
   if (backend === 'claude-code') {
-    // Dynamic import is required: @anthropic-ai/claude-agent-sdk is an optional peer absent for other backends.
     const { runClaudeCodeAgent } = await import('./claude-code.js')
     return runClaudeCodeAgent(options)
   }
 
   if (backend === 'codex') {
-    // Dynamic import is required: @openai/codex-sdk is an optional peer absent for other backends.
     const { runCodexAgent } = await import('./codex.js')
     return runCodexAgent(options)
   }
 
+  if (backend === 'opencode') {
+    return runOpencodeAgent(options)
+  }
+
   if (backend === 'pi') {
     return runPiAgent(options)
   }
@@ -44,52 +41,48 @@ export async function runAgent(
     return runOmpAgent(options)
   }
 
-  return runOpencodeAgent(options)
+  const unreachable: never = backend
+  throw new Error(`Unsupported backend: ${unreachable}`)
 }
 
-/** runOpencodeAgent executes an OpenCode agent with a prompt, streaming output in real-time. */
 async function runOpencodeAgent(
   options: RunAgentOptions,
 ): Promise<RunAgentResult> {
   const {
     prompt,
-    agent,
     model,
     sessionId,
     timeoutSec = 3600,
     workdir,
+    opencode,
     signal,
   } = options
 
   if (!model.providerID) {
     throw new Error('providerID is required for OpenCode backend')
   }
-  const modelStr = `${model.providerID}/${model.modelID}`
-  const sessionInfo = sessionId ? `[session:${sessionId}]` : '[new session]'
-  const promptPreview = prompt.slice(0, 50).replace(/\n/g, ' ')
 
-  console.error(
-    `\n>>> OpenCode [${agent}] [${modelStr}] ${sessionInfo}: ${promptPreview}...`,
-  )
-
-  // Check if already aborted
   if (signal?.aborted) {
     throw new Error('Request aborted')
   }
 
-  // Write prompt to .opencode/prompts/ within the working directory
   const cwd = workdir ?? PROJECT_ROOT
-  const promptsDir = join(cwd, '.opencode', 'prompts')
-  await mkdir(promptsDir, { recursive: true })
-  const promptFile = join(promptsDir, `prompt_${Date.now()}.txt`)
+  const modelStr = `${model.providerID}/${model.modelID}`
+  const sessionInfo = sessionId ? `[session:${sessionId}]` : '[new session]'
+  const promptPreview = prompt.slice(0, 50).replace(/\n/g, ' ')
+  console.error(
+    `\n>>> OpenCode [${modelStr}] ${sessionInfo}: ${promptPreview}...`,
+  )
+
+  const promptDir = opencode?.promptDir ?? TMP_DIR
+  await mkdir(promptDir, { recursive: true })
+  const promptFile = join(promptDir, `ocpipe_prompt_${randomUUID()}.txt`)
   await writeFile(promptFile, prompt)
 
   const args = [
     'run',
     '--format',
     'default',
-    '--agent',
-    agent,
     '--model',
     modelStr,
     '--prompt-file',
@@ -99,11 +92,9 @@ async function runOpencodeAgent(
   if (sessionId) {
     args.push('--session', sessionId)
   }
-
   if (model.variant) {
     args.push('--model-variant', model.variant)
   }
-
   if (model.variantThinkingBudget !== undefined) {
     args.push(
       '--model-variant-thinking-budget',
@@ -111,194 +102,164 @@ async function runOpencodeAgent(
     )
   }
 
-  return new Promise((resolve, reject) => {
-    const opencodeCmd = getOpencodeCommand(args)
-    console.error(
-      `[DEBUG] Running: ${opencodeCmd.cmd} ${opencodeCmd.args.join(' ')}`,
-    )
-    const proc = spawn(opencodeCmd.cmd, opencodeCmd.args, {
-      cwd,
-      stdio: ['ignore', 'pipe', 'pipe'],
-    })
-
-    let newSessionId = sessionId || ''
-    const stdoutChunks: string[] = []
-    const stderrChunks: string[] = []
-    let aborted = false
-
-    // Handle abort signal - kill subprocess when aborted
-    const abortHandler = async () => {
-      if (aborted) return
-      aborted = true
-      console.error(`\n[abort] Killing OpenCode subprocess...`)
-      proc.kill('SIGTERM')
-      // Give it a moment to clean up, then force kill
-      setTimeout(() => {
-        if (!proc.killed) proc.kill('SIGKILL')
-      }, 1000)
-      await unlink(promptFile).catch(() => {})
-      reject(new Error('Request aborted'))
-    }
-    signal?.addEventListener('abort', abortHandler, { once: true })
-
-    // Stream stderr in real-time (OpenCode progress output)
-    proc.stderr.on('data', (data: Buffer) => {
-      const text = data.toString()
-      stderrChunks.push(text)
-
-      // Parse session ID from output
-      for (const line of text.split('\n')) {
-        if (line.startsWith('[session:')) {
-          newSessionId = line.trim().slice(9, -1)
-          continue
-        }
-        // Filter noise
-        if (line.includes('baseline-browser-mapping')) continue
-        if (line.startsWith('$ bun run')) continue
-        if (line.trim()) {
-          process.stderr.write(line + '\n')
-        }
-      }
-    })
-
-    // Collect stdout
-    proc.stdout.on('data', (data: Buffer) => {
-      const text = data.toString()
-      stdoutChunks.push(text)
-      process.stderr.write(text)
-    })
-
-    // Timeout handling (0 = no timeout)
-    const timeout =
-      timeoutSec > 0 ?
-        setTimeout(async () => {
-          proc.kill()
-          await unlink(promptFile).catch(() => {})
-          reject(new Error(`Timeout after ${timeoutSec}s`))
-        }, timeoutSec * 1000)
-      : null
-
-    proc.on('close', async (code) => {
-      if (timeout) clearTimeout(timeout)
-      signal?.removeEventListener('abort', abortHandler)
-
-      // If aborted, we already rejected
-      if (aborted) return
-
-      // Clean up prompt file
-      await unlink(promptFile).catch(() => {})
-
-      const stderr = stderrChunks.join('').trim()
-
-      if (code !== 0) {
-        const lastLines = stderr.split('\n').slice(-5).join('\n')
-        const detail = lastLines ? `\n${lastLines}` : ''
-        reject(new Error(`OpenCode exited with code ${code}${detail}`))
-        return
-      }
+  const command = opencode?.command ?? 'opencode'
+  console.error(`[DEBUG] Running: ${command} ${args.join(' ')}`)
+  const proc = spawn(command, args, {
+    cwd,
+    stdio: ['ignore', 'pipe', 'pipe'],
+    env: { ...process.env, ...opencode?.env },
+  })
 
-      // Check for OpenCode errors that exit with code 0 but produce no output
-      const knownErrors = [
-        {
-          pattern: /ProviderModelNotFoundError/,
-          message: 'Provider/model not found',
-        },
-        { pattern: /ModelNotFoundError/, message: 'Model not found' },
-        { pattern: /ProviderNotFoundError/, message: 'Provider not found' },
-        { pattern: /API key.*not.*found/i, message: 'API key not configured' },
-        {
-          pattern: /authentication.*failed/i,
-          message: 'Authentication failed',
-        },
-      ]
-
-      for (const { pattern, message } of knownErrors) {
-        if (pattern.test(stderr)) {
-          // Extract the relevant error lines
-          const errorLines = stderr
-            .split('\n')
-            .filter(
-              (line) =>
-                pattern.test(line) ||
-                line.includes('Error') ||
-                line.includes('error:'),
-            )
-            .slice(0, 5)
-            .join('\n')
-          reject(new Error(`OpenCode ${message}:\n${errorLines}`))
-          return
-        }
-      }
+  const { promise, resolve, reject } = Promise.withResolvers<RunAgentResult>()
+  let newSessionId = sessionId || ''
+  const stdoutChunks: string[] = []
+  const stderrChunks: string[] = []
+  let aborted = false
+
+  const abortHandler = () => {
+    if (aborted) return
+    aborted = true
+    console.error(`\n[abort] Killing OpenCode subprocess...`)
+    proc.kill('SIGTERM')
+    setTimeout(() => {
+      if (!proc.killed) proc.kill('SIGKILL')
+    }, 1000)
+    void unlink(promptFile).catch(() => {})
+    reject(new Error('Request aborted'))
+  }
+  signal?.addEventListener('abort', abortHandler, { once: true })
 
-      // Export session to get structured response
-      let response = stdoutChunks.join('').trim()
+  proc.stderr.on('data', (data: Buffer) => {
+    const text = data.toString()
+    stderrChunks.push(text)
 
-      if (newSessionId) {
-        const exported = await exportSession(newSessionId, workdir)
-        if (exported) {
-          response = exported
-        }
+    for (const line of text.split('\n')) {
+      if (line.startsWith('[session:')) {
+        newSessionId = line.trim().slice(9, -1)
+        continue
+      }
+      if (line.includes('baseline-browser-mapping')) continue
+      if (line.startsWith('$ bun run')) continue
+      if (line.trim()) {
+        process.stderr.write(line + '\n')
       }
+    }
+  })
+
+  proc.stdout.on('data', (data: Buffer) => {
+    const text = data.toString()
+    stdoutChunks.push(text)
+    process.stderr.write(text)
+  })
+
+  const timeout =
+    timeoutSec > 0 ?
+      setTimeout(() => {
+        proc.kill()
+        void unlink(promptFile).catch(() => {})
+        reject(new Error(`Timeout after ${timeoutSec}s`))
+      }, timeoutSec * 1000)
+    : undefined
+
+  proc.on('close', async (code) => {
+    clearTimeout(timeout)
+    signal?.removeEventListener('abort', abortHandler)
+    if (aborted) return
+
+    void unlink(promptFile).catch(() => {})
+    const stderr = stderrChunks.join('').trim()
+
+    if (code !== 0) {
+      const lastLines = stderr.split('\n').slice(-5).join('\n')
+      const detail = lastLines ? `\n${lastLines}` : ''
+      reject(new Error(`OpenCode exited with code ${code}${detail}`))
+      return
+    }
 
-      // Check for empty response with errors in stderr (likely a silent failure)
-      if (response.length === 0 && stderr.includes('Error')) {
-        const lastLines = stderr.split('\n').slice(-10).join('\n')
-        reject(
-          new Error(
-            `OpenCode returned empty response with errors:\n${lastLines}`,
-          ),
-        )
+    for (const { pattern, message } of knownOpenCodeErrors) {
+      if (pattern.test(stderr)) {
+        const errorLines = stderr
+          .split('\n')
+          .filter(
+            (line) =>
+              pattern.test(line) ||
+              line.includes('Error') ||
+              line.includes('error:'),
+          )
+          .slice(0, 5)
+          .join('\n')
+        reject(new Error(`OpenCode ${message}:\n${errorLines}`))
         return
       }
+    }
+
+    let response = stdoutChunks.join('').trim()
+    if (newSessionId) {
+      response =
+        (await exportSession(newSessionId, cwd, command, opencode?.env)) ??
+        response
+    }
 
-      const sessionStr = newSessionId || 'none'
-      console.error(
-        `<<< OpenCode done (${response.length} chars) [session:${sessionStr}]`,
+    if (response.length === 0 && stderr.includes('Error')) {
+      const lastLines = stderr.split('\n').slice(-10).join('\n')
+      reject(
+        new Error(
+          `OpenCode returned empty response with errors:\n${lastLines}`,
+        ),
       )
+      return
+    }
+
+    const sessionStr = newSessionId || 'none'
+    console.error(
+      `<<< OpenCode done (${response.length} chars) [session:${sessionStr}]`,
+    )
+    resolve({ text: response, sessionId: newSessionId })
+  })
 
-      resolve({
-        text: response,
-        sessionId: newSessionId,
-      })
-    })
-
-    proc.on('error', async (err) => {
-      if (timeout) clearTimeout(timeout)
-      await unlink(promptFile).catch(() => {})
-      reject(err)
-    })
+  proc.on('error', (err) => {
+    clearTimeout(timeout)
+    signal?.removeEventListener('abort', abortHandler)
+    void unlink(promptFile).catch(() => {})
+    reject(err)
   })
+
+  return promise
 }
 
-/** exportSession exports a session and extracts assistant text responses. */
 async function exportSession(
   sessionId: string,
-  workdir?: string,
+  workdir: string,
+  command: string,
+  env: Record<string, string> | undefined,
 ): Promise<string | null> {
-  const tmpPath = `${TMP_DIR}/opencode_export_${Date.now()}.json`
+  const exportFile = join(TMP_DIR, `opencode_export_${randomUUID()}.json`)
 
   try {
     await mkdir(TMP_DIR, { recursive: true })
-    const opencodeCmd = getOpencodeCommand([
-      'session',
-      'export',
-      sessionId,
-      '--format',
-      'json',
-      '--turn',
-      '-1',
-      '-o',
-      tmpPath,
-    ])
-    const proc = Bun.spawn([opencodeCmd.cmd, ...opencodeCmd.args], {
-      cwd: workdir ?? PROJECT_ROOT,
-      stdout: 'pipe',
-      stderr: 'pipe',
-    })
+    const proc = Bun.spawn(
+      [
+        command,
+        'session',
+        'export',
+        sessionId,
+        '--format',
+        'json',
+        '--turn',
+        '-1',
+        '-o',
+        exportFile,
+      ],
+      {
+        cwd: workdir,
+        stdout: 'pipe',
+        stderr: 'pipe',
+        env: { ...process.env, ...env },
+      },
+    )
 
     await proc.exited
-
-    const file = Bun.file(tmpPath)
+    const file = Bun.file(exportFile)
     if (!(await file.exists())) return null
 
     const data = (await file.json()) as {
@@ -307,29 +268,37 @@ async function exportSession(
         parts?: Array<{ type?: string; text?: string }>
       }>
     }
-    await Bun.write(tmpPath, '') // Clean up
+    void unlink(exportFile).catch(() => {})
 
-    // Extract all assistant text parts from the exported turn.
-    // The --turn -1 flag ensures we only get the last turn's messages.
-    const messages = data.messages || []
     const textParts: string[] = []
-
-    for (const msg of messages) {
-      if (msg.info?.role === 'assistant') {
-        for (const part of msg.parts || []) {
-          if (part.type === 'text' && part.text) {
-            textParts.push(part.text)
-          }
+    for (const msg of data.messages ?? []) {
+      if (msg.info?.role !== 'assistant') continue
+      for (const part of msg.parts ?? []) {
+        if (part.type === 'text' && part.text) {
+          textParts.push(part.text)
         }
       }
     }
 
     return textParts.length > 0 ? textParts.join('\n') : null
   } catch {
+    void unlink(exportFile).catch(() => {})
     return null
   }
 }
 
+const knownOpenCodeErrors: ReadonlyArray<{ pattern: RegExp; message: string }> =
+  [
+    {
+      pattern: /ProviderModelNotFoundError/,
+      message: 'Provider/model not found',
+    },
+    { pattern: /ModelNotFoundError/, message: 'Model not found' },
+    { pattern: /ProviderNotFoundError/, message: 'Provider not found' },
+    { pattern: /API key.*not.*found/i, message: 'API key not configured' },
+    { pattern: /authentication.*failed/i, message: 'Authentication failed' },
+  ]
+
 /** logStep logs a step header for workflow progress. */
 export function logStep(step: number, title: string, detail = ''): void {
   const detailStr = detail ? ` (${detail})` : ''

package/src/claude-code.ts

@@ -11,7 +11,7 @@
  */
 
 import { execSync } from 'child_process'
-import { existsSync, readFileSync } from 'fs'
+import { existsSync } from 'fs'
 import { join } from 'path'
 import { homedir } from 'os'
 import {
@@ -66,9 +66,14 @@ function resolveClaudeCodePath(explicit?: string): string | undefined {
   if (explicit) return explicit
 
   try {
-    const found = execSync('which claude', { encoding: 'utf8', timeout: 3000 }).trim()
+    const found = execSync('which claude', {
+      encoding: 'utf8',
+      timeout: 3000,
+    }).trim()
     if (found) return found
-  } catch { /* which not found or timed out — fall through to defaults */ }
+  } catch {
+    /* which not found or timed out — fall through to defaults */
+  }
 
   const defaults = [
     join(homedir(), '.local', 'bin', 'claude'),
@@ -90,21 +95,6 @@ function normalizeModelId(modelId: string): string {
   return modelId
 }
 
-/** loadAgentDefinition loads an OpenCode agent definition file and extracts the
- * markdown body (stripping the YAML frontmatter) for use as a system prompt. */
-function loadAgentDefinition(agent: string, workdir?: string): string | undefined {
-  if (!agent || !workdir) return undefined
-
-  const agentPath = join(workdir, '.opencode', 'agents', `${agent}.md`)
-  if (!existsSync(agentPath)) return undefined
-
-  const content = readFileSync(agentPath, 'utf8')
-
-  // Strip YAML frontmatter (--- delimited block at the start).
-  const stripped = content.replace(/^---\n[\s\S]*?\n---\n*/, '')
-  return stripped.trim() || undefined
-}
-
 /** Extract text from assistant messages. */
 function getAssistantText(msg: SDKMessage): string | null {
   if (msg.type !== 'assistant') return null
@@ -147,7 +137,6 @@ export async function runClaudeCodeAgent(
 ): Promise<RunAgentResult> {
   const {
     prompt,
-    agent,
     model,
     sessionId,
     timeoutSec = 3600,
@@ -169,8 +158,8 @@ export async function runClaudeCodeAgent(
   // Build query options with configurable permission mode (default: acceptEdits)
   const permissionMode = claudeCode?.permissionMode ?? 'acceptEdits'
 
-  // Resolve system prompt: explicit option > agent definition file > none
-  const systemPrompt = claudeCode?.systemPrompt ?? loadAgentDefinition(agent, workdir)
+  // Resolve system prompt from explicit configuration only.
+  const systemPrompt = claudeCode?.systemPrompt
 
   // Bridge external abort signal to an AbortController for the SDK
   const abortController = new AbortController()
@@ -217,16 +206,22 @@ export async function runClaudeCodeAgent(
       }),
     // Resolve executable path: explicit option > PATH lookup > default locations
     ...(() => {
-      const resolved = resolveClaudeCodePath(claudeCode?.pathToClaudeCodeExecutable)
+      const resolved = resolveClaudeCodePath(
+        claudeCode?.pathToClaudeCodeExecutable,
+      )
       return resolved ? { pathToClaudeCodeExecutable: resolved } : {}
     })(),
   }
 
   if (claudeCode?.agents) {
-    console.error(`[ocpipe] Subagents defined: ${Object.keys(claudeCode.agents).join(', ')}`)
+    console.error(
+      `[ocpipe] Subagents defined: ${Object.keys(claudeCode.agents).join(', ')}`,
+    )
   }
   if (claudeCode?.allowedTools) {
-    console.error(`[ocpipe] Allowed tools: ${claudeCode.allowedTools.join(', ')}`)
+    console.error(
+      `[ocpipe] Allowed tools: ${claudeCode.allowedTools.join(', ')}`,
+    )
   }
   console.error(
     `\n>>> Claude Code [${modelStr}] [${permissionMode}] ${sessionInfo}: ${promptPreview}...`,

package/src/index.ts

@@ -1,5 +1,5 @@
 /**
- * ocpipe: LLM pipelines with OpenCode and Zod.
+ * ocpipe: LLM pipelines with coding-agent backends and Zod.
  *
  * Inspired by DSPy.
  *
@@ -22,8 +22,7 @@
  * // Run in a pipeline
  * const pipeline = new Pipeline({
  *   name: 'my-workflow',
- *   defaultModel: { providerID: 'opencode', modelID: 'minimax-m2.1-free' },
- *   defaultAgent: 'general',
+ *   defaultModel: { backend: 'omp', modelID: 'gpt-5.5' },
  *   checkpointDir: './ckpt',
  *   logDir: './logs',
  * }, createBaseState)

package/src/pipeline.ts

@@ -30,9 +30,9 @@ export class Pipeline<S extends BaseState> {
     this.ctx = {
       sessionId: undefined,
       defaultModel: config.defaultModel,
-      defaultAgent: config.defaultAgent,
       timeoutSec: config.timeoutSec ?? 3600,
       workdir: config.workdir,
+      opencode: config.opencode,
       claudeCode: config.claudeCode,
       codex: config.codex,
       pi: config.pi,
@@ -89,8 +89,8 @@ export class Pipeline<S extends BaseState> {
           result: result as StepResult<unknown>,
         })
 
-        // Update opencode session in state
-        this.state.opencodeSessionId = this.ctx.sessionId
+        // Update backend session in state.
+        this.state.agentSessionId = this.ctx.sessionId
 
         await this.saveCheckpoint()
         return result
@@ -159,7 +159,7 @@ export class Pipeline<S extends BaseState> {
     }
   }
 
-  /** getSessionId returns the current OpenCode session ID. */
+  /** getSessionId returns the current backend session ID. */
   getSessionId(): string | undefined {
     return this.ctx.sessionId
   }
@@ -189,9 +189,9 @@ export class Pipeline<S extends BaseState> {
       const pipeline = new Pipeline<S>(config, () => state)
       pipeline.state = state
 
-      // Restore context from state
-      if (state.opencodeSessionId) {
-        pipeline.ctx.sessionId = state.opencodeSessionId
+      // Restore context from state.
+      if (state.agentSessionId) {
+        pipeline.ctx.sessionId = state.agentSessionId
       }
 
       // Restore step number

package/src/predict.ts

@@ -1,7 +1,8 @@
 /**
  * ocpipe Predict class.
  *
- * Executes a signature by generating a prompt, calling OpenCode, and parsing the response.
+ * Executes a signature by generating a prompt, calling a backend, and parsing
+ * the response.
  */
 
 import { z } from 'zod/v4'
@@ -37,8 +38,6 @@ import {
 
 /** Configuration for a Predict instance. */
 export interface PredictConfig {
-  /** Override the pipeline's default agent. */
-  agent?: string
   /** Override the pipeline's default model. */
   model?: ModelConfig
   /** Start a fresh session (default: false, reuses context). */
@@ -71,12 +70,12 @@ export class Predict<S extends AnySignature> {
 
     const agentResult = await runAgent({
       prompt,
-      agent: this.config.agent ?? ctx.defaultAgent,
       model: this.config.model ?? ctx.defaultModel,
       sessionId: this.config.newSession ? undefined : ctx.sessionId,
       timeoutSec: ctx.timeoutSec,
       workdir: ctx.workdir,
       claudeCode: ctx.claudeCode,
+      opencode: ctx.opencode,
       codex: ctx.codex,
       pi: ctx.pi,
       omp: ctx.omp,
@@ -206,10 +205,10 @@ export class Predict<S extends AnySignature> {
         prompt: repairPrompt,
         model: correctionModel ?? ctx.defaultModel,
         sessionId: correctionModel ? undefined : sessionId,
-        agent: ctx.defaultAgent,
         timeoutSec: ctx.timeoutSec,
         workdir: ctx.workdir,
         claudeCode: ctx.claudeCode,
+        opencode: ctx.opencode,
         codex: ctx.codex,
         pi: ctx.pi,
         omp: ctx.omp,
@@ -286,10 +285,10 @@ export class Predict<S extends AnySignature> {
         prompt: patchPrompt,
         model: correctionModel ?? ctx.defaultModel,
         sessionId: correctionModel ? undefined : sessionId,
-        agent: ctx.defaultAgent,
         timeoutSec: ctx.timeoutSec,
         workdir: ctx.workdir,
         claudeCode: ctx.claudeCode,
+        opencode: ctx.opencode,
         codex: ctx.codex,
         pi: ctx.pi,
         omp: ctx.omp,
@@ -399,8 +398,7 @@ export class Predict<S extends AnySignature> {
     // Add field descriptions from our config (toJSONSchema uses .describe() metadata)
     // Since our FieldConfig has a separate desc field, merge it in
     const props = jsonSchema.properties as
-      | Record<string, Record<string, unknown>>
-      | undefined
+      Record<string, Record<string, unknown>> | undefined
     if (props) {
       for (const [name, config] of Object.entries(this.sig.outputs) as [
         string,

package/src/testing.ts

@@ -134,18 +134,20 @@ export class MockAgentBackend {
 export function createMockContext(
   overrides?: Partial<{
     sessionId: string
-    defaultModel: { providerID: string; modelID: string }
-    defaultAgent: string
+    defaultModel: {
+      backend?: 'claude-code' | 'codex' | 'pi' | 'omp'
+      providerID?: string
+      modelID: string
+    }
     timeoutSec: number
   }>,
 ) {
   return {
     sessionId: overrides?.sessionId,
     defaultModel: overrides?.defaultModel ?? {
-      providerID: 'github-copilot',
-      modelID: 'grok-code-fast-1',
+      backend: 'omp',
+      modelID: 'gpt-5.5',
     },
-    defaultAgent: overrides?.defaultAgent ?? 'general',
     timeoutSec: overrides?.timeoutSec ?? 60,
   }
 }

package/src/types.ts

@@ -8,29 +8,20 @@ import type { z } from 'zod/v4'
 // Model Configuration
 // ============================================================================
 
-/** Backend type for running agents. */
+/** Backend type for running prompts. */
 export type BackendType = 'opencode' | 'claude-code' | 'codex' | 'pi' | 'omp'
 
 /** Reasoning effort for Codex SDK threads. */
 export type CodexReasoningEffort =
-  | 'minimal'
-  | 'low'
-  | 'medium'
-  | 'high'
-  | 'xhigh'
+  'minimal' | 'low' | 'medium' | 'high' | 'xhigh'
 
 /** Codex sandbox mode. */
 export type CodexSandboxMode =
-  | 'read-only'
-  | 'workspace-write'
-  | 'danger-full-access'
+  'read-only' | 'workspace-write' | 'danger-full-access'
 
 /** Codex approval policy. */
 export type CodexApprovalPolicy =
-  | 'never'
-  | 'on-request'
-  | 'on-failure'
-  | 'untrusted'
+  'never' | 'on-request' | 'on-failure' | 'untrusted'
 
 /** Codex web search mode. */
 export type CodexWebSearchMode = 'disabled' | 'cached' | 'live'
@@ -45,10 +36,7 @@ export type CodexConfigValue =
 
 /** Permission mode for Claude Code sessions. */
 export type PermissionMode =
-  | 'default'
-  | 'acceptEdits'
-  | 'bypassPermissions'
-  | 'plan'
+  'default' | 'acceptEdits' | 'bypassPermissions' | 'plan'
 
 /** Subagent definition for Claude Code's Task tool dispatch. */
 export interface AgentDefinition {
@@ -75,8 +63,7 @@ export interface ClaudeCodeOptions {
    * Can be a full string or use the preset format with append.
    */
   systemPrompt?:
-    | string
-    | { type: 'preset'; preset: 'claude_code'; append: string }
+    string | { type: 'preset'; preset: 'claude_code'; append: string }
   /**
    * Subagent definitions for parallel task dispatch via the Task tool.
    * Keys are agent names, values are agent definitions.
@@ -133,6 +120,16 @@ export interface PiOptions {
   env?: Record<string, string>
 }
 
+/** OpenCode CLI specific session options. */
+export interface OpenCodeOptions {
+  /** Path to the OpenCode executable (default: `opencode` from PATH). */
+  command?: string
+  /** Prompt-file directory; defaults to ocpipe's temporary directory, not `.opencode`. */
+  promptDir?: string
+  /** Extra environment variables passed to the OpenCode subprocess. */
+  env?: Record<string, string>
+}
+
 /** Oh My Pi CLI specific session options. */
 export interface OmpOptions {
   /** Path to the Oh My Pi executable (default: `omp` from PATH). */
@@ -167,9 +164,9 @@ export interface OmpOptions {
 
 /** Model configuration for LLM backends. */
 export interface ModelConfig {
-  /** Backend to use (default: 'opencode'). */
+  /** Backend to use (default: 'omp'). */
   backend?: BackendType
-  /** Provider ID (required for OpenCode, ignored for Claude Code). */
+  /** Provider ID for provider-qualified backends such as OpenCode. */
   providerID?: string
   modelID: string
   /** Model variant for reasoning effort (e.g. 'low', 'medium', 'high', 'max'). */
@@ -184,16 +181,16 @@ export interface ModelConfig {
 
 /** Execution context passed through pipeline execution. */
 export interface ExecutionContext {
-  /** Current OpenCode session ID (for continuity). */
+  /** Current backend session ID for continuity. */
   sessionId?: string
   /** Default model for predictions. */
   defaultModel: ModelConfig
-  /** Default agent for predictions. */
-  defaultAgent: string
   /** Timeout in seconds for agent calls. */
   timeoutSec: number
-  /** Working directory for opencode (where .opencode/agents/ lives). */
+  /** Target working directory for backend tools. */
   workdir?: string
+  /** OpenCode CLI specific options. */
+  opencode?: OpenCodeOptions
   /** Claude Code specific options. */
   claudeCode?: ClaudeCodeOptions
   /** Codex SDK specific options. */
@@ -218,7 +215,7 @@ export interface StepResult<T> {
   stepName: string
   /** Execution duration in milliseconds. */
   duration: number
-  /** OpenCode session ID used. */
+  /** Backend session ID used. */
   sessionId: string
   /** Model used for this step. */
   model: ModelConfig
@@ -251,8 +248,8 @@ export interface BaseState {
   sessionId: string
   /** ISO timestamp when pipeline started. */
   startedAt: string
-  /** Current OpenCode session ID (for continuity). */
-  opencodeSessionId?: string
+  /** Current backend session ID for continuity. */
+  agentSessionId?: string
   /** Current phase name (for resume). */
   phase: string
   /** All completed steps. */
@@ -271,7 +268,7 @@ export interface PredictResult<T> {
   data: T
   /** Raw response text from the LLM. */
   raw: string
-  /** OpenCode session ID. */
+  /** Backend session ID. */
   sessionId: string
   /** Execution duration in milliseconds. */
   duration: number
@@ -364,9 +361,7 @@ export interface CorrectionConfig {
 
 /** Error codes for field errors, enabling robust error type detection. */
 export type FieldErrorCode =
-  | 'json_parse_failed'
-  | 'no_json_found'
-  | 'schema_validation_failed'
+  'json_parse_failed' | 'no_json_found' | 'schema_validation_failed'
 
 /** A field-level error from schema validation. */
 export interface FieldError {
@@ -406,8 +401,6 @@ export interface PipelineConfig {
   name: string
   /** Default model for predictions. */
   defaultModel: ModelConfig
-  /** Default agent for predictions. */
-  defaultAgent: string
   /** Directory for checkpoint files. */
   checkpointDir: string
   /** Directory for log files. */
@@ -416,8 +409,10 @@ export interface PipelineConfig {
   retry?: RetryConfig
   /** Default timeout in seconds. */
   timeoutSec?: number
-  /** Working directory for opencode (where .opencode/agents/ lives). */
+  /** Target working directory for backend tools. */
   workdir?: string
+  /** OpenCode CLI specific options. */
+  opencode?: OpenCodeOptions
   /** Claude Code specific options. */
   claudeCode?: ClaudeCodeOptions
   /** Codex SDK specific options. */
@@ -444,20 +439,20 @@ export interface RunOptions {
 // Agent Types
 // ============================================================================
 
-/** Options for running an OpenCode agent. */
+/** Options for running a prompt through a backend. */
 export interface RunAgentOptions {
-  /** The prompt to send to the agent. */
+  /** The prompt to send to the backend. */
   prompt: string
-  /** Agent type (e.g., "journey-creator", "explore", "general"). */
-  agent: string
   /** Model to use. */
   model: ModelConfig
   /** Existing session ID to continue. */
   sessionId?: string
   /** Timeout in seconds. */
   timeoutSec?: number
-  /** Working directory for opencode (where .opencode/agents/ lives). */
+  /** Target working directory for backend tools. */
   workdir?: string
+  /** OpenCode CLI specific options. */
+  opencode?: OpenCodeOptions
   /** Claude Code specific options. */
   claudeCode?: ClaudeCodeOptions
   /** Codex SDK specific options. */
@@ -470,7 +465,7 @@ export interface RunAgentOptions {
   signal?: AbortSignal
 }
 
-/** Result from running an OpenCode agent. */
+/** Result from running a prompt through a backend. */
 export interface RunAgentResult {
   /** The text response from the agent. */
   text: string