cartethyia 2.5.9 → 2.6.0

package/package.json

@@ -1,97 +1,96 @@
-{
-  "name": "cartethyia",
-  "version": "2.5.9",
-  "description": "A powerful, self-hosted reverse proxy for OpenAI- and Anthropic-compatible AI clients, powered by native Bun and Elysia. It serves both protocols from a single server, routes every model across any configured provider, and translates requests and responses in real time \u2014 streaming and prompt caching included. Underneath it runs a full delivery engine: per-account health tracking, quota and cooldown enforcement, automatic failover across pools and providers, usage accounting, and telemetry. Point OpenCode, Cline, Claude Code, Codex, or any compatible client at Cartethyia and it keeps its native protocol while the gateway absorbs every provider-specific difference behind it. Runs on embedded SQLite or external PostgreSQL with optional Redis coordination, ships as a global CLI with a system-tray console, and needs only Bun 1.4+ alongside Node.js/npm.",
-  "license": "GPL-3.0-only",
-  "type": "module",
-  "packageManager": "bun@1.4.0",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/risunCodex/Cartethyia.git"
-  },
-  "homepage": "https://github.com/risunCodex/Cartethyia#readme",
-  "bugs": {
-    "url": "https://github.com/risunCodex/Cartethyia/issues"
-  },
-  "keywords": [
-    "ai",
-    "gateway",
-    "llm",
-    "bun",
-    "self-hosted"
-  ],
-  "bin": {
-    "cartethyia": "scripts/cli/bin/cartethyia.cjs",
-    "carte": "scripts/cli/bin/carte.cjs"
-  },
-  "files": [
-    "scripts/cli/",
-    "scripts/build/",
-    "scripts/health.ts",
-    "src/",
-    "migrations/",
-    "dist/dashboard/",
-    ".env.example",
-    "README.md"
-  ],
-  "workspaces": [
-    "dashboard"
-  ],
-  "engines": {
-    "bun": ">=1.4.0"
-  },
-  "scripts": {
-    "dev": "bun run dev:stack",
-    "dev:watch": "bun run scripts/dev/supervisor.ts",
-    "test": "bun run scripts/test/run.ts",
-    "build": "bun run scripts/build/build.ts",
-    "prepack": "bun run dashboard:build",
-    "setup": "bun run scripts/cli/setup.ts",
-    "start": "bun run scripts/cli/main.ts start",
-    "doctor": "bun run scripts/cli/doctor.ts",
-    "probe:egress": "bun run scripts/tools/probe-egress.ts",
-    "restart": "bun run scripts/build/restart.ts",
-    "build:aot": "bun run scripts/build/aot.ts",
-    "dev:stack": "concurrently -n BACKEND,DASHBOARD -c cyan,magenta --kill-others-on-fail \"bun run dev:backend\" \"bun run dashboard:dev\"",
-    "typecheck": "tsc --noEmit",
-    "test:watch": "bun run scripts/test/run.ts --watch",
-    "test-db:up": "docker compose -f docker-compose.test.yml up -d --wait postgres-test",
-    "dev:backend": "bun run --hot src/main.ts",
-    "dev:console-auth": "bun run scripts/test/console-session.ts",
-    "dev:visual-baseline": "bun run scripts/test/visual-baseline.ts",
-    "build:binary": "bun run scripts/build/compile.ts",
-    "test:backend": "bun run scripts/test/run.ts --scope backend",
-    "test-db:down": "docker compose -f docker-compose.test.yml down",
-    "dashboard:dev": "bun run --cwd dashboard dev",
-    "test-db:check": "bun run scripts/test/check-db.ts",
-    "dashboard:test": "bun run scripts/test/run.ts --scope dashboard",
-    "test-db:reset": "docker compose -f docker-compose.test.yml down -v && docker compose -f docker-compose.test.yml up -d --wait postgres-test",
-    "dashboard:build": "bun run --cwd dashboard build",
-    "dashboard:typecheck": "bun run --cwd dashboard typecheck",
-    "check:migrations": "bun run scripts/test/check-migrations.ts"
-  },
-  "dependencies": {
-    "drizzle-orm": "0.45.2",
-    "elysia": "2.0.0-beta.16",
-    "enquirer": "^2.4.1",
-    "ioredis": "6.0.0",
-    "jose": "^6.2.12",
-    "jsonrepair": "^3.15.0",
-    "pg": "8.23.0",
-    "pino": "^10.3.1",
-    "pino-pretty": "^13.1.3",
-    "protobufjs": "^7.6.5",
-    "socks-proxy-agent": "^10.1.0",
-    "systray2": "2.1.4",
-    "typebox": "1.3.27",
-    "ws": "8.22.0"
-  },
-  "devDependencies": {
-    "@types/pg": "8.11.10",
-    "@types/ws": "8.18.1",
-    "bun-types": "1.4.0",
-    "concurrently": "^10.0.5",
-    "drizzle-kit": "^0.31.11",
-    "typescript": "5.9.2"
-  }
-}
+{
+  "name": "cartethyia",
+  "version": "2.6.0",
+  "description": "A powerful, self-hosted reverse proxy for OpenAI- and Anthropic-compatible AI clients, powered by native Bun and Elysia. It serves both protocols from a single server, routes every model across any configured provider, and translates requests and responses in real time \u2014 streaming and prompt caching included. Underneath it runs a full delivery engine: per-account health tracking, quota and cooldown enforcement, automatic failover across pools and providers, usage accounting, and telemetry. Point OpenCode, Cline, Claude Code, Codex, or any compatible client at Cartethyia and it keeps its native protocol while the gateway absorbs every provider-specific difference behind it. Runs on embedded SQLite or external PostgreSQL with optional Redis coordination, ships as a global CLI with a system-tray console, and needs only Bun 1.4+ alongside Node.js/npm.",
+  "license": "GPL-3.0-only",
+  "type": "module",
+  "packageManager": "bun@1.4.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/risunCodex/Cartethyia.git"
+  },
+  "homepage": "https://github.com/risunCodex/Cartethyia#readme",
+  "bugs": {
+    "url": "https://github.com/risunCodex/Cartethyia/issues"
+  },
+  "keywords": [
+    "ai",
+    "gateway",
+    "llm",
+    "bun",
+    "self-hosted"
+  ],
+  "bin": {
+    "cartethyia": "scripts/cli/bin/cartethyia.cjs",
+    "carte": "scripts/cli/bin/carte.cjs"
+  },
+  "files": [
+    "scripts/cli/",
+    "src/",
+    "migrations/",
+    "dist/dashboard/",
+    ".env.example",
+    "README.md"
+  ],
+  "workspaces": [
+    "dashboard"
+  ],
+  "engines": {
+    "bun": ">=1.4.0"
+  },
+  "scripts": {
+    "dev": "bun run dev:stack",
+    "dev:watch": "bun run scripts/dev/supervisor.ts",
+    "test": "bun run scripts/test/run.ts",
+    "build": "bun run scripts/build/build.ts",
+    "prepack": "bun run dashboard:build",
+    "setup": "bun run scripts/cli/setup.ts",
+    "start": "bun run scripts/cli/main.ts start",
+    "doctor": "bun run scripts/cli/doctor.ts",
+    "probe:egress": "bun run scripts/tools/probe-egress.ts",
+    "restart": "bun run scripts/build/restart.ts",
+    "build:aot": "bun run scripts/build/aot.ts",
+    "dev:stack": "concurrently -n BACKEND,DASHBOARD -c cyan,magenta --kill-others-on-fail \"bun run dev:backend\" \"bun run dashboard:dev\"",
+    "typecheck": "tsc --noEmit",
+    "test:watch": "bun run scripts/test/run.ts --watch",
+    "test-db:up": "docker compose -f docker-compose.test.yml up -d --wait postgres-test",
+    "dev:backend": "bun run --hot src/main.ts",
+    "dev:console-auth": "bun run scripts/test/console-session.ts",
+    "dev:visual-baseline": "bun run scripts/test/visual-baseline.ts",
+    "build:binary": "bun run scripts/build/compile.ts",
+    "test:backend": "bun run scripts/test/run.ts --scope backend",
+    "test:integration": "bun run scripts/test/run.ts --scope integration",
+    "test-db:down": "docker compose -f docker-compose.test.yml down",
+    "dashboard:dev": "bun run --cwd dashboard dev",
+    "test-db:check": "bun run scripts/test/check-db.ts",
+    "dashboard:test": "bun run scripts/test/run.ts --scope dashboard",
+    "test-db:reset": "docker compose -f docker-compose.test.yml down -v && docker compose -f docker-compose.test.yml up -d --wait postgres-test",
+    "dashboard:build": "bun run --cwd dashboard build",
+    "dashboard:typecheck": "bun run --cwd dashboard typecheck",
+    "check:migrations": "bun run scripts/test/check-migrations.ts"
+  },
+  "dependencies": {
+    "drizzle-orm": "0.45.2",
+    "elysia": "2.0.0-beta.16",
+    "enquirer": "^2.4.1",
+    "ioredis": "6.0.0",
+    "jose": "^6.2.12",
+    "jsonrepair": "^3.15.0",
+    "pg": "8.23.0",
+    "pino": "^10.3.1",
+    "pino-pretty": "^13.1.3",
+    "protobufjs": "^7.6.5",
+    "socks-proxy-agent": "^10.1.0",
+    "systray2": "2.1.4",
+    "typebox": "1.3.27",
+    "ws": "8.22.0"
+  },
+  "devDependencies": {
+    "@types/pg": "8.11.10",
+    "@types/ws": "8.18.1",
+    "bun-types": "1.4.0",
+    "concurrently": "^10.0.5",
+    "drizzle-kit": "^0.31.11",
+    "typescript": "5.9.2"
+  }
+}

