@nick3/copilot-api 1.5.3 → 1.5.6

package/dist/{server-DzE_zmUf.js → server-DVpkQrk2.js}

@@ -1,8 +1,8 @@
-import { A as resolveTraceId, C as normalizeDomain, D as accountFromState, E as prepareMessageProxyHeaders, O as state, T as prepareInteractionHeaders, _ as HTTPError, b as copilotHeaders, c as getRootSessionId, d as parseUserIdMetadata, f as sleep, g as getCopilotUsage, h as getDeviceCode, k as requestContext, l as getUUID, m as getGitHubUser, r as cacheModels, s as generateRequestIdFromPayload, t as pollAccessToken, u as isNullish, v as forwardError, w as prepareForCompact, y as copilotBaseUrl } from "./poll-access-token-BzenaGHn.js";
-import { a as getAccountClientIdentityByLoginAndApp, c as listAccountsFromRegistry, f as removeAccountFromRegistry, g as DEFAULT_IDENTITY_ENTERPRISE_DOMAIN, h as saveRegistry, m as saveAccountToken, p as removeAccountToken, r as addAccountToRegistry, t as isAccountType, u as loadRegistry, y as getCurrentIdentityEnvironment } from "./account-BMFr8t9b.js";
+import { A as resolveTraceId, C as normalizeDomain, D as accountFromState, E as prepareMessageProxyHeaders, O as state, T as prepareInteractionHeaders, _ as HTTPError, b as copilotHeaders, c as getRootSessionId, d as parseUserIdMetadata, f as sleep, g as getCopilotUsage, h as getDeviceCode, k as requestContext, l as getUUID, m as getGitHubUser, r as cacheModels, s as generateRequestIdFromPayload, t as pollAccessToken, u as isNullish, v as forwardError, w as prepareForCompact, y as copilotBaseUrl } from "./poll-access-token-DFooFWhY.js";
+import { a as getAccountClientIdentityByLoginAndApp, c as listAccountsFromRegistry, f as removeAccountFromRegistry, g as DEFAULT_IDENTITY_ENTERPRISE_DOMAIN, h as saveRegistry, m as saveAccountToken, p as removeAccountToken, r as addAccountToRegistry, t as isAccountType, u as loadRegistry, y as getCurrentIdentityEnvironment } from "./account-AacnHem5.js";
 import { r as ensurePaths, t as PATHS } from "./paths-DGlr310R.js";
-import "./get-copilot-token-DoK8Ia3u.js";
-import { _ as isMessagesApiEnabled, a as getClaudeTokenMultiplier, b as mergeConfigWithDefaults, c as getModelAliases, d as getProviderConfig, f as getReasoningEffortForModel, g as isMessageStartInputTokensFallbackEnabled, h as isForceAgentEnabled, i as getAnthropicApiKey, l as getModelAliasesInfo, m as isAccountAffinityEnabled, n as PROVIDER_TYPE_ANTHROPIC, o as getConfig, p as getSmallModel, r as getAliasTargetSet, s as getExtraPromptForModel, t as accountsManager, u as getModelRefreshIntervalMs, v as isResponsesApiContextManagementModel, x as shouldCompactUseSmallModel, y as isResponsesApiWebSearchEnabled } from "./accounts-manager-DgQH4KtO.js";
+import "./get-copilot-token-cha9rQwA.js";
+import { _ as isMessagesApiEnabled, a as getClaudeTokenMultiplier, b as mergeConfigWithDefaults, c as getModelAliases, d as getProviderConfig, f as getReasoningEffortForModel, g as isMessageStartInputTokensFallbackEnabled, h as isForceAgentEnabled, i as getAnthropicApiKey, l as getModelAliasesInfo, m as isAccountAffinityEnabled, n as PROVIDER_TYPE_ANTHROPIC, o as getConfig, p as getSmallModel, r as getAliasTargetSet, s as getExtraPromptForModel, t as accountsManager, u as getModelRefreshIntervalMs, v as isResponsesApiContextManagementModel, x as shouldCompactUseSmallModel, y as isResponsesApiWebSearchEnabled } from "./accounts-manager-BE-Dq5Wn.js";
 import consola from "consola";
 import fs, { readFile } from "node:fs/promises";
 import { randomUUID, timingSafeEqual } from "node:crypto";
