@axiom-lattice/cli-a2a 0.1.4 → 0.1.6

package/__tests__/session-store-path.test.ts

@@ -0,0 +1,40 @@
+import { join } from 'node:path';
+import { resolveSessionStorePath } from '../src/session-store';
+
+describe('resolveSessionStorePath', () => {
+  const storeDir = '/tmp/cli-a2a-session-tests';
+
+  it('isolates default stores by provider and port', () => {
+    const codex = resolveSessionStorePath({
+      provider: 'codex',
+      port: 4301,
+      storeDir,
+    });
+    const claude = resolveSessionStorePath({
+      provider: 'claude',
+      port: 4302,
+      storeDir,
+    });
+
+    expect(codex).toBe(join(storeDir, 'sessions-codex-4301.json'));
+    expect(claude).toBe(join(storeDir, 'sessions-claude-4302.json'));
+    expect(codex).not.toBe(claude);
+  });
+
+  it('returns the same path for the same runtime identity', () => {
+    const options = { provider: 'opencode' as const, port: 4303, storeDir };
+
+    expect(resolveSessionStorePath(options)).toBe(resolveSessionStorePath(options));
+  });
+
+  it('preserves an explicitly configured store path', () => {
+    const configuredPath = join(storeDir, 'custom.json');
+
+    expect(resolveSessionStorePath({
+      configuredPath,
+      provider: 'codex',
+      port: 4301,
+      storeDir,
+    })).toBe(configuredPath);
+  });
+});

package/dist/{chunk-NQIDRU47.mjs → chunk-54SKDK3D.mjs}

@@ -1,14 +1,19 @@
 import {
+  extractText,
   publishFinalArtifact,
   publishStatus,
   publishTask
-} from "./chunk-LXL47XMZ.mjs";
+} from "./chunk-YGUPSPZO.mjs";
+import {
+  generateContextId
+} from "./chunk-DRFFQJII.mjs";
 import {
   logger
 } from "./chunk-VZEH3EPJ.mjs";
 
 // src/executors/claude/client.ts
 import { spawn } from "child_process";
