copilot-api-plus 1.2.48 → 1.2.50

package/dist/main.js

@@ -1728,6 +1728,168 @@ async function checkRateLimit(state) {
 	}
 }
 //#endregion
+//#region src/routes/messages/strip-reminders.ts
+/** Matches `<system-reminder>…</system-reminder>` non-greedy, across lines. */
+const REMINDER_RE = /<system-reminder>[\s\S]*?<\/system-reminder>/g;
+/** Cheap sentinel that lets callers skip the regex scan. */
+const REMINDER_OPEN_TAG = "<system-reminder>";
+/**
+* Strip every `<system-reminder>` block from a plain string.
+*
+* Collapses runs of 3+ newlines left behind by the removal into a
+* single blank line, then trims leading/trailing whitespace. Returns
+* the same reference if no reminder was present (zero allocation).
+*/
+function stripText(s) {
+	if (!s.includes(REMINDER_OPEN_TAG)) return s;
+	return s.replaceAll(REMINDER_RE, "").replaceAll(/\n{3,}/g, "\n\n").trim();
+}
+/**
+* Strip reminders from a block array. Non-text blocks pass through.
+* Text blocks that become empty after stripping are filtered out.
+* Returns the same reference if nothing changed.
+*/
+function stripBlocks(content) {
+	if (!content.some((b) => b.type === "text" && b.text.includes(REMINDER_OPEN_TAG) || b.type === "tool_result" && b.content.includes(REMINDER_OPEN_TAG))) return content;
+	const out = [];
+	for (const b of content) {
+		if (b.type === "tool_result") {
+			const orig = b.content;
+			const stripped = stripText(orig);
+			if (stripped === orig) out.push(b);
+			else if (stripped.length === 0) out.push({
+				...b,
+				content: " "
+			});
+			else out.push({
+				...b,
+				content: stripped
+			});
+			continue;
+		}
+		if (b.type !== "text") {
+			out.push(b);
+			continue;
+		}
+		const t = stripText(b.text);
+		if (t.length === 0) continue;
+		out.push(t === b.text ? b : {
+			...b,
+			text: t
+		});
+	}
+	return out;
+}
+/**
+* Strip reminders from a single message. Returns the same reference
+* if nothing changed.
+*/
+function stripMessage(message) {
+	if (typeof message.content === "string") {
+		const next = stripText(message.content);
+		if (next === message.content) return message;
+		return {
+			...message,
+			content: next
+		};
+	}
+	const next = stripBlocks(message.content);
+	if (next === message.content) return message;
+	return {
+		...message,
+		content: next
+	};
+}
+/**
+* Strip reminders from the `system` field (string OR text-block array).
+* Returns the same reference if nothing changed.
+*/
+function stripSystem(system) {
+	if (system === void 0) return system;
+	if (typeof system === "string") {
+		const next = stripText(system);
+		return next === system ? system : next;
+	}
+	if (!system.some((b) => b.text.includes(REMINDER_OPEN_TAG))) return system;
+	const out = [];
+	for (const b of system) {
+		const t = stripText(b.text);
+		if (t.length === 0) continue;
+		out.push(t === b.text ? b : {
+			...b,
+			text: t
+		});
+	}
+	return out;
+}
+/**
+* Return a shallow-cloned payload with `<system-reminder>` blocks
+* removed from every message's text content AND the system field.
+* The input payload is NOT mutated; if no reminders are present
+* anywhere, the original payload reference is returned unchanged.
+*/
+function stripSystemReminders(payload) {
+	let changed = false;
+	const newSystem = stripSystem(payload.system);
+	if (newSystem !== payload.system) changed = true;
+	const newMessages = payload.messages.map((m) => {
+		const next = stripMessage(m);
+		if (next !== m) changed = true;
+		return next;
+	});
+	if (!changed) return payload;
+	return {
+		...payload,
+		system: newSystem,
+		messages: newMessages
+	};
+}
+/**
+* Strip reminders from an OpenAI-style chat completions payload.
+* Walks every message's content (string OR ContentPart[]). Filters
+* out text parts that become empty. Returns the same reference if
+* nothing changed.
+*/
+function stripOpenAIReminders(payload) {
+	let changed = false;
+	const newMessages = payload.messages.map((m) => {
+		if (m.content === null) return m;
+		if (typeof m.content === "string") {
+			const next = stripText(m.content);
+			if (next === m.content) return m;
+			changed = true;
+			return {
+				...m,
+				content: next
+			};
+		}
+		if (!m.content.some((p) => p.type === "text" && typeof p.text === "string" && p.text.includes(REMINDER_OPEN_TAG))) return m;
+		const out = [];
+		for (const p of m.content) {
+			if (p.type !== "text" || typeof p.text !== "string") {
+				out.push(p);
+				continue;
+			}
+			const t = stripText(p.text);
+			if (t.length === 0) continue;
+			out.push(t === p.text ? p : {
+				...p,
+				text: t
+			});
+		}
+		changed = true;
+		return {
+			...m,
+			content: out
+		};
+	});
+	if (!changed) return payload;
+	return {
+		...payload,
+		messages: newMessages
+	};
+}
+//#endregion
 //#region src/services/copilot/create-chat-completions.ts
 /**
 * Timeout for the initial HTTP connection + headers (not the body/stream).
@@ -2097,6 +2259,10 @@ async function handleMultiAccountHttpError(error, account, retryContext) {
 		case 429:
 			accountManager.markAccountStatus(account.id, "rate_limited", "429 Rate limited");
 			return null;
+		case 408:
+			consola.warn(`Account ${account.label}: 408 request timeout (network issue, not rotating)`);
+			error.__nonAccountError = true;
+			return null;
 		default:
 			if (error.response.status >= 500) {
 				accountManager.markAccountStatus(account.id, "error", `HTTP ${error.response.status}`);
@@ -2117,6 +2283,7 @@ async function handleMultiAccountHttpError(error, account, retryContext) {
 async function createWithMultiAccount(payload) {
 	const triedAccountIds = /* @__PURE__ */ new Set();
 	let lastError;
