@cordfuse/llmux 0.12.0 → 0.12.2

package/README.md

@@ -1,119 +1,208 @@
 # llmux
 
-You have Claude Code in one terminal, Codex in another, aider in a third, and
-opencode in a fourth. They're all live, all mid-conversation, all costing
+You have Claude Code in one terminal, Codex in another, Aider in a third, and
+OpenCode in a fourth. They're all live, all mid-conversation, all costing
 nothing to keep open. But to fire a prompt at one of them you have to find the
-right window, click in, and type. To fire the same prompt at two of them — you
-just don't. And if you're on the couch with your phone? Forget it.
+right window, click in, and type. To do anything from your phone? Forget it.
 
 llmux turns every agent CLI into a named tmux session you can drive from
-anywhere. Spawn `claude`, `agy`, `codex`, `qwen`, `opencode`, `grok`, `aider`,
-`goose`, and `gh copilot` once. Then fire prompts at any of them — by name,
-broadcast to several at once, from a REST call, a curl one-liner, or a browser
-terminal on your phone over Tailscale.
+anywhere. Spawn `claude`, `codex`, `agy`, `gemini`, `qwen`, `opencode`, `amp`,
+`grok`, `aider`, `continue`, `kiro`, `cursor`, `plandex`, `goose`, or
+`gh copilot` once. Then fire prompts at any of them — by name, from a CLI, from
+a REST call, or from a browser on your phone over Tailscale. Past
+conversations are browsable and resumable. The agents keep running.
 
-The agents keep running. You stop window-hopping.
+> **Status:** v0.12.2 — daemon + CLI client consolidated into one binary
+> (`llmux`). Auth, tokens, mobile picker, conversation resume, Claude Code
+> history adapter shipped. See [CHANGELOG.md](./CHANGELOG.md).
 
-> **Status:** v0.2.1 — Phases 0, 1, and 4 shipped. Phases 2, 3, 5, 6, 7 pending.
-> See [CHANGELOG.md](./CHANGELOG.md).
+<p align="center">
+  <img src="https://raw.githubusercontent.com/cordfuse/llmux/main/docs/screenshots/sessions.jpg" width="32%" alt="mobile sessions picker — 5 agents running, respawn/edit/kill per row">
+  <img src="https://raw.githubusercontent.com/cordfuse/llmux/main/docs/screenshots/edit.jpg" width="32%" alt="edit session form — agent, name, cwd, flags, env vars">
+  <img src="https://raw.githubusercontent.com/cordfuse/llmux/main/docs/screenshots/chat.jpg" width="32%" alt="phone chat — xterm.js with soft-keyboard toolbar attached to an OpenCode session">
+</p>
+
+> Browser picker, edit form, and attached terminal — all on a phone over
+> Tailscale HTTPS.
 
 ## Install
 
 ```bash
-# On the machine with tmux + your agent CLIs
-npm install -g @cordfuse/llmuxd
-
-# Anywhere you want to send prompts from (laptop, phone, CI)
+# One package, one binary — installs on the daemon host AND any client machine
 npm install -g @cordfuse/llmux
 ```
 
+If you used the now-deprecated `@cordfuse/llmuxd` package: uninstall it and
+install `@cordfuse/llmux` instead. The `llmuxd` binary is gone; the `llmux`
+binary covers both daemon and client roles.
+
 ## 30-second quickstart
 
 ```bash
-# Spawn an agent in a named tmux session
-llmuxd spawn claude --name main --cwd ~/projects/myapp
+# 1. Start the daemon (binds REST + WebSocket + browser picker)
+llmux server start --port 3030
+
+# 2. Spawn an agent into a named tmux session
+llmux session start claude --name main --cwd ~/projects/myapp
 
-# Fire a prompt at it — fire-and-forget
-llmuxd send main "what does src/index.ts do?"
+# 3. Fire a prompt — fire-and-forget
+llmux session prompt main "what does src/index.ts do?"
 
-# Or attach interactively (switch-client if you're already in tmux)
-llmuxd attach main
+# 4. Or attach interactively (raw TTY pass-through)
+llmux session attach main
 
-# Or expose a browser-terminal — opens the session in any browser
-llmuxd serve
+# 5. Or open the browser picker (URL is in the server start banner)
+#    Pick a session, get a full-screen xterm.js terminal wired over WebSocket.
 ```
 
