agentv 4.38.0-next.1 → 4.38.0

package/dist/{chunk-Q5IJMKPS.js → chunk-NLTIK3LV.js}

@@ -11,7 +11,7 @@ import {
   parseRepoConfig,
   parseYamlValue,
   resolveRepoCloneUrl
-} from "./chunk-3KEVTQRM.js";
+} from "./chunk-VBHHZQS6.js";
 
 // ../../packages/core/dist/index.js
 import { readFileSync } from "node:fs";
@@ -3080,4 +3080,4 @@ export {
   TranscriptProvider,
   createAgentKernel
 };
-//# sourceMappingURL=chunk-Q5IJMKPS.js.map
+//# sourceMappingURL=chunk-NLTIK3LV.js.map

package/dist/{chunk-3KEVTQRM.js → chunk-VBHHZQS6.js}

@@ -6184,7 +6184,7 @@ async function expandFileReferences(tests, evalFileDir) {
   return expanded;
 }
 
-// ../../packages/core/dist/chunk-A5KGF24N.js
+// ../../packages/core/dist/chunk-RH5LAMMU.js
 import path48 from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 import { existsSync as existsSync7 } from "node:fs";
@@ -6192,13 +6192,13 @@ import path47 from "node:path";
 import micromatch4 from "micromatch";
 import { mkdir, readFile as readFile3, writeFile } from "node:fs/promises";
 import path5 from "node:path";
-import { execFile as execFile3 } from "node:child_process";
+import { execFile as execFile2 } from "node:child_process";
 import { createHash as createHash5, randomUUID as randomUUID10 } from "node:crypto";
 import { existsSync as existsSync6 } from "node:fs";
 import { copyFile as copyFile2, mkdir as mkdir17, readdir as readdir8, stat as stat9 } from "node:fs/promises";
 import path46 from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
-import { promisify as promisify7 } from "node:util";
+import { promisify as promisify6 } from "node:util";
 import micromatch3 from "micromatch";
 import { mkdtemp, rm, writeFile as writeFile2 } from "node:fs/promises";
 import { tmpdir } from "node:os";
@@ -18852,7 +18852,7 @@ var RequestError = class _RequestError extends Error {
   }
 };
 
-// ../../packages/core/dist/chunk-A5KGF24N.js
+// ../../packages/core/dist/chunk-RH5LAMMU.js
 import { exec as execCallback } from "node:child_process";
 import { readdirSync, statSync } from "node:fs";
 import { readFile as readFile32, readdir as readdir2, stat as stat2 } from "node:fs/promises";
@@ -18927,18 +18927,16 @@ import path33 from "node:path";
 import fg3 from "fast-glob";
 import { cp, mkdir as mkdir14, readdir as readdir5, rm as rm4, stat as stat6 } from "node:fs/promises";
 import path34 from "node:path";
-import { execFile } from "node:child_process";
 import { createHash as createHash3 } from "node:crypto";
 import { existsSync as existsSync3 } from "node:fs";
 import { cp as cp2, mkdir as mkdir15, readFile as readFile11, readdir as readdir6, rm as rm5, unlink, writeFile as writeFile9 } from "node:fs/promises";
 import path35 from "node:path";
-import { promisify as promisify5 } from "node:util";
-import { execFile as execFile2, spawn as spawn5 } from "node:child_process";
+import { execFile, spawn as spawn5 } from "node:child_process";
 import { createHash as createHash4, randomUUID as randomUUID9 } from "node:crypto";
 import { existsSync as existsSync5, readFileSync as readFileSync3 } from "node:fs";
 import { mkdir as mkdir16, rename, rm as rm6 } from "node:fs/promises";
 import path37 from "node:path";
-import { promisify as promisify6 } from "node:util";
+import { promisify as promisify5 } from "node:util";
 import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync22, readdirSync as readdirSync3, statSync as statSync2, writeFileSync } from "node:fs";
 import path36 from "node:path";
 import { stringify as stringifyYaml } from "yaml";
