@flumecode/runner 0.23.0 → 0.24.0

package/dist/cli.js

@@ -62,29 +62,27 @@ async function get(cfg, path) {
   if (!res.ok) throw new Error(await safeText2(res));
   return res.json();
 }
-async function post(cfg, path, body) {
+async function post(cfg, path, body2) {
   const res = await fetch(cfg.serverUrl + path, {
     method: "POST",
     headers: { ...authHeaders(cfg), "Content-Type": "application/json" },
-    body: JSON.stringify(body)
+    body: JSON.stringify(body2)
   });
   if (!res.ok) throw new Error(await safeText2(res));
   return res.json();
 }
-var listRepositories, listAgents, listRequests, getRequest, createRequest, answerWidgets, acceptPlan, startImplementing, listJobs, listRunners;
+var listRepositories, listAgents, getRequest, createRequest, addRequestComment, answerWidgets, acceptPlan, startImplementing, listJobs, listRunners;
 var init_tui_api = __esm({
   "src/tui-api.ts"() {
     "use strict";
     init_version();
     listRepositories = (cfg) => get(cfg, "/api/cli/repositories").then((r) => r.repositories);
     listAgents = (cfg) => get(cfg, "/api/cli/agents").then((r) => r.agents);
-    listRequests = (cfg, repoId) => get(cfg, `/api/cli/repositories/${repoId}/requests`).then(
-      (r) => r.requests
-    );
     getRequest = (cfg, id) => get(cfg, `/api/cli/requests/${id}`);
     createRequest = (cfg, input) => post(cfg, "/api/cli/requests", input);
+    addRequestComment = (cfg, requestId, body2) => post(cfg, `/api/cli/requests/${requestId}/comments`, { body: body2 });
     answerWidgets = (cfg, messageId, payload) => post(cfg, `/api/cli/messages/${messageId}/answer`, payload);
-    acceptPlan = (cfg, messageId, target, mergeBranch) => post(cfg, `/api/cli/plans/${messageId}/accept`, { target, mergeBranch });
+    acceptPlan = (cfg, messageId, mergeBranch) => post(cfg, `/api/cli/plans/${messageId}/accept`, { target: { kind: "new" }, mergeBranch });
     startImplementing = (cfg, sessionId) => post(cfg, `/api/cli/sessions/${sessionId}/implement`, {});
     listJobs = (cfg) => get(cfg, "/api/cli/jobs").then((r) => r.jobs);
     listRunners = (cfg) => get(cfg, "/api/cli/runners").then((r) => r.runners);
@@ -121,17 +119,18 @@ var init_usePoll = __esm({
 });
 
 // src/tui/StatusBar.tsx
-import { Box, Text } from "ink";
-import { jsx, jsxs } from "react/jsx-runtime";
+import { Text } from "ink";
+import { jsxs } from "react/jsx-runtime";
 function StatusBar({ jobs, runners }) {
-  const runningJobs = jobs?.filter((j) => j.status === "running").length ?? 0;
-  const onlineRunners = runners?.filter((r) => r.status === "online").length ?? 0;
-  return /* @__PURE__ */ jsx(Box, { borderStyle: "single", paddingX: 1, children: /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-    "Jobs running: ",
-    runningJobs,
-    " | Runners online: ",
-    onlineRunners
-  ] }) });
+  const running = jobs?.filter((j) => j.status === "running").length ?? 0;
+  const online = runners?.filter((r) => r.status === "online").length ?? 0;
+  return /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+    "jobs ",
+    running,
+    " running \xB7 runners ",
+    online,
+    " online"
+  ] });
 }
 var init_StatusBar = __esm({
   "src/tui/StatusBar.tsx"() {
@@ -141,8 +140,8 @@ var init_StatusBar = __esm({
 
 // src/tui/RepoListScreen.tsx
 import { useState as useState2 } from "react";
-import { Box as Box2, Text as Text2, useInput } from "ink";
-import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
+import { Box, Text as Text2, useInput } from "ink";
+import { jsx, jsxs as jsxs2 } from "react/jsx-runtime";
 function RepoListScreen({ config, onSelect }) {
   const repos = usePoll(() => listRepositories(config), 1e4);
   const [cursor, setCursor] = useState2(0);
@@ -155,10 +154,10 @@ function RepoListScreen({ config, onSelect }) {
       if (repo) onSelect(repo);
     }
   });
-  if (!repos) return /* @__PURE__ */ jsx2(Text2, { children: "Loading repositories\u2026" });
-  if (repos.length === 0) return /* @__PURE__ */ jsx2(Text2, { children: "No repositories found." });
-  return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx2(Text2, { bold: true, children: "Select a repository (\u2191\u2193 Enter):" }),
+  if (!repos) return /* @__PURE__ */ jsx(Text2, { children: "Loading repositories\u2026" });
+  if (repos.length === 0) return /* @__PURE__ */ jsx(Text2, { children: "No repositories found." });
+  return /* @__PURE__ */ jsxs2(Box, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx(Text2, { bold: true, children: "Select a repository (\u2191\u2193 Enter):" }),
     repos.map((repo, i) => /* @__PURE__ */ jsxs2(Text2, { color: i === cursor ? "cyan" : void 0, children: [
       i === cursor ? "\u25B6 " : "  ",
       repo.fullName
@@ -173,188 +172,241 @@ var init_RepoListScreen = __esm({
   }
 });
 
-// src/tui/RequestListScreen.tsx
-import { useState as useState3 } from "react";
-import { Box as Box3, Text as Text3, useInput as useInput2 } from "ink";
-import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
-function RequestListScreen({ config, repo, onOpen, onNew, onBack }) {
-  const requests = usePoll(() => listRequests(config, repo.id), 5e3);
-  const [cursor, setCursor] = useState3(0);
-  useInput2((input, key) => {
-    if (key.escape) {
-      onBack();
-      return;
+// src/tui/markdown.ts
+function parseSpans(text) {
+  const spans = [];
+  let plain = "";
+  const flush = () => {
+    if (plain) {
+      spans.push({ text: plain });
+      plain = "";
     }
-    if (!requests) return;
-    if (key.upArrow) setCursor((c) => Math.max(0, c - 1));
-    else if (key.downArrow) setCursor((c) => Math.min(requests.length - 1, c + 1));
-    else if (key.return) {
-      const req = requests[cursor];
-      if (req) onOpen(req);
-    } else if (input === "n") {
-      onNew();
+  };
+  let i = 0;
+  while (i < text.length) {
+    const ch = text[i];
+    if (ch === "`") {
+      const end = text.indexOf("`", i + 1);
+      if (end > i) {
+        flush();
+        spans.push({ text: text.slice(i + 1, end), code: true });
+        i = end + 1;
+        continue;
+      }
     }
-  });
-  if (!requests) return /* @__PURE__ */ jsx3(Text3, { children: "Loading requests\u2026" });
-  return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsxs3(Text3, { bold: true, children: [
-      repo.fullName,
-      " \u2014 Requests (\u2191\u2193 Enter open, n new, Esc back):"
-    ] }),
-    requests.length === 0 && /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "No requests yet." }),
-    requests.map((req, i) => /* @__PURE__ */ jsxs3(Text3, { color: i === cursor ? "cyan" : void 0, children: [
-      i === cursor ? "\u25B6 " : "  ",
-      "[",
-      req.status,
-      "] ",
-      req.title
-    ] }, req.id))
-  ] });
-}
-var init_RequestListScreen = __esm({
-  "src/tui/RequestListScreen.tsx"() {
-    "use strict";
-    init_usePoll();
-    init_tui_api();
+    if (ch === "*" && text[i + 1] === "*") {
+      const end = text.indexOf("**", i + 2);
+      if (end > i + 1) {
+        flush();
+        spans.push({ text: text.slice(i + 2, end), bold: true });
+        i = end + 2;
+        continue;
+      }
+    }
+    if (ch === "*" && text[i + 1] !== void 0 && text[i + 1] !== " " && text[i + 1] !== "*") {
+      const end = text.indexOf("*", i + 1);
+      if (end > i + 1) {
+        flush();
+        spans.push({ text: text.slice(i + 1, end), italic: true });
+        i = end + 1;
+        continue;
+      }
+    }
+    plain += ch;
+    i++;
   }
-});
-
-// src/tui/NewRequestScreen.tsx
-import { useState as useState4 } from "react";
-import { Box as Box4, Text as Text4, useInput as useInput3 } from "ink";
-import TextInput from "ink-text-input";
-import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
-function NewRequestScreen({ config, repo, onCreated, onBack }) {
-  const agents = usePoll(() => listAgents(config), 3e4);
-  const [field, setField] = useState4("title");
-  const [title, setTitle] = useState4("");
-  const [body, setBody] = useState4("");
-  const [agentCursor, setAgentCursor] = useState4(0);
-  const [branch, setBranch] = useState4("");
-  const [error, setError] = useState4(null);
-  const [submitting, setSubmitting] = useState4(false);
-  useInput3((_input, key) => {
-    if (key.escape) {
-      onBack();
-      return;
+  flush();
+  return spans;
+}
+function parseBlocks(src) {
+  const blocks = [];
+  const lines2 = src.split("\n");
+  let para = [];
+  let code = null;
+  const flushPara = () => {
+    if (para.length) {
+      blocks.push({ t: "p", spans: parseSpans(para.join(" ")) });
+      para = [];
     }
-    if (field === "title" && key.tab) {
-      setField("body");
-      return;
+  };
+  for (const raw of lines2) {
+    if (code) {
+      if (raw.trimEnd() === "```") {
+        blocks.push({ t: "code", ...code.lang ? { lang: code.lang } : {}, lines: code.lines });
+        code = null;
+      } else {
+        code.lines.push(raw);
+      }
+      continue;
     }
-    if (field === "body" && key.tab) {
-      setField("agent");
-      return;
+    const line = raw.trimEnd();
+    const trimmed = line.trim();
+    if (trimmed.startsWith("```")) {
+      flushPara();
+      const lang = trimmed.slice(3).trim();
+      code = { ...lang ? { lang } : {}, lines: [] };
+      continue;
     }
-    if (field === "agent") {
-      if (key.upArrow && agents) setAgentCursor((c) => Math.max(0, c - 1));
-      if (key.downArrow && agents) setAgentCursor((c) => Math.min((agents.length || 1) - 1, c + 1));
-      if (key.tab) setField("branch");
+    if (trimmed === "") {
+      flushPara();
+      continue;
     }
-    if (field === "branch" && key.return && !submitting) {
-      void submit();
+    const h = /^(#{1,3})\s+(.*)$/.exec(trimmed);
+    if (h && h[1] && h[2] !== void 0) {
+      flushPara();
+      blocks.push({ t: "h", level: h[1].length, spans: parseSpans(h[2]) });
+      continue;
     }
-  });
-  async function submit() {
-    if (!title.trim() || !agents?.[agentCursor]) return;
-    setSubmitting(true);
-    setError(null);
-    try {
-      const result = await createRequest(config, {
-        title: title.trim(),
-        body: body.trim(),
-        agentId: agents[agentCursor].id,
-        repoId: repo.id,
-        checkoutBranch: branch.trim() || void 0
+    if (/^(-{3,}|\*{3,})$/.test(trimmed)) {
+      flushPara();
+      blocks.push({ t: "rule" });
+      continue;
+    }
+    const indent = line.length - line.trimStart().length;
+    const li = /^[-*]\s+(.*)$/.exec(trimmed);
+    if (li && li[1] !== void 0) {
+      flushPara();
+      blocks.push({ t: "li", depth: indent >= 2 ? 1 : 0, spans: parseSpans(li[1]) });
+      continue;
+    }
+    const ol = /^(\d+)[.)]\s+(.*)$/.exec(trimmed);
+    if (ol && ol[1] && ol[2] !== void 0) {
+      flushPara();
+      blocks.push({
+        t: "li",
+        depth: indent >= 2 ? 1 : 0,
+        ordered: Number(ol[1]),
+        spans: parseSpans(ol[2])
       });
-      onCreated(result.requestId);
-    } catch (err) {
-      setError(err instanceof Error ? err.message : "Unknown error");
-      setSubmitting(false);
+      continue;
+    }
+    if (trimmed.startsWith("> ") || trimmed === ">") {
+      flushPara();
+      blocks.push({ t: "quote", spans: parseSpans(trimmed.replace(/^>\s?/, "")) });
+      continue;
     }
+    para.push(trimmed);
   }
-  return /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", gap: 1, children: [
-    /* @__PURE__ */ jsxs4(Text4, { bold: true, children: [
-      "New Request in ",
-      repo.fullName,
-      " (Tab to advance, Esc back)"
-    ] }),
-    /* @__PURE__ */ jsxs4(Box4, { children: [
-      /* @__PURE__ */ jsx4(Text4, { children: "Title: " }),
-      /* @__PURE__ */ jsx4(TextInput, { value: title, onChange: setTitle, focus: field === "title" })
-    ] }),
-    /* @__PURE__ */ jsxs4(Box4, { children: [
-      /* @__PURE__ */ jsx4(Text4, { children: "Body: " }),
-      /* @__PURE__ */ jsx4(TextInput, { value: body, onChange: setBody, focus: field === "body" })
-    ] }),
-    /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs4(Text4, { children: [
-        "Agent",
-        field === "agent" ? " (\u2191\u2193 to pick, Tab next)" : "",
-        ":"
-      ] }),
-      (agents ?? []).map((a, i) => /* @__PURE__ */ jsxs4(Text4, { color: field === "agent" && i === agentCursor ? "cyan" : void 0, children: [
-        field === "agent" && i === agentCursor ? "\u25B6 " : "  ",
-        a.name
-      ] }, a.id))
-    ] }),
-    /* @__PURE__ */ jsxs4(Box4, { children: [
-      /* @__PURE__ */ jsx4(Text4, { children: "Checkout branch (optional): " }),
-      /* @__PURE__ */ jsx4(TextInput, { value: branch, onChange: setBranch, focus: field === "branch" })
-    ] }),
-    submitting && /* @__PURE__ */ jsx4(Text4, { color: "yellow", children: "Creating\u2026" }),
-    error && /* @__PURE__ */ jsxs4(Text4, { color: "red", children: [
-      "Error: ",
-      error
-    ] })
+  if (code)
+    blocks.push({ t: "code", ...code.lang ? { lang: code.lang } : {}, lines: code.lines });
+  flushPara();
+  return blocks;
+}
+function parseMarkdown(src) {
+  try {
+    return parseBlocks(src);
+  } catch {
+    return [{ t: "p", spans: [{ text: src }] }];
+  }
+}
+var init_markdown = __esm({
+  "src/tui/markdown.ts"() {
+    "use strict";
+  }
+});
+
+// src/tui/Markdown.tsx
+import { Box as Box2, Text as Text3 } from "ink";
+import { jsx as jsx2, jsxs as jsxs3 } from "react/jsx-runtime";
+function Markdown({ source, width }) {
+  const blocks = parseMarkdown(source);
+  return /* @__PURE__ */ jsx2(Box2, { flexDirection: "column", children: blocks.map((block, i) => renderBlock(block, i, blocks, width)) });
+}
+function spanNodes(spans) {
+  return spans.map((s, k) => /* @__PURE__ */ jsx2(Text3, { bold: s.bold, italic: s.italic, color: s.code ? "magenta" : void 0, children: s.text }, k));
+}
+function renderBlock(block, i, blocks, width) {
+  switch (block.t) {
+    case "h":
+      return /* @__PURE__ */ jsx2(Box2, { marginTop: i === 0 ? 0 : 1, children: /* @__PURE__ */ jsx2(Text3, { bold: true, underline: block.level !== 3, children: spanNodes(block.spans) }) }, i);
+    case "p":
+      return /* @__PURE__ */ jsx2(Box2, { marginBottom: 1, children: /* @__PURE__ */ jsx2(Text3, { children: spanNodes(block.spans) }) }, i);
+    case "li": {
+      const marker = block.ordered ? `${block.ordered}.` : block.depth === 1 ? "\u25E6" : "\u2022";
+      const isLastOfRun = blocks[i + 1]?.t !== "li";
+      return /* @__PURE__ */ jsxs3(Box2, { marginBottom: isLastOfRun ? 1 : 0, children: [
+        /* @__PURE__ */ jsx2(Box2, { width: block.depth === 1 ? 4 : 2, flexShrink: 0, children: /* @__PURE__ */ jsx2(Text3, { dimColor: true, children: marker }) }),
+        /* @__PURE__ */ jsx2(Box2, { flexGrow: 1, children: /* @__PURE__ */ jsx2(Text3, { children: spanNodes(block.spans) }) })
+      ] }, i);
+    }
+    case "code":
+      return /* @__PURE__ */ jsx2(Box2, { flexDirection: "column", paddingLeft: 2, marginBottom: 1, children: block.lines.map((line, k) => (
+        // An empty string renders nothing in ink, so substitute a single space.
+        /* @__PURE__ */ jsx2(Text3, { dimColor: true, children: line || " " }, k)
+      )) }, i);
+    case "quote":
+      return /* @__PURE__ */ jsxs3(Box2, { marginBottom: 1, children: [
+        /* @__PURE__ */ jsx2(Box2, { width: 2, flexShrink: 0, children: /* @__PURE__ */ jsx2(Text3, { dimColor: true, children: "\u258C" }) }),
+        /* @__PURE__ */ jsx2(Box2, { flexGrow: 1, children: /* @__PURE__ */ jsx2(Text3, { dimColor: true, children: spanNodes(block.spans) }) })
+      ] }, i);
+    case "rule":
+      return /* @__PURE__ */ jsx2(Box2, { marginBottom: 1, children: /* @__PURE__ */ jsx2(Text3, { dimColor: true, children: "\u2500".repeat(Math.max(8, Math.min(width - 2, 60))) }) }, i);
+  }
+}
+var init_Markdown = __esm({
+  "src/tui/Markdown.tsx"() {
+    "use strict";
+    init_markdown();
+  }
+});
+
+// src/tui/Spinner.tsx
+import { useEffect as useEffect2, useState as useState3 } from "react";
+import { Text as Text4 } from "ink";
+import { jsxs as jsxs4 } from "react/jsx-runtime";
+function Spinner({ label }) {
+  const [frame, setFrame] = useState3(0);
+  useEffect2(() => {
+    const id = setInterval(() => setFrame((f) => (f + 1) % FRAMES.length), 100);
+    return () => clearInterval(id);
+  }, []);
+  return /* @__PURE__ */ jsxs4(Text4, { color: "yellow", children: [
+    FRAMES[frame],
+    " ",
+    label
   ] });
 }
-var init_NewRequestScreen = __esm({
-  "src/tui/NewRequestScreen.tsx"() {
+var FRAMES;
+var init_Spinner = __esm({
+  "src/tui/Spinner.tsx"() {
     "use strict";
-    init_usePoll();
-    init_tui_api();
+    FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
   }
 });
 
 // src/tui/WidgetAnswerScreen.tsx
-import { useState as useState5 } from "react";
-import { Box as Box5, Text as Text5, useInput as useInput4 } from "ink";
-import TextInput2 from "ink-text-input";
-import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
-function renderOptionLabel(opt, i, cursor, isSingle, checked) {
-  const pointer = i === cursor ? "\u25B6 " : "  ";
-  if (isSingle) {
-    return `${pointer}${opt.label}`;
-  }
-  return `${pointer}[${checked.has(opt.id) ? "x" : " "}] ${opt.label}`;
-}
-function WidgetAnswerScreen({ config, message, onDone }) {
-  const [widgetIndex, setWidgetIndex] = useState5(0);
-  const [cursor, setCursor] = useState5(0);
-  const [checked, setChecked] = useState5(/* @__PURE__ */ new Set());
-  const [customText, setCustomText] = useState5("");
-  const [showCustom, setShowCustom] = useState5(false);
-  const [error, setError] = useState5(null);
-  const [submitting, setSubmitting] = useState5(false);
-  const widget = message.widgets[widgetIndex];
-  function handleSingleInput(input, key, w) {
-    const opts2 = [...w.options, { id: "__other__", label: "Other" }];
+import { useRef as useRef2, useState as useState4 } from "react";
+import { Box as Box3, Text as Text5, useInput as useInput2 } from "ink";
+import TextInput from "ink-text-input";
+import { jsx as jsx3, jsxs as jsxs5 } from "react/jsx-runtime";
+function WidgetAnswerScreen({ config, message: message2, onDone }) {
+  const [widgetIndex, setWidgetIndex] = useState4(0);
+  const [cursor, setCursor] = useState4(0);
+  const [checked, setChecked] = useState4(/* @__PURE__ */ new Set());
+  const [customText, setCustomText] = useState4("");
+  const [showCustom, setShowCustom] = useState4(false);
+  const [error, setError] = useState4(null);
+  const [submitting, setSubmitting] = useState4(false);
+  const answersRef = useRef2([]);
+  const summaryRef = useRef2([]);
+  const widget = message2.widgets[widgetIndex];
+  function handleSingleInput(key, w) {
+    const opts2 = [...w.options, OTHER];
     if (key.upArrow) {
+      setShowCustom(false);
       setCursor((c) => Math.max(0, c - 1));
     } else if (key.downArrow) {
+      setShowCustom(false);
       setCursor((c) => Math.min(opts2.length - 1, c + 1));
     } else if (key.return) {
+      if (showCustom) return;
       const picked = opts2[cursor];
-      if (picked?.id === "__other__") {
-        setShowCustom(true);
-      } else {
-        void advanceOrSubmit(w, picked?.id, void 0, void 0);
-      }
+      if (picked?.id === OTHER.id) setShowCustom(true);
+      else if (picked) void advanceOrSubmit(w, picked.id, void 0, void 0);
     }
   }
   function handleMultiInput(input, key, w) {
-    const opts2 = [...w.options, { id: "__other__", label: "Other" }];
+    const opts2 = [...w.options, OTHER];
     if (key.upArrow) {
       setCursor((c) => Math.max(0, c - 1));
     } else if (key.downArrow) {
@@ -362,7 +414,7 @@ function WidgetAnswerScreen({ config, message, onDone }) {
     } else if (input === " ") {
       const picked = opts2[cursor];
       if (!picked) return;
-      if (picked.id === "__other__") {
+      if (picked.id === OTHER.id) {
         setShowCustom((s) => !s);
       } else {
         const next = new Set(checked);
@@ -374,24 +426,26 @@ function WidgetAnswerScreen({ config, message, onDone }) {
       void advanceOrSubmit(w, void 0, [...checked], customText || void 0);
     }
   }
-  useInput4((input, key) => {
-    if (!widget) return;
-    if (widget.type === "single_select") {
-      handleSingleInput(input, key, widget);
-    } else {
-      handleMultiInput(input, key, widget);
-    }
+  useInput2((input, key) => {
+    if (!widget || submitting) return;
+    if (widget.type === "single_select") handleSingleInput(key, widget);
+    else handleMultiInput(input, key, widget);
   });
+  const onCustomSubmit = (value) => {
+    if (!widget || widget.type !== "single_select" || submitting) return;
+    const text = value.trim();
+    if (!text) return;
+    void advanceOrSubmit(widget, void 0, void 0, text);
+  };
   async function advanceOrSubmit(w, optionId, optionIds, custom) {
-    const answers = [
-      {
-        widgetId: w.id,
-        ...optionId !== void 0 ? { optionId } : {},
-        ...optionIds !== void 0 ? { optionIds } : {},
-        ...custom ? { customText: custom } : {}
-      }
-    ];
-    if (widgetIndex < message.widgets.length - 1) {
+    answersRef.current.push({
+      widgetId: w.id,
+      ...optionId !== void 0 ? { optionId } : {},
+      ...optionIds !== void 0 ? { optionIds } : {},
+      ...custom ? { customText: custom } : {}
+    });
+    summaryRef.current.push(`${w.question} \u2192 ${answerLabel(w, optionId, optionIds, custom)}`);
+    if (widgetIndex < message2.widgets.length - 1) {
       setWidgetIndex((i) => i + 1);
       setCursor(0);
       setChecked(/* @__PURE__ */ new Set());
@@ -402,177 +456,396 @@ function WidgetAnswerScreen({ config, message, onDone }) {
     setSubmitting(true);
     setError(null);
     try {
-      await answerWidgets(config, message.id, { requestId: message.requestId, answers });
-      onDone();
+      await answerWidgets(config, message2.id, {
+        requestId: message2.requestId,
+        answers: answersRef.current
+      });
+      onDone(summaryRef.current);
     } catch (err) {
+      answersRef.current.pop();
+      summaryRef.current.pop();
       setError(err instanceof Error ? err.message : "Unknown error");
       setSubmitting(false);
     }
   }
-  if (!widget) return /* @__PURE__ */ jsx5(Text5, { children: "No widgets to answer." });
+  if (!widget) return /* @__PURE__ */ jsx3(Text5, { children: "No widgets to answer." });
   const isSingle = widget.type === "single_select";
-  const opts = [...widget.options, { id: "__other__", label: "Other" }];
-  return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", gap: 1, children: [
-    /* @__PURE__ */ jsxs5(Text5, { bold: true, children: [
-      "Widget ",
-      widgetIndex + 1,
-      "/",
-      message.widgets.length,
-      ": ",
-      widget.question
+  const opts = [...widget.options, OTHER];
+  const total = opts.length;
+  const start2 = total <= WINDOW ? 0 : Math.min(Math.max(0, cursor - Math.floor(WINDOW / 2)), total - WINDOW);
+  const end = Math.min(total, start2 + WINDOW);
+  const moreAbove = start2;
+  const moreBelow = total - end;
+  return /* @__PURE__ */ jsxs5(Box3, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs5(Box3, { children: [
+      /* @__PURE__ */ jsx3(Box3, { width: 2, flexShrink: 0, children: /* @__PURE__ */ jsx3(Text5, { bold: true, children: "\u25CF" }) }),
+      /* @__PURE__ */ jsx3(Box3, { flexGrow: 1, children: /* @__PURE__ */ jsxs5(Text5, { children: [
+        /* @__PURE__ */ jsx3(Text5, { bold: true, children: widget.question }),
+        /* @__PURE__ */ jsx3(Text5, { dimColor: true, children: ` (${widgetIndex + 1}/${message2.widgets.length})` })
+      ] }) })
     ] }),
-    widget.body && /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: widget.body }),
-    /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: isSingle ? "\u2191\u2193 to navigate, Enter to select" : "\u2191\u2193 to navigate, Space to toggle, Enter to confirm" }),
-    opts.map((opt, i) => /* @__PURE__ */ jsx5(Text5, { color: i === cursor ? "cyan" : void 0, children: renderOptionLabel(opt, i, cursor, isSingle, checked) }, opt.id)),
-    showCustom && /* @__PURE__ */ jsxs5(Box5, { children: [
-      /* @__PURE__ */ jsx5(Text5, { children: "Custom answer: " }),
-      /* @__PURE__ */ jsx5(TextInput2, { value: customText, onChange: setCustomText, focus: showCustom })
+    widget.body ? /* @__PURE__ */ jsx3(Box3, { marginTop: 1, marginLeft: 2, children: /* @__PURE__ */ jsx3(Markdown, { source: widget.body, width: 76 }) }) : null,
+    /* @__PURE__ */ jsxs5(Box3, { flexDirection: "column", marginTop: 1, children: [
+      moreAbove > 0 && /* @__PURE__ */ jsx3(Text5, { dimColor: true, children: `  \u2026 ${moreAbove} more above` }),
+      opts.slice(start2, end).map((opt, vi) => {
+        const i = start2 + vi;
+        const onCursor = i === cursor;
+        return /* @__PURE__ */ jsxs5(Box3, { children: [
+          /* @__PURE__ */ jsx3(Box3, { width: 2, flexShrink: 0, children: onCursor ? /* @__PURE__ */ jsx3(Text5, { color: "cyan", bold: true, children: "\u276F " }) : /* @__PURE__ */ jsx3(Text5, { children: "  " }) }),
+          /* @__PURE__ */ jsx3(Box3, { flexGrow: 1, children: /* @__PURE__ */ jsxs5(Text5, { color: onCursor ? "cyan" : void 0, children: [
+            !isSingle && (checked.has(opt.id) ? /* @__PURE__ */ jsx3(Text5, { color: "green", children: "\u25C9 " }) : /* @__PURE__ */ jsx3(Text5, { dimColor: true, children: "\u25EF " })),
+            opt.label
+          ] }) })
+        ] }, opt.id);
+      }),
+      moreBelow > 0 && /* @__PURE__ */ jsx3(Text5, { dimColor: true, children: `  \u2026 ${moreBelow} more below` })
     ] }),
-    submitting && /* @__PURE__ */ jsx5(Text5, { color: "yellow", children: "Submitting\u2026" }),
+    showCustom && /* @__PURE__ */ jsxs5(Box3, { marginTop: 1, children: [
+      /* @__PURE__ */ jsx3(Box3, { width: 2, flexShrink: 0, children: /* @__PURE__ */ jsx3(Text5, { color: "cyan", bold: true, children: "\u203A" }) }),
+      /* @__PURE__ */ jsx3(
+        TextInput,
+        {
+          value: customText,
+          onChange: setCustomText,
+          focus: showCustom,
+          onSubmit: isSingle ? onCustomSubmit : void 0
+        }
+      )
+    ] }),
+    /* @__PURE__ */ jsx3(Box3, { marginTop: 1, children: /* @__PURE__ */ jsx3(Text5, { dimColor: true, children: isSingle ? "\u2191\u2193 move \xB7 enter select" : "\u2191\u2193 move \xB7 space toggle \xB7 enter confirm" }) }),
+    submitting && /* @__PURE__ */ jsx3(Spinner, { label: "submitting\u2026" }),
     error && /* @__PURE__ */ jsxs5(Text5, { color: "red", children: [
       "Error: ",
       error
     ] })
   ] });
 }
+function answerLabel(w, optionId, optionIds, custom) {
+  const pickedIds = [...optionId ? [optionId] : [], ...optionIds ?? []];
+  const labels = pickedIds.map((id) => w.options.find((o) => o.id === id)?.label).filter((label) => label !== void 0);
+  if (custom) labels.push(custom);
+  return labels.length ? labels.join(", ") : "(no selection)";
+}
+var OTHER, WINDOW;
 var init_WidgetAnswerScreen = __esm({
   "src/tui/WidgetAnswerScreen.tsx"() {
     "use strict";
     init_tui_api();
+    init_Markdown();
+    init_Spinner();
+    OTHER = { id: "__other__", label: "Other" };
+    WINDOW = 10;
   }
 });
 
-// src/tui/ThreadScreen.tsx
-import { useState as useState6 } from "react";
-import { Box as Box6, Text as Text6, useInput as useInput5 } from "ink";
-import TextInput3 from "ink-text-input";
-import { Fragment, jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
-function ThreadScreen({ config, requestId, onBack }) {
-  const data = usePoll(() => getRequest(config, requestId), 3e3);
-  const [cursor, setCursor] = useState6(0);
-  const [overlay, setOverlay] = useState6({ kind: "none" });
-  const [targetBranch, setTargetBranch] = useState6("main");
-  const [mergeBranch, setMergeBranch] = useState6("");
-  const [acceptStep, setAcceptStep] = useState6("target");
-  const [error, setError] = useState6(null);
-  const messages = data?.messages ?? [];
-  const sessions = data?.sessions ?? [];
-  const selectedMsg = messages[cursor];
-  const implementableSession = sessions.find((s) => s.status === "planned" || s.status === "ready");
-  useInput5((_input, key) => {
-    if (overlay.kind !== "none") return;
-    if (key.escape) {
-      onBack();
-      return;
+// src/tui/Message.tsx
+import { Box as Box4, Text as Text6 } from "ink";
+import { Fragment, jsx as jsx4, jsxs as jsxs6 } from "react/jsx-runtime";
+function Message({ msg, width }) {
+  return /* @__PURE__ */ jsxs6(Box4, { marginBottom: 1, flexDirection: "row", children: [
+    /* @__PURE__ */ jsx4(Box4, { width: 2, flexShrink: 0, children: glyph(msg) }),
+    /* @__PURE__ */ jsx4(Box4, { flexDirection: "column", flexGrow: 1, children: body(msg, width) })
+  ] });
+}
+function glyph(msg) {
+  if (msg.role === "user") {
+    return /* @__PURE__ */ jsx4(Text6, { color: "cyan", bold: true, children: "\u203A" });
+  }
+  if (msg.kind === "success") return /* @__PURE__ */ jsx4(Text6, { color: "green", children: "\u2713" });
+  if (msg.kind === "error") return /* @__PURE__ */ jsx4(Text6, { color: "red", children: "\u2717" });
+  if (msg.kind === "info" || msg.role === "system") return /* @__PURE__ */ jsx4(Text6, { dimColor: true, children: "\xB7" });
+  return /* @__PURE__ */ jsx4(Text6, { bold: true, children: "\u25CF" });
+}
+function body(msg, width) {
+  if (msg.role === "user") return /* @__PURE__ */ jsx4(Text6, { color: "cyan", children: msg.text });
+  if (msg.kind === "markdown") return /* @__PURE__ */ jsx4(Markdown, { source: msg.text, width: width - 2 });
+  if (msg.kind === "plan") {
+    return /* @__PURE__ */ jsxs6(Fragment, { children: [
+      /* @__PURE__ */ jsx4(Text6, { bold: true, children: "Plan" }),
+      /* @__PURE__ */ jsx4(Text6, { dimColor: true, children: "\u2500".repeat(Math.max(8, Math.min(width - 4, 50))) }),
+      /* @__PURE__ */ jsx4(Markdown, { source: msg.text, width: width - 2 })
+    ] });
+  }
+  if (msg.kind === "info" || msg.kind === "success" || msg.kind === "error") {
+    return /* @__PURE__ */ jsx4(Text6, { dimColor: true, children: msg.text });
+  }
+  return /* @__PURE__ */ jsx4(Text6, { children: msg.text });
+}
+var init_Message = __esm({
+  "src/tui/Message.tsx"() {
+    "use strict";
+    init_Markdown();
+  }
+});
+
+// src/tui/ConversationScreen.tsx
+import { useCallback, useEffect as useEffect3, useRef as useRef3, useState as useState5 } from "react";
+import { Box as Box5, Static, Text as Text7, useInput as useInput3, useStdout } from "ink";
+import TextInput2 from "ink-text-input";
+import { Fragment as Fragment2, jsx as jsx5, jsxs as jsxs7 } from "react/jsx-runtime";
+function deriveTitle(text) {
+  const firstLine = (text.split("\n")[0] ?? "").trim();
+  const t = firstLine.length > 0 ? firstLine : text.trim();
+  return t.length > 72 ? `${t.slice(0, 69).trimEnd()}\u2026` : t;
+}
+function ConversationScreen({ config, repo, onBack }) {
+  const idRef = useRef3(0);
+  const [msgs, setMsgs] = useState5([
+    {
+      id: 0,
+      role: "system",
+      kind: "info",
+      text: `${repo.fullName} \u2014 describe what you'd like to build. Your message becomes a request; the FlumeCode agent (your runner) takes it from there.`
     }
-    if (key.upArrow) {
-      setCursor((c) => Math.max(0, c - 1));
-      return;
+  ]);
+  const [input, setInput] = useState5("");
+  const historyRef = useRef3([]);
+  const [histIndex, setHistIndex] = useState5(null);
+  const [phase, setPhase] = useState5("compose");
+  const [error, setError] = useState5(null);
+  const [agentPending, setAgentPending] = useState5(false);
+  const [requestId, setRequestId] = useState5(null);
+  const planMessageId = useRef3(null);
+  const shownIds = useRef3(/* @__PURE__ */ new Set());
+  const [widgetMsg, setWidgetMsg] = useState5(null);
+  const { stdout: stdout2 } = useStdout();
+  const width = Math.min(stdout2?.columns ?? 80, 100);
+  const runners = usePoll(() => listRunners(config), 15e3);
+  const noRunnerOnline = runners !== null && !runners.some((r) => r.status === "online");
+  const push = useCallback((role, text, kind = "text") => {
+    setMsgs((prev) => [...prev, { id: ++idRef.current, role, kind, text }]);
+  }, []);
+  const createFromIdea = useCallback(
+    async (idea) => {
+      setPhase("creating");
+      try {
+        const agents = await listAgents(config);
+        const agentId = agents[0]?.id;
+        if (!agentId) throw new Error("No agent is configured for this repository.");
+        const { requestId: id } = await createRequest(config, {
+          title: deriveTitle(idea),
+          body: idea,
+          agentId,
+          repoId: repo.id,
+          // Fixed to the repo's default branch (same as the merge target below).
+          checkoutBranch: repo.defaultBranch ?? "main"
+        });
+        setRequestId(id);
+        setError(null);
+        push("system", `Request created \u2014 ${config.serverUrl}/requests/${id}`, "success");
+        push(
+          "system",
+          "The agent (your runner) is working on it. Needs a connected runner; Esc to leave.",
+          "info"
+        );
+        setPhase("thread");
+      } catch (err) {
+        setError(
+          `Could not create the request: ${err instanceof Error ? err.message : String(err)}`
+        );
+        setPhase("compose");
+      }
+    },
+    [config, push, repo]
+  );
+  const postFollowUp = useCallback(
+    async (text) => {
+      if (!requestId) return;
+      try {
+        await addRequestComment(config, requestId, text);
+        setError(null);
+      } catch (err) {
+        setError(`Could not send: ${err instanceof Error ? err.message : String(err)}`);
+      }
+    },
+    [config, requestId]
+  );
+  const doImplement = useCallback(async () => {
+    const msgId = planMessageId.current;
+    if (!msgId) return;
+    setPhase("working");
+    try {
+      const mergeBranch = repo.defaultBranch ?? "main";
+      const { session } = await acceptPlan(config, msgId, mergeBranch);
+      push(
+        "system",
+        `Coding session created \u2014 ${config.serverUrl}/repositories/${repo.id}/sessions/${session.id}`,
+        "success"
+      );
+      await startImplementing(config, session.id);
+      push(
+        "system",
+        "Implementation started \u2014 the runner will build it and open a PR. Track it in the status bar or the web.",
+        "success"
+      );
+    } catch (err) {
+      push(
+        "system",
+        `Could not start implementing: ${err instanceof Error ? err.message : String(err)}`,
+        "error"
+      );
     }
-    if (key.downArrow) {
-      setCursor((c) => Math.min(messages.length - 1, c + 1));
+    setPhase("thread");
+  }, [config, push, repo]);
+  const onWidgetDone = useCallback(
+    (summary) => {
+      setWidgetMsg(null);
+      for (const line of summary) push("system", line, "info");
+      push("system", "the agent is continuing\u2026", "info");
+      setPhase("thread");
+    },
+    [push]
+  );
+  useEffect3(() => {
+    if (phase !== "thread" || !requestId) return;
+    let live = true;
+    const poll = async () => {
+      try {
+        const data = await getRequest(config, requestId);
+        if (!live) return;
+        let pending = false;
+        for (const m of data.messages) {
+          if (shownIds.current.has(m.id)) continue;
+          if (m.authorType && m.authorType !== "agent") {
+            shownIds.current.add(m.id);
+            continue;
+          }
+          if (m.type === "plan" && m.body?.trim()) {
+            shownIds.current.add(m.id);
+            planMessageId.current = m.id;
+            push("assistant", m.body.trim(), "plan");
+            setAgentPending(false);
+            setPhase("confirm-implement");
+            live = false;
+            return;
+          }
+          const ws = m.widgets;
+          if (ws && ws.length) {
+            shownIds.current.add(m.id);
+            if (m.body?.trim()) push("assistant", m.body.trim(), "markdown");
+            push("system", "The agent is asking \u2014 pick an option below.", "info");
+            setWidgetMsg({ id: m.id, widgets: ws, requestId });
+            setAgentPending(false);
+            setPhase("answering-widget");
+            live = false;
+            return;
+          }
+          if (m.type === "comment" && m.body?.trim()) {
+            shownIds.current.add(m.id);
+            push("assistant", m.body.trim(), "markdown");
+            continue;
+          }
+          if (m.authorType === "agent" && !m.body?.trim()) pending = true;
+        }
+        setAgentPending(pending);
+      } catch {
+      }
+    };
+    void poll();
+    const iv = setInterval(() => void poll(), 3e3);
+    return () => {
+      live = false;
+      clearInterval(iv);
+    };
+  }, [phase, requestId, config, push]);
+  useInput3((ch, key) => {
+    if (phase === "answering-widget") return;
+    if (key.escape) {
+      if (phase === "compose" || phase === "thread") onBack();
+      else if (phase === "confirm-implement") {
+        push("system", "Holding off on implementation.", "info");
+        setPhase("thread");
+      }
       return;
     }
-    if (key.return && selectedMsg) {
-      if (selectedMsg.widgets?.length) {
-        const widgets = selectedMsg.widgets;
-        setOverlay({ kind: "widget", message: { ...selectedMsg, widgets, requestId } });
-      } else if (selectedMsg.type === "plan") {
-        setTargetBranch("main");
-        setMergeBranch("");
-        setAcceptStep("target");
-        setOverlay({ kind: "accept", messageId: selectedMsg.id });
+    if ((phase === "compose" || phase === "thread") && (key.upArrow || key.downArrow)) {
+      const h = historyRef.current;
+      if (h.length === 0) return;
+      if (key.upArrow) {
+        const idx = histIndex === null ? h.length - 1 : Math.max(0, histIndex - 1);
+        setHistIndex(idx);
+        setInput(h[idx] ?? "");
+      } else if (histIndex !== null && histIndex < h.length - 1) {
+        const idx = histIndex + 1;
+        setHistIndex(idx);
+        setInput(h[idx] ?? "");
+      } else {
+        setHistIndex(null);
+        setInput("");
       }
+      return;
     }
-    if (_input === "i" && implementableSession) {
-      void doImplement(implementableSession.id);
+    if (phase === "confirm-implement") {
+      if (ch === "y" || ch === "Y") void doImplement();
+      else if (ch === "n" || ch === "N") {
+        push("system", "Holding off on implementation.", "info");
+        setPhase("thread");
+      }
     }
   });
-  async function doAcceptPlan() {
-    if (overlay.kind !== "accept") return;
-    try {
-      await acceptPlan(
-        config,
-        overlay.messageId,
-        targetBranch.trim() || "main",
-        mergeBranch.trim() || "flumecode/session"
-      );
-      setOverlay({ kind: "accepted" });
-    } catch (err) {
-      setError(err instanceof Error ? err.message : "Unknown error");
+  const onSubmit = () => {
+    const text = input.trim();
+    if (!text) return;
+    const h = historyRef.current;
+    if (h[h.length - 1] !== text) h.push(text);
+    setHistIndex(null);
+    setInput("");
+    if (phase === "compose") {
+      push("user", text);
+      void createFromIdea(text);
+    } else if (phase === "thread") {
+      push("user", text);
+      void postFollowUp(text);
     }
-  }
-  async function doImplement(sessionId) {
-    try {
-      await startImplementing(config, sessionId);
-    } catch (err) {
-      setError(err instanceof Error ? err.message : "Unknown error");
-    }
-  }
-  if (overlay.kind === "widget") {
-    return /* @__PURE__ */ jsx6(
-      WidgetAnswerScreen,
-      {
-        config,
-        message: overlay.message,
-        onDone: () => setOverlay({ kind: "none" })
-      }
-    );
-  }
-  if (overlay.kind === "accept") {
-    return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", gap: 1, children: [
-      /* @__PURE__ */ jsx6(Text6, { bold: true, children: "Accept Plan" }),
-      /* @__PURE__ */ jsx6(Text6, { children: "Enter target branch (base):" }),
-      /* @__PURE__ */ jsx6(
-        TextInput3,
-        {
-          value: targetBranch,
-          onChange: setTargetBranch,
-          onSubmit: () => setAcceptStep("merge"),
-          focus: acceptStep === "target"
-        }
-      ),
-      acceptStep === "merge" && /* @__PURE__ */ jsxs6(Fragment, { children: [
-        /* @__PURE__ */ jsx6(Text6, { children: "Enter merge branch name:" }),
-        /* @__PURE__ */ jsx6(
-          TextInput3,
+  };
+  const inputActive = phase === "compose" || phase === "thread";
+  const staticItems = [{ kind: "header", id: -1 }, ...msgs];
+  return /* @__PURE__ */ jsxs7(Box5, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx5(Static, { items: staticItems, children: (item) => item.kind === "header" ? /* @__PURE__ */ jsx5(Box5, { marginBottom: 1, children: /* @__PURE__ */ jsxs7(Text7, { bold: true, children: [
+      "\u273B FlumeCode \xB7 ",
+      repo.fullName,
+      "  ",
+      /* @__PURE__ */ jsx5(Text7, { dimColor: true, children: "esc to go back" })
+    ] }) }, String(item.id)) : /* @__PURE__ */ jsx5(Message, { msg: item, width }, String(item.id)) }),
+    phase === "creating" && /* @__PURE__ */ jsx5(Spinner, { label: "creating request\u2026" }),
+    phase === "working" && /* @__PURE__ */ jsx5(Spinner, { label: "working\u2026" }),
+    phase === "confirm-implement" && /* @__PURE__ */ jsxs7(Text7, { children: [
+      /* @__PURE__ */ jsx5(Text7, { color: "green", bold: true, children: "\u276F Start implementing?" }),
+      /* @__PURE__ */ jsx5(Text7, { dimColor: true, children: " y = yes \xB7 n = keep refining" })
+    ] }),
+    phase === "answering-widget" && widgetMsg && /* @__PURE__ */ jsx5(WidgetAnswerScreen, { config, message: widgetMsg, onDone: onWidgetDone }),
+    phase === "thread" && agentPending && /* @__PURE__ */ jsx5(Spinner, { label: "waiting for the agent\u2026" }),
+    phase === "thread" && agentPending && noRunnerOnline && /* @__PURE__ */ jsx5(Text7, { color: "yellow", children: "\u26A0 no runner online \u2014 start one with `flumecode start`" }),
+    inputActive && /* @__PURE__ */ jsxs7(Fragment2, { children: [
+      error && /* @__PURE__ */ jsx5(Text7, { color: "red", children: error }),
+      /* @__PURE__ */ jsxs7(Box5, { borderStyle: "round", borderColor: inputActive ? "cyan" : "gray", paddingX: 1, children: [
+        /* @__PURE__ */ jsx5(Text7, { color: "cyan", bold: true, children: "\u203A " }),
+        /* @__PURE__ */ jsx5(
+          TextInput2,
           {
-            value: mergeBranch,
-            onChange: setMergeBranch,
-            onSubmit: () => void doAcceptPlan(),
+            value: input,
+            onChange: (v) => {
+              setInput(v);
+              if (histIndex !== null) setHistIndex(null);
+            },
+            onSubmit,
             focus: true
-          }
+          },
+          `input-${histIndex ?? "live"}`
         )
       ] }),
-      error && /* @__PURE__ */ jsx6(Text6, { color: "red", children: error })
-    ] });
-  }
-  return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx6(Text6, { bold: true, children: "Thread (\u2191\u2193 navigate, Enter act on selected, i implement, Esc back)" }),
-    !data && /* @__PURE__ */ jsx6(Text6, { children: "Loading\u2026" }),
-    overlay.kind === "accepted" && /* @__PURE__ */ jsx6(Text6, { color: "green", children: "Plan accepted! Job queued." }),
-    messages.map((msg, i) => /* @__PURE__ */ jsx6(Box6, { flexDirection: "column", marginY: 0, children: /* @__PURE__ */ jsxs6(Text6, { color: i === cursor ? "cyan" : void 0, children: [
-      i === cursor ? "\u25B6 " : "  ",
-      "[",
-      msg.type,
-      "] ",
-      msg.body?.slice(0, 80) ?? "",
-      msg.widgets?.length ? ` (${msg.widgets.length} widget${msg.widgets.length > 1 ? "s" : ""})` : ""
-    ] }) }, msg.id)),
-    implementableSession && /* @__PURE__ */ jsxs6(Text6, { dimColor: true, children: [
-      "Press i to start implementing session ",
-      implementableSession.id.slice(0, 8),
-      "\u2026"
-    ] }),
-    error && /* @__PURE__ */ jsx6(Text6, { color: "red", children: error })
+      /* @__PURE__ */ jsx5(Text7, { dimColor: true, children: phase === "compose" ? "enter to create a request \xB7 esc back" : "enter send \xB7 esc back" })
+    ] })
   ] });
 }
-var init_ThreadScreen = __esm({
-  "src/tui/ThreadScreen.tsx"() {
+var init_ConversationScreen = __esm({
+  "src/tui/ConversationScreen.tsx"() {
     "use strict";
-    init_usePoll();
     init_tui_api();
     init_WidgetAnswerScreen();
+    init_Message();
+    init_Spinner();
+    init_usePoll();
   }
 });
 
@@ -581,58 +854,37 @@ var App_exports = {};
 __export(App_exports, {
   App: () => App
 });
-import { useState as useState7 } from "react";
-import { Box as Box7 } from "ink";
-import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
+import { useState as useState6 } from "react";
+import { Box as Box6 } from "ink";
+import { jsx as jsx6, jsxs as jsxs8 } from "react/jsx-runtime";
 function renderScreen(screen, setScreen, config) {
   switch (screen.name) {
     case "repos":
-      return /* @__PURE__ */ jsx7(
+      return /* @__PURE__ */ jsx6(
         RepoListScreen,
         {
           config,
-          onSelect: (repo) => setScreen({ name: "requests", repo })
+          onSelect: (repo) => setScreen({ name: "conversation", repo })
         }
       );
-    case "requests":
-      return /* @__PURE__ */ jsx7(
-        RequestListScreen,
+    case "conversation":
+      return /* @__PURE__ */ jsx6(
+        ConversationScreen,
         {
           config,
           repo: screen.repo,
-          onOpen: (req) => setScreen({ name: "thread", repo: screen.repo, requestId: req.id }),
-          onNew: () => setScreen({ name: "new-request", repo: screen.repo }),
           onBack: () => setScreen({ name: "repos" })
         }
       );
-    case "new-request":
-      return /* @__PURE__ */ jsx7(
-        NewRequestScreen,
-        {
-          config,
-          repo: screen.repo,
-          onCreated: (requestId) => setScreen({ name: "thread", repo: screen.repo, requestId }),
-          onBack: () => setScreen({ name: "requests", repo: screen.repo })
-        }
-      );
-    case "thread":
-      return /* @__PURE__ */ jsx7(
-        ThreadScreen,
-        {
-          config,
-          requestId: screen.requestId,
-          onBack: () => setScreen({ name: "requests", repo: screen.repo })
-        }
-      );
   }
 }
 function App({ config }) {
-  const [screen, setScreen] = useState7({ name: "repos" });
+  const [screen, setScreen] = useState6({ name: "repos" });
   const jobs = usePoll(() => listJobs(config), 3e3);
   const runners = usePoll(() => listRunners(config), 3e3);
-  return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
+  return /* @__PURE__ */ jsxs8(Box6, { flexDirection: "column", children: [
     renderScreen(screen, setScreen, config),
-    /* @__PURE__ */ jsx7(StatusBar, { jobs, runners })
+    /* @__PURE__ */ jsx6(StatusBar, { jobs, runners })
   ] });
 }
 var init_App = __esm({
@@ -642,15 +894,17 @@ var init_App = __esm({
     init_usePoll();
     init_StatusBar();
     init_RepoListScreen();
-    init_RequestListScreen();
-    init_NewRequestScreen();
-    init_ThreadScreen();
+    init_ConversationScreen();
   }
 });
 
 // src/cli.ts
 import { createInterface } from "node:readline/promises";
 import { stdin, stdout } from "node:process";
+import { spawn as spawn4 } from "node:child_process";
+import { openSync } from "node:fs";
+import { homedir as homedir2 } from "node:os";
+import { join as join7 } from "node:path";
 
 // src/config.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
@@ -662,8 +916,8 @@ function readConfig() {
   if (!existsSync(configPath)) return null;
   try {
     const parsed = JSON.parse(readFileSync(configPath, "utf8"));
-    if (!parsed.serverUrl || !parsed.token) return null;
-    const config = { serverUrl: parsed.serverUrl, token: parsed.token };
+    if (!parsed.serverUrl || !parsed.token && !parsed.apiToken) return null;
+    const config = { serverUrl: parsed.serverUrl, token: parsed.token ?? "" };
     if (parsed.apiToken) config.apiToken = parsed.apiToken;
     return config;
   } catch {
@@ -675,6 +929,118 @@ function writeConfig(config) {
   writeFileSync(configPath, JSON.stringify(config, null, 2), { mode: 384 });
 }
 
+// src/browser-login.ts
+import { createServer } from "node:http";
+import { randomBytes } from "node:crypto";
+import { hostname } from "node:os";
+import { spawn } from "node:child_process";
+var LOGIN_TIMEOUT_MS = 5 * 6e4;
+function openBrowser(url) {
+  const [cmd, args] = process.platform === "darwin" ? ["open", [url]] : process.platform === "win32" ? ["cmd", ["/c", "start", "", url]] : ["xdg-open", [url]];
+  try {
+    const child = spawn(cmd, args, { stdio: "ignore", detached: true });
+    child.on("error", () => {
+    });
+    child.unref();
+  } catch {
+  }
+}
+function respondHtml(res, status, title, body2) {
+  const html = `<!doctype html><html><head><meta charset="utf-8"><title>${title}</title><style>
+    body{font:16px/1.5 system-ui,sans-serif;background:#0b0b0f;color:#e8e8ea;display:grid;place-items:center;height:100vh;margin:0}
+    .box{max-width:28rem;padding:2rem;text-align:center}
+    h1{font-size:1.25rem;margin:0 0 .5rem}p{color:#a0a0a8;margin:0}
+  </style></head><body><div class="box"><h1>${title}</h1><p>${body2}</p></div></body></html>`;
+  res.statusCode = status;
+  res.setHeader("Content-Type", "text/html; charset=utf-8");
+  res.end(html);
+}
+function browserLogin(opts) {
+  const print = opts.print ?? ((m) => console.log(m));
+  const open = opts.open ?? openBrowser;
+  const state = randomBytes(16).toString("hex");
+  return new Promise((resolve, reject) => {
+    let timer;
+    const server = createServer((req, res) => {
+      const url = new URL(req.url ?? "/", "http://127.0.0.1");
+      if (url.pathname !== "/" && url.pathname !== "/callback") {
+        res.statusCode = 404;
+        res.end("Not found");
+        return;
+      }
+      const params = url.searchParams;
+      if (params.get("state") !== state) {
+        respondHtml(
+          res,
+          400,
+          "Login mismatch",
+          "This authorization did not match the pending login. Run `flumecode login` again."
+        );
+        return;
+      }
+      const error = params.get("error");
+      if (error) {
+        respondHtml(
+          res,
+          200,
+          "Login canceled",
+          "You can close this tab and return to the terminal."
+        );
+        cleanup2();
+        reject(
+          new Error(
+            error === "denied" ? "Login was denied in the browser." : `Login failed: ${error}`
+          )
+        );
+        return;
+      }
+      respondHtml(
+        res,
+        200,
+        "You're signed in",
+        "Authorization complete \u2014 close this tab and return to the terminal."
+      );
+      cleanup2();
+      resolve({
+        cliToken: params.get("cli") ?? void 0,
+        runnerToken: params.get("runner") ?? void 0
+      });
+    });
+    const cleanup2 = () => {
+      clearTimeout(timer);
+      server.close();
+    };
+    server.on("error", (err) => {
+      cleanup2();
+      reject(err);
+    });
+    server.listen(0, "127.0.0.1", () => {
+      const addr = server.address();
+      const port = typeof addr === "object" && addr ? addr.port : 0;
+      if (!port) {
+        cleanup2();
+        reject(new Error("Could not start the local login listener."));
+        return;
+      }
+      const authorizeUrl = `${opts.serverUrl}/cli/authorize?` + new URLSearchParams({
+        port: String(port),
+        state,
+        host: hostname(),
+        scope: opts.scope
+      }).toString();
+      print("Opening your browser to authorize this machine\u2026");
+      print(`If it doesn't open, paste this URL:
+  ${authorizeUrl}
+`);
+      open(authorizeUrl);
+    });
+    timer = setTimeout(() => {
+      cleanup2();
+      reject(new Error("Timed out waiting for browser authorization (5 min)."));
+    }, LOGIN_TIMEOUT_MS);
+  });
+}
+
 // src/run.ts
 import { existsSync as existsSync5 } from "node:fs";
 import { join as join6 } from "node:path";
@@ -734,8 +1100,8 @@ async function pollJobCanceling(config, jobId) {
   });
   noteServerVersion(res);
   if (!res.ok) return false;
-  const body = await res.json();
-  return body.canceling === true;
+  const body2 = await res.json();
+  return body2.canceling === true;
 }
 async function reportJob(config, jobId, result) {
   const res = await fetch(`${config.serverUrl}/api/runner/jobs/${jobId}/complete`, {
@@ -957,7 +1323,18 @@ var stepSchema = z2.object({
     "Per-file pseudo code. Provide an entry for every non-documentation file this step touches. Each entry contains the file path and pseudo code describing the changes to that file."
   )
 });
+var requirementSchema = z2.object({
+  requirement: z2.string().min(1).describe(
+    "A human-readable statement of what this change must accomplish and why, in plain language a non-technical reader can follow. Distinct from acceptanceCriteria: requirements explain intent/rationale; acceptance criteria are the machine-checkable proof. " + INLINE_CODE_HINT
+  ),
+  acceptanceCriteria: z2.array(z2.string().min(1)).min(1).describe(
+    "Concrete, deterministically-checkable conditions that prove this requirement is satisfied. Each names a trigger/precondition and the exact observable result (run X -> output Y; file Z contains W; f(a) returns b) \u2014 no vague adjectives, not a restatement of a step. " + INLINE_CODE_HINT
+  )
+});
 var planInputSchema = {
+  dependsOn: z2.array(z2.number().int().positive()).optional().describe(
+    "1-based positions of EARLIER plans in this same submission that must be merged or closed before this one. Use ONLY when the work must be strictly serial; omit for independent plans."
+  ),
   title: z2.string().min(1).max(120).describe(
     "A concise, descriptive name for THIS plan. Must be distinct from the request title and from any sibling plans on the same request. Keep it under 120 characters."
   ),
@@ -970,13 +1347,10 @@ var planInputSchema = {
     "Why the user is making this request \u2014 the underlying motivation or problem the change addresses. Fill this especially when the request content/context does NOT already state the why (ask the user in the Clarify phase); omit when there is no additional motivation to record. Useful for future understanding of the system. " + INLINE_CODE_HINT
   ),
   assumptions: z2.array(z2.string()).describe("Anything decided during planning, including unanswered defaults."),
-  requirements: z2.array(z2.string().min(1)).min(1).describe(
-    "Required, human-readable statements of what this change must accomplish and why, in plain language a non-technical reader can follow. Distinct from acceptanceCriteria: requirements explain intent/rationale; acceptance criteria are the machine-checkable proof. At least 1 required. " + INLINE_CODE_HINT
+  requirements: z2.array(requirementSchema).min(1).describe(
+    "Required, human-readable statements of what this change must accomplish and why, each carrying its own acceptanceCriteria. At least 1 requirement required; at least 2 acceptance criteria total across all requirements. " + INLINE_CODE_HINT
   ),
   steps: z2.array(stepSchema).min(1).describe("Ordered list of changes. Each step says what and why, with file references."),
-  acceptanceCriteria: z2.array(z2.string().min(1)).min(2).describe(
-    "Concrete, deterministically-checkable conditions that together define done. Each names a trigger/precondition and the exact observable result (run X -> output Y; file Z contains W; f(a) returns b) \u2014 no vague adjectives, not a restatement of a step. The set must collectively cover every step's change. At least 2 required. " + INLINE_CODE_HINT
-  ),
   risks: z2.array(z2.string()).describe("Anything that could change the approach."),
   outOfScope: z2.array(z2.string()).describe("What is deliberately not being done.")
 };
@@ -991,7 +1365,21 @@ function requireRootCauseForFix(schema) {
     }
   });
 }
-var planSchema = requireRootCauseForFix(z2.object(planInputSchema));
+function requireAtLeastTwoCriteria(schema) {
+  return schema.superRefine((plan, ctx) => {
+    const total = plan.requirements.reduce((sum, r) => sum + r.acceptanceCriteria.length, 0);
+    if (total < 2) {
+      ctx.addIssue({
+        code: z2.ZodIssueCode.custom,
+        path: ["requirements"],
+        message: "At least 2 acceptance criteria total across all requirements are required."
+      });
+    }
+  });
+}
+var planSchema = requireAtLeastTwoCriteria(
+  requireRootCauseForFix(z2.object(planInputSchema))
+);
 function renderPlan(plan) {
   const lines2 = [];
   lines2.push(`# ${plan.title}`);
@@ -1018,8 +1406,8 @@ function renderPlan(plan) {
   }
   lines2.push("");
   lines2.push("## Requirements");
-  for (const requirement of plan.requirements) {
-    lines2.push(`- ${requirement}`);
+  for (const req of plan.requirements) {
+    lines2.push(`- ${req.requirement}`);
   }
   lines2.push("");
   lines2.push("## Steps");
@@ -1044,8 +1432,11 @@ function renderPlan(plan) {
   }
   lines2.push("");
   lines2.push("## Acceptance criteria");
-  for (const criterion of plan.acceptanceCriteria) {
-    lines2.push(`- [ ] ${criterion}`);
+  for (const req of plan.requirements) {
+    lines2.push(`### ${req.requirement}`);
+    for (const criterion of req.acceptanceCriteria) {
+      lines2.push(`- [ ] ${criterion}`);
+    }
   }
   if (plan.risks.length > 0) {
     lines2.push("");
@@ -1065,25 +1456,42 @@ function renderPlan(plan) {
   lines2.push(PLAN_MARKER);
   return lines2.join("\n");
 }
+function validateDependsOnReferences(arr, ctx) {
+  for (let i = 0; i < arr.length; i++) {
+    const deps = arr[i]?.dependsOn ?? [];
+    for (const dep of deps) {
+      if (dep > i || dep < 1) {
+        ctx.addIssue({
+          code: z2.ZodIssueCode.custom,
+          path: [i, "dependsOn"],
+          message: "dependsOn must reference an earlier plan (1-based) in this submission."
+        });
+      }
+    }
+  }
+}
 var submitPlanInputSchema = {
-  plans: z2.array(requireRootCauseForFix(z2.object(planInputSchema))).min(1).refine(
+  plans: z2.array(requireAtLeastTwoCriteria(requireRootCauseForFix(z2.object(planInputSchema)))).min(1).refine(
     (arr) => {
       const titles = arr.map((p) => p.title.trim()).filter((t) => t.length > 0);
       return new Set(titles).size === titles.length;
     },
     { message: "Each plan must have a distinct non-empty title" }
-  )
+  ).superRefine(validateDependsOnReferences)
 };
 var submitPlanSchema = z2.object(submitPlanInputSchema);
+function toPlanDraft(plan) {
+  return { body: renderPlan(plan), dependsOn: plan.dependsOn ?? [] };
+}
 function createPlanTooling() {
   let renderedPlans = null;
   const submitPlan = tool2(
     SUBMIT_PLAN,
-    `Submit ALL your plans in a single call \u2014 one entry per plan; each becomes its own independently-acceptable Accept-as-plan draft. Do NOT call submit_plan more than once. acceptanceCriteria is required in each plan and must contain at least 2 observable, verifiable conditions. The 'title' field names each specific plan \u2014 make it concise and distinct from the request title and from sibling plan titles. requirements is required in each plan: at least 1 plain-language statement of what the change must accomplish and why (human-readable intent), separate from the machine-checkable acceptanceCriteria. When a plan's scope is "fix", rootCause is required: a non-empty explanation of the underlying cause of the bug (not just the symptom). motivation is optional: the user's stated or asked-for reason for the request. `,
+    `Submit ALL your plans in a single call \u2014 one entry per plan; each becomes its own independently-acceptable Accept-as-plan draft. Do NOT call submit_plan more than once. requirements is required in each plan: an array of objects, each with a requirement (plain-language intent) and an acceptanceCriteria array (machine-checkable proof for that requirement). At least 1 requirement required; at least 2 acceptance criteria total across all requirements. Each requirement's acceptanceCriteria must be non-empty (at least 1 item). The 'title' field names each specific plan \u2014 make it concise and distinct from the request title and from sibling plan titles. When a plan's scope is "fix", rootCause is required: a non-empty explanation of the underlying cause of the bug (not just the symptom). motivation is optional: the user's stated or asked-for reason for the request. dependsOn is optional: a list of 1-based positions of EARLIER plans in this same submission that must be merged or closed before this one \u2014 use only when plans must be worked strictly serially.`,
     submitPlanInputSchema,
     async (args) => {
       const parsed = submitPlanSchema.parse(args);
-      renderedPlans = parsed.plans.map(renderPlan);
+      renderedPlans = parsed.plans.map(toPlanDraft);
       return {
         content: [
           {
@@ -1147,6 +1555,9 @@ var acVerdictSchema = z3.object({
   rationale: z3.string().min(1).describe("One or two sentences on why the verdict holds. " + INLINE_CODE_HINT),
   evidence: z3.array(evidenceSchema).describe(
     "Diff hunks proving the verdict, copied verbatim from git --no-pager diff. Across ALL criteria the evidence must collectively cover every hunk in the diff \u2014 each changed hunk appears under at least one criterion. Cite the relevant hunk(s) for a met criterion; may be empty for not_met / unclear."
+  ),
+  requirement: z3.string().min(1).optional().describe(
+    "The verbatim requirement text from the plan that this criterion appears under. Used for grouping criteria by requirement in the rendered report. Optional \u2014 omit for resolve runs (no plan) and legacy plans without grouping."
   )
 });
 var reportInputSchema = {
@@ -1171,24 +1582,47 @@ var reportInputSchema = {
   )
 };
 var reportSchema = z3.object(reportInputSchema);
+function groupByRequirement(criteria) {
+  const groups = /* @__PURE__ */ new Map();
+  for (const ac of criteria) {
+    const key = ac.requirement ?? null;
+    const existing = groups.get(key);
+    if (existing) {
+      existing.push(ac);
+    } else {
+      groups.set(key, [ac]);
+    }
+  }
+  return groups;
+}
+function renderAcVerdict(lines2, ac) {
+  lines2.push("");
+  lines2.push(`#### ${STATUS_ICON[ac.status]} ${ac.criterion}`);
+  lines2.push("");
+  lines2.push(ac.rationale.trim());
+  for (const ev of ac.evidence) {
+    lines2.push("");
+    lines2.push(ev.note ? `\`${ev.file}\` \u2014 ${ev.note}` : `\`${ev.file}\``);
+    lines2.push("");
+    lines2.push("```diff");
+    lines2.push(ev.hunk.replace(/\n+$/, ""));
+    lines2.push("```");
+  }
+}
 function renderReport(report) {
   const lines2 = [];
   lines2.push(report.summary.trim());
   lines2.push("", "## Files changed", "", report.filesChanged.trim());
   if (report.acceptanceCriteria.length > 0) {
     lines2.push("", "## Acceptance criteria");
-    for (const ac of report.acceptanceCriteria) {
-      lines2.push("");
-      lines2.push(`### ${STATUS_ICON[ac.status]} ${ac.criterion}`);
-      lines2.push("");
-      lines2.push(ac.rationale.trim());
-      for (const ev of ac.evidence) {
-        lines2.push("");
-        lines2.push(ev.note ? `\`${ev.file}\` \u2014 ${ev.note}` : `\`${ev.file}\``);
+    const groups = groupByRequirement(report.acceptanceCriteria);
+    for (const [req, acs] of groups) {
+      if (req !== null) {
         lines2.push("");
-        lines2.push("```diff");
-        lines2.push(ev.hunk.replace(/\n+$/, ""));
-        lines2.push("```");
+        lines2.push(`### ${req}`);
+      }
+      for (const ac of acs) {
+        renderAcVerdict(lines2, ac);
       }
     }
   }
@@ -1212,7 +1646,7 @@ function createReportTooling() {
   let submittedReport = null;
   const submitReport = tool3(
     SUBMIT_REPORT,
-    "Submit the final implementation report as structured data. Call this exactly once, at the end of the run. `acceptanceCriteria` must contain one entry per plan criterion, each with a met / not_met / unclear verdict and the diff hunk(s) that prove it. `summary`, `filesChanged`, `codeQuality`, and `caveats` are the four named markdown sections. `cicd` (optional) holds Verify-phase check results (one entry per command with `command`, `status` `passed`/`failed`, and `output` on failure); omit when no verification setup exists. Do NOT include a PR link \u2014 the runner appends it.",
+    "Submit the final implementation report as structured data. Call this exactly once, at the end of the run. `acceptanceCriteria` must contain one entry per plan criterion (same count and order), each with a met / not_met / unclear verdict and the diff hunk(s) that prove it. Set `requirement` on each entry to the verbatim text of the `### <requirement>` heading the criterion appeared under in the plan \u2014 this groups criteria by requirement in the rendered report. Omit `requirement` for resolve runs (no plan) or when the plan has no requirement headings. `summary`, `filesChanged`, `codeQuality`, and `caveats` are the four named markdown sections. `cicd` (optional) holds Verify-phase check results (one entry per command with `command`, `status` `passed`/`failed`, and `output` on failure); omit when no verification setup exists. Do NOT include a PR link \u2014 the runner appends it.",
     reportInputSchema,
     async (args) => {
       submittedReport = reportSchema.parse(args);
@@ -1295,7 +1729,7 @@ async function runClaudeCode(opts) {
   const { mcpServer, collected } = createWidgetTooling();
   const { mcpServer: planServer, getPlans } = createPlanTooling();
   const { mcpServer: reportServer, getReport } = createReportTooling();
-  for await (const message of query({
+  for await (const message2 of query({
     prompt: opts.prompt,
     options: {
       cwd: opts.cwd,
@@ -1319,8 +1753,8 @@ async function runClaudeCode(opts) {
       allowedTools: [...WIDGET_TOOL_NAMES, PLAN_TOOL_NAME, REPORT_TOOL_NAME, "Task"]
     }
   })) {
-    if (message.type === "assistant") {
-      const content = message.message?.content;
+    if (message2.type === "assistant") {
+      const content = message2.message?.content;
       if (Array.isArray(content)) {
         for (const block of content) {
           if (block && block.type === "text" && typeof block.text === "string") {
@@ -1331,8 +1765,8 @@ async function runClaudeCode(opts) {
           }
         }
       }
-    } else if (message.type === "user") {
-      const content = message.message?.content;
+    } else if (message2.type === "user") {
+      const content = message2.message?.content;
       if (Array.isArray(content)) {
         for (const block of content) {
           if (block && block.type === "tool_result") {
@@ -1340,10 +1774,10 @@ async function runClaudeCode(opts) {
           }
         }
       }
-    } else if (message.type === "result") {
-      finalText = message.result ?? "";
+    } else if (message2.type === "result") {
+      finalText = message2.result ?? "";
       logEvent("result", finalText);
-      const resultMsg = message;
+      const resultMsg = message2;
       if (resultMsg.usage) {
         usageAcc.inputTokens += resultMsg.usage.input_tokens ?? 0;
         usageAcc.outputTokens += resultMsg.usage.output_tokens ?? 0;
@@ -1351,8 +1785,8 @@ async function runClaudeCode(opts) {
         usageAcc.cacheReadTokens += resultMsg.usage.cache_read_input_tokens ?? 0;
       }
       usageAcc.costUsd += resultMsg.total_cost_usd ?? 0;
-    } else if (message.type === "system") {
-      logEvent("system", JSON.stringify(message));
+    } else if (message2.type === "system") {
+      logEvent("system", JSON.stringify(message2));
     }
   }
   process.stdout.write("\n");
@@ -1363,7 +1797,7 @@ async function runClaudeCode(opts) {
 }
 
 // src/codex.ts
-import { spawn } from "node:child_process";
+import { spawn as spawn2 } from "node:child_process";
 import { mkdtempSync, readFileSync as readFileSync3, writeFileSync as writeFileSync2, existsSync as existsSync2 } from "node:fs";
 import { join as join2 } from "node:path";
 import { tmpdir } from "node:os";
@@ -1373,7 +1807,7 @@ async function runCodex(opts) {
   const tmpDir = mkdtempSync(join2(tmpdir(), "flume-codex-"));
   const outFile = join2(tmpDir, "flume-mcp.jsonl");
   writeFileSync2(outFile, "");
-  const child = spawn(
+  const child = spawn2(
     "codex",
     [
       "exec",
@@ -1426,7 +1860,8 @@ async function runCodex(opts) {
   }
   const raw = existsSync2(outFile) ? readFileSync3(outFile, "utf8") : "";
   const records = raw.split("\n").filter(Boolean).map(parseJsonLine).filter((r) => r !== null);
-  const plans = records.filter((r) => r.kind === "plans").flatMap((r) => r.plans ?? []);
+  const rawPlans = records.filter((r) => r.kind === "plans").flatMap((r) => r.plans ?? []);
+  const plans = rawPlans.map((body2) => ({ body: body2, dependsOn: [] }));
   const widgets = records.filter((r) => r.kind === "widget").map((r) => r.widget);
   return {
     text: "",
@@ -1450,14 +1885,14 @@ async function checkClaudeCode() {
   try {
     let sawResult = false;
     const run = (async () => {
-      for await (const message of query2({
+      for await (const message2 of query2({
         prompt: "Reply with the single word: ok",
         options: { permissionMode: "bypassPermissions", maxTurns: 1 }
       })) {
-        if (message.type === "result") {
+        if (message2.type === "result") {
           sawResult = true;
-          const isError = message.is_error === true;
-          const subtype = message.subtype;
+          const isError = message2.is_error === true;
+          const subtype = message2.subtype;
           if (isError)
             throw new Error(
               subtype ? `Claude Code error: ${subtype}` : "Claude Code returned an error"
@@ -1472,9 +1907,9 @@ async function checkClaudeCode() {
     return { ready: false, error: errorMessage(err) };
   }
 }
-function withTimeout(p, ms, message) {
+function withTimeout(p, ms, message2) {
   return new Promise((resolve, reject) => {
-    const timer = setTimeout(() => reject(new Error(message)), ms);
+    const timer = setTimeout(() => reject(new Error(message2)), ms);
     p.then(
       (v) => {
         clearTimeout(timer);
@@ -1536,6 +1971,13 @@ function appendRule(lines2, intro, ruleName) {
   lines2.push("", intro, "", loadRule(ruleName));
 }
 var WRITING_INTRO = "These technical-writing guidelines apply to the plan and report prose you author in this run:";
+var SETUP_PREVIEW_MARKER = "<!-- flumecode:setup-preview -->";
+function setupPreviewDirective(mode) {
+  if (mode === "plan") {
+    return "This request installs FlumeCode's **UI Preview plugin**. Use the `flumecode:setup-preview` skill as your authority: analyse this app read-only to determine exactly what the plugin needs \u2014 the app directory, the install and dev-server commands, any env for a hermetic boot, the globs that count as a UI change, and the showcase strategy \u2014 and fold that into the plan you submit (the precise `.flumecode/plugins/ui-preview.json` fields to write and the `.flumecode/wiki/components/ui-preview.md` record to add). Do not write files; you are read-only.";
+  }
+  return "This request installs FlumeCode's **UI Preview plugin**. The `flumecode:setup-preview` skill is the authority on what to produce \u2014 `.flumecode/plugins/ui-preview.json` (the machine recipe later previews execute) and a `.flumecode/wiki/components/ui-preview.md` record, plus any packages future previews need. As the orchestrator, direct your implementation subagent to follow `flumecode:setup-preview` exactly, and your review subagent to verify the manifest and wiki record against it.";
+}
 var LANGUAGE_DIRECTIVE = "First, determine the dominant natural language of the incoming thread (the request title/body and the user's messages). Use that one language for EVERYTHING you author this run - your reply body, any plan or report fields, AND every clarifying question and its widget options. Never mix languages: if the thread is in English, your questions and options must be in English too. Keep code identifiers, file paths, and quoted code verbatim.";
 function turnHeading(turn, agentName) {
   if (turn.role === "user") return "User";
@@ -1572,6 +2014,9 @@ function buildPrompt(ctx) {
       loadRule("coding-guideline")
     );
   }
+  if (ctx.request?.body?.includes(SETUP_PREVIEW_MARKER)) {
+    lines2.push("", setupPreviewDirective(ctx.permissionMode));
+  }
   appendRule(lines2, WRITING_INTRO, "technical-writing");
   lines2.push("", `# Request: ${ctx.request?.title ?? ""}`);
   if (ctx.request?.body) {
@@ -1740,12 +2185,19 @@ function buildCodexPrompt(ctx) {
     "\n"
   );
 }
-function buildPreviewPrompt(ctx, committedFileNames, tmpRoute) {
+function buildPreviewPrompt(ctx, committedFileNames, manifest, sentinelPath) {
   const lines2 = [
     `You are "${ctx.agentName}" authoring an ephemeral UI showcase for ${ctx.repo.fullName}.`,
-    `An implementation just ran and committed UI changes to branch "${ctx.repo.checkoutBranch}". Use the \`flumecode:preview-ui\` skill to create a temporary showcase page that imports the changed components and fills them with realistic fake data.`,
-    `Write your showcase files under \`${tmpRoute}\` and write the URL path to \`${tmpRoute}/.showcase-path\`.`,
-    `These files are ephemeral and git-excluded \u2014 do NOT commit or push them.`,
+    `An implementation just ran and committed UI changes to branch "${ctx.repo.checkoutBranch}". Use the \`flumecode:preview-ui\` skill to create a temporary showcase that renders the changed UI with realistic fake data, following the recipe below for this repo's stack.`,
+    `Record the showcase's URL path (exactly, no trailing newline) in the file \`${sentinelPath}\` \u2014 the runner reads it to navigate to your showcase.`,
+    `Your showcase is EPHEMERAL: the runner reverts the working tree after capturing it, so you may edit whatever the recipe requires (including registering a temporary route in tracked files). Do NOT commit or push.`,
+    "",
+    "## Preview recipe (from this repo's ui-preview plugin manifest)",
+    "",
+    `- App directory: \`${manifest.appDir}\``,
+    `- Showcase strategy: ${manifest.showcase.kind}`,
+    "",
+    manifest.showcase.instructions || "(no recipe instructions were recorded \u2014 infer from the app)",
     "",
     "These coding guidelines apply to all code produced in this run:",
     "",
@@ -1759,14 +2211,14 @@ function buildPreviewPrompt(ctx, committedFileNames, tmpRoute) {
   if (committedFileNames.trim()) {
     lines2.push(
       "",
-      "UI files changed by this implementation (showcase these components):",
+      "UI files changed by this implementation (showcase these):",
       "",
       committedFileNames.trim()
     );
   }
   lines2.push(
     "",
-    "When done, reply with one short sentence confirming what showcase file you created."
+    "When done, reply with one short sentence confirming what showcase you created and its URL path."
   );
   return lines2.join("\n");
 }
@@ -1781,7 +2233,8 @@ function buildInitPrompt(ctx) {
 
 // src/types.ts
 function jobTitle(ctx) {
-  return ctx.kind === "init" ? "Initialize FlumeCode wiki" : ctx.request?.title ?? "request";
+  if (ctx.kind === "init") return "Initialize FlumeCode wiki";
+  return ctx.request?.title ?? "request";
 }
 
 // src/workspace.ts
@@ -1945,6 +2398,13 @@ async function gitDiffStat(dir) {
   const { stdout: stdout2 } = await git(["-C", dir, "--no-pager", "diff", "--stat"]);
   return stdout2;
 }
+async function captureFullDiff(ctx, dir) {
+  const { mergeBranch } = ctx.repo;
+  if (!mergeBranch) return "";
+  await git(["-C", dir, "fetch", "--quiet", "origin", mergeBranch]);
+  const { stdout: stdout2 } = await git(["-C", dir, "--no-pager", "diff", "FETCH_HEAD...HEAD"]);
+  return stdout2;
+}
 var PreCommitError = class extends Error {
   constructor(log) {
     super("pre-commit checks failed");
@@ -2037,7 +2497,7 @@ async function openPullRequest(ctx) {
     "content-type": "application/json"
   };
   const title = jobTitle(ctx);
-  const body = ctx.kind === "init" ? "Bootstraps the `.flumecode/` wiki for this repository. Opened by the FlumeCode runner." : `Opened by the FlumeCode runner for request "${title}".`;
+  const body2 = ctx.kind === "init" ? "Bootstraps the `.flumecode/` wiki for this repository. Opened by the FlumeCode runner." : `Opened by the FlumeCode runner for request "${title}".`;
   const res = await fetch(`${apiBase}/pulls`, {
     method: "POST",
     headers,
@@ -2045,7 +2505,7 @@ async function openPullRequest(ctx) {
       title: `FlumeCode: ${title}`,
       head: checkoutBranch,
       base: mergeBranch,
-      body
+      body: body2
     })
   });
   if (res.status === 201) {
@@ -2136,80 +2596,170 @@ async function prNumbersForCommit(ctx, sha) {
 }
 
 // src/preview.ts
-import { appendFileSync, existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync5, rmSync } from "node:fs";
-import { createServer } from "node:net";
-import { join as join5, relative } from "node:path";
-import { spawn as spawn2 } from "node:child_process";
+import { execFile as execFile2, spawn as spawn3 } from "node:child_process";
+import { existsSync as existsSync4, mkdtempSync as mkdtempSync2, readFileSync as readFileSync5, rmSync } from "node:fs";
+import { createServer as createServer2 } from "node:net";
+import { tmpdir as tmpdir3 } from "node:os";
+import { join as join5 } from "node:path";
+import { promisify as promisify2 } from "node:util";
+var exec2 = promisify2(execFile2);
 var PREVIEW_MAX_TURNS = 60;
 var CAPTURE_TIMEOUT_MS = 3e4;
 var DEV_SERVER_READY_TIMEOUT_MS = 6e4;
+var INSTALL_TIMEOUT_MS = 3e5;
+var MANIFEST_REL = ".flumecode/plugins/ui-preview.json";
 var VIEWPORTS = [
   { name: "mobile", width: 375, height: 812 },
   { name: "tablet", width: 768, height: 1024 },
   { name: "desktop", width: 1280, height: 800 }
 ];
-var UI_EXTENSIONS = /* @__PURE__ */ new Set([
-  ".tsx",
-  ".jsx",
-  ".vue",
-  ".svelte",
-  ".astro",
-  ".css",
-  ".scss",
-  ".sass",
-  ".less"
-]);
-function changedFilesTouchUi(stat) {
-  for (const line of stat.split("\n")) {
-    const trimmed = line.trim();
-    if (!trimmed) continue;
-    const dot = trimmed.lastIndexOf(".");
-    if (dot === -1) continue;
-    const ext = trimmed.slice(dot);
-    if (UI_EXTENSIONS.has(ext)) return true;
-  }
-  return false;
-}
-function detectFramework(dir) {
-  const pm = detectPackageManager(dir);
-  const pkgPath = join5(dir, "package.json");
-  if (!existsSync4(pkgPath)) return { pm, family: null, devCmd: null };
-  let pkg;
+var DEFAULT_UI_GLOBS = [
+  "**/*.tsx",
+  "**/*.jsx",
+  "**/*.vue",
+  "**/*.svelte",
+  "**/*.astro",
+  "**/*.css",
+  "**/*.scss",
+  "**/*.sass",
+  "**/*.less",
+  "**/*.html",
+  "**/*.htm",
+  "**/*.erb",
+  "**/*.haml",
+  "**/*.slim"
+];
+async function buildPreview(ctx, dir, committedFileNames, config, abort) {
+  let manifest;
   try {
-    pkg = JSON.parse(readFileSync5(pkgPath, "utf8"));
-  } catch {
-    return { pm, family: null, devCmd: null };
+    manifest = readPreviewManifest(dir);
+  } catch (err) {
+    return { status: "failed", reason: `UI Preview plugin manifest is invalid: ${message(err)}` };
+  }
+  if (!manifest) {
+    return {
+      status: "skipped",
+      reason: `UI Preview plugin not initialized \u2014 a repo member can enable it in repo settings (${MANIFEST_REL} is absent).`
+    };
+  }
+  if (!changedFilesTouchUi(committedFileNames, manifest.uiGlobs)) {
+    return { status: "skipped", reason: "No UI files were changed in this run." };
+  }
+  if (!manifest.devServer.trim()) {
+    return {
+      status: "blocked",
+      reason: "The UI Preview plugin needs manual setup before previews can run.",
+      ...manifest.manualSteps ? { manualSteps: manifest.manualSteps } : {}
+    };
+  }
+  try {
+    const { previewId, entrypoint } = await runPreviewPass(
+      ctx,
+      dir,
+      committedFileNames,
+      manifest,
+      config,
+      abort
+    );
+    return { status: "ready", previewId, entrypoint };
+  } catch (err) {
+    if (manifest.manualSteps) {
+      return { status: "blocked", reason: message(err), manualSteps: manifest.manualSteps };
+    }
+    return { status: "failed", reason: message(err) };
+  }
+}
+function readPreviewManifest(repoRoot) {
+  const path = join5(repoRoot, MANIFEST_REL);
+  if (!existsSync4(path)) return null;
+  let raw;
+  try {
+    raw = JSON.parse(readFileSync5(path, "utf8"));
+  } catch (err) {
+    throw new Error(`${MANIFEST_REL} is not valid JSON: ${message(err)}`);
   }
-  const deps = {
-    ...pkg.dependencies,
-    ...pkg.devDependencies
+  if (typeof raw !== "object" || raw === null) {
+    throw new Error(`${MANIFEST_REL} must be a JSON object`);
+  }
+  const o = raw;
+  const devServer = typeof o.devServer === "string" ? o.devServer : "";
+  const manualSteps = typeof o.manualSteps === "string" ? o.manualSteps : null;
+  if (!devServer.trim() && !manualSteps) {
+    throw new Error(`${MANIFEST_REL} must declare either "devServer" or "manualSteps"`);
+  }
+  const showcaseRaw = typeof o.showcase === "object" && o.showcase !== null ? o.showcase : {};
+  return {
+    version: typeof o.version === "number" ? o.version : 1,
+    appDir: typeof o.appDir === "string" && o.appDir.trim() ? o.appDir : ".",
+    install: stringArray(o.install),
+    devServer,
+    readyPath: typeof o.readyPath === "string" && o.readyPath.trim() ? o.readyPath : "/",
+    ...isStringRecord(o.env) ? { env: o.env } : {},
+    uiGlobs: stringArray(o.uiGlobs),
+    showcase: {
+      kind: typeof showcaseRaw.kind === "string" ? showcaseRaw.kind : "custom",
+      instructions: typeof showcaseRaw.instructions === "string" ? showcaseRaw.instructions : ""
+    },
+    manualSteps
   };
-  const family = pickFamily(deps);
-  const port = 0;
-  const devCmd = family ? pickDevCmd(family, port) : null;
-  return { pm, family, devCmd };
 }
-async function runPreviewPass(ctx, dir, committedFileNames, config, abort) {
-  const tmpRoute = mkTempRouteDir(dir);
+function stringArray(v) {
+  return Array.isArray(v) ? v.filter((x) => typeof x === "string") : [];
+}
+function isStringRecord(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v) && Object.values(v).every((x) => typeof x === "string");
+}
+function changedFilesTouchUi(stat, uiGlobs = []) {
+  const files = stat.split("\n").map((line) => line.trim()).filter(Boolean);
+  const regexes = (uiGlobs.length ? uiGlobs : DEFAULT_UI_GLOBS).map(globToRegExp);
+  return files.some((file) => regexes.some((re) => re.test(file)));
+}
+function globToRegExp(glob) {
+  let re = "";
+  for (let i = 0; i < glob.length; i++) {
+    const c = glob[i];
+    if (c === "*") {
+      if (glob[i + 1] === "*") {
+        i++;
+        if (glob[i + 1] === "/") {
+          i++;
+          re += "(?:.*/)?";
+        } else {
+          re += ".*";
+        }
+      } else {
+        re += "[^/]*";
+      }
+    } else if (c === "?") {
+      re += "[^/]";
+    } else if (".+^${}()|[]\\".includes(c)) {
+      re += `\\${c}`;
+    } else {
+      re += c;
+    }
+  }
+  return new RegExp(`^${re}$`);
+}
+async function runPreviewPass(ctx, dir, committedFileNames, manifest, config, abort) {
+  const appDir = manifest.appDir === "." ? dir : join5(dir, manifest.appDir);
+  await assertCleanTree(dir);
+  const scratch = mkdtempSync2(join5(tmpdir3(), "flume-showcase-"));
+  const sentinelPath = join5(scratch, ".showcase-path");
   try {
-    gitExclude(dir, tmpRoute);
     await runClaudeCode({
       cwd: dir,
-      prompt: buildPreviewPrompt(ctx, committedFileNames, tmpRoute),
+      prompt: buildPreviewPrompt(ctx, committedFileNames, manifest, sentinelPath),
       permissionMode: ctx.permissionMode,
       abortController: abort,
       maxTurns: PREVIEW_MAX_TURNS
     });
-    const showcasePath = readShowcasePath(tmpRoute);
+    const showcasePath = readSentinel(sentinelPath);
     if (!showcasePath) {
-      throw new Error("preview-ui skill did not write .showcase-path \u2014 skipping preview");
-    }
-    const framework = detectFramework(dir);
-    if (!framework.family) {
-      throw new Error("unsupported framework \u2014 skipping preview");
+      throw new Error("preview-ui skill did not record a showcase URL path \u2014 skipping preview");
     }
+    await runInstall(appDir, manifest.install);
     const port = await findFreePort();
-    const devServer = await startDevServer(dir, framework, port);
+    const devServer = await startDevServer(appDir, manifest, port);
     try {
       const url = `http://localhost:${port}${showcasePath}`;
       const shots = await captureWithChromium(url, VIEWPORTS);
@@ -2220,111 +2770,52 @@ async function runPreviewPass(ctx, dir, committedFileNames, config, abort) {
       await devServer.stop();
     }
   } finally {
-    rmSync(tmpRoute, { recursive: true, force: true });
-  }
-}
-function pickFamily(deps) {
-  if (deps["next"]) return "next";
-  if (deps["@sveltejs/kit"]) return "svelte-kit";
-  if (deps["nuxt"]) return "nuxt";
-  if (deps["astro"]) return "astro";
-  if (deps["react-scripts"]) return "cra";
-  if (deps["@remix-run/react"] || deps["@remix-run/node"]) return "remix";
-  if (deps["vite"]) {
-    if (deps["vue"]) return "vite-vue";
-    if (deps["svelte"]) return "vite-svelte";
-    if (deps["react"]) return "vite-react";
-    return "vite-react";
-  }
-  return null;
-}
-function pickDevCmd(family, port) {
-  switch (family) {
-    case "next":
-      return ["next", "dev", "-p", String(port)];
-    case "vite-react":
-    case "vite-vue":
-    case "vite-svelte":
-      return ["vite", "--port", String(port)];
-    case "nuxt":
-      return ["nuxt", "dev", "--port", String(port)];
-    case "svelte-kit":
-      return ["vite", "--port", String(port)];
-    case "astro":
-      return ["astro", "dev", "--port", String(port)];
-    case "cra":
-      return ["react-scripts", "start"];
-    case "remix":
-      return ["remix", "dev", "--port", String(port)];
-  }
-}
-function mkTempRouteDir(dir) {
-  const suffix = Math.random().toString(36).slice(2, 10);
-  const tmpRoute = join5(dir, `__flumecode_preview_${suffix}`);
-  mkdirSync2(tmpRoute, { recursive: true });
-  return tmpRoute;
-}
-function gitExclude(dir, tmpRoute) {
-  const excludePath = join5(dir, ".git", "info", "exclude");
-  const rel = relative(dir, tmpRoute);
-  appendFileSync(excludePath, `
-${rel}
-`);
+    await restoreTree(dir);
+    rmSync(scratch, { recursive: true, force: true });
+  }
 }
-function readShowcasePath(tmpRoute) {
-  const sentinelPath = join5(tmpRoute, ".showcase-path");
-  if (!existsSync4(sentinelPath)) return null;
-  const content = readFileSync5(sentinelPath, "utf8").trim();
-  return content.length > 0 ? content : null;
+async function assertCleanTree(dir) {
+  const { stdout: stdout2 } = await exec2("git", ["-C", dir, "status", "--porcelain"]);
+  if (stdout2.trim()) {
+    throw new Error("working tree is not clean before the showcase pass \u2014 refusing to restore");
+  }
 }
-function findFreePort() {
-  return new Promise((resolve, reject) => {
-    const server = createServer();
-    server.listen(0, "127.0.0.1", () => {
-      const addr = server.address();
-      if (!addr || typeof addr === "string") {
-        server.close();
-        reject(new Error("Could not determine free port"));
-        return;
-      }
-      const port = addr.port;
-      server.close((err) => {
-        if (err) reject(err);
-        else resolve(port);
-      });
-    });
-    server.on("error", reject);
-  });
+async function restoreTree(dir) {
+  try {
+    await exec2("git", ["-C", dir, "checkout", "--", "."]);
+    await exec2("git", ["-C", dir, "clean", "-fd"]);
+  } catch (err) {
+    console.warn(`  preview: working-tree restore failed: ${message(err)}`);
+  }
 }
-function startDevServer(dir, framework, port) {
+async function runInstall(appDir, commands) {
+  for (const cmd of commands) {
+    try {
+      await runShell(cmd, appDir, {}, INSTALL_TIMEOUT_MS);
+    } catch (err) {
+      console.warn(`  preview: install step "${cmd}" failed: ${message(err)}`);
+    }
+  }
+}
+function startDevServer(appDir, manifest, port) {
   return new Promise((resolve, reject) => {
-    const pm = framework.pm ?? "npm";
-    const devCmd = pickDevCmd(framework.family, port);
-    const argv = [pm === "npm" ? "npx" : "exec", ...devCmd];
-    const cmd = pm === "npm" ? "npx" : pm;
-    const args = pm === "npm" ? devCmd : ["exec", ...devCmd];
-    const proc = spawn2(cmd, args, {
-      cwd: dir,
-      env: { ...process.env, PORT: String(port) },
-      stdio: "ignore"
+    const command2 = manifest.devServer.replaceAll("{PORT}", String(port));
+    const proc = spawn3(command2, {
+      cwd: appDir,
+      shell: true,
+      stdio: "ignore",
+      env: { ...process.env, PORT: String(port), ...manifest.env ?? {} }
     });
     proc.on("error", reject);
-    const baseUrl = `http://localhost:${port}`;
+    const readyUrl = `http://127.0.0.1:${port}${manifest.readyPath}`;
     const deadline = Date.now() + DEV_SERVER_READY_TIMEOUT_MS;
+    const stop = () => new Promise((res) => {
+      proc.kill();
+      proc.on("close", () => res());
+      setTimeout(res, 500);
+    });
     const poll = () => {
-      fetch(baseUrl).then((res) => {
-        if (res.ok || res.status < 500) {
-          resolve({
-            stop: () => new Promise((res2) => {
-              proc.kill();
-              proc.on("close", () => res2());
-              setTimeout(res2, 500);
-            })
-          });
-        } else {
-          scheduleNext();
-        }
-      }).catch(() => scheduleNext());
+      fetch(readyUrl).then((r) => r.ok || r.status < 500 ? resolve({ stop }) : scheduleNext()).catch(() => scheduleNext());
     };
     const scheduleNext = () => {
       if (Date.now() > deadline) {
@@ -2339,6 +2830,50 @@ function startDevServer(dir, framework, port) {
     setTimeout(poll, 2e3);
   });
 }
+function runShell(command2, cwd, env, timeoutMs) {
+  return new Promise((resolve, reject) => {
+    const proc = spawn3(command2, {
+      cwd,
+      shell: true,
+      stdio: "ignore",
+      env: { ...process.env, ...env }
+    });
+    const timer = setTimeout(() => {
+      proc.kill();
+      reject(new Error(`"${command2}" timed out after ${timeoutMs}ms`));
+    }, timeoutMs);
+    proc.on("error", (err) => {
+      clearTimeout(timer);
+      reject(err);
+    });
+    proc.on("close", (code) => {
+      clearTimeout(timer);
+      if (code === 0) resolve();
+      else reject(new Error(`"${command2}" exited with code ${code}`));
+    });
+  });
+}
+function readSentinel(sentinelPath) {
+  if (!existsSync4(sentinelPath)) return null;
+  const content = readFileSync5(sentinelPath, "utf8").trim();
+  return content.length > 0 ? content : null;
+}
+function findFreePort() {
+  return new Promise((resolve, reject) => {
+    const server = createServer2();
+    server.listen(0, "127.0.0.1", () => {
+      const addr = server.address();
+      if (!addr || typeof addr === "string") {
+        server.close();
+        reject(new Error("Could not determine free port"));
+        return;
+      }
+      const port = addr.port;
+      server.close((err) => err ? reject(err) : resolve(port));
+    });
+    server.on("error", reject);
+  });
+}
 async function captureWithChromium(url, viewports) {
   const { chromium } = await import("playwright");
   const browser = await chromium.launch({ headless: true });
@@ -2378,6 +2913,9 @@ async function uploadAll(urls, keys, bytes) {
     })
   );
 }
+function message(err) {
+  return err instanceof Error ? err.message : String(err);
+}
 
 // src/run.ts
 var IDLE_MS = 5e3;
@@ -2686,18 +3224,26 @@ ${reply}`;
     rebase: !resumed
   });
   reply += outcomeBanner(outcome, { branch: ctx.repo.checkoutBranch, documented, autoMerged });
-  const finalReport = report && conflictResolution ? { ...report, conflictResolution } : report;
+  let fullDiff;
+  if (report && outcome.kind !== "none") {
+    try {
+      fullDiff = (await captureFullDiff(ctx, dir)).trim() || void 0;
+    } catch (err) {
+      console.warn(`  full-diff capture skipped: ${errorMessage2(err)}`);
+    }
+  }
+  const finalReport = report ? {
+    ...report,
+    ...conflictResolution ? { conflictResolution } : {},
+    ...fullDiff ? { fullDiff } : {}
+  } : report;
   let preview;
   if (outcome.kind !== "none") {
+    console.log(`  \u2026checking UI preview for implement ${ctx.jobId}`);
     const committedFileNames = await gitCommittedFiles(dir);
-    if (changedFilesTouchUi(committedFileNames)) {
-      try {
-        console.log(`  \u2026generating UI preview for implement ${ctx.jobId}`);
-        preview = await runPreviewPass(ctx, dir, committedFileNames, config, abort);
-      } catch (err) {
-        console.warn(`  preview skipped: ${errorMessage2(err)}`);
-      }
-    }
+    preview = await buildPreview(ctx, dir, committedFileNames, config, abort);
+    if (preview.status !== "ready")
+      console.log(`  UI preview ${preview.status}: ${preview.reason}`);
   }
   return {
     text: reply,
@@ -2721,7 +3267,7 @@ async function processReviseJob(ctx, dir, resumed, config, abort) {
   });
   const report = result.report ?? void 0;
   let reply = (report ? renderReport(report) : result.text.trim()) || "(the agent produced no reply)";
-  if (result.plans?.length) reply = result.plans[0] ?? reply;
+  if (result.plans?.length) reply = result.plans[0]?.body ?? reply;
   if (installResult.status === "failed") {
     reply += `
 
@@ -2760,15 +3306,11 @@ async function processReviseJob(ctx, dir, resumed, config, abort) {
   const finalReport = report && conflictResolution ? { ...report, conflictResolution } : report;
   let preview;
   if (outcome.kind !== "none") {
+    console.log(`  \u2026checking UI preview for revise ${ctx.jobId}`);
     const committedFileNames = await gitCommittedFiles(dir);
-    if (changedFilesTouchUi(committedFileNames)) {
-      try {
-        console.log(`  \u2026generating UI preview for revise ${ctx.jobId}`);
-        preview = await runPreviewPass(ctx, dir, committedFileNames, config, abort);
-      } catch (err) {
-        console.warn(`  preview skipped: ${errorMessage2(err)}`);
-      }
-    }
+    preview = await buildPreview(ctx, dir, committedFileNames, config, abort);
+    if (preview.status !== "ready")
+      console.log(`  UI preview ${preview.status}: ${preview.reason}`);
   }
   return {
     text: reply,
@@ -2978,37 +3520,55 @@ function formatJobError(ctx, err) {
 
 // src/cli.ts
 init_version();
-import React7 from "react";
+import React6 from "react";
 var DEFAULT_SERVER = process.env.FLUME_SERVER || "http://localhost:3000";
 async function login(args) {
   const flags = parseFlags(args);
-  let serverUrl = flags.server;
-  let token = flags.token;
-  if (!serverUrl || !token) {
-    const rl = createInterface({ input: stdin, output: stdout });
-    if (!serverUrl) {
-      const answer = (await rl.question(`Server URL [${DEFAULT_SERVER}]: `)).trim();
-      serverUrl = answer || DEFAULT_SERVER;
-    }
-    if (!token) {
-      token = (await rl.question("Runner token (flrun_\u2026): ")).trim();
-    }
-    rl.close();
+  const serverUrl = (flags.server ?? DEFAULT_SERVER).replace(/\/+$/, "");
+  const explicitRunner = flags.runnerToken ?? flags.token;
+  const explicitCli = flags.cliToken;
+  if (explicitRunner || explicitCli) {
+    saveCredentials(serverUrl, { runnerToken: explicitRunner, cliToken: explicitCli });
+    return;
   }
-  serverUrl = serverUrl.replace(/\/+$/, "");
-  if (!token) {
-    console.error("A runner token is required. Create one in the web app under Runners.");
+  const scope = flags.cliOnly ? "cli" : flags.runnerOnly ? "runner" : "cli,runner";
+  console.log(`Logging in to ${serverUrl}  (override with --server)
+`);
+  let result;
+  try {
+    result = await browserLogin({ serverUrl, scope });
+  } catch (err) {
+    console.error(`
+Login failed: ${err.message}`);
+    console.error("\nOr log in non-interactively with tokens from the web app:");
+    console.error("  flumecode login --server <url> --runner-token flrun_\u2026 --cli-token flcli_\u2026");
     process.exit(1);
   }
-  writeConfig({ serverUrl, token });
-  console.log(`Saved runner config to ${configPath}.`);
-  console.log("Start the runner with: flumecode start");
+  saveCredentials(serverUrl, result);
+}
+function saveCredentials(serverUrl, creds) {
+  const existing = readConfig();
+  const config = { serverUrl, token: creds.runnerToken ?? existing?.token ?? "" };
+  const apiToken = creds.cliToken ?? existing?.apiToken;
+  if (apiToken) config.apiToken = apiToken;
+  writeConfig(config);
+  const have = [];
+  if (config.token) have.push("runner token");
+  if (config.apiToken) have.push("CLI token");
+  console.log(`Saved ${have.join(" + ") || "server URL"} to ${configPath}.`);
+  if (config.token && config.apiToken) {
+    console.log("Next: `flumecode start --tui`  (worker + TUI together on this machine)");
+  } else if (config.apiToken) {
+    console.log("Next: `flumecode tui`");
+  } else if (config.token) {
+    console.log("Next: `flumecode start`");
+  }
 }
 async function start() {
   process.env.CLAUDE_CODE_DISABLE_AUTO_MEMORY = "1";
   const config = readConfig();
-  if (!config) {
-    console.error("Not logged in. Run: flumecode login");
+  if (!config || !config.token) {
+    console.error("No runner token configured. Run: flumecode login");
     process.exit(1);
   }
   await pollLoop(config);
@@ -3026,13 +3586,57 @@ async function runTui(args) {
   writeConfig(config);
   const { render } = await import("ink");
   const { App: App2 } = await Promise.resolve().then(() => (init_App(), App_exports));
-  render(React7.createElement(App2, { config }));
+  render(React6.createElement(App2, { config }));
+}
+async function startWithTui(args) {
+  process.env.CLAUDE_CODE_DISABLE_AUTO_MEMORY = "1";
+  const flags = parseFlags(args);
+  const existing = readConfig();
+  if (!existing || !existing.token) {
+    console.error("No runner token configured. Run `flumecode login` first.");
+    process.exit(1);
+  }
+  const config = { ...existing };
+  if (flags.server) config.serverUrl = flags.server.replace(/\/+$/, "");
+  if (flags.token) config.apiToken = flags.token;
+  if (!config.apiToken) {
+    const rl = createInterface({ input: stdin, output: stdout });
+    config.apiToken = (await rl.question("CLI token (flcli_\u2026): ")).trim();
+    rl.close();
+  }
+  writeConfig(config);
+  const logPath = join7(homedir2(), ".flume", "runner.log");
+  const fd = openSync(logPath, "a");
+  const entry = process.argv[1];
+  const worker = entry ? spawn4(process.execPath, [...process.execArgv, entry, "start"], {
+    stdio: ["ignore", fd, fd],
+    env: process.env
+  }) : null;
+  const cleanup2 = () => {
+    try {
+      worker?.kill();
+    } catch {
+    }
+  };
+  process.on("exit", cleanup2);
+  console.log(`Runner worker started in the background (logs: ${logPath}).`);
+  const { render } = await import("ink");
+  const { App: App2 } = await Promise.resolve().then(() => (init_App(), App_exports));
+  const app = render(React6.createElement(App2, { config }));
+  await app.waitUntilExit();
+  cleanup2();
+  process.exit(0);
 }
 function parseFlags(args) {
   const out = {};
   for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--server") out.server = args[i + 1];
-    else if (args[i] === "--token") out.token = args[i + 1];
+    const a = args[i];
+    if (a === "--server") out.server = args[++i];
+    else if (a === "--token") out.token = args[++i];
+    else if (a === "--cli-token") out.cliToken = args[++i];
+    else if (a === "--runner-token") out.runnerToken = args[++i];
+    else if (a === "--cli-only") out.cliOnly = true;
+    else if (a === "--runner-only") out.runnerOnly = true;
   }
   return out;
 }
@@ -3044,15 +3648,37 @@ if (command === "--version" || command === "-v" || command === "version") {
 } else if (command === "login") {
   void login(rest);
 } else if (command === "start") {
-  void start();
+  if (rest.includes("--tui")) void startWithTui(rest);
+  else void start();
 } else if (command === "tui") {
   void runTui(rest);
 } else {
   console.log(`FlumeCode runner v${RUNNER_VERSION}`);
-  console.log("Usage:");
-  console.log("  flumecode login     # save server URL + token");
-  console.log("  flumecode start     # poll for and run jobs");
-  console.log("  flumecode tui       # open the interactive TUI");
-  console.log("  flumecode --version # print the runner version");
+  console.log("");
+  console.log("Usage: flumecode <command> [--server URL] [--token TOKEN]");
+  console.log("");
+  console.log("Commands:");
+  console.log("  login       Authorize this machine in the browser (GitHub sign-in), provisioning");
+  console.log("              both the runner token (flrun_\u2026) and CLI token (flcli_\u2026) into config.");
+  console.log(
+    "              Flags: --cli-only / --runner-only \xB7 or non-interactive --runner-token /"
+  );
+  console.log("              --cli-token to paste tokens straight from the web app.");
+  console.log("  start       Run the worker: claim queued jobs and drive your local Claude Code");
+  console.log("  start --tui  All-in-one (single machine): run the worker in the background +");
+  console.log("              the interactive TUI in the foreground");
+  console.log(
+    "  tui         Open the interactive terminal UI \u2014 talk through a repo, shape a request,"
+  );
+  console.log(
+    "              answer the agent's questions, and start implementing. Authenticates as"
+  );
+  console.log("              you with a CLI token (flcli_\u2026) from the web app's Settings.");
+  console.log("  --version   Print the runner version");
+  console.log("");
+  console.log(
+    "`start` (the worker) and `tui` (a client) are separate roles with different tokens;"
+  );
+  console.log("`start --tui` just runs both together on one machine. See apps/runner/docs/tui.md.");
   process.exit(command ? 1 : 0);
 }