@agentv/core 3.14.0 → 3.14.3

package/dist/index.cjs

@@ -4676,22 +4676,31 @@ async function loadTestById(evalFilePath, repoRoot, evalId) {
   return match;
 }
 var loadEvalCaseById = loadTestById;
+function parseCommandArray(source) {
+  if (typeof source === "string") {
+    const parts = source.trim().split(/\s+/);
+    return parts.length > 0 && parts[0] !== "" ? parts : void 0;
+  }
+  if (Array.isArray(source)) {
+    const arr = source.filter((s) => typeof s === "string");
+    return arr.length > 0 ? arr : void 0;
+  }
+  return void 0;
+}
 function parseWorkspaceScriptConfig(raw, evalFileDir) {
   if (!isJsonObject(raw)) return void 0;
   const obj = raw;
   if (obj.script !== void 0 && obj.command === void 0) {
     logWarning5("'script' is deprecated. Use 'command' instead.");
   }
-  const commandSource = obj.command ?? obj.script;
-  if (!Array.isArray(commandSource) || commandSource.length === 0) return void 0;
-  const commandArr = commandSource.filter((s) => typeof s === "string");
-  if (commandArr.length === 0) return void 0;
+  const command = parseCommandArray(obj.command ?? obj.script);
+  if (!command) return void 0;
   const timeoutMs = typeof obj.timeout_ms === "number" ? obj.timeout_ms : void 0;
   let cwd = typeof obj.cwd === "string" ? obj.cwd : void 0;
   if (cwd && !import_node_path8.default.isAbsolute(cwd)) {
     cwd = import_node_path8.default.resolve(evalFileDir, cwd);
   }
-  const config = { command: commandArr };
+  const config = { command };
   if (timeoutMs !== void 0) {
     return { ...config, timeout_ms: timeoutMs, ...cwd !== void 0 && { cwd } };
   }
@@ -9180,6 +9189,26 @@ ${prompt}` : prompt;
         env[envKey] = this.config.apiKey;
       }
     }
+    if (this.config.subprovider) {
+      const provider = this.config.subprovider.toLowerCase();
+      const PROVIDER_OWN_PREFIXES = {
+        openrouter: ["OPENROUTER_"],
+        anthropic: ["ANTHROPIC_"],
+        openai: ["OPENAI_"],
+        azure: ["AZURE_OPENAI_"],
+        google: ["GEMINI_", "GOOGLE_GENERATIVE_AI_"],
+        gemini: ["GEMINI_", "GOOGLE_GENERATIVE_AI_"],
+        groq: ["GROQ_"],
+        xai: ["XAI_"]
+      };
+      const ownPrefixes = PROVIDER_OWN_PREFIXES[provider] ?? [];
+      const allOtherPrefixes = Object.entries(PROVIDER_OWN_PREFIXES).filter(([key]) => key !== provider).flatMap(([, prefixes]) => prefixes);
+      for (const key of Object.keys(env)) {
+        if (allOtherPrefixes.some((prefix) => key.startsWith(prefix)) && !ownPrefixes.some((prefix) => key.startsWith(prefix))) {
+          delete env[key];
+        }
+      }
+    }
     return env;
   }
   async createWorkspace() {
@@ -9407,6 +9436,10 @@ function summarizePiEvent(event) {
       }
       return `message_update: ${eventType}`;
     }
+    case "tool_execution_start":
+      return `tool_start: ${record.toolName}`;
+    case "tool_execution_end":
+      return `tool_end: ${record.toolName}`;
     default:
       return type;
   }
@@ -9437,25 +9470,89 @@ function parsePiJsonl(output) {
   return parsed;
 }
 function extractMessages(events) {
+  let messages;
   for (let i = events.length - 1; i >= 0; i--) {
     const event = events[i];
     if (!event || typeof event !== "object") continue;
     const record = event;
     if (record.type !== "agent_end") continue;
-    const messages = record.messages;
-    if (!Array.isArray(messages)) continue;
-    return messages.map(convertPiMessage).filter((m) => m !== void 0);
+    const msgs = record.messages;
+    if (!Array.isArray(msgs)) continue;
+    messages = msgs.map(convertPiMessage).filter((m) => m !== void 0);
+    break;
+  }
+  if (!messages) {
+    messages = [];
+    for (const event of events) {
+      if (!event || typeof event !== "object") continue;
+      const record = event;
+      if (record.type === "turn_end") {
+        const converted = convertPiMessage(record.message);
+        if (converted) messages.push(converted);
+      }
+    }
+  }
+  const eventToolCalls = extractToolCallsFromEvents(events);
+  if (eventToolCalls.length > 0) {
+    injectEventToolCalls(messages, eventToolCalls);
   }
-  const output = [];
+  return messages;
+}
+function extractToolCallsFromEvents(events) {
+  const starts = /* @__PURE__ */ new Map();
+  const results = /* @__PURE__ */ new Map();
   for (const event of events) {
     if (!event || typeof event !== "object") continue;
-    const record = event;
-    if (record.type === "turn_end") {
-      const converted = convertPiMessage(record.message);
-      if (converted) output.push(converted);
+    const r = event;
+    const type = r.type;
+    if (type === "tool_execution_start" && typeof r.toolName === "string") {
+      const id = typeof r.toolCallId === "string" ? r.toolCallId : void 0;
+      starts.set(id ?? `anon-${starts.size}`, { tool: r.toolName, input: r.args });
+    } else if (type === "tool_execution_end") {
+      const id = typeof r.toolCallId === "string" ? r.toolCallId : void 0;
+      if (id) results.set(id, r.result);
     }
   }
-  return output;
+  const toolCalls = [];
+  for (const [id, { tool: tool2, input }] of starts) {
+    toolCalls.push({
+      tool: tool2,
+      input,
+      id: id.startsWith("anon-") ? void 0 : id,
+      output: results.get(id)
+    });
+  }
+  return toolCalls;
+}
+function injectEventToolCalls(messages, eventToolCalls) {
+  const existingIds = /* @__PURE__ */ new Set();
+  const existingTools = /* @__PURE__ */ new Set();
+  for (const msg of messages) {
+    if (!msg.toolCalls) continue;
+    for (const tc of msg.toolCalls) {
+      if (tc.id) existingIds.add(tc.id);
+      existingTools.add(`${tc.tool}:${JSON.stringify(tc.input)}`);
+    }
+  }
+  const missing = eventToolCalls.filter((tc) => {
+    if (tc.id && existingIds.has(tc.id)) return false;
+    if (existingTools.has(`${tc.tool}:${JSON.stringify(tc.input)}`)) return false;
+    return true;
+  });
+  if (missing.length === 0) return;
+  let targetIdx = -1;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    if (messages[i].role === "assistant") {
+      targetIdx = i;
+      break;
+    }
+  }
+  if (targetIdx >= 0) {
+    const target = messages[targetIdx];
+    messages[targetIdx] = { ...target, toolCalls: [...target.toolCalls ?? [], ...missing] };
+  } else {
+    messages.push({ role: "assistant", content: "", toolCalls: missing });
+  }
 }
 function extractTokenUsage(events) {
   for (let i = events.length - 1; i >= 0; i--) {
@@ -9550,15 +9647,13 @@ function extractToolCalls3(content) {
         input: p.input,
         id: typeof p.id === "string" ? p.id : void 0
       });
-    }
-    if (p.type === "toolCall" && typeof p.name === "string") {
+    } else if ((p.type === "toolCall" || p.type === "tool_call") && typeof p.name === "string") {
       toolCalls.push({
         tool: p.name,
-        input: p.arguments,
+        input: p.arguments ?? p.input,
         id: typeof p.id === "string" ? p.id : void 0
       });
-    }
-    if (p.type === "tool_result" && typeof p.tool_use_id === "string") {
+    } else if (p.type === "tool_result" && typeof p.tool_use_id === "string") {
       const existing = toolCalls.find((tc) => tc.id === p.tool_use_id);
       if (existing) {
         const idx = toolCalls.indexOf(existing);