solrouter 0.4.4 → 0.5.0

package/bin/proxy.js

@@ -119,6 +119,26 @@ async function main() {
       return;
     }
 
+    case "install": {
+      const { install } = await import("../src/install.js");
+      const r = await install();
+      if (!r.ok) { console.error("Install failed:", r.error); process.exit(1); }
+      console.log(`\n✓ SolRouter installed as a background service on http://127.0.0.1:${r.port}`);
+      console.log(`  EVERY Claude Code session now routes through the proxy automatically —`);
+      console.log(`  no special window, no special command. Just open Claude Code.`);
+      console.log(`  (auto-starts at login, restarts on crash)\n`);
+      console.log(`  Heads up: all Claude Code now bills to your API key, not your Max subscription`);
+      console.log(`  — that's required to use a custom endpoint. Undo anytime:  solrouter uninstall\n`);
+      return;
+    }
+
+    case "uninstall": {
+      const { uninstall } = await import("../src/install.js");
+      uninstall();
+      console.log("✓ SolRouter uninstalled. Claude Code goes straight to Anthropic again.");
+      return;
+    }
+
     // `solrouter code [claude args...]` — the one-command path: start the proxy
     // in THIS process, then launch Claude Code already pointed at it, in the same
     // tab. When Claude Code exits, so does the proxy. (`claude` is the alias.)