@@ -33000,30 +32998,6 @@ function normalizeHostPath(host, rawPath) {
 function stripGitSuffix(value) {
   return value.replace(/\.git$/i, "");
 }
-var execFileAsync = promisify5(execFile);
-function gitEnv() {
-  const env = { ...process.env };
-  for (const key of Object.keys(env)) {
-    if (key.startsWith("GIT_") && key !== "GIT_SSH_COMMAND") {
-      delete env[key];
-    }
-  }
-  return {
-    ...env,
-    GIT_TERMINAL_PROMPT: "0",
-    GIT_ASKPASS: "",
-    GIT_SSH_COMMAND: "ssh -o BatchMode=yes"
-  };
-}
-async function git(args, opts) {
-  const { stdout } = await execFileAsync("git", args, {
-    cwd: opts?.cwd,
-    timeout: opts?.timeout ?? 3e5,
-    env: gitEnv(),
-    maxBuffer: 50 * 1024 * 1024
-  });
-  return stdout.trim();
-}
 function normalizeRepoForFingerprint(repo) {
   const result = {};
   if (repo.path) {
@@ -33103,7 +33077,7 @@ var WorkspacePoolManager = class {
       }
       const slotExists = existsSync3(slotPath);
       if (slotExists) {
-        await this.resetSlot(slotPath, templatePath, repos, poolReset);
+        await this.resetSlot(slotPath, templatePath, repos, options.repoManager, poolReset);
         return {
           index: i,
           path: slotPath,
@@ -33235,20 +33209,9 @@ var WorkspacePoolManager = class {
    * 1. Reset repos to their declared checkout, then git clean per repo
    * 2. Re-copy template files (skip repo directories)
    */
-  async resetSlot(slotPath, templatePath, repos, poolReset = "fast") {
-    for (const repo of repos) {
-      if (!repo.path || !repo.repo) continue;
-      const repoDir = path35.join(slotPath, repo.path);
-      if (!existsSync3(repoDir)) {
-        continue;
-      }
-      if (poolReset === "none") {
-        continue;
-      }
-      const ref = getRepoCheckoutRef(repo);
-      await git(["reset", "--hard", ref], { cwd: repoDir });
-      const cleanFlag = poolReset === "strict" ? "-fdx" : "-fd";
-      await git(["clean", cleanFlag], { cwd: repoDir });
+  async resetSlot(slotPath, templatePath, repos, repoManager, poolReset = "fast") {
+    if (poolReset !== "none") {
+      await repoManager.reset(repos, slotPath, poolReset);
     }
     if (templatePath) {
       const repoDirNames = new Set(
@@ -33450,12 +33413,12 @@ function discoverProjects(rootDir, maxDepth = 2) {
   scan(absRoot, 0);
   return results.sort();
 }
-var execFileAsync2 = promisify6(execFile2);
+var execFileAsync = promisify5(execFile);
 var DEFAULT_TIMEOUT_MS2 = 3e5;
 var DEFAULT_HEARTBEAT_MS = 3e4;
 var ERROR_OUTPUT_LIMIT = 1024 * 1024;
 var LOCK_POLL_MS = 100;
-function gitEnv2() {
+function gitEnv() {
   const env = { ...process.env };
   for (const key of Object.keys(env)) {
     if (key.startsWith("GIT_") && key !== "GIT_SSH_COMMAND") {
@@ -33506,11 +33469,11 @@ function expandHome(value) {
   if (value.startsWith("~/")) return path37.join(process.env.HOME ?? "~", value.slice(2));
   return value;
 }
-async function git2(args, opts) {
-  const { stdout } = await execFileAsync2("git", args, {
+async function git(args, opts) {
+  const { stdout } = await execFileAsync("git", args, {
     cwd: opts?.cwd,
     timeout: opts?.timeout ?? DEFAULT_TIMEOUT_MS2,
-    env: gitEnv2(),
+    env: gitEnv(),
     maxBuffer: 50 * 1024 * 1024
   });
   return stdout.trim();
@@ -33532,7 +33495,7 @@ var RepoManager = class {
       console.log(`[repo] git start cwd=${opts?.cwd ?? process.cwd()} args=${args.join(" ")}`);
     }
     try {
-      const output = await git2(args, { ...opts, timeout: opts?.timeout ?? this.timeoutMs });
+      const output = await git(args, { ...opts, timeout: opts?.timeout ?? this.timeoutMs });
       if (this.verbose) {
         console.log(`[repo] git ok durationMs=${Date.now() - startedAt} args=${args.join(" ")}`);
       }
@@ -33560,7 +33523,7 @@ var RepoManager = class {
       let timedOut = false;
       const child = spawn5("git", args, {
         cwd: opts.cwd,
-        env: gitEnv2(),
+        env: gitEnv(),
         stdio: ["ignore", "pipe", "pipe"]
       });
       let timeoutHandle;
@@ -33793,6 +33756,20 @@ ${output}` : ""}`
     }
     throw new Error(`Cannot resolve ref '${ref}' to a commit.`);
   }
+  async resolveCheckoutCommit(repo, targetDir) {
+    const ref = getRepoCheckoutRef(repo);
+    const checkoutSha = await this.resolveCommit(ref, targetDir);
+    const ancestor = repo.ancestor ?? 0;
+    if (ancestor === 0) {
+      return checkoutSha;
+    }
+    try {
+      return await this.resolveCommit(`${checkoutSha}~${ancestor}`, targetDir);
+    } catch {
+      const shallowHint = isFullCommitSha(ref) ? "" : " Ensure the declared commit has enough reachable history in the selected repo.";
+      throw new Error(`Cannot resolve ancestor ${ancestor} of ref '${ref}'.${shallowHint}`);
+    }
+  }
   assertNoUserOwnedAlternates(targetDir, acquisition) {
     const alternatesPath = path37.join(targetDir, ".git", "objects", "info", "alternates");
     if (!existsSync5(alternatesPath)) return;
@@ -33883,18 +33860,8 @@ ${output}` : ""}`
     if (this.verbose) {
       console.log(`[repo] checkout path=${repo.path} ref=${ref}`);
     }
-    const checkoutSha = await this.resolveCommit(ref, targetDir);
+    const checkoutSha = await this.resolveCheckoutCommit(repo, targetDir);
     await this.runGit(["checkout", "--detach", checkoutSha], { cwd: targetDir });
-    const ancestor = repo.ancestor ?? 0;
-    if (ancestor > 0) {
-      try {
-        const ancestorSha = await this.resolveCommit(`HEAD~${ancestor}`, targetDir);
-        await this.runGit(["checkout", "--detach", ancestorSha], { cwd: targetDir });
-      } catch {
-        const shallowHint = isFullCommitSha(ref) ? "" : " Ensure the declared commit has enough reachable history in the selected repo.";
-        throw new Error(`Cannot resolve ancestor ${ancestor} of ref '${ref}'.${shallowHint}`);
-      }
-    }
     if (this.verbose) {
       console.log(
         `[repo] materialize done path=${repo.path} target=${targetDir} durationMs=${Date.now() - startedAt}`
@@ -33922,8 +33889,7 @@ ${output}` : ""}`
     for (const repo of repos) {
       if (!repo.path || !repo.repo) continue;
       const targetDir = path37.join(workspacePath, repo.path);
-      const ref = getRepoCheckoutRef(repo);
-      const resetSha = await this.resolveCommit(ref, targetDir);
+      const resetSha = await this.resolveCheckoutCommit(repo, targetDir);
       await this.runGit(["reset", "--hard", resetSha], { cwd: targetDir });
       await this.runGit(["clean", cleanFlag], { cwd: targetDir });
     }
@@ -37438,7 +37404,7 @@ async function loadTestSuite(evalFilePath, repoRoot, options) {
     return { tests: await loadTestsFromAgentSkills(evalFilePath) };
   }
   if (format === "typescript") {
-    const { loadTsEvalSuite: loadTsEvalSuite2 } = await import("./ts-eval-loader-XXZBXY7L-RLXQGTHS.js");
+    const { loadTsEvalSuite: loadTsEvalSuite2 } = await import("./ts-eval-loader-TJT6BGFF-DI7XNSO4.js");
     return loadTsEvalSuite2(evalFilePath, resolveToAbsolutePath(repoRoot), options);
   }
   const { tests, parsed, suiteWorkspacePath } = await loadTestsFromYaml(
@@ -37473,7 +37439,7 @@ async function loadTests(evalFilePath, repoRoot, options) {
     return loadTestsFromAgentSkills(evalFilePath);
   }
   if (format === "typescript") {
-    const { loadTsEvalSuite: loadTsEvalSuite2 } = await import("./ts-eval-loader-XXZBXY7L-RLXQGTHS.js");
+    const { loadTsEvalSuite: loadTsEvalSuite2 } = await import("./ts-eval-loader-TJT6BGFF-DI7XNSO4.js");
     const suite = await loadTsEvalSuite2(evalFilePath, resolveToAbsolutePath(repoRoot), options);
     return suite.tests;
   }
@@ -38200,7 +38166,7 @@ ${detailBlock}${ANSI_RESET8}`);
     console.error(`${ANSI_RED3}Error: ${message}${ANSI_RESET8}`);
   }
 }
-var execFileAsync3 = promisify7(execFile3);
+var execFileAsync2 = promisify6(execFile2);
 var WORKSPACE_GIT_TIMEOUT_MS = 3e5;
 function pathFromRoot(root) {
   return root instanceof URL ? fileURLToPath5(root) : String(root);
@@ -38267,8 +38233,8 @@ async function resetWorkspaceRoot(workspacePath, resetMode, baselineRef) {
     env: workspaceGitEnv(),
     maxBuffer: 50 * 1024 * 1024
   };
-  await execFileAsync3("git", ["reset", "--hard", baselineRef ?? "HEAD"], opts);
-  await execFileAsync3("git", ["clean", cleanFlag], opts);
+  await execFileAsync2("git", ["reset", "--hard", baselineRef ?? "HEAD"], opts);
+  await execFileAsync2("git", ["clean", cleanFlag], opts);
   return true;
 }
 function validateDependencyGraph(tests) {
@@ -41185,15 +41151,15 @@ function computeWeightedMean(entries) {
   return totalWeight > 0 ? weightedSum / totalWeight : 0;
 }
 async function runPreflightChecks(env, cwd, log) {
-  const execFileAsync4 = promisify7(execFile3);
+  const execFileAsync3 = promisify6(execFile2);
   const missing = [];
   for (const cmd of env.required_commands ?? []) {
     log(`preflight: checking command "${cmd}"`);
     try {
       if (process.platform === "win32") {
-        await execFileAsync4("where", [cmd], { cwd });
+        await execFileAsync3("where", [cmd], { cwd });
       } else {
-        await execFileAsync4("sh", ["-c", `command -v ${cmd}`], { cwd });
+        await execFileAsync3("sh", ["-c", `command -v ${cmd}`], { cwd });
       }
     } catch {
       missing.push(`command: ${cmd}`);
@@ -41202,7 +41168,7 @@ async function runPreflightChecks(env, cwd, log) {
   for (const mod of env.required_python_modules ?? []) {
     log(`preflight: checking Python module "${mod}"`);
     try {
-      await execFileAsync4("python3", ["-c", `import ${mod}`], { cwd });
+      await execFileAsync3("python3", ["-c", `import ${mod}`], { cwd });
     } catch {
       missing.push(`python module: ${mod}`);
     }
@@ -41842,4 +41808,4 @@ export {
   loadTsEvalFile,
   loadTsEvalSuite
 };
-//# sourceMappingURL=chunk-3KEVTQRM.js.map
+//# sourceMappingURL=chunk-VBHHZQS6.js.map