-`llmuxd serve` prints reachable URLs (Local, LAN, Tailscale). Open one, pick a
-session, and you get a full-screen xterm.js terminal wired to your live tmux
-session over WebSocket. Multiple browsers can attach to the same session — tmux
-handles the multiplexing. On mobile, the floating toolbar gives you arrow keys,
-modifiers, and shell chars `gboard` hides.
+On mobile the picker is a real PWA-style surface — spawn / restart / kill /
+edit / resume past conversations, with a confirmation modal on destructive
+actions. The chat page is a phone-friendly xterm with a custom soft-keyboard
+toolbar that surfaces Esc / Tab / Ctrl / Alt / arrows / shell chars that
+gboard hides.
 
-> **Auth:** `serve` runs without authentication today. Phase 3 lands SAS tokens.
-> Until then, bind to `127.0.0.1` (default) or expose only over Tailscale.
+## Remote operation
 
-## How it works
+The same binary is the client. Set `--server` (or `LLMUX_SERVER` env) on any
+session/agent verb and it routes over HTTP instead of operating locally:
 
-Two packages:
+```bash
+export LLMUX_SERVER=http://100.105.221.46:3030
+export LLMUX_TOKEN=sas_…                    # mint with `llmux token create`
 
-| Package | Where it runs | What it does |
-|---|---|---|
-| `@cordfuse/llmuxd` | The machine with tmux | Daemon: session management, REST API, web terminal |
-| `@cordfuse/llmux` | Anywhere | Thin HTTP client — no tmux dependency |
+llmux session list
+llmux session prompt main "tomorrow's plan?"
+llmux session attach main                   # raw TTY pass-through over WS
+llmux session resume main --latest          # rebind to the most recent claude convo
+```
+
+Localhost requests bypass auth; remote requests require a Bearer token.
+`--token <sas>` per-command works too.
 
-Each spawned agent is a real tmux session, not a wrapped PTY. llmuxd dispatches
-input via `tmux send-keys` and reads output by attaching xterm.js over a
-WebSocket bridge. That keeps the agent CLIs unmodified — Claude Code is still
-running Claude Code; llmuxd just coordinates input and exposes the surface.
+## Noun-prefix surface
 
-Session metadata lives at `$XDG_STATE_HOME/llmuxd/sessions.json` (default
-`~/.local/state/llmuxd/sessions.json`, `0600` perms, versioned schema).
-Reconciliation is on demand — sessions can die outside llmuxd, and `status`
-reports live tmux state.
+```
+session   list / start / stop / restart / attach / prompt / broadcast
+          / resume / history
+server    start
+token     create / list / revoke
+agent     list  [--all] [--installed] [--json]
+```
 
-The daemon runs on Node (not Bun) because `node-pty`'s native prebuilds target
-Node; Bun caused immediate SIGHUP on the PTY child.
+Global flags: `--server <url>`, `--token <sas>`, `--help`, `--version`.
+
+Backward-compat shims (kept one release): `llmux serve`, `llmux ls`,
+`llmux status`, and the legacy flat verbs (`llmux send`, `llmux spawn`,
+`llmux kill`, etc.) still work; they fall through to the noun-prefix
+dispatcher.
+
+## How it works
+
+Each spawned agent is a real tmux session, not a wrapped PTY. The daemon
+dispatches input via `tmux send-keys` and exposes the surface over a REST API
+plus a WebSocket bridge to xterm.js (via node-pty attached to
+`tmux attach -t <name>`). That keeps the agent CLIs unmodified — Claude Code
+is still running Claude Code; llmux just coordinates input and exposes the
+surface.
+
+State lives at `~/.local/state/llmuxd/sessions.json` (or
+`$XDG_STATE_HOME/llmuxd/sessions.json`) with `0600` perms and a versioned
+schema. Auth tokens live in the sibling `auth.json`. The state directory keeps
+its `llmuxd/` name across the v0.12.0 package consolidation so existing
+operators don't need to migrate anything.
+
+The daemon runs on Node (not Bun) — `node-pty`'s native prebuilds target
+Node, and attaching to tmux through node-pty under Bun caused immediate SIGHUP.
 
 ## Supported agents
 