@@ -136,6 +156,16 @@ async function main() {
       const passThru = rest.filter((a, i) =>
         !["--port", "--mode"].includes(a) && !["--port", "--mode"].includes(rest[i - 1]));
       const tool = process.env.SOLROUTER_TOOL || "claude";
+      // CRITICAL: Claude Code only routes to a custom ANTHROPIC_BASE_URL when an API
+      // key is present — otherwise a Max/Pro subscription silently bypasses the base
+      // URL and talks to Anthropic directly (so the proxy never sees the traffic).
+      // Force API-key mode by giving the child a key. The proxy's frontier leg uses
+      // its own configured key regardless, so this only needs to be non-empty.
+      const childKey = cfg.frontier.apiKey || process.env.ANTHROPIC_API_KEY || "sk-ant-solrouter-proxy";
+      if (!cfg.frontier.apiKey && !process.env.ANTHROPIC_API_KEY) {
+        console.warn("Warning: no Anthropic API key configured — Claude Code on a subscription may bypass the proxy.");
+        console.warn("Run `solrouter setup` and paste an API key so requests route through the proxy.\n");
+      }
       console.log(`\nLaunching ${tool} through the proxy (ANTHROPIC_BASE_URL=http://127.0.0.1:${cfg.port})…\n`);
       const child = spawn(tool, passThru, {
         stdio: "inherit",
@@ -143,6 +173,8 @@ async function main() {
           ...process.env,
           ANTHROPIC_BASE_URL: `http://127.0.0.1:${cfg.port}`,
           OPENAI_BASE_URL: `http://127.0.0.1:${cfg.port}/v1`,
+          ANTHROPIC_API_KEY: childKey,           // forces Claude Code to use the base URL
+          CLAUDE_CODE_USE_BEDROCK: "",
         },
       });
       child.on("error", e => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solrouter",
-  "version": "0.4.4",
+  "version": "0.5.0",
   "description": "Local privacy router for coding tools: pseudonymises every request before it leaves your machine, and sends work a frontier model would refuse to an uncensored open-weight model you control.",
   "type": "module",
   "bin": {

package/src/install.js

@@ -0,0 +1,113 @@
+// install.js — make the proxy the default for EVERY Claude Code session, so there's
+// no "which window routes through it" footgun. Two pieces:
+//   1. a macOS LaunchAgent that keeps the proxy running on a fixed port (auto-start
+//      at login, auto-restart on crash);
+//   2. ~/.claude/settings.json `env` pointing all Claude Code at that port (+ an API
+//      key, which Claude Code requires to use a custom base URL — see the README).
+//
+// `uninstall` reverses both, touching only the keys we added.
+
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { execSync } from "node:child_process";
+import { existsSync, mkdirSync, writeFileSync, readFileSync, rmSync, realpathSync } from "node:fs";
+import { loadConfig, HOME_DIR } from "./config.js";
+
+const LABEL = "com.solrouter.proxy";
+const PLIST = join(homedir(), "Library", "LaunchAgents", `${LABEL}.plist`);
+const CLAUDE_SETTINGS = join(homedir(), ".claude", "settings.json");
+const MARK = "__solrouter"; // marks which env keys we own, for a clean uninstall
+
+async function freePort(start) {
+  const net = await import("node:net");
+  for (let p = start; p < start + 25; p++) {
+    const ok = await new Promise(res => {
+      const s = net.createServer();
+      s.once("error", () => res(false));
+      s.once("listening", () => s.close(() => res(true)));
+      s.listen(p, "127.0.0.1");
+    });
+    if (ok) return p;
+  }
+  return start;
+}
+
+function plistXml({ node, binPath, port }) {
+  const log = join(HOME_DIR, "daemon.log");
+  const args = [node, binPath, "start", "--port", String(port)]
+    .map(a => `    <string>${a}</string>`).join("\n");
+  return `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key><string>${LABEL}</string>
+  <key>ProgramArguments</key>
+  <array>
+${args}
+  </array>
+  <key>RunAtLoad</key><true/>
+  <key>KeepAlive</key><true/>
+  <key>StandardOutPath</key><string>${log}</string>
+  <key>StandardErrorPath</key><string>${log}</string>
+</dict>
+</plist>
+`;
+}
+
+/** Merge our env into ~/.claude/settings.json, preserving everything else. */
+function writeClaudeEnv(port, key) {
+  let s = {};
+  try { s = JSON.parse(readFileSync(CLAUDE_SETTINGS, "utf8")); } catch {}
+  if (!existsSync(join(homedir(), ".claude"))) mkdirSync(join(homedir(), ".claude"), { recursive: true });
+  s.env = s.env || {};
+  s.env.ANTHROPIC_BASE_URL = `http://127.0.0.1:${port}`;
+  s.env.ANTHROPIC_API_KEY = key;
+  s.env[MARK] = "1"; // our marker
+  writeFileSync(CLAUDE_SETTINGS, JSON.stringify(s, null, 2));
+}
+
+function removeClaudeEnv() {
+  let s;
+  try { s = JSON.parse(readFileSync(CLAUDE_SETTINGS, "utf8")); } catch { return; }
+  if (s.env?.[MARK]) {
+    delete s.env.ANTHROPIC_BASE_URL;
+    delete s.env.ANTHROPIC_API_KEY;
+    delete s.env[MARK];
+    if (Object.keys(s.env).length === 0) delete s.env;
+    writeFileSync(CLAUDE_SETTINGS, JSON.stringify(s, null, 2));
+  }
+}
+
+/** Resolve a stable path to this proxy's bin (npx caches are ephemeral → warn). */
+function resolveBin() {
+  const p = realpathSync(process.argv[1]);
+  return { binPath: p, ephemeral: /[/\\]_npx[/\\]/.test(p) };
+}
+
+export async function install() {
+  const cfg = loadConfig();
+  const key = cfg.frontier.apiKey || process.env.ANTHROPIC_API_KEY;
+  if (!key) return { ok: false, error: "No Anthropic API key configured. Run `solrouter setup` first." };
+
+  const { binPath, ephemeral } = resolveBin();
+  if (ephemeral) return { ok: false, error: "Run `npm i -g solrouter` first — an npx cache path can't back a persistent service." };
+
+  const port = await freePort(cfg.port || 8787);
+  if (!existsSync(HOME_DIR)) mkdirSync(HOME_DIR, { recursive: true });
+  if (!existsSync(join(homedir(), "Library", "LaunchAgents"))) mkdirSync(join(homedir(), "Library", "LaunchAgents"), { recursive: true });
+
+  writeFileSync(PLIST, plistXml({ node: process.execPath, binPath, port }));
+  try { execSync(`launchctl unload "${PLIST}" 2>/dev/null`); } catch {}
+  execSync(`launchctl load "${PLIST}"`);
+  writeClaudeEnv(port, key);
+  return { ok: true, port, plist: PLIST };
+}
+
+export function uninstall() {
+  try { execSync(`launchctl unload "${PLIST}" 2>/dev/null`); } catch {}
+  if (existsSync(PLIST)) rmSync(PLIST);
+  removeClaudeEnv();
+  return { ok: true };
+}
+
+export default { install, uninstall };