@mikaelkaron/skills-cherry-pick-filter 0.2.3 → 0.4.0

package/dist/commands/cherry-pick-filter.js

@@ -60,9 +60,10 @@ All human-readable output goes to stderr. stdout emits one picked commit SHA per
                 this.logToStderr(`Checking out '${targetBranch}' from origin...`);
                 const checkoutResult = tryExec(`git checkout --track origin/${targetBranch}`);
                 if (!checkoutResult.ok) {
-                    this.logToStderr(`Error: failed to checkout '${targetBranch}' from origin.`);
                     this.logToStderr(checkoutResult.output);
-                    this.exit(1);
+                    this.error(`failed to checkout '${targetBranch}' from origin.`, {
+                        exit: 1,
+                    });
                 }
                 exec(`git checkout ${currentBranch}`);
             }
@@ -115,7 +116,7 @@ All human-readable output goes to stderr. stdout emits one picked commit SHA per
             this.logToStderr(`Split each commit with:`);
             this.logToStderr(`  git rebase -i ${mixed[0].sha.slice(0, 9)}^\n`);
             this.logToStderr(`Then re-run: git cherry-pick-filter ${targetBranch} ${filters.map((f) => `--filter ${f}`).join(" ")}`);
-            this.exit(1);
+            this.error(`${mixed.length} mixed commit(s) detected — split before syncing.`, { exit: 1 });
         }
         const verb = dryRun ? "Would pick" : "Ready to pick";
         this.logToStderr(`${verb} ${candidates.length} commit${candidates.length === 1 ? "" : "s"}:`);
@@ -137,11 +138,12 @@ All human-readable output goes to stderr. stdout emits one picked commit SHA per
                 picked++;
             }
             else {
-                this.logToStderr(`\nCherry-pick failed: ${sha.slice(0, 9)} ${subject}\n`);
                 this.logToStderr("Resolve the conflict then run:");
                 this.logToStderr("  git cherry-pick --continue");
                 this.logToStderr("  git cherry-pick --abort   (to cancel)");
-                this.exit(1);
+                this.error(`cherry-pick failed: ${sha.slice(0, 9)} ${subject}`, {
+                    exit: 1,
+                });
             }
         }
         exec(`git checkout ${currentBranch}`);

package/dist/lib/git.js

@@ -1,6 +1,9 @@
 import { execSync } from "node:child_process";
 export function exec(cmd) {
-    return execSync(cmd, { encoding: "utf8", stdio: ["pipe", "pipe", "inherit"] }).trim();
+    return execSync(cmd, {
+        encoding: "utf8",
+        stdio: ["pipe", "pipe", "inherit"],
+    }).trim();
 }
 export function tryExec(cmd) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikaelkaron/skills-cherry-pick-filter",
-  "version": "0.2.3",
+  "version": "0.4.0",
   "bin": {
     "mks-cherry-pick-filter": "bin/run.js"
   },
@@ -15,6 +15,7 @@
   },
   "scripts": {
     "build": "tsc",
+    "pretest": "npm run build",
     "test": "node --experimental-strip-types --test 'test/**/*.test.ts'",
     "test:types": "tsc -p test/tsconfig.json"
   },