toolroll 0.9.92 → 0.9.94

package/dist/server/chrome.js

@@ -14,6 +14,7 @@ import { DISCLOSURE_CSS } from "../disclosure.js";
 import { EVIDENCE_PACK_CSS } from "../evidence-pack.js";
 import { EXPORT_CSS } from "../export-ui.js";
 import { START_COMMAND } from "../first-run.js";
+import { SHORTCUTS, webKeymapScript } from "../keymap.js";
 import { GALLERY_CSS } from "../flow-gallery-ui.js";
 import { STARTERS_CSS } from "../flow-starters-ui.js";
 import { FLOWS_CSS } from "../flows-ui.js";
@@ -347,8 +348,9 @@ export function chromeScript() {
         `navGroups.forEach(function(g){g.addEventListener("toggle",function(){` +
         `if(g.open){navGroups.forEach(function(o){if(o!==g)o.removeAttribute("open");});}});});` +
         // the palette
-        `var raw=document.getElementById("palette-index");if(!raw)return;` +
-        `var index;try{index=JSON.parse(raw.textContent||"[]");}catch(e){return;}` +
+        // No index on a workspace page: search is the workspace's own there (keymap.ts search), and the keys still work.
+        `var raw=document.getElementById("palette-index");var index=[];` +
+        `if(raw){try{index=JSON.parse(raw.textContent||"[]");}catch(e){return;}}` +
         `var open=false,box=null,list=null,input=null,items=[],paletteBack=null;` +
         `function close(){if(!open)return;open=false;box.remove();box=null;if(paletteBack&&paletteBack.isConnected)paletteBack.focus();paletteBack=null;}` +
         `function go(href){location.href=href;}` +
@@ -395,23 +397,22 @@ export function chromeScript() {
         `var next=at===-1?(delta>0?0:set.length-1):Math.max(0,Math.min(set.length-1,at+delta));` +
         `if(next===at)return;` +
         `set[next].focus();ev.preventDefault();}` +
-        // key routing: never inside editable targets, no modifiers, no IME
-        // composition (finding 4); repeats allowed only for j/k
+        // key routing (keymap.ts, one table with the terminal UI): never inside editable targets, no modifiers, no IME
+        // composition (finding 4); repeats allowed only for j/k. A press key presses only a control the page rendered.
+        webKeymapScript() +
         `var pending=null;` +
         `document.addEventListener("keydown",function(ev){` +
         `if(ev.isComposing||ev.metaKey||ev.ctrlKey||ev.altKey)return;` +
         `var t=ev.target;var tag=t&&t.tagName?t.tagName.toLowerCase():"";` +
-        `if(tag==="input"||tag==="textarea"||tag==="select"||tag==="button"||(t&&t.isContentEditable))return;` +
+        `if(tag==="input"||tag==="textarea"||tag==="select"||(t&&t.isContentEditable)||(t&&t.closest&&t.closest("[role=textbox],[role=dialog]:not(.kbd-help)")))return;` +
         `if(ev.key==="Escape"){if(helpOpen()){toggleHelp();ev.preventDefault();return;}close();return;}` +
         `if(helpOpen())return;` +
         `if(ev.repeat&&ev.key!=="j"&&ev.key!=="k")return;` +
-        `if(ev.key==="/"){show();ev.preventDefault();return;}` +
-        `if(ev.key==="?"){toggleHelp();ev.preventDefault();return;}` +
         `if(ev.key==="j"||ev.key==="k"){rove(ev.key==="j"?1:-1,ev);return;}` +
-        `if(pending==="g"){pending=null;` +
-        `var map={b:"/board",i:"/",w:"/workbench",d:"/done",q:"/board?view=order",f:"/fleet",t:"/work",a:"/activity",p:"/projects"};` +
-        `if(map[ev.key]){go(map[ev.key]);ev.preventDefault();}return;}` +
-        `if(ev.key==="g"){pending="g";setTimeout(function(){pending=null;},800);}});` +
+        `if(pending==="g"){pending=null;var after=GKEYS[ev.key];if(after&&run(after))ev.preventDefault();return;}` +
+        `if(ev.key==="g"){pending="g";setTimeout(function(){pending=null;},800);return;}` +
+        `var act=Object.prototype.hasOwnProperty.call(KEYS,ev.key)?KEYS[ev.key]:null;` +
+        `if(act&&run(act))ev.preventDefault();});` +
         `})();`);
 }
 export const ROLE_TITLES = { plan: "Planner", build: "Builder", review: "Reviewer", repair: "Repair" };
