gitxplain 0.1.3 → 0.1.8

package/cli/services/chatService.js

@@ -17,6 +17,19 @@ const COLORS = {
   red: "\x1b[31m"
 };
 
+export function getBootHelpText() {
+  return [
+    "Available commands:",
+    "  help      Show this command list",
+    "  repos     Select a GitHub repository and commit for analysis",
+    "  issues    Summarize open issues for the selected repository",
+    "  status    Review local uncommitted git diff",
+    "  download  Download the selected repository at the selected commit",
+    "  clear     Reset the current chat history",
+    "  exit      Close the interactive session"
+  ].join("\n");
+}
+
 export class ChatService {
   constructor(token, providerOverride, modelOverride, username) {
     this.token = token;
@@ -220,25 +233,32 @@ Analysis:
       });
     };
 
-    console.log(`${COLORS.bold}${COLORS.cyan}GitHub Chat - Type 'repos' to select a repo, 'download' to clone the selected commit state, 'exit' to quit, 'clear' to reset history\n${COLORS.reset}`);
+    console.log(`${COLORS.bold}${COLORS.cyan}GitHub Chat${COLORS.reset}`);
+    console.log(`${COLORS.cyan}${getBootHelpText()}\n${COLORS.reset}`);
     console.log(`${COLORS.cyan}Model: ${this.config.model} (${this.config.provider})\n${COLORS.reset}`);
 
     while (true) {
       const userInput = await question("You: ");
+      const normalizedInput = userInput.trim().toLowerCase();
+
+      if (normalizedInput === "help") {
+        console.log(`\n${COLORS.cyan}${getBootHelpText()}\n${COLORS.reset}`);
+        continue;
+      }
 
-      if (userInput.toLowerCase() === "exit") {
+      if (normalizedInput === "exit") {
         console.log(`${COLORS.green}Goodbye!${COLORS.reset}`);
         rl.close();
         break;
       }
 
-      if (userInput.toLowerCase() === "clear") {
+      if (normalizedInput === "clear") {
         this.conversationHistory = [];
         console.log(`${COLORS.yellow}Conversation history cleared.\n${COLORS.reset}`);
         continue;
       }
 
-      if (userInput.toLowerCase() === "download") {
+      if (normalizedInput === "download") {
         if (!this.activeRepo || !this.activeCommit) {
           console.log(`${COLORS.yellow}No repository/commit selected. Please type 'repos' first.\n${COLORS.reset}`);
           continue;
@@ -257,7 +277,7 @@ Analysis:
         continue;
       }
 
-      if (userInput.toLowerCase() === "repos") {
+      if (normalizedInput === "repos") {
         const selectedRepo = await this.showRepoSelector();
         if (selectedRepo) {
           this.activeRepo = selectedRepo;
@@ -302,7 +322,7 @@ Please acknowledge this selection in a maximum of 3 sentences, giving a brief su
         continue;
       }
       
-      if (userInput.toLowerCase() === "status") {
+      if (normalizedInput === "status") {
         try {
           const diff = execSync("git diff").toString();
           if (!diff) {
@@ -319,7 +339,7 @@ Please acknowledge this selection in a maximum of 3 sentences, giving a brief su
         continue;
       }
       
-      if (userInput.toLowerCase() === "issues") {
+      if (normalizedInput === "issues") {
         if (!this.activeRepo) {
           console.log(`${COLORS.yellow}No active repository. Please type 'repos' first.\n${COLORS.reset}`);
           continue;
@@ -656,7 +676,7 @@ Please acknowledge this selection in a maximum of 3 sentences, giving a brief su
   }
 }
 
-export async function startChatSession(token, username, providerOverride, modelOverride) {
+export async function startChatSession(token, providerOverride, modelOverride, username) {
   const chatService = new ChatService(token, providerOverride, modelOverride, username);
   await chatService.initializeRepoContext();
   await chatService.startInteractiveChat();

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/gitService.js

@@ -1,4 +1,4 @@
-import { execFileSync } from "node:child_process";
+import { execFileSync, spawnSync } from "node:child_process";
 import os from "node:os";
 import { mkdtempSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
 import path from "node:path";
@@ -87,6 +87,33 @@ export function runGitCommandUnchecked(args, cwd) {
   }
 }
 
+export function listGitSubcommands() {
+  const output = execFileSync("git", ["help", "-a"], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+
+  return new Set(
+    output
+      .split("\n")
+      .map((line) => line.match(/^\s{3}([a-z0-9][a-z0-9-]*)\s{2,}/i)?.[1] ?? null)
+      .filter(Boolean)
+  );
+}
+
+export function runNativeGitPassthrough(args, cwd) {
+  const result = spawnSync("git", args, {
+    cwd,
+    stdio: "inherit"
+  });
+
+  if (result.error) {
+    throw result.error;
+  }
+
+  return result.status ?? 0;
+}
+
 export function isGitRepository(cwd) {
   try {
     return runGitCommand(["rev-parse", "--is-inside-work-tree"], cwd) === "true";
@@ -231,6 +258,21 @@ export function gitPush(cwd, remote = null, branch = null, runner = runGitComman
   return runner(args, cwd);
 }
 
+export function gitPull(cwd, remote = null, branch = null, runner = runGitCommand) {
+  const args = ["pull"];
+
+  if (remote) {
+    args.push(remote);
+  }
+
+  if (branch) {
+    args.push(branch);
+  }
+
+  return runner(args, cwd);
+}
+
+
 export function gitCreateAnnotatedTag(tagName, ref, message, cwd) {
   return runGitCommand(["tag", "-a", tagName, ref, "-m", message], cwd);
 }
@@ -438,8 +480,8 @@ export function isAncestorCommit(ancestorRef, descendantRef, cwd) {
   throw new Error(result.stderr || "Unable to determine commit ancestry.");
 }
 
-export function gitResetHard(ref, cwd) {
-  return runGitCommand(["reset", "--hard", ref], cwd);
+export function gitResetHard(ref, cwd, runner = runGitCommand) {
+  return runner(["reset", "--hard", ref], cwd);
 }
 
 export function gitCherryPickNoCommit(ref, cwd) {