eckra 1.0.0

package/src/ui/modules/more.js

@@ -0,0 +1,94 @@
+const inquirer = require("inquirer");
+const { s, header, clear } = require("../common");
+const { doUndo } = require("./undo");
+const { doAmend } = require("./amend");
+const { doDiff } = require("./diff");
+const { doStash } = require("./stash");
+const { doTag } = require("./tag");
+const { doRemote } = require("./remote");
+const { doStats } = require("./stats");
+const { doSearch } = require("./search");
+const { doBlame } = require("./blame");
+const { doWorktree } = require("./worktree");
+const { doSettings } = require("./settings");
+const { doRebase } = require("./rebase");
+
+async function doMore() {
+  clear();
+  header();
+  console.log(s.bold("  More Options\n"));
+
+  const { action } = await inquirer.prompt([
+    {
+      type: "list",
+      name: "action",
+      message: s.muted("What would you like to do?"),
+      choices: [
+        { name: s.warning("  ↩ Undo (Revert last commit)"), value: "undo" },
+        {
+          name: s.primary("  ✎ Amend (Fix commit message)"),
+          value: "amend",
+        },
+        { name: s.warning("  ⚡ Rebase / Squash"), value: "rebase" },
+        { name: s.text("  ≋ Diff (View changes)"), value: "diff" },
+        { type: "separator", line: " " },
+        { name: s.text("  📦 Stash"), value: "stash" },
+        { name: s.text("  🏷 Tag"), value: "tag" },
+        { name: s.text("  🔗 Remote"), value: "remote" },
+        { type: "separator", line: " " },
+        { name: s.text("  📊 Statistics"), value: "stats" },
+        { name: s.text("  🔍 Search Commits"), value: "search" },
+        { name: s.text("  📋 Blame"), value: "blame" },
+        { name: s.text("  🌳 Worktrees"), value: "worktree" },
+        { type: "separator", line: " " },
+        { name: s.text("  ⚙ Settings"), value: "settings" },
+        { name: s.muted("  ← Main Menu"), value: "back" },
+      ],
+      pageSize: 15,
+      loop: false,
+    },
+  ]);
+
+  if (action === "back") return;
+
+  switch (action) {
+    case "undo":
+      await doUndo();
+      break;
+    case "amend":
+      await doAmend();
+      break;
+    case "rebase":
+      await doRebase();
+      break;
+    case "diff":
+      await doDiff();
+      break;
+    case "stash":
+      await doStash();
+      break;
+    case "tag":
+      await doTag();
+      break;
+    case "remote":
+      await doRemote();
+      break;
+    case "stats":
+      await doStats();
+      break;
+    case "search":
+      await doSearch();
+      break;
+    case "blame":
+      await doBlame();
+      break;
+    case "worktree":
+      await doWorktree();
+      break;
+    case "settings":
+      await doSettings();
+      break;
+  }
+}
+
+module.exports = { doMore };

package/src/ui/modules/rebase.js

@@ -0,0 +1,72 @@
+const inquirer = require("inquirer");
+const ora = require("ora");
+const { getCommitLog, squashCommits, resetToCommit } = require("../../helpers/git");
+const { s, header, clear, pause } = require("../common");
+
+async function doRebase() {
+  clear();
+  header();
+  console.log(s.bold("  Advanced Git Operations (Rebase)\n"));
+
+  const { action } = await inquirer.prompt([
+    {
+      type: "list",
+      name: "action",
+      message: s.muted("Select operation:"),
+      choices: [
+        { name: s.warning("  Squash last N commits"), value: "squash" },
+        { name: s.muted("  ← Back"), value: "back" },
+      ],
+      loop: false,
+    },
+  ]);
+
+  if (action === "back") return;
+
+  if (action === "squash") {
+    await doSquash();
+  }
+}
+
+async function doSquash() {
+  const log = await getCommitLog(10);
+  
+  if (log.all.length < 2) {
+    console.log(s.warning("  Not enough commits to squash."));
+    await pause();
+    return;
+  }
+
+  const { count } = await inquirer.prompt([
+    {
+      type: "number",
+      name: "count",
+      message: "How many commits to squash (from HEAD)?",
+      default: 2,
+      validate: (val) => val > 1 && val <= log.all.length ? true : `Enter a number between 2 and ${log.all.length}`
+    }
+  ]);
+
+  const { message } = await inquirer.prompt([
+    {
+      type: "input",
+      name: "message",
+      message: "New commit message for squashed commit:",
+      default: `Squashed ${count} commits`
+    }
+  ]);
+
+  const spin = ora({ text: s.muted(" Squashing..."), spinner: "dots" }).start();
+  
+  try {
+    // Soft reset to HEAD~count
+    await squashCommits(count, message);
+    spin.succeed(s.success(" Commits squashed successfully!"));
+  } catch (error) {
+    spin.fail(s.error(" Squash failed: " + error.message));
+  }
+  
+  await pause();
+}
+
+module.exports = { doRebase };

