pullfrog 0.1.105 → 0.1.106

package/dist/cli.mjs

@@ -112919,7 +112919,7 @@ var import_picocolors = __toESM(require_picocolors(), 1);
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.1.105",
+  version: "0.1.106",
   cliContractVersion: "1",
   type: "module",
   bin: {
@@ -118421,7 +118421,7 @@ import { chmodSync, createWriteStream, existsSync as existsSync4, mkdirSync } fr
 import { join as join2 } from "node:path";
 import { pipeline } from "node:stream/promises";
 function resolveNpm() {
-  const npmCli = process.env.npm_execpath;
+  const npmCli = process.env.NPM_EXECPATH;
   if (npmCli?.endsWith("npm-cli.js")) return { command: process.execPath, args: [npmCli] };
   return { command: "npm", args: [] };
 }
@@ -193695,14 +193695,15 @@ function computeIncrementalDiff(params) {
     const tips = [`origin/${params.baseBranch}`, ...params.formerBaseTips];
     const oldBase = versionBase({ sha: params.beforeSha, tips });
     const newBase = versionBase({ sha: params.headSha, tips });
+    const replayed = oldBase === newBase ? null : replay({ sha: params.beforeSha, from: oldBase, onto: newBase });
     const raw2 = $(
       "sh",
       [
         "-c",
         'git range-diff --no-color --creation-factor=1000 "$1..$(git commit-tree "$2^{tree}" -p "$1" -m x)" "$3..$(git commit-tree "$4^{tree}" -p "$3" -m x)"',
         "--",
-        oldBase,
-        params.beforeSha,
+        replayed ? newBase : oldBase,
+        replayed ?? params.beforeSha,
         newBase,
         params.headSha
       ],
@@ -193737,6 +193738,22 @@ function versionBase(params) {
   }
   return best.sha;
 }
+function replay(params) {
+  try {
+    return git([
+      "merge-tree",
+      "--write-tree",
+      `--merge-base=${params.from}`,
+      params.onto,
+      params.sha
+    ]);
+  } catch {
+    log2.info(
+      `\xBB incremental diff: ${params.sha.slice(0, 7)} does not replay onto the new base; comparing each on its own`
+    );
+    return null;
+  }
+}
 function isDiffPrefix(ch) {
   return ch === " " || ch === "+" || ch === "-";
 }
@@ -200996,11 +201013,25 @@ import { execFileSync as execFileSync7, execSync as execSync2 } from "node:child
 import { mkdtempSync as mkdtempSync3, readdirSync, realpathSync as realpathSync2, rmSync as rmSync4, unlinkSync as unlinkSync2 } from "node:fs";
 import { tmpdir as tmpdir3 } from "node:os";
 import { join as join16 } from "node:path";
+var TEMP_DIR_STATE = "temp_dir";
 function createTempDirectory() {
   const path4 = mkdtempSync3(join16(tmpdir3(), "pullfrog-"));
   process.env.PULLFROG_TEMP_DIR = path4;
   log2.info(`\xBB created temp dir at ${path4}`);
-  return { path: path4, [Symbol.dispose]: () => removeTempDirectory(path4) };
+  const tracked = process.env.RUNNER_ENVIRONMENT !== "github-hosted";
+  if (tracked) saveSecretState(TEMP_DIR_STATE, path4);
+  return {
+    path: path4,
+    [Symbol.dispose]: () => {
+      if (removeTempDirectory(path4) && tracked) saveSecretState(TEMP_DIR_STATE, "");
+    }
+  };
+}
+function removeAbandonedTempDirectory() {
+  const path4 = getState(TEMP_DIR_STATE);
+  if (!path4) return;
+  log2.info(`\xBB removing temp dir left by an interrupted run at ${path4}`);
+  removeTempDirectory(path4);
 }
 function removeTempDirectory(path4) {
   try {
@@ -201011,10 +201042,12 @@ function removeTempDirectory(path4) {
       rmSync4(path4, { recursive: true, force: true });
     }
     log2.debug(`\xBB removed temp dir at ${path4}`);
+    return true;
   } catch (err) {
     log2.warning(
       `\xBB could not remove temp dir at ${path4}: ${err instanceof Error ? err.message : String(err)}`
     );
+    return false;
   }
 }
 function wipeRunnerLeakSurface() {
@@ -209665,6 +209698,7 @@ async function runCli5(params) {
 async function run(args2) {
   if (args2.includes("--post") && !args2.includes("token")) {
     await runOAuthWriteback().catch((error63) => warning(`oauth post-hook: ${error63}`));
+    removeAbandonedTempDirectory();
     return;
   }
   try {
@@ -210066,7 +210100,7 @@ function resolveTarget2(repo) {
   return { owner: match3[1], repo: match3[2] };
 }
 function cliVersion() {
-  const parts = /^(\d+)\.(\d+)\.(\d+)$/.exec("0.1.105");
+  const parts = /^(\d+)\.(\d+)\.(\d+)$/.exec("0.1.106");
   if (!parts) return "0.0.0";
   return `${Number(parts[1])}.${Number(parts[2])}.${Number(parts[3])}`;
 }
@@ -210263,7 +210297,7 @@ async function runCli9(input2) {
 }
 
 // cli.ts
-var VERSION10 = "0.1.105";
+var VERSION10 = "0.1.106";
 var bin = basename2(process.argv[1] || "");
 var PROG = bin === "pf" || bin === "pullfrog" ? bin : "pullfrog";
 var rawArgs = process.argv.slice(2);

package/dist/index.js

@@ -111839,7 +111839,7 @@ import { chmodSync, createWriteStream, existsSync as existsSync3, mkdirSync } fr
 import { join } from "node:path";
 import { pipeline } from "node:stream/promises";
 function resolveNpm() {
-  const npmCli = process.env.npm_execpath;
+  const npmCli = process.env.NPM_EXECPATH;
   if (npmCli?.endsWith("npm-cli.js")) return { command: process.execPath, args: [npmCli] };
   return { command: "npm", args: [] };
 }
@@ -112171,7 +112171,7 @@ var import_semver = __toESM(require_semver2(), 1);
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.1.105",
+  version: "0.1.106",
   cliContractVersion: "1",
   type: "module",
   bin: {
@@ -190177,14 +190177,15 @@ function computeIncrementalDiff(params) {
     const tips = [`origin/${params.baseBranch}`, ...params.formerBaseTips];
     const oldBase = versionBase({ sha: params.beforeSha, tips });
     const newBase = versionBase({ sha: params.headSha, tips });
+    const replayed = oldBase === newBase ? null : replay({ sha: params.beforeSha, from: oldBase, onto: newBase });
     const raw2 = $(
       "sh",
       [
         "-c",
         'git range-diff --no-color --creation-factor=1000 "$1..$(git commit-tree "$2^{tree}" -p "$1" -m x)" "$3..$(git commit-tree "$4^{tree}" -p "$3" -m x)"',
         "--",
-        oldBase,
-        params.beforeSha,
+        replayed ? newBase : oldBase,
+        replayed ?? params.beforeSha,
         newBase,
         params.headSha
       ],
@@ -190219,6 +190220,22 @@ function versionBase(params) {
   }
   return best.sha;
 }
+function replay(params) {
+  try {
+    return git([
+      "merge-tree",
+      "--write-tree",
+      `--merge-base=${params.from}`,
+      params.onto,
+      params.sha
+    ]);
+  } catch {
+    log.info(
+      `\xBB incremental diff: ${params.sha.slice(0, 7)} does not replay onto the new base; comparing each on its own`
+    );
+    return null;
+  }
+}
 function isDiffPrefix(ch) {
   return ch === " " || ch === "+" || ch === "-";
 }
@@ -197478,11 +197495,19 @@ import { execFileSync as execFileSync6, execSync as execSync2 } from "node:child
 import { mkdtempSync as mkdtempSync2, readdirSync, realpathSync as realpathSync2, rmSync as rmSync2, unlinkSync as unlinkSync2 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
 import { join as join15 } from "node:path";
+var TEMP_DIR_STATE = "temp_dir";
 function createTempDirectory() {
   const path4 = mkdtempSync2(join15(tmpdir2(), "pullfrog-"));
   process.env.PULLFROG_TEMP_DIR = path4;
   log.info(`\xBB created temp dir at ${path4}`);
-  return { path: path4, [Symbol.dispose]: () => removeTempDirectory(path4) };
+  const tracked = process.env.RUNNER_ENVIRONMENT !== "github-hosted";
+  if (tracked) saveSecretState(TEMP_DIR_STATE, path4);
+  return {
+    path: path4,
+    [Symbol.dispose]: () => {
+      if (removeTempDirectory(path4) && tracked) saveSecretState(TEMP_DIR_STATE, "");
+    }
+  };
 }
 function removeTempDirectory(path4) {
   try {
@@ -197493,10 +197518,12 @@ function removeTempDirectory(path4) {
       rmSync2(path4, { recursive: true, force: true });
     }
     log.debug(`\xBB removed temp dir at ${path4}`);
+    return true;
   } catch (err) {
     log.warning(
       `\xBB could not remove temp dir at ${path4}: ${err instanceof Error ? err.message : String(err)}`
     );
+    return false;
   }
 }
 function wipeRunnerLeakSurface() {

package/dist/internal.js

@@ -8,7 +8,7 @@ var __export = (target, all) => {
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.1.105",
+  version: "0.1.106",
   cliContractVersion: "1",
   type: "module",
   bin: {

package/dist/utils/setup.d.ts

@@ -14,6 +14,8 @@ export declare function createTempDirectory(): {
     path: string;
     [Symbol.dispose]: () => void;
 };
+/** the `post:` hook's half of `createTempDirectory`: removes the directory a cancelled run left. */
+export declare function removeAbandonedTempDirectory(): void;
 /**
  * snapshot-and-delete the GHA runner's known credential leak surfaces inside
  * `$RUNNER_TEMP` before the agent spawns. without this, a shell-capable agent

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pullfrog",
-  "version": "0.1.105",
+  "version": "0.1.106",
   "cliContractVersion": "1",
   "type": "module",
   "bin": {