-| Session key | CLI |
-|---|---|
-| `claude`   | [Claude Code](https://github.com/anthropics/claude-code) |
-| `agy`      | [Antigravity CLI](https://antigravity.dev) |
-| `codex`    | [OpenAI Codex CLI](https://github.com/openai/codex) |
-| `qwen`     | [Qwen Code](https://github.com/QwenLM/qwen-code) |
-| `opencode` | [opencode](https://opencode.ai) |
-| `grok`     | [Grok Build CLI](https://x.ai) |
-| `aider`    | [aider](https://aider.chat) |
-| `goose`    | [Goose](https://block.github.io/goose/) |
-| `copilot`  | [GitHub Copilot CLI](https://github.com/github/gh-copilot) (via `gh` extension) |
-
-Only installed agents are spawnable. llmuxd uses `command -v` (and
-`gh extension list` for copilot) to detect availability.
+| Key | CLI | Danger-mode default |
+|---|---|---|
+| `claude`   | [Claude Code](https://docs.claude.com/en/docs/claude-code/overview) | `--dangerously-skip-permissions` |
+| `codex`    | [OpenAI Codex CLI](https://github.com/openai/codex) | `--dangerously-bypass-approvals-and-sandbox` |
+| `agy`      | [Antigravity CLI](https://antigravity.google) | `--dangerously-skip-permissions` |
+| `gemini`   | [Gemini CLI](https://github.com/google-gemini/gemini-cli) | `--yolo` |
+| `qwen`     | [Qwen Code](https://github.com/QwenLM/qwen-code) | `--yolo` |
+| `opencode` | [OpenCode](https://opencode.ai) | env: `OPENCODE_YOLO=1` (TUI lacks a flag) |
+| `amp`      | [Sourcegraph Amp](https://ampcode.com) | `--dangerously-allow-all` |
+| `grok`     | [Grok Build CLI](https://x.ai/cli) | `--always-approve` |
+| `aider`    | [Aider](https://aider.chat) | `--yes-always` |
+| `continue` | [Continue CLI](https://docs.continue.dev/guides/cli) (`cn`) | `--auto` |
+| `kiro`     | [Kiro CLI](https://kiro.dev/cli/) | `--trust-all-tools` |
+| `cursor`   | [Cursor CLI](https://cursor.com/docs/cli/installation) (`cursor-agent`) | (config-based) |
+| `plandex`  | [Plandex](https://plandex.ai) | (interactive `set-auto`) |
+| `goose`    | [Goose](https://block.github.io/goose) | env: `GOOSE_MODE=auto` |
+| `copilot`  | [GitHub Copilot CLI](https://docs.github.com/en/copilot/how-tos/use-copilot-in-the-cli) (`gh copilot`) | n/a |
+
+Only installed agents appear in `llmux agent list` and the picker dropdown.
+Detection uses a pure-Node PATH walk for most; `copilot` checks the gh-managed
+binary directory.
+
+Per-session overrides via `llmux session start <agent>`:
+- `--name <X>` — tmux session name (defaults to the agent key)
+- `--cwd <path>` — working directory (accepts `~/…` shorthand)
+- `--flags "<f>"` — replace the agent's default flags entirely
+- `--env "KEY=VAL"` — extra env vars (newline-separated for multiple)
+
+Editing any of these on a running session via the web picker auto-respawns
+the tmux session so changes take effect immediately.
+
+## Conversation resume
+
+For agents with a history adapter (Claude Code today; codex/gemini/etc.
+coming), the row gets a `☰ N` button. Tap it to see past conversations in the
+session's cwd; pick one to relaunch the agent with its `--resume <id>` flag.
+State preserves the binding across restarts so respawn keeps you on the
+same conversation. Use `llmux session resume <name> --latest` from the CLI
+for the same flow.
+
+## Auth
+
+`llmux server start` runs without auth until you create a token:
+
+```bash
+llmux token create --name phone
+# prints sas_…<43-char-base64url> once; copy it.
+# pass --qr-endpoint tailscale-https for a QR-code deep-link that logs you
+# in on first scan from a phone.
+
+llmux token list
+llmux token revoke <8-char-id>
+```
+
+After the first token exists, all non-localhost HTTP/WS requests require
+either `Authorization: Bearer <sas>` (CLI / curl) or the `llmuxd_token`
+cookie set by the browser gate. Localhost stays open so local CLI use needs
+no token.
+
+If `tailscale serve --https=443 http://localhost:<port>` is configured on the
+host, the server-start banner surfaces the HTTPS hostname URL above the
+http endpoints. The browser picker is a clean TLS surface; CLI `attach`
+currently speaks ws:// only.
 
 ## Config (`.llmux.yaml`)
 
-llmuxd looks for config in this order (highest priority first):
+A YAML config (project-local or global) can override per-agent defaults.
+Discovery order:
 
 1. `--config <path>` flag
-2. `./.llmux.yaml` (project-level, auto-discovered in cwd)
+2. `./.llmux.yaml` (project-local, auto-discovered in cwd)
 3. `~/.config/llmux/config.yaml` (global default)
 4. `LLMUX_CONFIG=<path>` env var
 
-All config has sensible defaults — llmuxd runs without any YAML file.
-
-See [docs/config.md](./docs/config.md) (forthcoming) for the full schema.
+llmux runs without any YAML file — all defaults are baked into
+`agents.ts`. The `init` command to generate a starter YAML is not yet
+shipped; create one by hand if you want to override defaults today.
 
-## Build phases
+## Environment
 
-- [x] **Phase 0** — scaffold, CLI stubs *(v0.0.1)*
-- [x] **Phase 1** — spawn / send / broadcast / chat / kill / status *(v0.1.0)*
-- [ ] **Phase 2** — `.llmux.yaml` config + `llmuxd init`
-- [ ] **Phase 3** — REST API + `llmux` HTTP client + SAS tokens
-- [x] **Phase 4** — web terminal (xterm.js + node-pty + WebSocket) + mobile UX *(v0.2.0–v0.2.1)*
-- [ ] **Phase 5** — QR codes + serve UX + service templates (systemd/launchd)
-- [ ] **Phase 6** — agent-initiated spawning (`LLMUX_SERVER` / `LLMUX_TOKEN` auto-inject)
-- [ ] **Phase 7** — polish + npm publish
+| Variable | Purpose |
+|---|---|
+| `LLMUX_SERVER` | Default `--server` URL for session/agent verbs |
+| `LLMUX_TOKEN`  | Default `--token` SAS auth |
+| `LLMUX_PORT`   | Default port resolution for QR-endpoint helpers |
+| `XDG_STATE_HOME` | Override for the state directory parent |
+| `OPENCODE_YOLO`, `GOOSE_MODE`, … | Forwarded by `envDefaults` per-agent |
 
 ## License
 

package/dist/index.js

@@ -753,7 +753,7 @@ function pickerPage() {
   </div>
 </div>
 <footer>
-  <span>llmuxd v${escapeHtml(DAEMON_VERSION)}</span>
+  <span>llmux v${escapeHtml(DAEMON_VERSION)}</span>
   ${authEnabled() ? `<span class="ok">\u2713 auth required \u2014 ${listAuthTokens().length} active token${listAuthTokens().length === 1 ? "" : "s"}</span>` : `<span class="warn">\u26A0 no auth \u2014 anyone on the network can attach</span>`}
 </footer>
 <script>
@@ -810,7 +810,7 @@ function pickerPage() {
 
   function render(sessions){
     if (!sessions || sessions.length === 0){
-      container.innerHTML = '<div class="empty">no sessions yet \u2014 spawn one from the CLI:<br><br><code>llmuxd spawn claude --name <em>name</em></code></div>';
+      container.innerHTML = '<div class="empty">no sessions yet \u2014 spawn one from the CLI:<br><br><code>llmux session start claude --name <em>name</em></code></div>';
       return;
     }
     const rows = sessions.map(rowHtml).join('');
@@ -1287,7 +1287,7 @@ function pickerPage() {
 }
 function renderSessionTable(sessions) {
   if (sessions.length === 0) {
-    return `<div class="empty">no sessions yet \u2014 spawn one from the CLI:<br><br><code>llmuxd spawn claude --name <em>name</em></code></div>`;
+    return `<div class="empty">no sessions yet \u2014 spawn one from the CLI:<br><br><code>llmux session start claude --name <em>name</em></code></div>`;
   }
   const rows = sessions.map((s) => {
     const cls = `state-${s.status}`;
@@ -1386,7 +1386,7 @@ function sessionPage(name) {
   const jsonVersion = JSON.stringify(DAEMON_VERSION);
   return `<!doctype html><html lang="en"><head>
 <meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,viewport-fit=cover,interactive-widget=resizes-content">
-<title>${escapedName} \u2014 llmuxd</title>
+<title>${escapedName} \u2014 llmux</title>
 <link rel="icon" href="${FAVICON_DATA_URL}">
 <link rel="apple-touch-icon" href="${FAVICON_DATA_URL}">
 <link rel="stylesheet" href="${XTERM_CSS}">
@@ -1901,10 +1901,10 @@ function isWsAuthorized(req, urlSearch) {
   return validateAuthToken(extractWsToken(req, urlSearch));
 }
 function gatePage(reason) {
-  const message = reason === "invalid" ? "Token rejected. Try again." : "This llmuxd instance requires a token.";
+  const message = reason === "invalid" ? "Token rejected. Try again." : "This llmux daemon requires a token.";
   return `<!doctype html><html lang="en"><head>
 <meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
-<title>llmuxd \u2014 auth</title>
+<title>llmux \u2014 auth</title>
 <link rel="icon" href="${FAVICON_DATA_URL}">
 <style>
   :root{color-scheme:dark}
@@ -1935,7 +1935,7 @@ function gatePage(reason) {
     <div class="msg" id="msg"></div>
   </form>
   <div class="hint">
-    Generate a token on the daemon host: <code>llmuxd token create</code><br>
+    Generate a token on the daemon host: <code>llmux token create</code><br>
     The token is sent as a cookie after unlock. Localhost bypasses this gate.
   </div>
 </div>
@@ -2538,7 +2538,7 @@ function attachSession(ws, sessionName) {
   });
 }
 function printBanner(port) {
-  console.log(`llmuxd v${DAEMON_VERSION}
+  console.log(`llmux v${DAEMON_VERSION}
 `);
   const addrs = getAddresses(port);
   const width = Math.max(10, ...addrs.map((a) => a.label.length + 2));
@@ -2553,7 +2553,7 @@ function printBanner(port) {
   } else {
     console.log(`
   \u26A0 running without auth \u2014 anyone on the network can attach.`);
-    console.log(`    create a token with \`llmuxd token create\` to enable auth.
+    console.log(`    create a token with \`llmux token create\` to enable auth.
 `);
   }
 }
@@ -2645,7 +2645,7 @@ function handleStatus(args) {
     return;
   }
   if (tracked.length === 0) {
-    console.log("no llmuxd sessions");
+    console.log("no llmux sessions");
     return;
   }
   const rows = tracked.map((s) => [
@@ -2670,7 +2670,7 @@ function handleSend(args) {
   const prompt = promptParts.join(" ");
   const { session } = resolveTarget(target);
   if (!hasSession(session.name)) {
-    throw new Error(`session "${session.name}" is in state but not live in tmux (exited?). Try \`llmuxd respawn ${session.name}\`.`);
+    throw new Error(`session "${session.name}" is in state but not live in tmux (exited?). Try \`llmux session restart ${session.name}\`.`);
   }
   sendKeys(session.name, prompt, { enter: true });
   console.log(`sent ${prompt.length} bytes \u2192 ${session.name}`);
@@ -2704,7 +2704,7 @@ function handleChat(args) {
   const target = args.positional[0];
   if (!target) throw new Error("chat requires <session>");
   if (args.flags.browser) {
-    throw new Error("--browser requires `llmuxd serve` (Phase 4). Use `llmuxd chat` without --browser for now.");
+    throw new Error("--browser requires the web server (`llmux server start`). Without --browser, use `llmux session attach` for raw TTY pass-through.");
   }
   const { session } = resolveTarget(target);
   if (!hasSession(session.name)) {
@@ -2749,7 +2749,7 @@ function resolveQrEndpoint(selector, port) {
   }
   if (matches.length > 1) {
     throw new Error(
-      `--qr-endpoint "${selector}" is ambiguous (${matches.length} matches). Use \`llmuxd token create --qr\` without an endpoint to pick interactively.`
+      `--qr-endpoint "${selector}" is ambiguous (${matches.length} matches). Use \`llmux token create --qr\` without an endpoint to pick interactively.`
     );
   }
   return matches[0];
@@ -2823,7 +2823,7 @@ function handleTokenShow(args) {
     return;
   }
   if (tokens.length === 0) {
-    console.log("no tokens \u2014 auth is disabled. Create one with `llmuxd token create`.");
+    console.log("no tokens \u2014 auth is disabled. Create one with `llmux token create`.");
     return;
   }
   const headers = ["ID", "NAME", "CREATED", "EXPIRES"];
@@ -2913,7 +2913,7 @@ function help(name, summary, usage) {
     `  ${usage}`,
     "",
     "Environment:",
-    "  LLMUX_SERVER  base URL of the llmuxd daemon (e.g. http://localhost:3030)",
+    "  LLMUX_SERVER  base URL of the llmux daemon (e.g. http://localhost:3030)",
     "  LLMUX_TOKEN   auth token (sas_\u2026); not required for localhost",
     ""
   ].join("\n");
@@ -2921,7 +2921,7 @@ function help(name, summary, usage) {
 function resolveContext() {
   const baseUrl = process.env.LLMUX_SERVER;
   if (!baseUrl) {
-    throw new Error("LLMUX_SERVER is not set. Point it at your llmuxd (e.g. http://localhost:3030).");
+    throw new Error("LLMUX_SERVER is not set. Point it at your llmux daemon (e.g. http://localhost:3030).");
   }
   return { baseUrl: baseUrl.replace(/\/$/, ""), token: process.env.LLMUX_TOKEN };
 }
@@ -2940,7 +2940,7 @@ async function request(ctx, method, path, body) {
   }
   if (r.status === 401) {
     throw new Error(
-      "unauthorized \u2014 set LLMUX_TOKEN (use `llmuxd token create` on the daemon host to mint one)"
+      "unauthorized \u2014 set LLMUX_TOKEN (use `llmux token create` on the daemon host to mint one)"
     );
   }
   if (r.status === 404) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cordfuse/llmux",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "tmux-based AI agent dispatcher — REST/WS daemon + CLI client in one binary",
   "license": "MIT",
   "type": "module",

package/src/cli.ts

@@ -95,6 +95,6 @@ export function renderFlagHelp(specs: FlagSpecs): string {
 }
 
 export function notImplemented(commandPath: string): never {
-  console.error(`llmuxd ${commandPath}: not yet implemented (scaffold)`);
+  console.error(`llmux ${commandPath}: not yet implemented (scaffold)`);
   process.exit(70);
 }

package/src/client/client.ts

@@ -18,7 +18,7 @@ function help(name: string, summary: string, usage: string): () => string {
       `  ${usage}`,
       '',
       'Environment:',
-      '  LLMUX_SERVER  base URL of the llmuxd daemon (e.g. http://localhost:3030)',
+      '  LLMUX_SERVER  base URL of the llmux daemon (e.g. http://localhost:3030)',
       '  LLMUX_TOKEN   auth token (sas_…); not required for localhost',
       '',
     ].join('\n');
@@ -32,7 +32,7 @@ interface ClientContext {
 export function resolveContext(): ClientContext {
   const baseUrl = process.env.LLMUX_SERVER;
   if (!baseUrl) {
-    throw new Error('LLMUX_SERVER is not set. Point it at your llmuxd (e.g. http://localhost:3030).');
+    throw new Error('LLMUX_SERVER is not set. Point it at your llmux daemon (e.g. http://localhost:3030).');
   }
   return { baseUrl: baseUrl.replace(/\/$/, ''), token: process.env.LLMUX_TOKEN };
 }
@@ -62,7 +62,7 @@ async function request<T = unknown>(
   }
   if (r.status === 401) {
     throw new Error(
-      'unauthorized — set LLMUX_TOKEN (use `llmuxd token create` on the daemon host to mint one)',
+      'unauthorized — set LLMUX_TOKEN (use `llmux token create` on the daemon host to mint one)',
     );
   }
   if (r.status === 404) {

package/src/daemon/handlers.ts

@@ -119,7 +119,7 @@ export function handleStatus(args: ParsedArgs): void {
   }
 
   if (tracked.length === 0) {
-    console.log('no llmuxd sessions');
+    console.log('no llmux sessions');
     return;
   }
 
@@ -146,7 +146,7 @@ export function handleSend(args: ParsedArgs): void {
   const prompt = promptParts.join(' ');
   const { session } = resolveTarget(target);
   if (!tmux.hasSession(session.name)) {
-    throw new Error(`session "${session.name}" is in state but not live in tmux (exited?). Try \`llmuxd respawn ${session.name}\`.`);
+    throw new Error(`session "${session.name}" is in state but not live in tmux (exited?). Try \`llmux session restart ${session.name}\`.`);
   }
   tmux.sendKeys(session.name, prompt, { enter: true });
   console.log(`sent ${prompt.length} bytes → ${session.name}`);
@@ -182,7 +182,7 @@ export function handleChat(args: ParsedArgs): void {
   const target = args.positional[0];
   if (!target) throw new Error('chat requires <session>');
   if (args.flags.browser) {
-    throw new Error('--browser requires `llmuxd serve` (Phase 4). Use `llmuxd chat` without --browser for now.');
+    throw new Error('--browser requires the web server (`llmux server start`). Without --browser, use `llmux session attach` for raw TTY pass-through.');
   }
   const { session } = resolveTarget(target);
   if (!tmux.hasSession(session.name)) {
@@ -236,7 +236,7 @@ function resolveQrEndpoint(selector: string, port: number): { label: string; url
   }
   if (matches.length > 1) {
     throw new Error(
-      `--qr-endpoint "${selector}" is ambiguous (${matches.length} matches). Use \`llmuxd token create --qr\` without an endpoint to pick interactively.`,
+      `--qr-endpoint "${selector}" is ambiguous (${matches.length} matches). Use \`llmux token create --qr\` without an endpoint to pick interactively.`,
     );
   }
   return matches[0]!;
@@ -320,7 +320,7 @@ export function handleTokenShow(args: ParsedArgs): void {
     return;
   }
   if (tokens.length === 0) {
-    console.log('no tokens — auth is disabled. Create one with `llmuxd token create`.');
+    console.log('no tokens — auth is disabled. Create one with `llmux token create`.');
     return;
   }
   const headers = ['ID', 'NAME', 'CREATED', 'EXPIRES'];

package/src/daemon/web/server.ts

@@ -314,7 +314,7 @@ function pickerPage(): string {
   </div>
 </div>
 <footer>
-  <span>llmuxd v${escapeHtml(DAEMON_VERSION)}</span>
+  <span>llmux v${escapeHtml(DAEMON_VERSION)}</span>
   ${authStore.authEnabled()
     ? `<span class="ok">✓ auth required — ${authStore.listAuthTokens().length} active token${authStore.listAuthTokens().length === 1 ? '' : 's'}</span>`
     : `<span class="warn">⚠ no auth — anyone on the network can attach</span>`}
@@ -373,7 +373,7 @@ function pickerPage(): string {
 
   function render(sessions){
     if (!sessions || sessions.length === 0){
-      container.innerHTML = '<div class="empty">no sessions yet — spawn one from the CLI:<br><br><code>llmuxd spawn claude --name <em>name</em></code></div>';
+      container.innerHTML = '<div class="empty">no sessions yet — spawn one from the CLI:<br><br><code>llmux session start claude --name <em>name</em></code></div>';
       return;
     }
     const rows = sessions.map(rowHtml).join('');
@@ -851,7 +851,7 @@ function pickerPage(): string {
 
 function renderSessionTable(sessions: SessionView[]): string {
   if (sessions.length === 0) {
-    return `<div class="empty">no sessions yet — spawn one from the CLI:<br><br><code>llmuxd spawn claude --name <em>name</em></code></div>`;
+    return `<div class="empty">no sessions yet — spawn one from the CLI:<br><br><code>llmux session start claude --name <em>name</em></code></div>`;
   }
   const rows = sessions
     .map((s) => {
@@ -956,7 +956,7 @@ function sessionPage(name: string): string {
   const jsonVersion = JSON.stringify(DAEMON_VERSION);
   return `<!doctype html><html lang="en"><head>
 <meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,viewport-fit=cover,interactive-widget=resizes-content">
-<title>${escapedName} — llmuxd</title>
+<title>${escapedName} — llmux</title>
 <link rel="icon" href="${FAVICON_DATA_URL}">
 <link rel="apple-touch-icon" href="${FAVICON_DATA_URL}">
 <link rel="stylesheet" href="${XTERM_CSS}">
@@ -1481,10 +1481,10 @@ function isWsAuthorized(req: IncomingMessage, urlSearch: URLSearchParams): boole
 
 function gatePage(reason: 'missing' | 'invalid'): string {
   const message =
-    reason === 'invalid' ? 'Token rejected. Try again.' : 'This llmuxd instance requires a token.';
+    reason === 'invalid' ? 'Token rejected. Try again.' : 'This llmux daemon requires a token.';
   return `<!doctype html><html lang="en"><head>
 <meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
-<title>llmuxd — auth</title>
+<title>llmux — auth</title>
 <link rel="icon" href="${FAVICON_DATA_URL}">
 <style>
   :root{color-scheme:dark}
@@ -1515,7 +1515,7 @@ function gatePage(reason: 'missing' | 'invalid'): string {
     <div class="msg" id="msg"></div>
   </form>
   <div class="hint">
-    Generate a token on the daemon host: <code>llmuxd token create</code><br>
+    Generate a token on the daemon host: <code>llmux token create</code><br>
     The token is sent as a cookie after unlock. Localhost bypasses this gate.
   </div>
 </div>
@@ -2261,7 +2261,7 @@ function attachSession(ws: WebSocket, sessionName: string): void {
 }
 
 export function printBanner(port: number): void {
-  console.log(`llmuxd v${DAEMON_VERSION}\n`);
+  console.log(`llmux v${DAEMON_VERSION}\n`);
   const addrs = getAddresses(port);
   const width = Math.max(10, ...addrs.map((a) => a.label.length + 2));
   for (const addr of addrs) {
@@ -2272,6 +2272,6 @@ export function printBanner(port: number): void {
     console.log(`\n  ✓ auth required — ${count} active token${count === 1 ? '' : 's'} (localhost bypasses)\n`);
   } else {
     console.log(`\n  ⚠ running without auth — anyone on the network can attach.`);
-    console.log(`    create a token with \`llmuxd token create\` to enable auth.\n`);
+    console.log(`    create a token with \`llmux token create\` to enable auth.\n`);
   }
 }