pi-vim 0.2.1 → 0.3.1

package/README.md

@@ -34,6 +34,8 @@ u          # undo
 ```
 
 Mode indicator (`INSERT` / `NORMAL`) appears at bottom-right.
+Its label is theme-colored: reverse-video `borderMuted` for
+INSERT, `borderAccent` for NORMAL.
 
 ## why pi-vim
 
@@ -74,7 +76,7 @@ ex-commands, etc.).
 | `Esc` / `Ctrl+[` | Normal mode → pass to Pi (abort agent) |
 | `i`      | Normal → Insert at cursor              |
 | `a`      | Normal → Insert after cursor           |
-| `I`      | Normal → Insert at line start          |
+| `I`      | Normal → Insert at first non-whitespace |
 | `A`      | Normal → Insert at line end            |
 | `o`      | Normal → open line below + Insert      |
 | `O`      | Normal → open line above + Insert      |
@@ -238,7 +240,9 @@ Same motion set as `d`. Writes to register, **no text mutation**.
 | command | yanks                           |
 |---------|---------------------------------|
 | `yy`         | Whole line + trailing `\n`                     |
+| `Y`          | Whole line + trailing `\n` (same as `yy`)      |
 | `{count}yy`  | `{count}` whole lines + trailing `\n`          |
+| `{count}Y`   | `{count}` whole lines + trailing `\n` (same as `{count}yy`) |
 | `y{count}j`  | Current line + `{count}` lines below (linewise) |
 | `y{count}k`  | Current line + `{count}` lines above (linewise) |
 | `yG`         | Current line to end of buffer (linewise)         |
@@ -281,7 +285,8 @@ Line-wise detection: register content ending in `\n` is treated as line-wise.
 
 | key | action |
 |-----|--------|
-| `u` | Undo in normal mode |
+| `u` | Undo one change in normal mode |
+| `{count}u` | Undo up to `{count}` changes in normal mode; clamps at available history |
 | `Ctrl+_` | Undo in normal mode (alias for `u`) |
 | `<C-r>` | Redo one undone change in normal mode; safe no-op when redo history is empty |
 | `{count}<C-r>` | Redo up to `{count}` undone changes in order; clamps at available history and consumes count state (no leak to the next command) |

package/index.ts

@@ -136,6 +136,7 @@ export class ModalEditor extends CustomEditor {
   private readonly redoStack: EditorSnapshot[] = [];
   private currentTransition: TransitionState = "none";
   private onChangeHooked: boolean = false;
+  private readonly labelColorizers: { insert: (s: string) => string; normal: (s: string) => string } | null;
 
   // Unnamed register
   private unnamedRegister: string = "";
@@ -143,6 +144,16 @@ export class ModalEditor extends CustomEditor {
     try { copyToClipboard(text); } catch { /* best effort */ }
   };
 
+  constructor(
+    tui: any,
+    theme: any,
+    kb: any,
+    labelColorizers?: { insert: (s: string) => string; normal: (s: string) => string } | null,
+  ) {
+    super(tui, theme, kb);
+    this.labelColorizers = labelColorizers ?? null;
+  }
+
   // Test seams
   setClipboardFn(fn: (text: string) => void): void { this.clipboardFn = fn; }
   getRegister(): string { return this.unnamedRegister; }
@@ -220,16 +231,22 @@ export class ModalEditor extends CustomEditor {
     }
   }
 
-  private performUndo(): void {
-    this.withTransition("undo", () => {
-      const beforeUndo = this.captureSnapshot();
-      super.handleInput(CTRL_UNDERSCORE);
-      const afterUndo = this.captureSnapshot();
-
-      if (this.snapshotChanged(beforeUndo, afterUndo)) {
-        this.redoStack.push(beforeUndo);
-      }
-    });
+  private performUndo(count: number = this.takeTotalCount(1)): void {
+    const maxSteps = Math.max(1, Math.min(MAX_COUNT, count));
+    for (let i = 0; i < maxSteps; i++) {
+      let changed = false;
+      this.withTransition("undo", () => {
+        const beforeUndo = this.captureSnapshot();
+        super.handleInput(CTRL_UNDERSCORE);
+        const afterUndo = this.captureSnapshot();
+
+        if (this.snapshotChanged(beforeUndo, afterUndo)) {
+          this.redoStack.push(beforeUndo);
+          changed = true;
+        }
+      });
+      if (!changed) break;
+    }
   }
 
   private performRedo(count: number = this.takeTotalCount(1)): void {
@@ -889,7 +906,11 @@ export class ModalEditor extends CustomEditor {
         || data === "C"
         || data === "p"
         || data === "P"
+        || data === "Y"
         || data === "J"
+        || data === "u"
+        || data === CTRL_UNDERSCORE
+        || matchesKey(data, "ctrl+_")
         || data === CTRL_R
         || matchesKey(data, "ctrl+r")
       );
@@ -996,6 +1017,12 @@ export class ModalEditor extends CustomEditor {
       return;
     }
 
+    if (data === "Y") {
+      const count = this.takeTotalCount(1);
+      this.yankLinewiseByDelta(count - 1);
+      return;
+    }
+
     if (CHAR_MOTION_KEYS.has(data)) {
       this.pendingMotion = data as PendingMotion;
       return;
@@ -1091,7 +1118,7 @@ export class ModalEditor extends CustomEditor {
         break;
       case "I":
         this.mode = "insert";
-        super.handleInput(CTRL_A);
+        this.moveCursorToFirstNonWhitespace();
         break;
       case "o":
         this.openLineBelow();
@@ -2187,10 +2214,14 @@ export class ModalEditor extends CustomEditor {
     const lines = super.render(width);
     if (lines.length === 0) return lines;
 
-    const label = this.getModeLabel();
+    const rawLabel = this.getModeLabel();
+    const colorize = this.labelColorizers
+      ? (this.mode === "insert" ? this.labelColorizers.insert : this.labelColorizers.normal)
+      : null;
+    const label = colorize ? colorize(rawLabel) : rawLabel;
     const last = lines.length - 1;
-    if (visibleWidth(lines[last]!) >= label.length) {
-      lines[last] = truncateToWidth(lines[last]!, width - label.length, "") + label;
+    if (visibleWidth(lines[last]!) >= visibleWidth(rawLabel)) {
+      lines[last] = truncateToWidth(lines[last]!, width - visibleWidth(rawLabel), "") + label;
     }
     return lines;
   }
@@ -2225,6 +2256,11 @@ export class ModalEditor extends CustomEditor {
 
 export default function (pi: ExtensionAPI) {
   pi.on("session_start", (_event, ctx) => {
-    ctx.ui.setEditorComponent((tui, theme, kb) => new ModalEditor(tui, theme, kb));
+    const t = ctx.ui.theme;
+    const colorizers = t ? {
+      insert: (s: string) => t.fg("borderMuted", `\x1b[7m${s}\x1b[27m`),
+      normal: (s: string) => t.fg("borderAccent", `\x1b[7m${s}\x1b[27m`),
+    } : null;
+    ctx.ui.setEditorComponent((tui, theme, kb) => new ModalEditor(tui, theme, kb, colorizers));
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-vim",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "description": "Vim-style modal editing for Pi's TUI editor",
   "type": "module",
   "keywords": [
@@ -12,7 +12,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/lajarre/pi-vim.git"
+    "url": "https://github.com/lajarre/pi-vim.git"
   },
   "files": [
     "*.ts",