From bc3e0a9f4929d91f410a0dc6cc8985cce80b8317 Mon Sep 17 00:00:00 2001 From: Jason Woltje Date: Tue, 10 Nov 2026 12:42:24 -0600 Subject: [PATCH] feat(webui): U5 side by side, two panes across organizations and projects (#1873) The Side by side page now opens two panes. Each pane shows an organization dashboard, an agents grid or a project page, chosen from a picker that lists every organization and project. Pane state lives in the URL and is kept per viewer. A separator resizes the panes by pointer or arrow keys, closing a pane goes back to one, and each pane keeps its own focus and scroll through polling. A pane whose organization's bus is down says so while the other pane keeps working. On a phone a two-way switch shows one pane at a time. Panes are read-only. Conversation, room, settings, queue, docs and inbox pages open in full view; chat.js is a single-instance page with global ids. --- packages/webui/src/public/bus.js | 10 +- packages/webui/src/public/index.html | 4 +- packages/webui/src/public/panes.css | 66 +++ packages/webui/src/public/panes.js | 446 ++++++++++++++++++ packages/webui/src/public/projects.js | 28 +- packages/webui/src/public/workspace.js | 37 +- packages/webui/src/serve.mjs | 4 +- packages/webui/tests/browser.test.mjs | 4 +- .../webui/tests/side-by-side-browser.test.mjs | 201 ++++++++ .../tests/unified-workspace-browser.test.mjs | 9 +- 10 files changed, 767 insertions(+), 42 deletions(-) create mode 100644 packages/webui/src/public/panes.css create mode 100644 packages/webui/src/public/panes.js create mode 100644 packages/webui/tests/side-by-side-browser.test.mjs diff --git a/packages/webui/src/public/bus.js b/packages/webui/src/public/bus.js index 409366c8a..35141e097 100644 --- a/packages/webui/src/public/bus.js +++ b/packages/webui/src/public/bus.js @@ -1449,7 +1449,6 @@ if (n === 0 && window.MosaicOrg) return window.MosaicWorkspace.home(); if (a === 'projects' && n === 1 && window.MosaicOrg) return window.MosaicWorkspace.projectsPage(q); if (a === 'organization' && n === 1 && window.MosaicOrg) return window.MosaicWorkspace.dashboard(); - if (a === 'side-by-side' && n === 1 && window.MosaicOrg) return `${head('Side by side', 'Not built yet.')}${empty('Side by side is not built yet.', 'It arrives with a later unified workspace update. Projects and Agents work today.')}`; if (a === 'inbox' && n === 1 && window.MosaicOrg) return window.MosaicWorkspace.inboxPage(q); if (a === 'tasks' && n === 1 && window.MosaicOrg) return window.MosaicTasksBoard.view(); if (a === 'inbox' && n === 1) return inboxView(get); @@ -1542,6 +1541,15 @@ window.MosaicChat?.leave(chatPath); if (path === '/business') { location.replace('#/settings/business'); return; } if (path === '/settings/display') { location.replace('#/settings/appearance'); return; } + // U5: Side by side draws its own two panes (panes.js); every other page stops their polling. + if (path !== '/side-by-side') window.MosaicPanes?.unmount(); + else if (window.MosaicOrg && window.MosaicPanes) { + const fresh = navigated || shown !== path; + shown = path; + if (fresh) { unmountEditor(); await window.MosaicPanes.mount($('bus-view'), query, { navigated }); } + else window.MosaicPanes.refresh(); + return; + } if (chatPath === '/chat' || chatPath.startsWith('/chat/') || /^\/projects\/[0-9a-f-]+\/(?:settings|conversations|tasks|requirements|files)$/i.test(chatPath)) { // Re-read the scoped capability as the Console and bus recover. A failed read // withdraws the control; the chat renderer retains the draft across repaint. diff --git a/packages/webui/src/public/index.html b/packages/webui/src/public/index.html index 586296d90..1687c34d1 100644 --- a/packages/webui/src/public/index.html +++ b/packages/webui/src/public/index.html @@ -6,8 +6,8 @@ - - + + diff --git a/packages/webui/src/public/panes.css b/packages/webui/src/public/panes.css new file mode 100644 index 000000000..29d895cee --- /dev/null +++ b/packages/webui/src/public/panes.css @@ -0,0 +1,66 @@ +/* Side by side (U5, sample 07 "EXT 8"): a bar, then two panes with a divider between them. Each pane + has its own header with the organization's mark and edge, and its own scroll. One pane and a + shown-pane switch on a phone. Loaded after shell.css; every rule is scoped to the side-by-side page. */ +html[data-organizations] .content:has(> #bus-view > .sbs){padding:0} +html[data-organizations] .sbs{margin:0;display:flex;flex-direction:column;min-height:0;height:calc(100vh - var(--bar-h,53px) - var(--foot-h,33px))} +html[data-organizations] .sbs .panebar{display:flex;align-items:center;gap:10px;padding:8px 14px;border-bottom:1px solid var(--line);background:var(--canvas);flex-wrap:wrap} +html[data-organizations] .sbs .panebar h1{font-size:16px;font-weight:700;margin:0;line-height:1.4} +html[data-organizations] .sbs .panebar h1:focus{outline:none} +html[data-organizations] .sbs .panebar .note{font-size:13px;color:var(--muted)} +html[data-organizations] .sbs .panebar [data-pane-add]{margin-left:auto} +html[data-organizations] .sbs .ws-seg.pane-tabs{display:none;margin-left:0} +html[data-organizations] .sbs .pane-tabs>button{gap:5px;max-width:44vw} +html[data-organizations] .sbs .pane-tabs>button>span:last-child{overflow:hidden;text-overflow:ellipsis} + +html[data-organizations] .panes{--sbs-a:1fr;--sbs-b:1fr;display:grid;grid-template-columns:minmax(0,1fr);flex:1;min-height:0} +html[data-organizations] .panes.two{grid-template-columns:minmax(0,var(--sbs-a)) 1px minmax(0,var(--sbs-b))} +html[data-organizations] .pane{display:flex;flex-direction:column;min-width:0;min-height:0} +html[data-organizations] .pane[hidden]{display:none} +html[data-organizations] .pane-h{display:flex;align-items:center;gap:8px;padding:8px 14px;border-bottom:1px solid var(--line);background:var(--surface);box-shadow:inset 0 3px 0 var(--org,var(--line));min-width:0} +html[data-organizations] .pane-h .ttl{font-weight:700;color:var(--strong,var(--text));overflow:hidden;text-overflow:ellipsis;white-space:nowrap;min-width:0;flex:0 1 auto} +html[data-organizations] .pane-h .ttl small{font-weight:500;color:var(--muted);margin-left:6px;font-size:inherit} +html[data-organizations] .pane-h [data-pane-state]:empty{display:none} +html[data-organizations] .pane-pick{flex:0 1 180px;min-width:0;max-width:220px;margin-left:auto;font:500 12px/1.4 var(--font);color:var(--text);background:var(--canvas);border:1px solid var(--line);border-radius:var(--r);padding:3px 6px;min-height:0} +html[data-organizations] .pane-h .tools{display:flex;gap:2px;flex:none} +html[data-organizations] .pane-tool{display:inline-grid;place-items:center;width:26px;height:26px;border-radius:var(--r);color:var(--muted);border:0;background:none;padding:0;min-height:0;cursor:pointer} +html[data-organizations] .pane-tool:hover{background:var(--raised);color:var(--text)} +html[data-organizations] .pane-tool[hidden]{display:none} +html[data-organizations] .pane-tool svg.i{width:15px;height:15px;fill:none;stroke:currentColor;stroke-width:1.8;stroke-linecap:round;stroke-linejoin:round} +html[data-organizations] .pane-line{margin:0;padding:6px 14px;border-bottom:1px solid var(--line);font-size:13px;color:var(--text);background:color-mix(in srgb,var(--warn,#b7791f) 12%,var(--surface))} +html[data-organizations] .pane-line[hidden]{display:none} +html[data-organizations] .pane-body{overflow:auto;padding:14px;min-height:0;flex:1} +html[data-organizations] .pane-body:focus{outline:none} +html[data-organizations] .pane-body:focus-visible{outline:2px solid var(--focus,var(--action));outline-offset:-2px} +/* A page inside a pane is a section of the side-by-side page: smaller headings, no page chrome. */ +html[data-organizations] .pane-body .ws h1,html[data-organizations] .pane-body .project-header h1{font-size:20px} +html[data-organizations] .pane-body .chat-area.pane-project{display:block;height:auto;min-height:0;overflow:visible;padding:0} +/* Project pages size some parts from the window (projects.css); in a pane they size from the pane, + and a pane narrower than a phone gets the phone's stacked header. */ +html[data-organizations] .pane-body{container-type:inline-size} +html[data-organizations] .pane-body .project-header{width:auto;max-width:100%;margin-top:0} +html[data-organizations] .pane-body .project-header-icon{width:44px;height:44px;font-size:22px} +@container (max-width:699px){ + html[data-organizations] .pane-body .project-header:not([data-project-conversation="true"]){display:block} + html[data-organizations] .pane-body .project-actions{margin-top:12px;display:flex;flex-wrap:wrap;gap:8px} +} +/* The side-by-side page has its own bar; the page breadcrumb would name only one pane. */ +body:has(#bus-view > .sbs) #breadcrumbs{display:none} +html[data-organizations] .content:has(> #bus-view > .sbs) > .org-cue{margin:8px 14px} + +html[data-organizations] .pane-div{position:relative;background:var(--line);cursor:col-resize;touch-action:none;outline:none} +html[data-organizations] .pane-div::before{content:"";position:absolute;inset:0 -4px;z-index:1} +html[data-organizations] .pane-div:hover,html[data-organizations] .pane-div.dragging{background:var(--action)} +html[data-organizations] .pane-div:focus-visible{background:var(--action);box-shadow:0 0 0 2px var(--action)} +html[data-organizations] .pane-div[hidden]{display:none} + +@media (max-width:760px){ + html[data-organizations] .content:has(> #bus-view > .sbs){padding:0} + html[data-organizations] .sbs{height:auto} + html[data-organizations] .sbs .ws-seg.pane-tabs{display:inline-flex} + html[data-organizations] .sbs .hide-m{display:none} + html[data-organizations] .panes,html[data-organizations] .panes.two{grid-template-columns:minmax(0,1fr)} + html[data-organizations] .pane.alt,html[data-organizations] .pane-div{display:none} + html[data-organizations] .pane-body{overflow:visible} + html[data-organizations] .pane-h{flex-wrap:wrap} + html[data-organizations] .pane-pick{flex:1 1 100%;max-width:none;order:5;margin-left:0} +} diff --git a/packages/webui/src/public/panes.js b/packages/webui/src/public/panes.js new file mode 100644 index 000000000..52fc2b573 --- /dev/null +++ b/packages/webui/src/public/panes.js @@ -0,0 +1,446 @@ +// Side by side (U5, sample 07): two panes, each showing one page of any organization. A pane holds +// the organization dashboard, the Agents levels or a project page (overview, conversations, tasks, +// requirements, files), drawn by the same modules as the full view (workspace.js, projects.js) into +// the pane instead of #bus-view. Every read names the pane's organization, so the panes never share +// state. Pages that keep one global form, dialog or editor (a conversation, the room, settings, the +// queue, docs, the inbox) are not offered in a pane; their links open the full view. +// +// The panes' routes, the divider and the phone's shown pane live in the URL +// (#/orgs//side-by-side?a=/&b=/&w=&show=a|b), updated with +// replaceState so nothing reloads, and the last layout is remembered in this browser. +(() => { + 'use strict'; + if (!document.documentElement.hasAttribute('data-organizations')) return; + const data = window.MosaicWorkspaceData, ws = () => window.MosaicWorkspace; + const esc = value => String(value ?? '').replace(/[&<>"']/g, c => ({ '&': '&', '<': '<', '>': '>', '"': '"', "'": ''' }[c])); + const enc = encodeURIComponent; + const STORE = 'mosaic-side-by-side-v1', POLL = 10000, LIST_TTL = 3000, PROJECTS_TTL = 30000; + const MIN = 25, MAX = 75, STEP = 5; + const ORG = /^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/; + const PROJECT = /^\/projects\/([A-Za-z0-9][A-Za-z0-9._-]{0,159})(?:\/(conversations|tasks|requirements|files))?$/; + const SECTIONS = { overview: 'Overview', conversations: 'Conversations', tasks: 'Tasks', requirements: 'Requirements', files: 'Files' }; + const FOCUSABLE = 'a[href],button:not([disabled]),select,textarea,input,summary,[tabindex]:not([tabindex="-1"])'; + const NAMES = { a: 'left', b: 'right' }; + const load = () => { try { return localStorage.getItem(STORE); } catch { return null; } }; + const save = value => { try { localStorage.setItem(STORE, value); } catch {} }; + const paused = () => document.getElementById('pause')?.getAttribute('aria-pressed') === 'true'; + const svg = d => ``; + const FULL = svg(''); + const CLOSE = svg(''); + const PLUS = svg(''); + + // A pane's page: the routes a pane can draw. Anything else is not pane-safe. + function page(route) { + if (route === '/organization') return { kind: 'dashboard' }; + if (route === '/agents') return { kind: 'agents' }; + const m = PROJECT.exec(route); + if (m && m[1] !== 'threads' && m[1] !== 'rooms') return { kind: 'project', id: m[1], section: m[2] || 'overview' }; + return null; + } + // "/" from the URL; null when either part is not one a pane draws. + function parsePane(value) { + if (typeof value !== 'string') return null; + const cut = value.indexOf('/'); + if (cut < 1) return null; + const org = value.slice(0, cut), route = value.slice(cut); + return ORG.test(org) && page(route) ? { org, route } : null; + } + const paneValue = p => `${p.org}${p.route}`; + const clampW = n => Math.min(MAX, Math.max(MIN, Math.round(n))); + + // ---------- shared reads (one organization list and project lists for both panes) ---------- + let listAt = 0, listPromise = null, projectReads = new Map(); + function orgList(fresh = false) { + if (!listPromise || fresh || Date.now() - listAt > LIST_TTL) { + listAt = Date.now(); + listPromise = Promise.all([data.organizations(), ws()?.themes?.()]).then(([rows]) => (Array.isArray(rows) ? rows : null)).catch(() => null); + } + return listPromise; + } + function projectsOf(org, fresh = false) { + const hit = projectReads.get(org); + if (hit && !fresh && Date.now() - hit.at < PROJECTS_TTL) return hit.promise; + const promise = data.projects(org).then(b => (Array.isArray(b?.rows) ? b.rows.filter(p => p && typeof p.id === 'string') : null)).catch(() => null); + projectReads.set(org, { at: Date.now(), promise }); + return promise; + } + + // ---------- state ---------- + let mounted = null; // { root, panes: [pane], w, show, gen } + let mountGen = 0; + let listCache = null; // the last organization list read, for the shown-pane tabs + + function readQuery(query) { + const q = new URLSearchParams(query || ''); + return { a: parsePane(q.get('a')), b: parsePane(q.get('b')), w: Number(q.get('w')), show: q.get('show'), named: q.has('a') || q.has('b') }; + } + function queryOf(state) { + const q = new URLSearchParams(); + state.panes.forEach((p, i) => q.set(i ? 'b' : 'a', paneValue(p))); + q.set('w', String(state.w)); + q.set('show', state.show); + return q.toString().replace(/%2F/g, '/'); + } + function writeUrl() { + if (!mounted) return; + const qs = queryOf(mounted); + save(qs); + const next = `#/orgs/${enc(window.MosaicOrg.id)}/side-by-side?${qs}`; + if (location.hash !== next) history.replaceState(null, '', next); + } + // The first pane is this page's organization; the second is the next organization on the list, + // or this one's Agents when there is no other. + async function defaults() { + const here = window.MosaicOrg.id, list = await orgList(); + const other = (list || []).find(o => o && !o.invalid && o.id !== here && ORG.test(o.id)); + return [{ org: here, route: '/organization' }, other ? { org: other.id, route: '/organization' } : { org: here, route: '/agents' }]; + } + + // ---------- markup ---------- + function paneShell(key) { + const name = NAMES[key]; + return `
+
+ + + + Open in full view${FULL} +
+

+
+
`; + } + function frame() { + return `
+

Side by side

+ +
+
${paneShell('a')}${paneShell('b')}
+
`; + } + + // Orgs in the picker: every organization on the list. A pane draws a valid one's dashboard, Agents or + // any project the organization's project read lists; an invalid one is listed and cannot be chosen. + async function pickerHtml(p, list) { + const groups = await Promise.all((list || []).filter(o => o && ORG.test(o.id)).map(async org => { + const name = ws().label(org); + if (org.invalid) return ``; + const rows = await projectsOf(org.id); + const opt = (route, text) => ``; + const projects = rows === null ? '' : rows.filter(r => !r.archived && PROJECT.test(`/projects/${r.id}`)).map(r => opt(`/projects/${r.id}`, `Project: ${r.name || r.id}`)).join(''); + return `${opt('/organization', 'Dashboard')}${opt('/agents', 'Agents')}${projects}`; + })); + let html = groups.join(''); + const value = paneValue(p); + // A project section, or a page the list no longer names, is still the pane's page: keep it selectable. + if (!html.includes(`value="${esc(value)}"`)) html = `${html}`; + return html; + } + + // ---------- drawing one pane ---------- + const els = p => ({ + head: p.el.querySelector('[data-pane-head]'), av: p.el.querySelector('[data-pane-av]'), ttl: p.el.querySelector('[data-pane-ttl]'), + state: p.el.querySelector('[data-pane-state]'), pick: p.el.querySelector('[data-pane-pick]'), full: p.el.querySelector('[data-pane-full]'), + fullLabel: p.el.querySelector('[data-pane-full-label]'), close: p.el.querySelector('[data-pane-close]'), line: p.el.querySelector('[data-pane-line]'), body: p.el.querySelector('[data-pane-body]'), + }); + const setHtml = (el, html) => { if (el && el.innerHTML !== html) el.innerHTML = html; }; + const setText = (el, text) => { if (el && el.textContent !== text) el.textContent = text; }; + + // Links a page draws are relative to the page's organization. In a pane they name the pane's + // organization; reads the page links to (/api/...) name it too. + function rewrite(p, root) { + const prefix = `#/orgs/${enc(p.org)}`; + for (const a of root.querySelectorAll('a[href^="#/"]')) if (!a.getAttribute('href').startsWith('#/orgs/')) a.setAttribute('href', prefix + a.getAttribute('href').slice(1)); + for (const a of root.querySelectorAll('a[href^="/api/"]')) if (!a.getAttribute('href').startsWith('/api/orgs/')) a.setAttribute('href', `/api/orgs/${enc(p.org)}/${a.getAttribute('href').slice(5)}`); + // The pane's title is the page's heading; the side-by-side page keeps the one level-1 heading. + for (const h of root.querySelectorAll('h1:not([aria-level])')) h.setAttribute('aria-level', '2'); + } + // Focus and scroll survive a repaint of this pane only. Focus in the other pane is never taken. + function capture(p, root) { + const a = document.activeElement, inside = !!a && a !== root && root.contains(a); + return { + top: root.scrollTop, + focus: inside ? { key: a.dataset?.focusKey || null, href: a.getAttribute('href'), index: [...root.querySelectorAll(FOCUSABLE)].indexOf(a), h1: a.tagName === 'H1' } : null, + }; + } + function restore(p, root, kept) { + root.scrollTop = kept.top; + const f = kept.focus, a = document.activeElement; + if (!f || (a && a !== document.body && !root.contains(a))) return; + const target = (f.key && root.querySelector(`[data-focus-key="${CSS.escape(f.key)}"]`)) + || (f.href && [...root.querySelectorAll('a[href]')].find(x => x.getAttribute('href') === f.href)) + || (f.h1 && root.querySelector('h1')) + || root.querySelectorAll(FOCUSABLE)[f.index]; + (target || root).focus({ preventScroll: true }); + } + function paintBody(p, html) { + const { body } = els(p); + if (p.html === html && body.childElementCount) return; + const kept = capture(p, body); + body.innerHTML = html; p.html = html; p.project = null; + rewrite(p, body); + restore(p, body, kept); + } + + async function drawPane(p, { fresh = false, focusHead = false } = {}) { + if (!mounted || !p.el.isConnected) return; + const turn = ++p.turn, gen = mountGen, live = () => mounted && gen === mountGen && turn === p.turn && p.el.isConnected; + clearTimeout(p.timer); + const e = els(p), what = page(p.route); + const list = await orgList(fresh); + if (!live()) return; + if (list) listCache = list; + const org = list?.find(o => o?.id === p.org) || null; + const name = org ? ws().label(org) : p.org; + // Header: the organization's mark, the page's title, its state, the picker and the tools. + if (org) e.head.setAttribute('style', ws().colours(org)); else e.head.removeAttribute('style'); + setHtml(e.av, org ? ws().av(org, 'md') : ''); + const [scls, sglyph, sword] = org ? ws().state(org) : ['s-unknown', '?', 'not on your list']; + setHtml(e.state, org?.busHealthy && !org.invalid ? '' : ws().dot(scls, sglyph, sword, true)); + const fullHref = `#/orgs/${enc(p.org)}${p.route}`; + if (e.full.getAttribute('href') !== fullHref) e.full.setAttribute('href', fullHref); + + let line = '', html = null; + if (!list) line = 'The organization list could not be read. This pane shows what its own reads return.'; + else if (!org) { line = `${p.org} is not on your organization list.`; html = '

Nothing is read for an organization that is not on your list.

'; } + else if (org.invalid) { line = `${name}: organization invalid${org.reason ? ` (${org.reason})` : ''}.`; html = '

Nothing is read from an invalid organization. Fix its file under Settings, Organizations.

'; } + else if (!org.busHealthy) line = `${name}: bus unavailable. Reads from this organization may fail; the other pane is not affected.`; + setText(e.line, line); e.line.hidden = !line; + + let title = what?.kind === 'agents' ? 'Agents' : 'Dashboard'; + if (html === null && what?.kind === 'dashboard') html = await ws().dashboard(p.org, { pane: true, idPrefix: `pane-${p.key}-` }).catch(() => '

Dashboard unavailable.

'); + else if (html === null && what?.kind === 'agents') html = await ws().agentGrid('', p.org).catch(() => '

Agents unavailable.

'); + if (!live()) return; + if (html === null && what?.kind === 'project') { + title = await drawProject(p, e, what, fresh); + if (!live()) return; + } else if (html !== null) paintBody(p, html); + p.title = title; + setHtml(e.ttl, `${esc(title)}${esc(name)}`); + p.el.setAttribute('aria-label', `${NAMES[p.key][0].toUpperCase()}${NAMES[p.key].slice(1)} pane: ${title}, ${name}`); + setText(e.fullLabel, `Open ${title}, ${name}, in full view`); + // The picker is rebuilt only while it is closed and unfocused, so a choice in progress stays. + if (document.activeElement !== e.pick) { + const options = await pickerHtml(p, list); + if (!live()) return; + if (document.activeElement !== e.pick) { setHtml(e.pick, options); e.pick.value = paneValue(p); } + } + paintBar(); fit(); + if (focusHead) (e.body.querySelector('h1') || e.body).focus({ preventScroll: true }); + p.timer = setTimeout(() => tick(p), POLL); + } + function tick(p) { + if (!mounted || !p.el.isConnected) return; + if (paused()) { p.timer = setTimeout(() => tick(p), POLL); return; } + void drawPane(p); + } + + // A project page: projects.js's header and content, mounted into the pane with the pane's + // organization, read-only (a pane never sends). + async function drawProject(p, e, what, fresh) { + const [projects, threadsRead] = await Promise.all([projectsOf(p.org, fresh), data.threads(p.org).catch(() => null)]); + const project = projects?.find(r => r.id === what.id); + const sectionName = SECTIONS[what.section]; + if (!project) { + paintBody(p, projects === null ? '

Projects unavailable. The organization did not answer the project read.

' : '

This project is not in the organization\'s project list.

'); + return what.id; + } + const threads = Array.isArray(threadsRead?.rows) ? threadsRead.rows : []; + const head = window.MosaicProjects.header(project, what.section, threads); + const conv = what.section === 'conversations' ? conversations(project, threads, threadsRead) : null; + const key = JSON.stringify([project.id, what.section, head, conv]); + const { body } = e; + if (p.project?.key !== key) { + const kept = capture(p, body); + body.innerHTML = `
${head}${conv ?? '
Reading…
'}
`; + p.html = null; p.project = { key }; + rewrite(p, body); + restore(p, body, kept); + } + const content = body.querySelector('[data-project-content]'); + if (content) await window.MosaicProjects.mountContent({ container: content, project, threads, section: what.section, canSend: false, org: p.org, pane: true }); + return what.section === 'overview' ? project.name || project.id : `${project.name || project.id} · ${sectionName}`; + } + function conversations(project, threads, read) { + if (!read) return '

Conversations unavailable.

'; + const own = threads.filter(t => t && !t.shared && t.project === project.id && typeof t.id === 'string'); + const rows = own.map(t => `${esc(t.name || t.id)}With ${esc(t.instance || 'no agent recorded')}`).join(''); + return `

Conversations

${rows || '

No conversations yet.

'}

A conversation opens in its full view.

`; + } + + // ---------- the bar, tabs, divider and layout ---------- + function paintBar() { + if (!mounted) return; + const { root, panes, show } = mounted, two = panes.length === 2; + setText(root.querySelector('[data-sbs-note]'), `${panes.length} ${panes.length === 1 ? 'pane' : 'panes'} · each pane reads its own organization's bus and keeps its own state`); + const tabs = root.querySelector('[data-sbs-tabs]'), focusedTab = tabs.contains(document.activeElement) ? document.activeElement.dataset.paneShow : null; + const list = listCache; + const html = panes.map(p => { + const org = list?.find(o => o?.id === p.org); + return ``; + }).join(''); + if (tabs.innerHTML !== html) { tabs.innerHTML = html; if (focusedTab) tabs.querySelector(`[data-pane-show="${focusedTab}"]`)?.focus({ preventScroll: true }); } + const add = root.querySelector('[data-pane-add]'); + add.disabled = two; add.title = two ? 'Side by side holds two panes. Close one to choose another.' : 'Open a second pane'; + for (const p of panes) { const c = p.el.querySelector('[data-pane-close]'); c.hidden = !two; } + } + function layout() { + if (!mounted) return; + const { root, panes, w, show } = mounted, two = panes.length === 2; + const box = root.querySelector('[data-sbs-panes]'), divider = root.querySelector('[data-sbs-divider]'); + box.classList.toggle('two', two); + box.style.setProperty('--sbs-a', `${w}fr`); box.style.setProperty('--sbs-b', `${100 - w}fr`); + divider.hidden = !two; + divider.setAttribute('aria-valuenow', String(w)); + divider.setAttribute('aria-valuetext', `Left pane ${w} percent, right pane ${100 - w} percent`); + root.querySelector('#pane-b').hidden = !two; + for (const p of panes) p.el.classList.toggle('alt', show !== p.key); + fit(); + } + // Wide screens: the panes fill the window below the bar and each scrolls on its own. + const wide = window.matchMedia('(min-width: 761px)'); + function fit() { + if (!mounted) return; + const { root } = mounted; + if (!wide.matches) { root.style.height = ''; return; } + const foot = document.querySelector('body > .foot, .foot')?.getBoundingClientRect().height || 0; + const top = root.getBoundingClientRect().top; + root.style.height = `${Math.max(360, Math.floor(window.innerHeight - Math.max(top, 0) - foot))}px`; + } + function setWidth(w, persist = true) { + if (!mounted) return; + const next = clampW(w); + if (next === mounted.w) return; + mounted.w = next; layout(); if (persist) writeUrl(); + } + + // ---------- events (bound once to the mount root) ---------- + function bind(root) { + const divider = root.querySelector('[data-sbs-divider]'); + divider.addEventListener('keydown', e => { + const w = mounted?.w; if (w === undefined) return; + const next = { ArrowLeft: w - STEP, ArrowDown: w - STEP, ArrowRight: w + STEP, ArrowUp: w + STEP, PageDown: w - 10, PageUp: w + 10, Home: MIN, End: MAX }[e.key]; + if (next === undefined) return; + e.preventDefault(); setWidth(next); + }); + divider.addEventListener('pointerdown', e => { + if (e.button !== 0) return; + e.preventDefault(); divider.focus({ preventScroll: true }); divider.setPointerCapture(e.pointerId); divider.classList.add('dragging'); + const box = root.querySelector('[data-sbs-panes]').getBoundingClientRect(); + const move = ev => setWidth(((ev.clientX - box.left) / box.width) * 100, false); + const up = () => { divider.removeEventListener('pointermove', move); divider.removeEventListener('pointerup', up); divider.removeEventListener('pointercancel', up); divider.classList.remove('dragging'); writeUrl(); }; + divider.addEventListener('pointermove', move); divider.addEventListener('pointerup', up); divider.addEventListener('pointercancel', up); + }); + root.addEventListener('change', e => { + const pick = e.target.closest?.('[data-pane-pick]'); if (!pick || !mounted) return; + const p = mounted.panes.find(x => x.el.contains(pick)), next = parsePane(pick.value); + if (!p || !next) return; + go(p, next, false); + }); + root.addEventListener('click', e => { + if (!mounted) return; + const show = e.target.closest?.('[data-pane-show]'); + if (show) { mounted.show = show.dataset.paneShow === 'b' && mounted.panes.length === 2 ? 'b' : 'a'; layout(); paintBar(); writeUrl(); return; } + if (e.target.closest?.('[data-pane-add]')) { void addPane(); return; } + const close = e.target.closest?.('[data-pane-close]'); + if (close) { closePane(mounted.panes.find(x => x.el.contains(close))); return; } + // A plain click on a link to a page a pane draws, in the pane's own organization, opens it in + // the pane. Anything else (another organization, a page a pane does not draw, a new tab) is + // an ordinary link to the full view. + const a = e.target.closest?.('a[href^="#/orgs/"]'); + if (!a || a.hasAttribute('data-pane-full') || e.defaultPrevented || e.button !== 0 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) return; + const p = mounted.panes.find(x => x.el.contains(a)); if (!p) return; + const m = /^#\/orgs\/([^/?#]+)(\/[^?#]*)$/.exec(a.getAttribute('href')); + let org, route; + try { org = decodeURIComponent(m?.[1] ?? ''); route = decodeURIComponent(m?.[2] ?? ''); } catch { return; } + if (org !== p.org || !page(route)) return; + e.preventDefault(); + go(p, { org, route }, true); + }); + } + function go(p, next, focusHead) { + p.org = next.org; p.route = next.route; p.html = null; p.project = null; p.title = null; + els(p).body.scrollTop = 0; + writeUrl(); + void drawPane(p, { focusHead }); + } + async function addPane() { + if (!mounted || mounted.panes.length !== 1) return; + const [a] = mounted.panes, list = await orgList(); + if (!mounted || mounted.panes.length !== 1) return; + const other = (list || []).find(o => o && !o.invalid && o.id !== a.org && ORG.test(o.id)); + const b = makePane('b', other ? { org: other.id, route: '/organization' } : { org: a.org, route: a.route === '/agents' ? '/organization' : '/agents' }); + mounted.panes.push(b); mounted.show = 'b'; + layout(); writeUrl(); + await drawPane(b); + if (mounted?.panes.includes(b)) els(b).pick.focus({ preventScroll: true }); + } + function closePane(p) { + if (!mounted || !p || mounted.panes.length !== 2) return; + clearTimeout(p.timer); p.turn++; + const keep = mounted.panes.find(x => x !== p); + // The remaining pane becomes the first: its page moves into pane a's element. + const a = mounted.panes[0]; + if (keep !== a) { + const b = mounted.panes[1]; + clearTimeout(b.timer); b.turn++; + a.org = keep.org; a.route = keep.route; a.html = null; a.project = null; a.title = keep.title; + } + setHtml(els(mounted.panes[1]).body, ''); mounted.panes[1].html = null; mounted.panes[1].project = null; + mounted.panes = [a]; mounted.show = 'a'; + layout(); writeUrl(); + void drawPane(a).then(() => { if (mounted?.panes[0] === a) els(a).pick.focus({ preventScroll: true }); }); + if (keep === a) els(a).pick.focus({ preventScroll: true }); + } + function makePane(key, at) { + const el = mounted.root.querySelector(`#pane-${key}`); + const p = { key, el, org: at.org, route: at.route, turn: 0, timer: null, html: null, project: null, title: null }; + // projects.js paints a project's content after its own reads; its links are rewritten as they land. + p.observer?.disconnect(); + p.observer = new MutationObserver(() => rewrite(p, els(p).body)); + p.observer.observe(els(p).body, { childList: true, subtree: true }); + return p; + } + + // ---------- public ---------- + async function mount(container, query, { navigated = false } = {}) { + unmount(); + const gen = ++mountGen; + container.innerHTML = frame(); + const root = container.querySelector('[data-side-by-side]'); + mounted = { root, panes: [], w: 50, show: 'a', gen }; + bind(root); + window.addEventListener('resize', fit); + document.title = 'Side by side · Mosaic Console'; + if (navigated) root.querySelector('h1').focus({ preventScroll: true }); + let wanted = readQuery(query); + if (!wanted.named) { const kept = readQuery(load() || ''); if (kept.a) wanted = { ...kept, named: true }; } + let at = [wanted.a, wanted.b].filter(Boolean); + if (!at.length) at = await defaults(); + if (!mounted || gen !== mountGen) return; + listCache = await orgList(); + if (!mounted || gen !== mountGen) return; + mounted.panes = at.slice(0, 2).map((x, i) => makePane(i ? 'b' : 'a', x)); + mounted.w = Number.isFinite(wanted.w) && wanted.w ? clampW(wanted.w) : 50; + mounted.show = wanted.show === 'b' && mounted.panes.length === 2 ? 'b' : 'a'; + layout(); paintBar(); writeUrl(); + await Promise.all(mounted.panes.map(p => drawPane(p))); + } + function unmount() { + if (!mounted) return; + for (const p of mounted.panes) { clearTimeout(p.timer); p.turn++; p.observer?.disconnect(); } + window.removeEventListener('resize', fit); + mounted = null; mountGen++; + } + // The Console's Refresh: both panes read again now, each keeping its own focus and scroll. + function refresh() { + if (!mounted) return; + projectReads = new Map(); + void orgList(true).then(rows => { if (rows) listCache = rows; }); + for (const p of mounted.panes) void drawPane(p, { fresh: true }); + } + // The list the tabs draw from follows each fresh read of the organization list. + document.addEventListener('mosaic-org-list', e => { if (Array.isArray(e.detail?.rows)) listCache = e.detail.rows; }); + + window.MosaicPanes = Object.freeze({ mount, unmount, refresh, page }); +})(); diff --git a/packages/webui/src/public/projects.js b/packages/webui/src/public/projects.js index 0b4dcf0ec..7e729344b 100644 --- a/packages/webui/src/public/projects.js +++ b/packages/webui/src/public/projects.js @@ -31,12 +31,15 @@ let treeRows=[], treeThreads=[], treeGeneration=0, treeState, treeRead=null, treeReadAt=0; const treeFocus = new WeakMap(); try { treeState=JSON.parse(localStorage.getItem(storageKey) || '{}'); if (!treeState || Array.isArray(treeState) || typeof treeState !== 'object') treeState={}; } catch { treeState={}; } + // A side-by-side pane reads its own organization: its reads name that organization explicitly. + const at=(org,url)=>org && url.startsWith('/api/') ? `/api/orgs/${encodeURIComponent(org)}/${url.slice(5)}` : url; async function read(url) { const response=await fetch(url,{cache:'no-store',redirect:'manual'}); if(response.status===401 || response.type==='opaqueredirect') { document.dispatchEvent(new CustomEvent('mosaic-signed-out',{detail:{signIn:true}})); throw Error('signed-out'); } if(!response.ok) { const body=await response.json().catch(()=>null); const error=Error('unavailable'); error.status=response.status; error.code=body?.error; throw error; } return response.json(); } + const readAt=url=>read(url); function currentProject(route) { const id=route.match(/^\/(?:projects|chat)\/(?:projects\/|rooms\/)?([0-9a-f-]{36})/i)?.[1]; if(id) return id; @@ -104,8 +107,9 @@ const same=(a,b)=>JSON.stringify(canonical(a))===JSON.stringify(canonical(b)); const material=(d,s)=>d && d.candidate && s?.candidate && same(d.candidate,s.candidate) && d.candidate.request===s.request && d.candidate.project===s.project && d.candidate.mode_revision===s.mode_revision && typeof d.prd==='string' && Array.isArray(d.requirements) && Array.isArray(d.candidate.requirements) && d.requirements.length===d.candidate.requirements.length && d.requirements.every((r,i)=>r && r.id===d.candidate.requirements[i]?.id && r.title===d.candidate.requirements[i]?.title && typeof r.text==='string') && d.snapshot && Number.isSafeInteger(d.snapshot.revision) && d.snapshot.revision>=0 && d.snapshot.id===s.snapshot && (d.snapshot.id===null || requestId(d.snapshot.id) && d.snapshot.revision>0); const ownThreads=(project,threads)=>threads.filter(t=>t.project===project.id && !t.shared && UUID.test(t.id)); - async function gather(project,threads) { - const own=ownThreads(project,threads), key=project.id+':'+String(project.repo)+':'+own.map(t=>t.id).join(','); + async function gather(project,threads,org=null) { + const read=url=>readAt(at(org,url)); + const own=ownThreads(project,threads), key=(org?org+'|':'')+project.id+':'+String(project.repo)+':'+own.map(t=>t.id).join(','); const prior=cache.get(key); if(prior && Date.now()-prior.at<10000) return prior.promise; const started=epoch; const promise=(async()=>{ @@ -133,7 +137,7 @@ const [draft,workspace]=await Promise.all([read(base+'/draft').catch(()=>null),read(base+'/workspace').catch(()=>null)]); return {...item,state,draft:material(draft,state)?draft:null,materialFailed:!!state.candidate && !material(draft,state),workspace}; }))).filter(Boolean); - const [tasks,catalog,room]=await Promise.all([read('/api/bus/tasks').catch(()=>null),read('/api/chat/instances').catch(()=>null),readRoomStatus(project)]); + const [tasks,catalog,room]=await Promise.all([read('/api/bus/tasks').catch(()=>null),read('/api/chat/instances').catch(()=>null),readRoomStatus(project,org)]); const members=Array.isArray(catalog?.rows)?catalog.rows.filter(m=>typeof m?.instance==='string' && own.some(t=>t.instance===m.instance && t.name===t.instance)).length:null; let docs=project.repo ? null : {files:[]}, north=null, recordsMissing=false, northMissing=false, northRecordsMissing=false; if(project.repo && /^[A-Za-z0-9][A-Za-z0-9._/-]{0,200}$/.test(project.repo)) { @@ -145,9 +149,9 @@ })(); cache.set(key,{at:Date.now(),promise}); return promise; } - async function readRoomStatus(project) { + async function readRoomStatus(project,org=null) { try { - const response=await fetch(`/api/chat/rooms/${encodeURIComponent(project.id)}/messages?limit=100`,{cache:'no-store',redirect:'manual'}); + const response=await fetch(at(org,'/api/chat/rooms/')+`${encodeURIComponent(project.id)}/messages?limit=100`,{cache:'no-store',redirect:'manual'}); if(response.status===401 || response.type==='opaqueredirect') { document.dispatchEvent(new CustomEvent('mosaic-signed-out',{detail:{signIn:true}})); return 'Unavailable'; } const body=await response.json(); if(response.ok && Array.isArray(body?.rows) && typeof body.hasMore==='boolean') return 'Open'; @@ -241,15 +245,15 @@ const wanted=new Set((restore.disclosures || []).map(String)), closed=new Set((restore.closed || []).map(String)); [...root.querySelectorAll('details')].forEach((el,i)=>{const key=restoreKey(el,i);if(wanted.has(key)) el.open=true;else if(el.dataset.restoreKey && closed.has(key)) el.open=false;}); const f=restore.projectFocus; if(!f) return; - const focus=f.id ? document.getElementById(f.id) : f.details ? [...root.querySelectorAll('details[data-restore-key]')].find(el=>el.dataset.restoreKey===f.details)?.querySelector(':scope > summary') : root.querySelectorAll(FOCUSABLE)[f.index]; + const focus=f.id ? root.querySelector('#'+CSS.escape(f.id)) : f.details ? [...root.querySelectorAll('details[data-restore-key]')].find(el=>el.dataset.restoreKey===f.details)?.querySelector(':scope > summary') : root.querySelectorAll(FOCUSABLE)[f.index]; focus?.focus({preventScroll:true}); } - async function mountContent({container,project,threads,section,canSend,restore,roomReceipt}) { + async function mountContent({container,project,threads,section,canSend,restore,roomReceipt,org=null,pane=false}) { if(!container || !project) return; const generation=epoch, run=(contentRuns.get(container) || 0)+1; contentRuns.set(container,run); if (!contentPaints.has(container)) container.textContent='Reading…'; - const data=await gather(project,threads).catch(()=>null); + const data=await gather(project,threads,org).catch(()=>null); if(!container.isConnected || generation!==epoch || contentRuns.get(container)!==run || document.body.classList.contains('signed-out')) return; if(!data){contentPaints.delete(container);container.textContent='Project data unavailable. Refresh to try again.';return;} const selected=selectedRequests.get(project.id); @@ -260,12 +264,12 @@ // The generated presentation and separately mounted Markdown determine visible content. const signature=JSON.stringify([view, section==='requirements' ? selectedRequest?.draft?.prd : null, ['requirements','overview'].includes(section) ? data.north?.content : null, data.failed && ['files','tasks'].includes(section)]); const header=container.closest('.chat-area')?.querySelector('.project-tabs'); - if(header){const tasks=header.querySelector(`a[href="${path(project.id,'tasks')}"]`), files=header.querySelector(`a[href="${path(project.id,'files')}"]`);const f=filesData(data);if(tasks && !tasks.querySelector('.project-count') && !data.failed)tasks.insertAdjacentHTML('beforeend',` ${taskRefs(data).length}`);if(files && !files.querySelector('.project-count') && !data.failed && f.docs && data.requests.every(r=>r.workspace?.available===true && Array.isArray(r.workspace.entries)))files.insertAdjacentHTML('beforeend',` ${f.reviewed.length+f.drafts.length+f.docs.length}`);} + if(header){const tab=key=>header.querySelector(`a[href$="${path(project.id,key).slice(1)}"]`), tasks=tab('tasks'), files=tab('files');const f=filesData(data);if(tasks && !tasks.querySelector('.project-count') && !data.failed)tasks.insertAdjacentHTML('beforeend',` ${taskRefs(data).length}`);if(files && !files.querySelector('.project-count') && !data.failed && f.docs && data.requests.every(r=>r.workspace?.available===true && Array.isArray(r.workspace.entries)))files.insertAdjacentHTML('beforeend',` ${f.reviewed.length+f.drafts.length+f.docs.length}`);} revealTab(header); // Retained controls (the request selector) draw from the newest accepted read, even when // this read changes nothing visible and the DOM is kept. contentModels.set(container,{data,project,section,canSend,roomReceipt}); - window.MosaicOnboarding?.offer(container,{project,section,north:data.north,docs:data.docs,threads:data.threads,canSend}); // F2: its panel sits before the container, outside draw(). + if(!pane) window.MosaicOnboarding?.offer(container,{project,section,north:data.north,docs:data.docs,threads:data.threads,canSend}); // F2: its panel sits before the container, outside draw(). if (contentPaints.get(container) === signature) return; contentPaints.set(container, signature); // Capture at commit time: the user may have interacted while the read was pending. @@ -285,7 +289,7 @@ if (restore) { restoreView(container,restore); } - const sectionTarget=new URLSearchParams(location.hash.split('?')[1] || '').get('section'); + const sectionTarget=pane ? null : new URLSearchParams(location.hash.split('?')[1] || '').get('section'); if(section==='requirements' && ['prd','north-star'].includes(sectionTarget)) container.querySelector('#project-'+sectionTarget)?.scrollIntoView({block:'start'}); } // Cut at a word boundary, unless that would leave only a markdown marker (a long heading). @@ -334,7 +338,7 @@ } const palette=()=>treeRows.filter(p=>!p.archived && UUID.test(p.id)).flatMap(p=>sections.map(([key,label])=>({href:path(p.id,key),label:key==='overview'?p.name:`${p.name}: ${label}`,group:'project'}))); function breadcrumb(box, view) { - const h=view.querySelector('.project-header'); if(!h)return false; + const h=view.querySelector('.project-header'); if(!h||h.closest('[data-pane]'))return false; const id=h.dataset.projectId, name=h.dataset.projectName, section=h.dataset.projectSection, conversation=h.dataset.projectConversation==='true'; const title=sections.find(([key])=>key===section)?.[1] || (section==='settings'?'Settings':'Overview'); const leaf=conversation?view.querySelector('h1')?.textContent:title; diff --git a/packages/webui/src/public/workspace.js b/packages/webui/src/public/workspace.js index 3c0758f4a..c43959864 100644 --- a/packages/webui/src/public/workspace.js +++ b/packages/webui/src/public/workspace.js @@ -191,8 +191,10 @@ }).join('')}`; } - async function dashboard() { - const id = window.MosaicOrg.id; + // A side-by-side pane passes its own organization and { pane: true, idPrefix }: the pane has no bus + // restart (that stays in the organization's full view) and its ids carry the pane's prefix. + async function dashboard(id = window.MosaicOrg.id, opts = {}) { + const pane = opts.pane === true, why = `${opts.idPrefix || ''}ws-reload-why`; // Only an organization the membership list names is read; anything else reads nothing more. const [listRead] = await Promise.all([data.organizations().catch(() => null), ensureThemes()]); const list = Array.isArray(listRead) ? listRead : null; @@ -210,11 +212,12 @@ // Header: the bus restart is console-restart.js's button where the Console allows it, otherwise // the same control, present and disabled, with the reason. - const restart = window.MosaicConsole?.busButton?.('Restart bus') || ''; - const bus = restart ? `${icon('restart', 'ws-busicon')}${restart}` : ``; - const reload = ``; + const restart = pane ? '' : window.MosaicConsole?.busButton?.('Restart bus') || ''; + const offTitle = pane ? "Restart the bus from this organization's full view" : "Restarting the bus is the owner's trailed action, on a Console started with send and the action trail"; + const bus = restart ? `${icon('restart', 'ws-busicon')}${restart}` : ``; + const reload = ``; const [bcls, bglyph] = state(org); - const meta = `

Kind not recordedid ${esc(id)}Tracker: ${tracker ? esc(titleCase(tracker)) : 'not set'}${dot(bcls, bglyph, org.busHealthy ? `bus running, read ${clock()}` : `bus unavailable, read ${clock()}`, true)}Restart is a trailed human action; reload arrives with the cross-org update.

`; + const meta = `

Kind not recordedid ${esc(id)}Tracker: ${tracker ? esc(titleCase(tracker)) : 'not set'}${dot(bcls, bglyph, org.busHealthy ? `bus running, read ${clock()}` : `bus unavailable, read ${clock()}`, true)}Restart is a trailed human action; reload arrives with the cross-org update.

`; const projectName = pid => projectRows?.find(p => p.id === pid)?.name || pid; const typechips = '
System typesNo system types yet. They arrive with the system types update.
'; @@ -269,7 +272,9 @@ const LEVEL_CLS = { root: 'root', org: 'org', project: 'proj' }; const projectName = (rows, id) => { const p = Array.isArray(rows) ? rows.find(r => r?.id === id) : null; return p?.name || id; }; let agentsPick = null; // the project chosen in "Available in a project", kept across repaints - let agentsAvailable = null; // repaints that section alone when the choice changes + // Repaints that section alone when the choice changes, one renderer per organization: a side-by-side + // pane can show another organization's agents next to the page's own. + let agentsAvailable = {}; function levelsTable(ctx, projectId) { const { selOrg, lv, mine, levels, modelOf, names, others } = ctx; @@ -322,9 +327,8 @@ return `
${body}
AgentLevelDefined inMemoryStatusModel
${note}`; } - async function agentGrid(note = '') { + async function agentGrid(note = '', selected = window.MosaicOrg?.id) { const [list, levels] = await Promise.all([data.organizations().catch(() => null), data.agentLevels().catch(() => null), ensureThemes()]); - const selected = window.MosaicOrg?.id; const head = `

Agents

Agents are defined at three levels: root, organization and project. Root and project agents are read from their files and are not launched yet.${note ? ` ${note}` : ''}

`; if (!Array.isArray(list)) return `
${head}

Organizations unavailable.

`; const valid = list.filter(org => !org.invalid); @@ -372,8 +376,8 @@ const projectIds = lv?.state === 'ok' ? Object.keys(lv.projects) : []; const pick = projectIds.includes(agentsPick?.[selected]) ? agentsPick[selected] : projectIds[0] ?? null; const ctx = { selOrg, lv, mine, levels, modelOf, names: id => projectName(mine?.rows, id), others: valid.filter(o => o.id !== selected) }; - agentsAvailable = projectId => levelsTable(ctx, projectId); - const chooser = projectIds.length ? `` : ''; + agentsAvailable = { ...agentsAvailable, [selected]: projectId => levelsTable(ctx, projectId) }; + const chooser = projectIds.length ? `` : ''; const title = projectIds.length ? 'Available in a project' : `Agents in ${esc(label(selOrg))}`; const table = !mine ? '

The selected organization is not on the list.

' : levelsTable(ctx, pick); const rules = `

rootYou define root agents in agents.json in your configuration directory. The chief cannot change them.

orgAgents come from the organization file. Add, change or remove them under Settings, Agents.

projectA project in the organization file can add an agent, narrow an inherited agent's limits or exclude one. It never widens them.

overrideThe most specific level wins. A row says which definition it replaces.

An agent's harness, model and thinking are set under Settings, Routing.

`; @@ -383,10 +387,11 @@ } document.addEventListener('change', e => { const select = e.target.closest?.('[data-agents-project]'); - const box = select && document.querySelector('[data-agents-available]'); - if (!box || !agentsAvailable || !window.MosaicOrg) return; - agentsPick = { ...agentsPick, [window.MosaicOrg.id]: select.value }; - box.innerHTML = agentsAvailable(select.value); + const org = select?.dataset.agentsProject, draw = org && Object.hasOwn(agentsAvailable, org) ? agentsAvailable[org] : null; + const box = draw && select.closest('[data-org-agents]')?.querySelector('[data-agents-available]'); + if (!box) return; + agentsPick = { ...agentsPick, [org]: select.value }; + box.innerHTML = draw(select.value); }); // ---------- across organizations (U3: samples 02, 04 and 05) ---------- @@ -737,6 +742,6 @@ // U4b: the org mark (colour and initials) for the task board (tasks-board.js). const orgMark = Object.freeze({ ready: ensureThemes, av, colours, initials }); - window.MosaicWorkspace = Object.freeze({ dashboard, agentGrid, icon, orgMark, refresh: () => refresh(), home, projectsPage, inboxPage, setGrouping, get pollMs() { return pollMs; } }); + window.MosaicWorkspace = Object.freeze({ dashboard, agentGrid, icon, orgMark, refresh: () => refresh(), av, colours, label, state, dot, themes: ensureThemes, home, projectsPage, inboxPage, setGrouping, get pollMs() { return pollMs; } }); refresh(); })(); diff --git a/packages/webui/src/serve.mjs b/packages/webui/src/serve.mjs index dc7dc71bc..b17e8bc38 100644 --- a/packages/webui/src/serve.mjs +++ b/packages/webui/src/serve.mjs @@ -60,12 +60,12 @@ const files = new Map([ ['/', ['index.html', 'text/html; charset=utf-8']], ['/proxy.js', ['proxy.js', 'text/javascript; charset=utf-8']], ['/project-remote.js', ['project-remote.js', 'text/javascript; charset=utf-8']], - ...['app.js', 'brand.js', 'bus.js', 'markdown-preview.js', 'chat.js', 'project-archive.js', 'processing.js', 'agents.js', 'federation.js', 'requests.js', 'org-create.js', 'console-restart.js', 'onboarding.js', 'workspace-data.js', 'workspace.js', 'tasks-board.js'].map(f => ['/' + f, [f, 'text/javascript; charset=utf-8']]), + ...['app.js', 'brand.js', 'bus.js', 'markdown-preview.js', 'chat.js', 'project-archive.js', 'processing.js', 'agents.js', 'federation.js', 'requests.js', 'org-create.js', 'console-restart.js', 'onboarding.js', 'workspace-data.js', 'workspace.js', 'tasks-board.js', 'panes.js'].map(f => ['/' + f, [f, 'text/javascript; charset=utf-8']]), ['/files.js', ['files.js', 'text/javascript; charset=utf-8']], ['/projects.js', ['projects.js', 'text/javascript; charset=utf-8']], ['/projects.css', ['projects.css', 'text/css; charset=utf-8']], ['/files.css', ['files.css', 'text/css; charset=utf-8']], - ...['shared/app.css', 'tokens.css', 'console.css', 'live.css', 'bus.css', 'shell.css', 'chat.css', 'project-archive.css', 'processing.css', 'org-create.css', 'onboarding.css', 'tasks-board.css'].map(f => ['/' + f, [f, 'text/css; charset=utf-8']]), + ...['shared/app.css', 'tokens.css', 'console.css', 'live.css', 'bus.css', 'shell.css', 'chat.css', 'project-archive.css', 'processing.css', 'org-create.css', 'onboarding.css', 'tasks-board.css', 'panes.css'].map(f => ['/' + f, [f, 'text/css; charset=utf-8']]), ['/display.js', ['display.js', 'text/javascript; charset=utf-8']], ['/inbox.js', ['inbox.js', 'text/javascript; charset=utf-8']], ['/inbox.css', ['inbox.css', 'text/css; charset=utf-8']], diff --git a/packages/webui/tests/browser.test.mjs b/packages/webui/tests/browser.test.mjs index 3c8137792..1d1a77b5c 100644 --- a/packages/webui/tests/browser.test.mjs +++ b/packages/webui/tests/browser.test.mjs @@ -18,8 +18,8 @@ test('served Console browser: real board fixtures, keyboard, drafts, receipts, t assert.equal(await b.evaluate('document.querySelector("#session-count").textContent'), '3 of 4'); await b.evaluate('document.querySelector("#hide-offline").click()'); assert.equal(await b.evaluate('document.querySelectorAll("table.sessions tbody tr").length'), 4); - // Rows 129, 154, 191, 194 and 294: chat.js, editor.js, processing.js, agents.js and federation.js are the scripts added, and #1839 adds requests.js (the intake panel under an owner's chat message), all same origin; the list is the pin, so another script is a visible change. #797 adds project-archive.js immediately after chat.js. F2 adds onboarding.js after org-create.js, and F3 adds console-restart.js after it. U2 (#1873) adds workspace-data.js and workspace.js before console-restart.js, and U4b adds tasks-board.js after workspace.js. - assert.deepEqual(await b.evaluate('[...document.querySelectorAll("script")].map(s => s.getAttribute("src"))'), ['/editor.js', '/processing.js', '/org-create.js', '/onboarding.js', '/workspace-data.js', '/workspace.js', '/tasks-board.js', '/console-restart.js', '/display.js', '/inbox.js', '/files.js', '/project-remote.js', '/federation.js', '/brand.js', '/app.js', '/markdown-preview.js', '/projects.js', '/chat.js', '/project-archive.js', '/agents.js', '/bus.js', '/requests.js']); + // Rows 129, 154, 191, 194 and 294: chat.js, editor.js, processing.js, agents.js and federation.js are the scripts added, and #1839 adds requests.js (the intake panel under an owner's chat message), all same origin; the list is the pin, so another script is a visible change. #797 adds project-archive.js immediately after chat.js. F2 adds onboarding.js after org-create.js, and F3 adds console-restart.js after it. U2 (#1873) adds workspace-data.js and workspace.js before console-restart.js, and U4b adds tasks-board.js after workspace.js. U5 (#1873) adds panes.js (Side by side) just before bus.js, which mounts it. + assert.deepEqual(await b.evaluate('[...document.querySelectorAll("script")].map(s => s.getAttribute("src"))'), ['/editor.js', '/processing.js', '/org-create.js', '/onboarding.js', '/workspace-data.js', '/workspace.js', '/tasks-board.js', '/console-restart.js', '/display.js', '/inbox.js', '/files.js', '/project-remote.js', '/federation.js', '/brand.js', '/app.js', '/markdown-preview.js', '/projects.js', '/chat.js', '/project-archive.js', '/agents.js', '/panes.js', '/bus.js', '/requests.js']); assert.equal(await b.evaluate(`document.querySelectorAll('script[src="/processing.js"]').length`), 1); assert.equal(await b.evaluate(`document.querySelectorAll('script[src="/chat.js"]').length`), 1); assert.equal(await b.evaluate('!!window.injected'), false); diff --git a/packages/webui/tests/side-by-side-browser.test.mjs b/packages/webui/tests/side-by-side-browser.test.mjs new file mode 100644 index 000000000..24ba0e277 --- /dev/null +++ b/packages/webui/tests/side-by-side-browser.test.mjs @@ -0,0 +1,201 @@ +// U5 (#1873, sample 07): Side by side shows two panes, each holding one page of any organization. +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { startServer } from '../src/serve.mjs'; +import { createDevOwner } from '../src/dev-owner.mjs'; +import { browser } from './browser.mjs'; +import { close } from './fixture.mjs'; + +const waitFor = b => expression => b.evaluate(`(async()=>{for(let i=0;i<200;i++){if(${expression})return;await new Promise(r=>setTimeout(r,30))}throw Error(${JSON.stringify(expression)})})()`); + +// Three organizations: two running buses and one stopped (home). `state.flip` changes what the +// running organizations report, so a refresh repaints both panes. +function orgs(state = { flip: false, seen: [] }) { + const ORGS = [ + { id: 'ddigital', label: 'Distinctly Digital', theme: 'rosewood', busHealthy: true }, + { id: 'forge', label: 'Forge', theme: 'cobalt', busHealthy: true }, + { id: 'home', label: 'Home', theme: 'grove', busHealthy: false }, + ]; + const PROJECTS = { ddigital: [{ id: 'spring-launch', name: 'Spring launch' }, { id: 'brand-refresh', name: 'Brand refresh' }], forge: [{ id: 'api-gateway', name: 'API gateway' }], home: [] }; + const INSTANCES = { ddigital: ['chief', 'copywriter', 'producer', 'editor', 'researcher', 'designer', 'analyst', 'scheduler'], forge: ['chief', 'builder', 'tester', 'reviewer', 'operator', 'scribe'] }; + const THREADS = { ddigital: [{ id: 't0', name: 'Kickoff notes', project: 'spring-launch', instance: 'chief' }, { id: 't1', name: 'Launch email', project: 'spring-launch', instance: 'copywriter' }], forge: [{ id: 'f0', name: 'Gateway auth', project: 'api-gateway', instance: 'chief' }] }; + const instances = id => ({ business: id, revision: 'a'.repeat(64), launch: true, noHire: [], retired: [], definitions: {}, + instances: Object.fromEntries(INSTANCES[id].map((n, i) => [n, { definition: n, vars: {}, launched: true, launcher: false, protected: false, kept: false, running: [`r${i}`], alive: [] }])) }); + const agents = id => INSTANCES[id].map((role, i) => ({ role, holder_run: `r${i}`, state: (i % 2 === 0) === state.flip ? 'working' : 'waiting' })); + const business = id => ({ business: { id, human: 'jason', arbiters: ['chief'], projects: PROJECTS[id].map(p => p.id), vars: {}, instances: INSTANCES[id].map(n => ({ instance: n, vars: {} })), appearance: { theme: ORGS.find(o => o.id === id).theme } } }); + return { + list: async () => ORGS, + resolve: async id => { + state.seen.push(id); + const org = ORGS.find(o => o.id === id); if (!org) return null; + if (!org.busHealthy) return { busHealthy: false, reads: null, bus: {}, chat: { projects: async () => [], threads: async () => [] } }; + return { + busHealthy: true, + reads: { business: async () => business(id), settings: async () => ({ release: '0.0.42', launch: { limits: { total: 4 } } }), queue: async () => ({ rows: [] }), busStatus: async () => ({}) }, + bus: { instances: async () => instances(id), messages: async () => ({ messages: [], unread: 0 }), agents: async () => agents(id), 'thread.claims': async () => [], inbox: async () => [], tasks: async () => [] }, + chat: { projects: async () => PROJECTS[id], threads: async () => THREADS[id] }, + projectFiles: async () => ({ head: 'a'.repeat(40), files: [] }), + }; + }, + }; +} + +async function open(t, { width = 1440, height = 900, hash = '#/orgs/ddigital/side-by-side', state } = {}) { + const server = await startServer({ port: 0, sso: createDevOwner(), organizations: orgs(state), log: () => {} }); t.after(() => close(server)); + const b = await browser({ machine: false }); t.after(() => b.close()); + await b.viewport(width, height); + const base = `http://127.0.0.1:${server.address().port}/`; + await b.navigate(base + hash); + return { b, base, wait: waitFor(b) }; +} +const text = key => `(document.querySelector("#pane-${key} [data-pane-body]")?.innerText || "")`; +const title = key => `(document.querySelector("#pane-${key} [data-pane-ttl]")?.textContent || "")`; +const query = '(() => Object.fromEntries(new URLSearchParams(location.hash.split("?")[1] || "")))()'; +const pick = (b, key, value) => b.evaluate(`(() => { const s = document.querySelector("#pane-${key}-pick"); s.value = ${JSON.stringify(value)}; if (s.value !== ${JSON.stringify(value)}) throw Error("no option " + ${JSON.stringify(value)}); s.dispatchEvent(new Event("change", { bubbles: true })); })()`); + +test('the Side by side nav item opens two panes with different organizations, and the URL restores both after a reload', async t => { + const state = { flip: false, seen: [] }; + const { b, base, wait } = await open(t, { hash: '#/orgs/ddigital/organization', state }); + await wait('document.querySelector("[data-org-dashboard]")'); + await b.evaluate('[...document.querySelectorAll("#sections > li > a")].find(a => a.textContent.trim() === "Side by side").click()'); + await wait(`document.querySelectorAll(".panes > .pane:not([hidden])").length === 2 && ${title('a')}.includes("Distinctly Digital") && ${title('b')}.includes("Forge")`); + assert.doesNotMatch(await b.evaluate('document.getElementById("bus-view").innerText'), /Side by side is not built yet/i); + assert.equal(await b.evaluate('document.querySelector("#bus-view h1").textContent'), 'Side by side'); + assert.equal(await b.evaluate('document.title'), 'Side by side · Mosaic Console'); + assert.deepEqual(await b.evaluate(query), { a: 'ddigital/organization', b: 'forge/organization', w: '50', show: 'a' }); + await wait(`${text('a')}.includes("Distinctly Digital") && ${text('b')}.includes("Forge")`); + // Each pane's links name its own organization. + assert.equal(await b.evaluate('[...document.querySelectorAll("#pane-b [data-pane-body] a[href^=\\"#/\\"]")].every(a => a.getAttribute("href").startsWith("#/orgs/forge/"))'), true); + assert.equal(await b.evaluate('document.querySelectorAll("#pane-a [data-pane-body] h1[aria-level=\\"2\\"]").length > 0'), true); + // The picker lists every organization and its projects. + const groups = await b.evaluate('[...document.querySelectorAll("#pane-b-pick optgroup")].map(g => g.label)'); + assert.deepEqual(groups, ['Distinctly Digital', 'Forge', 'Home · bus unavailable']); + assert.deepEqual(await b.evaluate('[...document.querySelectorAll("#pane-b-pick option")].map(o => o.value).filter(Boolean)'), + ['ddigital/organization', 'ddigital/agents', 'ddigital/projects/spring-launch', 'ddigital/projects/brand-refresh', 'forge/organization', 'forge/agents', 'forge/projects/api-gateway', 'home/organization', 'home/agents']); + // Pick a project in the right pane; the left keeps its page. + await pick(b, 'b', 'forge/projects/api-gateway'); + await wait(`${title('b')}.startsWith("API gateway") && ${text('b')}.includes("API gateway") && location.hash.includes("b=forge/projects/api-gateway")`); + assert.match(await b.evaluate(title('a')), /^Dashboard/); + // A project tab opens in the pane, not the full view. + await b.evaluate('[...document.querySelectorAll("#pane-b nav.project-tabs a")].find(a => /Tasks/.test(a.textContent)).click()'); + await wait(`location.hash.includes("b=forge/projects/api-gateway/tasks") && ${title('b')}.includes("Tasks")`); + assert.match(await b.evaluate('location.hash'), /^#\/orgs\/ddigital\/side-by-side\?/); + // Reload: both panes come back from the URL. + await b.call('Page.reload'); + await wait('document.readyState === "complete"'); + await wait(`${title('a')}.startsWith("Dashboard") && ${title('a')}.includes("Distinctly Digital") && ${title('b')}.includes("API gateway") && ${title('b')}.includes("Tasks")`); + assert.deepEqual(await b.evaluate(query), { a: 'ddigital/organization', b: 'forge/projects/api-gateway/tasks', w: '50', show: 'a' }); + // A shared link opens exactly what it names, whatever this browser remembered. + await b.navigate(`${base}#/orgs/forge/side-by-side?a=forge/agents&b=ddigital/projects/spring-launch&w=40&show=b`); + await wait(`${title('a')}.startsWith("Agents") && ${title('a')}.includes("Forge") && ${title('b')}.startsWith("Spring launch")`); + assert.equal(await b.evaluate('document.querySelector("[data-sbs-divider]").getAttribute("aria-valuenow")'), '40'); + // A link with a route a pane does not draw falls back to the remembered layout or the default. + await b.navigate(`${base}#/orgs/ddigital/side-by-side?a=ddigital/settings&b=nope!/organization`); + await wait(`document.querySelectorAll(".panes > .pane:not([hidden])").length === 2 && ${title('a')}.length > 0 && !location.hash.includes("settings")`); + // Leaving the page stops both panes reading. + await b.evaluate('location.hash = "#/orgs/ddigital/agents"'); + await wait('!document.querySelector("[data-side-by-side]") && [...document.querySelectorAll("#bus-view h1")].some(h => h.textContent.trim() === "Agents")'); + assert.ok(state.seen.includes('forge') && state.seen.includes('ddigital')); +}); + +test('the divider resizes the panes by mouse and by keyboard', async t => { + const { b, wait } = await open(t); + await wait(`${title('a')}.length > 0 && ${title('b')}.length > 0`); + const sep = '[role=separator][data-sbs-divider]'; + assert.deepEqual(await b.evaluate(`(() => { const d = document.querySelector("${sep}"); return [d.getAttribute("aria-valuenow"), d.getAttribute("aria-valuemin"), d.getAttribute("aria-valuemax"), d.getAttribute("aria-orientation"), d.tabIndex]; })()`), ['50', '25', '75', 'vertical', 0]); + const ratio = `(() => { const a = document.getElementById("pane-a").getBoundingClientRect().width, b = document.getElementById("pane-b").getBoundingClientRect().width; return Math.round(a / (a + b) * 100); })()`; + // Mouse: drag the divider to 30% of the panes' width. + const box = await b.evaluate(`(() => { const p = document.querySelector("[data-sbs-panes]").getBoundingClientRect(), d = document.querySelector("${sep}").getBoundingClientRect(); return { left: p.left, width: p.width, x: d.left + d.width / 2, y: d.top + 200 }; })()`); + const target = box.left + box.width * 0.3; + await b.call('Input.dispatchMouseEvent', { type: 'mouseMoved', x: box.x, y: box.y }); + await b.call('Input.dispatchMouseEvent', { type: 'mousePressed', x: box.x, y: box.y, button: 'left', buttons: 1, clickCount: 1 }); + for (const step of [0.25, 0.5, 0.75, 1]) await b.call('Input.dispatchMouseEvent', { type: 'mouseMoved', x: box.x + (target - box.x) * step, y: box.y, button: 'left', buttons: 1 }); + await b.call('Input.dispatchMouseEvent', { type: 'mouseReleased', x: target, y: box.y, button: 'left', buttons: 0, clickCount: 1 }); + await wait(`document.querySelector("${sep}").getAttribute("aria-valuenow") === "30" && location.hash.includes("w=30")`); + assert.ok(Math.abs(await b.evaluate(ratio) - 30) <= 1); + // Keyboard: the separator has focus after the drag; arrows step by 5, Home and End reach the limits. + assert.equal(await b.evaluate('document.activeElement.getAttribute("role")'), 'separator'); + await b.call('Input.dispatchKeyEvent', { type: 'keyDown', key: 'ArrowRight', code: 'ArrowRight', windowsVirtualKeyCode: 39 }); + await b.call('Input.dispatchKeyEvent', { type: 'keyUp', key: 'ArrowRight', code: 'ArrowRight', windowsVirtualKeyCode: 39 }); + await wait(`document.querySelector("${sep}").getAttribute("aria-valuenow") === "35"`); + await b.call('Input.dispatchKeyEvent', { type: 'keyDown', key: 'ArrowLeft', code: 'ArrowLeft', windowsVirtualKeyCode: 37 }); + await b.call('Input.dispatchKeyEvent', { type: 'keyUp', key: 'ArrowLeft', code: 'ArrowLeft', windowsVirtualKeyCode: 37 }); + await b.call('Input.dispatchKeyEvent', { type: 'keyDown', key: 'ArrowLeft', code: 'ArrowLeft', windowsVirtualKeyCode: 37 }); + await b.call('Input.dispatchKeyEvent', { type: 'keyUp', key: 'ArrowLeft', code: 'ArrowLeft', windowsVirtualKeyCode: 37 }); + await wait(`document.querySelector("${sep}").getAttribute("aria-valuenow") === "25"`); + await b.call('Input.dispatchKeyEvent', { type: 'keyDown', key: 'ArrowLeft', code: 'ArrowLeft', windowsVirtualKeyCode: 37 }); + await b.call('Input.dispatchKeyEvent', { type: 'keyUp', key: 'ArrowLeft', code: 'ArrowLeft', windowsVirtualKeyCode: 37 }); + assert.equal(await b.evaluate(`document.querySelector("${sep}").getAttribute("aria-valuenow")`), '25'); + await b.call('Input.dispatchKeyEvent', { type: 'keyDown', key: 'End', code: 'End', windowsVirtualKeyCode: 35 }); + await b.call('Input.dispatchKeyEvent', { type: 'keyUp', key: 'End', code: 'End', windowsVirtualKeyCode: 35 }); + await wait(`document.querySelector("${sep}").getAttribute("aria-valuenow") === "75" && location.hash.includes("w=75")`); + assert.ok(Math.abs(await b.evaluate(ratio) - 75) <= 1); + // Closing a pane goes back to one; the divider leaves with it. Add pane brings a second back. + await b.evaluate('document.querySelector("#pane-a [data-pane-close]").click()'); + await wait(`document.getElementById("pane-b").hidden && document.querySelector("${sep}").hidden && !new URLSearchParams(location.hash.split("?")[1]).has("b") && ${title('a')}.includes("Forge")`); + assert.equal(await b.evaluate('document.activeElement.id'), 'pane-a-pick'); + assert.equal(await b.evaluate('document.querySelector("#pane-a [data-pane-close]").hidden'), true); + assert.match(await b.evaluate('document.querySelector("[data-sbs-note]").textContent'), /^1 pane ·/); + await b.evaluate('document.querySelector("[data-pane-add]").click()'); + await wait(`!document.getElementById("pane-b").hidden && ${title('b')}.length > 0 && new URLSearchParams(location.hash.split("?")[1]).has("b")`); + assert.equal(await b.evaluate('document.querySelector("[data-pane-add]").disabled'), true); +}); + +test('each pane keeps its own focus and scroll through a refresh', async t => { + const state = { flip: false, seen: [] }; + const { b, wait } = await open(t, { height: 520, state, hash: '#/orgs/ddigital/side-by-side?a=ddigital/agents&b=forge/agents' }); + await wait(`${text('a')}.includes("copywriter") && ${text('b')}.includes("builder")`); + const scrollable = await b.evaluate('[...document.querySelectorAll("[data-pane-body]")].map(el => el.scrollHeight - el.clientHeight)'); + assert.ok(scrollable.every(n => n > 60), `both panes scroll: ${scrollable}`); + const focused = await b.evaluate('(() => { const a = document.querySelector("#pane-a [data-pane-body] a[href]"); a.focus(); return a.getAttribute("href"); })()'); + await b.evaluate('document.querySelector("#pane-a [data-pane-body]").scrollTop = 40; document.querySelector("#pane-b [data-pane-body]").scrollTop = 60;'); + const before = await b.evaluate(`[${text('a')}, ${text('b')}]`); + state.flip = true; + await b.evaluate('document.getElementById("refresh").click()'); + await wait(`${text('a')} !== ${JSON.stringify(before[0])} && ${text('b')} !== ${JSON.stringify(before[1])}`); + assert.equal(await b.evaluate('document.querySelector("#pane-a").contains(document.activeElement) && document.activeElement.getAttribute("href")'), focused); + assert.deepEqual(await b.evaluate('[...document.querySelectorAll("[data-pane-body]")].map(el => el.scrollTop)'), [40, 60]); + // Focus in the right pane stays there while the left repaints. + const right = await b.evaluate('(() => { const a = document.querySelector("#pane-b [data-pane-body] a[href]"); a.focus({ preventScroll: true }); return a.getAttribute("href"); })()'); + state.flip = false; + await b.evaluate('document.getElementById("refresh").click()'); + await wait(`${text('a')} === ${JSON.stringify(before[0])}`); + assert.equal(await b.evaluate('document.querySelector("#pane-b").contains(document.activeElement) && document.activeElement.getAttribute("href")'), right); + assert.deepEqual(await b.evaluate('[...document.querySelectorAll("[data-pane-body]")].map(el => el.scrollTop)'), [40, 60]); +}); + +test('a pane whose organization is down shows its state and the other pane still works', async t => { + const { b, wait } = await open(t, { hash: '#/orgs/ddigital/side-by-side?a=home/organization&b=forge/organization' }); + await wait(`${title('a')}.includes("Home") && ${title('b')}.includes("Forge") && ${text('b')}.includes("Forge")`); + await wait('/Home: bus unavailable/.test(document.querySelector("#pane-a [data-pane-line]").textContent)'); + assert.equal(await b.evaluate('document.querySelector("#pane-a [data-pane-line]").getAttribute("role")'), 'status'); + assert.equal(await b.evaluate('document.querySelector("#pane-a [data-pane-state]").innerText.trim().length > 0'), true); + assert.equal(await b.evaluate('document.querySelector("#pane-b [data-pane-line]").hidden'), true); + await pick(b, 'b', 'forge/agents'); + await wait(`${title('b')}.startsWith("Agents") && ${text('b')}.includes("builder")`); + await pick(b, 'b', 'forge/projects/api-gateway'); + await wait(`${title('b')}.startsWith("API gateway") && ${text('b')}.includes("API gateway")`); + assert.match(await b.evaluate(title('a')), /Home/); + // An organization that is not on the list is one honest line; nothing is read for it. + await b.evaluate('location.hash = "#/orgs/ddigital/side-by-side?a=ghost/organization&b=forge/agents"'); + await wait(`/ghost is not on your organization list/.test(document.querySelector("#pane-a [data-pane-line]").textContent) && ${text('b')}.includes("builder")`); +}); + +test('on a phone one pane shows at a time, switched from the bar, with no horizontal scroll', async t => { + const { b, wait } = await open(t, { width: 390, height: 844 }); + await wait(`${title('a')}.length > 0 && ${title('b')}.length > 0 && ${text('a')}.length > 0`); + const visible = '[...document.querySelectorAll(".panes > .pane")].filter(p => p.getBoundingClientRect().height > 0).map(p => p.id)'; + assert.deepEqual(await b.evaluate(visible), ['pane-a']); + assert.notEqual(await b.evaluate('getComputedStyle(document.querySelector("[data-sbs-tabs]")).display'), 'none'); + assert.equal(await b.evaluate('getComputedStyle(document.querySelector("[data-sbs-divider]")).display'), 'none'); + assert.equal(await b.evaluate('getComputedStyle(document.querySelector("[data-pane-add]")).display'), 'none'); + assert.deepEqual(await b.evaluate('[...document.querySelectorAll("[data-sbs-tabs] button")].map(x => x.getAttribute("aria-pressed"))'), ['true', 'false']); + assert.ok(await b.evaluate('document.documentElement.scrollWidth <= innerWidth'), 'no horizontal scroll'); + await b.evaluate('document.querySelector("[data-sbs-tabs] [data-pane-show=b]").click()'); + await wait(`JSON.stringify(${visible}) === '["pane-b"]' && location.hash.includes("show=b")`); + assert.deepEqual(await b.evaluate('[...document.querySelectorAll("[data-sbs-tabs] button")].map(x => x.getAttribute("aria-pressed"))'), ['false', 'true']); + assert.ok(await b.evaluate('document.documentElement.scrollWidth <= innerWidth'), 'no horizontal scroll on the second pane'); + await pick(b, 'b', 'ddigital/projects/spring-launch'); + await wait(`${text('b')}.includes("Spring launch")`); + assert.ok(await b.evaluate('document.documentElement.scrollWidth <= innerWidth'), 'no horizontal scroll on a project page'); +}); diff --git a/packages/webui/tests/unified-workspace-browser.test.mjs b/packages/webui/tests/unified-workspace-browser.test.mjs index 793f011d4..178aad6f9 100644 --- a/packages/webui/tests/unified-workspace-browser.test.mjs +++ b/packages/webui/tests/unified-workspace-browser.test.mjs @@ -110,13 +110,8 @@ test('sidebar follows sample 01 and Queue opens from the organization dashboard, assert.equal(queue, '#/queue'); await b.evaluate('document.querySelector("[data-org-queue]").click()'); await wait('location.hash === "#/orgs/ddigital/queue" && [...document.querySelectorAll("#bus-view h1")].some(h => h.textContent.trim() === "Queue")'); - // Views not built yet open and say so. - // Inbox (U3, workspace-pages-browser.test.mjs) and Tasks (U4b, tasks-board-browser.test.mjs) are built. - for (const [route, title] of [['side-by-side', 'Side by side']]) { - await b.evaluate(`location.hash = "#/orgs/ddigital/${route}"`); - await wait(`document.getElementById("bus-view").innerText.includes("not built yet") && [...document.querySelectorAll("#bus-view h1")].some(h => h.textContent.trim() === ${JSON.stringify(title)})`); - assert.doesNotMatch(await b.evaluate('document.getElementById("bus-view").innerText'), /error|failed/i, route); - } + // Every sidebar view is built: Inbox (U3, workspace-pages-browser.test.mjs), Tasks (U4b, + // tasks-board-browser.test.mjs) and Side by side (U5, side-by-side-browser.test.mjs). }); test('organization dashboard renders every section from the per-organization reads', async t => {