ocpipe 0.5.10 → 0.5.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocpipe",
-  "version": "0.5.10",
+  "version": "0.5.12",
   "description": "SDK for LLM pipelines with OpenCode and Zod",
   "type": "module",
   "main": "src/index.ts",

package/src/claude-code.ts

@@ -4,6 +4,10 @@
  * Uses the Claude Agent SDK v2 for running LLM agents with session management.
  */
 
+import { execSync } from 'child_process'
+import { existsSync, readFileSync } from 'fs'
+import { join } from 'path'
+import { homedir } from 'os'
 import {
   unstable_v2_createSession,
   unstable_v2_resumeSession,
@@ -51,6 +55,27 @@ function printToolEvent(color: string, type: string, title: string): void {
   console.error(line)
 }
 
+/** Resolve the Claude Code executable path.
+ * Priority: 1) explicit option, 2) `which claude` from PATH, 3) common default paths. */
+function resolveClaudeCodePath(explicit?: string): string | undefined {
+  if (explicit) return explicit
+
+  try {
+    const found = execSync('which claude', { encoding: 'utf8', timeout: 3000 }).trim()
+    if (found) return found
+  } catch {}
+
+  const defaults = [
+    join(homedir(), '.local', 'bin', 'claude'),
+    '/usr/local/bin/claude',
+  ]
+  for (const p of defaults) {
+    if (existsSync(p)) return p
+  }
+
+  return undefined
+}
+
 /** Normalize model ID to Claude Code format (opus, sonnet, haiku). */
 function normalizeModelId(modelId: string): string {
   const lower = modelId.toLowerCase()
@@ -60,6 +85,21 @@ 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
@@ -102,9 +142,11 @@ export async function runClaudeCodeAgent(
 ): Promise<RunAgentResult> {
   const {
     prompt,
+    agent,
     model,
     sessionId,
     timeoutSec = 600,
+    workdir,
     claudeCode,
     signal,
   } = options
@@ -121,9 +163,20 @@ export async function runClaudeCodeAgent(
 
   // Build session 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)
+
   const sessionOptions: SDKSessionOptions = {
     model: modelStr,
     permissionMode,
+    ...(workdir && { cwd: workdir }),
+    ...(systemPrompt && { systemPrompt }),
+    // Enable session persistence so close+resume works.
+    // The v2 SDK defaults persistSession to false, unlike v1 which defaults to true.
+    // Without this, session.close() destroys the session and resumeSession() fails
+    // with "No conversation found with session ID".
+    ...({ persistSession: true }),
     hooks: {
       PreToolUse: [{ hooks: [logToolCall] }],
     },
@@ -132,10 +185,11 @@ export async function runClaudeCodeAgent(
       claudeCode?.dangerouslySkipPermissions && {
         allowDangerouslySkipPermissions: true,
       }),
-    // Pass through custom executable path if provided
-    ...(claudeCode?.pathToClaudeCodeExecutable && {
-      pathToClaudeCodeExecutable: claudeCode.pathToClaudeCodeExecutable,
-    }),
+    // Resolve executable path: explicit option > PATH lookup > default locations
+    ...(() => {
+      const resolved = resolveClaudeCodePath(claudeCode?.pathToClaudeCodeExecutable)
+      return resolved ? { pathToClaudeCodeExecutable: resolved } : {}
+    })(),
   }
 
   console.error(

package/src/types.ts

@@ -26,6 +26,11 @@ export interface ClaudeCodeOptions {
   dangerouslySkipPermissions?: boolean
   /** Path to Claude Code executable (default: auto-detected). */
   pathToClaudeCodeExecutable?: string
+  /**
+   * System prompt for the Claude Code session.
+   * Can be a full string or use the preset format with append.
+   */
+  systemPrompt?: string | { type: 'preset'; preset: 'claude_code'; append: string }
 }
 
 /** Model configuration for LLM backends. */