otterly 0.3.3 → 0.3.4

package/dist/cli.js

@@ -17,7 +17,7 @@ const { values, positionals } = parseArgs({
 });
 const command = positionals[0] || "serve";
 if (values.version) {
-    console.log("0.3.3");
+    console.log("0.3.4");
     process.exit(0);
 }
 if (values.help || command === "help") {

package/dist/engine.js

@@ -1,5 +1,5 @@
-import { spawn } from "child_process";
-import { createInterface } from "readline";
+import { execFileSync } from "child_process";
+import { Worker } from "worker_threads";
 import { normalizeEvents, createEventContext } from "./events.js";
 import { classifyError, AgentError } from "./errors.js";
 import { wrapPermissionHandler } from "./permissions.js";
@@ -7,15 +7,12 @@ import { Session } from "./session.js";
 let cachedQueryFn = null;
 let resolvedMode = null;
 /**
- * Find the `claude` CLI binary. Returns the path or null.
+ * Find the `claude` CLI binary. Returns the name or null.
  */
-async function findClaudeCLI() {
-    const { execFileSync } = await import("child_process");
-    // Check common names: claude, claude-code
+function findClaudeCLI() {
     for (const bin of ["claude", "claude-code"]) {
         try {
             execFileSync("which", [bin], { stdio: "pipe" });
-            // Verify it actually runs
             execFileSync(bin, ["--version"], { stdio: "pipe", timeout: 5000 });
             return bin;
         }
@@ -26,102 +23,109 @@ async function findClaudeCLI() {
     return null;
 }
 /**
- * Build a QueryFn that spawns `claude -p` with stream-json output.
- * The CLI emits the same JSON event types the SDK does, so normalizeEvents
- * works unchanged.
+ * Build a shell command string for `claude -p`.
+ * Escapes the prompt for safe shell embedding.
+ */
+function buildCLICommand(cliBin, prompt, opts) {
+    // Shell-escape single quotes in prompt
+    const safePrompt = prompt.replace(/'/g, "'\\''");
+    const parts = [cliBin, "-p", `'${safePrompt}'`, "--output-format", "stream-json", "--verbose"];
+    if (opts.cwd)
+        parts.push("--cwd", `'${String(opts.cwd).replace(/'/g, "'\\''")}'`);
+    if (opts.model)
+        parts.push("--model", String(opts.model));
+    if (opts.maxTurns)
+        parts.push("--max-turns", String(opts.maxTurns));
+    if (opts.systemPrompt) {
+        const safe = String(opts.systemPrompt).replace(/'/g, "'\\''");
+        parts.push("--system-prompt", `'${safe}'`);
+    }
+    if (opts.resume)
+        parts.push("--resume", String(opts.resume));
+    if (opts.permissionMode)
+        parts.push("--permission-mode", String(opts.permissionMode));
+    if (opts.allowedTools) {
+        for (const tool of opts.allowedTools)
+            parts.push("--allowedTools", tool);
+    }
+    if (opts.disallowedTools) {
+        for (const tool of opts.disallowedTools)
+            parts.push("--disallowedTools", tool);
+    }
+    return parts.join(" ");
+}
+/**
+ * Build a QueryFn that runs `claude -p` via execSync in a worker thread.
+ *
+ * The Bun-compiled `claude` binary doesn't pipe stdout to Node.js child_process
+ * async APIs (spawn/exec), but execSync through a shell works reliably.
+ * We run it in a worker thread to avoid blocking the event loop.
  */
 function createCLIQueryFn(cliBin) {
     return function cliQuery(args) {
         const opts = args.options || {};
         const prompt = typeof args.prompt === "string" ? args.prompt : JSON.stringify(args.prompt);
-        const cliArgs = [
-            "-p", prompt,
-            "--output-format", "stream-json",
-            "--verbose",
-        ];
-        if (opts.cwd)
-            cliArgs.push("--cwd", String(opts.cwd));
-        if (opts.model)
-            cliArgs.push("--model", String(opts.model));
-        if (opts.maxTurns)
-            cliArgs.push("--max-turns", String(opts.maxTurns));
-        if (opts.systemPrompt)
-            cliArgs.push("--system-prompt", String(opts.systemPrompt));
-        if (opts.resume)
-            cliArgs.push("--resume", String(opts.resume));
-        if (opts.permissionMode)
-            cliArgs.push("--permission-mode", String(opts.permissionMode));
-        if (opts.allowedTools) {
-            for (const tool of opts.allowedTools) {
-                cliArgs.push("--allowedTools", tool);
-            }
-        }
-        if (opts.disallowedTools) {
-            for (const tool of opts.disallowedTools) {
-                cliArgs.push("--disallowedTools", tool);
-            }
-        }
-        const abortController = opts.abortController;
+        const cmd = buildCLICommand(cliBin, prompt, opts);
         return {
-            [Symbol.asyncIterator]() {
-                let lineBuffer = [];
-                let done = false;
-                let error = null;
-                let resolveNext = null;
-                const child = spawn(cliBin, cliArgs, {
-                    stdio: ["pipe", "pipe", "pipe"],
-                    env: { ...process.env },
-                });
-                // Handle abort
-                if (abortController) {
-                    abortController.signal.addEventListener("abort", () => {
-                        child.kill("SIGTERM");
+            async *[Symbol.asyncIterator]() {
+                // Run execSync in a worker thread to keep the event loop free
+                const stdout = await new Promise((resolve, reject) => {
+                    const workerCode = `
+            const { parentPort, workerData } = require('worker_threads');
+            const { execSync } = require('child_process');
+            try {
+              const out = execSync(workerData.cmd, {
+                encoding: 'utf-8',
+                timeout: workerData.timeout,
+                maxBuffer: 50 * 1024 * 1024,
+                env: process.env,
+              });
+              parentPort.postMessage({ ok: true, data: out });
+            } catch (err) {
+              parentPort.postMessage({ ok: false, error: err.message });
+            }
+          `;
+                    const timeout = opts.abortController
+                        ? 10 * 60 * 1000 // 10 min for streaming
+                        : 5 * 60 * 1000; // 5 min for one-shot
+                    const worker = new Worker(workerCode, {
+                        eval: true,
+                        workerData: { cmd, timeout },
                     });
-                }
-                const rl = createInterface({ input: child.stdout });
-                rl.on("line", (line) => {
-                    if (!line.trim())
-                        return;
-                    try {
-                        const parsed = JSON.parse(line);
-                        lineBuffer.push(parsed);
-                        if (resolveNext) {
-                            resolveNext();
-                            resolveNext = null;
+                    worker.on("message", (msg) => {
+                        if (msg.ok) {
+                            resolve(msg.data || "");
                         }
-                    }
-                    catch {
-                        // Skip non-JSON lines (stderr leakage, etc.)
+                        else {
+                            reject(new Error(msg.error || "CLI execution failed"));
+                        }
+                    });
+                    worker.on("error", reject);
+                    worker.on("exit", (code) => {
+                        if (code !== 0)
+                            reject(new Error(`Worker exited with code ${code}`));
+                    });
+                    // Handle abort
+                    const ac = opts.abortController;
+                    if (ac) {
+                        ac.signal.addEventListener("abort", () => {
+                            worker.terminate();
+                            reject(new Error("Aborted"));
+                        });
                     }
                 });
-                child.on("error", (err) => {
-                    error = err;
-                    done = true;
-                    if (resolveNext) {
-                        resolveNext();
-                        resolveNext = null;
+                // Parse the NDJSON output line by line and yield each event
+                const lines = stdout.trim().split("\n");
+                for (const line of lines) {
+                    if (!line.trim())
+                        continue;
+                    try {
+                        yield JSON.parse(line);
                     }
-                });
-                child.on("close", () => {
-                    done = true;
-                    if (resolveNext) {
-                        resolveNext();
-                        resolveNext = null;
+                    catch {
+                        // Skip non-JSON lines
                     }
-                });
-                return {
-                    async next() {
-                        while (lineBuffer.length === 0 && !done) {
-                            await new Promise((resolve) => { resolveNext = resolve; });
-                        }
-                        if (error)
-                            throw error;
-                        if (lineBuffer.length > 0) {
-                            return { value: lineBuffer.shift(), done: false };
-                        }
-                        return { value: undefined, done: true };
-                    },
-                };
+                }
             },
         };
     };

package/dist/server/index.js

@@ -114,7 +114,7 @@ export async function startApiServer(opts = {}) {
         }
         // GET / — server info
         if (req.method === "GET" && path === "/") {
-            jsonResponse(res, 200, { name: "otterly", version: "0.3.3", playground: "/playground" });
+            jsonResponse(res, 200, { name: "otterly", version: "0.3.4", playground: "/playground" });
             return;
         }
         // ── POST routes: auth → rate limit → circuit breaker → queue ──

package/dist/server/playground.js

@@ -1335,7 +1335,7 @@ function playgroundHTML() {
       <div class="header-left">
         <span class="logo">\u{1F9A6}</span>
         <span class="logo-text">otterly</span>
-        <span class="version-badge">v0.3.1</span>
+        <span class="version-badge">v0.3.4</span>
       </div>
       <div class="header-center">
         <nav class="nav">

package/dist/server/routes-native.js

@@ -5,7 +5,7 @@ import { AgentError } from "../errors.js";
 import { apiSessions } from "./session-store.js";
 import { errorToHttpStatus } from "./openai-compat.js";
 import { logError } from "./logger.js";
-const PKG_VERSION = "0.3.3";
+const PKG_VERSION = "0.3.4";
 /**
  * GET /api/status — health check with queue and circuit breaker stats
  */

package/dist/server/swagger.js

@@ -3,7 +3,7 @@ export const openApiSpec = {
     openapi: "3.0.3",
     info: {
         title: "Otterly API",
-        version: "0.3.3",
+        version: "0.3.4",
         description: "Local inference server with OpenAI-compatible and native endpoints. " +
             "WebSocket available at ws://localhost:{port}/ws for interactive sessions.",
     },
@@ -21,7 +21,7 @@ export const openApiSpec = {
                                     type: "object",
                                     properties: {
                                         status: { type: "string", example: "ok" },
-                                        version: { type: "string", example: "0.3.3" },
+                                        version: { type: "string", example: "0.3.4" },
                                         activeSessions: { type: "integer" },
                                         queue: {
                                             type: "object",
@@ -67,7 +67,7 @@ export const openApiSpec = {
                                     type: "object",
                                     properties: {
                                         name: { type: "string", example: "otterly" },
-                                        version: { type: "string", example: "0.3.3" },
+                                        version: { type: "string", example: "0.3.4" },
                                         playground: { type: "string", example: "/playground" },
                                     },
                                     required: ["name", "version", "playground"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "otterly",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Local AI inference for your apps. Use Claude Code instead of paying for API tokens.",
   "type": "module",
   "main": "dist/index.js",