@flumecode/runner 0.2.0 → 0.3.1

package/README.md

@@ -45,7 +45,8 @@ pnpm --filter @flumecode/runner dev login   # or: dev start
 
 `pnpm --filter @flumecode/runner build` produces the published single-file bundle
 (`dist/cli.js`); it is published to npm by the `release-runner` GitHub workflow
-when a `runner-v*` tag is pushed.
+when a GitHub Release is created (publishing the version in `package.json`, and
+skipping if that version is already on npm).
 
 ## What a job does
 

package/dist/cli.js

@@ -39,8 +39,34 @@ function readVersion() {
 }
 var RUNNER_VERSION = readVersion();
 var RUNNER_VERSION_HEADER = "x-flumecode-runner-version";
+var RUNNER_MIN_VERSION_HEADER = "x-flumecode-min-runner-version";
+function compareVersions(a, b) {
+  const parse = (v) => (v.split("-")[0] ?? v).split(".").map((n) => Number.parseInt(n, 10) || 0);
+  const pa = parse(a);
+  const pb = parse(b);
+  const len = Math.max(pa.length, pb.length);
+  for (let i = 0; i < len; i++) {
+    const diff = (pa[i] ?? 0) - (pb[i] ?? 0);
+    if (diff !== 0) return diff;
+  }
+  return 0;
+}
 
 // src/api.ts
+var OUTDATED_WARN_INTERVAL_MS = 60 * 6e4;
+var lastOutdatedWarnAt = 0;
+function noteServerVersion(res) {
+  const min = res.headers.get(RUNNER_MIN_VERSION_HEADER)?.trim();
+  if (!min || RUNNER_VERSION === "unknown") return;
+  if (compareVersions(RUNNER_VERSION, min) >= 0) return;
+  const now = Date.now();
+  if (now - lastOutdatedWarnAt < OUTDATED_WARN_INTERVAL_MS) return;
+  lastOutdatedWarnAt = now;
+  console.warn(
+    `\u26A0\uFE0F  This runner (v${RUNNER_VERSION}) is outdated \u2014 the server expects v${min} or newer.
+   Update with: npm install -g @flumecode/runner@latest`
+  );
+}
 async function claimJob(config) {
   const res = await fetch(`${config.serverUrl}/api/runner/jobs/claim`, {
     method: "POST",
@@ -49,6 +75,7 @@ async function claimJob(config) {
       [RUNNER_VERSION_HEADER]: RUNNER_VERSION
     }
   });
+  noteServerVersion(res);
   if (res.status === 204) return null;
   if (res.status === 401) {
     throw new Error("Runner token rejected (401). Re-run `login` with a fresh token.");
@@ -66,6 +93,7 @@ async function reportJob(config, jobId, result) {
     },
     body: JSON.stringify(result)
   });
+  noteServerVersion(res);
   if (!res.ok) throw new Error(`complete failed: ${res.status} ${await safeText(res)}`);
 }
 async function reportHeartbeat(config, claudeCode) {
@@ -78,6 +106,7 @@ async function reportHeartbeat(config, claudeCode) {
     },
     body: JSON.stringify({ claudeCode })
   });
