jason.woltje
068d868a99
Unclaimed files left in the canonical checkout. Inventory: canonical-cleanup-inventory.md (commit-as-evidence groups). detect-secrets scan clean on 2026-11-02: hits are sha256 pins, git object ids, test sentinels already in tracked tests and unit-file lines.
96 lines
9.0 KiB
Diff
96 lines
9.0 KiB
Diff
diff --git a/packages/webui/src/public/bus.js b/packages/webui/src/public/bus.js
|
|
index 4a2d0c5fe..5743514e0 100644
|
|
--- a/packages/webui/src/public/bus.js
|
|
+++ b/packages/webui/src/public/bus.js
|
|
@@ -239,7 +239,7 @@
|
|
// ---------------------------------------------------------------- views
|
|
let inboxCount = null, messageCount = null;
|
|
function sections(route) {
|
|
- const items = [['/', 'Board', '', 'board'], ['/inbox', 'Inbox', inboxCount ? `<span class="count" aria-label="${inboxCount.open} open for you">${inboxCount.open}</span>${inboxCount.blocking ? ` ${blockChip(`${inboxCount.blocking} blocking`)}` : ''}` : '', 'inbox'], ['/messages', 'Messages', messageCount === null ? '' : `<span class="count" aria-label="${messageCount} unread messages">${messageCount}</span>`, 'inbox'], ['/tasks', 'Tasks', '', 'tasks'], ['/agents', 'Agents', '', 'agents'], ['/queue', 'Queue', '', 'queue'], ['/business', 'Business', '', 'business'], ['/docs', 'Docs', '', 'library'], ['/settings', 'Settings', '', 'settings']];
|
|
+ const items = [['/', 'Board', '', 'board'], ['/inbox', 'Inbox', inboxCount ? `<span class="count" aria-label="${inboxCount.open} open for you">${inboxCount.open}</span>${inboxCount.blocking ? ` ${blockChip(`${inboxCount.blocking} blocking`)}` : ''}` : '', 'inbox'], ['/chat', 'Chat', '', 'inbox'], ['/messages', 'Messages', messageCount === null ? '' : `<span class="count" aria-label="${messageCount} unread messages">${messageCount}</span>`, 'inbox'], ['/tasks', 'Tasks', '', 'tasks'], ['/agents', 'Agents', '', 'agents'], ['/queue', 'Queue', '', 'queue'], ['/business', 'Business', '', 'business'], ['/docs', 'Docs', '', 'library'], ['/settings', 'Settings', '', 'settings']];
|
|
$('sections').innerHTML = items.map(([h, l, extra, icon]) => {
|
|
const cur = h === '/' ? route === '/' : route.startsWith(h) || (h === '/tasks' && route.startsWith('/trail/task')) || (h === '/inbox' && (route.startsWith('/trail/decision') || route.startsWith('/trail/message')));
|
|
return `<li><a href="#${h}" class="s1-section"${cur ? ' aria-current="page"' : ''}><svg class="i" aria-hidden="true"><use href="/icons.svg#i-${icon}"/></svg>${l}${extra ? ` ${extra}` : ''}</a></li>`;
|
|
@@ -771,7 +771,7 @@
|
|
// A refusal fails closed: no kept data, the code in mono. Any other failure keeps the last read, labelled with its time.
|
|
const refusal = err => err.status === 403 || ['not-configured', 'no-bus-host', 'queue-refused'].includes(err.code);
|
|
// After a refusal nothing read before is shown anywhere: not in a view, the palette or the Inbox count.
|
|
- function forget() { last.clear(); inboxCount = null; messageCount = null; }
|
|
+ function forget() { window.MosaicChat?.forget(); last.clear(); inboxCount = null; messageCount = null; }
|
|
const failedView = err => `${head(failTitle(err))}<div class="banner ${refusal(err) ? 'ref' : 'err'}" role="alert"><p>${refusal(err) ? `<b>refused: <code>${txt(err.code)}</code>.</b> ` : ''}${why(err)} Console shows nothing rather than a guess. Nothing was written.</p>${retry}</div>${empty('Nothing to show.', refusal(err) ? 'The view stays empty until the problem above is fixed.' : err.module ? 'Read again.' : 'Read again, or come back when the bus answers.')}`;
|
|
const staleBanner = err => `<div class="banner err s1-stale" role="alert"><p><b>The last read failed.</b> ${why(err)} This is what was read before, ${when(readAt)}. Nothing was changed.</p>${retry}</div>`;
|
|
// Freshness line in the command bar for bus pages.
|
|
@@ -840,6 +840,12 @@
|
|
document.body.classList.toggle('on-bus', !board);
|
|
$('bus-view').hidden = board;
|
|
sections(path);
|
|
+ window.MosaicChat?.leave(path);
|
|
+ if (path === '/chat' || path.startsWith('/chat/')) {
|
|
+ await window.MosaicChat.render({ path, container: $('bus-view'), canSend, navigated });
|
|
+ if (g !== gen || out()) return;
|
|
+ shown = route; schedule(); return;
|
|
+ }
|
|
if (board) {
|
|
// The board page keeps its own title; the Inbox count still follows the bus.
|
|
if (shown !== null) { shown = null; $('bus-view').innerHTML = ''; document.title = 'Mosaic Console'; if (navigated) $('main').focus(); }
|
|
@@ -933,7 +939,7 @@
|
|
// Ctrl+K opens it. It lists the views, and the decisions and tasks from the last inbox and
|
|
// tasks reads (opening it reads both again, GET only). Enter goes; Esc closes and puts focus
|
|
// back where it was. It only navigates.
|
|
- const VIEWS = [['#/', 'Board'], ['#/inbox', 'Inbox'], ['#/messages', 'Messages'], ['#/tasks', 'Tasks'], ['#/agents', 'Agents'], ['#/queue', 'Queue'], ['#/business', 'Business'], ['#/docs', 'Docs'], ['#/settings', 'Settings']];
|
|
+ const VIEWS = [['#/', 'Board'], ['#/chat', 'Chat'], ['#/inbox', 'Inbox'], ['#/messages', 'Messages'], ['#/tasks', 'Tasks'], ['#/agents', 'Agents'], ['#/queue', 'Queue'], ['#/business', 'Business'], ['#/docs', 'Docs'], ['#/settings', 'Settings']];
|
|
let pkAll = [], pkShown = [], pkAt = 0, pkBack = null;
|
|
function pkItems() {
|
|
const decisions = (last.get('inbox')?.rows || []).map(d => ({ href: `#/inbox/${enc(d.id)}`, label: first(d.question), group: `decision ${short(d.id)}` }));
|
|
@@ -1031,7 +1037,7 @@
|
|
if (c?.send !== true) return;
|
|
canSend = true;
|
|
const path = routeOf().split('?')[0];
|
|
- if (path.startsWith('/inbox')||path==='/settings'||path.startsWith('/docs/')) render(false); else if (path === '/' || path === '') paintHeld(heldErr);
|
|
+ if (path.startsWith('/chat')||path.startsWith('/inbox')||path==='/settings'||path.startsWith('/docs/')) render(false); else if (path === '/' || path === '') paintHeld(heldErr);
|
|
}).catch(() => {});
|
|
window.addEventListener('hashchange', () => render(true));
|
|
$('refresh').addEventListener('click', () => render(false));
|
|
diff --git a/packages/webui/src/serve.mjs b/packages/webui/src/serve.mjs
|
|
index 7c5e74a3c..eb1914135 100644
|
|
--- a/packages/webui/src/serve.mjs
|
|
+++ b/packages/webui/src/serve.mjs
|
|
@@ -4,6 +4,7 @@ import { resolve } from 'node:path';
|
|
import { isIP } from 'node:net';
|
|
import { BusReadError, busStatus, subjectOk, sendOutcome } from './bus.mjs';
|
|
import { ReadError, readStatus, fieldTable } from './reads.mjs';
|
|
+import { chatHTTP } from './chat-http.mjs';
|
|
|
|
export const DEFAULT_BOARD = 'http://127.0.0.1:7331';
|
|
export function isLoopback(host) {
|
|
@@ -21,8 +22,8 @@ export function boardURL(value) {
|
|
const root = resolve(import.meta.dirname, 'public');
|
|
const files = new Map([
|
|
['/', ['index.html', 'text/html; charset=utf-8']],
|
|
- ...['app.js', 'brand.js', 'bus.js', 'markdown-preview.js'].map(f => ['/' + f, [f, 'text/javascript; charset=utf-8']]),
|
|
- ...['shared/app.css', 'tokens.css', 'console.css', 'live.css', 'bus.css', 'shell.css'].map(f => ['/' + f, [f, 'text/css; charset=utf-8']]),
|
|
+ ...['app.js', 'brand.js', 'bus.js', 'markdown-preview.js', 'chat.js'].map(f => ['/' + f, [f, 'text/javascript; charset=utf-8']]),
|
|
+ ...['shared/app.css', 'tokens.css', 'console.css', 'live.css', 'bus.css', 'shell.css', 'chat.css'].map(f => ['/' + f, [f, 'text/css; charset=utf-8']]),
|
|
['/icons.svg', ['icons.svg', 'image/svg+xml']],
|
|
...[400, 500, 600, 700].map(w => [`/assets/fonts/manrope-${w}.woff2`, [`assets/fonts/manrope-${w}.woff2`, 'font/woff2']]),
|
|
...[400, 500, 700].map(w => [`/assets/fonts/jetbrains-mono-${w}.woff2`, [`assets/fonts/jetbrains-mono-${w}.woff2`, 'font/woff2']]),
|
|
@@ -261,7 +262,7 @@ async function projectFileRead(res, read, path, search) {
|
|
// `send` is the bus write (row 76): `args => Promise<{id}>`, only with the preview mode. `log`
|
|
// takes one line per send attempt that got past sign-in; never the body. `fieldsFile` is for
|
|
// tests; the field table is otherwise the committed packages/tasks/fields.json.
|
|
-export async function startServer({ host = '127.0.0.1', port = 7330, board = DEFAULT_BOARD, timeout = 20000, bus = null, reads = null, preview = null, send = null, settingsWrite = null, projectFiles = null, projectFile = null, projectSave = null, log = line => console.log(line), fieldsFile = undefined } = {}) {
|
|
+export async function startServer({ host = '127.0.0.1', port = 7330, board = DEFAULT_BOARD, timeout = 20000, bus = null, reads = null, preview = null, send = null, settingsWrite = null, projectFiles = null, projectFile = null, projectSave = null, chat = null, log = line => console.log(line), fieldsFile = undefined } = {}) {
|
|
if (!isLoopback(host)) throw new Error('refusing to bind to non-loopback host');
|
|
if (host === 'localhost') host = '127.0.0.1';
|
|
const upstream = boardURL(board);
|
|
@@ -310,6 +311,9 @@ export async function startServer({ host = '127.0.0.1', port = 7330, board = DEF
|
|
if (req.method !== 'POST') return json(res, 405, { error: 'method not allowed' });
|
|
return busSend(req, res, { send, preview, log });
|
|
}
|
|
+ if (path === '/api/chat' || path.startsWith('/api/chat/')) {
|
|
+ return chatHTTP(req, res, { path, search, chat, named, send, preview, log });
|
|
+ }
|
|
// Nothing else but GET and HEAD gets past here in preview mode, whatever the Host.
|
|
if (preview !== null && req.method !== 'GET' && req.method !== 'HEAD') return json(res, 403, { error: 'read-only', message: 'the Console preview is read-only' });
|
|
// The conversation routes (#1507, CHAT-02) keep their query; the board validates it.
|