@arthony/keybook 0.3.1 → 0.4.0

package/README.md

@@ -42,8 +42,9 @@ keybook check    # validate your data files
 In the TUI: type to fuzzy-search, ↑/↓ to move, ⏎ to copy the shortcut (or a
 recipe's command) to the clipboard, ⎋ to quit.
 
-Press `⌃O` in the TUI to add an entry without leaving the search screen. Or
-script it: `keybook add --app Fork --action 'Push' --keys 'shift cmd p' --tags push`
+Manage entries without leaving the search screen: `⌃O` to add, `⌃E` to edit the
+selected entry (pre-filled form), `⌃X` to delete it (with a `y/n` confirm). Or
+script an add: `keybook add --app Fork --action 'Push' --keys 'shift cmd p' --tags push`
 (`--keys` accepts glyphs or words; recipes use repeatable `--step`).
 
 ## Your data

package/dist/cli.js

@@ -7,7 +7,7 @@ import { Command } from "commander";
 import { Box, Text, render, useApp, useInput, useStdout } from "ink";
 import { createElement, useCallback, useMemo, useState } from "react";
 import { homedir } from "node:os";
-import { Document, parse, parseDocument } from "yaml";
+import { Document, isMap, isSeq, parse, parseDocument } from "yaml";
 import { z } from "zod";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { Fzf, extendedMatch } from "fzf";
@@ -177,6 +177,8 @@ function loadEntries(dataDir) {
 			}
 			entries.push({
 				app,
+				file,
+				index: i,
 				...parsed.data
 			});
 		});
@@ -310,6 +312,73 @@ function addEntry(dir, app, entry) {
 		lines: [`✓ ${created ? "created" : "added to"} ${basename(file)}`]
 	};
 }
+function deleteEntry(dir, file, index, expectedAction) {
+	const path = join(dir, file);
+	let original;
+	try {
+		original = readFileSync(path, "utf8");
+	} catch (e) {
+		return err(path, [e.message]);
+	}
+	const doc = parseDocument(original);
+	const node = doc.getIn(["entries", index]);
+	if ((isMap(node) ? String(node.get("action") ?? "").trim() : void 0) !== expectedAction.trim()) return err(path, ["✗ entry changed on disk — reload and retry"]);
+	doc.deleteIn(["entries", index]);
+	const seq = doc.getIn(["entries"]);
+	const emptied = isSeq(seq) ? seq.items.length === 0 : true;
+	try {
+		if (emptied) unlinkSync(path);
+		else writeFileSync(path, doc.toString());
+	} catch (e) {
+		return err(path, [e.message]);
+	}
+	if (!emptied) {
+		const fileErr = loadEntries(dir).errors.find((e) => e.file === basename(file));
+		if (fileErr) {
+			writeFileSync(path, original);
+			return err(path, [`✗ ${fileErr.message}`]);
+		}
+	}
+	return {
+		ok: true,
+		file: path,
+		created: false,
+		lines: [emptied ? `✗ deleted '${expectedAction}' (removed empty ${basename(file)})` : `✗ deleted '${expectedAction}'`]
+	};
+}
+function editEntry(dir, file, index, entry, expectedAction) {
+	if ("app" in entry) return err("", ["Error: entry must not have an app field; use --app instead"]);
+	const parsed = entrySchema.safeParse(entry);
+	if (!parsed.success) return err("", parsed.error.issues.map((i) => i.message));
+	const clean = buildClean(parsed.data);
+	const path = join(dir, file);
+	let original;
+	try {
+		original = readFileSync(path, "utf8");
+	} catch (e) {
+		return err(path, [e.message]);
+	}
+	const doc = parseDocument(original);
+	const node = doc.getIn(["entries", index]);
+	if ((isMap(node) ? String(node.get("action") ?? "").trim() : void 0) !== expectedAction.trim()) return err(path, ["✗ entry changed on disk — reload and retry"]);
+	doc.setIn(["entries", index], doc.createNode(clean));
+	try {
+		writeFileSync(path, doc.toString());
+	} catch (e) {
+		return err(path, [e.message]);
+	}
+	const fileErr = loadEntries(dir).errors.find((e) => e.file === basename(file));
+	if (fileErr) {
+		writeFileSync(path, original);
+		return err(path, [`✗ ${fileErr.message}`]);
+	}
+	return {
+		ok: true,
+		file: path,
+		created: false,
+		lines: [`✓ updated '${clean.action}'`]
+	};
+}
 //#endregion
 //#region src/commands.ts
 function runPath(env = process.env) {
@@ -390,7 +459,7 @@ function Field({ label, value, focused }) {
 		}) : null
 	] });
 }
