gitxplain 0.1.8 → 0.2.0

package/cli/services/mergeService.js

@@ -1,4 +1,3 @@
-import process from "node:process";
 import {
   createCommitFromTree,
   getCommitMetadata,
@@ -15,19 +14,13 @@ import {
   listBranchCommits,
   listCommitsAfter,
   listTags,
+  listTagTargets,
   localBranchExists,
   resolveTreeSha,
   resolveCommitSha,
   runGitCommand
 } from "./gitService.js";
-
-const ANSI = {
-  reset: "\u001b[0m",
-  bold: "\u001b[1m",
-  cyan: "\u001b[36m",
-  yellow: "\u001b[33m",
-  green: "\u001b[32m"
-};
+import { ANSI, colorize } from "./colorSupport.js";
 
 const RELEASE_BRANCH = "release";
 const VERSION_PATTERN = /\b\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?\b/g;
@@ -36,22 +29,14 @@ const SEMVER_PATTERN = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$
 const INTEGER_PATTERN = /^\d+$/;
 const TAG_VERSION_PATTERN = /^v?(\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?|\d+)$/;
 
-function supportsColor() {
-  return Boolean(process.stdout?.isTTY) && process.env.NO_COLOR == null;
-}
-
-function colorize(text, color) {
-  if (!supportsColor()) {
-    return text;
-  }
-
-  return `${color}${text}${ANSI.reset}`;
-}
-
 function unique(values) {
   return [...new Set(values)];
 }
 
+function formatVersionTag(version) {
+  return `v${version}`;
+}
+
 function extractVersions(line) {
   return unique(line.match(VERSION_PATTERN) ?? []);
 }
@@ -335,21 +320,41 @@ export function selectReleaseWindows(sourceCommits, releaseCommits = []) {
   };
 }
 
