@abhaydesu/git-pilot 1.3.1 → 2.0.1

package/src/lib/ui.js

@@ -1,28 +1,76 @@
 import chalk from "chalk";
 import inquirer from "inquirer";
 import ora from "ora";
-import { describeError } from "./api.js";
+import process from "node:process";
 import { UnsafeCommandError } from "./exec.js";
+import { ProviderError } from "./provider.js";
+import { GitCommitError } from "./git.js";
+import { CredentialStoreUnavailableError, redactSecretText } from "./credentials.js";
+import { sanitizeTerminalText } from "./sanitizer.js";
 
-// ora 9.x divides by stream.columns; a PTY that reports 0 columns makes its
-// redraw loop spin forever. Give it a sane fallback.
+// Check NO_COLOR standard (https://no-color.org)
+if (process.env.NO_COLOR) {
+  chalk.level = 0;
+}
+
+// ora 9.x column fallback
 if (!process.stderr.columns) process.stderr.columns = 80;
 
-// discardStdin is off so the spinner never swallows the input inquirer needs next.
-export const spin = (text) => ora({ text, discardStdin: false }).start();
+export const spin = (text) => ora({ text, discardStdin: false, stream: process.stderr }).start();
 
 export function showBlock(title, body) {
-  const bar = "-".repeat(title.length + 14);
+  const bar = "-".repeat(Math.max(title.length + 14, 30));
   console.log(chalk.green(`\n------ ${title} ------`));
   console.log(chalk.cyan(body));
   console.log(chalk.green(`${bar}\n`));
 }
 