package/scripts/cli/admin.ts

@@ -1,125 +1,126 @@
-/**
- * The two admin actions the menu and the tray both offer.
- *
- * Both go through the running gateway rather than the database file: the
- * gateway holds the connection and the schema is dialect-dependent, so reading
- * or writing the tables from this process would need a second implementation
- * of both.
- */
-
-import { ENV_PATH, readEnvFile } from "./env";
-
-/**
- * Asks the gateway to write a gzipped config backup into the download
- * directory. Returns the written path and counts, or null when it failed.
- */
-export async function exportBackup(
-  port: number,
-  token: string,
-): Promise<{ path: string; bytes: number; counts: Record<string, number> } | null> {
-  try {
-    const response = await fetch(`http://127.0.0.1:${port}/admin/export-backup`, {
-      method: "POST",
-      headers: { "content-type": "application/json", "x-drain-token": token },
-      body: JSON.stringify({}),
-      signal: AbortSignal.timeout(60_000),
-    });
-    if (!response.ok) {
-      const detail = await response.text().catch(() => "");
-      console.error(`The gateway refused the backup (HTTP ${response.status}). ${detail}`.trim());
-      return null;
-    }
-    return (await response.json()) as {
-      path: string;
-      bytes: number;
-      counts: Record<string, number>;
-    };
-  } catch {
-    console.error("Could not reach the gateway. Is it still running?");
-    return null;
-  }
-}
-
-/**
- * Posts the console-account reset to the running gateway.
- *
- * Returns 0 on success and 1 on any failure so the caller can print one line
- * either way.
- */
-export async function resetConsoleAccount(port: number, token: string): Promise<number> {
-  try {
-    const response = await fetch(`http://127.0.0.1:${port}/admin/reset-console-account`, {
-      method: "POST",
-      headers: { "content-type": "application/json", "x-drain-token": token },
-      body: JSON.stringify({ confirm: "RESET" }),
-      signal: AbortSignal.timeout(10_000),
-    });
-    if (!response.ok) {
-      const detail = await response.text().catch(() => "");
-      console.error(`The gateway refused the reset (HTTP ${response.status}). ${detail}`.trim());
-      return 1;
-    }
-    return 0;
-  } catch {
-    console.error("Could not reach the gateway. Is it still running?");
-    return 1;
-  }
-}
-
-
-/**
- * Operator escape hatch: clears the console login lockout bucket.
- *
- * The lockout is keyed by `<username>:<clientIp>` and lasts an hour, and there
- * is no console surface to clear it — a locked-out operator has no way back in
- * short of editing the database by hand. This is the documented reset.
- *
- * Usage:
- *   cartethyia admin reset-lockout <username> <clientIp>
- *   cartethyia admin reset-lockout --all
- */
-export async function resetLockout(args: readonly string[]): Promise<void> {
-  const all = args.includes("--all");
-  const positional = args.filter((arg) => !arg.startsWith("--"));
-  if (!all && positional.length < 2) {
-    console.error("Usage: cartethyia admin reset-lockout <username> <clientIp>");
-    console.error("       cartethyia admin reset-lockout --all");
-    process.exit(1);
-  }
-
-  const env = await readEnvFile(ENV_PATH);
-  const databaseUrl = env.DATABASE_URL ?? process.env.DATABASE_URL;
-  if (!databaseUrl) {
-    console.error("✗ DATABASE_URL is not set; cannot reach the lockout table.");
-    process.exit(1);
-  }
-  process.env.DATABASE_URL = databaseUrl;
-
-  const { getDb, closeDb } = await import("../../src/persistence/boot");
-  const { consoleLockouts } = await import("../../src/persistence/schema");
-  const { eq, or } = await import("drizzle-orm");
-
-  const db = getDb();
-  try {
-    if (all) {
-      const cleared = await db.delete(consoleLockouts).returning({ ip: consoleLockouts.ip });
-      console.log(`✓ Cleared ${cleared.length} lockout row(s).`);
-      return;
-    }
-    const username = positional[0]!.trim().toLowerCase();
-    const clientIp = positional[1]!;
-    // The bucket key is `<identifier>:<ip>`; match either exact spelling so
-    // an operator does not have to guess how the identifier was normalized.
-    const cleared = await db
-      .delete(consoleLockouts)
-      .where(or(eq(consoleLockouts.ip, `${username}:${clientIp}`), eq(consoleLockouts.ip, clientIp)))
-      .returning({ ip: consoleLockouts.ip });
-    if (cleared.length === 0) {
-      console.log(`• No lockout row for ${username}:${clientIp} (already clear).`);
-    } else {
-      console.log(`✓ Cleared lockout for ${cleared.map((row) => row.ip).join(", ")}.`);
-    }
-  } finally {
-    await closeDb();
-  }
-}
+/**
+ * The two admin actions the menu and the tray both offer.
+ *
+ * Both go through the running gateway rather than the database file: the
+ * gateway holds the connection and the schema is dialect-dependent, so reading
+ * or writing the tables from this process would need a second implementation
+ * of both.
+ */
+
+import { ENV_PATH, readEnvFile } from "./env";
+
+/**
+ * Asks the gateway to write a gzipped config backup into the download
+ * directory. Returns the written path and counts, or null when it failed.
+ */
+export async function exportBackup(
+  port: number,
+  token: string,
+): Promise<{ path: string; bytes: number; counts: Record<string, number> } | { error: string }> {
+  try {
+    const response = await fetch(`http://127.0.0.1:${port}/admin/export-backup`, {
+      method: "POST",
+      headers: { "content-type": "application/json", "x-drain-token": token },
+      body: JSON.stringify({}),
+      signal: AbortSignal.timeout(60_000),
+    });
+    if (!response.ok) {
+      const detail = await response.text().catch(() => "");
+      return { error: `The gateway refused the backup (HTTP ${response.status}). ${detail}`.trim() };
+    }
+    return (await response.json()) as {
+      path: string;
+      bytes: number;
+      counts: Record<string, number>;
+    };
+  } catch {
+    return { error: "Could not reach the gateway. Is it still running?" };
+  }
+}
+
+/**
+ * Posts the console-account reset to the running gateway.
+ *
+ * Returns 0 on success and 1 on any failure so the caller can print one line
+ * either way.
+ */
+export async function resetConsoleAccount(port: number, token: string): Promise<number> {
+  try {
+    const response = await fetch(`http://127.0.0.1:${port}/admin/reset-console-account`, {
+      method: "POST",
+      headers: { "content-type": "application/json", "x-drain-token": token },
+      body: JSON.stringify({ confirm: "RESET" }),
+      signal: AbortSignal.timeout(10_000),
+    });
+    if (!response.ok) {
+      const detail = await response.text().catch(() => "");
+      console.error(`The gateway refused the reset (HTTP ${response.status}). ${detail}`.trim());
+      return 1;
+    }
+    return 0;
+  } catch {
+    console.error("Could not reach the gateway. Is it still running?");
+    return 1;
+  }
+}
+
+
+/**
+ * Operator escape hatch: clears the console login lockout bucket.
+ *
+ * The lockout is keyed by `<username>:<clientIp>` and lasts an hour, and there
+ * is no console surface to clear it — a locked-out operator has no way back in
+ * short of editing the database by hand. This is the documented reset.
+ *
+ * Usage:
+ *   cartethyia admin reset-lockout <username> <clientIp>
+ *   cartethyia admin reset-lockout --all
+ */
+export async function resetLockout(args: readonly string[]): Promise<void> {
+  const all = args.includes("--all");
+  const positional = args.filter((arg) => !arg.startsWith("--"));
+  if (!all && positional.length < 2) {
+    console.error("Usage: cartethyia admin reset-lockout <username> <clientIp>");
+    console.error("       cartethyia admin reset-lockout --all");
+    process.exit(1);
+  }
+
+  const env = await readEnvFile(ENV_PATH);
+  const databaseUrl = env.DATABASE_URL ?? process.env.DATABASE_URL;
+  if (!databaseUrl) {
+    console.error("✗ DATABASE_URL is not set; cannot reach the lockout table.");
+    process.exit(1);
+  }
+  process.env.DATABASE_URL = databaseUrl;
+
+  // dynamic-import: database driver loaded after DATABASE_URL is published to
+  // process.env; static import would initialise the connection pool against
+  // whatever (or nothing) is in the environment at module load time.
+  const { getDb, closeDb } = await import("../../src/persistence/boot");
+  const { consoleLockouts } = await import("../../src/persistence/schema");
+  const { eq, or } = await import("drizzle-orm");
+
+  const db = getDb();
+  try {
+    if (all) {
+      const cleared = await db.delete(consoleLockouts).returning({ ip: consoleLockouts.ip });
+      console.log(`✓ Cleared ${cleared.length} lockout row(s).`);
+      return;
+    }
+    const username = positional[0]!.trim().toLowerCase();
+    const clientIp = positional[1]!;
+    // The bucket key is `<identifier>:<ip>`; match either exact spelling so
+    // an operator does not have to guess how the identifier was normalized.
+    const cleared = await db
+      .delete(consoleLockouts)
+      .where(or(eq(consoleLockouts.ip, `${username}:${clientIp}`), eq(consoleLockouts.ip, clientIp)))
+      .returning({ ip: consoleLockouts.ip });
+    if (cleared.length === 0) {
+      console.log(`• No lockout row for ${username}:${clientIp} (already clear).`);
+    } else {
+      console.log(`✓ Cleared lockout for ${cleared.map((row) => row.ip).join(", ")}.`);
+    }
+  } finally {
+    await closeDb();
+  }
+}