@kud/ai-conventional-commit-cli 0.12.3 → 0.12.7

package/README.md

@@ -109,6 +109,12 @@ ai-conventional-commit --style gitmoji-pure
 
 # Refine previous session's first commit (shorter wording)
 ai-conventional-commit refine --shorter
+
+# Reword an existing commit (picker)
+ai-conventional-commit reword
+
+# Reword HEAD directly (auto-amend)
+ai-conventional-commit reword HEAD
 ```
 
 ## Command Reference

package/dist/index.js

@@ -1017,7 +1017,7 @@ var RewordCommand = class extends Command {
   style = Option.String("--style", { required: false, description: "Title style override" });
   model = Option.String("-m,--model", { required: false, description: "Model override" });
   async execute() {
-    const { runReword } = await import("./reword-FE5N4MGV.js");
+    const { runReword } = await import("./reword-VRH7B6BE.js");
     const config = await loadConfig();
     if (this.style) config.style = this.style;
     if (this.model) config.model = this.model;

package/dist/reword-VRH7B6BE.js

@@ -0,0 +1,205 @@
+import {
+  OpenCodeProvider,
+  abortMessage,
+  animateHeaderBase,
+  borderLine,
+  buildRefineMessages,
+  createPhasedSpinner,
+  extractJSON,
+  finalSuccess,
+  formatCommitTitle,
+  renderCommitBlock,
+  sectionTitle
+} from "./chunk-H4W6AMGZ.js";
+
+// src/workflow/reword.ts
+import chalk from "chalk";
+import ora from "ora";
+import inquirer from "inquirer";
+import { simpleGit } from "simple-git";
+var git = simpleGit();
+async function getCommitMessage(hash) {
+  try {
+    const raw = await git.show([`${hash}`, "--quiet", "--format=%P%n%B"]);
+    const lines = raw.split("\n");
+    const parentsLine = lines.shift() || "";
+    const parents = parentsLine.trim().length ? parentsLine.trim().split(/\s+/) : [];
+    const message = lines.join("\n").trim();
+    if (!message) return null;
+    const [first, ...rest] = message.split("\n");
+    const body = rest.join("\n").trim() || void 0;
+    return { title: first, body, parents };
+  } catch {
+    return null;
+  }
+}
+async function isAncestor(ancestor, head) {
+  try {
+    const mb = (await git.raw(["merge-base", ancestor, head])).trim();
+    const anc = (await git.revparse([ancestor])).trim();
+    return mb === anc;
+  } catch {
+    return false;
+  }
+}
+async function runReword(config, hash) {
+  const startedAt = Date.now();
+  const commit = await getCommitMessage(hash);
+  if (!commit) {
+    console.log(`Commit not found: ${hash}`);
+    return;
+  }
+  if (commit.parents.length > 1) {
+    console.log("Refusing to reword a merge commit (multiple parents).");
+    return;
+  }
+  if (process.stdout.isTTY) {
+    await animateHeaderBase("ai-conventional-commit", config.model);
+    borderLine();
+  }
+  sectionTitle("Original commit");
+  borderLine(chalk.yellow(commit.title));
+  if (commit.body) {
+    commit.body.split("\n").forEach((l) => l.trim().length ? borderLine(l) : borderLine());
+  }
+  borderLine();
+  const instructions = [
+    "Improve clarity & conformity to Conventional Commits while preserving meaning."
+  ];
+  const syntheticPlan = {
+    commits: [
+      {
+        title: commit.title,
+        body: commit.body,
+        score: 0,
+        reasons: []
+      }
+    ]
+  };
+  const provider = new OpenCodeProvider(config.model);
+  const phased = createPhasedSpinner(ora);
+  let refined = null;
+  try {
+    phased.phase("Preparing prompt");
+    const messages = buildRefineMessages({
+      originalPlan: syntheticPlan,
+      index: 0,
+      instructions,
+      config
+    });
+    phased.phase("Calling model");
+    const raw = await provider.chat(messages, { maxTokens: config.maxTokens });
+    phased.phase("Parsing response");
+    refined = await extractJSON(raw);
+  } catch (e) {
+    phased.spinner.fail("Reword failed: " + (e?.message || e));
+    return;
+  }
+  phased.stop();
+  if (!refined || !refined.commits.length) {
+    console.log("No refined commit produced.");
+    return;
+  }
+  const candidate = refined.commits[0];
+  candidate.title = formatCommitTitle(candidate.title, {
+    allowGitmoji: config.style === "gitmoji" || config.style === "gitmoji-pure",
+    mode: config.style
+  });
+  sectionTitle("Proposed commit");
+  renderCommitBlock({
+    title: chalk.yellow(candidate.title),
+    body: candidate.body,
+    hideMessageLabel: true
+  });
+  borderLine();
+  const resolvedHash = (await git.revparse([hash])).trim();
+  const headHash = (await git.revparse(["HEAD"])).trim();
+  const isHead = headHash === resolvedHash || headHash.startsWith(resolvedHash);
+  const { ok } = await inquirer.prompt([
+    {
+      type: "list",
+      name: "ok",
+      message: isHead ? "Amend HEAD with this message?" : "Apply rewrite (history will change)?",
+      choices: [
+        { name: "Yes", value: true },
+        { name: "No", value: false }
+      ],
+      default: 0
+    }
+  ]);
+  if (!ok) {
+    borderLine();
+    abortMessage();
+    return;
+  }
+  const full = candidate.body ? `${candidate.title}
+
+${candidate.body}` : candidate.title;
+  if (isHead) {
+    try {
+      await git.commit(full, { "--amend": null });
+    } catch (e) {
+      borderLine("Failed to amend HEAD: " + (e?.message || e));
+      borderLine();
+      abortMessage();
+      return;
+    }
+    borderLine();
+    finalSuccess({ count: 1, startedAt });
+    return;
+  }
+  const ancestorOk = await isAncestor(resolvedHash, headHash);
+  if (!ancestorOk) {
+    borderLine("Selected commit is not an ancestor of HEAD.");
+    borderLine("Cannot safely rewrite automatically.");
+    borderLine();
+    abortMessage();
+    return;
+  }
+  let mergesRange = "";
+  try {
+    mergesRange = (await git.raw(["rev-list", "--merges", `${resolvedHash}..HEAD`])).trim();
+  } catch {
+  }
+  if (mergesRange) {
+    sectionTitle("Unsafe automatic rewrite");
+    borderLine("Merge commits detected between target and HEAD.");
+    borderLine("Falling back to manual instructions (preserving previous behavior).");
+    borderLine();
+    sectionTitle("Apply manually");
+    borderLine(`1. git rebase -i ${resolvedHash}~1 --reword`);
+    borderLine("2. Mark the line as reword if needed.");
+    borderLine("3. Replace the message with:");
+    borderLine();
+    borderLine(candidate.title);
+    if (candidate.body) candidate.body.split("\n").forEach((l) => borderLine(l || void 0));
+    borderLine();
+    abortMessage();
+    return;
+  }
+  try {
+    const tree = (await git.raw(["show", "-s", "--format=%T", resolvedHash])).trim();
+    const parent = commit.parents[0];
+    const args = ["commit-tree", tree];
+    if (parent) args.push("-p", parent);
+    args.push("-m", full);
+    const newHash = (await git.raw(args)).trim();
+    const currentBranch = (await git.revparse(["--abbrev-ref", "HEAD"])).trim();
+    const rebaseTarget = currentBranch === "HEAD" ? "HEAD" : currentBranch;
+    await git.raw(["rebase", "--onto", newHash, resolvedHash, rebaseTarget]);
+    sectionTitle("Updated commit");
+    borderLine(`Rewrote ${resolvedHash.slice(0, 7)} \u2192 ${newHash.slice(0, 7)}`);
+    renderCommitBlock({ title: candidate.title, body: candidate.body, hideMessageLabel: true });
+    borderLine();
+    finalSuccess({ count: 1, startedAt });
+  } catch (e) {
+    borderLine("Automatic rewrite failed: " + (e?.message || e));
+    borderLine("If a rebase is in progress, resolve conflicts then run: git rebase --continue");
+    borderLine("Or abort with: git rebase --abort");
+    borderLine();
+    abortMessage();
+  }
+}
+export {
+  runReword
+};

package/dist/reword-WFCNTOEU.js

@@ -0,0 +1,203 @@
+import {
+  OpenCodeProvider,
+  abortMessage,
+  animateHeaderBase,
+  borderLine,
+  buildRefineMessages,
+  createPhasedSpinner,
+  extractJSON,
+  finalSuccess,
+  formatCommitTitle,
+  renderCommitBlock,
+  sectionTitle
+} from "./chunk-H4W6AMGZ.js";
+
+// src/workflow/reword.ts
+import chalk from "chalk";
+import ora from "ora";
+import inquirer from "inquirer";
+import { simpleGit } from "simple-git";
+var git = simpleGit();
+async function getCommitMessage(hash) {
+  try {
+    const raw = await git.show([`${hash}`, "--quiet", "--format=%P%n%B"]);
+    const lines = raw.split("\n");
+    const parentsLine = lines.shift() || "";
+    const parents = parentsLine.trim().length ? parentsLine.trim().split(/\s+/) : [];
+    const message = lines.join("\n").trim();
+    if (!message) return null;
+    const [first, ...rest] = message.split("\n");
+    const body = rest.join("\n").trim() || void 0;
+    return { title: first, body, parents };
+  } catch {
+    return null;
+  }
+}
+async function isAncestor(ancestor, head) {
+  try {
+    const mb = (await git.raw(["merge-base", ancestor, head])).trim();
+    const anc = (await git.revparse([ancestor])).trim();
+    return mb === anc;
+  } catch {
+    return false;
+  }
+}
+async function runReword(config, hash) {
+  const startedAt = Date.now();
+  const commit = await getCommitMessage(hash);
+  if (!commit) {
+    console.log(`Commit not found: ${hash}`);
+    return;
+  }
+  if (commit.parents.length > 1) {
+    console.log("Refusing to reword a merge commit (multiple parents).");
+    return;
+  }
+  if (process.stdout.isTTY) {
+    await animateHeaderBase("ai-conventional-commit", config.model);
+    borderLine();
+  }
+  sectionTitle("Original commit");
+  borderLine(chalk.yellow(commit.title));
+  if (commit.body) {
+    commit.body.split("\n").forEach((l) => l.trim().length ? borderLine(l) : borderLine());
+  }
+  borderLine();
+  const instructions = [
+    "Improve clarity & conformity to Conventional Commits while preserving meaning."
+  ];
+  const syntheticPlan = {
+    commits: [
+      {
+        title: commit.title,
+        body: commit.body,
+        score: 0,
+        reasons: []
+      }
+    ]
+  };
+  const provider = new OpenCodeProvider(config.model);
+  const phased = createPhasedSpinner(ora);
+  let refined = null;
+  try {
+    phased.phase("Preparing prompt");
+    const messages = buildRefineMessages({
+      originalPlan: syntheticPlan,
+      index: 0,
+      instructions,
+      config
+    });
+    phased.phase("Calling model");
+    const raw = await provider.chat(messages, { maxTokens: config.maxTokens });
+    phased.phase("Parsing response");
+    refined = await extractJSON(raw);
+  } catch (e) {
+    phased.spinner.fail("Reword failed: " + (e?.message || e));
+    return;
+  }
+  phased.stop();
+  if (!refined || !refined.commits.length) {
+    console.log("No refined commit produced.");
+    return;
+  }
+  const candidate = refined.commits[0];
+  candidate.title = formatCommitTitle(candidate.title, {
+    allowGitmoji: config.style === "gitmoji" || config.style === "gitmoji-pure",
+    mode: config.style
+  });
+  sectionTitle("Proposed commit");
+  renderCommitBlock({
+    title: chalk.yellow(candidate.title),
+    body: candidate.body,
+    hideMessageLabel: true
+  });
+  borderLine();
+  const resolvedHash = (await git.revparse([hash])).trim();
+  const headHash = (await git.revparse(["HEAD"])).trim();
+  const isHead = headHash === resolvedHash || headHash.startsWith(resolvedHash);
+  const { ok } = await inquirer.prompt([
+    {
+      type: "list",
+      name: "ok",
+      message: isHead ? "Amend HEAD with this message?" : "Apply rewrite (history will change)?",
+      choices: [
+        { name: "Yes", value: true },
+        { name: "No", value: false }
+      ],
+      default: 0
+    }
+  ]);
+  if (!ok) {
+    borderLine();
+    abortMessage();
+    return;
+  }
+  const full = candidate.body ? `${candidate.title}
+
+${candidate.body}` : candidate.title;
+  if (isHead) {
+    try {
+      await git.commit(full, { "--amend": null });
+    } catch (e) {
+      borderLine("Failed to amend HEAD: " + (e?.message || e));
+      borderLine();
+      abortMessage();
+      return;
+    }
+    borderLine();
+    finalSuccess({ count: 1, startedAt });
+    return;
+  }
+  const ancestorOk = await isAncestor(resolvedHash, headHash);
+  if (!ancestorOk) {
+    borderLine("Selected commit is not an ancestor of HEAD.");
+    borderLine("Cannot safely rewrite automatically.");
+    borderLine();
+    abortMessage();
+    return;
+  }
+  let mergesRange = "";
+  try {
+    mergesRange = (await git.raw(["rev-list", "--merges", `${resolvedHash}..HEAD`])).trim();
+  } catch {
+  }
+  if (mergesRange) {
+    sectionTitle("Unsafe automatic rewrite");
+    borderLine("Merge commits detected between target and HEAD.");
+    borderLine("Falling back to manual instructions (preserving previous behavior).");
+    borderLine();
+    sectionTitle("Apply manually");
+    borderLine(`1. git rebase -i ${resolvedHash}~1 --reword`);
+    borderLine("2. Mark the line as reword if needed.");
+    borderLine("3. Replace the message with:");
+    borderLine();
+    borderLine(candidate.title);
+    if (candidate.body) candidate.body.split("\n").forEach((l) => borderLine(l || void 0));
+    borderLine();
+    abortMessage();
+    return;
+  }
+  try {
+    const tree = (await git.raw(["show", "-s", "--format=%T", resolvedHash])).trim();
+    const parent = commit.parents[0];
+    const args = ["commit-tree", tree];
+    if (parent) args.push("-p", parent);
+    args.push("-m", full);
+    const newHash = (await git.raw(args)).trim();
+    await git.raw(["rebase", "--onto", newHash, resolvedHash, "HEAD"]);
+    sectionTitle("Updated commit");
+    borderLine(`Rewrote ${resolvedHash.slice(0, 7)} \u2192 ${newHash.slice(0, 7)}`);
+    renderCommitBlock({ title: candidate.title, body: candidate.body, hideMessageLabel: true });
+    borderLine();
+    finalSuccess({ count: 1, startedAt });
+  } catch (e) {
+    borderLine("Automatic rewrite failed: " + (e?.message || e));
+    borderLine("If a rebase is in progress, resolve conflicts then run: git rebase --continue");
+    borderLine("Or abort with: git rebase --abort");
+    borderLine();
+    abortMessage();
+  }
+}
+export {
+  runReword
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kud/ai-conventional-commit-cli",
-  "version": "0.12.3",
+  "version": "0.12.7",
   "type": "module",
   "description": "Opinionated, style-aware AI assistant for crafting and splitting git commits (opencode-based, provider-agnostic).",
   "bin": {