-export async function confirm(message) {
-  const { ok } = await inquirer.prompt([{ type: "confirm", name: "ok", message, default: false }]);
+export function showPanel({ title, details = [], content, stream = process.stdout }) {
+  const write = (line) => stream.write(line + "\n");
+  write(chalk.bold.cyan(`\n╭─ ${title} ` + "─".repeat(Math.max(0, 50 - title.length))));
+  for (const detail of details) {
+    write(chalk.dim(`│  ${detail}`));
+  }
+  if (details.length > 0) {
+    write(chalk.dim(`├${"─".repeat(55)}`));
+  }
+  const lines = (content || "").split("\n");
+  for (const line of lines) {
+    write(`│  ${chalk.white(line)}`);
+  }
+  write(chalk.bold.cyan(`╰${"─".repeat(56)}\n`));
+}
+
+export async function confirm(message, defaultVal = false) {
+  const { ok } = await inquirer.prompt([
+    { type: "confirm", name: "ok", message, default: defaultVal },
+  ]);
   return ok;
 }
 
+/**
+ * Action menu for commit flow: returns "accept" | "edit" | "regenerate" | "abort".
+ * Default selection is "abort" (non-destructive) so pressing Enter accidentally
+ * never creates an unintended commit.
+ */
+export async function chooseCommitAction() {
+  const { action } = await inquirer.prompt([
+    {
+      type: "list",
+      name: "action",
+      message: "What would you like to do?",
+      default: "abort",
+      choices: [
+        { name: "Accept and commit", value: "accept" },
+        { name: "Edit in $EDITOR", value: "edit" },
+        { name: "Regenerate message", value: "regenerate" },
+        { name: "Abort", value: "abort" },
+      ],
+    },
+  ]);
+  return action;
+}
+
 /** Accept / Edit / Abort menu; returns "accept" | "edit" | "abort". */
 export async function chooseAcceptEditAbort() {
   const { choice } = await inquirer.prompt([
@@ -30,6 +78,7 @@ export async function chooseAcceptEditAbort() {
       type: "list",
       name: "choice",
       message: "What would you like to do?",
+      default: "abort",
       choices: [
         { name: "Accept", value: "accept" },
         { name: "Edit", value: "edit" },
@@ -54,21 +103,70 @@ export async function editText(message, initial, emptyMessage) {
   return text.trim();
 }
 
-export const success = (text) => console.log(chalk.bgGreen.black(text));
-export const aborted = (text) => console.log(chalk.red(text));
+/** Non-echoing masked password prompt */
+export async function promptMaskedPassword(message) {
+  const { secret } = await inquirer.prompt([
+    {
+      type: "password",
+      name: "secret",
+      message,
+      mask: "*",
+      validate: (input) => (input.trim().length > 0 ? true : "Input cannot be empty."),
+    },
+  ]);
+  return secret.trim();
+}
+
+export const success = (text) => console.log(chalk.green(`✔ ${text}`));
+export const warn = (text) => console.error(chalk.yellow(`⚠ ${text}`));
+export const info = (text) => console.error(chalk.blue(`ℹ ${text}`));
+export const aborted = (text) => console.log(chalk.dim(`Cancelled. ${text}`));
+
+export function formatSafeErrorText(text) {
+  return sanitizeTerminalText(redactSecretText(String(text || "")));
+}
 
 /** Prints an error, stops the spinner if it is running, and exits non-zero. */
 export function handleError(error, spinner) {
   if (spinner?.isSpinning) spinner.fail();
 
   if (error?.name === "ExitPromptError") {
-    console.error(chalk.red("\nCancelled."));
+    console.error(chalk.dim("\nCancelled by user."));
     process.exit(130);
   }
+
+  if (error instanceof CredentialStoreUnavailableError) {
+    console.error(chalk.red.bold(`\nCredential Store Unavailable:`));
+    console.error(chalk.red(formatSafeErrorText(error.message)));
+    console.error(
+      chalk.yellow(
+        "\nTip: For CI or automated environments, you can alternatively set the GEMINI_API_KEY environment variable."
+      )
+    );
+    process.exit(1);
+  }
+
   if (error instanceof UnsafeCommandError) {
-    console.error(chalk.red(`Refusing to run: ${error.message}`));
-  } else {
-    console.error(chalk.red(describeError(error)));
+    console.error(chalk.red(`Refusing to run: ${formatSafeErrorText(error.message)}`));
+    process.exit(1);
+  }
+
+  if (error instanceof ProviderError) {
+    console.error(chalk.red(`Provider Error: ${formatSafeErrorText(error.message)}`));
+    process.exit(1);
+  }
+
+  if (error instanceof GitCommitError) {
+    console.error(chalk.red(`\nCommit Error: ${formatSafeErrorText(error.message)}`));
+    console.error(chalk.yellow(`\nYour generated message was preserved:`));
+    console.error(chalk.cyan(sanitizeTerminalText(error.commitMessage)));
+    process.exit(1);
   }
+
+  console.error(
+    chalk.red(
+      `An unexpected error occurred: ${formatSafeErrorText(error?.message || String(error))}`
+    )
+  );
   process.exit(1);
 }

package/src/lib/api.js

@@ -1,59 +0,0 @@
-import axios from "axios";
-
-export const DEFAULT_API_URL = "https://git-pilot-api.vercel.app";
-
-// The API rejects request bodies over 1 MB (bytes, after JSON encoding) and diffs over
-// 800,000 characters.
-export const MAX_DIFF_CHARS = 800_000;
-const MAX_BODY_BYTES = 1_000_000;
-
-/** True if `body` (containing `diff`) is small enough for the API to accept. */
-export const fitsInRequest = (body, diff) =>
-  diff.length <= MAX_DIFF_CHARS && Buffer.byteLength(JSON.stringify(body)) <= MAX_BODY_BYTES;
-
-const LOCAL_HOSTS = new Set(["localhost", "127.0.0.1", "[::1]"]);
-
-export function apiBaseUrl() {
-  const raw = (process.env.GIT_PILOT_API_URL || DEFAULT_API_URL).replace(/\/+$/, "");
-
-  let url;
-  try {
-    url = new URL(raw);
-  } catch {
-    throw new Error(`GIT_PILOT_API_URL is not a valid URL: ${raw}`);
-  }
-  // Your staged diffs are sent to this server, so never over plain http except locally.
-  const plainHttpOk = url.protocol === "http:" && LOCAL_HOSTS.has(url.hostname);
-  if (url.protocol !== "https:" && !plainHttpOk) {
-    throw new Error("GIT_PILOT_API_URL must use https (plain http is only allowed for localhost).");
-  }
-  return raw;
-}
-
-/** POSTs `body` to `/api/<endpoint>` and returns the parsed response data. */
-export async function callApi(endpoint, body) {
-  const { data } = await axios.post(`${apiBaseUrl()}/api/${endpoint}`, body, {
-    timeout: 30_000,
-    maxRedirects: 0, // the API never redirects a POST; don't follow one to somewhere else
-    maxContentLength: 1_000_000,
-  });
-  return data;
-}
-
-/** Returns `data[field]` if it is a non-empty string; otherwise throws a clear error. */
-export function requireString(data, field) {
-  const value = data?.[field];
-  if (typeof value !== "string" || value === "") {
-    throw new Error(`Unexpected response from the API (missing "${field}").`);
-  }
-  return value;
-}
-
-/** Human-readable message for an axios/network/other error. */
-export function describeError(error) {
-  if (error.response) {
-    const detail = error.response.data?.error || "No message";
-    return `API Error: ${error.response.status} - ${detail}`;
-  }
-  return `An unexpected error occurred: ${error.message}`;
-}