@@ -440,17 +441,7 @@ FINISH: unreviewed and undocumented is unfinished; this build ends with the fini
  * absent from sensitive pages. Navigation help in plain words — no key
  * ever posts. */
 export const KBD_HELP = html `<div class="kbd-help" hidden role="dialog" aria-label="keyboard shortcuts" tabindex="-1">\
-<h2>Keyboard shortcuts</h2><table>\
-<tr><td><kbd>/</kbd></td><td>jump to a page or an open task</td></tr>\
-<tr><td><kbd>g</kbd> then <kbd>i</kbd></td><td>go to the inbox</td></tr>\
-<tr><td><kbd>g</kbd> then <kbd>b</kbd></td><td>go to the board</td></tr>\
-<tr><td><kbd>g</kbd> then <kbd>q</kbd></td><td>go to the queue</td></tr>\
-<tr><td><kbd>g</kbd> then <kbd>f</kbd></td><td>go to the fleet</td></tr>\
-<tr><td><kbd>g</kbd> then <kbd>w</kbd></td><td>go to the workbench</td></tr>\
-<tr><td><kbd>g</kbd> then <kbd>t</kbd></td><td>go to the task list</td></tr>\
-<tr><td><kbd>g</kbd> then <kbd>a</kbd></td><td>go to the activity view</td></tr>\
-<tr><td><kbd>g</kbd> then <kbd>p</kbd></td><td>go to the projects</td></tr>\
-<tr><td><kbd>g</kbd> then <kbd>d</kbd></td><td>go to what is done</td></tr>\
+<h2>Keyboard shortcuts</h2><table>${SHORTCUTS.map(one => html `<tr><td>${joinHtml(one.keys.split(" ").map(key => html `<kbd>${key}</kbd>`), " then ")}</td><td>${one.says}</td></tr>`)}\
 <tr><td><kbd>j</kbd> / <kbd>k</kbd></td><td>move through the rows on this page</td></tr>\
 <tr><td><kbd>Escape</kbd></td><td>close this</td></tr>\
 </table></div>`;
