@albinocrabs/o-switcher 0.3.0 → 0.4.0

package/dist/plugin.js

@@ -1,42 +1,6 @@
-import { createAuditLogger, createOperatorTools, createProfileTools, switchToNextProfile, generateCorrelationId, loadProfiles, discoverTargetsFromProfiles, discoverTargets, createAuthWatcher, validateConfig, createRegistry, createRoutingEventBus, createCircuitBreaker, createConcurrencyTracker, createCooldownManager, createRequestTraceBuffer, createLogSubscriber } from './chunk-XXH633FY.js';
-import { mkdir, writeFile, rename } from 'fs/promises';
-import { join, dirname } from 'path';
-import { homedir } from 'os';
-
-var STATE_DIR = join(homedir(), ".local", "share", "o-switcher");
-var STATE_FILE = join(STATE_DIR, "tui-state.json");
-var STATE_TMP = join(STATE_DIR, "tui-state.json.tmp");
-var writeStateAtomic = async (state) => {
-  await mkdir(dirname(STATE_FILE), { recursive: true });
-  const json = JSON.stringify(state);
-  await writeFile(STATE_TMP, json, "utf8");
-  await rename(STATE_TMP, STATE_FILE);
-};
-var createStateWriter = (debounceMs = 500) => {
-  let pending;
-  let timer;
-  let writePromise = Promise.resolve();
-  const doWrite = () => {
-    if (!pending) return;
-    const snapshot = pending;
-    pending = void 0;
-    writePromise = writeStateAtomic(snapshot).catch(() => void 0);
-  };
-  const write = (state) => {
-    pending = state;
-    if (timer) clearTimeout(timer);
-    timer = setTimeout(doWrite, debounceMs);
-  };
-  const flush = async () => {
-    if (timer) {
-      clearTimeout(timer);
-      timer = void 0;
-    }
-    doWrite();
-    await writePromise;
-  };
-  return { write, flush };
-};
+import { createOperatorTools, createProfileTools, switchToNextProfile, discoverTargetsFromProfiles, discoverTargets, createAuthWatcher, validateConfig, createRegistry, createRoutingEventBus, createCircuitBreaker, createConcurrencyTracker, createCooldownManager, createRequestTraceBuffer, createLogSubscriber } from './chunk-2EYMYNKS.js';
+import { createStateWriter, createProxy } from './chunk-I6RDAZBR.js';
+import { createAuditLogger, generateCorrelationId, loadProfiles } from './chunk-HAEEX3KB.js';
 
 // src/plugin.ts
 var initializeSwitcher = (rawConfig) => {
@@ -163,6 +127,28 @@ var server = async (_input) => {
         Object.assign(state, initialized);
         logger.info({ targets: state.registry?.getAllTargets().length }, "O-Switcher initialized");
         publishTuiState();
+        const proxyEnabled = switcherConfig?.["proxy"] !== false && !process.env["VITEST"];
+        if (proxyEnabled) {
+          const proxyPort = Number(switcherConfig?.["proxy_port"] ?? 4444);
+          try {
+            const proxy = await createProxy({
+              port: proxyPort,
+              provider: "openai",
+              maxRetries: 3
+            });
+            await proxy.start();
+            logger.info({ port: proxyPort }, "Proxy started \u2014 rotating API keys on 429");
+            if (providerConfig) {
+              const providerEntry = providerConfig["openai"];
+              if (providerEntry && typeof providerEntry === "object") {
+                providerEntry["baseURL"] = `http://localhost:${proxyPort}/v1`;
+                logger.info("Patched openai provider baseURL to proxy");
+              }
+            }
+          } catch (proxyErr) {
+            logger.warn({ err: proxyErr }, "Proxy failed to start \u2014 continuing without key rotation");
+          }
+        }
         state.authWatcher = createAuthWatcher({ logger });
         await state.authWatcher.start();
         logger.info("Auth watcher started");
@@ -235,27 +221,34 @@ var server = async (_input) => {
             state.registry.recordObservation(target.target_id, 0);
             state.circuitBreakers?.get(target.target_id)?.recordFailure();
             publishTuiState();
-            state.logger?.info(
-              { target_id: target.target_id, event_type: event.type },
-              "Recorded failure from session event"
-            );
-            if (target.health_score < 0.3) {
-              const unhealthyIds = matchingTargets.filter((t) => t.health_score < 0.3).map((t) => t.target_id);
+            const errorObj = error;
+            const statusCode = errorObj.statusCode ?? errorObj.error?.statusCode;
+            const errorName = String(errorObj.name ?? errorObj.error ?? "");
+            const isRateLimit = statusCode === 429 || statusCode === "429" || errorName.includes("RateLimitError") || errorName.includes("QuotaExceeded");
+            if (isRateLimit) {
+              state.logger?.info(
+                { target_id: target.target_id, statusCode },
+                "Rate limit hit \u2014 switching profile"
+              );
               switchToNextProfile({
                 provider: providerId,
                 currentProfileId: target.target_id,
-                excludeProfileIds: unhealthyIds,
                 logger: state.logger
               }).then((result) => {
                 if (result.success) {
                   state.logger?.info(
                     { from: result.from, to: result.to, provider: providerId },
-                    "Auto-switched to next profile after health drop"
+                    "Switched to next profile after rate limit"
                   );
                 }
               }).catch((err) => {
-                state.logger?.warn({ err }, "Failed to auto-switch profile");
+                state.logger?.warn({ err }, "Failed to switch profile");
               });
+            } else {
+              state.logger?.info(
+                { target_id: target.target_id, event_type: event.type },
+                "Recorded failure from session event"
+              );
             }
           }
         }

package/dist/proxy/cli.cjs

@@ -0,0 +1,91 @@
+#!/usr/bin/env node
+'use strict';
+
+var chunkQKEHCM2F_cjs = require('../chunk-QKEHCM2F.cjs');
+require('../chunk-BHHR2U5B.cjs');
+var promises = require('fs/promises');
+var path = require('path');
+var os = require('os');
+
+var OPENCODE_CONFIG = path.join(os.homedir(), ".config", "opencode", "opencode.json");
+var OPENCODE_BACKUP = `${OPENCODE_CONFIG}.osw-backup`;
+var parseArgs = (args) => {
+  const result = {};
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (arg.startsWith("--") && i + 1 < args.length) {
+      result[arg.slice(2)] = args[i + 1];
+      i++;
+    }
+  }
+  return result;
+};
+var patchConfig = async (provider, port, _upstream) => {
+  try {
+    const raw = await promises.readFile(OPENCODE_CONFIG, "utf-8");
+    const config = JSON.parse(raw);
+    await promises.copyFile(OPENCODE_CONFIG, OPENCODE_BACKUP);
+    const providers = config["provider"] ?? {};
+    const existing = providers[provider] ?? {};
+    const originalBaseURL = existing["baseURL"];
+    existing["baseURL"] = `http://localhost:${port}/v1`;
+    providers[provider] = existing;
+    config["provider"] = providers;
+    await promises.writeFile(OPENCODE_CONFIG, JSON.stringify(config, null, 2), "utf-8");
+    return originalBaseURL ?? null;
+  } catch {
+    return null;
+  }
+};
+var restoreConfig = async () => {
+  try {
+    await promises.copyFile(OPENCODE_BACKUP, OPENCODE_CONFIG);
+    console.log("  Config restored.");
+  } catch {
+    console.log("  Warning: could not restore config backup.");
+  }
+};
+var main = async () => {
+  const args = parseArgs(process.argv.slice(2));
+  const config = {
+    port: args["port"] ? Number(args["port"]) : 4444,
+    upstream: args["upstream"] ?? "https://api.openai.com",
+    provider: args["provider"] ?? "openai",
+    maxRetries: args["retries"] ? Number(args["retries"]) : 3
+  };
+  await patchConfig(config.provider, config.port, config.upstream);
+  console.log(`
+  \u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510
+  \u2502  O-Switcher Proxy                       \u2502
+  \u2502                                         \u2502
+  \u2502  Port:     ${String(config.port).padEnd(28)}\u2502
+  \u2502  Upstream: ${config.upstream.padEnd(28)}\u2502
+  \u2502  Provider: ${config.provider.padEnd(28)}\u2502
+  \u2502  Retries:  ${String(config.maxRetries).padEnd(28)}\u2502
+  \u2502                                         \u2502
+  \u2502  opencode.json patched automatically    \u2502
+  \u2502  Will restore on exit (Ctrl+C)          \u2502
+  \u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518
+`);
+  const proxy = await chunkQKEHCM2F_cjs.createProxy(config);
+  const { port, close } = await proxy.start();
+  console.log(`  Listening on http://localhost:${port}`);
+  console.log("  Restart OpenCode to pick up the proxy.");
+  console.log("  Press Ctrl+C to stop and restore config.");
+  const shutdown = async () => {
+    console.log("\n  Shutting down...");
+    close();
+    await restoreConfig();
+    process.exit(0);
+  };
+  process.on("SIGINT", () => {
+    shutdown();
+  });
+  process.on("SIGTERM", () => {
+    shutdown();
+  });
+};
+main().catch((err) => {
+  console.error("Failed to start proxy:", err);
+  process.exit(1);
+});

package/dist/proxy/cli.d.cts

@@ -0,0 +1 @@
+#!/usr/bin/env node

package/dist/proxy/cli.d.ts

@@ -0,0 +1 @@
+#!/usr/bin/env node

package/dist/proxy/cli.js

@@ -0,0 +1,89 @@
+#!/usr/bin/env node
+import { createProxy } from '../chunk-I6RDAZBR.js';
+import '../chunk-HAEEX3KB.js';
+import { readFile, copyFile, writeFile } from 'fs/promises';
+import { join } from 'path';
+import { homedir } from 'os';
+
+var OPENCODE_CONFIG = join(homedir(), ".config", "opencode", "opencode.json");
+var OPENCODE_BACKUP = `${OPENCODE_CONFIG}.osw-backup`;
+var parseArgs = (args) => {
+  const result = {};
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (arg.startsWith("--") && i + 1 < args.length) {
+      result[arg.slice(2)] = args[i + 1];
+      i++;
+    }
+  }
+  return result;
+};
+var patchConfig = async (provider, port, _upstream) => {
+  try {
+    const raw = await readFile(OPENCODE_CONFIG, "utf-8");
+    const config = JSON.parse(raw);
+    await copyFile(OPENCODE_CONFIG, OPENCODE_BACKUP);
+    const providers = config["provider"] ?? {};
+    const existing = providers[provider] ?? {};
+    const originalBaseURL = existing["baseURL"];
+    existing["baseURL"] = `http://localhost:${port}/v1`;
+    providers[provider] = existing;
+    config["provider"] = providers;
+    await writeFile(OPENCODE_CONFIG, JSON.stringify(config, null, 2), "utf-8");
+    return originalBaseURL ?? null;
+  } catch {
+    return null;
+  }
+};
+var restoreConfig = async () => {
+  try {
+    await copyFile(OPENCODE_BACKUP, OPENCODE_CONFIG);
+    console.log("  Config restored.");
+  } catch {
+    console.log("  Warning: could not restore config backup.");
+  }
+};
+var main = async () => {
+  const args = parseArgs(process.argv.slice(2));
+  const config = {
+    port: args["port"] ? Number(args["port"]) : 4444,
+    upstream: args["upstream"] ?? "https://api.openai.com",
+    provider: args["provider"] ?? "openai",
+    maxRetries: args["retries"] ? Number(args["retries"]) : 3
+  };
+  await patchConfig(config.provider, config.port, config.upstream);
+  console.log(`
+  \u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510
+  \u2502  O-Switcher Proxy                       \u2502
+  \u2502                                         \u2502
+  \u2502  Port:     ${String(config.port).padEnd(28)}\u2502
+  \u2502  Upstream: ${config.upstream.padEnd(28)}\u2502
+  \u2502  Provider: ${config.provider.padEnd(28)}\u2502
+  \u2502  Retries:  ${String(config.maxRetries).padEnd(28)}\u2502
+  \u2502                                         \u2502
+  \u2502  opencode.json patched automatically    \u2502
+  \u2502  Will restore on exit (Ctrl+C)          \u2502
+  \u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518
+`);
+  const proxy = await createProxy(config);
+  const { port, close } = await proxy.start();
+  console.log(`  Listening on http://localhost:${port}`);
+  console.log("  Restart OpenCode to pick up the proxy.");
+  console.log("  Press Ctrl+C to stop and restore config.");
+  const shutdown = async () => {
+    console.log("\n  Shutting down...");
+    close();
+    await restoreConfig();
+    process.exit(0);
+  };
+  process.on("SIGINT", () => {
+    shutdown();
+  });
+  process.on("SIGTERM", () => {
+    shutdown();
+  });
+};
+main().catch((err) => {
+  console.error("Failed to start proxy:", err);
+  process.exit(1);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@albinocrabs/o-switcher",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Seamless OpenRouter profile rotation for OpenCode — buy multiple subscriptions, use as one pool",
   "type": "module",
   "license": "Apache-2.0",
@@ -27,6 +27,9 @@
     "LICENSE",
     "CHANGELOG.md"
   ],
+  "bin": {
+    "o-switcher-proxy": "dist/proxy/cli.js"
+  },
   "main": "dist/plugin.js",
   "module": "dist/plugin.js",
   "types": "dist/plugin.d.ts",

package/src/tui.tsx

@@ -103,7 +103,7 @@ const SidebarFooter = () => {
 };
 
 /** Full status dashboard route. */
-const StatusDashboard = () => {
+const StatusDashboard = (props: { api: TuiPluginApi }) => {
   const state = useTuiState();
 
   const content = (): string => {
@@ -167,11 +167,19 @@ const StatusDashboard = () => {
     const age = Date.now() - s.updated_at;
     const ageSec = Math.round(age / 1000);
     lines.push(`  Updated ${ageSec}s ago`);
+    lines.push('');
+    lines.push('  Press Esc or q to go back');
 
     return lines.join('\n');
   };
 
-  return <text wrapMode="none">{content()}</text>;
+  const onKeyDown = (e: { name: string }) => {
+    if (e.name === 'escape' || e.name === 'q') {
+      props.api.route.navigate('home');
+    }
+  };
+
+  return <box focused onKeyDown={onKeyDown}><text wrapMode="none">{content()}</text></box>;
 };
 
 // ── Plugin entry point ────────────────────────────────────────────
@@ -190,7 +198,7 @@ const tui = async (api: TuiPluginApi) => {
   api.route.register([
     {
       name: 'o-switcher-status',
-      render: () => <StatusDashboard />,
+      render: () => <StatusDashboard api={api} />,
     },
   ]);