@agentv/core 2.17.3 → 2.18.2

package/dist/index.cjs

@@ -4778,11 +4778,13 @@ function parseWorkspaceHookConfig(raw, evalFileDir) {
 function parseWorkspaceHooksConfig(raw, evalFileDir) {
   if (!isJsonObject(raw)) return void 0;
   const obj = raw;
+  const enabled = typeof obj.enabled === "boolean" ? obj.enabled : void 0;
   const beforeAll = parseWorkspaceHookConfig(obj.before_all, evalFileDir);
   const beforeEach = parseWorkspaceHookConfig(obj.before_each, evalFileDir);
   const afterEach = parseWorkspaceHookConfig(obj.after_each, evalFileDir);
   const afterAll = parseWorkspaceHookConfig(obj.after_all, evalFileDir);
   const hooks = {
+    ...enabled !== void 0 && { enabled },
     ...beforeAll !== void 0 && { before_all: beforeAll },
     ...beforeEach !== void 0 && { before_each: beforeEach },
     ...afterEach !== void 0 && { after_each: afterEach },
@@ -4813,6 +4815,17 @@ async function resolveWorkspaceConfig(raw, evalFileDir) {
 function parseWorkspaceConfig(raw, evalFileDir) {
   if (!isJsonObject(raw)) return void 0;
   const obj = raw;
+  if ("static_path" in obj) {
+    throw new Error(
+      "workspace.static_path has been removed. Use workspace.path with workspace.mode=static."
+    );
+  }
+  if ("pool" in obj) {
+    throw new Error("workspace.pool has been removed. Use workspace.mode='pooled' or 'temp'.");
+  }
+  if ("static" in obj) {
+    throw new Error("workspace.static has been removed. Use workspace.mode='static'.");
+  }
   let template = typeof obj.template === "string" ? obj.template : void 0;
   if (template && !import_node_path8.default.isAbsolute(template)) {
     template = import_node_path8.default.resolve(evalFileDir, template);
@@ -4820,19 +4833,17 @@ function parseWorkspaceConfig(raw, evalFileDir) {
   const isolation = obj.isolation === "shared" || obj.isolation === "per_test" ? obj.isolation : void 0;
   const repos = Array.isArray(obj.repos) ? obj.repos.map(parseRepoConfig).filter(Boolean) : void 0;
   const hooks = parseWorkspaceHooksConfig(obj.hooks, evalFileDir);
-  const mode = obj.mode === "pooled" || obj.mode === "ephemeral" || obj.mode === "static" ? obj.mode : void 0;
-  const staticPath = typeof obj.static_path === "string" ? obj.static_path : void 0;
-  const pool = typeof obj.pool === "boolean" ? obj.pool : void 0;
-  if (!template && !isolation && !repos && !hooks && !mode && !staticPath && pool === void 0)
-    return void 0;
+  const explicitMode = obj.mode === "pooled" || obj.mode === "temp" || obj.mode === "static" ? obj.mode : void 0;
+  const workspacePath = typeof obj.path === "string" ? obj.path : void 0;
+  const mode = explicitMode ?? (workspacePath ? "static" : void 0);
+  if (!template && !isolation && !repos && !hooks && !mode && !workspacePath) return void 0;
   return {
     ...template !== void 0 && { template },
     ...isolation !== void 0 && { isolation },
     ...repos !== void 0 && { repos },
     ...hooks !== void 0 && { hooks },
     ...mode !== void 0 && { mode },
-    ...staticPath !== void 0 && { static_path: staticPath },
-    ...pool !== void 0 && { pool }
+    ...workspacePath !== void 0 && { path: workspacePath }
   };
 }
 function mergeWorkspaceConfigs(suiteLevel, caseLevel) {
@@ -4846,21 +4857,22 @@ function mergeWorkspaceConfigs(suiteLevel, caseLevel) {
       ...caseHook ?? {}
     };
   };
+  const mergedEnabled = caseLevel.hooks?.enabled ?? suiteLevel.hooks?.enabled;
   const mergedHooks = {
+    ...mergedEnabled !== void 0 && { enabled: mergedEnabled },
     before_all: mergeHook(suiteLevel.hooks?.before_all, caseLevel.hooks?.before_all),
     before_each: mergeHook(suiteLevel.hooks?.before_each, caseLevel.hooks?.before_each),
     after_each: mergeHook(suiteLevel.hooks?.after_each, caseLevel.hooks?.after_each),
     after_all: mergeHook(suiteLevel.hooks?.after_all, caseLevel.hooks?.after_all)
   };
-  const hasHooks = Object.values(mergedHooks).some((hook) => hook !== void 0);
+  const hasHooks = mergedEnabled !== void 0 || Object.values(mergedHooks).some((hook) => hook !== void 0 && typeof hook === "object");
   return {
     template: caseLevel.template ?? suiteLevel.template,
     isolation: caseLevel.isolation ?? suiteLevel.isolation,
     repos: caseLevel.repos ?? suiteLevel.repos,
     ...hasHooks && { hooks: mergedHooks },
     mode: caseLevel.mode ?? suiteLevel.mode,
-    static_path: caseLevel.static_path ?? suiteLevel.static_path,
-    pool: caseLevel.pool ?? suiteLevel.pool
+    path: caseLevel.path ?? suiteLevel.path
   };
 }
 function asString6(value) {
@@ -7915,14 +7927,18 @@ var PiAgentSdkProvider = class {
       }
     });
     try {
-      const timeoutMs = this.config.timeoutMs ?? 12e4;
-      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]);
+      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;
       for (const msg of agentMessages) {
@@ -8994,6 +9010,11 @@ function resolveRetryConfig(target) {
 }
 function resolveTargetDefinition(definition, env = process.env, evalFilePath) {
   const parsed = BASE_TARGET_SCHEMA.parse(definition);
+  if (parsed.workspace_template !== void 0 || parsed.workspaceTemplate !== void 0) {
+    throw new Error(
+      `${parsed.name}: target-level workspace_template has been removed. Use eval-level workspace.template.`
+    );
+  }
   const provider = parsed.provider.toLowerCase();
   const providerBatching = resolveOptionalBoolean(
     parsed.provider_batching ?? parsed.providerBatching
@@ -16287,6 +16308,9 @@ function toScriptConfig(hook, hookName, context2) {
 function hasHookCommand(hook) {
   return !!(hook?.command && hook.command.length > 0 || hook?.script && hook.script.length > 0);
 }
+function hooksEnabled(workspace) {
+  return workspace?.hooks?.enabled !== false;
+}
 function getWorkspaceTemplate(target) {
   const config = target.config;
   if ("workspaceTemplate" in config && typeof config.workspaceTemplate === "string") {
@@ -16461,19 +16485,27 @@ async function runEvaluation(options) {
     }
   };
   const isPerTestIsolation = suiteWorkspace?.isolation === "per_test";
-  const configuredMode = suiteWorkspace?.mode ?? workspaceMode;
-  const configuredStaticPath = suiteWorkspace?.static_path ?? workspacePath ?? legacyWorkspacePath;
-  const useStaticWorkspace = configuredMode === "static" || !!configuredStaticPath && !configuredMode;
+  const cliWorkspacePath = workspacePath ?? legacyWorkspacePath;
+  const yamlWorkspacePath = suiteWorkspace?.path;
+  if (cliWorkspacePath && workspaceMode && workspaceMode !== "static") {
+    throw new Error("--workspace-path requires --workspace-mode static when both are provided");
+  }
+  const configuredMode = cliWorkspacePath ? "static" : workspaceMode ?? suiteWorkspace?.mode ?? (yamlWorkspacePath ? "static" : "pooled");
+  const configuredStaticPath = cliWorkspacePath ?? yamlWorkspacePath;
+  const useStaticWorkspace = configuredMode === "static";
   if (useStaticWorkspace && isPerTestIsolation) {
     throw new Error(
       "static workspace mode is incompatible with isolation: per_test. Use isolation: shared (default)."
     );
   }
   if (configuredMode === "static" && !configuredStaticPath) {
-    throw new Error("workspace.mode=static requires workspace.static_path or --workspace-path");
+    throw new Error("workspace.mode=static requires workspace.path or --workspace-path");
+  }
+  if (configuredMode !== "static" && configuredStaticPath) {
+    throw new Error("workspace.path requires workspace.mode=static");
   }
   const hasSharedWorkspace = !!(useStaticWorkspace || workspaceTemplate || suiteWorkspace?.hooks || suiteWorkspace?.repos?.length && !isPerTestIsolation);
-  const poolEnabled = configuredMode === "pooled" ? true : configuredMode === "ephemeral" || useStaticWorkspace ? false : suiteWorkspace?.pool ?? poolWorkspaces ?? true;
+  const poolEnabled = configuredMode === "pooled";
   const usePool = poolEnabled !== false && !!suiteWorkspace?.repos?.length && !isPerTestIsolation && !useStaticWorkspace;
   const resolvedRetainOnSuccess = retainOnSuccess ?? (keepWorkspaces ? "keep" : "cleanup");
   const resolvedRetainOnFailure = retainOnFailure ?? (cleanupWorkspaces ? "cleanup" : "keep");
@@ -16497,9 +16529,28 @@ async function runEvaluation(options) {
   const availablePoolSlots = [];
   const poolSlotBaselines = /* @__PURE__ */ new Map();
   const poolMaxSlots = Math.min(configPoolMaxSlots ?? 10, 50);
+  let staticMaterialised = false;
   if (useStaticWorkspace && configuredStaticPath) {
+    const isYamlConfiguredPath = !cliWorkspacePath && !!yamlWorkspacePath;
+    const dirExists = await (0, import_promises29.stat)(configuredStaticPath).then(
+      (s) => s.isDirectory(),
+      () => false
+    );
+    const isEmpty = dirExists ? (await (0, import_promises29.readdir)(configuredStaticPath)).length === 0 : false;
+    if (isYamlConfiguredPath && (!dirExists || isEmpty)) {
+      if (!dirExists) {
+        await (0, import_promises29.mkdir)(configuredStaticPath, { recursive: true });
+      }
+      if (workspaceTemplate) {
+        await copyDirectoryRecursive(workspaceTemplate, configuredStaticPath);
+        setupLog(`copied template into static workspace: ${configuredStaticPath}`);
+      }
+      staticMaterialised = true;
+      setupLog(`materialised static workspace at: ${configuredStaticPath}`);
+    } else {
+      setupLog(`reusing existing static workspace: ${configuredStaticPath}`);
+    }
     sharedWorkspacePath = configuredStaticPath;
-    setupLog(`using static workspace: ${configuredStaticPath}`);
   } else if (usePool && suiteWorkspace?.repos) {
     const slotsNeeded = workers;
     setupLog(`acquiring ${slotsNeeded} workspace pool slot(s) (pool capacity: ${poolMaxSlots})`);
@@ -16545,7 +16596,8 @@ async function runEvaluation(options) {
       } catch {
       }
     }
-    const repoManager = suiteWorkspace?.repos?.length && !usePool && !useStaticWorkspace ? new RepoManager(verbose) : void 0;
+    const needsRepoMaterialisation = !!suiteWorkspace?.repos?.length && !usePool && (!useStaticWorkspace || staticMaterialised);
+    const repoManager = needsRepoMaterialisation ? new RepoManager(verbose) : void 0;
     if (repoManager && sharedWorkspacePath && suiteWorkspace?.repos && !isPerTestIsolation) {
       setupLog(
         `materializing ${suiteWorkspace.repos.length} shared repo(s) into ${sharedWorkspacePath}`
@@ -16562,8 +16614,9 @@ async function runEvaluation(options) {
         throw new Error(`Failed to materialize repos: ${message}`);
       }
     }
+    const suiteHooksEnabled = hooksEnabled(suiteWorkspace);
     const suiteBeforeAllHook = suiteWorkspace?.hooks?.before_all;
-    if (sharedWorkspacePath && hasHookCommand(suiteBeforeAllHook)) {
+    if (sharedWorkspacePath && suiteHooksEnabled && hasHookCommand(suiteBeforeAllHook)) {
       const beforeAllHook = suiteBeforeAllHook;
       const beforeAllCommand = (beforeAllHook.command ?? beforeAllHook.script ?? []).join(" ");
       setupLog(
@@ -16590,7 +16643,7 @@ async function runEvaluation(options) {
         throw new Error(`before_all script failed: ${message}`);
       }
     }
-    if (availablePoolSlots.length > 0 && hasHookCommand(suiteBeforeAllHook)) {
+    if (availablePoolSlots.length > 0 && suiteHooksEnabled && hasHookCommand(suiteBeforeAllHook)) {
       const beforeAllHook = suiteBeforeAllHook;
       for (const slot of availablePoolSlots) {
         setupLog(`running before_all on pool slot ${slot.index}`);
@@ -16832,7 +16885,7 @@ async function runEvaluation(options) {
     }
     const afterAllWorkspaces = poolSlots.length > 1 ? poolSlots.map((s) => s.path) : sharedWorkspacePath ? [sharedWorkspacePath] : [];
     const suiteAfterAllHook = suiteWorkspace?.hooks?.after_all;
-    if (afterAllWorkspaces.length > 0 && hasHookCommand(suiteAfterAllHook)) {
+    if (afterAllWorkspaces.length > 0 && suiteHooksEnabled && hasHookCommand(suiteAfterAllHook)) {
       const afterAllHook = suiteAfterAllHook;
       for (const wsPath of afterAllWorkspaces) {
         const scriptContext = {
@@ -17080,6 +17133,7 @@ async function runEvalCase(options) {
   let afterEachOutput;
   const isSharedWorkspace = !!sharedWorkspacePath;
   let caseWorkspaceFile;
+  const caseHooksEnabled = hooksEnabled(evalCase.workspace);
   if (!workspacePath) {
     const rawCaseTemplate = evalCase.workspace?.template ?? getWorkspaceTemplate(target);
     const resolvedCaseTemplate = await resolveWorkspaceTemplate(rawCaseTemplate);
@@ -17141,7 +17195,7 @@ async function runEvalCase(options) {
       }
     }
     const caseBeforeAllHook = evalCase.workspace?.hooks?.before_all;
-    if (workspacePath && hasHookCommand(caseBeforeAllHook)) {
+    if (workspacePath && caseHooksEnabled && hasHookCommand(caseBeforeAllHook)) {
       const beforeAllHook = caseBeforeAllHook;
       const beforeAllCommand = (beforeAllHook.command ?? beforeAllHook.script ?? []).join(" ");
       if (setupDebug) {
@@ -17185,7 +17239,7 @@ async function runEvalCase(options) {
     }
   }
   const caseBeforeEachHook = evalCase.workspace?.hooks?.before_each;
-  if (workspacePath && hasHookCommand(caseBeforeEachHook)) {
+  if (workspacePath && caseHooksEnabled && hasHookCommand(caseBeforeEachHook)) {
     const beforeEachHook = caseBeforeEachHook;
     const scriptContext = {
       workspacePath,
@@ -17314,7 +17368,7 @@ async function runEvalCase(options) {
     }
   }
   const providerError = extractProviderError(providerResponse);
-  if (repoManager && workspacePath && evalCase.workspace?.hooks?.after_each?.reset && evalCase.workspace.hooks.after_each.reset !== "none" && evalCase.workspace.repos) {
+  if (caseHooksEnabled && repoManager && workspacePath && evalCase.workspace?.hooks?.after_each?.reset && evalCase.workspace.hooks.after_each.reset !== "none" && evalCase.workspace.repos) {
     try {
       await repoManager.reset(
         evalCase.workspace.repos,
@@ -17325,7 +17379,7 @@ async function runEvalCase(options) {
     }
   }
   const caseAfterEachHook = evalCase.workspace?.hooks?.after_each;
-  if (workspacePath && hasHookCommand(caseAfterEachHook)) {
+  if (workspacePath && caseHooksEnabled && hasHookCommand(caseAfterEachHook)) {
     const afterEachHook = caseAfterEachHook;
     const scriptContext = {
       workspacePath,
@@ -18104,7 +18158,7 @@ async function evaluate(config) {
     repoRoot,
     target: resolvedTarget,
     maxRetries: config.maxRetries ?? 2,
-    agentTimeoutMs: config.agentTimeoutMs ?? 12e4,
+    agentTimeoutMs: config.agentTimeoutMs,
     verbose: config.verbose,
     maxConcurrency: config.workers ?? 3,
     filter: config.filter,
@@ -18207,7 +18261,7 @@ var AgentVConfigSchema = import_zod6.z.object({
     workers: import_zod6.z.number().int().min(1).max(50).optional(),
     /** Maximum retries on failure (default: 2) */
     maxRetries: import_zod6.z.number().int().min(0).optional(),
-    /** Agent timeout in milliseconds (default: 120000) */
+    /** Agent timeout in milliseconds. No timeout if not set. */
     agentTimeoutMs: import_zod6.z.number().int().min(0).optional(),
     /** Enable verbose logging */
     verbose: import_zod6.z.boolean().optional(),