copilot-api-plus 1.0.40 → 1.0.41

package/dist/{auth-T55-Bhoo.js → auth-BrdL89xk.js}

@@ -15,7 +15,7 @@ function getZenAuthPath() {
 async function saveZenAuth(auth) {
 	await ensurePaths();
 	const authPath = getZenAuthPath();
-	await (await import("node:fs/promises")).writeFile(authPath, JSON.stringify(auth, null, 2), "utf-8");
+	await (await import("node:fs/promises")).writeFile(authPath, JSON.stringify(auth, null, 2), "utf8");
 	consola.success("Zen API key saved to", authPath);
 }
 /**
@@ -30,7 +30,7 @@ async function loadZenAuth() {
 		} catch {
 			return null;
 		}
-		const content = await fs.readFile(authPath, "utf-8");
+		const content = await fs.readFile(authPath);
 		return JSON.parse(content);
 	} catch {
 		return null;
@@ -74,4 +74,4 @@ async function setupZenApiKey(force = false) {
 
 //#endregion
 export { clearZenAuth, getZenAuthPath, loadZenAuth, saveZenAuth, setupZenApiKey };
-//# sourceMappingURL=auth-T55-Bhoo.js.map
+//# sourceMappingURL=auth-BrdL89xk.js.map

package/dist/auth-BrdL89xk.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth-BrdL89xk.js","names":[],"sources":["../src/services/zen/auth.ts"],"sourcesContent":["/**\n * OpenCode Zen Authentication\n *\n * Handles API key authentication for OpenCode Zen.\n * API keys are created at https://opencode.ai/zen\n */\n\nimport consola from \"consola\"\n\nimport { PATHS, ensurePaths } from \"~/lib/paths\"\n\nexport interface ZenAuth {\n  apiKey: string\n}\n\nconst ZEN_AUTH_FILENAME = \"zen-auth.json\"\n\n/**\n * Get the path to the Zen auth file\n */\nexport function getZenAuthPath(): string {\n  return `${PATHS.DATA_DIR}/${ZEN_AUTH_FILENAME}`\n}\n\n/**\n * Save Zen API key to file\n */\nexport async function saveZenAuth(auth: ZenAuth): Promise<void> {\n  await ensurePaths()\n  const authPath = getZenAuthPath()\n  const fs = await import(\"node:fs/promises\")\n  await fs.writeFile(authPath, JSON.stringify(auth, null, 2), \"utf8\")\n  consola.success(\"Zen API key saved to\", authPath)\n}\n\n/**\n * Load Zen API key from file\n */\nexport async function loadZenAuth(): Promise<ZenAuth | null> {\n  try {\n    const authPath = getZenAuthPath()\n    const fs = await import(\"node:fs/promises\")\n\n    // Check if file exists\n    try {\n      await fs.access(authPath)\n    } catch {\n      return null\n    }\n\n    const content = await fs.readFile(authPath)\n    return JSON.parse(content) as ZenAuth\n  } catch {\n    return null\n  }\n}\n\n/**\n * Clear Zen API key\n */\nexport async function clearZenAuth(): Promise<void> {\n  try {\n    const authPath = getZenAuthPath()\n    const fs = await import(\"node:fs/promises\")\n    await fs.unlink(authPath)\n    consola.success(\"Zen API key cleared\")\n  } catch {\n    // File might not exist, ignore\n  }\n}\n\n/**\n * Setup Zen API key interactively\n */\nexport async function setupZenApiKey(force = false): Promise<string> {\n  const existingAuth = await loadZenAuth()\n\n  if (existingAuth && !force) {\n    consola.info(\"Using existing Zen API key\")\n    return existingAuth.apiKey\n  }\n\n  consola.info(\"OpenCode Zen gives you access to all the best coding models\")\n  consola.info(\"Get your API key at: https://opencode.ai/zen\")\n  consola.info(\"\")\n\n  const apiKey = await consola.prompt(\"Enter your OpenCode Zen API key:\", {\n    type: \"text\",\n  })\n\n  if (!apiKey || typeof apiKey !== \"string\") {\n    throw new Error(\"API key is required\")\n  }\n\n  // Validate the API key by fetching models\n  try {\n    const response = await fetch(\"https://opencode.ai/zen/v1/models\", {\n      headers: {\n        Authorization: `Bearer ${apiKey}`,\n      },\n    })\n\n    if (!response.ok) {\n      throw new Error(\n        `Invalid API key: ${response.status} ${response.statusText}`,\n      )\n    }\n\n    consola.success(\"API key validated successfully\")\n  } catch (error) {\n    consola.error(\"Failed to validate API key:\", error)\n    throw error\n  }\n\n  await saveZenAuth({ apiKey })\n  return apiKey\n}\n"],"mappings":";;;;AAeA,MAAM,oBAAoB;;;;AAK1B,SAAgB,iBAAyB;AACvC,QAAO,GAAG,MAAM,SAAS,GAAG;;;;;AAM9B,eAAsB,YAAY,MAA8B;AAC9D,OAAM,aAAa;CACnB,MAAM,WAAW,gBAAgB;AAEjC,QADW,MAAM,OAAO,qBACf,UAAU,UAAU,KAAK,UAAU,MAAM,MAAM,EAAE,EAAE,OAAO;AACnE,SAAQ,QAAQ,wBAAwB,SAAS;;;;;AAMnD,eAAsB,cAAuC;AAC3D,KAAI;EACF,MAAM,WAAW,gBAAgB;EACjC,MAAM,KAAK,MAAM,OAAO;AAGxB,MAAI;AACF,SAAM,GAAG,OAAO,SAAS;UACnB;AACN,UAAO;;EAGT,MAAM,UAAU,MAAM,GAAG,SAAS,SAAS;AAC3C,SAAO,KAAK,MAAM,QAAQ;SACpB;AACN,SAAO;;;;;;AAOX,eAAsB,eAA8B;AAClD,KAAI;EACF,MAAM,WAAW,gBAAgB;AAEjC,SADW,MAAM,OAAO,qBACf,OAAO,SAAS;AACzB,UAAQ,QAAQ,sBAAsB;SAChC;;;;;AAQV,eAAsB,eAAe,QAAQ,OAAwB;CACnE,MAAM,eAAe,MAAM,aAAa;AAExC,KAAI,gBAAgB,CAAC,OAAO;AAC1B,UAAQ,KAAK,6BAA6B;AAC1C,SAAO,aAAa;;AAGtB,SAAQ,KAAK,8DAA8D;AAC3E,SAAQ,KAAK,+CAA+C;AAC5D,SAAQ,KAAK,GAAG;CAEhB,MAAM,SAAS,MAAM,QAAQ,OAAO,oCAAoC,EACtE,MAAM,QACP,CAAC;AAEF,KAAI,CAAC,UAAU,OAAO,WAAW,SAC/B,OAAM,IAAI,MAAM,sBAAsB;AAIxC,KAAI;EACF,MAAM,WAAW,MAAM,MAAM,qCAAqC,EAChE,SAAS,EACP,eAAe,UAAU,UAC1B,EACF,CAAC;AAEF,MAAI,CAAC,SAAS,GACZ,OAAM,IAAI,MACR,oBAAoB,SAAS,OAAO,GAAG,SAAS,aACjD;AAGH,UAAQ,QAAQ,iCAAiC;UAC1C,OAAO;AACd,UAAQ,MAAM,+BAA+B,MAAM;AACnD,QAAM;;AAGR,OAAM,YAAY,EAAE,QAAQ,CAAC;AAC7B,QAAO"}

