contribute-now 0.2.0 → 0.2.1-staging.42dccfe

package/dist/index.js

@@ -169,6 +169,13 @@ async function createBranch(branch, from) {
 async function resetHard(ref) {
   return run(["reset", "--hard", ref]);
 }
+async function updateLocalBranch(branch, target) {
+  const current = await getCurrentBranch();
+  if (current === branch) {
+    return resetHard(target);
+  }
+  return run(["branch", "-f", branch, target]);
+}
 async function pushSetUpstream(remote, branch) {
   return run(["push", "-u", remote, branch]);
 }
@@ -454,8 +461,14 @@ feat: add user authentication system
 fix(auth): resolve token expiry issue
 docs: update contributing guidelines
 feat!: redesign authentication API`;
-var CLEAN_COMMIT_SYSTEM_PROMPT = `You are a git commit message generator. Generate a Clean Commit message following this exact format:
-<emoji> <type>[!][(<scope>)]: <description>
+var CLEAN_COMMIT_SYSTEM_PROMPT = `You are a git commit message generator. Generate a Clean Commit message following this EXACT format:
+<emoji> <type>[!][ (<scope>)]: <description>
+
+CRITICAL spacing rules (must follow exactly):
+- There MUST be a space between the emoji and the type
+- If a scope is used, there MUST be a space before the opening parenthesis
+- There MUST be a colon and a space after the type or scope before the description
+- Pattern: EMOJI SPACE TYPE SPACE OPENPAREN SCOPE CLOSEPAREN COLON SPACE DESCRIPTION
 
 Emoji and type table:
 \uD83D\uDCE6 new      – new features, files, or capabilities
@@ -470,15 +483,21 @@ Emoji and type table:
 
 Rules:
 - Breaking change (!) only for: new, update, remove, security
-- Description: concise, imperative mood, max 72 chars
+- Description: concise, imperative mood, max 72 chars, lowercase start
 - Scope: optional, camelCase or kebab-case component name
 - Return ONLY the commit message line, nothing else
 
-Examples:
-\uD83D\uDCE6 new: user authentication system
+Correct examples:
+\uD83D\uDCE6 new: add user authentication system
 \uD83D\uDD27 update (api): improve error handling
 ⚙️ setup (ci): configure github actions workflow
-\uD83D\uDCE6 new!: completely redesign authentication system`;
+\uD83D\uDCE6 new!: redesign authentication system
+\uD83D\uDDD1️ remove (deps): drop unused lodash dependency
+
+WRONG (never do this):
+⚙️setup(ci): ... ← missing spaces
+\uD83D\uDCE6new: ... ← missing space after emoji
+\uD83D\uDD27 update(api): ... ← missing space before scope`;
 var BRANCH_NAME_SYSTEM_PROMPT = `You are a git branch name generator. Convert natural language descriptions into proper git branch names.
 
 Format: <prefix>/<kebab-case-name>
@@ -512,8 +531,21 @@ Rules:
 - Suggest the most likely correct resolution strategy
 - Never auto-resolve — provide guidance only
 - Be concise and actionable`;
+function suppressSubprocessWarnings() {
+  const prev = process.env.NODE_NO_WARNINGS;
+  process.env.NODE_NO_WARNINGS = "1";
+  return prev;
+}
+function restoreWarnings(prev) {
+  if (prev === undefined) {
+    delete process.env.NODE_NO_WARNINGS;
+  } else {
+    process.env.NODE_NO_WARNINGS = prev;
+  }
+}
 async function checkCopilotAvailable() {
   let client = null;
+  const prev = suppressSubprocessWarnings();
   try {
     client = new CopilotClient;
     await client.start();
@@ -536,6 +568,7 @@ async function checkCopilotAvailable() {
     }
     return `Copilot health check failed: ${msg}`;
   } finally {
+    restoreWarnings(prev);
     try {
       await client.stop();
     } catch {}
@@ -543,17 +576,18 @@ async function checkCopilotAvailable() {
   return null;
 }
 async function callCopilot(systemMessage, userMessage, model) {
+  const prev = suppressSubprocessWarnings();
   const client = new CopilotClient;
   await client.start();
   try {
     const sessionConfig = {
-      systemMessage: { content: systemMessage }
+      systemMessage: { mode: "replace", content: systemMessage }
     };
     if (model)
       sessionConfig.model = model;
     const session = await client.createSession(sessionConfig);
     try {
-      const response = await session.sendAndWait({ content: userMessage });
+      const response = await session.sendAndWait({ prompt: userMessage });
       if (!response?.data?.content)
         return null;
       return response.data.content;
@@ -561,6 +595,7 @@ async function callCopilot(systemMessage, userMessage, model) {
       await session.destroy();
     }
   } finally {
+    restoreWarnings(prev);
     await client.stop();
   }
 }
@@ -1181,8 +1216,8 @@ var start_default = defineCommand5({
     }
     info(`Creating branch: ${pc7.bold(branchName)}`);
     await fetchRemote(syncSource.remote);
-    const resetResult = await resetHard(syncSource.ref);
-    if (resetResult.exitCode !== 0) {}
+    const updateResult = await updateLocalBranch(baseBranch, syncSource.ref);
+    if (updateResult.exitCode !== 0) {}
     const result = await createBranch(branchName, baseBranch);
     if (result.exitCode !== 0) {
       error(`Failed to create branch: ${result.stderr}`);
@@ -1534,7 +1569,7 @@ var update_default = defineCommand9({
     heading("\uD83D\uDD03 contrib update");
     info(`Updating ${pc11.bold(currentBranch)} with latest ${pc11.bold(baseBranch)}...`);
     await fetchRemote(syncSource.remote);
-    await resetHard(syncSource.ref);
+    await updateLocalBranch(baseBranch, syncSource.ref);
     const rebaseResult = await rebase(baseBranch);
     if (rebaseResult.exitCode !== 0) {
       warn("Rebase hit conflicts. Resolve them manually.");
@@ -1626,7 +1661,7 @@ import pc13 from "picocolors";
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.2.0",
+  version: "0.2.1-staging.42dccfe",
   description: "Git workflow CLI for squash-merge two-branch models. Keeps dev in sync with main after squash merges.",
   type: "module",
   bin: {
@@ -1638,12 +1673,12 @@ var package_default = {
   ],
   scripts: {
     build: "bun build src/index.ts --outfile dist/index.js --target node --packages external",
+    cli: "bun run src/index.ts --",
     dev: "bun src/index.ts",
     test: "bun test",
     lint: "biome check .",
     "lint:fix": "biome check --write .",
     format: "biome format --write .",
-    prepare: "husky || true",
     "www:dev": "bun run --cwd www dev",
     "www:build": "bun run --cwd www build",
     "www:preview": "bun run --cwd www preview"
@@ -1680,7 +1715,6 @@ var package_default = {
     "@biomejs/biome": "^2.4.4",
     "@types/bun": "latest",
     "@types/figlet": "^1.7.0",
-    husky: "^9.1.7",
     typescript: "^5.7.0"
   }
 };
@@ -1688,9 +1722,10 @@ var package_default = {
 // src/ui/banner.ts
 var LOGO;
 try {
-  LOGO = figlet.textSync("contrib", { font: "ANSI Shadow" });
+  LOGO = figlet.textSync(`Contribute
+Now`, { font: "ANSI Shadow" });
 } catch {
-  LOGO = "contribute-now";
+  LOGO = "Contribute Now";
 }
 function getVersion() {
   return package_default.version ?? "unknown";
@@ -1698,12 +1733,11 @@ function getVersion() {
 function getAuthor() {
   return typeof package_default.author === "string" ? package_default.author : "unknown";
 }
-function showBanner(minimal = false) {
+function showBanner(showLinks = false) {
   console.log(pc13.cyan(`
 ${LOGO}`));
   console.log(`  ${pc13.dim(`v${getVersion()}`)} ${pc13.dim("—")} ${pc13.dim(`Built by ${getAuthor()}`)}`);
-  if (!minimal) {
-    console.log(`  ${pc13.dim(package_default.description)}`);
+  if (showLinks) {
     console.log();
     console.log(`  ${pc13.yellow("Star")}        ${pc13.cyan("https://github.com/warengonzaga/contribute-now")}`);
     console.log(`  ${pc13.green("Contribute")}  ${pc13.cyan("https://github.com/warengonzaga/contribute-now/blob/main/CONTRIBUTING.md")}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contribute-now",
-  "version": "0.2.0",
+  "version": "0.2.1-staging.42dccfe",
   "description": "Git workflow CLI for squash-merge two-branch models. Keeps dev in sync with main after squash merges.",
   "type": "module",
   "bin": {
@@ -12,12 +12,12 @@
   ],
   "scripts": {
     "build": "bun build src/index.ts --outfile dist/index.js --target node --packages external",
+    "cli": "bun run src/index.ts --",
     "dev": "bun src/index.ts",
     "test": "bun test",
     "lint": "biome check .",
     "lint:fix": "biome check --write .",
     "format": "biome format --write .",
-    "prepare": "husky || true",
     "www:dev": "bun run --cwd www dev",
     "www:build": "bun run --cwd www build",
     "www:preview": "bun run --cwd www preview"
@@ -54,7 +54,6 @@
     "@biomejs/biome": "^2.4.4",
     "@types/bun": "latest",
     "@types/figlet": "^1.7.0",
-    "husky": "^9.1.7",
     "typescript": "^5.7.0"
   }
 }