-function FormFields({ draft, apps, appIndex, focused, existingTags }) {
+function FormFields({ draft, apps, appIndex, focused, existingTags, lockedApp }) {
 	const appChoices = [...apps, "Create new app…"];
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
@@ -398,7 +467,10 @@ function FormFields({ draft, apps, appIndex, focused, existingTags }) {
 			/* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, {
 				color: focused === 0 ? "cyan" : "gray",
 				children: "App".padEnd(8)
-			}), draft.creatingApp ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Text, { children: draft.newApp }), focused === 0 ? /* @__PURE__ */ jsx(Text, {
+			}), lockedApp ? /* @__PURE__ */ jsx(Text, {
+				color: "gray",
+				children: `${lockedApp}  (locked)`
+			}) : draft.creatingApp ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Text, { children: draft.newApp }), focused === 0 ? /* @__PURE__ */ jsx(Text, {
 				inverse: true,
 				children: " "
 			}) : null] }) : /* @__PURE__ */ jsxs(Text, { children: [appChoices[appIndex] ?? "—", focused === 0 ? "  (↑/↓)" : ""] })] }),
@@ -617,10 +689,25 @@ function draftToEntryInput(d) {
 	if (d.notes.trim()) e.notes = d.notes.trim();
 	return e;
 }
-function useAddForm(initialApp = "") {
+/** Inverse of draftToEntryInput: seed a Draft from an existing entry for editing. */
+function entryToDraft(app, e) {
+	const type = e.keys ? "shortcut" : e.command ? "command" : "recipe";
+	return {
+		...emptyDraft,
+		app,
+		type,
+		action: e.action,
+		keys: e.keys ?? "",
+		command: e.command ?? "",
+		steps: e.steps ? [...e.steps] : [],
+		tags: (e.tags ?? []).join(", "),
+		notes: e.notes ?? ""
+	};
+}
+function useAddForm(initial = {}) {
 	const [draft, setDraft] = useState(() => ({
 		...emptyDraft,
-		app: initialApp
+		...initial
 	}));
 	const update = (patch) => setDraft((d) => ({
 		...d,
@@ -640,9 +727,9 @@ const TYPES = [
 	"recipe"
 ];
 const LAST_FIELD = 5;
-function AddEntryForm({ apps, existingTags, onSubmit, onComplete, onCancel, resolveTarget }) {
-	const { draft, update, setDraft } = useAddForm(apps[0] ?? "");
-	const [focused, setFocused] = useState(0);
+function AddEntryForm({ apps, existingTags, onSubmit, onComplete, onCancel, resolveTarget, initial, lockedApp, title }) {
+	const { draft, update, setDraft } = useAddForm(initial ?? { app: apps[0] ?? "" });
+	const [focused, setFocused] = useState(lockedApp ? 1 : 0);
 	const [appIndex, setAppIndex] = useState(0);
 	const [screen, setScreen] = useState("form");
 	const [hint, setHint] = useState("");
@@ -682,7 +769,7 @@ function AddEntryForm({ apps, existingTags, onSubmit, onComplete, onCancel, reso
 		}
 		if (key.escape) return onCancel();
 		if (key.ctrl && input === "n") return setFocused((f) => Math.min(f + 1, LAST_FIELD));
-		if (key.ctrl && input === "p") return setFocused((f) => Math.max(f - 1, 0));
+		if (key.ctrl && input === "p") return setFocused((f) => Math.max(f - 1, lockedApp ? 1 : 0));
 		if (focused === 0) {
 			if (key.upArrow) {
 				const next = Math.max(appIndex - 1, 0);
@@ -742,7 +829,7 @@ function AddEntryForm({ apps, existingTags, onSubmit, onComplete, onCancel, reso
 		children: [
 			/* @__PURE__ */ jsx(Text, {
 				color: "cyan",
-				children: "keybook add"
+				children: title ?? "keybook add"
 			}),
 			/* @__PURE__ */ jsx(Box, {
 				marginTop: 1,
@@ -751,7 +838,8 @@ function AddEntryForm({ apps, existingTags, onSubmit, onComplete, onCancel, reso
 					apps,
 					appIndex,
 					focused,
-					existingTags
+					existingTags,
+					lockedApp
 				})
 			}),
 			/* @__PURE__ */ jsx(Box, {
@@ -796,7 +884,20 @@ function search(entries, query) {
 }
 //#endregion
 //#region src/tui/Footer.tsx
-function Footer({ flash, errorCount, resultCount }) {
+function Footer({ flash, errorCount, resultCount, confirm }) {
+	if (confirm) return /* @__PURE__ */ jsxs(Box, {
+		marginTop: 1,
+		justifyContent: "space-between",
+		children: [/* @__PURE__ */ jsx(Text, {
+			color: "yellow",
+			wrap: "truncate-end",
+			children: confirm
+		}), /* @__PURE__ */ jsx(Text, {
+			color: "yellow",
+			bold: true,
+			children: "  y / n"
+		})]
+	});
 	return /* @__PURE__ */ jsxs(Box, {
 		marginTop: 1,
 		justifyContent: "space-between",
@@ -804,7 +905,7 @@ function Footer({ flash, errorCount, resultCount }) {
 			color: "gray",
 			wrap: "truncate-end",
 			children: [
-				"↑↓ move ⏎ copy ⌃O add ⎋ quit ⌥⌫/⌃W del ⌃U clear (",
+				"↑↓ move ⏎ copy ⌃O add ⌃E edit ⌃X del ⎋ quit ⌃U clear (",
 				resultCount,
 				")"
 			]
@@ -972,6 +1073,8 @@ function App({ entries: initial, errorCount = 0, dataDir, onCopy = copyToClipboa
 	const { stdout } = useStdout();
 	const [entries, setEntries] = useState(initial);
 	const [mode, setMode] = useState("search");
+	const [editTarget, setEditTarget] = useState(null);
+	const [pendingDelete, setPendingDelete] = useState(null);
 	const [query, setQuery] = useState("");
 	const [selected, setSelected] = useState(0);
 	const [flash, setFlash] = useState("");
@@ -984,8 +1087,24 @@ function App({ entries: initial, errorCount = 0, dataDir, onCopy = copyToClipboa
 	const listHeight = visibleListHeight(stdout?.rows);
 	const { left, right } = columnWidths(stdout?.columns);
 	useInput((input, key) => {
+		if (key.ctrl && input === "c") {
+			exit();
+			return;
+		}
+		if (pendingDelete) {
+			if ((key.return || input === "y" || input === "Y") && dataDir) {
+				const r = deleteEntry(dataDir, pendingDelete.file, pendingDelete.index, pendingDelete.action.trim());
+				if (r.ok) {
+					reload();
+					setSelected(0);
+				}
+				setFlash(r.lines[0] ?? (r.ok ? "✗ deleted" : "✗ delete failed"));
+			} else setFlash("");
+			setPendingDelete(null);
+			return;
+		}
 		if (!key.return && flash) setFlash("");
-		if (key.escape || key.ctrl && input === "c") {
+		if (key.escape) {
 			exit();
 			return;
 		}
@@ -993,6 +1112,15 @@ function App({ entries: initial, errorCount = 0, dataDir, onCopy = copyToClipboa
 			setMode("add");
 			return;
 		}
+		if (dataDir && current && key.ctrl && input === "e") {
+			setEditTarget(current);
+			setMode("edit");
+			return;
+		}
+		if (dataDir && current && key.ctrl && input === "x") {
+			setPendingDelete(current);
+			return;
+		}
 		if (key.downArrow || key.ctrl && input === "n") {
 			setSelected((s) => Math.min(s + 1, results.length - 1));
 			return;
@@ -1025,24 +1153,47 @@ function App({ entries: initial, errorCount = 0, dataDir, onCopy = copyToClipboa
 			setSelected(0);
 		}
 	}, { isActive: mode === "search" });
-	if (mode === "add" && dataDir) {
-		const existingTags = [...new Set(entries.flatMap((e) => e.tags ?? []))].sort();
-		return /* @__PURE__ */ jsx(AddEntryForm, {
-			apps: listApps(dataDir),
-			existingTags,
-			resolveTarget: (a) => resolveTargetFile(dataDir, a),
-			onSubmit: (app, entry) => addEntry(dataDir, app, entry),
-			onComplete: (result) => {
-				if (result.ok) {
-					reload();
-					setSelected(0);
-					setFlash(result.lines[0] ?? "✓ added");
-				}
-				setMode("search");
-			},
-			onCancel: () => setMode("search")
-		});
-	}
+	const existingTags = [...new Set(entries.flatMap((e) => e.tags ?? []))].sort();
+	if (mode === "add" && dataDir) return /* @__PURE__ */ jsx(AddEntryForm, {
+		apps: listApps(dataDir),
+		existingTags,
+		resolveTarget: (a) => resolveTargetFile(dataDir, a),
+		onSubmit: (app, entry) => addEntry(dataDir, app, entry),
+		onComplete: (result) => {
+			if (result.ok) {
+				reload();
+				setSelected(0);
+				setFlash(result.lines[0] ?? "✓ added");
+			}
+			setMode("search");
+		},
+		onCancel: () => setMode("search")
+	});
+	if (mode === "edit" && dataDir && editTarget) return /* @__PURE__ */ jsx(AddEntryForm, {
+		apps: listApps(dataDir),
+		existingTags,
+		lockedApp: editTarget.app,
+		initial: entryToDraft(editTarget.app, editTarget),
+		title: `Edit entry — ${editTarget.app}`,
+		resolveTarget: () => ({
+			file: editTarget.file,
+			created: false
+		}),
+		onSubmit: (_app, entry) => editEntry(dataDir, editTarget.file, editTarget.index, entry, editTarget.action),
+		onComplete: (result) => {
+			if (result.ok) {
+				reload();
+				setSelected(0);
+				setFlash(result.lines[0] ?? "✓ updated");
+			}
+			setMode("search");
+			setEditTarget(null);
+		},
+		onCancel: () => {
+			setMode("search");
+			setEditTarget(null);
+		}
+	});
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		children: [
@@ -1060,7 +1211,8 @@ function App({ entries: initial, errorCount = 0, dataDir, onCopy = copyToClipboa
 			/* @__PURE__ */ jsx(Footer, {
 				flash,
 				errorCount,
-				resultCount: results.length
+				resultCount: results.length,
+				confirm: pendingDelete ? `Delete '${pendingDelete.app}: ${pendingDelete.action}'?` : void 0
 			})
 		]
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arthony/keybook",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "publishConfig": {
     "access": "public"
   },

package/seed/git.yaml

@@ -0,0 +1,272 @@
+# Curated git CLI essentials — branches, commits, history rewriting, recovery.
+# Almost every entry has a `command` (Enter copies it to the clipboard); recipes
+# use `steps` and place the canonical command in `command` so paste-and-tweak
+# still works.
+app: Git
+entries:
+  # ---- Branches ----
+  - action: Create and switch to a new branch
+    command: git switch -c <name>
+    notes: Legacy synonym is `git checkout -b <name>`.
+    tags: [branch, create, checkout, new]
+
+  - action: Switch to an existing branch
+    command: git switch <name>
+    notes: Legacy synonym is `git checkout <name>`.
+    tags: [branch, checkout, switch]
+
+  - action: Delete a local branch
+    command: git branch -d <name>
+    notes: Use -D (capital) to force-delete a branch with unmerged commits.
+    tags: [branch, delete, remove]
+
+  - action: Delete a remote branch
+    command: git push origin --delete <name>
+    tags: [branch, delete, remote, push]
+
+  - action: Rename the current branch
+    command: git branch -m <new-name>
+    tags: [branch, rename, move]
+
+  # ---- Commits & undo ----
+  - action: Amend the last commit (edit message and/or fold in staged changes)
+    command: git commit --amend
+    notes: Rewrites the most recent commit. Force-push needed if already pushed.
+    tags: [amend, commit, edit, message]
+
+  - action: Amend the last commit without changing its message
+    command: git commit --amend --no-edit
+    notes: Quietly folds new staged changes into the most recent commit.
+    tags: [amend, fixup, no-edit, commit]
+
+  - action: Unstage a file but keep the working-copy change
+    command: git restore --staged <file>
+    notes: Legacy synonym is `git reset HEAD <file>`.
+    tags: [unstage, reset, restore]
+
+  - action: Discard local changes to a file (destructive)
+    command: git restore <file>
+    notes: The file's uncommitted edits are gone. Legacy `git checkout -- <file>`.
+    tags: [discard, undo, restore, dangerous]
+
+  - action: Undo the last commit but keep its changes staged
+    command: git reset --soft HEAD~1
+    tags: [undo, reset, soft, uncommit]
+
+  - action: Hard-reset to a specific commit (destructive)
+    command: git reset --hard <ref>
+    notes: >-
+      Wipes working tree AND index. If you regret it, find the pre-reset HEAD in
+      `git reflog` and `git reset --hard <sha>` to recover (within 90 days).
+    tags: [reset, hard, dangerous, undo]
+
+  - action: Set the per-repo author email (useful for work/personal split)
+    command: git config user.email "<address>"
+    notes: Drop --global to scope to the current repo only. Pair with `git config user.name`.
+    tags: [config, email, identity, author]
+
+  # ---- Stash ----
+  - action: Stash all changes including untracked files
+    command: git stash -u
+    notes: -u (--include-untracked) saves new files too; without it, untracked stays put.
+    tags: [stash, save, wip, untracked]
+
+  - action: Stash with a message
+    command: git stash push -m "<message>"
+    tags: [stash, message, save]
+
+  - action: List all stashes
+    command: git stash list
+    tags: [stash, list]
+
+  - action: Apply and drop the most recent stash
+    command: git stash pop
+    notes: Use `git stash apply` to keep the stash on the list after applying.
+    tags: [stash, pop, apply, restore]
+
+  # ---- Log & inspect ----
+  - action: Pretty one-line log with a branch graph
+    command: git log --oneline --graph --all --decorate
+    notes: Add `--first-parent` to flatten merge-heavy branches.
+    tags: [log, history, graph, decorate]
+
+  - action: Show what changed in the last commit
+    command: git show
+    notes: Append a sha or ref (e.g. `git show HEAD~2`) to inspect any commit.
+    tags: [show, diff, last, commit]
+
+  - action: Diff staged vs unstaged changes
+    steps:
+      - "`git diff` shows unstaged changes (working tree vs index)"
+      - "`git diff --staged` shows staged changes (index vs HEAD); --cached is the same"
+    notes: Add `-- <path>` to either to scope to a file.
+    tags: [diff, staged, cached, unstaged]
+
+  - action: Blame a file showing commit and author per line
+    command: git blame <file>
+    notes: Add `-L 10,20` to limit to a line range; `-w` ignores whitespace-only changes.
+    tags: [blame, who, author, line]
+
+  - action: Find which commit introduced a string (pickaxe search)
+    command: git log -S "<text>" --source --all
+    notes: -S finds commits that change the literal-string count; use -G for a regex.
+    tags: [search, pickaxe, history, find, who]
+
+  # ---- Remote ----
+  - action: Force-push safely (refuses to overwrite remote work you haven't seen)
+    command: git push --force-with-lease
+    notes: >-
+      Prefer this over plain --force. It errors if the remote moved since your
+      last fetch, preventing accidental overwrites of teammates' commits.
+    tags: [push, force, force-with-lease, safe]
+
+  - action: Fetch all remotes and prune deleted upstream branches
+    command: git fetch --all --prune
+    tags: [fetch, prune, cleanup, remote]
+
+  - action: Pull with rebase (replay your local commits on top of upstream)
+    command: git pull --rebase
+    notes: Set `git config --global pull.rebase true` to make this the default.
+    tags: [pull, rebase, update]
+
+  - action: Push the current branch and set its upstream
+    command: git push -u origin HEAD
+    notes: After this, plain `git push` / `git pull` work without arguments on this branch.
+    tags: [push, upstream, set-upstream]
+
+  # ---- Rebase, merge, conflicts ----
+  - action: Interactive rebase the last N commits
+    command: git rebase -i HEAD~<N>
+    notes: >-
+      In the editor: change `pick` to `reword` (edit message), `squash` (fold into
+      previous, keep both messages), `fixup` (squash and drop message), `drop`
+      (remove the commit), or reorder lines. Resume with `git rebase --continue`.
+    tags: [rebase, interactive, squash, reword, fixup]
+
+  - action: Resolve a merge conflict
+    command: git merge --continue
+    steps:
+      - "`git status` lists the conflicting files (marked \"both modified\")"
+      - Open each file; replace the `<<<<<<<` / `=======` / `>>>>>>>` blocks with the desired content
+      - "`git add <files>` to mark each resolved file"
+      - "`git commit` (or `git merge --continue`) to finish the merge"
+    notes: >-
+      Bail out with `git merge --abort` (restores pre-merge state). During a
+      rebase, use `git rebase --continue` / `--abort` instead.
+    tags: [merge, conflict, resolve, fix]
+
+  - action: Take "ours" or "theirs" wholesale during a conflict
+    steps:
+      - "`git checkout --ours <file>` keeps the version from your current branch"
+      - "`git checkout --theirs <file>` takes the version from the other branch"
+      - "`git add <file>` then `git commit` (or `--continue`)"
+    notes: >-
+      During a rebase, ours/theirs are FLIPPED — rebase replays your commits onto
+      theirs, so "ours" refers to the branch you're rebasing onto.
+    tags: [conflict, ours, theirs, merge, rebase]
+
+  - action: Abort a merge in progress
+    command: git merge --abort
+    notes: Use `git rebase --abort` if you're mid-rebase instead.
+    tags: [merge, abort, cancel]
+
+  - action: Cherry-pick a commit onto the current branch
+    command: git cherry-pick <sha>
+    notes: Use a range like `<a>^..<b>` to pick a series in order.
+    tags: [cherry-pick, copy, apply]
+
+  - action: Safely undo a commit by adding an inverse commit
+    command: git revert <sha>
+    notes: Non-destructive — creates a new commit that undoes the target. Safe on shared branches.
+    tags: [revert, undo, safe, inverse]
+
+  # ---- History rewriting ----
+  - action: Remove a co-author trailer from every commit (cleanup after Claude etc.)
+    command: |
+      git filter-repo --message-callback '
+        import re
+        return re.sub(rb"^Co-authored-by:.*\n?", b"", message, flags=re.MULTILINE)
+      '
+    steps:
+      - "Install once: `brew install git-filter-repo`"
+      - Ensure the working tree is clean (no staged or unstaged changes)
+      - Run the filter-repo command (Enter copies it from the preview)
+      - "Re-add the remote (filter-repo strips it for safety): `git remote add origin <url>`"
+      - "Force-push: `git push --force-with-lease --all && git push --force-with-lease --tags`"
+    notes: >-
+      Destructive — every commit SHA changes. Coordinate with anyone who has
+      cloned the repo so they re-clone or hard-reset their local copy.
+    tags: [filter-repo, rewrite, co-author, cleanup, claude, history]
+
+  - action: Squash the last N commits into one
+    command: git rebase -i HEAD~<N>
+    steps:
+      - "`git rebase -i HEAD~<N>`"
+      - In the editor, change `pick` to `squash` on every line EXCEPT the first
+      - Save and quit; the next editor lets you craft the combined commit message
+    notes: Use `fixup` instead of `squash` to keep only the first commit's message.
+    tags: [squash, rebase, combine, history]
+
+  - action: Edit the message of an old commit
+    steps:
+      - "`git rebase -i HEAD~<N>` where N is far enough back to include the target"
+      - "Change `pick` to `reword` on the target line; save and quit"
+      - Edit the message in the next editor; save and quit
+      - "`git rebase --continue` if anything else needs attention"
+    command: git rebase -i HEAD~<N>
+    notes: SHAs from that commit onward change; force-push needed if already pushed.
+    tags: [rebase, reword, message, history]
+
+  - action: Drop a commit from history
+    steps:
+      - "`git rebase -i HEAD~<N>`"
+      - Delete the line (or change `pick` to `drop`) for the commit to remove
+      - Save and quit; resolve any conflicts with `--continue`
+    command: git rebase -i HEAD~<N>
+    notes: Prefer `git revert <sha>` if the commit is already shared with others.
+    tags: [rebase, drop, remove, history]
+
+  # ---- Recovery & tags ----
+  - action: View the reflog to find lost commits
+    command: git reflog
+    notes: >-
+      Every HEAD-changing operation leaves an entry. Recover with `git reset
+      --hard <sha>` or `git checkout <sha>`. Entries expire after 90 days by default.
+    tags: [reflog, recover, lost, history, undo]
+
+  - action: Recover after a bad reset or rebase
+    steps:
+      - "`git reflog` to find the entry just BEFORE the bad operation"
+      - "Note the sha or HEAD@{N} reference"
+      - "`git reset --hard HEAD@{N}` (or `git reset --hard <sha>`)"
+    command: git reflog
+    notes: Reflog entries expire after 90 days by default — act soon.
+    tags: [reflog, recover, undo, mistake, rescue]
+
+  - action: Find the commit that broke things (git bisect)
+    steps:
+      - "`git bisect start`"
+      - "`git bisect bad` to mark HEAD as bad"
+      - "`git bisect good <ref>` to mark a known-good past commit or tag"
+      - Test at each step; mark with `git bisect good` or `git bisect bad`
+      - "`git bisect reset` to return to where you started"
+    command: git bisect start
+    notes: Automate with `git bisect run <script>` for hands-off bisection.
+    tags: [bisect, regression, find, debug, broke]
+
+  - action: Create an annotated tag
+    command: git tag -a v<version> -m "<message>"
+    notes: Annotated tags carry author + date + message; prefer them over lightweight `git tag <name>`.
+    tags: [tag, release, annotated, version]
+
+  - action: Push a specific tag to the remote
+    command: git push origin v<version>
+    notes: Use `git push --tags` to push all local tags at once.
+    tags: [tag, push, release, remote]
+
+  - action: Delete a tag locally and on the remote
+    steps:
+      - "`git tag -d v<version>` removes it locally"
+      - "`git push origin --delete v<version>` removes it from the remote"
+    command: git push origin --delete v<version>
+    tags: [tag, delete, remove, remote]

package/seed/vim.yaml

@@ -64,3 +64,115 @@ entries:
   - action: Indent / outdent the line or selection
     keys: ">>, <<"
     tags: [indent]
+  - action: Move to end of word / end of WORD
+    keys: "e, E"
+    notes: e treats punctuation as a word boundary; E spans punctuation (whitespace-separated WORD).
+    tags: [word, motion, end]
+  - action: Move forward / back by WORD (whitespace-separated)
+    keys: "W, B"
+    notes: Capital variants of w / b — jump past punctuation in one step.
+    tags: [word, motion, big]
+  - action: Find a character on the current line
+    keys: "f, F, t, T"
+    notes: >-
+      After pressing, type the target character. f / F land ON it (forward / back);
+      t / T land just before it. ; repeats the same find, , reverses direction.
+      Searches like "fa" (find 'a') are great when paired with d / c (e.g. dt, deletes to before next ',').
+    tags: [find, char, line, motion, tip]
+  - action: Search forward / back for the word under the cursor
+    keys: "*, #"
+    notes: Use n / N afterwards to step through matches. Great for tracing usages.
+    tags: [search, word, find, navigate, tip]
+  - action: Jump to top / middle / bottom of the screen
+    keys: "H, M, L"
+    notes: Cursor only — doesn't scroll the viewport. Combine with zz to recenter after.
+    tags: [screen, viewport, motion]
+  - action: Scroll half / full page down / up
+    keys: "⌃D, ⌃U, ⌃F, ⌃B"
+    notes: Half-page (⌃D / ⌃U) is usually less jarring than full-page (⌃F / ⌃B).
+    tags: [scroll, page, motion]
+  - action: Recenter / top / bottom the current line in the viewport
+    keys: "zz, zt, zb"
+    notes: zz centers the current line, zt puts it at the top of the window, zb at the bottom.
+    tags: [scroll, center, recenter, viewport]
+  - action: Jump back / forward in the cursor history
+    keys: "⌃O, ⌃I"
+    notes: >-
+      Vim records every jump >1 line. ⌃O retraces backwards through your trail, ⌃I goes forward.
+      Indispensable for diving into code and bouncing back where you were.
+    tags: [jump, history, navigate, tip, productivity]
+  - action: Jump to local declaration / global definition under cursor
+    keys: "gd, gD"
+    notes: gd searches the current function/scope for the identifier under the cursor; gD searches the whole file.
+    tags: [definition, declaration, goto, tip]
+  - action: Open a new line below / above the current
+    keys: "o, O"
+    notes: Both enter Insert mode immediately on the new line.
+    tags: [insert, new line, edit]
+  - action: Insert at start / append at end of line
+    keys: "I, A"
+    notes: I jumps to the first non-blank character and enters Insert; A appends after the last character.
+    tags: [insert, append, line, edit]
+  - action: Change / delete to end of line
+    keys: "C, D"
+    notes: C is shorthand for c$ (change to end of line); D is d$ (delete to end). Quick rewrites.
+    tags: [change, delete, line, edit]
+  - action: Replace a single character / enter Replace mode
+    keys: "r, R"
+    notes: After r, type the replacement char (one key, doesn't enter Insert). R overwrites characters as you type until ⎋.
+    tags: [replace, overwrite, edit]
+  - action: Join the next line onto the current one
+    keys: "J"
+    notes: Adds a space between them. gJ joins without inserting a space.
+    tags: [join, line, edit]
+  - action: Toggle case of character / inner word
+    keys: "~, g~iw"
+    notes: ~ flips one char's case; g~iw flips the word under the cursor. gu / gU make a motion lower / upper-case.
+    tags: [case, toggle, edit]
+  - action: Split the window horizontally / vertically
+    keys: ":split⏎, :vsplit⏎"
+    notes: Short forms :sp and :vsp. After splitting, :e <file> opens a file in the focused split.
+    tags: [split, window, layout]
+  - action: Move focus between splits
+    keys: "⌃Wh, ⌃Wj, ⌃Wk, ⌃Wl"
+    notes: ⌃W followed by an hjkl direction. ⌃W⌃W cycles forward through splits.
+    tags: [split, window, navigate]
+  - action: List and switch buffers
+    keys: ":ls⏎, :b <n>⏎, :bn, :bp"
+    notes: :ls lists all open buffers with their numbers. :bn / :bp cycle next / previous.
+    tags: [buffer, switch, list, tip]
+  - action: Close the current buffer (keep the split layout)
+    keys: ":bd⏎"
+    notes: Drops the buffer but keeps the window. Add ! to discard unsaved changes.
+    tags: [buffer, close]
+  - action: Set a mark / jump back to it
+    keys: "m, ', `"
+    notes: >-
+      m{letter} sets a mark at the cursor; '{letter} jumps to its line, `{letter} (backtick) to the exact column.
+      Lowercase marks a–z are file-local; capital A–Z are global across files.
+    tags: [mark, jump, bookmark, "ma", "'a", tip]
+  - action: Record / play back a macro
+    keys: "q...q, @, @@"
+    notes: >-
+      q{letter} starts recording into a register; q stops. @{letter} replays. @@ re-runs the last macro.
+      Workflow — record one edit on the first item, then @a (or whatever register) on each subsequent occurrence.
+    tags: [macro, record, replay, automation, tip, productivity]
+  - action: Repeat the last ex (:) command
+    keys: "@:"
+    notes: "After running any :command once, @: replays it; @@ then keeps replaying."
+    tags: [repeat, command, tip]
+  - action: Toggle relative / absolute line numbers
+    keys: ":set rnu⏎, :set nornu⏎, :set nu⏎"
+    notes: >-
+      Relative numbers (rnu) show each line's distance from the cursor — "5j" or "12dd" become trivial to count.
+      Combine `set nu` + `set rnu` for a hybrid view. Put both in your vimrc to make it permanent.
+    tags: [option, line numbers, relative, productivity, tip]
+  - action: Insert the same text on every line of a column selection
+    steps:
+      - "⌃V to enter Visual-Block mode"
+      - Use j / k to extend the block over the lines you want
+      - Press I (capital) to insert at the LEFT edge of the block
+      - Type the text you want repeated on every line
+      - "Press ⎋ — wait a moment — the text duplicates onto every selected line"
+    notes: A (capital) does the same at the RIGHT edge. Game-changer for adding comment markers, trailing commas, or any column prefix/suffix.
+    tags: [visual block, multi line, insert, comment, prefix, tip, productivity]