otterly 0.3.1 → 0.3.3

package/dist/cli.js

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

package/dist/engine.js

@@ -1,18 +1,142 @@
+import { spawn } from "child_process";
+import { createInterface } from "readline";
 import { normalizeEvents, createEventContext } from "./events.js";
 import { classifyError, AgentError } from "./errors.js";
 import { wrapPermissionHandler } from "./permissions.js";
 import { Session } from "./session.js";
 let cachedQueryFn = null;
+let resolvedMode = null;
+/**
+ * Find the `claude` CLI binary. Returns the path or null.
+ */
+async function findClaudeCLI() {
+    const { execFileSync } = await import("child_process");
+    // Check common names: claude, claude-code
+    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;
+        }
+        catch {
+            // Try next
+        }
+    }
+    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.
+ */
+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;
+        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");
+                    });
+                }
+                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;
+                        }
+                    }
+                    catch {
+                        // Skip non-JSON lines (stderr leakage, etc.)
+                    }
+                });
+                child.on("error", (err) => {
+                    error = err;
+                    done = true;
+                    if (resolveNext) {
+                        resolveNext();
+                        resolveNext = null;
+                    }
+                });
+                child.on("close", () => {
+                    done = true;
+                    if (resolveNext) {
+                        resolveNext();
+                        resolveNext = null;
+                    }
+                });
+                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 };
+                    },
+                };
+            },
+        };
+    };
+}
 async function resolveSDK() {
     if (cachedQueryFn)
         return cachedQueryFn;
-    // Try the primary SDK first, then the alternative package name
+    // 1. Try the npm SDK packages
     for (const pkg of ["@anthropic-ai/claude-code", "@anthropic-ai/claude-agent-sdk"]) {
         try {
             const mod = await import(pkg);
             const fn = mod.query || mod.default?.query;
             if (typeof fn === "function") {
                 cachedQueryFn = fn;
+                resolvedMode = "sdk";
                 return cachedQueryFn;
             }
         }
@@ -20,7 +144,14 @@ async function resolveSDK() {
             // Try next
         }
     }
-    throw new AgentError("SDK_NOT_FOUND", "Could not find Claude Code SDK. Install it:\n  npm install @anthropic-ai/claude-code");
+    // 2. Fall back to the CLI binary (works regardless of install method)
+    const cliBin = await findClaudeCLI();
+    if (cliBin) {
+        cachedQueryFn = createCLIQueryFn(cliBin);
+        resolvedMode = "cli";
+        return cachedQueryFn;
+    }
+    throw new AgentError("SDK_NOT_FOUND", "Could not find Claude Code. Install it from https://docs.anthropic.com/en/docs/claude-code or:\n  npm install -g @anthropic-ai/claude-code");
 }
 export class ClaudeEngine {
     defaults;

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.1", playground: "/playground" });
+            jsonResponse(res, 200, { name: "otterly", version: "0.3.3", playground: "/playground" });
             return;
         }
         // ── POST routes: auth → rate limit → circuit breaker → queue ──