package/dist/{auth-CCwbOOQN.js → auth-pRwfByMF.js}

@@ -1,4 +1,4 @@
 import "./paths-CVYLp61D.js";
-import { clearZenAuth, getZenAuthPath, loadZenAuth, saveZenAuth, setupZenApiKey } from "./auth-T55-Bhoo.js";
+import { clearZenAuth, getZenAuthPath, loadZenAuth, saveZenAuth, setupZenApiKey } from "./auth-BrdL89xk.js";
 
 export { loadZenAuth, setupZenApiKey };

package/dist/main.js

@@ -3,9 +3,9 @@ import { PATHS, ensurePaths } from "./paths-CVYLp61D.js";
 import { state } from "./state-CcLGr8VN.js";
 import { GITHUB_API_BASE_URL, copilotBaseUrl, copilotHeaders, githubHeaders } from "./get-user-BzIEATcF.js";
 import { HTTPError, forwardError } from "./error-CvU5otz-.js";
-import { cacheModels, cacheVSCodeVersion, clearGithubToken, isNullish, setupCopilotToken, setupGitHubToken, sleep } from "./token-ClgudjZm.js";
+import { cacheModels, cacheVSCodeVersion, clearGithubToken, findModel, isNullish, setupCopilotToken, setupGitHubToken, sleep } from "./token-B777vbx8.js";
 import { clearAntigravityAuth, disableCurrentAccount, getAntigravityAuthPath, getApiKey, getCurrentProjectId, getValidAccessToken, rotateAccount } from "./auth-CWGl6kMf.js";
-import { clearZenAuth, getZenAuthPath } from "./auth-T55-Bhoo.js";
+import { clearZenAuth, getZenAuthPath } from "./auth-BrdL89xk.js";
 import { getAntigravityModels, getAntigravityUsage, isThinkingModel } from "./get-models-uEbEgq0L.js";
 import { createRequire } from "node:module";
 import { defineCommand, runMain } from "citty";