package/src/ui/modules/remote.js

@@ -0,0 +1,74 @@
+const inquirer = require("inquirer");
+const { getRemotes, addRemote, removeRemote } = require("../../helpers/git");
+const { s, header, clear, pause, sleep } = require("../common");
+
+async function doRemote() {
+  clear();
+  header();
+  console.log(s.bold("  Remote\n"));
+
+  const remotes = await getRemotes();
+
+  if (remotes.length > 0) {
+    remotes.forEach((r) => {
+      console.log(s.primary(`  ${r.name}`));
+      console.log(s.muted(`    ${r.refs.fetch || "-"}\n`));
+    });
+  } else {
+    console.log(s.muted("  No remotes.\n"));
+  }
+
+  const { action } = await inquirer.prompt([
+    {
+      type: "list",
+      name: "action",
+      message: s.muted("What should I do?"),
+      choices: [
+        { name: s.success("  + Add Remote"), value: "add" },
+        { name: s.error("  ✕ Remove Remote"), value: "remove" },
+        { name: s.muted("  ← Back"), value: "back" },
+      ],
+      loop: false,
+    },
+  ]);
+
+  if (action === "back") return;
+
+  if (action === "add") {
+    const { name } = await inquirer.prompt([
+      {
+        type: "input",
+        name: "name",
+        message: s.muted("Remote name:"),
+        default: "origin",
+      },
+    ]);
+    const { url } = await inquirer.prompt([
+      {
+        type: "input",
+        name: "url",
+        message: s.muted("URL:"),
+        validate: (v) => v.length > 0,
+      },
+    ]);
+    await addRemote(name, url);
+    console.log(s.success(`\n  ✓ ${name} added!`));
+    await sleep(600);
+  }
+
+  if (action === "remove" && remotes.length > 0) {
+    const { toRemove } = await inquirer.prompt([
+      {
+        type: "list",
+        name: "toRemove",
+        message: s.muted("Which remote to remove?"),
+        choices: remotes.map((r) => r.name),
+      },
+    ]);
+    await removeRemote(toRemove);
+    console.log(s.success(`\n  ✓ ${toRemove} removed!`));
+    await sleep(600);
+  }
+}
+
+module.exports = { doRemote };

package/src/ui/modules/search.js

@@ -0,0 +1,46 @@
+const inquirer = require("inquirer");
+const ora = require("ora");
+const { searchCommits } = require("../../helpers/git");
+const { s, header, clear, pause, truncate, timeAgo } = require("../common");
+
+async function doSearch() {
+  clear();
+  header();
+  console.log(s.bold("  Search Commits\n"));
+
+  const { query } = await inquirer.prompt([
+    {
+      type: "input",
+      name: "query",
+      message: s.muted("Search term:"),
+      validate: (v) => v.length > 0,
+    },
+  ]);
+
+  const spin = ora({ text: s.muted(" Searching..."), spinner: "dots" }).start();
+
+  try {
+    const results = await searchCommits(query);
+    spin.stop();
+
+    if (results.all.length === 0) {
+      console.log(s.muted("\n  No results found.\n"));
+    } else {
+      console.log(s.muted(`\n  ${results.all.length} results:\n`));
+      results.all.slice(0, 10).forEach((commit) => {
+        console.log(
+          `  ${s.primary(commit.hash.substring(0, 7))} ${s.text(truncate(commit.message, 50))}`,
+        );
+        console.log(
+          s.muted(`         ${commit.author_name} · ${timeAgo(commit.date)}\n`),
+        );
+      });
+    }
+  } catch (err) {
+    spin.fail(s.error(` ${err.message}`));
+  }
+
+  await pause();
+}
+
+module.exports = { doSearch };

package/src/ui/modules/settings.js

