@jannael/glinter 1.2.8 → 1.3.0

package/README.md

@@ -1,104 +1,104 @@
-<p align="center">
-  <br>
-  <br>
-  <a href="https://glinter.jannael.com" target="_blank" rel="noopener noreferrer">
-    <picture>
-      <img alt="Glinter" src="https://github.com/Jannael/glinter/raw/main/apps/web/public/og.png">
-    </picture>
-  </a>
-</p>
-
-Glinter is a high-performance, transparent Git wrapper built with **Bun**.
-
-[Tutorial](https://youtu.be/LQWp6flYeyI)
-
-[Commands](https://glinter.jannael.com/#commands)
-
-[Aliases](https://glinter.jannael.com/alias)
-
-[Quick start](https://glinter.jannael.com/#quick-start)
-
-## Preview
-
-### Badge
-
-| Preview                                                                          | Copy                                                                               |
-| -------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------- |
-| [![Glinter](https://glinter.jannael.com/badge.svg)](https://glinter.jannael.com) | `[![Glinter](https://glinter.jannael.com/badge.svg)](https://glinter.jannael.com)` |
-
-<video src="https://github.com/user-attachments/assets/63b401a0-e1e1-453c-9e38-c36cd14e200f" controls="false" autoplay="true" loop="true" muted="true" style="max-width: 100%;">
-Your browser does not support the video tag.
-</video>
-
-### Screenshots
-
-| `g add`                              | `g commit`                              |
-| ------------------------------------ | --------------------------------------- |
-| ![glinter add](./screenshots/ga.png) | ![glinter commit](./screenshots/gc.png) |
-
-## Security
-
-Security is a top priority for this project.
-
-This project uses Bun as its runtime and package manager. You don't need to worry about package vulnerabilities — the `bunfig.toml` configuration includes `minimumReleaseAge = 259200` (3 days), which prevents newly published packages from being installed automatically. This protects against supply chain attacks that have become increasingly common in the npm ecosystem.
-
-## Features
-
-- **Abbreviation**: You can use `g` instead of `git`.
-
-- **Safe by Default**: Automatically filters and prevents accidental staging of sensitive files: `.env` and `node_modules`.
-
-- **Transparent Wrapper**: For every other command (like `commit`, `push`, `log`, or `status`), Glinter acts as a direct tunnel to Git. It preserves all original colors, formatting, and interactive features of the native Git CLI.
-
-## Test environment
-
-- for windows i used my own laptop (windows 11) so if you have a problem please create an issue
-
-- for linux i used WSL (windows subsystem linux) with a kali-linux vm so if you have a problem please create an issue
-
-## How it works
-
-Glinter is designed to be as "natural" as possible, meaning it shouldn't feel like a wrapper at all.
-
-### 1. The Transparent Proxy
-
-In `src/index.ts`, Glinter uses `Bun.spawn` with `stdio: 'inherit'`. This is a low-level operation that connects the standard input, output, and error streams of the Git process directly to your terminal.
-
-- **Result**: Git "knows" it's in a real terminal, so it correctly detects colors and allows for interactive prompts (like credential entry).
-
-### 2. Reliable Status Parsing
-
-For the interactive `add` feature, Glinter runs `git status --porcelain`.
-
-- **Why?**: Standard `git status` output is designed for humans and can change based on your Git version or system language. `--porcelain` is a machine-readable format that is consistent across all environments, making the file detection 100% reliable.
-
-### 3. Interactive Selection
-
-Using the `@clack/prompts` library, Glinter transforms the raw status data into a selectable list.
-
-- The selection logic uses Bun's high-speed shell to execute the final `git add` command, correctly escaping filenames to handle spaces and special characters.
-
-## Installation
-
-To use Glinter as your primary Git interface (e.g., using the command `g`):
-
-```bash
-npm install -g @jannael/glinter
-```
-
-### For Development
-
-1. **Clone the repo**
-2. **Install dependencies**: `bun install`
-3. **Link the binary**: `bun link`
-
-now you can simply run:
-
-```bash
-g add           # Opens the interactive selector
-g commit        # Opens commit type + message prompt
-g add <file>    # Runs standard git add <file>
-g commit -m ""  # Runs standard git commit -m ""
-g status        # Runs standard git status
-g push          # Runs standard git push
-```
+<p align="center">
+  <br>
+  <br>
+  <a href="https://glinter.jannael.com" target="_blank" rel="noopener noreferrer">
+    <picture>
+      <img alt="Glinter" src="https://github.com/Jannael/glinter/raw/main/apps/web/public/og.png">
+    </picture>
+  </a>
+</p>
+
+Glinter is a high-performance, transparent Git wrapper built with **Bun**.
+
+[Tutorial](https://youtu.be/LQWp6flYeyI)
+
+[Commands](https://glinter.jannael.com/#commands)
+
+[Aliases](https://glinter.jannael.com/alias)
+
+[Quick start](https://glinter.jannael.com/#quick-start)
+
+## Preview
+
+### Badge
+
+| Preview                                                                          | Copy                                                                               |
+| -------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------- |
+| [![Glinter](https://glinter.jannael.com/badge.svg)](https://glinter.jannael.com) | `[![Glinter](https://glinter.jannael.com/badge.svg)](https://glinter.jannael.com)` |
+
+<video src="https://github.com/user-attachments/assets/63b401a0-e1e1-453c-9e38-c36cd14e200f" controls="false" autoplay="true" loop="true" muted="true" style="max-width: 100%;">
+Your browser does not support the video tag.
+</video>
+
+### Screenshots
+
+| `g add`                              | `g commit`                              |
+| ------------------------------------ | --------------------------------------- |
+| ![glinter add](./screenshots/ga.png) | ![glinter commit](./screenshots/gc.png) |
+
+## Security
+
+Security is a top priority for this project.
+
+This project uses Bun as its runtime and package manager. You don't need to worry about package vulnerabilities — the `bunfig.toml` configuration includes `minimumReleaseAge = 259200` (3 days), which prevents newly published packages from being installed automatically. This protects against supply chain attacks that have become increasingly common in the npm ecosystem.
+
+## Features
+
+- **Abbreviation**: You can use `g` instead of `git`.
+
+- **Safe by Default**: Automatically filters and prevents accidental staging of sensitive files: `.env` and `node_modules`.
+
+- **Transparent Wrapper**: For every other command (like `commit`, `push`, `log`, or `status`), Glinter acts as a direct tunnel to Git. It preserves all original colors, formatting, and interactive features of the native Git CLI.
+
+## Test environment
+
+- for windows i used my own laptop (windows 11) so if you have a problem please create an issue
+
+- for linux i used WSL (windows subsystem linux) with a kali-linux vm so if you have a problem please create an issue
+
+## How it works
+
+Glinter is designed to be as "natural" as possible, meaning it shouldn't feel like a wrapper at all.
+
+### 1. The Transparent Proxy
+
+In `src/index.ts`, Glinter uses `Bun.spawn` with `stdio: 'inherit'`. This is a low-level operation that connects the standard input, output, and error streams of the Git process directly to your terminal.
+
+- **Result**: Git "knows" it's in a real terminal, so it correctly detects colors and allows for interactive prompts (like credential entry).
+
+### 2. Reliable Status Parsing
+
+For the interactive `add` feature, Glinter runs `git status --porcelain`.
+
+- **Why?**: Standard `git status` output is designed for humans and can change based on your Git version or system language. `--porcelain` is a machine-readable format that is consistent across all environments, making the file detection 100% reliable.
+
+### 3. Interactive Selection
+
+Using the `@clack/prompts` library, Glinter transforms the raw status data into a selectable list.
+
+- The selection logic uses Bun's high-speed shell to execute the final `git add` command, correctly escaping filenames to handle spaces and special characters.
+
+## Installation
+
+To use Glinter as your primary Git interface (e.g., using the command `g`):
+
+```bash
+npm install -g @jannael/glinter
+```
+
+### For Development
+
+1. **Clone the repo**
+2. **Install dependencies**: `bun install`
+3. **Link the binary**: `bun link`
+
+now you can simply run:
+
+```bash
+g add           # Opens the interactive selector
+g commit        # Opens commit type + message prompt
+g add <file>    # Runs standard git add <file>
+g commit -m ""  # Runs standard git commit -m ""
+g status        # Runs standard git status
+g push          # Runs standard git push
+```

package/dist/index.js

@@ -116,6 +116,11 @@ var AVAILABLE_COMMANDS = [
     name: "setup",
     command: "g setup",
     description: "Setup alias for git and glinter"
+  },
+  {
+    name: "reset-hard",
+    command: "g reset-hard",
+    description: "Interactive reset hard"
   }
 ];
 
@@ -1188,8 +1193,8 @@ var u$1 = class u extends V {
 var o$1 = /* @__PURE__ */ new Set(["up", "down", "left", "right"]);
 
 class h extends V {
-  #s = false;
-  #t;
+  #t = false;
+  #s;
   focused = "editor";
   get userInputWithCursor() {
     if (this.state === "submit")
@@ -1197,10 +1202,10 @@ class h extends V {
     const t2 = this.userInput;
     if (this.cursor >= t2.length)
       return `${t2}\u2588`;
-    const s = t2.slice(0, this.cursor), r2 = t2[this.cursor], e = t2.slice(this.cursor + 1);
+    const s = t2.slice(0, this.cursor), r2 = t2[this.cursor], i = t2.slice(this.cursor + 1);
     return r2 === `
 ` ? `${s}\u2588
-${e}` : `${s}${styleText("inverse", r2)}${e}`;
+${i}` : `${s}${styleText("inverse", r2)}${i}`;
   }
   get cursor() {
     return this._cursor;
@@ -1230,37 +1235,41 @@ ${e}` : `${s}${styleText("inverse", r2)}${e}`;
     }
   }
   _shouldSubmit(t2, s) {
-    if (this.#t)
+    if (this.#s)
       return this.focused === "submit" ? true : (this.#r(`
 `), this._cursor++, false);
-    const r2 = this.#s;
-    return this.#s = true, r2 ? (this.userInput[this.cursor - 1] === `
+    const r2 = this.#t;
+    return this.#t = true, r2 && this.cursor === this.userInput.length ? (this.userInput[this.cursor - 1] === `
 ` && (this._setUserInput(this.userInput.slice(0, this.cursor - 1) + this.userInput.slice(this.cursor)), this._cursor--), true) : (this.#r(`
 `), this._cursor++, false);
   }
   constructor(t2) {
-    super(t2, false), this.#t = t2.showSubmit ?? false, this.on("key", (s, r2) => {
-      if (r2?.name && o$1.has(r2.name)) {
-        this.#i(r2.name);
+    const s = t2.initialUserInput ?? t2.initialValue;
+    super({
+      ...t2,
+      initialUserInput: s
+    }, false), s !== undefined && (this._cursor = s.length), this.#s = t2.showSubmit ?? false, this.on("key", (r2, i) => {
+      if (i?.name && o$1.has(i.name)) {
+        this.#t = false, this.#i(i.name);
         return;
       }
-      if (s === "\t" && this.#t) {
+      if (r2 === "\t" && this.#s) {
         this.focused = this.focused === "editor" ? "submit" : "editor";
         return;
       }
-      if (r2?.name !== "return") {
-        if (this.#s = false, r2?.name === "backspace" && this.cursor > 0) {
+      if (i?.name !== "return") {
+        if (this.#t = false, i?.name === "backspace" && this.cursor > 0) {
           this._setUserInput(this.userInput.slice(0, this.cursor - 1) + this.userInput.slice(this.cursor)), this._cursor--;
           return;
         }
-        if (r2?.name === "delete" && this.cursor < this.userInput.length) {
+        if (i?.name === "delete" && this.cursor < this.userInput.length) {
           this._setUserInput(this.userInput.slice(0, this.cursor) + this.userInput.slice(this.cursor + 1));
           return;
         }
-        s && (this.#t && this.focused === "submit" && (this.focused = "editor"), this.#r(s ?? ""), this._cursor++);
+        r2 && (this.#s && this.focused === "submit" && (this.focused = "editor"), this.#r(r2 ?? ""), this._cursor++);
       }
-    }), this.on("userInput", (s) => {
-      this._setValue(s);
+    }), this.on("userInput", (r2) => {
+      this._setValue(r2);
     }), this.on("finalize", () => {
       this.value || (this.value = t2.defaultValue), this.value === undefined && (this.value = "");
     });
@@ -1377,7 +1386,7 @@ function isUnicodeSupported() {
 }
 var unicode = isUnicodeSupported();
 var isCI = () => process.env.CI === "true";
-var unicodeOr = (e, o2) => unicode ? e : o2;
+var unicodeOr = (o2, e) => unicode ? o2 : e;
 var S_STEP_ACTIVE = unicodeOr("\u25C6", "*");
 var S_STEP_CANCEL = unicodeOr("\u25A0", "x");
 var S_STEP_ERROR = unicodeOr("\u25B2", "x");
@@ -1403,8 +1412,8 @@ var S_INFO = unicodeOr("\u25CF", "\u2022");
 var S_SUCCESS = unicodeOr("\u25C6", "*");
 var S_WARN = unicodeOr("\u25B2", "!");
 var S_ERROR = unicodeOr("\u25A0", "x");
-var symbol = (e) => {
-  switch (e) {
+var symbol = (o2) => {
+  switch (o2) {
     case "initial":
     case "active":
       return styleText2("cyan", S_STEP_ACTIVE);
@@ -1416,8 +1425,8 @@ var symbol = (e) => {
       return styleText2("green", S_STEP_SUBMIT);
   }
 };
-var symbolBar = (e) => {
-  switch (e) {
+var symbolBar = (o2) => {
+  switch (o2) {
     case "initial":
     case "active":
       return styleText2("cyan", S_BAR);
@@ -1429,6 +1438,10 @@ var symbolBar = (e) => {
       return styleText2("green", S_BAR);
   }
 };
+function formatInstructionFooter(o2, e) {
+  const r2 = [`${e ? `${styleText2("cyan", S_BAR)}  ` : ""}${o2.join(" \u2022 ")}`];
+  return e && r2.push(styleText2("cyan", S_BAR_END)), r2;
+}
 var E$1 = (l2, o2, g2, c2, h2, O = false) => {
   let r2 = o2, w = 0;
   if (O)
@@ -1513,61 +1526,48 @@ ${g2}
     }
   }).prompt();
 };
-var cancel = (o2 = "", t2) => {
-  const i = t2?.output ?? process.stdout, e = t2?.withGuide ?? settings.withGuide ? `${styleText2("gray", S_BAR_END)}  ` : "";
-  i.write(`${e}${styleText2("red", o2)}
-
-`);
-};
-var intro = (o2 = "", t2) => {
-  const i = t2?.output ?? process.stdout, e = t2?.withGuide ?? settings.withGuide ? `${styleText2("gray", S_BAR_START)}  ` : "";
-  i.write(`${e}${o2}
-`);
-};
-var outro = (o2 = "", t2) => {
-  const i = t2?.output ?? process.stdout, e = t2?.withGuide ?? settings.withGuide ? `${styleText2("gray", S_BAR)}
-${styleText2("gray", S_BAR_END)}  ` : "";
-  i.write(`${e}${o2}
-
-`);
-};
-var d = (n2, a3) => n2.split(`
-`).map((m2) => a3(m2)).join(`
+var MULTISELECT_INSTRUCTIONS = [
+  `${styleText2("dim", "\u2191/\u2193")} to navigate`,
+  `${styleText2("dim", "Space:")} select`,
+  `${styleText2("dim", "Enter:")} confirm`
+];
+var m2 = (n2, o2) => n2.split(`
+`).map((d) => o2(d)).join(`
 `);
 var multiselect = (n2) => {
-  const a3 = (t2, o2) => {
+  const o2 = (t2, a3) => {
     const r2 = t2.label ?? String(t2.value);
-    return o2 === "disabled" ? `${styleText2("gray", S_CHECKBOX_INACTIVE)} ${d(r2, (l2) => styleText2(["strikethrough", "gray"], l2))}${t2.hint ? ` ${styleText2("dim", `(${t2.hint ?? "disabled"})`)}` : ""}` : o2 === "active" ? `${styleText2("cyan", S_CHECKBOX_ACTIVE)} ${r2}${t2.hint ? ` ${styleText2("dim", `(${t2.hint})`)}` : ""}` : o2 === "selected" ? `${styleText2("green", S_CHECKBOX_SELECTED)} ${d(r2, (l2) => styleText2("dim", l2))}${t2.hint ? ` ${styleText2("dim", `(${t2.hint})`)}` : ""}` : o2 === "cancelled" ? `${d(r2, (l2) => styleText2(["strikethrough", "dim"], l2))}` : o2 === "active-selected" ? `${styleText2("green", S_CHECKBOX_SELECTED)} ${r2}${t2.hint ? ` ${styleText2("dim", `(${t2.hint})`)}` : ""}` : o2 === "submitted" ? `${d(r2, (l2) => styleText2("dim", l2))}` : `${styleText2("dim", S_CHECKBOX_INACTIVE)} ${d(r2, (l2) => styleText2("dim", l2))}`;
-  }, m2 = n2.required ?? true;
+    return a3 === "disabled" ? `${styleText2("gray", S_CHECKBOX_INACTIVE)} ${m2(r2, (l2) => styleText2(["strikethrough", "gray"], l2))}${t2.hint ? ` ${styleText2("dim", `(${t2.hint ?? "disabled"})`)}` : ""}` : a3 === "active" ? `${styleText2("cyan", S_CHECKBOX_ACTIVE)} ${r2}${t2.hint ? ` ${styleText2("dim", `(${t2.hint})`)}` : ""}` : a3 === "selected" ? `${styleText2("green", S_CHECKBOX_SELECTED)} ${m2(r2, (l2) => styleText2("dim", l2))}${t2.hint ? ` ${styleText2("dim", `(${t2.hint})`)}` : ""}` : a3 === "cancelled" ? `${m2(r2, (l2) => styleText2(["strikethrough", "dim"], l2))}` : a3 === "active-selected" ? `${styleText2("green", S_CHECKBOX_SELECTED)} ${r2}${t2.hint ? ` ${styleText2("dim", `(${t2.hint})`)}` : ""}` : a3 === "submitted" ? `${m2(r2, (l2) => styleText2("dim", l2))}` : `${styleText2("dim", S_CHECKBOX_INACTIVE)} ${m2(r2, (l2) => styleText2("dim", l2))}`;
+  }, d = n2.required ?? true;
   return new a$1({
     options: n2.options,
     signal: n2.signal,
     input: n2.input,
     output: n2.output,
     initialValues: n2.initialValues,
-    required: m2,
+    required: d,
     cursorAt: n2.cursorAt,
     validate(t2) {
-      if (m2 && (t2 === undefined || t2.length === 0))
+      if (d && (t2 === undefined || t2.length === 0))
         return `Please select at least one option.
 ${styleText2("reset", styleText2("dim", `Press ${styleText2(["gray", "bgWhite", "inverse"], " space ")} to select, ${styleText2("gray", styleText2("bgWhite", styleText2("inverse", " enter ")))} to submit`))}`;
     },
     render() {
-      const t2 = n2.withGuide ?? settings.withGuide, o2 = wrapTextWithPrefix(n2.output, n2.message, t2 ? `${symbolBar(this.state)}  ` : "", `${symbol(this.state)}  `), r2 = `${t2 ? `${styleText2("gray", S_BAR)}
-` : ""}${o2}
-`, l2 = this.value ?? [], g2 = (i, u3) => {
+      const t2 = n2.withGuide ?? settings.withGuide, a3 = wrapTextWithPrefix(n2.output, n2.message, t2 ? `${symbolBar(this.state)}  ` : "", `${symbol(this.state)}  `), r2 = `${t2 ? `${styleText2("gray", S_BAR)}
+` : ""}${a3}
+`, l2 = this.value ?? [], p2 = (i, u3) => {
         if (i.disabled)
-          return a3(i, "disabled");
+          return o2(i, "disabled");
         const s = l2.includes(i.value);
-        return u3 && s ? a3(i, "active-selected") : s ? a3(i, "selected") : a3(i, u3 ? "active" : "inactive");
+        return u3 && s ? o2(i, "active-selected") : s ? o2(i, "selected") : o2(i, u3 ? "active" : "inactive");
       };
       switch (this.state) {
         case "submit": {
-          const i = this.options.filter(({ value: s }) => l2.includes(s)).map((s) => a3(s, "submitted")).join(styleText2("dim", ", ")) || styleText2("dim", "none"), u3 = wrapTextWithPrefix(n2.output, i, t2 ? `${styleText2("gray", S_BAR)}  ` : "");
+          const i = this.options.filter(({ value: s }) => l2.includes(s)).map((s) => o2(s, "submitted")).join(styleText2("dim", ", ")) || styleText2("dim", "none"), u3 = wrapTextWithPrefix(n2.output, i, t2 ? `${styleText2("gray", S_BAR)}  ` : "");
           return `${r2}${u3}`;
         }
         case "cancel": {
-          const i = this.options.filter(({ value: s }) => l2.includes(s)).map((s) => a3(s, "cancelled")).join(styleText2("dim", ", "));
+          const i = this.options.filter(({ value: s }) => l2.includes(s)).map((s) => o2(s, "cancelled")).join(styleText2("dim", ", "));
           if (i.trim() === "")
             return `${r2}${styleText2("gray", S_BAR)}`;
           const u3 = wrapTextWithPrefix(n2.output, i, t2 ? `${styleText2("gray", S_BAR)}  ` : "");
@@ -1576,9 +1576,9 @@ ${styleText2("gray", S_BAR)}` : ""}`;
         }
         case "error": {
           const i = t2 ? `${styleText2("yellow", S_BAR)}  ` : "", u3 = this.error.split(`
-`).map((h2, x) => x === 0 ? `${t2 ? `${styleText2("yellow", S_BAR_END)}  ` : ""}${styleText2("yellow", h2)}` : `   ${h2}`).join(`
+`).map(($, x) => x === 0 ? `${t2 ? `${styleText2("yellow", S_BAR_END)}  ` : ""}${styleText2("yellow", $)}` : `   ${$}`).join(`
 `), s = r2.split(`
-`).length, v = u3.split(`
+`).length, g2 = u3.split(`
 `).length + 1;
           return `${r2}${i}${limitOptions({
             output: n2.output,
@@ -1586,8 +1586,8 @@ ${styleText2("gray", S_BAR)}` : ""}`;
             cursor: this.cursor,
             maxItems: n2.maxItems,
             columnPadding: i.length,
-            rowPadding: s + v,
-            style: g2
+            rowPadding: s + g2,
+            style: p2
           }).join(`
 ${i}`)}
 ${u3}
@@ -1595,24 +1595,43 @@ ${u3}
         }
         default: {
           const i = t2 ? `${styleText2("cyan", S_BAR)}  ` : "", u3 = r2.split(`
-`).length, s = t2 ? 2 : 1;
+`).length, s = formatInstructionFooter(MULTISELECT_INSTRUCTIONS, t2), g2 = s.join(`
+`), $ = s.length + 1;
           return `${r2}${i}${limitOptions({
             output: n2.output,
             options: this.options,
             cursor: this.cursor,
             maxItems: n2.maxItems,
             columnPadding: i.length,
-            rowPadding: u3 + s,
-            style: g2
+            rowPadding: u3 + $,
+            style: p2
           }).join(`
 ${i}`)}
-${t2 ? styleText2("cyan", S_BAR_END) : ""}
+${g2}
 `;
         }
       }
     }
   }).prompt();
 };
+var cancel = (o2 = "", t2) => {
+  const i = t2?.output ?? process.stdout, e = t2?.withGuide ?? settings.withGuide ? `${styleText2("gray", S_BAR_END)}  ` : "";
+  i.write(`${e}${styleText2("red", o2)}
+
+`);
+};
+var intro = (o2 = "", t2) => {
+  const i = t2?.output ?? process.stdout, e = t2?.withGuide ?? settings.withGuide ? `${styleText2("gray", S_BAR_START)}  ` : "";
+  i.write(`${e}${o2}
+`);
+};
+var outro = (o2 = "", t2) => {
+  const i = t2?.output ?? process.stdout, e = t2?.withGuide ?? settings.withGuide ? `${styleText2("gray", S_BAR)}
+${styleText2("gray", S_BAR_END)}  ` : "";
+  i.write(`${e}${o2}
+
+`);
+};
 var W = (l2) => styleText2("magenta", l2);
 var spinner = ({
   indicator: l2 = "dots",
@@ -1622,18 +1641,18 @@ var spinner = ({
   errorMessage: O,
   frames: E = unicode ? ["\u25D2", "\u25D0", "\u25D3", "\u25D1"] : ["\u2022", "o", "O", "0"],
   delay: F = unicode ? 80 : 120,
-  signal: m2,
+  signal: m3,
   ...I
 } = {}) => {
   const u3 = isCI();
-  let M2, T3, d2 = false, S = false, s = "", p2, w = performance.now();
+  let M2, T3, d = false, S = false, s = "", p2, w = performance.now();
   const x = getColumns(n2), k = I?.styleFrame ?? W, g2 = (e) => {
     const r2 = e > 1 ? O ?? settings.messages.error : G ?? settings.messages.cancel;
-    S = e === 1, d2 && (a3(r2, e), S && typeof h2 == "function" && h2());
+    S = e === 1, d && (a3(r2, e), S && typeof h2 == "function" && h2());
   }, f2 = () => g2(2), i = () => g2(1), A = () => {
-    process.on("uncaughtExceptionMonitor", f2), process.on("unhandledRejection", f2), process.on("SIGINT", i), process.on("SIGTERM", i), process.on("exit", g2), m2 && m2.addEventListener("abort", i);
+    process.on("uncaughtExceptionMonitor", f2), process.on("unhandledRejection", f2), process.on("SIGINT", i), process.on("SIGTERM", i), process.on("exit", g2), m3 && m3.addEventListener("abort", i);
   }, H = () => {
-    process.removeListener("uncaughtExceptionMonitor", f2), process.removeListener("unhandledRejection", f2), process.removeListener("SIGINT", i), process.removeListener("SIGTERM", i), process.removeListener("exit", g2), m2 && m2.removeEventListener("abort", i);
+    process.removeListener("uncaughtExceptionMonitor", f2), process.removeListener("unhandledRejection", f2), process.removeListener("SIGINT", i), process.removeListener("SIGTERM", i), process.removeListener("exit", g2), m3 && m3.removeEventListener("abort", i);
   }, y = () => {
     if (p2 === undefined)
       return;
@@ -1649,7 +1668,7 @@ var spinner = ({
     const r2 = (performance.now() - e) / 1000, t2 = Math.floor(r2 / 60), o2 = Math.floor(r2 % 60);
     return t2 > 0 ? `[${t2}m ${o2}s]` : `[${o2}s]`;
   }, N = I.withGuide ?? settings.withGuide, P2 = (e = "") => {
-    d2 = true, M2 = block({ output: n2 }), s = C2(e), w = performance.now(), N && n2.write(`${styleText2("gray", S_BAR)}
+    d = true, M2 = block({ output: n2 }), s = C2(e), w = performance.now(), N && n2.write(`${styleText2("gray", S_BAR)}
 `);
     let r2 = 0, t2 = 0;
     A(), T3 = setInterval(() => {
@@ -1673,9 +1692,9 @@ var spinner = ({
       n2.write(j), r2 = r2 + 1 < E.length ? r2 + 1 : 0, t2 = t2 < 4 ? t2 + 0.125 : 0;
     }, F);
   }, a3 = (e = "", r2 = 0, t2 = false) => {
-    if (!d2)
+    if (!d)
       return;
-    d2 = false, clearInterval(T3), y();
+    d = false, clearInterval(T3), y();
     const o2 = r2 === 0 ? styleText2("green", S_STEP_SUBMIT) : r2 === 1 ? styleText2("red", S_STEP_CANCEL) : styleText2("red", S_STEP_ERROR);
     s = e ?? s, t2 || (l2 === "timer" ? n2.write(`${o2}  ${s} ${_2(w)}
 `) : n2.write(`${o2}  ${s}
@@ -1700,20 +1719,24 @@ var u3 = {
   heavy: unicodeOr("\u2501", "="),
   block: unicodeOr("\u2588", "#")
 };
-var c2 = (e, a3) => e.includes(`
-`) ? e.split(`
-`).map((t2) => a3(t2)).join(`
-`) : a3(e);
-var select = (e) => {
-  const a3 = (t2, d2) => {
-    const s = t2.label ?? String(t2.value);
-    switch (d2) {
+var SELECT_INSTRUCTIONS = [
+  `${styleText2("dim", "\u2191/\u2193")} to navigate`,
+  `${styleText2("dim", "Enter:")} confirm`
+];
+var c2 = (t2, a3) => t2.includes(`
+`) ? t2.split(`
+`).map((i) => a3(i)).join(`
+`) : a3(t2);
+var select = (t2) => {
+  const a3 = (i, m3) => {
+    const s = i.label ?? String(i.value);
+    switch (m3) {
       case "disabled":
-        return `${styleText2("gray", S_RADIO_INACTIVE)} ${c2(s, (n2) => styleText2("gray", n2))}${t2.hint ? ` ${styleText2("dim", `(${t2.hint ?? "disabled"})`)}` : ""}`;
+        return `${styleText2("gray", S_RADIO_INACTIVE)} ${c2(s, (n2) => styleText2("gray", n2))}${i.hint ? ` ${styleText2("dim", `(${i.hint ?? "disabled"})`)}` : ""}`;
       case "selected":
         return `${c2(s, (n2) => styleText2("dim", n2))}`;
       case "active":
-        return `${styleText2("green", S_RADIO_ACTIVE)} ${s}${t2.hint ? ` ${styleText2("dim", `(${t2.hint})`)}` : ""}`;
+        return `${styleText2("green", S_RADIO_ACTIVE)} ${s}${i.hint ? ` ${styleText2("dim", `(${i.hint})`)}` : ""}`;
       case "cancelled":
         return `${c2(s, (n2) => styleText2(["strikethrough", "dim"], n2))}`;
       default:
@@ -1721,39 +1744,40 @@ var select = (e) => {
     }
   };
   return new a2({
-    options: e.options,
-    signal: e.signal,
-    input: e.input,
-    output: e.output,
-    initialValue: e.initialValue,
+    options: t2.options,
+    signal: t2.signal,
+    input: t2.input,
+    output: t2.output,
+    initialValue: t2.initialValue,
     render() {
-      const t2 = e.withGuide ?? settings.withGuide, d2 = `${symbol(this.state)}  `, s = `${symbolBar(this.state)}  `, n2 = wrapTextWithPrefix(e.output, e.message, s, d2), u4 = `${t2 ? `${styleText2("gray", S_BAR)}
+      const i = t2.withGuide ?? settings.withGuide, m3 = `${symbol(this.state)}  `, s = `${symbolBar(this.state)}  `, n2 = wrapTextWithPrefix(t2.output, t2.message, s, m3), u4 = `${i ? `${styleText2("gray", S_BAR)}
 ` : ""}${n2}
 `;
       switch (this.state) {
         case "submit": {
-          const r2 = t2 ? `${styleText2("gray", S_BAR)}  ` : "", l2 = wrapTextWithPrefix(e.output, a3(this.options[this.cursor], "selected"), r2);
-          return `${u4}${l2}`;
+          const r2 = i ? `${styleText2("gray", S_BAR)}  ` : "", o2 = wrapTextWithPrefix(t2.output, a3(this.options[this.cursor], "selected"), r2);
+          return `${u4}${o2}`;
         }
         case "cancel": {
-          const r2 = t2 ? `${styleText2("gray", S_BAR)}  ` : "", l2 = wrapTextWithPrefix(e.output, a3(this.options[this.cursor], "cancelled"), r2);
-          return `${u4}${l2}${t2 ? `
+          const r2 = i ? `${styleText2("gray", S_BAR)}  ` : "", o2 = wrapTextWithPrefix(t2.output, a3(this.options[this.cursor], "cancelled"), r2);
+          return `${u4}${o2}${i ? `
 ${styleText2("gray", S_BAR)}` : ""}`;
         }
         default: {
-          const r2 = t2 ? `${styleText2("cyan", S_BAR)}  ` : "", l2 = t2 ? styleText2("cyan", S_BAR_END) : "", g2 = u4.split(`
-`).length, h2 = t2 ? 2 : 1;
+          const r2 = i ? `${styleText2("cyan", S_BAR)}  ` : "", o2 = u4.split(`
+`).length, $ = formatInstructionFooter(SELECT_INSTRUCTIONS, i), h2 = $.join(`
+`), b2 = $.length + 1;
           return `${u4}${r2}${limitOptions({
-            output: e.output,
+            output: t2.output,
             cursor: this.cursor,
             options: this.options,
-            maxItems: e.maxItems,
+            maxItems: t2.maxItems,
             columnPadding: r2.length,
-            rowPadding: g2 + h2,
-            style: (p2, b2) => a3(p2, p2.disabled ? "disabled" : b2 ? "active" : "inactive")
+            rowPadding: o2 + b2,
+            style: (p2, x) => a3(p2, p2.disabled ? "disabled" : x ? "active" : "inactive")
           }).join(`
 ${r2}`)}
-${l2}
+${h2}
 `;
         }
       }
@@ -1775,10 +1799,10 @@ var text = (t2) => new n({
 `, c3 = t2.placeholder ? styleText2("inverse", t2.placeholder[0]) + styleText2("dim", t2.placeholder.slice(1)) : styleText2(["inverse", "hidden"], "_"), o2 = this.userInput ? this.userInputWithCursor : c3, a3 = this.value ?? "";
     switch (this.state) {
       case "error": {
-        const n2 = this.error ? `  ${styleText2("yellow", this.error)}` : "", r2 = i2 ? `${styleText2("yellow", S_BAR)}  ` : "", d2 = i2 ? styleText2("yellow", S_BAR_END) : "";
+        const n2 = this.error ? `  ${styleText2("yellow", this.error)}` : "", r2 = i2 ? `${styleText2("yellow", S_BAR)}  ` : "", d = i2 ? styleText2("yellow", S_BAR_END) : "";
         return `${s.trim()}
 ${r2}${o2}
-${d2}${n2}
+${d}${n2}
 `;
       }
       case "submit": {
@@ -1835,8 +1859,6 @@ class AddCommand {
       const options = changes.map((c3) => ({ value: c3.value, label: c3.label }));
       const selectedChanges = await MultiSelect({
         message: `Select the changes you want to commit. 
-` + BLUE({ text: "[space] to select" }) + `
-` + GREEN({ text: "[enter] to confirm" }) + `
 ` + MAGENTA({ text: "[a] to select all" }) + `
 ` + RED({ text: "[esc] to cancel" }) + `
 `,
@@ -2036,7 +2058,9 @@ var ALIASES = [
   { name: "gstp", command: "stash pop", kind: "git" },
   { name: "gstl", command: "stash list", kind: "git" },
   { name: "gcl", command: "clean -fd", kind: "git" },
-  { name: "grh", command: "reset --hard", kind: "git" }
+  { name: "grh", command: "reset --hard", kind: "git" },
+  { name: "ggrh", command: "reset-hard", kind: "glinter" },
+  { name: "ggclean", command: "reset --hard && git clean -fd", kind: "git" }
 ];
 
 // apps/cli/modules/alias/main.ts
@@ -2108,10 +2132,7 @@ var commitTypeOptions = [
 ];
 
 // apps/cli/utils/input.ts
-async function Input({
-  message,
-  placeholder
-}) {
+async function Input({ message, placeholder }) {
   const value = await text({
     message,
     placeholder,
@@ -2129,10 +2150,7 @@ async function Input({
 }
 
 // apps/cli/utils/select.ts
-async function Select({
-  message,
-  options
-}) {
+async function Select({ message, options }) {
   const selected = await select({
     message,
     options
@@ -2190,6 +2208,123 @@ async function commitCommand() {
   await commitCmd.execute();
 }
 
+// apps/cli/modules/reset-hard/app/reset-hard-command.ts
+var PREV_PAGE = "< Previous page";
+var NEXT_PAGE = "Next page >";
+
+class ResetHardCommand {
+  resetHardRepository;
+  constructor(resetHardRepository) {
+    this.resetHardRepository = resetHardRepository;
+  }
+  async execute() {
+    try {
+      let page = 0;
+      const pageSize = 10;
+      while (true) {
+        const { commits, hasMore } = await this.resetHardRepository.getCommits(page, pageSize);
+        if (commits.length === 0) {
+          console.log(`${WARNING({ text: "No commits found." })}`);
+          return;
+        }
+        const options = [];
+        if (page > 0) {
+          options.push({ value: PREV_PAGE, label: PREV_PAGE });
+        }
+        for (const commit of commits) {
+          options.push({
+            value: commit.hash,
+            label: `${YELLOW({ text: commit.shortHash })} ${commit.subject}`
+          });
+        }
+        if (hasMore) {
+          options.push({ value: NEXT_PAGE, label: NEXT_PAGE });
+        }
+        const selected = await Select({
+          message: "Select the commit you want to reset to.",
+          options
+        });
+        if (selected === PREV_PAGE) {
+          page -= 1;
+          continue;
+        }
+        if (selected === NEXT_PAGE) {
+          page += 1;
+          continue;
+        }
+        await this.resetHardRepository.resetHard(selected);
+        console.log(`${CHECK({ text: "Successfully reset to " + selected })}`);
+        break;
+      }
+    } catch (error) {
+      errorHandler(error);
+    }
+  }
+}
+
+// apps/cli/modules/reset-hard/infra/bun-reset-hard.repository.ts
+var {$: $2 } = globalThis.Bun;
+
+// apps/cli/modules/reset-hard/domain/commit.ts
+class Commit {
+  props;
+  constructor(props) {
+    this.props = props;
+  }
+  get hash() {
+    return this.props.hash;
+  }
+  get shortHash() {
+    return this.props.hash.slice(0, 7);
+  }
+  get subject() {
+    return this.props.subject;
+  }
+  static fromGitLog(output) {
+    if (!output.trim())
+      return [];
+    const lines = output.split(`
+`).filter((line) => line.trim() !== "");
+    return lines.map((line) => {
+      const hash = line.substring(0, 40);
+      const subject = line.substring(41).trim();
+      return new Commit({ hash, subject });
+    });
+  }
+}
+
+// apps/cli/modules/reset-hard/infra/bun-reset-hard.repository.ts
+class BunResetHardRepository {
+  async getCommits(page, pageSize) {
+    try {
+      const skip = page * pageSize;
+      const output = await $2`git --no-pager log -n ${pageSize + 1} --skip=${skip} --format="%H %s"`.quiet().text();
+      const allCommits = Commit.fromGitLog(output);
+      const hasMore = allCommits.length > pageSize;
+      const commits = hasMore ? allCommits.slice(0, pageSize) : allCommits;
+      return { commits, hasMore };
+    } catch {
+      throw new ServerError("Git log failed", "Could not retrieve commits");
+    }
+  }
+  async resetHard(hash) {
+    const proc = Bun.spawn(["git", "reset", "--hard", hash], {
+      stdio: ["inherit", "inherit", "inherit"]
+    });
+    const exitCode = await proc.exited;
+    if (exitCode !== 0) {
+      throw new ServerError("Git reset failed", `Failed to reset to commit ${hash}`);
+    }
+  }
+}
+
+// apps/cli/modules/reset-hard/main.ts
+async function resetHardCommand() {
+  const resetHardRepository = new BunResetHardRepository;
+  const resetHardCmd = new ResetHardCommand(resetHardRepository);
+  await resetHardCmd.execute();
+}
+
 // apps/cli/modules/setup/app/setup-aliases.use-case.ts
 class SetupAliasesUseCase {
   aliasRepository;
@@ -2210,11 +2345,7 @@ class SetupAliasesUseCase {
 }
 
 // apps/cli/utils/confirm.ts
-async function Confirm({
-  message,
-  cancelMessage,
-  exitOnCancel = true
-}) {
+async function Confirm({ message, cancelMessage, exitOnCancel = true }) {
   const confirmed = await confirm({
     message
   });
@@ -2360,12 +2491,7 @@ ${functionLine}
     return path2.join(this.getWindowsDocumentsPath(), "PowerShell", "Microsoft.PowerShell_profile.ps1");
   }
   getWindowsDocumentsPath() {
-    const proc = Bun.spawnSync([
-      "powershell",
-      "-NoProfile",
-      "-Command",
-      "[Environment]::GetFolderPath('MyDocuments')"
-    ], {
+    const proc = Bun.spawnSync(["powershell", "-NoProfile", "-Command", "[Environment]::GetFolderPath('MyDocuments')"], {
       stdout: "pipe",
       stderr: "pipe"
     });
@@ -2516,11 +2642,11 @@ class SwitchCommand {
 }
 
 // apps/cli/modules/switch/infra/bun-switch-repository.ts
-var {$: $2 } = globalThis.Bun;
+var {$: $3 } = globalThis.Bun;
 class BunSwitchRepository {
   async getBranches() {
     try {
-      const output = await $2`git branch -a`.quiet().text();
+      const output = await $3`git branch -a`.quiet().text();
       if (!output.trim()) {
         return [];
       }
@@ -2556,7 +2682,8 @@ var COMMANDS_FN = {
   commit: commitCommand,
   switch: switchCommand,
   alias: aliasCommand,
-  setup: setupCommand
+  setup: setupCommand,
+  "reset-hard": resetHardCommand
 };
 
 // apps/cli/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@jannael/glinter",
-	"version": "1.2.8",
+	"version": "1.3.0",
 	"description": "A high-performance, transparent Git wrapper with interactive staging",
 	"type": "module",
 	"private": false,
@@ -36,12 +36,12 @@
 	"scripts": {
 		"build": "bun build ./apps/cli/index.ts --outfile=./dist/index.js --target=bun",
 		"prepublishOnly": "bun run build",
-		"test": "vitest",
-		"lint": "oxlint",
-		"lint:fix": "oxlint --fix",
-		"format": "prettier --write .",
-		"format:check": "prettier --check .",
+		"test": "bun test",
 		"type-check": "bunx tsc --noEmit",
+		"lint": "eslint .",
+		"lint:fix": "eslint --fix .",
+		"fmt": "prettier --write .",
+		"fmt:check": "prettier --check .",
 		"prepare": "husky"
 	},
 	"bin": {
@@ -51,27 +51,23 @@
 		"bun": ">=1.0.0"
 	},
 	"devDependencies": {
+		"@eslint/js": "10.0.1",
 		"@types/bun": "1.3.14",
+		"eslint": "10.5.0",
+		"eslint-plugin-astro": "2.0.0",
 		"husky": "9.1.7",
-		"oxlint": "1.68.0",
-		"prettier": "3.8.3",
+		"lint-staged": "17.0.8",
+		"prettier": "3.8.4",
 		"prettier-plugin-astro": "0.14.1",
 		"prettier-plugin-tailwindcss": "0.8.0",
-		"vitest": "4.1.8",
-		"lint-staged": "17.0.7",
-		"wrangler": "4.98.0"
+		"typescript-eslint": "8.62.0",
+		"wrangler": "4.104.0"
 	},
 	"peerDependencies": {
 		"bun": "1.3.14",
 		"typescript": "6.0.3"
 	},
 	"dependencies": {
-		"@clack/prompts": "1.5.1"
-	},
-	"lint-staged": {
-		"*.{ts,tsx,js,jsx,astro}": [
-			"bun run lint:fix",
-			"bun run format"
-		]
+		"@clack/prompts": "1.6.0"
 	}
 }