@@ -2957,9 +2957,12 @@ const createChatCompletions = async (payload) => {
 //#region src/routes/chat-completions/handler.ts
 /**
 * Calculate token count, log it, and auto-truncate if needed.
+*
+* Uses multi-strategy exact matching via findModel() to handle
+* mismatches between requested and available model names.
 */
 async function processPayloadTokens(payload) {
-	const selectedModel = state.models?.data.find((model) => model.id === payload.model);
+	const selectedModel = findModel(payload.model);
 	if (!selectedModel) {
 		consola.warn("No model selected, skipping token count calculation");
 		return payload;
@@ -3085,14 +3088,6 @@ function translateModelName(model) {
 		"claude-3-5-haiku": "claude-haiku-4.5",
 		"claude-3-haiku": "claude-haiku-4.5"
 	})) if (modelBase.startsWith(oldFormat) && supportedModels.includes(newFormat)) return newFormat;
-	let modelFamily = null;
-	if (model.includes("opus")) modelFamily = "opus";
-	else if (model.includes("sonnet")) modelFamily = "sonnet";
-	else if (model.includes("haiku")) modelFamily = "haiku";
-	if (modelFamily) {
-		const familyModel = supportedModels.find((m) => m.includes(modelFamily));
-		if (familyModel) return familyModel;
-	}
 	return model;
 }
 function translateAnthropicMessagesToOpenAI(anthropicMessages, system) {
@@ -3260,16 +3255,21 @@ function getAnthropicToolUseBlocks(toolCalls) {
 //#endregion
 //#region src/routes/messages/count-tokens-handler.ts
 /**
-* Handles token counting for Anthropic messages
+* Handles token counting for Anthropic messages.
+*
+* Uses multi-strategy model matching:
+* 1. findModel(translatedName) — translated Copilot name with format variants
+* 2. findModel(originalName) — original Anthropic name with format variants
 */
 async function handleCountTokens(c) {
 	try {
 		const anthropicBeta = c.req.header("anthropic-beta");
 		const anthropicPayload = await c.req.json();
 		const openAIPayload = translateToOpenAI(anthropicPayload);
-		const selectedModel = state.models?.data.find((model) => model.id === anthropicPayload.model);
+		const translatedModelName = translateModelName(anthropicPayload.model);
+		const selectedModel = findModel(translatedModelName) ?? findModel(anthropicPayload.model);
 		if (!selectedModel) {
-			consola.warn("Model not found, returning default token count");
+			consola.warn(`Model not found for "${anthropicPayload.model}" (translated: "${translatedModelName}"), returning default token count`);
 			return c.json({ input_tokens: 1 });
 		}
 		const tokenCount = await getTokenCount(openAIPayload, selectedModel);
@@ -3420,9 +3420,12 @@ function translateChunkToAnthropicEvents(chunk, state$1) {
 //#region src/routes/messages/handler.ts
 /**
 * Auto-truncate OpenAI payload if prompt tokens exceed model limit.
+*
+* Uses multi-strategy exact matching via findModel() to handle
+* mismatches between Anthropic and Copilot model naming conventions.
 */
 async function autoTruncatePayload(payload) {
-	const selectedModel = state.models?.data.find((model) => model.id === payload.model);
+	const selectedModel = findModel(payload.model);
 	if (!selectedModel) {
 		consola.warn("No model selected for Anthropic endpoint, skipping auto-truncation");
 		return payload;
@@ -3982,7 +3985,7 @@ async function runServer(options$1) {
 			state.zenApiKey = options$1.zenApiKey;
 			consola.info("Using provided Zen API key");
 		} else {
-			const { setupZenApiKey, loadZenAuth } = await import("./auth-CCwbOOQN.js");
+			const { setupZenApiKey, loadZenAuth } = await import("./auth-pRwfByMF.js");
 			const existingAuth = await loadZenAuth();
 			if (existingAuth) {
 				state.zenApiKey = existingAuth.apiKey;
@@ -4002,7 +4005,7 @@ async function runServer(options$1) {
 		}
 		if (hasApiKey()) {
 			consola.info("Using Gemini API Key for authentication (from GEMINI_API_KEY)");
-			consola.info("API Key: " + getApiKey$1()?.slice(0, 10) + "...");
+			consola.info(`API Key: ${getApiKey$1()?.slice(0, 10) ?? ""}...`);
 		} else {
 			const existingAuth = await loadAntigravityAuth();
 			if (!existingAuth || existingAuth.accounts.length === 0) {
@@ -4048,7 +4051,7 @@ async function runServer(options$1) {
 			const { HTTPError: HTTPError$1 } = await import("./error-CsShqJjE.js");
 			if (error instanceof HTTPError$1 && error.response.status === 401) {
 				consola.error("Failed to get Copilot token - GitHub token may be invalid or Copilot access revoked");
-				const { clearGithubToken: clearGithubToken$1 } = await import("./token-sYqHiHEd.js");
+				const { clearGithubToken: clearGithubToken$1 } = await import("./token-CCg0yU7a.js");
 				await clearGithubToken$1();
 				consola.info("Please restart to re-authenticate");
 			}