contribute-now 0.6.0 → 0.6.1-dev.4075d32

package/dist/index.js

@@ -293,6 +293,12 @@ async function getCommitHash(ref) {
     return null;
   return stdout.trim() || null;
 }
+async function getCommitSubject(ref) {
+  const { exitCode, stdout } = await run(["log", "-1", "--format=%s", ref]);
+  if (exitCode !== 0)
+    return null;
+  return stdout.trim() || null;
+}
 async function determineRebaseStrategy(currentBranch, syncRef) {
   const upstreamRef = await getUpstreamRef();
   if (!upstreamRef) {
@@ -664,21 +670,21 @@ LogEngine.configure({
   mode: LogMode.INFO,
   format: {
     includeIsoTimestamp: false,
-    includeLocalTime: true,
+    includeLocalTime: false,
     includeEmoji: true
   }
 });
-function success(msg) {
-  LogEngine.log(msg);
+function success(msg, emoji = "✅") {
+  LogEngine.log(msg, undefined, { emoji });
 }
-function error(msg) {
-  LogEngine.error(msg);
+function error(msg, emoji = "\uD83D\uDEA8") {
+  LogEngine.error(msg, undefined, { emoji });
 }
-function warn(msg) {
-  LogEngine.warn(msg);
+function warn(msg, emoji = "⚠️") {
+  LogEngine.warn(msg, undefined, { emoji });
 }
-function info(msg) {
-  LogEngine.info(msg);
+function info(msg, emoji = "ℹ️") {
+  LogEngine.info(msg, undefined, { emoji });
 }
 function heading(msg) {
   console.log(`
@@ -1677,8 +1683,8 @@ async function handleCurrentBranchDeletion(currentBranch, baseBranch, config) {
       if (rebaseResult.exitCode !== 0) {
         await rebaseAbort();
         warn("Rebase had conflicts — aborted to keep the repo in a clean state.");
-        info(`Your work is saved on ${pc5.bold(newBranchName)}. After cleanup, rebase manually:`);
-        info(`  ${pc5.bold(`git checkout ${newBranchName} && git rebase ${syncSource2.ref}`)}`);
+        info(`Your work is saved on ${pc5.bold(newBranchName)}. After cleanup, rebase manually:`, "");
+        info(`  ${pc5.bold(`git checkout ${newBranchName} && git rebase ${syncSource2.ref}`)}`, "");
       } else {
         success(`Rebased ${pc5.bold(newBranchName)} onto ${pc5.bold(syncSource2.ref)}.`);
       }
@@ -1753,7 +1759,7 @@ var clean_default = defineCommand2({
         const mergedPR = await getMergedPRForBranch(currentBranch);
         if (mergedPR) {
           warn(`PR #${mergedPR.number} (${pc5.bold(mergedPR.title)}) has already been merged.`);
-          info(`Link: ${pc5.underline(mergedPR.url)}`);
+          info(`Link: ${pc5.underline(mergedPR.url)}`, "");
           goneCandidates.push(currentBranch);
         }
       }
@@ -1827,7 +1833,7 @@ ${pc5.bold("Stale branches (remote deleted, likely squash-merged):")}`);
       }
     }
     if (mergedCandidates.length === 0 && goneCandidates.length === 0) {
-      info("No branches to clean up. Everything is tidy! \uD83E\uDDF9");
+      info("No branches to clean up. Everything is tidy!", "\uD83E\uDDF9");
     }
     const finalBranch = await getCurrentBranch();
     if (finalBranch && protectedBranches.has(finalBranch)) {
@@ -2069,7 +2075,7 @@ ${pc6.bold("Changed files:")}`);
       error(`Failed to commit: ${result.stderr}`);
       process.exit(1);
     }
-    success(`✅ Committed: ${pc6.bold(finalMessage)}`);
+    success(`Committed: ${pc6.bold(finalMessage)}`);
   }
 });
 async function runGroupCommit(model, config) {
@@ -2176,7 +2182,7 @@ ${pc6.bold(`AI suggested ${validGroups.length} commit group(s):`)}
         continue;
       }
       committed++;
-      success(`✅ Committed group ${i + 1}: ${pc6.bold(group.message)}`);
+      success(`Committed group ${i + 1}: ${pc6.bold(group.message)}`);
     }
   } else {
     for (let i = 0;i < validGroups.length; i++) {
@@ -2247,7 +2253,7 @@ ${pc6.bold(`AI suggested ${validGroups.length} commit group(s):`)}
           continue;
         }
         committed++;
-        success(`✅ Committed group ${i + 1}: ${pc6.bold(message)}`);
+        success(`Committed group ${i + 1}: ${pc6.bold(message)}`);
         actionDone = true;
       }
     }
