@levistudio/redline 0.3.0 → 0.4.1

package/src/cli.ts

@@ -45,24 +45,25 @@ preflightDependencies();
 // Dynamic imports so preflight runs before module resolution pulls in third-party deps.
 const { createServer } = await import("./server");
 const { resolve } = await import("./resolve");
+const {
+  getAgentProvider,
+  invalidProviderMessage,
+  parseAgentProviderId,
+  resolveProviderId,
+} = await import("./agentProvider");
 
-// Verify the `claude` CLI is reachable before we start, so first-run users
-// without Claude Code installed get a clear message instead of a silent agent
-// crash later (the agent process shells out to `claude -p`; without it, replies
-// fail and errors land in `.review/errors.log` where nobody looks).
-//
-// Resolution mirrors the runtime: prefer CLAUDE_CODE_EXECPATH (used by tests
-// and advanced setups), then look for `claude` on PATH.
-function preflightClaudeCli() {
-  const exec = process.env.CLAUDE_CODE_EXECPATH;
-  if (exec && existsSync(exec)) return;
-  if (Bun.which("claude")) return;
-  console.error(
-    "\n[redline] Could not find the `claude` CLI on PATH.\n" +
-    "Redline shells out to Claude Code for agent replies and revisions.\n" +
-    "Install it from https://claude.com/claude-code and re-run.\n"
-  );
-  process.exit(1);
+function argValue(args: string[], flag: string): string | undefined {
+  const idx = args.indexOf(flag);
+  return idx !== -1 ? args[idx + 1] : undefined;
+}
+
+function selectProvider(args: string[]) {
+  const raw = argValue(args, "--agent") ?? process.env.REDLINE_AGENT;
+  if (raw && !parseAgentProviderId(raw)) {
+    console.error(invalidProviderMessage(raw));
+    process.exit(1);
+  }
+  return getAgentProvider(resolveProviderId(raw));
 }
 
 // Walk up from `start` looking for a git root (a `.git` directory or file —
@@ -100,11 +101,33 @@ function maybePrintGitignoreHint(filePath: string) {
 
 const args = process.argv.slice(2);
 
+if (args[0] === "--version" || args[0] === "-v") {
+  const pkgPath = path.resolve(import.meta.dir, "..", "package.json");
+  try {
+    const pkg = JSON.parse(readFileSync(pkgPath, "utf8")) as { version?: string };
+    console.log(pkg.version ?? "unknown");
+  } catch {
+    console.log("unknown");
+  }
+  process.exit(0);
+}
+
+// redline install-skill [--agent claude|codex|both]
+if (args[0] === "install-skill") {
+  const script = path.resolve(import.meta.dir, "..", "scripts", "install-skill.sh");
+  if (!existsSync(script)) {
+    console.error(`Install script not found: ${script}`);
+    process.exit(1);
+  }
+  const result = spawnSync("bash", [script, ...args.slice(1)], { stdio: "inherit" });
+  process.exit(result.status ?? 1);
+}
+
 // redline resolve <file> [--model <id>]
 if (args[0] === "resolve") {
   const filePath = args[1];
   if (!filePath) {
-    console.error("Usage: redline resolve <file.md> [--model <model-id>]");
+    console.error("Usage: redline resolve <file.md> [--model <model-id>] [--agent claude|codex]");
     process.exit(1);
   }
   const resolved = path.resolve(filePath);
@@ -112,15 +135,20 @@ if (args[0] === "resolve") {
     console.error(`File not found: ${resolved}`);
     process.exit(1);
   }
-  const modelFlag = args.indexOf("--model");
-  const model = modelFlag !== -1 ? args[modelFlag + 1] : undefined;
-  preflightClaudeCli();
-  resolve(resolved, { model });
+  const model = argValue(args, "--model");
+  const provider = selectProvider(args);
+  try {
+    provider.preflight();
+  } catch (e) {
+    console.error(e instanceof Error ? e.message : String(e));
+    process.exit(1);
+  }
+  resolve(resolved, { model, agentProvider: provider.id });
 } else {
   // redline <file>  — open review reader
   const filePath = args[0];
   if (!filePath) {
-    console.error("Usage: redline <file.md>");
+    console.error("Usage: redline <file.md>\n       redline resolve <file.md> [--model <model-id>] [--agent claude|codex]\n       redline install-skill [--agent claude|codex|both]");
     process.exit(1);
   }
   const resolved = path.resolve(filePath);
@@ -129,14 +157,21 @@ if (args[0] === "resolve") {
     process.exit(1);
   }
   const noAgent = args.includes("--no-agent");
+  const provider = selectProvider(args);
 
   // Manual annotation mode skips both the preflight and the agent spawn —
-  // the user just wants inline comments without a Claude conversation, so
-  // requiring claude on PATH would be a hostile gate.
-  if (!noAgent) preflightClaudeCli();
+  // the user just wants inline comments without an agent conversation, so
+  // requiring a provider CLI on PATH would be a hostile gate.
+  if (!noAgent) {
+    try {
+      provider.preflight();
+    } catch (e) {
+      console.error(e instanceof Error ? e.message : String(e));
+      process.exit(1);
+    }
+  }
 
-  const contextFlag = args.indexOf("--context");
-  const context = contextFlag !== -1 ? args[contextFlag + 1] : undefined;
+  const context = argValue(args, "--context");
   const autoOpen = args.includes("--open");
 
   const resultFile = path.join(path.dirname(resolved), ".review", path.basename(resolved) + ".result");
@@ -164,7 +199,7 @@ if (args[0] === "resolve") {
   // caller can pin the token if it needs to.
   const csrfToken = process.env.REDLINE_TOKEN ?? crypto.randomUUID();
 
-  const app = createServer(resolved, { context, csrfToken, noAgent });
+  const app = createServer(resolved, { context, csrfToken, noAgent, agentName: provider.displayName });
   const server = Bun.serve({ port: 0, hostname: "127.0.0.1", fetch: app.fetch, idleTimeout: 0 });
   const url = `http://localhost:${server.port}`;
 
@@ -182,6 +217,7 @@ if (args[0] === "resolve") {
       started_at: new Date().toISOString(),
       pid: process.pid,
       csrf_token: csrfToken,
+      agent_provider: provider.id,
     }, null, 2));
   } catch (e) {
     console.error("[redline] Failed to write startup file:", e);
@@ -194,14 +230,14 @@ if (args[0] === "resolve") {
   console.log(`  URL:  ${url}`);
   console.log(`  Result: ${resultFile}`);
   console.log(`${bar}`);
-  if (noAgent) console.log(`  Mode: manual annotation (--no-agent — no Claude replies, no revision pass)`);
+  if (noAgent) console.log(`  Mode: manual annotation (--no-agent — no ${provider.displayName} replies, no revision pass)`);
   if (!autoOpen) console.log(`\n  → cmd-click the URL when you're ready to review\n`);
   else console.log("");
 
   maybePrintGitignoreHint(resolved);
 
   // Auto-restart the agent if it dies unexpectedly (harness reaping, OOM,
-  // a transient claude-CLI auth blip, etc). Capped to MAX_RESTARTS within
+  // a transient provider-CLI auth blip, etc). Capped to MAX_RESTARTS within
   // RESTART_WINDOW_MS so a permanently-broken environment doesn't loop forever.
   const RESTART_WINDOW_MS = 60_000;
   // Cap is overrideable via env so integration tests can exercise the
@@ -216,7 +252,7 @@ if (args[0] === "resolve") {
       [process.execPath, "run", path.join(import.meta.dir, "agent.ts"), resolved],
       {
         stdout: "inherit", stderr: "inherit", stdin: "ignore",
-        env: { ...process.env, REDLINE_PORT: String(server.port), REDLINE_TOKEN: csrfToken },
+        env: { ...process.env, REDLINE_PORT: String(server.port), REDLINE_TOKEN: csrfToken, REDLINE_AGENT: provider.id },
       }
     );
     agentProc = proc;

package/src/client/sse.ts

@@ -192,7 +192,7 @@ export function initSSE(): void {
     });
     on("finished", () => {
       document.body.innerHTML =
-        '<div style="display:flex;align-items:center;justify-content:center;height:100vh;font-family:system-ui;flex-direction:column;gap:16px;color:#374151"><div style="font-size:48px">\u2713</div><div style="font-size:20px;font-weight:600">Review complete</div><div style="color:#6b7280">You can close this tab and continue in Claude Code.</div></div>';
+        '<div style="display:flex;align-items:center;justify-content:center;height:100vh;font-family:system-ui;flex-direction:column;gap:16px;color:#374151"><div style="font-size:48px">\u2713</div><div style="font-size:20px;font-weight:600">Review complete</div><div style="color:#6b7280">You can close this tab and continue in your agent environment.</div></div>';
     });
     es.onerror = () => {
       es.close();

package/src/pickModel.ts

@@ -1,12 +1,14 @@
-// Heuristic for picking which Claude model to use based on the human's message.
-// Short / simple → Haiku. Long, question, or "involved" keyword → Sonnet.
+// Heuristic for picking how much model capacity to use based on the human's
+// message. Providers map these tiers to concrete model ids.
 //
 // Used in two places:
 //   - agent.ts picks per-reply, looking at the last human message in the thread
 //   - resolve.ts picks per-revision, scanning every human message across settled comments
 
-export const FAST_MODEL = "claude-haiku-4-5-20251001";
-export const SMART_MODEL = "claude-sonnet-4-6";
+export type ModelTier = "fast" | "smart";
+
+export const FAST_MODEL: ModelTier = "fast";
+export const SMART_MODEL: ModelTier = "smart";
 
 export const REPLY_INVOLVED_PATTERNS =
   /\b(what|why|how|which|who|suggest|suggestion|alternative|option|idea|propose|explain|think|consider|recommend|help|could|would|should)\b/i;

package/src/promptEnvelope.ts

@@ -1,5 +1,5 @@
 // Per-prompt envelope around user-controlled strings before they reach
-// `claude -p`. Same delimiter-over-JSON principle the agent reply path
+// the selected local agent provider. Same delimiter-over-JSON principle the agent reply path
 // already uses (see retro entry 2026-05-07 — "delimiter envelope for agent
 // replies"), applied to the *input* side: comment text, document body,
 // thread messages.

package/src/resolve.ts

@@ -5,11 +5,13 @@ import type { Round, Comment } from "./sidecar";
 import { pickRevisionModel } from "./pickModel";
 import { newEnvelope } from "./promptEnvelope";
 import { contextBlock } from "./contextBlock";
+import { getAgentProvider, resolveProviderId, type AgentProviderId } from "./agentProvider";
 
 const serverBase = () => `http://localhost:${process.env.REDLINE_PORT ?? "3000"}`;
 const csrfHeader = (): Record<string, string> => ({ "X-Redline-Token": process.env.REDLINE_TOKEN ?? "" });
 
-export async function resolve(filePath: string, options: { model?: string } = {}) {
+export async function resolve(filePath: string, options: { model?: string; agentProvider?: AgentProviderId } = {}) {
+  const provider = getAgentProvider(options.agentProvider ?? resolveProviderId());
   const model = options.model ?? null;
   const sidecar = await loadSidecar(filePath);
 
@@ -20,7 +22,7 @@ export async function resolve(filePath: string, options: { model?: string } = {}
   }
   const round: Round = resolvedRounds[resolvedRounds.length - 1];
   const settled = round.comments.filter((c) => c.resolved);
-  const chosenModel = model ?? pickRevisionModel(settled);
+  const chosenModel = model ?? provider.modelForTier(pickRevisionModel(settled));
 
   const docText = await readFile(filePath, "utf-8");
 
@@ -89,9 +91,6 @@ export async function resolve(filePath: string, options: { model?: string } = {}
     contextBlock(sidecar.context, env) +
     `<comments-to-apply>\n${commentsBlock}\n</comments-to-apply>${priorChangesBlock}\n\n<document>\n${env.wrap("document", docText)}\n</document>`;
 
-  // Call the claude CLI (inherits auth from the user's Claude Code session — no API key needed)
-  const cliBin = process.env.CLAUDE_CODE_EXECPATH ?? "claude";
-
   const broadcastChunk = (text: string, kind: "thinking" | "text") => {
     fetch(`${serverBase()}/api/revision-chunk`, {
       method: "POST",
@@ -109,7 +108,7 @@ export async function resolve(filePath: string, options: { model?: string } = {}
   const fail = async (reason: string) => {
     await logRevisionFailure(filePath, {
       reason,
-      model: chosenModel,
+      model: `${provider.id}/${chosenModel}`,
       exitCode,
       stderr: stderrText.trim(),
       stdoutSample: revised.slice(0, 2000),
@@ -128,72 +127,27 @@ export async function resolve(filePath: string, options: { model?: string } = {}
   for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
     console.log(
       attempt === 1
-        ? `Revising with ${chosenModel}...\n`
-        : `\nRetrying revision with ${chosenModel} (attempt ${attempt}/${MAX_ATTEMPTS})...\n`
+        ? `Revising with ${provider.id}/${chosenModel}...\n`
+        : `\nRetrying revision with ${provider.id}/${chosenModel} (attempt ${attempt}/${MAX_ATTEMPTS})...\n`
     );
     console.log("─".repeat(60));
-    const revisionStartedAt = Date.now();
-
-    const proc = Bun.spawn(
-      [cliBin, "-p", "--system-prompt", systemPrompt, "--model", chosenModel,
-       "--output-format", "stream-json", "--include-partial-messages", "--verbose"],
-      { stdin: "pipe", stdout: "pipe", stderr: "pipe" }
-    );
-
-    proc.stdin.write(userMessage);
-    proc.stdin.end();
-
-    // Drain stderr concurrently so we can include it in any error report.
-    stderrText = "";
-    const stderrDone = (async () => {
-      const r = proc.stderr.getReader();
-      const dec = new TextDecoder();
-      while (true) {
-        const { done, value } = await r.read();
-        if (done) break;
-        const chunk = dec.decode(value);
-        stderrText += chunk;
-        process.stderr.write(chunk);
-      }
-    })();
-
-    revised = "";
-    let buffer = "";
-    const reader = proc.stdout.getReader();
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) break;
-      buffer += new TextDecoder().decode(value);
-      const lines = buffer.split("\n");
-      buffer = lines.pop() ?? "";
-      for (const line of lines) {
-        if (!line.trim()) continue;
-        try {
-          const obj = JSON.parse(line);
-          if (obj.type === "stream_event" && obj.event?.type === "content_block_delta") {
-            const delta = obj.event.delta;
-            if (delta?.type === "text_delta" && delta.text) {
-              revised += delta.text;
-              process.stdout.write(delta.text);
-              broadcastChunk(delta.text, "text");
-            } else if (delta?.type === "thinking_delta" && delta.thinking) {
-              broadcastChunk(delta.thinking, "thinking");
-            }
-          }
-        } catch { /* malformed JSON line, skip */ }
-      }
-    }
-
-    exitCode = await proc.exited;
-    await stderrDone;
-    const revisionDurationMs = Date.now() - revisionStartedAt;
+    const run = await provider.runRevision({
+      systemPrompt,
+      userMessage,
+      model: chosenModel,
+      cwd: process.cwd(),
+      onChunk: broadcastChunk,
+    });
+    revised = run.revised;
+    stderrText = run.stderr;
+    exitCode = run.exitCode;
     console.log("\n" + "─".repeat(60));
-    console.log(`Model: ${chosenModel}  ·  Duration: ${(revisionDurationMs / 1000).toFixed(1)}s  ·  Exit: ${exitCode}`);
+    console.log(`Model: ${provider.id}/${chosenModel}  ·  Duration: ${(run.durationMs / 1000).toFixed(1)}s  ·  Exit: ${exitCode}`);
     console.log("─".repeat(60) + "\n");
 
     // A CLI crash is not retryable — fail immediately.
     if (exitCode !== 0) {
-      await fail(`claude CLI exited with code ${exitCode}${stderrText.trim() ? ` — ${stderrText.trim().split("\n").slice(-3).join(" | ")}` : ""}`);
+      await fail(`${provider.id} CLI exited with code ${exitCode}${stderrText.trim() ? ` — ${stderrText.trim().split("\n").slice(-3).join(" | ")}` : ""}`);
     }
 
     const result = validateRevision(revised, docText, settled);

package/src/server-page.ts

@@ -17,7 +17,8 @@ function pageTemplate(
   context?: string,
   readOnly = false,
   csrfToken = "",
-  noAgent = false
+  noAgent = false,
+  agentName = "selected local"
 ): string {
   const commentsJson = JSON.stringify(comments);
 
@@ -51,7 +52,7 @@ function pageTemplate(
         </span>
         <div class="header-actions">
           <span id="agent-status" class="agent-status" hidden></span>
-          ${noAgent ? `<span class="manual-mode-pill" title="Started with --no-agent. No Claude replies, no revision pass.">Manual mode</span>` : ''}
+          ${noAgent ? `<span class="manual-mode-pill" title="Started with --no-agent. No ${escapeHtml(agentName)} replies, no revision pass.">Manual mode</span>` : ''}
           ${!readOnly && totalRounds > 1 ? `<button class="btn-toggle-diff" id="btn-toggle-diff" type="button" aria-pressed="false">Show changes</button>` : ''}
           ${readOnly
             ? `<span style="font-size:13px;color:var(--text-muted);font-style:italic">Read-only — <a href="/" style="color:var(--accent)">back to current</a></span>`
@@ -65,7 +66,7 @@ function pageTemplate(
       </div>` : ''}
       ${!readOnly ? `<div class="first-run-banner" id="first-run-banner" hidden>
         <span class="first-run-icon" aria-hidden="true">⚠</span>
-        <span class="first-run-text">Redline sends document and comment text to your local Claude Code agent. Use trusted docs.</span>
+        <span class="first-run-text">Redline sends document and comment text to your ${escapeHtml(agentName)} agent. Use trusted docs.</span>
         <button class="first-run-dismiss" id="first-run-dismiss" aria-label="Dismiss">Got it</button>
       </div>` : ''}
       <article class="prose" id="prose">
@@ -97,7 +98,7 @@ function pageTemplate(
     </div>
   </div>
   <div id="error-banner" style="display:none;position:fixed;bottom:24px;left:50%;transform:translateX(-50%);background:#b71c1c;color:white;padding:12px 24px;border-radius:6px;font-size:14px;font-weight:500;box-shadow:0 1px 4px rgba(0,0,0,0.08);z-index:999;white-space:nowrap;"></div>
-  <div id="session-ended-banner" style="display:none;position:fixed;top:0;left:0;right:0;background:#92400e;color:white;padding:10px 24px;font-size:14px;font-weight:500;text-align:center;z-index:1000;box-shadow:0 1px 4px rgba(0,0,0,0.15);">Review session ended — the redline server is no longer running. Your changes up to this point are saved; close this tab and continue in Claude Code.</div>
+  <div id="session-ended-banner" style="display:none;position:fixed;top:0;left:0;right:0;background:#92400e;color:white;padding:10px 24px;font-size:14px;font-weight:500;text-align:center;z-index:1000;box-shadow:0 1px 4px rgba(0,0,0,0.15);">Review session ended — the redline server is no longer running. Your changes up to this point are saved; close this tab and continue in your agent environment.</div>
 
   <script>
     window.__REDLINE__ = {

package/src/server.ts

@@ -50,7 +50,7 @@ function getClientBundle(): Promise<string> {
 
 export function createServer(
   filePath: string,
-  opts: { context?: string; csrfToken?: string; noAgent?: boolean } = {}
+  opts: { context?: string; csrfToken?: string; noAgent?: boolean; agentName?: string } = {}
 ) {
   const app = new Hono();
   const fileName = path.basename(filePath);
@@ -275,7 +275,7 @@ export function createServer(
     const agentRepliedAt = latestRound?.agent_replied_at ?? null;
     const roundNumber = latestRound?.round ?? 1;
     const totalRounds = sidecar.rounds.length;
-    return c.html(pageTemplate(fileName, html, serializeCommentsForClient(comments), roundResolved, agentRepliedAt, roundNumber, totalRounds, sidecar.context, false, csrfToken, opts.noAgent ?? false));
+    return c.html(pageTemplate(fileName, html, serializeCommentsForClient(comments), roundResolved, agentRepliedAt, roundNumber, totalRounds, sidecar.context, false, csrfToken, opts.noAgent ?? false, opts.agentName));
   });
 
   // Add a comment to the active round
@@ -430,7 +430,7 @@ export function createServer(
   });
 
   // CLI signals the agent subprocess is gone for good (restart cap exhausted,
-  // missing claude CLI, etc). Surfaces a small persistent indicator in the
+  // missing provider CLI, etc). Surfaces a small persistent indicator in the
   // header so the user knows replies aren't coming and can restart redline.
   // No paired "agent-available" event — recovery requires a restart, so the
   // indicator stays until the page reloads.
@@ -588,7 +588,8 @@ export function createServer(
       sidecar.context,
       true,   // readOnly
       csrfToken,
-      opts.noAgent ?? false
+      opts.noAgent ?? false,
+      opts.agentName
     ));
   });
 
@@ -681,5 +682,3 @@ export function createServer(
     onRevisionRecovered(cb: () => void) { onRevisionRecoveredCallback = cb; },
   };
 }
-
-