@khanglvm/llm-router 2.0.1 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khanglvm/llm-router",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "LLM Router: single gateway endpoint for multi-provider LLMs with unified OpenAI+Anthropic format and seamless fallback",
   "keywords": [
     "llm-router",
@@ -31,7 +31,8 @@
     "deploy:worker": "node ./src/cli-entry.js deploy",
     "test:provider-live": "node --test --test-concurrency=1 ./test/live-provider-suite.test.js",
     "test:provider-smoke": "npm run test:provider-live",
-    "test:amp-smoke": "node ./scripts/amp-smoke-suite.mjs"
+    "test:amp-smoke": "node ./scripts/amp-smoke-suite.mjs",
+    "prepublishOnly": "npm run test:provider-live"
   },
   "dependencies": {
     "@levu/snap": "^0.3.13"

package/src/node/startup-manager.js

@@ -11,6 +11,20 @@ import { FIXED_LOCAL_ROUTER_HOST, FIXED_LOCAL_ROUTER_PORT } from "./local-server
 
 const SERVICE_NAME = "llm-router";
 const LAUNCH_AGENT_ID = "dev.llm-router";
+const STARTUP_ENV_PASSTHROUGH_KEYS = [
+  "NODE_EXTRA_CA_CERTS",
+  "SSL_CERT_FILE",
+  "SSL_CERT_DIR",
+  "HTTP_PROXY",
+  "HTTPS_PROXY",
+  "ALL_PROXY",
+  "NO_PROXY",
+  "http_proxy",
+  "https_proxy",
+  "all_proxy",
+  "no_proxy",
+  "npm_config_cafile"
+];
 
 function resolveDarwinDomain() {
   const uid = process.getuid?.();
@@ -83,13 +97,48 @@ function isMissingServiceMessage(value) {
     || text.includes("unit llm-router.service could not be found");
 }
 
+function escapeXml(value) {
+  return String(value)
+    .replaceAll("&", "&")
+    .replaceAll("<", "&lt;")
+    .replaceAll(">", "&gt;")
+    .replaceAll('"', "&quot;")
+    .replaceAll("'", "&apos;");
+}
+
+export function buildStartupEnvironment(env = process.env) {
+  const configuredCliPath = String(env?.LLM_ROUTER_CLI_PATH || "").trim();
+  const startupEnv = {
+    LLM_ROUTER_MANAGED_BY_STARTUP: "1",
+    LLM_ROUTER_CLI_PATH: configuredCliPath || String(resolveStartupCliEntryPath({ env }) || "").trim()
+  };
+
+  for (const key of STARTUP_ENV_PASSTHROUGH_KEYS) {
+    const value = String(env?.[key] || "").trim();
+    if (!value) continue;
+    startupEnv[key] = value;
+  }
+
+  return startupEnv;
+}
+
 function buildLaunchAgentPlist({ nodePath, cliPath, configPath, host, port, watchConfig, watchBinary, requireAuth }) {
   const logDir = path.join(os.homedir(), "Library", "Logs");
   const stdoutPath = path.join(logDir, "llm-router.out.log");
   const stderrPath = path.join(logDir, "llm-router.err.log");
   const args = [nodePath, cliPath, ...makeExecArgs({ configPath, host, port, watchConfig, watchBinary, requireAuth })];
+  const environment = {
+    ...buildStartupEnvironment({
+      ...process.env,
+      LLM_ROUTER_CLI_PATH: cliPath
+    }),
+    LLM_ROUTER_CLI_PATH: cliPath
+  };
 
-  const xmlArgs = args.map((arg) => `    <string>${arg}</string>`).join("\n");
+  const xmlArgs = args.map((arg) => `    <string>${escapeXml(arg)}</string>`).join("\n");
+  const xmlEnvironment = Object.entries(environment)
+    .map(([key, value]) => `      <key>${escapeXml(key)}</key>\n      <string>${escapeXml(value)}</string>`)
+    .join("\n");
 
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -107,17 +156,14 @@ ${xmlArgs}
     <true/>
     <key>EnvironmentVariables</key>
     <dict>
-      <key>LLM_ROUTER_MANAGED_BY_STARTUP</key>
-      <string>1</string>
-      <key>LLM_ROUTER_CLI_PATH</key>
-      <string>${cliPath}</string>
+${xmlEnvironment}
     </dict>
     <key>StandardOutPath</key>
-    <string>${stdoutPath}</string>
+    <string>${escapeXml(stdoutPath)}</string>
     <key>StandardErrorPath</key>
-    <string>${stderrPath}</string>
+    <string>${escapeXml(stderrPath)}</string>
     <key>WorkingDirectory</key>
-    <string>${process.cwd()}</string>
+    <string>${escapeXml(process.cwd())}</string>
   </dict>
 </plist>
 `;
@@ -126,6 +172,17 @@ ${xmlArgs}
 function buildSystemdService({ nodePath, cliPath, configPath, host, port, watchConfig, watchBinary, requireAuth }) {
   const execArgs = makeExecArgs({ configPath, host, port, watchConfig, watchBinary, requireAuth }).map(quoteArg).join(" ");
   const execStart = `${quoteArg(nodePath)} ${quoteArg(cliPath)} ${execArgs}`;
+  const environment = {
+    ...buildStartupEnvironment({
+      ...process.env,
+      LLM_ROUTER_CLI_PATH: cliPath
+    }),
+    LLM_ROUTER_CLI_PATH: cliPath,
+    NODE_ENV: "production"
+  };
+  const systemdEnvironment = Object.entries(environment)
+    .map(([key, value]) => `Environment=${key}=${value}`)
+    .join("\n");
 
   return `[Unit]
 Description=LLM Router local route
@@ -136,9 +193,7 @@ Type=simple
 ExecStart=${execStart}
 Restart=always
 RestartSec=2
-Environment=NODE_ENV=production
-Environment=LLM_ROUTER_MANAGED_BY_STARTUP=1
-Environment=LLM_ROUTER_CLI_PATH=${cliPath}
+${systemdEnvironment}
 WorkingDirectory=${process.cwd()}
 
 [Install]

package/src/runtime/handler/amp-web-search.js

@@ -80,7 +80,7 @@ const READ_WEB_PAGE_FUNCTION_PARAMETERS = {
   additionalProperties: true
 };
 
-const OPENAI_WEB_SEARCH_TOOL = Object.freeze({
+const OPENAI_CHAT_WEB_SEARCH_TOOL = Object.freeze({
   type: "function",
   function: {
     name: SEARCH_TOOL_NAME,
@@ -89,13 +89,20 @@ const OPENAI_WEB_SEARCH_TOOL = Object.freeze({
   }
 });
 
+const OPENAI_RESPONSES_WEB_SEARCH_TOOL = Object.freeze({
+  type: "function",
+  name: SEARCH_TOOL_NAME,
+  description: "Search the web for current information, news, documentation, or real-time facts.",
+  parameters: WEB_SEARCH_FUNCTION_PARAMETERS
+});
+
 const CLAUDE_WEB_SEARCH_TOOL = Object.freeze({
   name: SEARCH_TOOL_NAME,
   description: "Search the web for current information, news, documentation, or real-time facts.",
   input_schema: WEB_SEARCH_FUNCTION_PARAMETERS
 });
 
-const OPENAI_READ_WEB_PAGE_TOOL = Object.freeze({
+const OPENAI_CHAT_READ_WEB_PAGE_TOOL = Object.freeze({
   type: "function",
   function: {
     name: READ_WEB_PAGE_TOOL_NAME,
@@ -104,6 +111,13 @@ const OPENAI_READ_WEB_PAGE_TOOL = Object.freeze({
   }
 });
 
+const OPENAI_RESPONSES_READ_WEB_PAGE_TOOL = Object.freeze({
+  type: "function",
+  name: READ_WEB_PAGE_TOOL_NAME,
+  description: "Fetch and extract the readable text and table content from a web page URL.",
+  parameters: READ_WEB_PAGE_FUNCTION_PARAMETERS
+});
+
 const CLAUDE_READ_WEB_PAGE_TOOL = Object.freeze({
   name: READ_WEB_PAGE_TOOL_NAME,
   description: "Fetch and extract the readable text and table content from a web page URL.",
@@ -1269,7 +1283,20 @@ export function shouldInterceptAmpWebSearch({ clientType, originalBody, runtimeC
   return true;
 }
 
-export function rewriteProviderBodyForAmpWebSearch(providerBody, targetFormat) {
+function getOpenAIInterceptToolDefinitions(requestKind) {
+  if (requestKind === "responses") {
+    return {
+      webSearch: OPENAI_RESPONSES_WEB_SEARCH_TOOL,
+      readWebPage: OPENAI_RESPONSES_READ_WEB_PAGE_TOOL
+    };
+  }
+  return {
+    webSearch: OPENAI_CHAT_WEB_SEARCH_TOOL,
+    readWebPage: OPENAI_CHAT_READ_WEB_PAGE_TOOL
+  };
+}
+
+export function rewriteProviderBodyForAmpWebSearch(providerBody, targetFormat, requestKind = undefined) {
   const tools = Array.isArray(providerBody?.tools) ? providerBody.tools : [];
   if (tools.length === 0) {
     return {
@@ -1301,8 +1328,9 @@ export function rewriteProviderBodyForAmpWebSearch(providerBody, targetFormat) {
   }
 
   if (targetFormat === FORMATS.OPENAI) {
-    if (interceptedToolNames.has(SEARCH_TOOL_NAME)) nextTools.push(OPENAI_WEB_SEARCH_TOOL);
-    if (interceptedToolNames.has(READ_WEB_PAGE_TOOL_NAME)) nextTools.push(OPENAI_READ_WEB_PAGE_TOOL);
+    const toolDefinitions = getOpenAIInterceptToolDefinitions(requestKind);
+    if (interceptedToolNames.has(SEARCH_TOOL_NAME)) nextTools.push(toolDefinitions.webSearch);
+    if (interceptedToolNames.has(READ_WEB_PAGE_TOOL_NAME)) nextTools.push(toolDefinitions.readWebPage);
   } else if (targetFormat === FORMATS.CLAUDE) {
     if (interceptedToolNames.has(SEARCH_TOOL_NAME)) nextTools.push(CLAUDE_WEB_SEARCH_TOOL);
     if (interceptedToolNames.has(READ_WEB_PAGE_TOOL_NAME)) nextTools.push(CLAUDE_READ_WEB_PAGE_TOOL);

package/src/runtime/handler/provider-call.js

@@ -516,7 +516,7 @@ export async function makeProviderCall({
     providerBody = declaredOpenAIHostedWebSearchRewrite.providerBody;
   }
   if (interceptAmpWebSearch) {
-    providerBody = rewriteProviderBodyForAmpWebSearch(providerBody, targetFormat).providerBody;
+    providerBody = rewriteProviderBodyForAmpWebSearch(providerBody, targetFormat, requestKind).providerBody;
   }
   logToolRouting({
     env,