agentv 3.10.3 → 3.11.1

package/dist/{chunk-JUQCB3ZW.js → chunk-OYD2NB55.js}

@@ -1,7 +1,4 @@
 import { createRequire } from 'node:module'; const require = createRequire(import.meta.url);
-import {
-  require_token_error
-} from "./chunk-HQDCIXVH.js";
 import {
   AISDKError,
   APICallError,
@@ -150,6 +147,9 @@ import {
   withoutTrailingSlash,
   zodSchema
 } from "./chunk-BJV6MDBE.js";
+import {
+  require_token_error
+} from "./chunk-HQDCIXVH.js";
 import {
   SpanStatusCode,
   context,
@@ -301,7 +301,7 @@ var require_dist = __commonJS({
   }
 });
 
-// ../../packages/core/dist/chunk-VCFYWLFV.js
+// ../../packages/core/dist/chunk-4XWPXNQM.js
 import { constants } from "node:fs";
 import { access, readFile } from "node:fs/promises";
 import path from "node:path";
@@ -419,7 +419,7 @@ __export(external_exports2, {
   void: () => voidType
 });
 
-// ../../packages/core/dist/chunk-VCFYWLFV.js
+// ../../packages/core/dist/chunk-4XWPXNQM.js
 import { readFile as readFile2 } from "node:fs/promises";
 import path3 from "node:path";
 import fg from "fast-glob";
@@ -938,14 +938,14 @@ function resolveTargetDefinition(definition, env = process.env, evalFilePath) {
         providerBatching,
         config: resolvePiCodingAgentConfig(parsed, env, evalFilePath)
       };
-    case "pi-agent-sdk":
+    case "pi-cli":
       return {
-        kind: "pi-agent-sdk",
+        kind: "pi-cli",
         name: parsed.name,
         graderTarget: parsed.grader_target ?? parsed.judge_target,
         workers: parsed.workers,
         providerBatching,
-        config: resolvePiAgentSdkConfig(parsed, env)
+        config: resolvePiCliConfig(parsed, env, evalFilePath)
       };
     case "claude":
     case "claude-code":
@@ -1362,27 +1362,26 @@ function normalizeCopilotLogFormat(value) {
   throw new Error("copilot log format must be 'summary' or 'json'");
 }
 function resolvePiCodingAgentConfig(target, env, evalFilePath) {
-  const executableSource = target.executable ?? target.command ?? target.binary;
-  const providerSource = target.pi_provider ?? target.piProvider ?? target.llm_provider;
+  const subproviderSource = target.subprovider;
   const modelSource = target.model ?? target.pi_model ?? target.piModel;
   const apiKeySource = target.api_key ?? target.apiKey;
   const toolsSource = target.tools ?? target.pi_tools ?? target.piTools;
   const thinkingSource = target.thinking ?? target.pi_thinking ?? target.piThinking;
-  const argsSource = target.args ?? target.arguments;
   const cwdSource = target.cwd;
   const workspaceTemplateSource = target.workspace_template ?? target.workspaceTemplate;
   const timeoutSource = target.timeout_seconds ?? target.timeoutSeconds;
   const logDirSource = target.log_dir ?? target.logDir ?? target.log_directory ?? target.logDirectory;
   const logFormatSource = target.log_format ?? target.logFormat;
   const systemPromptSource = target.system_prompt ?? target.systemPrompt;
-  const executable = resolveOptionalString(executableSource, env, `${target.name} pi executable`, {
-    allowLiteral: true,
-    optionalEnv: true
-  }) ?? "pi";
-  const provider = resolveOptionalString(providerSource, env, `${target.name} pi provider`, {
-    allowLiteral: true,
-    optionalEnv: true
-  });
+  const subprovider = resolveOptionalString(
+    subproviderSource,
+    env,
+    `${target.name} pi subprovider`,
+    {
+      allowLiteral: true,
+      optionalEnv: true
+    }
+  );
   const model = resolveOptionalString(modelSource, env, `${target.name} pi model`, {
     allowLiteral: true,
     optionalEnv: true
@@ -1399,7 +1398,6 @@ function resolvePiCodingAgentConfig(target, env, evalFilePath) {
     allowLiteral: true,
     optionalEnv: true
   });
-  const args = resolveOptionalStringArray(argsSource, env, `${target.name} pi args`);
   const cwd = resolveOptionalString(cwdSource, env, `${target.name} pi cwd`, {
     allowLiteral: true,
     optionalEnv: true
@@ -1429,13 +1427,11 @@ function resolvePiCodingAgentConfig(target, env, evalFilePath) {
   const logFormat = logFormatSource === "json" || logFormatSource === "summary" ? logFormatSource : void 0;
   const systemPrompt = typeof systemPromptSource === "string" && systemPromptSource.trim().length > 0 ? systemPromptSource.trim() : void 0;
   return {
-    executable,
-    provider,
+    subprovider,
     model,
     apiKey,
     tools,
     thinking,
-    args,
     cwd,
     workspaceTemplate,
     timeoutMs,
@@ -1444,36 +1440,83 @@ function resolvePiCodingAgentConfig(target, env, evalFilePath) {
     systemPrompt
   };
 }
-function resolvePiAgentSdkConfig(target, env) {
-  const providerSource = target.pi_provider ?? target.piProvider ?? target.llm_provider;
+function resolvePiCliConfig(target, env, evalFilePath) {
+  const executableSource = target.executable ?? target.command ?? target.binary;
+  const subproviderSource = target.subprovider;
   const modelSource = target.model ?? target.pi_model ?? target.piModel;
   const apiKeySource = target.api_key ?? target.apiKey;
+  const toolsSource = target.tools ?? target.pi_tools ?? target.piTools;
+  const thinkingSource = target.thinking ?? target.pi_thinking ?? target.piThinking;
+  const cwdSource = target.cwd;
+  const workspaceTemplateSource = target.workspace_template ?? target.workspaceTemplate;
   const timeoutSource = target.timeout_seconds ?? target.timeoutSeconds;
+  const logDirSource = target.log_dir ?? target.logDir ?? target.log_directory ?? target.logDirectory;
+  const logFormatSource = target.log_format ?? target.logFormat;
   const systemPromptSource = target.system_prompt ?? target.systemPrompt;
-  const provider = resolveOptionalString(
-    providerSource,
+  const executable = resolveOptionalString(executableSource, env, `${target.name} pi-cli executable`, {
+    allowLiteral: true,
+    optionalEnv: true
+  }) ?? "pi";
+  const subprovider = resolveOptionalString(
+    subproviderSource,
     env,
-    `${target.name} pi-agent-sdk provider`,
-    {
-      allowLiteral: true,
-      optionalEnv: true
-    }
+    `${target.name} pi-cli subprovider`,
+    { allowLiteral: true, optionalEnv: true }
   );
-  const model = resolveOptionalString(modelSource, env, `${target.name} pi-agent-sdk model`, {
+  const model = resolveOptionalString(modelSource, env, `${target.name} pi-cli model`, {
     allowLiteral: true,
     optionalEnv: true
   });
-  const apiKey = resolveOptionalString(apiKeySource, env, `${target.name} pi-agent-sdk api key`, {
+  const apiKey = resolveOptionalString(apiKeySource, env, `${target.name} pi-cli api key`, {
     allowLiteral: false,
     optionalEnv: true
   });
-  const timeoutMs = resolveTimeoutMs(timeoutSource, `${target.name} pi-agent-sdk timeout`);
+  const tools = resolveOptionalString(toolsSource, env, `${target.name} pi-cli tools`, {
+    allowLiteral: true,
+    optionalEnv: true
+  });
+  const thinking = resolveOptionalString(thinkingSource, env, `${target.name} pi-cli thinking`, {
+    allowLiteral: true,
+    optionalEnv: true
+  });
+  const rawArgs = target.args ?? target.arguments;
+  const args = resolveOptionalStringArray(rawArgs, env, `${target.name} pi-cli args`);
+  const cwd = resolveOptionalString(cwdSource, env, `${target.name} pi-cli cwd`, {
+    allowLiteral: true,
+    optionalEnv: true
+  });
+  let workspaceTemplate = resolveOptionalString(
+    workspaceTemplateSource,
+    env,
+    `${target.name} pi-cli workspace template`,
+    { allowLiteral: true, optionalEnv: true }
+  );
+  if (workspaceTemplate && evalFilePath && !path2.isAbsolute(workspaceTemplate)) {
+    workspaceTemplate = path2.resolve(path2.dirname(path2.resolve(evalFilePath)), workspaceTemplate);
+  }
+  if (cwd && workspaceTemplate) {
+    throw new Error(`${target.name}: 'cwd' and 'workspace_template' are mutually exclusive.`);
+  }
+  const timeoutMs = resolveTimeoutMs(timeoutSource, `${target.name} pi-cli timeout`);
+  const logDir = resolveOptionalString(logDirSource, env, `${target.name} pi-cli log directory`, {
+    allowLiteral: true,
+    optionalEnv: true
+  });
+  const logFormat = logFormatSource === "json" || logFormatSource === "summary" ? logFormatSource : void 0;
   const systemPrompt = typeof systemPromptSource === "string" && systemPromptSource.trim().length > 0 ? systemPromptSource.trim() : void 0;
   return {
-    provider,
+    executable,
+    subprovider,
     model,
     apiKey,
+    tools,
+    thinking,
+    args,
+    cwd,
+    workspaceTemplate,
     timeoutMs,
+    logDir,
+    logFormat,
     systemPrompt
   };
 }
@@ -1603,8 +1646,8 @@ function resolveCliConfig(target, env, evalFilePath) {
   const parseResult = CliTargetInputSchema.safeParse(target, { errorMap: cliErrorMap });
   if (!parseResult.success) {
     const firstError = parseResult.error.errors[0];
-    const path44 = firstError?.path.join(".") || "";
-    const prefix = path44 ? `${target.name} ${path44}: ` : `${target.name}: `;
+    const path45 = firstError?.path.join(".") || "";
+    const prefix = path45 ? `${target.name} ${path45}: ` : `${target.name}: `;
     throw new Error(`${prefix}${firstError?.message}`);
   }
   const normalized = normalizeCliTargetInput(parseResult.data, env, evalFilePath);
@@ -1944,7 +1987,7 @@ var AGENT_PROVIDER_KINDS = [
   "copilot-sdk",
   "copilot-cli",
   "pi-coding-agent",
-  "pi-agent-sdk",
+  "pi-cli",
   "claude",
   "claude-cli",
   "claude-sdk",
@@ -1961,7 +2004,7 @@ var KNOWN_PROVIDERS = [
   "copilot-sdk",
   "copilot-cli",
   "pi-coding-agent",
-  "pi-agent-sdk",
+  "pi-cli",
   "claude",
   "claude-cli",
   "claude-sdk",
@@ -2039,7 +2082,7 @@ import path8 from "node:path";
 import { parse as parse3 } from "yaml";
 import { createOpenAI } from "@ai-sdk/openai";
 
-// ../../node_modules/.bun/@openrouter+ai-sdk-provider@2.3.1+3ab978b6804fd9e7/node_modules/@openrouter/ai-sdk-provider/dist/index.mjs
+// ../../node_modules/.bun/@openrouter+ai-sdk-provider@2.3.3+3ab978b6804fd9e7/node_modules/@openrouter/ai-sdk-provider/dist/index.mjs
 var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
 var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
@@ -4202,11 +4245,13 @@ function isDefinedOrNotNull(value) {
 var ReasoningFormat = /* @__PURE__ */ ((ReasoningFormat2) => {
   ReasoningFormat2["Unknown"] = "unknown";
   ReasoningFormat2["OpenAIResponsesV1"] = "openai-responses-v1";
+  ReasoningFormat2["AzureOpenAIResponsesV1"] = "azure-openai-responses-v1";
   ReasoningFormat2["XAIResponsesV1"] = "xai-responses-v1";
   ReasoningFormat2["AnthropicClaudeV1"] = "anthropic-claude-v1";
   ReasoningFormat2["GoogleGeminiV1"] = "google-gemini-v1";
   return ReasoningFormat2;
 })(ReasoningFormat || {});
+var DEFAULT_REASONING_FORMAT = "anthropic-claude-v1";
 var CommonReasoningDetailSchema = external_exports.object({
   id: external_exports.string().nullish(),
   format: external_exports.enum(ReasoningFormat).nullish(),
@@ -4360,7 +4405,11 @@ var OpenRouterProviderMetadataSchema = external_exports.object({
 }).catchall(external_exports.any());
 var OpenRouterProviderOptionsSchema = external_exports.object({
   openrouter: external_exports.object({
-    reasoning_details: external_exports.array(ReasoningDetailUnionSchema).optional(),
+    // Use ReasoningDetailArraySchema (with unknown fallback) instead of
+    // z.array(ReasoningDetailUnionSchema) so that a single malformed entry
+    // (e.g., a future format not yet in the enum) is individually dropped
+    // rather than causing the entire array to fail parsing.
+    reasoning_details: ReasoningDetailArraySchema.optional(),
     annotations: external_exports.array(FileAnnotationSchema).optional()
   }).optional()
 }).optional();
@@ -4758,8 +4807,24 @@ function convertToOpenRouterChatMessages(prompt) {
         const candidateReasoningDetails = messageReasoningDetails && Array.isArray(messageReasoningDetails) && messageReasoningDetails.length > 0 ? messageReasoningDetails : findFirstReasoningDetails(content);
         let finalReasoningDetails;
         if (candidateReasoningDetails && candidateReasoningDetails.length > 0) {
+          const validDetails = candidateReasoningDetails.filter((detail) => {
+            var _a173;
+            if (detail.type !== "reasoning.text") {
+              return true;
+            }
+            const format = (_a173 = detail.format) != null ? _a173 : DEFAULT_REASONING_FORMAT;
+            if (format !== "anthropic-claude-v1") {
+              return true;
+            }
+            return !!detail.signature;
+          });
+          if (validDetails.length < candidateReasoningDetails.length) {
+            console.warn(
+              "[openrouter] Some reasoning_details entries were removed because they were missing signatures. See https://github.com/OpenRouterTeam/ai-sdk-provider/issues/423 for more details."
+            );
+          }
           const uniqueDetails = [];
-          for (const detail of candidateReasoningDetails) {
+          for (const detail of validDetails) {
             if (reasoningDetailsTracker.upsert(detail)) {
               uniqueDetails.push(detail);
             }
@@ -4808,20 +4873,135 @@ function getToolResultContent(input) {
       return input.output.value;
     case "json":
     case "error-json":
-    case "content":
       return JSON.stringify(input.output.value);
+    case "content":
+      return mapToolResultContentParts(input.output.value);
     case "execution-denied":
       return (_a163 = input.output.reason) != null ? _a163 : "Tool execution denied";
   }
 }
+function mapToolResultContentParts(parts) {
+  return parts.map((part) => {
+    var _a163, _b162, _c;
+    switch (part.type) {
+      case "text":
+        return { type: "text", text: part.text };
+      case "image-data":
+        return {
+          type: "image_url",
+          image_url: {
+            url: buildFileDataUrl({
+              data: part.data,
+              mediaType: part.mediaType,
+              defaultMediaType: "image/jpeg"
+            })
+          }
+        };
+      case "image-url":
+        return {
+          type: "image_url",
+          image_url: { url: part.url }
+        };
+      case "file-data": {
+        const dataUrl = buildFileDataUrl({
+          data: part.data,
+          mediaType: part.mediaType,
+          defaultMediaType: "application/octet-stream"
+        });
+        if ((_a163 = part.mediaType) == null ? void 0 : _a163.startsWith("image/")) {
+          return {
+            type: "image_url",
+            image_url: { url: dataUrl }
+          };
+        }
+        if ((_b162 = part.mediaType) == null ? void 0 : _b162.startsWith("audio/")) {
+          const rawFormat = part.mediaType.replace("audio/", "");
+          const format = MIME_TO_FORMAT[rawFormat];
+          if (format !== void 0) {
+            return {
+              type: "input_audio",
+              input_audio: {
+                data: getBase64FromDataUrl(dataUrl),
+                format
+              }
+            };
+          }
+        }
+        return {
+          type: "file",
+          file: {
+            filename: (_c = part.filename) != null ? _c : "",
+            file_data: dataUrl
+          }
+        };
+      }
+      case "file-url": {
+        if (looksLikeImageUrl(part.url)) {
+          return {
+            type: "image_url",
+            image_url: { url: part.url }
+          };
+        }
+        return {
+          type: "file",
+          file: {
+            filename: filenameFromUrl(part.url),
+            file_data: part.url
+          }
+        };
+      }
+      case "file-id":
+      case "image-file-id":
+      case "custom":
+        return { type: "text", text: JSON.stringify(part) };
+      default: {
+        const _exhaustiveCheck = part;
+        return { type: "text", text: JSON.stringify(_exhaustiveCheck) };
+      }
+    }
+  });
+}
+var IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([
+  "jpg",
+  "jpeg",
+  "png",
+  "gif",
+  "webp",
+  "svg",
+  "bmp",
+  "ico",
+  "tif",
+  "tiff",
+  "avif"
+]);
+function looksLikeImageUrl(url) {
+  var _a163;
+  try {
+    const pathname = new URL(url).pathname;
+    const ext = (_a163 = pathname.split(".").pop()) == null ? void 0 : _a163.toLowerCase();
+    return ext !== void 0 && IMAGE_EXTENSIONS.has(ext);
+  } catch (e) {
+    return false;
+  }
+}
+function filenameFromUrl(url) {
+  try {
+    const pathname = new URL(url).pathname;
+    const last = pathname.split("/").pop();
+    return (last == null ? void 0 : last.includes(".")) ? last : "";
+  } catch (e) {
+    return "";
+  }
+}
 function findFirstReasoningDetails(content) {
-  var _a163, _b162, _c;
+  var _a163, _b162, _c, _d;
   for (const part of content) {
     if (part.type === "tool-call") {
-      const openrouter2 = (_a163 = part.providerOptions) == null ? void 0 : _a163.openrouter;
-      const details = openrouter2 == null ? void 0 : openrouter2.reasoning_details;
-      if (Array.isArray(details) && details.length > 0) {
-        return details;
+      const parsed = OpenRouterProviderOptionsSchema.safeParse(
+        part.providerOptions
+      );
+      if (parsed.success && ((_b162 = (_a163 = parsed.data) == null ? void 0 : _a163.openrouter) == null ? void 0 : _b162.reasoning_details) && parsed.data.openrouter.reasoning_details.length > 0) {
+        return parsed.data.openrouter.reasoning_details;
       }
     }
   }
@@ -4830,7 +5010,7 @@ function findFirstReasoningDetails(content) {
       const parsed = OpenRouterProviderOptionsSchema.safeParse(
         part.providerOptions
       );
-      if (parsed.success && ((_c = (_b162 = parsed.data) == null ? void 0 : _b162.openrouter) == null ? void 0 : _c.reasoning_details) && parsed.data.openrouter.reasoning_details.length > 0) {
+      if (parsed.success && ((_d = (_c = parsed.data) == null ? void 0 : _c.openrouter) == null ? void 0 : _d.reasoning_details) && parsed.data.openrouter.reasoning_details.length > 0) {
         return parsed.data.openrouter.reasoning_details;
       }
     }
@@ -6490,7 +6670,7 @@ function withUserAgentSuffix22(headers, ...userAgentSuffixParts) {
     "user-agent": userAgent
   });
 }
-var VERSION2 = false ? "0.0.0-test" : "2.3.1";
+var VERSION2 = false ? "0.0.0-test" : "2.3.3";
 function createOpenRouter(options = {}) {
   var _a163, _b162, _c;
   const baseURL = (_b162 = withoutTrailingSlash2((_a163 = options.baseURL) != null ? _a163 : options.baseUrl)) != null ? _b162 : "https://openrouter.ai/api/v1";
@@ -6509,7 +6689,7 @@ function createOpenRouter(options = {}) {
   );
   const createChatModel = (modelId, settings = {}) => new OpenRouterChatLanguageModel(modelId, settings, {
     provider: "openrouter.chat",
-    url: ({ path: path44 }) => `${baseURL}${path44}`,
+    url: ({ path: path45 }) => `${baseURL}${path45}`,
     headers: getHeaders,
     compatibility,
     fetch: options.fetch,
@@ -6517,7 +6697,7 @@ function createOpenRouter(options = {}) {
   });
   const createCompletionModel = (modelId, settings = {}) => new OpenRouterCompletionLanguageModel(modelId, settings, {
     provider: "openrouter.completion",
-    url: ({ path: path44 }) => `${baseURL}${path44}`,
+    url: ({ path: path45 }) => `${baseURL}${path45}`,
     headers: getHeaders,
     compatibility,
     fetch: options.fetch,
@@ -6525,14 +6705,14 @@ function createOpenRouter(options = {}) {
   });
   const createEmbeddingModel = (modelId, settings = {}) => new OpenRouterEmbeddingModel(modelId, settings, {
     provider: "openrouter.embedding",
-    url: ({ path: path44 }) => `${baseURL}${path44}`,
+    url: ({ path: path45 }) => `${baseURL}${path45}`,
     headers: getHeaders,
     fetch: options.fetch,
     extraBody: options.extraBody
   });
   const createImageModel = (modelId, settings = {}) => new OpenRouterImageModel(modelId, settings, {
     provider: "openrouter.image",
-    url: ({ path: path44 }) => `${baseURL}${path44}`,
+    url: ({ path: path45 }) => `${baseURL}${path45}`,
     headers: getHeaders,
     fetch: options.fetch,
     extraBody: options.extraBody
@@ -14041,37 +14221,43 @@ import { createWriteStream as createWriteStream5 } from "node:fs";
 import { mkdir as mkdir6, mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path17 from "node:path";
+import { execSync } from "node:child_process";
+import { randomUUID as randomUUID8 } from "node:crypto";
+import { createWriteStream as createWriteStream6 } from "node:fs";
+import { mkdir as mkdir7 } from "node:fs/promises";
+import path18 from "node:path";
+import { createInterface } from "node:readline";
 import { exec as exec2 } from "node:child_process";
 import { constants as constants3, access as access3, stat as stat4 } from "node:fs/promises";
-import path29 from "node:path";
+import path30 from "node:path";
 import { promisify as promisify3 } from "node:util";
 import { stat as stat3, writeFile as writeFile4 } from "node:fs/promises";
-import path27 from "node:path";
+import path28 from "node:path";
 import { constants as constants22 } from "node:fs";
-import { access as access22, mkdir as mkdir7, readdir, rm as rm2, stat } from "node:fs/promises";
-import path18 from "node:path";
+import { access as access22, mkdir as mkdir8, readdir, rm as rm2, stat } from "node:fs/promises";
 import path19 from "node:path";
 import path20 from "node:path";
-import { readFile as readFile7 } from "node:fs/promises";
 import path21 from "node:path";
+import { readFile as readFile7 } from "node:fs/promises";
+import path222 from "node:path";
 import { exec, spawn as spawn4 } from "node:child_process";
-import { mkdir as mkdir8, writeFile as writeFile2 } from "node:fs/promises";
-import path24 from "node:path";
+import { mkdir as mkdir9, writeFile as writeFile2 } from "node:fs/promises";
+import path25 from "node:path";
 import { promisify as promisify2 } from "node:util";
-import path23 from "node:path";
+import path24 from "node:path";
 import os2 from "node:os";
-import path222 from "node:path";
-import { copyFile, mkdir as mkdir9, readFile as readFile8, readdir as readdir2, stat as stat2, writeFile as writeFile3 } from "node:fs/promises";
+import path23 from "node:path";
+import { copyFile, mkdir as mkdir10, readFile as readFile8, readdir as readdir2, stat as stat2, writeFile as writeFile3 } from "node:fs/promises";
+import path27 from "node:path";
 import path26 from "node:path";
-import path25 from "node:path";
 import JSON5 from "json5";
 import { writeFile as writeFile5 } from "node:fs/promises";
-import path28 from "node:path";
+import path29 from "node:path";
 import { constants as constants4 } from "node:fs";
 import { access as access4, readFile as readFile9 } from "node:fs/promises";
-import path30 from "node:path";
-import { parse as parse4 } from "yaml";
 import path31 from "node:path";
+import { parse as parse4 } from "yaml";
+import path322 from "node:path";
 import fg2 from "fast-glob";
 import { mkdtemp as mkdtemp2, rm as rm3, writeFile as writeFile6 } from "node:fs/promises";
 import { tmpdir as tmpdir2 } from "node:os";
@@ -14079,38 +14265,38 @@ import { dirname, join } from "node:path";
 import { randomBytes } from "node:crypto";
 import { createServer } from "node:http";
 import fs2 from "node:fs/promises";
-import path322 from "node:path";
-import { createHash as createHash2, randomUUID as randomUUID8 } from "node:crypto";
-import { copyFile as copyFile2, mkdir as mkdir13, readdir as readdir6, stat as stat7 } from "node:fs/promises";
-import path41 from "node:path";
-import micromatch3 from "micromatch";
 import path33 from "node:path";
+import { createHash as createHash2, randomUUID as randomUUID9 } from "node:crypto";
+import { copyFile as copyFile2, mkdir as mkdir14, readdir as readdir6, stat as stat7 } from "node:fs/promises";
+import path422 from "node:path";
+import micromatch3 from "micromatch";
 import path34 from "node:path";
-import fg22 from "fast-glob";
 import path35 from "node:path";
+import fg22 from "fast-glob";
+import path36 from "node:path";
 import fg3 from "fast-glob";
 import { exec as execCallback } from "node:child_process";
 import { readdirSync as readdirSync2, statSync } from "node:fs";
-import path36 from "node:path";
-import { promisify as promisify4 } from "node:util";
-import { cp, mkdir as mkdir11, readdir as readdir3, rm as rm4, stat as stat5 } from "node:fs/promises";
 import path37 from "node:path";
+import { promisify as promisify4 } from "node:util";
+import { cp, mkdir as mkdir12, readdir as readdir3, rm as rm4, stat as stat5 } from "node:fs/promises";
+import path38 from "node:path";
 import { execFile } from "node:child_process";
 import { createHash } from "node:crypto";
 import { existsSync as existsSync2 } from "node:fs";
-import { cp as cp2, mkdir as mkdir12, readFile as readFile10, readdir as readdir4, rm as rm5, unlink, writeFile as writeFile7 } from "node:fs/promises";
-import path38 from "node:path";
+import { cp as cp2, mkdir as mkdir13, readFile as readFile10, readdir as readdir4, rm as rm5, unlink, writeFile as writeFile7 } from "node:fs/promises";
+import path39 from "node:path";
 import { promisify as promisify5 } from "node:util";
 import { execFile as execFile2 } from "node:child_process";
 import { existsSync as existsSync3 } from "node:fs";
-import path39 from "node:path";
+import path40 from "node:path";
 import { promisify as promisify6 } from "node:util";
 import { readdir as readdir5, stat as stat6 } from "node:fs/promises";
-import path40 from "node:path";
+import path41 from "node:path";
 import { existsSync as existsSync4 } from "node:fs";
-import path422 from "node:path";
-import { mkdir as mkdir14, readFile as readFile11, writeFile as writeFile8 } from "node:fs/promises";
 import path43 from "node:path";
+import { mkdir as mkdir15, readFile as readFile11, writeFile as writeFile8 } from "node:fs/promises";
+import path44 from "node:path";
 function computeTraceSummary(messages) {
   const toolCallCounts = {};
   const toolDurations = {};
@@ -14227,6 +14413,62 @@ function mergeExecutionMetrics(computed, metrics) {
     endTime: metrics.endTime ?? computed.endTime
   };
 }
+function flattenInputMessages(messages) {
+  return messages.flatMap((message) => extractContentSegments(message.content));
+}
+function collectResolvedInputFilePaths(messages) {
+  const filePaths = [];
+  for (const message of messages) {
+    if (!Array.isArray(message.content)) {
+      continue;
+    }
+    for (const segment of message.content) {
+      if (isJsonObject(segment) && segment.type === "file" && typeof segment.resolvedPath === "string") {
+        filePaths.push(segment.resolvedPath);
+      }
+    }
+  }
+  return filePaths;
+}
+function extractContentSegments(content) {
+  if (typeof content === "string") {
+    return content.trim().length > 0 ? [{ type: "text", value: content }] : [];
+  }
+  if (isJsonObject(content)) {
+    const rendered = JSON.stringify(content, null, 2);
+    return rendered.trim().length > 0 ? [{ type: "text", value: rendered }] : [];
+  }
+  if (!Array.isArray(content)) {
+    return [];
+  }
+  const segments = [];
+  for (const segment of content) {
+    if (!isJsonObject(segment)) {
+      continue;
+    }
+    segments.push(cloneJsonObject(segment));
+  }
+  return segments;
+}
+function cloneJsonObject(source) {
+  const entries = Object.entries(source).map(([key, value]) => [key, cloneJsonValue(value)]);
+  return Object.fromEntries(entries);
+}
+function cloneJsonValue(value) {
+  if (value === null) {
+    return null;
+  }
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => cloneJsonValue(item));
+  }
+  if (typeof value === "object") {
+    return cloneJsonObject(value);
+  }
+  return value;
+}
 var ANSI_RED = "\x1B[31m";
 var ANSI_RESET2 = "\x1B[0m";
 function logError(msg) {
@@ -14292,7 +14534,6 @@ function parseAgentSkillsEvals(parsed, source = "evals.json", baseDir) {
       id: String(id),
       question: prompt,
       input: [{ role: "user", content: prompt }],
-      input_segments: [{ type: "text", value: prompt }],
       expected_output: evalCase.expected_output ? [{ role: "assistant", content: evalCase.expected_output }] : [],
       reference_answer: evalCase.expected_output,
       file_paths: filePaths,
@@ -14414,7 +14655,7 @@ async function loadConfig(evalFilePath, repoRoot) {
     }
     try {
       const rawConfig = await readFile22(configPath, "utf8");
-      const parsed = parse(rawConfig);
+      const parsed = interpolateEnv(parse(rawConfig), process.env);
       if (!isJsonObject(parsed)) {
         logWarning(`Invalid .agentv/config.yaml format at ${configPath}`);
         continue;
@@ -14632,6 +14873,27 @@ function parseExecutionDefaults(raw, configPath) {
   } else if (otelFile !== void 0) {
     logWarning(`Invalid execution.otel_file in ${configPath}, expected non-empty string`);
   }
+  if (typeof obj.export_otel === "boolean") {
+    result.export_otel = obj.export_otel;
+  } else if (obj.export_otel !== void 0) {
+    logWarning(`Invalid execution.export_otel in ${configPath}, expected boolean`);
+  }
+  const otelBackend = obj.otel_backend;
+  if (typeof otelBackend === "string" && otelBackend.trim().length > 0) {
+    result.otel_backend = otelBackend.trim();
+  } else if (otelBackend !== void 0) {
+    logWarning(`Invalid execution.otel_backend in ${configPath}, expected non-empty string`);
+  }
+  if (typeof obj.otel_capture_content === "boolean") {
+    result.otel_capture_content = obj.otel_capture_content;
+  } else if (obj.otel_capture_content !== void 0) {
+    logWarning(`Invalid execution.otel_capture_content in ${configPath}, expected boolean`);
+  }
+  if (typeof obj.otel_group_turns === "boolean") {
+    result.otel_group_turns = obj.otel_group_turns;
+  } else if (obj.otel_group_turns !== void 0) {
+    logWarning(`Invalid execution.otel_group_turns in ${configPath}, expected boolean`);
+  }
   if (typeof obj.pool_workspaces === "boolean") {
     result.pool_workspaces = obj.pool_workspaces;
   } else if (obj.pool_workspaces !== void 0) {
@@ -16076,27 +16338,28 @@ var ANSI_YELLOW4 = "\x1B[33m";
 var ANSI_RESET5 = "\x1B[0m";
 async function processMessages(options) {
   const { messages, searchRoots, repoRootPath, textParts, messageType, verbose } = options;
-  const segments = [];
+  const processedMessages = [];
   for (const message of messages) {
     const content = message.content;
     if (typeof content === "string") {
-      segments.push({ type: "text", value: content });
       if (textParts) {
         textParts.push(content);
       }
+      processedMessages.push({ ...message, content });
       continue;
     }
     if (isJsonObject(content)) {
       const rendered = JSON.stringify(content, null, 2);
-      segments.push({ type: "text", value: rendered });
       if (textParts) {
         textParts.push(rendered);
       }
+      processedMessages.push({ ...message, content: cloneJsonObject(content) });
       continue;
     }
     if (!Array.isArray(content)) {
       continue;
     }
+    const processedContent = [];
     for (const rawSegment of content) {
       if (!isJsonObject(rawSegment)) {
         continue;
@@ -16119,8 +16382,8 @@ async function processMessages(options) {
         }
         try {
           const fileContent = (await readFile4(resolvedPath, "utf8")).replace(/\r\n/g, "\n");
-          segments.push({
-            type: "file",
+          processedContent.push({
+            ...cloneJsonObject(rawSegment),
             path: displayPath,
             text: fileContent,
             resolvedPath: path5.resolve(resolvedPath)
@@ -16137,37 +16400,19 @@ async function processMessages(options) {
         continue;
       }
       const clonedSegment = cloneJsonObject(rawSegment);
-      segments.push(clonedSegment);
+      processedContent.push(clonedSegment);
       const inlineValue = clonedSegment.value;
       if (typeof inlineValue === "string" && textParts) {
         textParts.push(inlineValue);
       }
     }
+    processedMessages.push({ ...message, content: processedContent });
   }
-  return segments;
+  return processedMessages;
 }
 function asString3(value) {
   return typeof value === "string" ? value : void 0;
 }
-function cloneJsonObject(source) {
-  const entries = Object.entries(source).map(([key, value]) => [key, cloneJsonValue(value)]);
-  return Object.fromEntries(entries);
-}
-function cloneJsonValue(value) {
-  if (value === null) {
-    return null;
-  }
-  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
-    return value;
-  }
-  if (Array.isArray(value)) {
-    return value.map((item) => cloneJsonValue(item));
-  }
-  if (typeof value === "object") {
-    return cloneJsonObject(value);
-  }
-  return value;
-}
 function logWarning3(message, details) {
   if (details && details.length > 0) {
     const detailBlock = details.join("\n");
@@ -16412,10 +16657,10 @@ async function loadTestsFromJsonl(evalFilePath, repoRoot, options) {
         );
       }
     }
-    const inputMessages = resolveInputMessages(evalcase);
+    const rawInputMessages = resolveInputMessages(evalcase);
     const expectedMessages = resolveExpectedMessages(evalcase) ?? [];
     const hasEvaluationSpec = !!outcome || expectedMessages.length > 0 || evalcase.assert !== void 0;
-    if (!id || !hasEvaluationSpec || !inputMessages || inputMessages.length === 0) {
+    if (!id || !hasEvaluationSpec || !rawInputMessages || rawInputMessages.length === 0) {
       logError2(
         `Skipping incomplete test at line ${lineNumber}: ${id ?? "unknown"}. Missing required fields: id, input, and at least one of criteria/expected_output/assert`
       );
@@ -16423,8 +16668,8 @@ async function loadTestsFromJsonl(evalFilePath, repoRoot, options) {
     }
     const hasExpectedMessages = expectedMessages.length > 0;
     const inputTextParts = [];
-    const inputSegments = await processMessages({
-      messages: inputMessages,
+    const inputMessages = await processMessages({
+      messages: rawInputMessages,
       searchRoots,
       repoRootPath,
       textParts: inputTextParts,
@@ -16470,19 +16715,13 @@ async function loadTestsFromJsonl(evalFilePath, repoRoot, options) {
       }
     }
     warnUnconsumedCriteria(outcome, evaluators, id ?? "unknown");
-    const userFilePaths = [];
-    for (const segment of inputSegments) {
-      if (segment.type === "file" && typeof segment.resolvedPath === "string") {
-        userFilePaths.push(segment.resolvedPath);
-      }
-    }
+    const userFilePaths = collectResolvedInputFilePaths(inputMessages);
     const testCase = {
       id,
       eval_set: evalSetName,
       conversation_id: conversationId,
       question,
       input: inputMessages,
-      input_segments: inputSegments,
       expected_output: outputSegments,
       reference_answer: referenceAnswer,
       file_paths: userFilePaths,
@@ -16543,50 +16782,9 @@ function parseMetadata(suite) {
   });
 }
 async function buildPromptInputs(testCase, mode = "lm") {
-  const segmentsByMessage = [];
-  const fileContentsByPath = /* @__PURE__ */ new Map();
-  for (const segment of testCase.input_segments) {
-    if (segment.type === "file" && typeof segment.path === "string" && typeof segment.text === "string") {
-      fileContentsByPath.set(segment.path, segment.text);
-    }
-  }
-  for (const message of testCase.input) {
-    const messageSegments = [];
-    if (typeof message.content === "string") {
-      if (message.content.trim().length > 0) {
-        messageSegments.push({ type: "text", value: message.content });
-      }
-    } else if (Array.isArray(message.content)) {
-      for (const segment of message.content) {
-        if (typeof segment === "string") {
-          if (segment.trim().length > 0) {
-            messageSegments.push({ type: "text", value: segment });
-          }
-        } else if (isJsonObject(segment)) {
-          const type = asString5(segment.type);
-          if (type === "file") {
-            const value = asString5(segment.value);
-            if (!value) continue;
-            const fileText = fileContentsByPath.get(value);
-            if (fileText !== void 0) {
-              messageSegments.push({ type: "file", text: fileText, path: value });
-            }
-          } else if (type === "text") {
-            const textValue = asString5(segment.value);
-            if (textValue && textValue.trim().length > 0) {
-              messageSegments.push({ type: "text", value: textValue });
-            }
-          }
-        }
-      }
-    } else if (isJsonObject(message.content)) {
-      const rendered = JSON.stringify(message.content, null, 2);
-      if (rendered.trim().length > 0) {
-        messageSegments.push({ type: "text", value: rendered });
-      }
-    }
-    segmentsByMessage.push(messageSegments);
-  }
+  const segmentsByMessage = testCase.input.map(
+    (message) => extractContentSegments(message.content)
+  );
   const useRoleMarkers = needsRoleMarkers(testCase.input, segmentsByMessage);
   let question;
   if (useRoleMarkers) {
@@ -16614,7 +16812,7 @@ ${messageContent}`);
     question = messageParts.join("\n\n");
   } else {
     const questionParts = [];
-    for (const segment of testCase.input_segments) {
+    for (const segment of flattenInputMessages(testCase.input)) {
       const formattedContent = formatSegment(segment, mode);
       if (formattedContent) {
         questionParts.push(formattedContent);
@@ -16701,9 +16899,6 @@ function buildChatPromptFromSegments(options) {
   }
   return chatPrompt.length > 0 ? chatPrompt : void 0;
 }
-function asString5(value) {
-  return typeof value === "string" ? value : void 0;
-}
 var ANSI_YELLOW6 = "\x1B[33m";
 var ANSI_RED3 = "\x1B[31m";
 var ANSI_RESET7 = "\x1B[0m";
@@ -16784,7 +16979,7 @@ async function loadTestsFromYaml(evalFilePath, repoRoot, options) {
     throw new Error(`Invalid test file format: ${evalFilePath}`);
   }
   const suite = interpolated;
-  const evalSetNameFromSuite = asString6(suite.name)?.trim();
+  const evalSetNameFromSuite = asString5(suite.name)?.trim();
   const fallbackEvalSet = path7.basename(absoluteTestPath).replace(/\.ya?ml$/i, "") || "eval";
   const evalSetName = evalSetNameFromSuite && evalSetNameFromSuite.length > 0 ? evalSetNameFromSuite : fallbackEvalSet;
   const rawTestcases = resolveTests(suite);
@@ -16803,7 +16998,7 @@ async function loadTestsFromYaml(evalFilePath, repoRoot, options) {
   const suiteInputMessages = expandInputShorthand(suite.input);
   const suiteInputFiles = suite.input_files;
   const rawGlobalExecution = isJsonObject(suite.execution) ? suite.execution : void 0;
-  const _globalTarget = asString6(rawGlobalExecution?.target) ?? asString6(suite.target);
+  const _globalTarget = asString5(rawGlobalExecution?.target) ?? asString5(suite.target);
   const suiteAssertions = suite.assertions ?? suite.assert;
   if (suite.assert !== void 0 && suite.assertions === void 0) {
     logWarning5("'assert' is deprecated at the suite level. Use 'assertions' instead.");
@@ -16816,17 +17011,17 @@ async function loadTestsFromYaml(evalFilePath, repoRoot, options) {
       continue;
     }
     const evalcase = rawEvalcase;
-    const id = asString6(evalcase.id);
+    const id = asString5(evalcase.id);
     if (filterPattern && (!id || !micromatch2.isMatch(id, filterPattern))) {
       continue;
     }
-    const conversationId = asString6(evalcase.conversation_id);
-    let outcome = asString6(evalcase.criteria);
+    const conversationId = asString5(evalcase.conversation_id);
+    let outcome = asString5(evalcase.criteria);
     if (!outcome && evalcase.expected_outcome !== void 0) {
-      outcome = asString6(evalcase.expected_outcome);
+      outcome = asString5(evalcase.expected_outcome);
       if (outcome) {
         logWarning5(
-          `Test '${asString6(evalcase.id) ?? "unknown"}': 'expected_outcome' is deprecated. Use 'criteria' instead.`
+          `Test '${asString5(evalcase.id) ?? "unknown"}': 'expected_outcome' is deprecated. Use 'criteria' instead.`
         );
       }
     }
@@ -16843,10 +17038,9 @@ async function loadTestsFromYaml(evalFilePath, repoRoot, options) {
       continue;
     }
     const effectiveSuiteInputMessages = suiteInputMessages && !skipDefaults ? suiteInputMessages : void 0;
-    const inputMessages = effectiveSuiteInputMessages ? [...effectiveSuiteInputMessages, ...testInputMessages] : testInputMessages;
     const hasExpectedMessages = expectedMessages.length > 0;
     const inputTextParts = [];
-    const suiteInputSegments = effectiveSuiteInputMessages ? await processMessages({
+    const suiteResolvedInputMessages = effectiveSuiteInputMessages ? await processMessages({
       messages: effectiveSuiteInputMessages,
       searchRoots,
       repoRootPath,
@@ -16854,7 +17048,7 @@ async function loadTestsFromYaml(evalFilePath, repoRoot, options) {
       messageType: "input",
       verbose
     }) : [];
-    const testInputSegments = await processMessages({
+    const testResolvedInputMessages = await processMessages({
       messages: testInputMessages,
       searchRoots,
       repoRootPath,
@@ -16862,7 +17056,7 @@ async function loadTestsFromYaml(evalFilePath, repoRoot, options) {
       messageType: "input",
       verbose
     });
-    const inputSegments = [...suiteInputSegments, ...testInputSegments];
+    const inputMessages = [...suiteResolvedInputMessages, ...testResolvedInputMessages];
     const outputSegments = hasExpectedMessages ? await processExpectedMessages({
       messages: expectedMessages,
       searchRoots,
@@ -16900,12 +17094,7 @@ async function loadTestsFromYaml(evalFilePath, repoRoot, options) {
       }
     }
     warnUnconsumedCriteria(outcome, evaluators, id ?? "unknown");
-    const userFilePaths = [];
-    for (const segment of inputSegments) {
-      if (segment.type === "file" && typeof segment.resolvedPath === "string") {
-        userFilePaths.push(segment.resolvedPath);
-      }
-    }
+    const userFilePaths = collectResolvedInputFilePaths(inputMessages);
     const caseWorkspace = await resolveWorkspaceConfig(evalcase.workspace, evalFileDir);
     const mergedWorkspace = mergeWorkspaceConfigs(suiteWorkspace, caseWorkspace);
     const metadata = isJsonObject(evalcase.metadata) ? evalcase.metadata : void 0;
@@ -16916,7 +17105,6 @@ async function loadTestsFromYaml(evalFilePath, repoRoot, options) {
       conversation_id: conversationId,
       question,
       input: inputMessages,
-      input_segments: inputSegments,
       expected_output: outputSegments,
       reference_answer: referenceAnswer,
       file_paths: userFilePaths,
@@ -17125,7 +17313,7 @@ function mergeWorkspaceConfigs(suiteLevel, caseLevel) {
     path: caseLevel.path ?? suiteLevel.path
   };
 }
-function asString6(value) {
+function asString5(value) {
   return typeof value === "string" ? value : void 0;
 }
 function logWarning5(message, details) {
@@ -20727,260 +20915,6 @@ var MockProvider = class {
     return this.delayMs;
   }
 };
-function extractPiTextContent(content) {
-  if (typeof content === "string") {
-    return content;
-  }
-  if (!Array.isArray(content)) {
-    return void 0;
-  }
-  const textParts = [];
-  for (const part of content) {
-    if (!part || typeof part !== "object") {
-      continue;
-    }
-    const p = part;
-    if (p.type === "text" && typeof p.text === "string") {
-      textParts.push(p.text);
-    }
-  }
-  return textParts.length > 0 ? textParts.join("\n") : void 0;
-}
-function toFiniteNumber(value) {
-  if (typeof value === "number" && Number.isFinite(value)) return value;
-  return void 0;
-}
-var piAgentModule = null;
-var piAiModule = null;
-async function loadPiModules() {
-  if (!piAgentModule || !piAiModule) {
-    try {
-      [piAgentModule, piAiModule] = await Promise.all([
-        import("@mariozechner/pi-agent-core"),
-        import("@mariozechner/pi-ai")
-      ]);
-    } catch (error) {
-      throw new Error(
-        `Failed to load pi-agent-sdk dependencies. Please install them:
-  npm install @mariozechner/pi-agent-core @mariozechner/pi-ai
-
-Original error: ${error instanceof Error ? error.message : String(error)}`
-      );
-    }
-  }
-  return {
-    Agent: piAgentModule.Agent,
-    getModel: piAiModule.getModel,
-    getEnvApiKey: piAiModule.getEnvApiKey
-  };
-}
-var PiAgentSdkProvider = class {
-  id;
-  kind = "pi-agent-sdk";
-  targetName;
-  supportsBatch = false;
-  config;
-  constructor(targetName, config) {
-    this.id = `pi-agent-sdk:${targetName}`;
-    this.targetName = targetName;
-    this.config = config;
-  }
-  async invoke(request) {
-    if (request.signal?.aborted) {
-      throw new Error("Pi agent SDK request was aborted before execution");
-    }
-    const { Agent, getModel, getEnvApiKey } = await loadPiModules();
-    const startTimeIso = (/* @__PURE__ */ new Date()).toISOString();
-    const startMs = Date.now();
-    const providerName = this.config.provider ?? "anthropic";
-    const modelId = this.config.model ?? "claude-sonnet-4-20250514";
-    const model = getModel(providerName, modelId);
-    const systemPrompt = this.config.systemPrompt ?? "Answer directly and concisely.";
-    const agent = new Agent({
-      initialState: {
-        systemPrompt,
-        model,
-        tools: [],
-        // No tools for simple Q&A
-        messages: []
-      },
-      getApiKey: async (provider) => {
-        return this.config.apiKey ?? getEnvApiKey(provider) ?? void 0;
-      }
-    });
-    let tokenUsage;
-    let costUsd;
-    const toolTrackers = /* @__PURE__ */ new Map();
-    const completedToolResults = /* @__PURE__ */ new Map();
-    const unsubscribe = agent.subscribe((event) => {
-      switch (event.type) {
-        case "message_end": {
-          const msg = event.message;
-          if (msg && typeof msg === "object" && "role" in msg && msg.role === "assistant" && "usage" in msg) {
-            const usage = msg.usage;
-            if (usage && typeof usage === "object") {
-              const u = usage;
-              const input = toFiniteNumber(u.input);
-              const output = toFiniteNumber(u.output);
-              const cached = toFiniteNumber(u.cacheRead);
-              let callDelta;
-              if (input !== void 0 || output !== void 0) {
-                callDelta = {
-                  input: input ?? 0,
-                  output: output ?? 0,
-                  ...cached !== void 0 ? { cached } : {}
-                };
-                tokenUsage = {
-                  input: (tokenUsage?.input ?? 0) + callDelta.input,
-                  output: (tokenUsage?.output ?? 0) + callDelta.output,
-                  ...cached !== void 0 ? { cached: (tokenUsage?.cached ?? 0) + cached } : tokenUsage?.cached !== void 0 ? { cached: tokenUsage.cached } : {}
-                };
-              }
-              const cost = u.cost;
-              if (cost && typeof cost === "object") {
-                const total = toFiniteNumber(cost.total);
-                if (total !== void 0) {
-                  costUsd = (costUsd ?? 0) + total;
-                }
-              }
-              request.streamCallbacks?.onLlmCallEnd?.(modelId, callDelta);
-            }
-          }
-          break;
-        }
-        case "tool_execution_start": {
-          toolTrackers.set(event.toolCallId, {
-            toolCallId: event.toolCallId,
-            toolName: event.toolName,
-            args: event.args,
-            startMs: Date.now(),
-            startTime: (/* @__PURE__ */ new Date()).toISOString()
-          });
-          request.streamCallbacks?.onToolCallStart?.(event.toolName, event.toolCallId);
-          break;
-        }
-        case "tool_execution_end": {
-          const tracker = toolTrackers.get(event.toolCallId);
-          const durationMs = tracker ? Date.now() - tracker.startMs : 0;
-          completedToolResults.set(event.toolCallId, {
-            output: event.result,
-            durationMs
-          });
-          request.streamCallbacks?.onToolCallEnd?.(
-            event.toolName,
-            tracker?.args,
-            event.result,
-            durationMs,
-            event.toolCallId
-          );
-          toolTrackers.delete(event.toolCallId);
-          break;
-        }
-      }
-    });
-    try {
-      if (this.config.timeoutMs) {
-        const timeoutMs = this.config.timeoutMs;
-        const timeoutPromise = new Promise((_, reject) => {
-          setTimeout(
-            () => reject(new Error(`Pi agent SDK timed out after ${timeoutMs}ms`)),
-            timeoutMs
-          );
-        });
-        await Promise.race([agent.prompt(request.question), timeoutPromise]);
-      } else {
-        await agent.prompt(request.question);
-      }
-      await agent.waitForIdle();
-      const agentMessages = agent.state.messages;
-      const output = [];
-      for (const msg of agentMessages) {
-        output.push(convertAgentMessage(msg, toolTrackers, completedToolResults));
-      }
-      const endTimeIso = (/* @__PURE__ */ new Date()).toISOString();
-      const durationMs = Date.now() - startMs;
-      return {
-        raw: {
-          messages: agentMessages,
-          systemPrompt,
-          model: this.config.model,
-          provider: this.config.provider
-        },
-        output,
-        tokenUsage,
-        costUsd,
-        durationMs,
-        startTime: startTimeIso,
-        endTime: endTimeIso
-      };
-    } finally {
-      unsubscribe();
-    }
-  }
-};
-function convertAgentMessage(message, toolTrackers, completedToolResults) {
-  if (!message || typeof message !== "object") {
-    return { role: "unknown", content: String(message) };
-  }
-  const msg = message;
-  const role = typeof msg.role === "string" ? msg.role : "unknown";
-  const content = extractPiTextContent(msg.content);
-  const toolCalls = extractToolCalls3(msg.content, toolTrackers, completedToolResults);
-  const startTime = typeof msg.timestamp === "number" ? new Date(msg.timestamp).toISOString() : typeof msg.timestamp === "string" ? msg.timestamp : void 0;
-  let msgTokenUsage;
-  if (msg.usage && typeof msg.usage === "object") {
-    const u = msg.usage;
-    const input = toFiniteNumber(u.input);
-    const output = toFiniteNumber(u.output);
-    if (input !== void 0 || output !== void 0) {
-      msgTokenUsage = {
-        input: input ?? 0,
-        output: output ?? 0,
-        ...toFiniteNumber(u.cacheRead) !== void 0 ? { cached: toFiniteNumber(u.cacheRead) } : {}
-      };
-    }
-  }
-  const metadata = {};
-  if (msg.api) metadata.api = msg.api;
-  if (msg.provider) metadata.provider = msg.provider;
-  if (msg.model) metadata.model = msg.model;
-  if (msg.stopReason) metadata.stopReason = msg.stopReason;
-  return {
-    role,
-    content,
-    toolCalls: toolCalls.length > 0 ? toolCalls : void 0,
-    startTime,
-    metadata: Object.keys(metadata).length > 0 ? metadata : void 0,
-    tokenUsage: msgTokenUsage
-  };
-}
-function extractToolCalls3(content, toolTrackers, completedToolResults) {
-  if (!Array.isArray(content)) {
-    return [];
-  }
-  const toolCalls = [];
-  for (const part of content) {
-    if (!part || typeof part !== "object") {
-      continue;
-    }
-    const p = part;
-    if (p.type === "toolCall" && typeof p.name === "string") {
-      const id = typeof p.id === "string" ? p.id : void 0;
-      const tracker = id ? toolTrackers.get(id) : void 0;
-      const completed = id ? completedToolResults.get(id) : void 0;
-      toolCalls.push({
-        tool: p.name,
-        input: p.arguments,
-        id,
-        output: completed?.output,
-        durationMs: completed?.durationMs,
-        startTime: tracker?.startTime,
-        endTime: tracker?.startTime && completed?.durationMs !== void 0 ? new Date(new Date(tracker.startTime).getTime() + completed.durationMs).toISOString() : void 0
-      });
-    }
-  }
-  return toolCalls;
-}
 var GLOBAL_LOGS_KEY5 = Symbol.for("agentv.piLogs");
 var GLOBAL_SUBSCRIBERS_KEY5 = Symbol.for("agentv.piLogSubscribers");
 function getPiLogStore() {
@@ -21032,24 +20966,47 @@ function subscribeToPiLogEntries(listener) {
     store.delete(listener);
   };
 }
+function extractPiTextContent(content) {
+  if (typeof content === "string") {
+    return content;
+  }
+  if (!Array.isArray(content)) {
+    return void 0;
+  }
+  const textParts = [];
+  for (const part of content) {
+    if (!part || typeof part !== "object") {
+      continue;
+    }
+    const p = part;
+    if (p.type === "text" && typeof p.text === "string") {
+      textParts.push(p.text);
+    }
+  }
+  return textParts.length > 0 ? textParts.join("\n") : void 0;
+}
+function toFiniteNumber(value) {
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  return void 0;
+}
 var WORKSPACE_PREFIX = "agentv-pi-";
 var PROMPT_FILENAME = "prompt.md";
-var PiCodingAgentProvider = class {
+var PiCliProvider = class {
   id;
-  kind = "pi-coding-agent";
+  kind = "pi-cli";
   targetName;
   supportsBatch = false;
   config;
   runPi;
   constructor(targetName, config, runner = defaultPiRunner) {
-    this.id = `pi-coding-agent:${targetName}`;
+    this.id = `pi-cli:${targetName}`;
     this.targetName = targetName;
     this.config = config;
     this.runPi = runner;
   }
   async invoke(request) {
     if (request.signal?.aborted) {
-      throw new Error("Pi coding agent request was aborted before execution");
+      throw new Error("Pi CLI request was aborted before execution");
     }
     const inputFiles = normalizeInputFiles(request.inputFiles);
     const startTime = (/* @__PURE__ */ new Date()).toISOString();
@@ -21059,17 +21016,17 @@ var PiCodingAgentProvider = class {
     try {
       const promptFile = path17.join(workspaceRoot, PROMPT_FILENAME);
       await writeFile(promptFile, request.question, "utf8");
-      const args = this.buildPiArgs(request.question, inputFiles, request.captureFileChanges);
+      const args = this.buildPiArgs(request.question, inputFiles);
       const cwd = this.resolveCwd(workspaceRoot, request.cwd);
       const result = await this.executePi(args, cwd, request.signal, logger);
       if (result.timedOut) {
         throw new Error(
-          `Pi coding agent timed out${formatTimeoutSuffix3(this.config.timeoutMs ?? void 0)}`
+          `Pi CLI timed out${formatTimeoutSuffix3(this.config.timeoutMs ?? void 0)}`
         );
       }
       if (result.exitCode !== 0) {
         const detail = pickDetail(result.stderr, result.stdout);
-        const prefix = `Pi coding agent exited with code ${result.exitCode}`;
+        const prefix = `Pi CLI exited with code ${result.exitCode}`;
         throw new Error(detail ? `${prefix}: ${detail}` : prefix);
       }
       const parsed = parsePiJsonl(result.stdout);
@@ -21126,10 +21083,10 @@ var PiCodingAgentProvider = class {
     }
     return path17.resolve(this.config.cwd);
   }
-  buildPiArgs(prompt, inputFiles, _captureFileChanges) {
+  buildPiArgs(prompt, inputFiles) {
     const args = [];
-    if (this.config.provider) {
-      args.push("--provider", this.config.provider);
+    if (this.config.subprovider) {
+      args.push("--provider", this.config.subprovider);
     }
     if (this.config.model) {
       args.push("--model", this.config.model);
@@ -21178,7 +21135,7 @@ ${prompt}` : prompt;
       const err = error;
       if (err.code === "ENOENT") {
         throw new Error(
-          `Pi coding agent executable '${this.config.executable}' was not found. Update the target settings.executable or add it to PATH.`
+          `Pi CLI executable '${this.config.executable}' was not found. Update the target executable or add it to PATH.`
         );
       }
       throw error;
@@ -21187,27 +21144,19 @@ ${prompt}` : prompt;
   buildEnv() {
     const env = { ...process.env };
     if (this.config.apiKey) {
-      const provider = this.config.provider?.toLowerCase() ?? "google";
-      switch (provider) {
-        case "google":
-        case "gemini":
-          env.GEMINI_API_KEY = this.config.apiKey;
-          break;
-        case "anthropic":
-          env.ANTHROPIC_API_KEY = this.config.apiKey;
-          break;
-        case "openai":
-          env.OPENAI_API_KEY = this.config.apiKey;
-          break;
-        case "groq":
-          env.GROQ_API_KEY = this.config.apiKey;
-          break;
-        case "xai":
-          env.XAI_API_KEY = this.config.apiKey;
-          break;
-        case "openrouter":
-          env.OPENROUTER_API_KEY = this.config.apiKey;
-          break;
+      const provider = this.config.subprovider?.toLowerCase() ?? "google";
+      const ENV_KEY_MAP = {
+        google: "GEMINI_API_KEY",
+        gemini: "GEMINI_API_KEY",
+        anthropic: "ANTHROPIC_API_KEY",
+        openai: "OPENAI_API_KEY",
+        groq: "GROQ_API_KEY",
+        xai: "XAI_API_KEY",
+        openrouter: "OPENROUTER_API_KEY"
+      };
+      const envKey = ENV_KEY_MAP[provider];
+      if (envKey) {
+        env[envKey] = this.config.apiKey;
       }
     }
     return env;
@@ -21225,7 +21174,7 @@ ${prompt}` : prompt;
     if (this.config.logDir) {
       return path17.resolve(this.config.logDir);
     }
-    return path17.join(process.cwd(), ".agentv", "logs", "pi-coding-agent");
+    return path17.join(process.cwd(), ".agentv", "logs", "pi-cli");
   }
   async createStreamLogger(request) {
     const logDir = this.resolveLogDirectory();
@@ -21277,7 +21226,7 @@ var PiStreamLogger = class _PiStreamLogger {
   static async create(options) {
     const logger = new _PiStreamLogger(options.filePath, options.format);
     const header = [
-      "# Pi Coding Agent stream log",
+      "# Pi CLI stream log",
       `# target: ${options.targetName}`,
       options.evalCaseId ? `# eval: ${options.evalCaseId}` : void 0,
       options.attempt !== void 0 ? `# attempt: ${options.attempt + 1}` : void 0,
@@ -21426,10 +21375,10 @@ function summarizePiEvent(event) {
       return `${type}: ${role}`;
     }
     case "message_update": {
-      const event2 = record.assistantMessageEvent;
-      const eventType = event2?.type;
+      const evt = record.assistantMessageEvent;
+      const eventType = evt?.type;
       if (eventType === "text_delta") {
-        const delta = event2?.delta;
+        const delta = evt?.delta;
         if (typeof delta === "string") {
           const preview = delta.length > 50 ? `${delta.slice(0, 50)}...` : delta;
           return `text_delta: ${preview}`;
@@ -21451,7 +21400,7 @@ function tryParseJsonValue(rawLine) {
 function parsePiJsonl(output) {
   const trimmed = output.trim();
   if (trimmed.length === 0) {
-    throw new Error("Pi coding agent produced no output");
+    throw new Error("Pi CLI produced no output");
   }
   const lines = trimmed.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
   const parsed = [];
@@ -21462,131 +21411,646 @@ function parsePiJsonl(output) {
     }
   }
   if (parsed.length === 0) {
-    throw new Error("Pi coding agent produced no valid JSON output");
+    throw new Error("Pi CLI produced no valid JSON output");
   }
   return parsed;
 }
 function extractMessages(events) {
   for (let i = events.length - 1; i >= 0; i--) {
     const event = events[i];
-    if (!event || typeof event !== "object") {
-      continue;
-    }
+    if (!event || typeof event !== "object") continue;
     const record = event;
-    if (record.type !== "agent_end") {
-      continue;
-    }
+    if (record.type !== "agent_end") continue;
     const messages = record.messages;
-    if (!Array.isArray(messages)) {
-      continue;
-    }
+    if (!Array.isArray(messages)) continue;
     return messages.map(convertPiMessage).filter((m) => m !== void 0);
   }
   const output = [];
   for (const event of events) {
-    if (!event || typeof event !== "object") {
-      continue;
-    }
+    if (!event || typeof event !== "object") continue;
     const record = event;
     if (record.type === "turn_end") {
-      const message = record.message;
-      const converted = convertPiMessage(message);
-      if (converted) {
-        output.push(converted);
+      const converted = convertPiMessage(record.message);
+      if (converted) output.push(converted);
+    }
+  }
+  return output;
+}
+function extractTokenUsage(events) {
+  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 usage = record.usage;
+    if (usage && typeof usage === "object") {
+      const u = usage;
+      const input = toFiniteNumber(u.input_tokens ?? u.inputTokens ?? u.input);
+      const output = toFiniteNumber(u.output_tokens ?? u.outputTokens ?? u.output);
+      if (input !== void 0 || output !== void 0) {
+        const result = { input: input ?? 0, output: output ?? 0 };
+        const cached = toFiniteNumber(u.cache_read_input_tokens ?? u.cached ?? u.cachedTokens);
+        const reasoning = toFiniteNumber(u.reasoning_tokens ?? u.reasoningTokens ?? u.reasoning);
+        return {
+          ...result,
+          ...cached !== void 0 ? { cached } : {},
+          ...reasoning !== void 0 ? { reasoning } : {}
+        };
+      }
+    }
+    const messages = record.messages;
+    if (Array.isArray(messages)) {
+      return aggregateUsageFromMessages(messages);
+    }
+  }
+  return void 0;
+}
+function aggregateUsageFromMessages(messages) {
+  let totalInput = 0;
+  let totalOutput = 0;
+  let totalCached;
+  let found = false;
+  for (const msg of messages) {
+    if (!msg || typeof msg !== "object") continue;
+    const m = msg;
+    const usage = m.usage;
+    if (!usage || typeof usage !== "object") continue;
+    const u = usage;
+    const input = toFiniteNumber(u.input_tokens ?? u.inputTokens ?? u.input);
+    const output = toFiniteNumber(u.output_tokens ?? u.outputTokens ?? u.output);
+    if (input !== void 0 || output !== void 0) {
+      found = true;
+      totalInput += input ?? 0;
+      totalOutput += output ?? 0;
+      const cached = toFiniteNumber(u.cache_read_input_tokens ?? u.cached ?? u.cachedTokens);
+      if (cached !== void 0) {
+        totalCached = (totalCached ?? 0) + cached;
       }
     }
   }
-  return output;
-}
-function extractTokenUsage(events) {
-  for (let i = events.length - 1; i >= 0; i--) {
-    const event = events[i];
-    if (!event || typeof event !== "object") continue;
+  if (!found) return void 0;
+  const result = { input: totalInput, output: totalOutput };
+  if (totalCached !== void 0) {
+    return { ...result, cached: totalCached };
+  }
+  return result;
+}
+function convertPiMessage(message) {
+  if (!message || typeof message !== "object") return void 0;
+  const msg = message;
+  const role = msg.role;
+  if (typeof role !== "string") return void 0;
+  const content = extractPiTextContent(msg.content);
+  const toolCalls = extractToolCalls3(msg.content);
+  const startTime = typeof msg.timestamp === "number" ? new Date(msg.timestamp).toISOString() : typeof msg.timestamp === "string" ? msg.timestamp : void 0;
+  const metadata = {};
+  if (msg.api) metadata.api = msg.api;
+  if (msg.provider) metadata.provider = msg.provider;
+  if (msg.model) metadata.model = msg.model;
+  if (msg.usage) metadata.usage = msg.usage;
+  if (msg.stopReason) metadata.stopReason = msg.stopReason;
+  return {
+    role,
+    content,
+    toolCalls: toolCalls.length > 0 ? toolCalls : void 0,
+    startTime,
+    metadata: Object.keys(metadata).length > 0 ? metadata : void 0
+  };
+}
+function extractToolCalls3(content) {
+  if (!Array.isArray(content)) return [];
+  const toolCalls = [];
+  for (const part of content) {
+    if (!part || typeof part !== "object") continue;
+    const p = part;
+    if (p.type === "tool_use" && typeof p.name === "string") {
+      toolCalls.push({
+        tool: p.name,
+        input: p.input,
+        id: typeof p.id === "string" ? p.id : void 0
+      });
+    }
+    if (p.type === "toolCall" && typeof p.name === "string") {
+      toolCalls.push({
+        tool: p.name,
+        input: p.arguments,
+        id: typeof p.id === "string" ? p.id : void 0
+      });
+    }
+    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);
+        toolCalls[idx] = { ...existing, output: p.content };
+      }
+    }
+  }
+  return toolCalls;
+}
+function escapeAtSymbols(prompt) {
+  return prompt.replace(/@\[([^\]]+)\]:/g, "[[$1]]:");
+}
+function pickDetail(stderr, stdout) {
+  const errorText = stderr.trim();
+  if (errorText.length > 0) return errorText;
+  const stdoutText = stdout.trim();
+  return stdoutText.length > 0 ? stdoutText : void 0;
+}
+function formatTimeoutSuffix3(timeoutMs) {
+  if (!timeoutMs || timeoutMs <= 0) return "";
+  return ` after ${Math.ceil(timeoutMs / 1e3)}s`;
+}
+async function defaultPiRunner(options) {
+  return await new Promise((resolve2, reject) => {
+    const parts = options.executable.split(/\s+/);
+    const executable = parts[0];
+    const executableArgs = parts.slice(1);
+    const allArgs = [...executableArgs, ...options.args];
+    const child = spawn3(executable, allArgs, {
+      cwd: options.cwd,
+      env: options.env,
+      stdio: ["pipe", "pipe", "pipe"],
+      shell: false
+    });
+    let stdout = "";
+    let stderr = "";
+    let timedOut = false;
+    const onAbort = () => {
+      child.kill("SIGTERM");
+    };
+    if (options.signal) {
+      if (options.signal.aborted) {
+        onAbort();
+      } else {
+        options.signal.addEventListener("abort", onAbort, { once: true });
+      }
+    }
+    let timeoutHandle;
+    if (options.timeoutMs && options.timeoutMs > 0) {
+      timeoutHandle = setTimeout(() => {
+        timedOut = true;
+        child.kill("SIGTERM");
+      }, options.timeoutMs);
+      timeoutHandle.unref?.();
+    }
+    child.stdout.setEncoding("utf8");
+    child.stdout.on("data", (chunk) => {
+      stdout += chunk;
+      options.onStdoutChunk?.(chunk);
+    });
+    child.stderr.setEncoding("utf8");
+    child.stderr.on("data", (chunk) => {
+      stderr += chunk;
+      options.onStderrChunk?.(chunk);
+    });
+    child.stdin.end();
+    const cleanup = () => {
+      if (timeoutHandle) clearTimeout(timeoutHandle);
+      if (options.signal) options.signal.removeEventListener("abort", onAbort);
+    };
+    child.on("error", (error) => {
+      cleanup();
+      reject(error);
+    });
+    child.on("close", (code) => {
+      cleanup();
+      resolve2({
+        stdout,
+        stderr,
+        exitCode: typeof code === "number" ? code : -1,
+        timedOut
+      });
+    });
+  });
+}
+var piCodingAgentModule = null;
+var piAiModule = null;
+async function promptInstall() {
+  if (!process.stdout.isTTY) return false;
+  const rl = createInterface({ input: process.stdin, output: process.stderr });
+  try {
+    return await new Promise((resolve2) => {
+      rl.question(
+        "@mariozechner/pi-coding-agent is not installed. Install it now? (y/N) ",
+        (answer) => resolve2(answer.trim().toLowerCase() === "y")
+      );
+    });
+  } finally {
+    rl.close();
+  }
+}
+async function loadSdkModules() {
+  if (!piCodingAgentModule || !piAiModule) {
+    try {
+      [piCodingAgentModule, piAiModule] = await Promise.all([
+        import("@mariozechner/pi-coding-agent"),
+        import("./dist-BOIN5LC5-T5UWUK43.js")
+      ]);
+    } catch {
+      if (await promptInstall()) {
+        console.error("Installing @mariozechner/pi-coding-agent...");
+        execSync("bun add @mariozechner/pi-coding-agent", { stdio: "inherit" });
+        [piCodingAgentModule, piAiModule] = await Promise.all([
+          import("@mariozechner/pi-coding-agent"),
+          import("./dist-BOIN5LC5-T5UWUK43.js")
+        ]);
+      } else {
+        throw new Error(
+          "pi-coding-agent SDK is not installed. Install it with:\n  bun add @mariozechner/pi-coding-agent"
+        );
+      }
+    }
+  }
+  const toolMap = {
+    read: piCodingAgentModule.readTool,
+    bash: piCodingAgentModule.bashTool,
+    edit: piCodingAgentModule.editTool,
+    write: piCodingAgentModule.writeTool,
+    grep: piCodingAgentModule.grepTool,
+    find: piCodingAgentModule.findTool,
+    ls: piCodingAgentModule.lsTool
+  };
+  return {
+    createAgentSession: piCodingAgentModule.createAgentSession,
+    codingTools: piCodingAgentModule.codingTools,
+    toolMap,
+    SessionManager: piCodingAgentModule.SessionManager,
+    getModel: piAiModule.getModel
+  };
+}
+var PiCodingAgentProvider = class {
+  id;
+  kind = "pi-coding-agent";
+  targetName;
+  supportsBatch = false;
+  config;
+  constructor(targetName, config) {
+    this.id = `pi-coding-agent:${targetName}`;
+    this.targetName = targetName;
+    this.config = config;
+  }
+  async invoke(request) {
+    if (request.signal?.aborted) {
+      throw new Error("Pi coding agent request was aborted before execution");
+    }
+    const inputFiles = normalizeInputFiles(request.inputFiles);
+    const startTime = (/* @__PURE__ */ new Date()).toISOString();
+    const startMs = Date.now();
+    const sdk = await loadSdkModules();
+    const logger = await this.createStreamLogger(request).catch(() => void 0);
+    try {
+      const cwd = this.resolveCwd(request.cwd);
+      const providerName = this.config.subprovider ?? "google";
+      const modelId = this.config.model ?? "gemini-2.5-flash";
+      this.setApiKeyEnv(providerName);
+      const model = sdk.getModel(providerName, modelId);
+      const tools = this.resolveTools(sdk);
+      const { session } = await sdk.createAgentSession({
+        cwd,
+        model,
+        tools,
+        thinkingLevel: this.config.thinking,
+        sessionManager: sdk.SessionManager.inMemory(cwd)
+      });
+      let tokenUsage;
+      let costUsd;
+      const toolTrackers = /* @__PURE__ */ new Map();
+      const completedToolResults = /* @__PURE__ */ new Map();
+      const unsubscribe = session.subscribe((event) => {
+        logger?.handleEvent(event);
+        switch (event.type) {
+          case "message_end": {
+            const msg = event.message;
+            if (msg && typeof msg === "object" && "role" in msg && msg.role === "assistant" && "usage" in msg) {
+              const usage = msg.usage;
+              if (usage && typeof usage === "object") {
+                const u = usage;
+                const input = toFiniteNumber(u.input);
+                const output = toFiniteNumber(u.output);
+                const cached = toFiniteNumber(u.cacheRead);
+                let callDelta;
+                if (input !== void 0 || output !== void 0) {
+                  callDelta = {
+                    input: input ?? 0,
+                    output: output ?? 0,
+                    ...cached !== void 0 ? { cached } : {}
+                  };
+                  tokenUsage = {
+                    input: (tokenUsage?.input ?? 0) + callDelta.input,
+                    output: (tokenUsage?.output ?? 0) + callDelta.output,
+                    ...cached !== void 0 ? { cached: (tokenUsage?.cached ?? 0) + cached } : tokenUsage?.cached !== void 0 ? { cached: tokenUsage.cached } : {}
+                  };
+                }
+                const cost = u.cost;
+                if (cost && typeof cost === "object") {
+                  const total = toFiniteNumber(cost.total);
+                  if (total !== void 0) {
+                    costUsd = (costUsd ?? 0) + total;
+                  }
+                }
+                request.streamCallbacks?.onLlmCallEnd?.(modelId, callDelta);
+              }
+            }
+            break;
+          }
+          case "tool_execution_start": {
+            toolTrackers.set(event.toolCallId, {
+              toolCallId: event.toolCallId,
+              toolName: event.toolName,
+              args: event.args,
+              startMs: Date.now(),
+              startTime: (/* @__PURE__ */ new Date()).toISOString()
+            });
+            request.streamCallbacks?.onToolCallStart?.(event.toolName, event.toolCallId);
+            break;
+          }
+          case "tool_execution_end": {
+            const tracker = toolTrackers.get(event.toolCallId);
+            const durationMs = tracker ? Date.now() - tracker.startMs : 0;
+            completedToolResults.set(event.toolCallId, {
+              output: event.result,
+              durationMs
+            });
+            request.streamCallbacks?.onToolCallEnd?.(
+              event.toolName,
+              tracker?.args,
+              event.result,
+              durationMs,
+              event.toolCallId
+            );
+            toolTrackers.delete(event.toolCallId);
+            break;
+          }
+        }
+      });
+      try {
+        const systemPrompt = this.config.systemPrompt;
+        let prompt = request.question;
+        if (systemPrompt) {
+          prompt = `${systemPrompt}
+
+${prompt}`;
+        }
+        if (inputFiles && inputFiles.length > 0) {
+          const fileList = inputFiles.map((f) => `@${f}`).join("\n");
+          prompt = `${prompt}
+
+Files:
+${fileList}`;
+        }
+        if (this.config.timeoutMs) {
+          const timeoutMs = this.config.timeoutMs;
+          let timeoutId;
+          const timeoutPromise = new Promise((_, reject) => {
+            timeoutId = setTimeout(
+              () => reject(
+                new Error(`Pi coding agent timed out after ${Math.ceil(timeoutMs / 1e3)}s`)
+              ),
+              timeoutMs
+            );
+          });
+          try {
+            await Promise.race([session.prompt(prompt), timeoutPromise]);
+          } finally {
+            if (timeoutId !== void 0) clearTimeout(timeoutId);
+          }
+        } else {
+          await session.prompt(prompt);
+        }
+        const agentMessages = session.agent.state.messages;
+        const output = [];
+        for (const msg of agentMessages) {
+          output.push(convertAgentMessage(msg, toolTrackers, completedToolResults));
+        }
+        const endTime = (/* @__PURE__ */ new Date()).toISOString();
+        const durationMs = Date.now() - startMs;
+        return {
+          raw: {
+            messages: agentMessages,
+            model: this.config.model,
+            provider: this.config.subprovider
+          },
+          output,
+          tokenUsage,
+          costUsd,
+          durationMs,
+          startTime,
+          endTime
+        };
+      } finally {
+        unsubscribe();
+        session.dispose();
+      }
+    } finally {
+      await logger?.close();
+    }
+  }
+  /** Maps config apiKey to the provider-specific env var the SDK reads. */
+  setApiKeyEnv(providerName) {
+    if (!this.config.apiKey) return;
+    const ENV_KEY_MAP = {
+      google: "GEMINI_API_KEY",
+      gemini: "GEMINI_API_KEY",
+      anthropic: "ANTHROPIC_API_KEY",
+      openai: "OPENAI_API_KEY",
+      groq: "GROQ_API_KEY",
+      xai: "XAI_API_KEY",
+      openrouter: "OPENROUTER_API_KEY"
+    };
+    const envKey = ENV_KEY_MAP[providerName.toLowerCase()];
+    if (envKey) {
+      process.env[envKey] = this.config.apiKey;
+    }
+  }
+  resolveCwd(cwdOverride) {
+    if (cwdOverride) {
+      return path18.resolve(cwdOverride);
+    }
+    if (this.config.cwd) {
+      return path18.resolve(this.config.cwd);
+    }
+    return process.cwd();
+  }
+  resolveTools(sdk) {
+    if (!this.config.tools) {
+      return sdk.codingTools;
+    }
+    const toolNames = this.config.tools.split(",").map((t) => t.trim().toLowerCase());
+    const selected = [];
+    for (const name21 of toolNames) {
+      if (name21 in sdk.toolMap) {
+        selected.push(sdk.toolMap[name21]);
+      }
+    }
+    return selected.length > 0 ? selected : sdk.codingTools;
+  }
+  resolveLogDirectory() {
+    if (this.config.logDir) {
+      return path18.resolve(this.config.logDir);
+    }
+    return path18.join(process.cwd(), ".agentv", "logs", "pi-coding-agent");
+  }
+  async createStreamLogger(request) {
+    const logDir = this.resolveLogDirectory();
+    if (!logDir) {
+      return void 0;
+    }
+    try {
+      await mkdir7(logDir, { recursive: true });
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.warn(`Skipping Pi stream logging (could not create ${logDir}): ${message}`);
+      return void 0;
+    }
+    const filePath = path18.join(logDir, buildLogFilename6(request, this.targetName));
+    try {
+      const logger = await PiStreamLogger2.create({
+        filePath,
+        targetName: this.targetName,
+        evalCaseId: request.evalCaseId,
+        attempt: request.attempt,
+        format: this.config.logFormat ?? "summary"
+      });
+      recordPiLogEntry({
+        filePath,
+        targetName: this.targetName,
+        evalCaseId: request.evalCaseId,
+        attempt: request.attempt
+      });
+      return logger;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.warn(`Skipping Pi stream logging for ${filePath}: ${message}`);
+      return void 0;
+    }
+  }
+};
+var PiStreamLogger2 = class _PiStreamLogger2 {
+  filePath;
+  stream;
+  startedAt = Date.now();
+  format;
+  constructor(filePath, format) {
+    this.filePath = filePath;
+    this.format = format;
+    this.stream = createWriteStream6(filePath, { flags: "a" });
+  }
+  static async create(options) {
+    const logger = new _PiStreamLogger2(options.filePath, options.format);
+    const header = [
+      "# Pi Coding Agent stream log",
+      `# target: ${options.targetName}`,
+      options.evalCaseId ? `# eval: ${options.evalCaseId}` : void 0,
+      options.attempt !== void 0 ? `# attempt: ${options.attempt + 1}` : void 0,
+      `# started: ${(/* @__PURE__ */ new Date()).toISOString()}`,
+      ""
+    ].filter((line) => Boolean(line));
+    for (const line of header) {
+      logger.stream.write(`${line}
+`);
+    }
+    return logger;
+  }
+  handleEvent(event) {
+    if (!event || typeof event !== "object") return;
     const record = event;
-    if (record.type !== "agent_end") continue;
-    const usage = record.usage;
-    if (usage && typeof usage === "object") {
-      const u = usage;
-      const input = toFiniteNumber(u.input_tokens ?? u.inputTokens ?? u.input);
-      const output = toFiniteNumber(u.output_tokens ?? u.outputTokens ?? u.output);
-      if (input !== void 0 || output !== void 0) {
-        const result = {
-          input: input ?? 0,
-          output: output ?? 0
-        };
-        const cached = toFiniteNumber(u.cache_read_input_tokens ?? u.cached ?? u.cachedTokens);
-        const reasoning = toFiniteNumber(u.reasoning_tokens ?? u.reasoningTokens ?? u.reasoning);
-        return {
-          ...result,
-          ...cached !== void 0 ? { cached } : {},
-          ...reasoning !== void 0 ? { reasoning } : {}
-        };
-      }
-    }
-    const messages = record.messages;
-    if (Array.isArray(messages)) {
-      return aggregateUsageFromMessages(messages);
+    const type = typeof record.type === "string" ? record.type : void 0;
+    if (!type) return;
+    const message = this.format === "json" ? JSON.stringify(event, null, 2) : summarizeSdkEvent2(event);
+    if (message) {
+      this.stream.write(`[+${formatElapsed6(this.startedAt)}] ${message}
+`);
     }
   }
-  return void 0;
-}
-function aggregateUsageFromMessages(messages) {
-  let totalInput = 0;
-  let totalOutput = 0;
-  let totalCached;
-  let found = false;
-  for (const msg of messages) {
-    if (!msg || typeof msg !== "object") continue;
-    const m = msg;
-    const usage = m.usage;
-    if (!usage || typeof usage !== "object") continue;
-    const u = usage;
-    const input = toFiniteNumber(u.input_tokens ?? u.inputTokens ?? u.input);
-    const output = toFiniteNumber(u.output_tokens ?? u.outputTokens ?? u.output);
-    if (input !== void 0 || output !== void 0) {
-      found = true;
-      totalInput += input ?? 0;
-      totalOutput += output ?? 0;
-      const cached = toFiniteNumber(u.cache_read_input_tokens ?? u.cached ?? u.cachedTokens);
-      if (cached !== void 0) {
-        totalCached = (totalCached ?? 0) + cached;
-      }
+  async close() {
+    await new Promise((resolve2, reject) => {
+      this.stream.once("error", reject);
+      this.stream.end(() => resolve2());
+    });
+  }
+};
+function summarizeSdkEvent2(event) {
+  if (!event || typeof event !== "object") return void 0;
+  const record = event;
+  const type = typeof record.type === "string" ? record.type : void 0;
+  if (!type) return void 0;
+  switch (type) {
+    case "agent_start":
+    case "agent_end":
+    case "turn_start":
+    case "turn_end":
+      return type;
+    case "message_start":
+    case "message_end": {
+      const msg = record.message;
+      return `${type}: ${msg?.role ?? "unknown"}`;
     }
+    case "tool_execution_start":
+      return `tool_start: ${record.toolName}`;
+    case "tool_execution_end":
+      return `tool_end: ${record.toolName}`;
+    default:
+      return type;
   }
-  if (!found) return void 0;
-  const result = { input: totalInput, output: totalOutput };
-  if (totalCached !== void 0) {
-    return { ...result, cached: totalCached };
+}
+function buildLogFilename6(request, targetName) {
+  const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  const evalId = sanitizeForFilename6(request.evalCaseId ?? "pi");
+  const attemptSuffix = request.attempt !== void 0 ? `_attempt-${request.attempt + 1}` : "";
+  const target = sanitizeForFilename6(targetName);
+  return `${timestamp}_${target}_${evalId}${attemptSuffix}_${randomUUID8().slice(0, 8)}.log`;
+}
+function sanitizeForFilename6(value) {
+  const sanitized = value.replace(/[^A-Za-z0-9._-]+/g, "_");
+  return sanitized.length > 0 ? sanitized : "pi";
+}
+function formatElapsed6(startedAt) {
+  const elapsedSeconds = Math.floor((Date.now() - startedAt) / 1e3);
+  const hours = Math.floor(elapsedSeconds / 3600);
+  const minutes = Math.floor(elapsedSeconds % 3600 / 60);
+  const seconds = elapsedSeconds % 60;
+  if (hours > 0) {
+    return `${hours.toString().padStart(2, "0")}:${minutes.toString().padStart(2, "0")}:${seconds.toString().padStart(2, "0")}`;
   }
-  return result;
+  return `${minutes.toString().padStart(2, "0")}:${seconds.toString().padStart(2, "0")}`;
 }
-function convertPiMessage(message) {
+function convertAgentMessage(message, toolTrackers, completedToolResults) {
   if (!message || typeof message !== "object") {
-    return void 0;
+    return { role: "unknown", content: String(message) };
   }
   const msg = message;
-  const role = msg.role;
-  if (typeof role !== "string") {
-    return void 0;
-  }
+  const role = typeof msg.role === "string" ? msg.role : "unknown";
   const content = extractPiTextContent(msg.content);
-  const toolCalls = extractToolCalls4(msg.content);
-  const startTime = typeof msg.timestamp === "number" ? new Date(msg.timestamp).toISOString() : typeof msg.timestamp === "string" ? msg.timestamp : void 0;
+  const toolCalls = extractToolCalls4(msg.content, toolTrackers, completedToolResults);
+  const startTimeVal = typeof msg.timestamp === "number" ? new Date(msg.timestamp).toISOString() : typeof msg.timestamp === "string" ? msg.timestamp : void 0;
+  let msgTokenUsage;
+  if (msg.usage && typeof msg.usage === "object") {
+    const u = msg.usage;
+    const input = toFiniteNumber(u.input);
+    const output = toFiniteNumber(u.output);
+    if (input !== void 0 || output !== void 0) {
+      msgTokenUsage = {
+        input: input ?? 0,
+        output: output ?? 0,
+        ...toFiniteNumber(u.cacheRead) !== void 0 ? { cached: toFiniteNumber(u.cacheRead) } : {}
+      };
+    }
+  }
   const metadata = {};
   if (msg.api) metadata.api = msg.api;
   if (msg.provider) metadata.provider = msg.provider;
   if (msg.model) metadata.model = msg.model;
-  if (msg.usage) metadata.usage = msg.usage;
   if (msg.stopReason) metadata.stopReason = msg.stopReason;
   return {
     role,
     content,
     toolCalls: toolCalls.length > 0 ? toolCalls : void 0,
-    startTime,
-    metadata: Object.keys(metadata).length > 0 ? metadata : void 0
+    startTime: startTimeVal,
+    metadata: Object.keys(metadata).length > 0 ? metadata : void 0,
+    tokenUsage: msgTokenUsage
   };
 }
-function extractToolCalls4(content) {
+function extractToolCalls4(content, toolTrackers, completedToolResults) {
   if (!Array.isArray(content)) {
     return [];
   }
@@ -21596,118 +22060,23 @@ function extractToolCalls4(content) {
       continue;
     }
     const p = part;
-    if (p.type === "tool_use" && typeof p.name === "string") {
-      toolCalls.push({
-        tool: p.name,
-        input: p.input,
-        id: typeof p.id === "string" ? p.id : void 0
-      });
-    }
     if (p.type === "toolCall" && typeof p.name === "string") {
+      const id = typeof p.id === "string" ? p.id : void 0;
+      const tracker = id ? toolTrackers.get(id) : void 0;
+      const completed = id ? completedToolResults.get(id) : void 0;
       toolCalls.push({
         tool: p.name,
         input: p.arguments,
-        id: typeof p.id === "string" ? p.id : void 0
+        id,
+        output: completed?.output,
+        durationMs: completed?.durationMs,
+        startTime: tracker?.startTime,
+        endTime: tracker?.startTime && completed?.durationMs !== void 0 ? new Date(new Date(tracker.startTime).getTime() + completed.durationMs).toISOString() : void 0
       });
     }
-    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);
-        toolCalls[idx] = {
-          ...existing,
-          output: p.content
-        };
-      }
-    }
   }
   return toolCalls;
 }
-function escapeAtSymbols(prompt) {
-  return prompt.replace(/@\[([^\]]+)\]:/g, "[[$1]]:");
-}
-function pickDetail(stderr, stdout) {
-  const errorText = stderr.trim();
-  if (errorText.length > 0) {
-    return errorText;
-  }
-  const stdoutText = stdout.trim();
-  return stdoutText.length > 0 ? stdoutText : void 0;
-}
-function formatTimeoutSuffix3(timeoutMs) {
-  if (!timeoutMs || timeoutMs <= 0) {
-    return "";
-  }
-  const seconds = Math.ceil(timeoutMs / 1e3);
-  return ` after ${seconds}s`;
-}
-async function defaultPiRunner(options) {
-  return await new Promise((resolve2, reject) => {
-    const parts = options.executable.split(/\s+/);
-    const executable = parts[0];
-    const executableArgs = parts.slice(1);
-    const allArgs = [...executableArgs, ...options.args];
-    const child = spawn3(executable, allArgs, {
-      cwd: options.cwd,
-      env: options.env,
-      stdio: ["pipe", "pipe", "pipe"],
-      shell: false
-    });
-    let stdout = "";
-    let stderr = "";
-    let timedOut = false;
-    const onAbort = () => {
-      child.kill("SIGTERM");
-    };
-    if (options.signal) {
-      if (options.signal.aborted) {
-        onAbort();
-      } else {
-        options.signal.addEventListener("abort", onAbort, { once: true });
-      }
-    }
-    let timeoutHandle;
-    if (options.timeoutMs && options.timeoutMs > 0) {
-      timeoutHandle = setTimeout(() => {
-        timedOut = true;
-        child.kill("SIGTERM");
-      }, options.timeoutMs);
-      timeoutHandle.unref?.();
-    }
-    child.stdout.setEncoding("utf8");
-    child.stdout.on("data", (chunk) => {
-      stdout += chunk;
-      options.onStdoutChunk?.(chunk);
-    });
-    child.stderr.setEncoding("utf8");
-    child.stderr.on("data", (chunk) => {
-      stderr += chunk;
-      options.onStderrChunk?.(chunk);
-    });
-    child.stdin.end();
-    const cleanup = () => {
-      if (timeoutHandle) {
-        clearTimeout(timeoutHandle);
-      }
-      if (options.signal) {
-        options.signal.removeEventListener("abort", onAbort);
-      }
-    };
-    child.on("error", (error) => {
-      cleanup();
-      reject(error);
-    });
-    child.on("close", (code) => {
-      cleanup();
-      resolve2({
-        stdout,
-        stderr,
-        exitCode: typeof code === "number" ? code : -1,
-        timedOut
-      });
-    });
-  });
-}
 var ProviderRegistry = class {
   factories = /* @__PURE__ */ new Map();
   /** Register a factory function for a provider kind. */
@@ -21750,13 +22119,13 @@ async function pathExists(target) {
   }
 }
 async function ensureDir(target) {
-  await mkdir7(target, { recursive: true });
+  await mkdir8(target, { recursive: true });
 }
 async function readDirEntries(target) {
   const entries = await readdir(target, { withFileTypes: true });
   return entries.map((entry) => ({
     name: entry.name,
-    absolutePath: path18.join(target, entry.name),
+    absolutePath: path19.join(target, entry.name),
     isDirectory: entry.isDirectory()
   }));
 }
@@ -21770,7 +22139,7 @@ async function removeIfExists(target) {
   }
 }
 function pathToFileUri2(filePath) {
-  const absolutePath = path19.isAbsolute(filePath) ? filePath : path19.resolve(filePath);
+  const absolutePath = path20.isAbsolute(filePath) ? filePath : path20.resolve(filePath);
   const normalizedPath = absolutePath.replace(/\\/g, "/");
   if (/^[a-zA-Z]:\//.test(normalizedPath)) {
     return `file:///${normalizedPath}`;
@@ -21862,8 +22231,8 @@ function createBatchRequestPrompt(userQuery, responseFileTmp, responseFileFinal,
   });
 }
 function createBatchOrchestratorPrompt(requestFiles, responseFiles, templateContent) {
-  const requestLines = requestFiles.map((file, index) => `${index + 1}. messages/${path20.basename(file)}`).join("\n");
-  const responseList = responseFiles.map((file) => `"${path20.basename(file)}"`).join(", ");
+  const requestLines = requestFiles.map((file, index) => `${index + 1}. messages/${path21.basename(file)}`).join("\n");
+  const responseList = responseFiles.map((file) => `"${path21.basename(file)}"`).join(", ");
   return renderTemplate2(templateContent, {
     requestFiles: requestLines,
     responseList
@@ -21923,7 +22292,7 @@ async function waitForResponseOutput(responseFileFinal, pollInterval = 1e3, sile
 }
 async function waitForBatchResponses(responseFilesFinal, pollInterval = 1e3, silent = false, timeoutMs = DEFAULT_TIMEOUT_MS) {
   if (!silent) {
-    const fileList = responseFilesFinal.map((file) => path21.basename(file)).join(", ");
+    const fileList = responseFilesFinal.map((file) => path222.basename(file)).join(", ");
     console.error(`waiting for ${responseFilesFinal.length} batch response(s): ${fileList}`);
   }
   const deadline = Date.now() + timeoutMs;
@@ -21932,7 +22301,7 @@ async function waitForBatchResponses(responseFilesFinal, pollInterval = 1e3, sil
     while (pending.size > 0) {
       if (Date.now() >= deadline) {
         if (!silent) {
-          const remaining = [...pending].map((f) => path21.basename(f)).join(", ");
+          const remaining = [...pending].map((f) => path222.basename(f)).join(", ");
           console.error(
             `error: timed out after ${Math.round(timeoutMs / 1e3)}s waiting for batch responses. Still pending: ${remaining}`
           );
@@ -21989,25 +22358,25 @@ function getAgentvHome() {
     }
     return envHome;
   }
-  return path222.join(os2.homedir(), ".agentv");
+  return path23.join(os2.homedir(), ".agentv");
 }
 function getWorkspacesRoot() {
-  return path222.join(getAgentvHome(), "workspaces");
+  return path23.join(getAgentvHome(), "workspaces");
 }
 function getSubagentsRoot() {
-  return path222.join(getAgentvHome(), "subagents");
+  return path23.join(getAgentvHome(), "subagents");
 }
 function getTraceStateRoot() {
-  return path222.join(getAgentvHome(), "trace-state");
+  return path23.join(getAgentvHome(), "trace-state");
 }
 function getWorkspacePoolRoot() {
-  return path222.join(getAgentvHome(), "workspace-pool");
+  return path23.join(getAgentvHome(), "workspace-pool");
 }
 var DEFAULT_LOCK_NAME = "subagent.lock";
 var DEFAULT_ALIVE_FILENAME = ".alive";
 function getDefaultSubagentRoot(vscodeCmd = "code") {
   const folder = vscodeCmd === "code-insiders" ? "vscode-insiders-agents" : "vscode-agents";
-  return path23.join(getSubagentsRoot(), folder);
+  return path24.join(getSubagentsRoot(), folder);
 }
 var DEFAULT_SUBAGENT_ROOT = getDefaultSubagentRoot();
 var execAsync2 = promisify2(exec);
@@ -22072,11 +22441,11 @@ async function ensureWorkspaceFocused(workspacePath, workspaceName, subagentDir,
     await raceSpawnError(child);
     return true;
   }
-  const aliveFile = path24.join(subagentDir, DEFAULT_ALIVE_FILENAME);
+  const aliveFile = path25.join(subagentDir, DEFAULT_ALIVE_FILENAME);
   await removeIfExists(aliveFile);
-  const githubAgentsDir = path24.join(subagentDir, ".github", "agents");
-  await mkdir8(githubAgentsDir, { recursive: true });
-  const wakeupDst = path24.join(githubAgentsDir, "wakeup.md");
+  const githubAgentsDir = path25.join(subagentDir, ".github", "agents");
+  await mkdir9(githubAgentsDir, { recursive: true });
+  const wakeupDst = path25.join(githubAgentsDir, "wakeup.md");
   await writeFile2(wakeupDst, DEFAULT_WAKEUP_CONTENT, "utf8");
   const workspaceChild = spawnVsCode(vscodeCmd, [workspacePath], {
     label: "open-workspace"
@@ -22089,7 +22458,7 @@ async function ensureWorkspaceFocused(workspacePath, workspaceName, subagentDir,
     "chat",
     "-m",
     wakeupChatId,
-    `create a file named .alive in the ${path24.basename(subagentDir)} folder`
+    `create a file named .alive in the ${path25.basename(subagentDir)} folder`
   ];
   const wakeupChild = spawnVsCode(vscodeCmd, chatArgs, { label: "send-wakeup-chat" });
   await raceSpawnError(wakeupChild);
@@ -22104,10 +22473,10 @@ async function ensureWorkspaceFocused(workspacePath, workspaceName, subagentDir,
   return true;
 }
 async function launchVsCodeWithChat(subagentDir, chatId, attachmentPaths, requestInstructions, timestamp, vscodeCmd) {
-  const workspacePath = path24.join(subagentDir, `${path24.basename(subagentDir)}.code-workspace`);
-  const messagesDir = path24.join(subagentDir, "messages");
-  await mkdir8(messagesDir, { recursive: true });
-  const reqFile = path24.join(messagesDir, `${timestamp}_req.md`);
+  const workspacePath = path25.join(subagentDir, `${path25.basename(subagentDir)}.code-workspace`);
+  const messagesDir = path25.join(subagentDir, "messages");
+  await mkdir9(messagesDir, { recursive: true });
+  const reqFile = path25.join(messagesDir, `${timestamp}_req.md`);
   await writeFile2(reqFile, requestInstructions, { encoding: "utf8" });
   const reqUri = pathToFileUri2(reqFile);
   const chatArgs = ["-r", "chat", "-m", chatId];
@@ -22115,16 +22484,16 @@ async function launchVsCodeWithChat(subagentDir, chatId, attachmentPaths, reques
     chatArgs.push("-a", attachment);
   }
   chatArgs.push("-a", reqFile);
-  chatArgs.push(`Follow instructions in [${path24.basename(reqFile)}](${reqUri})`);
+  chatArgs.push(`Follow instructions in [${path25.basename(reqFile)}](${reqUri})`);
   const workspaceReady = await ensureWorkspaceFocused(
     workspacePath,
-    path24.basename(subagentDir),
+    path25.basename(subagentDir),
     subagentDir,
     vscodeCmd
   );
   if (!workspaceReady) {
     throw new Error(
-      `VS Code workspace '${path24.basename(subagentDir)}' failed to become ready within the timeout. Check that '${vscodeCmd}' can open workspaces.`
+      `VS Code workspace '${path25.basename(subagentDir)}' failed to become ready within the timeout. Check that '${vscodeCmd}' can open workspaces.`
     );
   }
   await sleep2(500);
@@ -22132,9 +22501,9 @@ async function launchVsCodeWithChat(subagentDir, chatId, attachmentPaths, reques
   await raceSpawnError(child);
 }
 async function launchVsCodeWithBatchChat(subagentDir, chatId, attachmentPaths, chatInstruction, vscodeCmd) {
-  const workspacePath = path24.join(subagentDir, `${path24.basename(subagentDir)}.code-workspace`);
-  const messagesDir = path24.join(subagentDir, "messages");
-  await mkdir8(messagesDir, { recursive: true });
+  const workspacePath = path25.join(subagentDir, `${path25.basename(subagentDir)}.code-workspace`);
+  const messagesDir = path25.join(subagentDir, "messages");
+  await mkdir9(messagesDir, { recursive: true });
   const chatArgs = ["-r", "chat", "-m", chatId];
   for (const attachment of attachmentPaths) {
     chatArgs.push("-a", attachment);
@@ -22142,13 +22511,13 @@ async function launchVsCodeWithBatchChat(subagentDir, chatId, attachmentPaths, c
   chatArgs.push(chatInstruction);
   const workspaceReady = await ensureWorkspaceFocused(
     workspacePath,
-    path24.basename(subagentDir),
+    path25.basename(subagentDir),
     subagentDir,
     vscodeCmd
   );
   if (!workspaceReady) {
     throw new Error(
-      `VS Code workspace '${path24.basename(subagentDir)}' failed to become ready within the timeout. Check that '${vscodeCmd}' can open workspaces.`
+      `VS Code workspace '${path25.basename(subagentDir)}' failed to become ready within the timeout. Check that '${vscodeCmd}' can open workspaces.`
     );
   }
   await sleep2(500);
@@ -22170,10 +22539,10 @@ function transformWorkspacePaths(workspaceContent, templateDir) {
   }
   const transformedFolders = workspace.folders.map((folder) => {
     const folderPath = folder.path;
-    if (path25.isAbsolute(folderPath)) {
+    if (path26.isAbsolute(folderPath)) {
       return folder;
     }
-    const absolutePath = path25.resolve(templateDir, folderPath);
+    const absolutePath = path26.resolve(templateDir, folderPath);
     return {
       ...folder,
       path: absolutePath
@@ -22195,19 +22564,19 @@ function transformWorkspacePaths(workspaceContent, templateDir) {
       if (locationMap && typeof locationMap === "object") {
         const transformedMap = {};
         for (const [locationPath, value] of Object.entries(locationMap)) {
-          const isAbsolute = path25.isAbsolute(locationPath);
+          const isAbsolute = path26.isAbsolute(locationPath);
           if (isAbsolute) {
             transformedMap[locationPath] = value;
           } else {
             const firstGlobIndex = locationPath.search(/[*]/);
             if (firstGlobIndex === -1) {
-              const resolvedPath = path25.resolve(templateDir, locationPath).replace(/\\/g, "/");
+              const resolvedPath = path26.resolve(templateDir, locationPath).replace(/\\/g, "/");
               transformedMap[resolvedPath] = value;
             } else {
               const basePathEnd = locationPath.lastIndexOf("/", firstGlobIndex);
               const basePath = basePathEnd !== -1 ? locationPath.substring(0, basePathEnd) : ".";
               const patternPath = locationPath.substring(basePathEnd !== -1 ? basePathEnd : 0);
-              const resolvedPath = (path25.resolve(templateDir, basePath) + patternPath).replace(
+              const resolvedPath = (path26.resolve(templateDir, basePath) + patternPath).replace(
                 /\\/g,
                 "/"
               );
@@ -22246,7 +22615,7 @@ async function findUnlockedSubagent(subagentRoot) {
     number: Number.parseInt(entry.name.split("-")[1] ?? "", 10)
   })).filter((entry) => Number.isInteger(entry.number)).sort((a, b) => a.number - b.number);
   for (const subagent of subagents) {
-    const lockFile = path26.join(subagent.absolutePath, DEFAULT_LOCK_NAME);
+    const lockFile = path27.join(subagent.absolutePath, DEFAULT_LOCK_NAME);
     if (!await pathExists(lockFile)) {
       return subagent.absolutePath;
     }
@@ -22256,7 +22625,7 @@ async function findUnlockedSubagent(subagentRoot) {
 async function copyAgentConfig(subagentDir, workspaceTemplate, cwd) {
   let workspaceContent;
   if (workspaceTemplate) {
-    const workspaceSrc = path26.resolve(workspaceTemplate);
+    const workspaceSrc = path27.resolve(workspaceTemplate);
     if (!await pathExists(workspaceSrc)) {
       throw new Error(`workspace template not found: ${workspaceSrc}`);
     }
@@ -22269,13 +22638,13 @@ async function copyAgentConfig(subagentDir, workspaceTemplate, cwd) {
   } else {
     workspaceContent = DEFAULT_WORKSPACE_TEMPLATE;
   }
-  const workspaceName = `${path26.basename(subagentDir)}.code-workspace`;
-  const workspaceDst = path26.join(subagentDir, workspaceName);
-  const templateDir = workspaceTemplate ? path26.dirname(path26.resolve(workspaceTemplate)) : subagentDir;
+  const workspaceName = `${path27.basename(subagentDir)}.code-workspace`;
+  const workspaceDst = path27.join(subagentDir, workspaceName);
+  const templateDir = workspaceTemplate ? path27.dirname(path27.resolve(workspaceTemplate)) : subagentDir;
   const workspaceJson = JSON.stringify(workspaceContent, null, 2);
   let transformedContent = transformWorkspacePaths(workspaceJson, templateDir);
   if (cwd) {
-    const absCwd = path26.resolve(cwd);
+    const absCwd = path27.resolve(cwd);
     const parsed = JSON.parse(transformedContent);
     const alreadyPresent = parsed.folders.some((f) => f.path === absCwd);
     if (!alreadyPresent) {
@@ -22284,35 +22653,35 @@ async function copyAgentConfig(subagentDir, workspaceTemplate, cwd) {
     }
   }
   await writeFile3(workspaceDst, transformedContent, "utf8");
-  const messagesDir = path26.join(subagentDir, "messages");
-  await mkdir9(messagesDir, { recursive: true });
+  const messagesDir = path27.join(subagentDir, "messages");
+  await mkdir10(messagesDir, { recursive: true });
   return { workspace: workspaceDst, messagesDir };
 }
 async function createSubagentLock(subagentDir) {
-  const messagesDir = path26.join(subagentDir, "messages");
+  const messagesDir = path27.join(subagentDir, "messages");
   if (await pathExists(messagesDir)) {
     const files = await readdir2(messagesDir);
     await Promise.all(
       files.map(async (file) => {
-        const target = path26.join(messagesDir, file);
+        const target = path27.join(messagesDir, file);
         await removeIfExists(target);
       })
     );
   }
-  const githubAgentsDir = path26.join(subagentDir, ".github", "agents");
+  const githubAgentsDir = path27.join(subagentDir, ".github", "agents");
   if (await pathExists(githubAgentsDir)) {
     const agentFiles = await readdir2(githubAgentsDir);
     const preservedFiles = /* @__PURE__ */ new Set(["wakeup.md", "subagent.md"]);
     await Promise.all(
-      agentFiles.filter((file) => file.endsWith(".md") && !preservedFiles.has(file)).map((file) => removeIfExists(path26.join(githubAgentsDir, file)))
+      agentFiles.filter((file) => file.endsWith(".md") && !preservedFiles.has(file)).map((file) => removeIfExists(path27.join(githubAgentsDir, file)))
     );
   }
-  const lockFile = path26.join(subagentDir, DEFAULT_LOCK_NAME);
+  const lockFile = path27.join(subagentDir, DEFAULT_LOCK_NAME);
   await writeFile3(lockFile, "", { encoding: "utf8" });
   return lockFile;
 }
 async function removeSubagentLock(subagentDir) {
-  const lockFile = path26.join(subagentDir, DEFAULT_LOCK_NAME);
+  const lockFile = path27.join(subagentDir, DEFAULT_LOCK_NAME);
   await removeIfExists(lockFile);
 }
 async function prepareSubagentDirectory(subagentDir, promptFile, chatId, workspaceTemplate, dryRun, cwd) {
@@ -22332,9 +22701,9 @@ async function prepareSubagentDirectory(subagentDir, promptFile, chatId, workspa
     return 1;
   }
   if (promptFile) {
-    const githubAgentsDir = path26.join(subagentDir, ".github", "agents");
-    await mkdir9(githubAgentsDir, { recursive: true });
-    const agentFile = path26.join(githubAgentsDir, `${chatId}.md`);
+    const githubAgentsDir = path27.join(subagentDir, ".github", "agents");
+    await mkdir10(githubAgentsDir, { recursive: true });
+    const agentFile = path27.join(githubAgentsDir, `${chatId}.md`);
     try {
       await copyFile(promptFile, agentFile);
     } catch (error) {
@@ -22351,7 +22720,7 @@ async function resolvePromptFile(promptFile) {
   if (!promptFile) {
     return void 0;
   }
-  const resolvedPrompt = path27.resolve(promptFile);
+  const resolvedPrompt = path28.resolve(promptFile);
   if (!await pathExists(resolvedPrompt)) {
     throw new Error(`Prompt file not found: ${resolvedPrompt}`);
   }
@@ -22367,7 +22736,7 @@ async function resolveAttachments(extraAttachments) {
   }
   const resolved = [];
   for (const attachment of extraAttachments) {
-    const resolvedPath = path27.resolve(attachment);
+    const resolvedPath = path28.resolve(attachment);
     if (!await pathExists(resolvedPath)) {
       throw new Error(`Attachment not found: ${resolvedPath}`);
     }
@@ -22409,7 +22778,7 @@ async function dispatchAgentSession(options) {
         error: "No unlocked subagents available. Provision additional subagents with: subagent code provision --subagents <desired_total>"
       };
     }
-    const subagentName = path27.basename(subagentDir);
+    const subagentName = path28.basename(subagentDir);
     const chatId = Math.random().toString(16).slice(2, 10);
     const preparationResult = await prepareSubagentDirectory(
       subagentDir,
@@ -22437,9 +22806,9 @@ async function dispatchAgentSession(options) {
       };
     }
     const timestamp = generateTimestamp();
-    const messagesDir = path27.join(subagentDir, "messages");
-    const responseFileTmp = path27.join(messagesDir, `${timestamp}_res.tmp.md`);
-    const responseFileFinal = path27.join(messagesDir, `${timestamp}_res.md`);
+    const messagesDir = path28.join(subagentDir, "messages");
+    const responseFileTmp = path28.join(messagesDir, `${timestamp}_res.tmp.md`);
+    const responseFileFinal = path28.join(messagesDir, `${timestamp}_res.md`);
     const requestInstructions = createRequestPrompt(
       userQuery,
       responseFileTmp,
@@ -22544,7 +22913,7 @@ async function dispatchBatchAgent(options) {
         error: "No unlocked subagents available. Provision additional subagents with: subagent code provision --subagents <desired_total>"
       };
     }
-    subagentName = path27.basename(subagentDir);
+    subagentName = path28.basename(subagentDir);
     const chatId = Math.random().toString(16).slice(2, 10);
     const preparationResult = await prepareSubagentDirectory(
       subagentDir,
@@ -22575,17 +22944,17 @@ async function dispatchBatchAgent(options) {
       };
     }
     const timestamp = generateTimestamp();
-    const messagesDir = path27.join(subagentDir, "messages");
+    const messagesDir = path28.join(subagentDir, "messages");
     requestFiles = userQueries.map(
-      (_, index) => path27.join(messagesDir, `${timestamp}_${index}_req.md`)
+      (_, index) => path28.join(messagesDir, `${timestamp}_${index}_req.md`)
     );
     const responseTmpFiles = userQueries.map(
-      (_, index) => path27.join(messagesDir, `${timestamp}_${index}_res.tmp.md`)
+      (_, index) => path28.join(messagesDir, `${timestamp}_${index}_res.tmp.md`)
     );
     responseFilesFinal = userQueries.map(
-      (_, index) => path27.join(messagesDir, `${timestamp}_${index}_res.md`)
+      (_, index) => path28.join(messagesDir, `${timestamp}_${index}_res.md`)
     );
-    const orchestratorFile = path27.join(messagesDir, `${timestamp}_orchestrator.md`);
+    const orchestratorFile = path28.join(messagesDir, `${timestamp}_orchestrator.md`);
     if (!dryRun) {
       await Promise.all(
         userQueries.map((query, index) => {
@@ -22698,7 +23067,7 @@ async function provisionSubagents(options) {
   if (!Number.isInteger(subagents) || subagents < 1) {
     throw new Error("subagents must be a positive integer");
   }
-  const targetPath = path28.resolve(targetRoot);
+  const targetPath = path29.resolve(targetRoot);
   if (!dryRun) {
     await ensureDir(targetPath);
   }
@@ -22718,7 +23087,7 @@ async function provisionSubagents(options) {
         continue;
       }
       highestNumber = Math.max(highestNumber, parsed);
-      const lockFile = path28.join(entry.absolutePath, lockName);
+      const lockFile = path29.join(entry.absolutePath, lockName);
       const locked = await pathExists(lockFile);
       if (locked) {
         lockedSubagents.add(entry.absolutePath);
@@ -22735,10 +23104,10 @@ async function provisionSubagents(options) {
       break;
     }
     const subagentDir = subagent.absolutePath;
-    const githubAgentsDir = path28.join(subagentDir, ".github", "agents");
-    const lockFile = path28.join(subagentDir, lockName);
-    const workspaceDst = path28.join(subagentDir, `${path28.basename(subagentDir)}.code-workspace`);
-    const wakeupDst = path28.join(githubAgentsDir, "wakeup.md");
+    const githubAgentsDir = path29.join(subagentDir, ".github", "agents");
+    const lockFile = path29.join(subagentDir, lockName);
+    const workspaceDst = path29.join(subagentDir, `${path29.basename(subagentDir)}.code-workspace`);
+    const wakeupDst = path29.join(githubAgentsDir, "wakeup.md");
     const isLocked = await pathExists(lockFile);
     if (isLocked && !force) {
       continue;
@@ -22776,10 +23145,10 @@ async function provisionSubagents(options) {
   let nextIndex = highestNumber;
   while (subagentsProvisioned < subagents) {
     nextIndex += 1;
-    const subagentDir = path28.join(targetPath, `subagent-${nextIndex}`);
-    const githubAgentsDir = path28.join(subagentDir, ".github", "agents");
-    const workspaceDst = path28.join(subagentDir, `${path28.basename(subagentDir)}.code-workspace`);
-    const wakeupDst = path28.join(githubAgentsDir, "wakeup.md");
+    const subagentDir = path29.join(targetPath, `subagent-${nextIndex}`);
+    const githubAgentsDir = path29.join(subagentDir, ".github", "agents");
+    const workspaceDst = path29.join(subagentDir, `${path29.basename(subagentDir)}.code-workspace`);
+    const wakeupDst = path29.join(githubAgentsDir, "wakeup.md");
     if (!dryRun) {
       await ensureDir(subagentDir);
       await ensureDir(githubAgentsDir);
@@ -22965,7 +23334,7 @@ var VSCodeProvider = class {
 async function locateVSCodeExecutable(candidate) {
   const includesPathSeparator = candidate.includes("/") || candidate.includes("\\");
   if (includesPathSeparator) {
-    const resolved = path29.isAbsolute(candidate) ? candidate : path29.resolve(candidate);
+    const resolved = path30.isAbsolute(candidate) ? candidate : path30.resolve(candidate);
     try {
       await access3(resolved, constants3.F_OK);
       return resolved;
@@ -22994,7 +23363,7 @@ async function resolveWorkspaceTemplateFile(template) {
     return void 0;
   }
   try {
-    const stats = await stat4(path29.resolve(template));
+    const stats = await stat4(path30.resolve(template));
     return stats.isFile() ? template : void 0;
   } catch {
     return template;
@@ -23018,7 +23387,7 @@ function buildMandatoryPrereadBlock2(attachmentFiles) {
     return "";
   }
   const buildList = (files) => files.map((absolutePath) => {
-    const fileName = path29.basename(absolutePath);
+    const fileName = path30.basename(absolutePath);
     const fileUri = pathToFileUri3(absolutePath);
     return `* [${fileName}](${fileUri})`;
   });
@@ -23039,7 +23408,7 @@ function collectAttachmentFiles(attachments) {
   }
   const unique = /* @__PURE__ */ new Map();
   for (const attachment of attachments) {
-    const absolutePath = path29.resolve(attachment);
+    const absolutePath = path30.resolve(attachment);
     if (!unique.has(absolutePath)) {
       unique.set(absolutePath, absolutePath);
     }
@@ -23047,7 +23416,7 @@ function collectAttachmentFiles(attachments) {
   return Array.from(unique.values());
 }
 function pathToFileUri3(filePath) {
-  const absolutePath = path29.isAbsolute(filePath) ? filePath : path29.resolve(filePath);
+  const absolutePath = path30.isAbsolute(filePath) ? filePath : path30.resolve(filePath);
   const normalizedPath = absolutePath.replace(/\\/g, "/");
   if (/^[a-zA-Z]:\//.test(normalizedPath)) {
     return `file:///${normalizedPath}`;
@@ -23060,7 +23429,7 @@ function normalizeAttachments(attachments) {
   }
   const deduped = /* @__PURE__ */ new Set();
   for (const attachment of attachments) {
-    deduped.add(path29.resolve(attachment));
+    deduped.add(path30.resolve(attachment));
   }
   return Array.from(deduped);
 }
@@ -23069,7 +23438,7 @@ function mergeAttachments(all) {
   for (const list of all) {
     if (!list) continue;
     for (const inputFile of list) {
-      deduped.add(path29.resolve(inputFile));
+      deduped.add(path30.resolve(inputFile));
     }
   }
   return deduped.size > 0 ? Array.from(deduped) : void 0;
@@ -23149,7 +23518,7 @@ async function fileExists3(filePath) {
   }
 }
 async function readTargetDefinitions(filePath) {
-  const absolutePath = path30.resolve(filePath);
+  const absolutePath = path31.resolve(filePath);
   if (!await fileExists3(absolutePath)) {
     throw new Error(`targets.yaml not found at ${absolutePath}`);
   }
@@ -23170,11 +23539,11 @@ function listTargetNames(definitions) {
 async function discoverProviders(registry, baseDir) {
   const patterns = ["*.ts", "*.js", "*.mts", "*.mjs"];
   const candidateDirs = [];
-  let dir = path31.resolve(baseDir);
-  const root = path31.parse(dir).root;
+  let dir = path322.resolve(baseDir);
+  const root = path322.parse(dir).root;
   while (dir !== root) {
-    candidateDirs.push(path31.join(dir, ".agentv", "providers"));
-    dir = path31.dirname(dir);
+    candidateDirs.push(path322.join(dir, ".agentv", "providers"));
+    dir = path322.dirname(dir);
   }
   let files = [];
   for (const providersDir of candidateDirs) {
@@ -23190,7 +23559,7 @@ async function discoverProviders(registry, baseDir) {
   }
   const discoveredKinds = [];
   for (const filePath of files) {
-    const basename = path31.basename(filePath);
+    const basename = path322.basename(filePath);
     const kindName = basename.replace(/\.(ts|js|mts|mjs)$/, "");
     if (registry.has(kindName)) {
       continue;
@@ -23206,7 +23575,7 @@ async function discoverProviders(registry, baseDir) {
 }
 function createBuiltinProviderRegistry() {
   const registry = new ProviderRegistry();
-  registry.register("openai", (t) => new OpenAIProvider(t.name, t.config)).register("openrouter", (t) => new OpenRouterProvider(t.name, t.config)).register("azure", (t) => new AzureProvider(t.name, t.config)).register("anthropic", (t) => new AnthropicProvider(t.name, t.config)).register("gemini", (t) => new GeminiProvider(t.name, t.config)).register("cli", (t) => new CliProvider(t.name, t.config)).register("codex", (t) => new CodexProvider(t.name, t.config)).register("copilot-sdk", (t) => new CopilotSdkProvider(t.name, t.config)).register("copilot-cli", (t) => new CopilotCliProvider(t.name, t.config)).register("pi-coding-agent", (t) => new PiCodingAgentProvider(t.name, t.config)).register("pi-agent-sdk", (t) => new PiAgentSdkProvider(t.name, t.config)).register("claude-cli", (t) => new ClaudeCliProvider(t.name, t.config)).register("claude", (t) => new ClaudeCliProvider(t.name, t.config)).register("claude-sdk", (t) => new ClaudeSdkProvider(t.name, t.config)).register("mock", (t) => new MockProvider(t.name, t.config)).register("agentv", (t) => new AgentvProvider(t.name, t.config)).register("vscode", (t) => new VSCodeProvider(t.name, t.config, "vscode")).register(
+  registry.register("openai", (t) => new OpenAIProvider(t.name, t.config)).register("openrouter", (t) => new OpenRouterProvider(t.name, t.config)).register("azure", (t) => new AzureProvider(t.name, t.config)).register("anthropic", (t) => new AnthropicProvider(t.name, t.config)).register("gemini", (t) => new GeminiProvider(t.name, t.config)).register("cli", (t) => new CliProvider(t.name, t.config)).register("codex", (t) => new CodexProvider(t.name, t.config)).register("copilot-sdk", (t) => new CopilotSdkProvider(t.name, t.config)).register("copilot-cli", (t) => new CopilotCliProvider(t.name, t.config)).register("pi-coding-agent", (t) => new PiCodingAgentProvider(t.name, t.config)).register("pi-cli", (t) => new PiCliProvider(t.name, t.config)).register("claude-cli", (t) => new ClaudeCliProvider(t.name, t.config)).register("claude", (t) => new ClaudeCliProvider(t.name, t.config)).register("claude-sdk", (t) => new ClaudeSdkProvider(t.name, t.config)).register("mock", (t) => new MockProvider(t.name, t.config)).register("agentv", (t) => new AgentvProvider(t.name, t.config)).register("vscode", (t) => new VSCodeProvider(t.name, t.config, "vscode")).register(
     "vscode-insiders",
     (t) => new VSCodeProvider(t.name, t.config, "vscode-insiders")
   );
@@ -23388,15 +23757,15 @@ async function execFileWithStdinNode(argv, stdinPayload, options) {
   });
 }
 async function execShellWithStdin(command, stdinPayload, options = {}) {
-  const { mkdir: mkdir15, readFile: readFile12, rm: rm6, writeFile: writeFile9 } = await import("node:fs/promises");
+  const { mkdir: mkdir16, readFile: readFile12, rm: rm6, writeFile: writeFile9 } = await import("node:fs/promises");
   const { tmpdir: tmpdir3 } = await import("node:os");
-  const path44 = await import("node:path");
-  const { randomUUID: randomUUID9 } = await import("node:crypto");
-  const dir = path44.join(tmpdir3(), `agentv-exec-${randomUUID9()}`);
-  await mkdir15(dir, { recursive: true });
-  const stdinPath = path44.join(dir, "stdin.txt");
-  const stdoutPath = path44.join(dir, "stdout.txt");
-  const stderrPath = path44.join(dir, "stderr.txt");
+  const path45 = await import("node:path");
+  const { randomUUID: randomUUID10 } = await import("node:crypto");
+  const dir = path45.join(tmpdir3(), `agentv-exec-${randomUUID10()}`);
+  await mkdir16(dir, { recursive: true });
+  const stdinPath = path45.join(dir, "stdin.txt");
+  const stdoutPath = path45.join(dir, "stdout.txt");
+  const stderrPath = path45.join(dir, "stderr.txt");
   await writeFile9(stdinPath, stdinPayload, "utf8");
   const wrappedCommand = process.platform === "win32" ? `(${command}) < ${shellEscapePath(stdinPath)} > ${shellEscapePath(stdoutPath)} 2> ${shellEscapePath(stderrPath)}` : `(${command}) < ${shellEscapePath(stdinPath)} > ${shellEscapePath(stdoutPath)} 2> ${shellEscapePath(stderrPath)}`;
   const { spawn: spawn5 } = await import("node:child_process");
@@ -23921,7 +24290,8 @@ var freeformEvaluationSchema = external_exports2.object({
       passed: external_exports2.boolean().describe("Whether this aspect was satisfied"),
       evidence: external_exports2.string().describe("Concise evidence (1-2 sentences)").optional()
     })
-  ).describe("Per-aspect evaluation results \u2014 one entry per aspect checked").optional()
+  ).describe("Per-aspect evaluation results \u2014 one entry per aspect checked").optional(),
+  details: external_exports2.record(external_exports2.unknown()).describe("Optional structured metadata for domain-specific metrics").optional()
 });
 var rubricCheckResultSchema = external_exports2.object({
   id: external_exports2.string().describe("The ID of the rubric item being checked"),
@@ -23983,7 +24353,7 @@ var LlmGraderEvaluator = class {
   async evaluateFreeform(context2, graderProvider) {
     const formattedQuestion = context2.promptInputs.question && context2.promptInputs.question.trim().length > 0 ? context2.promptInputs.question : context2.evalCase.question;
     const variables = {
-      [TEMPLATE_VARIABLES.INPUT]: JSON.stringify(context2.evalCase.input_segments, null, 2),
+      [TEMPLATE_VARIABLES.INPUT]: JSON.stringify(context2.evalCase.input, null, 2),
       [TEMPLATE_VARIABLES.EXPECTED_OUTPUT]: JSON.stringify(
         context2.evalCase.expected_output,
         null,
@@ -24026,6 +24396,7 @@ ${context2.fileChanges}`;
         expectedAspectCount: Math.max(assertions.length, 1),
         evaluatorRawRequest,
         graderTarget: graderProvider.targetName,
+        details: data.details,
         tokenUsage
       };
     } catch (e) {
@@ -24445,7 +24816,7 @@ ${outputSchema2}`;
         expectedAspectCount: Math.max(assertions.length, 1),
         evaluatorRawRequest,
         graderTarget,
-        details
+        details: data.details && Object.keys(data.details).length > 0 ? { ...details, ...data.details } : details
       };
     } catch {
       return {
@@ -24592,7 +24963,8 @@ function buildOutputSchema() {
     '      "passed": <boolean>,',
     '      "evidence": "<concise evidence, 1-2 sentences, optional>"',
     "    }",
-    "  ]",
+    "  ],",
+    '  "details": {<optional object with domain-specific structured metrics>}',
     "}"
   ].join("\n");
 }
@@ -24710,8 +25082,8 @@ function calculateScoreRangeResult(result, rubrics) {
   };
 }
 function resolveSandboxed(basePath, relativePath) {
-  const resolved = path322.resolve(basePath, relativePath);
-  if (!resolved.startsWith(basePath + path322.sep) && resolved !== basePath) {
+  const resolved = path33.resolve(basePath, relativePath);
+  if (!resolved.startsWith(basePath + path33.sep) && resolved !== basePath) {
     throw new Error(`Path '${relativePath}' is outside the workspace`);
   }
   return resolved;
@@ -24801,11 +25173,11 @@ async function searchDirectory(dirPath, workspacePath, regex, matches) {
   for (const entry of entries) {
     if (matches.length >= MAX_SEARCH_MATCHES) return;
     if (SEARCH_SKIP_DIRS.has(entry.name)) continue;
-    const fullPath = path322.join(dirPath, entry.name);
+    const fullPath = path33.join(dirPath, entry.name);
     if (entry.isDirectory()) {
       await searchDirectory(fullPath, workspacePath, regex, matches);
     } else if (entry.isFile()) {
-      const ext = path322.extname(entry.name).toLowerCase();
+      const ext = path33.extname(entry.name).toLowerCase();
       if (BINARY_EXTENSIONS.has(ext)) continue;
       try {
         const stat8 = await fs2.stat(fullPath);
@@ -24817,7 +25189,7 @@ async function searchDirectory(dirPath, workspacePath, regex, matches) {
           regex.lastIndex = 0;
           if (regex.test(lines[i])) {
             matches.push({
-              file: path322.relative(workspacePath, fullPath),
+              file: path33.relative(workspacePath, fullPath),
               line: i + 1,
               text: lines[i].substring(0, 200)
             });
@@ -25444,115 +25816,115 @@ var FieldAccuracyEvaluator = class {
    * Evaluate a single field against the expected value.
    */
   evaluateField(fieldConfig, candidateData, expectedData) {
-    const { path: path44, match, required = true, weight = 1 } = fieldConfig;
-    const candidateValue = resolvePath(candidateData, path44);
-    const expectedValue = resolvePath(expectedData, path44);
+    const { path: path45, match, required = true, weight = 1 } = fieldConfig;
+    const candidateValue = resolvePath(candidateData, path45);
+    const expectedValue = resolvePath(expectedData, path45);
     if (expectedValue === void 0) {
       return {
-        path: path44,
+        path: path45,
         score: 1,
         // No expected value means no comparison needed
         weight,
         hit: true,
-        message: `${path44}: no expected value`
+        message: `${path45}: no expected value`
       };
     }
     if (candidateValue === void 0) {
       if (required) {
         return {
-          path: path44,
+          path: path45,
           score: 0,
           weight,
           hit: false,
-          message: `${path44} (required, missing)`
+          message: `${path45} (required, missing)`
         };
       }
       return {
-        path: path44,
+        path: path45,
         score: 1,
         // Don't penalize missing optional fields
         weight: 0,
         // Zero weight means it won't affect the score
         hit: true,
-        message: `${path44}: optional field missing`
+        message: `${path45}: optional field missing`
       };
     }
     switch (match) {
       case "exact":
-        return this.compareExact(path44, candidateValue, expectedValue, weight);
+        return this.compareExact(path45, candidateValue, expectedValue, weight);
       case "numeric_tolerance":
         return this.compareNumericTolerance(
-          path44,
+          path45,
           candidateValue,
           expectedValue,
           fieldConfig,
           weight
         );
       case "date":
-        return this.compareDate(path44, candidateValue, expectedValue, fieldConfig, weight);
+        return this.compareDate(path45, candidateValue, expectedValue, fieldConfig, weight);
       default:
         return {
-          path: path44,
+          path: path45,
           score: 0,
           weight,
           hit: false,
-          message: `${path44}: unknown match type "${match}"`
+          message: `${path45}: unknown match type "${match}"`
         };
     }
   }
   /**
    * Exact equality comparison.
    */
-  compareExact(path44, candidateValue, expectedValue, weight) {
+  compareExact(path45, candidateValue, expectedValue, weight) {
     if (deepEqual(candidateValue, expectedValue)) {
       return {
-        path: path44,
+        path: path45,
         score: 1,
         weight,
         hit: true,
-        message: path44
+        message: path45
       };
     }
     if (typeof candidateValue !== typeof expectedValue) {
       return {
-        path: path44,
+        path: path45,
         score: 0,
         weight,
         hit: false,
-        message: `${path44} (type mismatch: got ${typeof candidateValue}, expected ${typeof expectedValue})`
+        message: `${path45} (type mismatch: got ${typeof candidateValue}, expected ${typeof expectedValue})`
       };
     }
     return {
-      path: path44,
+      path: path45,
       score: 0,
       weight,
       hit: false,
-      message: `${path44} (value mismatch)`
+      message: `${path45} (value mismatch)`
     };
   }
   /**
    * Numeric comparison with absolute or relative tolerance.
    */
-  compareNumericTolerance(path44, candidateValue, expectedValue, fieldConfig, weight) {
+  compareNumericTolerance(path45, candidateValue, expectedValue, fieldConfig, weight) {
     const { tolerance = 0, relative = false } = fieldConfig;
     const candidateNum = toNumber(candidateValue);
     const expectedNum = toNumber(expectedValue);
     if (candidateNum === null || expectedNum === null) {
       return {
-        path: path44,
+        path: path45,
         score: 0,
         weight,
         hit: false,
-        message: `${path44} (non-numeric value)`
+        message: `${path45} (non-numeric value)`
       };
     }
     if (!Number.isFinite(candidateNum) || !Number.isFinite(expectedNum)) {
       return {
-        path: path44,
+        path: path45,
         score: 0,
         weight,
         hit: false,
-        message: `${path44} (invalid numeric value)`
+        message: `${path45} (invalid numeric value)`
       };
     }
     const diff = Math.abs(candidateNum - expectedNum);
@@ -25565,61 +25937,61 @@ var FieldAccuracyEvaluator = class {
     }
     if (withinTolerance) {
       return {
-        path: path44,
+        path: path45,
         score: 1,
         weight,
         hit: true,
-        message: `${path44} (within tolerance: diff=${diff.toFixed(2)})`
+        message: `${path45} (within tolerance: diff=${diff.toFixed(2)})`
       };
     }
     return {
-      path: path44,
+      path: path45,
       score: 0,
       weight,
       hit: false,
-      message: `${path44} (outside tolerance: diff=${diff.toFixed(2)}, tolerance=${tolerance})`
+      message: `${path45} (outside tolerance: diff=${diff.toFixed(2)}, tolerance=${tolerance})`
     };
   }
   /**
    * Date comparison with format normalization.
    */
-  compareDate(path44, candidateValue, expectedValue, fieldConfig, weight) {
+  compareDate(path45, candidateValue, expectedValue, fieldConfig, weight) {
     const formats = fieldConfig.formats ?? DEFAULT_DATE_FORMATS;
     const candidateDate = parseDate(String(candidateValue), formats);
     const expectedDate = parseDate(String(expectedValue), formats);
     if (candidateDate === null) {
       return {
-        path: path44,
+        path: path45,
         score: 0,
         weight,
         hit: false,
-        message: `${path44} (unparseable candidate date)`
+        message: `${path45} (unparseable candidate date)`
       };
     }
     if (expectedDate === null) {
       return {
-        path: path44,
+        path: path45,
         score: 0,
         weight,
         hit: false,
-        message: `${path44} (unparseable expected date)`
+        message: `${path45} (unparseable expected date)`
       };
     }
     if (candidateDate.getFullYear() === expectedDate.getFullYear() && candidateDate.getMonth() === expectedDate.getMonth() && candidateDate.getDate() === expectedDate.getDate()) {
       return {
-        path: path44,
+        path: path45,
         score: 1,
         weight,
         hit: true,
-        message: path44
+        message: path45
       };
     }
     return {
-      path: path44,
+      path: path45,
       score: 0,
       weight,
       hit: false,
-      message: `${path44} (date mismatch: got ${formatDateISO(candidateDate)}, expected ${formatDateISO(expectedDate)})`
+      message: `${path45} (date mismatch: got ${formatDateISO(candidateDate)}, expected ${formatDateISO(expectedDate)})`
     };
   }
   /**
@@ -25652,11 +26024,11 @@ var FieldAccuracyEvaluator = class {
     };
   }
 };
-function resolvePath(obj, path44) {
-  if (!path44 || !obj) {
+function resolvePath(obj, path45) {
+  if (!path45 || !obj) {
     return void 0;
   }
-  const parts = path44.split(/\.|\[|\]/).filter((p) => p.length > 0);
+  const parts = path45.split(/\.|\[|\]/).filter((p) => p.length > 0);
   let current = obj;
   for (const part of parts) {
     if (current === null || current === void 0) {
@@ -25818,9 +26190,7 @@ var PROVIDER_TOOL_SEMANTICS = {
   "claude-sdk": CLAUDE_MATCHER,
   codex: CODEX_MATCHER,
   "pi-coding-agent": PI_CODING_AGENT_MATCHER,
-  // pi-agent-sdk has no tools, so skill detection is a no-op. Kept for completeness.
-  // TODO: consider removing pi-agent-sdk provider entirely.
-  "pi-agent-sdk": PI_CODING_AGENT_MATCHER,
+  "pi-cli": PI_CODING_AGENT_MATCHER,
   "copilot-cli": COPILOT_MATCHER,
   "copilot-sdk": COPILOT_MATCHER,
   vscode: COPILOT_MATCHER,
@@ -25942,7 +26312,7 @@ function assembleLlmGraderPrompt(input) {
 function assembleFreeform(evalCase, candidate, promptInputs, fileChanges, evaluatorTemplateOverride) {
   const formattedQuestion = promptInputs.question && promptInputs.question.trim().length > 0 ? promptInputs.question : evalCase.question;
   const variables = {
-    [TEMPLATE_VARIABLES.INPUT]: JSON.stringify(evalCase.input_segments, null, 2),
+    [TEMPLATE_VARIABLES.INPUT]: JSON.stringify(evalCase.input, null, 2),
     [TEMPLATE_VARIABLES.EXPECTED_OUTPUT]: JSON.stringify(evalCase.expected_output, null, 2),
     [TEMPLATE_VARIABLES.OUTPUT]: JSON.stringify([], null, 2),
     [TEMPLATE_VARIABLES.CRITERIA]: evalCase.criteria.trim(),
@@ -26129,8 +26499,8 @@ var TokenUsageEvaluator = class {
     };
   }
 };
-function getNestedValue(obj, path44) {
-  const parts = path44.split(".");
+function getNestedValue(obj, path45) {
+  const parts = path45.split(".");
   let current = obj;
   for (const part of parts) {
     if (current === null || current === void 0 || typeof current !== "object") {
@@ -26993,7 +27363,7 @@ async function executePromptTemplate(script, context2, config, timeoutMs) {
   };
   const inputJson = JSON.stringify(toSnakeCaseDeep(payload), null, 2);
   const scriptPath = script[script.length - 1];
-  const cwd = path33.dirname(scriptPath);
+  const cwd = path34.dirname(scriptPath);
   try {
     const stdout = await executeScript(script, inputJson, timeoutMs, cwd);
     const prompt = stdout.trim();
@@ -27264,11 +27634,11 @@ function createBuiltinRegistry() {
 async function discoverAssertions(registry, baseDir) {
   const patterns = ["*.ts", "*.js", "*.mts", "*.mjs"];
   const candidateDirs = [];
-  let dir = path34.resolve(baseDir);
-  const root = path34.parse(dir).root;
+  let dir = path35.resolve(baseDir);
+  const root = path35.parse(dir).root;
   while (dir !== root) {
-    candidateDirs.push(path34.join(dir, ".agentv", "assertions"));
-    dir = path34.dirname(dir);
+    candidateDirs.push(path35.join(dir, ".agentv", "assertions"));
+    dir = path35.dirname(dir);
   }
   let files = [];
   for (const assertionsDir of candidateDirs) {
@@ -27284,7 +27654,7 @@ async function discoverAssertions(registry, baseDir) {
   }
   const discoveredTypes = [];
   for (const filePath of files) {
-    const basename = path34.basename(filePath);
+    const basename = path35.basename(filePath);
     const typeName = basename.replace(/\.(ts|js|mts|mjs)$/, "");
     if (registry.has(typeName)) {
       continue;
@@ -27303,12 +27673,12 @@ async function discoverAssertions(registry, baseDir) {
 async function discoverGraders(registry, baseDir) {
   const patterns = ["*.ts", "*.js", "*.mts", "*.mjs"];
   const candidateDirs = [];
-  let dir = path35.resolve(baseDir);
-  const root = path35.parse(dir).root;
+  let dir = path36.resolve(baseDir);
+  const root = path36.parse(dir).root;
   while (dir !== root) {
-    candidateDirs.push(path35.join(dir, ".agentv", "graders"));
-    candidateDirs.push(path35.join(dir, ".agentv", "judges"));
-    dir = path35.dirname(dir);
+    candidateDirs.push(path36.join(dir, ".agentv", "graders"));
+    candidateDirs.push(path36.join(dir, ".agentv", "judges"));
+    dir = path36.dirname(dir);
   }
   let files = [];
   for (const gradersDir of candidateDirs) {
@@ -27324,7 +27694,7 @@ async function discoverGraders(registry, baseDir) {
   }
   const discoveredTypes = [];
   for (const filePath of files) {
-    const basename = path35.basename(filePath);
+    const basename = path36.basename(filePath);
     const typeName = basename.replace(/\.(ts|js|mts|mjs)$/, "");
     if (registry.has(typeName)) {
       continue;
@@ -27510,10 +27880,10 @@ async function stageNestedRepoChanges(workspacePath) {
   }
   for (const entry of entries) {
     if (entry === ".git" || entry === "node_modules") continue;
-    const childPath = path36.join(workspacePath, entry);
+    const childPath = path37.join(workspacePath, entry);
     try {
       if (!statSync(childPath).isDirectory()) continue;
-      if (!statSync(path36.join(childPath, ".git")).isDirectory()) continue;
+      if (!statSync(path37.join(childPath, ".git")).isDirectory()) continue;
     } catch {
       continue;
     }
@@ -27550,14 +27920,14 @@ async function isDirectory(filePath) {
 }
 function getWorkspacePath(evalRunId, caseId, workspaceRoot) {
   const root = workspaceRoot ?? getWorkspacesRoot();
-  return path37.join(root, evalRunId, caseId);
+  return path38.join(root, evalRunId, caseId);
 }
 async function copyDirectoryRecursive(src, dest) {
-  await mkdir11(dest, { recursive: true });
+  await mkdir12(dest, { recursive: true });
   const entries = await readdir3(src, { withFileTypes: true });
   for (const entry of entries) {
-    const srcPath = path37.join(src, entry.name);
-    const destPath = path37.join(dest, entry.name);
+    const srcPath = path38.join(src, entry.name);
+    const destPath = path38.join(dest, entry.name);
     if (entry.name === ".git") {
       continue;
     }
@@ -27569,7 +27939,7 @@ async function copyDirectoryRecursive(src, dest) {
   }
 }
 async function createTempWorkspace(templatePath, evalRunId, caseId, workspaceRoot) {
-  const resolvedTemplatePath = path37.resolve(templatePath);
+  const resolvedTemplatePath = path38.resolve(templatePath);
   if (!await fileExists(resolvedTemplatePath)) {
     throw new TemplateNotFoundError(resolvedTemplatePath);
   }
@@ -27618,7 +27988,7 @@ async function cleanupWorkspace(workspacePath) {
 }
 async function cleanupEvalWorkspaces(evalRunId, workspaceRoot) {
   const root = workspaceRoot ?? getWorkspacesRoot();
-  const evalDir = path37.join(root, evalRunId);
+  const evalDir = path38.join(root, evalRunId);
   if (await fileExists(evalDir)) {
     await rm4(evalDir, { recursive: true, force: true });
   }
@@ -27672,11 +28042,11 @@ function computeWorkspaceFingerprint(repos) {
   return createHash("sha256").update(JSON.stringify(canonical)).digest("hex");
 }
 async function copyDirectoryRecursive2(src, dest, skipDirs) {
-  await mkdir12(dest, { recursive: true });
+  await mkdir13(dest, { recursive: true });
   const entries = await readdir4(src, { withFileTypes: true });
   for (const entry of entries) {
-    const srcPath = path38.join(src, entry.name);
-    const destPath = path38.join(dest, entry.name);
+    const srcPath = path39.join(src, entry.name);
+    const destPath = path39.join(dest, entry.name);
     if (entry.name === ".git") {
       continue;
     }
@@ -27709,8 +28079,8 @@ var WorkspacePoolManager = class {
   async acquireWorkspace(options) {
     const { templatePath, repos, maxSlots, repoManager, poolReset } = options;
     const fingerprint = computeWorkspaceFingerprint(repos);
-    const poolDir = path38.join(this.poolRoot, fingerprint);
-    await mkdir12(poolDir, { recursive: true });
+    const poolDir = path39.join(this.poolRoot, fingerprint);
+    await mkdir13(poolDir, { recursive: true });
     const drifted = await this.checkDrift(poolDir, fingerprint);
     if (drifted) {
       console.warn(
@@ -27719,7 +28089,7 @@ var WorkspacePoolManager = class {
       await this.removeAllSlots(poolDir);
     }
     for (let i = 0; i < maxSlots; i++) {
-      const slotPath = path38.join(poolDir, `slot-${i}`);
+      const slotPath = path39.join(poolDir, `slot-${i}`);
       const lockPath = `${slotPath}.lock`;
       const locked = await this.tryLock(lockPath);
       if (!locked) {
@@ -27737,7 +28107,7 @@ var WorkspacePoolManager = class {
           poolDir
         };
       }
-      await mkdir12(slotPath, { recursive: true });
+      await mkdir13(slotPath, { recursive: true });
       if (templatePath) {
         await copyDirectoryRecursive2(templatePath, slotPath);
       }
@@ -27806,7 +28176,7 @@ var WorkspacePoolManager = class {
    * Returns false (no drift) if metadata.json doesn't exist (first use).
    */
   async checkDrift(poolDir, fingerprint) {
-    const metadataPath = path38.join(poolDir, "metadata.json");
+    const metadataPath = path39.join(poolDir, "metadata.json");
     try {
       const raw = await readFile10(metadataPath, "utf-8");
       const metadata = JSON.parse(raw);
@@ -27823,14 +28193,14 @@ var WorkspacePoolManager = class {
       repos,
       createdAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-    await writeFile7(path38.join(poolDir, "metadata.json"), JSON.stringify(metadata, null, 2));
+    await writeFile7(path39.join(poolDir, "metadata.json"), JSON.stringify(metadata, null, 2));
   }
   /** Remove all slot directories and their lock files from a pool directory. */
   async removeAllSlots(poolDir) {
     const entries = await readdir4(poolDir);
     for (const entry of entries) {
       if (entry.startsWith("slot-") && !entry.endsWith(".lock")) {
-        const lockPath = path38.join(poolDir, `${entry}.lock`);
+        const lockPath = path39.join(poolDir, `${entry}.lock`);
         if (existsSync2(lockPath)) {
           try {
             const pidStr = await readFile10(lockPath, "utf-8");
@@ -27846,12 +28216,12 @@ var WorkspacePoolManager = class {
           } catch {
           }
         }
-        await rm5(path38.join(poolDir, entry), { recursive: true, force: true });
+        await rm5(path39.join(poolDir, entry), { recursive: true, force: true });
         await rm5(lockPath, { force: true }).catch(() => {
         });
       }
     }
-    await rm5(path38.join(poolDir, "metadata.json"), { force: true }).catch(() => {
+    await rm5(path39.join(poolDir, "metadata.json"), { force: true }).catch(() => {
     });
   }
   /**
@@ -27861,7 +28231,7 @@ var WorkspacePoolManager = class {
    */
   async resetSlot(slotPath, templatePath, repos, poolReset = "fast") {
     for (const repo of repos) {
-      const repoDir = path38.join(slotPath, repo.path);
+      const repoDir = path39.join(slotPath, repo.path);
       if (!existsSync2(repoDir)) {
         continue;
       }
@@ -27982,7 +28352,7 @@ ${lines.join("\n")}`;
    * Handles checkout, ref resolution, ancestor walking, shallow clone, sparse checkout.
    */
   async materialize(repo, workspacePath) {
-    const targetDir = path39.join(workspacePath, repo.path);
+    const targetDir = path40.join(workspacePath, repo.path);
     const sourceUrl = getSourceUrl(repo.source);
     const startedAt = Date.now();
     if (this.verbose) {
@@ -28073,7 +28443,7 @@ ${lines.join("\n")}`;
   async reset(repos, workspacePath, reset) {
     const cleanFlag = reset === "strict" ? "-fdx" : "-fd";
     for (const repo of repos) {
-      const targetDir = path39.join(workspacePath, repo.path);
+      const targetDir = path40.join(workspacePath, repo.path);
       await this.runGit(["reset", "--hard", "HEAD"], { cwd: targetDir });
       await this.runGit(["clean", cleanFlag], { cwd: targetDir });
     }
@@ -28083,11 +28453,11 @@ async function resolveWorkspaceTemplate(templatePath) {
   if (!templatePath) {
     return void 0;
   }
-  const resolved = path40.resolve(templatePath);
+  const resolved = path41.resolve(templatePath);
   const stats = await stat6(resolved);
   if (stats.isFile()) {
     return {
-      dir: path40.dirname(resolved),
+      dir: path41.dirname(resolved),
       workspaceFile: resolved
     };
   }
@@ -28099,14 +28469,14 @@ async function resolveWorkspaceTemplate(templatePath) {
   if (workspaceFiles.length === 1) {
     return {
       dir: resolved,
-      workspaceFile: path40.join(resolved, workspaceFiles[0])
+      workspaceFile: path41.join(resolved, workspaceFiles[0])
     };
   }
   if (workspaceFiles.length > 1) {
     const conventionFile = workspaceFiles.find((f) => f === "template.code-workspace");
     return {
       dir: resolved,
-      workspaceFile: conventionFile ? path40.join(resolved, conventionFile) : void 0
+      workspaceFile: conventionFile ? path41.join(resolved, conventionFile) : void 0
     };
   }
   return { dir: resolved };
@@ -28156,6 +28526,18 @@ var QUALITY_PASS_THRESHOLD = 0.8;
 function classifyQualityStatus(score) {
   return score >= QUALITY_PASS_THRESHOLD ? "ok" : "quality_failure";
 }
+function buildSkippedEvaluatorError(scores) {
+  const skippedScores = scores?.filter((score) => score.verdict === "skip") ?? [];
+  if (skippedScores.length === 0) {
+    return void 0;
+  }
+  const messages = skippedScores.map((score) => {
+    const label = score.name || score.type;
+    const assertionMessage = score.assertions.find((assertion) => !assertion.passed)?.text ?? "Evaluator skipped";
+    return `${label}: ${assertionMessage}`;
+  });
+  return messages.length === 1 ? messages[0] : `Evaluators skipped: ${messages.join(" | ")}`;
+}
 function usesFileReferencePrompt(provider) {
   return isAgentProvider(provider) || provider.kind === "cli";
 }
@@ -28227,7 +28609,7 @@ async function runEvaluation(options) {
     );
     useCache = false;
   }
-  const evalRunId = randomUUID8();
+  const evalRunId = randomUUID9();
   const evalCases = preloadedEvalCases ?? await loadTests(evalFilePath, repoRoot, { verbose, filter: filter2 });
   const filteredEvalCases = filterEvalCases(evalCases, filter2);
   if (filteredEvalCases.length === 0) {
@@ -28272,7 +28654,7 @@ async function runEvaluation(options) {
         if (!cliModel) {
           throw new Error('--grader-target "agentv" requires --model (e.g., "openai:gpt-5-mini")');
         }
-        const { AgentvProvider: AgentvProvider2 } = await import("./agentv-provider-NFFLXG5M-TJAWCWCX.js");
+        const { AgentvProvider: AgentvProvider2 } = await import("./agentv-provider-MIDKLYIH-6LIYKQRP.js");
         return new AgentvProvider2("agentv", { model: cliModel, temperature: 0 });
       }
       const overrideTarget = resolveTargetByName(cliGraderTarget);
@@ -28306,7 +28688,7 @@ async function runEvaluation(options) {
   ];
   const evaluatorRegistry = buildEvaluatorRegistry(evaluators, resolveGraderProvider);
   const typeRegistry = createBuiltinRegistry();
-  const discoveryBaseDir = evalFilePath ? path41.dirname(path41.resolve(evalFilePath)) : process.cwd();
+  const discoveryBaseDir = evalFilePath ? path422.dirname(path422.resolve(evalFilePath)) : process.cwd();
   const evalDir = discoveryBaseDir;
   await discoverAssertions(typeRegistry, discoveryBaseDir);
   await discoverGraders(typeRegistry, discoveryBaseDir);
@@ -28453,7 +28835,7 @@ async function runEvaluation(options) {
     const isEmpty = dirExists ? (await readdir6(configuredStaticPath)).length === 0 : false;
     if (isYamlConfiguredPath && (!dirExists || isEmpty)) {
       if (!dirExists) {
-        await mkdir13(configuredStaticPath, { recursive: true });
+        await mkdir14(configuredStaticPath, { recursive: true });
       }
       if (workspaceTemplate) {
         await copyDirectoryRecursive(workspaceTemplate, configuredStaticPath);
@@ -28498,12 +28880,12 @@ async function runEvaluation(options) {
     }
   } else if (suiteWorkspace?.hooks || suiteWorkspace?.repos?.length && !isPerTestIsolation) {
     sharedWorkspacePath = getWorkspacePath(evalRunId, "shared");
-    await mkdir13(sharedWorkspacePath, { recursive: true });
+    await mkdir14(sharedWorkspacePath, { recursive: true });
     setupLog(`created empty shared workspace at: ${sharedWorkspacePath}`);
   }
   try {
     if (suiteWorkspaceFile && sharedWorkspacePath) {
-      const copiedWorkspaceFile = path41.join(sharedWorkspacePath, path41.basename(suiteWorkspaceFile));
+      const copiedWorkspaceFile = path422.join(sharedWorkspacePath, path422.basename(suiteWorkspaceFile));
       try {
         await stat7(copiedWorkspaceFile);
         suiteWorkspaceFile = copiedWorkspaceFile;
@@ -29085,7 +29467,7 @@ async function runEvalCase(options) {
         );
       }
       if (caseWorkspaceFile && workspacePath) {
-        const copiedFile = path41.join(workspacePath, path41.basename(caseWorkspaceFile));
+        const copiedFile = path422.join(workspacePath, path422.basename(caseWorkspaceFile));
         try {
           await stat7(copiedFile);
           caseWorkspaceFile = copiedFile;
@@ -29095,7 +29477,7 @@ async function runEvalCase(options) {
     }
     if (!workspacePath && (evalCase.workspace?.hooks || evalCase.workspace?.repos?.length) && evalRunId) {
       workspacePath = getWorkspacePath(evalRunId, evalCase.id);
-      await mkdir13(workspacePath, { recursive: true });
+      await mkdir14(workspacePath, { recursive: true });
     }
     if (evalCase.workspace?.repos?.length && workspacePath) {
       const localPathErrors = RepoManager.validateLocalPaths(evalCase.workspace.repos);
@@ -29147,10 +29529,10 @@ async function runEvalCase(options) {
       const files = evalCase.metadata.agent_skills_files;
       if (baseDir && files.length > 0) {
         for (const relPath of files) {
-          const srcPath = path41.resolve(baseDir, relPath);
-          const destPath = path41.resolve(workspacePath, relPath);
+          const srcPath = path422.resolve(baseDir, relPath);
+          const destPath = path422.resolve(workspacePath, relPath);
           try {
-            await mkdir13(path41.dirname(destPath), { recursive: true });
+            await mkdir14(path422.dirname(destPath), { recursive: true });
             await copyFile2(srcPath, destPath);
           } catch (error) {
             const message = error instanceof Error ? error.message : String(error);
@@ -29420,7 +29802,8 @@ async function runEvalCase(options) {
       durationMs: totalDurationMs,
       ...evalRunTokenUsage ? { tokenUsage: evalRunTokenUsage } : {}
     };
-    const executionStatus = providerError ? "execution_error" : classifyQualityStatus(result.score);
+    const skippedEvaluatorError = buildSkippedEvaluatorError(result.scores);
+    const executionStatus = providerError || skippedEvaluatorError ? "execution_error" : classifyQualityStatus(result.score);
     const finalResult = providerError ? {
       ...result,
       evalRun,
@@ -29432,7 +29815,26 @@ async function runEvalCase(options) {
       beforeAllOutput,
       beforeEachOutput,
       afterEachOutput
-    } : { ...result, evalRun, executionStatus, beforeAllOutput, beforeEachOutput, afterEachOutput };
+    } : skippedEvaluatorError ? {
+      ...result,
+      score: 0,
+      evalRun,
+      error: skippedEvaluatorError,
+      executionStatus,
+      failureStage: "evaluator",
+      failureReasonCode: "evaluator_error",
+      executionError: { message: skippedEvaluatorError, stage: "evaluator" },
+      beforeAllOutput,
+      beforeEachOutput,
+      afterEachOutput
+    } : {
+      ...result,
+      evalRun,
+      executionStatus,
+      beforeAllOutput,
+      beforeEachOutput,
+      afterEachOutput
+    };
     const isFailure = !!finalResult.error || finalResult.score < 0.5;
     if (workspacePath && !isSharedWorkspace) {
       if (forceCleanup) {
@@ -29776,7 +30178,7 @@ async function runEvaluatorList(options) {
     fileChanges,
     workspacePath
   };
-  const evalFileDir = evalCase.file_paths[0] ? path41.dirname(evalCase.file_paths[0]) : process.cwd();
+  const evalFileDir = evalCase.file_paths[0] ? path422.dirname(evalCase.file_paths[0]) : process.cwd();
   const dispatchContext = {
     graderProvider,
     targetResolver,
@@ -30139,7 +30541,7 @@ async function evaluate(config) {
   }
   const gitRoot = await findGitRoot(process.cwd());
   const repoRoot = gitRoot ?? process.cwd();
-  const testFilePath = config.specFile ? path422.resolve(config.specFile) : path422.join(process.cwd(), "__programmatic__.yaml");
+  const testFilePath = config.specFile ? path43.resolve(config.specFile) : path43.join(process.cwd(), "__programmatic__.yaml");
   await loadEnvHierarchy(repoRoot, testFilePath);
   let resolvedTarget;
   let taskProvider;
@@ -30169,11 +30571,6 @@ async function evaluate(config) {
     evalCases = (config.tests ?? []).map((test) => {
       const input = typeof test.input === "string" ? [{ role: "user", content: test.input }] : test.input;
       const question = typeof test.input === "string" ? test.input : test.input.find((m) => m.role === "user")?.content ?? "";
-      const inputSegments = input.map((m) => ({
-        type: "text",
-        value: typeof m.content === "string" ? m.content : JSON.stringify(m.content),
-        messageIndex: 0
-      }));
       const expectedOutputValue = test.expectedOutput ?? test.expected_output;
       const expectedOutput = expectedOutputValue ? [
         { role: "assistant", content: expectedOutputValue }
@@ -30202,7 +30599,6 @@ async function evaluate(config) {
         criteria: test.criteria ?? "",
         question: String(question),
         input,
-        input_segments: inputSegments,
         expected_output: expectedOutput,
         reference_answer: expectedOutputValue,
         file_paths: [],
@@ -30266,10 +30662,10 @@ function computeSummary(results, durationMs) {
 var TARGET_FILE_CANDIDATES = [".agentv/targets.yaml", ".agentv/targets.yml"];
 async function discoverDefaultTarget(repoRoot) {
   const cwd = process.cwd();
-  const chain = buildDirectoryChain(path422.join(cwd, "_placeholder"), repoRoot);
+  const chain = buildDirectoryChain(path43.join(cwd, "_placeholder"), repoRoot);
   for (const dir of chain) {
     for (const candidate of TARGET_FILE_CANDIDATES) {
-      const targetsPath = path422.join(dir, candidate);
+      const targetsPath = path43.join(dir, candidate);
       if (!existsSync4(targetsPath)) continue;
       try {
         const definitions = await readTargetDefinitions(targetsPath);
@@ -30286,7 +30682,7 @@ async function loadEnvHierarchy(repoRoot, startPath) {
   const chain = buildDirectoryChain(startPath, repoRoot);
   const envFiles = [];
   for (const dir of chain) {
-    const envPath = path422.join(dir, ".env");
+    const envPath = path43.join(dir, ".env");
     if (existsSync4(envPath)) envFiles.push(envPath);
   }
   for (let i = 0; i < envFiles.length; i++) {
@@ -30475,13 +30871,13 @@ var ResponseCache = class {
   }
   async set(key, value) {
     const filePath = this.keyToPath(key);
-    const dir = path43.dirname(filePath);
-    await mkdir14(dir, { recursive: true });
+    const dir = path44.dirname(filePath);
+    await mkdir15(dir, { recursive: true });
     await writeFile8(filePath, JSON.stringify(value, null, 2), "utf8");
   }
   keyToPath(key) {
     const prefix = key.slice(0, 2);
-    return path43.join(this.cachePath, prefix, `${key}.json`);
+    return path44.join(this.cachePath, prefix, `${key}.json`);
   }
 };
 function shouldEnableCache(params) {
@@ -30582,11 +30978,11 @@ var OtelTraceExporter = class {
   async init() {
     try {
       const [sdkTraceNode, resourcesMod, semconvMod, api, coreMod] = await Promise.all([
-        import("./src-ML4D2MC2.js"),
-        import("./esm-CZAWIY6F.js"),
+        import("./src-PXDA7QIS.js"),
+        import("./esm-UYZ3HJBU.js"),
         import("./esm-RVQPUGWH.js"),
         import("./esm-R77SNOF5.js"),
-        import("./esm-5Q4BZALM-5REQWAUV.js").catch(() => null)
+        import("./esm-OJ2BXJK4-YKEI3Z7E.js").catch(() => null)
       ]);
       const { NodeTracerProvider: Provider, SimpleSpanProcessor } = sdkTraceNode;
       const { resourceFromAttributes } = resourcesMod;
@@ -30605,13 +31001,13 @@ var OtelTraceExporter = class {
         processors.push(new SimpleSpanProcessor(exporter));
       }
       if (this.options.otlpFilePath) {
-        const { OtlpJsonFileExporter: OtlpJsonFileExporter2 } = await import("./otlp-json-file-exporter-77FDBRSY-EZAPHWP6.js");
+        const { OtlpJsonFileExporter: OtlpJsonFileExporter2 } = await import("./otlp-json-file-exporter-VN67MK3S-RQIM6EHY.js");
         processors.push(
           new SimpleSpanProcessor(new OtlpJsonFileExporter2(this.options.otlpFilePath))
         );
       }
       if (this.options.traceFilePath) {
-        const { SimpleTraceFileExporter: SimpleTraceFileExporter2 } = await import("./simple-trace-file-exporter-S76DMABU-5FCJESD2.js");
+        const { SimpleTraceFileExporter: SimpleTraceFileExporter2 } = await import("./simple-trace-file-exporter-XWZTIZR2-4JKATE5G.js");
         processors.push(
           new SimpleSpanProcessor(new SimpleTraceFileExporter2(this.options.traceFilePath))
         );
@@ -31103,4 +31499,4 @@ export {
   OtelStreamingObserver,
   createAgentKernel
 };
-//# sourceMappingURL=chunk-JUQCB3ZW.js.map
+//# sourceMappingURL=chunk-OYD2NB55.js.map