kaizen-agent 1.43.3 → 1.45.0

package/cli/pty.test.ts

@@ -5,7 +5,7 @@ import { mkdtempSync, mkdirSync, writeFileSync, readFileSync, existsSync, realpa
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { launchMode, closeSessions, readSessions, sweepSessions, CLOSE_GRACE_MS } from "./state.ts";
-import { loginEnv, startPty, writePty, attachPty, ptyState } from "./pty.ts";
+import { loginEnv, startPty, writePty, attachPty, ptyState, exitPty } from "./pty.ts";
 import { conptyHost, innerCommand, resizeSeq } from "./conpty.ts";
 
 const root = realpathSync(mkdtempSync(join(tmpdir(), "kaizen-pty-")));
@@ -198,6 +198,18 @@ test.skipIf(process.platform === "win32")("the done sweep keeps a session the us
   expect(await gone(looked)).toBe(true);
 });
 
+test.skipIf(process.platform === "win32")("exitPty types /exit, and ends an agent that ignores it", async () => {
+  const wait = async (k: string) => { for (let i = 0; i < 100 && ptyState(k)!.alive; i++) await Bun.sleep(30); return ptyState(k)!.alive; };
+  startPty("polite", ["sh", "-c", "while read l; do case $l in */exit*) exit 0;; esac; done"], root);
+  expect(exitPty("polite", 60_000)).toBe(true);
+  expect(await wait("polite")).toBe(false);
+  startPty("stubborn", ["sh", "-c", "trap '' INT; while read l; do :; done"], root);
+  await Bun.sleep(100);
+  exitPty("stubborn", 300);
+  expect(await wait("stubborn")).toBe(false);
+  expect(exitPty("stubborn")).toBe(false);
+});
+
 test("asking: Claude Code and Codex prompts count as a question, ordinary output does not", async () => {
   const { asking } = await import("./pty.ts");
   expect(asking("\x1b[1mWould you like to run the following command?\x1b[0m")).toBe(true);

package/cli/pty.ts

@@ -120,6 +120,17 @@ const send = (p: Pty, d: string) => {
   try { (p.proc.stdin as Bun.FileSink).write(d); (p.proc.stdin as Bun.FileSink).flush(); } catch { /* host gone */ }
 };
 
+// The tile's ×: ask the agent to quit as the user would (/exit), then end it if it is
+// still there after `grace`. Escape first clears whatever is half-typed at its prompt.
+export function exitPty(key: string, grace = 5000): boolean {
+  const p = ptys.get(key);
+  if (!p || p.exit !== null) return false;
+  send(p, "\x1b");
+  setTimeout(() => send(p, "/exit\r"), 100);
+  setTimeout(() => { if (p.exit === null) p.proc.kill(); }, grace).unref();
+  return true;
+}
+
 export function resizePty(key: string, cols: number, rows: number) {
   const p = ptys.get(key);
   const c = Math.max(10, Math.min(500, cols | 0)), r = Math.max(5, Math.min(300, rows | 0));

package/cli/release.test.ts

@@ -0,0 +1,12 @@
+import { test, expect } from "bun:test";
+import { nextVersion, levelOf, summaryOf } from "./release.ts";
+
+test("release picks the bump from the commits and names it from them", () => {
+  expect(levelOf("fix(board): x\ndocs: y")).toBe("patch");
+  expect(levelOf("docs: y\nfeat(board): x")).toBe("minor");
+  expect(levelOf("feat: x\n\nBREAKING: config moved")).toBe("major");
+  expect(nextVersion("1.43.3", "patch")).toBe("1.43.4");
+  expect(nextVersion("1.43.3", "minor")).toBe("1.44.0");
+  expect(nextVersion("1.43.3", "major")).toBe("2.0.0");
+  expect(summaryOf(["feat(board): a", "docs(notes): b", "fix: c"])).toBe("a; c");
+});

package/cli/release.ts

@@ -0,0 +1,67 @@
+// `bun run release [patch|minor|major] [summary]`: bump, commit, test, publish, push.
+// With no level, the commits since the last tag decide it: a `feat` makes a new minor
+// (1.43.3 -> 1.44.0), anything else a patch; "BREAKING" anywhere makes a major.
+// The summary defaults to those commits' subjects, prefixes dropped. A bump commit
+// already made but never published (HEAD is "Release <version>:" with no tag) is reused.
+import { readFileSync, writeFileSync } from "node:fs";
+
+const sh = (cmd: string[]) => {
+  const r = Bun.spawnSync(cmd, { stdout: "pipe", stderr: "inherit" });
+  if (r.exitCode !== 0) throw new Error(`${cmd.join(" ")} failed`);
+  return r.stdout.toString().trim();
+};
+const run = (cmd: string[]) => {
+  if (Bun.spawnSync(cmd, { stdio: ["inherit", "inherit", "inherit"] }).exitCode !== 0) process.exit(1);
+};
+
+export function nextVersion(v: string, level: string) {
+  const [a, b, c] = v.split(".").map(Number);
+  return level === "major" ? `${a + 1}.0.0` : level === "minor" ? `${a}.${b + 1}.0` : `${a}.${b}.${c + 1}`;
+}
+export function levelOf(log: string) {
+  if (/BREAKING/.test(log)) return "major";
+  return /^feat(\(.*?\))?!?:/m.test(log) ? "minor" : "patch";
+}
+export function summaryOf(subjects: string[]) {
+  return subjects
+    .filter((s) => /^(feat|fix|perf)(\(.*?\))?!?:/.test(s))
+    .map((s) => s.replace(/^\w+(\(.*?\))?!?:\s*/, ""))
+    .join("; ");
+}
+
+if (import.meta.main) {
+  const args = process.argv.slice(2);
+  const forced = ["patch", "minor", "major"].includes(args[0]) ? args.shift() : null;
+  const pkg = JSON.parse(readFileSync("package.json", "utf8"));
+  const tagged = (v: string) => sh(["git", "tag", "-l", `v${v}`]) !== "";
+  const head = sh(["git", "log", "-1", "--format=%s"]);
+  if (sh(["git", "status", "--porcelain", "--untracked-files=no"])) {
+    console.error("release: commit or drop your changes first");
+    process.exit(1);
+  }
+  if (head.startsWith(`Release ${pkg.version}:`) && !tagged(pkg.version) && !forced) {
+    console.log(`release: reusing the unpublished bump commit for ${pkg.version}`);
+  } else {
+    const last = sh(["git", "describe", "--tags", "--abbrev=0"]);
+    const log = sh(["git", "log", "--format=%s%n%b", `${last}..HEAD`]);
+    if (!log) {
+      console.error(`release: nothing since ${last}`);
+      process.exit(1);
+    }
+    const level = forced ?? levelOf(log);
+    const v = nextVersion(pkg.version, level);
+    const summary = args.join(" ") || summaryOf(sh(["git", "log", "--reverse", "--format=%s", `${last}..HEAD`]).split("\n")) || "maintenance";
+    writeFileSync("package.json", readFileSync("package.json", "utf8").replace(`"version": "${pkg.version}"`, `"version": "${v}"`));
+    const note = ".kaizen/notes/Project/Release and testing.md";
+    try {
+      writeFileSync(note, readFileSync(note, "utf8").replace(`version ${pkg.version} in this checkout`, `version ${v} in this checkout`));
+    } catch {}
+    sh(["git", "add", "package.json", note]);
+    sh(["git", "commit", "-q", "-m", `Release ${v}: ${summary}`]);
+    console.log(`release: ${pkg.version} -> ${v} (${level})`);
+  }
+  // Tests run in prepublishOnly; a failure stops here with the commit unpushed.
+  run(["bun", "publish"]);
+  run(["git", "push", "origin", "HEAD"]);
+  run(["bun", "run", "publish:gh"]);
+}

package/cli/settings.test.ts

@@ -86,3 +86,11 @@ test("a config still holding git.branch_before_implement keeps its preset", () =
   expect(detectPreset(low, text)).toBe("low");
   expect(detectPreset(text, text)).toBe("medium");
 });
+
+test("a low-preset config saved before review.executor existed still reads as low", () => {
+  const text = readFileSync(defaults, "utf8");
+  const low = applyPreset("", "low", text);
+  const old = low.replace(/(review:\n(?:\s*#.*\n)*)\s*executor: inline\n/, "$1");
+  expect(old).not.toContain("executor: inline\n  # Let");
+  expect(detectPreset(old, text)).toBe("low");
+});

package/cli/settings.ts

@@ -25,6 +25,7 @@ export const PRESETS: Record<PresetName, {
       mode: "approve",
       runner: "lite",
       "build.executor": "inline",
+      "review.executor": "inline",
       "approvals.plan": "true",
       "approvals.review": "true",
       "approvals.each_file": "false",
@@ -105,6 +106,7 @@ const SETTINGS: Setting[] = [
   { key: "approvals.each_file", label: "Confirm every file edit", group: "Approvals", values: ["true", "false"], help: "", when: ["mode", "approve"] },
   { key: "runner", label: "Stage isolation", group: "Agents", values: ["full", "lite"], help: "full: separate agent per stage. lite: one session" },
   { key: "build.executor", label: "Who builds", group: "Agents", values: ["subagent", "inline", "ask"], help: "subagent: its own agent · inline: this session · ask: pick at plan approval", when: ["runner", "full"] },
+  { key: "review.executor", label: "Reviewer", group: "Agents", values: ["inline", "subagent", "ask"], help: "subagent: its own cold agent · inline: this session · ask: pick before review", when: ["runner", "lite"] },
   { key: "agent.default", label: "Tool the board launches", group: "Agents", values: ["auto", "claude", "codex", "agy", "opencode", "gemini"], help: "" },
   { key: "agent.launch", label: "Where the board runs agents", group: "Agents", values: ["card", "terminal"], help: "" },
   { key: "subagents.model", label: "Model for subagents", group: "Agents", values: ["inherit", "opus", "sonnet", "haiku"], help: "Planner, builder, reviewer", when: ["runner", "full"] },

package/cli/web.ts

@@ -9,7 +9,7 @@ import {
   reviewFindings, pickFindings, backlogCards, backlogItem, startedBacklog, closeBacklog, markBacklogDone, fixPrompt, approvalPrompt, canApproveAwaiting, nativePath, closeSessions, sweepSessions, issueUrl,
   launchMode, readSessions, ownerOf, runIndex, resumePrompt, runAgent, firstSession, webHosts,
 } from "./state.ts";
-import { attachPty, writePty, resizePty, ptyState, ptyKeys, adoptLoginEnv } from "./pty.ts";
+import { attachPty, writePty, resizePty, exitPty, ptyState, ptyKeys, adoptLoginEnv } from "./pty.ts";
 import { readSources, addSource, removeSource, moveSource, setCategory, setWriteback, readIcebox, promote, dismiss, restore, addItem, githubRepo, markDone, markReplied, gatherSource, freshImages, gatherAll, gatherDirs, due, socialUrl, socialOf } from "./sources.ts";
 import { projectLogo, LOGO_TYPES } from "./logo.ts";
 import * as chatgpt from "./chatgpt.ts";
@@ -389,6 +389,16 @@ export async function web(repoDir: string, opts: Opts = {}) {
         return bad("websocket expected", 426);
       }
 
+      // The Terminal page's ×: the agent is asked to /exit, and ended if it will not.
+      if (req.method === "POST" && path === "/pty/exit") {
+        if (!local(req)) return bad("cross-origin write refused", 403);
+        let body: any;
+        try { body = await req.json(); } catch { return bad("json body expected"); }
+        const key = String(body.key ?? "");
+        if (!/^[\w-]+$/.test(key) || !ptyState(key)) return bad("no such terminal", 404);
+        return json({ ok: exitPty(key) });
+      }
+
       // Every note of one project, text included: search, tags and backlinks are the page's.
       if (req.method === "GET" && path === "/vault") {
         const dir = url.searchParams.get("dir") ?? state ?? join(home, ".kaizen");

package/commands/kaizen-lite.md

@@ -1,5 +1,5 @@
 ---
-description: Run kaizen with every stage in this session — cheaper, and the reviewer has seen the work
+description: Run kaizen with every stage in this session — cheaper; the reviewer has seen the work unless review.executor is subagent
 ---
 
 Invoke the `kaizen` skill with argument `lite $ARGUMENTS`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kaizen-agent",
-  "version": "1.43.3",
+  "version": "1.45.0",
   "description": "Staged workflow for AI agents — code, writing, research, operations: plan, human approval, build, independent review, bounded fix loop.",
   "type": "module",
   "bin": {
@@ -28,7 +28,7 @@
     "prepublishOnly": "bun test",
     "postpublish": "sh cli/release.sh",
     "publish:gh": "sh cli/publish-gh.sh",
-    "release": "bun publish && bun run publish:gh"
+    "release": "bun run cli/release.ts"
   },
   "repository": {
     "type": "git",

package/skills/kaizen/SKILL.md

@@ -42,7 +42,7 @@ Porting the workflow to Codex or Antigravity is covered in [`adapters.md`](adapt
 | `/kaizen <request>` | Start a new run in the configured mode (default: `approve`) |
 | `/kaizen plan <request>` | Start a run and stop after the plan (`plan-only`) |
 | `/kaizen auto <request>` | Start a run in `auto` mode: every stage back to back, no approval stops |
-| `/kaizen lite <request>` | Run every stage in this session — cheap, and the reviewer has seen the work |
+| `/kaizen lite <request>` | Run every stage in this session — cheap, and the reviewer has seen the work unless `review.executor` is `subagent` |
 | `/kaizen full <request>` | Dispatch every stage as its own agent — the reviewer starts cold |
 | `/kaizen run` | Resume the current run and execute the approved plan |
 | `/kaizen review [target]` | Review-only: audit existing code, no plan, no implementation (`review-only`) |
@@ -210,11 +210,13 @@ would cost in one session and several times that. Set it for the project with
   The reviewer has never seen how the work was done, so it has nothing to defend.
   That is the entire reason its findings are worth reading, and it is what catches the
   bug in a fix rather than the bug in the plan.
-- **`lite`** — this session runs every stage itself, in order, as
+- **`lite`** — this session runs every stage itself (the review too, unless `review.executor` says otherwise), in order, as
   [`adapters.md`](adapters.md) already describes for tools that have no subagents.
   Read only the stage's declared inputs, write its artifact before starting the next,
   and when reviewing, judge the work on its own terms rather than defending the
   reasoning you used producing it.
+  `review.executor: subagent` hands just the review to a cold agent, which buys
+  back the independence for the price of one stage.
 
 Everything else holds in both: the plan, the approval stop, the numbered gate answered
 with evidence, numbered findings, the files, and a run another tool can pick up.
@@ -227,7 +229,7 @@ produced it — and a fix that is worse than the finding it closes is exactly th
 
 So: `lite` where being wrong is cheap and obvious, which is also where the short path
 above applies. `full` where being wrong is expensive. When a run is going to
-touch money, a migration, or anything hard to undo, say which runner it used at the
+touch money, a migration, or anything hard to undo, say which runner (and, for `lite`, which reviewer) it used at the
 final report, so nobody reads a same-session review as an independent one.
 
 ## Running a stage
@@ -241,7 +243,7 @@ it. Everything else in this file holds unchanged.
 
 **Check `runner` first.**
 
-- `runner: lite` — do not call the Agent tool. You run plan, build and review
+- `runner: lite` — do not call the Agent tool, except for the review as below. You run plan, build and review
   yourself, in that order, reading only each stage's declared inputs and writing its
   artifact before starting the next. The stage table below still applies; you are the
   agent for every row.
@@ -251,6 +253,9 @@ it. Everything else in this file holds unchanged.
   `runs/<id>/attachments/` embedded in `## Preview`, taken by driving a headless browser
   against the running app; "no browser session" or "same renderer as before" is not a
   reason, it is the gate failing. Short path or not, no screenshot means not built.
+  The review stage follows `review.executor`: `inline` (default) reviews in this session; `subagent` dispatches
+  `kaizen-reviewer` cold, as under `full`, for the review and every recheck; `ask` puts the choice to the user when the build is done.
+  Record the answer as `review_executor` in `state.json` so a resumed run keeps it.
 - `runner: full` — dispatch each stage as its own subagent, as follows.
 
 Under `full`, each stage runs as a subagent via the Agent tool, with the agent type
@@ -271,7 +276,7 @@ the choice at the plan approval. Building inline does not make the review less
 independent: the reviewer is a separate agent in every case, and never sees the
 conversation the work happened in.
 
-`subagents.model` and `subagents.effort` apply to every stage dispatched this way.
+`subagents.model` and `subagents.effort` apply to every stage dispatched this way, including a lite run's reviewer under `review.executor: subagent`.
 Pass `model` on the Agent call when it is not `inherit`. Effort has no call-time
 knob: when it is not `inherit`, make sure the frontmatter of the agent's definition
 (`~/.claude/agents/kaizen-<stage>.md`, or the project's `.claude/agents/` copy)

package/skills/kaizen/config.default.yml

@@ -59,6 +59,14 @@ auto_fix:
   max_iterations: 2
 
 review:
+  # Who reviews a lite run. Only read when runner is lite; under full the reviewer is
+  # always its own agent.
+  #   inline   - this session reviews its own work. Cheapest; expect it to miss what
+  #              it just did. The default, so a lite run costs what it always has.
+  #   subagent - plan and build stay in this session, the review (and every recheck in
+  #              the fix loop) goes to a cold reviewer agent that never saw the work.
+  #   ask      - offer the choice when the build is done, before the review.
+  executor: inline
   # Let the reviewer append durable lessons to .kaizen/memory.md.
   write_memory: true
   # Every stage of every future run reads memory.md, so cap it. Over this, the reviewer

package/skills/kaizen/settings.md

@@ -15,6 +15,7 @@ nearest first, so a change lands globally unless this project keeps its own conf
 | `mode` | `approve`, `auto`, `plan-only`, `review-only` | Where a run stops |
 | `runner` | `full`, `lite` | Whether each stage is its own cold agent, or this session runs them all |
 | `build.executor` | `subagent`, `inline`, `ask` | Who carries out the approved plan |
+| `review.executor` | `inline`, `subagent`, `ask` | Who reviews a lite run: this session, a cold reviewer agent, or ask before the review |
 | `approvals.plan` | `true`, `false` | Stop and show the plan before anything is built |
 | `approvals.review` | `true`, `false` | Stop after the review, before the run is called done |
 | `approvals.each_file` | `true`, `false` | Confirm every individual edit |
@@ -34,7 +35,8 @@ nearest first, so a change lands globally unless this project keeps its own conf
 | `agent.default` | `auto`, `claude`, `codex`, `agy`, `opencode`, `gemini` | Coding agent to launch from dashboard backlog |
 
 Some settings only have an effect while another stands a certain way: the approvals
-while `mode` is `approve`, `build.executor` and `subagents.*` while `runner` is `full`,
+while `mode` is `approve`, `build.executor` and `subagents.*` while `runner` is `full` (`subagents.*` also reaches a lite
+run's reviewer under `review.executor: subagent`), `review.executor` while `runner` is `lite`,
 `auto_fix.min_severity` and `auto_fix.max_iterations` while `auto_fix.enabled` is
 `true`, `sources.model` and `sources.effort` while `sources.agent` is `chatgpt`. When
 printing one of these that has no effect now, say so beside its value. Still offer it:

package/skills/kaizen/spec-main.md

@@ -138,7 +138,7 @@ Controlled by `approvals.review`, skipped in `auto`.
 Report: what was built (for a code run, show its Preview proof), verification results, findings fixed, findings still open,
 every criterion the reviewer answered `CANNOT VERIFY` with the check it says a human
 must make, anything the builder noted as out of scope, and the notes the *Docs gate*
-touched. Where the run used `runner: lite`, say
+touched. Where the run used `runner: lite` and reviewed inline (`review.executor: inline`), say
 so in that report — the reviewer saw the work, and nobody should read a same-session
 review as an independent one because the output looked the same.
 Later build requests in the same session follow *Follow-ups are runs too* in [`spec.md`](spec.md): a revise of this run until it is `done`, then a new linked run.

package/skills/kaizen/spec.md

@@ -111,6 +111,7 @@ Write into `00-request.md`: the verbatim request, the deliverable, what done mea
 and what wrong means. Record in `state.json`: `id`, `mode`, `runner`, `agent`, `track`,
 `stage: "plan"`, `awaiting: null`, `iteration: 0`, and `updated` — the time of this
 write, refreshed on every later one.
+A `lite` run also records `review_executor` (`inline` or `subagent`, from `review.executor`, `ask` resolved) once it is known, and a resumed run keeps it.
 Where the environment has `CLAUDE_CODE_SESSION_ID`, also record it as `session`: the
 board keeps the run on the card it was launched from by that id.
 

package/skills/kaizen-help/SKILL.md

@@ -23,7 +23,7 @@ anything.
 | `/kaizen <request>` | Start a new run in the configured mode (default: `approve`) |
 | `/kaizen plan <request>` | Start a run and stop after the plan (`plan-only`) |
 | `/kaizen auto <request>` | Start a run in `auto` mode: every stage back to back, no approval stops |
-| `/kaizen lite <request>` | Run the stages in this session — cheap, reviewer has seen the work |
+| `/kaizen lite <request>` | Run the stages in this session — cheap, reviewer has seen the work (unless `review.executor: subagent`) |
 | `/kaizen full <request>` | Dispatch each stage as its own cold agent |
 | `/kaizen run` | Resume the current run and execute the approved plan |
 | `/kaizen review [target]` | Review-only: audit existing code, no plan, no implementation |
@@ -85,6 +85,7 @@ Each iteration is written to `runs/<id>/05-iterations/`.
 | `approvals.review` | `false` | Stop after the review |
 | `approvals.each_file` | `false` | Confirm every file edit |
 | `build.executor` | `subagent` | Who builds: `subagent`, `inline` (main thread), or `ask` at the approval |
+| `review.executor` | `inline` | Lite only — who reviews: `inline` (this session), `subagent` (cold agent), or `ask` |
 | `auto_fix.enabled` | `true` | Auto-fix findings vs. escalate everything |
 | `auto_fix.min_severity` | `high` | Threshold for auto-fix (`critical\|high\|medium\|low`) |
 | `auto_fix.max_iterations` | `2` | Fix/recheck rounds before escalating remaining findings |

package/web/board/terms.ts

@@ -1,6 +1,6 @@
 import { store } from "./store.ts";
 import { $, html, ico } from "./dom.ts";
-import { load } from "./api.ts";
+import { load, post } from "./api.ts";
 import { termLoad } from "./agent-term.ts";
 import { open } from "./panel.ts";
 import { resume } from "./approvals.ts";
@@ -13,7 +13,7 @@ import { resume } from "./approvals.ts";
 // ponytail: a √n grid with draggable borders, not an i3-style split tree; add one if a grid falls short.
 // mode: grid (√n), cols (side by side) or rows (stacked, so borders drag up and down).
 type Lay = { mode: string; order: string[]; hidden: string[]; max: string | null; sizes: Record<string, { c: number[]; r: number[] }> };
-const MODES = [["grid", "Grid"], ["cols", "Side by side"], ["rows", "Stacked"]];
+const MODES = [["grid", "Grid", "lgrid"], ["cols", "Side by side", "lcols"], ["rows", "Stacked", "lrows"]];
 const GAP = 6;
 let lay: Lay = { mode: "grid", order: [], hidden: [], max: null, sizes: {} };
 try {
@@ -51,11 +51,32 @@ function sessions() {
 
 export function termsStop() {
   showing = false;
+  document.body.classList.remove("tmax");
   for (const t of tiles.values()) t.off?.();
   tiles.clear();
   $("terms").innerHTML = "";
 }
 
+// A header button took focus off the terminal; give it back so typing carries on.
+const focusTerm = (k: string) => tiles.get(k)?.el.querySelector<HTMLElement>(".xterm-helper-textarea")?.focus({ preventScroll: true });
+// Ctrl+Shift+M maximises or restores the tile being typed in. Escape belongs to the agent,
+// so the key is read in capture, before xterm sends it on.
+if (typeof window !== "undefined") addEventListener(
+  "keydown",
+  (e) => {
+    if (!showing || !e.ctrlKey || !e.shiftKey || e.altKey || e.metaKey || e.code !== "KeyM" || phone?.matches) return;
+    const k = (e.target as HTMLElement).closest?.<HTMLElement>(".tile")?.dataset.k || lay.max;
+    if (!k) return;
+    e.preventDefault();
+    e.stopPropagation();
+    lay.max = lay.max === k ? null : k;
+    save();
+    openTerms();
+    focusTerm(k);
+  },
+  true,
+);
+
 export function openTerms() {
   showing = true;
   if (!phone) (phone = matchMedia("(max-width:640px)")).onchange = () => showing && openTerms();
@@ -86,7 +107,9 @@ export function openTerms() {
   }
   // An ended session closed with × has nothing to come back to: no chip for it.
   const hid = [...all.keys()].filter((k) => lay.hidden.includes(k) && all.get(k).pty.alive);
-  bar!.innerHTML = html`<span class="bar" role="group" aria-label="Layout">${MODES.map(([v, l]) => html`<button data-mode="${v}" class="${lay.mode === v ? "on" : ""}" aria-pressed="${String(lay.mode === v)}">${l}</button>`)}</span>${hid.length ? html`<span class="dim">Hidden</span>${hid.map((k) => html`<button class="chip" data-show="${k}" title="Show this terminal">${ico("plus")}${nameOf(all.get(k))} - ${projOf(all.get(k))}</button>`)}` : ""}${phone.matches && keys.length > 1 ? html`<span class="ttabs" role="group" aria-label="Terminals">${keys.map((k) => html`<button class="${k === one ? "on" : ""}" data-pick="${k}" aria-pressed="${String(k === one)}"><span class="tdot ${tst(all.get(k))}"></span>${nameOf(all.get(k))} - ${projOf(all.get(k))}</button>`)}</span>` : ""}`.s;
+  // The layout switch sits at the right of the page header.
+  $("tmodes").innerHTML = html`${MODES.map(([v, l, i]) => html`<button data-mode="${v}" class="${lay.mode === v ? "on" : ""}" aria-pressed="${String(lay.mode === v)}" title="${l}" aria-label="${l}">${ico(i)}</button>`)}`.s;
+  bar!.innerHTML = html`${hid.length ? html`<span class="dim">Hidden</span>${hid.map((k) => html`<button class="chip" data-show="${k}" title="Show this terminal">${ico("plus")}${nameOf(all.get(k))} - ${projOf(all.get(k))}</button>`)}` : ""}${phone.matches && keys.length > 1 ? html`<span class="ttabs" role="group" aria-label="Terminals">${keys.map((k) => html`<button class="${k === one ? "on" : ""}" data-pick="${k}" aria-pressed="${String(k === one)}"><span class="tdot ${tst(all.get(k))}"></span>${nameOf(all.get(k))} - ${projOf(all.get(k))}</button>`)}</span>` : ""}`.s;
   bar!.querySelectorAll<HTMLElement>("[data-pick]").forEach(
     (b) =>
       (b.onclick = () => {
@@ -95,7 +118,7 @@ export function openTerms() {
       }),
   );
   bar!.querySelector(".ttabs .on")?.scrollIntoView({ block: "nearest", inline: "nearest" });
-  bar!.querySelectorAll<HTMLElement>("[data-mode]").forEach(
+  $("tmodes").querySelectorAll<HTMLElement>("[data-mode]").forEach(
     (b) =>
       (b.onclick = () => {
         lay.mode = b.dataset.mode!;
@@ -122,6 +145,8 @@ export function openTerms() {
     );
     return;
   }
+  const had = document.activeElement;
+  let i = 0;
   for (const k of keys) {
     const c = all.get(k);
     let t = tiles.get(k);
@@ -140,12 +165,19 @@ export function openTerms() {
     const hd = t.el.querySelector("header")!;
     hd.title = (c.kind === "run" ? c.id : c.text) + " · " + c.where;
     // An ended run can be resumed from here; an idea whose agent ended has no run to resume.
-    hd.innerHTML = html`<span class="tdot ${st}" role="img" title="${st}" aria-label="${st}"></span><b>${nameOf(c)} - ${projOf(c)}</b>${off ? html`<span class="tend">ended</span>` : ""}<span class="sp"></span>${off && c.kind === "run" ? html`<button class="btn sm" data-a="resume" title="Continue this run's agent">Resume</button>` : ""}<button class="ib sm" data-a="card" title="Open card" aria-label="Open card">${ico("open")}</button><button class="ib sm" data-a="max" title="${lay.max === k ? "Restore" : "Maximise"}" aria-label="${lay.max === k ? "Restore" : "Maximise"}">${ico(lay.max === k ? "min" : "max")}</button><button class="ib sm" data-a="hide" title="${off ? "Close" : "Hide"}" aria-label="${off ? "Close" : "Hide"}">${ico("close")}</button>`.s;
+    hd.innerHTML = html`<span class="tdot ${st}" role="img" title="${st}" aria-label="${st}"></span><b>${nameOf(c)} - ${projOf(c)}</b>${off ? html`<span class="tend">ended</span>` : ""}<span class="sp"></span>${off && c.kind === "run" ? html`<button class="btn sm" data-a="resume" title="Continue this run's agent">Resume</button>` : ""}<button class="ib sm" data-a="card" title="Open card" aria-label="Open card">${ico("open")}</button><button class="ib sm" data-a="max" title="${lay.max === k ? "Restore" : "Maximise"} (Ctrl+Shift+M)" aria-label="${lay.max === k ? "Restore" : "Maximise"}">${ico(lay.max === k ? "min" : "max")}</button>${off ? "" : html`<button class="ib sm" data-a="hide" title="Hide" aria-label="Hide">${ico("dash")}</button>`}<button class="ib sm" data-a="${off ? "hide" : "exit"}" title="${off ? "Close" : "Exit session"}" aria-label="${off ? "Close" : "Exit session"}">${ico("close")}</button>`.s;
     t.el.classList.toggle("ended", off);
     t.el.classList.toggle("off", !!one && one !== k);
+    t.el.classList.toggle("max", !phone.matches && lay.max === k);
     t.el.style.gridColumn = "";
-    grid.append(t.el); // in order
+    // In order, moving only what is out of place: a moved tile loses its terminal's focus,
+    // and every /state tick came here, so typed keys fell to the page (Firefox's find bar).
+    if (grid.children[i] !== t.el) grid.insertBefore(t.el, grid.children[i] || null);
+    i++;
   }
+  if (had instanceof HTMLElement && had !== document.activeElement && had.isConnected) had.focus({ preventScroll: true });
+  // Maximised fills the window, over the sidebar and header: with one terminal it was already the whole grid.
+  document.body.classList.toggle("tmax", !!lay.max && !phone.matches);
   // Grid is √n, the last tile spanning what its row leaves empty; side by side is one row, stacked one column.
   const n = one ? 1 : keys.length,
     cols = lay.mode === "cols" ? n : lay.mode === "rows" ? 1 : Math.ceil(Math.sqrt(n)),
@@ -180,6 +212,10 @@ function wire(el: HTMLElement) {
     else if (a === "hide") {
       lay.hidden.push(k);
       if (lay.max === k) lay.max = null;
+    } else if (a === "exit") {
+      // The tile stays, turning "ended" with its Resume button when the agent is gone.
+      if (confirm("End this agent session? A run can be resumed from its tile or card.")) post("/pty/exit", { key: k }).then(() => load(true));
+      return;
     } else if (a === "card") {
       const c = sessions().get(k);
       if (c) open(c);
@@ -192,6 +228,7 @@ function wire(el: HTMLElement) {
     } else return;
     save();
     openTerms();
+    focusTerm(k);
   };
   el.querySelector("header")!.ondblclick = (e) => {
     // A phone shows one tile anyway: a double-tap there would only leave desktop maximised.
@@ -199,6 +236,7 @@ function wire(el: HTMLElement) {
     lay.max = lay.max === k ? null : k;
     save();
     openTerms();
+    focusTerm(k);
   };
   // Drag a header onto another tile: the two swap places.
   el.querySelector("header")!.ondragstart = (e) => {

package/web/board.html

@@ -272,7 +272,7 @@ body.paged:not(.ice) .hdr,body.ice aside.docked>header{display:none}body.ice #ne
 /* The Terminal page: the project bar stays (it picks whose terminals show), the board gives way to the tiles */
 #terms{display:none}body.termv.paged .hdr{display:flex}body.termv #newtop,body.termv #fbtn{display:none!important}
 body.termv #terms{flex:1;min-height:0;display:flex;flex-direction:column;gap:8px;padding:10px 20px 14px 28px}
-.tbar{display:flex;flex-wrap:wrap;align-items:center;gap:6px;font-size:12px}.tbar .bar{margin-right:8px}.tbar .bar button{padding:0 10px;font-size:12px}.tbar .chip{cursor:pointer;background:none;border:0;font:inherit;font-size:11px}.tbar .chip:hover{color:var(--ink)}.tbar svg{width:12px;height:12px}
+.tbar{display:flex;flex-wrap:wrap;align-items:center;gap:6px;font-size:12px}#tmodes{display:none}body.termv #tmodes{display:inline-flex}#tmodes button{display:inline-grid;place-items:center;padding:0 8px}#tmodes svg{width:16px;height:16px}.tbar .chip{cursor:pointer;background:none;border:0;font:inherit;font-size:11px}.tbar .chip:hover{color:var(--ink)}.tbar svg{width:12px;height:12px}
 .tgrid{position:relative;flex:1;min-height:0;display:grid;gap:6px}
 .tile{display:flex;flex-direction:column;min-width:0;min-height:0;border:1px solid var(--line);border-radius:var(--r-s);background:var(--bg);overflow:hidden}.tile.off{display:none}.tile.drop{outline:2px solid var(--accent);outline-offset:-2px}
 .tile header{display:flex;align-items:center;gap:8px;min-height:30px;padding:0 4px 0 10px;border-bottom:1px solid var(--line);background:var(--bg-2);cursor:grab;user-select:none}
@@ -281,11 +281,12 @@ body.termv #terms{flex:1;min-height:0;display:flex;flex-direction:column;gap:8px
 .tdot{flex:none;width:8px;height:8px;border-radius:50%;background:var(--run)}.tdot.asking{background:var(--warn)}.tdot.ended{background:var(--dim);opacity:.6}
 .tile .term{flex:1;min-height:0}.tile .term .xterm{height:100%;padding:4px}.tile .term .xterm-viewport{background:transparent!important}
 .tsplit{position:absolute;z-index:2;touch-action:none}.tsplit.c{top:0;width:10px;margin-left:-5px;cursor:col-resize}.tsplit.r{left:0;right:0;height:10px;margin-top:-5px;cursor:row-resize}.tsplit:hover,.tdrag .tsplit:active{background:color-mix(in srgb,var(--accent) 35%,transparent)}
+.tile.max{position:fixed;inset:8px;z-index:10;box-shadow:var(--shadow-1)}body.tmax .tsplit{display:none}
 body.tdrag{user-select:none}body.tdrag .tile{pointer-events:none}
 @media(max-width:900px){body.termv #terms{padding-inline:16px}}
 /* A phone has no room for a grid or a stack: one terminal fills the page, and tabs above pick which */
 .ttabs{display:none}
-@media(max-width:640px){.tbar .bar,.tile [data-a=max],.tsplit{display:none}.ttabs{display:flex;order:-1;flex:1 0 100%;min-width:0;gap:6px;overflow-x:auto;scrollbar-width:none}.ttabs button{flex:none;display:inline-flex;align-items:center;gap:6px;height:30px;padding:0 10px;border:1px solid var(--line);border-radius:var(--r-pill);background:none;color:var(--dim);font:inherit;font-size:12px;white-space:nowrap}.ttabs button.on{color:var(--ink);background:var(--hover);border-color:var(--accent)}.tgrid{display:flex;flex-direction:column}.tile{flex:1}.tile.off{display:none}}
+@media(max-width:640px){body.termv #tmodes,.tile [data-a=max],.tsplit{display:none}.ttabs{display:flex;order:-1;flex:1 0 100%;min-width:0;gap:6px;overflow-x:auto;scrollbar-width:none}.ttabs button{flex:none;display:inline-flex;align-items:center;gap:6px;height:30px;padding:0 10px;border:1px solid var(--line);border-radius:var(--r-pill);background:none;color:var(--dim);font:inherit;font-size:12px;white-space:nowrap}.ttabs button.on{color:var(--ink);background:var(--hover);border-color:var(--accent)}.tgrid{display:flex;flex-direction:column}.tile{flex:1}.tile.off{display:none}}
 aside.docked{position:static;z-index:auto;flex:1;min-height:0;width:auto;transform:none;visibility:visible;transition:none;box-shadow:none;border:0;background:none}
 aside.docked>header,aside.docked>.body{padding-inline:28px}
 aside.docked>header{border-bottom:0;padding-top:28px;padding-bottom:12px}
@@ -535,6 +536,10 @@ a.schip:hover{color:var(--ink);border-color:color-mix(in srgb,var(--line) 60%,va
 <symbol id="i-term" viewBox="0 0 24 24"><path d="M4 17l6-5-6-5M12 19h8"/></symbol>
 <symbol id="i-max" viewBox="0 0 24 24"><path d="M4 9V4h5M20 9V4h-5M4 15v5h5M20 15v5h-5"/></symbol>
 <symbol id="i-min" viewBox="0 0 24 24"><path d="M9 4v5H4M15 4v5h5M9 20v-5H4M15 20v-5h5"/></symbol>
+<symbol id="i-lgrid" viewBox="0 0 24 24"><rect x="3" y="3" width="7" height="7" rx="1"/><rect x="14" y="3" width="7" height="7" rx="1"/><rect x="3" y="14" width="7" height="7" rx="1"/><rect x="14" y="14" width="7" height="7" rx="1"/></symbol>
+<symbol id="i-lcols" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M12 3v18"/></symbol>
+<symbol id="i-lrows" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M3 12h18"/></symbol>
+<symbol id="i-dash" viewBox="0 0 24 24"><path d="M5 12h14"/></symbol>
 <symbol id="i-close" viewBox="0 0 24 24"><path d="M18 6L6 18M6 6l12 12"/></symbol>
 <symbol id="i-more" viewBox="0 0 24 24"><circle cx="5" cy="12" r="1.2" fill="currentColor"/><circle cx="12" cy="12" r="1.2" fill="currentColor"/><circle cx="19" cy="12" r="1.2" fill="currentColor"/></symbol>
 <symbol id="i-open" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M15 3v18"/></symbol>
@@ -606,6 +611,7 @@ a.schip:hover{color:var(--ink);border-color:color-mix(in srgb,var(--line) 60%,va
   <button class="ib" id="fbtn" aria-label="Filter by status" title="Filter by status" aria-expanded="false" hidden><svg><use href="#i-filter"/></svg></button>
   <input type="search" class="sel" id="bq" placeholder="Filter cards (press /)" aria-label="Filter cards" spellcheck="false" autocomplete="off">
   <span class="sp"></span>
+  <span class="bar" id="tmodes" role="group" aria-label="Layout"></span>
   <button class="btn pri" id="newtop">New idea</button>
 </div>
 <main id="board" aria-live="polite" aria-busy="true"><section aria-hidden="true"><span class="skel" style="height:14px;width:40%;margin:4px 0 12px"></span><span class="skel" style="height:72px;margin-bottom:8px"></span><span class="skel" style="height:72px"></span></section><section aria-hidden="true"><span class="skel" style="height:14px;width:40%;margin:4px 0 12px"></span><span class="skel" style="height:72px;margin-bottom:8px"></span><span class="skel" style="height:72px"></span></section><section aria-hidden="true"><span class="skel" style="height:14px;width:40%;margin:4px 0 12px"></span><span class="skel" style="height:72px;margin-bottom:8px"></span><span class="skel" style="height:72px"></span></section><section aria-hidden="true"><span class="skel" style="height:14px;width:40%;margin:4px 0 12px"></span><span class="skel" style="height:72px;margin-bottom:8px"></span><span class="skel" style="height:72px"></span></section><section aria-hidden="true"><span class="skel" style="height:14px;width:40%;margin:4px 0 12px"></span><span class="skel" style="height:72px;margin-bottom:8px"></span><span class="skel" style="height:72px"></span></section></main>