ocx-cursor 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocx-cursor",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Use OpenCodex models in Cursor through an authenticated HTTPS gateway",
   "keywords": [
     "opencodex",

package/src/catalog.mjs

@@ -39,7 +39,7 @@ export function aliasFor(sourceId) {
 
 export function inferredEfforts(sourceId) {
   const modelId = sourceId.split("/").at(-1);
-  if (/^claude-(?:fable-5|sonnet-5|opus-(?:5|4-[78]))$/.test(modelId)) return [...allowedEfforts];
+  if (/^claude-(?:fable-5(?:-1)?|sonnet-5|opus-(?:5|4-[78]))$/.test(modelId)) return [...allowedEfforts];
   if (/^claude-(?:opus-4-6|sonnet-4-6)$/.test(modelId)) return ["low", "medium", "high", "max"];
   if (/^gpt-5\.6-(?:luna|sol|terra)$/.test(modelId)) return [...allowedEfforts];
   if (/^gpt-5\.[45](?:$|-)/.test(modelId)) return ["low", "medium", "high", "xhigh"];
@@ -73,38 +73,30 @@ export function priorityModelIds(catalogFile = configuredCodexCatalogFile()) {
   }
 }
 
-export function codexNativeModels(catalogFile = configuredCodexCatalogFile()) {
-  try {
-    const payload = JSON.parse(readFileSync(catalogFile, "utf8"));
-    return payload.models
-      .filter((model) => typeof model?.slug === "string"
-        && !model.slug.includes("/")
-        && model.visibility === "list"
-        && model.supported_in_api === true
-        && model.opencodex_capability_provenance === undefined)
-      .map((model) => ({
-        id: model.slug,
-        owned_by: "openai",
-        capabilities: {
-          input_modalities: model.input_modalities,
-          context_length: model.context_window,
-          max_output_tokens: model.max_output_tokens,
-          reasoning_effort: model.supported_reasoning_levels?.map(({ effort }) => effort),
-        },
-      }));
-  } catch {
-    return [];
-  }
-}
-
 export function normalizeActiveCatalog(configured, active, fastModelIds = new Set()) {
   const configuredById = new Map(configured
     .filter((model) => typeof model.provider === "string" && typeof model.model === "string")
     .map((model) => [`${model.provider}/${model.model}`, model]));
   const models = new Map();
+  const activeIds = new Set(active.filter((model) => model?.owned_by !== "opencodex").map((model) => model?.id));
+  const configuredIds = new Set(configured.flatMap((model) => [
+    `${model.provider}/${model.model}`,
+    model.alias,
+    ...(model.provider === "openai" ? [model.model] : []),
+  ]));
+  // OpenCodex publishes synthetic --fast rows for clients without a Fast toggle.
+  // Preserve exact configured IDs and real product names ending in a single -fast.
+  const fastRows = new Set(active.filter((model) => (
+    typeof model?.id === "string"
+    && model.owned_by !== "opencodex"
+    && model.id.endsWith("--fast")
+    && !configuredIds.has(model.id)
+    && activeIds.has(model.id.slice(0, -"--fast".length))
+  )).map((model) => model.id));
 
   for (const model of active) {
     if (typeof model?.id !== "string" || model.owned_by === "opencodex") continue;
+    if (fastRows.has(model.id)) continue;
     const configuredModel = configuredById.get(model.id);
     const provider = model.id.includes("/") ? model.id.split("/", 1)[0] : String(model.owned_by || "openai").toLowerCase();
     if (provider === "cursor") continue;
@@ -123,7 +115,7 @@ export function normalizeActiveCatalog(configured, active, fastModelIds = new Se
       maxOutputTokens: model.capabilities?.max_output_tokens,
       inputModalities,
       reasoningEfforts: sanitizeEfforts(model.id, configuredModel?.reasoningEfforts ?? model.capabilities?.reasoning_effort),
-      supportsFast: fastModelIds.has(model.id),
+      supportsFast: fastModelIds.has(model.id) || fastRows.has(`${model.id}--fast`),
     });
   }
 
@@ -168,7 +160,7 @@ export async function buildActiveCatalog(options = {}) {
   const codexCatalogFile = options.codexCatalogFile || configuredCodexCatalogFile();
   return normalizeActiveCatalog(
     configuredModels(options.ocxBin),
-    [...await activeModels(options.fetchImpl), ...codexNativeModels(codexCatalogFile)],
+    await activeModels(options.fetchImpl),
     options.fastModelIds || priorityModelIds(codexCatalogFile),
   );
 }

package/src/cursor-patch.mjs

@@ -21,7 +21,7 @@ export const legacyCursorSubagentCredentialsPatchMarker = "/*ocx-cursor-subagent
 export const cursorSubagentLegacyDetailsPatchMarker = "/*ocx-cursor-subagent-legacy-details-v2*/";
 export const legacyCursorSubagentLegacyDetailsPatchMarker = "/*ocx-cursor-subagent-legacy-details-v1*/";
 export const cursorSubagentPromptRoutingPatchMarker = "/*ocx-cursor-subagent-prompt-routing-v3*/";
-export const cursorSubagentExecutionRoutingPatchMarker = "/*ocx-cursor-subagent-execution-routing-v5*/";
+export const cursorSubagentExecutionRoutingPatchMarker = "/*ocx-cursor-subagent-execution-routing-v6*/";
 export const cursorSubagentRunRoutingPatchMarker = "/*ocx-cursor-subagent-run-routing-v1*/";
 export const cursorSubagentRuntimeCredentialsPatchMarker = "/*ocx-cursor-subagent-runtime-credentials-v1*/";
 export const cursorSubagentModelDisplayPatchMarker = "/*ocx-cursor-subagent-model-display-v2*/";
@@ -60,6 +60,8 @@ const legacySubagentPromptRouting = /customSystemPrompt:\(\(\)=>\{\/\*ocx-cursor
 const legacySubagentRequestRouting = /(?<prefix>conversationState:[A-Za-z_$][\w$]*\([A-Za-z_$][\w$]*\),action:)\(\(\)=>\{\/\*ocx-cursor-subagent-prompt-routing-v2\*\/[\s\S]*?return (?<action>[A-Za-z_$][\w$]*)\}\)\(\)(?=,modelDetails:)/g;
 const createOrResumeSubagentStart = /async createOrResumeSubagent\((?<input>[A-Za-z_$][\w$]*)\)\{/g;
 const legacySubagentExecutionRouting = /(?<start>async createOrResumeSubagent\((?<input>[A-Za-z_$][\w$]*)\)\{)\/\*ocx-cursor-subagent-execution-routing-v[1-4]\*\/[\s\S]*?(?=let [A-Za-z_$][\w$]*,[A-Za-z_$][\w$]*=\k<input>\.resumeAgentId;)/g;
+const currentSubagentExecutionRouting = /(?<start>async createOrResumeSubagent\((?<input>[A-Za-z_$][\w$]*)\)\{)\/\*ocx-cursor-subagent-execution-routing-v5\*\/[\s\S]*?(?=const [A-Za-z_$][\w$]*=\{mode:)/g;
+const subagentSpawnMethod = /(?<start>async _createOrResumeSubagentSpawn\((?<input>[A-Za-z_$][\w$]*),[A-Za-z_$][\w$]*\)\{)(?<body>[\s\S]*?)(?=async runSubagentWithHandle\()/g;
 const legacySubagentModelConfigFixup = /(?<fixup>[A-Za-z_$][\w$]*)=ocxCursorRequestedModel\?void 0:typeof this\._modelConfigService\.fixupModelConfigForCurrentFlag=="function"\?this\._modelConfigService\.fixupModelConfigForCurrentFlag\(\{modelName:(?<input>[A-Za-z_$][\w$]*)\.modelId,maxMode:(?<composerConfig>[A-Za-z_$][\w$]*)\.maxMode===!0\}\):void 0/g;
 const subagentModelConfigFixup = /(?<fixup>[A-Za-z_$][\w$]*)=typeof this\._modelConfigService\.fixupModelConfigForCurrentFlag=="function"\?this\._modelConfigService\.fixupModelConfigForCurrentFlag\(\{modelName:(?<input>[A-Za-z_$][\w$]*)\.modelId,maxMode:(?<composerConfig>[A-Za-z_$][\w$]*)\.maxMode===!0\}\):void 0/g;
 const appendSubagentComposer = /(?<declaration>const (?<result>[A-Za-z_$][\w$]*)=await this\._composerDataService\.appendSubComposer\((?<composer>[A-Za-z_$][\w$]*)\))/g;
@@ -69,6 +71,7 @@ const requestedModelCredentials = /(?<prefix>new [A-Za-z_$][\w$]*\(\{modelId:(?<
 const subagentModelDisplaySelection = /function (?<functionName>[A-Za-z_$][\w$]*)\((?<input>[A-Za-z_$][\w$]*)\)\{return \k<input>\.resumeTargetComposerId!==void 0\?\k<input>\.subagentModelName:\k<input>\.bestOfNModelName!==void 0\?\k<input>\.bestOfNModelName:\k<input>\.taskParamModelName\?\?\k<input>\.subagentModelName\}/g;
 const legacySubagentModelDisplaySelection = /function (?<functionName>[A-Za-z_$][\w$]*)\((?<input>[A-Za-z_$][\w$]*)\)\{\/\*ocx-cursor-subagent-model-display-v1\*\/return \k<input>\.subagentModelName\?\.startsWith\("opencodex\/"\)\?\k<input>\.subagentModelName:\k<input>\.resumeTargetComposerId!==void 0\?\k<input>\.subagentModelName:\k<input>\.bestOfNModelName!==void 0\?\k<input>\.bestOfNModelName:\k<input>\.taskParamModelName\?\?\k<input>\.subagentModelName\}/g;
 const subagentTaskArgsContext = /(?<args>[A-Za-z_$][\w$]*)=(?<argsExtractor>[A-Za-z_$][\w$]*)\((?<bubble>[A-Za-z_$][\w$]*)\),(?<resume>[A-Za-z_$][\w$]*)=(?<resumeExtractor>[A-Za-z_$][\w$]*)\(\k<args>\),[\s\S]{0,400}?(?<taskModel>[A-Za-z_$][\w$]*)=\k<resume>===void 0\?\k<bubble>\.params\?\.model:void 0/g;
+const directSubagentTaskArgsContext = /subagentTypeName:(?<bubble>[A-Za-z_$][\w$]*)\.params\?\.name[\s\S]{0,2500}?taskParamModelName:(?<taskModel>[A-Za-z_$][\w$]*)\}\);return/g;
 const legacySubagentTaskArgsDisplayV4 = /taskParamModelName:\/\*ocx-cursor-subagent-task-args-display-v4\*\/\(\(\)=>\{[\s\S]*?\}\)\(\)/g;
 const legacySubagentTaskArgsDisplayV3 = /taskParamModelName:\/\*ocx-cursor-subagent-task-args-display-v3\*\/\(\(\)=>\{[\s\S]*?return ocxCursorTaskModel\}\)\(\)/g;
 const legacySubagentTaskArgsDisplayV2 = /taskParamModelName:\/\*ocx-cursor-subagent-task-args-display-v2\*\/\(\(\)=>\{[\s\S]*?return ocxCursorTaskModel\}\)\(\)/g;
@@ -85,9 +88,29 @@ const directoryPatchQueues = new Map();
 
 export function clearCursorAppQuarantine(options = {}) {
   const execute = options.execFileSync || execFileSync;
-  execute("/usr/bin/xattr", ["-dr", "com.apple.quarantine", options.appPath || cursorAppPath], {
-    stdio: "ignore",
-  });
+  const appPath = options.appPath || cursorAppPath;
+  try {
+    execute("/usr/bin/xattr", ["-dr", "com.apple.quarantine", appPath], {
+      stdio: "ignore",
+    });
+  } catch (error) {
+    // Read-only nested app directories can make recursive xattr traversal fail
+    // even after the bundle root has no quarantine attribute. List root
+    // attributes so probe failures and a real remaining quarantine are never
+    // hidden.
+    try {
+      const rootAttributes = execute("/usr/bin/xattr", [appPath], {
+        encoding: "utf8",
+      });
+      const hasRootQuarantine = String(rootAttributes)
+        .split(/\r?\n/)
+        .some((attribute) => attribute.trim() === "com.apple.quarantine");
+      if (!hasRootQuarantine) return;
+    } catch {
+      // Fail closed when the root probe itself cannot be completed.
+    }
+    throw error;
+  }
 }
 
 export function finalizeCursorAppPatch(options = {}) {
@@ -260,11 +283,34 @@ export function patchCursorSubagentPromptRoutingSource(source) {
 export function patchCursorSubagentExecutionRoutingSource(source) {
   if (source.includes(cursorSubagentExecutionRoutingPatchMarker)) return { status: "already-patched", source };
   let restored = source;
+  let restoredLegacySpawn = false;
+  if (restored.includes("/*ocx-cursor-subagent-execution-routing-v5*/")) {
+    restored = replaceSingleMatch(restored, currentSubagentExecutionRouting, (match) => match.groups.start, "current subagent execution routing");
+    const spawnMatches = [...restored.matchAll(subagentSpawnMethod)];
+    if (spawnMatches.length === 1) {
+      const { start, input, body } = spawnMatches[0].groups;
+      const routedBody = body
+        .replaceAll("ocxCursorRequestedModel?void 0:", `${input}.modelId?.startsWith("opencodex/")?void 0:`)
+        .replaceAll("ocxCursorRequestedModel&&", `${input}.modelId?.startsWith("opencodex/")&&`)
+        .replaceAll("modelName:ocxCursorRequestedModel", `modelName:${input}.modelId`)
+        .replaceAll("modelId:ocxCursorRequestedModel", `modelId:${input}.modelId`);
+      if (routedBody !== body) {
+        restored = replaceSingleMatch(restored, subagentSpawnMethod, `${start}${routedBody}`, "current subagent spawn routing");
+        restoredLegacySpawn = true;
+      }
+    }
+  }
   if (restored.includes("/*ocx-cursor-subagent-execution-routing-v4*/")) {
-    restored = replaceSingleMatch(restored, legacySubagentModelConfigFixup, (match) => {
-      const { fixup, input, composerConfig } = match.groups;
-      return `${fixup}=typeof this._modelConfigService.fixupModelConfigForCurrentFlag=="function"?this._modelConfigService.fixupModelConfigForCurrentFlag({modelName:${input}.modelId,maxMode:${composerConfig}.maxMode===!0}):void 0`;
-    }, "legacy subagent model config fixup");
+    const legacyFixups = [...restored.matchAll(legacySubagentModelConfigFixup)];
+    if (legacyFixups.length > 1) {
+      throw new Error(`Expected at most one Cursor legacy subagent model config fixup, found ${legacyFixups.length}`);
+    }
+    if (legacyFixups.length === 1) {
+      restored = replaceSingleMatch(restored, legacySubagentModelConfigFixup, (match) => {
+        const { fixup, input, composerConfig } = match.groups;
+        return `${fixup}=typeof this._modelConfigService.fixupModelConfigForCurrentFlag=="function"?this._modelConfigService.fixupModelConfigForCurrentFlag({modelName:${input}.modelId,maxMode:${composerConfig}.maxMode===!0}):void 0`;
+      }, "legacy subagent model config fixup");
+    }
   }
   if (restored.includes("/*ocx-cursor-subagent-execution-routing-v1*/") || restored.includes("/*ocx-cursor-subagent-execution-routing-v2*/") || restored.includes("/*ocx-cursor-subagent-execution-routing-v3*/") || restored.includes("/*ocx-cursor-subagent-execution-routing-v4*/")) {
     restored = replaceSingleMatch(restored, legacySubagentExecutionRouting, (match) => match.groups.start, "legacy subagent execution routing");
@@ -273,14 +319,28 @@ export function patchCursorSubagentExecutionRoutingSource(source) {
     const { input } = match.groups;
     return `${match[0]}${cursorSubagentExecutionRoutingPatchMarker}const ocxCursorModelMarker=typeof ${input}.prompt==="string"?/^\\s*<ocx-subagent-model>(opencodex\\/[A-Za-z0-9._\\/-]+)<\\/ocx-subagent-model>\\s*/.exec(${input}.prompt):null,ocxCursorRequestedModel=ocxCursorModelMarker?.[1];if(ocxCursorRequestedModel&&!${input}.resumeAgentId){const ocxCursorModelAvailable=this._modelConfigService.getAvailableDefaultModels().some(ocxCursorModel=>ocxCursorModel?.name===ocxCursorRequestedModel);if(!ocxCursorModelAvailable)throw new Error("OpenCodex subagent model is unavailable: "+ocxCursorRequestedModel);${input}={...${input},modelId:ocxCursorRequestedModel}}if(ocxCursorModelMarker)${input}={...${input},prompt:${input}.prompt.slice(ocxCursorModelMarker[0].length)};`;
   }, "subagent execution entrypoint");
-  patched = replaceSingleMatch(patched, subagentModelConfigFixup, (match) => {
-    const { fixup, input, composerConfig } = match.groups;
-    return `${fixup}=ocxCursorRequestedModel?void 0:typeof this._modelConfigService.fixupModelConfigForCurrentFlag=="function"?this._modelConfigService.fixupModelConfigForCurrentFlag({modelName:${input}.modelId,maxMode:${composerConfig}.maxMode===!0}):void 0`;
-  }, "subagent model config fixup");
-  patched = replaceSingleMatch(patched, appendSubagentComposer, (match) => {
-    const { declaration, composer } = match.groups;
-    return `ocxCursorRequestedModel&&(${composer}.modelConfig={modelName:ocxCursorRequestedModel,maxMode:${composer}.modelConfig?.maxMode===!0,selectedModels:[{modelId:ocxCursorRequestedModel,parameters:[]}]});${declaration}`;
-  }, "final subagent model config");
+  const configFixups = [...patched.matchAll(subagentModelConfigFixup)];
+  if (configFixups.length > 1) throw new Error(`Expected at most one Cursor subagent model config fixup, found ${configFixups.length}`);
+  const allowMissingConfigFixup = restoredLegacySpawn || source.includes("/*ocx-cursor-subagent-execution-routing-v4*/");
+  if (configFixups.length === 0 && !allowMissingConfigFixup) {
+    throw new Error("Expected one Cursor subagent model config fixup, found 0");
+  }
+  if (configFixups.length === 1) {
+    patched = replaceSingleMatch(patched, subagentModelConfigFixup, (match) => {
+      const { fixup, input, composerConfig } = match.groups;
+      // The execution entrypoint and the composer-spawn helper are separate
+      // methods in current Cursor builds. The requested model marker is scoped
+      // to createOrResumeSubagent, so derive routing from the already-normalized
+      // request model here instead of referencing that out-of-scope variable.
+      return `${fixup}=${input}.modelId?.startsWith("opencodex/")?void 0:typeof this._modelConfigService.fixupModelConfigForCurrentFlag=="function"?this._modelConfigService.fixupModelConfigForCurrentFlag({modelName:${input}.modelId,maxMode:${composerConfig}.maxMode===!0}):void 0`;
+    }, "subagent model config fixup");
+  }
+  if (!restoredLegacySpawn) {
+    patched = replaceSingleMatch(patched, appendSubagentComposer, (match) => {
+      const { declaration, composer } = match.groups;
+      return `(${composer}.modelConfig?.modelName?.startsWith("opencodex/"))&&(${composer}.modelConfig={modelName:${composer}.modelConfig.modelName,maxMode:${composer}.modelConfig?.maxMode===!0,selectedModels:[{modelId:${composer}.modelConfig.modelName,parameters:[]}]});${declaration}`;
+    }, "final subagent model config");
+  }
   return { status: "patched", source: patched };
 }
 
@@ -324,12 +384,17 @@ export function patchCursorSubagentModelDisplaySource(source) {
 
 export function patchCursorSubagentTaskArgsDisplaySource(source) {
   if (source.includes(cursorSubagentTaskArgsDisplayPatchMarker)) return { status: "already-patched", source };
-  const contexts = [...source.matchAll(subagentTaskArgsContext)];
+  const legacyContexts = [...source.matchAll(subagentTaskArgsContext)];
+  const contexts = legacyContexts.length > 0
+    ? legacyContexts
+    : [...source.matchAll(directSubagentTaskArgsContext)];
   if (contexts.length !== 1) {
     throw new Error(`Expected one Cursor subagent task args context, found ${contexts.length}`);
   }
   const { args, bubble, taskModel } = contexts[0].groups;
-  const replacement = `taskParamModelName:${cursorSubagentTaskArgsDisplayPatchMarker}/<ocx-subagent-model>(opencodex\\/[^<]+)<\\/ocx-subagent-model>/.exec(${bubble}.params?.prompt??${args}?.prompt??"")?.[1]??${taskModel}??${args}?.model`;
+  const prompt = args ? `${bubble}.params?.prompt??${args}?.prompt??""` : `${bubble}.params?.prompt??""`;
+  const fallback = args ? `${taskModel}??${args}?.model` : taskModel;
+  const replacement = `taskParamModelName:${cursorSubagentTaskArgsDisplayPatchMarker}/<ocx-subagent-model>(opencodex\\/[^<]+)<\\/ocx-subagent-model>/.exec(${prompt})?.[1]??${fallback}`;
   if (source.includes(legacyCursorSubagentTaskArgsDisplayV4PatchMarker)) {
     const upgraded = replaceSingleMatch(source, legacySubagentTaskArgsDisplayV4, replacement, "v4 subagent task args model display field");
     return { status: "patched", source: upgraded };

package/src/cursor-state.mjs

@@ -186,6 +186,17 @@ function syncSelectedModel(state, catalog) {
   const composer = state.aiSettings?.modelConfig?.composer;
   if (!composer || !Array.isArray(composer.selectedModels)) return;
   const byAlias = new Map(catalog.map((model) => [model.alias, model]));
+  for (const selected of composer.selectedModels) {
+    if (typeof selected?.modelId !== "string" || byAlias.has(selected.modelId)
+      || !selected.modelId.endsWith("--fast")) continue;
+    const base = byAlias.get(selected.modelId.slice(0, -"--fast".length));
+    if (!base?.supportsFast) continue;
+    selected.modelId = base.alias;
+    selected.parameters = [
+      ...(Array.isArray(selected.parameters) ? selected.parameters.filter(({ id }) => id !== "fast") : []),
+      { id: "fast", value: "true" },
+    ];
+  }
   composer.selectedModels = composer.selectedModels.filter((selected) => (
     typeof selected?.modelId !== "string" || !selected.modelId.startsWith(managedPrefix) || byAlias.has(selected.modelId)
   ));

package/src/gateway.mjs

@@ -45,6 +45,122 @@ function disableStrictFunctionTools(tools) {
   }
 }
 
+function normalizeCursorTool(tool) {
+  if (!isRecord(tool) || tool.type !== undefined || typeof tool.name !== "string" || !isRecord(tool.input_schema)) {
+    return tool;
+  }
+  const definition = {
+    name: tool.name,
+    ...(typeof tool.description === "string" ? { description: tool.description } : {}),
+    parameters: tool.input_schema,
+    ...(typeof tool.strict === "boolean" ? { strict: tool.strict } : {}),
+  };
+  return { type: "function", function: definition };
+}
+
+function normalizeToolChoice(choice) {
+  if (!isRecord(choice) || typeof choice.type !== "string") return choice;
+  if (choice.type === "auto") return "auto";
+  if (choice.type === "none") return "none";
+  if (choice.type === "any") return "required";
+  if (choice.type === "tool" && typeof choice.name === "string") {
+    return { type: "function", function: { name: choice.name } };
+  }
+  return choice;
+}
+
+function normalizeCursorTooling(payload) {
+  if (Array.isArray(payload.tools)) payload.tools = payload.tools.map(normalizeCursorTool);
+  if (payload.tool_choice !== undefined) payload.tool_choice = normalizeToolChoice(payload.tool_choice);
+}
+
+function toolResultText(value) {
+  if (typeof value === "string") return value;
+  if (Array.isArray(value)) return value.map(toolResultText).filter(Boolean).join("\n");
+  if (isRecord(value)) {
+    if (typeof value.text === "string") return value.text;
+    if (value.content !== undefined) return toolResultText(value.content);
+    try {
+      return JSON.stringify(value);
+    } catch {
+      return "";
+    }
+  }
+  return value === undefined || value === null ? "" : String(value);
+}
+
+function openAiToolCallFromCursorBlock(block) {
+  let args = "{}";
+  try {
+    args = JSON.stringify(block.input ?? {}) ?? "{}";
+  } catch {
+    // Keep the request valid if Cursor supplied a non-serializable input value.
+  }
+  return {
+    id: block.id,
+    type: "function",
+    function: {
+      name: block.name,
+      arguments: args,
+    },
+  };
+}
+
+export function normalizeCursorChatMessages(messages) {
+  if (!Array.isArray(messages)) return messages;
+  const normalized = [];
+  for (const message of messages) {
+    if (!isRecord(message) || !Array.isArray(message.content)) {
+      normalized.push(message);
+      continue;
+    }
+    if (message.role === "assistant") {
+      const allToolUses = message.content.filter((block) => isRecord(block) && block.type === "tool_use");
+      const toolUses = allToolUses.filter((block) => typeof block.id === "string" && block.id.length > 0 && typeof block.name === "string");
+      if (allToolUses.length > toolUses.length) {
+        normalized.push(message);
+        continue;
+      }
+      if (toolUses.length === 0) {
+        normalized.push(message);
+        continue;
+      }
+      const existingToolCalls = Array.isArray(message.tool_calls) ? message.tool_calls : [];
+      const existingIds = new Set(existingToolCalls.map((call) => call?.id).filter((id) => typeof id === "string"));
+      const newToolUses = toolUses.filter((block) => !existingIds.has(block.id));
+      const content = message.content.filter((block) => !(isRecord(block) && block.type === "tool_use"));
+      normalized.push({
+        ...message,
+        content: content.length > 0 ? content : null,
+        tool_calls: [
+          ...existingToolCalls,
+          ...newToolUses.map((block) => openAiToolCallFromCursorBlock(block)),
+        ],
+      });
+      continue;
+    }
+    const toolResults = message.content.filter((block) => isRecord(block) && block.type === "tool_result");
+    if (message.role !== "user" || toolResults.length === 0) {
+      normalized.push(message);
+      continue;
+    }
+    if (toolResults.some((block) => typeof block.tool_use_id !== "string" || block.tool_use_id.length === 0)) {
+      normalized.push(message);
+      continue;
+    }
+    for (const block of toolResults) {
+      normalized.push({
+        role: "tool",
+        tool_call_id: block.tool_use_id,
+        content: toolResultText(block.content),
+      });
+    }
+    const remainingContent = message.content.filter((block) => !(isRecord(block) && block.type === "tool_result"));
+    if (remainingContent.length > 0) normalized.push({ ...message, content: remainingContent });
+  }
+  return normalized;
+}
+
 function enrichSubagentModelTools(tools, catalog) {
   if (!Array.isArray(tools)) return;
   const aliases = catalog.map(({ alias }) => alias).filter((alias) => alias.startsWith(managedPrefix));
@@ -91,7 +207,7 @@ function restoreRoutedSubagentModels(messages, catalog) {
   }
 }
 
-export function rewriteModelAliasBody(body, catalog) {
+export function rewriteModelAliasBody(body, catalog, route = "POST /v1/chat/completions") {
   if (!body?.length) return body;
   let payload;
   try {
@@ -101,7 +217,11 @@ export function rewriteModelAliasBody(body, catalog) {
   }
   if (!isRecord(payload) || typeof payload.model !== "string" || !payload.model.startsWith(managedPrefix)) return body;
   restoreRoutedSubagentModels(payload.messages, catalog);
-  enrichSubagentModelTools(payload.tools, catalog);
+  if (route === "POST /v1/chat/completions") {
+    payload.messages = normalizeCursorChatMessages(payload.messages);
+    normalizeCursorTooling(payload);
+    enrichSubagentModelTools(payload.tools, catalog);
+  }
 
   const variant = /^(opencodex\/.+?)\[([^\]]+)\]$/.exec(payload.model);
   let alias = variant?.[1] || payload.model;
@@ -251,7 +371,7 @@ export function startGateway(options) {
       const upstream = options.upstream || opencodexEndpoint();
       const receivedBody = await readBody(req);
       if (downstreamClosed) return;
-      const body = rewriteModelAliasBody(receivedBody, catalog);
+      const body = rewriteModelAliasBody(receivedBody, catalog, route);
       const token = options.serviceToken !== undefined ? options.serviceToken : await serviceToken();
       if (downstreamClosed) return;
       upstreamReq = http.request({