@nanopm/cli 0.1.17 → 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,7 @@ 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", "throw", "thrown"];
+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;
@@ -5662,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) {
@@ -11226,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;
@@ -11513,26 +11515,40 @@ async function throwAwayBuilds(client, daemonId, userId) {
   }
   return thrown;
 }
-async function shippedBuilds(client, daemonId, userId) {
-  const { data: building } = await client.from("solutions").select("id, ref, project_id").eq("status", "building");
+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 {
@@ -11696,7 +11712,7 @@ async function runDaemon(options = {}) {
       }
       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();
@@ -14651,7 +14667,7 @@ import { promisify as promisify8 } from "util";
 // package.json
 var package_default = {
   name: "@nanopm/cli",
-  version: "0.1.17",
+  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",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nanopm/cli",
-  "version": "0.1.17",
+  "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",