+	let networkRetried = false;
 	for (let attempt = 0; attempt < 3; attempt++) {
 		const account = accountManager.getActiveAccount();
 		if (!account || triedAccountIds.has(account.id)) break;
@@ -2171,7 +2338,14 @@ async function createWithMultiAccount(payload) {
 				if (error.__nonAccountError) throw error;
 			} else {
 				const errMsg = error.message || String(error);
-				consola.warn(`Account ${account.label}: network error (not rotating): ${errMsg}`);
+				if (!networkRetried) {
+					networkRetried = true;
+					consola.warn(`Account ${account.label}: network error, resetting pool and retrying once: ${errMsg}`);
+					resetAccountConnections(account.id);
+					triedAccountIds.delete(account.id);
+					continue;
+				}
+				consola.warn(`Account ${account.label}: network error after retry (giving up): ${errMsg}`);
 				throw error;
 			}
 			consola.warn(`Account ${account.label} failed (attempt ${attempt + 1}), trying next...`);
@@ -2249,7 +2423,7 @@ async function handleCompletion$1(c) {
 	await checkRateLimit(state);
 	const rawPayload = await c.req.json();
 	consola.debug("Request payload:", JSON.stringify(rawPayload).slice(-400));
-	const payload = applyMaxTokens(rawPayload);
+	const payload = applyMaxTokens(stripOpenAIReminders(rawPayload));
 	if (state.manualApprove) await awaitApproval();
 	const response = await createChatCompletions(payload);
 	if (isNonStreaming$1(response)) {
@@ -2760,84 +2934,6 @@ function getAnthropicToolUseBlocks(toolCalls) {
 	}));
 }
 //#endregion
-//#region src/routes/messages/strip-reminders.ts
-/** Matches `<system-reminder>…</system-reminder>` non-greedy, across lines. */
-const REMINDER_RE = /<system-reminder>[\s\S]*?<\/system-reminder>/g;
-/** Cheap sentinel that lets callers skip the regex scan. */
-const REMINDER_OPEN_TAG = "<system-reminder>";
-/**
-* Strip every `<system-reminder>` block from a plain string.
-*
-* Collapses runs of 3+ newlines left behind by the removal into a
-* single blank line, then trims leading/trailing whitespace. Returns
-* the same reference if no reminder was present (zero allocation).
-*/
-function stripText(s) {
-	if (!s.includes(REMINDER_OPEN_TAG)) return s;
-	return s.replaceAll(REMINDER_RE, "").replaceAll(/\n{3,}/g, "\n\n").trim();
-}
-/**
-* Strip reminders from a block array. Non-text blocks pass through.
-* Text blocks that become empty after stripping are filtered out.
-* Returns the same reference if nothing changed.
-*/
-function stripBlocks(content) {
-	if (!content.some((b) => b.type === "text" && b.text.includes(REMINDER_OPEN_TAG))) return content;
-	const out = [];
-	for (const b of content) {
-		if (b.type !== "text") {
-			out.push(b);
-			continue;
-		}
-		const t = stripText(b.text);
-		if (t.length === 0) continue;
-		out.push(t === b.text ? b : {
-			...b,
-			text: t
-		});
-	}
-	return out;
-}
-/**
-* Strip reminders from a single message. Returns the same reference
-* if nothing changed.
-*/
-function stripMessage(message) {
-	if (typeof message.content === "string") {
-		const next = stripText(message.content);
-		if (next === message.content) return message;
-		return {
-			...message,
-			content: next
-		};
-	}
-	const next = stripBlocks(message.content);
-	if (next === message.content) return message;
-	return {
-		...message,
-		content: next
-	};
-}
-/**
-* Return a shallow-cloned payload with `<system-reminder>` blocks
-* removed from every message's text content. The input payload is
-* NOT mutated; if no reminders are present anywhere, the original
-* payload reference is returned unchanged (no allocation).
-*/
-function stripSystemReminders(payload) {
-	let changed = false;
-	const newMessages = payload.messages.map((m) => {
-		const next = stripMessage(m);
-		if (next !== m) changed = true;
-		return next;
-	});
-	if (!changed) return payload;
-	return {
-		...payload,
-		messages: newMessages
-	};
-}
-//#endregion
 //#region src/routes/messages/count-tokens-handler.ts
 /**
 * Handles token counting for Anthropic messages.