@denisvieiradev/gitwise-core 0.1.0 → 1.1.1

package/dist/index.d.ts

@@ -721,7 +721,12 @@ interface FinishReleaseOptions {
  * failed strategy merge (typically gitflow's develop merge when develop has
  * advanced) surfaces as `FINISH_MERGE_CONFLICT` — the repo is left mid-merge
  * for manual recovery (`git merge --continue` then tag + push by hand) since
- * the plan can no longer be re-run.
+ * the plan can no longer be re-run. A failure in step 9 (tag creation, or a
+ * rejected push — typically a non-fast-forward because origin's mainBranch
+ * advanced, e.g. a CI bot commit, while this release was being prepared or
+ * finished) surfaces as `FINISH_PUSH_FAILED` with the exact fetch/merge/push
+ * recovery commands embedded in the message; merge (never rebase) is required
+ * because the tag, if already created, is pinned to the release commit's hash.
  */
 declare function finishRelease(opts: FinishReleaseOptions): Promise<void>;
 interface AbortReleaseOptions {

package/dist/index.js

@@ -7,7 +7,7 @@ var __export = (target, all) => {
 // package.json
 var package_default = {
   name: "@denisvieiradev/gitwise-core",
-  version: "0.1.0",
+  version: "1.1.0",
   description: "Shared logic for gitwise: non-interactive commit/review/pr/release commands, LLM providers, git/github primitives, prompt templates.",
   type: "module",
   main: "./dist/index.js",
@@ -890,12 +890,10 @@ function defaultIsProcessAlive(pid) {
 }
 
 // src/providers/claude-code.ts
-import { execFile as execFile3, execSync, spawn } from "child_process";
+import { execSync, spawn } from "child_process";
 import fs from "fs";
 import os from "os";
 import path2 from "path";
-import { promisify as promisify3 } from "util";
-var execFileAsync = promisify3(execFile3);
 var LARGE_PROMPT_THRESHOLD = 1e5;
 var DEFAULT_TIMEOUT_MS = 12e4;
 var COMMON_CLAUDE_PATHS = [
@@ -973,35 +971,12 @@ var ClaudeCodeProvider = class {
     return args;
   }
   async callViaCli(args) {
-    try {
-      const { stdout } = await execFileAsync(this.claudeBinaryPath, args, {
-        timeout: DEFAULT_TIMEOUT_MS,
-        maxBuffer: 10 * 1024 * 1024,
-        ...{ input: "" }
-      });
-      return this.parseResponse(stdout);
-    } catch (err) {
-      const execErr = err;
-      if (execErr.stdout) {
-        try {
-          const parsed = JSON.parse(execErr.stdout);
-          if (parsed.is_error) {
-            throw new Error(`Claude CLI error: ${parsed.result}`);
-          }
-        } catch (parseErr) {
-          if (parseErr instanceof Error && parseErr.message.startsWith("Claude CLI error:")) {
-            throw parseErr;
-          }
-        }
-      }
-      const stderr = execErr.stderr?.replace(/Warning: no stdin data.*\n?/g, "").trim();
-      if (stderr) {
-        throw new Error(`Claude CLI failed: ${stderr}`);
-      }
-      throw this.wrapError(err);
-    }
+    return this.spawnClaude(args, "");
   }
   async callViaStdin(args, input) {
+    return this.spawnClaude(args, input);
+  }
+  async spawnClaude(args, input) {
     return new Promise((resolve, reject) => {
       const child = spawn(this.claudeBinaryPath, args, {
         stdio: ["pipe", "pipe", "pipe"],
@@ -1740,9 +1715,9 @@ ${stderr}`;
 }
 
 // src/commands/pr.ts
-import { execFile as execFile4 } from "child_process";
-import { promisify as promisify4 } from "util";
-var exec3 = promisify4(execFile4);
+import { execFile as execFile3 } from "child_process";
+import { promisify as promisify3 } from "util";
+var exec3 = promisify3(execFile3);
 function parsePrResponse(content) {
   const titleMatch = content.match(/^TITLE:\s*(.+)$/m);
   const title = titleMatch ? titleMatch[1].trim() : "Update";
@@ -2473,6 +2448,28 @@ ${dirty}`,
   await saveReleasePlan(cwd, persistedPlan);
   await finishRelease({ cwd, tagAndPush, createGhRelease, workspacePropagation, signTags });
 }
+function finishPushFailure(opts) {
+  const { stage, tag, mainBranch, developBranch, newVersion, err } = opts;
+  const cause = err instanceof Error ? err.message : String(err);
+  const action = stage === "tag" ? `create the tag "${tag}"` : stage === "push-main" ? `push "${mainBranch}" (with tags) to origin` : `push "${developBranch}" to origin`;
+  const recoverySteps = stage === "tag" ? [
+    `git tag -a ${tag} -F .gitwise/release-${newVersion}.md`,
+    `git push origin ${mainBranch} --follow-tags`
+  ] : [
+    `git ls-remote --tags origin ${tag}  # check whether the tag already reached origin`,
+    `git fetch origin`,
+    `git merge origin/${mainBranch}  # do NOT rebase \u2014 that changes the hash ${tag} points to`,
+    `git push origin ${mainBranch} --follow-tags`
+  ];
+  return new GitwiseError({
+    code: "FINISH_PUSH_FAILED",
+    message: `Failed to ${action} while finishing v${newVersion}: ${cause}. The release plan file has already been deleted, so "gw release finish" cannot be re-run, and the release commit already exists locally, so "gw release prepare" will refuse with NO_COMMITS. Recover manually:
+${recoverySteps.map((s) => `  ${s}`).join("\n")}`,
+    exitCode: EXIT_CODES.GIT_FAILED,
+    cause: err,
+    details: { stage, tag, mainBranch, developBranch, newVersion }
+  });
+}
 async function finishRelease(opts) {
   const {
     cwd,
@@ -2663,15 +2660,27 @@ ${cause}`,
     await checkout(cwd, mainBranch);
   }
   if (tagAndPush) {
-    await createTag(cwd, tag, notes, { signed: signTags !== false });
-    await pushWithTags(cwd, "origin", mainBranch);
+    try {
+      await createTag(cwd, tag, notes, { signed: signTags !== false });
+    } catch (err) {
+      throw finishPushFailure({ stage: "tag", tag, mainBranch, newVersion: plan.newVersion, err });
+    }
+    try {
+      await pushWithTags(cwd, "origin", mainBranch);
+    } catch (err) {
+      throw finishPushFailure({ stage: "push-main", tag, mainBranch, newVersion: plan.newVersion, err });
+    }
     debug("release.finish.tag.pushed", {
       tag,
       branch: mainBranch,
       remote: "origin"
     });
     if (strategy.requiresDevelop()) {
-      await push(cwd, "origin", developBranch);
+      try {
+        await push(cwd, "origin", developBranch);
+      } catch (err) {
+        throw finishPushFailure({ stage: "push-develop", tag, mainBranch, developBranch, newVersion: plan.newVersion, err });
+      }
     }
   }
   if (createGhRelease) {