gitxplain 0.1.6 → 0.1.9

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,18 +29,6 @@ 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)];
 }
@@ -306,6 +287,23 @@ export function buildReleaseWindows(sourceCommits) {
   return windows;
 }
 
+function selectLatestWindowsPerVersion(windows) {
+  const seenVersions = new Set();
+  const latestWindows = [];
+
+  for (let index = windows.length - 1; index >= 0; index -= 1) {
+    const window = windows[index];
+    if (!window.version || seenVersions.has(window.version)) {
+      continue;
+    }
+
+    seenVersions.add(window.version);
+    latestWindows.push(window);
+  }
+
+  return latestWindows.reverse();
+}
+
 export function selectReleaseWindows(sourceCommits, releaseCommits = []) {
   const windows = buildReleaseWindows(sourceCommits);
   const releasedVersions = getReleasedVersions(releaseCommits);
@@ -318,21 +316,38 @@ export function selectReleaseWindows(sourceCommits, releaseCommits = []) {
   };
 }
 
-export function selectReleaseTags(sourceCommits, existingTagNames = []) {
-  const windows = buildReleaseWindows(sourceCommits);
+export function selectReleaseTags(sourceCommits, existingTagNames = [], existingTagTargets = []) {
+  const windows = selectLatestWindowsPerVersion(buildReleaseWindows(sourceCommits));
   const taggedVersions = extractTaggedVersions(existingTagNames);
+  const targetByVersion = new Map(
+    existingTagTargets
+      .map((tag) => {
+        const version = tag.tagName?.match(TAG_VERSION_PATTERN)?.[1] ?? null;
+        return version ? [version, tag.targetSha] : null;
+      })
+      .filter(Boolean)
+  );
   const tags = windows
-    .filter((window) => !taggedVersions.has(window.version))
     .map((window) => {
       const targetCommit = window.commits.at(-1) ?? null;
+      const existingTargetSha = targetByVersion.get(window.version) ?? null;
+      const windowCommitShas = new Set(window.commits.map((commit) => commit.sha));
+
       return {
         ...window,
         tagName: window.version,
+        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 {
@@ -342,6 +357,32 @@ export function selectReleaseTags(sourceCommits, existingTagNames = []) {
   };
 }
 
+function findLatestTaggedSourceVersion(sourceCommits, taggedVersions) {
+  const tagged = new Set(taggedVersions);
+  return selectLatestWindowsPerVersion(buildReleaseWindows(sourceCommits))
+    .map((window) => window.version)
+    .filter((version) => version && tagged.has(version))
+    .at(-1) ?? null;
+}
+
+function buildReleaseTagPlanForSource(sourceBranch, sourceRef, cwd) {
+  const sourceCommits = listBranchCommits(sourceRef, cwd).map((sha) => inspectCommit(sha, cwd));
+  const existingTagNames = listTags(cwd);
+  const existingTagTargets = listTagTargets(cwd);
+  const selection = selectReleaseTags(sourceCommits, existingTagNames, existingTagTargets);
+
+  return {
+    sourceBranch,
+    baseRef: sourceRef,
+    mergeBase: null,
+    releaseExists: localBranchExists(RELEASE_BRANCH, cwd),
+    taggedVersions: selection.taggedVersions,
+    latestDetectedVersion: selection.latestDetectedVersion,
+    latestTaggedVersion: findLatestTaggedSourceVersion(sourceCommits, selection.taggedVersions),
+    tags: selection.tags
+  };
+}
+
 export function selectReleaseTagsFromReleaseCommits(releaseCommits, existingTagNames = []) {
   const taggedVersions = extractTaggedVersions(existingTagNames);
   const tags = releaseCommits
@@ -431,26 +472,7 @@ export function buildReleaseTagPlan(cwd) {
     throw new Error(`Already on "${RELEASE_BRANCH}". Switch to a source branch before running --tag.`);
   }
 
-  const releaseExists = localBranchExists(RELEASE_BRANCH, cwd);
-  const baseRef = releaseExists ? RELEASE_BRANCH : getDefaultBaseRef(cwd);
-  const { mergeBase, sourceCommitShas } = getReleaseTrackSourceCommitShas(releaseExists, baseRef, "HEAD", cwd);
-  const existingTagNames = listTags(cwd);
-  const selection = releaseExists
-    ? selectReleaseTagsFromReleaseCommits(
-        listBranchCommits(RELEASE_BRANCH, cwd).map((sha) => inspectCommit(sha, cwd)),
-        existingTagNames
-      )
-    : selectReleaseTags(sourceCommits.map((sha) => inspectCommit(sha, cwd)), existingTagNames);
-
-  return {
-    sourceBranch,
-    baseRef,
-    mergeBase,
-    releaseExists,
-    taggedVersions: selection.taggedVersions,
-    latestDetectedVersion: selection.latestDetectedVersion,
-    tags: selection.tags
-  };
+  return buildReleaseTagPlanForSource(sourceBranch, "HEAD", cwd);
 }
 
 export function finalizeReleaseMergePlan(plan) {
@@ -523,7 +545,11 @@ function buildDriftStatus(sourceRef, sourceLabel, releaseExists, cwd) {
 
 function getNextRecommendedAction({ releaseExists, mergePlan, missingTagCount }) {
   if (!releaseExists && mergePlan.windows.length > 0) {
-    return `Run \`gitxplain merge --execute\` to create ${RELEASE_BRANCH} and promote ${mergePlan.windows.length} unreleased version(s).`;
+    return `Run \`gitxplain --merge --execute\` to create ${RELEASE_BRANCH} and promote ${mergePlan.windows.length} unreleased version(s).`;
+  }
+
+  if (!releaseExists && missingTagCount > 0) {
+    return `Run \`gitxplain --tag --execute\` to create ${missingTagCount} missing version tag(s) on the current branch.`;
   }
 
   if (!releaseExists) {
@@ -531,15 +557,15 @@ function getNextRecommendedAction({ releaseExists, mergePlan, missingTagCount })
   }
 
   if (mergePlan.windows.length > 0 && missingTagCount > 0) {
-    return `Run \`gitxplain merge --execute\` first, then \`gitxplain tag --execute\` to finish tagging release commits.`;
+    return `Run \`gitxplain --merge --execute\` to update ${RELEASE_BRANCH}, and \`gitxplain --tag --execute\` to create ${missingTagCount} missing version tag(s).`;
   }
 
   if (mergePlan.windows.length > 0) {
-    return `Run \`gitxplain merge --execute\` to promote ${mergePlan.windows.length} unreleased version(s) to ${RELEASE_BRANCH}.`;
+    return `Run \`gitxplain --merge --execute\` to promote ${mergePlan.windows.length} unreleased version(s) to ${RELEASE_BRANCH}.`;
   }
 
   if (missingTagCount > 0) {
-    return `Run \`gitxplain tag --execute\` to create ${missingTagCount} missing release tag(s).`;
+    return `Run \`gitxplain --tag --execute\` to create ${missingTagCount} missing version tag(s).`;
   }
 
   return "No action required. Release branch and tags are up to date.";
@@ -552,11 +578,9 @@ export function buildReleaseStatus(cwd) {
   const sourceRef = currentBranch === RELEASE_BRANCH ? sourceBranch : "HEAD";
   const mergePlan = finalizeReleaseMergePlan(buildReleaseMergePlanForSource(sourceBranch, sourceRef, cwd));
   const releaseCommits = releaseExists ? listBranchCommits(RELEASE_BRANCH, cwd).map((sha) => inspectCommit(sha, cwd)) : [];
-  const tagSelection = releaseExists
-    ? selectReleaseTagsFromReleaseCommits(releaseCommits, listTags(cwd))
-    : { tags: [], taggedVersions: [], latestDetectedVersion: null };
+  const tagPlan = finalizeReleaseTagPlan(buildReleaseTagPlanForSource(sourceBranch, sourceRef, cwd));
   const drift = buildDriftStatus(sourceRef, sourceBranch, releaseExists, cwd);
-  const missingTagVersions = tagSelection.tags.map((tag) => tag.tagName);
+  const missingTagVersions = tagPlan.tags.map((tag) => tag.tagName);
   const unmergedVersions = mergePlan.windows.map((window) => window.version);
 
   return {
@@ -571,20 +595,12 @@ export function buildReleaseStatus(cwd) {
         : "healthy",
     latestSourceVersion: mergePlan.latestDetectedVersion,
     latestReleaseVersion: findLatestReleaseVersion(releaseCommits),
-    latestTaggedVersion: findLatestTaggedReleaseVersion(releaseCommits, tagSelection.taggedVersions),
+    latestTaggedVersion: tagPlan.latestTaggedVersion,
     unmergedVersions,
     missingTagVersions,
     drift,
     mergePlan,
-    tagPlan: finalizeReleaseTagPlan({
-      sourceBranch,
-      baseRef: mergePlan.baseRef,
-      mergeBase: mergePlan.mergeBase,
-      releaseExists,
-      taggedVersions: tagSelection.taggedVersions,
-      latestDetectedVersion: tagSelection.latestDetectedVersion,
-      tags: tagSelection.tags
-    }),
+    tagPlan,
     nextRecommendedAction: getNextRecommendedAction({
       releaseExists,
       mergePlan,
@@ -638,15 +654,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}`);
@@ -800,13 +819,17 @@ 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) {
+      if (tag.needsMove) {
+        gitDeleteTag(tag.tagName, cwd);
+      }
+
       gitCreateAnnotatedTag(tag.tagName, tag.targetSha, `release ${tag.tagName}`, cwd);
       createdTags.push(tag.tagName);
     }

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);
   }

package/cli/services/pipelineService.js

@@ -414,6 +414,24 @@ export function inspectRepositoryForPipeline(cwd) {
       label: "GitHub Actions CI verification",
       description: "Runs install, lint, test, build, and package checks when supported.",
       files: [".github/workflows/ci.yml"]
+    },
+    {
+      id: "gitlab-ci",
+      label: "GitLab CI verification",
+      description: "Creates a .gitlab-ci.yml pipeline with install, lint, test, and build stages.",
+      files: [".gitlab-ci.yml"]
+    },
+    {
+      id: "circleci",
+      label: "CircleCI verification",
+      description: "Creates a .circleci/config.yml pipeline for verification jobs.",
+      files: [".circleci/config.yml"]
+    },
+    {
+      id: "bitbucket-pipelines",
+      label: "Bitbucket Pipelines verification",
+      description: "Creates bitbucket-pipelines.yml with install, test, and build steps.",
+      files: ["bitbucket-pipelines.yml"]
     }
   ];
 
@@ -676,6 +694,87 @@ export function buildContainerWorkflow() {
   ].join("\n").concat("\n");
 }
 
+function buildPipelineCommands(context) {
+  return [context.commands.install, context.commands.lint, context.commands.test, context.commands.build, context.commands.pack]
+    .filter(Boolean);
+}
+
+export function buildGitLabCiWorkflow(context) {
+  const commands = buildPipelineCommands(context);
+  const image =
+    context.type === "python"
+      ? "python:3.12"
+      : context.type === "go"
+        ? "golang:1.22"
+        : context.type === "rust"
+          ? "rust:latest"
+          : "node:20";
+
+  return [
+    `image: ${image}`,
+    "",
+    "stages:",
+    "  - verify",
+    "",
+    "verify:",
+    "  stage: verify",
+    "  script:",
+    ...commands.map((command) => `    - ${command}`)
+  ].join("\n").concat("\n");
+}
+
+export function buildCircleCiWorkflow(context) {
+  const image =
+    context.type === "python"
+      ? "cimg/python:3.12"
+      : context.type === "go"
+        ? "cimg/go:1.22"
+        : context.type === "rust"
+          ? "cimg/rust:1.83"
+          : "cimg/node:20.10";
+  const commands = buildPipelineCommands(context);
+
+  return [
+    "version: 2.1",
+    "",
+    "jobs:",
+    "  verify:",
+    "    docker:",
+    `      - image: ${image}`,
+    "    steps:",
+    "      - checkout",
+    ...commands.map((command) => `      - run: ${command}`),
+    "",
+    "workflows:",
+    "  verify:",
+    "    jobs:",
+    "      - verify"
+  ].join("\n").concat("\n");
+}
+
+export function buildBitbucketPipelinesWorkflow(context) {
+  const image =
+    context.type === "python"
+      ? "python:3.12"
+      : context.type === "go"
+        ? "golang:1.22"
+        : context.type === "rust"
+          ? "rust:latest"
+          : "node:20";
+  const commands = buildPipelineCommands(context);
+
+  return [
+    `image: ${image}`,
+    "",
+    "pipelines:",
+    "  default:",
+    "    - step:",
+    "        name: Verify",
+    "        script:",
+    ...commands.map((command) => `          - ${command}`)
+  ].join("\n").concat("\n");
+}
+
 export function writePipelineFiles(cwd, analysis, selection) {
   if (!analysis.supported) {
     throw new Error(analysis.reason);
@@ -689,6 +788,7 @@ export function writePipelineFiles(cwd, analysis, selection) {
 
   const writeWorkflow = (relativePath, contents) => {
     const absolutePath = path.join(cwd, relativePath);
+    mkdirSync(path.dirname(absolutePath), { recursive: true });
     writeFileSync(absolutePath, contents, "utf8");
     writtenFiles.push(relativePath);
   };
@@ -713,8 +813,20 @@ export function writePipelineFiles(cwd, analysis, selection) {
     writeWorkflow(".github/workflows/container.yml", buildContainerWorkflow());
   }
 
+  if (selection.id === "gitlab-ci") {
+    writeWorkflow(".gitlab-ci.yml", buildGitLabCiWorkflow(analysis.primary));
+  }
+
+  if (selection.id === "circleci") {
+    writeWorkflow(".circleci/config.yml", buildCircleCiWorkflow(analysis.primary));
+  }
+
+  if (selection.id === "bitbucket-pipelines") {
+    writeWorkflow("bitbucket-pipelines.yml", buildBitbucketPipelinesWorkflow(analysis.primary));
+  }
+
   if (selection.id === "container" && !selection.files.includes(".github/workflows/ci.yml")) {
-    notes.push("This option only creates the container workflow. Run `gitxplain pipeline` again if you also want CI verification.");
+    notes.push("This option only creates the container workflow. Run `gitxplain --pipeline` again if you also want CI verification.");
   }
 
   return { writtenFiles, notes };

package/cli/services/promptService.js

@@ -16,7 +16,14 @@ const PROMPT_FILES = {
   review: "review.txt",
   security: "security.txt",
   split: "split.txt",
-  commit: "commit.txt"
+  commit: "commit.txt",
+  changelog: "changelog.txt",
+  refactor: "refactor.txt",
+  "test-suggest": "test-suggest.txt",
+  "pr-description": "pr-description.txt",
+  blame: "blame.txt",
+  stash: "stash.txt",
+  conflict: "conflict.txt"
 };
 
 function fillTemplate(template, values) {

package/cli/services/splitService.js

@@ -1,4 +1,3 @@
-import process from "node:process";
 import {
   createCommitFromTree,
   deletePaths,
@@ -32,26 +31,7 @@ import {
   runGitCommandUnchecked,
   resolveCommitSha
 } from "./gitService.js";
-
-const ANSI = {
-  reset: "\u001b[0m",
-  bold: "\u001b[1m",
-  cyan: "\u001b[36m",
-  yellow: "\u001b[33m",
-  green: "\u001b[32m"
-};
-
-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}`;
-}
+import { ANSI, colorize } from "./colorSupport.js";
 
 function extractJsonPayload(explanation) {
   const fencedMatch = explanation.match(/```(?:json)?\s*([\s\S]*?)\s*```/i);