@@ -2255,8 +2261,8 @@ ${pc6.bold(`AI suggested ${validGroups.length} commit group(s):`)}
   if (committed === 0) {
     warn("No groups were committed.");
   } else {
-    success(`
-\uD83C\uDF89 ${committed} of ${validGroups.length} group(s) committed successfully.`);
+    console.log();
+    success(`${committed} of ${validGroups.length} group(s) committed successfully.`, "\uD83C\uDF89");
   }
   process.exit(0);
 }
@@ -2268,7 +2274,7 @@ import pc7 from "picocolors";
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.6.0",
+  version: "0.6.1-dev.4075d32",
   description: "Developer CLI that automates git workflows — branching, syncing, committing, and PRs — with multi-workflow and commit convention support.",
   type: "module",
   bin: {
@@ -2731,7 +2737,7 @@ async function installHook() {
   }
   if (config.commitConvention === "none") {
     warn('Commit convention is set to "none". No hook to install.');
-    info("Change your convention with `contrib setup` first.");
+    info("Change your convention with `contrib setup` first.", "");
     process.exit(0);
   }
   const hookPath = getHookPath();
@@ -2751,8 +2757,8 @@ async function installHook() {
   }
   writeFileSync2(hookPath, generateHookScript(), { mode: 493 });
   success(`commit-msg hook installed.`);
-  info(`Convention: ${pc8.bold(CONVENTION_LABELS[config.commitConvention])}`);
-  info(`Path: ${pc8.dim(hookPath)}`);
+  info(`Convention: ${pc8.bold(CONVENTION_LABELS[config.commitConvention])}`, "");
+  info(`Path: ${pc8.dim(hookPath)}`, "");
   warn("Note: hooks can be bypassed with `git commit --no-verify`.");
 }
 async function uninstallHook() {
@@ -3169,7 +3175,7 @@ async function handleSave(message) {
     return;
   }
   success(`Saved: ${pc10.dim(label)}`);
-  info(`Use ${pc10.bold("contrib save --restore")} to bring them back.`);
+  info(`Use ${pc10.bold("contrib save --restore")} to bring them back.`, "");
 }
 async function handleRestore() {
   heading("\uD83D\uDCBE contrib save --restore");
@@ -3214,8 +3220,8 @@ async function handleList() {
     console.log(`  ${idx}  ${msg}`);
   }
   console.log();
-  info(`Use ${pc10.bold("contrib save --restore")} to bring changes back.`);
-  info(`Use ${pc10.bold("contrib save --drop")} to discard saved changes.`);
+  info(`Use ${pc10.bold("contrib save --restore")} to bring changes back.`, "");
+  info(`Use ${pc10.bold("contrib save --drop")} to discard saved changes.`, "");
 }
 async function handleDrop() {
   heading("\uD83D\uDCBE contrib save --drop");
@@ -3425,7 +3431,7 @@ var setup_default = defineCommand8({
           success(`Added remote ${pc11.bold(upstreamRemote)} → ${upstreamUrl}`);
         } else {
           error("An upstream remote URL is required for contributors.");
-          info("Add it manually: git remote add upstream <url>");
+          info("Add it manually: git remote add upstream <url>", "");
           process.exit(1);
         }
       }
@@ -3441,9 +3447,9 @@ var setup_default = defineCommand8({
       commitConvention
     };
     writeConfig(config);
-    success(`✅ Config written to .contributerc.json`);
+    success(`Config written to .contributerc.json`);
     const syncRemote = config.role === "contributor" ? config.upstream : config.origin;
-    info(`Fetching ${pc11.bold(syncRemote)} to verify branch configuration...`);
+    info(`Fetching ${pc11.bold(syncRemote)} to verify branch configuration...`, "");
     await fetchRemote(syncRemote);
     const mainRef = `${syncRemote}/${config.mainBranch}`;
     if (!await refExists(mainRef)) {
@@ -3565,7 +3571,7 @@ var start_default = defineCommand9({
     info(`Creating branch: ${pc12.bold(branchName)}`);
     if (await branchExists(branchName)) {
       error(`Branch ${pc12.bold(branchName)} already exists.`);
-      info(`  Use ${pc12.bold(`git checkout ${branchName}`)} to switch to it, or choose a different name.`);
+      info(`  Use ${pc12.bold(`git checkout ${branchName}`)} to switch to it, or choose a different name.`, "");
       process.exit(1);
     }
     await fetchRemote(syncSource.remote);
@@ -3593,11 +3599,11 @@ var start_default = defineCommand9({
           error(`Failed to create branch: ${result2.stderr}`);
           process.exit(1);
         }
-        success(`✅ Created ${pc12.bold(branchName)} from ${pc12.bold(syncSource.ref)}`);
+        success(`Created ${pc12.bold(branchName)} from ${pc12.bold(syncSource.ref)}`);
         return;
       }
       error(`Failed to update ${pc12.bold(baseBranch)}: ${updateResult.stderr}`);
-      info("Make sure your base branch exists locally or the remote ref is available.");
+      info("Make sure your base branch exists locally or the remote ref is available.", "");
       process.exit(1);
     }
     const result = await createBranch(branchName, baseBranch);
@@ -3605,7 +3611,7 @@ var start_default = defineCommand9({
       error(`Failed to create branch: ${result.stderr}`);
       process.exit(1);
     }
-    success(`✅ Created ${pc12.bold(branchName)} from latest ${pc12.bold(baseBranch)}`);
+    success(`Created ${pc12.bold(branchName)} from latest ${pc12.bold(baseBranch)}`);
   }
 });
 
@@ -3668,6 +3674,51 @@ var status_default = defineCommand10({
     } else if (currentBranch) {
       console.log(pc13.dim(`  (on ${pc13.bold(currentBranch)} branch)`));
     }
+    let branchesAligned = true;
+    {
+      const alignRefs = [];
+      const devRemote = isContributor ? upstream : origin;
+      const hashResults = await Promise.all([
+        getCommitHash(mainBranch).then((h) => ({ name: mainBranch, hash: h })),
+        getCommitHash(`${origin}/${mainBranch}`).then((h) => ({ name: `${origin}/${mainBranch}`, hash: h })),
+        ...hasDevBranch(workflow) && config.devBranch ? [
+          getCommitHash(config.devBranch).then((h) => ({ name: config.devBranch, hash: h })),
+          getCommitHash(`${devRemote}/${config.devBranch}`).then((h) => ({
+            name: `${devRemote}/${config.devBranch}`,
+            hash: h
+          }))
+        ] : []
+      ]);
+      for (const { name, hash } of hashResults) {
+        if (hash)
+          alignRefs.push({ name, hash });
+      }
+      if (alignRefs.length > 1) {
+        const groups = new Map;
+        for (const { name, hash } of alignRefs) {
+          if (!groups.has(hash))
+            groups.set(hash, []);
+          groups.get(hash).push(name);
+        }
+        branchesAligned = groups.size === 1;
+        console.log();
+        console.log(`  ${pc13.bold("\uD83D\uDD17 Branch Alignment")}`);
+        for (const [hash, names] of groups) {
+          const short = hash.slice(0, 7);
+          const nameStr = names.map((n) => pc13.bold(n)).join(pc13.dim(" · "));
+          console.log(`     ${pc13.yellow(short)} ${pc13.dim("──")} ${nameStr}`);
+          const subject = await getCommitSubject(hash);
+          if (subject) {
+            console.log(`                ${pc13.dim(subject)}`);
+          }
+        }
+        if (branchesAligned) {
+          console.log(`     ${pc13.green("✓")} ${pc13.green("All branches aligned")} ${pc13.dim("— ready to start")}`);
+        } else {
+          console.log(`     ${pc13.yellow("⚠")} ${pc13.yellow("Branches are not fully aligned")}`);
+        }
+      }
+    }
     const hasFiles = fileStatus.staged.length > 0 || fileStatus.modified.length > 0 || fileStatus.untracked.length > 0;
     if (hasFiles) {
       console.log();
@@ -3693,6 +3744,9 @@ var status_default = defineCommand10({
       console.log(`  ${pc13.green("✓")}  ${pc13.dim("Working tree clean")}`);
     }
     const tips = [];
+    if (!branchesAligned) {
+      tips.push(`Run ${pc13.bold("contrib sync")} to align your local branches with the remote`);
+    }
     if (fileStatus.staged.length > 0) {
       tips.push(`Run ${pc13.bold("contrib commit")} to commit staged changes`);
     }
@@ -3870,8 +3924,8 @@ async function performSquashMerge(origin, baseBranch, featureBranch, options) {
       warn(`Could not delete remote branch: ${delRemote.stderr.trim()}`);
     }
   }
-  success(`✅ Squash merged ${pc14.bold(featureBranch)} into ${pc14.bold(baseBranch)} and pushed.`);
-  info(`Run ${pc14.bold("contrib start")} to begin a new feature.`);
+  success(`Squash merged ${pc14.bold(featureBranch)} into ${pc14.bold(baseBranch)} and pushed.`);
+  info(`Run ${pc14.bold("contrib start")} to begin a new feature.`, "");
 }
 var submit_default = defineCommand11({
   meta: {
@@ -3924,7 +3978,7 @@ var submit_default = defineCommand11({
       const hasAnything = hasCommits || dirty;
       if (!hasAnything) {
         error("No local changes or commits to move. Switch to a feature branch first.");
-        info(`  Run ${pc14.bold("contrib start")} to create a new feature branch.`);
+        info(`  Run ${pc14.bold("contrib start")} to create a new feature branch.`, "");
         process.exit(1);
       }
       if (hasCommits) {
@@ -3983,10 +4037,10 @@ var submit_default = defineCommand11({
       }
       success(`Created ${pc14.bold(newBranchName)} with your changes.`);
       await updateLocalBranch(currentBranch, remoteRef);
-      info(`Reset ${pc14.bold(currentBranch)} back to ${pc14.bold(remoteRef)} — no damage done.`);
+      info(`Reset ${pc14.bold(currentBranch)} back to ${pc14.bold(remoteRef)} — no damage done.`, "");
       console.log();
       success(`You're now on ${pc14.bold(newBranchName)} with all your work intact.`);
-      info(`Run ${pc14.bold("contrib submit")} again to push and create your PR.`);
+      info(`Run ${pc14.bold("contrib submit")} again to push and create your PR.`, "");
       return;
     }
     heading("\uD83D\uDE80 contrib submit");
@@ -4064,11 +4118,11 @@ var submit_default = defineCommand11({
             }
             if (rebaseResult.exitCode !== 0) {
               warn("Rebase encountered conflicts. Resolve them manually, then run:");
-              info(`  ${pc14.bold("git rebase --continue")}`);
+              info(`  ${pc14.bold("git rebase --continue")}`, "");
             } else {
               success(`Rebased ${pc14.bold(newBranchName)} onto ${pc14.bold(syncSource2.ref)}.`);
             }
-            info(`All your changes are preserved. Run ${pc14.bold("contrib submit")} when ready to create a new PR.`);
+            info(`All your changes are preserved. Run ${pc14.bold("contrib submit")} when ready to create a new PR.`, "");
             return;
           }
           warn("Discarding local changes...");
@@ -4105,8 +4159,8 @@ var submit_default = defineCommand11({
           error(`Failed to push: ${pushResult2.stderr}`);
           if (pushResult2.stderr.includes("rejected") || pushResult2.stderr.includes("non-fast-forward")) {
             warn("The remote branch has diverged. Try:");
-            info(`  git pull --rebase ${origin} ${currentBranch}`);
-            info("  Then run `contrib submit` again.");
+            info(`  git pull --rebase ${origin} ${currentBranch}`, "");
+            info("  Then run `contrib submit` again.", "");
           }
           process.exit(1);
         }
@@ -4142,22 +4196,39 @@ ${pc14.dim("AI body preview:")}`);
         warn(`AI unavailable: ${copilotError}`);
       }
     }
-    if (!args["no-ai"]) {
-      await tryGenerateAI();
-    }
     const CANCEL = "Cancel";
     const SQUASH_LOCAL = `Squash merge to ${baseBranch} locally (no PR)`;
     const REGENERATE = "Regenerate AI description";
     let submitAction = "cancel";
     const isMaintainer = config.role === "maintainer";
+    if (isMaintainer) {
+      const maintainerChoice = await selectPrompt("How would you like to submit your changes?", ["Create a PR", SQUASH_LOCAL, CANCEL]);
+      if (maintainerChoice === CANCEL) {
+        warn("Submit cancelled.");
+        return;
+      }
+      if (maintainerChoice === SQUASH_LOCAL) {
+        await performSquashMerge(origin, baseBranch, currentBranch, {
+          model: args.model,
+          convention: config.commitConvention
+        });
+        return;
+      }
+    }
+    if (!args["no-ai"]) {
+      await tryGenerateAI();
+    }
     let actionResolved = false;
     while (!actionResolved) {
       if (prTitle && prBody) {
-        const choices = ["Use AI description"];
-        if (isMaintainer)
-          choices.push(SQUASH_LOCAL);
-        choices.push("Edit title", "Write manually", "Use gh --fill (auto-fill from commits)", REGENERATE, CANCEL);
-        const action = await selectPrompt("What would you like to do with the PR description?", choices);
+        const action = await selectPrompt("What would you like to do with the PR description?", [
+          "Use AI description",
+          "Edit title",
+          "Write manually",
+          "Use gh --fill (auto-fill from commits)",
+          REGENERATE,
+          CANCEL
+        ]);
         if (action === CANCEL) {
           submitAction = "cancel";
           actionResolved = true;
@@ -4165,9 +4236,6 @@ ${pc14.dim("AI body preview:")}`);
           prTitle = null;
           prBody = null;
           await tryGenerateAI();
-        } else if (action === SQUASH_LOCAL) {
-          submitAction = "squash";
-          actionResolved = true;
         } else if (action === "Use AI description") {
           submitAction = "create-pr";
           actionResolved = true;
@@ -4186,8 +4254,6 @@ ${pc14.dim("AI body preview:")}`);
         }
       } else {
         const choices = [];
-        if (isMaintainer)
-          choices.push(SQUASH_LOCAL);
         if (!args["no-ai"])
           choices.push(REGENERATE);
         choices.push("Write title & body manually", "Use gh --fill (auto-fill from commits)", CANCEL);
@@ -4197,9 +4263,6 @@ ${pc14.dim("AI body preview:")}`);
           actionResolved = true;
         } else if (action === REGENERATE) {
           await tryGenerateAI();
-        } else if (action === SQUASH_LOCAL) {
-          submitAction = "squash";
-          actionResolved = true;
         } else if (action === "Write title & body manually") {
           prTitle = await inputPrompt("PR title");
           prBody = await inputPrompt("PR body (markdown)");
@@ -4215,23 +4278,16 @@ ${pc14.dim("AI body preview:")}`);
       warn("Submit cancelled.");
       return;
     }
-    if (submitAction === "squash") {
-      await performSquashMerge(origin, baseBranch, currentBranch, {
-        model: args.model,
-        convention: config.commitConvention
-      });
-      return;
-    }
     info(`Pushing ${pc14.bold(currentBranch)} to ${origin}...`);
     const pushResult = await pushSetUpstream(origin, currentBranch);
     if (pushResult.exitCode !== 0) {
       error(`Failed to push: ${pushResult.stderr}`);
       if (pushResult.stderr.includes("rejected") || pushResult.stderr.includes("non-fast-forward")) {
         warn("The remote branch has diverged. Try:");
-        info(`  git pull --rebase ${origin} ${currentBranch}`);
-        info("  Then run `contrib submit` again.");
-        info("If you need to force push (use with caution):");
-        info(`  git push --force-with-lease ${origin} ${currentBranch}`);
+        info(`  git pull --rebase ${origin} ${currentBranch}`, "");
+        info("  Then run `contrib submit` again.", "");
+        info("If you need to force push (use with caution):", "");
+        info(`  git push --force-with-lease ${origin} ${currentBranch}`, "");
       }
       process.exit(1);
     }
@@ -4240,10 +4296,10 @@ ${pc14.dim("AI body preview:")}`);
       if (repoInfo) {
         const prUrl = `https://github.com/${repoInfo.owner}/${repoInfo.repo}/compare/${baseBranch}...${currentBranch}?expand=1`;
         console.log();
-        info("Create your PR manually:");
+        info("Create your PR manually:", "");
         console.log(`  ${pc14.cyan(prUrl)}`);
       } else {
-        info("gh CLI not available. Create your PR manually on GitHub.");
+        info("gh CLI not available. Create your PR manually on GitHub.", "");
       }
       return;
     }
@@ -4253,7 +4309,7 @@ ${pc14.dim("AI body preview:")}`);
         error(`Failed to create PR: ${fillResult.stderr}`);
         process.exit(1);
       }
-      success(`✅ PR created: ${fillResult.stdout.trim()}`);
+      success(`PR created: ${fillResult.stdout.trim()}`);
       return;
     }
     if (!prTitle) {
@@ -4270,7 +4326,7 @@ ${pc14.dim("AI body preview:")}`);
       error(`Failed to create PR: ${prResult.stderr}`);
       process.exit(1);
     }
-    success(`✅ PR created: ${prResult.stdout.trim()}`);
+    success(`PR created: ${prResult.stdout.trim()}`);
   }
 });
 
@@ -4360,8 +4416,8 @@ var switch_default = defineCommand12({
         process.exit(1);
       }
       success(`Switched to ${pc15.bold(targetBranch)}`);
-      info(`Your changes from ${pc15.bold(currentBranch ?? "previous branch")} are saved.`);
-      info(`Use ${pc15.bold("contrib save --restore")} to bring them back.`);
+      info(`Your changes from ${pc15.bold(currentBranch ?? "previous branch")} are saved.`, "");
+      info(`Use ${pc15.bold("contrib save --restore")} to bring them back.`, "");
       return;
     }
     const result = await checkoutBranch(targetBranch);
@@ -4428,8 +4484,8 @@ var sync_default = defineCommand13({
     }
     if (!await refExists(syncSource.ref)) {
       error(`Remote ref ${pc16.bold(syncSource.ref)} does not exist.`);
-      info("This can happen if the branch was renamed or deleted on the remote.");
-      info(`Check your config: the base branch may need updating via ${pc16.bold("contrib setup")}.`);
+      info("This can happen if the branch was renamed or deleted on the remote.", "");
+      info(`Check your config: the base branch may need updating via ${pc16.bold("contrib setup")}.`, "");
       process.exit(1);
     }
     let allowMergeCommit = false;
@@ -4506,10 +4562,10 @@ var sync_default = defineCommand13({
           const remoteRef = syncSource.ref;
           await updateLocalBranch(baseBranch, remoteRef);
           success(`Reset ${pc16.bold(baseBranch)} to ${pc16.bold(remoteRef)}.`);
-          success(`✅ ${pc16.bold(baseBranch)} is now in sync with ${syncSource.ref}`);
+          success(`${pc16.bold(baseBranch)} is now in sync with ${syncSource.ref}`);
           console.log();
-          info(`Your commits are safe on ${pc16.bold(newBranchName)}.`);
-          info(`Run ${pc16.bold(`git checkout ${newBranchName}`)} then ${pc16.bold("contrib update")} to rebase onto the synced ${pc16.bold(baseBranch)}.`);
+          info(`Your commits are safe on ${pc16.bold(newBranchName)}.`, "");
+          info(`Run ${pc16.bold(`git checkout ${newBranchName}`)} then ${pc16.bold("contrib update")} to rebase onto the synced ${pc16.bold(baseBranch)}.`, "");
           return;
         }
         allowMergeCommit = true;
@@ -4532,11 +4588,11 @@ var sync_default = defineCommand13({
         error(`Pull failed: ${pullResult.stderr.trim()}`);
       } else {
         error(`Fast-forward pull failed. Your local ${pc16.bold(baseBranch)} may have diverged.`);
-        info(`Use ${pc16.bold("contrib sync")} again and choose "Move my commits to a new feature branch" to fix this.`);
+        info(`Use ${pc16.bold("contrib sync")} again and choose "Move my commits to a new feature branch" to fix this.`, "");
       }
       process.exit(1);
     }
-    success(`✅ ${baseBranch} is now in sync with ${syncSource.ref}`);
+    success(`${baseBranch} is now in sync with ${syncSource.ref}`);
     if (hasDevBranch(workflow) && role === "maintainer") {
       const mainDiv = await getDivergence(config.mainBranch, `${origin}/${config.mainBranch}`);
       if (mainDiv.behind > 0) {
@@ -4545,7 +4601,7 @@ var sync_default = defineCommand13({
         if (mainCoResult.exitCode === 0) {
           const mainPullResult = await pullFastForwardOnly(origin, config.mainBranch);
           if (mainPullResult.exitCode === 0) {
-            success(`✅ ${config.mainBranch} is now in sync with ${origin}/${config.mainBranch}`);
+            success(`${config.mainBranch} is now in sync with ${origin}/${config.mainBranch}`);
           }
         }
         await checkoutBranch(baseBranch);
@@ -4660,10 +4716,10 @@ var update_default = defineCommand14({
       }
       success(`Created ${pc17.bold(newBranchName)} with your changes.`);
       await updateLocalBranch(currentBranch, remoteRef);
-      info(`Reset ${pc17.bold(currentBranch)} back to ${pc17.bold(remoteRef)} — no damage done.`);
+      info(`Reset ${pc17.bold(currentBranch)} back to ${pc17.bold(remoteRef)} — no damage done.`, "");
       console.log();
       success(`You're now on ${pc17.bold(newBranchName)} with all your work intact.`);
-      info(`Run ${pc17.bold("contrib update")} again to rebase onto latest ${pc17.bold(baseBranch)}.`);
+      info(`Run ${pc17.bold("contrib update")} again to rebase onto latest ${pc17.bold(baseBranch)}.`, "");
       return;
     }
     if (await hasUncommittedChanges()) {
@@ -4674,7 +4730,7 @@ var update_default = defineCommand14({
     const mergedPR = await getMergedPRForBranch(currentBranch);
     if (mergedPR) {
       warn(`PR #${mergedPR.number} (${pc17.bold(mergedPR.title)}) has already been merged.`);
-      info(`Link: ${pc17.underline(mergedPR.url)}`);
+      info(`Link: ${pc17.underline(mergedPR.url)}`, "");
       const localWork = await hasLocalWork(syncSource.remote, currentBranch);
       const hasWork = localWork.uncommitted || localWork.unpushedCommits > 0;
       if (hasWork) {
@@ -4741,11 +4797,11 @@ var update_default = defineCommand14({
           }
           if (rebaseResult2.exitCode !== 0) {
             warn("Rebase encountered conflicts. Resolve them manually, then run:");
-            info(`  ${pc17.bold("git rebase --continue")}`);
+            info(`  ${pc17.bold("git rebase --continue")}`, "");
           } else {
             success(`Rebased ${pc17.bold(newBranchName)} onto ${pc17.bold(syncSource.ref)}.`);
           }
-          info(`All your changes are preserved. Run ${pc17.bold("contrib submit")} when ready to create a new PR.`);
+          info(`All your changes are preserved. Run ${pc17.bold("contrib submit")} when ready to create a new PR.`, "");
           return;
         }
         warn("Discarding local changes...");
@@ -4762,7 +4818,7 @@ var update_default = defineCommand14({
       info(`Deleting stale branch ${pc17.bold(currentBranch)}...`);
       await forceDeleteBranch(currentBranch);
       success(`Deleted ${pc17.bold(currentBranch)}.`);
-      info(`Run ${pc17.bold("contrib start")} to begin a new feature branch.`);
+      info(`Run ${pc17.bold("contrib start")} to begin a new feature branch.`, "");
       return;
     }
     info(`Updating ${pc17.bold(currentBranch)} with latest ${pc17.bold(baseBranch)}...`);
@@ -4823,7 +4879,7 @@ ${pc17.bold("\uD83D\uDCA1 AI Conflict Resolution Guidance:")}`);
       console.log(`  Or abort: ${pc17.cyan("git rebase --abort")}`);
       process.exit(1);
     }
-    success(`✅ ${pc17.bold(currentBranch)} has been rebased onto latest ${pc17.bold(baseBranch)}`);
+    success(`${pc17.bold(currentBranch)} has been rebased onto latest ${pc17.bold(baseBranch)}`);
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contribute-now",
-  "version": "0.6.0",
+  "version": "0.6.1-dev.4075d32",
   "description": "Developer CLI that automates git workflows — branching, syncing, committing, and PRs — with multi-workflow and commit convention support.",
   "type": "module",
   "bin": {