agent-cli-proxy 0.1.0 → 0.2.6

package/dist/migrations/001_init.sql

@@ -1,9 +1,16 @@
 CREATE TABLE IF NOT EXISTS request_logs (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
+  request_id TEXT,
   provider TEXT NOT NULL,
   model TEXT NOT NULL,
+  actual_model TEXT,
+  actual_provider TEXT,
+  proxy_api_key_id INTEGER REFERENCES api_keys(id),
   tool TEXT DEFAULT 'unknown',
   client_id TEXT DEFAULT 'unknown',
+  agent TEXT,
+  source TEXT DEFAULT 'proxy',
+  msg_id TEXT,
   path TEXT NOT NULL,
   streamed INTEGER NOT NULL DEFAULT 0,
   status INTEGER,
@@ -11,16 +18,40 @@ CREATE TABLE IF NOT EXISTS request_logs (
   completion_tokens INTEGER DEFAULT 0,
   cache_creation_tokens INTEGER DEFAULT 0,
   cache_read_tokens INTEGER DEFAULT 0,
+  reasoning_tokens INTEGER DEFAULT 0,
   total_tokens INTEGER DEFAULT 0,
   cost_usd REAL DEFAULT 0,
+  cost_status TEXT NOT NULL DEFAULT 'unresolved'
+    CHECK(cost_status IN ('unresolved', 'ok', 'pending', 'unsupported')),
+  lifecycle_status TEXT NOT NULL DEFAULT 'pending'
+    CHECK(lifecycle_status IN ('pending', 'completed', 'error', 'aborted')),
   incomplete INTEGER NOT NULL DEFAULT 0,
   error_code TEXT,
+  error_message TEXT,
   latency_ms INTEGER,
   started_at TEXT NOT NULL,
   finished_at TEXT,
-  meta_json TEXT
+  finalized_at TEXT,
+  meta_json TEXT,
+  user_agent TEXT,
+  source_ip TEXT,
+  cliproxy_account TEXT,
+  cliproxy_auth_index TEXT,
+  cliproxy_source TEXT,
+  correlated_at TEXT
 );
 
+CREATE INDEX IF NOT EXISTS idx_request_logs_started_at ON request_logs(started_at);
+CREATE INDEX IF NOT EXISTS idx_request_logs_tool ON request_logs(tool);
+CREATE INDEX IF NOT EXISTS idx_request_logs_client_id ON request_logs(client_id);
+CREATE INDEX IF NOT EXISTS idx_request_logs_cliproxy_account ON request_logs(cliproxy_account);
+CREATE INDEX IF NOT EXISTS idx_request_logs_cliproxy_auth_index ON request_logs(cliproxy_auth_index);
+CREATE INDEX IF NOT EXISTS idx_request_logs_provider_cliproxy_account_started_at ON request_logs(provider, cliproxy_account, started_at);
+CREATE INDEX IF NOT EXISTS idx_request_logs_request_id ON request_logs(request_id);
+CREATE UNIQUE INDEX IF NOT EXISTS idx_request_logs_msg_id ON request_logs(msg_id) WHERE msg_id IS NOT NULL;
+CREATE INDEX IF NOT EXISTS idx_request_logs_lifecycle_status ON request_logs(lifecycle_status);
+CREATE INDEX IF NOT EXISTS idx_request_logs_cost_status ON request_logs(cost_status);
+
 CREATE TABLE IF NOT EXISTS daily_usage (
   day TEXT NOT NULL,
   provider TEXT NOT NULL,
@@ -35,7 +66,64 @@ CREATE TABLE IF NOT EXISTS daily_usage (
   PRIMARY KEY (day, provider, model)
 );
 
-CREATE INDEX IF NOT EXISTS idx_request_logs_started_at ON request_logs(started_at);
-CREATE INDEX IF NOT EXISTS idx_request_logs_tool ON request_logs(tool);
-CREATE INDEX IF NOT EXISTS idx_request_logs_client_id ON request_logs(client_id);
 CREATE INDEX IF NOT EXISTS idx_daily_usage_day ON daily_usage(day);
+
+CREATE TABLE IF NOT EXISTS daily_account_usage (
+  day TEXT NOT NULL,
+  provider TEXT NOT NULL,
+  model TEXT NOT NULL,
+  cliproxy_account TEXT NOT NULL,
+  cliproxy_auth_index TEXT,
+  request_count INTEGER DEFAULT 0,
+  prompt_tokens INTEGER DEFAULT 0,
+  completion_tokens INTEGER DEFAULT 0,
+  cache_creation_tokens INTEGER DEFAULT 0,
+  cache_read_tokens INTEGER DEFAULT 0,
+  reasoning_tokens INTEGER DEFAULT 0,
+  total_tokens INTEGER DEFAULT 0,
+  cost_usd REAL DEFAULT 0,
+  PRIMARY KEY (day, provider, model, cliproxy_account)
+);
+
+CREATE INDEX IF NOT EXISTS idx_daily_account_usage_day ON daily_account_usage(day);
+CREATE INDEX IF NOT EXISTS idx_daily_account_usage_account ON daily_account_usage(cliproxy_account);
+
+CREATE TABLE IF NOT EXISTS quota_snapshots (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  timestamp TEXT NOT NULL,
+  provider TEXT NOT NULL,
+  account TEXT NOT NULL,
+  quota_type TEXT NOT NULL,
+  model TEXT,
+  used_pct REAL,
+  remaining REAL,
+  remaining_raw TEXT,
+  resets_at TEXT,
+  raw_json TEXT
+);
+
+CREATE INDEX IF NOT EXISTS idx_quota_snapshots_provider ON quota_snapshots(provider, account, timestamp);
+
+CREATE TABLE IF NOT EXISTS cost_audit (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  request_log_id INTEGER REFERENCES request_logs(id),
+  model TEXT,
+  provider TEXT,
+  source TEXT,
+  base_cost_usd REAL,
+  calc_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX IF NOT EXISTS idx_cost_audit_request_log_id ON cost_audit(request_log_id);
+
+CREATE TABLE IF NOT EXISTS api_keys (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  key_hash TEXT NOT NULL UNIQUE,
+  key_prefix TEXT NOT NULL,
+  name TEXT NOT NULL,
+  created_at TEXT NOT NULL DEFAULT (datetime('now')),
+  revoked_at TEXT,
+  last_used_at TEXT,
+  allowed_accounts TEXT,
+  allowed_providers TEXT
+);

package/dist/migrations/002_quota_local_usage_index.sql

@@ -0,0 +1,2 @@
+CREATE INDEX IF NOT EXISTS idx_request_logs_provider_cliproxy_account_started_at
+ON request_logs(provider, cliproxy_account, started_at);

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "agent-cli-proxy",
-  "version": "0.1.0",
-  "description": "Self-hosted AI API proxy with per-tool usage monitoring, usage attribution, cost tracking, and subscription metadata for OpenAI/Anthropic-compatible APIs.",
-  "module": "src/index.ts",
+  "version": "0.2.6",
+  "description": "Self-hosted AI API proxy with per-tool usage monitoring, account attribution, and cost tracking for OpenAI/Anthropic-compatible APIs.",
+  "module": "./dist/index.js",
   "type": "module",
   "private": false,
   "author": "Agent CLI Proxy contributors",
@@ -27,7 +27,7 @@
     "self-hosted"
   ],
   "engines": {
-    "bun": ">=1.0.0",
+    "bun": ">=1.3.0",
     "node": ">=20.0.0"
   },
   "bin": {
@@ -36,27 +36,32 @@
   "files": [
     "dist",
     "README.md",
+    "CHANGELOG.md",
     "LICENSE"
   ],
   "scripts": {
     "dev": "bun run --watch src/index.ts",
-    "build": "bun build src/index.ts src/cli.ts --target=bun --outdir=./dist && rm -rf dist/migrations && cp -R src/storage/migrations dist/migrations && mkdir -p dist/data && cp data/plans.default.json dist/data/plans.default.json && bun run scripts/post-build.ts",
+    "build": "bun build src/index.ts src/cli.ts --target=bun --outdir=./dist && rm -rf dist/migrations && cp -R src/storage/migrations dist/migrations && bun run scripts/post-build.ts",
     "typecheck": "bunx tsc --noEmit",
     "test": "bun test",
-    "release-check": "bun run typecheck && bun run test && bun run build && (bunx publint dist || bun run scripts/release-fallback-check.ts)",
+    "release-check": "bun run typecheck && bun run test && bun run build && (bunx publint . || bun run scripts/release-fallback-check.ts)",
     "prepublishOnly": "bun run release-check",
     "pack:check": "bun pm pack --dry-run",
     "test:e2e": "bun test tests/e2e/",
-    "test:e2e:mock": "MOCK_CLI_PROXY=1 CLI_PROXY_API_URL=http://localhost:18317 bun test tests/e2e/",
+    "test:e2e:mock": "MOCK_CLI_PROXY=1 CLI_PROXY_API_URL=http://localhost:18317 bun test tests/e2e/admin-auth.test.ts && MOCK_CLI_PROXY=1 CLI_PROXY_API_URL=http://localhost:18317 bun test tests/e2e/body-size-limit.test.ts && MOCK_CLI_PROXY=1 CLI_PROXY_API_URL=http://localhost:18317 bun test tests/e2e/ready.test.ts && MOCK_CLI_PROXY=1 CLI_PROXY_API_URL=http://localhost:18317 bun test tests/e2e/proxy.test.ts && MOCK_CLI_PROXY=1 CLI_PROXY_API_URL=http://localhost:18317 bun test tests/e2e/transforms.test.ts",
     "start": "bun run dist/index.js",
-    "backfill:costs": "bun run src/cli.ts backfill-costs --env .env"
+    "backfill:costs": "bun run src/cli.ts backfill-costs --env .env",
+    "release": "bun run scripts/release.ts",
+    "release:patch": "bun run scripts/release.ts patch",
+    "release:minor": "bun run scripts/release.ts minor",
+    "release:major": "bun run scripts/release.ts major",
+    "release:dry-run": "bun run scripts/release.ts --dry-run"
   },
   "devDependencies": {
     "@types/bun": "latest",
-    "@tokscale/core": "^1.4.3"
+    "@types/node": "^25.9.1"
   },
   "peerDependencies": {
     "typescript": "^5"
-  },
-  "dependencies": {}
+  }
 }

package/dist/data/plans.default.json

@@ -1,93 +0,0 @@
-{
-  "plans": [
-    {
-      "code": "claude_pro",
-      "provider": "anthropic",
-      "display_name": "Anthropic Claude Pro",
-      "monthly_price_usd": 20,
-      "currency": "USD",
-      "billing_period_days": 30,
-      "vendor_url": "https://www.anthropic.com/claude/pricing",
-      "notes": "Conservative estimate — verify with vendor — last updated 2026-05"
-    },
-    {
-      "code": "claude_max5",
-      "provider": "anthropic",
-      "display_name": "Anthropic Claude Max 5x",
-      "monthly_price_usd": 100,
-      "currency": "USD",
-      "billing_period_days": 30,
-      "vendor_url": "https://www.anthropic.com/claude/pricing",
-      "notes": "Conservative estimate — verify with vendor — last updated 2026-05"
-    },
-    {
-      "code": "claude_max20",
-      "provider": "anthropic",
-      "display_name": "Anthropic Claude Max 20x",
-      "monthly_price_usd": 200,
-      "currency": "USD",
-      "billing_period_days": 30,
-      "vendor_url": "https://www.anthropic.com/claude/pricing",
-      "notes": "Conservative estimate — verify with vendor — last updated 2026-05"
-    },
-    {
-      "code": "chatgpt_plus",
-      "provider": "openai",
-      "display_name": "OpenAI ChatGPT Plus",
-      "monthly_price_usd": 20,
-      "currency": "USD",
-      "billing_period_days": 30,
-      "vendor_url": "https://openai.com/chatgpt/pricing/",
-      "notes": "Conservative estimate — verify with vendor — last updated 2026-05"
-    },
-    {
-      "code": "chatgpt_pro",
-      "provider": "openai",
-      "display_name": "OpenAI ChatGPT Pro",
-      "monthly_price_usd": 200,
-      "currency": "USD",
-      "billing_period_days": 30,
-      "vendor_url": "https://openai.com/chatgpt/pricing/",
-      "notes": "Conservative estimate — verify with vendor — last updated 2026-05"
-    },
-    {
-      "code": "chatgpt_business",
-      "provider": "openai",
-      "display_name": "OpenAI ChatGPT Business",
-      "monthly_price_usd": 25,
-      "currency": "USD",
-      "billing_period_days": 30,
-      "vendor_url": "https://openai.com/chatgpt/pricing/",
-      "notes": "Conservative estimate (per-seat); verify with vendor — last updated 2026-05"
-    },
-    {
-      "code": "kimi_pro",
-      "provider": "moonshot",
-      "display_name": "Moonshot Kimi",
-      "monthly_price_usd": 15,
-      "currency": "USD",
-      "billing_period_days": 30,
-      "vendor_url": "https://www.moonshot.cn/",
-      "notes": "Conservative estimate — verify with vendor — last updated 2026-05"
-    },
-    {
-      "code": "glm_pro",
-      "provider": "bigmodel",
-      "display_name": "BigModel GLM",
-      "monthly_price_usd": 10,
-      "currency": "USD",
-      "billing_period_days": 30,
-      "vendor_url": "https://open.bigmodel.cn/",
-      "notes": "Conservative estimate — verify with vendor — last updated 2026-05"
-    },
-    {
-      "code": "local_byok",
-      "provider": "local",
-      "display_name": "Bring Your Own Key (BYOK / Self-hosted)",
-      "monthly_price_usd": 0,
-      "currency": "USD",
-      "billing_period_days": 30,
-      "notes": "Self-hosted or BYOK provider. No vendor billing. verify with vendor — last updated 2026-05"
-    }
-  ]
-}

package/dist/migrations/002_agent_attribution.sql

@@ -1,25 +0,0 @@
--- Add agent attribution columns to request_logs
-ALTER TABLE request_logs ADD COLUMN IF NOT EXISTS agent TEXT;
-ALTER TABLE request_logs ADD COLUMN IF NOT EXISTS source TEXT DEFAULT 'proxy';
-ALTER TABLE request_logs ADD COLUMN IF NOT EXISTS msg_id TEXT;
-
--- Unique index for dedup (only for non-null msg_id)
-CREATE UNIQUE INDEX IF NOT EXISTS idx_request_logs_msg_id 
-  ON request_logs(msg_id) WHERE msg_id IS NOT NULL;
-
--- Quota snapshots table
-CREATE TABLE IF NOT EXISTS quota_snapshots (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  timestamp TEXT NOT NULL,
-  provider TEXT NOT NULL,
-  account TEXT NOT NULL,
-  quota_type TEXT NOT NULL,
-  used_pct REAL,
-  remaining REAL,
-  remaining_raw TEXT,
-  resets_at TEXT,
-  raw_json TEXT
-);
-
-CREATE INDEX IF NOT EXISTS idx_quota_snapshots_provider 
-  ON quota_snapshots(provider, account, timestamp);

package/dist/migrations/003_enhanced_logging.sql

@@ -1,3 +0,0 @@
-ALTER TABLE request_logs ADD COLUMN actual_model TEXT;
-ALTER TABLE request_logs ADD COLUMN source_ip TEXT;
-ALTER TABLE request_logs ADD COLUMN user_agent TEXT;

package/dist/migrations/004_cliproxy_attribution.sql

@@ -1,40 +0,0 @@
--- Add CLIProxyAPI account attribution
-ALTER TABLE request_logs ADD COLUMN cliproxy_account TEXT;
-ALTER TABLE request_logs ADD COLUMN cliproxy_auth_index TEXT;
-ALTER TABLE request_logs ADD COLUMN cliproxy_source TEXT;
-ALTER TABLE request_logs ADD COLUMN request_id TEXT;
-ALTER TABLE request_logs ADD COLUMN reasoning_tokens INTEGER DEFAULT 0;
-ALTER TABLE request_logs ADD COLUMN actual_model TEXT;
-ALTER TABLE request_logs ADD COLUMN user_agent TEXT;
-ALTER TABLE request_logs ADD COLUMN source_ip TEXT;
-ALTER TABLE request_logs ADD COLUMN correlated_at TEXT;
-
-CREATE INDEX IF NOT EXISTS idx_request_logs_cliproxy_account
-  ON request_logs(cliproxy_account);
-CREATE INDEX IF NOT EXISTS idx_request_logs_cliproxy_auth_index
-  ON request_logs(cliproxy_auth_index);
-CREATE INDEX IF NOT EXISTS idx_request_logs_request_id
-  ON request_logs(request_id);
-
--- Daily usage breakdown by cliproxy account
-CREATE TABLE IF NOT EXISTS daily_account_usage (
-  day TEXT NOT NULL,
-  provider TEXT NOT NULL,
-  model TEXT NOT NULL,
-  cliproxy_account TEXT NOT NULL,
-  cliproxy_auth_index TEXT,
-  request_count INTEGER DEFAULT 0,
-  prompt_tokens INTEGER DEFAULT 0,
-  completion_tokens INTEGER DEFAULT 0,
-  cache_creation_tokens INTEGER DEFAULT 0,
-  cache_read_tokens INTEGER DEFAULT 0,
-  reasoning_tokens INTEGER DEFAULT 0,
-  total_tokens INTEGER DEFAULT 0,
-  cost_usd REAL DEFAULT 0,
-  PRIMARY KEY (day, provider, model, cliproxy_account)
-);
-
-CREATE INDEX IF NOT EXISTS idx_daily_account_usage_day
-  ON daily_account_usage(day);
-CREATE INDEX IF NOT EXISTS idx_daily_account_usage_account
-  ON daily_account_usage(cliproxy_account);

package/dist/migrations/005_lifecycle_cost_subscription.sql

@@ -1,39 +0,0 @@
-ALTER TABLE request_logs ADD COLUMN lifecycle_status TEXT NOT NULL DEFAULT 'pending' CHECK(lifecycle_status IN ('pending', 'completed', 'error', 'aborted'));
-ALTER TABLE request_logs ADD COLUMN cost_status TEXT NOT NULL DEFAULT 'unresolved' CHECK(cost_status IN ('unresolved', 'ok', 'pending', 'unsupported'));
-ALTER TABLE request_logs ADD COLUMN subscription_code TEXT;
-ALTER TABLE request_logs ADD COLUMN finalized_at TEXT;
-ALTER TABLE request_logs ADD COLUMN error_message TEXT;
-
-UPDATE request_logs
-SET lifecycle_status = CASE
-    WHEN incomplete = 1
-      OR error_code IS NOT NULL
-      OR status >= 400 THEN 'error'
-    ELSE 'completed'
-  END,
-  finalized_at = COALESCE(finished_at, started_at),
-  cost_status = CASE
-    WHEN cost_usd > 0 THEN 'ok'
-    ELSE 'pending'
-  END;
-
-CREATE INDEX IF NOT EXISTS idx_request_logs_lifecycle_status
-  ON request_logs(lifecycle_status);
-CREATE INDEX IF NOT EXISTS idx_request_logs_cost_status
-  ON request_logs(cost_status);
-CREATE INDEX IF NOT EXISTS idx_request_logs_subscription_code
-  ON request_logs(subscription_code) WHERE subscription_code IS NOT NULL;
-
-CREATE TABLE IF NOT EXISTS cost_audit (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  request_log_id INTEGER,
-  model TEXT,
-  provider TEXT,
-  source TEXT,
-  base_cost_usd REAL,
-  calc_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  FOREIGN KEY (request_log_id) REFERENCES request_logs(id)
-);
-
-CREATE INDEX IF NOT EXISTS idx_cost_audit_request_log_id
-  ON cost_audit(request_log_id);

package/dist/migrations/006_account_subscriptions.sql

@@ -1,8 +0,0 @@
-CREATE TABLE IF NOT EXISTS account_subscriptions (
-  cliproxy_account TEXT PRIMARY KEY,
-  subscription_code TEXT NOT NULL,
-  bound_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
-);
-
-CREATE INDEX IF NOT EXISTS idx_account_subscriptions_subscription_code
-  ON account_subscriptions(subscription_code);