@agentgrader/agent-openrouter 2.0.2 → 3.0.0

package/dist/index.js

@@ -5,11 +5,25 @@ import { createAnthropic } from '@ai-sdk/anthropic';
 import { z } from 'zod';
 
 // src/index.ts
+function resolveProvider(config) {
+  if (config.provider) return config.provider;
+  const modelName = config.model || "";
+  const hasOpenRouterKey = Boolean(process.env.OPENROUTER_API_KEY || process.env.OPENAI_API_KEY);
+  if (!hasOpenRouterKey) {
+    if (/^claude-/i.test(modelName) && process.env.ANTHROPIC_API_KEY) {
+      return "anthropic";
+    }
+    if (/^(gpt-|o[0-9])/i.test(modelName) && process.env.OPENAI_API_KEY) {
+      return "openai";
+    }
+  }
+  return "openrouter";
+}
 var AiSdkAgentAdapter = class {
   name = "ai-sdk";
   async solve(input) {
     const { prompt, sandbox, config, onStep } = input;
-    const provider = config.provider || "openrouter";
+    const provider = resolveProvider(config);
     const modelName = config.model || "gpt-4o-mini";
     let model;
     if (provider === "anthropic") {
@@ -130,7 +144,30 @@ var AiSdkAgentAdapter = class {
         console.error(`Failed to connect to MCP server "${serverName}": ${err.message}`);
       }
     }
-    const tools = { ...localTools, ...mcpTools };
+    const allTools = { ...localTools, ...mcpTools };
+    let tools = allTools;
+    if (config.tools?.length) {
+      const allowlist = new Set(config.tools);
+      const localToolNames = Object.keys(localTools);
+      const availableNames = new Set(Object.keys(allTools));
+      for (const name of allowlist) {
+        if (!availableNames.has(name)) {
+          console.warn(
+            `Tool "${name}" listed in config.tools was not found among local tools (${localToolNames.join(", ")}) or connected MCP server tools - ignoring.`
+          );
+        }
+      }
+      if (!allowlist.has("submit")) {
+        console.warn(
+          "tools allowlist did not include 'submit' - adding it automatically, as it is required to end a run."
+        );
+      }
+      const effectiveAllowlist = /* @__PURE__ */ new Set([...allowlist, "submit"]);
+      tools = Object.fromEntries(
+        Object.entries(allTools).filter(([key]) => effectiveAllowlist.has(key))
+      );
+      console.log(`Tool allowlist active: ${Object.keys(tools).join(", ")}`);
+    }
     const getPricing = (model2) => {
       const name = model2.toLowerCase();
       if (name.includes("claude-3-5-sonnet")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentgrader/agent-openrouter",
-  "version": "2.0.2",
+  "version": "3.0.0",
   "description": "OpenRouter/AI SDK ReAct agent adapter for the Agentgrader framework",
   "license": "MIT",
   "type": "module",
@@ -21,7 +21,7 @@
     "build:watch": "tsup src/index.ts --format esm --dts --watch"
   },
   "dependencies": {
-    "@agentgrader/core": "^1.1.2",
+    "@agentgrader/core": "^1.2.0",
     "@ai-sdk/anthropic": "^1.2.12",
     "@ai-sdk/openai": "^1.1.0",
     "ai": "^4.1.0",
@@ -31,6 +31,6 @@
     "tsup": "^8.5.1"
   },
   "peerDependencies": {
-    "@agentgrader/core": "^1.1.2"
+    "@agentgrader/core": "^1.2.0"
   }
 }