Compare commits

...
Author SHA1 Message Date
jason.woltje 2d44750b96 fix(webui): drawer polish review round 3 notes: with the runs not read and no claim, Last activity names the agents and claims reads, with a test for chief; the Project scroll test waits for the Projects page heading; a test comment matches the one of its runs wording (#1873, lane sp18-drawer-polish) 2026-11-18 11:26:45 -06:00
jason.woltje 9343baffff fix(webui): drawer polish review round 2: the kept scroll place is dropped as soon as the address leaves the page under the sheet, so a project or Assistant page that bus.js draws without afterPaint no longer leaves it for a later page; the scroll tests make every page long first and wait for the linked page's own content; Last activity says one of its N runs, and a run when the runs were not read (#1873, lane sp18-drawer-polish) 2026-11-18 11:18:18 -06:00
jason.woltje 38ea639d70 fix(webui): drawer polish review round: at 390 the page under the sheet goes back to its place only when the drawer closes onto that same page, so a link in the sheet opens its page at the top and a later page does not jump; Last activity counts a role or conversation claim only when the instances read lists its run as running, says when a running run holds nothing yet, and names the latest of several runs (#1873, lane sp18-drawer-polish) 2026-11-18 11:18:18 -06:00
jason.woltje fc558df31a fix(webui): drawer and page polish: at 390 the open agent sheet is the whole screen and the page under it no longer scrolls behind it, and Close puts the page back where it was; the drawer's Last activity is when the agent's current run took its role or conversation, from the claim time the workspace read already carries; the Dashboard's two columns line up with its tile row; the organization page's left column holds Autonomy and Starter packs; the workflows section() stub and its duplicate stopped panel are gone (#1873, lane sp18-drawer-polish) 2026-11-18 11:18:18 -06:00
jason.woltje 56cc7b59dd fix(seat,unslop-hook): review round: the linked fixed path test puts the stand-in's real path outside HOME so only its own guard refuses the source; the Stop hook's notes name the late-fallback turn a later Stop can check again and say a second Stop after a blocking hook waits and logs one late entry; the plugins README names the Perl, Ruby, less and resolver hooks and points to REFUSED_NAMES (#1873, lane triage-p3s) 2026-11-18 11:05:35 -06:00
jason.woltje c641dbfbc9 fix(webui): the triage snapshot reads every organization's bus and processing sockets at once and limits only the config checks, which start node children; the deadline tests count reads and use the injected clock instead of tight wall-clock margins (#1873, lane triage-p3s) 2026-11-18 10:52:53 -06:00
jason.woltje eb1146ebad fix(webui): a triage reply settles its entry only when it is the runner's RESULT answer; a progress note that names the message leaves it queued, so a session that dies after the note still reports it unanswered (#1873, lane triage-p3s) 2026-11-18 10:52:53 -06:00
jason.woltje 4b5d027361 fix(seat): hosted route fences P3s: realOr runs once per fixed path, a test hook adds a stand-in fixed path so a linked one is tested, the refuse list adds LUA_INIT, CURL_HOME and SSLKEYLOGFILE, and the plugins README names every refused suffix and hook (#1873, lane triage-p3s) 2026-11-18 10:52:53 -06:00
jason.woltje 80ce06851d fix(unslop-hook): the Stop hook records the last prompt it checked per session in <log>.stop.json and waits while the transcript still ends with that turn, so a Stop with no last_assistant_message, or one whose reply has the last turn's text, no longer checks the last turn as this one; the 2 s wait stays (#1873, lane triage-p3s) 2026-11-18 10:52:53 -06:00
20 changed files with 489 additions and 94 deletions

No files matched your search

+6 -2
View File
@@ -265,8 +265,12 @@ export returns:
`harnessEnv` name only when it is listed here and is not one the host
always refuses: `MOSAIC_*`, `NODE_*`, `LD_*`, `DYLD_*`, `PYTHON*`, `BASH_*`,
`GIT_*`, `MALLOC_*`, `NPM_CONFIG_*`, `XDG_*`, any name ending in `_DIR`,
`_CONF` or `_CONFIG`, PATH, HOME, TMPDIR, ENV, the founder's and the
provider's names, and named shell, proxy, libc, OpenSSL and Java hooks. `installRoots` lists the directories
`_CONF`, `_CONFIG`, `_ASKPASS`, `_CA_BUNDLE` or `_BASE_URL`, PATH, HOME,
TMPDIR, ENV, the founder's and the provider's names, and named shell,
proxy, resolver, libc, OpenSSL and Java hooks, Perl and Ruby start
options and library paths, less's input filters, Lua's start code,
curl's config home and a TLS key log. The full list is
`REFUSED_NAMES` in `packages/webui/src/triage-host.mjs`. `installRoots` lists the directories
where the adapter and the mounts live. A hosted adapter or mount source
must resolve inside one of them, and never in or around the data root,
the config directory, HOME, `/srv/mosaic` or a path with a `secret`
+14 -7
View File
@@ -232,25 +232,32 @@ const secretPath = (p) => p.split("/").some((seg) => /secret/i.test(seg));
const realOr = (p) => { try { return realpathSync(p); } catch { return p; } };
const plainObject = (o) => o !== null && typeof o === "object" && !Array.isArray(o) && [Object.prototype, null].includes(Object.getPrototypeOf(o));
export function checkHostedRoute({ adapter, harnessMounts, installRoots, protectedPaths, codeRoot = null, codeHolder = null, runDir, node = process.execPath }) {
// `alsoFixed` is a test hook: it adds stand-in fixed paths and never removes a shipped one.
export function checkHostedRoute({ adapter, harnessMounts, installRoots, protectedPaths, codeRoot = null, codeHolder = null, runDir, node = process.execPath, alsoFixed = [] }) {
if (!cleanPath(runDir)) refuseRoute("protected", "the run directory is not a clean absolute path");
if (!Array.isArray(protectedPaths)) refuseRoute("protected", "no protected paths were given");
if (!Array.isArray(alsoFixed)) refuseRoute("protected", "the added fixed paths are not a list");
// Lists are copied once, so a Proxy cannot answer one length to a check and another to the map.
protectedPaths = Array.from(protectedPaths);
// Each guarded entry: its spellings, and whether a source in the code root is clear of it. The
// fixed paths and the run dir never hold the code. Their spellings are looked up once, here, and
// serve both the code-root check and their guards, so the two always see the same real path.
const fixed = [...ALWAYS_PROTECTED, ...Array.from(alsoFixed), runDir].map((p) => {
if (!cleanPath(p)) refuseRoute("protected", "a protected path is not a clean absolute path");
return { spellings: [p, realOr(p)], holdsCode: false };
});
let code = null;
if (codeRoot !== null) {
if (!cleanPath(codeRoot)) refuseRoute("protected", "the code root is not a clean absolute path");
if (!protectedPaths.includes(codeHolder)) refuseRoute("protected", "the code root's holder is not a protected path");
code = [codeRoot, realOr(codeRoot)];
const fixed = [runDir, ...ALWAYS_PROTECTED].flatMap((g) => [g, realOr(g)]);
if (code.some((c) => fixed.some((g) => overlaps(c, g)))) refuseRoute("protected", "the code root is in or around a path that is never set aside");
if (code.some((c) => fixed.some((g) => g.spellings.some((s) => overlaps(c, s))))) refuseRoute("protected", "the code root is in or around a path that is never set aside");
}
// Each guarded entry: its spellings, and whether a source in the code root is clear of it.
const guarded = [];
for (const [p, mayHoldCode] of [...ALWAYS_PROTECTED.map((g) => [g, false]), ...protectedPaths.map((g) => [g, g === codeHolder]), [runDir, false]]) {
const guarded = [...fixed];
for (const p of protectedPaths) {
if (!cleanPath(p)) refuseRoute("protected", "a protected path is not a clean absolute path");
const spellings = [p, realOr(p)];
const holdsCode = mayHoldCode && code !== null && spellings.some((g) => code.some((c) => c !== g && within(c, g)));
const holdsCode = p === codeHolder && code !== null && spellings.some((g) => code.some((c) => c !== g && within(c, g)));
guarded.push({ spellings, holdsCode });
}
if (!Array.isArray(installRoots)) refuseRoute("roots", "the harness module declares no usable install roots");
+28
View File
@@ -177,6 +177,34 @@ test("a protected path that holds the code root (HOME over a copy or a worktree)
assert.throws(() => checkHostedRoute({ adapter: join(realRun, "code", "inst", "a.sh"), harnessMounts: [], installRoots: [join(realRun, "code", "inst")], protectedPaths: [p.dataRoot, home], codeRoot: join(realRun, "code"), codeHolder: home, runDir: join(p.root, "runlink") }), (e) => e.fence === "protected", "code root in the run dir's real path");
});
test("a fixed path named through a link: a code root in its real path is refused before any guard, and a source there is refused by its guard", async (t) => {
const p = await layout(t);
// None of the shipped fixed paths is a link on a test host, so the test hook adds a stand-in.
const home = join(p.root, "home");
// The real path lies outside HOME and the data root, so only the stand-in's own guard can refuse
// a source there.
const real = join(p.root, "fixedreal");
const inst = join(real, "code", "inst");
mkdirSync(inst, { recursive: true });
writeFileSync(join(inst, "a.sh"), "x");
const link = join(p.root, "fixedlink");
symlinkSync(real, link);
const base = { adapter: join(inst, "a.sh"), harnessMounts: [], installRoots: [inst], protectedPaths: [p.dataRoot, home], codeHolder: home, runDir: p.runDir, alsoFixed: [link] };
const refused = (opts, fence, message, label) => assert.throws(() => checkHostedRoute({ ...base, ...opts }), (e) => e.code === "hosted-binds-refused" && e.fence === fence && message.test(e.message), label);
// The code root lies in the stand-in's real path, not under the name the list gives.
refused({ codeRoot: join(real, "code") }, "protected", /never set aside/, "code root in a fixed path's real path");
// With the code root in HOME, the source in the stand-in's real path is refused by the stand-in's
// guard, which holds the same real spelling. No other guard holds that path.
mkdirSync(join(home, "code"), { recursive: true });
refused({ codeRoot: join(home, "code") }, "adapter", /protected path/, "source in a fixed path's real path");
// The same source passes without the stand-in: only the stand-in refused it.
assert.equal(checkHostedRoute({ ...base, alsoFixed: [], codeRoot: join(home, "code") }).adapter.src, join(inst, "a.sh"));
// The hook adds fixed paths and never removes one, and takes only a list of clean absolute paths.
refused({ alsoFixed: [], codeRoot: "/srv/mosaic/x" }, "protected", /never set aside/, "shipped fixed path with an empty hook");
refused({ alsoFixed: ["relative"], codeRoot: join(real, "code") }, "protected", /clean absolute/, "relative stand-in");
refused({ alsoFixed: "/x", codeRoot: join(real, "code") }, "protected", /clean absolute|list/, "a hook that is not a list");
});
test("a list that answers one length to the check and another later is read once", async (t) => {
const p = await layout(t);
const items = [];
+1 -1
View File
@@ -1,4 +1,4 @@
[data-packs],[data-workflows]{margin-top:16px}
[data-packs]{margin-top:16px}
.pack-list,.pack-hires{list-style:none;margin:8px 0;padding:0}
.pack-row,.pack-hire{border-top:1px solid var(--border);padding:12px 0;overflow-wrap:anywhere}
.pack-preview{border:1px solid var(--border);border-radius:var(--r);padding:12px;margin:12px 0;overflow-wrap:anywhere}
+13
View File
@@ -631,6 +631,14 @@ html[data-organizations] .ws-orgcard .at{grid-column:3;grid-row:1;font:500 11.5p
html[data-organizations] .ws-orgcard .why{grid-column:1/-1;font-size:12px;color:var(--muted)}
html[data-organizations] .ws-orgcard.off a{border-style:dashed}
html[data-organizations] .ws-home-split{margin-top:4px}
/* SP18: the Dashboard's columns line up with its tile row. Three equal tracks with the tiles' gap, the left
column spanning two, end on a tile edge whether the row holds six tiles (after the fourth) or three
(after the second). Below 760 px the split is one column. */
html[data-organizations] .ws-home>.ws-tiles{gap:var(--gap)}
@media (min-width:760px){
html[data-organizations] .ws-home-split{grid-template-columns:repeat(3,minmax(0,1fr));gap:var(--gap)}
html[data-organizations] .ws-home-split>:first-child{grid-column:span 2}
}
html[data-organizations] .ws-trail{list-style:none;margin:0;padding:0;border:1px solid var(--line);border-radius:8px;background:var(--surface)}
html[data-organizations] .ws-trail li{display:grid;grid-template-columns:48px 20px minmax(0,1fr);gap:10px;padding:7px 12px;border-bottom:1px solid color-mix(in srgb,var(--line) 60%,transparent);font-size:13px;align-items:center}
html[data-organizations] .ws-trail li:last-child{border-bottom:0}
@@ -770,6 +778,11 @@ html[data-organizations] .ws-drawer-acts .note{flex-basis:100%}
@media (min-width:1200px){html[data-organizations] body:has(.ws-drawer) .content{padding-right:calc(420px + 22px)}}
@media (max-width:700px){
html[data-organizations] .ws-drawer{top:0;left:0;right:0;width:auto;border-left:0;box-shadow:none}
/* SP18: the sheet covers the screen, so the page under it is held to one screen and does not scroll; it
kept its own height before, and the sheet showed over a long blank area. workspace.js puts the page's
place back on Close. */
html[data-organizations]:has(#bus-view .ws-drawer){overflow:hidden}
html[data-organizations]:has(#bus-view .ws-drawer) body{height:100dvh;overflow:hidden}
}
@media (max-width:1100px){
html[data-organizations] .ws-tiles.six{grid-template-columns:repeat(3,minmax(0,1fr))}
+1 -3
View File
@@ -823,7 +823,5 @@
window.matchMedia(NARROW).addEventListener('change', () => {
if (document.querySelector('[data-wfg-graph]')) document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));
});
// section(): the organization page's old form editor is gone (SP17); workspace.js still asks for it.
const section = () => '';
window.MosaicWorkflows = { load, section, page, card, hasDraft, forget, landed };
window.MosaicWorkflows = { load, page, card, hasDraft, forget, landed };
})();
+36 -11
View File
@@ -367,21 +367,20 @@
${orgTiles}
${docrow}
<div class="ws-split">
<section aria-label="Sessions and workflows">
<section aria-label="Sessions, workflows, autonomy and starter packs">
${secH('Active agent sessions', live ? (noRuns ? 'running not read' : live.length ? `${live.length} running${tileAgents ? `, ${liveWorking} working` : ', working not read'}` : 'none running') : '', `<a href="#/agents?${oq}" data-focus-key="agents-all">This organization's agents</a>`)}
${sessions}
${window.MosaicWorkflows?.card?.(id, { stopped, label: label(org) }) ?? ''}
<div class="ws-wide">
${stopped ? stoppedPanel('data-autonomy', 'Autonomy') : window.MosaicAutonomy?.section(id) ?? ''}
${stopped ? stoppedPanel('data-packs', 'Starter packs') : window.MosaicPacks?.section(id) ?? ''}
</div>
</section>
<section aria-label="Settings">
${secH('Settings', 'every setting, with where its value comes from')}
${settingsList(org, { business, settings, instances, noRuns, orgCount: list ? list.length : null })}
</section>
</div>
<div class="ws-wide">
${stopped ? stoppedPanel('data-autonomy', 'Autonomy') : window.MosaicAutonomy?.section(id) ?? ''}
${stopped ? stoppedPanel('data-packs', 'Starter packs') : window.MosaicPacks?.section(id) ?? ''}
${stopped ? stoppedPanel('data-workflows', 'Workflows') : window.MosaicWorkflows?.section(id) ?? ''}
</div>
${await drawerRead}
</article>`;
}
@@ -1348,6 +1347,21 @@
const actions = chat || change
? `<div class="ws-drawer-acts" data-drawer-actions>${acts.join(' ')}<p class="ws-drawer-status" id="ws-drawer-status" role="status" data-drawer-status>${esc(st?.text || '')}</p></div>`
: `<p class="note" data-drawer-readonly>This Console only reads ${esc(orgName)}. It can not message or stop its agents.</p>`;
// SP18: the agents read lists only roles a run holds now, and thread.claims only conversations a run
// holds now; each row carries that run and when it took the role or the conversation. A claim counts
// only when the instances read lists its run as running, so a claim left by a run that ended does not
// date a stopped agent. Last activity is the latest such time. No read keeps when a run ended or when
// the agent last sent a message (a thread's messages read pages from the oldest message), so neither is shown.
const runs = !unknown && runsRead(item) ? item.running : null;
const claims = [a.s ? { ...a.s, what: 'the role' } : null, ...arr(body?.sessions).filter(x => x?.kind === 'thread' && x.org === org && x.instance === key).map(x => ({ ...x, what: 'the conversation' }))]
.filter(c => c && msOf(c.claimedAt) !== null && (!runs || runs.includes(c.run))).sort((x, y) => msOf(y.claimedAt) - msOf(x.claimedAt));
const last = claims[0], claimWhy = notRead(['agents', 'claims']);
// With the runs not read, nothing checked the claim against a live run, so the line says "a run".
const activity = last ? `${!runs ? 'a run' : runs.length > 1 ? `one of its ${runs.length} runs` : 'its run'} took ${last.what} <time datetime="${esc(last.claimedAt)}" title="${esc(new Date(msOf(last.claimedAt)).toLocaleString())}">${esc(ago(last.claimedAt))}</time>`
: `<span class="muted">${claimWhy ? `not read: ${esc(claimWhy)}`
: runs?.length ? `not recorded: ${runs.length > 1 ? 'its runs hold' : 'its run holds'} no role or conversation yet`
: !runs ? 'not recorded: the agents and claims reads show no run holding its role or a conversation, and its runs were not read'
: 'not recorded: no run holds it now, and no read keeps when its last run ended'}</span>`;
const fields = [
field('org', 'Organization', orgChip(o, org)),
// A pack hire's pack is named once, in Hired from; the Role row says only that it was hired.
@@ -1358,11 +1372,7 @@
model ? field('model', 'Model', `<span class="mono">${esc(model)}</span>`) : '',
project ? field('project', 'Project', `<a href="${esc(`${orgHref(org)}/projects/${enc(project.id)}`)}">${esc(project.name || project.key || project.id)}</a>${project.from ? ` <span class="t2">${project.from}</span>` : ''}`) : '',
task ? field('task', 'Task', `<a href="${esc(taskHref(task.ref))}">${esc(task.title || task.ref)}</a>${task.title ? ` <span class="t2 mono">${esc(task.ref)}</span>` : ''}`) : '',
// SP16: no read the Console makes carries the time of a role agent's last message or run. The agents
// read's time is when it took the role and `since` is when its present state began, so neither is shown.
// An agent holding a conversation has its messages in that thread's messages read, but that read pages
// from the oldest message, so its last message is a walk of every page away; the drawer does not make it.
field('activity', 'Last activity', `<span class="muted">${thread?.thread ? 'not shown: reading it means reading the whole conversation' : 'not recorded'}</span>`),
field('activity', 'Last activity', activity),
].join('');
return shell(a.name, `<dl class="ws-drawer-fields">${fields}</dl>
<section class="ws-drawer-sec" data-drawer-tasks aria-label="Open tasks assigned to ${esc(a.name)}"><h3>Open tasks</h3>${tasksBody}${tasksAll}</section>
@@ -1377,6 +1387,16 @@
history.replaceState(unmarked(), '', sansAgent());
document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));
}
// SP18: below 701 px the open drawer is a sheet and shell.css holds the page under it to one screen, which
// scrolls the page to the top. The page's place is kept while no drawer is open, with the page the sheet
// opened over. It is put back only when the drawer closes onto that same page (Close, Escape or Back); a
// link in the sheet goes to another page, which starts at its top, and the kept place is dropped. Some
// pages a link opens (a project, the Assistant) are drawn without afterPaint, so the place is dropped as
// soon as the address leaves the page under the sheet.
const SHEET = window.matchMedia('(max-width:700px)');
let pageY = 0, sheetOver = null;
window.addEventListener('scroll', () => { if (!document.querySelector('#bus-view [data-ws-drawer]')) pageY = window.scrollY; }, { passive: true });
window.addEventListener('hashchange', () => { if (sheetOver !== null && sansAgent() !== sheetOver) { sheetOver = null; pageY = 0; } });
// bus.js calls this after each paint: focus moves into a drawer a row opened, and back to the row
// when the drawer has closed and focus was left nowhere.
function afterPaint() {
@@ -1384,8 +1404,13 @@
const view = document.getElementById('bus-view'), d = view?.querySelector('[data-ws-drawer]');
const now = d?.dataset.wsDrawer || null, was = drawerShown;
drawerShown = now;
if (now) sheetOver = sansAgent();
if (d && drawerFocus) { drawerFocus = false; d.querySelector('h2')?.focus({ preventScroll: true }); return; }
drawerFocus = false;
if (!now && sheetOver !== null) {
if (SHEET.matches && pageY && sheetOver === sansAgent()) window.scrollTo(0, pageY);
sheetOver = null; pageY = window.scrollY;
}
if (!now && was) {
const a = document.activeElement;
if (!a || a === document.body || !view?.contains(a)) view?.querySelector(`[data-focus-key="${CSS.escape(`agent:${was}`)}"]`)?.focus({ preventScroll: true });
+14 -9
View File
@@ -75,14 +75,15 @@ const ENV_VALUE_MAX = 4096;
const HARNESS_ENV_MAX = 64;
// Refused in harnessEnv even when the harness module declares them: the runner's own MOSAIC_*
// values, loader, libc and interpreter hooks, the shell's start files, a tool's config directory
// and the founder's, an askpass program, a CA bundle or a base URL. A provider name (every ANTHROPIC_* among them) goes through route env or nowhere.
// and the founder's, an askpass program, a CA bundle or a base URL, Lua's start code, curl's config
// home and a TLS key log. A provider name (every ANTHROPIC_* among them) goes through route env or nowhere.
const REFUSED_PREFIX = /^(MOSAIC_|NODE_|LD_|DYLD_|PYTHON|BASH_|GIT_|MALLOC_|NPM_CONFIG_|XDG_)/;
const REFUSED_SUFFIX = /_(DIR|CONF|CONFIG|ASKPASS|CA_BUNDLE|BASE_URL)$/;
const REFUSED_NAMES = new Set([
"PATH", "HOME", "TMPDIR", "BASH_ENV", "ENV", "SSH_AUTH_SOCK", "SHELL", "SHELLOPTS", "BASHOPTS", "PS4", "IFS", "CDPATH",
"GLOBIGNORE", "PROMPT_COMMAND", "ZDOTDIR", "PERL5OPT", "PERL5LIB", "RUBYOPT", "RUBYLIB", "PERLLIB", "LESSOPEN", "LESSCLOSE", "HOSTALIASES", "HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY", "NO_PROXY",
"GCONV_PATH", "GLIBC_TUNABLES", "LOCPATH", "OPENSSL_CONF", "OPENSSL_ENGINES", "OPENSSL_MODULES", "SSL_CERT_FILE", "SSL_CERT_DIR",
"JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "JDK_JAVA_OPTIONS",
"JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "JDK_JAVA_OPTIONS", "LUA_INIT", "CURL_HOME", "SSLKEYLOGFILE",
...FOUNDER_ENV,
]);
export const refusedHarnessName = (k) => typeof k !== "string" || !ENV_NAME.test(k) || REFUSED_PREFIX.test(k) || REFUSED_SUFFIX.test(k) || REFUSED_NAMES.has(k) || isProviderVariable(k);
@@ -175,8 +176,9 @@ function sameCap(a, b) {
return timingSafeEqual(Buffer.from(a), Buffer.from(b));
}
// The relay server. `onSend(body)` keeps a human-bound send; `take()` returns the queued owner
// messages; `read(id)` drops one that was answered.
// The relay server. `onSend({ body, in_reply_to, result })` keeps a human-bound send, `result` true
// only for class RESULT, the class the runner gives its answer to a turn; `take()` returns the
// queued owner messages; `read(id)` drops one that was answered.
export function createRelay({ socket, cap, take, read, onSend, log = () => {} }) {
const answer = (conn, value) => { try { conn.end(JSON.stringify(value) + "\n"); } catch {} };
const refuse = (conn) => answer(conn, { ok: false, error: RELAY_REFUSED, reason: "the Triage host answers only a message to the person" });
@@ -203,7 +205,7 @@ export function createRelay({ socket, cap, take, read, onSend, log = () => {} })
if (verb === "message.read") { read(args.id); return answer(conn, { ok: true, result: {} }); }
if (verb === "message.send" && args.to === "human" && typeof args.body === "string" && args.body.length <= 32768) {
// Only an id the host issued is kept. The model writes this field, and the transcript serves it.
onSend({ body: args.body, in_reply_to: typeof args.in_reply_to === "string" && OWNER_ID.test(args.in_reply_to) ? args.in_reply_to : null });
onSend({ body: args.body, in_reply_to: typeof args.in_reply_to === "string" && OWNER_ID.test(args.in_reply_to) ? args.in_reply_to : null, result: args.class === "RESULT" });
return answer(conn, { ok: true, result: { id: `triage-${randomBytes(6).toString("hex")}` } });
}
} catch (e) {
@@ -380,12 +382,15 @@ export function createTriageHost({ dataRoot, route = null, readSnapshot = async
const i = queue.findIndex((m) => m.id === id);
if (i >= 0) queue.splice(i, 1);
},
// A reply that names a queued message answers it: the message leaves the queue here, so a
// session that ends before its message.read leaves no "unanswered" line under an answer.
onSend: ({ body, in_reply_to }) => {
// An answer (class RESULT) that names a queued message answers it: the message leaves the queue
// here, so a session that ends before its message.read leaves no "unanswered" line under an
// answer. A note in any other class stays in the transcript but leaves the message queued, so
// a session that ends after a progress note still gets the "unanswered" line. The model's tool
// can also pick class RESULT; such a note settles the message as the runner's answer would.
onSend: ({ body, in_reply_to, result }) => {
const { text, cards, dropped } = extractCards(body, orgIds(), { devOwner: devOwner === true });
append({ at: now().toISOString(), from: "triage", text, cards, dropped, ...(in_reply_to ? { in_reply_to } : {}) });
const i = in_reply_to ? queue.findIndex((m) => m.id === in_reply_to) : -1;
const i = in_reply_to && result === true ? queue.findIndex((m) => m.id === in_reply_to) : -1;
if (i >= 0) queue.splice(i, 1);
},
log,
+25 -17
View File
@@ -39,7 +39,7 @@ export const BUS_STATES = Object.freeze(["running", "not-answering", "stopped",
const UNIT_ACTIVE = Object.freeze(["active", "inactive", "failed", "activating", "deactivating", "reloading", "unknown"]);
export const READ_TIMEOUT_MS = 5000;
export const MAX_ORGS = 200;
// At most this many organizations are read at once; each read can start a node child for its config check.
// At most this many organizations' config checks run at once; each starts a node child.
export const ORG_READS_AT_ONCE = 4;
// What a failed system config check may say. Each refusal code the validator prints as its first
@@ -190,8 +190,11 @@ async function mapLimit(items, limit, fn) {
}
// The organization stage runs under one deadline, `timeoutMs` from its start, however many
// organizations there are: an organization whose reads have not finished by then is "not read", and
// one not yet begun is not read at all. A whole snapshot takes at most about two timeouts.
// organizations there are: a read that has not finished by then is "not read", and one not yet
// begun is not read at all. The bus and processing reads are socket reads and begin for every
// organization at once. Only the config checks, a node child each, wait for one of
// ORG_READS_AT_ONCE slots, so a hung check holds back other checks but never another
// organization's socket reads. A whole snapshot takes at most about two timeouts.
export async function composeSnapshot(readers = {}, { now = () => new Date(), timeoutMs = READ_TIMEOUT_MS, clock = Date.now } = {}) {
const at = now().toISOString();
const read = (name, ...args) => (typeof readers[name] === "function" ? bounded(() => readers[name](...args), timeoutMs) : Promise.resolve(NOT_READ));
@@ -200,21 +203,26 @@ export async function composeSnapshot(readers = {}, { now = () => new Date(), ti
if (Array.isArray(orgsRaw)) {
const active = orgsRaw.filter((o) => o && typeof o === "object" && o.state === "active" && typeof o.id === "string" && ID_PATTERN.test(o.id)).slice(0, MAX_ORGS);
const deadline = clock() + timeoutMs;
const list = await mapLimit(active, ORG_READS_AT_ONCE, async ({ id }) => {
// fn bounded by what is left of the deadline, or NOT_READ once nothing is.
const inTime = (fn) => {
const left = deadline - clock();
if (left <= 0) return { id, bus: NOT_READ, processing: NOT_READ, config: NOT_READ };
const readOrg = (name) => (typeof readers[name] === "function" ? bounded(() => readers[name](id), left) : NOT_READ);
const [bus, processing, config] = await Promise.all([
typeof readers.busStatus === "function"
? bounded(async () => {
try { return busFields(await readers.busStatus(id)); }
catch (e) { return e?.name === "CliError" || e?.dead === true ? busFields(null, true) : NOT_READ; }
}, left)
: NOT_READ,
readOrg("processing"),
readOrg("orgConfig"),
]);
return { id, bus: bus === NOT_READ ? NOT_READ : bus, processing: processingFields(processing), config: configFields(config, ORG_CONFIG_CODES) };
return left > 0 ? bounded(fn, left) : Promise.resolve(NOT_READ);
};
const readOrg = (name, id) => (typeof readers[name] === "function" ? inTime(() => readers[name](id)) : Promise.resolve(NOT_READ));
const sockets = Promise.all(active.map(({ id }) => Promise.all([
typeof readers.busStatus === "function"
? inTime(async () => {
try { return busFields(await readers.busStatus(id)); }
catch (e) { return e?.name === "CliError" || e?.dead === true ? busFields(null, true) : NOT_READ; }
})
: NOT_READ,
readOrg("processing", id),
])));
const configs = await mapLimit(active, ORG_READS_AT_ONCE, ({ id }) => readOrg("orgConfig", id));
const socketReads = await sockets;
const list = active.map(({ id }, i) => {
const [bus, processing] = socketReads[i];
return { id, bus: bus === NOT_READ ? NOT_READ : bus, processing: processingFields(processing), config: configFields(configs[i], ORG_CONFIG_CODES) };
});
organizations = { count: list.length, list };
}
@@ -18,7 +18,7 @@ const at = minutesAgo => new Date(Date.now() - minutesAgo * 60000).toISOString()
const HIRE = '0f3c1a2b-4d5e-4f60-8a7b-9c0d1e2f3a4b';
const THREAD = '7b1e2c3d-4f50-4a61-8b72-9c83d4e5f6a7';
function fixture() {
function fixture(tweak) {
const LIST = [
{ id: 'acme', label: 'Acme Studio', theme: 'cobalt' },
{ id: 'beta', label: 'Beta Works', theme: 'grove' },
@@ -52,6 +52,7 @@ function fixture() {
model: {},
},
};
tweak?.(DATA);
const value = (id, name) => Promise.resolve(DATA[id]?.[name] ?? (['usage', 'limits'].includes(name) ? {} : []));
const opts = id => ({
bus: { inbox: () => value(id, 'inbox'), agents: () => value(id, 'agents'), 'thread.claims': () => value(id, 'claims'), tasks: () => value(id, 'tasks'), usage: () => value(id, 'usage'), limits: () => value(id, 'limits'), decisions: () => value(id, 'decisions') },
@@ -115,8 +116,8 @@ const STUB = `(() => {
};
})();`;
async function setup(t, { viewport = [1440, 900], hash = '#/agents', stub = true, scripts = [] } = {}) {
const server = await startServer({ port: 0, sso: createDevOwner(), organizations: fixture(), log: () => {} });
async function setup(t, { viewport = [1440, 900], hash = '#/agents', stub = true, scripts = [], data } = {}) {
const server = await startServer({ port: 0, sso: createDevOwner(), organizations: fixture(data), log: () => {} });
t.after(() => close(server));
const b = await browser({ machine: false }); t.after(() => b.close());
await b.viewport(...viewport);
@@ -185,9 +186,12 @@ test('the drawer shows each field from its read: name, organization, role and so
// Decisions waiting on a human that it raised, each into the Inbox. Chief's is not its own.
const decisions = await b.evaluate(`[...document.querySelectorAll('${d} [data-drawer-decisions] li a')].map(a => [a.textContent.trim(), a.getAttribute("href")])`);
assert.deepEqual(decisions, [['Ship the hero copy?', '#/inbox?d=acme%3Adec-1']]);
// SP16: no read gives the time of an agent's last activity. The agents read's time (when it took the
// role) and `since` (when its present state began) are not that, so the drawer says not recorded.
assert.equal(await text(`${d} [data-drawer-activity]`), 'not recorded');
// SP18: the agents read lists only roles a run holds now, and its time is when that run took the role,
// so Last activity is when coder's running run took the role, 40 minutes before the read, with the time itself.
assert.match(await text(`${d} [data-drawer-activity]`), /^its run took the role 4[01] min ago$/);
const started = await attr(`${d} [data-drawer-activity] time`, 'datetime');
assert.ok(Math.abs(Date.now() - Date.parse(started) - 40 * 60000) < 90000, started);
assert.match(await attr(`${d} [data-drawer-activity] time`, 'title'), /\d/);
assert.equal(await b.evaluate(`document.querySelector('${d} [data-drawer-activity]').closest('.ws-drawer-f').querySelector('dt').textContent`), 'Last activity');
// Not a pack hire: no packs read, and no Hired from line.
assert.equal(await has(`${d} [data-drawer-hired]`), false);
@@ -209,6 +213,53 @@ test('a hired agent shows where its role came from; a not-running agent says not
assert.match(await text(`${d} [data-drawer-source]`), new RegExp(`hire decision ${HIRE}`));
assert.match(await text(`${d} [data-drawer-state]`), /(^|\s)not running$/);
assert.equal(await has(`${d} [data-drawer-model]`), false);
// SP18: no run holds it, and no read keeps the time of a run that ended: one plain line, no time.
assert.equal(await text(`${d} [data-drawer-activity]`), 'not recorded: no run holds it now, and no read keeps when its last run ended');
assert.equal(await has(`${d} [data-drawer-activity] time`), false);
});
// SP18 review: a claim dates the agent only when the instances read lists its run as running.
test('SP18 review: Last activity counts only a claim whose run is running', async t => {
// Coder runs run-2, but the role is still held by run-1, whose process ended: nothing dates run-2 yet.
{
const { wait, text, has } = await setup(t, { hash: '#/agents?agent=acme%3Acoder', data: d => { d.acme.instances.coder.running = ['run-2']; } });
const d = '[data-ws-drawer="acme:coder"]';
await wait(`${open('acme:coder')} && /running$/.test(document.querySelector('${d} [data-drawer-state]')?.textContent ?? '')`);
assert.equal(await text(`${d} [data-drawer-activity]`), 'not recorded: its run holds no role or conversation yet');
assert.equal(await has(`${d} [data-drawer-activity] time`), false);
}
// Coder runs nothing, and a claim from three days ago is left: not running, and no time from that claim.
{
const { wait, text, has } = await setup(t, { hash: '#/agents?agent=acme%3Acoder', data: d => { d.acme.instances.coder.running = []; d.acme.agents[0].at = at(3 * 24 * 60); d.acme.agents[0].working = null; } });
const d = '[data-ws-drawer="acme:coder"]';
await wait(`${open('acme:coder')} && /not running$/.test(document.querySelector('${d} [data-drawer-state]')?.textContent ?? '')`);
assert.equal(await text(`${d} [data-drawer-activity]`), 'not recorded: no run holds it now, and no read keeps when its last run ended');
assert.equal(await has(`${d} [data-drawer-activity] time`), false);
}
// Two runs, one holding the role: no read says which run is newer, so the line says one of them.
{
const { wait, text } = await setup(t, { hash: '#/agents?agent=acme%3Acoder', data: d => { d.acme.instances.coder.running = ['run-1', 'run-2']; } });
const d = '[data-ws-drawer="acme:coder"]';
await wait(`${open('acme:coder')} && !!document.querySelector('${d} [data-drawer-activity] time')`);
assert.match(await text(`${d} [data-drawer-activity]`), /^one of its 2 runs took the role 4[01] min ago$/);
}
// The instances read fails: nothing checked the claim against a live run, so the line says "a run".
{
const fail = `(() => { const f = window.fetch; window.fetch = (u, i) => /\\/api\\/orgs\\/acme\\/bus\\/instances$/.test(String(u)) ? Promise.resolve(new Response('{}', { status: 503 })) : f(u, i); })();`;
const { wait, text } = await setup(t, { hash: '#/agents?agent=acme%3Acoder', scripts: [fail] });
const d = '[data-ws-drawer="acme:coder"]';
await wait(`${open('acme:coder')} && /^State not read/.test(document.querySelector('${d} [data-drawer-state]')?.textContent ?? '')`);
assert.match(await text(`${d} [data-drawer-activity]`), /^a run took the role 4[01] min ago$/);
}
// The same failed read for chief, which holds no role and no conversation: the line names both gaps.
{
const fail = `(() => { const f = window.fetch; window.fetch = (u, i) => /\\/api\\/orgs\\/acme\\/bus\\/instances$/.test(String(u)) ? Promise.resolve(new Response('{}', { status: 503 })) : f(u, i); })();`;
const { wait, text, has } = await setup(t, { hash: '#/agents?agent=acme%3Achief', scripts: [fail] });
const d = '[data-ws-drawer="acme:chief"]';
await wait(`${open('acme:chief')} && /^State not read/.test(document.querySelector('${d} [data-drawer-state]')?.textContent ?? '')`);
assert.equal(await text(`${d} [data-drawer-activity]`), 'not recorded: the agents and claims reads show no run holding its role or a conversation, and its runs were not read');
assert.equal(await has(`${d} [data-drawer-activity] time`), false);
}
});
test('SP16: a pack hire names its pack and the template the packs read gives; a refused read says so', async t => {
@@ -501,8 +552,8 @@ test('Message opens the agent\'s thread in an Assistant pane; Stop asks first an
assert.equal(await attr('[data-ws-drawer="acme:assistant"] [data-drawer-message]', 'href'), `#/assistant?add=acme%3A${THREAD}`);
// SP16: Message is offered, so no line says why it is not.
assert.equal(await has('[data-ws-drawer="acme:assistant"] [data-drawer-nomessage]'), false);
// It holds a conversation, whose messages read pages from the oldest message: the drawer says it does not read it.
assert.equal(await text('[data-ws-drawer="acme:assistant"] [data-drawer-activity]'), 'not shown: reading it means reading the whole conversation');
// SP18: a conversation agent's run took its conversation 5 minutes before the read (thread.claims' time).
assert.match(await text('[data-ws-drawer="acme:assistant"] [data-drawer-activity]'), /^its run took the conversation [56] min ago$/);
// A role agent holds no thread to open, so it has no Message; it can still be stopped.
await b.evaluate('location.hash = "#/agents?agent=acme%3Acoder"');
await wait(`${open('acme:coder')} && document.querySelector('[data-ws-drawer="acme:coder"] [data-drawer-stop]')`);
@@ -578,6 +629,71 @@ test('at 390 wide the drawer is a full-width sheet', async t => {
assert.ok(box[3] <= box[2], `no horizontal page scroll: ${box[3]} > ${box[2]}`);
});
// SP18: the sheet is fixed to the screen, but the page under it kept its own height, so the page still
// scrolled behind the sheet and a full-page shot showed the sheet stretched down a long blank area. With the
// sheet open the page is one screen tall; Close puts the page back where the reader left it.
test('SP18: at 390 wide the open sheet is the whole screen, the page under it does not scroll, and Close keeps the place', async t => {
const { b, wait } = await setup(t, { viewport: [390, 844], hash: '#/orgs/acme/organization' });
const link = JSON.stringify(sessionLink('acme:coder'));
await wait(`document.querySelector(${link}) && document.querySelectorAll("[data-org-settings] [data-org-setting]").length > 10`);
await b.evaluate(`document.querySelector(${link}).scrollIntoView({ block: 'center' })`);
const at = await b.evaluate('Math.round(scrollY)');
assert.ok(at > 100, `the row is down the page: ${at}`);
await b.evaluate(`document.querySelector(${link}).click()`);
await wait(open('acme:coder'));
await b.evaluate('new Promise(r => requestAnimationFrame(() => requestAnimationFrame(r)))');
const m = await b.evaluate(`(() => { const r = ${drawer('acme:coder')}.getBoundingClientRect(), e = document.documentElement; return { top: Math.round(r.top), bottom: Math.round(r.bottom), left: Math.round(r.left), width: Math.round(r.width), vh: innerHeight, vw: e.clientWidth, docH: e.scrollHeight, bodyH: Math.round(document.body.getBoundingClientRect().height), sw: e.scrollWidth }; })()`);
assert.equal(m.top, 0, JSON.stringify(m));
assert.equal(m.bottom, m.vh, `the sheet ends at the screen's foot: ${JSON.stringify(m)}`);
assert.equal(m.left, 0); assert.equal(m.width, m.vw);
assert.ok(m.docH <= m.vh && m.bodyH <= m.vh, `the page under the sheet is one screen tall, nothing below to scroll to: ${JSON.stringify(m)}`);
assert.ok(m.sw <= m.vw, 'no sideways scroll');
// A scroll on the page does nothing while the sheet is open.
await b.evaluate('window.scrollTo(0, 2000)');
assert.equal(await b.evaluate('Math.round(scrollY)'), 0);
await b.evaluate(`${drawer('acme:coder')}.querySelector("[data-drawer-close]").click()`);
await wait(noDrawer);
await b.evaluate('new Promise(r => requestAnimationFrame(() => requestAnimationFrame(r)))');
assert.ok(Math.abs(await b.evaluate('Math.round(scrollY)') - at) <= 1, `Close puts the page back at ${at}: ${await b.evaluate('Math.round(scrollY)')}`);
assert.ok(await b.evaluate('document.documentElement.scrollHeight') > 844, 'the page is its full height again');
// At 1440 the drawer is a side panel: the page keeps its height and scrolls.
await b.viewport(1440, 900);
await b.evaluate(`document.querySelector(${link}).click()`);
await wait(open('acme:coder'));
assert.ok(await b.evaluate('document.documentElement.scrollHeight') > 900, 'at 1440 the page beside the drawer keeps its height');
});
// SP18 review: only Close (or Back to the same page) puts the page back. A link in the sheet goes to a new
// page, which starts at its top, and the place kept for the page under the sheet is not used later either.
// The Task page is drawn through afterPaint; a project address is drawn by bus.js's chat branch without it
// (this fixture has no chat backend, so that page is the Projects list saying the route is invalid).
for (const [label, sel, hashStart, ready] of [
['Task', '[data-drawer-task] a', '#/orgs/acme/tasks?task=', 'document.querySelector("[data-tasks-board]")'],
['Project', '[data-drawer-project] a', '#/orgs/acme/projects/p-site', 'document.querySelector("#bus-view h1")?.textContent.trim() === "Projects"'],
]) test(`SP18 review: at 390 the sheet's ${label} link opens its page at the top, and a later page does not jump`, async t => {
const { b, wait } = await setup(t, { viewport: [390, 844], hash: '#/orgs/acme/organization' });
const link = JSON.stringify(sessionLink('acme:coder'));
await wait(`document.querySelector(${link}) && document.querySelectorAll("[data-org-settings] [data-org-setting]").length > 10`);
// Every page is long, so a jump to the kept place would show wherever it lands.
await b.evaluate('document.head.insertAdjacentHTML("beforeend", "<style>#bus-view{padding-bottom:4000px}</style>")');
await b.evaluate(`document.querySelector(${link}).scrollIntoView({ block: 'center' })`);
const at = await b.evaluate('Math.round(scrollY)');
assert.ok(at > 100, `the row is down the page: ${at}`);
await b.evaluate(`document.querySelector(${link}).click()`);
await wait(open('acme:coder'));
await b.evaluate(`${drawer('acme:coder')}.querySelector(${JSON.stringify(sel)}).click()`);
await wait(`${noDrawer} && location.hash.startsWith(${JSON.stringify(hashStart)}) && ${ready}`);
await b.evaluate('new Promise(r => setTimeout(r, 500))');
const y = await b.evaluate('Math.round(scrollY)');
assert.ok(y <= 1, `the ${label} page is at its top, not at ${at}: ${y}`);
// The next page with no drawer does not take the kept place either.
await b.evaluate('location.hash = "#/orgs/acme/organization"');
await wait('document.querySelectorAll("[data-org-settings] [data-org-setting]").length > 10');
await b.evaluate('new Promise(r => setTimeout(r, 500))');
const later = await b.evaluate('Math.round(scrollY)');
assert.ok(later <= 1, `the organization page opens at its top: ${later}`);
});
// #1873 triage-followups: the page focuses its heading when its first render ends. On load the page
// starts a second render that reads GET /api/workspace again, so when the first render's read is slow
// the second draws the rows first and a reader can open a drawer before the first render ends. Its late
+7 -2
View File
@@ -6,7 +6,8 @@
// CARDS answer a reply with a cards fence: one valid card, one unknown step
// TOOL <to> call send_message to <to> through the tool socket and answer the raw reply
// SLEEP hang until killed
// REPLY-SLEEP send the person an answer to this message through the tool socket, then hang until killed
// REPLY-SLEEP send the person an answer (class RESULT) to this message through the tool socket, then hang until killed
// NOTE-SLEEP send the person a progress note (class INFO) on this message through the tool socket, then hang until killed
// anything else answer "echo: <body>"
import { existsSync, readFileSync, writeFileSync } from "node:fs";
import { connect } from "node:net";
@@ -57,7 +58,11 @@ if (body === "PROBE") {
process.stdout.write(await toolCall("send_message", { to: body.slice(5), body: "from the tool", class: "INFO" }));
} else if (body === "REPLY-SLEEP") {
const id = request.match(/^Message (\S+) from /m)?.[1];
await toolCall("send_message", { to: "human", body: "answered early", class: "INFO", in_reply_to: id });
await toolCall("send_message", { to: "human", body: "answered early", class: "RESULT", in_reply_to: id });
setInterval(() => {}, 1000);
} else if (body === "NOTE-SLEEP") {
const id = request.match(/^Message (\S+) from /m)?.[1];
await toolCall("send_message", { to: "human", body: "still looking", class: "INFO", in_reply_to: id });
setInterval(() => {}, 1000);
} else if (body === "SLEEP") {
setInterval(() => {}, 1000);
@@ -279,3 +279,24 @@ test('At 390 wide the tiles sit two to a row with no sideways scroll, on the Das
assert.equal(await cols('[data-org-tiles]'), 2);
assert.equal(await b.evaluate('document.documentElement.scrollWidth <= document.documentElement.clientWidth'), true, 'organization page');
});
test('SP18: at 1440 and 1024 the Dashboard\'s two columns line up with the tile row above them', async t => {
const { b, wait } = await setup(t, { viewport: [1440, 1000] });
await wait(homeReady);
// The left column ends where a tile ends and the right column starts where the next tile starts: the fourth
// and fifth of six at 1440, the second and third of three a row at 1024.
const edges = () => b.evaluate(`(() => {
const tiles = [...document.querySelectorAll('[data-ws-home] [data-ws-tile]')].map(e => e.getBoundingClientRect());
const cols = [...document.querySelectorAll('[data-ws-home] .ws-home-split>*')].map(e => e.getBoundingClientRect());
return { rights: tiles.map(r => Math.round(r.right)), lefts: tiles.map(r => Math.round(r.left)), left: cols[0] && [Math.round(cols[0].left), Math.round(cols[0].right)], right: cols[1] && [Math.round(cols[1].left), Math.round(cols[1].right)] };
})()`);
for (const [w, nth] of [[1440, 4], [1024, 2]]) {
await b.viewport(w, 1000);
await b.evaluate('new Promise(r => requestAnimationFrame(() => requestAnimationFrame(r)))');
const e = await edges();
assert.ok(e.left && e.right && e.right[0] > e.left[1], `two columns side by side at ${w}: ${JSON.stringify(e)}`);
assert.ok(Math.abs(e.left[1] - e.rights[nth - 1]) <= 1, `at ${w} the left column ends with tile ${nth}: ${JSON.stringify(e)}`);
assert.ok(Math.abs(e.right[0] - e.lefts[nth]) <= 1, `at ${w} the right column starts with tile ${nth + 1}: ${JSON.stringify(e)}`);
assert.ok(Math.abs(e.right[1] - Math.max(...e.rights)) <= 1, `at ${w} the right column ends with the row`);
}
});
@@ -180,6 +180,20 @@ test('the Settings card fits at 1440 with the drawer open, at 735 and 390 withou
assert.deepEqual(cols[1].heads, ['Settings']);
const gap = await b.evaluate(`(() => { const left = document.querySelector('#bus-view .ws-dash>.ws-split>section'), card = left.querySelector('[data-wfg-card]'), above = card.previousElementSibling; return Math.round(card.getBoundingClientRect().top - above.getBoundingClientRect().bottom); })()`);
assert.ok(gap >= 0 && gap <= 40, `the Workflows card follows the sessions directly: ${gap}px`);
// SP18: Autonomy and Starter packs follow the Workflows card in the left column, so the left column is not
// empty beside the long Settings card and nothing runs full width below it.
const left = await b.evaluate(`(() => { const s = [...document.querySelectorAll('#bus-view .ws-dash>.ws-split>section')]; return { autonomy: !!s[0].querySelector('[data-autonomy]'), packs: !!s[0].querySelector('[data-packs]'), after: !!document.querySelector('#bus-view .ws-dash>.ws-split ~ :is(div,section):not([data-ws-drawer])'), ends: s.map(x => Math.round(x.getBoundingClientRect().bottom)) }; })()`);
assert.equal(left.autonomy && left.packs, true, `Autonomy and Starter packs are in the left column: ${JSON.stringify(left)}`);
assert.equal(left.after, false, 'no full-width block under the split');
// How near level the two end depends on the data: in this fixture Autonomy is a one-line refusal and no pack
// is installed, so the Settings card is still the taller. The left column ends with Starter packs.
assert.ok(await b.evaluate(`Math.abs(document.querySelector('#bus-view .ws-dash>.ws-split>section [data-packs]').getBoundingClientRect().bottom - document.querySelector('#bus-view .ws-dash>.ws-split>section').getBoundingClientRect().bottom) <= 1`), `the left column ends with Starter packs: ${JSON.stringify(left.ends)}`);
// At 390 the page is one column: sessions, Workflows, Autonomy, Starter packs, then Settings.
await b.viewport(390, 844);
await b.evaluate('new Promise(r => requestAnimationFrame(() => requestAnimationFrame(r)))');
const order = await b.evaluate(`[...document.querySelectorAll('#bus-view .ws-dash>.ws-split h2, #bus-view .ws-dash>.ws-split h3')].map(h => h.textContent.trim()).filter(x => ['Active agent sessions', 'Workflows', 'Autonomy', 'Starter packs', 'Settings'].includes(x))`);
assert.deepEqual(order, ['Active agent sessions', 'Workflows', 'Autonomy', 'Starter packs', 'Settings']);
assert.ok(await b.evaluate('document.documentElement.scrollWidth <= document.documentElement.clientWidth'), 'no sideways scroll at 390');
});
test('the bare organization address with a query is the organization page, query kept; ?agent= opens the drawer', async t => {
+21 -2
View File
@@ -65,13 +65,20 @@ test("the relay refuses every verb but a message to the person, and any call wit
assert.deepEqual(await client.call("message.receive"), [{ id: "owner-0123456789ab", from_role: "human", class: "REQUEST", body: "hello", at: "2026-11-16T12:00:00.000Z" }]);
assert.match((await client.call("message.send", { to: "human", body: "answer", class: "RESULT", in_reply_to: "owner-0123456789ab" })).id, /^triage-/);
await client.call("message.read", { id: "owner-0123456789ab" });
assert.deepEqual(sent, [{ body: "answer", in_reply_to: "owner-0123456789ab" }]);
assert.deepEqual(sent, [{ body: "answer", in_reply_to: "owner-0123456789ab", result: true }]);
assert.deepEqual(read, ["owner-0123456789ab"]);
// Only the class RESULT send, the runner's answer to its turn, says the message is answered. A note
// in any other class, or with no class, is kept but does not.
for (const cls of ["INFO", "REQUEST", "result", undefined, 7]) {
sent.length = 0;
await client.call("message.send", { to: "human", body: "note", class: cls, in_reply_to: "owner-0123456789ab" });
assert.deepEqual(sent, [{ body: "note", in_reply_to: "owner-0123456789ab", result: false }], String(cls));
}
// The model writes in_reply_to. Anything but an id the host issued is dropped, never stored.
for (const bad of ["<img src=x onerror=1>", "owner-1", "owner-0123456789ab\u202e", "owner-0123456789abc", "x".repeat(60000)]) {
sent.length = 0;
await client.call("message.send", { to: "human", body: "b", in_reply_to: bad });
assert.deepEqual(sent, [{ body: "b", in_reply_to: null }], bad.slice(0, 24));
assert.deepEqual(sent, [{ body: "b", in_reply_to: null, result: false }], bad.slice(0, 24));
}
const refused = [
["decision.raise", { kind: "hire", body: "x" }], ["event.emit", { kind: "action.allowed", body: {} }],
@@ -222,6 +229,7 @@ test("fence 1: a harnessEnv name the host refuses is refused even when the harne
"LOCPATH", "MALLOC_CHECK_", "OPENSSL_CONF", "SSL_CERT_FILE", "ZDOTDIR", "PROMPT_COMMAND", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "NPM_CONFIG_PREFIX",
"CLAUDE_CONFIG_DIR", "XDG_DATA_HOME", "ANY_CONF", "ANY_CONFIG", "PERLLIB", "LESSOPEN", "LESSCLOSE", "HOSTALIASES",
"SSH_ASKPASS", "SUDO_ASKPASS", "CURL_CA_BUNDLE", "REQUESTS_CA_BUNDLE", "OPENAI_BASE_URL", "ANY_BASE_URL",
"LUA_INIT", "CURL_HOME", "SSLKEYLOGFILE",
]) assert.equal(refusedHarnessName(name), true, name);
for (const name of ["FAKE_OK", "PI_MODEL", "TRIAGE_PROBE"]) assert.equal(refusedHarnessName(name), false, name);
});
@@ -635,6 +643,17 @@ test("a reply that names its message answers it: a session killed after replying
assert.deepEqual((await h.state()).transcript.filter((e) => e.from === "host"), []);
});
test("a progress note that names its message does not answer it: a session killed after the note leaves an unanswered line", { skip, timeout: 120000 }, async (t) => {
const root = scratch();
const { h } = host(t, root, { route: stubRoute(root) });
const sent = await h.message("NOTE-SLEEP");
const [noted] = await repliesOf(h, 1);
assert.deepEqual([noted.text.replace(/\n\n.*$/s, ""), noted.in_reply_to], ["still looking", sent.id]);
process.kill(-h.pid, "SIGKILL");
const [note] = await repliesOf(h, 1, "host");
assert.deepEqual([note.in_reply_to, note.text], [sent.id, UNANSWERED]);
});
test("a message the session never read gets a host line when it ends and leaves the queue", { skip, timeout: 120000 }, async (t) => {
const root = scratch();
const { h, dataRoot } = host(t, root, { route: stubRoute(root) });
+38 -10
View File
@@ -156,7 +156,7 @@ test("the snapshot file is one 0600 file, replaced whole", () => {
assert.equal(JSON.parse(readFileSync(file, "utf8")).n, 2);
});
test("organizations are read at most ORG_READS_AT_ONCE at a time and listed in registry order", async () => {
test("config checks run at most ORG_READS_AT_ONCE at a time and organizations are listed in registry order", async () => {
let live = 0, most = 0;
const ids = Array.from({ length: 10 }, (_, i) => `org${i}`);
const slow = async () => { live++; most = Math.max(most, live); await new Promise((r) => setTimeout(r, 5)); live--; return { valid: true, exit: 0, code: null }; };
@@ -167,15 +167,19 @@ test("organizations are read at most ORG_READS_AT_ONCE at a time and listed in r
assert.equal(snap.organizations.count, 10);
});
// The timing tests below assert what was read, which no load changes, and a time bound far
// above the one deadline they prove; the "begun late" test moves the deadline's clock by hand.
test("the organization reads share one deadline: forty hung organizations take one timeout, not ten", async () => {
let calls = 0;
const calls = { busStatus: 0, processing: 0, orgConfig: 0 };
const ids = Array.from({ length: 40 }, (_, i) => `org${i}`);
const hang = () => { calls++; return new Promise(() => {}); };
const hang = (name) => () => { calls[name]++; return new Promise(() => {}); };
const began = Date.now();
const snap = await composeSnapshot({ orgs: async () => ids.map((id) => ({ id, state: "active" })), busStatus: hang, processing: hang, orgConfig: hang }, { timeoutMs: 200 });
const snap = await composeSnapshot({ orgs: async () => ids.map((id) => ({ id, state: "active" })), busStatus: hang("busStatus"), processing: hang("processing"), orgConfig: hang("orgConfig") }, { timeoutMs: 200 });
const took = Date.now() - began;
assert.ok(took < 800, `took ${took} ms`);
assert.ok(calls < ids.length, `${calls} reads began`);
// Ten timeouts would be 2000 ms; one is 200.
assert.ok(took < 1500, `took ${took} ms`);
// The config checks behind the first four hang to the deadline, and no later one begins.
assert.ok(calls.orgConfig < ids.length, `${calls.orgConfig} config checks began`);
assert.equal(snap.organizations.count, 40);
assert.deepEqual(snap.organizations.list.map((o) => o.id), ids);
for (const o of snap.organizations.list) assert.deepEqual([o.bus, o.processing, o.config], [NOT_READ, NOT_READ, NOT_READ], o.id);
@@ -184,11 +188,35 @@ test("the organization reads share one deadline: forty hung organizations take o
test("an organization begun late gets only what is left of the deadline", async () => {
const ids = ["a0", "a1", "a2", "a3", "a4"];
const hang = () => new Promise(() => {});
// Three readers hang; a3 answers after 300 ms, and the worker that read it starts a4 with 100 ms left.
const orgConfig = (id) => (id === "a3" ? new Promise((r) => setTimeout(() => r({ valid: true, exit: 0, code: null }), 300)) : hang());
// The deadline's clock moves only by hand. Three readers hang; a3 answers at once and moves the
// clock 300 ms, so the worker that read it starts a4 with 100 ms left. a4 answers after 250 ms:
// inside a whole timeout, outside what is left.
let t = 0;
const answer = { valid: true, exit: 0, code: null };
const orgConfig = (id) => {
if (id === "a3") { t += 300; return answer; }
if (id === "a4") return new Promise((r) => setTimeout(() => r(answer), 250));
return hang();
};
const began = Date.now();
const snap = await composeSnapshot({ orgs: async () => ids.map((id) => ({ id, state: "active" })), orgConfig }, { timeoutMs: 400 });
const snap = await composeSnapshot({ orgs: async () => ids.map((id) => ({ id, state: "active" })), orgConfig }, { timeoutMs: 400, clock: () => t });
const took = Date.now() - began;
assert.ok(took < 600, `took ${took} ms`);
assert.ok(took < 1500, `took ${took} ms`);
assert.deepEqual(snap.organizations.list.map((o) => [o.id, o.config === NOT_READ ? "not read" : "read"]), [["a0", "not read"], ["a1", "not read"], ["a2", "not read"], ["a3", "read"], ["a4", "not read"]]);
});
test("the bus and processing reads are not held behind the config checks: every organization's sockets are read", async () => {
const ids = Array.from({ length: 10 }, (_, i) => `org${i}`);
const hang = () => new Promise(() => {});
// The first four config checks hang to the deadline and hold every config slot; the socket reads answer at once.
const orgConfig = (id) => (ids.indexOf(id) < ORG_READS_AT_ONCE ? hang() : { valid: true, exit: 0, code: null });
const snap = await composeSnapshot({
orgs: async () => ids.map((id) => ({ id, state: "active" })),
busStatus: async () => ({ healthy: true, pid: 1 }),
processing: async () => ({ halted: false, invalid: false }),
orgConfig,
}, { timeoutMs: 300 });
assert.deepEqual(snap.organizations.list.map((o) => o.id), ids);
for (const o of snap.organizations.list) assert.deepEqual([o.bus.state, o.processing], ["running", { halted: false, invalid: false }], o.id);
for (const o of snap.organizations.list.slice(0, ORG_READS_AT_ONCE)) assert.equal(o.config, NOT_READ, o.id);
});
@@ -302,8 +302,9 @@ test('keyboard focus follows visual order and survives a data refresh', async t
await b.navigate(`http://127.0.0.1:${server.address().port}/#/orgs/ddigital/organization`);
await wait('document.querySelectorAll("[data-org-dashboard] .ws-doc").length > 0 && document.querySelectorAll("#workspace-nav .ws-proj").length === 3');
const wide = await tabStops(b, 'document.querySelector("#sections a")');
// The left column holds the sessions and, below them, the Workflows card (SP16); the right holds Settings.
const regions = ['nav', 'head', 'Sessions and workflows', 'Settings'];
// The left column holds the sessions and, below them, the Workflows card (SP16), then Autonomy and Starter
// packs (SP18); the right holds Settings.
const regions = ['nav', 'head', 'Sessions, workflows, autonomy and starter packs', 'Settings'];
assert.deepEqual([...new Set(wide.map(s => s.region))].filter(r => r !== 'other'), regions);
assertVisualOrder(wide.filter(s => s.region !== 'other'), regions, '1440');
const keys = wide.map(s => s.key);
@@ -312,6 +312,9 @@ test('a stopped organization is not read: the page and card say the bus is stopp
await wait(`document.querySelector('[data-org-dashboard] [data-wfg-card][data-bus-stopped]')`, 'stopped card');
assert.match(await b.evaluate(`document.querySelector('[data-wfg-card]').textContent`), /Not read: the bus is stopped\./);
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-card] [data-wfg-none]')`), null);
// SP18: the card is the page's one Workflows block; the old stopped panel under it said the same thing twice.
assert.equal(await b.evaluate(`[...document.querySelectorAll('[data-org-dashboard] h2, [data-org-dashboard] h3')].filter(h => h.textContent.trim() === 'Workflows').length`), 1, 'one Workflows heading on a stopped organization page');
assert.equal(await b.evaluate(`document.querySelector('[data-workflows]')`), null);
assert.equal(reads.filter(id => id === 'gamma').length, 0, 'a stopped organization is not read');
});
+18 -6
View File
@@ -114,13 +114,25 @@ lists.
- The extension's per-reply dedupe is in memory. After a restart the same
reply can get a second notice.
- Claude Code can run the Stop hook before it writes the turn to the
transcript (seen on 2.1.319 to 2.1.325, on any turn). The hook reads the
transcript again until its last reply matches `last_assistant_message`,
for up to 2 s. If it never does, the hook checks `last_assistant_message`
transcript (seen on 2.1.319 to 2.1.325, on any turn). The Stop hook keeps,
per session id, the uuid of the last prompt whose turn it checked, in
`<log>.stop.json` next to its log. A transcript is stale while its last
prompt has that uuid, or while its last reply does not match
`last_assistant_message`. The hook reads it again until it is not, for up
to 2 s. If it never catches up, the hook checks `last_assistant_message`
alone, logs an empty `entryId` and `late: true`, and the turn's earlier
replies go unchecked. Two stale cases remain: a hook input with no
`last_assistant_message`, and a reply whose text equals the last turn's
last reply. Either can log the last turn's replies again.
replies go unchecked; with no `last_assistant_message` it checks nothing.
Two cases are left. First, a late fallback records no prompt, because
the hook never saw the turn. When that turn lands in the transcript, a
later Stop can take it for its own: one with no
`last_assistant_message`, or one whose reply has the same text as the
late turn's last reply. That Stop checks the late turn's replies again.
Second, a Stop hook that blocks makes Claude go on with no new prompt,
so a second Stop in that turn finds the transcript stale by its prompt.
It waits 2 s and checks `last_assistant_message` alone, late. Managed
sessions do not reach this case: their only Stop hook never blocks. The
state file sits in the run directory with the log, so it is the
session's own record too.
- The word/phrase lists are the mechanical subset of ms-unslop only, keyed to
pattern ids in lists.json. Style judgments (voice, rhythm, structure) stay in
the skill, not the gate.
+54 -14
View File
@@ -77,38 +77,77 @@ function check(text, at) {
}
}
// The assistant messages with text since the transcript's last prompt.
function turnReplies(path) {
// The transcript's last prompt (its uuid, or null) and the assistant messages with text since it.
function lastTurn(path) {
const list = entries(path);
let start = -1;
list.forEach((e, i) => { if (isPrompt(e)) start = i; });
return replies(list.slice(start + 1));
const uuid = start >= 0 && typeof list[start].uuid === "string" && list[start].uuid ? list[start].uuid : null;
return { prompt: uuid, replies: replies(list.slice(start + 1)) };
}
// The Stop hook's own state, next to its log: per session id, the uuid of the last prompt whose
// turn it checked. At most STATE_MAX sessions are kept, the latest last.
const STATE = LOG ? `${LOG}.stop.json` : null;
const STATE_MAX = 64;
function stopState() {
if (!STATE) return {};
try {
const value = JSON.parse(fs.readFileSync(STATE, "utf8"));
return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
} catch { return {}; }
}
function recordStop(session, prompt) {
if (!STATE) return;
const state = stopState();
delete state[session];
state[session] = prompt;
const keys = Object.keys(state);
for (const k of keys.slice(0, Math.max(0, keys.length - STATE_MAX))) delete state[k];
const tmp = `${STATE}.${process.pid}`;
try {
fs.writeFileSync(tmp, JSON.stringify(state) + "\n");
fs.renameSync(tmp, STATE);
} catch {
try { fs.rmSync(tmp, { force: true }); } catch {}
}
}
// Claude Code can run the Stop hook before it writes the turn to the transcript, so the
// transcript may still end with the last turn. Read it again until its last reply is the one
// the hook input names, for up to STOP_WAIT_MS (the hook's own limit is 10 s). A transcript that
// never catches up gives last_assistant_message alone, logged with late: true so a release where
// it never matches shows in the log.
// Two stale cases remain: an input with no last_assistant_message is not waited for, and a reply
// whose text equals the last turn's last reply matches a stale transcript at once. Either can log
// the last turn's replies again.
// transcript may still end with the last turn. It is stale while its last prompt is the one the
// hook last checked for this session, or while its last reply is not the one the hook input
// names in last_assistant_message. Read it again until it is not, for up to STOP_WAIT_MS (the
// hook's own limit is 10 s). A transcript that never catches up gives last_assistant_message
// alone, logged with late: true so a release where it never matches shows in the log; with no
// last_assistant_message there is no reply to check, and nothing is logged.
// Two cases are left. A late fallback records no prompt uuid, since the hook never saw the turn.
// Once that turn lands, a later Stop with no last_assistant_message, or with a reply whose text
// equals the late turn's last reply, takes it for its own and logs its replies again. And a Stop
// hook that blocks makes Claude go on with no new prompt, so a second Stop in that turn finds the
// transcript stale by the uuid rule, waits, and logs only last_assistant_message, late. Managed
// sessions never reach the second case: their only Stop hook never blocks.
const STOP_WAIT_MS = 2000;
const flat = (s) => s.replace(/\s+/g, "");
const pause = (ms) => Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
function stop(input) {
const told = typeof input.last_assistant_message === "string" && input.last_assistant_message.trim() ? input.last_assistant_message : null;
const session = typeof input.session_id === "string" ? input.session_id : "";
const state = stopState();
const seen = Object.hasOwn(state, session) && typeof state[session] === "string" ? state[session] : null;
const stale = (t) => (t.prompt !== null && t.prompt === seen) || (told !== null && !(t.replies.length && flat(t.replies.at(-1).text) === flat(told)));
const deadline = Date.now() + STOP_WAIT_MS;
let turn = turnReplies(input.transcript_path), late = false;
while (told !== null && !(turn.length && flat(turn.at(-1).text) === flat(told))) {
let t = lastTurn(input.transcript_path);
let turn = t.replies, late = false;
while (stale(t)) {
if (Date.now() >= deadline) {
turn = [{ id: "", text: told }];
turn = told === null ? [] : [{ id: "", text: told }];
late = true;
break;
}
pause(25);
turn = turnReplies(input.transcript_path);
t = lastTurn(input.transcript_path);
turn = t.replies;
}
for (const r of turn) {
const result = check(r.text, "stop");
@@ -117,6 +156,7 @@ function stop(input) {
if (result.clean) log({ ev: "checked", clean: true, entryId: r.id, charsChecked: result.charsChecked, ...extra });
else log({ ev: "flagged", clean: false, entryId: r.id, charsChecked: result.charsChecked, findings: result.findings, ...extra });
}
if (!late && t.prompt !== null) recordStop(session, t.prompt);
}
// The entry ids the log already holds a notice for.
+48
View File
@@ -340,6 +340,54 @@ t("claude-hook: Stop with a transcript that never catches up checks last_assista
assert.deepStrictEqual(events(now).map((e) => [e.ev, e.entryId, e.late]), [["checked", "a1", undefined]]);
});
// The Stop hook keeps, per session and next to its log, the last prompt whose turn it checked. A
// transcript that still ends with that prompt is stale, even with no last_assistant_message or
// with a reply whose text equals the last turn's.
const appendLater = (from, to) => require("node:child_process").spawn("sh", ["-c", 'sleep 0.3; cat "$1" >> "$2"', "sh", from, to], { stdio: "ignore" });
t("claude-hook: Stop with no last_assistant_message does not check a turn it checked again, and waits for the late tail", () => {
const transcript = writeTmp("transcript-untold.jsonl", jsonl(lastTurn));
const log = tmp("hook-untold.jsonl");
const env = { MOSAIC_UNSLOP_LOG: log };
assert.strictEqual(hook("stop", { session_id: "s1", transcript_path: transcript }, env).status, 0);
assert.deepStrictEqual(events(log).map((e) => [e.ev, e.entryId]), [["checked", "a1"]]);
// The next turn's Stop runs before its turn reaches the transcript.
const writer = appendLater(writeTmp("transcript-untold-tail.jsonl", jsonl([
{ type: "user", uuid: "p2", message: { role: "user", content: "and now?" } },
line("assistant", "m2", "a2", [{ type: "text", text: TELL_REPLY }]),
])), transcript);
const r = hook("stop", { session_id: "s1", transcript_path: transcript }, env);
writer.kill();
assert.strictEqual(r.status, 0, r.stderr);
assert.deepStrictEqual(events(log).map((e) => [e.ev, e.entryId]), [["checked", "a1"], ["flagged", "a2"]]);
// A transcript that never catches up gives nothing to check: nothing is logged.
assert.strictEqual(hook("stop", { session_id: "s1", transcript_path: transcript }, env).status, 0);
assert.strictEqual(events(log).length, 2);
// The state is per session: another session on the same log has checked nothing yet.
hook("stop", { session_id: "s2", transcript_path: transcript }, env);
assert.deepStrictEqual(events(log).slice(2).map((e) => [e.ev, e.entryId]), [["flagged", "a2"]]);
});
t("claude-hook: Stop whose reply has the last turn's text does not take the stale transcript for this turn", () => {
const transcript = writeTmp("transcript-same.jsonl", jsonl(lastTurn));
const log = tmp("hook-same.jsonl");
const env = { MOSAIC_UNSLOP_LOG: log };
const told = { session_id: "s1", transcript_path: transcript, last_assistant_message: "The build is green." };
assert.strictEqual(hook("stop", told, env).status, 0);
assert.deepStrictEqual(events(log).map((e) => [e.ev, e.entryId]), [["checked", "a1"]]);
const writer = appendLater(writeTmp("transcript-same-tail.jsonl", jsonl([
{ type: "user", uuid: "p2", message: { role: "user", content: "still?" } },
line("assistant", "m2", "a2", [{ type: "text", text: "The build is green." }]),
])), transcript);
const r = hook("stop", told, env);
writer.kill();
assert.strictEqual(r.status, 0, r.stderr);
assert.deepStrictEqual(events(log).map((e) => [e.ev, e.entryId]), [["checked", "a1"], ["checked", "a2"]]);
// A transcript that never catches up gives last_assistant_message alone, late.
hook("stop", told, env);
assert.deepStrictEqual(events(log).slice(2).map((e) => [e.ev, e.entryId, e.late]), [["checked", "", true]]);
});
let failed = 0;
for (const [name, ok] of results) { console.log(`${ok ? "PASS" : "FAIL"} ${name}`); if (!ok) failed++; }
console.log(`${results.length - failed}/${results.length} passed`);