cartethyia 2.7.0 → 2.7.2

package/package.json

@@ -1,96 +1,96 @@
-{
-  "name": "cartethyia",
-  "version": "2.7.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 — 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"
-  }
-}
+{
+  "name": "cartethyia",
+  "version": "2.7.2",
+  "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 — 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/console-menu.ts

@@ -18,7 +18,6 @@ import { exportBackup, resetConsoleAccount } from "./admin";
 import { printUpdateInstructions, runDetachedUpdate } from "./update";
 import { acquireController } from "./controller";
 import { restoreControllerAfterFailedHandoff } from "./controller";
-import { attachGateway as attachRunningGateway } from "./instance";
 
 /**
  * Seconds to keep the update notice on screen before returning to the shell.
@@ -316,7 +315,11 @@ async function runMenu(handoff: { readonly token: string; readonly parentPid: nu
   // would stop the very process the tray just adopted, which is why the menu
   // appeared to hand over a gateway that was not listening.
   if (handedOff) return;
-  if (runningAttached !== null || (await attachRunningGateway(port, drainToken)) !== null) {
+  // An attached (externally owned) gateway is left running for its owner; our
+  // own child is drained before the menu returns to the shell. `attachGateway`
+  // is deliberately NOT probed again here: it would always see our own child's
+  // lock and turn a clean drain into a rough kill on the exit backstop.
+  if (runningAttached !== null) {
     detachAttached();
     return;
   }

package/scripts/cli/tray.ts

@@ -64,15 +64,16 @@ export async function startTray(): Promise<void> {
   const handoff = inheritedControllerHandoff();
   const controller = acquireController("tray", handoff);
   const releaseController = (): void => controller.release();
-  const failedHandoff = (): void => {
-    if (handoff) restoreControllerAfterFailedHandoff(handoff);
-  };
-  process.once("exit", failedHandoff);
   process.once("exit", releaseController);
   try {
     await runTray();
+  } catch (error) {
+    // Only a tray that never became ready restores the menu's lease. After a
+    // successful handoff the tray owns the controller; restoring it on a later
+    // normal exit would pin a controller record to the long-gone menu pid.
+    if (handoff) restoreControllerAfterFailedHandoff(handoff);
+    throw error;
   } finally {
-    process.removeListener("exit", failedHandoff);
     controller.release();
     process.removeListener("exit", releaseController);
   }
@@ -174,7 +175,21 @@ async function runTray(): Promise<void> {
     // over HTTP before it ever reaches for `kill()`, so detaching costs the
     // exit path nothing: the tray can still stop the gateway on Exit.
     adoptedGateway = await attachGateway(port, drainToken);
-    if (adoptedGateway === null) gateway = await startGateway(port, drainToken, { detached: true });
+    if (adoptedGateway === null) {
+      gateway = await startGateway(port, drainToken, { detached: true });
+    } else {
+      // The adopted gateway was started by the menu as a non-detached child of
+      // the menu's console. When the menu exits — and especially when the
+      // operator closes that terminal window afterwards — Windows delivers
+      // CTRL_CLOSE to the whole console group and the gateway (handling
+      // SIGTERM) shuts down with it: "Hide to tray" left nothing serving. The
+      // menu cannot hand the same process off to another console, so re-cycle
+      // it into a detached gateway now, before reporting ready, so the tray
+      // owns a gateway that is not attached to any console after the handoff.
+      await stopAttachedGateway(adoptedGateway, drainToken);
+      adoptedGateway = null;
+      gateway = await startGateway(port, drainToken, { detached: true });
+    }
     // The launcher that spawned this tray is blocked on a signal file: it
     // cannot read our stdio, because the tray is detached. Without this write
     // it waits out its 60 s deadline and reports a failure for a tray that is