@@ -0,0 +1,123 @@
+const inquirer = require("inquirer");
+const { getConfig, saveConfig } = require("../../helpers/config");
+const { checkAIConnection } = require("../../helpers/ai");
+const { s, header, clear, sleep, truncate } = require("../common");
+
+async function doSettings() {
+  clear();
+  header();
+  console.log(s.bold("  Settings\n"));
+
+  const config = getConfig();
+  const aiStatus = await checkAIConnection();
+
+  console.log(s.muted("  Provider: ") + s.text(config.aiProvider || "lmstudio"));
+  
+  if (config.aiProvider === "openai") {
+    console.log(s.muted("  Model: ") + s.text(config.openaiModel));
+    console.log(s.muted("  API Key: ") + s.text(config.openaiApiKey ? "****" + config.openaiApiKey.slice(-4) : "None"));
+  } else if (config.aiProvider === "anthropic") {
+    console.log(s.muted("  Model: ") + s.text(config.anthropicModel));
+    console.log(s.muted("  API Key: ") + s.text(config.anthropicApiKey ? "****" + config.anthropicApiKey.slice(-4) : "None"));
+  } else if (config.aiProvider === "ollama") {
+    console.log(s.muted("  URL: ") + s.text(config.ollamaUrl));
+    console.log(s.muted("  Model: ") + s.text(config.ollamaModel));
+  } else {
+    console.log(s.muted("  LM Studio URL: ") + s.text(config.lmStudioUrl));
+    console.log(s.muted("  Model: ") + s.text(config.model));
+  }
+
+  console.log(s.muted("  AI Instruction: ") + s.text(truncate(config.aiInstruction || "", 50)));
+  console.log(
+    s.muted("  AI Status: ") +
+    (aiStatus.connected ? s.success("Connected ✓") : s.error("Not connected ✗ (" + (aiStatus.error || "Unknown error") + ")")),
+  );
+  console.log();
+
+  const { action } = await inquirer.prompt([
+    {
+      type: "list",
+      name: "action",
+      message: s.muted("What should I do?"),
+      choices: [
+        { name: s.text("  Change Provider"), value: "provider" },
+        { name: s.text("  Configure Provider Settings"), value: "configure" },
+        { name: s.text("  Change AI Instructions"), value: "instruction" },
+        { name: s.muted("  ← Back"), value: "back" },
+      ],
+      loop: false,
+    },
+  ]);
+
+  if (action === "back") return;
+
+  if (action === "provider") {
+    const { provider } = await inquirer.prompt([
+      {
+        type: "list",
+        name: "provider",
+        message: s.muted("Select AI Provider:"),
+        choices: [
+          { name: "LM Studio (Local)", value: "lmstudio" },
+          { name: "OpenAI", value: "openai" },
+          { name: "Anthropic (Claude)", value: "anthropic" },
+          { name: "Ollama (Local)", value: "ollama" },
+        ],
+        default: config.aiProvider,
+      },
+    ]);
+    saveConfig({ ...config, aiProvider: provider });
+    console.log(s.success("\n  ✓ Provider changed to " + provider));
+    await sleep(600);
+    return;
+  }
+
+  if (action === "configure") {
+    const provider = config.aiProvider || "lmstudio";
+    let questions = [];
+
+    if (provider === "openai") {
+      questions = [
+        { type: "input", name: "openaiApiKey", message: "OpenAI API Key:", default: config.openaiApiKey },
+        { type: "input", name: "openaiModel", message: "Model (e.g. gpt-4o, gpt-3.5-turbo):", default: config.openaiModel }
+      ];
+    } else if (provider === "anthropic") {
+      questions = [
+        { type: "input", name: "anthropicApiKey", message: "Anthropic API Key:", default: config.anthropicApiKey },
+        { type: "input", name: "anthropicModel", message: "Model (e.g. claude-3-5-sonnet-20240620):", default: config.anthropicModel }
+      ];
+    } else if (provider === "ollama") {
+      questions = [
+        { type: "input", name: "ollamaUrl", message: "Ollama URL:", default: config.ollamaUrl },
+        { type: "input", name: "ollamaModel", message: "Model (e.g. llama3):", default: config.ollamaModel }
+      ];
+    } else {
+      questions = [
+        { type: "input", name: "lmStudioUrl", message: "LM Studio URL:", default: config.lmStudioUrl },
+        { type: "input", name: "model", message: "Model:", default: config.model }
+      ];
+    }
+
+    const answers = await inquirer.prompt(questions);
+    saveConfig({ ...config, ...answers });
+    console.log(s.success("\n  ✓ Settings saved!"));
+    await sleep(600);
+    return;
+  }
+
+  if (action === "instruction") {
+    const { instruction } = await inquirer.prompt([
+      {
+        type: "input",
+        name: "instruction",
+        message: s.muted("AI System Instruction:"),
+        default: config.aiInstruction,
+      },
+    ]);
+    saveConfig({ ...config, aiInstruction: instruction });
+    console.log(s.success("\n  ✓ Saved!"));
+    await sleep(600);
+  }
+}
+
+module.exports = { doSettings };

