@x12i/openrouter-runtime 1.0.1 → 1.0.3

package/dist/index.js

@@ -161,7 +161,7 @@ function isRecord(value) {
 function resultToChatToolMessage(result) {
   return {
     role: "tool",
-    toolCallId: result.callId,
+    tool_call_id: result.callId,
     name: result.name,
     content: stringifyToolResult(result.status === "completed" ? result.result : { error: result.error })
   };
@@ -177,6 +177,9 @@ function resultToResponsesInput(result) {
 // src/normalize/citations.ts
 function extractCitations(value) {
   const citations = [];
+  if (typeof value === "string") {
+    return extractCitationsFromText(value);
+  }
   visit(value, (item) => {
     const url = pickString(item, ["url", "uri"]);
     if (!url) return;
@@ -191,7 +194,37 @@ function extractCitations(value) {
       ...optional("endIndex", pickNumber(item, ["end_index", "endIndex"]))
     });
   });
-  return dedupe(citations);
+  return dedupeCitations(citations);
+}
+function extractCitationsFromText(text) {
+  const citations = [];
+  const markdownLinkPattern = /\[([^\]]+)\]\((https?:\/\/[^)\s]+)\)/g;
+  for (const match of text.matchAll(markdownLinkPattern)) {
+    const title = match[1];
+    const url = cleanUrl(match[2]);
+    const startIndex = match.index;
+    citations.push({
+      type: "url",
+      url,
+      sourceProvider: "openrouter",
+      raw: match[0],
+      ...title ? { title } : {},
+      ...startIndex !== void 0 ? { startIndex, endIndex: startIndex + match[0].length } : {}
+    });
+  }
+  const urlPattern = /https?:\/\/[^\s)]+/g;
+  for (const match of text.matchAll(urlPattern)) {
+    const url = cleanUrl(match[0]);
+    const startIndex = match.index;
+    citations.push({
+      type: "url",
+      url,
+      sourceProvider: "openrouter",
+      raw: match[0],
+      ...startIndex !== void 0 ? { startIndex, endIndex: startIndex + match[0].length } : {}
+    });
+  }
+  return dedupeCitations(citations);
 }
 function optional(key, value) {
   return value === void 0 ? {} : { [key]: value };
@@ -213,15 +246,18 @@ function pickNumber(record, keys) {
   for (const key of keys) if (typeof record[key] === "number") return record[key];
   return void 0;
 }
-function dedupe(citations) {
+function dedupeCitations(citations) {
   const seen = /* @__PURE__ */ new Set();
   return citations.filter((citation) => {
-    const key = `${citation.url}:${citation.startIndex ?? ""}:${citation.endIndex ?? ""}`;
+    const key = citation.url;
     if (seen.has(key)) return false;
     seen.add(key);
     return true;
   });
 }
+function cleanUrl(url) {
+  return (url ?? "").replace(/[.,;:!?]+$/, "");
+}
 
 // src/normalize/images.ts
 function extractImages(value) {
@@ -403,7 +439,10 @@ function normalizeChatResponse(params) {
     apiMode: params.apiMode,
     model: typeof responseRecord.model === "string" ? responseRecord.model : params.model,
     text,
-    citations: extractCitations([message.annotations, responseRecord.citations, params.response]),
+    citations: dedupeCitations([
+      ...extractCitations([message.annotations, responseRecord.citations, params.response]),
+      ...extractCitations(text)
+    ]),
     images: extractImages(params.response),
     patches: extractPatches(params.response),
     toolUsage: createToolUsage(params.serverTools, params.response, params.functionToolUsage),
@@ -433,9 +472,14 @@ function optional3(key, value) {
 }
 
 // src/policies/post-response-validation.ts
-async function validatePostResponse(response, defaults) {
+async function validatePostResponse(response, defaults, serverTools) {
   const errors = [...response.errors];
   const warnings = [...response.warnings];
+  const webSearchUsage = response.toolUsage.serverTools.webSearch;
+  if (webSearchUsage.requested && response.citations.length > 0 && !webSearchUsage.used) {
+    webSearchUsage.used = true;
+    webSearchUsage.callCount = Math.max(webSearchUsage.callCount ?? 0, 1);
+  }
   for (const [key, usage] of Object.entries(response.toolUsage.serverTools)) {
     if (usage.required && !usage.used) {
       const code = `${toScreamingSnake(key)}_REQUIRED_BUT_NOT_USED`;
@@ -448,11 +492,18 @@ async function validatePostResponse(response, defaults) {
       }
     }
   }
-  if (defaults.requireCitationsWhenSearchUsed && response.toolUsage.serverTools.webSearch.requested && response.citations.length === 0) {
-    warnings.push({
+  const citationsRequired = serverTools?.webSearch?.requireCitations ?? defaults.requireCitationsWhenSearchUsed;
+  if (citationsRequired && webSearchUsage.used && response.citations.length === 0) {
+    const violation = {
       code: "CITATIONS_REQUIRED_BUT_MISSING",
-      message: "Web search was requested but no citations were extracted."
-    });
+      message: "Web search was used but no citations were extracted."
+    };
+    webSearchUsage.policyViolation = webSearchUsage.policyViolation ?? violation.code;
+    if (defaults.onPolicyViolation === "throw") {
+      errors.push({ ...violation, source: "policy" });
+    } else {
+      warnings.push(violation);
+    }
   }
   return {
     ...response,
@@ -832,7 +883,7 @@ function compileMessages(request) {
   if (request.system) messages.push({ role: "system", content: request.system });
   if (request.messages) messages.push(...request.messages);
   if (request.prompt) messages.push({ role: "user", content: request.prompt });
-  return messages;
+  return messages.map(compileMessage);
 }
 function compilePromptInput(request) {
   if (request.prompt) return request.prompt;
@@ -841,6 +892,32 @@ function compilePromptInput(request) {
     content: message.content
   }));
 }
+function compileMessage(message) {
+  return clean({
+    role: message.role,
+    content: compileContent(message.content),
+    name: message.name,
+    tool_call_id: message.toolCallId
+  });
+}
+function compileContent(content) {
+  if (typeof content === "string") return content;
+  return content.map((part) => {
+    if (part.type === "image_url") {
+      return { type: "image_url", image_url: { url: part.imageUrl } };
+    }
+    if (part.type === "file") {
+      return clean({
+        type: "file",
+        file_name: part.fileName,
+        mime_type: part.mimeType,
+        data: part.data,
+        url: part.url
+      });
+    }
+    return part;
+  });
+}
 function compileToolChoice(choice, serverTools) {
   if (!choice || choice === "auto") return void 0;
   if (choice === "none" || choice === "required") return choice;
@@ -968,7 +1045,7 @@ async function executeFunctionCalls(params) {
       name: result.name,
       callId: result.callId,
       status: result.status,
-      args: call.args,
+      args: parseToolArgs(call.args),
       ...result.result !== void 0 ? { result: result.result } : {},
       ...result.error !== void 0 ? { error: result.error } : {},
       ...result.durationMs !== void 0 ? { durationMs: result.durationMs } : {}
@@ -1004,10 +1081,13 @@ async function runChat(request, compiled, context) {
     functionUsage.push(...results);
     const body = activeCompiled.body;
     const messages = Array.isArray(body.messages) ? [...body.messages] : [];
+    const assistantMessage = extractAssistantMessage(response);
+    if (assistantMessage) messages.push(assistantMessage);
     messages.push(...results.map(resultToChatToolMessage));
-    activeCompiled = { ...activeCompiled, body: { ...body, messages } };
+    activeCompiled = { ...activeCompiled, body: { ...body, messages, tool_choice: "auto" } };
   }
   const model = typeof compiled.body.model === "string" ? compiled.body.model : "";
+  const serverTools = mergeServerTools(context.defaults.serverTools, request.serverTools);
   const normalized = normalizeChatResponse({
     requestBody: activeCompiled.body,
     response,
@@ -1015,25 +1095,33 @@ async function runChat(request, compiled, context) {
     model,
     warnings: compiled.warnings,
     functionToolUsage: functionUsage,
-    ...optional4("serverTools", mergeServerTools(context.defaults.serverTools, request.serverTools)),
+    ...optional4("serverTools", serverTools),
     ...optional4("metadata", request.metadata)
   });
-  return validatePostResponse(normalized, context.defaults);
+  return validatePostResponse(normalized, context.defaults, serverTools);
 }
 function optional4(key, value) {
   return value === void 0 ? {} : { [key]: value };
 }
+function extractAssistantMessage(response) {
+  const record = isRecord(response) ? response : {};
+  const choice = Array.isArray(record.choices) && isRecord(record.choices[0]) ? record.choices[0] : {};
+  const message = isRecord(choice.message) ? choice.message : void 0;
+  if (!message) return void 0;
+  return message;
+}
 
 // src/normalize/normalize-responses-response.ts
 function normalizeResponsesResponse(params) {
   const record = isRecord(params.response) ? params.response : {};
+  const text = extractOutputText(record);
   return {
     id: typeof record.id === "string" ? record.id : createRuntimeId("orresp"),
     status: record.status === "requires_action" ? "requires_action" : "completed",
     apiMode: "responses",
     model: typeof record.model === "string" ? record.model : params.model,
-    text: extractOutputText(record),
-    citations: extractCitations(params.response),
+    text,
+    citations: dedupeCitations([...extractCitations(params.response), ...extractCitations(text)]),
     images: extractImages(params.response),
     patches: extractPatches(params.response),
     toolUsage: createToolUsage(params.serverTools, params.response, params.functionToolUsage),
@@ -1095,22 +1183,24 @@ async function runResponses(request, compiled, context) {
       ...activeCompiled,
       body: {
         ...activeCompiled.body,
+        tool_choice: "auto",
         previous_response_id: isRecord(response) && typeof response.id === "string" ? response.id : void 0,
         input: results.map(resultToResponsesInput)
       }
     };
   }
   const model = typeof compiled.body.model === "string" ? compiled.body.model : "";
+  const serverTools = mergeServerTools(context.defaults.serverTools, request.serverTools);
   const normalized = normalizeResponsesResponse({
     requestBody: activeCompiled.body,
     response,
     model,
     warnings: compiled.warnings,
     functionToolUsage: functionUsage,
-    ...optional6("serverTools", mergeServerTools(context.defaults.serverTools, request.serverTools)),
+    ...optional6("serverTools", serverTools),
     ...optional6("metadata", request.metadata)
   });
-  return validatePostResponse(normalized, context.defaults);
+  return validatePostResponse(normalized, context.defaults, serverTools);
 }
 function optional6(key, value) {
   return value === void 0 ? {} : { [key]: value };