@@ -232,7 +232,7 @@ function migrateV1(db) {
 }
 function migrateAdminDb(db) {
 	const current = db.query("PRAGMA user_version;").get()?.user_version ?? 0;
-	if (current >= 5) return;
+	if (current >= 6) return;
 	if (current < 1) migrateV1(db);
 	if (current < 2) db.run(`
       ALTER TABLE request_log ADD COLUMN user_id TEXT;
@@ -274,6 +274,10 @@ function migrateAdminDb(db) {
 
       PRAGMA user_version = 5;
     `);
+	if (current < 6) {
+		if (!db.query("PRAGMA table_info(request_log);").all().some((row) => row.name === "is_subagent")) db.run("ALTER TABLE request_log ADD COLUMN is_subagent INTEGER;");
+		db.run("PRAGMA user_version = 6;");
+	}
 }
 
 //#endregion
@@ -407,6 +411,7 @@ var RequestHistoryStore = class {
         safety_identifier,
         prompt_cache_key,
         initiator,
+        is_subagent,
         upstream_request_id,
         tokens_input,
         tokens_output,
@@ -430,7 +435,7 @@ var RequestHistoryStore = class {
         ?,?,?,?,?,?,?,?,
         ?,?,?,?,?,?,?,?,
         ?,?,?,?,?,?,?,?,
-        ?,?,?,?,?,?,?
+        ?,?,?,?,?,?,?,?
       );
     `);
 		this.getByRequestIdStmt = db.query("SELECT * FROM request_log WHERE request_id = ? LIMIT 1;");
@@ -474,6 +479,7 @@ var RequestHistoryStore = class {
 				toDbNull(record.safetyIdentifier),
 				toDbNull(record.promptCacheKey),
 				toDbNull(record.initiator),
+				toDbBool(record.isSubagent),
 				toDbNull(record.upstreamRequestId),
 				toDbNull(record.tokensInput),
 				toDbNull(record.tokensOutput),
@@ -812,6 +818,7 @@ var AuthSessionManager = class {
 				});
 			}
 			if (!this.getLiveSession(sessionId)) return;
+			await accountsManager.reloadRegistryNow();
 			this.completeSession(sessionId, accountId);
 		} catch (error) {
 			if (session.abortController.signal.aborted) return;
@@ -1001,13 +1008,20 @@ const PROVIDER_MODEL_CONFIG_KEYS = new Set([
 	"topP",
 	"topK"
 ]);
-const PROVIDER_CONFIG_KEYS = new Set([
+const PROVIDER_CONFIG_FIELDS = [
 	"type",
 	"enabled",
 	"baseUrl",
 	"apiKey",
-	"models"
-]);
+	"authType",
+	"models",
+	"adjustInputTokens"
+];
+const PROVIDER_AUTH_TYPES = ["authorization", "x-api-key"];
+const PROVIDER_CONFIG_KEYS = new Set(PROVIDER_CONFIG_FIELDS);
+function isProviderAuthType(value) {
+	return PROVIDER_AUTH_TYPES.includes(value);
+}
 function validateAllowedObjectKeys(value, field, allowed) {
 	for (const key of Object.keys(value)) if (!allowed.has(key)) return `${field}.${key} is not supported`;
 }
@@ -1087,12 +1101,27 @@ function applyProviderApiKey(provider, value, field) {
 	if ("error" in parsed) return parsed.error;
 	if ("value" in parsed) provider.apiKey = parsed.value;
 }
+function applyProviderAuthType(provider, value, field) {
+	if (!Object.hasOwn(value, "authType")) return void 0;
+	const parsed = parseOptionalString(value.authType, `${field}.authType`);
+	if ("error" in parsed) return parsed.error;
+	if ("value" in parsed) {
+		if (!isProviderAuthType(parsed.value)) return `${field}.authType must be one of: ${PROVIDER_AUTH_TYPES.map((item) => `"${item}"`).join(", ")}`;
+		provider.authType = parsed.value;
+	}
+}
 function applyProviderModels(provider, value, field) {
 	if (!Object.hasOwn(value, "models")) return void 0;
 	const parsed = parseProviderModelsRecord(value.models, `${field}.models`);
 	if ("error" in parsed) return parsed.error;
 	if ("value" in parsed) provider.models = parsed.value;
 }
+function applyProviderAdjustInputTokens(provider, value, field) {
+	if (!Object.hasOwn(value, "adjustInputTokens")) return void 0;
+	const parsed = parseOptionalBoolean(value.adjustInputTokens, `${field}.adjustInputTokens`);
+	if ("error" in parsed) return parsed.error;
+	if ("value" in parsed) provider.adjustInputTokens = parsed.value;
+}
 function parseProviderConfig(value, field) {
 	if (value === null || value === void 0) return { error: `${field} must be an object` };
 	if (!isPlainObject(value)) return { error: `${field} must be an object` };
@@ -1107,8 +1136,12 @@ function parseProviderConfig(value, field) {
 	if (baseUrlError) return { error: baseUrlError };
 	const apiKeyError = applyProviderApiKey(provider, value, field);
 	if (apiKeyError) return { error: apiKeyError };
+	const authTypeError = applyProviderAuthType(provider, value, field);
+	if (authTypeError) return { error: authTypeError };
 	const modelsError = applyProviderModels(provider, value, field);
 	if (modelsError) return { error: modelsError };
+	const adjustInputTokensError = applyProviderAdjustInputTokens(provider, value, field);
+	if (adjustInputTokensError) return { error: adjustInputTokensError };
 	return { value: provider };
 }
 function parseProviders(value) {
@@ -3578,7 +3611,7 @@ const isWarmupProbeRequest = (payload) => {
 	return false;
 };
 const handleSelectionFailure = (context) => {
-	const { c, store, requestId, startedAtMs, method, path: path$2, streamRequested, clientModel, clientIp, clientIpSource, userAgent, userId, safetyIdentifier, promptCacheKey, initiator, selection } = context;
+	const { c, store, requestId, startedAtMs, method, path: path$2, streamRequested, clientModel, clientIp, clientIpSource, userAgent, userId, safetyIdentifier, promptCacheKey, initiator, isSubagent, selection } = context;
 	const finishedAtMs = Date.now();
 	store.insert({
 		requestId,
@@ -3596,6 +3629,7 @@ const handleSelectionFailure = (context) => {
 		safetyIdentifier,
 		promptCacheKey,
 		initiator,
+		isSubagent,
 		httpStatus: selection.reason === "MODEL_NOT_SUPPORTED" ? 400 : 429,
 		selectionFailureReason: selection.reason
 	});
@@ -5191,6 +5225,7 @@ function closeThinkingBlockIfOpen(state$1, events$1) {
 //#endregion
 //#region src/routes/messages/subagent-marker.ts
 const subagentMarkerPrefix = "__SUBAGENT_MARKER__";
+const REMINDER_RE = /<system-reminder>([\s\S]*?)<\/system-reminder>/g;
 const parseSubagentMarkerFromFirstUser = (payload) => {
 	const firstUserMessage = payload.messages.find((msg) => msg.role === "user" && Array.isArray(msg.content));
 	if (!firstUserMessage || !Array.isArray(firstUserMessage.content)) return null;
@@ -5202,33 +5237,54 @@ const parseSubagentMarkerFromFirstUser = (payload) => {
 	return null;
 };
 const parseSubagentMarkerFromSystemReminder = (text) => {
-	const startTag = "<system-reminder>";
-	const endTag = "</system-reminder>";
-	let searchFrom = 0;
-	while (true) {
-		const reminderStart = text.indexOf(startTag, searchFrom);
-		if (reminderStart === -1) break;
-		const contentStart = reminderStart + 17;
-		const reminderEnd = text.indexOf(endTag, contentStart);
-		if (reminderEnd === -1) break;
-		const reminderContent = text.slice(contentStart, reminderEnd);
-		const markerIndex = reminderContent.indexOf(subagentMarkerPrefix);
-		if (markerIndex === -1) {
-			searchFrom = reminderEnd + 18;
+	for (const [, content] of text.matchAll(REMINDER_RE)) {
+		const markerIndex = content.indexOf(subagentMarkerPrefix);
+		if (markerIndex === -1) continue;
+		const afterPrefix = content.slice(markerIndex + 19).trimStart();
+		if (!afterPrefix.startsWith("{")) continue;
+		const json = extractBalancedJson(afterPrefix);
+		if (!json) continue;
+		try {
+			const parsed = JSON.parse(json);
+			if (!parsed.session_id || !parsed.agent_id || !parsed.agent_type) continue;
+			return parsed;
+		} catch {
 			continue;
 		}
-		const markerJson = reminderContent.slice(markerIndex + 19).trim();
-		try {
-			const parsed = JSON.parse(markerJson);
-			if (!parsed.session_id || !parsed.agent_id || !parsed.agent_type) {
-				searchFrom = reminderEnd + 18;
+	}
+	return null;
+};
+/** Extract the first balanced `{...}` object from text that starts with `{`. */
+const extractBalancedJson = (text) => {
+	let depth = 0;
+	let inString = false;
+	let escaped = false;
+	for (let index = 0; index < text.length; index += 1) {
+		const char = text[index];
+		if (inString) {
+			if (escaped) {
+				escaped = false;
 				continue;
 			}
-			return parsed;
-		} catch {
-			searchFrom = reminderEnd + 18;
+			if (char === "\\") {
+				escaped = true;
+				continue;
+			}
+			if (char === "\"") inString = false;
+			continue;
+		}
+		if (char === "\"") {
+			inString = true;
 			continue;
 		}
+		if (char === "{") {
+			depth += 1;
+			continue;
+		}
+		if (char === "}") {
+			depth -= 1;
+			if (depth === 0) return text.slice(0, index + 1);
+		}
 	}
 	return null;
 };
@@ -5289,7 +5345,8 @@ async function handleCompletion(c) {
 		userId,
 		safetyIdentifier: normalizedSafetyIdentifier,
 		promptCacheKey: normalizedPromptCacheKey,
-		initiator: initiatorOverride
+		initiator: initiatorOverride,
+		isSubagent: Boolean(subagentMarker)
 	});
 	if (blockedResponse) return blockedResponse;
 	const openAIPayload = translateToOpenAI(anthropicPayload);
@@ -5326,6 +5383,7 @@ async function handleCompletion(c) {
 		safetyIdentifier: normalizedSafetyIdentifier,
 		promptCacheKey: normalizedPromptCacheKey,
 		initiator: fallbackInitiator,
+		isSubagent: Boolean(subagentMarker),
 		selection
 	});
 	const { account, reservation, selectedModel, endpoint, costUnits } = selection;
@@ -5346,6 +5404,7 @@ async function handleCompletion(c) {
 		userId,
 		safetyIdentifier: normalizedSafetyIdentifier,
 		promptCacheKey: normalizedPromptCacheKey,
+		isSubagent: Boolean(subagentMarker),
 		clientModel,
 		account,
 		reservation,
@@ -5501,6 +5560,7 @@ function insertRequestLog$1(instr, record) {
 		safetyIdentifier: instr.safetyIdentifier,
 		promptCacheKey: instr.promptCacheKey,
 		initiator: instr.initiator,
+		isSubagent: instr.isSubagent,
 		upstreamRequestId: instr.upstreamRequestId,
 		affinityHit: instr.affinityHit,
 		affinityCacheKey: instr.affinityCacheKey,
@@ -6077,10 +6137,13 @@ const STRIPPED_RESPONSE_HEADERS = [
 	"upgrade"
 ];
 function buildProviderUpstreamHeaders(providerConfig, requestHeaders) {
+	const authHeaders = {};
+	if (providerConfig.authType === "authorization") authHeaders.authorization = `Bearer ${providerConfig.apiKey}`;
+	else authHeaders["x-api-key"] = providerConfig.apiKey;
 	const headers = {
 		"content-type": "application/json",
 		accept: "application/json",
-		"x-api-key": providerConfig.apiKey
+		...authHeaders
 	};
 	for (const headerName of FORWARDABLE_HEADERS) {
 		const headerValue = requestHeaders.get(headerName);
@@ -6831,4 +6894,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 
 //#endregion
 export { server };
-//# sourceMappingURL=server-DzE_zmUf.js.map
+//# sourceMappingURL=server-DVpkQrk2.js.map