moshcode 0.37.0 → 0.39.0

package/README.md

@@ -219,6 +219,13 @@ content pane", and the real attach would be a tmux client inside a tmux client.
 Output grows the bar over the content for as long as you are reading it, then it
 collapses back to one row.
 
+**`moshcode attach <name>` gets the bar too.** A session you attach to directly
+grows the same one-line prompt along the bottom for as long as you are there,
+and it is taken away again when you detach — so a member is a plain member when
+nobody is looking at it. `show <name>` from that bar switches you to another
+member (and gives that one a bar before you land in it). The bar is the bottom
+row either way, which is why one key finds it in both places.
+
 The right-hand pane is not a picture of a session — it *is* the session's pane,
 moved in. tmux's model is session → window → pane, so moving between *windows*
 cannot keep anything on screen; but `join-pane` moves a running pane into an
@@ -536,6 +543,24 @@ an equity's score, and each response ships the `caveats` that say so. Prices are
 Alpaca's US venue alone and can differ materially from other exchanges. Research
 aid, not advice — and like `stocks`, nothing under `crypto` can place an order.
 
+### Aliases (`/alias`)
+
+The pit is a prompt you sit at all day, so it lets you name the lines you keep
+retyping. An alias runs in `$SHELL` unless it starts with `/`, in which case it
+is a pit command:
+
+```text
+/alias set gs "git status"        # then /gs — and /gs -sb appends to it
+/alias set cx "/agents codex"     # a pit command, not a shell one
+/alias                            # what is defined
+/alias rm gs
+```
+
+They live in `~/.moshcode/aliases.json` (owner-only, like the history file) and
+survive between sessions. A name that is already a pit command, an engine, or a
+tool is refused rather than shadowed — built-ins are dispatched first, so such
+an alias would never run.
+
 ### Social posting from the pit
 
 The pit can hand a prepared post to Bluesky or Nostr without storing either

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moshcode",
-  "version": "0.37.0",
+  "version": "0.39.0",
   "type": "module",
   "description": "moshcode — a metal wrapper for coding engines and native UGig/CoinPay workflow CLIs, with OpenPRD and moshscript",
   "repository": {

package/src/aliases.mjs

@@ -0,0 +1,160 @@
+// Named shortcuts for whatever you type at the mosh prompt.
+//
+// The pit is a prompt people sit at all day, and the things they retype are
+// their own: `git status`, `pnpm -r test`, `/agents claude --resume`. Shell
+// aliases can't help — the pit is not a shell, and `!git status` is exactly the
+// keystrokes an alias is supposed to save. So the pit keeps its own.
+//
+// An alias is a name and a line. The line is a shell command unless it starts
+// with `/`, in which case it is a pit command:
+//
+//   /alias set gs "git status"       → /gs   runs `$SHELL -c "git status"`
+//   /alias set cc "/agents claude"   → /cc   opens claude autonomously
+//
+// Shell-by-default because that is what the prompt is mostly asked for, and the
+// leading slash is already how the pit spells its own verbs — so the rule reads
+// the same way the rest of the pit does rather than being a new convention.
+//
+// Anything the pit can dispatch is fair game as a value, which is what keeps
+// this from needing to grow a type: a bookmarklet or a URL becomes an alias the
+// day the pit gets a verb that opens one, with no change here.
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+
+/** Owner-only, and for the same reason ~/.moshcode_history is: values are
+ * whatever was typed, and people alias commands that carry tokens. */
+const FILE_MODE = 0o600;
+
+const NAME_RE = /^[a-z0-9][a-z0-9._-]{0,63}$/;
+
+/** A value long enough to be a pasted mistake rather than a command. */
+const MAX_VALUE = 4096;
+
+/**
+ * How many times one line may expand before the pit gives up.
+ *
+ * Aliases can name aliases (`/alias set st "/gs --short"`), which is useful and
+ * also the one way to write a loop: two aliases naming each other would spin
+ * the dispatch loop forever. Ten is far past any chain a person builds on
+ * purpose.
+ */
+export const MAX_EXPANSIONS = 10;
+
+/** Where the aliases live. Derived per call so tests can move $HOME. */
+export function aliasFile() {
+  return path.join(os.homedir(), ".moshcode", "aliases.json");
+}
+
+/**
+ * Every alias, as a plain name → line map.
+ *
+ * A file that is missing, unreadable, or not the shape we wrote reads as "no
+ * aliases" rather than throwing: this is called on the dispatch path for every
+ * unrecognised command, and a hand-edited file with a stray comma must not take
+ * the prompt down with it. Entries whose value is not a string are dropped for
+ * the same reason.
+ */
+export function loadAliases() {
+  let raw;
+  try { raw = fs.readFileSync(aliasFile(), "utf8"); }
+  catch { return {}; }
+  let parsed;
+  try { parsed = JSON.parse(raw); }
+  catch { return {}; }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
+  const out = {};
+  for (const [name, value] of Object.entries(parsed)) {
+    if (typeof value === "string" && value.trim()) out[name.toLowerCase()] = value;
+  }
+  return out;
+}
+
+/** Write the map back, creating ~/.moshcode if this is the first alias. */
+function saveAliases(aliases) {
+  const file = aliasFile();
+  fs.mkdirSync(path.dirname(file), { recursive: true, mode: 0o700 });
+  // Sorted so the file reads like a list rather than like insertion order, and
+  // so hand edits produce a small diff.
+  const ordered = Object.fromEntries(Object.keys(aliases).sort().map((k) => [k, aliases[k]]));
+  fs.writeFileSync(file, `${JSON.stringify(ordered, null, 2)}\n`, { mode: FILE_MODE });
+  // `mode` only applies at creation, so an existing file keeps whatever the
+  // umask gave it. Tighten every write, the way the history file does.
+  try { fs.chmodSync(file, FILE_MODE); } catch { /* best effort */ }
+}
+
+/** The name as it is stored, or "" for anything that cannot be one. */
+export function normalizeName(name) {
+  const clean = String(name ?? "").trim().toLowerCase().replace(/^\//, "");
+  return NAME_RE.test(clean) ? clean : "";
+}
+
+/** One alias's line, or null. */
+export function getAlias(name) {
+  const key = normalizeName(name);
+  if (!key) return null;
+  const aliases = loadAliases();
+  return Object.hasOwn(aliases, key) ? aliases[key] : null;
+}
+
+/**
+ * Define an alias. Returns { ok, error, name, value, previous }.
+ *
+ * `isReserved` asks the pit whether a name is already its own — a command, an
+ * engine, a tool. A predicate rather than a list because the dispatcher decides
+ * that by resolving, aliases included, and a list copied out of the rosters
+ * here would be a second answer that drifts from the first. A colliding name is
+ * refused rather than shadowed: built-ins are checked first, so an alias named
+ * `agents` would be silently dead, and a shortcut that does nothing is worse
+ * than one that was never accepted.
+ */
+export function setAlias(name, value, { isReserved = () => false } = {}) {
+  const key = normalizeName(name);
+  if (!key) {
+    return { ok: false, error: `"${name}" isn't a usable alias name — letters, digits, . _ - and it must start with a letter or digit` };
+  }
+  if (isReserved(key)) {
+    return { ok: false, error: `/${key} is already a pit command, engine, or tool — pick another name` };
+  }
+  const line = String(value ?? "").trim();
+  if (!line) return { ok: false, error: "an alias needs something to run" };
+  if (line.includes("\n")) return { ok: false, error: "an alias is a single line" };
+  if (line.length > MAX_VALUE) return { ok: false, error: `that value is ${line.length} characters — the cap is ${MAX_VALUE}` };
+
+  const aliases = loadAliases();
+  const previous = Object.hasOwn(aliases, key) ? aliases[key] : null;
+  aliases[key] = line;
+  try { saveAliases(aliases); }
+  catch (e) { return { ok: false, error: `can't write ${aliasFile()}: ${e.message}` }; }
+  return { ok: true, name: key, value: line, previous };
+}
+
+/** Forget one. Returns { ok, error, name, value }. */
+export function removeAlias(name) {
+  const key = normalizeName(name);
+  const aliases = loadAliases();
+  if (!key || !Object.hasOwn(aliases, key)) {
+    return { ok: false, error: `no alias named "${String(name ?? "").replace(/^\//, "")}"` };
+  }
+  const value = aliases[key];
+  delete aliases[key];
+  try { saveAliases(aliases); }
+  catch (e) { return { ok: false, error: `can't write ${aliasFile()}: ${e.message}` }; }
+  return { ok: true, name: key, value };
+}
+
+/**
+ * The line an alias becomes, with anything else the user typed appended.
+ *
+ * Appended rather than substituted, the way a shell alias behaves: `/gs -sb` is
+ * `git status -sb`. `args` is the raw remainder of the typed line, not the
+ * tokenized parts, so the user's own quoting survives into `$SHELL -c`.
+ *
+ * The `!` is what routes a bare value to the shell — the pit already reads a
+ * leading `!` as "run this in $SHELL", so an alias does not need a second path
+ * through it.
+ */
+export function expandAlias(value, args = "") {
+  const line = `${String(value).trim()}${args ? ` ${args}` : ""}`;
+  return /^[/!]/.test(line) ? line : `!${line}`;
+}

package/src/cli-schema.mjs

@@ -115,10 +115,13 @@ export const CORE_CLI_COMMANDS = [
     name: "attach",
     group: "runtime",
     description: "attach this terminal to a herd session",
-    synopsis: [["moshcode attach <name>", "detach again with Ctrl-b d (or Ctrl-] without tmux)"]],
+    synopsis: [["moshcode attach <name>", "F12 for the mosh bar · Ctrl-b d detaches (Ctrl-] without tmux)"]],
     examples: [["moshcode attach api", ""]],
     seeAlso: ["ps", "herd", "kill"],
-    note: "detaching leaves the session running; ending it is `moshcode kill`. "
+    note: "under tmux the session gets a one-line mosh bar along the bottom for as long as you are "
+      + "attached, so the way out is on screen even when the agent has the keyboard: F12 reaches it, "
+      + "Esc goes back, `detach` leaves. it is taken away again when you detach. "
+      + "detaching leaves the session running; ending it is `moshcode kill`. "
       + "the whole herd shares one tmux server, so from inside any session Ctrl-b s picks another, "
       + "Ctrl-b ) and Ctrl-b ( step through them, and Ctrl-b L goes back to the last one — "
       + "no switcher under the no-tmux fallback, where Ctrl-] detaches instead.",
@@ -892,6 +895,24 @@ export const PIT_COMMANDS = [
     description: "show the current dir + git repo/branch/origin" },
   { name: "shell", aliases: ["sh"], args: "[cmd]", pitOnly: true,
     description: "drop into $SHELL (exit → back to the pit); also !cmd" },
+  { name: "alias", aliases: ["aliases"], args: 'set <name> "<cmd>" | list | get | rm', pitOnly: true,
+    description: "name a line you keep retyping; /<name> runs it",
+    synopsis: [
+      ['/alias set <name> "<command>"', "define one (also: /alias <name> \"<command>\")"],
+      ["/alias [list] [--json]", "every alias"],
+      ["/alias get <name>", "what one expands to"],
+      ["/alias rm <name>", "forget one"],
+    ],
+    examples: [
+      ['/alias set gs "git status"', "then /gs — and /gs -sb appends"],
+      // Deliberately not `cc`: that one is already how the pit spells claude,
+      // so the example would print a refusal for anyone who typed it.
+      ['/alias set cx "/agents codex"', "a pit command, not a shell one"],
+      ["/alias rm gs", ""],
+    ],
+    note: "the command runs in $SHELL unless it starts with / — then it is a pit command. "
+      + "Aliases live in ~/.moshcode/aliases.json and cannot shadow a pit command, engine, or tool.",
+  },
   { name: "help", aliases: ["?", "h"], args: "[command]", pitOnly: true,
     description: "this, or one command in detail" },
   { name: "quit", aliases: ["exit", "q"], pitOnly: true,

package/src/help.mjs

@@ -449,8 +449,21 @@ export function renderPitCommand(name) {
     }
   }
   const out = [`/${entry.name} — ${entry.description}`];
-  if (entry.args) out.push("", "usage:", row(`/${entry.name} ${entry.args}`, "", 44));
+  // A pit-only verb may write its own synopsis/examples/note, the same shapes
+  // renderCommand reads. Without them the args string is the whole usage, which
+  // is enough for `/quit` and not enough for anything with sub-verbs.
+  const synopsis = entry.synopsis || (entry.args ? [[`/${entry.name} ${entry.args}`, ""]] : []);
+  if (synopsis.length) {
+    out.push("", "usage:");
+    for (const [line, note] of synopsis) out.push(row(line, note, 44));
+  }
   if (entry.aliases?.length) out.push("", `aliases: ${entry.aliases.map((a) => `/${a}`).join(", ")}`);
+  const examples = entry.examples || [];
+  if (examples.length) {
+    out.push("", "examples:");
+    for (const [line, note] of examples) out.push(row(line, note ? `# ${note}` : "", 44));
+  }
+  if (entry.note) out.push("", wrap(entry.note, 0));
   return out.join("\n");
 }
 

package/src/herd-bar.mjs

@@ -54,6 +54,90 @@ export function paneRoles(target, { runner = spawnSync } = {}) {
   return roles;
 }
 
+/** How a bar pane starts itself. Separated so tests can run a stand-in. */
+export function barCommand(self = process.argv[1]) {
+  return `${process.execPath} ${self} herd bar`;
+}
+
+/** The window a pane lives in, as a target string. */
+export function ownTarget({ runner = spawnSync, me = process.env.TMUX_PANE } = {}) {
+  if (!me) return null;
+  const r = tmux(["display-message", "-p", "-t", me, "#{session_name}:#{window_index}"], { runner });
+  return r.ok ? r.stdout.trim() || null : null;
+}
+
+/**
+ * Put a bar at the bottom of `target`, or find the one already there.
+ *
+ * Idempotent, because both the workspace and every attach want one and neither
+ * should care which of them got there first.
+ */
+export function ensureBar(target, { runner = spawnSync, command = null } = {}) {
+  const existing = paneRoles(target, { runner }).bar;
+  if (existing) return { paneId: existing.paneId, created: false };
+  const made = tmux(
+    ["split-window", "-t", target, "-f", "-v", "-l", String(BAR_HEIGHT), "-P", "-F", "#{pane_id}", command],
+    { runner },
+  );
+  if (!made.ok) return { paneId: null, created: false };
+  const paneId = made.stdout.trim().split("\n")[0];
+  if (!paneId) return { paneId: null, created: false };
+  tmux(["select-pane", "-t", paneId, "-T", BAR_TITLE], { runner });
+  return { paneId, created: true };
+}
+
+/**
+ * Bind the key that reaches the bar.
+ *
+ * `{bottom-right}` rather than a pane id, so one binding serves the workspace
+ * and every attached session — in both, the bar is the bottom row. A pane id
+ * would have pinned the key to whichever bar happened to be built last.
+ *
+ * The root table is what makes it work at all: tmux claims the key before the
+ * pane's application ever sees it, which is the whole point when the pane holds
+ * an agent that has taken the keyboard.
+ */
+export function bindJumpKey({ runner = spawnSync } = {}) {
+  return tmux(["bind-key", "-n", BAR_KEY, "select-pane", "-t", "{bottom-right}"], { runner }).ok;
+}
+
+/** Drop the bar from a window, leaving whatever else is in it alone. */
+export function removeBar(target, { runner = spawnSync } = {}) {
+  const roles = paneRoles(target, { runner });
+  if (!roles.bar || !roles.content) return false;
+  return tmux(["kill-pane", "-t", roles.bar.paneId], { runner }).ok;
+}
+
+/**
+ * Take the bar back out of every session nobody is looking at.
+ *
+ * A bar left behind is not cosmetic: `kill` ends a member by killing its pane,
+ * so a session holding a leftover bar outlives the member it was named for and
+ * keeps showing up on the roster. Detaching cleans up after itself, but a
+ * crashed client cannot, so this also runs on the way in.
+ *
+ * Sessions with a client attached are skipped — someone else is using that bar.
+ */
+export function sweepBars({ runner = spawnSync, except = null } = {}) {
+  const r = tmux(["list-panes", "-a", "-F",
+    "#{session_name}\t#{window_index}\t#{pane_title}\t#{session_attached}"], { runner });
+  if (!r.ok) return 0;
+  const windows = new Map();
+  for (const line of r.stdout.split("\n")) {
+    const [session, window, title, attached] = line.split("\t");
+    if (!session || session === except || attached !== "0") continue;
+    const key = `${session}:${window}`;
+    const seen = windows.get(key) || { bars: 0, others: 0 };
+    if (title === BAR_TITLE) seen.bars += 1; else seen.others += 1;
+    windows.set(key, seen);
+  }
+  let removed = 0;
+  for (const [target, seen] of windows) {
+    if (seen.bars && seen.others && removeBar(target, { runner })) removed += 1;
+  }
+  return removed;
+}
+
 /* --------------------------------------------------------------- line editing */
 
 /**
@@ -118,10 +202,14 @@ export async function herdBar({
   stdin = process.stdin,
   stdout = process.stdout,
   runner = spawnSync,
-  target = "herd:ui",
+  target = null,
   run = null,
 } = {}) {
   const me = process.env.TMUX_PANE;
+  // The bar runs in the workspace AND under a plain attach, so it asks where it
+  // is rather than assuming. Everything below keys off that one answer.
+  const here = target || ownTarget({ runner, me }) || "herd:ui";
+  const inWorkspace = () => !!paneRoles(here, { runner }).sidebar;
   const herdCommand = run || (async (argv, options) => (await import("./herd-cli.mjs")).herdCommand(argv, options));
 
   let line = "";
@@ -146,10 +234,26 @@ export async function herdBar({
   };
   /** Give the keyboard back to whatever is on screen. */
   const toContent = () => {
-    const roles = paneRoles(target, { runner });
+    const roles = paneRoles(here, { runner });
     if (roles.content) tmux(["select-pane", "-t", roles.content.paneId], { runner });
   };
 
+  /**
+   * `show` means two different things and both are right.
+   *
+   * In the workspace it swaps the content pane. Under a plain attach there is
+   * no content pane to swap, so it switches the client to that member — and
+   * gives that member a bar first, or you would arrive somewhere with no way
+   * back out, which is the bug this whole thing exists to fix.
+   */
+  const showElsewhere = async (name) => {
+    const { paneIndex } = await import("./herd.mjs");
+    const found = paneIndex({ runner }).get(name);
+    if (!found) return false;
+    ensureBar(`${found.session}:${found.windowId}`, { runner, command: barCommand() });
+    return tmux(["switch-client", "-t", found.session], { runner }).ok;
+  };
+
   const submit = async () => {
     const typed = line;
     line = "";
@@ -160,8 +264,13 @@ export async function herdBar({
     if (command.kind === "detach") { tmux(["detach-client"], { runner }); return false; }
     if (command.kind === "show") {
       const [name] = command.argv;
-      const { showMember } = await import("./herd-workspace.mjs");
-      const okShown = name && showMember(name, { runner, me });
+      let okShown = false;
+      if (name && inWorkspace()) {
+        const { showMember } = await import("./herd-workspace.mjs");
+        okShown = showMember(name, { runner, me });
+      } else if (name) {
+        okShown = await showElsewhere(name);
+      }
       if (!okShown) { show([ash(`no session named ${JSON.stringify(name || "")} — try ps`)]); return true; }
       collapse(); draw(); toContent();
       return true;
@@ -173,8 +282,24 @@ export async function herdBar({
     return true;
   };
 
+  /**
+   * Keep the bar one row.
+   *
+   * tmux scales panes proportionally when the window resizes, so a bar built
+   * before a client attached came back three rows tall once one did — the pane
+   * was created against an 80x24 window and stretched to fit 100x30. Nothing
+   * outside can predict when that happens, but the bar gets a resize event for
+   * it, so the bar is the thing that fixes it.
+   */
+  const keepThin = () => {
+    if (open) return;
+    tmux(["resize-pane", "-t", me, "-y", String(BAR_HEIGHT)], { runner });
+  };
+
   try { stdin.setRawMode?.(true); } catch { /* not a tty */ }
   stdin.resume();
+  stdout.on?.("resize", () => { keepThin(); draw(); });
+  keepThin();
   draw();
 
   await new Promise((resolve) => {

package/src/herd-cli.mjs

@@ -10,7 +10,7 @@ import path from "node:path";
 
 import {
   attachSession, capture, defaultName, detectSubstrate, forgetSession, HERD_SOCKET,
-  herdDir, killSession, listSessions, readManifest, rememberSession, sendKeys, sendPrompt,
+  herdDir, killSession, listSessions, paneIndex, readManifest, rememberSession, sendKeys, sendPrompt,
   slugifyName, startSession, stopRuntime, substrateNote, validName, NAME_RE,
 } from "./herd.mjs";
 import { clearReport, reportState, STATES, withState } from "./herd-state.mjs";
@@ -328,9 +328,32 @@ export async function herdAttach(argv, { write = console.log } = {}) {
   // this whole feature is someone quitting a session they meant to leave
   // running, and the only defence is telling them the key first.
   const substrate = detectSubstrate();
-  write(info(substrate === "tmux" ? "detach with Ctrl-b d — the session keeps running." : "detach with Ctrl-] — the session keeps running."));
+
+  // Give the session a mosh bar, so the way out is on screen the whole time
+  // rather than in a line that the agent's first repaint scrolls away. Only a
+  // member sitting in its own session: a tiled one shares a window with its
+  // neighbours and would be handing them a footer they did not ask for.
+  const bar = await import("./herd-bar.mjs");
+  let barTarget = null;
+  if (substrate === "tmux") {
+    bar.sweepBars({ runner: undefined, except: "herd" });
+    const found = paneIndex().get(name);
+    if (found && found.session === name) {
+      barTarget = `${found.session}:${found.windowId}`;
+      bar.ensureBar(barTarget, { command: bar.barCommand() });
+      bar.bindJumpKey({});
+    }
+  }
+
+  write(info(substrate === "tmux"
+    ? `detach with Ctrl-b d — the session keeps running.${barTarget ? ` ${bar.BAR_KEY} for the mosh bar.` : ""}`
+    : "detach with Ctrl-] — the session keeps running."));
 
   const result = await attachSession(name, { substrate });
+  // Take it back out on the way through, so a member is a member again: `kill`
+  // ends one by killing its pane, and a session still holding a bar would
+  // outlive the member and keep its name on the roster.
+  if (barTarget) bar.removeBar(barTarget, {});
   if (!result.ok) { write(err(String(result.error?.message || result.error))); return EXIT.usage; }
 
   const after = findSession(name);

package/src/herd-workspace.mjs

@@ -21,7 +21,7 @@ import { spawn, spawnSync } from "node:child_process";
 import { HERD_SOCKET, detectSubstrate, paneIndex, readManifest, tmux } from "./herd.mjs";
 import { roster } from "./herd-cli.mjs";
 import { groupByHerd, parseInput } from "./herd-ui.mjs";
-import { BAR_HEIGHT, BAR_KEY, BAR_TITLE, SIDEBAR_TITLE, paneRoles } from "./herd-bar.mjs";
+import { BAR_KEY, BAR_TITLE, SIDEBAR_TITLE, barCommand, bindJumpKey, ensureBar, paneRoles } from "./herd-bar.mjs";
 import { acid, amber, ash, bone, danger, dim, err, info, ok } from "./ui.mjs";
 
 export const WORKSPACE = "herd";
@@ -82,34 +82,11 @@ export async function herdUi(argv = [], { write = console.log, spawner = spawn,
 
 /* ------------------------------------------------------------------ the bar */
 
-/** How the bar pane starts itself. Separated so tests can run a stand-in. */
-export function barCommand(self = process.argv[1]) {
-  return `${process.execPath} ${self} herd bar`;
-}
-
-/**
- * Add the one-line mosh prompt under the content, and the key that reaches it.
- *
- * The binding goes in tmux's root table, so it is claimed before the pane's
- * application ever sees it — that is what makes it work from inside an agent
- * that has taken the keyboard, which is the case the bar exists for. It also
- * switches the client first, so it is a way out of a member you attached to
- * directly and not only of the workspace.
- */
+/** Add the one-line mosh prompt under the content, and the key that reaches it. */
 export function buildBar({ runner = spawnSync, command = barCommand() } = {}) {
-  const made = tmux(
-    ["split-window", "-t", TARGET, "-f", "-v", "-l", String(BAR_HEIGHT), "-P", "-F", "#{pane_id}", command],
-    { runner },
-  );
-  if (!made.ok) return null;
-  const paneId = made.stdout.trim().split("\n")[0];
+  const { paneId } = ensureBar(TARGET, { runner, command });
   if (!paneId) return null;
-  tmux(["select-pane", "-t", paneId, "-T", BAR_TITLE], { runner });
-  // One string, not separate arguments: a bare ";" argument ends the bind-key
-  // command itself, so tmux binds the first command and runs the second once,
-  // now. That silently produced a key that switched sessions and did nothing
-  // else — the binding has to arrive as a single command sequence.
-  tmux(["bind-key", "-n", BAR_KEY, `switch-client -t ${WORKSPACE} ; select-pane -t ${paneId}`], { runner });
+  bindJumpKey({ runner });
   tmux(["select-pane", "-t", `${TARGET}.0`], { runner });
   return paneId;
 }

package/src/herd.mjs

@@ -629,7 +629,19 @@ export function killSession(name, { substrate = detectSubstrate(), runner = spaw
   if (substrate === "tmux") {
     // kill-pane, not kill-session: a tiled member shares its session with
     // every other tiled member, and killing that would take the lot.
+    const found = paneIndex({ runner }).get(name);
     const r = tmux(["kill-pane", "-t", target(name, { runner })], { runner });
+    // A member being attached to has a mosh bar under it, and the bar would
+    // hold the session open after its member is gone — an empty room still
+    // answering to the dead member's name on the roster. If that is all that is
+    // left, take the room too.
+    if (r.ok && found) {
+      const left = tmux(["list-panes", "-t", found.session, "-F", "#{pane_title}"], { runner });
+      const titles = left.ok ? left.stdout.split("\n").filter(Boolean) : [];
+      if (titles.length && titles.every((t) => t === "mosh-bar")) {
+        tmux(["kill-session", "-t", found.session], { runner });
+      }
+    }
     forgetSession(name);
     return r.ok ? { ok: true } : { ok: false, error: new Error(r.stderr.trim() || "no such session") };
   }

package/src/tui.mjs

@@ -27,6 +27,7 @@ import { banner, hr, acid, ash, bone, dim, ok, err, warn, info, moshcodeVersion
 import { CORE_CLI_COMMAND_NAMES } from "./cli-schema.mjs";
 import { RENAMED_COMMANDS, findPitCommand, pitHelpModel, renderPitCommand, suggest, wantsHelp } from "./help.mjs";
 import { openNewTab } from "./tabs.mjs";
+import { MAX_EXPANSIONS, expandAlias, getAlias, loadAliases, removeAlias, setAlias } from "./aliases.mjs";
 import { herdCommand, herdStart, renderRoster, roster, splitDetachArgs } from "./herd-cli.mjs";
 import { detectSubstrate, substrateNote } from "./herd.mjs";
 
@@ -128,9 +129,32 @@ export function splitCommandLine(line) {
 // hands this straight to `$SHELL -c`, the same way `!cmd` does: the shell does
 // its own parsing, so re-joining the tokenized parts would strip the user's
 // quotes and escapes and silently split `-m "two words"` into two arguments.
-function commandRemainder(line) {
-  const firstWord = /^\s*\S+\s*/.exec(String(line));
-  return firstWord ? String(line).slice(firstWord[0].length).trim() : "";
+function commandRemainder(line, words = 1) {
+  let out = String(line);
+  for (let i = 0; i < words; i++) {
+    const firstWord = /^\s*\S+\s*/.exec(out);
+    out = firstWord ? out.slice(firstWord[0].length) : "";
+  }
+  return out.trim();
+}
+
+/**
+ * The value half of `/alias set <name> <value…>`, as the user meant it.
+ *
+ * `/alias set gs "git status"` quotes the value because that is the obvious way
+ * to write it, and `/alias set gc git commit -m "wip"` does not because the
+ * quotes there belong to the shell. Tokenizing tells the two apart: exactly one
+ * token means the whole value was quoted, so use it with the quotes stripped;
+ * anything else is a bare command line, and it goes through verbatim so the
+ * user's own quoting survives into `$SHELL -c`.
+ */
+export function aliasValue(line) {
+  const raw = commandRemainder(line, 3); // past "/alias", "set", "<name>"
+  if (!raw) return "";
+  let parts;
+  try { parts = splitCommandLine(raw); }
+  catch { return raw; }
+  return parts.length === 1 ? parts[0] : raw;
 }
 
 function printEngines(json = false) {
@@ -209,6 +233,94 @@ function printSocials() {
   console.log(ash("   the browser always asks you to confirm before anything is published"));
 }
 
+/**
+ * Is this name the pit's own?
+ *
+ * Asked by resolving it the way the dispatcher does, rather than by consulting
+ * a list: the dispatcher checks pit verbs, then engines, then tools, and only
+ * then aliases, so anything that resolves earlier would shadow an alias of the
+ * same name into silence.
+ */
+function isReservedName(name) {
+  const key = String(name).toLowerCase();
+  return Boolean(findPitCommand(key) || resolveEngine(key) || resolveTool(key) || RENAMED_COMMANDS[key]);
+}
+
+function printAliases({ json = false } = {}) {
+  const aliases = loadAliases();
+  const names = Object.keys(aliases).sort();
+  if (json) { console.log(JSON.stringify(aliases, null, 2)); return; }
+  if (!names.length) {
+    console.log(info(`no aliases yet — ${acid('/alias set gs "git status"')} then ${acid("/gs")}.`));
+    return;
+  }
+  console.log(bone("  aliases") + ash("  — run one with ") + acid("/<name>") + ash(" · ") + acid("/alias rm <name>") + ash(" to forget"));
+  const width = Math.max(...names.map((n) => n.length));
+  for (const name of names) {
+    // A leading slash marks the ones that are pit commands rather than shell,
+    // which is the only thing about a value that is not already visible.
+    const value = aliases[name];
+    const kind = value.startsWith("/") ? ash("pit  ") : ash("shell");
+    console.log(`   ${acid(`/${name}`.padEnd(width + 1))} ${kind} ${bone(value)}`);
+  }
+}
+
+/**
+ * `/alias` — define, list, and forget the shortcuts (src/aliases.mjs).
+ *
+ * `line` comes in alongside the tokenized `rest` because the value is a command
+ * line, not an argument list: re-joining tokens would drop the quoting that the
+ * shell still has to read.
+ */
+function aliasCommand(rest, line) {
+  const json = rest.includes("--json");
+  // `--json` is the listing's flag wherever it appears, so `/alias --json` is a
+  // listing rather than a verb nobody recognises. The value in `set` is read
+  // from the raw line, not from here, so an aliased command that itself passes
+  // --json is untouched by this.
+  const [verb, ...args] = rest.filter((a) => a !== "--json");
+  const sub = String(verb ?? "").toLowerCase();
+
+  if (!verb || sub === "list" || sub === "ls") {
+    printAliases({ json });
+    return;
+  }
+  if (sub === "set" || sub === "add") {
+    const name = args[0];
+    const value = aliasValue(line);
+    if (!name || !value) {
+      console.log(err('usage: /alias set <name> "<command>"'));
+      console.log(ash("   the command runs in $SHELL unless it starts with / — then it's a pit command"));
+      return;
+    }
+    const result = setAlias(name, value, { isReserved: isReservedName });
+    if (!result.ok) { console.log(err(result.error)); return; }
+    console.log(ok(`${acid(`/${result.name}`)} → ${bone(result.value)}`));
+    if (result.previous) console.log(ash(`   replaced: ${result.previous}`));
+    return;
+  }
+  if (sub === "rm" || sub === "remove" || sub === "unset" || sub === "delete" || sub === "del") {
+    if (!args[0]) { console.log(err("usage: /alias rm <name>")); return; }
+    const result = removeAlias(args[0]);
+    console.log(result.ok ? ok(`forgot ${acid(`/${result.name}`)} ${ash(`(was: ${result.value})`)}`) : err(result.error));
+    return;
+  }
+  if (sub === "get" || sub === "show") {
+    if (!args[0]) { console.log(err("usage: /alias get <name>")); return; }
+    const value = getAlias(args[0]);
+    console.log(value == null
+      ? err(`no alias named "${String(args[0]).replace(/^\//, "")}"`)
+      : `  ${acid(`/${String(args[0]).toLowerCase().replace(/^\//, "")}`)} ${ash("→")} ${bone(value)}`);
+    return;
+  }
+  // A bare `/alias gs "git status"` is what people type once they know the
+  // command exists, so treat an unknown verb as the name in `set` — but only
+  // when there is a value after it, or `/alias gs` would silently define
+  // nothing.
+  if (args.length) { aliasCommand(["set", ...rest], `/alias set ${commandRemainder(line)}`); return; }
+  console.log(err(`unknown /alias verb "${verb}" — set, list, get, rm`));
+}
+
 /**
  * The moshscript vocabulary, split the way the CLI's help splits it.
  *
@@ -526,19 +638,31 @@ export async function tui() {
   const { restoreTee, drainRemote, atPrompt } = await startMirror();
 
   let rl = mkrl();
+  // An alias expands into a line that is dispatched exactly as if it had been
+  // typed, so it goes back through the top of this loop instead of through a
+  // second copy of the dispatcher. `expansions` bounds a chain of aliases that
+  // name each other; it resets whenever a real line is read.
+  let pending = null;
+  let expansions = 0;
   for (;;) {
     let line;
-    // Arm the prompt first, THEN release any command waiting from the web:
-    // rl.write() only lands as input once readline is actually asking.
-    const answer = ask(rl);
-    atPrompt(rl);
-    drainRemote();
-    try { line = await answer; } catch { break; }
-    finally { atPrompt(null); }
-    if (line == null) break; // Ctrl-D
-    line = line.trim();
-    if (!line) continue;
-    saveHistory(); // readline just recorded this line into the shared history
+    if (pending != null) {
+      line = pending;
+      pending = null;
+    } else {
+      // Arm the prompt first, THEN release any command waiting from the web:
+      // rl.write() only lands as input once readline is actually asking.
+      const answer = ask(rl);
+      atPrompt(rl);
+      drainRemote();
+      try { line = await answer; } catch { break; }
+      finally { atPrompt(null); }
+      if (line == null) break; // Ctrl-D
+      expansions = 0;
+      line = line.trim();
+      if (!line) continue;
+      saveHistory(); // readline just recorded this line into the shared history
+    }
 
     // vim-style shell escape: `!` drops into $SHELL, `!<cmd>` runs one-off. We
     // take the raw remainder (not the tokenized parts) so quoting is preserved.
@@ -586,6 +710,7 @@ export async function tui() {
       rl = mkrl();
       continue;
     }
+    if (cmd === "alias" || cmd === "aliases") { aliasCommand(rest, line); continue; }
     if (cmd === "pwd" || cmd === "where") { printPwd(); continue; }
     if (cmd === "login") {
       const device = rest.includes("--device") || rest.includes("device") || rest.includes("-d");
@@ -785,6 +910,23 @@ export async function tui() {
       rl = mkrl();
       continue;
     }
+    // A user-defined alias (src/aliases.mjs) — last, so it can never shadow a
+    // built-in, and so an alias that names one is dead rather than surprising.
+    // /alias set refuses those names for exactly this reason.
+    const aliased = getAlias(cmd);
+    if (aliased) {
+      if (expansions >= MAX_EXPANSIONS) {
+        console.log(err(`/${cmd} keeps expanding — ${MAX_EXPANSIONS} rounds and still not a command. check /alias list for a loop.`));
+        continue;
+      }
+      expansions += 1;
+      pending = expandAlias(aliased, commandRemainder(line));
+      // Echoed because the line that runs is not the line that was typed, and a
+      // shell command that fails is a lot easier to read when what actually ran
+      // is on the screen above it.
+      console.log(ash(`  ▸ ${pending}`));
+      continue;
+    }
     // A renamed verb gets pointed at its replacement; `/ticker` was a pit
     // command for a release, so a bare "unknown command" is a dead end here.
     const renamed = RENAMED_COMMANDS[cmd];