${page.total} messages · ${page.unread} unread
${body} `; } - async function decisionView(get, id) { + async function decisionView(get, id, current) { const open = (await get('inbox')).find(r => r.id === id) || null, d = await decision(get, id, open); + // Obsolete reads, including kept-data fallback, must not replace the displayed answer state. + if (!current()) return ''; if (!d) return notFound(`No decision with id ${txt(id)}.`); const c = d.closed; const status = c ? (c.op === 'resolved' ? `Resolved: ${txt(c.by)} chose “${txt(c.choice)}”${c.via ? ` via ${txt(c.via)}` : ''} ${when(c.at)}.` : `${esc(c.op[0].toUpperCase() + c.op.slice(1))} by ${txt(c.by)} ${when(c.at)}${c.note ? `: ${txt(c.note)}` : ''}.`) : `Open since ${when(d.at)}.`; @@ -1187,12 +1189,12 @@ // ---------------------------------------------------------------- router // #/ and anything that is not a #/ route is the control board; the rest is this file's. const routeOf = () => location.hash.startsWith('#/') ? location.hash.slice(1) : '/'; - function view(get, path, q, opts) { + function view(get, path, q, opts, current) { const parts = path.split('/').filter(Boolean).map(p => { try { return decodeURIComponent(p); } catch { return null; } }); if (parts.includes(null)) return notFound(); const [a, b, c] = parts, n = parts.length; if (a === 'inbox' && n === 1) return inboxView(get); - if (a === 'inbox' && n === 2) return SAFE.test(b) ? decisionView(get, b) : notFound(`${txt(b)} is not a decision id.`); + if (a === 'inbox' && n === 2) return SAFE.test(b) ? decisionView(get, b, current) : notFound(`${txt(b)} is not a decision id.`); if (a === 'messages' && n === 1) return messagesView(get, q); if (a === 'tasks' && n === 1) return tasksView(get); if (a === 'tasks' && n === 2) return TASK.test(b) ? taskView(get, b) : notFound(`${txt(b)} is not a task reference.`); @@ -1244,6 +1246,7 @@ // Leaving a decision discards its confirmation immediately, including a preview in flight. if (answer && (navigated || path !== `/inbox/${answer.id}`)) answer = null; const g = ++gen; + const current = () => g === gen && route === routeOf() && !out(); document.body.classList.toggle('on-bus', !board); $('bus-view').hidden = board; sections(path); @@ -1281,15 +1284,15 @@ try { await live('messages'); } catch (err) { messageCount = null; if (err.status === 403 || err.code === 'signed-out') throw err; } } - html = await view(live, path, new URLSearchParams(query), opts); readAt = live.oldest(); } + html = await view(live, path, new URLSearchParams(query), opts, current); readAt = live.oldest(); } catch (err) { if (err.code === 'signed-out') return; const kept = reader(false); - try { if (refusal(err)) throw err; html = await view(kept, path, new URLSearchParams(query), opts); readAt = kept.oldest(); html = staleBanner(err) + html; state = 'stale'; } + try { if (refusal(err)) throw err; html = await view(kept, path, new URLSearchParams(query), opts, current); readAt = kept.oldest(); html = staleBanner(err) + html; state = 'stale'; } catch { html = failedView(err) + (path === '/settings' ? appearance() : ''); state = refusal(err) ? 'refused' : 'failed'; } if (refusal(err)) forget(); } - if (g !== gen) return; + if (!current()) return; freshBus(state, SOURCES[path.split('/')[1]]); const k = !navigated && shown === route ? keep() : null; unmountEditor(); diff --git a/packages/webui/tests/decide-browser.test.mjs b/packages/webui/tests/decide-browser.test.mjs index 81a0e30b8..9ec2a99aa 100644 --- a/packages/webui/tests/decide-browser.test.mjs +++ b/packages/webui/tests/decide-browser.test.mjs @@ -36,6 +36,15 @@ const STUB = `(() => { const c = await (await real(url, init)).json(); return answer(200, { ...c, ...(q.has('sso') ? { sso: true } : {}), ...(q.has('send') ? { send: true } : {}), ...(q.has('decide') ? { send: true, decide: true } : {}), ...(q.has('tester') ? { tester: true } : {}) }); } + if (window.__delayRead?.url === u) { + const delay = window.__delayRead; + window.__delayRead = null; + const response = await real(url, init); + window.__readHeld = true; + await new Promise(resolve => { window.__releaseRead = resolve; }); + if (delay.reject) throw new TypeError('Delayed read failed'); + return response; + } if (u === '/api/bus/inbox' && window.__changedDecision) { const body = await (await real(url, init)).json(); body.rows = body.rows.map(row => row.id === window.__changedDecision ? { ...row, console: { ...row.console, digest: 'e'.repeat(64) } } : row); @@ -69,7 +78,7 @@ function hostileGrant(store, grant) { return id; } -async function setup({ ordinary = false } = {}) { +async function setup({ ordinary = false, paired = false } = {}) { const root = mkdtempSync(join(tmpdir(), 'webui-decide-browser-')); const store = new Store(root), b0 = new Broker({ store, businesses }); const grant = { method: 'host-enroll', host: 'web1', address: '192.0.2.10', port: 22, user: 'jarvis', sudo: true, fingerprints: [] }; @@ -83,6 +92,11 @@ async function setup({ ordinary = false } = {}) { options: [{ key: 'new/autonomous', text: 'New project — autonomous' }, { key: 'new/guided', text: 'New project — guided' }, { key: 'existing:project', text: `Add to existing project ${HOSTILE}` }], recommendation: 'new/autonomous', approvalChoice: 'new/autonomous', } }).id : null; + const other = paired ? b0.request(chief, { verb: 'decision.raise', args: { + action: 'prd.approve', question: 'Decision B: choose a project', blocking: false, + options: [{ key: 'B-0', text: 'B autonomous' }, { key: 'B-1', text: 'B guided' }, { key: 'B-2', text: 'B existing project' }], + recommendation: 'B-0', approvalChoice: 'B-0', + } }).id : null; const reader = b0.bindReader({ business: 'demo' }); const bus = views({ call: async (verb, args = {}) => structuredClone(b0.request(reader, { verb, args })) }); const f = await fixture(), b = await browser(); @@ -105,7 +119,7 @@ async function setup({ ordinary = false } = {}) { }; const settle = () => new Promise(r => setTimeout(r, 600)); const done = async () => { await b.close(); await close(web); await f.close(); store.close(); rmSync(root, { recursive: true, force: true }); }; - return { b, store, base, open, deploy, bare, normal, wait, text, has, posts, queue, click, page, settle, done }; + return { b, store, base, open, deploy, bare, normal, other, wait, text, has, posts, queue, click, page, settle, done }; } const CONFIRM = (s, action, choice, text) => ({ status: 200, body: { id: s.open, question: `Enroll web1? ${HOSTILE}`, action, choice, text, grant: { method: 'host-enroll', host: 'web1' }, confirmation: 'c'.repeat(64) } }); @@ -372,3 +386,41 @@ test('a changed authoritative context drops an open ordinary confirmation before assert.equal((await s.posts()).filter(p => p.url.endsWith('/resolve')).length, 0); } finally { await s.done(); } }); + +for (const [read, reject] of [['inbox', false], ['trail', false], ['trail', true]]) { + test(`I1: obsolete A ${read} read${reject ? ' failure with cached fallback' : ' completion'} cannot redirect B answer controls`, { timeout: 120000 }, async () => { + const s = await setup({ ordinary: true, paired: true }); + try { + // Warm A's cache so the failed read also exercises the kept-data continuation. + await s.page('sso&decide', s.normal); + await s.b.evaluate('document.querySelector("#pause").click(), true'); + assert.equal(await s.b.evaluate('document.querySelector("#pause").getAttribute("aria-pressed")'), 'true'); + const url = read === 'inbox' ? '/api/bus/inbox' : `/api/bus/trail?subject=${encodeURIComponent(s.normal)}`; + await s.b.evaluate(`window.__delayRead = ${JSON.stringify({ url, reject })}; document.querySelector('#refresh').click(); true`); + await s.wait('window.__readHeld === true'); + + await s.b.navigate(`${s.base}?sso&decide#/inbox/${s.other}`); + await s.wait('document.querySelector("#bus-view .s1-q")?.textContent === "Decision B: choose a project" && document.querySelector("[data-decide=option-2]")?.textContent === "B existing project"'); + await s.b.evaluate('window.__releaseRead(), true'); + await s.settle(); + assert.equal(await s.text('#bus-view .s1-q'), 'Decision B: choose a project'); + assert.equal(await s.text('[data-decide=option-2]'), 'B existing project'); + + await s.queue({ status: 200, body: { id: s.other, kind: 'decision', action: 'answer', question: 'Decision B: choose a project', choice: 'B-2', text: 'B existing project', confirmation: 'b'.repeat(64) } }); + await s.click('option-2'); + const [preview] = await s.posts(); + assert.equal(preview.url, `/api/decisions/${encodeURIComponent(s.other)}/confirmation`, 'B controls must request confirmation for B after the obsolete A continuation'); + assert.deepEqual(JSON.parse(preview.body), { choice: 'B-2' }); + await s.wait('document.querySelector("[data-decide=confirm]")'); + assert.equal(await s.text('#bus-view .s1-q'), 'Decision B: choose a project'); + assert.match(await s.text('.s1-confirm'), /B-2.*B existing project/); + await s.queue({ status: 200, body: { id: s.other, op: 'resolved', choice: 'B-2' } }); + await s.click('confirm'); + await s.wait('document.querySelector("#decide-status")?.textContent.startsWith("Recorded")'); + const posts = await s.posts(); + assert.equal(posts.length, 2); + assert.equal(posts[1].url, `/api/decisions/${encodeURIComponent(s.other)}/resolve`); + assert.deepEqual(JSON.parse(posts[1].body), { choice: 'B-2', confirmation: 'b'.repeat(64) }); + } finally { await s.done(); } + }); +}