@jeffreycao/copilot-api 1.3.8 → 1.4.0

package/dist/{auth-DteTbqnM.js → auth-BF_z8R4h.js}

@@ -1,6 +1,6 @@
 import { PATHS, ensurePaths } from "./paths-Cla6y5eD.js";
-import { state } from "./utils-DKqD66k9.js";
-import { setupGitHubToken } from "./token-8AyBHdsS.js";
+import { state } from "./utils-DVmO1EMi.js";
+import { setupGitHubToken } from "./token-DDRrlAWy.js";
 import { defineCommand } from "citty";
 import consola from "consola";
 
@@ -43,4 +43,4 @@ const auth = defineCommand({
 
 //#endregion
 export { auth };
-//# sourceMappingURL=auth-DteTbqnM.js.map
+//# sourceMappingURL=auth-BF_z8R4h.js.map

package/dist/{auth-DteTbqnM.js.map → auth-BF_z8R4h.js.map}

@@ -1 +1 @@
-{"version":3,"file":"auth-DteTbqnM.js","names":[],"sources":["../src/auth.ts"],"sourcesContent":["#!/usr/bin/env node\n\nimport { defineCommand } from \"citty\"\nimport consola from \"consola\"\n\nimport { PATHS, ensurePaths } from \"./lib/paths\"\nimport { state } from \"./lib/state\"\nimport { setupGitHubToken } from \"./lib/token\"\n\ninterface RunAuthOptions {\n  verbose: boolean\n  showToken: boolean\n}\n\nexport async function runAuth(options: RunAuthOptions): Promise<void> {\n  if (options.verbose) {\n    consola.level = 5\n    consola.info(\"Verbose logging enabled\")\n  }\n\n  state.showToken = options.showToken\n\n  await ensurePaths()\n  await setupGitHubToken({ force: true })\n  consola.success(\"GitHub token written to\", PATHS.GITHUB_TOKEN_PATH)\n}\n\nexport const auth = defineCommand({\n  meta: {\n    name: \"auth\",\n    description: \"Run GitHub auth flow without running the server\",\n  },\n  args: {\n    verbose: {\n      alias: \"v\",\n      type: \"boolean\",\n      default: false,\n      description: \"Enable verbose logging\",\n    },\n    \"show-token\": {\n      type: \"boolean\",\n      default: false,\n      description: \"Show GitHub token on auth\",\n    },\n  },\n  run({ args }) {\n    return runAuth({\n      verbose: args.verbose,\n      showToken: args[\"show-token\"],\n    })\n  },\n})\n"],"mappings":";;;;;;;AAcA,eAAsB,QAAQ,SAAwC;AACpE,KAAI,QAAQ,SAAS;AACnB,UAAQ,QAAQ;AAChB,UAAQ,KAAK,0BAA0B;;AAGzC,OAAM,YAAY,QAAQ;AAE1B,OAAM,aAAa;AACnB,OAAM,iBAAiB,EAAE,OAAO,MAAM,CAAC;AACvC,SAAQ,QAAQ,2BAA2B,MAAM,kBAAkB;;AAGrE,MAAa,OAAO,cAAc;CAChC,MAAM;EACJ,MAAM;EACN,aAAa;EACd;CACD,MAAM;EACJ,SAAS;GACP,OAAO;GACP,MAAM;GACN,SAAS;GACT,aAAa;GACd;EACD,cAAc;GACZ,MAAM;GACN,SAAS;GACT,aAAa;GACd;EACF;CACD,IAAI,EAAE,QAAQ;AACZ,SAAO,QAAQ;GACb,SAAS,KAAK;GACd,WAAW,KAAK;GACjB,CAAC;;CAEL,CAAC"}
+{"version":3,"file":"auth-BF_z8R4h.js","names":[],"sources":["../src/auth.ts"],"sourcesContent":["#!/usr/bin/env node\n\nimport { defineCommand } from \"citty\"\nimport consola from \"consola\"\n\nimport { PATHS, ensurePaths } from \"./lib/paths\"\nimport { state } from \"./lib/state\"\nimport { setupGitHubToken } from \"./lib/token\"\n\ninterface RunAuthOptions {\n  verbose: boolean\n  showToken: boolean\n}\n\nexport async function runAuth(options: RunAuthOptions): Promise<void> {\n  if (options.verbose) {\n    consola.level = 5\n    consola.info(\"Verbose logging enabled\")\n  }\n\n  state.showToken = options.showToken\n\n  await ensurePaths()\n  await setupGitHubToken({ force: true })\n  consola.success(\"GitHub token written to\", PATHS.GITHUB_TOKEN_PATH)\n}\n\nexport const auth = defineCommand({\n  meta: {\n    name: \"auth\",\n    description: \"Run GitHub auth flow without running the server\",\n  },\n  args: {\n    verbose: {\n      alias: \"v\",\n      type: \"boolean\",\n      default: false,\n      description: \"Enable verbose logging\",\n    },\n    \"show-token\": {\n      type: \"boolean\",\n      default: false,\n      description: \"Show GitHub token on auth\",\n    },\n  },\n  run({ args }) {\n    return runAuth({\n      verbose: args.verbose,\n      showToken: args[\"show-token\"],\n    })\n  },\n})\n"],"mappings":";;;;;;;AAcA,eAAsB,QAAQ,SAAwC;AACpE,KAAI,QAAQ,SAAS;AACnB,UAAQ,QAAQ;AAChB,UAAQ,KAAK,0BAA0B;;AAGzC,OAAM,YAAY,QAAQ;AAE1B,OAAM,aAAa;AACnB,OAAM,iBAAiB,EAAE,OAAO,MAAM,CAAC;AACvC,SAAQ,QAAQ,2BAA2B,MAAM,kBAAkB;;AAGrE,MAAa,OAAO,cAAc;CAChC,MAAM;EACJ,MAAM;EACN,aAAa;EACd;CACD,MAAM;EACJ,SAAS;GACP,OAAO;GACP,MAAM;GACN,SAAS;GACT,aAAa;GACd;EACD,cAAc;GACZ,MAAM;GACN,SAAS;GACT,aAAa;GACd;EACF;CACD,IAAI,EAAE,QAAQ;AACZ,SAAO,QAAQ;GACb,SAAS,KAAK;GACd,WAAW,KAAK;GACjB,CAAC;;CAEL,CAAC"}

package/dist/{check-usage-Z8fnzZQt.js → check-usage-Bg8l21pI.js}

@@ -1,7 +1,7 @@
 import { ensurePaths } from "./paths-Cla6y5eD.js";
-import "./utils-DKqD66k9.js";
-import { setupGitHubToken } from "./token-8AyBHdsS.js";
-import { getCopilotUsage } from "./get-copilot-usage-CuVET98U.js";
+import "./utils-DVmO1EMi.js";
+import { setupGitHubToken } from "./token-DDRrlAWy.js";
+import { getCopilotUsage } from "./get-copilot-usage-LteGnMt-.js";
 import { defineCommand } from "citty";
 import consola from "consola";
 
@@ -42,4 +42,4 @@ const checkUsage = defineCommand({
 
 //#endregion
 export { checkUsage };
-//# sourceMappingURL=check-usage-Z8fnzZQt.js.map
+//# sourceMappingURL=check-usage-Bg8l21pI.js.map

package/dist/{check-usage-Z8fnzZQt.js.map → check-usage-Bg8l21pI.js.map}

@@ -1 +1 @@
-{"version":3,"file":"check-usage-Z8fnzZQt.js","names":[],"sources":["../src/check-usage.ts"],"sourcesContent":["import { defineCommand } from \"citty\"\nimport consola from \"consola\"\n\nimport { ensurePaths } from \"./lib/paths\"\nimport { setupGitHubToken } from \"./lib/token\"\nimport {\n  getCopilotUsage,\n  type QuotaDetail,\n} from \"./services/github/get-copilot-usage\"\n\nexport const checkUsage = defineCommand({\n  meta: {\n    name: \"check-usage\",\n    description: \"Show current GitHub Copilot usage/quota information\",\n  },\n  async run() {\n    await ensurePaths()\n    await setupGitHubToken()\n    try {\n      const usage = await getCopilotUsage()\n      const premium = usage.quota_snapshots.premium_interactions\n      const premiumTotal = premium.entitlement\n      const premiumUsed = premiumTotal - premium.remaining\n      const premiumPercentUsed =\n        premiumTotal > 0 ? (premiumUsed / premiumTotal) * 100 : 0\n      const premiumPercentRemaining = premium.percent_remaining\n\n      // Helper to summarize a quota snapshot\n      function summarizeQuota(name: string, snap: QuotaDetail | undefined) {\n        if (!snap) return `${name}: N/A`\n        const total = snap.entitlement\n        const used = total - snap.remaining\n        const percentUsed = total > 0 ? (used / total) * 100 : 0\n        const percentRemaining = snap.percent_remaining\n        return `${name}: ${used}/${total} used (${percentUsed.toFixed(1)}% used, ${percentRemaining.toFixed(1)}% remaining)`\n      }\n\n      const premiumLine = `Premium: ${premiumUsed}/${premiumTotal} used (${premiumPercentUsed.toFixed(1)}% used, ${premiumPercentRemaining.toFixed(1)}% remaining)`\n      const chatLine = summarizeQuota(\"Chat\", usage.quota_snapshots.chat)\n      const completionsLine = summarizeQuota(\n        \"Completions\",\n        usage.quota_snapshots.completions,\n      )\n\n      consola.box(\n        `Copilot Usage (plan: ${usage.copilot_plan})\\n`\n          + `Quota resets: ${usage.quota_reset_date}\\n`\n          + `\\nQuotas:\\n`\n          + `  ${premiumLine}\\n`\n          + `  ${chatLine}\\n`\n          + `  ${completionsLine}`,\n      )\n    } catch (err) {\n      consola.error(\"Failed to fetch Copilot usage:\", err)\n      process.exit(1)\n    }\n  },\n})\n"],"mappings":";;;;;;;;AAUA,MAAa,aAAa,cAAc;CACtC,MAAM;EACJ,MAAM;EACN,aAAa;EACd;CACD,MAAM,MAAM;AACV,QAAM,aAAa;AACnB,QAAM,kBAAkB;AACxB,MAAI;GACF,MAAM,QAAQ,MAAM,iBAAiB;GACrC,MAAM,UAAU,MAAM,gBAAgB;GACtC,MAAM,eAAe,QAAQ;GAC7B,MAAM,cAAc,eAAe,QAAQ;GAC3C,MAAM,qBACJ,eAAe,IAAK,cAAc,eAAgB,MAAM;GAC1D,MAAM,0BAA0B,QAAQ;GAGxC,SAAS,eAAe,MAAc,MAA+B;AACnE,QAAI,CAAC,KAAM,QAAO,GAAG,KAAK;IAC1B,MAAM,QAAQ,KAAK;IACnB,MAAM,OAAO,QAAQ,KAAK;IAC1B,MAAM,cAAc,QAAQ,IAAK,OAAO,QAAS,MAAM;IACvD,MAAM,mBAAmB,KAAK;AAC9B,WAAO,GAAG,KAAK,IAAI,KAAK,GAAG,MAAM,SAAS,YAAY,QAAQ,EAAE,CAAC,UAAU,iBAAiB,QAAQ,EAAE,CAAC;;GAGzG,MAAM,cAAc,YAAY,YAAY,GAAG,aAAa,SAAS,mBAAmB,QAAQ,EAAE,CAAC,UAAU,wBAAwB,QAAQ,EAAE,CAAC;GAChJ,MAAM,WAAW,eAAe,QAAQ,MAAM,gBAAgB,KAAK;GACnE,MAAM,kBAAkB,eACtB,eACA,MAAM,gBAAgB,YACvB;AAED,WAAQ,IACN,wBAAwB,MAAM,aAAa,mBACtB,MAAM,iBAAiB,iBAEnC,YAAY,MACZ,SAAS,MACT,kBACV;WACM,KAAK;AACZ,WAAQ,MAAM,kCAAkC,IAAI;AACpD,WAAQ,KAAK,EAAE;;;CAGpB,CAAC"}
+{"version":3,"file":"check-usage-Bg8l21pI.js","names":[],"sources":["../src/check-usage.ts"],"sourcesContent":["import { defineCommand } from \"citty\"\nimport consola from \"consola\"\n\nimport { ensurePaths } from \"./lib/paths\"\nimport { setupGitHubToken } from \"./lib/token\"\nimport {\n  getCopilotUsage,\n  type QuotaDetail,\n} from \"./services/github/get-copilot-usage\"\n\nexport const checkUsage = defineCommand({\n  meta: {\n    name: \"check-usage\",\n    description: \"Show current GitHub Copilot usage/quota information\",\n  },\n  async run() {\n    await ensurePaths()\n    await setupGitHubToken()\n    try {\n      const usage = await getCopilotUsage()\n      const premium = usage.quota_snapshots.premium_interactions\n      const premiumTotal = premium.entitlement\n      const premiumUsed = premiumTotal - premium.remaining\n      const premiumPercentUsed =\n        premiumTotal > 0 ? (premiumUsed / premiumTotal) * 100 : 0\n      const premiumPercentRemaining = premium.percent_remaining\n\n      // Helper to summarize a quota snapshot\n      function summarizeQuota(name: string, snap: QuotaDetail | undefined) {\n        if (!snap) return `${name}: N/A`\n        const total = snap.entitlement\n        const used = total - snap.remaining\n        const percentUsed = total > 0 ? (used / total) * 100 : 0\n        const percentRemaining = snap.percent_remaining\n        return `${name}: ${used}/${total} used (${percentUsed.toFixed(1)}% used, ${percentRemaining.toFixed(1)}% remaining)`\n      }\n\n      const premiumLine = `Premium: ${premiumUsed}/${premiumTotal} used (${premiumPercentUsed.toFixed(1)}% used, ${premiumPercentRemaining.toFixed(1)}% remaining)`\n      const chatLine = summarizeQuota(\"Chat\", usage.quota_snapshots.chat)\n      const completionsLine = summarizeQuota(\n        \"Completions\",\n        usage.quota_snapshots.completions,\n      )\n\n      consola.box(\n        `Copilot Usage (plan: ${usage.copilot_plan})\\n`\n          + `Quota resets: ${usage.quota_reset_date}\\n`\n          + `\\nQuotas:\\n`\n          + `  ${premiumLine}\\n`\n          + `  ${chatLine}\\n`\n          + `  ${completionsLine}`,\n      )\n    } catch (err) {\n      consola.error(\"Failed to fetch Copilot usage:\", err)\n      process.exit(1)\n    }\n  },\n})\n"],"mappings":";;;;;;;;AAUA,MAAa,aAAa,cAAc;CACtC,MAAM;EACJ,MAAM;EACN,aAAa;EACd;CACD,MAAM,MAAM;AACV,QAAM,aAAa;AACnB,QAAM,kBAAkB;AACxB,MAAI;GACF,MAAM,QAAQ,MAAM,iBAAiB;GACrC,MAAM,UAAU,MAAM,gBAAgB;GACtC,MAAM,eAAe,QAAQ;GAC7B,MAAM,cAAc,eAAe,QAAQ;GAC3C,MAAM,qBACJ,eAAe,IAAK,cAAc,eAAgB,MAAM;GAC1D,MAAM,0BAA0B,QAAQ;GAGxC,SAAS,eAAe,MAAc,MAA+B;AACnE,QAAI,CAAC,KAAM,QAAO,GAAG,KAAK;IAC1B,MAAM,QAAQ,KAAK;IACnB,MAAM,OAAO,QAAQ,KAAK;IAC1B,MAAM,cAAc,QAAQ,IAAK,OAAO,QAAS,MAAM;IACvD,MAAM,mBAAmB,KAAK;AAC9B,WAAO,GAAG,KAAK,IAAI,KAAK,GAAG,MAAM,SAAS,YAAY,QAAQ,EAAE,CAAC,UAAU,iBAAiB,QAAQ,EAAE,CAAC;;GAGzG,MAAM,cAAc,YAAY,YAAY,GAAG,aAAa,SAAS,mBAAmB,QAAQ,EAAE,CAAC,UAAU,wBAAwB,QAAQ,EAAE,CAAC;GAChJ,MAAM,WAAW,eAAe,QAAQ,MAAM,gBAAgB,KAAK;GACnE,MAAM,kBAAkB,eACtB,eACA,MAAM,gBAAgB,YACvB;AAED,WAAQ,IACN,wBAAwB,MAAM,aAAa,mBACtB,MAAM,iBAAiB,iBAEnC,YAAY,MACZ,SAAS,MACT,kBACV;WACM,KAAK;AACZ,WAAQ,MAAM,kCAAkC,IAAI;AACpD,WAAQ,KAAK,EAAE;;;CAGpB,CAAC"}

package/dist/{get-copilot-usage-CuVET98U.js → get-copilot-usage-LteGnMt-.js}

@@ -1,4 +1,4 @@
-import { HTTPError, getGitHubApiBaseUrl, githubHeaders, state } from "./utils-DKqD66k9.js";
+import { HTTPError, getGitHubApiBaseUrl, githubHeaders, state } from "./utils-DVmO1EMi.js";
 
 //#region src/services/github/get-copilot-usage.ts
 const getCopilotUsage = async () => {
@@ -9,4 +9,4 @@ const getCopilotUsage = async () => {
 
 //#endregion
 export { getCopilotUsage };
-//# sourceMappingURL=get-copilot-usage-CuVET98U.js.map
+//# sourceMappingURL=get-copilot-usage-LteGnMt-.js.map

package/dist/{get-copilot-usage-CuVET98U.js.map → get-copilot-usage-LteGnMt-.js.map}

@@ -1 +1 @@
-{"version":3,"file":"get-copilot-usage-CuVET98U.js","names":[],"sources":["../src/services/github/get-copilot-usage.ts"],"sourcesContent":["import { getGitHubApiBaseUrl, githubHeaders } from \"~/lib/api-config\"\nimport { HTTPError } from \"~/lib/error\"\nimport { state } from \"~/lib/state\"\n\nexport const getCopilotUsage = async (): Promise<CopilotUsageResponse> => {\n  const response = await fetch(\n    `${getGitHubApiBaseUrl()}/copilot_internal/user`,\n    {\n      headers: githubHeaders(state),\n    },\n  )\n\n  if (!response.ok) {\n    throw new HTTPError(\"Failed to get Copilot usage\", response)\n  }\n\n  return (await response.json()) as CopilotUsageResponse\n}\n\nexport interface QuotaDetail {\n  entitlement: number\n  overage_count: number\n  overage_permitted: boolean\n  percent_remaining: number\n  quota_id: string\n  quota_remaining: number\n  remaining: number\n  unlimited: boolean\n}\n\ninterface QuotaSnapshots {\n  chat: QuotaDetail\n  completions: QuotaDetail\n  premium_interactions: QuotaDetail\n}\n\ninterface CopilotUsageResponse {\n  access_type_sku: string\n  analytics_tracking_id: string\n  assigned_date: string\n  can_signup_for_limited: boolean\n  chat_enabled: boolean\n  copilot_plan: string\n  organization_login_list: Array<unknown>\n  organization_list: Array<unknown>\n  quota_reset_date: string\n  quota_snapshots: QuotaSnapshots\n}\n"],"mappings":";;;AAIA,MAAa,kBAAkB,YAA2C;CACxE,MAAM,WAAW,MAAM,MACrB,GAAG,qBAAqB,CAAC,yBACzB,EACE,SAAS,cAAc,MAAM,EAC9B,CACF;AAED,KAAI,CAAC,SAAS,GACZ,OAAM,IAAI,UAAU,+BAA+B,SAAS;AAG9D,QAAQ,MAAM,SAAS,MAAM"}
+{"version":3,"file":"get-copilot-usage-LteGnMt-.js","names":[],"sources":["../src/services/github/get-copilot-usage.ts"],"sourcesContent":["import { getGitHubApiBaseUrl, githubHeaders } from \"~/lib/api-config\"\nimport { HTTPError } from \"~/lib/error\"\nimport { state } from \"~/lib/state\"\n\nexport const getCopilotUsage = async (): Promise<CopilotUsageResponse> => {\n  const response = await fetch(\n    `${getGitHubApiBaseUrl()}/copilot_internal/user`,\n    {\n      headers: githubHeaders(state),\n    },\n  )\n\n  if (!response.ok) {\n    throw new HTTPError(\"Failed to get Copilot usage\", response)\n  }\n\n  return (await response.json()) as CopilotUsageResponse\n}\n\nexport interface QuotaDetail {\n  entitlement: number\n  overage_count: number\n  overage_permitted: boolean\n  percent_remaining: number\n  quota_id: string\n  quota_remaining: number\n  remaining: number\n  unlimited: boolean\n}\n\ninterface QuotaSnapshots {\n  chat: QuotaDetail\n  completions: QuotaDetail\n  premium_interactions: QuotaDetail\n}\n\ninterface CopilotUsageResponse {\n  access_type_sku: string\n  analytics_tracking_id: string\n  assigned_date: string\n  can_signup_for_limited: boolean\n  chat_enabled: boolean\n  copilot_plan: string\n  organization_login_list: Array<unknown>\n  organization_list: Array<unknown>\n  quota_reset_date: string\n  quota_snapshots: QuotaSnapshots\n}\n"],"mappings":";;;AAIA,MAAa,kBAAkB,YAA2C;CACxE,MAAM,WAAW,MAAM,MACrB,GAAG,qBAAqB,CAAC,yBACzB,EACE,SAAS,cAAc,MAAM,EAC9B,CACF;AAED,KAAI,CAAC,SAAS,GACZ,OAAM,IAAI,UAAU,+BAA+B,SAAS;AAG9D,QAAQ,MAAM,SAAS,MAAM"}

package/dist/main.js

@@ -20,10 +20,10 @@ const args = parseArgs(process.argv, cliArgs);
 if (typeof args["api-home"] === "string") process.env.COPILOT_API_HOME = args["api-home"];
 if (typeof args["oauth-app"] === "string") process.env.COPILOT_API_OAUTH_APP = args["oauth-app"];
 if (typeof args["enterprise-url"] === "string") process.env.COPILOT_API_ENTERPRISE_URL = args["enterprise-url"];
-const { auth } = await import("./auth-DteTbqnM.js");
-const { checkUsage } = await import("./check-usage-Z8fnzZQt.js");
+const { auth } = await import("./auth-BF_z8R4h.js");
+const { checkUsage } = await import("./check-usage-Bg8l21pI.js");
 const { debug } = await import("./debug-Dx1S6uWG.js");
-const { start } = await import("./start-DyiU_Ikg.js");
+const { start } = await import("./start-IV3N7KCo.js");
 const main = defineCommand({
 	meta: {
 		name: "copilot-api",

package/dist/{server-Cprgkxd_.js → server-BrAyTHBe.js}

@@ -1,6 +1,6 @@
 import { PATHS } from "./paths-Cla6y5eD.js";
-import { HTTPError, cacheModels, copilotBaseUrl, copilotHeaders, forwardError, generateRequestIdFromPayload, getRootSessionId, getUUID, isNullish, prepareForCompact, prepareInteractionHeaders, sleep, state } from "./utils-DKqD66k9.js";
-import { getCopilotUsage } from "./get-copilot-usage-CuVET98U.js";
+import { HTTPError, cacheModels, copilotBaseUrl, copilotHeaders, forwardError, generateRequestIdFromPayload, getRootSessionId, getUUID, isNullish, parseUserIdMetadata, prepareForCompact, prepareInteractionHeaders, sleep, state } from "./utils-DVmO1EMi.js";
+import { getCopilotUsage } from "./get-copilot-usage-LteGnMt-.js";
 import { getConfig, getExtraPromptForModel, getProviderConfig, getReasoningEffortForModel, getSmallModel, isMessagesApiEnabled, isResponsesApiContextManagementModel } from "./config-DIqcOsnZ.js";
 import consola from "consola";
 import path from "node:path";
@@ -759,10 +759,21 @@ function translateAnthropicToolsToOpenAI(anthropicTools) {
 		function: {
 			name: tool.name,
 			description: tool.description,
-			parameters: tool.input_schema
+			parameters: normalizeToolSchema(tool.input_schema)
 		}
 	}));
 }
+/**
+* Ensures `type: "object"` schema has a `properties` field.
+* OpenAI's API rejects object schemas without it.
+*/
+const normalizeToolSchema = (schema) => {
+	if (schema.type === "object" && !schema.properties) return {
+		...schema,
+		properties: {}
+	};
+	return schema;
+};
 function translateAnthropicToolChoiceToOpenAI(anthropicToolChoice) {
 	if (!anthropicToolChoice) return;
 	switch (anthropicToolChoice.type) {
@@ -911,7 +922,7 @@ const translateAnthropicMessagesToResponsesPayload = (payload) => {
 	for (const message of payload.messages) input.push(...translateMessage(message, payload.model, applyPhase));
 	const translatedTools = convertAnthropicTools(payload.tools);
 	const toolChoice = convertAnthropicToolChoice(payload.tool_choice);
-	const { safetyIdentifier, promptCacheKey } = parseUserId(payload.metadata?.user_id);
+	const { safetyIdentifier, sessionId: promptCacheKey } = parseUserIdMetadata(payload.metadata?.user_id);
 	return {
 		model: payload.model,
 		input,
@@ -1124,7 +1135,7 @@ const convertAnthropicTools = (tools) => {
 	return tools.map((tool) => ({
 		type: "function",
 		name: tool.name,
-		parameters: tool.input_schema,
+		parameters: normalizeToolSchema(tool.input_schema),
 		strict: false,
 		...tool.description ? { description: tool.description } : {}
 	}));
@@ -1303,20 +1314,6 @@ const mapResponsesUsage = (response) => {
 const isRecord = (value) => typeof value === "object" && value !== null;
 const isResponseOutputText = (block) => isRecord(block) && "type" in block && block.type === "output_text";
 const isResponseOutputRefusal = (block) => isRecord(block) && "type" in block && block.type === "refusal";
-const parseUserId = (userId) => {
-	if (!userId || typeof userId !== "string") return {
-		safetyIdentifier: null,
-		promptCacheKey: null
-	};
-	const userMatch = userId.match(/user_([^_]+)_account/);
-	const safetyIdentifier = userMatch ? userMatch[1] : null;
-	const sessionMatch = userId.match(/_session_(.+)$/);
-	const promptCacheKey = sessionMatch ? sessionMatch[1] : null;
-	return {
-		safetyIdentifier,
-		promptCacheKey
-	};
-};
 const convertToolResultContent = (content) => {
 	if (typeof content === "string") return content;
 	if (Array.isArray(content)) {
@@ -2880,4 +2877,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 
 //#endregion
 export { server };
-//# sourceMappingURL=server-Cprgkxd_.js.map
+//# sourceMappingURL=server-BrAyTHBe.js.map