package/src/ui/modules/stage.js

@@ -0,0 +1,174 @@
+const inquirer = require("inquirer");
+const ora = require("ora");
+const { getGitStatus, stageAll, stageFiles, getFileDiff, applyPatchString } = require("../../helpers/git");
+const { parseDiff, generatePatch } = require("../../helpers/patch");
+const { s, header, clear, sleep, rows, pause } = require("../common");
+const { doCommit } = require("./commit");
+
+async function doStage(info) {
+  clear();
+  header();
+  console.log(s.bold("  Stage\n"));
+
+  const status = info?.status || (await getGitStatus());
+  const files = [...status.modified, ...status.not_added];
+
+  if (files.length === 0) {
+    console.log(s.muted("  No changes.\n"));
+    await pause();
+    return;
+  }
+
+  // Categorize files
+  const modifiedFiles = status.modified.map((f) => ({
+    name: `  ${s.warning("~")} ${f}`,
+    value: f,
+    short: f,
+  }));
+
+  const untrackedFiles = status.not_added.map((f) => ({
+    name: `  ${s.muted("+")} ${f}`,
+    value: f,
+    short: f,
+  }));
+
+  const { action } = await inquirer.prompt([
+    {
+      type: "list",
+      name: "action",
+      message: s.muted("What should I do?"),
+      choices: [
+        { name: s.success("  ✓ Stage All"), value: "all" },
+        { name: s.text("  ◉ Select Files"), value: "select" },
+        { name: s.warning("  ✂ Partial Stage (Beta)"), value: "partial" },
+        { name: s.muted("  ← Back"), value: "back" },
+      ],
+      loop: false,
+    },
+  ]);
+
+  if (action === "back") return;
+  if (action === "partial") return doPartialStage(status);
+
+  if (action === "all") {
+    const spin = ora({ text: s.muted(" Staging..."), spinner: "dots" }).start();
+    await stageAll();
+    spin.succeed(s.success(" All staged!"));
+    await sleep(500);
+
+    // Redirect to commit
+    const { goCommit } = await inquirer.prompt([
+      {
+        type: "confirm",
+        name: "goCommit",
+        message: s.muted("Would you like to commit?"),
+        default: true,
+      },
+    ]);
+
+    if (goCommit) await doCommit();
+    return;
+  }
+
+  // Select files
+  const { selected } = await inquirer.prompt([
+    {
+      type: "checkbox",
+      name: "selected",
+      message: s.muted("Select files (use space):"),
+      choices: [
+        ...(modifiedFiles.length > 0
+          ? [{ type: "separator", line: s.muted("  Modified") }]
+          : []),
+        ...modifiedFiles,
+        ...(untrackedFiles.length > 0
+          ? [{ type: "separator", line: s.muted("  Untracked") }]
+          : []),
+        ...untrackedFiles,
+      ],
+      pageSize: rows() - 10,
+      loop: false,
+    },
+  ]);
+
+  if (selected.length > 0) {
+    await stageFiles(selected);
+    console.log(s.success(`\n  ✓ ${selected.length} files staged!`));
+
+    const { goCommit } = await inquirer.prompt([
+      {
+        type: "confirm",
+        name: "goCommit",
+        message: s.muted("Would you like to commit?"),
+        default: true,
+      },
+    ]);
+
+    if (goCommit) await doCommit();
+  }
+}
+
+async function doPartialStage(status) {
+  if (status.modified.length === 0) {
+    console.log(s.warning("\n  No modified files suitable for partial staging."));
+    console.log(s.muted("  (Untracked files cannot be partially staged)"));
+    await pause();
+    return;
+  }
+
+  // Select a file
+  const { file } = await inquirer.prompt([
+    {
+      type: "list",
+      name: "file",
+      message: s.muted("Select file to split:"),
+      choices: status.modified.map(f => ({ name: f, value: f })),
+    },
+  ]);
+
+  const diff = await getFileDiff(file);
+  const parsedFiles = parseDiff(diff);
+  
+  if (parsedFiles.length === 0 || !parsedFiles[0].hunks.length) {
+    console.log(s.warning("  No hunks found to split."));
+    await pause();
+    return;
+  }
+
+  const targetFile = parsedFiles[0];
+  const hunks = targetFile.hunks;
+
+  const { selectedIndices } = await inquirer.prompt([
+    {
+      type: "checkbox",
+      name: "selectedIndices",
+      message: s.muted("Select hunks to stage:"),
+      choices: hunks.map((hunk, idx) => {
+        // Create a preview of the hunk
+        const preview = hunk.lines.slice(0, 4).join("\n      ");
+        const more = hunk.lines.length > 4 ? `... (+${hunk.lines.length - 4} lines)` : "";
+        return {
+          name: `${s.primary(`Hunk ${idx + 1}`)}\n      ${s.dim(preview)} ${s.dim(more)}`,
+          value: idx
+        };
+      }),
+      pageSize: rows() - 5
+    }
+  ]);
+
+  if (selectedIndices.length === 0) return;
+
+  const spin = ora({ text: s.muted(" Applying partial patch..."), spinner: "dots" }).start();
+  
+  try {
+    const patchContent = generatePatch(targetFile, selectedIndices);
+    await applyPatchString(patchContent);
+    spin.succeed(s.success(" Selected hunks staged!"));
+  } catch (error) {
+    spin.fail(s.error(" Failed to stage hunks: " + error.message));
+  }
+  
+  await sleep(1000);
+}
+
+module.exports = { doStage };

