@hsupu/copilot-api 0.7.9 → 0.7.10

package/dist/main.js

@@ -558,15 +558,12 @@ const SUPPORTED_VERSIONS = {
 		min: "2.0.0",
 		max: "2.1.10"
 	},
-	v2b: {
-		min: "2.1.11",
-		max: "2.1.12"
-	}
+	v2b: { min: "2.1.11" }
 };
 const PATTERNS = {
 	funcOriginal: /function HR\(A\)\{if\(A\.includes\("\[1m\]"\)\)return 1e6;return 200000\}/,
 	funcPatched: /function HR\(A\)\{if\(A\.includes\("\[1m\]"\)\)return 1e6;return \d+\}/,
-	variable: /var BS9=(\d+)/
+	variable: /var ([A-Za-z_$]\w*)=(\d+)(?=,\w+=20000,)/
 };
 /**
 * Parse semver version string to comparable parts
@@ -592,14 +589,14 @@ function compareVersions(a, b) {
 }
 function getPatternTypeForVersion(version$1) {
 	if (compareVersions(version$1, SUPPORTED_VERSIONS.v2a.min) >= 0 && compareVersions(version$1, SUPPORTED_VERSIONS.v2a.max) <= 0) return "func";
-	if (compareVersions(version$1, SUPPORTED_VERSIONS.v2b.min) >= 0 && compareVersions(version$1, SUPPORTED_VERSIONS.v2b.max) <= 0) return "variable";
+	if (compareVersions(version$1, SUPPORTED_VERSIONS.v2b.min) >= 0) return "variable";
 	return null;
 }
 /**
 * Get supported version range string for error messages
 */
 function getSupportedRangeString() {
-	return `${SUPPORTED_VERSIONS.v2a.min}-${SUPPORTED_VERSIONS.v2a.max}, ${SUPPORTED_VERSIONS.v2b.min}-${SUPPORTED_VERSIONS.v2b.max}`;
+	return `${SUPPORTED_VERSIONS.v2a.min}-${SUPPORTED_VERSIONS.v2a.max}, ${SUPPORTED_VERSIONS.v2b.min}+`;
 }
 /**
 * Get Claude Code version from package.json
@@ -632,9 +629,9 @@ function findInVoltaTools(voltaHome) {
 	return paths;
 }
 /**
-* Find Claude Code CLI path by checking common locations
+* Find all Claude Code CLI paths by checking common locations
 */