+import { v4 as uuidv4 } from "uuid";
 var log = logger.child("claude:client");
 var ClaudeClient = class {
   constructor(config) {
@@ -27,14 +32,31 @@ var ClaudeClient = class {
     }
   }
   /**
-   * Execute a prompt via the Claude Code CLI and return the response text.
+   * Execute a prompt via the Claude Code CLI.
+   *
+   * @param prompt - The user prompt text.
+   * @param sessionId - If provided, resumes the session with `--resume`.
+   *   Otherwise creates a new session with `--session-id <new-uuid>`.
+   * @param workingDirectory - Optional per-request working directory override.
+   * @returns The response text and the session ID (new or existing).
    */
-  async execute(prompt) {
+  async execute(prompt, sessionId, workingDirectory) {
+    if (sessionId) {
+      const text2 = await this.run(["-p", "--resume", sessionId, prompt], workingDirectory);
+      return { text: text2, sessionId };
+    }
+    const newSessionId = uuidv4();
+    const text = await this.run(["-p", "--session-id", newSessionId, prompt], workingDirectory);
+    return { text, sessionId: newSessionId };
+  }
+  // ── Internal ──────────────────────────────────────────────────────────
+  async run(args, workingDirectory) {
     const cliPath = this.config.cliPath || "claude";
     const timeout = this.config.timeout ?? 3e5;
     const MAX_PROMPT = 1e5;
-    if (prompt.length > MAX_PROMPT) {
-      throw new Error(`Prompt too large (${prompt.length} chars, max ${MAX_PROMPT}). Split into smaller messages.`);
+    const promptArg = args[args.length - 1];
+    if (promptArg && promptArg.length > MAX_PROMPT) {
+      throw new Error(`Prompt too large (${promptArg.length} chars, max ${MAX_PROMPT}). Split into smaller messages.`);
     }
     const env = {
       PATH: process.env.PATH ?? "",
@@ -46,15 +68,19 @@ var ClaudeClient = class {
     if (this.config.apiKey) {
       env["ANTHROPIC_API_KEY"] = this.config.apiKey;
     }
-    const args = ["-p"];
+    const fullArgs = [];
+    for (const arg of args.slice(0, -1)) {
+      fullArgs.push(arg);
+    }
     if (this.config.model) {
-      args.push("--model", this.config.model);
+      fullArgs.push("--model", this.config.model);
     }
-    args.push(prompt);
-    log.info("Spawning claude", { cliPath, workdir: this.config.workdir, model: this.config.model });
+    fullArgs.push(promptArg);
+    const workdir = workingDirectory || this.config.workdir || process.cwd();
+    log.info("Spawning claude", { cliPath, workdir, model: this.config.model });
     return new Promise((resolve, reject) => {
-      const child = spawn(cliPath, args, {
-        cwd: this.config.workdir || process.cwd(),
+      const child = spawn(cliPath, fullArgs, {
+        cwd: workdir,
         env,
         stdio: ["ignore", "pipe", "pipe"]
       });
@@ -106,10 +132,11 @@ var ClaudeClient = class {
 // src/executors/claude/executor.ts
 var log2 = logger.child("claude:executor");
 var ClaudeExecutor = class {
-  constructor(config) {
+  constructor(config, sessionStore) {
     this.client = null;
     this.initialized = false;
     this.config = config;
+    this.sessionStore = sessionStore;
   }
   async initialize() {
     if (this.initialized) return;
@@ -130,25 +157,51 @@ var ClaudeExecutor = class {
     log2.info("Executor shut down");
   }
   async execute(ctx, bus) {
-    const { taskId, contextId, userMessage, task } = ctx;
+    const { taskId, userMessage } = ctx;
     await this.initialize();
+    const reuseByContext = this.config.session?.reuseByContext ?? true;
+    let contextId = ctx.contextId;
+    if (!contextId) {
+      contextId = generateContextId();
+      log2.info("Generated new contextId", { contextId, taskId });
+    }
+    const binding = reuseByContext ? this.sessionStore.get(contextId, "claude") : null;
+    const sessionId = binding?.sessionId;
     try {
-      if (!task) {
+      const existingTask = ctx.task;
+      if (!existingTask) {
         publishTask(bus, taskId, contextId);
         publishStatus(bus, taskId, contextId, "submitted");
       }
-      publishStatus(bus, taskId, contextId, "working", "Processing request...");
-      const promptText = this.extractText(userMessage);
-      log2.info("Sending prompt to Claude Code", { taskId, len: promptText.length });
-      const response = await this.client.execute(promptText);
-      const finalText = response || "No response from Claude Code.";
-      publishFinalArtifact(bus, taskId, contextId, finalText);
+      publishStatus(bus, taskId, contextId, "working");
+      const promptText = extractText(userMessage);
+      const userMsg = userMessage;
+      const workingDirectory = userMsg.metadata && typeof userMsg.metadata === "object" ? userMsg.metadata.workingDirectory : void 0;
+      log2.info("Sending prompt to Claude Code", {
+        taskId,
+        contextId,
+        sessionId: sessionId || "(new)",
+        len: promptText.length,
+        workingDirectory: workingDirectory || "(default)"
+      });
+      const result = await this.client.execute(promptText, sessionId, workingDirectory);
+      this.sessionStore.set({
+        provider: "claude",
+        contextId,
+        sessionId: result.sessionId,
+        activeTaskId: void 0,
+        activeTaskState: void 0,
+        createdAt: binding?.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        expiresAt: new Date(Date.now() + (this.config.session?.ttl ?? 24 * 60 * 60 * 1e3)).toISOString()
+      });
+      publishFinalArtifact(bus, taskId, contextId, result.text || "No response from Claude Code.");
       publishStatus(bus, taskId, contextId, "completed", void 0, true);
       bus.finished();
-      log2.info("Task completed", { taskId, len: finalText.length });
+      log2.info("Task completed", { taskId, contextId, sessionId: result.sessionId });
     } catch (error) {
       const msg = error.message ?? String(error);
-      log2.error("Execution failed", { taskId, error: msg });
+      log2.error("Execution failed", { taskId, contextId, error: msg });
       publishStatus(bus, taskId, contextId, "failed", `Error: ${msg}`, true);
       bus.finished();
     }
@@ -159,20 +212,13 @@ var ClaudeExecutor = class {
     publishStatus(bus, taskId, "", "canceled", "Claude Code task cancelled", true);
     bus.finished();
   }
-  extractText(message) {
-    return message.parts.filter((p) => {
-      const part = p;
-      const text = part.text;
-      return text !== void 0 && text !== null;
-    }).map((p) => p.text).join("\n");
-  }
 };
-function createClaudeExecutor(config) {
-  return new ClaudeExecutor(config);
+function createClaudeExecutor(config, sessionStore) {
+  return new ClaudeExecutor(config, sessionStore);
 }
 
 export {
   ClaudeExecutor,
   createClaudeExecutor
 };
-//# sourceMappingURL=chunk-NQIDRU47.mjs.map
+//# sourceMappingURL=chunk-54SKDK3D.mjs.map

package/dist/chunk-54SKDK3D.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/executors/claude/client.ts","../src/executors/claude/executor.ts"],"sourcesContent":["/**\n * Claude Code CLI client wrapper.\n *\n * Spawns the Anthropic Claude Code CLI as a child process in non-interactive\n * print mode (`-p`). Sends prompts, captures stdout as the response.\n * Supports session persistence: first call uses `--session-id <uuid>` to\n * create a named session; subsequent calls use `--resume <uuid>` to continue.\n */\n\nimport { spawn } from 'node:child_process';\nimport { v4 as uuidv4 } from 'uuid';\nimport { logger } from '../../logger.js';\n\nconst log = logger.child('claude:client');\n\n// ─── Types ──────────────────────────────────────────────────────────────────\n\nexport interface ClaudeClientConfig {\n  /** Path to the claude binary (default: \"claude\") */\n  cliPath: string;\n  /** Working directory for the process */\n  workdir: string;\n  /** Model identifier (e.g. \"claude-sonnet-4-20250514\") — passed via --model */\n  model?: string;\n  /** Anthropic API key — passed as ANTHROPIC_API_KEY env */\n  apiKey?: string;\n  /** Timeout in ms (default: 300_000 = 5 min) */\n  timeout?: number;\n}\n\nexport interface ClaudeExecuteResult {\n  text: string;\n  sessionId: string;\n}\n\n// ─── Client ─────────────────────────────────────────────────────────────────\n\nexport class ClaudeClient {\n  private currentChild: ReturnType<typeof spawn> | null = null;\n\n  constructor(private config: ClaudeClientConfig) {}\n\n  abort(): void {\n    if (this.currentChild) {\n      this.currentChild.kill('SIGTERM');\n      setTimeout(() => {\n        if (this.currentChild?.exitCode === null) {\n          this.currentChild.kill('SIGKILL');\n        }\n      }, 5000);\n      this.currentChild = null;\n    }\n  }\n\n  /**\n   * Execute a prompt via the Claude Code CLI.\n   *\n   * @param prompt - The user prompt text.\n   * @param sessionId - If provided, resumes the session with `--resume`.\n   *   Otherwise creates a new session with `--session-id <new-uuid>`.\n   * @param workingDirectory - Optional per-request working directory override.\n   * @returns The response text and the session ID (new or existing).\n   */\n  async execute(prompt: string, sessionId?: string, workingDirectory?: string): Promise<ClaudeExecuteResult> {\n    if (sessionId) {\n      const text = await this.run(['-p', '--resume', sessionId, prompt], workingDirectory);\n      return { text, sessionId };\n    }\n\n    const newSessionId = uuidv4();\n    const text = await this.run(['-p', '--session-id', newSessionId, prompt], workingDirectory);\n    return { text, sessionId: newSessionId };\n  }\n\n  // ── Internal ──────────────────────────────────────────────────────────\n\n  private async run(args: string[], workingDirectory?: string): Promise<string> {\n    const cliPath = this.config.cliPath || 'claude';\n    const timeout = this.config.timeout ?? 300_000;\n    const MAX_PROMPT = 100_000;\n\n    // Validate prompt size\n    const promptArg = args[args.length - 1];\n    if (promptArg && promptArg.length > MAX_PROMPT) {\n      throw new Error(`Prompt too large (${promptArg.length} chars, max ${MAX_PROMPT}). Split into smaller messages.`);\n    }\n\n    // Only pass relevant env vars to child process\n    const env: Record<string, string> = {\n      PATH: process.env.PATH ?? '',\n      HOME: process.env.HOME ?? '',\n    };\n    for (const key of ['HTTP_PROXY', 'HTTPS_PROXY', 'NO_PROXY', 'http_proxy', 'https_proxy', 'no_proxy']) {\n      if (process.env[key]) env[key] = process.env[key];\n    }\n    if (this.config.apiKey) {\n      env['ANTHROPIC_API_KEY'] = this.config.apiKey;\n    }\n\n    // Build full args: base args + model + prompt\n    const fullArgs: string[] = [];\n    for (const arg of args.slice(0, -1)) {\n      fullArgs.push(arg);\n    }\n    if (this.config.model) {\n      fullArgs.push('--model', this.config.model);\n    }\n    fullArgs.push(promptArg);\n\n    const workdir = workingDirectory || this.config.workdir || process.cwd();\n    log.info('Spawning claude', { cliPath, workdir, model: this.config.model });\n\n    return new Promise<string>((resolve, reject) => {\n      const child = spawn(cliPath, fullArgs, {\n        cwd: workdir,\n        env,\n        stdio: ['ignore', 'pipe', 'pipe'],\n      });\n\n      this.currentChild = child;\n\n      let stdout = '';\n      let stderr = '';\n      const MAX_OUTPUT = 10_000_000;\n\n      const timer = setTimeout(() => {\n        child.kill('SIGTERM');\n        const forceTimer = setTimeout(() => {\n          if (child.exitCode === null) child.kill('SIGKILL');\n        }, 5000);\n        child.on('close', () => clearTimeout(forceTimer));\n        reject(new Error(`Claude Code execution timed out after ${timeout}ms`));\n      }, timeout);\n\n      child.stdout?.on('data', (chunk: Buffer) => {\n        stdout += chunk.toString();\n        if (stdout.length > MAX_OUTPUT) {\n          child.kill('SIGTERM');\n          setTimeout(() => { if (child.exitCode === null) child.kill('SIGKILL'); }, 5000);\n        }\n      });\n\n      child.stderr?.on('data', (chunk: Buffer) => {\n        stderr += chunk.toString();\n        log.debug('Claude stderr', { text: chunk.toString().trim() });\n      });\n\n      child.on('close', (code) => {\n        clearTimeout(timer);\n        this.currentChild = null;\n\n        if (code === 0) {\n          resolve(stdout.trim());\n        } else {\n          const errMsg = stderr.trim() || stdout.trim() || `Claude Code exited with code ${code}`;\n          log.warn('Claude non-zero exit', { code, stderr: errMsg });\n          reject(new Error(errMsg));\n        }\n      });\n\n      child.on('error', (err) => {\n        clearTimeout(timer);\n        log.error('Claude spawn failed', { error: err.message });\n        reject(new Error(`Failed to start claude: ${err.message}. Install: npm i -g @anthropic-ai/claude-code`));\n      });\n    });\n  }\n}\n","/**\n * Claude Code A2A Executor\n *\n * Bridges the local Claude Code CLI to the A2A protocol. Spawns Claude Code\n * in non-interactive print mode (`-p`) for each request. Supports multi-turn\n * conversation via contextId → sessionId binding through SessionBindingStore.\n */\n\nimport type { A2AExecutor } from '../index.js';\nimport type { RequestContext, ExecutionEventBus } from '@a2a-js/sdk/server';\n\nimport type { AgentConfig } from '../../config/types.js';\nimport type { SessionBindingStore } from '../../session-store.js';\nimport { generateContextId } from '../../session-store.js';\nimport { logger } from '../../logger.js';\nimport { ClaudeClient } from './client.js';\nimport {\n  publishTask,\n  publishStatus,\n  publishFinalArtifact,\n  extractText,\n} from '../events.js';\n\nconst log = logger.child('claude:executor');\n\n// ─── Executor ───────────────────────────────────────────────────────────────\n\nexport class ClaudeExecutor implements A2AExecutor {\n  private config: Required<AgentConfig>;\n  private client: ClaudeClient | null = null;\n  private initialized = false;\n  private sessionStore: SessionBindingStore;\n\n  constructor(config: Required<AgentConfig>, sessionStore: SessionBindingStore) {\n    this.config = config;\n    this.sessionStore = sessionStore;\n  }\n\n  async initialize(): Promise<void> {\n    if (this.initialized) return;\n\n    const cc = this.config.claude;\n    this.client = new ClaudeClient({\n      cliPath: cc.cliPath!,\n      workdir: cc.workdir!,\n      model: cc.model || undefined,\n      apiKey: cc.apiKey || undefined,\n      timeout: this.config.timeouts.prompt ?? 600_000,\n    });\n\n    this.initialized = true;\n    log.info('Executor initialized', { cliPath: cc.cliPath, workdir: cc.workdir });\n  }\n\n  async shutdown(): Promise<void> {\n    this.client = null;\n    this.initialized = false;\n    log.info('Executor shut down');\n  }\n\n  async execute(ctx: RequestContext, bus: ExecutionEventBus): Promise<void> {\n    const { taskId, userMessage } = ctx;\n    await this.initialize();\n\n    const reuseByContext = this.config.session?.reuseByContext ?? true;\n\n    let contextId = ctx.contextId;\n    if (!contextId) {\n      contextId = generateContextId();\n      log.info('Generated new contextId', { contextId, taskId });\n    }\n\n    const binding = reuseByContext\n      ? this.sessionStore.get(contextId, 'claude')\n      : null;\n\n    const sessionId = binding?.sessionId;\n\n    try {\n      const existingTask = ctx.task;\n      if (!existingTask) {\n        publishTask(bus, taskId, contextId);\n        publishStatus(bus, taskId, contextId, 'submitted');\n      }\n\n      publishStatus(bus, taskId, contextId, 'working');\n\n      const promptText = extractText(userMessage);\n\n      // Extract per-request workingDirectory from A2A message metadata\n      const userMsg = userMessage as unknown as Record<string, unknown>;\n      const workingDirectory = userMsg.metadata &&\n        typeof userMsg.metadata === 'object'\n        ? (userMsg.metadata as Record<string, unknown>).workingDirectory as string | undefined\n        : undefined;\n\n      log.info('Sending prompt to Claude Code', {\n        taskId,\n        contextId,\n        sessionId: sessionId || '(new)',\n        len: promptText.length,\n        workingDirectory: workingDirectory || '(default)',\n      });\n\n      const result = await this.client!.execute(promptText, sessionId, workingDirectory);\n\n      this.sessionStore.set({\n        provider: 'claude',\n        contextId,\n        sessionId: result.sessionId,\n        activeTaskId: undefined,\n        activeTaskState: undefined,\n        createdAt: binding?.createdAt ?? new Date().toISOString(),\n        updatedAt: new Date().toISOString(),\n        expiresAt: new Date(Date.now() + (this.config.session?.ttl ?? 24 * 60 * 60 * 1000)).toISOString(),\n      });\n\n      publishFinalArtifact(bus, taskId, contextId, result.text || 'No response from Claude Code.');\n      publishStatus(bus, taskId, contextId, 'completed', undefined, true);\n      bus.finished();\n      log.info('Task completed', { taskId, contextId, sessionId: result.sessionId });\n\n    } catch (error) {\n      const msg = (error as Error).message ?? String(error);\n      log.error('Execution failed', { taskId, contextId, error: msg });\n      publishStatus(bus, taskId, contextId, 'failed', `Error: ${msg}`, true);\n      bus.finished();\n    }\n  }\n\n  async cancelTask(taskId: string, bus: ExecutionEventBus): Promise<void> {\n    log.info('Cancel requested for Claude Code task', { taskId });\n    this.client?.abort();\n    publishStatus(bus, taskId, '', 'canceled', 'Claude Code task cancelled', true);\n    bus.finished();\n  }\n}\n\n// ─── Factory ────────────────────────────────────────────────────────────────\n\nexport function createClaudeExecutor(\n  config: Required<AgentConfig>,\n  sessionStore: SessionBindingStore,\n): A2AExecutor {\n  return new ClaudeExecutor(config, sessionStore);\n}\n"],"mappings":"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","names":["text","log"]}

package/dist/chunk-BSNQOP2W.mjs

@@ -0,0 +1,350 @@
+import {
+  extractText,
+  publishFinalArtifact,
+  publishStatus,
+  publishTask
+} from "./chunk-YGUPSPZO.mjs";
+import {
+  generateContextId
+} from "./chunk-DRFFQJII.mjs";
+import {
+  logger
+} from "./chunk-VZEH3EPJ.mjs";
+
+// src/executors/opencode/client.ts
+import { spawn } from "child_process";
+var log = logger.child("opencode:client");
+var OpenCodeClient = class {
+  constructor(config) {
+    this.config = config;
+    this.currentChild = null;
+  }
+  abort() {
+    if (this.currentChild) {
+      this.currentChild.kill("SIGTERM");
+      setTimeout(() => {
+        if (this.currentChild?.exitCode === null) {
+          this.currentChild.kill("SIGKILL");
+        }
+      }, 5e3);
+      this.currentChild = null;
+    }
+  }
+  /**
+   * Execute a prompt via the OpenCode CLI.
+   *
+   * @param prompt - The user prompt text.
+   * @param sessionId - If provided, continues the session with `--session`.
+   *   Otherwise creates a new session using `--format json` to capture the
+   *   session ID.
+   * @param workingDirectory - Optional per-request working directory override.
+   *   Falls back to config.workdir if not provided.
+   */
+  async execute(prompt, sessionId, workingDirectory) {
+    if (sessionId) {
+      const text = await this.runResume(prompt, sessionId, workingDirectory);
+      return { text, sessionId };
+    }
+    return this.runNew(prompt, workingDirectory);
+  }
+  resolveWorkdir(override) {
+    return override || this.config.workdir || process.cwd();
+  }
+  // ── New session (first turn) ──────────────────────────────────────────
+  async runNew(prompt, workingDirectory) {
+    const cliPath = this.config.cliPath || "opencode";
+    const timeout = this.config.timeout ?? 6e5;
+    const MAX_PROMPT = 1e5;
+    if (prompt.length > MAX_PROMPT) {
+      throw new Error(`Prompt too large (${prompt.length} chars, max ${MAX_PROMPT}).`);
+    }
+    const env = {
+      PATH: process.env.PATH ?? "",
+      HOME: process.env.HOME ?? ""
+    };
+    for (const key of ["HTTP_PROXY", "HTTPS_PROXY", "NO_PROXY", "http_proxy", "https_proxy", "no_proxy"]) {
+      if (process.env[key]) env[key] = process.env[key];
+    }
+    for (const key of ["OPENAI_API_KEY", "ANTHROPIC_API_KEY", "OPENCODE_SERVER_PASSWORD", "OPENCODE_SERVER_USERNAME"]) {
+      if (process.env[key]) env[key] = process.env[key];
+    }
+    const args = ["run", "--format", "json"];
+    if (this.config.model) {
+      args.push("--model", this.config.model);
+    }
+    if (this.config.agent) {
+      args.push("--agent", this.config.agent);
+    }
+    if (this.config.attachUrl) {
+      args.push("--attach", this.config.attachUrl);
+    }
+    args.push("--dangerously-skip-permissions", prompt);
+    const workdir = this.resolveWorkdir(workingDirectory);
+    log.info("Spawning opencode (new session, json)", { cliPath, workdir });
+    return new Promise((resolve, reject) => {
+      const child = spawn(cliPath, args, {
+        cwd: workdir,
+        env,
+        stdio: ["ignore", "pipe", "pipe"]
+      });
+      this.currentChild = child;
+      let stdout = "";
+      let stderr = "";
+      const MAX_OUTPUT = 1e7;
+      const timer = setTimeout(() => {
+        child.kill("SIGTERM");
+        const forceTimer = setTimeout(() => {
+          if (child.exitCode === null) child.kill("SIGKILL");
+        }, 5e3);
+        child.on("close", () => clearTimeout(forceTimer));
+        reject(new Error(`OpenCode execution timed out after ${timeout}ms`));
+      }, timeout);
+      child.stdout?.on("data", (chunk) => {
+        stdout += chunk.toString();
+        if (stdout.length > MAX_OUTPUT) {
+          child.kill("SIGTERM");
+          setTimeout(() => {
+            if (child.exitCode === null) child.kill("SIGKILL");
+          }, 5e3);
+        }
+      });
+      child.stderr?.on("data", (chunk) => {
+        stderr += chunk.toString();
+        log.debug("OpenCode stderr", { text: chunk.toString().trim() });
+      });
+      child.on("close", (code) => {
+        clearTimeout(timer);
+        this.currentChild = null;
+        if (code !== 0) {
+          const errMsg = stderr.trim() || stdout.trim() || `OpenCode exited with code ${code}`;
+          log.warn("OpenCode non-zero exit", { code, stderr: errMsg });
+          reject(new Error(errMsg));
+          return;
+        }
+        try {
+          const { text, sessionId } = this.parseJsonEvents(stdout);
+          resolve({ text, sessionId });
+        } catch (err) {
+          reject(new Error(`Failed to parse OpenCode JSON output: ${err.message}`));
+        }
+      });
+      child.on("error", (err) => {
+        clearTimeout(timer);
+        log.error("OpenCode spawn failed", { error: err.message });
+        reject(new Error(`Failed to start opencode: ${err.message}. Is it installed?`));
+      });
+    });
+  }
+  // ── Resume session ────────────────────────────────────────────────────
+  async runResume(prompt, sessionId, workingDirectory) {
+    const cliPath = this.config.cliPath || "opencode";
+    const timeout = this.config.timeout ?? 6e5;
+    const MAX_PROMPT = 1e5;
+    if (prompt.length > MAX_PROMPT) {
+      throw new Error(`Prompt too large (${prompt.length} chars, max ${MAX_PROMPT}).`);
+    }
+    const env = {
+      PATH: process.env.PATH ?? "",
+      HOME: process.env.HOME ?? ""
+    };
+    for (const key of ["HTTP_PROXY", "HTTPS_PROXY", "NO_PROXY", "http_proxy", "https_proxy", "no_proxy"]) {
+      if (process.env[key]) env[key] = process.env[key];
+    }
+    for (const key of ["OPENAI_API_KEY", "ANTHROPIC_API_KEY", "OPENCODE_SERVER_PASSWORD", "OPENCODE_SERVER_USERNAME"]) {
+      if (process.env[key]) env[key] = process.env[key];
+    }
+    const args = ["run", "--session", sessionId];
+    if (this.config.model) {
+      args.push("--model", this.config.model);
+    }
+    if (this.config.agent) {
+      args.push("--agent", this.config.agent);
+    }
+    if (this.config.attachUrl) {
+      args.push("--attach", this.config.attachUrl);
+    }
+    args.push("--format", "default", "--dangerously-skip-permissions", prompt);
+    const workdir = this.resolveWorkdir(workingDirectory);
+    log.info("Spawning opencode (resume)", { sessionId, workdir });
+    return new Promise((resolve, reject) => {
+      const child = spawn(cliPath, args, {
+        cwd: workdir,
+        env,
+        stdio: ["ignore", "pipe", "pipe"]
+      });
+      this.currentChild = child;
+      let stdout = "";
+      let stderr = "";
+      const MAX_OUTPUT = 1e7;
+      const timer = setTimeout(() => {
+        child.kill("SIGTERM");
+        const forceTimer = setTimeout(() => {
+          if (child.exitCode === null) child.kill("SIGKILL");
+        }, 5e3);
+        child.on("close", () => clearTimeout(forceTimer));
+        reject(new Error(`OpenCode execution timed out after ${timeout}ms`));
+      }, timeout);
+      child.stdout?.on("data", (chunk) => {
+        stdout += chunk.toString();
+        if (stdout.length > MAX_OUTPUT) {
+          child.kill("SIGTERM");
+          setTimeout(() => {
+            if (child.exitCode === null) child.kill("SIGKILL");
+          }, 5e3);
+        }
+      });
+      child.stderr?.on("data", (chunk) => {
+        stderr += chunk.toString();
+        log.debug("OpenCode stderr", { text: chunk.toString().trim() });
+      });
+      child.on("close", (code) => {
+        clearTimeout(timer);
+        this.currentChild = null;
+        if (code === 0) {
+          resolve(stdout.trim());
+        } else {
+          const errMsg = stderr.trim() || stdout.trim() || `OpenCode exited with code ${code}`;
+          log.warn("OpenCode non-zero exit", { code, stderr: errMsg });
+          reject(new Error(errMsg));
+        }
+      });
+      child.on("error", (err) => {
+        clearTimeout(timer);
+        log.error("OpenCode spawn failed", { error: err.message });
+        reject(new Error(`Failed to start opencode: ${err.message}. Is it installed?`));
+      });
+    });
+  }
+  // ── Parser ────────────────────────────────────────────────────────────
+  /**
+   * Parse newline-delimited JSON events from OpenCode's `--format json` output.
+   * Extracts the sessionID from the first event that contains it, and
+   * accumulates text content from relevant events.
+   */
+  parseJsonEvents(stdout) {
+    const lines = stdout.split("\n").filter((l) => l.trim());
+    let sessionId = "";
+    const textParts = [];
+    for (const line of lines) {
+      let event;
+      try {
+        event = JSON.parse(line);
+      } catch {
+        continue;
+      }
+      if (!sessionId && event.sessionID) {
+        sessionId = event.sessionID;
+      }
+      if (event.type === "error") continue;
+      const text = event.text || event.content || event.message;
+      if (text) {
+        textParts.push(text);
+      }
+    }
+    if (!sessionId) {
+      return {
+        text: textParts.join("\n").trim() || stdout.trim(),
+        sessionId: ""
+      };
+    }
+    return {
+      text: textParts.join("\n").trim() || "No response from OpenCode.",
+      sessionId
+    };
+  }
+};
+
+// src/executors/opencode/executor.ts
+var log2 = logger.child("opencode:executor");
+var OpenCodeExecutor = class {
+  constructor(config, sessionStore) {
+    this.client = null;
+    this.initialized = false;
+    this.config = config;
+    this.sessionStore = sessionStore;
+  }
+  async initialize() {
+    if (this.initialized) return;
+    const oc = this.config.opencode;
+    this.client = new OpenCodeClient({
+      cliPath: "opencode",
+      workdir: oc.projectDirectory || process.cwd(),
+      model: oc.model || void 0,
+      agent: oc.agent || void 0,
+      attachUrl: oc.baseUrl || void 0,
+      timeout: this.config.timeouts.prompt ?? 6e5
+    });
+    this.initialized = true;
+    log2.info("Executor initialized", { workdir: oc.projectDirectory, model: oc.model });
+  }
+  async shutdown() {
+    this.client = null;
+    this.initialized = false;
+    log2.info("Executor shut down");
+  }
+  async execute(ctx, bus) {
+    const { taskId, userMessage } = ctx;
+    await this.initialize();
+    const reuseByContext = this.config.session?.reuseByContext ?? true;
+    let contextId = ctx.contextId;
+    if (!contextId) {
+      contextId = generateContextId();
+      log2.info("Generated new contextId", { contextId, taskId });
+    }
+    const binding = reuseByContext ? this.sessionStore.get(contextId, "opencode") : null;
+    const sessionId = binding?.sessionId;
+    try {
+      const existingTask = ctx.task;
+      if (!existingTask) {
+        publishTask(bus, taskId, contextId);
+        publishStatus(bus, taskId, contextId, "submitted");
+      }
+      publishStatus(bus, taskId, contextId, "working");
+      const promptText = extractText(userMessage);
+      const userMsg = userMessage;
+      const workingDirectory = userMsg.metadata && typeof userMsg.metadata === "object" ? userMsg.metadata.workingDirectory : void 0;
+      log2.info("Sending prompt to OpenCode", {
+        taskId,
+        contextId,
+        sessionId: sessionId || "(new)",
+        len: promptText.length,
+        workingDirectory: workingDirectory || "(default)"
+      });
+      const result = await this.client.execute(promptText, sessionId, workingDirectory);
+      this.sessionStore.set({
+        provider: "opencode",
+        contextId,
+        sessionId: result.sessionId,
+        activeTaskId: void 0,
+        activeTaskState: void 0,
+        createdAt: binding?.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        expiresAt: new Date(Date.now() + (this.config.session?.ttl ?? 24 * 60 * 60 * 1e3)).toISOString()
+      });
+      publishFinalArtifact(bus, taskId, contextId, result.text || "No response from OpenCode.");
+      publishStatus(bus, taskId, contextId, "completed", void 0, true);
+      bus.finished();
+      log2.info("Task completed", { taskId, contextId, sessionId: result.sessionId });
+    } catch (error) {
+      const msg = error.message ?? String(error);
+      log2.error("Execution failed", { taskId, contextId, error: msg });
+      publishStatus(bus, taskId, contextId, "failed", `Error: ${msg}`, true);
+      bus.finished();
+    }
+  }
+  async cancelTask(taskId, bus) {
+    log2.info("Cancel requested for OpenCode task", { taskId });
+    this.client?.abort();
+    publishStatus(bus, taskId, "", "canceled", "OpenCode task cancelled", true);
+    bus.finished();
+  }
+};
+function createOpenCodeExecutor(config, sessionStore) {
+  return new OpenCodeExecutor(config, sessionStore);
+}
+
+export {
+  OpenCodeExecutor,
+  createOpenCodeExecutor
+};
+//# sourceMappingURL=chunk-BSNQOP2W.mjs.map