gitxplain 0.1.6 → 0.1.8

package/cli/services/configService.js

@@ -1,7 +1,41 @@
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
 
+const ENV_CONFIG_KEYS = new Set([
+  "LLM_PROVIDER",
+  "LLM_MODEL",
+  "OPENAI_API_KEY",
+  "OPENAI_MODEL",
+  "OPENAI_BASE_URL",
+  "GROQ_API_KEY",
+  "GROQ_MODEL",
+  "GROQ_BASE_URL",
+  "OPENROUTER_API_KEY",
+  "OPENROUTER_MODEL",
+  "OPENROUTER_BASE_URL",
+  "OPENROUTER_SITE_URL",
+  "OPENROUTER_APP_NAME",
+  "GEMINI_API_KEY",
+  "GEMINI_MODEL",
+  "GEMINI_BASE_URL",
+  "OLLAMA_API_KEY",
+  "OLLAMA_MODEL",
+  "OLLAMA_BASE_URL",
+  "CHUTES_API_KEY",
+  "CHUTES_MODEL",
+  "CHUTES_BASE_URL"
+]);
+
+const PROVIDER_API_KEY_FIELDS = {
+  openai: "OPENAI_API_KEY",
+  groq: "GROQ_API_KEY",
+  openrouter: "OPENROUTER_API_KEY",
+  gemini: "GEMINI_API_KEY",
+  ollama: "OLLAMA_API_KEY",
+  chutes: "CHUTES_API_KEY"
+};
+
 function readJsonConfig(filePath) {
   if (!existsSync(filePath)) {
     return {};
@@ -14,9 +48,16 @@ function readJsonConfig(filePath) {
   }
 }
 
+export function getUserConfigPath() {
+  return path.join(os.homedir(), ".gitxplain", "config.json");
+}
+
+export function loadUserConfig() {
+  return readJsonConfig(getUserConfigPath());
+}
+
 export function loadConfig(cwd) {
-  const homeDir = os.homedir();
-  const userConfigPath = path.join(homeDir, ".gitxplain", "config.json");
+  const userConfigPath = getUserConfigPath();
   const projectConfigPath = path.join(cwd, ".gitxplainrc");
   const projectJsonConfigPath = path.join(cwd, ".gitxplainrc.json");
 
@@ -26,3 +67,34 @@ export function loadConfig(cwd) {
     ...readJsonConfig(projectJsonConfigPath)
   };
 }
+
+export function applyConfigEnvironment(config) {
+  for (const [key, value] of Object.entries(config)) {
+    if (!ENV_CONFIG_KEYS.has(key)) {
+      continue;
+    }
+
+    if (typeof value === "string" && value !== "" && !process.env[key]) {
+      process.env[key] = value;
+    }
+  }
+}
+
+export function getProviderApiKeyField(provider) {
+  const normalized = provider?.toLowerCase();
+  return normalized ? PROVIDER_API_KEY_FIELDS[normalized] ?? null : null;
+}
+
+export function writeUserConfig(nextConfig) {
+  const configPath = getUserConfigPath();
+  mkdirSync(path.dirname(configPath), { recursive: true });
+  writeFileSync(configPath, `${JSON.stringify(nextConfig, null, 2)}\n`, "utf8");
+  return configPath;
+}
+
+export function updateUserConfig(updates) {
+  const currentConfig = loadUserConfig();
+  const nextConfig = { ...currentConfig, ...updates };
+  const configPath = writeUserConfig(nextConfig);
+  return { configPath, config: nextConfig };
+}

package/cli/services/mergeService.js

@@ -306,6 +306,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);
@@ -319,7 +336,7 @@ export function selectReleaseWindows(sourceCommits, releaseCommits = []) {
 }
 
 export function selectReleaseTags(sourceCommits, existingTagNames = []) {
-  const windows = buildReleaseWindows(sourceCommits);
+  const windows = selectLatestWindowsPerVersion(buildReleaseWindows(sourceCommits));
   const taggedVersions = extractTaggedVersions(existingTagNames);
   const tags = windows
     .filter((window) => !taggedVersions.has(window.version))
@@ -342,6 +359,31 @@ 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 selection = selectReleaseTags(sourceCommits, existingTagNames);
+
+  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 +473,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 +546,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 +558,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 +579,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 +596,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,

package/cli/services/pipelineService.js

@@ -714,7 +714,7 @@ export function writePipelineFiles(cwd, analysis, selection) {
   }
 
   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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitxplain",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "AI-powered Git commit explainer CLI",
   "type": "module",
   "bin": {