kaizen-agent 1.41.0 → 1.41.3

package/cli/conpty.ts

@@ -0,0 +1,99 @@
+// Windows has no Bun.Terminal, so the in-card terminal there runs through a small
+// ConPTY host: PowerShell compiles the C# below with Add-Type, starts the command in
+// a pseudo console, and bridges it to plain pipes. Its stdout is the screen, its
+// stdin the keys. A resize travels in-band on stdin as ESC ] kzr;<cols>;<rows> BEL,
+// a sequence no key produces, and is taken out before the rest reaches the console.
+const HOST = String.raw`
+using System; using System.IO; using System.Threading; using System.Runtime.InteropServices;
+public static class KzPty {
+  [StructLayout(LayoutKind.Sequential)] struct COORD { public short X, Y; }
+  [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] struct STARTUPINFO {
+    public int cb; public string r, d, t; public int x, y, w, h, cx, cy, fa, fl; public short sw, r2; public IntPtr r3, i, o, e; }
+  [StructLayout(LayoutKind.Sequential)] struct STARTUPINFOEX { public STARTUPINFO si; public IntPtr attrs; }
+  [StructLayout(LayoutKind.Sequential)] struct PI { public IntPtr hp, ht; public int pid, tid; }
+  [DllImport("kernel32.dll", SetLastError = true)] static extern bool CreatePipe(out IntPtr r, out IntPtr w, IntPtr a, int s);
+  [DllImport("kernel32.dll")] static extern int CreatePseudoConsole(COORD c, IntPtr i, IntPtr o, uint f, out IntPtr h);
+  [DllImport("kernel32.dll")] static extern int ResizePseudoConsole(IntPtr h, COORD c);
+  [DllImport("kernel32.dll")] static extern void ClosePseudoConsole(IntPtr h);
+  [DllImport("kernel32.dll", SetLastError = true)] static extern bool InitializeProcThreadAttributeList(IntPtr l, int n, int f, ref IntPtr s);
+  [DllImport("kernel32.dll", SetLastError = true)] static extern bool UpdateProcThreadAttribute(IntPtr l, uint f, IntPtr a, IntPtr v, IntPtr s, IntPtr p, IntPtr r);
+  [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)] static extern bool CreateProcessW(string app, string cmd, IntPtr pa, IntPtr ta, bool inh, uint f, IntPtr env, string cwd, ref STARTUPINFOEX si, out PI pi);
+  [DllImport("kernel32.dll")] static extern uint WaitForSingleObject(IntPtr h, uint ms);
+  [DllImport("kernel32.dll")] static extern bool GetExitCodeProcess(IntPtr h, out int c);
+  [DllImport("kernel32.dll")] static extern bool CloseHandle(IntPtr h);
+  static COORD Size(int c, int r) { COORD s; s.X = (short)c; s.Y = (short)r; return s; }
+  static FileStream Of(IntPtr h, FileAccess a) { return new FileStream(new Microsoft.Win32.SafeHandles.SafeFileHandle(h, true), a); }
+  public static int Run(string cmd, int cols, int rows) {
+    IntPtr inR, inW, outR, outW, hpc;
+    if (!CreatePipe(out inR, out inW, IntPtr.Zero, 0) || !CreatePipe(out outR, out outW, IntPtr.Zero, 0)) return 1;
+    int hr = CreatePseudoConsole(Size(cols, rows), inR, outW, 0, out hpc);
+    if (hr != 0) { Console.Error.WriteLine("CreatePseudoConsole failed: " + hr); return 1; }
+    IntPtr sz = IntPtr.Zero;
+    InitializeProcThreadAttributeList(IntPtr.Zero, 1, 0, ref sz);
+    var si = new STARTUPINFOEX(); si.si.cb = Marshal.SizeOf(typeof(STARTUPINFOEX));
+    // STARTF_USESTDHANDLES with none: otherwise the child takes this host's piped stdio, not the console.
+    si.si.fl = 0x100;
+    si.attrs = Marshal.AllocHGlobal(sz);
+    if (!InitializeProcThreadAttributeList(si.attrs, 1, 0, ref sz)
+      || !UpdateProcThreadAttribute(si.attrs, 0, (IntPtr)0x20016, hpc, (IntPtr)IntPtr.Size, IntPtr.Zero, IntPtr.Zero)) return 1;
+    PI pi;
+    if (!CreateProcessW(null, cmd, IntPtr.Zero, IntPtr.Zero, false, 0x80000, IntPtr.Zero, null, ref si, out pi)) {
+      Console.Error.WriteLine("CreateProcess failed: " + Marshal.GetLastWin32Error()); return 1; }
+    // The console holds its own copies; ours would keep the pipes open past its end.
+    CloseHandle(inR); CloseHandle(outW);
+    var input = Of(inW, FileAccess.Write); var output = Of(outR, FileAccess.Read);
+    var stdout = Console.OpenStandardOutput();
+    var pump = new Thread(() => {
+      var b = new byte[16384]; int n;
+      try { while ((n = output.Read(b, 0, b.Length)) > 0) { stdout.Write(b, 0, n); stdout.Flush(); } } catch { }
+    });
+    pump.IsBackground = true; pump.Start();
+    var keys = new Thread(() => {
+      var stdin = Console.OpenStandardInput(); var b = new byte[4096]; int n;
+      var held = new MemoryStream();
+      try {
+        while ((n = stdin.Read(b, 0, b.Length)) > 0) {
+          // ponytail: a UTF-8 character split across two reads decodes as U+FFFD; hold incomplete tails if that shows up.
+          held.Write(b, 0, n);
+          var s = System.Text.Encoding.UTF8.GetString(held.ToArray());
+          // A resize cut in half by the pipe waits for its other half.
+          int keep = s.LastIndexOf("\x1b]kzr;");
+          if (keep >= 0 && s.IndexOf('\x07', keep) < 0) { held = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(s.Substring(keep))); s = s.Substring(0, keep); }
+          else held = new MemoryStream();
+          s = System.Text.RegularExpressions.Regex.Replace(s, "\x1b]kzr;(\\d+);(\\d+)\x07", m => {
+            ResizePseudoConsole(hpc, Size(int.Parse(m.Groups[1].Value), int.Parse(m.Groups[2].Value))); return ""; });
+          var o = System.Text.Encoding.UTF8.GetBytes(s);
+          if (o.Length > 0) { input.Write(o, 0, o.Length); input.Flush(); }
+        }
+      } catch { }
+    });
+    keys.IsBackground = true; keys.Start();
+    WaitForSingleObject(pi.hp, 0xFFFFFFFF);
+    int code; GetExitCodeProcess(pi.hp, out code);
+    // Closing the console flushes its last frame into the pump, then ends it.
+    ClosePseudoConsole(hpc);
+    pump.Join(2000);
+    return code;
+  }
+}`;
+
+// The PowerShell that hosts it: the child's command line, size and directory come in
+// through the environment, so nothing the agent is given passes through a quoting layer.
+const SCRIPT = `Add-Type -TypeDefinition @'
+${HOST}
+'@
+Set-Location -LiteralPath $env:KZ_PTY_CWD
+exit [KzPty]::Run($env:KZ_PTY_CMD, [int]$env:KZ_PTY_COLS, [int]$env:KZ_PTY_ROWS)`;
+
+export const conptyHost = () => Buffer.from(SCRIPT, "utf16le").toString("base64");
+
+export const resizeSeq = (cols: number, rows: number) => `\x1b]kzr;${cols};${rows}\x07`;
+
+// The command line the pseudo console starts: PowerShell running cmd. It finds .cmd
+// shims (npm installs claude as one), which CreateProcess alone does not, and takes
+// the arguments as -EncodedCommand, as findTerminal does, so newlines survive.
+export function innerCommand(shell: string, cmd: string[]): string {
+  const q = (a: string) => `'${a.replace(/'/g, "''")}'`;
+  const enc = Buffer.from(`& ${cmd.map(q).join(" ")}`, "utf16le").toString("base64");
+  return `"${shell}" -NoProfile -EncodedCommand ${enc}`;
+}