-export function selectReleaseTags(sourceCommits, existingTagNames = []) {
+export function selectReleaseTags(sourceCommits, existingTagNames = [], existingTagTargets = []) {
   const windows = selectLatestWindowsPerVersion(buildReleaseWindows(sourceCommits));
   const taggedVersions = extractTaggedVersions(existingTagNames);
+  const existingTagByVersion = new Map(
+    existingTagTargets
+      .map((tag) => {
+        const version = tag.tagName?.match(TAG_VERSION_PATTERN)?.[1] ?? null;
+        return version ? [version, tag] : null;
+      })
+      .filter(Boolean)
+  );
   const tags = windows
-    .filter((window) => !taggedVersions.has(window.version))
     .map((window) => {
       const targetCommit = window.commits.at(-1) ?? null;
+      const existingTag = existingTagByVersion.get(window.version) ?? null;
+      const existingTargetSha = existingTag?.targetSha ?? null;
+      const windowCommitShas = new Set(window.commits.map((commit) => commit.sha));
+
       return {
         ...window,
-        tagName: window.version,
+        version: window.version,
+        tagName: existingTag?.tagName ?? formatVersionTag(window.version),
+        existingTagName: existingTag?.tagName ?? null,
+        existingTargetSha,
+        needsMove:
+          existingTargetSha != null &&
+          targetCommit?.sha != null &&
+          windowCommitShas.has(existingTargetSha) &&
+          existingTargetSha !== targetCommit.sha,
         targetSha: targetCommit?.sha ?? null,
         targetShortSha: targetCommit?.shortSha ?? null,
         targetSubject: targetCommit?.subject ?? null
       };
     })
+    .filter((tag) => !taggedVersions.has(tag.version) || tag.needsMove)
     .filter((tag) => tag.targetSha != null);
 
   return {
@@ -370,7 +375,8 @@ function findLatestTaggedSourceVersion(sourceCommits, taggedVersions) {
 function buildReleaseTagPlanForSource(sourceBranch, sourceRef, cwd) {
   const sourceCommits = listBranchCommits(sourceRef, cwd).map((sha) => inspectCommit(sha, cwd));
   const existingTagNames = listTags(cwd);
-  const selection = selectReleaseTags(sourceCommits, existingTagNames);
+  const existingTagTargets = listTagTargets(cwd);
+  const selection = selectReleaseTags(sourceCommits, existingTagNames, existingTagTargets);
 
   return {
     sourceBranch,
@@ -395,7 +401,7 @@ export function selectReleaseTagsFromReleaseCommits(releaseCommits, existingTagN
     .filter((entry) => !taggedVersions.has(entry.version))
     .map(({ commit, version }) => ({
       version,
-      tagName: version,
+      tagName: formatVersionTag(version),
       startRef: commit.shortSha,
       endRef: commit.shortSha,
       targetSha: commit.sha,
@@ -655,15 +661,18 @@ export function formatReleaseTagPlan(plan) {
   ];
 
   if (plan.tags.length === 0) {
-    lines.push(colorize("No unreleased release tags detected. Nothing to tag.", ANSI.green));
+    lines.push(colorize("No release tag changes detected. Nothing to tag.", ANSI.green));
     return lines.join("\n");
   }
 
   for (const tag of plan.tags) {
     lines.push("");
-    lines.push(colorize(`tag ${tag.tagName}`, ANSI.bold + ANSI.yellow));
+    lines.push(colorize(`${tag.needsMove ? "move tag" : "tag"} ${tag.tagName}`, ANSI.bold + ANSI.yellow));
     lines.push(`${colorize("Commit Range:", ANSI.bold + ANSI.cyan)} ${tag.startRef}..${tag.endRef}`);
     lines.push(`${colorize("Target Commit:", ANSI.bold + ANSI.cyan)} ${tag.targetShortSha} ${tag.targetSubject}`);
+    if (tag.needsMove) {
+      lines.push(`${colorize("Action:", ANSI.bold + ANSI.cyan)} move existing tag to the latest commit for ${tag.tagName}`);
+    }
 
     for (const commit of tag.commits) {
       lines.push(`${colorize(commit.shortSha, ANSI.bold + ANSI.cyan)} ${commit.subject}`);
@@ -817,14 +826,18 @@ export function executeReleaseMerge(plan, cwd) {
 
 export function executeReleaseTagPlan(plan, cwd) {
   if (plan.tags.length === 0) {
-    throw new Error("No unreleased release tags detected. Nothing to tag.");
+    throw new Error("No release tag changes detected. Nothing to tag.");
   }
 
   const createdTags = [];
 
   try {
     for (const tag of plan.tags) {
-      gitCreateAnnotatedTag(tag.tagName, tag.targetSha, `release ${tag.tagName}`, cwd);
+      if (tag.needsMove) {
+        gitDeleteTag(tag.existingTagName ?? tag.tagName, cwd);
+      }
+
+      gitCreateAnnotatedTag(tag.tagName, tag.targetSha, `release ${tag.version ?? tag.tagName.replace(/^v/, "")}`, cwd);
       createdTags.push(tag.tagName);
     }
   } catch (error) {

package/cli/services/outputFormatter.js

@@ -1,34 +1,4 @@
-import process from "node:process";
-
-const ANSI = {
-  reset: "\u001b[0m",
-  bold: "\u001b[1m",
-  cyan: "\u001b[36m",
-  yellow: "\u001b[33m",
-  green: "\u001b[32m",
-  red: "\u001b[31m",
-  gray: "\u001b[90m"
-};
-
-function supportsColor() {
-  if (process.env.FORCE_COLOR != null && process.env.FORCE_COLOR !== "0") {
-    return true;
-  }
-
-  if (process.env.NO_COLOR != null) {
-    return false;
-  }
-
-  return Boolean(process.stdout?.isTTY);
-}
-
-function colorize(text, color) {
-  if (!supportsColor()) {
-    return text;
-  }
-
-  return `${color}${text}${ANSI.reset}`;
-}
+import { ANSI, colorize } from "./colorSupport.js";
 
 function stripInlineMarkdown(text) {
   return text
@@ -84,61 +54,37 @@ function normalizeMarkdownLine(line, state) {
 }
 
 function formatTargetLabel(commitData) {
-  return commitData.analysisType === "range" ? "Range" : "Commit";
-}
-
-function normalizeHeading(line) {
-  const match = line.match(/^([0-9]+\.)?\s*(Summary|Issues? Fixed|Issue|Root Cause|Fix(?: Explanation)?|Impact|Risk Level|Severity|Technical Breakdown|Full Analysis|Line-by-Line Code Walkthrough|Code Review|Security Review|Security Findings|Review Findings|Suggestions|Recommended Mitigations)\s*:?\s*$/i);
-
-  if (!match) {
-    return null;
+  if (commitData.analysisType === "range") {
+    return "Range";
   }
 
-  return `${match[2]}:`;
-}
-
-function isFileHeading(line) {
-  return /^(?:File|Path)\s*:/i.test(line) || /^[A-Za-z0-9_./-]+\.[A-Za-z0-9]+:\s*$/.test(line);
-}
-
-function classifyTone(line) {
-  if (/^\s*low(?:\b|[.:])/i.test(line)) {
-    return "good";
+  if (commitData.analysisType === "blame") {
+    return "File";
   }
 
-  if (/^\s*medium(?:\b|[.:])/i.test(line)) {
-    return "neutral";
+  if (commitData.analysisType === "stash") {
+    return "Stash";
   }
 
-  if (/^\s*high(?:\b|[.:])/i.test(line)) {
-    return "bad";
+  if (commitData.analysisType === "conflict") {
+    return "Conflict";
   }
 
-  if (
-    /\b(no significant findings|no security findings|none apparent|looks good|safe|improved|improvement|fixed|resolved|successful|passes?|low risk|low severity)\b/i.test(
-      line
-    )
-  ) {
-    return "good";
-  }
+  return "Commit";
+}
 
-  if (
-    /\b(issue|issues|bug|broken|failure|failing|risk|risky|severity|vulnerability|insecure|regression|warning|problem|bad|missing|error|high risk|high severity)\b/i.test(
-      line
-    )
-  ) {
-    return "bad";
-  }
+function normalizeHeading(line) {
+  const match = line.match(/^([0-9]+\.)?\s*(Summary|Issues? Fixed|Issue|Root Cause|Fix(?: Explanation)?|Impact|Risk Level|Severity|Technical Breakdown|Full Analysis|Line-by-Line Code Walkthrough|Code Review|Security Review|Security Findings|Review Findings|Suggestions|Recommended Mitigations)\s*:?\s*$/i);
 
-  if (/\b(suggestion|consider|follow-up|todo|medium risk|medium severity)\b/i.test(line)) {
-    return "neutral";
+  if (!match) {
+    return null;
   }
 
-  return null;
+  return `${match[2]}:`;
 }
 
-function colorizeByTone(line, tone) {
-  return line;
+function isFileHeading(line) {
+  return /^(?:File|Path)\s*:/i.test(line) || /^[A-Za-z0-9_./-]+\.[A-Za-z0-9]+:\s*$/.test(line);
 }
 
 function formatBulletLine(line) {
@@ -189,7 +135,7 @@ function formatLine(line) {
     return severityLine;
   }
 
-  return colorizeByTone(line, classifyTone(line));
+  return line;
 }
 
 function formatExplanation(explanation) {
@@ -266,6 +212,10 @@ export function formatFooter({ responseMeta, promptMeta, options }) {
     lines.push(`Usage: ${JSON.stringify(responseMeta.usage)}`);
   }
 
+  if (responseMeta.estimatedCostUsd != null) {
+    lines.push(`Estimated Cost: $${responseMeta.estimatedCostUsd.toFixed(6)}`);
+  }
+
   if (promptMeta?.warnings?.length) {
     lines.push(...promptMeta.warnings);
   }