@wrenautomation/raven 0.3.0 → 0.7.0

package/dist/app/cli.js

@@ -2,20 +2,21 @@
 /**
  * `raven`: the planner from a shell. `plan` turns an ask into queries, `triage` marks hits read
  * or skip, `review` picks the edge after a round, `plans` prints a default plan file to tune.
- * The model is a command that reads the prompt on stdin and prints the answer: `claude -p` by
- * default (RAVEN_MODEL or --model to change it), so Claude Code is the planner's model in any
- * terminal. Everything is JSON on stdout.
+ * The model is a spec from `@wrenautomation/models` (`claude-code` by default, `anthropic:sonnet`,
+ * `gateway`...) or any command that reads the prompt on stdin and prints the answer; RAVEN_MODEL
+ * or --model changes it. Everything is JSON on stdout.
  */
 import { readFileSync } from "node:fs";
 import { userInfo } from "node:os";
+import { commandModel } from "@wrenautomation/models/command";
+import { modelFromSpec, SPEC_NAMES } from "@wrenautomation/models/spec";
 import { Command } from "commander";
-import { commandModel } from "../model.js";
 import { plan } from "../plan.js";
 import { defaultPlanFile, PLAN_KINDS } from "../plans/index.js";
 import { review } from "../review.js";
 import { triage } from "../triage.js";
 import { AskKind, HitView, Plan, PlanFile, Round, YieldRow, z } from "../types.js";
-const DEFAULT_MODEL = "claude -p --output-format json";
+const DEFAULT_MODEL = "claude-code";
 const readJson = (path, shape) => shape.parse(JSON.parse(readFileSync(path, "utf8")));
 const print = (x) => console.log(JSON.stringify(x, null, 2));
 const more = (v, prev) => [...prev, v];
@@ -27,11 +28,17 @@ const who = () => {
         return "human";
     }
 };
-const modelOf = (o) => o.model === false
-    ? null
-    : commandModel(o.model, o.model === DEFAULT_MODEL ? "claude-code" : o.model);
+/** A spec name (`claude-code`, `anthropic:sonnet`) goes to models; anything else is a command. */
+const modelOf = (o) => {
+    if (o.model === false)
+        return null;
+    const name = o.model.split(":")[0] ?? "";
+    return SPEC_NAMES.includes(name)
+        ? modelFromSpec(o.model)
+        : commandModel(o.model);
+};
 const withModel = (c) => c