package/cli/install.ts

@@ -576,7 +576,8 @@ if (upgrade) {
   // is not a failed upgrade: the version on disk is what decides.
   if (after !== latest) {
     console.log(`\n  ${c.bold(`could not install kaizen ${latest}`)}`);
-    console.log(`  ${c.dim("try:")} ${c.cyan(`bunx kaizen-agent@${latest}`)}\n`);
+    // npm names a new version before it serves it (its review takes minutes).
+    console.log(`  ${c.dim("npm may still be publishing it: try again in a few minutes, or run")} ${c.cyan(`bunx kaizen-agent@${latest}`)}\n`);
     process.exit(1);
   }
   console.log(`\n  ${c.bold("Upgraded")}  ${c.dim(now)} → ${c.green(after)}\n  ${c.dim("Restart Claude Code to pick up any new slash commands.")}\n`);

package/cli/pty.test.ts

@@ -5,7 +5,8 @@ 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 } from "./pty.ts";
+import { loginEnv, startPty, writePty, attachPty, ptyState } from "./pty.ts";
+import { conptyHost, innerCommand, resizeSeq } from "./conpty.ts";
 
 const root = realpathSync(mkdtempSync(join(tmpdir(), "kaizen-pty-")));
 
@@ -194,3 +195,27 @@ test("asking: Claude Code and Codex prompts count as a question, ordinary output
   expect(asking("Do you want to make this edit to cli/pty.ts?")).toBe(true);
   expect(asking("Reading cli/pty.ts\r\n\x1b[2K✻ Thinking… 1. step one done")).toBe(false);
 });
