pubm 0.2.7 → 0.2.9

package/bin/cli.js

@@ -4655,6 +4655,7 @@ var Listr = (_a23 = class {
 }, __name(_a23, "Listr"), _a23);
 
 // src/error.ts
+import { NonZeroExitError } from "tinyexec";
 var AbstractError = class extends Error {
   constructor(message, { cause } = {}) {
     super(message, { cause });
@@ -4665,20 +4666,49 @@ var AbstractError = class extends Error {
 function replaceCode(code) {
   return code.replace(/`([^`].+)`/g, color.bold(color.underline("$1")));
 }
+function formatStderr(stderr) {
+  return stderr.split("\n").map((line) => `  ${color.dim("\u2502")} ${line}`).join("\n");
+}
+function isNoisyCause(cause) {
+  if (cause instanceof NonZeroExitError) return true;
+  if (cause instanceof Error && /Process exited with non-zero status/i.test(cause.message))
+    return true;
+  return false;
+}
 function formatError(error) {
   if (!(error instanceof Error)) return `${error}`;
-  const message = typeof error.message === "string" ? replaceCode(error.message) : (
+  const rawMessage = typeof error.message === "string" ? error.message : (
     /* v8 ignore next */
-    formatError(error)
+    String(error)
   );
-  let stringifyError = `${color.bgRed(` ${error.name} `)}${color.reset("")} ${message}
+  const newlineIndex = rawMessage.indexOf("\n");
+  let summary;
+  let detail;
+  if (newlineIndex !== -1) {
+    summary = rawMessage.slice(0, newlineIndex);
+    detail = rawMessage.slice(newlineIndex + 1);
+  } else {
+    summary = rawMessage;
+  }
+  let result = `${color.bgRed(` ${error.name} `)}${color.reset("")} ${replaceCode(summary)}
 `;
-  stringifyError += error.stack?.split("\n").slice(1).join("\n").replace(/at/g, color.dim("at")).replace(/\(([^(].+)\)/g, `(${color.blue("$1")})`);
-  if (error.cause) {
-    stringifyError += "\n\nCaused: ";
-    stringifyError += formatError(error.cause);
+  if (detail) {
+    result += `
+${formatStderr(detail)}
+`;
+  }
+  if (process.env.DEBUG === "pubm" && error.stack) {
+    result += error.stack.split("\n").slice(1).join("\n").replace(/at/g, color.dim("at")).replace(/\(([^(].+)\)/g, `(${color.blue("$1")})`);
   }
-  return stringifyError;
+  if (error.cause && !isNoisyCause(error.cause)) {
+    const causeMsg = error.cause instanceof Error ? error.cause.message : String(error.cause);
+    if (causeMsg !== summary) {
+      result += `
+${color.dim("Caused by:")} `;
+      result += formatError(error.cause);
+    }
+  }
+  return result;
 }
 function consoleError(error) {
   let errorText = "\n";
@@ -5468,12 +5498,6 @@ import SemVer from "semver";
 import { isCI as isCI2 } from "std-env";
 import { exec as exec9 } from "tinyexec";
 
-// src/utils/cli.ts
-var warningBadge = color.bgYellow(" Warning ");
-function link2(text, url) {
-  return `\x1B]8;;${url}\x07${text}\x1B]8;;\x07`;
-}
-
 // src/ecosystem/rust.ts
 import { readFile, stat as stat2, writeFile } from "node:fs/promises";
 import path8 from "node:path";
@@ -5593,6 +5617,12 @@ var RustEcosystem = class extends Ecosystem {
   }
 };
 
+// src/utils/cli.ts
+var warningBadge = color.bgYellow(" Warning ");
+function link2(text, url) {
+  return `\x1B]8;;${url}\x07${text}\x1B]8;;\x07`;
+}
+
 // src/utils/crate-graph.ts
 async function sortCratesByDependencyOrder(cratePaths) {
   if (cratePaths.length <= 1) return cratePaths;
@@ -5645,12 +5675,19 @@ var rollbacks = [];
 function addRollback(rollback2, context) {
   rollbacks.push({ fn: rollback2, ctx: context });
 }
+function rollbackLog(message) {
+  console.log(`  ${color.yellow("\u21A9")} ${message}`);
+}
+function rollbackError(message) {
+  console.error(`  ${color.red("\u2717")} ${message}`);
+}
 var called = false;
 async function rollback() {
   if (called) return void 0;
   called = true;
   if (rollbacks.length <= 0) return void 0;
-  console.log("Rollback...");
+  console.log(`
+${color.yellow("\u27F2")} ${color.yellow("Rolling back...")}`);
   const results = await Promise.allSettled(
     rollbacks.map(({ fn, ctx }) => fn(ctx))
   );
@@ -5659,15 +5696,15 @@ async function rollback() {
   );
   if (failures.length > 0) {
     for (const failure of failures) {
-      console.error(
-        `Rollback operation failed: ${failure.reason instanceof Error ? failure.reason.message : failure.reason}`
+      rollbackError(
+        failure.reason instanceof Error ? failure.reason.message : failure.reason
       );
     }
     console.log(
-      "Rollback completed with errors. Some operations may require manual recovery."
+      `${color.red("\u2717")} ${color.red("Rollback completed with errors.")} Some operations may require manual recovery.`
     );
   } else {
-    console.log("Rollback completed");
+    console.log(`${color.green("\u2713")} Rollback completed`);
   }
 }
 
@@ -5952,7 +5989,7 @@ function collectRegistries(ctx) {
 
 // src/registry/crates.ts
 import path10 from "node:path";
-import { exec as exec5, NonZeroExitError } from "tinyexec";
+import { exec as exec5, NonZeroExitError as NonZeroExitError2 } from "tinyexec";
 
 // src/registry/registry.ts
 var Registry = class {
@@ -5972,6 +6009,14 @@ var CratesError = class extends AbstractError {
   }
 };
 var USER_AGENT = "pubm (https://github.com/syi0808/pubm)";
+function cleanCargoStderr(stderr) {
+  return stderr.split("\n").filter((line) => {
+    const trimmed = line.trim();
+    if (trimmed === "Updating crates.io index") return false;
+    if (trimmed === "") return false;
+    return true;
+  }).join("\n");
+}
 var CratesRegistry = class extends Registry {
   constructor() {
     super(...arguments);
@@ -6036,26 +6081,40 @@ var CratesRegistry = class extends Registry {
       await exec5("cargo", args, { throwOnError: true });
       return true;
     } catch (error) {
-      const stderr = error instanceof NonZeroExitError ? error.output?.stderr : void 0;
+      const stderr = error instanceof NonZeroExitError2 ? error.output?.stderr : void 0;
       const message = stderr ? `Failed to run \`cargo publish\`:
-${stderr}` : "Failed to run `cargo publish`";
+${cleanCargoStderr(stderr)}` : "Failed to run `cargo publish`";
       throw new CratesError(message, { cause: error });
     }
   }
   async dryRunPublish(manifestDir) {
     try {
-      const args = ["publish", "--dry-run", "--no-verify"];
+      const args = ["publish", "--dry-run"];
       if (manifestDir) {
         args.push("--manifest-path", path10.join(manifestDir, "Cargo.toml"));
       }
       await exec5("cargo", args, { throwOnError: true });
     } catch (error) {
-      const stderr = error instanceof NonZeroExitError ? error.output?.stderr : void 0;
+      const stderr = error instanceof NonZeroExitError2 ? error.output?.stderr : void 0;
       const message = stderr ? `Failed to run \`cargo publish --dry-run\`:
-${stderr}` : "Failed to run `cargo publish --dry-run`";
+${cleanCargoStderr(stderr)}` : "Failed to run `cargo publish --dry-run`";
       throw new CratesError(message, { cause: error });
     }
   }
+  async isVersionPublished(version2) {
+    try {
+      const response = await fetch(
+        `${this.registry}/api/v1/crates/${this.packageName}/${version2}`,
+        { headers: this.headers }
+      );
+      return response.ok;
+    } catch (error) {
+      throw new CratesError(
+        `Failed to check version ${version2} for '${this.packageName}' on crates.io`,
+        { cause: error }
+      );
+    }
+  }
   async isPublished() {
     try {
       const response = await fetch(
@@ -6132,10 +6191,24 @@ function createCratesPublishTask(packagePath) {
   const label = packagePath ? ` (${packagePath})` : "";
   return {
     title: `Publishing to crates.io${label}`,
-    task: async () => {
+    task: async (ctx, task) => {
       const packageName = await getCrateName(packagePath);
       const registry = new CratesRegistry(packageName);
-      await registry.publish(packagePath);
+      if (await registry.isVersionPublished(ctx.version)) {
+        task.title = `[SKIPPED] crates.io${label}: v${ctx.version} already published`;
+        task.output = `\u26A0 ${packageName}@${ctx.version} is already published on crates.io`;
+        return task.skip();
+      }
+      try {
+        await registry.publish(packagePath);
+      } catch (error) {
+        if (error instanceof Error && error.message.includes("is already uploaded")) {
+          task.title = `[SKIPPED] crates.io${label}: v${ctx.version} already published`;
+          task.output = `\u26A0 ${packageName}@${ctx.version} is already published on crates.io`;
+          return task.skip();
+        }
+        throw error;
+      }
     }
   };
 }
@@ -6146,7 +6219,7 @@ var cratesPublishTasks = createCratesPublishTask();
 import { ListrEnquirerPromptAdapter as ListrEnquirerPromptAdapter2 } from "@listr2/prompt-adapter-enquirer";
 
 // src/registry/jsr.ts
-import { exec as exec6, NonZeroExitError as NonZeroExitError2 } from "tinyexec";
+import { exec as exec6, NonZeroExitError as NonZeroExitError3 } from "tinyexec";
 
 // src/utils/package-name.ts
 import { builtinModules } from "node:module";
@@ -6254,7 +6327,7 @@ var JsrRegisry = class extends Registry {
       this.packageCreationUrls = void 0;
       return true;
     } catch (error) {
-      const stderr = error instanceof NonZeroExitError2 ? error.output?.stderr : void 0;
+      const stderr = error instanceof NonZeroExitError3 ? error.output?.stderr : void 0;
       if (stderr?.includes("don't exist")) {
         const urls = [...stderr.matchAll(/https:\/\/jsr\.io\/new\S+/g)].map(
           (m) => m[0]
@@ -6306,6 +6379,20 @@ ${stderr}` : ""}`,
       );
     }
   }
+  async isVersionPublished(version2) {
+    try {
+      const [scope, name] = getScopeAndName(this.packageName);
+      const response = await fetch(
+        `${this.registry}/@${scope}/${name}/${version2}`
+      );
+      return response.status === 200;
+    } catch (error) {
+      throw new JsrError(
+        `Failed to fetch \`${this.registry}/${this.packageName}/${version2}\``,
+        { cause: error }
+      );
+    }
+  }
   async hasPermission() {
     return this.client.scopePermission(`${getScope(this.packageName)}`) !== null;
   }
@@ -6535,7 +6622,7 @@ async function jsrRegistry() {
 // src/registry/npm.ts
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { exec as exec7, NonZeroExitError as NonZeroExitError3 } from "tinyexec";
+import { exec as exec7, NonZeroExitError as NonZeroExitError4 } from "tinyexec";
 var NpmError = class extends AbstractError {
   constructor() {
     super(...arguments);
@@ -6580,6 +6667,19 @@ var NpmRegistry = class extends Registry {
       );
     }
   }
+  async isVersionPublished(version2) {
+    try {
+      const response = await fetch(
+        `${this.registry}/${this.packageName}/${version2}`
+      );
+      return response.status === 200;
+    } catch (error) {
+      throw new NpmError(
+        `Failed to fetch \`${this.registry}/${this.packageName}/${version2}\``,
+        { cause: error }
+      );
+    }
+  }
   async userName() {
     try {
       return (await this.npm(["whoami"])).trim();
@@ -6592,7 +6692,7 @@ var NpmRegistry = class extends Registry {
       await this.npm(["whoami"]);
       return true;
     } catch (error) {
-      if (error instanceof NonZeroExitError3) {
+      if (error instanceof NonZeroExitError4) {
         return false;
       }
       throw new NpmError("Failed to run `npm whoami`", { cause: error });
@@ -6670,7 +6770,7 @@ var NpmRegistry = class extends Registry {
       await this.npm(["publish", "--provenance", "--access", "public"]);
       return true;
     } catch (error) {
-      if (error instanceof NonZeroExitError3 && error.output?.stderr.includes("EOTP")) {
+      if (error instanceof NonZeroExitError4 && error.output?.stderr.includes("EOTP")) {
         return false;
       }
       throw this.classifyPublishError(error);
@@ -6682,7 +6782,7 @@ var NpmRegistry = class extends Registry {
       await this.npm(args);
       return true;
     } catch (error) {
-      if (error instanceof NonZeroExitError3 && error.output?.stderr.includes("EOTP")) {
+      if (error instanceof NonZeroExitError4 && error.output?.stderr.includes("EOTP")) {
         return false;
       }
       throw this.classifyPublishError(error);
@@ -6700,7 +6800,7 @@ var NpmRegistry = class extends Registry {
         }
       });
     } catch (error) {
-      const stderr = error instanceof NonZeroExitError3 ? error.output?.stderr : void 0;
+      const stderr = error instanceof NonZeroExitError4 ? error.output?.stderr : void 0;
       throw new NpmError(
         `Failed to run \`npm publish --dry-run\`${stderr ? `
 ${stderr}` : ""}`,
@@ -6727,7 +6827,7 @@ ${stderr}` : ""}`,
     };
   }
   classifyPublishError(error) {
-    if (error instanceof NonZeroExitError3) {
+    if (error instanceof NonZeroExitError4) {
       const stderr = error.output?.stderr ?? "";
       if (stderr.includes("EOTP")) {
         return new NpmError("OTP required for publishing", { cause: error });
@@ -6785,20 +6885,30 @@ async function withTokenRetry(registryKey, task, action) {
 }
 var npmDryRunPublishTask = {
   title: "Dry-run npm publish",
-  task: async (_, task) => {
+  task: async (ctx, task) => {
+    const npm = await npmRegistry();
+    if (await npm.isVersionPublished(ctx.version)) {
+      task.title = `[SKIPPED] Dry-run npm publish: v${ctx.version} already published`;
+      task.output = `\u26A0 ${npm.packageName}@${ctx.version} is already published on npm`;
+      return task.skip();
+    }
     task.output = "Running npm publish --dry-run...";
     await withTokenRetry("npm", task, async () => {
-      const npm = await npmRegistry();
       await npm.dryRunPublish();
     });
   }
 };
 var jsrDryRunPublishTask = {
   title: "Dry-run jsr publish",
-  task: async (_, task) => {
+  task: async (ctx, task) => {
+    const jsr = await jsrRegistry();
+    if (await jsr.isVersionPublished(ctx.version)) {
+      task.title = `[SKIPPED] Dry-run jsr publish: v${ctx.version} already published`;
+      task.output = `\u26A0 ${jsr.packageName}@${ctx.version} is already published on jsr`;
+      return task.skip();
+    }
     task.output = "Running jsr publish --dry-run...";
     await withTokenRetry("jsr", task, async () => {
-      const jsr = await jsrRegistry();
       await jsr.dryRunPublish();
     });
   }
@@ -6807,17 +6917,58 @@ async function getCrateName2(packagePath) {
   const eco = new RustEcosystem(packagePath ?? process.cwd());
   return await eco.packageName();
 }
-function createCratesDryRunPublishTask(packagePath) {
+var MISSING_CRATE_PATTERN = /no matching package named `([^`]+)` found/;
+async function findUnpublishedSiblingDeps(packagePath, siblingCrateNames) {
+  const eco = new RustEcosystem(packagePath ?? process.cwd());
+  const deps = await eco.dependencies();
+  const siblingDeps = deps.filter((d2) => siblingCrateNames.includes(d2));
+  const results = await Promise.all(
+    siblingDeps.map(async (name) => {
+      const registry = new CratesRegistry(name);
+      const published = await registry.isPublished();
+      return published ? null : name;
+    })
+  );
+  return results.filter((name) => name !== null);
+}
+function createCratesDryRunPublishTask(packagePath, siblingCrateNames) {
   const label = packagePath ? ` (${packagePath})` : "";
   return {
     title: `Dry-run crates.io publish${label}`,
-    task: async (_, task) => {
+    task: async (ctx, task) => {
+      const packageName = await getCrateName2(packagePath);
+      const registry = new CratesRegistry(packageName);
+      if (await registry.isVersionPublished(ctx.version)) {
+        task.title = `[SKIPPED] Dry-run crates.io publish${label}: v${ctx.version} already published`;
+        task.output = `\u26A0 ${packageName}@${ctx.version} is already published on crates.io`;
+        return task.skip();
+      }
+      if (siblingCrateNames?.length) {
+        const unpublished = await findUnpublishedSiblingDeps(
+          packagePath,
+          siblingCrateNames
+        );
+        if (unpublished.length > 0) {
+          task.title = `Dry-run crates.io publish${label} [skipped: sibling crate \`${unpublished.join("`, `")}\` not yet published]`;
+          return;
+        }
+      }
       task.output = "Running cargo publish --dry-run...";
-      await withTokenRetry("crates", task, async () => {
-        const packageName = await getCrateName2(packagePath);
-        const registry = new CratesRegistry(packageName);
-        await registry.dryRunPublish(packagePath);
-      });
+      try {
+        await withTokenRetry("crates", task, async () => {
+          const packageName2 = await getCrateName2(packagePath);
+          const registry2 = new CratesRegistry(packageName2);
+          await registry2.dryRunPublish(packagePath);
+        });
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        const match = message.match(MISSING_CRATE_PATTERN);
+        if (match && siblingCrateNames?.includes(match[1])) {
+          task.title = `Dry-run crates.io publish${label} [skipped: sibling crate \`${match[1]}\` not yet published]`;
+          return;
+        }
+        throw error;
+      }
     }
   };
 }
@@ -6998,48 +7149,62 @@ var jsrPublishTasks = {
   title: "Running jsr publish",
   task: async (ctx, task) => {
     const jsr = await jsrRegistry();
+    if (await jsr.isVersionPublished(ctx.version)) {
+      task.title = `[SKIPPED] jsr: v${ctx.version} already published`;
+      task.output = `\u26A0 ${jsr.packageName}@${ctx.version} is already published on jsr`;
+      return task.skip();
+    }
     task.output = "Publishing on jsr...";
-    if (!JsrClient.token && !ctx.promptEnabled) {
-      const jsrTokenEnv = process12.env.JSR_TOKEN;
-      if (!jsrTokenEnv) {
-        throw new JsrAvailableError(
-          "JSR_TOKEN not found in the environment variables. Please set the token and try again."
-        );
+    try {
+      if (!JsrClient.token && !ctx.promptEnabled) {
+        const jsrTokenEnv = process12.env.JSR_TOKEN;
+        if (!jsrTokenEnv) {
+          throw new JsrAvailableError(
+            "JSR_TOKEN not found in the environment variables. Please set the token and try again."
+          );
+        }
+        JsrClient.token = jsrTokenEnv;
       }
-      JsrClient.token = jsrTokenEnv;
-    }
-    let result = await jsr.publish();
-    if (!result && jsr.packageCreationUrls) {
-      if (ctx.promptEnabled) {
-        task.title = "Running jsr publish (package creation needed)";
-        const urls = jsr.packageCreationUrls;
-        const maxAttempts = 3;
-        task.output = `Package doesn't exist on jsr. Create it at:
+      let result = await jsr.publish();
+      if (!result && jsr.packageCreationUrls) {
+        if (ctx.promptEnabled) {
+          task.title = "Running jsr publish (package creation needed)";
+          const urls = jsr.packageCreationUrls;
+          const maxAttempts = 3;
+          task.output = `Package doesn't exist on jsr. Create it at:
 ${urls.map((url) => `  ${color.cyan(url)}`).join("\n")}`;
-        open(urls[0]);
-        for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-          await task.prompt(ListrEnquirerPromptAdapter3).run({
-            type: "input",
-            message: `Press ${color.bold("enter")} after creating the package on jsr.io${attempt > 1 ? ` (attempt ${attempt}/${maxAttempts})` : ""}`
-          });
-          result = await jsr.publish();
-          if (result) break;
-          if (attempt < maxAttempts) {
-            task.output = "Package still doesn't exist. Please create it and try again.";
+          open(urls[0]);
+          for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+            await task.prompt(ListrEnquirerPromptAdapter3).run({
+              type: "input",
+              message: `Press ${color.bold("enter")} after creating the package on jsr.io${attempt > 1 ? ` (attempt ${attempt}/${maxAttempts})` : ""}`
+            });
+            result = await jsr.publish();
+            if (result) break;
+            if (attempt < maxAttempts) {
+              task.output = "Package still doesn't exist. Please create it and try again.";
+            }
           }
-        }
-        if (!result) {
+          if (!result) {
+            throw new JsrAvailableError(
+              "Package creation not completed after 3 attempts."
+            );
+          }
+          task.title = "Running jsr publish (package created)";
+        } else {
           throw new JsrAvailableError(
-            "Package creation not completed after 3 attempts."
+            `Package doesn't exist on jsr. Create it at:
+${jsr.packageCreationUrls.join("\n")}`
           );
         }
-        task.title = "Running jsr publish (package created)";
-      } else {
-        throw new JsrAvailableError(
-          `Package doesn't exist on jsr. Create it at:
-${jsr.packageCreationUrls.join("\n")}`
-        );
       }
+    } catch (error) {
+      if (error instanceof Error && error.message.includes("already published")) {
+        task.title = `[SKIPPED] jsr: v${ctx.version} already published`;
+        task.output = `\u26A0 ${jsr.packageName}@${ctx.version} is already published on jsr`;
+        return task.skip();
+      }
+      throw error;
     }
   }
 };
@@ -7136,44 +7301,62 @@ var npmPublishTasks = {
   skip: (ctx) => !!ctx.preview,
   task: async (ctx, task) => {
     const npm = await npmRegistry();
+    if (await npm.isVersionPublished(ctx.version)) {
+      task.title = `[SKIPPED] npm: v${ctx.version} already published`;
+      task.output = `\u26A0 ${npm.packageName}@${ctx.version} is already published on npm`;
+      return task.skip();
+    }
     task.output = "Publishing on npm...";
-    if (ctx.promptEnabled) {
-      let result = await npm.publish();
-      if (!result) {
-        task.title = "Running npm publish (OTP code needed)";
-        const maxAttempts = 3;
-        for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-          result = await npm.publish(
-            await task.prompt(ListrEnquirerPromptAdapter4).run({
-              type: "password",
-              message: `npm OTP code${attempt > 1 ? ` (attempt ${attempt}/${maxAttempts})` : ""}`
-            })
-          );
-          if (result) break;
-          if (attempt < maxAttempts) {
-            task.output = "2FA failed. Please try again.";
+    try {
+      if (ctx.promptEnabled) {
+        let result = await npm.publish();
+        if (!result) {
+          task.title = "Running npm publish (OTP code needed)";
+          const maxAttempts = 3;
+          for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+            result = await npm.publish(
+              await task.prompt(ListrEnquirerPromptAdapter4).run({
+                type: "password",
+                message: `npm OTP code${attempt > 1 ? ` (attempt ${attempt}/${maxAttempts})` : ""}`
+              })
+            );
+            if (result) break;
+            if (attempt < maxAttempts) {
+              task.output = "2FA failed. Please try again.";
+            }
+          }
+          if (!result) {
+            throw new NpmAvailableError(
+              "OTP verification failed after 3 attempts."
+            );
           }
+          task.title = "Running npm publish (2FA passed)";
+        }
+      } else {
+        const npmTokenEnv = process13.env.NODE_AUTH_TOKEN;
+        if (!npmTokenEnv) {
+          throw new NpmAvailableError(
+            "NODE_AUTH_TOKEN not found in environment variables. Set it in your CI configuration:\n  GitHub Actions: Add NODE_AUTH_TOKEN as a repository secret\n  Other CI: Export NODE_AUTH_TOKEN with your npm access token"
+          );
         }
+        const result = await npm.publishProvenance();
         if (!result) {
           throw new NpmAvailableError(
-            "OTP verification failed after 3 attempts."
+            `In CI environment, publishing with 2FA is not allowed. Please disable 2FA when accessing with a token from https://www.npmjs.com/package/${npm.packageName}/access `
           );
         }
-        task.title = "Running npm publish (2FA passed)";
       }
-    } else {
-      const npmTokenEnv = process13.env.NODE_AUTH_TOKEN;
-      if (!npmTokenEnv) {
-        throw new NpmAvailableError(
-          "NODE_AUTH_TOKEN not found in environment variables. Set it in your CI configuration:\n  GitHub Actions: Add NODE_AUTH_TOKEN as a repository secret\n  Other CI: Export NODE_AUTH_TOKEN with your npm access token"
-        );
-      }
-      const result = await npm.publishProvenance();
-      if (!result) {
-        throw new NpmAvailableError(
-          `In CI environment, publishing with 2FA is not allowed. Please disable 2FA when accessing with a token from https://www.npmjs.com/package/${npm.packageName}/access `
-        );
+    } catch (error) {
+      if (error instanceof Error && (error.message.includes(
+        "cannot publish over the previously published"
+      ) || error.message.includes(
+        "You cannot publish over the previously published"
+      ))) {
+        task.title = `[SKIPPED] npm: v${ctx.version} already published`;
+        task.output = `\u26A0 ${npm.packageName}@${ctx.version} is already published on npm`;
+        return task.skip();
       }
+      throw error;
     }
   }
 };
@@ -7589,10 +7772,15 @@ async function collectDryRunPublishTasks(ctx) {
       return nonCratesTasks;
     }
     const sortedPaths = await sortCratesByDependencyOrder(cratesPaths);
+    const siblingCrateNames = await Promise.all(
+      cratesPaths.map((p) => new RustEcosystem(p).packageName())
+    );
     const sequentialCratesTask = {
       title: "Dry-run crates.io publish (sequential)",
       task: (_ctx, task) => task.newListr(
-        sortedPaths.map((p) => createCratesDryRunPublishTask(p)),
+        sortedPaths.map(
+          (p) => createCratesDryRunPublishTask(p, siblingCrateNames)
+        ),
         { concurrent: false }
       )
     };
@@ -7685,23 +7873,23 @@ async function run(options) {
             addRollback(async () => {
               if (tagCreated) {
                 try {
-                  console.log("Deleting tag...");
+                  rollbackLog("Deleting tag");
                   await git.deleteTag(`${await git.latestTag()}`);
                 } catch (error) {
-                  console.error(
+                  rollbackError(
                     `Failed to delete tag: ${error instanceof Error ? error.message : error}`
                   );
                 }
               }
               if (commited) {
                 try {
-                  console.log("Reset commits...");
+                  rollbackLog("Resetting commits");
                   await git.reset();
                   await git.stash();
                   await git.reset("HEAD^", "--hard");
                   await git.popStash();
                 } catch (error) {
-                  console.error(
+                  rollbackError(
                     `Failed to reset commits: ${error instanceof Error ? error.message : error}`
                   );
                 }