-    .option("--model <command>", "a command: prompt on stdin, answer on stdout", process.env.RAVEN_MODEL ?? DEFAULT_MODEL)
+    .option("--model <spec>", "a models spec (claude-code, anthropic:sonnet, gateway) or a command: prompt on stdin, answer on stdout", process.env.RAVEN_MODEL ?? DEFAULT_MODEL)
     .option("--no-model", "no model call: only what is given by hand");
 const program = new Command().name("raven").description("ask in, plan out");
 withModel(program

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { type Answer, commandModel, fill, type Model, parseAnswer, readOutput, scriptedModel, type Usage, } from "./model.js";
+export { fill } from "./model.js";
 export { mergeProposals, type PlanInput, plan, propose, proposePrompt } from "./plan.js";
 export { defaultPlanFile, PLAN_KINDS } from "./plans/index.js";
 export { renderHits, renderYield } from "./render.js";

package/dist/index.js

@@ -1,4 +1,4 @@
-export { commandModel, fill, parseAnswer, readOutput, scriptedModel, } from "./model.js";
+export { fill } from "./model.js";
 export { mergeProposals, plan, propose, proposePrompt } from "./plan.js";
 export { defaultPlanFile, PLAN_KINDS } from "./plans/index.js";
 export { renderHits, renderYield } from "./render.js";

package/dist/model.d.ts

@@ -1,39 +1,6 @@
-import type { ZodType } from "zod";
-/** What one model call cost, as far as the model says. All optional: a shell command may say nothing. */
-export interface Usage {
-    /** Tokens in and out. */
-    input?: number;
-    output?: number;
-    usd?: number;
-}
-/** A parsed answer and what it cost: the ledger keeps both. */
-export interface Answer<T> {
-    value: T;
-    usage?: Usage;
-}
-export interface Model {
-    /** What goes in `by` on the records this model writes. */
-    id: string;
-    ask<T>(prompt: string, shape: ZodType<T>): Promise<Answer<T>>;
-}
-/** `{name}` marks filled in one pass; a `{word}` with no value stays as text. */
-export declare const fill: (template: string, values: Readonly<Record<string, string>>) => string;
-/**
- * The first JSON object of the shape in a model's text, found by brace balance: fences, prose
- * and stray braces around it are passed over. Throws with the model's text when nothing parses.
- */
-export declare function parseAnswer<T>(text: string, shape: ZodType<T>): T;
-/** A command's stdout as an answer: the envelope's text and usage when it printed one, else the text. */
-export declare function readOutput(stdout: string): {
-    text: string;
-    usage?: Usage;
-};
 /**
- * A model that is a shell command: the prompt on stdin, the answer on stdout. When stdout is
- * Claude Code's JSON envelope (`claude -p --output-format json`) the usage comes with it.
- * A command that says nothing for `timeoutMs` (3 minutes) is killed and the ask fails with
- * why, so a hung model never hangs the run.
+ * Raven never picks a model: a caller hands in one `Model` from `@wrenautomation/models`, and its
+ * id goes on every record raven writes. This file keeps only the prompt template fill.
  */
-export declare function commandModel(command: string, id?: string, timeoutMs?: number): Model;
-/** A model that answers from a fixed list, in order: tests and dry runs. */
-export declare function scriptedModel(answers: unknown[], id?: string): Model;
+/** `{name}` marks filled in one pass; a `{word}` with no value stays as text. */
+export declare const fill: (template: string, values: Readonly<Record<string, string>>) => string;

package/dist/model.js

@@ -1,126 +1,7 @@
 /**
- * The model seam. Raven never picks a model: a caller hands in one `Model`, a function from a
- * prompt and an answer shape to a parsed answer with what it cost, and its id goes on every
- * record it writes. In a terminal the model is a command that reads the prompt on stdin and
- * prints the answer (`claude -p --output-format json` by default); in wren it wraps the LLM
- * client.
+ * Raven never picks a model: a caller hands in one `Model` from `@wrenautomation/models`, and its
+ * id goes on every record raven writes. This file keeps only the prompt template fill.
  */
-import { spawn } from "node:child_process";
 /** `{name}` marks filled in one pass; a `{word}` with no value stays as text. */
 export const fill = (template, values) => template.replace(/\{(\w+)\}/g, (mark, name) => values[name] ?? mark);
-/** Every balanced `{...}` in a text, by start position: an outer object comes before its inner ones. */
-function* objects(text) {
-    for (let start = text.indexOf("{"); start >= 0; start = text.indexOf("{", start + 1)) {
-        let depth = 0;
-        let inString = false;
-        let escaped = false;
-        for (let i = start; i < text.length; i++) {
-            const c = text[i];
-            if (inString) {
-                if (escaped)
-                    escaped = false;
-                else if (c === "\\")
-                    escaped = true;
-                else if (c === '"')
-                    inString = false;
-            }
-            else if (c === '"')
-                inString = true;
-            else if (c === "{")
-                depth++;
-            else if (c === "}" && --depth === 0) {
-                yield text.slice(start, i + 1);
-                break;
-            }
-        }
-    }
-}
-/**
- * The first JSON object of the shape in a model's text, found by brace balance: fences, prose
- * and stray braces around it are passed over. Throws with the model's text when nothing parses.
- */
-export function parseAnswer(text, shape) {
-    for (const candidate of objects(text)) {
-        try {
-            const out = shape.safeParse(JSON.parse(candidate));
-            if (out.success)
-                return out.data;
-        }
-        catch { }
-    }
-    throw new Error(`no answer of the expected shape in: ${text.slice(0, 400)}`);
-}
-const isEnvelope = (x) => typeof x === "object" && x !== null && typeof x.result === "string";
-/** A command's stdout as an answer: the envelope's text and usage when it printed one, else the text. */
-export function readOutput(stdout) {
-    try {
-        const parsed = JSON.parse(stdout);
-        if (isEnvelope(parsed)) {
-            const usage = {};
-            if (parsed.usage?.input_tokens !== undefined)
-                usage.input = parsed.usage.input_tokens;
-            if (parsed.usage?.output_tokens !== undefined)
-                usage.output = parsed.usage.output_tokens;
-            if (parsed.total_cost_usd !== undefined)
-                usage.usd = parsed.total_cost_usd;
-            return { text: parsed.result, usage };
-        }
-    }
-    catch { }
-    return { text: stdout };
-}
-/**
- * A model that is a shell command: the prompt on stdin, the answer on stdout. When stdout is
- * Claude Code's JSON envelope (`claude -p --output-format json`) the usage comes with it.
- * A command that says nothing for `timeoutMs` (3 minutes) is killed and the ask fails with
- * why, so a hung model never hangs the run.
- */
-export function commandModel(command, id = command, timeoutMs = 180_000) {
-    return {
-        id,
-        ask: (prompt, shape) => new Promise((resolve, reject) => {
-            const child = spawn(command, { shell: true, stdio: ["pipe", "pipe", "inherit"] });
-            const out = [];
-            let timedOut = false;
-            const timer = setTimeout(() => {
-                timedOut = true;
-                child.kill();
-            }, timeoutMs);
-            child.stdout.on("data", (b) => out.push(b));
-            child.on("error", (e) => {
-                clearTimeout(timer);
-                reject(e);
-            });
-            child.on("close", (code) => {
-                clearTimeout(timer);
-                const stdout = Buffer.concat(out).toString("utf8");
-                if (timedOut)
-                    return reject(new Error(`${command}: no answer in ${Math.round(timeoutMs / 1000)}s`));
-                if (code !== 0)
-                    return reject(new Error(`${command} exited ${code}: ${stdout.slice(0, 400)}`));
-                try {
-                    const { text, usage } = readOutput(stdout);
-                    resolve({ value: parseAnswer(text, shape), ...(usage ? { usage } : {}) });
-                }
-                catch (e) {
-                    reject(e);
-                }
-            });
-            child.stdin.end(prompt);
-        }),
-    };
-}
-/** A model that answers from a fixed list, in order: tests and dry runs. */
-export function scriptedModel(answers, id = "scripted") {
-    let i = 0;
-    return {
-        id,
-        ask: async (_prompt, shape) => {
-            const a = answers[i++];
-            if (a === undefined)
-                throw new Error(`scripted model has no answer ${i}`);
-            return { value: shape.parse(a) };
-        },
-    };
-}
 //# sourceMappingURL=model.js.map

package/dist/plan.d.ts

@@ -3,7 +3,7 @@
  * or a second model are others, and all merge the same way. Human queries come first and never
  * count against the budget: someone chose them.
  */
-import { type Model } from "./model.js";
+import type { Model } from "@wrenautomation/models";
 import { type Ask, type Plan, type PlanFile, type Proposal, type Query, type YieldRow } from "./types.js";
 export declare function proposePrompt(ask: Ask, planFile: PlanFile, yieldRows: readonly YieldRow[], now: Date): string;
 /** The model's proposal for an ask under a plan file. */

package/dist/plan.js

@@ -1,8 +1,3 @@
-/**
- * The plan step: proposals in, one plan out. The model is one proposer; a person, a plan file
- * or a second model are others, and all merge the same way. Human queries come first and never
- * count against the budget: someone chose them.
- */
 import { fill } from "./model.js";
 import { defaultPlanFile } from "./plans/index.js";
 import { lines, renderSteer, renderYield } from "./render.js";

package/dist/review.d.ts

@@ -3,7 +3,7 @@
  * rail, not a stop rule: when it is spent raven stops and says so; before that the model decides
  * and says why. The runner takes the edge; raven never loops.
  */
-import { type Model } from "./model.js";
+import type { Model } from "@wrenautomation/models";
 import { type Edge, type PlanFile, type Round } from "./types.js";
 export declare function reviewPrompt(round: Round, planFile: PlanFile): string;
 export declare function review(round: Round, model: Model, options?: {

package/dist/review.js

@@ -1,8 +1,3 @@
-/**
- * After a round: stop, go again from plan, or back to one step. The round budget is a guard
- * rail, not a stop rule: when it is spent raven stops and says so; before that the model decides
- * and says why. The runner takes the edge; raven never loops.
- */
 import { fill } from "./model.js";
 import { defaultPlanFile } from "./plans/index.js";
 import { lines, renderSteer } from "./render.js";

package/dist/triage.d.ts

@@ -4,7 +4,7 @@
  * caps it; a hit the model did not name is a skip, written down as one. The model writes a why
  * on a read only: a skip's why is fixed text, so the answer pays for the reads alone.
  */
-import { type Model } from "./model.js";
+import type { Model } from "@wrenautomation/models";
 import { HitView, type HitViewIn, type Plan, type PlanFile, type Triage, type YieldRow } from "./types.js";
 /** What a skip says: the model named it and passed. */
 export declare const SKIPPED = "skipped by the model";

package/dist/triage.js

@@ -1,9 +1,3 @@
-/**
- * The filter before the read: for each hit, read or skip, from what the hit shows for free.
- * Hits dedupe by url and keep every source that returned them. The model picks; the read budget
- * caps it; a hit the model did not name is a skip, written down as one. The model writes a why
- * on a read only: a skip's why is fixed text, so the answer pays for the reads alone.
- */
 import { fill } from "./model.js";
 import { defaultPlanFile } from "./plans/index.js";
 import { lines, renderHits, renderSteer, renderYield } from "./render.js";

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@wrenautomation/raven",
-  "version": "0.3.0",
+  "version": "0.7.0",
   "description": "Ask in, plan out. The planner of Wren's research engine: typed queries with who proposed them and why, proposals merged into one plan under a plan file per ask kind, read-or-skip on hits, and the edge to take after a round. Pure functions and prompts; the model is injected.",
   "license": "PolyForm-Shield-1.0.0",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/wrenautomation/raven.git"
+    "url": "git+https://github.com/wrenautomation/engine.git",
+    "directory": "packages/raven"
   },
   "type": "module",
   "files": [
@@ -28,25 +29,13 @@
   "engines": {
     "node": ">=24"
   },
-  "packageManager": "pnpm@9.15.0",
-  "scripts": {
-    "prepare": "git config core.hooksPath .githooks || true",
-    "lint": "biome check --error-on-warnings .",
-    "lint:fix": "biome check --write .",
-    "typecheck": "tsc --noEmit",
-    "build": "rm -rf dist && tsc && chmod +x dist/app/cli.js",
-    "test": "vitest run",
-    "gates": "lockf -t 900 /tmp/wren_automation-checks.lock sh -c 'pnpm lint && pnpm typecheck && pnpm test'",
-    "prepublishOnly": "pnpm build"
-  },
   "dependencies": {
     "commander": "15.0.0",
-    "zod": "4.6.5"
+    "zod": "4.6.5",
+    "@wrenautomation/models": "0.7.0"
   },
-  "devDependencies": {
-    "@biomejs/biome": "2.5.14",
-    "@types/node": "22.20.3",
-    "typescript": "5.9.3",
-    "vitest": "5.0.1"
+  "scripts": {
+    "typecheck": "tsc --noEmit",
+    "build": "rm -rf dist && tsc && chmod +x dist/app/cli.js"
   }
-}
+}