package/src/ui/modules/stash.js

@@ -0,0 +1,96 @@
+const inquirer = require("inquirer");
+const { getGitStatus, listStashes, stashChanges, popStash, applyStash, dropStash } = require("../../helpers/git");
+const { s, header, clear, pause, sleep } = require("../common");
+
+async function doStash() {
+  clear();
+  header();
+  console.log(s.bold("  Stash\n"));
+
+  const stashes = await listStashes();
+
+  if (stashes.all.length > 0) {
+    stashes.all.slice(0, 5).forEach((st, i) => {
+      console.log(s.muted(`  ${i}: `) + s.text(st.message));
+    });
+    console.log();
+  } else {
+    console.log(s.muted("  No stashes.\n"));
+  }
+
+  const { action } = await inquirer.prompt([
+    {
+      type: "list",
+      name: "action",
+      message: s.muted("What should I do?"),
+      choices: [
+        { name: s.success("  + Save Stash"), value: "save" },
+        { name: s.primary("  ↓ Pop Stash (Apply & Drop)"), value: "pop" },
+        { name: s.text("  ⟳ Apply Stash (Keep)"), value: "apply" },
+        { name: s.error("  ✕ Drop Stash"), value: "drop" },
+        { name: s.muted("  ← Back"), value: "back" },
+      ],
+      loop: false,
+    },
+  ]);
+
+  if (action === "back") return;
+
+  if (action === "save") {
+    const status = await getGitStatus();
+    if (status.modified.length === 0 && status.not_added.length === 0) {
+      console.log(s.muted("\n  No changes to stash."));
+      await pause();
+    } else {
+      const { message } = await inquirer.prompt([
+        {
+          type: "input",
+          name: "message",
+          message: s.muted("Stash message (optional):"),
+        },
+      ]);
+      await stashChanges(message || null);
+      console.log(s.success("\n  ✓ Changes stashed!"));
+      await sleep(600);
+    }
+    return;
+  }
+
+  if (stashes.all.length === 0) {
+    console.log(s.muted("\n  No stashes available."));
+    await pause();
+    return;
+  }
+
+  // Select stash index
+  const { index } = await inquirer.prompt([
+    {
+      type: "list",
+      name: "index",
+      message: s.muted("Select stash:"),
+      choices: stashes.all.map((st, i) => ({
+        name: `${i}: ${st.message}`,
+        value: i
+      }))
+    }
+  ]);
+
+  try {
+    if (action === "pop") {
+      await popStash(index);
+      console.log(s.success("\n  ✓ Stash popped!"));
+    } else if (action === "apply") {
+      await applyStash(index);
+      console.log(s.success("\n  ✓ Stash applied!"));
+    } else if (action === "drop") {
+      await dropStash(index);
+      console.log(s.success("\n  ✓ Stash dropped!"));
+    }
+    await sleep(600);
+  } catch (err) {
+    console.log(s.error(`\n  ✗ ${err.message}`));
+    await pause();
+  }
+}
+
+module.exports = { doStash };