@sjawhar/pi-legion 9.8.1 → 9.8.2

package/dist/legion.js

@@ -15729,7 +15729,7 @@ function onEnvoyRoleRegained(listener) {
 // package.json
 var package_default = {
   name: "@sjawhar/pi-legion",
-  version: "9.8.1",
+  version: "9.8.2",
   license: "Apache-2.0",
   type: "module",
   omp: {
@@ -16515,6 +16515,45 @@ function createControllerSession(deps) {
 // src/handoff-commit.ts
 import { execFile as execFile2 } from "child_process";
 import { promisify as promisify2 } from "util";
+
+// src/git-lock.ts
+import { lstat } from "fs/promises";
+var GIT_LOCK_REPORTS = [
+  /The lockfile at '([^']+)' might need manual deletion/g,
+  /Unable to create '([^']+)': File exists/g
+];
+function age(ms) {
+  const total = Math.round(Math.abs(ms) / 1000);
+  const sign = ms < 0 && total > 0 ? "-" : "";
+  const hours = Math.floor(total / 3600);
+  const minutes = Math.floor(total % 3600 / 60);
+  const seconds = total % 60;
+  if (hours > 0)
+    return `${sign}${hours}h${minutes}m${seconds}s`;
+  if (minutes > 0)
+    return `${sign}${minutes}m${seconds}s`;
+  return `${sign}${seconds}s`;
+}
+async function staleGitLockNote(output, now = Date.now()) {
+  const locks = new Set;
+  for (const report of GIT_LOCK_REPORTS) {
+    for (const match of output.matchAll(report))
+      locks.add(match[1]);
+  }
+  const notes = [];
+  for (const lock of locks) {
+    const written = await lstat(lock).then((info) => info.mtimeMs, () => {
+      return;
+    });
+    if (written === undefined)
+      continue;
+    notes.push(`git lock ${lock} was last written ${age(now - written)} ago and blocks this command. Do not remove it while the issue's pod runs: another role's git, which this container cannot see, may hold it. Replacing the issue's pod removes it. Under the tmux runtime nothing removes it: remove it by hand only once no git or jj process on the host is using the repository.`);
+  }
+  return notes.join(`
+`);
+}
+
+// src/handoff-commit.ts
 var FILE_BACKED = {
   planning: { word: "plan", role: "planner" },
   implementing: { word: "implement", role: "implementer" },
@@ -16531,7 +16570,9 @@ var pathJj = async (args, cwd) => {
     return stdout.trim();
   } catch (error48) {
     const detail = error48 !== null && typeof error48 === "object" && "stderr" in error48 ? String(error48.stderr).trim() : error48 instanceof Error ? error48.message : String(error48);
-    throw new Error(`jj ${args.join(" ")} failed: ${detail}`);
+    const note = await staleGitLockNote(detail);
+    throw new Error(`jj ${args.join(" ")} failed: ${detail}${note === "" ? "" : `
+${note}`}`);
   }
 };
 function requiredVariable(env, name) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjawhar/pi-legion",
-  "version": "9.8.1",
+  "version": "9.8.2",
   "license": "Apache-2.0",
   "type": "module",
   "omp": {