copilot-api-plus 1.2.42 → 1.2.44

package/dist/main.js

@@ -1861,6 +1861,16 @@ function isToolChoiceForced(toolChoice) {
 * /models endpoint doesn't expose thinking budget fields.
 */
 function injectThinking(payload, resolvedModel) {
+	if (isToolChoiceForced(payload.tool_choice)) {
+		if (payload.reasoning_effort || payload.thinking_budget) {
+			const stripped = { ...payload };
+			delete stripped.reasoning_effort;
+			delete stripped.thinking_budget;
+			consola.debug(`Thinking: stripped reasoning params for "${resolvedModel}" because tool_choice forces tool use`);
+			return stripped;
+		}
+		return payload;
+	}
 	if (payload.reasoning_effort || payload.thinking_budget) {
 		if (payload.reasoning_effort && payload.reasoning_effort !== "medium" && payload.reasoning_effort !== "low") {
 			const cap = reasoningEffortCap.get(resolvedModel);
@@ -1871,7 +1881,6 @@ function injectThinking(payload, resolvedModel) {
 		}
 		return payload;
 	}
-	if (isToolChoiceForced(payload.tool_choice)) return payload;
 	const budget = getThinkingBudget(findModel(resolvedModel));
 	if (budget) return {
 		...payload,
@@ -2013,7 +2022,8 @@ async function createWithSingleAccount(payload) {
 	}
 	if (!response.ok) {
 		const errorBody = await response.text();
-		if (response.status === 400) consola.warn(`400: ${errorBody}`);
+		if (response.status === 400) if (errorBody.includes("reasoning_effort") || errorBody.includes("invalid_reasoning_effort") || errorBody.includes("does not support reasoning")) consola.debug(`400 (auto-handled): ${errorBody}`);
+		else consola.warn(`400: ${errorBody}`);
 		else consola.error("Failed to create chat completions", {
 			status: response.status,
 			statusText: response.statusText,
@@ -2061,6 +2071,15 @@ async function tryDowngradeReasoningEffort(errMsg, retryContext, accountId) {
 	}
 }
 /**
+* Whether a 400 error is caused by the request itself (model unavailable,
+* invalid params, etc.) rather than the account. These should NOT trigger
+* account disabling or rotation — rotating to another account would just
+* waste credits hitting the same error.
+*/
+function isNonAccountError(errMsg) {
+	return errMsg.includes("model_not_supported") || errMsg.includes("The requested model is not supported") || errMsg.includes("invalid_request_body") || errMsg.includes("invalid_request_error") || errMsg.includes("invalid_reasoning_effort") || errMsg.includes("reasoning_effort") || errMsg.includes("tool_choice");
+}
+/**
 * Handle an HTTP error from a multi-account request attempt.
 *
 * For 401 errors, attempts token refresh and retry.
@@ -2083,7 +2102,14 @@ async function handleMultiAccountHttpError(error, account, retryContext) {
 				accountManager.markAccountStatus(account.id, "error", `HTTP ${error.response.status}`);
 				return null;
 			}
-			if (error.response.status === 400) return tryDowngradeReasoningEffort(error.message, retryContext, account.id);
+			if (error.response.status === 400) {
+				const downgraded = await tryDowngradeReasoningEffort(error.message, retryContext, account.id);
+				if (downgraded !== null) return downgraded;
+				if (isNonAccountError(error.message)) {
+					error.__nonAccountError = true;
+					return null;
+				}
+			}
 			accountManager.markAccountStatus(account.id, "error", `HTTP ${error.response.status}`);
 			return null;
 	}
@@ -2142,6 +2168,7 @@ async function createWithMultiAccount(payload) {
 					tokenSource
 				});
 				if (retryResult) return retryResult;
+				if (error.__nonAccountError) throw error;
 			} else accountManager.markAccountStatus(account.id, "error", error.message);
 			consola.warn(`Account ${account.label} failed (attempt ${attempt + 1}), trying next...`);
 		}
@@ -2183,7 +2210,8 @@ async function doFetch(payload, source, accountId) {
 	});
 	if (!response.ok) {
 		const errorBody = await response.text();
-		if (response.status === 400) consola.warn(`400: ${errorBody}`);
+		if (response.status === 400) if (errorBody.includes("reasoning_effort") || errorBody.includes("invalid_reasoning_effort") || errorBody.includes("does not support reasoning")) consola.debug(`400 (auto-handled): ${errorBody}`);
+		else consola.warn(`400: ${errorBody}`);
 		else consola.error("Failed to create chat completions", {
 			status: response.status,
 			statusText: response.statusText,