@nanopm/cli 0.1.16 → 0.1.18

package/dist/index.js

@@ -5369,9 +5369,10 @@ function stepsLeft(plan, done) {
 function buildDir(home, jobId) {
   return `${home.replace(/\/+$/, "")}/.cache/nanopm/builds/${jobId}`;
 }
-function buildBranch(ref, title) {
+function buildBranch(ref, title, jobId) {
   const slug = title.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40).replace(/-+$/, "");
-  return `nano/${ref.toLowerCase()}${slug ? `-${slug}` : ""}`;
+  const own = jobId.replace(/[^a-z0-9]/gi, "").slice(0, 6).toLowerCase();
+  return `nano/${ref.toLowerCase()}${slug ? `-${slug}` : ""}-${own}`;
 }
 var REGISTRIES = {
   "package-lock.json": ["registry.npmjs.org"],
@@ -5420,7 +5421,20 @@ var isDecideForMe = (answer) => /^\s*decide(\s+for\s+me)?\s*\.?\s*$/i.test(answe
 function answerForAgent(answer) {
   return isDecideForMe(answer) ? DECIDE_FOR_ME : answer;
 }
-var BUILD_HISTORY_KINDS = ["worktree", "plan", "step", "question", "answer", "paused", "pr", "handed"];
+var BUILD_HISTORY_KINDS = ["worktree", "plan", "step", "question", "answer", "paused", "pr", "handed", "throw", "thrown", "closed"];
+function originOf(job) {
+  const named = (job.params ?? {}).origin;
+  return typeof named === "string" && /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.test(named) ? named : job.id;
+}
+function throwRefusal(runs, jobId) {
+  if (runs.some((r) => ["queued", "running", "waiting"].includes(r.status))) return "This build is on its way again: stop it first.";
+  const newest = [...runs].sort((x, y) => y.created_at.localeCompare(x.created_at))[0];
+  return newest?.id === jobId ? null : "This build was continued since: refresh the page.";
+}
+async function buildRuns(client, projectId, origin) {
+  const { data } = await client.from("jobs").select("id, status, created_at, assigned_daemon_id, requested_by").eq("project_id", projectId).eq("skill", BUILD_SKILL).or(`id.eq.${origin},params->>origin.eq.${origin}`);
+  return data ?? [];
+}
 var BUILD_CONFLICT = { resolve: "Let Nano resolve it", mine: "I\u2019ll do it in my terminal" };
 var chose = (answer, option) => {
   const plain = (s) => s.trim().toLowerCase().replace(/[’‘]/g, "'");
@@ -5462,6 +5476,11 @@ function buildHistory(events, at) {
   if (last?.kind === "paused") return found({ why: "limit" });
   return found({ why: "lost" });
 }
+function parkedDue(events, now) {
+  const stop2 = [...events].reverse().find((e) => e.kind === "paused" || e.kind === "question");
+  if (stop2?.kind === "paused") return Date.parse(String(stop2.payload.resets_at ?? "")) <= now;
+  return stop2?.kind === "question" && events.some((e) => e.kind === "answer" && e.seq === stop2.seq);
+}
 function wasOf(params) {
   return params?.was === "proposed" ? "proposed" : "accepted";
 }
@@ -5570,6 +5589,15 @@ async function addWorktree(clone, dir, branch) {
 async function removeWorktree(clone, dir) {
   await git(clone, ["worktree", "remove", "--force", dir]).catch(() => "");
 }
+async function deleteBranch(clone, branch) {
+  return git(clone, ["branch", "-D", branch]).then(
+    () => true,
+    () => false
+  );
+}
+async function branchExists(clone, branch) {
+  return Boolean(await git(clone, ["branch", "--list", branch]).catch(() => ""));
+}
 async function commonGitDir(cwd) {
   return git(cwd, ["rev-parse", "--path-format=absolute", "--git-common-dir"]);
 }
@@ -5635,11 +5663,12 @@ async function ghReady(cwd) {
     return /ENOENT/.test(errorMessage(err)) ? "the GitHub CLI is not installed on this machine: brew install gh, then gh auth login" : "the GitHub CLI is not signed in on this machine: run gh auth login in your terminal";
   }
 }
-async function pullRequestMerged(cwd, number) {
+async function pullRequestState(cwd, number) {
   try {
-    return await gh(cwd, ["pr", "view", String(number), "--json", "state", "--jq", ".state"]) === "MERGED";
+    const { state, headRefName } = JSON.parse(await gh(cwd, ["pr", "view", String(number), "--json", "state,headRefName"]));
+    return (state === "MERGED" || state === "CLOSED" || state === "OPEN") && typeof headRefName === "string" ? { state, head: headRefName } : null;
   } catch {
-    return false;
+    return null;
   }
 }
 async function openPullRequest(cwd, pr) {
@@ -11199,7 +11228,7 @@ async function prepareBuild(client, job, clone, adapter) {
       await startSolution(client, job.project_id, solution.ref, job.id);
       return { ok: true, build: { solution, clone, ...place, worktree: worktree2, network: await network(place.dir), history } };
     }
-    const branch = buildBranch(solution.ref, solution.title);
+    const branch = buildBranch(solution.ref, solution.title, job.id);
     await mkdir5(join13(dir, ".."), { recursive: true, mode: 448 });
     const { base, fork, worktree } = await addWorktree(clone, dir, branch);
     made = true;
@@ -11222,8 +11251,8 @@ async function runBuildJob(input) {
   let said = history.report;
   const stop2 = async (message, opts = { keep: true }) => {
     await unstartSolution(client, job.project_id, solution.ref, was).catch(() => void 0);
-    if (opts.keep && !await merging(worktree)) await commitAll(worktree, `${solution.ref}: unfinished \u2014 ${solution.title}`).catch(() => null);
-    else await removeWorktree(clone, dir);
+    if (!opts.keep) await removeWorktree(clone, dir);
+    else if (!await merging(worktree)) await commitAll(worktree, `${solution.ref}: unfinished \u2014 ${solution.title}`).catch(() => null);
     return { ...failed(opts.keep ? `${message}. What was done is on ${branch}, in ${dir}.` : message), usage };
   };
   const park = async (why) => {
@@ -11381,8 +11410,7 @@ function askOf(input) {
   };
 }
 async function loadHistory(client, job) {
-  const named = (job.params ?? {}).origin;
-  const origin = typeof named === "string" && /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.test(named) ? named : job.id;
+  const origin = originOf(job);
   const { data: runs } = await client.from("jobs").select("id").eq("project_id", job.project_id).eq("skill", BUILD_SKILL).or(`id.eq.${origin},params->>origin.eq.${origin}`);
   return loadBuildHistory(client, [.../* @__PURE__ */ new Set([origin, job.id, ...(runs ?? []).map((r) => r.id)])], { home: homedir4(), jobId: origin });
 }
@@ -11456,37 +11484,71 @@ async function resumePausedBuilds(client, daemonId, now = Date.now()) {
   const { data: parked } = await client.from("jobs").select("id").eq("skill", BUILD_SKILL).eq("status", "waiting").eq("assigned_daemon_id", daemonId);
   const ids = (parked ?? []).map((j) => j.id);
   if (!ids.length) return [];
-  const { data: stops } = await client.from("job_events").select("job_id, kind, payload").in("job_id", ids).in("kind", ["paused", "question"]).order("id", { ascending: false });
-  const last = /* @__PURE__ */ new Map();
-  for (const e of stops ?? []) if (!last.has(e.job_id)) last.set(e.job_id, e);
-  const due = ids.filter((id) => {
-    const stop2 = last.get(id);
-    return stop2?.kind === "paused" && Date.parse(String(stop2.payload?.resets_at ?? "")) <= now;
-  });
+  const { data: stops } = await client.from("job_events").select("job_id, kind, seq, payload").in("job_id", ids).in("kind", ["paused", "question", "answer"]).order("id");
+  const due = ids.filter((id) => parkedDue((stops ?? []).filter((e) => e.job_id === id).map((e) => ({ ...e, payload: e.payload ?? {} })), now));
   if (!due.length) return [];
   const { data } = await client.from("jobs").update({ status: "queued", assigned_daemon_id: null }).in("id", due).eq("status", "waiting").select("id");
   return (data ?? []).map((j) => j.id);
 }
-async function shippedBuilds(client, daemonId, userId) {
-  const { data: building } = await client.from("solutions").select("id, ref, project_id").eq("status", "building");
+async function throwAwayBuilds(client, daemonId, userId) {
+  const { data: throws } = await client.from("job_events").select("job_id").eq("kind", "throw");
+  if (!throws?.length) return [];
+  const { data: marked } = await client.from("job_events").select("job_id").eq("kind", "thrown").in("job_id", throws.map((t) => t.job_id));
+  const open = throws.map((t) => t.job_id).filter((id) => !marked?.some((m) => m.job_id === id));
+  if (!open.length) return [];
+  const { data: asked } = await client.from("jobs").select("id, project_id, params").in("id", open).eq("skill", BUILD_SKILL).eq("requested_by", userId).or(`assigned_daemon_id.eq.${daemonId},target_daemon_id.eq.${daemonId}`);
+  if (!asked?.length) return [];
+  const { data: clones } = await client.from("clones").select("project_id, repo_path").eq("daemon_id", daemonId);
+  const thrown = [];
+  for (const job of asked) {
+    const runs = await buildRuns(client, job.project_id, originOf(job));
+    const first = runs.find((r) => r.id === originOf(job));
+    if (!first || first.assigned_daemon_id !== daemonId || first.requested_by !== userId || throwRefusal(runs, job.id)) continue;
+    const { place } = await loadHistory(client, job);
+    const clone = clones?.find((c) => c.project_id === job.project_id)?.repo_path;
+    if (place && clone && existsSync5(clone)) {
+      if (existsSync5(place.dir)) await removeWorktree(clone, place.dir);
+      if (existsSync5(place.dir) || await branchExists(clone, place.branch) && !await deleteBranch(clone, place.branch)) continue;
+    } else if (place) continue;
+    await appendJobEvent(client, job.id, "thrown", {}, "nanopm");
+    thrown.push(job.id);
+  }
+  return thrown;
+}
+async function settledBuilds(client, daemonId, userId) {
+  const { data: building } = await client.from("solutions").select("id, ref, project_id").eq("status", "building").is("superseded_by", null);
   if (!building?.length) return [];
   const [{ data: built }, { data: clones }] = await Promise.all([
-    client.from("jobs").select("id, params, pr:result->pr").eq("skill", BUILD_SKILL).eq("status", "succeeded").eq("assigned_daemon_id", daemonId).eq("requested_by", userId).in("params->>solution_id", building.map((s) => s.id)),
+    client.from("jobs").select("id, project_id, params, created_at, pr:result->pr").eq("skill", BUILD_SKILL).eq("status", "succeeded").eq("assigned_daemon_id", daemonId).eq("requested_by", userId).in("params->>solution_id", building.map((s) => s.id)).order("created_at", { ascending: false }),
     client.from("clones").select("project_id, repo_path").eq("daemon_id", daemonId)
   ]);
+  const newest = [...new Map((built ?? []).reverse().map((j) => [j.params?.solution_id, j])).values()];
+  const { data: closed } = newest.length ? await client.from("job_events").select("job_id").in("job_id", newest.map((j) => j.id)).eq("kind", "closed") : { data: [] };
   const cloneOf = new Map((clones ?? []).map((c) => [c.project_id, c.repo_path]));
-  const shipped = [];
-  for (const j of built ?? []) {
+  const settled2 = [];
+  for (const j of newest.filter((n) => !closed?.some((c) => c.job_id === n.id))) {
     const solution = building.find((s) => s.id === j.params?.solution_id);
     const number = j.pr?.number;
     const clone = solution ? cloneOf.get(solution.project_id) : void 0;
-    if (!solution || typeof number !== "number" || number <= 0 || !clone || !existsSync5(clone) || !await pullRequestMerged(clone, number)) continue;
-    const { error } = await client.rpc("finish_solution", { p_project_id: solution.project_id, p_ref: solution.ref, p_job_id: j.id });
-    if (error) continue;
-    await logActivity({ client }, { id: j.id, project_id: solution.project_id }, "shipped", `Pull request #${number} merged: ${solution.ref} shipped`);
-    shipped.push(j.id);
-  }
-  return shipped;
+    if (!solution || typeof number !== "number" || number <= 0 || !clone || !existsSync5(clone)) continue;
+    const [{ place }, pr] = await Promise.all([loadHistory(client, j), pullRequestState(clone, number)]);
+    if (!place || !pr || pr.head !== place.branch) continue;
+    const at = { id: j.id, project_id: solution.project_id };
+    if (pr.state === "MERGED") {
+      const { error } = await client.rpc("finish_solution", { p_project_id: solution.project_id, p_ref: solution.ref, p_job_id: j.id });
+      if (error) continue;
+      await logActivity({ client }, at, "shipped", `Pull request #${number} merged: ${solution.ref} shipped`);
+      settled2.push({ id: j.id, ref: solution.ref, merged: true });
+    } else if (pr.state === "CLOSED") {
+      const { error } = await client.rpc("unstart_solution", { p_project_id: solution.project_id, p_ref: solution.ref, p_to: wasOf(j.params) });
+      if (error) continue;
+      await deleteBranch(clone, place.branch);
+      await appendJobEvent(client, j.id, "closed", { number }, "nanopm");
+      await logActivity({ client }, at, "closed", `Pull request #${number} closed without merging: ${solution.ref} back on the roadmap`);
+      settled2.push({ id: j.id, ref: solution.ref, merged: false });
+    }
+  }
+  return settled2;
 }
 async function tellTheApp(accessToken, jobId, fetchImpl = fetch) {
   try {
@@ -11645,11 +11707,12 @@ async function runDaemon(options = {}) {
       if (options.once && Date.now() - startedAt > onceTimeoutMs) break;
       if (!options.once && Date.now() - lastPauseCheck > PAUSE_CHECK_MS) {
         lastPauseCheck = Date.now();
-        for (const id of await resumePausedBuilds(auth.client, daemonId).catch(() => [])) log(`build ${id}: the Claude limit reset, carrying on`);
+        for (const id of await resumePausedBuilds(auth.client, daemonId).catch(() => [])) log(`build ${id}: carrying on (its limit reset, or its answer came)`);
+        for (const id of await throwAwayBuilds(auth.client, daemonId, auth.userId).catch(() => [])) log(`build ${id}: thrown away, its copy and its local branch`);
       }
       if (!options.once && Date.now() - lastShipCheck > SHIP_CHECK_MS) {
         lastShipCheck = Date.now();
-        for (const id of await shippedBuilds(auth.client, daemonId, auth.userId).catch(() => [])) log(`build ${id}: its pull request merged, shipped`);
+        for (const b of await settledBuilds(auth.client, daemonId, auth.userId).catch(() => [])) log(`build ${b.id}: its pull request ${b.merged ? `merged, ${b.ref} shipped` : `closed without merging, ${b.ref} back on the roadmap`}`);
       }
       if (!options.once && Date.now() - lastDeployCheck > DEPLOY_CHECK_MS) {
         lastDeployCheck = Date.now();
@@ -14604,7 +14667,7 @@ import { promisify as promisify8 } from "util";
 // package.json
 var package_default = {
   name: "@nanopm/cli",
-  version: "0.1.16",
+  version: "0.1.18",
   description: "An autonomous product manager for builders who run several small products. Runs on your machine, drives your own coding harness.",
   type: "module",
   license: "MIT",
@@ -16025,7 +16088,7 @@ async function build(ref, opts) {
   }
   const stopped = opts.continue || opts.throwAway ? await buildOf(auth.client, project.id, ["failed", "cancelled"], solution.id) : null;
   if ((opts.continue || opts.throwAway) && !stopped) throw new Error(`${solution.ref} has no stopped build to ${opts.continue ? "continue" : "throw away"}.`);
-  if (opts.throwAway) return throwAway(auth.client, stopped.origin, repo.root, out);
+  if (opts.throwAway) return throwAway(auth.client, stopped, repo.root, out);
   const [daemon, local] = await Promise.all([awakeDaemon(auth.client, auth.userId), localDaemonId()]);
   if (!local || daemon?.id !== local) throw new Error("This machine\u2019s daemon is asleep, so nothing was queued. `nanopm daemon install` starts it; then build again.");
   await rememberClone(auth.client, project.id, repo.root);
@@ -16047,11 +16110,12 @@ async function buildOf(client, projectId, statuses, solutionId) {
   const params = data?.params ?? {};
   return data ? { id: data.id, solutionId: params.solution_id ?? "", was: wasOf(data.params), origin: params.origin ?? data.id } : null;
 }
-async function throwAway(client, jobId, clone, out) {
-  const { place } = await loadBuildHistory(client, [jobId], { home: homedir6(), jobId });
+async function throwAway(client, build2, clone, out) {
+  const { place } = await loadBuildHistory(client, [build2.origin], { home: homedir6(), jobId: build2.origin });
   if (!place) throw new Error("that build left nothing on this machine.");
   if (existsSync7(place.dir)) await execFileAsync9("git", ["-C", clone, "worktree", "remove", "--force", place.dir]);
   await execFileAsync9("git", ["-C", clone, "branch", "-D", place.branch]).catch(() => void 0);
+  await appendJobEvent(client, build2.id, "thrown", {}, "user");
   out(`Thrown away: the copy of the code and the local branch ${place.branch}.`);
   return 0;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nanopm/cli",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "An autonomous product manager for builders who run several small products. Runs on your machine, drives your own coding harness.",
   "type": "module",
   "license": "MIT",