+  noteServerVersion(res);
   if (!res.ok) throw new Error(`heartbeat failed: ${res.status} ${await safeText(res)}`);
 }
 async function safeText(res) {
@@ -460,6 +489,25 @@ function buildDocumentPrompt(ctx) {
   lines.push("", "When done, reply with a one- or two-line summary of the wiki changes you made.");
   return lines.join("\n");
 }
+function buildRepairPrompt(ctx, hookLog) {
+  const lines = [
+    `You are "${ctx.agentName}", fixing a failed pre-commit check in the repository ${ctx.repo.fullName}, checked out in your current working directory.`,
+    `The changes from the previous step are still uncommitted in the working tree. When the runner tried to commit them, the repository's pre-commit hook \u2014 which runs the project's own checks (lint / typecheck / unit tests) \u2014 failed. Make the working tree pass those checks: fix the failing code or tests at their root. Do NOT delete or skip tests, weaken assertions, or disable the checks to silence the failure. Preserve the intent of the original change; repair only what's broken. Do NOT commit or push \u2014 the runner re-commits once the checks pass.`,
+    "",
+    "These coding guidelines apply to all code produced in this run:",
+    "",
+    loadRule("coding-guideline"),
+    "",
+    "# Pre-commit hook output",
+    "",
+    "```",
+    hookLog,
+    "```",
+    "",
+    "When done, reply with a one-line summary of what you fixed."
+  ];
+  return lines.join("\n");
+}
 function buildInitPrompt(ctx) {
   return [
     `You are "${ctx.agentName}" initializing FlumeCode for the repository ${ctx.repo.fullName}, checked out in your current working directory.`,
@@ -513,6 +561,48 @@ async function installDependencies(dir) {
 async function makeWorkspace() {
   return mkdtemp(join3(tmpdir(), WORKSPACE_PREFIX));
 }
+var MAX_WORKSPACES = 8;
+var workspaceRegistry = /* @__PURE__ */ new Map();
+async function acquireWorkspace(key) {
+  const existing = workspaceRegistry.get(key);
+  if (existing !== void 0 && existsSync2(existing)) {
+    workspaceRegistry.delete(key);
+    workspaceRegistry.set(key, existing);
+    return { dir: existing, reused: true };
+  }
+  const dir = await makeWorkspace();
+  workspaceRegistry.set(key, dir);
+  if (workspaceRegistry.size > MAX_WORKSPACES) {
+    const oldest = workspaceRegistry.keys().next().value;
+    const oldDir = workspaceRegistry.get(oldest);
+    workspaceRegistry.delete(oldest);
+    rm(oldDir, { recursive: true, force: true }).catch(() => {
+    });
+  }
+  return { dir, reused: false };
+}
+async function discardWorkspace(key) {
+  const dir = workspaceRegistry.get(key);
+  workspaceRegistry.delete(key);
+  if (dir !== void 0) {
+    await cleanup(dir).catch(() => {
+    });
+  }
+}
+async function prepareAtSha(ctx, dir, reused) {
+  if (!reused) {
+    await cloneAtSha(ctx, dir);
+    return;
+  }
+  await git(["-C", dir, "remote", "set-url", "origin", cloneUrl(ctx)]);
+}
+async function prepareResumingBranch(ctx, dir, reused) {
+  if (!reused) {
+    return cloneResumingBranch(ctx, dir);
+  }
+  await git(["-C", dir, "remote", "set-url", "origin", cloneUrl(ctx)]);
+  return { resumed: true };
+}
 async function sweepWorkspaces() {
   const base = tmpdir();
   let entries;
@@ -552,20 +642,36 @@ async function hasChanges(dir) {
   const { stdout: stdout2 } = await git(["-C", dir, "status", "--porcelain"]);
   return stdout2.trim().length > 0;
 }
+var PreCommitError = class extends Error {
+  constructor(log) {
+    super("pre-commit checks failed");
+    this.log = log;
+    this.name = "PreCommitError";
+  }
+};
+function commitFailureLog(err) {
+  const e = err;
+  const parts = [e.stdout, e.stderr].map((s) => typeof s === "string" ? s.trim() : "").filter((s) => s.length > 0);
+  return parts.length > 0 ? parts.join("\n") : e.message ?? String(err);
+}
 async function commitChanges(ctx, dir) {
   if (!await hasChanges(dir)) return false;
-  await git([
-    "-C",
-    dir,
-    "-c",
-    "user.email=runner@flumecode.local",
-    "-c",
-    "user.name=FlumeCode Runner",
-    "commit",
-    "--quiet",
-    "-m",
-    `FlumeCode: ${jobTitle(ctx)}`
-  ]);
+  try {
+    await git([
+      "-C",
+      dir,
+      "-c",
+      "user.email=runner@flumecode.local",
+      "-c",
+      "user.name=FlumeCode Runner",
+      "commit",
+      "--quiet",
+      "-m",
+      `FlumeCode: ${jobTitle(ctx)}`
+    ]);
+  } catch (err) {
+    throw new PreCommitError(commitFailureLog(err));
+  }
   return true;
 }
 async function pushBranch(ctx, dir) {
@@ -643,17 +749,37 @@ async function cleanup(dir) {
 var IDLE_MS = 5e3;
 var ORCHESTRATOR_MODEL = "sonnet";
 var ORCHESTRATOR_MAX_TURNS = 80;
+var MAX_COMMIT_REPAIRS = 2;
 var INIT_MAX_TURNS = 200;
 var DOCUMENT_MAX_TURNS = 120;
 var HEARTBEAT_MS = 5 * 6e4;
 async function pushAndOpenPr(ctx, dir, opts = { rebase: true }) {
-  const committed = await commitChanges(ctx, dir);
+  const committed = await commitWithRepair(ctx, dir);
   if (!committed) return { kind: "none" };
   if (opts.rebase) await rebaseOntoMergeBranch(ctx, dir);
   await pushBranch(ctx, dir);
   const pr = await openPullRequest(ctx);
   return pr ? { kind: "pr", pr } : { kind: "pushed" };
 }
+async function commitWithRepair(ctx, dir) {
+  for (let attempt = 1; ; attempt++) {
+    try {
+      return await commitChanges(ctx, dir);
+    } catch (err) {
+      if (!(err instanceof PreCommitError) || attempt > MAX_COMMIT_REPAIRS) throw err;
+      console.warn(
+        `  pre-commit checks failed (repair ${attempt}/${MAX_COMMIT_REPAIRS}) \u2014 asking the agent to fix\u2026`
+      );
+      await runClaudeCode({
+        cwd: dir,
+        prompt: buildRepairPrompt(ctx, err.log),
+        permissionMode: ctx.permissionMode,
+        model: ORCHESTRATOR_MODEL,
+        maxTurns: ORCHESTRATOR_MAX_TURNS
+      });
+    }
+  }
+}
 function outcomeBanner(outcome, opts) {
   const wikiNote = opts.documented ? " (with wiki updates)" : "";
   switch (outcome.kind) {
@@ -675,20 +801,35 @@ function outcomeBanner(outcome, opts) {
   }
 }
 async function processJob(ctx) {
-  const dir = await makeWorkspace();
+  const { dir, reused } = await acquireWorkspace(ctx.workspaceKey);
+  let prepared = false;
   try {
-    if (ctx.kind === "init") return await processInitJob(ctx, dir);
-    if (ctx.kind === "implement") return await processImplementJob(ctx, dir);
-    if (ctx.kind === "revise") return await processReviseJob(ctx, dir);
+    if (ctx.kind === "init") {
+      await prepareAtSha(ctx, dir, reused);
+      prepared = true;
+      return await processInitJob(ctx, dir);
+    }
+    if (ctx.kind === "implement") {
+      const { resumed } = await prepareResumingBranch(ctx, dir, reused);
+      prepared = true;
+      return await processImplementJob(ctx, dir, resumed);
+    }
+    if (ctx.kind === "revise") {
+      const { resumed } = await prepareResumingBranch(ctx, dir, reused);
+      prepared = true;
+      return await processReviseJob(ctx, dir, resumed);
+    }
+    await prepareAtSha(ctx, dir, reused);
+    prepared = true;
     return await processChatJob(ctx, dir);
-  } finally {
-    await cleanup(dir);
+  } catch (err) {
+    if (!prepared) await discardWorkspace(ctx.workspaceKey);
+    throw err;
   }
 }
 async function processInitJob(ctx, dir) {
   console.log(`
 \u25B6 Init ${ctx.jobId} \u2014 ${ctx.repo.fullName} on ${ctx.repo.checkoutBranch}`);
-  await cloneAtSha(ctx, dir);
   const summary = (await runClaudeCode({
     cwd: dir,
     prompt: buildInitPrompt(ctx),
@@ -706,7 +847,6 @@ async function processInitJob(ctx, dir) {
 async function processChatJob(ctx, dir) {
   console.log(`
 \u25B6 Job ${ctx.jobId} \u2014 ${ctx.repo.fullName}: "${jobTitle(ctx)}"`);
-  await cloneAtSha(ctx, dir);
   const orchestrating = ctx.permissionMode !== "plan";
   const installResult = orchestrating ? await installDependencies(dir) : null;
   const result = await runClaudeCode({
@@ -748,10 +888,9 @@ async function processChatJob(ctx, dir) {
   reply += outcomeBanner(outcome, { branch: ctx.repo.checkoutBranch, documented });
   return { text: reply, widgets: [] };
 }
-async function processImplementJob(ctx, dir) {
+async function processImplementJob(ctx, dir, resumed) {
   console.log(`
 \u25B6 Implement ${ctx.jobId} \u2014 ${ctx.repo.fullName}: "${jobTitle(ctx)}"`);
-  const { resumed } = await cloneResumingBranch(ctx, dir);
   const installResult = await installDependencies(dir);
   const result = await runClaudeCode({
     cwd: dir,
@@ -785,10 +924,9 @@ async function processImplementJob(ctx, dir) {
   reply += outcomeBanner(outcome, { branch: ctx.repo.checkoutBranch, documented });
   return { text: reply, widgets: [], ...outcome.kind === "pr" ? { pr: outcome.pr } : {} };
 }
-async function processReviseJob(ctx, dir) {
+async function processReviseJob(ctx, dir, resumed) {
   console.log(`
 \u25B6 Revise ${ctx.jobId} \u2014 ${ctx.repo.fullName}: "${jobTitle(ctx)}"`);
-  const { resumed } = await cloneResumingBranch(ctx, dir);
   const installResult = await installDependencies(dir);
   const result = await runClaudeCode({
     cwd: dir,
@@ -933,14 +1071,18 @@ function parseFlags(args) {
 }
 var command = process.argv[2];
 var rest = process.argv.slice(3);
-if (command === "login") {
+if (command === "--version" || command === "-v" || command === "version") {
+  console.log(RUNNER_VERSION);
+  process.exit(0);
+} else if (command === "login") {
   void login(rest);
 } else if (command === "start") {
   void start();
 } else {
-  console.log("FlumeCode runner");
+  console.log(`FlumeCode runner v${RUNNER_VERSION}`);
   console.log("Usage:");
-  console.log("  flumecode login   # save server URL + token");
-  console.log("  flumecode start   # poll for and run jobs");
+  console.log("  flumecode login     # save server URL + token");
+  console.log("  flumecode start     # poll for and run jobs");
+  console.log("  flumecode --version # print the runner version");
   process.exit(command ? 1 : 0);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flumecode/runner",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "type": "module",
   "description": "FlumeCode local runner — claims jobs and drives your local Claude Code against a real checkout.",
   "bin": {