@tamsensedev/runner 0.5.1 → 0.6.0

package/dist/cli.js

@@ -187,7 +187,7 @@ function findNpm(nodePath, env, exists) {
   }
   return null;
 }
-var runProcess = (command, args, options) => new Promise((resolve, reject) => {
+var runProcess = (command, args, options) => new Promise((resolve2, reject) => {
   const child = spawn(command, args, { cwd: options.cwd, env: options.env, stdio: ["ignore", "pipe", "pipe"], windowsHide: true });
   const tail = [];
   for (const stream of [child.stdout, child.stderr]) {
@@ -201,7 +201,7 @@ var runProcess = (command, args, options) => new Promise((resolve, reject) => {
     });
   }
   child.on("error", reject);
-  child.on("close", (code) => resolve({ code: code ?? 1, output: tail.join("\n") }));
+  child.on("close", (code) => resolve2({ code: code ?? 1, output: tail.join("\n") }));
 });
 function failureText(what, result) {
   if (OFFLINE_PATTERN.test(result.output)) {
@@ -314,8 +314,8 @@ async function probeCapabilities(stop) {
   stop?.throwIfAborted();
   let release = () => {
   };
-  const released = new Promise((resolve) => {
-    release = resolve;
+  const released = new Promise((resolve2) => {
+    release = resolve2;
   });
   const nothing = {
     [Symbol.asyncIterator]: () => ({
@@ -653,8 +653,8 @@ function inputChannel(options = {}) {
       }
       const next = queue.shift();
       if (!next) {
-        await new Promise((resolve) => {
-          wake = resolve;
+        await new Promise((resolve2) => {
+          wake = resolve2;
         });
         continue;
       }
@@ -714,9 +714,9 @@ function inputChannel(options = {}) {
     onSwitch(apply) {
       applySwitch2 = apply;
       if (waitingSwitch) {
-        const { change, resolve } = waitingSwitch;
+        const { change, resolve: resolve2 } = waitingSwitch;
         waitingSwitch = null;
-        void apply(change).then(() => resolve(true), () => resolve(false));
+        void apply(change).then(() => resolve2(true), () => resolve2(false));
       }
     },
     close,
@@ -763,8 +763,8 @@ function inputChannel(options = {}) {
       const earlier = waitingSwitch;
       earlier?.resolve(false);
       const merged = { model: change.model ?? earlier?.change.model ?? null, effort: change.effort ?? earlier?.change.effort ?? null };
-      return new Promise((resolve) => {
-        waitingSwitch = { change: merged, resolve };
+      return new Promise((resolve2) => {
+        waitingSwitch = { change: merged, resolve: resolve2 };
       });
     }
   };
@@ -1048,6 +1048,206 @@ function specPromptText(spec) {
   ].filter(Boolean).join("\n\n");
 }
 
+// src/workspace.ts
+import { existsSync as existsSync2 } from "fs";
+import { rm as rm2 } from "fs/promises";
+import { join as join2, resolve } from "path";
+
+// src/git.ts
+import { Buffer } from "buffer";
+import { spawn as spawn2 } from "child_process";
+var GITHUB_ORIGIN = "https://github.com/";
+function githubAuthEnv(token) {
+  const credentials = Buffer.from(`x-access-token:${token}`).toString("base64");
+  return {
+    GIT_CONFIG_COUNT: "1",
+    GIT_CONFIG_KEY_0: `http.${GITHUB_ORIGIN}.extraheader`,
+    GIT_CONFIG_VALUE_0: `AUTHORIZATION: basic ${credentials}`,
+    GIT_TERMINAL_PROMPT: "0"
+  };
+}
+function runGit(args, options) {
+  const env = { ...process.env, ...options.env, ...options.token ? githubAuthEnv(options.token) : {} };
+  return new Promise((resolve2, reject) => {
+    const child = spawn2("git", args, { cwd: options.cwd, env, stdio: ["ignore", "pipe", "pipe"] });
+    let stdout = "";
+    let stderr = "";
+    child.stdout.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    child.stderr.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    child.on("error", reject);
+    child.on("close", (code) => resolve2({ code: code ?? 1, stdout: stdout.trim(), stderr: stderr.trim() }));
+  });
+}
+async function git(args, options) {
+  const result = await runGit(args, options);
+  if (result.code !== 0) {
+    throw new Error(`git ${args[0]} failed: ${result.stderr || result.stdout || `exit code ${result.code}`}`);
+  }
+  return result.stdout;
+}
+
+// src/lock.ts
+function keyedLock() {
+  const tails = /* @__PURE__ */ new Map();
+  return {
+    async run(key, work2) {
+      const previous = tails.get(key) ?? Promise.resolve();
+      let release = () => {
+      };
+      const done2 = new Promise((resolve2) => {
+        release = resolve2;
+      });
+      const tail = previous.then(() => done2);
+      tails.set(key, tail);
+      await previous;
+      try {
+        return await work2();
+      } finally {
+        release();
+        if (tails.get(key) === tail) {
+          tails.delete(key);
+        }
+      }
+    }
+  };
+}
+
+// src/workspace.ts
+var FALLBACK_IDENTITY = { name: "TAMsense", email: "noreply@tamsense.com" };
+var cacheLock = keyedLock();
+function githubRemoteUrl(fullName) {
+  return `https://github.com/${fullName}.git`;
+}
+function tamsenseFolder(home, ...parts) {
+  return join2(home, ".tamsense", ...parts);
+}
+function folderNames(repositories) {
+  const shortName = (fullName) => fullName.split("/").pop() ?? fullName;
+  const counts = /* @__PURE__ */ new Map();
+  for (const repository of repositories) {
+    counts.set(shortName(repository.fullName), (counts.get(shortName(repository.fullName)) ?? 0) + 1);
+  }
+  return repositories.map((repository) => counts.get(shortName(repository.fullName)) === 1 ? shortName(repository.fullName) : repository.fullName.replace("/", "__"));
+}
+async function refreshCache(cache, repository, token, tools) {
+  if (existsSync2(join2(cache, ".git"))) {
+    await git(["fetch", "--prune", "origin"], { cwd: cache, token });
+    return;
+  }
+  await git(["clone", "--no-checkout", tools.remoteUrl(repository.fullName), cache], { cwd: tools.home, token });
+}
+async function removeWorktree(cache, path) {
+  await runGit(["worktree", "remove", "--force", path], { cwd: cache });
+  await rm2(path, { recursive: true, force: true });
+  await git(["worktree", "prune"], { cwd: cache });
+}
+function stepFolder(job) {
+  const task = `task-${job.taskId}`;
+  return typeof job.stage.columnId === "number" ? [task, `step-${job.stage.columnId}`] : [task];
+}
+function isReadOnlyCheck(job) {
+  return job.stage.kind === "review" || job.stage.kind === "test";
+}
+function branchHolders(porcelain, branch) {
+  const holders = [];
+  let path = null;
+  for (const line of porcelain.split("\n").map((text2) => text2.trim())) {
+    if (line.startsWith("worktree ")) {
+      path = line.slice("worktree ".length);
+    } else if (path && line === `branch refs/heads/${branch}`) {
+      holders.push(path);
+    }
+  }
+  return holders;
+}
+async function releaseBranch(cache, branch, keep) {
+  const listed = await runGit(["worktree", "list", "--porcelain"], { cwd: cache });
+  for (const path of branchHolders(listed.stdout, branch).filter((holder) => resolve(holder) !== resolve(keep))) {
+    await removeWorktree(cache, path);
+  }
+}
+async function baseRef(cache, job, repository) {
+  const pushed = await runGit(["rev-parse", "--verify", "--quiet", `refs/remotes/origin/${job.branch}`], { cwd: cache });
+  return pushed.code === 0 ? `origin/${job.branch}` : `origin/${repository.defaultBranch}`;
+}
+async function keptBase(cache, path, job, repository) {
+  if (!job.keepWorkspace || !existsSync2(join2(path, ".git"))) {
+    return null;
+  }
+  const branch = await runGit(["rev-parse", "--abbrev-ref", "HEAD"], { cwd: path });
+  if (branch.code !== 0 || branch.stdout !== (isReadOnlyCheck(job) ? "HEAD" : job.branch)) {
+    return null;
+  }
+  return git(["rev-parse", await baseRef(cache, job, repository)], { cwd: cache });
+}
+async function prepareWorkspace(job, token, tools) {
+  const root = tamsenseFolder(tools.home, "work", ...stepFolder(job));
+  const folders = folderNames(job.repositories);
+  const repositories = [];
+  for (const [index, repository] of job.repositories.entries()) {
+    const cache = tamsenseFolder(tools.home, "repos", repository.fullName.replace("/", "__"));
+    const folder = folders[index] ?? repository.fullName;
+    const path = join2(root, folder);
+    const baseSha = await cacheLock.run(repository.fullName, async () => {
+      await refreshCache(cache, repository, token, tools);
+      const kept = await keptBase(cache, path, job, repository);
+      if (kept) {
+        return kept;
+      }
+      await removeWorktree(cache, path);
+      const base = await baseRef(cache, job, repository);
+      if (isReadOnlyCheck(job)) {
+        await git(["worktree", "add", "--force", "--detach", path, base], { cwd: cache });
+      } else {
+        await releaseBranch(cache, job.branch, path);
+        await git(["worktree", "add", "--force", "-B", job.branch, path, base], { cwd: cache });
+      }
+      return git(["rev-parse", "HEAD"], { cwd: path });
+    });
+    repositories.push({ fullName: repository.fullName, folder, path, baseSha });
+  }
+  return { root, repositories };
+}
+async function commitIdentityEnv(home) {
+  const configured = await runGit(["config", "--get", "user.email"], { cwd: home });
+  if (configured.code === 0 && configured.stdout) {
+    return {};
+  }
+  return {
+    GIT_AUTHOR_NAME: FALLBACK_IDENTITY.name,
+    GIT_AUTHOR_EMAIL: FALLBACK_IDENTITY.email,
+    GIT_COMMITTER_NAME: FALLBACK_IDENTITY.name,
+    GIT_COMMITTER_EMAIL: FALLBACK_IDENTITY.email
+  };
+}
+async function publishWorkspace(workspace, job, token, identity) {
+  const pushed = [];
+  for (const repository of workspace.repositories) {
+    const options = { cwd: repository.path, env: identity };
+    const sha = await cacheLock.run(repository.fullName, async () => {
+      await git(["add", "--all"], options);
+      const hasStaged = (await runGit(["diff", "--cached", "--quiet"], options)).code === 1;
+      if (hasStaged) {
+        await git(["commit", "--message", `Task #${job.taskId}: ${job.title}`], options);
+      }
+      const newCommits = Number(await git(["rev-list", "--count", `${repository.baseSha}..HEAD`], options));
+      if (newCommits === 0) {
+        return null;
+      }
+      await git(["push", "origin", `HEAD:refs/heads/${job.branch}`], { ...options, token });
+      return git(["rev-parse", "HEAD"], options);
+    });
+    if (sha) {
+      pushed.push({ repository: repository.fullName, branch: job.branch, sha });
+    }
+  }
+  return pushed;
+}
+
 // src/prompt.ts
 var VERDICT_TOOL_NAME = "submit_verdict";
 var SCREENSHOT_TOOL_NAME = "attach_screenshot";
@@ -1081,8 +1281,11 @@ var NAMING_RULE = 'Name everything you attach (screenshots, replays, videos) by
 var RECORDING_RULE = `Every browser you open with Playwright from Node is recorded for the task as a replay people can watch, requests from the tested site to the TAMsense tracker are blocked, so your runs never reach analytics, and requests other than GET, HEAD and OPTIONS to addresses outside this computer are aborted. In every browser script, load the recorder from the TAMSENSE_RECORDER environment variable (require(process.env.TAMSENSE_RECORDER), or createRequire(import.meta.url)(process.env.TAMSENSE_RECORDER) in an .mjs script), open each context with await recorder.newRecordedContext(browser, { title, purpose, context: { viewport } }), call await recorder.mark(page, 'what just happened') at every meaningful step, and end with await recorder.closeRecorded(context). Add video: true when the page has a canvas, a map, a video player or iframes from another site (a replay cannot show them), or when someone asks for a video. Recordings are attached to the task when the run ends; ${REPLAY_TOOL_NAME} and ${VIDEO_TOOL_NAME} attach one earlier with a better title.`;
 var BROWSER_RULE = "A headless browser is installed for interface checks. If the project has no Playwright of its own, load playwright-core from the folder in the TAMSENSE_PLAYWRIGHT environment variable, with PLAYWRIGHT_BROWSERS_PATH set to the folder in TAMSENSE_PLAYWRIGHT_BROWSERS.";
 var DEPENDENCIES_RULE = "The checkout may have no dependencies installed. To run the app or its tests, install the project's own dependencies from its lockfile with its package manager (pnpm install --frozen-lockfile, npm ci, yarn install --immutable and similar). Never add packages, change a lockfile or download browsers.";
-function localAppRule(taskId, isCheck, canAsk) {
-  const project = `tamsense-task-${taskId}`;
+function composeProjectName(job) {
+  return ["tamsense", ...stepFolder(job)].join("-");
+}
+function localAppRule(job, isCheck, canAsk) {
+  const project = composeProjectName(job);
   const cannotRun = isCheck ? `call ${VERDICT_TOOL_NAME} with passed false and couldNotRun true, write the exact reason and what a person should do in the report, and do not hand off: the task waits on this step for a person.` : "say so in your report with the exact reason and what a person should do.";
   return [
     "When you need the running app, start a local copy from this task folder only.",
@@ -1258,7 +1461,7 @@ ${job.review}`,
     teamMessagesText(job.messages)
   ].filter(Boolean).join("\n\n");
   const evidence = [SCREENSHOT_RULE, ...options.recorder ? [RECORDING_RULE] : [], NAMING_RULE];
-  const localApp = localAppRule(job.taskId, isCheck, canAsk);
+  const localApp = localAppRule(job, isCheck, canAsk);
   const rules = isCheck ? [...CHECK_RULES, DEPENDENCIES_RULE, localApp, ...evidence] : [...CODE_RULES, ...job.review ? [REWORK_RULE] : [], DEPENDENCIES_RULE, localApp, ...evidence, CODE_REPORT_RULE];
   const instructions = [
     canAsk ? ASKING_RULE : UNATTENDED_RULE,
@@ -1267,7 +1470,7 @@ ${job.review}`,
     stepLine(job.stage),
     job.stage.instructions,
     contextText(job.projectContext),
-    `The repositories for this task are checked out in the current folder, one subfolder each, on branch ${job.branch}:
+    `The repositories for this task are checked out in the current folder, one subfolder each, ${isCheck ? "at the latest commit of branch" : "on branch"} ${job.branch}:
 ${bulletList(repositoryLines(job, workspace))}`,
     `How to work:
 ${bulletList(rules)}`,
@@ -1778,13 +1981,13 @@ function claudeRunner(startQuery) {
 var runClaude = claudeRunner(query2);
 
 // src/config.ts
-import { mkdir as mkdir2, readFile as readFile2, rm as rm2, writeFile as writeFile2 } from "fs/promises";
+import { mkdir as mkdir2, readFile as readFile2, rm as rm3, writeFile as writeFile2 } from "fs/promises";
 import { homedir as homedir2 } from "os";
-import { dirname as dirname2, join as join2 } from "path";
+import { dirname as dirname2, join as join3 } from "path";
 var OWNER_ONLY_FILE = 384;
 var OWNER_ONLY_FOLDER = 448;
 function configPath(home = homedir2()) {
-  return join2(home, ".tamsense", "runner.json");
+  return join3(home, ".tamsense", "runner.json");
 }
 function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -1816,7 +2019,7 @@ async function writeConfig(config, path = configPath()) {
 `, { mode: OWNER_ONLY_FILE });
 }
 async function removeConfig(path = configPath()) {
-  await rm2(path, { force: true });
+  await rm3(path, { force: true });
 }
 
 // src/protocol.ts
@@ -1870,14 +2073,14 @@ async function login(tools, request) {
 }
 
 // src/recorderEnv.ts
-import { existsSync as existsSync2 } from "fs";
-import { join as join4 } from "path";
+import { existsSync as existsSync3 } from "fs";
+import { join as join5 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
 // src/recorder.ts
 import { appendFileSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import Module, { createRequire } from "module";
-import { basename, dirname as dirname3, join as join3 } from "path";
+import { basename, dirname as dirname3, join as join4 } from "path";
 import process2 from "process";
 var RECORDINGS_DIR_ENV = "TAMSENSE_RECORDINGS_DIR";
 var SERVER_ENV = "TAMSENSE_SERVER";
@@ -1958,7 +2161,7 @@ function automaticCaption(env = process2.env, script2 = process2.argv[1]) {
 }
 function rrwebSource() {
   const entry = createRequire(import.meta.url).resolve("rrweb");
-  return readFileSync(join3(dirname3(entry), "rrweb.umd.min.cjs"), "utf8");
+  return readFileSync(join4(dirname3(entry), "rrweb.umd.min.cjs"), "utf8");
 }
 function pageScript(rrweb) {
   return `(() => {
@@ -2009,8 +2212,8 @@ var Session = class {
   bytes = 0;
   constructor(dir, recording, url) {
     const id = `${Date.now().toString(36)}-${Math.random().toString(16).slice(2, 8)}`;
-    this.file = join3(dir, `${id}${REPLAY_SUFFIX}`);
-    this.metaFile = join3(dir, `${id}${META_SUFFIX}`);
+    this.file = join4(dir, `${id}${REPLAY_SUFFIX}`);
+    this.metaFile = join4(dir, `${id}${META_SUFFIX}`);
     this.meta = { version: 1, id, ...recording.caption, startedAt: Date.now(), endedAt: null, url, marks: [], video: null, gaps: [], blockedTrackerRequests: 0, blockedExternalWrites: 0, truncated: false, automatic: recording.automatic };
     writeFileSync(this.file, "");
     this.save();
@@ -2183,10 +2386,10 @@ if (process2.env[RECORDINGS_DIR_ENV]) {
 var RECORDER_ENV = "TAMSENSE_RECORDER";
 function bundledRecorder() {
   const path = fileURLToPath2(new URL("./recorder.cjs", import.meta.url));
-  return existsSync2(path) ? path : null;
+  return existsSync3(path) ? path : null;
 }
 function recordingsFolder(home, runId) {
-  return join4(home, ".tamsense", "recordings", `run-${runId}`);
+  return join5(home, ".tamsense", "recordings", `run-${runId}`);
 }
 function nodeOptionsWithRecorder(recorder, nodeOptions) {
   return [nodeOptions?.trim(), `--require "${recorder.replaceAll("\\", "/")}"`].filter(Boolean).join(" ");
@@ -2213,7 +2416,7 @@ function describeDevice(identity) {
 }
 
 // src/system.ts
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 import { hostname } from "os";
 import { delimiter as delimiter2 } from "path";
 import { setTimeout as wait } from "timers/promises";
@@ -2237,7 +2440,7 @@ function browserCommand(url, platform) {
 }
 function openBrowser(url, platform = process.platform) {
   const [command, args] = browserCommand(url, platform);
-  const child = spawn2(command, args, { detached: true, stdio: "ignore" });
+  const child = spawn3(command, args, { detached: true, stdio: "ignore" });
   child.on("error", () => {
   });
   child.unref();
@@ -2257,7 +2460,7 @@ async function sleep(ms, signal) {
 }
 
 // src/update.ts
-import { spawn as spawn3 } from "child_process";
+import { spawn as spawn4 } from "child_process";
 import { readFileSync as readFileSync2 } from "fs";
 import process3 from "process";
 var PACKAGE_NAME = "@tamsensedev/runner";
@@ -2312,8 +2515,8 @@ function relaunchArgs(argv) {
 }
 function relaunch(argv, env) {
   const isWindows = process3.platform === "win32";
-  return new Promise((resolve, reject) => {
-    const child = spawn3(isWindows ? "npx.cmd" : "npx", relaunchArgs(argv), { stdio: "inherit", shell: isWindows, env: { ...env, [RELAUNCHED_ENV]: "1" } });
+  return new Promise((resolve2, reject) => {
+    const child = spawn4(isWindows ? "npx.cmd" : "npx", relaunchArgs(argv), { stdio: "inherit", shell: isWindows, env: { ...env, [RELAUNCHED_ENV]: "1" } });
     const ignoreInterrupt = () => {
     };
     process3.on("SIGINT", ignoreInterrupt);
@@ -2323,7 +2526,7 @@ function relaunch(argv, env) {
     });
     child.on("close", (code) => {
       process3.off("SIGINT", ignoreInterrupt);
-      resolve(code ?? 1);
+      resolve2(code ?? 1);
     });
   });
 }
@@ -2369,37 +2572,11 @@ function feedQueue(send) {
   };
 }
 
-// src/lock.ts
-function keyedLock() {
-  const tails = /* @__PURE__ */ new Map();
-  return {
-    async run(key, work2) {
-      const previous = tails.get(key) ?? Promise.resolve();
-      let release = () => {
-      };
-      const done2 = new Promise((resolve) => {
-        release = resolve;
-      });
-      const tail = previous.then(() => done2);
-      tails.set(key, tail);
-      await previous;
-      try {
-        return await work2();
-      } finally {
-        release();
-        if (tails.get(key) === tail) {
-          tails.delete(key);
-        }
-      }
-    }
-  };
-}
-
 // src/recordings.ts
 import { randomUUID } from "crypto";
 import { createReadStream } from "fs";
 import { readdir, readFile as readFile3, stat, writeFile as writeFile3 } from "fs/promises";
-import { basename as basename2, dirname as dirname4, extname, isAbsolute, join as join5 } from "path";
+import { basename as basename2, dirname as dirname4, extname, isAbsolute, join as join6 } from "path";
 import { createInterface as createInterface2 } from "readline";
 import { Readable } from "stream";
 import { promisify } from "util";
@@ -2471,12 +2648,12 @@ async function readMeta(file) {
 }
 async function metaFor(kind, file) {
   if (kind === "replay") {
-    return readMeta(join5(dirname4(file), `${sessionIdOf(file)}${META_SUFFIX}`));
+    return readMeta(join6(dirname4(file), `${sessionIdOf(file)}${META_SUFFIX}`));
   }
   const folder = basename2(dirname4(file)) === "video" ? dirname4(dirname4(file)) : dirname4(file);
   for (const name of await readdir(folder).catch(() => [])) {
     if (name.endsWith(META_SUFFIX) && name !== LEDGER_FILE) {
-      const meta = await readMeta(join5(folder, name));
+      const meta = await readMeta(join6(folder, name));
       if (meta?.video === file) {
         return meta;
       }
@@ -2486,7 +2663,7 @@ async function metaFor(kind, file) {
 }
 async function ledger(dir) {
   try {
-    return new Set(JSON.parse(await readFile3(join5(dir, LEDGER_FILE), "utf8")));
+    return new Set(JSON.parse(await readFile3(join6(dir, LEDGER_FILE), "utf8")));
   } catch {
     return /* @__PURE__ */ new Set();
   }
@@ -2494,7 +2671,7 @@ async function ledger(dir) {
 async function remember(dir, file) {
   const done2 = await ledger(dir);
   done2.add(file);
-  await writeFile3(join5(dir, LEDGER_FILE), JSON.stringify([...done2]));
+  await writeFile3(join6(dir, LEDGER_FILE), JSON.stringify([...done2]));
 }
 async function nonEmpty(file) {
   return file !== null && ((await stat(file).catch(() => null))?.size ?? 0) > 0;
@@ -2507,8 +2684,8 @@ async function pendingRecordings(dir) {
     if (!name.endsWith(META_SUFFIX) || name === LEDGER_FILE) {
       continue;
     }
-    const meta = await readMeta(join5(dir, name));
-    const replay = join5(dir, `${name.slice(0, -META_SUFFIX.length)}${REPLAY_SUFFIX}`);
+    const meta = await readMeta(join6(dir, name));
+    const replay = join6(dir, `${name.slice(0, -META_SUFFIX.length)}${REPLAY_SUFFIX}`);
     if (!done2.has(replay) && await nonEmpty(replay)) {
       pending.push({ kind: "replay", file: replay, meta });
     }
@@ -2650,149 +2827,6 @@ async function readScreenshot(request) {
   return { name: basename3(request.path), ...caption, contentType, data };
 }
 
-// src/workspace.ts
-import { existsSync as existsSync3 } from "fs";
-import { rm as rm3 } from "fs/promises";
-import { join as join6 } from "path";
-
-// src/git.ts
-import { Buffer } from "buffer";
-import { spawn as spawn4 } from "child_process";
-var GITHUB_ORIGIN = "https://github.com/";
-function githubAuthEnv(token) {
-  const credentials = Buffer.from(`x-access-token:${token}`).toString("base64");
-  return {
-    GIT_CONFIG_COUNT: "1",
-    GIT_CONFIG_KEY_0: `http.${GITHUB_ORIGIN}.extraheader`,
-    GIT_CONFIG_VALUE_0: `AUTHORIZATION: basic ${credentials}`,
-    GIT_TERMINAL_PROMPT: "0"
-  };
-}
-function runGit(args, options) {
-  const env = { ...process.env, ...options.env, ...options.token ? githubAuthEnv(options.token) : {} };
-  return new Promise((resolve, reject) => {
-    const child = spawn4("git", args, { cwd: options.cwd, env, stdio: ["ignore", "pipe", "pipe"] });
-    let stdout = "";
-    let stderr = "";
-    child.stdout.on("data", (chunk) => {
-      stdout += chunk.toString();
-    });
-    child.stderr.on("data", (chunk) => {
-      stderr += chunk.toString();
-    });
-    child.on("error", reject);
-    child.on("close", (code) => resolve({ code: code ?? 1, stdout: stdout.trim(), stderr: stderr.trim() }));
-  });
-}
-async function git(args, options) {
-  const result = await runGit(args, options);
-  if (result.code !== 0) {
-    throw new Error(`git ${args[0]} failed: ${result.stderr || result.stdout || `exit code ${result.code}`}`);
-  }
-  return result.stdout;
-}
-
-// src/workspace.ts
-var FALLBACK_IDENTITY = { name: "TAMsense", email: "noreply@tamsense.com" };
-var cacheLock = keyedLock();
-function githubRemoteUrl(fullName) {
-  return `https://github.com/${fullName}.git`;
-}
-function tamsenseFolder(home, ...parts) {
-  return join6(home, ".tamsense", ...parts);
-}
-function folderNames(repositories) {
-  const shortName = (fullName) => fullName.split("/").pop() ?? fullName;
-  const counts = /* @__PURE__ */ new Map();
-  for (const repository of repositories) {
-    counts.set(shortName(repository.fullName), (counts.get(shortName(repository.fullName)) ?? 0) + 1);
-  }
-  return repositories.map((repository) => counts.get(shortName(repository.fullName)) === 1 ? shortName(repository.fullName) : repository.fullName.replace("/", "__"));
-}
-async function refreshCache(cache, repository, token, tools) {
-  if (existsSync3(join6(cache, ".git"))) {
-    await git(["fetch", "--prune", "origin"], { cwd: cache, token });
-    return;
-  }
-  await git(["clone", "--no-checkout", tools.remoteUrl(repository.fullName), cache], { cwd: tools.home, token });
-}
-async function removeWorktree(cache, path) {
-  await runGit(["worktree", "remove", "--force", path], { cwd: cache });
-  await rm3(path, { recursive: true, force: true });
-  await git(["worktree", "prune"], { cwd: cache });
-}
-async function baseRef(cache, job, repository) {
-  const pushed = await runGit(["rev-parse", "--verify", "--quiet", `refs/remotes/origin/${job.branch}`], { cwd: cache });
-  return pushed.code === 0 ? `origin/${job.branch}` : `origin/${repository.defaultBranch}`;
-}
-async function keptBase(cache, path, job, repository) {
-  if (!job.keepWorkspace || !existsSync3(join6(path, ".git"))) {
-    return null;
-  }
-  const branch = await runGit(["rev-parse", "--abbrev-ref", "HEAD"], { cwd: path });
-  if (branch.code !== 0 || branch.stdout !== job.branch) {
-    return null;
-  }
-  return git(["rev-parse", await baseRef(cache, job, repository)], { cwd: cache });
-}
-async function prepareWorkspace(job, token, tools) {
-  const root = tamsenseFolder(tools.home, "work", `task-${job.taskId}`);
-  const folders = folderNames(job.repositories);
-  const repositories = [];
-  for (const [index, repository] of job.repositories.entries()) {
-    const cache = tamsenseFolder(tools.home, "repos", repository.fullName.replace("/", "__"));
-    const folder = folders[index] ?? repository.fullName;
-    const path = join6(root, folder);
-    const baseSha = await cacheLock.run(repository.fullName, async () => {
-      await refreshCache(cache, repository, token, tools);
-      const kept = await keptBase(cache, path, job, repository);
-      if (kept) {
-        return kept;
-      }
-      await removeWorktree(cache, path);
-      await git(["worktree", "add", "--force", "-B", job.branch, path, await baseRef(cache, job, repository)], { cwd: cache });
-      return git(["rev-parse", "HEAD"], { cwd: path });
-    });
-    repositories.push({ fullName: repository.fullName, folder, path, baseSha });
-  }
-  return { root, repositories };
-}
-async function commitIdentityEnv(home) {
-  const configured = await runGit(["config", "--get", "user.email"], { cwd: home });
-  if (configured.code === 0 && configured.stdout) {
-    return {};
-  }
-  return {
-    GIT_AUTHOR_NAME: FALLBACK_IDENTITY.name,
-    GIT_AUTHOR_EMAIL: FALLBACK_IDENTITY.email,
-    GIT_COMMITTER_NAME: FALLBACK_IDENTITY.name,
-    GIT_COMMITTER_EMAIL: FALLBACK_IDENTITY.email
-  };
-}
-async function publishWorkspace(workspace, job, token, identity) {
-  const pushed = [];
-  for (const repository of workspace.repositories) {
-    const options = { cwd: repository.path, env: identity };
-    const sha = await cacheLock.run(repository.fullName, async () => {
-      await git(["add", "--all"], options);
-      const hasStaged = (await runGit(["diff", "--cached", "--quiet"], options)).code === 1;
-      if (hasStaged) {
-        await git(["commit", "--message", `Task #${job.taskId}: ${job.title}`], options);
-      }
-      const newCommits = Number(await git(["rev-list", "--count", `${repository.baseSha}..HEAD`], options));
-      if (newCommits === 0) {
-        return null;
-      }
-      await git(["push", "origin", `HEAD:refs/heads/${job.branch}`], { ...options, token });
-      return git(["rev-parse", "HEAD"], options);
-    });
-    if (sha) {
-      pushed.push({ repository: repository.fullName, branch: job.branch, sha });
-    }
-  }
-  return pushed;
-}
-
 // src/worker.ts
 var POLL_INTERVAL_MS = 5e3;
 var RETRY_AFTER_ERROR_MS = 15e3;
@@ -3126,18 +3160,18 @@ async function reportCapabilities(tools, stop) {
   }
 }
 function jobTools(job, tools, parallel) {
-  return parallel > 1 ? { ...tools, print: (line) => tools.print(`[#${job.taskId}] ${line}`) } : tools;
+  return parallel > 1 ? { ...tools, print: (line) => tools.print(`[#${job.taskId} ${job.stage.name}] ${line}`) } : tools;
 }
 async function work(tools, stop, parallel = 1) {
   tools.print(parallel > 1 ? `Waiting for tasks, up to ${parallel} at once. Press Ctrl+C to stop.` : "Waiting for tasks. Press Ctrl+C to stop.");
   const halt = new AbortController();
   const stopAll = AbortSignal.any([stop, halt.signal]);
   const running = /* @__PURE__ */ new Set();
-  const taskLock = keyedLock();
+  const folderLock = keyedLock();
   const reporting = reportCapabilities(tools, stopAll);
   const start = (job) => {
     const runTools = jobTools(job, tools, parallel);
-    const task = taskLock.run(String(job.taskId), () => runJob(job, runTools, stopAll)).catch((error) => runTools.print(`The run stopped: ${messageOf3(error)}`)).finally(() => running.delete(task));
+    const task = folderLock.run(stepFolder(job).join("/"), () => runJob(job, runTools, stopAll)).catch((error) => runTools.print(`The run stopped: ${messageOf3(error)}`)).finally(() => running.delete(task));
     running.add(task);
   };
   try {