Skip to content

Use Claude Code with your ChatGPT, Kimi, Cursor or Grok subscription via a local Anthropic-compatible proxy

Rust

extract provider auth CLI handlers

Raine Virta4f99f9d1f6d4
diff --git a/src/providers/codex/cli.ts b/src/providers/codex/cli.ts
new file mode 100644
index 0000000..9030714
--- /dev/null
+++ b/src/providers/codex/cli.ts
@@ -0,0 +1,35 @@
+import type { CliHandlers } from "../types.ts";
+import { runDeviceLogin } from "./auth/device.ts";
+import { persistInitialTokens } from "./auth/manager.ts";
+import { runBrowserLogin } from "./auth/pkce.ts";
+import { authPath, clearAuth, loadAuth } from "./auth/token-store.ts";
+
+export const codexCli: CliHandlers = {
+ async login() {
+ const tokens = await runBrowserLogin();
+ const saved = await persistInitialTokens(tokens);
+ console.log(`Auth saved in ${authPath()}`);
+ if (saved.accountId) console.log(`Account: ${saved.accountId}`);
+ },
+ async device() {
+ const tokens = await runDeviceLogin();
+ const saved = await persistInitialTokens(tokens);
+ console.log(`Auth saved in ${authPath()}`);
+ if (saved.accountId) console.log(`Account: ${saved.accountId}`);
+ },
+ async status() {
+ const auth = await loadAuth();
+ if (!auth) {
+ console.log("Not authenticated");
+ process.exit(1);
+ }
+ const ms = auth.expires - Date.now();
+ console.log(`Account: ${auth.accountId ?? "(none)"}`);
+ console.log(`Expires: ${new Date(auth.expires).toISOString()} (in ${Math.floor(ms / 1000)}s)`);
+ console.log(`Storage: ${authPath()}`);
+ },
+ async logout() {
+ await clearAuth();
+ console.log("Logged out");
+ },
+};
diff --git a/src/providers/codex/index.ts b/src/providers/codex/index.ts
index 31f6ee6..d49c5cb 100644
--- a/src/providers/codex/index.ts
+++ b/src/providers/codex/index.ts
@@ -1,6 +1,6 @@
import type { AnthropicRequest } from "../../anthropic/schema.ts";
import { wantsDownstreamStream } from "../../anthropic/stream.ts";
-import type { Provider, RequestContext, CliHandlers } from "../types.ts";
+import type { Provider, RequestContext } from "../types.ts";
import {
anthropicErrorBody,
jsonError,
@@ -21,12 +21,9 @@ import { mapUsageToAnthropic } from "./translate/reducer.ts";
import { CodexError, postCodex } from "./client.ts";
import { countTokens, countTranslatedTokens } from "./count-tokens.ts";
import { summarizeCodexRequestSize, type CodexRequestSizeSummary } from "./request-summary.ts";
-import { runBrowserLogin } from "./auth/pkce.ts";
-import { runDeviceLogin } from "./auth/device.ts";
-import { persistInitialTokens } from "./auth/manager.ts";
-import { loadAuth, authPath, clearAuth } from "./auth/token-store.ts";
import { codexPreviousResponseId, logVerbose } from "../../config.ts";
import { clearContinuation, continuationCandidate, recordContinuation } from "./continuation.ts";
+import { codexCli } from "./cli.ts";
interface SessionCountSnapshot {
reqId: string;
@@ -429,40 +426,10 @@ async function handleMessages(body: AnthropicRequest, ctx: RequestContext): Prom
}
}
-const cli: CliHandlers = {
- async login() {
- const tokens = await runBrowserLogin();
- const saved = await persistInitialTokens(tokens);
- console.log(`Auth saved in ${authPath()}`);
- if (saved.accountId) console.log(`Account: ${saved.accountId}`);
- },
- async device() {
- const tokens = await runDeviceLogin();
- const saved = await persistInitialTokens(tokens);
- console.log(`Auth saved in ${authPath()}`);
- if (saved.accountId) console.log(`Account: ${saved.accountId}`);
- },
- async status() {
- const auth = await loadAuth();
- if (!auth) {
- console.log("Not authenticated");
- process.exit(1);
- }
- const ms = auth.expires - Date.now();
- console.log(`Account: ${auth.accountId ?? "(none)"}`);
- console.log(`Expires: ${new Date(auth.expires).toISOString()} (in ${Math.floor(ms / 1000)}s)`);
- console.log(`Storage: ${authPath()}`);
- },
- async logout() {
- await clearAuth();
- console.log("Logged out");
- },
-};
-
export const codexProvider: Provider = {
name: "codex",
supportedModels: new Set([...ALLOWED_MODELS, ...FAST_MODEL_ALIASES]),
handleMessages,
handleCountTokens,
- cli,
+ cli: codexCli,
};
diff --git a/src/providers/cursor/cli.ts b/src/providers/cursor/cli.ts
new file mode 100644
index 0000000..970dcba
--- /dev/null
+++ b/src/providers/cursor/cli.ts
@@ -0,0 +1,44 @@
+import type { CliHandlers } from "../types.ts";
+import { runCursorLogin } from "./auth/login.ts";
+import {
+ clearCursorAuth,
+ cursorAuthLocation,
+ loadCursorAuth,
+ missingAuthMessage,
+} from "./auth/token-store.ts";
+
+export const cursorCli: CliHandlers = {
+ async login() {
+ const auth = await runCursorLogin();
+ if (!auth) {
+ console.error("Cursor login did not complete.");
+ process.exit(1);
+ }
+ console.log();
+ console.log(`Logged in. Storage: ${auth.source}`);
+ if (auth.email) console.log(`Email: ${auth.email}`);
+ if (auth.userId) console.log(`User: ${auth.userId}`);
+ if (auth.expires) console.log(`Expires: ${new Date(auth.expires).toISOString()}`);
+ },
+ async status() {
+ const auth = await loadCursorAuth();
+ if (!auth) {
+ console.log("Not authenticated");
+ console.log(missingAuthMessage());
+ process.exit(1);
+ }
+ console.log(`Storage: ${auth.source}`);
+ if (auth.email) console.log(`Email: ${auth.email}`);
+ if (auth.userId) console.log(`User: ${auth.userId}`);
+ if (auth.expires) {
+ const ms = auth.expires - Date.now();
+ console.log(`Expires: ${new Date(auth.expires).toISOString()} (in ${Math.floor(ms / 1000)}s)`);
+ } else {
+ console.log("Expires: unknown");
+ }
+ },
+ async logout() {
+ await clearCursorAuth();
+ console.log(`Cleared Cursor auth from ${cursorAuthLocation()}`);
+ },
+};
diff --git a/src/providers/cursor/index.ts b/src/providers/cursor/index.ts
index 15f58af..84382ac 100644
--- a/src/providers/cursor/index.ts
+++ b/src/providers/cursor/index.ts
@@ -2,7 +2,7 @@ import type { AnthropicRequest } from "../../anthropic/schema.ts";
import { wantsDownstreamStream } from "../../anthropic/stream.ts";
import { jsonError, jsonResponse, sseResponse } from "../../anthropic/response.ts";
import { logVerbose } from "../../config.ts";
-import type { CliHandlers, Provider, RequestContext } from "../types.ts";
+import type { Provider, RequestContext } from "../types.ts";
import {
CursorError,
runCursorAgent,
@@ -14,9 +14,7 @@ import {
expiredAuthMessage,
loadCursorAuth,
missingAuthMessage,
- clearCursorAuth,
} from "./auth/token-store.ts";
-import { runCursorLogin } from "./auth/login.ts";
import { renderCursorPrompt } from "./translate/request.ts";
import { CURSOR_SUPPORTED_MODELS, resolveCursorModel } from "./translate/model.ts";
import {
@@ -34,6 +32,7 @@ import {
} from "./tool-bridge.ts";
import type { CursorAuth } from "./auth/token-store.ts";
import type { CursorProto } from "./proto-loader.ts";
+import { cursorCli } from "./cli.ts";
const AUTH_EXPIRY_SKEW_MS = 60_000;
@@ -159,49 +158,13 @@ async function handleMessages(
}
}
-const cli: CliHandlers = {
- async login() {
- const auth = await runCursorLogin();
- if (!auth) {
- console.error("Cursor login did not complete.");
- process.exit(1);
- }
- console.log();
- console.log(`Logged in. Storage: ${auth.source}`);
- if (auth.email) console.log(`Email: ${auth.email}`);
- if (auth.userId) console.log(`User: ${auth.userId}`);
- if (auth.expires) console.log(`Expires: ${new Date(auth.expires).toISOString()}`);
- },
- async status() {
- const auth = await loadCursorAuth();
- if (!auth) {
- console.log("Not authenticated");
- console.log(missingAuthMessage());
- process.exit(1);
- }
- console.log(`Storage: ${auth.source}`);
- if (auth.email) console.log(`Email: ${auth.email}`);
- if (auth.userId) console.log(`User: ${auth.userId}`);
- if (auth.expires) {
- const ms = auth.expires - Date.now();
- console.log(`Expires: ${new Date(auth.expires).toISOString()} (in ${Math.floor(ms / 1000)}s)`);
- } else {
- console.log("Expires: unknown");
- }
- },
- async logout() {
- await clearCursorAuth();
- console.log(`Cleared Cursor auth from ${cursorAuthLocation()}`);
- },
-};
-
export function createCursorProvider(deps: CursorProviderDeps = defaultDeps): Provider {
return {
name: "cursor",
supportedModels: CURSOR_SUPPORTED_MODELS,
handleMessages: (body, ctx) => handleMessages(body, ctx, deps),
handleCountTokens,
- cli,
+ cli: cursorCli,
};
}
diff --git a/src/providers/kimi/cli.ts b/src/providers/kimi/cli.ts
new file mode 100644
index 0000000..7583845
--- /dev/null
+++ b/src/providers/kimi/cli.ts
@@ -0,0 +1,31 @@
+import type { CliHandlers } from "../types.ts";
+import { runDeviceLogin } from "./auth/login.ts";
+import { persistInitialTokens } from "./auth/manager.ts";
+import { authPath, clearAuth, loadAuth } from "./auth/token-store.ts";
+
+export const kimiCli: CliHandlers = {
+ async login() {
+ const tokens = await runDeviceLogin();
+ const saved = await persistInitialTokens(tokens);
+ console.log(`Auth saved in ${authPath()}`);
+ if (saved.userId) console.log(`User: ${saved.userId}`);
+ const secs = Math.floor((saved.expires - Date.now()) / 1000);
+ console.log(`Expires in ${secs}s`);
+ },
+ async status() {
+ const auth = await loadAuth();
+ if (!auth) {
+ console.log("Not authenticated");
+ process.exit(1);
+ }
+ const ms = auth.expires - Date.now();
+ console.log(`User: ${auth.userId ?? "(none)"}`);
+ console.log(`Expires: ${new Date(auth.expires).toISOString()} (in ${Math.floor(ms / 1000)}s)`);
+ console.log(`Scope: ${auth.scope ?? "(none)"}`);
+ console.log(`Storage: ${authPath()}`);
+ },
+ async logout() {
+ await clearAuth();
+ console.log("Logged out");
+ },
+};
diff --git a/src/providers/kimi/index.ts b/src/providers/kimi/index.ts
index 564f150..d09c5b3 100644
--- a/src/providers/kimi/index.ts
+++ b/src/providers/kimi/index.ts
@@ -1,4 +1,4 @@
-import type { Provider, CliHandlers, RequestContext } from "../types.ts";
+import type { Provider, RequestContext } from "../types.ts";
import type { AnthropicRequest } from "../../anthropic/schema.ts";
import { wantsDownstreamStream } from "../../anthropic/stream.ts";
import {
@@ -18,10 +18,8 @@ import { accumulateResponse, UpstreamStreamError } from "./translate/accumulate.
import { mapUsageToAnthropic } from "./translate/reducer.ts";
import { countTokens, countTranslatedTokens } from "./count-tokens.ts";
import { KimiError, postKimi } from "./client.ts";
-import { runDeviceLogin } from "./auth/login.ts";
-import { persistInitialTokens } from "./auth/manager.ts";
-import { loadAuth, clearAuth, authPath } from "./auth/token-store.ts";
import { logVerbose } from "../../config.ts";
+import { kimiCli } from "./cli.ts";
async function handleCountTokens(body: AnthropicRequest, ctx: RequestContext): Promise<Response> {
const log = ctx.childLogger("provider.kimi");
@@ -158,37 +156,10 @@ async function handleMessages(body: AnthropicRequest, ctx: RequestContext): Prom
}
}
-const cli: CliHandlers = {
- async login() {
- const tokens = await runDeviceLogin();
- const saved = await persistInitialTokens(tokens);
- console.log(`Auth saved in ${authPath()}`);
- if (saved.userId) console.log(`User: ${saved.userId}`);
- const secs = Math.floor((saved.expires - Date.now()) / 1000);
- console.log(`Expires in ${secs}s`);
- },
- async status() {
- const auth = await loadAuth();
- if (!auth) {
- console.log("Not authenticated");
- process.exit(1);
- }
- const ms = auth.expires - Date.now();
- console.log(`User: ${auth.userId ?? "(none)"}`);
- console.log(`Expires: ${new Date(auth.expires).toISOString()} (in ${Math.floor(ms / 1000)}s)`);
- console.log(`Scope: ${auth.scope ?? "(none)"}`);
- console.log(`Storage: ${authPath()}`);
- },
- async logout() {
- await clearAuth();
- console.log("Logged out");
- },
-};
-
export const kimiProvider: Provider = {
name: "kimi",
supportedModels: new Set(["kimi-for-coding", "kimi-k2.6", "k2.6"]),
handleMessages,
handleCountTokens,
- cli,
+ cli: kimiCli,
};
diff --git a/src/providers/registry.test.ts b/src/providers/registry.test.ts
index 85a821e..0e432dc 100644
--- a/src/providers/registry.test.ts
+++ b/src/providers/registry.test.ts
@@ -5,6 +5,7 @@ import { join } from "node:path";
import {
allSupportedModels,
ANTHROPIC_STYLE_ALIASES,
+ getProvider,
groupSupportedModelsByProvider,
normalizeIncomingModel,
providerForModel,
@@ -123,4 +124,27 @@ describe("provider routing", () => {
expect(cursorModels).toContain("cursor-plan");
expect(cursorModels).toContain("composer-2.5-fast");
});
+
+ it("keeps auth CLI commands available through the registry", () => {
+ const codex = getProvider("codex").cli;
+ expect(Object.keys(codex).sort()).toEqual(["device", "login", "logout", "status"]);
+ expect(typeof codex.login).toBe("function");
+ expect(typeof codex.device).toBe("function");
+ expect(typeof codex.status).toBe("function");
+ expect(typeof codex.logout).toBe("function");
+
+ const kimi = getProvider("kimi").cli;
+ expect(Object.keys(kimi).sort()).toEqual(["login", "logout", "status"]);
+ expect(typeof kimi.login).toBe("function");
+ expect(kimi.device).toBeUndefined();
+ expect(typeof kimi.status).toBe("function");
+ expect(typeof kimi.logout).toBe("function");
+
+ const cursor = getProvider("cursor").cli;
+ expect(Object.keys(cursor).sort()).toEqual(["login", "logout", "status"]);
+ expect(typeof cursor.login).toBe("function");
+ expect(cursor.device).toBeUndefined();
+ expect(typeof cursor.status).toBe("function");
+ expect(typeof cursor.logout).toBe("function");
+ });
});