@@ -513,8 +504,8 @@ ${count !== undefined && count > 0 ? html ` <span class="count badge badge-open"
     const scopeStatus = peekCounts === null
         ? null
         : html `<span class="scope-status">\
-${peekCounts.waiting > 0 ? html `<a class="hot" href="/work?view=needs-you">${peekCounts.waiting} needs you</a>` : html `<a href="/work?view=needs-you">0 needs you</a>`}\
-<a href="/runs">${peekCounts.running} live</a><a href="/board?view=order">${peekCounts.queued} queued</a></span>`;
+${peekCounts.waiting > 0 ? html `<a class="hot" href="/tasks?view=needs-you">${peekCounts.waiting} needs you</a>` : html `<a href="/tasks?view=needs-you">0 needs you</a>`}\
+<a href="/runs">${peekCounts.running} live</a><a href="/tasks?view=order">${peekCounts.queued} queued</a></span>`;
     const scopeName = effectiveScope === "project" && chrome.project !== null ? projectName(chrome.project) : "All projects";
     // The switcher (board pass): the scope's name opens a menu of every
     // enrolled project — one tap to open one, or to widen to all — as plain
@@ -556,7 +547,7 @@ ${scopeStatus}</div>`;
 ${count !== undefined && count > 0 ? html ` <span${chrome.inboxLabel === undefined ? "" : html ` aria-label="${chrome.inboxLabel}" title="${chrome.inboxLabel}"`} class="count badge badge-open">${count}${chrome.inboxSaturated ? "+" : ""}</span>` : ""}</a>`;
     const side = joinHtml([
         html `<aside class="side">`,
-        html `<div class="side-head"><a class="brand" href="${chrome.chat === true ? "/chat" : "/work"}"><span class="brand-long">Toolroll</span><span class="brand-short">T</span></a>`,
+        html `<div class="side-head"><a class="brand" href="${chrome.chat === true ? "/chat" : "/tasks"}"><span class="brand-long">Toolroll</span><span class="brand-short">T</span></a>`,
         ...(options.sidebarToggle === true
             ? [html `<button type="button" class="side-toggle" aria-label="collapse sidebar" aria-expanded="true" title="collapse sidebar">${strokeIcon(html `<path d="m15 18-6-6 6-6"/>`)}</button>`]
             : []),
@@ -566,7 +557,7 @@ ${count !== undefined && count > 0 ? html ` <span${chrome.inboxLabel === undefin
         // gating); Work and Projects always. Every specialist tool is a dim
         // text row inside one of the two accordion groups below.
         ...(chrome.chat ? [primaryItem("chat", "/chat", "Chat")] : []),
-        primaryItem("work", "/work", "Tasks", chrome.inboxCount),
+        primaryItem("work", "/tasks", "Tasks", chrome.inboxCount),
         primaryItem("flows", "/flows", "Flows"),
         primaryItem("projects", "/projects", "Projects"),
         html `</nav>`,
@@ -607,7 +598,7 @@ ${postForm(update.dismissHref, html `<button type="submit">Dismiss</button>`, {
     // these only below 760px; desktop keeps the sidebar untouched.
     const mobileTop = joinHtml([
         html `<header class="mobile-top">`,
-        html `<a class="brand-mini" href="${chrome.chat === true ? "/chat" : "/work"}">T</a>`,
+        html `<a class="brand-mini" href="${chrome.chat === true ? "/chat" : "/tasks"}">T</a>`,
         // On a phone the pill IS the scope row (mobile pass): the project's
         // name, its three counts, and the one /projects link at that
         // breakpoint — the scope bar hides below 760px so the header is one
@@ -640,7 +631,7 @@ ${count !== undefined && count > 0 ? html `<span class="dot-badge" role="img" ar
     const tabbar = joinHtml([
         html `<nav class="tabbar">`,
         ...(chrome.chat ? [tab("chat", "/chat", "Chat")] : []),
-        tab("work", "/work", "Tasks", chrome.inboxCount),
+        tab("work", "/tasks", "Tasks", chrome.inboxCount),
         tab("flows", "/flows", "Flows"),
         tab("projects", "/projects", "Projects"),
         html `</nav>`,
@@ -702,7 +693,7 @@ export const TO_FRONT_ICON = html `<svg viewBox="0 0 24 24" fill="none" stroke="
  * wear an icon each; the foot's list stays text, the way Linear's does. */
 export const strokeIcon = (paths) => html `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true" focusable="false">${paths}</svg>`;
 /** Where the queue lives now: the board, flipped to dispatch order. */
-export const QUEUE_VIEW = "/board?view=order";
+export const QUEUE_VIEW = "/tasks?view=order";
 export const FOLDER_PATHS = html `<path d="M4 20h16a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-7.9a2 2 0 0 1-1.69-.9L9.6 3.9A2 2 0 0 0 7.93 3H4a2 2 0 0 0-2 2v13c0 1.1.9 2 2 2Z"/>`;
 export const CHAT_PATHS = html `<path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"/>`;
 export const WORK_PATHS = html `<path d="M9 6h11"/><path d="M9 12h11"/><path d="M9 18h11"/><path d="m4 6 1 1 2-2"/><path d="m4 12 1 1 2-2"/><path d="m4 18 1 1 2-2"/>`;
@@ -730,11 +721,11 @@ export function workToolRows(scoped = false, _offersChat = false, offersCode = f
         // D5: coding sessions are deprecated; /code still opens this release, but nothing links to it.
         // Live terminals: an operator's own Claude Code, Codex or shell, in a real terminal (docs/plans/live-terminal.md).
         ...(offersCode ? [{ key: "code", href: "/term", label: "Live", hint: "your own terminals: Claude Code, Codex or a shell" }] : []),
-        { key: "inbox", href: "/inbox", label: "Inbox", hint: "questions, approvals, and repairs to act on" },
-        { key: "board", href: "/board", label: "Board", hint: "lanes by state, with the order view" },
-        { key: "tasks", href: "/work", label: "Task list", hint: "everything, filterable by state" },
+        { key: "inbox", href: "/", label: "Home", hint: "what needs you, what runs, and what waits" },
+        { key: "board", href: "/tasks?view=board", label: "Board", hint: "lanes by state, with the order view" },
+        { key: "tasks", href: "/tasks", label: "Task list", hint: "everything, filterable by state" },
         { key: "recipes", href: "/recipes", label: "Recipes", hint: "choose, customize, and reuse a workflow" },
-        { key: "workbench", href: "/workbench", label: "Portfolio", hint: "every project and live build in one place" },
+        { key: "workbench", href: "/tasks?scope=all", label: "Every project", hint: "every project's tasks in one list" },
         { key: "ledger", href: "/ledger", label: "Action ledger", hint: "who acted, what happened, and the result" },
         { key: "spend", href: "/spend", label: "Spend", hint: "what agent work cost, and monthly budgets" },
     ];
@@ -759,8 +750,8 @@ export const SETTINGS_KEYS = new Set(["settings", "fleet", "caps", "people", "mo
 export function buildsViews(current) {
     const views = [
         ["builds", "/runs", "builds"],
-        ["done", "/done", "done"],
-        ["review", "/review", "review"],
+        ["done", "/tasks?view=done", "done"],
+        ["review", "/tasks?view=ready", "review"],
         ["activity", "/activity", "activity"],
     ];
     return html `<p class="meta board-view">${joinHtml(views.map(([key, href, label]) => (key === current ? html `<strong>${label}</strong>` : html `<a href="${href}">${label}</a>`)), " \u00b7 ")}</p>`;

package/dist/server/console.css

@@ -1229,6 +1229,9 @@
   .approval-field-hint { color: var(--muted-foreground); font-size: 12px; line-height: 1.5; }
   .approval-field textarea, .approval-field input[type=text] { width: 100%; max-width: 75ch; margin: 0; font-family: var(--font-sans); font-size: 14px; line-height: 1.55; }
   .approval-requirements { display: grid; gap: 6px; margin: 2px 0 0; padding: 0; list-style: none; }
+  .approval-requirements li { display: flex; flex-wrap: wrap; gap: 6px; align-items: center; }
+  .approval-requirements li input[type=text] { flex: 1 1 22rem; }
+  .approval-how { flex: 0 1 auto; max-width: 100%; min-height: 2.125rem; margin: 0; font-size: 13px; }
   .approval-edit-act { display: flex; flex-wrap: wrap; align-items: center; gap: var(--so-space-sm); }
   .approval-edit-act button { margin: 0; min-height: 2.125rem; white-space: nowrap; }
   .approval-link { display: inline-flex; align-items: center; min-height: 32px; padding: 0 var(--so-space-md); border: 1px solid var(--border); border-radius: var(--so-radius-md); background: var(--card); color: var(--foreground); font-size: 13px; font-weight: 500; text-decoration: none; }
@@ -2793,3 +2796,23 @@ html.so-swap::view-transition-old(*):only-child { animation: so-card-out 160ms e
 @media (max-width: 40rem) { .welcome form > .k-btn[type=submit] { width: auto; } }
 /* On a phone the step's primary lives in the dock: its copy in the step is hidden. */
 @media (max-width: 760px) { .welcome .k-btn.k-docked { display: none; } }
+
+/* Code map: every name is repository data, however long; nothing may push the page wider. */
+.cm-list { list-style: none; margin: 0; padding: 0; }
+.cm-item { display: grid; gap: 2px; min-width: 0; padding: 10px 0; border-bottom: 1px solid var(--so-line); overflow-wrap: anywhere; }
+.cm-title { font-size: 13px; font-weight: 500; color: var(--so-ink); }
+.cm-meta { font-size: 12.5px; color: var(--so-muted); }
+.cm-path { overflow-wrap: anywhere; user-select: all; }
+.cm-search { display: flex; gap: var(--so-space-sm); align-items: center; margin: 0 0 var(--so-space-md); }
+.cm-search .k-input, .cm-search input[type="search"] { flex: 1 1 auto; min-width: 0; }
+.cm-search .k-btn { flex: 0 0 auto; white-space: nowrap; }
+/* A test's name is the row: it wraps whole, its facts sit under it, and the one action stays on one line. */
+.flaky-rows .k-row-a .k-btn { white-space: nowrap; }
+@media (min-width: 761px) {
+  .flaky-rows .k-row { grid-template-columns: 96px minmax(0, 1fr) auto auto; padding-block: 10px; }
+  .flaky-rows .k-row-t { grid-column: 2; grid-row: 1; white-space: normal; overflow-wrap: anywhere; }
+  .flaky-rows .k-row-d { grid-column: 2; grid-row: 2; white-space: normal; }
+  .flaky-rows .k-row-m { grid-column: 3; grid-row: 1 / span 2; }
+  .flaky-rows .k-row-a { grid-column: 4; grid-row: 1 / span 2; }
+  .flaky-rows .k-row-c { grid-row: 1 / span 2; }
+}

package/dist/server/guards.js

@@ -176,6 +176,7 @@ export function createSharedGuards(runtime) {
                 const task = matchTaskPath(url.pathname, '(?:/[a-z-]+)?$');
                 return task === null ? null : runtime.store.lookupRef(task.taskId)?.repo ?? null;
             }
+            case 'task-ref': return Number.isSafeInteger(id) && id > 0 ? runtime.store.refForId(id)?.repo ?? null : null;
             case 'run': return runRepo(id);
             case 'decision': return runRepo(runtime.store.getDecision(id)?.run);
             case 'incident': return runRepo(runtime.store.openIncidents().find(one => one.id === id)?.run);
@@ -271,6 +272,9 @@ export function createSharedGuards(runtime) {
             if (url.searchParams.get("view") === "order")
                 url.searchParams.delete("view");
         }
+        // Tasks (P1.4) keeps the board's rule: the queue's order view stays an instance view, never a limited person's.
+        if (route.id === "tasks" && url.searchParams.get("view") === "order")
+            url.searchParams.set("view", "board");
         return true;
     }
     function workAccess() {

package/dist/server/home.d.ts

@@ -25,6 +25,12 @@ export type HomeFacts = {
     chat: boolean;
     /** This person can answer an agent's question (an approver in a browser session). */
     canAnswer: boolean;
+    /** Why this task's plan can't take a yes right now (render-tasks.ts consentDoorOf), or null when it can. */
+    closedDoor: (taskId: string) => {
+        title: string;
+        why: string;
+        road: "scope" | "agents";
+    } | null;
 };
 /** "7 need you across 2 projects." — the sentence and the figures read the same totals. */
 export declare function homeSentence(needs: number, perProject: readonly {

package/dist/server/home.js

@@ -22,7 +22,7 @@ export function homeSentence(needs, perProject, scope, any) {
     const waiting = perProject.filter(one => one.needs > 0);
     return waiting.length === 1 ? `${needs} ${verb} you in ${waiting[0].name}.` : `${needs} ${verb} you across ${waiting.length} projects.`;
 }
-function rowOf(store, item, now, multi, canAnswer) {
+function rowOf(store, item, now, multi, canAnswer, closedDoor) {
     const action = item.primaryAction;
     const href = action?.code === "open-result" && action.target.runId != null
         ? `/review?result=${encodeURIComponent(action.target.taskId)}&run=${action.target.runId}` : browserWorkActionHref(item);
@@ -41,11 +41,14 @@ function rowOf(store, item, now, multi, canAnswer) {
     const line = waits
         ? (open ? decision.question : item.status.detail !== item.status.label ? item.status.detail : null)
         : item.progress ?? (item.status.detail !== item.status.label ? item.status.detail : null);
+    // A plan that can't take a yes never offers one: the reason, and the one act that opens it, as the task page says.
+    const door = action?.code === "approve-scope" ? closedDoor(action.target.taskId) : null;
     return {
         id: item.rootId, title: item.title, href: taskHref(item.rootId),
         project: multi || item.repo === null ? (item.repo === null ? "Unplaced" : projectName(item.repo)) : null,
-        age: relativeAge(item.updatedAt, now), chip: { word, tone }, line,
-        action: href === null || action === null ? null : { label: action.label, href }, question,
+        age: relativeAge(item.updatedAt, now), chip: { word, tone }, line: door === null ? line : door.title,
+        action: door !== null ? { label: door.road === "agents" ? "Change the agents" : "Edit the plan", href: `${taskHref(action.target.taskId)}#${door.road === "agents" ? "agents" : "scope"}` }
+            : href === null || action === null ? null : { label: action.label, href }, question,
     };
 }
 /** Home's view for one person and scope, from two reads of the work index (what waits, what runs). */
@@ -54,26 +57,28 @@ export function homeView(facts) {
     const read = (view, limit) => workIndexPage(store, now, access, { view, limit, project, ...(facts.evidenceRoot === undefined ? {} : { root: facts.evidenceRoot }) });
     const needs = read("needs-you", HOME_NEEDS_SHOWN);
     const running = read("running", HOME_RUNNING_SHOWN);
+    // Waiting (docs/plans/plain-toolroll.md P1.4): what Toolroll or another task moves on, with no person asked.
+    const waiting = workIndexPage(store, now, access, { view: "queued", limit: HOME_RUNNING_SHOWN, project, ...(facts.evidenceRoot === undefined ? {} : { root: facts.evidenceRoot }) });
     const totals = needs.totals;
     // Queued: the Tasks list's own Queued count (the same predicate its view=queued filter lists).
     const queued = totals.queued;
-    // Every project is said by name (all=1): /work alone would narrow to the session's open project.
-    const scopeQuery = project === null ? "all=1&" : `project=${encodeURIComponent(project)}&`;
+    // Every project is said by name (scope=all): /tasks alone would narrow to the session's open project.
+    const scopeQuery = project === null ? "scope=all&" : `project=${encodeURIComponent(project)}&`;
     const counts = [
-        { key: "needs", label: "Needs you", value: totals["needs-you"], href: `/work?${scopeQuery}view=needs-you` },
-        { key: "running", label: "Running", value: totals.running, href: `/work?${scopeQuery}view=running` },
-        { key: "queued", label: "Queued", value: queued, href: `/work?${scopeQuery}view=queued` },
-        { key: "finished", label: "Finished", value: totals.completed, href: `/work?${scopeQuery}view=completed` },
+        { key: "needs", label: "Needs you", value: totals["needs-you"], href: `/tasks?${scopeQuery}view=needs-you` },
+        { key: "running", label: "Running", value: totals.running, href: `/tasks?${scopeQuery}view=running` },
+        { key: "queued", label: "Queued", value: queued, href: `/tasks?${scopeQuery}view=queued` },
+        { key: "finished", label: "Finished", value: totals.completed, href: `/tasks?${scopeQuery}view=completed` },
     ];
     const multi = project === null && new Set([...needs.items, ...running.items].map(one => one.repo ?? "")).size > 1;
     const groups = [];
     for (const ask of ASKS) {
-        const rows = needs.items.filter(one => one.ask === ask).map(one => rowOf(store, one, now, multi, facts.canAnswer));
+        const rows = needs.items.filter(one => one.ask === ask).map(one => rowOf(store, one, now, multi, facts.canAnswer, facts.closedDoor));
         if (rows.length > 0)
             groups.push({ key: ask, label: ASK_LABEL[ask], rows });
     }
     // A waiting row whose ask the index couldn't name still waits on this person: it goes under Decide, never lost.
-    const unnamed = needs.items.filter(one => one.ask === null).map(one => rowOf(store, one, now, multi, facts.canAnswer));
+    const unnamed = needs.items.filter(one => one.ask === null).map(one => rowOf(store, one, now, multi, facts.canAnswer, facts.closedDoor));
     if (unnamed.length > 0) {
         const decide = groups.find(one => one.key === "decide");
         if (decide)
@@ -81,12 +86,15 @@ export function homeView(facts) {
         else
             groups.unshift({ key: "decide", label: ASK_LABEL.decide, rows: unnamed });
     }
-    const live = running.items.filter(one => !one.status.views.includes("needs-you")).map(one => rowOf(store, one, now, multi, facts.canAnswer));
+    const live = running.items.filter(one => !one.status.views.includes("needs-you")).map(one => rowOf(store, one, now, multi, facts.canAnswer, facts.closedDoor));
     if (live.length > 0)
         groups.push({ key: "running", label: "Running", rows: live });
+    const waits = waiting.items.filter(one => one.status.label === "Waiting" && !one.status.views.includes("needs-you")).map(one => rowOf(store, one, now, multi, facts.canAnswer, facts.closedDoor));
+    if (waits.length > 0)
+        groups.push({ key: "waiting", label: "Waiting", rows: waits });
     const perProject = needs.projects.map(one => ({ name: one.repo === null ? "Unplaced" : projectName(one.repo), needs: one.totals["needs-you"] }));
     const any = totals.all > 0 || totals.completed > 0 || (totals.archived ?? 0) > 0;
-    const shown = groups.filter(one => one.key !== "running").reduce((sum, one) => sum + one.rows.length, 0);
+    const shown = groups.filter(one => one.key !== "running" && one.key !== "waiting").reduce((sum, one) => sum + one.rows.length, 0);
     return {
         kind: "home",
         say: homeSentence(totals["needs-you"], perProject, project === null ? null : projectName(project), any),

package/dist/server/http.js

@@ -167,7 +167,7 @@ export function safeReturn(raw) {
  * button can name. Nothing here is a second redirect framework: one
  * same-site path, or "/".
  */
-export const LOGIN_RETURN_PAGES = /^\/(oauth\/authorize|t\/[^/]+|r\/[1-9]\d*|code(?:\/[a-f0-9]{32}(?:\/ship)?)?|review|chat|work|board|projects|routines|recipes|fleet|settings(\/[a-z-]+)?|mode)$/;
+export const LOGIN_RETURN_PAGES = /^\/(oauth\/authorize|t\/[^/]+|r\/[1-9]\d*|code(?:\/[a-f0-9]{32}(?:\/ship)?)?|review|chat|tasks|work|board|projects|routines|recipes|fleet|settings(\/[a-z-]+)?|mode)$/;
 export function loginReturn(raw) {
     const safe = safeReturn(raw);
     if (safe === "/")

package/dist/server/kit.js

@@ -223,7 +223,7 @@ export const card = (options) => html `<a class="k-card" href="${options.href}">
 export function notFound(path, options = {}) {
     return html `${pageHeader("Not found")}<div class="k-nf">${empty({
         title: options.title ?? NOT_FOUND.title(path), text: options.text ?? NOT_FOUND.text,
-        action: acts(btn("Go to Home", { sm: true, href: "/" }), btn("Open Tasks", { sm: true, variant: "ghost", href: "/work" })),
+        action: acts(btn("Go to Home", { sm: true, href: "/" }), btn("Open Tasks", { sm: true, variant: "ghost", href: "/tasks" })),
     })}</div>`;
 }
 /** The Settings frame: Overview and the eight groups, a desk breadcrumb, a phone back header, one column. */

package/dist/server/merge-ready-view.d.ts

@@ -0,0 +1,10 @@
+import type { AssignmentSnapshot } from "../assignment.js";
+import type { MergeReadyView } from "../browser-workspace.js";
+import type { Store } from "../store.js";
+import type { Who } from "./session.js";
+/** The panel for a task page, or null when there is no result to merge yet. */
+export declare function mergeReadyViewOf(store: Store, taskId: string, assignment: AssignmentSnapshot | null | undefined, who: Who, runChecks: {
+    action: string;
+    level: "quick" | "full";
+    returnTo: string;
+} | null, returnTo: string): MergeReadyView | null;

package/dist/server/merge-ready-view.js

@@ -0,0 +1,30 @@
+/** The task page's "Can I merge?" panel (docs/plans/plain-toolroll.md P1.6): the checklist (merge-checklist.ts) with
+ * each blocker's act as the form this page already posts for it. Run checks is the Checks row's own post; Retry is the
+ * failed box's own requeue (the page shows it only where that box would); Ask the agent to fix is Send back: the same
+ * post to /r/<build>/comment with intent=revise that the result's Send back makes, its note prefilled with the blocker
+ * and editable, sealing the same saved notes. Only a signed-in approver gets the forms; anyone else reads the rows. */
+import { randomBytes } from "node:crypto";
+import { checklistFromAssignment } from "../merge-checklist.js";
+import { isRevisionFeedback, revisionBatchOf, revisionSourceOf } from "../result-review.js";
+/** The panel for a task page, or null when there is no result to merge yet. */
+export function mergeReadyViewOf(store, taskId, assignment, who, runChecks, returnTo) {
+    if (assignment == null || assignment.receipt === null)
+        return null;
+    const list = checklistFromAssignment(store, taskId, assignment);
+    const person = who.via === "cookie" && who.role === "approver" && !store.isDemo();
+    const receipt = assignment.receipt;
+    const notes = store.liveDiffComments(receipt.runId).filter(one => isRevisionFeedback(one));
+    return {
+        answer: list.answer, sentence: list.sentence,
+        rows: list.rows.filter(one => one.mark !== "skip").map(one => {
+            const act = one.act;
+            const form = !person || act === null ? null
+                : act.kind === "run-checks" ? runChecks === null || runChecks.action !== `/r/${act.run}/checks` ? null : { kind: "run-checks", ...runChecks }
+                    : act.kind === "retry" ? { kind: "retry" }
+                        : act.run !== receipt.runId ? null
+                            : { kind: "fix", action: `/r/${act.run}/comment`, note: act.note, batch: revisionBatchOf(notes), source: revisionSourceOf(store.getScope(receipt.taskId)?.digest ?? null),
+                                request: randomBytes(16).toString("hex"), returnTo };
+            return { key: one.key, label: one.label, mark: one.mark, say: one.say, act: form };
+        }),
+    };
+}

package/dist/server/pages-assets.d.ts

@@ -3,6 +3,7 @@
  * typefaces, declared in the route table's edge stage and answered before authentication.
  */
 import type { ServerResponse } from "node:http";
+export declare const PWA_WORKER = "// Toolroll \u2014 push only; deliberately NO fetch handler (no offline cache of an authenticated console).\n// Every shape an older worker took, kept for good, then Home, Tasks' Ready and Board views and a task by its number.\nconst SHAPES = [/^\\/next$/, /^\\/review$/, /^\\/system$/, /^\\/routines$/, /^\\/routines\\/[0-9]+$/, /^\\/d\\/[0-9]+$/, /^\\/r\\/[0-9]+$/, /^\\/approve\\/[0-9]+$/,\n  /^\\/$/, /^\\/tasks\\?view=ready$/, /^\\/tasks\\?view=board$/, /^\\/n\\/[1-9][0-9]{0,14}$/];\nself.addEventListener(\"push\", function (event) {\n  var data = {};\n  try { data = event.data ? event.data.json() : {}; } catch (e) {}\n  var body = typeof data.body === \"string\" ? data.body : \"the console needs you\";\n  var tag = typeof data.tag === \"string\" ? data.tag : \"toolroll\";\n  var url = typeof data.url === \"string\" && SHAPES.some(function (s) { return s.test(data.url); }) ? data.url : \"/\";\n  if (typeof data.waiting === \"number\" && data.waiting >= 0 && self.registration.setAppBadge) {\n    // A count, never content. Honest no-op where unsupported.\n    event.waitUntil(self.registration.setAppBadge(Math.floor(data.waiting)).catch(function () {}));\n  }\n  event.waitUntil(self.registration.showNotification(\"Toolroll\", { body: body, tag: tag, data: { url: url }, actions: [{ action: \"open\", title: \"Open\" }] }));\n});\nself.addEventListener(\"message\", function (event) {\n  // The page recomputes on load/focus and is authoritative over any stale\n  // push: {badge: N} sets, {badge: 0} clears.\n  var badge = event.data && typeof event.data.badge === \"number\" ? event.data.badge : null;\n  if (badge === null || !self.registration.setAppBadge) return;\n  if (badge <= 0 && self.registration.clearAppBadge) { self.registration.clearAppBadge().catch(function () {}); return; }\n  self.registration.setAppBadge(Math.floor(badge)).catch(function () {});\n});\n// A tap on the ping and its one \"Open\" action land in the same place.\nself.addEventListener(\"notificationclick\", function (event) {\n  event.notification.close();\n  if (self.registration.clearAppBadge) self.registration.clearAppBadge().catch(function () {});\n  var url = event.notification.data && event.notification.data.url;\n  var target = new URL(SHAPES.some(function (s) { return s.test(url); }) ? url : \"/\", self.location.origin).href;\n  event.waitUntil(clients.matchAll({ type: \"window\" }).then(function (open) {\n    for (var i = 0; i < open.length; i++) { if (open[i].url === target && open[i].focus) return open[i].focus(); }\n    return clients.openWindow(target);\n  }));\n});\n";
 /**
  * Answers one install asset or typeface (GET only; the caller checks the method), with nosniff and its own
  * conservative caching/CSP. False for any other path: unknown names fall through to the router's refusal.

package/dist/server/pages-assets.js

@@ -38,19 +38,21 @@ const PWA_MANIFEST = JSON.stringify({
 // and the tap, only. notificationclick resolves ONLY allow-listed relative
 // paths — the payload URL is data, revalidated, never handed raw to the
 // browser (arc 3 finding 5).
-const PWA_WORKER = `// Toolroll — push only; deliberately NO fetch handler (no offline cache of an authenticated console).
-const SHAPES = [/^\\/next$/, /^\\/review$/, /^\\/system$/, /^\\/routines$/, /^\\/routines\\/[0-9]+$/, /^\\/d\\/[0-9]+$/, /^\\/r\\/[0-9]+$/];
+export const PWA_WORKER = `// Toolroll — push only; deliberately NO fetch handler (no offline cache of an authenticated console).
+// Every shape an older worker took, kept for good, then Home, Tasks' Ready and Board views and a task by its number.
+const SHAPES = [/^\\/next$/, /^\\/review$/, /^\\/system$/, /^\\/routines$/, /^\\/routines\\/[0-9]+$/, /^\\/d\\/[0-9]+$/, /^\\/r\\/[0-9]+$/, /^\\/approve\\/[0-9]+$/,
+  /^\\/$/, /^\\/tasks\\?view=ready$/, /^\\/tasks\\?view=board$/, /^\\/n\\/[1-9][0-9]{0,14}$/];
 self.addEventListener("push", function (event) {
   var data = {};
   try { data = event.data ? event.data.json() : {}; } catch (e) {}
   var body = typeof data.body === "string" ? data.body : "the console needs you";
   var tag = typeof data.tag === "string" ? data.tag : "toolroll";
-  var url = typeof data.url === "string" && SHAPES.some(function (s) { return s.test(data.url); }) ? data.url : "/next";
+  var url = typeof data.url === "string" && SHAPES.some(function (s) { return s.test(data.url); }) ? data.url : "/";
   if (typeof data.waiting === "number" && data.waiting >= 0 && self.registration.setAppBadge) {
     // A count, never content. Honest no-op where unsupported.
     event.waitUntil(self.registration.setAppBadge(Math.floor(data.waiting)).catch(function () {}));
   }
-  event.waitUntil(self.registration.showNotification("Toolroll", { body: body, tag: tag, data: { url: url } }));
+  event.waitUntil(self.registration.showNotification("Toolroll", { body: body, tag: tag, data: { url: url }, actions: [{ action: "open", title: "Open" }] }));
 });
 self.addEventListener("message", function (event) {
   // The page recomputes on load/focus and is authoritative over any stale
@@ -60,11 +62,12 @@ self.addEventListener("message", function (event) {
   if (badge <= 0 && self.registration.clearAppBadge) { self.registration.clearAppBadge().catch(function () {}); return; }
   self.registration.setAppBadge(Math.floor(badge)).catch(function () {});
 });
+// A tap on the ping and its one "Open" action land in the same place.
 self.addEventListener("notificationclick", function (event) {
   event.notification.close();
   if (self.registration.clearAppBadge) self.registration.clearAppBadge().catch(function () {});
   var url = event.notification.data && event.notification.data.url;
-  var target = new URL(SHAPES.some(function (s) { return s.test(url); }) ? url : "/next", self.location.origin).href;
+  var target = new URL(SHAPES.some(function (s) { return s.test(url); }) ? url : "/", self.location.origin).href;
   event.waitUntil(clients.matchAll({ type: "window" }).then(function (open) {
     for (var i = 0; i < open.length; i++) { if (open[i].url === target && open[i].focus) return open[i].focus(); }
     return clients.openWindow(target);