ocpipe 0.5.3 → 0.5.4

package/package.json

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

package/src/agent.ts

@@ -34,7 +34,7 @@ export async function runAgent(
 async function runOpencodeAgent(
   options: RunAgentOptions,
 ): Promise<RunAgentResult> {
-  const { prompt, agent, model, sessionId, timeoutSec = 600, workdir } = options
+  const { prompt, agent, model, sessionId, timeoutSec = 600, workdir, signal } = options
 
   if (!model.providerID) {
     throw new Error('providerID is required for OpenCode backend')
@@ -47,6 +47,11 @@ async function runOpencodeAgent(
     `\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')
@@ -85,6 +90,22 @@ async function runOpencodeAgent(
     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) => {
@@ -125,6 +146,10 @@ async function runOpencodeAgent(
 
     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(() => {})

package/src/claude-code.ts

@@ -62,7 +62,12 @@ const logToolCall: HookCallback = async (input) => {
 export async function runClaudeCodeAgent(
   options: RunAgentOptions,
 ): Promise<RunAgentResult> {
-  const { prompt, model, sessionId, timeoutSec = 600, claudeCode } = options
+  const { prompt, model, sessionId, timeoutSec = 600, claudeCode, signal } = options
+
+  // Check if already aborted
+  if (signal?.aborted) {
+    throw new Error('Request aborted')
+  }
 
   // Claude Code understands simple names: opus, sonnet, haiku
   const modelStr = normalizeModelId(model.modelID)
@@ -94,6 +99,13 @@ export async function runClaudeCodeAgent(
       unstable_v2_resumeSession(sessionId, sessionOptions)
     : unstable_v2_createSession(sessionOptions)
 
+  // Handle abort signal
+  const abortHandler = () => {
+    console.error(`\n[abort] Closing Claude Code session...`)
+    session.close()
+  }
+  signal?.addEventListener('abort', abortHandler, { once: true })
+
   try {
     // Send the prompt
     await session.send(prompt)
@@ -113,6 +125,15 @@ export async function runClaudeCodeAgent(
         })
       : null
 
+    // Set up abort promise
+    const abortPromise = signal ?
+      new Promise<never>((_, reject) => {
+        signal.addEventListener('abort', () => {
+          reject(new Error('Request aborted'))
+        }, { once: true })
+      })
+    : null
+
     // Stream the response
     const streamPromise = (async () => {
       for await (const msg of session.stream()) {
@@ -129,12 +150,11 @@ export async function runClaudeCodeAgent(
       }
     })()
 
-    // Race between stream and timeout
-    if (timeoutPromise) {
-      await Promise.race([streamPromise, timeoutPromise])
-    } else {
-      await streamPromise
-    }
+    // Race between stream, timeout, and abort
+    const promises: Promise<void | never>[] = [streamPromise]
+    if (timeoutPromise) promises.push(timeoutPromise)
+    if (abortPromise) promises.push(abortPromise)
+    await Promise.race(promises)
 
     const response = textParts.join('')
     const sessionStr = newSessionId || 'none'
@@ -147,6 +167,7 @@ export async function runClaudeCodeAgent(
       sessionId: newSessionId,
     }
   } finally {
+    signal?.removeEventListener('abort', abortHandler)
     session.close()
   }
 }

package/src/predict.ts

@@ -77,6 +77,7 @@ export class Predict<S extends AnySignature> {
       timeoutSec: ctx.timeoutSec,
       workdir: ctx.workdir,
       claudeCode: ctx.claudeCode,
+      signal: ctx.signal,
     })
 
     // Update context with new session ID for continuity
@@ -206,6 +207,7 @@ export class Predict<S extends AnySignature> {
         timeoutSec: 60,
         workdir: ctx.workdir,
         claudeCode: ctx.claudeCode,
+        signal: ctx.signal,
       })
 
       // Try to parse the repaired JSON
@@ -282,6 +284,7 @@ export class Predict<S extends AnySignature> {
         timeoutSec: 60, // Short timeout for simple patches
         workdir: ctx.workdir,
         claudeCode: ctx.claudeCode,
+        signal: ctx.signal,
       })
 
       // Extract and apply the patch based on method

package/src/types.ts

@@ -53,6 +53,8 @@ export interface ExecutionContext {
   workdir?: string
   /** Claude Code specific options. */
   claudeCode?: ClaudeCodeOptions
+  /** AbortSignal for cancelling requests. When aborted, kills subprocesses. */
+  signal?: AbortSignal
 }
 
 // ============================================================================
@@ -303,6 +305,8 @@ export interface RunAgentOptions {
   workdir?: string
   /** Claude Code specific options. */
   claudeCode?: ClaudeCodeOptions
+  /** AbortSignal for cancelling the request. When aborted, kills the subprocess. */
+  signal?: AbortSignal
 }
 
 /** Result from running an OpenCode agent. */