+
+test("Windows ConPTY host: resize travels in-band, the agent command survives quotes and newlines", () => {
+  expect(resizeSeq(100, 40)).toBe("\x1b]kzr;100;40\x07");
+  const line = innerCommand("C:\\ps.exe", ["claude", "it's\nhere"]);
+  const enc = line.split(" ").pop()!;
+  expect(line.startsWith('"C:\\ps.exe" -NoProfile -EncodedCommand ')).toBe(true);
+  expect(Buffer.from(enc, "base64").toString("utf16le")).toBe("& 'claude' 'it''s\nhere'");
+  // The host script decodes to PowerShell carrying the C# whole.
+  expect(Buffer.from(conptyHost(), "base64").toString("utf16le")).toContain("CreatePseudoConsole");
+});
+
+test.skipIf(process.platform !== "win32")("on Windows a card agent runs in a pseudo console and takes typed input", async () => {
+  const key = `win-${Date.now()}`;
+  const out: string[] = [];
+  startPty(key, ["cmd.exe", "/q", "/k", "echo ready"], root);
+  attachPty(key, (d) => { if (d) out.push(d); });
+  const until = async (re: RegExp) => { for (let i = 0; i < 300 && !re.test(out.join("")); i++) await Bun.sleep(100); return out.join(""); };
+  expect(await until(/ready/)).toContain("ready");
+  writePty(key, "echo typed-%OS%\r");
+  expect(await until(/typed-Windows_NT/)).toContain("typed-Windows_NT");
+  writePty(key, "exit\r");
+  for (let i = 0; i < 100 && ptyState(key)?.alive; i++) await Bun.sleep(100);
+  expect(ptyState(key)?.alive).toBe(false);
+}, 60_000);

package/cli/pty.ts

@@ -1,8 +1,15 @@
 // Agents the web board runs itself, each in a pseudo-terminal the board owns, so a
 // card can show the agent's screen and pass it the user's typing (agent.launch: card).
 // They live in this process: the board stopping ends them, as closing a terminal
-// window ends the agent in it. Bun has no pseudo-terminal on Windows.
+// window ends the agent in it. Bun has no pseudo-terminal on Windows; there the
+// agent runs under a ConPTY host (conpty.ts) spoken to over pipes.
 import { writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { conptyHost, innerCommand, resizeSeq } from "./conpty.ts";
+
+const WIN = process.platform === "win32";
+// Windows PowerShell, which every Windows has, both hosts the console and runs the agent in it.
+const winPs = () => join(process.env.SystemRoot ?? "C:\\Windows", "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
 
 type Pty = { proc: Bun.Subprocess; out: string[]; size: number; listeners: Set<(d: string | null) => void>; exit: number | null; asking: boolean; quiet?: Timer; total: number; since: number; onChange?: () => void };
 
@@ -24,7 +31,7 @@ export const asking = (screen: string) =>
 const QUIET_MS = 700;
 // Bun gained pseudo-terminals in 1.3.5; an older one spawns without a tty, so it
 // keeps opening terminal windows.
-export const ptySupported = process.platform !== "win32" && typeof (Bun as any).Terminal === "function";
+export const ptySupported = WIN || typeof (Bun as any).Terminal === "function";
 
 // Starts cmd in a new pseudo-terminal under `key` and returns its PID. pidFile gets
 // that PID, the agent's own, so closeSessions can end it like any launched session.
@@ -46,7 +53,21 @@ export function startPty(key: string, cmd: string[], cwd: string, pidFile?: stri
       flag(p.exit === null && n > 0 && asking(p.out.join("").slice(-n)));
     }, QUIET_MS);
   };