-function findClaudeCodePath() {
+function findAllClaudeCodePaths() {
 	const possiblePaths = [];
 	const home = process.env.HOME || "";
 	const voltaHome = process.env.VOLTA_HOME || join(home, ".volta");
@@ -649,22 +646,41 @@ function findClaudeCodePath() {
 	for (const base of globalPaths) possiblePaths.push(join(base, "@anthropic-ai", "claude-code", "cli.js"));
 	const bunGlobal = join(home, ".bun", "install", "global");
 	if (existsSync(bunGlobal)) possiblePaths.push(join(bunGlobal, "node_modules", "@anthropic-ai", "claude-code", "cli.js"));
-	return possiblePaths.find((p) => existsSync(p)) ?? null;
+	return [...new Set(possiblePaths.filter((p) => existsSync(p)))];
 }
 /**
-* Get current context limit from Claude Code
+* Get installation info for a CLI path
 */
-function getCurrentLimit(content) {
+function getInstallationInfo(cliPath) {
+	const version$1 = getClaudeCodeVersion(cliPath);
+	const content = readFileSync(cliPath, "utf8");
+	const limit = getCurrentLimit(content);
+	return {
+		path: cliPath,
+		version: version$1,
+		limit
+	};
+}
+function getCurrentLimitInfo(content) {
 	const varMatch = content.match(PATTERNS.variable);
-	if (varMatch) return Number.parseInt(varMatch[1], 10);
+	if (varMatch) return {
+		limit: Number.parseInt(varMatch[2], 10),
+		varName: varMatch[1]
+	};
 	const funcMatch = content.match(PATTERNS.funcPatched);
 	if (funcMatch) {
 		const limitMatch = funcMatch[0].match(/return (\d+)\}$/);
-		return limitMatch ? Number.parseInt(limitMatch[1], 10) : null;
+		return limitMatch ? { limit: Number.parseInt(limitMatch[1], 10) } : null;
 	}
 	return null;
 }
 /**
+* Get current context limit from Claude Code (legacy wrapper)
+*/
+function getCurrentLimit(content) {
+	return getCurrentLimitInfo(content)?.limit ?? null;
+}
+/**
 * Check if Claude Code version is supported for patching
 */
 function checkVersionSupport(cliPath) {
@@ -696,22 +712,25 @@ function patchClaudeCode(cliPath, newLimit) {
 	const versionCheck = checkVersionSupport(cliPath);
 	if (!versionCheck.supported) {
 		consola.error(versionCheck.error);
-		return false;
+		return "failed";
 	}
 	consola.info(`Claude Code version: ${versionCheck.version}`);
-	if (getCurrentLimit(content) === newLimit) {
-		consola.info(`Already patched with limit ${newLimit}`);
-		return true;
-	}
+	const limitInfo = getCurrentLimitInfo(content);
+	if (limitInfo?.limit === newLimit) return "already_patched";
 	let newContent;
-	if (versionCheck.patternType === "variable") newContent = content.replace(PATTERNS.variable, `var BS9=${newLimit}`);
-	else {
+	if (versionCheck.patternType === "variable") {
+		if (!limitInfo?.varName) {
+			consola.error("Could not detect variable name for patching");
+			return "failed";
+		}
+		newContent = content.replace(PATTERNS.variable, `var ${limitInfo.varName}=${newLimit}`);
+	} else {
 		const replacement = `function HR(A){if(A.includes("[1m]"))return 1e6;return ${newLimit}}`;
 		const pattern = PATTERNS.funcOriginal.test(content) ? PATTERNS.funcOriginal : PATTERNS.funcPatched;
 		newContent = content.replace(pattern, replacement);
 	}
 	writeFileSync(cliPath, newContent);
-	return true;
+	return "success";
 }
 /**
 * Restore Claude Code to original 200k limit
@@ -724,13 +743,19 @@ function restoreClaudeCode(cliPath) {
 		return false;
 	}
 	consola.info(`Claude Code version: ${versionCheck.version}`);
-	if (getCurrentLimit(content) === 2e5) {
+	const limitInfo = getCurrentLimitInfo(content);
+	if (limitInfo?.limit === 2e5) {
 		consola.info("Already at original 200000 limit");
 		return true;
 	}
 	let newContent;
-	if (versionCheck.patternType === "variable") newContent = content.replace(PATTERNS.variable, "var BS9=200000");
-	else newContent = content.replace(PATTERNS.funcPatched, "function HR(A){if(A.includes(\"[1m]\"))return 1e6;return 200000}");
+	if (versionCheck.patternType === "variable") {
+		if (!limitInfo?.varName) {
+			consola.error("Could not detect variable name for restoring");
+			return false;
+		}
+		newContent = content.replace(PATTERNS.variable, `var ${limitInfo.varName}=200000`);
+	} else newContent = content.replace(PATTERNS.funcPatched, "function HR(A){if(A.includes(\"[1m]\"))return 1e6;return 200000}");
 	writeFileSync(cliPath, newContent);
 	return true;
 }
@@ -739,7 +764,7 @@ function showStatus(cliPath, currentLimit) {
 	if (version$1) consola.info(`Claude Code version: ${version$1}`);
 	if (currentLimit === null) {
 		consola.warn("Could not detect current limit - CLI may have been updated");
-		consola.info("Look for the BS9 variable or HR function pattern in cli.js");
+		consola.info("Look for a variable like 'var XXX=200000' followed by ',YYY=20000,' in cli.js");
 	} else if (currentLimit === 2e5) consola.info("Status: Original (200k context window)");
 	else consola.info(`Status: Patched (${currentLimit} context window)`);
 }
@@ -773,17 +798,42 @@ const patchClaude = defineCommand({
 			description: "Show current patch status without modifying"
 		}
 	},
-	run({ args }) {
-		const cliPath = args.path || findClaudeCodePath();
-		if (!cliPath) {
-			consola.error("Could not find Claude Code installation");
-			consola.info("Searched in: volta, npm global, bun global");
-			consola.info("Use --path to specify the path to cli.js manually");
-			process.exit(1);
-		}
-		if (!existsSync(cliPath)) {
-			consola.error(`File not found: ${cliPath}`);
-			process.exit(1);
+	async run({ args }) {
+		let cliPath;
+		if (args.path) {
+			cliPath = args.path;
+			if (!existsSync(cliPath)) {
+				consola.error(`File not found: ${cliPath}`);
+				process.exit(1);
+			}
+		} else {
+			const installations = findAllClaudeCodePaths();
+			if (installations.length === 0) {
+				consola.error("Could not find Claude Code installation");
+				consola.info("Searched in: volta, npm global, bun global");
+				consola.info("Use --path to specify the path to cli.js manually");
+				process.exit(1);
+			}
+			if (installations.length === 1) cliPath = installations[0];
+			else {
+				consola.info(`Found ${installations.length} Claude Code installations:`);
+				const options = installations.map((path$1) => {
+					const info = getInstallationInfo(path$1);
+					let status = "unknown";
+					if (info.limit === 2e5) status = "original";
+					else if (info.limit) status = `patched: ${info.limit}`;
+					return {
+						label: `v${info.version ?? "?"} (${status}) - ${path$1}`,
+						value: path$1
+					};
+				});
+				const selected = await consola.prompt("Select installation to patch:", {
+					type: "select",
+					options
+				});
+				if (typeof selected === "symbol") process.exit(0);
+				cliPath = selected;
+			}
 		}
 		consola.info(`Claude Code path: ${cliPath}`);
 		const content = readFileSync(cliPath, "utf8");
@@ -806,13 +856,14 @@ const patchClaude = defineCommand({
 			consola.error("Invalid limit value. Must be a number >= 1000");
 			process.exit(1);
 		}
-		if (patchClaudeCode(cliPath, limit)) {
-			consola.success(`Patched context window: 200000 → ${limit}`);
+		const result = patchClaudeCode(cliPath, limit);
+		if (result === "success") {
+			consola.success(`Patched context window: ${currentLimit ?? 2e5} → ${limit}`);
 			consola.info("Note: You may need to re-run this after Claude Code updates");
-		} else {
+		} else if (result === "already_patched") consola.success(`Already patched with limit ${limit}`);
+		else {
 			consola.error("Failed to patch - pattern not found");
 			consola.info("Claude Code may have been updated to a new version");
-			consola.info("Check the cli.js for the HR function pattern");
 			process.exit(1);
 		}
 	}
@@ -821,7 +872,7 @@ const patchClaude = defineCommand({
 //#endregion
 //#region package.json
 var name = "@hsupu/copilot-api";
-var version = "0.7.9";
+var version = "0.7.10";
 var description = "Turn GitHub Copilot into OpenAI/Anthropic API compatible server. Usable with Claude Code!";
 var keywords = [
 	"proxy",
@@ -4109,16 +4160,33 @@ function translateAnthropicMessagesToOpenAI(anthropicMessages, system, toolNameM
 	const otherMessages = anthropicMessages.flatMap((message) => message.role === "user" ? handleUserMessage(message) : handleAssistantMessage(message, toolNameMapping));
 	return [...systemMessages, ...otherMessages];
 }
+const RESERVED_KEYWORDS = ["x-anthropic-billing-header"];
+/**
+* Filter out reserved keywords from system prompt text.
+* Copilot API rejects requests containing these keywords.
+* Removes the entire line containing the keyword to keep the prompt clean.
+*/
+function filterReservedKeywords(text) {
+	let filtered = text;
+	for (const keyword of RESERVED_KEYWORDS) if (text.includes(keyword)) {
+		consola.debug(`[Reserved Keyword] Removing line containing "${keyword}"`);
+		filtered = filtered.split("\n").filter((line) => !line.includes(keyword)).join("\n");
+	}
+	return filtered;
+}
 function handleSystemPrompt(system) {
 	if (!system) return [];
 	if (typeof system === "string") return [{
 		role: "system",
-		content: system
-	}];
-	else return [{
-		role: "system",
-		content: system.map((block) => block.text).join("\n\n")
+		content: filterReservedKeywords(system)
 	}];
+	else {
+		const systemText = system.map((block) => block.text).join("\n\n");
+		return [{
+			role: "system",
+			content: filterReservedKeywords(systemText)
+		}];
+	}
 }
 function handleUserMessage(message) {
 	const newMessages = [];