-  p.proc = Bun.spawn(cmd, {
+  if (WIN) {
+    const ps = winPs();
+    p.proc = Bun.spawn([ps, "-NoProfile", "-NonInteractive", "-EncodedCommand", conptyHost()], {
+      cwd,
+      env: { ...process.env, KZ_PTY_CMD: innerCommand(ps, cmd), KZ_PTY_CWD: cwd, KZ_PTY_COLS: "120", KZ_PTY_ROWS: "32" },
+      stdin: "pipe", stdout: "pipe", stderr: "pipe", windowsHide: true,
+    });
+    const read = async (s: ReadableStream<Uint8Array>) => {
+      const d = new TextDecoder();
+      for await (const c of s) push(d.decode(c, { stream: true }));
+    };
+    read(p.proc.stdout as ReadableStream<Uint8Array>).catch(() => {});
+    // The host's own failures (Add-Type, CreateProcess) land on the screen, not nowhere.
+    read(p.proc.stderr as ReadableStream<Uint8Array>).catch(() => {});
+  } else p.proc = Bun.spawn(cmd, {
     cwd,
     env: { ...process.env, TERM: "xterm-256color", COLORTERM: "truecolor" },
     terminal: { cols: 120, rows: 32, data: (_t, d) => push(dec.decode(d, { stream: true })) },
@@ -82,13 +103,18 @@ export function writePty(key: string, d: string) {
   if (!p || p.exit !== null) return;
   p.since = p.total;
   if (p.asking) { p.asking = false; p.onChange?.(); }
-  p.proc.terminal?.write(d);
+  send(p, d);
 }
 
+const send = (p: Pty, d: string) => {
+  if (!WIN) return p.proc.terminal?.write(d);
+  try { (p.proc.stdin as Bun.FileSink).write(d); (p.proc.stdin as Bun.FileSink).flush(); } catch { /* host gone */ }
+};
+
 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));
-  if (p && p.exit === null) p.proc.terminal?.resize(c, r);
+  if (p && p.exit === null) WIN ? send(p, resizeSeq(c, r)) : p.proc.terminal?.resize(c, r);
 }
 
 export const ptyKeys = () => [...ptys.keys()];

package/cli/state.test.ts

@@ -93,6 +93,22 @@ test("boardCards: a started idea stays until its run has a state.json", () => {
   rmSync(join(dir, ".."), { recursive: true, force: true });
 });
 
+test("boardCards: a started idea retires into the run its launch's session wrote, however reworded", () => {
+  const dir = join(mkdtempSync(join(tmpdir(), "kaizen-")), ".kaizen");
+  const r = join(dir, "runs", "2026-01-01-reworded");
+  mkdirSync(r, { recursive: true });
+  mkdirSync(join(dir, "sessions"));
+  writeInbox(dir, [{ status: "started", text: "revision" }]);
+  writeFileSync(join(r, "00-request.md"), "- add a form for the icebox\n");
+  writeFileSync(join(dir, "sessions", "1-a.json"), JSON.stringify({ run: null, text: "revision", cmd: "claude", sessionId: "abc", started: Date.now() }));
+  const cards = () => boardCards([dir], Date.now()).map((k) => k.kind);
+  writeFileSync(join(r, "state.json"), JSON.stringify({ id: "2026-01-01-reworded", stage: "build", awaiting: null }));
+  expect(cards()).toEqual(["idea", "run"]);
+  writeFileSync(join(r, "state.json"), JSON.stringify({ id: "2026-01-01-reworded", stage: "build", awaiting: null, session: "abc" }));
+  expect(cards()).toEqual(["run"]);
+  rmSync(join(dir, ".."), { recursive: true, force: true });
+});
+
 test("boardCards: a run older than the idea does not retire it", () => {
   const dir = join(mkdtempSync(join(tmpdir(), "kaizen-")), ".kaizen");
   const r = join(dir, "runs", "2026-01-01-old");

package/cli/state.ts

@@ -616,6 +616,7 @@ export type Card = {
   awaiting: string | null;
   dim: boolean;
   moved?: number;                                  // runs only: state.json mtime
+  added?: number;                                  // ideas only: when the inbox line first appeared (ms)
   title?: string;                                  // runs only: first line of the request
   archived: boolean;                               // hidden from the board unless asked for
   branch?: string;                                 // runs only: the run's own branch while it has a worktree
@@ -1001,6 +1002,9 @@ export function boardCards(states: string[], now: number): Card[] {
       for (const l of b.split("\n")) lines.push({ at, text: normalise(l.replace(/^[\s>*"'`-]+|[\s"'`.]+$/g, "")) });
     }
   }
+  // A launched idea whose run reworded the request: the board's own launch record,
+  // owned by a run (session id in its state.json, see ownerOf), retires it all the same.
+  const launchedInto = (st: string, t: string) => readSessions(st).some((s) => !s.run && normalise(s.text.replace(/^(lite|full|auto|plan)\s+/i, "")) === t.replace(/^(lite|full|auto|plan)\s+/i, "") && ownerOf(st, s) !== null);
   for (const st of states) {
     const where = label(st);
     const archive = readArchive(st);
@@ -1019,10 +1023,10 @@ export function boardCards(states: string[], now: number): Card[] {
       // titled "fix this bugs" must not swallow a new idea with the same words.
       // ponytail: 2s slack for coarse filesystem clocks.
       const after = (r: { at: number }) => !it.added || r.at >= it.added - 2000;
-      if (it.status === "started" ? requests.some((r) => after(r) && r.text.includes(t)) : lines.some((l) => after(l) && (l.text === t || l.text.endsWith(" " + t)))) continue;
+      if (it.status === "started" ? requests.some((r) => after(r) && r.text.includes(t)) || launchedInto(st, t) : lines.some((l) => after(l) && (l.text === t || l.text.endsWith(" " + t)))) continue;
       next.push(it.status === "started"
         ? { kind: "idea", status: "starting", text: it.text, state: st, where, column: 1, awaiting: null, dim: true, archived: false, notes: it.notes, parent: parentOf(it.notes) }
-        : { kind: "idea", status: "idea", text: it.text, state: st, where, column: 0, awaiting: null, dim: false, archived: it.status === "archived", notes: it.notes, parent: parentOf(it.notes) });
+        : { kind: "idea", status: "idea", text: it.text, state: st, where, column: 0, awaiting: null, dim: false, archived: it.status === "archived", notes: it.notes, parent: parentOf(it.notes), added: it.added });
     }
     // Runs started in Yolo. Only yolo records are matched to runs, so a project that
     // never used it pays one directory read.

package/cli/web.ts

@@ -815,6 +815,15 @@ export async function web(repoDir: string, opts: Opts = {}) {
           } catch (e) { return bad((e as Error).message, 500); }
         }
 
+        // Files added with a hand-written icebox item: saved beside the state, linked in its notes.
+        const iceFiles = (state: string, files: unknown) => {
+          const fs: { name: string; data: string }[] = Array.isArray(files) ? files : [];
+          if (fs.reduce((t, f) => t + (f.data?.length ?? 0), 0) > 20_000_000) throw new Error("attachments over 15MB");
+          return fs.map((f) => {
+            const rel = saveAttachment(state, null, String(f.name ?? "file"), Buffer.from(String(f.data).replace(/^data:[^,]*,/, ""), "base64"));
+            return (/\.(png|jpe?g|gif|webp|svg)$/i.test(rel) ? "!" : "") + `[${String(f.name ?? "file")}](${rel})`;
+          });
+        };
         // The icebox: the only way gathered text becomes an idea, one explicit click
         // (or agent call) at a time. An idea is made; no run starts.
         if (path === "/icebox") {
@@ -822,7 +831,7 @@ export async function web(repoDir: string, opts: Opts = {}) {
           const ids = Array.isArray(body.ids) ? body.ids.filter((i: unknown) => typeof i === "string") : [];
           try {
             const why = body.op === "promote" ? promote(body.dir, ids, typeof body.text === "string" ? body.text : undefined, typeof body.details === "string" ? body.details : undefined)
-              : body.op === "add" ? addItem(body.dir, typeof body.text === "string" ? body.text : "", typeof body.details === "string" ? body.details : "")
+              : body.op === "add" ? addItem(body.dir, typeof body.text === "string" ? body.text : "", [typeof body.details === "string" ? body.details : "", ...iceFiles(body.dir, body.files)].filter(Boolean).join("\n"))
               : body.op === "dismiss" ? dismiss(body.dir, ids) : body.op === "restore" ? restore(body.dir, ids) : "unknown op";
             if (why) return bad(why, why === "no such item" ? 404 : why === "unknown op" ? 400 : 409);
           } catch (e) { return bad((e as Error).message, 500); }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kaizen-agent",
-  "version": "1.41.0",
+  "version": "1.41.3",
   "description": "Staged workflow for AI agents — code, writing, research, operations: plan, human approval, build, independent review, bounded fix loop.",
   "type": "module",
   "bin": {

package/skills/kaizen/SKILL.md

@@ -341,7 +341,9 @@ changing because a setting moved:
 ```
 
 Every run writes all nine keys, from intake on: `id`, `mode`, `runner`, `agent`,
-`track`, `stage`, `awaiting`, `iteration` (0 until the fix loop runs), `updated`. The
+`track`, `stage`, `awaiting`, `iteration` (0 until the fix loop runs), `updated`. Where
+the environment has `CLAUDE_CODE_SESSION_ID`, also `session` with its value: without it
+a card launched from the board can stay stuck in planning beside its own run. The
 legal values of `stage` and `awaiting` are in [`spec.md`](spec.md).
 
 In a git repository, `init` also adds a gitignore entry that ignores run state but

package/skills/kaizen/config.default.yml

@@ -168,8 +168,8 @@ agent:
   # Where the web board runs the agent it launches.
   #   card     - inside the board: the card's Terminal tab shows the agent live and
   #              takes your typing. The agent lives in the board's process, so
-  #              stopping or upgrading the board ends it. Not on Windows, where it
-  #              falls back to a terminal window.
+  #              stopping or upgrading the board ends it. On Windows it runs in
+  #              a ConPTY console that Windows PowerShell hosts.
   #   terminal - a new terminal window (or tmux/herdr tab) per launch.
   # The terminal dashboard always opens terminal windows.
   launch: card

package/web/board/cards.ts

@@ -2,7 +2,7 @@ import { store } from "./store.ts";
 import { where } from "./agent-term.ts";
 import { load, post } from "./api.ts";
 import { mic, stopDictation } from "./dictation.ts";
-import { $, esc, ico } from "./dom.ts";
+import { $, dataUrls, esc, ico } from "./dom.ts";
 import { draft, undraft } from "./drafts.ts";
 import { COLS, ICON, MARKS, NAMES, WORD, age, d, need } from "./labels.ts";
 import { brief } from "./markdown.ts";
@@ -502,13 +502,15 @@ export function render() {
         (archive || !nested(c)) &&
         (!q || `${c.title || ""} ${c.text || ""} ${c.id || ""}`.toLowerCase().includes(q)),
     );
-    // Runs age by their last move, ideas by inbox position (new ones are appended).
+    // Runs age by their last move, ideas by when they were added, across every project;
+    // an idea from before the stamp falls back to its inbox position.
     if (ci < 4) {
-      const at = (c) => (c.kind === "run" ? c.moved || 0 : store.S.cards.indexOf(c)),
-        old = order[ci] === "old";
+      const at = (c) => (c.kind === "run" ? c.moved || 0 : c.added || 0),
+        old = order[ci] === "old",
+        pos = (c) => store.S.cards.indexOf(c);
       // Runs waiting on you go first, then the column's own order.
       const w = (c) => (c.status === "waiting" ? 1 : 0);
-      list.sort((a, b) => w(b) - w(a) || (old ? at(a) - at(b) : at(b) - at(a)));
+      list.sort((a, b) => w(b) - w(a) || (old ? at(a) - at(b) || pos(a) - pos(b) : at(b) - at(a) || pos(b) - pos(a)));
     }
     const clearable = ci === 4 && !archive && list.length;
     const olderThan = (days) => list.filter((c) => store.S.now - (c.moved || store.S.now) > days * d);
@@ -607,16 +609,7 @@ export function render() {
           toast("Idea added");
           // The idea exists first: a failed upload leaves it as plain text.
           if (files.length) {
-            const enc = await Promise.all(
-              files.map(
-                (x) =>
-                  new Promise((res) => {
-                    const rd = new FileReader();
-                    rd.onload = () => res({ name: x.name, data: rd.result });
-                    rd.readAsDataURL(x);
-                  }),
-              ),
-            );
+            const enc = await dataUrls(files);
             const n = await post("/note", { dir, for: text, text: "", files: enc });
             if (!n.ok) toast("Idea added, files not attached");
           }

package/web/board/dom.ts

@@ -9,3 +9,30 @@ export const SKEL =
   '<span class="skel" style="height:16px;width:35%;margin:20px 0 14px"></span>' +
   '<span class="skel" style="height:44px;margin-bottom:10px"></span>'.repeat(4) +
   "</div>";
+// Files as {name, data-URL}, the shape /note and /icebox take.
+export const dataUrls = (files: File[]) =>
+  Promise.all(
+    files.map(
+      (x) =>
+        new Promise<{ name: string; data: string }>((res) => {
+          const rd = new FileReader();
+          rd.onload = () => res({ name: x.name, data: rd.result as string });
+          rd.readAsDataURL(x);
+        }),
+    ),
+  );
+// A modal form: the native <dialog>, removed from the page once closed.
+export function modal(html: string) {
+  const dl = document.createElement("dialog");
+  dl.className = "kz";
+  dl.innerHTML = `<form class="inl" method="dialog">${html}</form>`;
+  dl.onclose = () => dl.remove();
+  // A tap on the backdrop. Braces matter: an on* handler that returns false cancels the click,
+  // which stopped every submit button inside the form.
+  dl.onclick = (e) => {
+    if (e.target === dl) dl.close();
+  };
+  document.body.appendChild(dl);
+  dl.showModal();
+  return dl;
+}

package/web/board/icebox.ts

@@ -2,9 +2,9 @@ import { store } from "./store.ts";
 import { termStop } from "./agent-term.ts";
 import { load, post } from "./api.ts";
 import { via } from "./cards.ts";
-import { stopDictation } from "./dictation.ts";
-import { $, esc, ico, SKEL } from "./dom.ts";
-import { plogo, setShown, short, showable } from "./projects.ts";
+import { mic, stopDictation } from "./dictation.ts";
+import { $, dataUrls, esc, ico, modal, SKEL } from "./dom.ts";
+import { ideaCombo, newDir, plogo, setShown, short, showable } from "./projects.ts";
 import { toast } from "./toast.ts";
 import { go, view } from "./views.ts";
 
@@ -988,13 +988,57 @@ export async function openSources() {
         };
   }
   if ($("ice-new"))
-    $("ice-new").onclick = async () => {
-      const to = dir || showable()[0]?.dir;
-      if (!to) return toast("Pick a project first");
-      const text = prompt(dir ? "New request for the icebox:" : `New request for ${short(showable()[0].label)}:`)?.trim();
-      if (!text) return;
-      const j = await post("/icebox", { op: "add", dir: to, text });
-      if (j.ok) toast("Added to the icebox");
+    $("ice-new").onclick = () => {
+      const all = !dir;
+      if (!dir && !showable().length) return toast("Pick a project first");
+      // The new-idea form, cut down: the request, files, dictation and, in All projects, the project.
+      const dl = modal(
+        `${all ? `<div class="combo" id="ndc"><button type="button" class="sel" id="newdir" aria-label="Project for this request" aria-haspopup="listbox" aria-expanded="false"></button><div class="menu-pop" hidden><input class="sel" aria-label="Search projects" placeholder="Search projects…" spellcheck="false" autocomplete="off"><div id="nds" role="listbox"></div></div></div>` : ""}<textarea id="newidea" placeholder="New request for the icebox" aria-label="Request"></textarea><div class="att"></div><input type="file" multiple hidden><div class="row"><button type="button" class="ib" id="newpick" aria-label="Attach files" title="Attach files">${ico("clip")}</button><button type="button" class="btn ghost" value="">Cancel</button><button class="btn pri">Add</button></div>`,
+      );
+      const f = dl.querySelector("form"),
+        inp = f.querySelector("textarea"),
+        files = [];
+      const add = (x) => {
+        files.push(x);
+        f.querySelector(".att").textContent = files.map((y) => y.name).join(" · ");
+      };
+      f.querySelector("#newpick").onclick = () => f.querySelector("input[type=file]").click();
+      f.querySelector("input[type=file]").onchange = (e) => {
+        [...e.target.files].forEach(add);
+        e.target.value = "";
+      };
+      inp.onpaste = (e) => {
+        for (const it of e.clipboardData.items)
+          if (it.kind === "file") {
+            const x = it.getAsFile();
+            add(new File([x], x.name === "image.png" ? `paste-${Date.now()}.png` : x.name, { type: x.type }));
+            e.preventDefault();
+          }
+      };
+      f.querySelector(".btn.ghost").onclick = () => dl.close();
+      if (all) ideaCombo(f);
+      const m = mic([inp]);
+      if (m) f.querySelector(".row").prepend(m);
+      dl.addEventListener("close", () => stopDictation(false));
+      inp.onkeydown = (e) => {
+        if (e.key === "Enter" && !e.shiftKey) {
+          e.preventDefault();
+          f.requestSubmit();
+        }
+      };
+      f.onsubmit = async (e) => {
+        e.preventDefault();
+        const text = inp.value.trim(),
+          to = dir || newDir;
+        if (!text) return inp.focus();
+        if (!to) return toast("Pick a project first");
+        const j = await post("/icebox", { op: "add", dir: to, text, files: await dataUrls(files) });
+        if (j.ok) {
+          toast("Added to the icebox");
+          dl.close();
+        }
+      };
+      inp.focus();
     };
   if ($("src-go"))
     $("src-go").onclick = () => {

package/web/board/projects.ts

@@ -1,7 +1,7 @@
 import { store } from "./store.ts";
 import { load, post } from "./api.ts";
 import { render } from "./cards.ts";
-import { $, esc, ico } from "./dom.ts";
+import { $, esc, ico, modal } from "./dom.ts";
 import { openSources, srcOpen } from "./icebox.ts";
 import { toast } from "./toast.ts";
 import { view } from "./views.ts";
@@ -56,24 +56,49 @@ async function pick(v) {
     const j = await post("/find", {});
     if (j.ok) toast(j.added ? `Found ${j.added} new project${j.added === 1 ? "" : "s"}` : "No new projects found");
   } else if (v === "__clone") {
-    const url = prompt("GitHub link to clone (https or ssh):")?.trim();
-    if (!url) return;
-    const d = await post("/clone", { url, check: true });
-    if (!d.ok) return;
-    let to = prompt("Clone into (a new folder is created). Leave empty to pick a folder:", d.to);
-    if (to === null) return;
-    if (!to.trim()) {
-      const f = await post("/pick-folder", {});
-      if (!f.path) return;
-      to = f.path.replace(/[\\/]+$/, "") + (f.path.includes("\\") ? "\\" : "/") + d.name;
-    }
-    toast("Cloning…");
-    const j = await post("/clone", { url, to });
-    if (!j.ok) return;
-    await post("/cd", { dir: j.dir });
+    // One form: the link, then where it goes. The folder fills in once the link names a repo.
+    const dl = modal(
+      `<b>Clone from GitHub</b><input name="url" placeholder="https://github.com/owner/repo or git@github.com:owner/repo" aria-label="GitHub link (https or ssh)" spellcheck="false" autocomplete="off"><div class="row"><input name="to" placeholder="Clone into (a new folder is made)" aria-label="Clone into" spellcheck="false" autocomplete="off"><button type="button" class="btn ghost" data-a="pick">Pick…</button></div><div class="row"><button type="button" class="btn ghost" data-a="x">Cancel</button><button class="btn pri">Clone</button></div>`,
+    );
+    const f = dl.querySelector("form"),
+      url = f.querySelector("[name=url]"),
+      to = f.querySelector("[name=to]");
+    let name = "",
+      auto = ""; // the folder this form filled in; one the user typed is left alone
+    const check = async () => {
+      const u = url.value.trim();
+      if (!u) return null;
+      const d = await post("/clone", { url: u, check: true });
+      if (!d.ok) return null;
+      name = d.name;
+      if (!to.value.trim() || to.value === auto) to.value = auto = d.to;
+      return d;
+    };
+    url.onchange = check;
+    f.querySelector("[data-a=x]").onclick = () => dl.close();
+    f.querySelector("[data-a=pick]").onclick = async () => {
+      if (!(await check())) return url.focus();
+      const p = await post("/pick-folder", {});
+      if (p.path) to.value = p.path.replace(/[\\/]+$/, "") + (p.path.includes("\\") ? "\\" : "/") + name;
+    };
+    url.focus();
+    const dir = await new Promise((done) => {
+      dl.addEventListener("close", () => done(null));
+      f.onsubmit = async (e) => {
+        e.preventDefault();
+        if (!(await check())) return url.focus();
+        toast("Cloning…");
+        const j = await post("/clone", { url: url.value.trim(), to: to.value.trim() || undefined });
+        if (!j.ok) return;
+        done(j.dir);
+        dl.close();
+      };
+    });
+    if (!dir) return;
+    await post("/cd", { dir });
     store.all = false;
-    store.dir = j.dir;
-    keep(j.dir);
+    store.dir = dir;
+    keep(dir);
     toast("Cloned");
   } else if (v === "all") {
     store.all = true;

package/web/board.html

@@ -219,6 +219,7 @@ section li.hint{display:block;padding:14px;border:1px dashed var(--line);border-
 .inl input::placeholder,.inl textarea::placeholder,.notes textarea::placeholder{color:var(--dim)}
 .inl .row,.notes .row{display:flex;gap:6px;justify-content:flex-end;align-items:center}
 .inl .row .mic{margin-right:0}.inl .row #newpick{margin-right:auto}.inl .row .btn{white-space:nowrap}.inl .att{font-size:12px;color:var(--dim)}.inl .att{font-size:12px;color:var(--dim)}.inl .att:empty{display:none}
+dialog.kz{border:0;padding:0;background:none;width:min(480px,calc(100vw - 32px));max-height:calc(100dvh - 32px);overflow:visible;color:var(--ink)}dialog.kz::backdrop{background:rgb(0 0 0/.45)}dialog.kz .row input{flex:1;min-width:0}dialog.kz #ndc{align-self:flex-start}
 .inl .run-actions{display:grid;gap:8px}.inl .run-actions .row{display:grid;grid-template-columns:repeat(2,minmax(0,1fr))}.inl .run-actions .pri{grid-column:1/-1}
 .notes{display:flex;flex-direction:column;gap:8px}
 #pbody img{max-width:100%;border-radius:var(--r-s)}