Compare commits

...
29 Commits
Author SHA1 Message Date
jason.woltje e5d1a37c9a Test that a task record with a container name keeps its worker key 2026-11-21 16:34:00 -06:00
jason.woltje 95a6be3b63 Hold a worker key for a container whose launcher died, and re-add a refused fast-path key under the lock 2026-11-21 16:34:00 -06:00
jason.woltje 882c12a136 Give the Triage key module a worker purpose, a lock-free launch path and a retire guard 2026-11-21 16:34:00 -06:00
jason.woltje 0aac96dd15 Stop naming a lost proxy for an idle close, and test that an error ends both sides
Re-check of bab5f47d9 found two minor things; this fixes them and one note.

- The forwarder printed the fixed line when the proxy closed an idle
  connection that never carried a request. An upstream end now counts
  only when the forwarder had sent the client's bytes; a socket error
  still always counts.
- Nothing tested that an error on one side ends the other. A new test
  streams from a proxy that keeps writing after a FIN, drops and resets
  120 connections mid-stream, and checks that the relay's and the
  forwarder's fd counts return to their baseline. With the error path
  cut it fails at 222 and 102 fds.
- A linger timer is now cleared when its socket closes by itself.
- spawnRelay's start timeout sends SIGKILL, so a relay wedged before
  "ready" cannot outlive it.
2026-11-21 16:22:32 -06:00
jason.woltje f904d7afda Keep a slow reader's tail, run the relay with no environment, and name a lost proxy
Review of 62468f963 found five things; this fixes them.

- Both copiers destroyed the other side on close, which cut a reply
  short for a client that half-closed and read slowly. A clean close now
  ends the other side and lets it flush; it is destroyed when its peer
  closes or 10 s after its last byte. An error still ends both at once.
- spawnRelay passed the caller's whole environment. The relay now runs
  with an empty one.
- The forwarder said nothing when the proxy died after the start check.
  A connection that ends before any reply byte, while the client still
  waits, now prints the fixed line once.
- stop() could wait forever on a wedged relay. It now sends SIGKILL
  after 2 s, and a stdin error cannot escape to the caller.
- New tests: half-closed slow reader through the relay and through the
  forwarder, empty environment, stop() on a stopped relay, the ppid poll
  alone, SIGINT and SIGHUP, and the proxy gone after the start check.
2026-11-21 16:22:32 -06:00
jason.woltje c27612cf41 Add the worker proxy relay and in-container forwarder, tested, not wired
Slice S2 of worker-proxy-simple. The host relay
(packages/processing-control/src/proxy-relay.mjs) listens on a 0600 Unix
socket in a caller-made 0700 directory and copies bytes to 127.0.0.1:<port>.
It refuses any other target, a socket path of 108 bytes or more, an unsafe
directory and an existing path. It exits on stdin EOF, on TERM, INT or HUP,
and when its parent changes.

The forwarder (adapters/pi/proxy-forward.mjs) listens on 127.0.0.1:<port>
and copies bytes to the socket. One start check through the socket must get
a reply byte; otherwise it prints one fixed line and exits 1.

Nothing calls either file yet except the tests. adapter.sh, compose.yaml,
the Containerfile and containers.mjs are unchanged.
2026-11-21 16:22:32 -06:00
jason.woltje 7264134899 Correct the final-stop notes from review, and name the cap and an unknown signal plainly
The header no longer claims stderr never carries an environment value: the
error line is pi's message as sent, and run-task redacts it. A comment says
why a worker fails a length stop with text while a managed session does
not. An unknown signal exits 1 rather than 128, and the over-cap line names
the 64 MiB cap. TOOLS.md notes that the wrapper is process 1 in the
container and passes SIGINT to pi.
2026-11-21 15:58:10 -06:00
jason.woltje 66d66eb736 Judge a pi worker run by its final stop reason, and print the cause of a failed run
In text print mode pi exits 1 on an error or aborted stop, but a length
stop exits 0 with nothing printed, so run-task recorded an empty success.
The worker entrypoint now sets MOSAIC_PI_FINAL_STOP=1 for headless pi.
adapter.sh then runs pi through final-stop.mjs, which uses --mode json,
keeps the last agent_end and fails the run on an error, aborted or length
stop with one plain line on stderr. A finished stop prints the answer as
text mode does. run-task also prints the cause line that show prints. The
reason stays exit-nonzero, with no new field. The mock adapter is unchanged.
2026-11-21 15:35:49 -06:00
jason.woltje baf5714443 Keep the Triage key state through a failed read, and stop a replaced decision draw
Re-check fix round. Triage settings hold the key state apart from the
read data, so a read that fails after a key change cannot let an older
read put back the old key state. The decision view checks that its draw
is still current after reading earlier versions, so a draw a newer one
replaced does not change the kept notice results.
2026-11-21 00:04:03 -06:00
jason.woltje 5f7adb7670 Keep a reload's route across a key change, and drop a result when its decision returns
Review fix round. A key change in Triage settings no longer drops a
Reload route read that was in flight. The read still draws its route
and revision, and keeps the newer key state. A decision notice drops
its kept result when the decision comes back into the inbox after a
draw saw it gone.
2026-11-20 23:52:05 -06:00
jason.woltje fc60809b80 Keep decision notice results, and drop older triage and workflow reads
The decision notice on an inbox decision kept its result only in the
page node, so the next poll redraw lost it, and a confirmed or reversed
decision left the inbox read with its notice. The result is now kept in
page memory per decision; a redraw keeps the result line and keeps both
buttons off while an answer is in flight.

Settings > Triage applied every route read. A read from an earlier visit
or a Reload route read that answered after a save or key change put back
the old route, revision or key state, and the next save was refused as
stale. Reads are now numbered as they start; one older than what the
page has drawn is dropped, and a save or key change takes a new number.

Workflows applied plain loads in the order they answered. Each
organization's loads are now numbered too, and an older load that
answers last, or fails last, is dropped. The SP17 write epochs are
unchanged.
2026-11-20 23:41:38 -06:00
jason.woltje 9b3cbe4296 Test that a hire receipt survives an overlapping packs reload
Two forced-order tests for the hire click. They fail without the packs state fix in 5a7e6765f.
2026-11-20 23:25:29 -06:00
jason.woltje 1e8a20074d Keep a newer autonomy read that lands during a save
Re-check of 7cba209dc (P3-1): a save can commit, another writer can
commit after it, and a poll can draw that newer read before the save
answers. The save then wrote its own older values into the state, and
the new redraw painted them over the newer form. It failed closed, but
the page showed older values.

A save that answers now writes its values into the state only when the
state still holds the revision it sent or the one it got back. Any other
revision was written after the save, so it stays. The redraw draws from
that state, so it never paints older values.

The older-read test waits for the draw as well as the read, since the
dashboard draws only after all its reads (re-check P3-2). A new test
forces the newer-writer order.
2026-11-20 22:48:55 -06:00
jason.woltje 2e78c7e593 Draw an autonomy save over a clean form drawn from an older read
Review of a4a035d17 (P3-1): a reload whose read was served before a save
committed could redraw a clean form while the save was in flight. The
save then wrote its revision to the form it started on, which the page
no longer drew. The drawn form showed the old levels next to the receipt,
and a second save before the next poll was refused as a revision
conflict.

A save that answers now draws the settings section again from the saved
state when the drawn form is a different, clean form. A form the owner is
editing stays, so it saves against its own revision and fails closed.
The live section lookup skips decision notices for the hold check too.

The older-read test now waits on the held read by the revision it
carries, so a poll in the window cannot move its count (P3-3). A new test
forces the P3-1 order and checks the drawn form before any reload.
2026-11-20 22:48:55 -06:00
jason.woltje fbfcd942be Keep an autonomy save or review receipt that overlaps a reload
The autonomy panel built a new state object on every load and copied the
status from the state it found when the load began. A save kept the old
object across its own request. So a save that answered while a poll or
an organization change was reading autonomy wrote its receipt and its new
revision to an object the page no longer drew, or the load copied the
empty status forward before the receipt existed. The next draw then
showed no receipt and the old revision, so the next save was refused as
a revision conflict. A trail review wrote its line only to the node it
started on, which a redraw replaces.

Each organization now keeps one state object. A load writes its read into
it when it ends. A load that began before the last applied read, or
before a save answered, is dropped. A save or review result is kept in
that state and written to the status line the page draws now.

Browser tests hold the fixture's calls to force each order of a save
against a reload, a review against a reload, and an older read that
answers after a newer one.
2026-11-20 22:48:55 -06:00
jason.woltje 5a7e6765f8 Keep a pack preview or receipt that overlaps a packs reload
The pack picker built a new state object on every load and copied the
preview and receipt from the state it found when the load began. A click
kept the old object across its own request. So a preview or a hire receipt
that answered while a poll or an apply's page reload was reading the packs
was written to an object the page no longer drew, or was copied away
before it existed. Under host load this dropped the project preview in the
SP6 pack picker test and the hire status in the pack hire test.

Each organization now keeps one state object. A load writes its read
fields into it when it ends, and a load that began before the last one
applied is dropped, so an older list never replaces a newer one.

One browser test holds the fixture's reads to force each order of the
overlap, a second forces an older packs read to answer last, and a third
holds a reload's packs read while an apply's receipt lands.
2026-11-20 20:33:47 -06:00
jason.woltje 69b3931c35 Resolve recheck follow-up cases 2026-11-20 19:43:53 -06:00
jason.woltje b7116be9c3 Address review of proxy administration follow-ups 2026-11-20 19:43:53 -06:00
jason.woltje 0f3135e36a Show unanswered organizations with offered models 2026-11-20 19:43:53 -06:00
jason.woltje b0dd4d3e2f Recognize organizations without a launch in model survey 2026-11-20 19:43:53 -06:00
jason.woltje e8c6c7e3a4 Test the 257 model limit boundary 2026-11-20 19:43:53 -06:00
jason.woltje fe671844ea Guard shared credential names with invalid account IDs 2026-11-20 19:43:53 -06:00
jason.woltje b3eaa8fd81 Preserve account removal success when refresh fails 2026-11-20 19:43:53 -06:00
jason.woltje 07baa87381 Clarify account removal ambiguity 2026-11-20 19:43:53 -06:00
jason.woltje 5e67fd9289 test(webui): wait for restart completion 2026-11-20 18:43:48 -06:00
jason.woltje ffc7db130f test(webui): enforce switch ordering in restart check 2026-11-20 18:43:48 -06:00
jason.woltje d6de22aaf8 test(webui): isolate browser waits and offline observation 2026-11-20 18:43:48 -06:00
jason.woltje f4134fff9a Fix account repair navigation and coverage 2026-11-20 17:03:22 -06:00
jason.woltje 122659a488 Make model setup account status truthful 2026-11-20 17:03:22 -06:00
35 changed files with 3405 additions and 229 deletions

No files matched your search

+5 -1
View File
@@ -31,6 +31,7 @@ Optional, adapter-specific (documented per adapter):
| Variable | Meaning |
|---|---|
| `MOSAIC_MOCK_RESPONSE` | mock only: the verbatim response to emit |
| `MOSAIC_PI_FINAL_STOP` | pi only, `1` from `src/run-agent.sh` for a headless worker: judge the run by pi's final stop reason (`final-stop.mjs`) |
**Outputs:**
@@ -53,7 +54,10 @@ Optional, adapter-specific (documented per adapter):
## Included adapters
- `pi` — the `@earendil-works/pi-coding-agent` CLI (not pinned; #1873) in noninteractive
print mode (`-p`), ambient discovery disabled, stdin detached.
print mode (`-p`), ambient discovery disabled, stdin detached. A worker run
(`MOSAIC_PI_FINAL_STOP=1`) goes through `final-stop.mjs`: pi runs with
`--mode json`, the answer is printed only on a finished stop, and an error,
aborted or output-limit stop exits 1 with one line on stderr.
- `mock` — deterministic echo of `MOSAIC_MOCK_RESPONSE`. Test-only: never use
it where a real model response is required.
- `claude` — the host's `claude` CLI, for managed sessions only (below):
+8
View File
@@ -148,5 +148,13 @@ if [ -n "${MOSAIC_MODEL_EVENT_MONITOR:-}" ] && [ "$INTERACTIVE" != "1" ]; then
STREAM="$(dirname "$0")/../../packages/plugins/harness/pi/model-stream.mjs"
exec node "$STREAM" pi "$MOSAIC_FIRST_OUTPUT_DIR" "${MOSAIC_PI_BIN:-pi}" "$@" --mode json
fi
# worker-stop-reason: a run-task worker (src/run-agent.sh sets MOSAIC_PI_FINAL_STOP=1) is judged
# by pi's final stop reason as well as its exit status. Text mode exits 0 on a "length" stop with
# nothing printed; final-stop.mjs runs pi with --mode json, prints the answer as text mode does on
# a finished stop, and fails the run on an error, aborted or length stop with one line on stderr.
# Managed sessions never set it and keep text mode.
if [ "${MOSAIC_PI_FINAL_STOP:-}" = "1" ] && [ "$INTERACTIVE" != "1" ]; then
exec node "$(dirname "$0")/final-stop.mjs" "${MOSAIC_PI_BIN:-pi}" "$@"
fi
# #1873 S2: the binary the harness module found (MOSAIC_PI_BIN, its path inside the sandbox).
exec "${MOSAIC_PI_BIN:-pi}" "$@"
+152
View File
@@ -0,0 +1,152 @@
#!/usr/bin/env node
// worker-stop-reason: judge a headless pi worker run by pi's final stop reason, not only its exit
// status. The worker entrypoint (src/run-agent.sh) asks for this with MOSAIC_PI_FINAL_STOP=1, and
// adapter.sh then runs `node final-stop.mjs <pi> <args...>` in place of `<pi> <args...>`.
//
// Why: in text print mode (-p) pi 0.85.1 exits 1 on an "error" or "aborted" stop, but a "length"
// stop (the model reached its output limit) exits 0 with nothing on stdout or stderr, so run-task
// recorded an empty success. Only the JSON event stream says how the run ended: its last
// agent_end event carries the run's messages, and the last assistant message's stopReason is the
// final stop. Proved against pi 0.85.1 with a fake provider on loopback (packages/plugins/tests/
// pi-final-stop.test.mjs).
//
// This runs pi with `--mode json` and keeps only the last agent_end line (bounded). Then:
// pi exited nonzero the same code, pi's own stderr already said why
// pi was stopped by a signal 128 + the signal number, one line on stderr
// final stop "stop" the text parts, each followed by "\n" (as text mode prints), exit 0
// final stop "toolUse" nothing, exit 0 (a tool ended the run; text mode prints nothing)
// final stop "error"/"aborted" exit 1, one line: pi stopped on an error: <pi's error message>
// final stop "length" exit 1, one line: the model reached its output limit
// anything else exit 1, one line (fail closed: no final answer to judge)
// stdout carries the answer only on success. An error line carries pi's error message as the
// provider sent it, as text mode printed it; run-task redacts known secret values before it shows
// the cause (runCause in scripts/mosaic-task.mjs).
import { spawn } from "node:child_process";
import { realpathSync } from "node:fs";
import { constants } from "node:os";
import { fileURLToPath } from "node:url";
export const AGENT_END_PREFIX = '{"type":"agent_end"';
// The cap on the one line kept. agent_end carries every message of the run, tool results too.
export const MAX_AGENT_END_BYTES = 64 * 1024 * 1024;
const MAX_LINE_CHARS = 2000;
const oneLine = (text) => {
const line = String(text).replace(/\s+/g, " ").trim();
return line.length > MAX_LINE_CHARS ? `${line.slice(0, MAX_LINE_CHARS)}...` : line;
};
// The judgement for the last agent_end line pi wrote (null when it wrote none):
// { ok: true, answer } or { ok: false, message }.
export function judgeFinalStop(agentEndLine) {
if (agentEndLine === null) return { ok: false, message: "pi ended without a final answer: it reported no end of run" };
let event;
try { event = JSON.parse(agentEndLine); } catch { return { ok: false, message: "pi ended without a final answer: its end of run could not be read" }; }
const messages = Array.isArray(event?.messages) ? event.messages : [];
let last = null;
for (let i = messages.length - 1; i >= 0; i--) {
if (messages[i]?.role === "assistant") { last = messages[i]; break; }
}
if (!last) return { ok: false, message: "pi ended without a final answer: the model gave no reply" };
const reason = last.stopReason;
if (reason === "stop" || reason === "toolUse") {
if (messages[messages.length - 1] !== last) return { ok: true, answer: "" };
const parts = Array.isArray(last.content) ? last.content : [];
return { ok: true, answer: parts.filter((p) => p?.type === "text" && typeof p.text === "string").map((p) => `${p.text}\n`).join("") };
}
if (reason === "error" || reason === "aborted") {
const said = typeof last.errorMessage === "string" && last.errorMessage.trim() ? oneLine(last.errorMessage) : `request ${reason}`;
return { ok: false, message: `pi stopped on an error: ${said}` };
}
// A worker run fails on "length" even with partial text: the answer was cut off. A managed
// session first turn (packages/plugins/harness/pi/model-stream.mjs) counts length with text as
// output; that turn is a conversation, a worker run is a finished job.
if (reason === "length") return { ok: false, message: "pi stopped with no finished answer: the model reached its output limit" };
return { ok: false, message: `pi ended without a final answer: it stopped for an unknown reason (${oneLine(String(reason)).slice(0, 40)})` };
}
// Keeps the last line that starts with AGENT_END_PREFIX out of a byte stream, holding at most
// one such line (up to max bytes) in memory. Other lines pass through unkept.
export function agentEndKeeper(max = MAX_AGENT_END_BYTES) {
let chunks = [];
let size = 0;
let state = "start"; // start: at a line start; keep: in an agent_end line; skip: in another line
let head = Buffer.alloc(0);
let last = null;
let tooBig = false;
const finishLine = () => {
if (state === "keep") {
if (size > max) tooBig = true;
else { last = Buffer.concat(chunks).toString("utf8"); tooBig = false; }
}
chunks = []; size = 0; state = "start"; head = Buffer.alloc(0);
};
const feedPart = (part) => {
if (state === "start") {
head = Buffer.concat([head, part]);
const prefix = Buffer.from(AGENT_END_PREFIX);
const n = Math.min(head.length, prefix.length);
if (!head.subarray(0, n).equals(prefix.subarray(0, n))) { state = "skip"; head = Buffer.alloc(0); return; }
if (head.length < prefix.length) return;
state = "keep"; part = head; head = Buffer.alloc(0);
}
if (state === "keep") {
size += part.length;
if (size <= max) chunks.push(part); else chunks = [];
}
};
return {
write(buffer) {
let at = 0;
while (at < buffer.length) {
const nl = buffer.indexOf(10, at);
if (nl === -1) { feedPart(buffer.subarray(at)); return; }
feedPart(buffer.subarray(at, nl));
finishLine();
at = nl + 1;
}
},
end() {
if (state === "keep") finishLine();
return { line: tooBig ? null : last, tooBig };
},
};
}
async function main(argv) {
const [pi, ...args] = argv;
if (!pi) { process.stderr.write("pi final stop: no pi binary was given\n"); return 2; }
const keeper = agentEndKeeper();
const child = spawn(pi, [...args, "--mode", "json"], { stdio: ["inherit", "pipe", "inherit"] });
const forward = (signal) => { try { child.kill(signal); } catch {} };
for (const signal of ["SIGTERM", "SIGINT", "SIGHUP"]) process.on(signal, () => forward(signal));
child.stdout.on("data", (buffer) => keeper.write(buffer));
const outcome = await new Promise((resolve) => {
child.on("error", (error) => resolve({ error }));
child.on("close", (code, signal) => resolve({ code, signal }));
});
if (outcome.error) {
process.stderr.write(`pi final stop: pi could not be started (${outcome.error.code ?? "spawn error"})\n`);
return 127;
}
if (outcome.signal) {
process.stderr.write(`pi final stop: pi was stopped by ${outcome.signal}\n`);
const number = constants.signals[outcome.signal];
return Number.isInteger(number) && number > 0 ? 128 + number : 1;
}
if (outcome.code !== 0) return outcome.code ?? 1;
const { line, tooBig } = keeper.end();
const verdict = tooBig
? { ok: false, message: `pi ended without a final answer: its end of run was over ${MAX_AGENT_END_BYTES / (1024 * 1024)} MiB` }
: judgeFinalStop(line);
if (!verdict.ok) {
process.stderr.write(`${verdict.message}\n`);
return 1;
}
await new Promise((resolve) => process.stdout.write(verdict.answer, resolve));
return 0;
}
let isMain = false;
try { isMain = realpathSync(process.argv[1] ?? "") === realpathSync(fileURLToPath(import.meta.url)); } catch {}
if (isMain) process.exitCode = await main(process.argv.slice(2));
+124
View File
@@ -0,0 +1,124 @@
#!/usr/bin/env node
// In-container forwarder for the model proxy (worker-proxy-simple, slice S2).
//
// node proxy-forward.mjs <socket path> <port>
//
// Listens on 127.0.0.1:<port> inside the container and copies bytes, both
// ways, to the host relay's Unix socket (packages/processing-control/src/
// proxy-relay.mjs), which copies them to the host's loopback model proxy.
// It parses nothing and holds no key.
//
// Start check. Before it listens it makes one connection through the socket
// and sends one small HTTP request (HEAD /). Any reply byte within five
// seconds passes: the socket, the relay and the proxy all answered. Anything
// else prints exactly one line on stderr and exits 1:
//
// worker: the container could not reach the model proxy socket.
//
// The same line is printed once, and the forwarder keeps running, when a later
// connection fails before any reply byte: the socket refuses, or the relay
// hangs up on a request with no reply, which is what a gone proxy looks like.
// An idle connection that the proxy closes before any request is not counted.
//
// Output. One line "ready" on stdout once the port listens, then stdout is
// closed. The caller captures it (for example ready=$(node ... &)), so it
// never mixes with the adapter's response on stdout. A usage or listen
// failure is one other line on stderr and exits 2.
// Not called by adapter.sh yet; the cutover slice (S4) starts it.
import { closeSync, openSync } from 'node:fs';
import net from 'node:net';
import { isAbsolute } from 'node:path';
const UNREACHABLE = 'worker: the container could not reach the model proxy socket.';
const CHECK_MS = 5000;
const CHECK_REQUEST = 'HEAD / HTTP/1.1\r\nHost: 127.0.0.1\r\nConnection: close\r\n\r\n';
let told = false;
function unreachable() {
if (!told) { told = true; process.stderr.write(`${UNREACHABLE}\n`); }
}
function check(socketPath) {
return new Promise((resolveCheck) => {
let passed = false, finished = false;
const probe = net.connect({ path: socketPath });
const finish = (ok) => {
if (finished) return;
finished = true;
clearTimeout(timer);
probe.destroy();
resolveCheck(ok);
};
const timer = setTimeout(() => finish(false), CHECK_MS);
probe.once('connect', () => probe.write(CHECK_REQUEST));
probe.on('data', () => { passed = true; finish(true); });
probe.on('error', () => finish(false));
probe.on('close', () => finish(passed));
});
}
// Copy bytes both ways. An error on either side ends both at once. A clean
// close of one side only ends the other, so bytes still queued for a slow
// reader are flushed first; that side is destroyed when its peer closes too,
// or LINGER_MS after its last byte was written. Kept in step with the same
// helper in packages/processing-control/src/proxy-relay.mjs.
const LINGER_MS = 10000;
function join(a, b) {
const kill = () => { a.destroy(); b.destroy(); };
const finish = (other) => () => {
if (other.destroyed) return;
other.resume();
other.end();
const linger = () => {
const timer = setTimeout(() => other.destroy(), LINGER_MS).unref();
other.once('close', () => clearTimeout(timer));
};
if (other.writableFinished) linger(); else other.once('finish', linger);
};
a.on('error', kill); b.on('error', kill);
a.on('close', finish(b)); b.on('close', finish(a));
a.pipe(b); b.pipe(a);
}
async function main(argv) {
const port = /^[1-9][0-9]{0,4}$/.test(argv[1] ?? '') ? Number(argv[1]) : 0;
if (argv.length !== 2 || !isAbsolute(argv[0]) || port < 1 || port > 65535) {
process.stderr.write('worker: proxy forwarder usage: proxy-forward.mjs <socket path> <port>.\n');
process.exit(2);
}
const socketPath = argv[0];
if (!(await check(socketPath))) {
unreachable();
process.exit(1);
}
const server = net.createServer({ allowHalfOpen: true }, (client) => {
const upstream = net.connect({ path: socketPath, allowHalfOpen: true });
let clientDone = false;
client.once('end', () => { clientDone = true; });
client.once('close', () => { clientDone = true; });
// The socket failed, or the relay hung up on a request before any reply
// byte while the client still waited: what a gone proxy looks like. An
// idle connection the proxy closes before any request is not counted.
const lost = () => { if (!clientDone && upstream.bytesRead === 0) unreachable(); };
upstream.on('error', lost);
upstream.once('end', () => { if (upstream.bytesWritten > 0) lost(); });
join(client, upstream);
});
server.on('error', () => {
process.stderr.write(`worker: the model proxy forwarder could not listen on 127.0.0.1:${port}.\n`);
process.exit(2);
});
server.listen({ host: '127.0.0.1', port, exclusive: true }, () => {
// Node never closes fd 1 itself, so close it and put /dev/null in its place:
// a caller reading stdout to its end then gets EOF right after "ready".
process.stdout.write('ready\n', () => {
try { closeSync(1); openSync('/dev/null', 'w'); } catch {}
});
});
}
main(process.argv.slice(2)).catch(() => {
unreachable();
process.exit(1);
});
+18 -1
View File
@@ -78,7 +78,24 @@ the expected text`, `processing was halted during the run`). Otherwise it is
progress and warning lines passed over, redacted (paths, links, emails,
key-shaped strings) and withheld when it holds a value from the environment.
With no such line it says the worker container could not be started or the
worker exited with its code and wrote nothing that can be shown.
worker exited with its code and wrote nothing that can be shown. `mosaic-task
run` prints the same line as `cause: <reason>` after `response:` when the run
did not succeed.
A pi worker is judged by pi's final stop reason as well as its exit status
(worker-stop-reason). In print mode pi exits 0 when the model reaches its
output limit, with nothing printed, so that run used to count as succeeded.
The container's entrypoint sets `MOSAIC_PI_FINAL_STOP=1` for a headless pi
run, and the pi adapter then runs pi through `adapters/pi/final-stop.mjs`,
which reads pi's JSON event stream. A finished stop prints the answer as
before. An error or aborted stop fails with `pi stopped on an error: <pi's
error>`, and an output-limit stop fails with `pi stopped with no finished
answer: the model reached its output limit`. The reason stays
`exit-nonzero`, and the line is the `worker said:` cause. Managed sessions
don't set the variable and keep text mode. In the container the wrapper is
process 1 and passes SIGTERM, SIGINT and SIGHUP to pi, so a SIGINT that
reaches the container now stops pi (exit 130). Before, pi was process 1 and
ignored SIGINT.
Legacy worker containers use a typed per-launch mount contract. Task, mission,
user and session-fork snapshots are read-only. A fork source is opened without
+3 -3
View File
@@ -108,7 +108,7 @@ export class ProxyPage {
rows.push({ ...view(this.#providers, key.auth_index, provider, status, key.priority ?? group.priority), source: 'apikey', groupIndex, keyIndex, models: configured.map(m => m.alias || m.name) });
}
}
return { rows, groups };
return { rows, groups, credentialNames: response.files.map(row => row?.name).filter(identifier) };
}
#public(row) {
const { accountId, provider, displayName, status, priority } = row;
@@ -271,13 +271,13 @@ export class ProxyPage {
fields(args, ['accountId', 'confirm']);
if (typeof args.accountId !== 'string' || !/^[a-f0-9]{12}$/.test(args.accountId) || args.confirm !== true) refuse('invalid-request');
return this.#write(async () => {
const { rows, groups } = await this.#accounts();
const { rows, groups, credentialNames } = await this.#accounts();
const original = this.#lock ? structuredClone(groups) : null;
const matches = rows.filter(row => row.accountId === args.accountId);
if (matches.length !== 1) refuse('invalid-request');
const row = matches[0];
// The DELETE names a credential file; another listed account on the same name would go too.
if (row.source === 'oauth' && rows.some(r => r !== row && r.source === 'oauth' && r.name === row.name)) refuse('invalid-request');
if (row.source === 'oauth' && credentialNames.filter(name => name === row.name).length !== 1) refuse('invalid-request');
if (this.#lock && !isDeepStrictEqual(await this.#client.getUpstreamGroups(), original)) refuse('proxy-down');
this.#beforeMutation('proxy.account.remove');
try {
+51 -27
View File
@@ -7,6 +7,12 @@
// <configDir>/secrets/triage/model (directory 0700, file 0600, the running user's)
// { version, key, keyId, issuedAt, rotateBy, retiring: [{ key, keyId, issuedAt, retireAt }] }
//
// worker-key-purpose (S3 of reports/worker-proxy-simple.md, Jason's ruling 2026-11-21): the same
// file shape and checks serve the worker key. A purpose, `triage` (the default, unchanged) or
// `worker`, picks the key prefix, the directory, the wording and the code prefix:
// triage mst-<tag>-triage-<43> <configDir>/secrets/triage/model triage-key-*
// worker msw-<tag>-worker-<43> <configDir>/secrets/worker/model worker-key-*
//
// Messages name files, never values.
import { closeSync, constants, fchmodSync, fstatSync, lstatSync, mkdirSync, openSync, readFileSync } from "node:fs";
import { createHash } from "node:crypto";
@@ -29,16 +35,30 @@ export class TriageKeyError extends Error {
this.exitCode = exitCode;
}
}
export const unreadable = (why) => new TriageKeyError("triage-key-unreadable", `the Triage key store is unreadable: ${why}`);
// What a purpose changes. `code` prefixes every refusal code this module and triage-key.mjs raise
// for that purpose; `head` and `name` make the key prefix; `dir` is the directory under secrets.
export const PURPOSES = Object.freeze({
triage: Object.freeze({ name: "triage", head: "mst", dir: "triage", code: "triage-key", store: "the Triage key store", dirWords: "the triage secrets directory", label: "Triage" }),
worker: Object.freeze({ name: "worker", head: "msw", dir: "worker", code: "worker-key", store: "the worker key store", dirWords: "the worker secrets directory", label: "worker" }),
});
export function purposeOf(purpose = "triage") {
if (!Object.hasOwn(PURPOSES, purpose)) throw new TypeError("the key purpose must be triage or worker");
return PURPOSES[purpose];
}
// A refusal for `purpose`: `suffix` is the part after the prefix, so ("worker", "raced") is
// worker-key-raced. The Triage codes are exactly the codes this module raised before purposes.
export const keyError = (purpose, suffix, message, exitCode) => new TriageKeyError(`${purposeOf(purpose).code}-${suffix}`, message, exitCode);
export const unreadable = (why, purpose = "triage") => keyError(purpose, "unreadable", `${purposeOf(purpose).store} is unreadable: ${why}`);
export const keyIdOf = (key) => createHash("sha256").update(key).digest("hex").slice(0, 12);
export const instanceTag = (configDir) => createHash("sha256").update(configDir).digest("hex").slice(0, 12);
export const keyPrefix = (configDir) => `mst-${instanceTag(configDir)}-triage-`;
const ownKey = (configDir) => (k) => typeof k === "string" && k.startsWith(keyPrefix(configDir)) && SECRET.test(k.slice(keyPrefix(configDir).length));
export const keyPrefix = (configDir, purpose = "triage") => { const p = purposeOf(purpose); return `${p.head}-${instanceTag(configDir)}-${p.name}-`; };
const ownKey = (configDir, purpose) => (k) => typeof k === "string" && k.startsWith(keyPrefix(configDir, purpose)) && SECRET.test(k.slice(keyPrefix(configDir, purpose).length));
export function keyPaths(configDir) {
export function keyPaths(configDir, purpose = "triage") {
const secrets = join(configDir, "secrets");
const dir = join(secrets, "triage");
const dir = join(secrets, purposeOf(purpose).dir);
return { secrets, dir, file: join(dir, "model") };
}
@@ -47,8 +67,8 @@ const exactKeys = (v, keys) => plain(v) && Object.keys(v).length === keys.length
const canonicalTime = (s) => typeof s === "string" && ISO.test(s) && !Number.isNaN(Date.parse(s)) && new Date(s).toISOString() === s;
const canonicalDay = (s) => typeof s === "string" && DAY.test(s) && !Number.isNaN(Date.parse(`${s}T00:00:00Z`)) && new Date(`${s}T00:00:00Z`).toISOString().slice(0, 10) === s;
export function validRecord(doc, configDir) {
const own = ownKey(configDir);
export function validRecord(doc, configDir, purpose = "triage") {
const own = ownKey(configDir, purpose);
return exactKeys(doc, FIELDS)
&& doc.version === KEY_VERSION
&& own(doc.key) && doc.keyId === keyIdOf(doc.key)
@@ -62,23 +82,24 @@ export function validRecord(doc, configDir) {
const uidOf = (opts) => opts.uid ?? process.getuid();
// A real directory, the running user's, mode 0700. Missing: false, or made when `create` is on.
export function checkDir(dir, uid, what, { create }) {
export function checkDir(dir, uid, what, { create, purpose = "triage" }) {
const bad = (why) => unreadable(why, purpose);
let st;
try { st = lstatSync(dir); }
catch (e) {
if (e.code !== "ENOENT") throw unreadable(`${what} cannot be read`);
if (e.code !== "ENOENT") throw bad(`${what} cannot be read`);
if (!create) return false;
try { mkdirSync(dir, { mode: 0o700 }); } catch { throw unreadable(`${what} cannot be made`); }
try { mkdirSync(dir, { mode: 0o700 }); } catch { throw bad(`${what} cannot be made`); }
try {
const fd = openSync(dir, constants.O_RDONLY | constants.O_DIRECTORY | constants.O_NOFOLLOW);
try { fchmodSync(fd, 0o700); } finally { closeSync(fd); }
} catch { throw unreadable(`${what} cannot be made`); }
} catch { throw bad(`${what} cannot be made`); }
st = lstatSync(dir);
}
if (st.isSymbolicLink()) throw unreadable(`${what} is a link`);
if (!st.isDirectory()) throw unreadable(`${what} is not a directory`);
if (st.uid !== uid) throw unreadable(`${what} is not owned by this user`);
if ((st.mode & 0o777) !== 0o700) throw unreadable(`${what} mode is not 0700`);
if (st.isSymbolicLink()) throw bad(`${what} is a link`);
if (!st.isDirectory()) throw bad(`${what} is not a directory`);
if (st.uid !== uid) throw bad(`${what} is not owned by this user`);
if ((st.mode & 0o777) !== 0o700) throw bad(`${what} mode is not 0700`);
return true;
}
@@ -91,27 +112,30 @@ export function checkFile(fd, uid, what, fail = unreadable) {
return st;
}
// The stored record, or null when no key is issued. Throws triage-key-unreadable on anything unsafe.
// opts.uid (both directories and the file) and opts.fileUid (the file only) are test seams for the
// owner checks.
// The stored record, or null when no key is issued. Throws <purpose>-key-unreadable on anything
// unsafe. opts.purpose picks the key (default triage). opts.uid (both directories and the file) and
// opts.fileUid (the file only) are test seams for the owner checks.
export function readKey(configDir, opts = {}) {
const { secrets, dir, file } = keyPaths(configDir);
const purpose = opts.purpose ?? "triage";
const p = purposeOf(purpose);
const bad = (why) => unreadable(why, purpose);
const { secrets, dir, file } = keyPaths(configDir, purpose);
const uid = uidOf(opts);
if (!checkDir(secrets, uid, "the secrets directory", { create: false })) return null;
if (!checkDir(dir, uid, "the triage secrets directory", { create: false })) return null;
if (!checkDir(secrets, uid, "the secrets directory", { create: false, purpose })) return null;
if (!checkDir(dir, uid, p.dirWords, { create: false, purpose })) return null;
let fd;
try { fd = openSync(file, constants.O_RDONLY | constants.O_NOFOLLOW | constants.O_NONBLOCK); }
catch (e) {
if (e.code === "ENOENT") return null;
if (e.code === "ELOOP") throw unreadable("the key file is a link");
throw unreadable("the key file cannot be opened");
if (e.code === "ELOOP") throw bad("the key file is a link");
throw bad("the key file cannot be opened");
}
try {
const st = checkFile(fd, opts.fileUid ?? uid, "the key file");
if (st.size > MAX_BYTES) throw unreadable("the key file is too large");
const st = checkFile(fd, opts.fileUid ?? uid, "the key file", bad);
if (st.size > MAX_BYTES) throw bad("the key file is too large");
let doc;
try { doc = JSON.parse(readFileSync(fd, "utf8")); } catch { throw unreadable("the key file is not JSON"); }
if (!validRecord(doc, configDir)) throw unreadable("the key file does not match the key shape");
try { doc = JSON.parse(readFileSync(fd, "utf8")); } catch { throw bad("the key file is not JSON"); }
if (!validRecord(doc, configDir, purpose)) throw bad("the key file does not match the key shape");
return doc;
} finally { closeSync(fd); }
}
+304 -99
View File
@@ -29,17 +29,54 @@
// Nothing here prints, logs or records a key. Receipts and output carry key ids only (the first 12
// hex of sha256(key), the id the bus uses). Messages name files and options, never values.
// The Console reads the key at each Triage spawn through triage-key-file.mjs, never this module.
import { closeSync, constants, fchmodSync, fsyncSync, lstatSync, openSync, readdirSync, renameSync, unlinkSync, writeSync } from "node:fs";
//
// worker-key-purpose (S3 of reports/worker-proxy-simple.md, Jason's ruling 2026-11-21): every export
// takes opts.purpose, `triage` (the default; nothing above changes) or `worker`. The worker key is
// `msw-<tag>-worker-<43 base64url>` in <configDir>/secrets/worker/model, and its refusal codes are
// the Triage codes with `worker-key-` for `triage-key-`. Each purpose removes names in its own
// namespace only; change() refuses any plan that would remove another name. Two worker-only rules:
// - ensureReady, the launch path: rotates when rotateBy has come and retires keys whose grace
// has passed, and
// - a retiring worker key whose grace has passed still stays while retireHeld says a live
// runtime started before the rotation (opts.runtimes, the processing-control list).
// ensureReady (both purposes) skips the lock when the plan it would run under the lock changes
// nothing, then probes the key. Nothing calls it for Triage yet.
import { closeSync, constants, fchmodSync, fsyncSync, lstatSync, openSync, readFileSync, readdirSync, renameSync, unlinkSync, writeSync } from "node:fs";
import { randomBytes } from "node:crypto";
import { join } from "node:path";
import { performance } from "node:perf_hooks";
import { isDeepStrictEqual } from "node:util";
import { createProxyLock } from "./proxy-lock.mjs";
import { loadManagementClient } from "../../model-proxy/src/client.mjs";
import { processIdentity, runtimeGroupState } from "../../processing-control/src/runtimes.mjs";
// #1873 triage-wiring: the key file's reader lives in triage-key-file.mjs (node built-ins only), so
// the Console reads the key without this module's proxy client. Re-exported here unchanged.
import { KEY_VERSION, MAX_RETIRING, SECRET, TriageKeyError, checkDir, checkFile, instanceTag, keyIdOf, keyPaths, keyPrefix, readKey, unreadable, validRecord } from "./triage-key-file.mjs";
export { KEY_VERSION, TriageKeyError, instanceTag, keyIdOf, keyPaths, keyPrefix, readKey, validRecord };
import { KEY_VERSION, MAX_RETIRING, PURPOSES, SECRET, TriageKeyError, checkDir, checkFile, instanceTag, keyError, keyIdOf, keyPaths, keyPrefix, purposeOf, readKey, unreadable, validRecord } from "./triage-key-file.mjs";
export { KEY_VERSION, PURPOSES, TriageKeyError, instanceTag, keyIdOf, keyPaths, keyPrefix, readKey, validRecord };
// The words that name a purpose's own verbs. Triage's are the words this module used before
// purposes; the worker key has no verbs, so its words name the launch.
const WORDS = {
triage: {
unrecorded: "the change was made but its receipt line was not written; run mosaic triage key status",
issued: "a Triage key is already issued; use mosaic triage key rotate",
notIssued: "no Triage key is issued; use mosaic triage key issue",
tooMany: "too many keys are retiring; run mosaic triage key retire once their grace has passed",
unwritten: (file, why, op) => `the proxy list changed but ${file} was not written (${why}); fix the file's directory, then run mosaic triage key ${op} again, which clears what this run left`,
unsynced: (file) => `${file} was written but its directory could not be synced, so it may not survive a power loss; run mosaic triage key status`,
raced: "the proxy's key list changed while this verb ran; run it again",
},
worker: {
unrecorded: "the change was made but its receipt line was not written; see <dataRoot>/proxy/mosaic-keys.receipts.jsonl",
issued: "a worker key is already issued",
notIssued: "no worker key is issued",
tooMany: "too many worker keys are retiring; they leave once their grace has passed and no older run is live",
unwritten: (file, why) => `the proxy list changed but ${file} was not written (${why}); fix the file's directory, then run the launch again, which clears what this run left`,
unsynced: (file) => `${file} was written but its directory could not be synced, so it may not survive a power loss; run the launch again`,
raced: "the proxy's key list changed while the worker key was being changed; run the launch again",
},
};
// The org key lifetime and the rotate grace default. The bus holds both as literals
// (packages/bus/src/model-keys.mjs #issue: 30 days to rotateBy; packages/bus/src/runtime.mjs:
@@ -50,27 +87,27 @@ export { KEY_VERSION, TriageKeyError, instanceTag, keyIdOf, keyPaths, keyPrefix,
export const KEY_LIFETIME_DAYS = 30;
export const DEFAULT_ROTATE_GRACE_MINUTES = 120;
const sentinelPrefix = (configDir) => `msk-${instanceTag(configDir)}-sentinel-`;
// Any name under the prefix is Triage's to remove, well formed or not, as the bus treats its own
// `msk-<tag>-` names. Only a well-formed key may be stored in the file.
const inNamespace = (configDir) => (k) => typeof k === "string" && k.startsWith(keyPrefix(configDir));
// Any name under the prefix is the purpose's to remove, well formed or not, as the bus treats its
// own `msk-<tag>-` names. Only a well-formed key may be stored in the file.
const inNamespace = (configDir, purpose = "triage") => (k) => typeof k === "string" && k.startsWith(keyPrefix(configDir, purpose));
// Both directories, checked (and the triage one made) before any proxy write, so a store that cannot
// be written refuses while the proxy is still untouched.
function prepareDirs(configDir, uid) {
const { secrets, dir } = keyPaths(configDir);
if (!checkDir(secrets, uid, "the secrets directory", { create: false })) throw unreadable("the secrets directory is missing");
checkDir(dir, uid, "the triage secrets directory", { create: true });
// Both directories, checked (and the purpose's one made) before any proxy write, so a store that
// cannot be written refuses while the proxy is still untouched.
function prepareDirs(configDir, uid, purpose = "triage") {
const { secrets, dir } = keyPaths(configDir, purpose);
if (!checkDir(secrets, uid, "the secrets directory", { create: false, purpose })) throw unreadable("the secrets directory is missing", purpose);
checkDir(dir, uid, purposeOf(purpose).dirWords, { create: true, purpose });
}
// A temp file writeKey left when it was killed before its rename. It may hold a key.
const TEMP = /^\.model\.\d+\.[0-9a-f]{12}\.tmp$/;
const tempsIn = (dir) => { try { return readdirSync(dir).filter((n) => TEMP.test(n)); } catch { return []; } };
// Under the lock no other Triage writer runs, so every temp file left in the directory is dead.
function removeTemps(configDir) {
const { dir } = keyPaths(configDir);
// Under the lock no other writer of this purpose runs, so every temp file left in the directory is dead.
function removeTemps(configDir, purpose = "triage") {
const { dir } = keyPaths(configDir, purpose);
for (const name of tempsIn(dir)) {
try { if (!lstatSync(join(dir, name)).isDirectory()) unlinkSync(join(dir, name)); }
catch { throw unreadable("a leftover temp file in the triage secrets directory cannot be removed"); }
catch { throw unreadable(`a leftover temp file in ${purposeOf(purpose).dirWords} cannot be removed`, purpose); }
}
}
@@ -78,19 +115,19 @@ function removeTemps(configDir) {
class NotSynced extends Error {}
// Atomic: a 0600 temp file in the same directory, fsync, rename, fsync of the directory.
function writeKey(configDir, record, uid, hook = () => {}) {
const { dir, file } = keyPaths(configDir);
prepareDirs(configDir, uid);
function writeKey(configDir, record, uid, hook = () => {}, purpose = "triage") {
const { dir, file } = keyPaths(configDir, purpose);
prepareDirs(configDir, uid, purpose);
const temp = join(dir, `.model.${process.pid}.${randomBytes(6).toString("hex")}.tmp`);
let fd;
try { fd = openSync(temp, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | constants.O_NOFOLLOW, 0o600); }
catch { throw unreadable("the key file cannot be written"); }
catch { throw unreadable("the key file cannot be written", purpose); }
try {
try { fchmodSync(fd, 0o600); writeSync(fd, `${JSON.stringify(record, null, 2)}\n`); fsyncSync(fd); }
finally { closeSync(fd); }
hook("rename");
renameSync(temp, file);
} catch { try { unlinkSync(temp); } catch {} throw unreadable("the key file cannot be written"); }
} catch { try { unlinkSync(temp); } catch {} throw unreadable("the key file cannot be written", purpose); }
try {
hook("sync");
const dfd = openSync(dir, constants.O_RDONLY | constants.O_DIRECTORY);
@@ -101,15 +138,15 @@ function writeKey(configDir, record, uid, hook = () => {}) {
// One line per write in the proxy lock's receipts file, ids only. `receiptsReady` runs under the
// lock before any change, so an unsafe receipts file refuses while nothing has changed yet.
const RECEIPTS_FLAGS = constants.O_WRONLY | constants.O_APPEND | constants.O_CREAT | constants.O_NOFOLLOW | constants.O_NONBLOCK;
const receiptsUnsafe = (why) => new TriageKeyError("triage-key-receipts-unsafe", `${why}; nothing was changed`);
function receiptsReady(stateDir, uid) {
const receiptsUnsafe = (purpose) => (why) => keyError(purpose, "receipts-unsafe", `${why}; nothing was changed`);
function receiptsReady(stateDir, uid, purpose = "triage") {
let fd;
try { fd = openSync(join(stateDir, "mosaic-keys.receipts.jsonl"), RECEIPTS_FLAGS, 0o600); }
catch { throw receiptsUnsafe("the proxy receipts file cannot be opened"); }
try { checkFile(fd, uid, "the proxy receipts file", receiptsUnsafe); } finally { closeSync(fd); }
catch { throw receiptsUnsafe(purpose)("the proxy receipts file cannot be opened"); }
try { checkFile(fd, uid, "the proxy receipts file", receiptsUnsafe(purpose)); } finally { closeSync(fd); }
}
function receipt(stateDir, uid, entry) {
const unrecorded = new TriageKeyError("triage-key-unrecorded", "the change was made but its receipt line was not written; run mosaic triage key status");
function receipt(stateDir, uid, entry, purpose = "triage") {
const unrecorded = keyError(purpose, "unrecorded", WORDS[purpose].unrecorded);
let fd;
try { fd = openSync(join(stateDir, "mosaic-keys.receipts.jsonl"), RECEIPTS_FLAGS, 0o600); } catch { throw unrecorded; }
try {
@@ -125,7 +162,7 @@ export const graceMinutes = (proxy) => proxy?.rotateGraceMinutes ?? DEFAULT_ROTA
export const rotateByFor = (nowMs) => new Date(nowMs + KEY_LIFETIME_DAYS * 86400_000).toISOString().slice(0, 10);
export const retireAtFor = (nowMs, proxy) => new Date(nowMs + graceMinutes(proxy) * 60_000).toISOString();
const proxyFailure = (code) => {
const proxyFailure = (code, purpose = "triage") => {
const words = {
"proxy-lock-busy": "another proxy writer holds the instance proxy lock; try again when it ends, and if no writer is running, see mosaic proxy fence status",
"proxy-lock-uncertain": "the instance proxy lock is in a state this verb will not guess about; check <dataRoot>/proxy by hand",
@@ -138,36 +175,47 @@ const proxyFailure = (code) => {
"proxy-client-redirect": "the proxy answered with a redirect",
"proxy-client-response": "the proxy gave an answer this verb cannot use",
};
return new TriageKeyError(code, words[code] ?? "the proxy write failed");
return new TriageKeyError(code === "triage-key-failed" ? `${purposeOf(purpose).code}-failed` : code, words[code] ?? "the proxy write failed");
};
// ensureReady's probe refusals, the codes a bus launch uses for the same answers.
const probeFailure = (code) => new TriageKeyError(code, code === "proxy-down" ? "the proxy did not answer the key probe" : "the proxy did not accept the key");
// opts.uid, opts.now and opts.hook(stage) are test seams; a stage hook may throw or kill the process.
// opts.client and opts.lock: the bus passes its own management client and instance proxy lock, so a
// bus change runs under the lock object its model key sweep uses and reads no key file of its own.
function context({ configDir, system, uid, fileUid, now, hook, client, lock }) {
if (!system?.proxy || !Number.isInteger(system.proxy.port)) throw new TriageKeyError("triage-key-no-proxy", "the instance has no model proxy set up (proxy.json)");
// opts.purpose: "triage" (default) or "worker". opts.runtimes (worker only): () => the
// processing-control runtime list, listRuntimes(dataRoot); without it no worker key whose grace has
// passed is removed. opts.retireGuard: test seams for retireHeld ({ marginMs, live, startedAt }).
function context({ configDir, system, uid, fileUid, now, hook, client, lock, purpose = "triage", runtimes, retireGuard, planSeam }) {
const p = purposeOf(purpose);
if (!system?.proxy || !Number.isInteger(system.proxy.port)) throw keyError(purpose, "no-proxy", "the instance has no model proxy set up (proxy.json)");
return {
configDir, dataRoot: system.dataRoot, proxy: system.proxy, stateDir: join(system.dataRoot, "proxy"),
uid: uid ?? process.getuid(), fileUid, now: now ?? Date.now, hook: hook ?? (() => {}), client, lock,
purpose, p, words: WORDS[purpose],
// Tests only: rewrites a plan's result, to prove change()'s namespace check refuses it.
planSeam: typeof planSeam === "function" ? planSeam : (result) => result,
// A Triage key leaves when its grace ends. A worker key also waits for older runs to end.
held: purpose === "worker" ? (record) => retireHeld({ runtimes, rotatedAtMs: Date.parse(record.issuedAt), ...(retireGuard ?? {}) }) : () => false,
};
}
function lockFor(c) {
if (c.lock) return c.lock;
try { return createProxyLock({ stateDir: c.stateDir, identity: `${c.configDir}:${c.proxy.port}` }); }
catch (e) { throw proxyFailure(e.code ?? "proxy-lock-invalid"); }
catch (e) { throw proxyFailure(e.code ?? "proxy-lock-invalid", c.purpose); }
}
async function clientFor(c) {
if (c.client) return c.client;
try { return await loadManagementClient({ configDir: c.configDir, proxy: c.proxy }); }
catch (e) { throw proxyFailure(e.code ?? "proxy-management-key-invalid"); }
catch (e) { throw proxyFailure(e.code ?? "proxy-management-key-invalid", c.purpose); }
}
function checkSentinel(c, keys) {
const prefix = sentinelPrefix(c.configDir);
if (!keys.some((k) => k.startsWith(prefix) && SECRET.test(k.slice(prefix.length)))) {
throw new TriageKeyError("triage-key-proxy-open", "the proxy's key list has no sentinel for this instance, so it may be another proxy");
throw keyError(c.purpose, "proxy-open", "the proxy's key list has no sentinel for this instance, so it may be another proxy");
}
}
@@ -182,57 +230,63 @@ async function change(c, opName, plan) {
return await lock.run(async () => {
const before = await client.getKeys();
checkSentinel(c, before);
const current = readKey(c.configDir, { uid: c.uid, fileUid: c.fileUid });
const result = plan(before, current);
const current = readKey(c.configDir, { uid: c.uid, fileUid: c.fileUid, purpose: c.purpose });
const result = c.planSeam(plan(before, current), before);
const op = result.op ?? opName;
const remove = result.remove === true && current !== null;
if (result.record) prepareDirs(c.configDir, c.uid);
removeTemps(c.configDir);
receiptsReady(c.stateDir, c.uid);
if (result.record) prepareDirs(c.configDir, c.uid, c.purpose);
removeTemps(c.configDir, c.purpose);
receiptsReady(c.stateDir, c.uid, c.purpose);
const after = result.after;
const removed = before.filter((k) => !after.includes(k));
const added = after.filter((k) => !before.includes(k));
const { removed, added } = diff(before, after);
// A key in another namespace never leaves the list.
if (removed.some((k) => !inNamespace(c.configDir)(k))) throw new TriageKeyError("triage-key-failed", "the change would remove a key outside the Triage namespace");
if (removed.some((k) => !inNamespace(c.configDir, c.purpose)(k))) throw keyError(c.purpose, "failed", `the change would remove a key outside the ${c.p.label} namespace`);
if (added.length || removed.length) {
// As the bus does: a list that moved since the first read is not overwritten.
if (!isDeepStrictEqual(await client.getKeys(), before)) throw new TriageKeyError("triage-key-raced", "the proxy's key list changed while this verb ran; run it again");
lock.fence({ org: null, op: `triage.${op}` });
if (!isDeepStrictEqual(await client.getKeys(), before)) throw keyError(c.purpose, "raced", c.words.raced);
lock.fence({ org: null, op: `${c.p.name}.${op}` });
await client.putKeys(after);
c.hook("put");
const confirmed = await client.getKeys();
if (!confirmed.some((k) => k.startsWith(sentinelPrefix(c.configDir))) || added.some((k) => !confirmed.includes(k)) || removed.some((k) => confirmed.includes(k))) {
throw new TriageKeyError("triage-key-unconfirmed", "the proxy did not confirm the change; the instance proxy fence stays set, see mosaic proxy fence status");
throw keyError(c.purpose, "unconfirmed", "the proxy did not confirm the change; the instance proxy fence stays set, see mosaic proxy fence status");
}
lock.confirm();
}
c.hook("write");
let unsynced = false;
if (result.record || remove) {
try { if (remove) unlinkKey(c.configDir, c.hook); else writeKey(c.configDir, result.record, c.uid, c.hook); }
try { if (remove) unlinkKey(c.configDir, c.hook, c.purpose); else writeKey(c.configDir, result.record, c.uid, c.hook, c.purpose); }
catch (e) {
if (e instanceof NotSynced) unsynced = true;
else throw new TriageKeyError("triage-key-unwritten", `the proxy list changed but ${keyPaths(c.configDir).file} was not written (${e.message}); fix the file's directory, then run mosaic triage key ${op} again, which clears what this run left`);
else throw keyError(c.purpose, "unwritten", c.words.unwritten(keyPaths(c.configDir, c.purpose).file, e.message, op));
}
}
c.hook("receipt");
// A run that changed neither the proxy nor the file leaves no receipt.
if (added.length || removed.length || result.record || remove) receipt(c.stateDir, c.uid, { op: `triage.key.${op}`, time: new Date(c.now()).toISOString(), addedKeyIds: added.map(keyIdOf), removedKeyIds: removed.map(keyIdOf) });
if (added.length || removed.length || result.record || remove) receipt(c.stateDir, c.uid, { op: `${c.p.name}.key.${op}`, time: new Date(c.now()).toISOString(), addedKeyIds: added.map(keyIdOf), removedKeyIds: removed.map(keyIdOf) }, c.purpose);
// The file is in place and the receipt written; only its durability is in doubt.
if (unsynced) throw new TriageKeyError("triage-key-unsynced", `${keyPaths(c.configDir).file} was written but its directory could not be synced, so it may not survive a power loss; run mosaic triage key status`);
if (unsynced) throw keyError(c.purpose, "unsynced", c.words.unsynced(keyPaths(c.configDir, c.purpose).file));
return { ...result.done, addedKeyIds: added.map(keyIdOf), removedKeyIds: removed.map(keyIdOf) };
});
} catch (e) {
if (e instanceof TriageKeyError) throw e;
throw proxyFailure(typeof e?.code === "string" && /^proxy-[a-z-]+$/.test(e.code) ? e.code : "triage-key-failed");
throw proxyFailure(typeof e?.code === "string" && /^proxy-[a-z-]+$/.test(e.code) ? e.code : "triage-key-failed", c.purpose);
}
}
const diff = (before, after) => ({ removed: before.filter((k) => !after.includes(k)), added: after.filter((k) => !before.includes(k)) });
// True when change() would write the proxy list, the file or a receipt for this plan.
const writes = (before, current, result) => {
const { removed, added } = diff(before, result.after);
return added.length > 0 || removed.length > 0 || Boolean(result.record) || (result.remove === true && current !== null);
};
// Revoke's file step: unlink, then sync the directory, with writeKey's stages and failures.
function unlinkKey(configDir, hook = () => {}) {
const { dir, file } = keyPaths(configDir);
function unlinkKey(configDir, hook = () => {}, purpose = "triage") {
const { dir, file } = keyPaths(configDir, purpose);
try { hook("rename"); unlinkSync(file); }
catch (e) { if (e?.code !== "ENOENT") throw unreadable("the key file cannot be removed"); }
catch (e) { if (e?.code !== "ENOENT") throw unreadable("the key file cannot be removed", purpose); }
try {
hook("sync");
const dfd = openSync(dir, constants.O_RDONLY | constants.O_DIRECTORY);
@@ -240,40 +294,43 @@ function unlinkKey(configDir, hook = () => {}) {
} catch { throw new NotSynced(); }
}
const newKey = (configDir) => keyPrefix(configDir) + randomBytes(32).toString("base64url");
const newKey = (configDir, purpose = "triage") => keyPrefix(configDir, purpose) + randomBytes(32).toString("base64url");
// Keys in the Triage namespace that the file does not hold: left by a crash between the PUT and the
// file write, or by a file that was removed by hand.
const orphansOf = (configDir, keys, record) => {
// Keys in the purpose's namespace that the file does not hold: left by a crash between the PUT and
// the file write, or by a file that was removed by hand.
const orphansOf = (configDir, keys, record, purpose = "triage") => {
const held = record ? [record.key, ...record.retiring.map((r) => r.key)] : [];
return keys.filter((k) => inNamespace(configDir)(k) && !held.includes(k));
return keys.filter((k) => inNamespace(configDir, purpose)(k) && !held.includes(k));
};
export async function issueKey(opts) {
const c = context(opts);
return change(c, "issue", (before, current) => {
if (current) throw new TriageKeyError("triage-key-issued", "a Triage key is already issued; use mosaic triage key rotate");
const orphans = orphansOf(c.configDir, before, null);
const key = newKey(c.configDir), nowMs = c.now();
if (current) throw keyError(c.purpose, "issued", c.words.issued);
const orphans = orphansOf(c.configDir, before, null, c.purpose);
const key = newKey(c.configDir, c.purpose), nowMs = c.now();
const record = { version: KEY_VERSION, key, keyId: keyIdOf(key), issuedAt: new Date(nowMs).toISOString(), rotateBy: rotateByFor(nowMs), retiring: [] };
return { after: [...before.filter((k) => !orphans.includes(k)), key], record, done: { keyId: record.keyId, rotateBy: record.rotateBy } };
});
}
// Retiring keys whose grace (plus marginMs, 0 for the terminal verbs) has passed, or that the proxy
// no longer holds.
const dueOf = (record, keys, nowMs, marginMs = 0) => record.retiring.filter((r) => Date.parse(r.retireAt) + marginMs <= nowMs || !keys.includes(r.key));
// no longer holds. For a worker key, a key whose grace has passed stays while c.held(record) says
// an older run may still use it; a key the proxy no longer holds goes from the file either way.
const graceOver = (record, nowMs, marginMs) => record.retiring.some((r) => Date.parse(r.retireAt) + marginMs <= nowMs);
const dueOf = (record, keys, nowMs, marginMs = 0, held = false) => record.retiring.filter((r) => (!held && Date.parse(r.retireAt) + marginMs <= nowMs) || !keys.includes(r.key));
const heldFor = (c, record, nowMs, marginMs) => graceOver(record, nowMs, marginMs) && c.held(record);
const rotateDueAt = (record) => Date.parse(`${record.rotateBy}T00:00:00Z`);
// The rotate plan, shared by the terminal verb and the sweep.
function rotatePlan(c, before, current, nowMs, marginMs = 0) {
const orphans = orphansOf(c.configDir, before, current);
const due = dueOf(current, before, nowMs, marginMs);
const orphans = orphansOf(c.configDir, before, current, c.purpose);
const due = dueOf(current, before, nowMs, marginMs, heldFor(c, current, nowMs, marginMs));
const keep = before.includes(current.key);
const retiring = [...current.retiring.filter((r) => !due.includes(r)),
...(keep ? [{ key: current.key, keyId: current.keyId, issuedAt: current.issuedAt, retireAt: retireAtFor(nowMs, c.proxy) }] : [])];
if (retiring.length > MAX_RETIRING) throw new TriageKeyError("triage-key-failed", "too many keys are retiring; run mosaic triage key retire once their grace has passed");
const key = newKey(c.configDir);
if (retiring.length > MAX_RETIRING) throw keyError(c.purpose, "failed", c.words.tooMany);
const key = newKey(c.configDir, c.purpose);
const record = { version: KEY_VERSION, key, keyId: keyIdOf(key), issuedAt: new Date(nowMs).toISOString(), rotateBy: rotateByFor(nowMs), retiring };
const drop = [...orphans, ...due.map((r) => r.key)];
return {
@@ -285,13 +342,13 @@ function rotatePlan(c, before, current, nowMs, marginMs = 0) {
export async function rotateKey(opts) {
const c = context(opts);
return change(c, "rotate", (before, current) => {
if (!current) throw new TriageKeyError("triage-key-not-issued", "no Triage key is issued; use mosaic triage key issue");
if (!current) throw keyError(c.purpose, "not-issued", c.words.notIssued);
return rotatePlan(c, before, current, c.now());
});
}
function retirePlan(c, before, current, nowMs, marginMs = 0) {
const orphans = orphansOf(c.configDir, before, current);
const due = current ? dueOf(current, before, nowMs, marginMs) : [];
const orphans = orphansOf(c.configDir, before, current, c.purpose);
const due = current ? dueOf(current, before, nowMs, marginMs, heldFor(c, current, nowMs, marginMs)) : [];
const record = current && due.length ? { ...current, retiring: current.retiring.filter((r) => !due.includes(r)) } : null;
const drop = [...orphans, ...due.map((r) => r.key)];
return { after: before.filter((k) => !drop.includes(k)), record, done: { droppedKeyIds: due.map((r) => r.keyId) } };
@@ -307,41 +364,188 @@ export async function retireKeys(opts) {
// issued no file: a new key (keys in the namespace the file does not hold are removed)
// held the proxy holds the file's key: only orphans and retiring keys the proxy lost go
// replaced the proxy does not hold the file's key: a new key, the old one marked lost
function ensurePlan(c, before, current, nowMs) {
const orphans = orphansOf(c.configDir, before, current, c.purpose);
const fresh = (retiring) => {
const key = newKey(c.configDir, c.purpose);
return { version: KEY_VERSION, key, keyId: keyIdOf(key), issuedAt: new Date(nowMs).toISOString(), rotateBy: rotateByFor(nowMs), retiring };
};
if (!current) {
const record = fresh([]);
return { after: [...before.filter((k) => !orphans.includes(k)), record.key], record, done: { action: "issued", keyId: record.keyId, rotateBy: record.rotateBy } };
}
const lost = current.retiring.filter((r) => !before.includes(r.key));
const retiring = current.retiring.filter((r) => !lost.includes(r));
if (before.includes(current.key)) {
return {
after: before.filter((k) => !orphans.includes(k)), record: lost.length ? { ...current, retiring } : null,
done: { action: "held", keyId: current.keyId, rotateBy: current.rotateBy },
};
}
const record = fresh(retiring);
return {
after: [...before.filter((k) => !orphans.includes(k)), record.key], record,
done: { action: "replaced", keyId: record.keyId, rotateBy: record.rotateBy, old: { keyId: current.keyId, lost: true } },
};
}
export async function ensureKey(opts) {
const c = context(opts);
return change(c, "ensure", (before, current) => {
const nowMs = c.now();
const orphans = orphansOf(c.configDir, before, current);
const fresh = (retiring) => {
const key = newKey(c.configDir);
return { version: KEY_VERSION, key, keyId: keyIdOf(key), issuedAt: new Date(nowMs).toISOString(), rotateBy: rotateByFor(nowMs), retiring };
};
if (!current) {
const record = fresh([]);
return { after: [...before.filter((k) => !orphans.includes(k)), record.key], record, done: { action: "issued", keyId: record.keyId, rotateBy: record.rotateBy } };
}
const lost = current.retiring.filter((r) => !before.includes(r.key));
const retiring = current.retiring.filter((r) => !lost.includes(r));
if (before.includes(current.key)) {
return {
after: before.filter((k) => !orphans.includes(k)), record: lost.length ? { ...current, retiring } : null,
done: { action: "held", keyId: current.keyId, rotateBy: current.rotateBy },
};
}
const record = fresh(retiring);
return {
after: [...before.filter((k) => !orphans.includes(k)), record.key], record,
done: { action: "replaced", keyId: record.keyId, rotateBy: record.rotateBy, old: { keyId: current.keyId, lost: true } },
};
return change(c, "ensure", (before, current) => ensurePlan(c, before, current, c.now()));
}
// worker-key-purpose: the launch's plan. Triage: ensureKey's plan. Worker: the same, and on a held
// key it also rotates once rotateBy has come and retires keys whose grace has passed (unless an
// older run is live, see retireHeld). The worker key has no sweep; launches are its timer.
function readyPlan(c, before, current, nowMs) {
const base = ensurePlan(c, before, current, nowMs);
if (c.purpose !== "worker" || base.done.action !== "held") return base;
if (rotateDueAt(current) <= nowMs) {
// When older runs hold so many retiring keys that one more would pass MAX_RETIRING, the launch
// keeps the current key (still in the list) and rotates at a later launch.
let plan = null;
try { plan = rotatePlan(c, before, current, nowMs); }
catch (e) { if (!(e instanceof TriageKeyError && e.message === c.words.tooMany)) throw e; }
if (plan) return { ...plan, op: "rotate", done: { action: "rotated", ...plan.done } };
}
// Retire only for a key whose grace has passed and that the list still holds; orphans and lost
// keys are the ensure plan's.
const plan = retirePlan(c, before, current, nowMs);
if (!plan.record || !current.retiring.some((r) => before.includes(r.key) && !plan.record.retiring.includes(r))) return base;
return { ...plan, op: "retire", done: { action: "retired", keyId: current.keyId, rotateBy: current.rotateBy, ...plan.done } };
}
// model-keys.mjs's ISSUE_PROBE_TIMEOUT_MS, ISSUE_REPROBE_MIN_MS and REVOKE_POLL_MS, copied so the key
// verbs do not load the broker; worker-key.test.mjs pins them equal.
export const PROBE_TIMING = Object.freeze({ timeoutMs: 2000, reprobeMinMs: 250, pollMs: 25 });
const pause = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
// As ModelKeys.preflight probes a just-issued key: CLIProxyAPI applies a key-list PUT by an async
// reload after it answers, so only a 401 is probed again, until a short deadline.
async function probeReady(client, key) {
const deadline = performance.now() + PROBE_TIMING.timeoutMs;
let status, first = true;
for (;;) {
const options = first ? undefined : { timeout: Math.max(PROBE_TIMING.reprobeMinMs, Math.ceil(deadline - performance.now())) };
first = false;
try { status = await client.probeKey(key, options); }
catch { throw probeFailure("proxy-down"); }
if (status !== 401 || performance.now() >= deadline) break;
await pause(PROBE_TIMING.pollMs);
}
if (status < 200 || status >= 300) throw probeFailure("proxy-key-refused");
}
// worker-key-purpose: ensure a usable key for a launch, without the lock when nothing needs writing.
// Fast path: read the file and the list (no lock, no write, not even the lock's identity file), run
// the plan change() would run, and when it writes nothing, no temp file is left and no fence is set,
// probe the file's key. Otherwise change() takes the lock, reads both again, decides again and
// writes; then the key is probed. Two launches that both see "no key" serialize on the lock, and
// the second finds the first's key held. A fast-path probe the proxy refuses (a list writer that
// dropped the key after the read) goes to the lock once, which re-adds the key, and refuses only
// when the probe after that fails too. The answer is ids only; the caller reads the key with
// readKey and must call again when readKey's keyId is not the answer's keyId: a rotate by another
// launch in between leaves a newer key that this call did not probe. opts.hook also sees "fast"
// (no lock) and "locked" (the slow path) for tests.
export async function ensureReady(opts) {
const c = context(opts);
const client = await clientFor(c);
let before;
try { before = await client.getKeys(); }
catch (e) { throw proxyFailure(typeof e?.code === "string" && /^proxy-[a-z-]+$/.test(e.code) ? e.code : "triage-key-failed", c.purpose); }
checkSentinel(c, before);
const current = readKey(c.configDir, { uid: c.uid, fileUid: c.fileUid, purpose: c.purpose });
const quiet = current && !writes(before, current, readyPlan(c, before, current, c.now()))
&& tempsIn(keyPaths(c.configDir, c.purpose).dir).length === 0 && !fenceSet(c.stateDir);
if (quiet) {
c.hook("fast");
try {
await probeReady(client, current.key);
return { action: "held", keyId: current.keyId, rotateBy: current.rotateBy, addedKeyIds: [], removedKeyIds: [] };
} catch (e) { if (e.code !== "proxy-key-refused") throw e; }
}
c.hook("locked");
const done = await change({ ...c, client }, "ensure", (latest, record) => readyPlan(c, latest, record, c.now()));
const record = readKey(c.configDir, { uid: c.uid, fileUid: c.fileUid, purpose: c.purpose });
if (!record) throw keyError(c.purpose, "failed", "the key file is missing after the change");
await probeReady(client, record.key);
return done;
}
// The fence by name only, as keyStatus checks it: a set fence sends the launch to the lock, which
// refuses proxy-uncertain.
function fenceSet(stateDir) {
try { lstatSync(join(stateDir, "mosaic-keys.uncertain")); return true; }
catch (e) { return e.code !== "ENOENT"; }
}
// worker-key-purpose: the retire guard (reports/worker-proxy-simple.md section 2, "Retired"). True
// when an old worker key must stay: a runtime that is not ended, and not proved dead, started before
// the rotation plus marginMs, or its start is unknown. Every doubt keeps the key.
// runtimes () => listRuntimes(dataRoot) from packages/processing-control/src/runtimes.mjs.
// Missing, throwing or not an array: the key stays.
// rotatedAtMs when the current key was issued (record.issuedAt), the latest rotation. Older
// retiring keys were replaced earlier, so this is the conservative time for all.
// marginMs a launch reads the key file before it registers its runtime; a run registered up
// to marginMs after the rotation may still hold the old key.
// live, startedAt seams; the defaults read /proc.
export const RETIRE_LAUNCH_MARGIN_MS = 10 * 60_000;
export function retireHeld({ runtimes, rotatedAtMs, marginMs = RETIRE_LAUNCH_MARGIN_MS, live = runtimeLive, startedAt = runtimeStartMs } = {}) {
if (typeof runtimes !== "function" || !Number.isFinite(rotatedAtMs)) return true;
let list;
try { list = runtimes(); } catch { return true; }
if (!Array.isArray(list)) return true;
return list.some((r) => {
try {
if (r?.phase === "ended") return false;
if (live(r) === false) return false;
const started = startedAt(r);
return !Number.isFinite(started) || started <= rotatedAtMs + marginMs;
} catch { return true; }
});
}
// false only when the runtime is proved gone: its supervisor (the host process that registered it,
// the launcher that read the key) is dead or another process, and its own pid, when it has one, is
// dead too. A failed task leaves its record behind, so "not ended" alone does not mean live.
// Liveness is processing-control's own check (a pid is dead only on ESRCH or another start time),
// so an unreadable /proc keeps the key. A container runtime has no pid, and a dead docker client is
// not proof its container exited (containers.mjs runContainer), so it stays unknown until its
// record is ended.
const supervisorLive = (id) => (id && typeof id === "object" ? runtimeGroupState({ pid: id.pid, startTime: id.startTime, boot: id.boot }) : null);
const sameProcess = (id) => {
if (!id || !Number.isSafeInteger(id.pid) || typeof id.startTime !== "string") return null;
const now = processIdentity(id.pid);
if (!now) return false;
return now.boot === id.boot && now.startTime === id.startTime;
};
export function runtimeLive(r) {
const supervisor = supervisorLive(r?.supervisor);
if (supervisor !== false) return supervisor === true ? true : null;
if (r.kind === "container" || r.containerName !== undefined) return null;
if (r.pid === undefined) return false;
const own = runtimeGroupState(r);
return own === false ? false : own === true ? true : null;
}
// The wall-clock start of the runtime's supervisor, or null when it is not the same process on this
// boot. Start ticks since boot plus btime, at 100 ticks a second, as model-proxy's processStartMs.
export function runtimeStartMs(r) {
const id = r?.supervisor;
if (sameProcess(id) !== true) return null;
try {
const btime = Number(/^btime ([0-9]+)$/m.exec(readFileSync("/proc/stat", "utf8"))?.[1]);
const ticks = Number(id.startTime);
if (!Number.isFinite(btime) || !Number.isFinite(ticks)) return null;
return btime * 1000 + ticks * 10;
} catch { return null; }
}
// proxy-scope slice 4: op revoke, when the owner turns Triage off. Every name in this instance's
// Triage namespace leaves the proxy list, then the key file goes. No file and no names: nothing.
export async function revokeKeys(opts) {
const c = context(opts);
return change(c, "revoke", (before, current) => {
const mine = before.filter(inNamespace(c.configDir));
const mine = before.filter(inNamespace(c.configDir, c.purpose));
return { after: before.filter((k) => !mine.includes(k)), record: null, remove: true, done: { action: mine.length || current ? "revoked" : "none" } };
});
}
@@ -377,9 +581,10 @@ export async function sweepKeys(opts, { marginMs = 0 } = {}) {
// Read only: the file, and when the proxy is set up, what its list holds. No lock, no write.
// The fence is checked by name only, so status writes nothing, not even the lock's identity file.
export async function keyStatus(opts) {
const { configDir, system, uid, fileUid } = opts;
const record = readKey(configDir, { uid, fileUid });
const proxy = { state: "not-set-up", fence: false, leftoverTemps: tempsIn(keyPaths(configDir).dir).length };
const { configDir, system, uid, fileUid, purpose = "triage" } = opts;
purposeOf(purpose);
const record = readKey(configDir, { uid, fileUid, purpose });
const proxy = { state: "not-set-up", fence: false, leftoverTemps: tempsIn(keyPaths(configDir, purpose).dir).length };
if (system?.proxy && Number.isInteger(system.proxy.port)) {
try { lstatSync(join(system.dataRoot, "proxy", "mosaic-keys.uncertain")); proxy.fence = true; }
catch (e) { if (e.code !== "ENOENT") proxy.fence = true; }
@@ -390,7 +595,7 @@ export async function keyStatus(opts) {
proxy.state = keys.some((k) => k.startsWith(prefix) && SECRET.test(k.slice(prefix.length))) ? "read" : "no-sentinel";
proxy.holdsKey = record ? keys.includes(record.key) : null;
proxy.retiringHeld = record ? record.retiring.map((r) => keys.includes(r.key)) : [];
proxy.orphanKeyIds = orphansOf(configDir, keys, record).map(keyIdOf);
proxy.orphanKeyIds = orphansOf(configDir, keys, record, purpose).map(keyIdOf);
} catch (e) { proxy.state = "unreadable"; proxy.code = typeof e?.code === "string" && /^proxy-[a-z-]+$/.test(e.code) ? e.code : "proxy-client-response"; }
}
return { record, proxy };
@@ -223,6 +223,14 @@ test('remove: two listed accounts on one credential name, or one account id list
await assert.rejects(d.call('proxy.account.remove', { accountId: id('oauth-one.json'), confirm: true }), { code: 'invalid-request' });
for (const x of [s, d]) { assert.equal(x.state.calls.some(c => !c.startsWith('GET ')), false); assert.equal(x.state.files.length, 2); }
});
test('remove: a credential with an unusable id still prevents deleting its shared name', async t => {
for (const badId of ['', null, 'x'.repeat(513)]) {
const s = await fakeManagement(t, { files: [oauth(), oauth({ id: badId, name: 'oauth-one.json' })] });
await assert.rejects(s.call('proxy.account.remove', { accountId: id('oauth-one.json'), confirm: true }), { code: 'invalid-request' });
assert.equal(s.state.calls.some(c => !c.startsWith('GET ')), false);
assert.equal(s.state.files.length, 2);
}
});
test('remove: under the lock, key groups that change between the read and the write refuse with proxy-down before the fence', async t => {
const fs = await import('node:fs'); const { join } = await import('node:path'); const { tmpdir } = await import('node:os');
const { createProxyLock } = await import('../src/proxy-lock.mjs');
+579
View File
@@ -0,0 +1,579 @@
// worker-key-purpose (S3 of reports/worker-proxy-simple.md): triage-key.mjs with purpose "worker".
// The worker key `msw-<tag>-worker-<43>` in <configDir>/secrets/worker/model, its mirrored
// worker-key-* refusals, the lock-free launch path ensureReady, the post-write probe, the namespace
// fence in both directions and the retire guard. A stand-in proxy on 127.0.0.1 port 0 and scratch
// config directories only; nothing here reads a real config, proxy or secret.
import { test } from "node:test";
import assert from "node:assert/strict";
import { spawn } from "node:child_process";
import fs from "node:fs";
import http from "node:http";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { createHash, randomBytes } from "node:crypto";
import {
PROBE_TIMING, PURPOSES, ensureKey, ensureReady, issueKey, keyPaths, keyPrefix, keyStatus, readKey, retireHeld, retireKeys,
revokeKeys, rotateKey, runtimeLive, runtimeStartMs, sweepKeys, RETIRE_LAUNCH_MARGIN_MS,
} from "../src/triage-key.mjs";
import { processIdentity } from "../../processing-control/src/runtimes.mjs";
import { ISSUE_PROBE_TIMEOUT_MS, ISSUE_REPROBE_MIN_MS, REVOKE_POLL_MS } from "../src/model-keys.mjs";
const NOW = Date.parse("2026-11-21T12:00:00.000Z");
const MIN = 60_000, HOUR = 60 * MIN, DAY = 24 * HOUR;
const MANAGE = "fxwk-manage";
const KEY_PATH = "/v8/management/config/access/api-keys";
const sha = (s) => createHash("sha256").update(s).digest("hex");
const tag = (dir) => sha(dir).slice(0, 12);
const id = (key) => sha(key).slice(0, 12);
const b64 = () => randomBytes(32).toString("base64url");
const iso = (ms) => new Date(ms).toISOString();
const MODULE = new URL("../src/triage-key.mjs", import.meta.url).href;
// Every msw-/mst- key the stand-in ever saw, and every text a call produced, for the leak scans.
const SEEN = new Set();
const OUTPUTS = [];
function leaks(text, keys = SEEN) {
for (const key of keys) {
const secret = key.slice(-43);
if (text.includes(key) || text.includes(secret)) return true;
for (let i = 0; i + 8 <= secret.length; i++) if (text.includes(secret.slice(i, i + 8))) return true;
}
return false;
}
// A stand-in proxy. A PUT records whether the instance proxy lock file existed while it ran.
async function fixture(t) {
const root = fs.realpathSync(fs.mkdtempSync(join(tmpdir(), "wk-")));
const configDir = join(root, "config");
fs.mkdirSync(join(configDir, "secrets"), { recursive: true, mode: 0o700 });
fs.chmodSync(configDir, 0o700); fs.chmodSync(join(configDir, "secrets"), 0o700);
fs.writeFileSync(join(configDir, "secrets", "proxy-management.key"), MANAGE, { mode: 0o600 });
fs.mkdirSync(join(root, "proxy"), { mode: 0o700 });
const T = tag(configDir);
const others = {
sentinel: `msk-${T}-sentinel-${b64()}`, bus: `msk-${T}-bus-${b64()}`, org: `mso-${T}-demo-key-${b64()}`,
foreign: "foreign-client-key", otherWorker: `msw-${"f".repeat(12)}-worker-${b64()}`,
};
const lockFile = join(root, "proxy", "mosaic-keys.lock");
const state = { keys: Object.values(others), gets: 0, puts: [], probes: [], refuse401: 0, ignorePut: false, onGet: null };
const server = http.createServer(async (req, res) => {
if (req.url === "/v1/models") {
const key = req.headers.authorization?.slice(7);
state.probes.push(key);
if (state.dropProbe) { req.socket.destroy(); return; }
if (state.refuse401 > 0) { state.refuse401--; res.writeHead(401); res.end("{}"); return; }
res.writeHead(state.keys.includes(key) ? 200 : 401); res.end("{}"); return;
}
if (req.url !== KEY_PATH || req.headers.authorization !== `Bearer ${MANAGE}`) { res.writeHead(401); res.end("{}"); return; }
if (req.method === "GET") { state.gets++; const body = JSON.stringify(state.keys); state.onGet?.(state.gets); res.end(body); return; }
const chunks = []; for await (const c of req) chunks.push(c);
const next = JSON.parse(Buffer.concat(chunks));
for (const k of next) if (/^ms[tw]-.*-[A-Za-z0-9_-]{43}$/.test(k)) SEEN.add(k);
state.puts.push({ keys: next, locked: fs.existsSync(lockFile) });
if (!state.ignorePut) state.keys = next;
res.end('{"status":"ok"}');
});
await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
const port = server.address().port;
t.after(async () => {
if (fs.existsSync(join(root, "proxy", "mosaic-keys.receipts.jsonl"))) OUTPUTS.push(fs.readFileSync(join(root, "proxy", "mosaic-keys.receipts.jsonl"), "utf8"));
server.closeAllConnections(); await new Promise((resolve) => server.close(resolve));
fs.rmSync(root, { recursive: true, force: true });
});
const f = {
root, configDir, state, others, port, lockFile, now: NOW,
system: { dataRoot: root, proxy: { port, binary: "/fixture-unused" } },
worker: keyPaths(configDir, "worker"), triage: keyPaths(configDir, "triage"),
receipts: join(root, "proxy", "mosaic-keys.receipts.jsonl"),
opts(extra = {}) {
const stages = [];
const o = { configDir, system: f.system, now: () => f.now, purpose: "worker", hook: (s) => stages.push(s), ...extra };
o.stages = stages;
return o;
},
mine: (purpose = "worker") => state.keys.filter((k) => k.startsWith(keyPrefix(configDir, purpose))),
read: (purpose = "worker") => readKey(configDir, { purpose }),
// Every file under the root with its size and mtime, for "wrote nothing".
snapshot() {
const out = {};
const walk = (dir) => { for (const name of fs.readdirSync(dir)) { const p = join(dir, name), st = fs.lstatSync(p); out[p] = st.isDirectory() ? "dir" : `${st.size}:${st.mtimeMs}`; if (st.isDirectory()) walk(p); } };
walk(root);
return out;
},
// Writes a worker record by hand: the current key, plus retiring entries.
seed({ issuedAt = NOW - DAY, rotateBy, retiring = [], inList = true } = {}) {
const key = keyPrefix(configDir, "worker") + b64();
SEEN.add(key);
const record = { version: 1, key, keyId: id(key), issuedAt: iso(issuedAt), rotateBy: rotateBy ?? iso(issuedAt + 30 * DAY).slice(0, 10), retiring };
fs.mkdirSync(f.worker.dir, { recursive: true, mode: 0o700 });
fs.writeFileSync(f.worker.file, JSON.stringify(record), { mode: 0o600 });
if (inList) state.keys.push(key);
for (const r of retiring) if (r.inList !== false && !state.keys.includes(r.key)) state.keys.push(r.key);
return record;
},
retiring(retireAt, { inList = true } = {}) {
const key = keyPrefix(configDir, "worker") + b64();
SEEN.add(key);
return { key, keyId: id(key), issuedAt: iso(NOW - 40 * DAY), retireAt: iso(retireAt), ...(inList ? {} : { inList }) };
},
};
return f;
}
// readKey refuses unknown fields, so the seed drops the test-only inList marker.
const clean = (r) => { const { inList, ...rest } = r; return rest; };
async function refused(promise, code) {
try { await promise; } catch (e) { OUTPUTS.push(e.message); assert.equal(e.code, code, e.message); return e; }
assert.fail(`expected ${code}`);
}
const deadRuntime = () => ({ phase: "running", supervisor: { pid: 999_999_999, startTime: "1", boot: "00000000-0000-4000-8000-000000000000" } });
test("the worker purpose names its own prefix, file and codes, and the Triage purpose is unchanged", async (t) => {
const f = await fixture(t);
assert.equal(keyPrefix(f.configDir), `mst-${tag(f.configDir)}-triage-`);
assert.equal(keyPrefix(f.configDir, "worker"), `msw-${tag(f.configDir)}-worker-`);
assert.equal(f.triage.file, join(f.configDir, "secrets", "triage", "model"));
assert.equal(f.worker.file, join(f.configDir, "secrets", "worker", "model"));
assert.deepEqual(Object.keys(PURPOSES), ["triage", "worker"]);
assert.throws(() => keyPrefix(f.configDir, "org"), TypeError);
await assert.rejects(ensureReady(f.opts({ purpose: "bus" })), TypeError);
const done = await ensureReady(f.opts());
assert.equal(done.action, "issued");
const record = f.read();
assert.match(record.key, new RegExp(`^msw-${tag(f.configDir)}-worker-[A-Za-z0-9_-]{43}$`));
assert.equal((fs.statSync(f.worker.file).mode & 0o777), 0o600);
assert.equal((fs.statSync(f.worker.dir).mode & 0o777), 0o700);
assert.equal(fs.existsSync(f.triage.dir), false, "a worker call leaves the Triage directory alone");
assert.equal(readKey(f.configDir), null, "the Triage reader does not see the worker key");
assert.deepEqual(f.mine(), [record.key]);
for (const k of Object.values(f.others)) assert.ok(f.state.keys.includes(k));
const lines = fs.readFileSync(f.receipts, "utf8").trim().split("\n").map((l) => JSON.parse(l));
assert.deepEqual(lines.map((l) => l.op), ["worker.key.ensure"]);
assert.deepEqual(lines[0].addedKeyIds, [record.keyId]);
assert.ok(f.state.puts.every((p) => p.locked), "every PUT ran under the lock");
assert.equal(f.state.probes.at(-1), record.key, "the key was probed after the write");
});
test("each worker-key-* refusal mirrors its triage-key-* code", async (t) => {
const f = await fixture(t);
const noProxy = { configDir: f.configDir, system: { dataRoot: f.root } };
await refused(ensureReady({ ...noProxy, purpose: "worker" }), "worker-key-no-proxy");
await refused(ensureKey({ ...noProxy }), "triage-key-no-proxy");
await refused(rotateKey(f.opts()), "worker-key-not-issued");
await issueKey(f.opts());
const issued = await refused(issueKey(f.opts()), "worker-key-issued");
assert.equal(issued.message, "a worker key is already issued");
fs.chmodSync(f.worker.file, 0o644);
await refused(ensureReady(f.opts()), "worker-key-unreadable");
fs.chmodSync(f.worker.file, 0o600);
const sentinel = f.others.sentinel;
f.state.keys = f.state.keys.filter((k) => k !== sentinel);
await refused(ensureReady(f.opts()), "worker-key-proxy-open");
f.state.keys.push(sentinel);
f.state.onGet = (n) => { if (n % 2 === 0) f.state.keys.push(`unrelated-${n}`); };
const raced = await refused(rotateKey(f.opts()), "worker-key-raced");
assert.match(raced.message, /run the launch again/);
assert.doesNotMatch(raced.message, /verb/);
f.state.onGet = null;
f.state.ignorePut = true;
await refused(rotateKey(f.opts()), "worker-key-unconfirmed");
f.state.ignorePut = false;
fs.rmSync(join(f.root, "proxy", "mosaic-keys.uncertain"), { force: true });
fs.chmodSync(f.receipts, 0o644);
await refused(rotateKey(f.opts()), "worker-key-receipts-unsafe");
fs.chmodSync(f.receipts, 0o600);
const unwritten = await refused(rotateKey(f.opts({ hook: (s) => { if (s === "rename") throw new Error("stop"); } })), "worker-key-unwritten");
assert.match(unwritten.message, /run the launch again/);
assert.doesNotMatch(unwritten.message, /triage/i);
const unsynced = await refused(rotateKey(f.opts({ hook: (s) => { if (s === "sync") throw new Error("stop"); } })), "worker-key-unsynced");
assert.match(unsynced.message, /secrets\/worker\/model/);
});
test("ensureReady on a held worker key takes no lock, writes nothing and probes the key", async (t) => {
const f = await fixture(t);
await ensureReady(f.opts());
const record = f.read();
// The lock's identity file is a write too; the fast path must not make it.
fs.rmSync(join(f.root, "proxy", "mosaic-proxy.identity"));
const before = f.snapshot(), puts = f.state.puts.length, probes = f.state.probes.length;
const o = f.opts();
const done = await ensureReady(o);
assert.deepEqual(o.stages, ["fast"]);
assert.deepEqual(done, { action: "held", keyId: record.keyId, rotateBy: record.rotateBy, addedKeyIds: [], removedKeyIds: [] });
assert.deepEqual(f.snapshot(), before, "no file changed or appeared");
assert.equal(f.state.puts.length, puts);
assert.deepEqual(f.state.probes.slice(probes), [record.key]);
// A Triage key takes the same fast path.
await ensureReady(f.opts({ purpose: "triage" }));
const triageRecord = f.read("triage");
fs.rmSync(join(f.root, "proxy", "mosaic-proxy.identity"));
const o2 = f.opts({ purpose: "triage" });
const snap = f.snapshot();
assert.equal((await ensureReady(o2)).action, "held");
assert.deepEqual(o2.stages, ["fast"]);
assert.deepEqual(f.snapshot(), snap);
assert.equal(f.state.probes.at(-1), triageRecord.key);
});
test("ensureReady takes the lock for every state that needs a write, and only writes under it", async (t) => {
const cases = [
["no file", (f) => {}, "issued"],
["key gone from the list", (f) => { const r = f.seed({ inList: false }); return r; }, "replaced"],
["an orphan in the worker namespace", (f) => { f.seed(); f.state.keys.push(keyPrefix(f.configDir, "worker") + b64()); }, "held"],
["a malformed name in the worker namespace", (f) => { f.seed(); f.state.keys.push(keyPrefix(f.configDir, "worker") + "short"); }, "held"],
["a retiring key the proxy lost", (f) => { const r = f.retiring(NOW + HOUR, { inList: false }); f.seed({ retiring: [clean(r)] }); f.state.keys = f.state.keys.filter((k) => k !== r.key); }, "held"],
["a leftover temp file", (f) => { f.seed(); fs.writeFileSync(join(f.worker.dir, `.model.1.${"a".repeat(12)}.tmp`), "x", { mode: 0o600 }); }, "held"],
["rotateBy has come", (f) => { f.seed({ issuedAt: NOW - 31 * DAY }); }, "rotated"],
["a retiring key past its grace, no live runs", (f) => { const r = f.retiring(NOW - MIN); f.seed({ retiring: [clean(r)] }); }, "retired"],
];
for (const [name, setup, action] of cases) {
await t.test(name, async (t) => {
const f = await fixture(t);
setup(f);
const o = f.opts({ runtimes: () => [] });
const done = await ensureReady(o);
assert.equal(o.stages[0], "locked", name);
assert.equal(done.action, action);
assert.ok(f.state.puts.every((p) => p.locked), "no PUT ran without the lock");
assert.deepEqual(fs.readdirSync(f.worker.dir), ["model"], "no temp file is left");
const record = f.read();
assert.deepEqual([...f.mine()].sort(), [record.key, ...record.retiring.map((r) => r.key)].sort(), "the list holds exactly the file's keys");
// The next launch finds nothing to write.
const o2 = f.opts({ runtimes: () => [] });
await ensureReady(o2);
assert.deepEqual(o2.stages, ["fast"], `${name}: settled`);
});
}
await t.test("a set fence sends the launch to the lock, which refuses", async (t) => {
const f = await fixture(t);
f.seed();
fs.writeFileSync(join(f.root, "proxy", "mosaic-keys.uncertain"), "{}", { mode: 0o600 });
const o = f.opts();
await refused(ensureReady(o), "proxy-uncertain");
assert.deepEqual(o.stages, ["locked"]);
assert.equal(f.state.puts.length, 0);
});
});
test("ensureReady probes a just-written key again while the proxy answers 401, then refuses", async (t) => {
assert.deepEqual({ ...PROBE_TIMING }, { timeoutMs: ISSUE_PROBE_TIMEOUT_MS, reprobeMinMs: ISSUE_REPROBE_MIN_MS, pollMs: REVOKE_POLL_MS }, "the bus's probe timing");
const f = await fixture(t);
f.state.refuse401 = 3;
const done = await ensureReady(f.opts());
assert.equal(done.action, "issued");
assert.equal(f.state.probes.length, 4, "three 401s, then the 200");
f.state.refuse401 = 1e9;
const started = Date.now();
await refused(ensureReady(f.opts()), "proxy-key-refused");
assert.ok(Date.now() - started >= 1500, "the 401 was probed until the deadline");
f.state.refuse401 = 0;
// A proxy that drops the model route gives proxy-down, on the fast path and after a write.
f.state.dropProbe = true;
await refused(ensureReady(f.opts()), "proxy-down");
fs.rmSync(f.worker.file);
await refused(ensureReady(f.opts()), "proxy-down");
f.state.dropProbe = false;
assert.equal((await ensureReady(f.opts())).action, "held", "the key written before the probe failed is kept");
});
test("a fast-path probe the proxy refuses goes to the lock once, which re-adds the key", async (t) => {
const f = await fixture(t);
const record = f.seed();
// A list writer outside the lock drops the key after this launch read the list.
f.state.onGet = (n) => { if (n === 1) f.state.keys = f.state.keys.filter((k) => k !== record.key); };
const o = f.opts();
const done = await ensureReady(o);
f.state.onGet = null;
assert.deepEqual(o.stages.filter((s) => s === "fast" || s === "locked"), ["fast", "locked"]);
assert.equal(done.action, "replaced");
assert.ok(f.state.puts.length > 0 && f.state.puts.every((p) => p.locked), "the re-add ran under the lock");
assert.equal(f.read().keyId, done.keyId);
assert.ok(f.state.keys.includes(f.read().key));
// A key the list holds but the proxy still refuses: the locked pass changes nothing, then refuses.
f.state.refuse401 = 1e9;
const puts = f.state.puts.length;
const o2 = f.opts();
await refused(ensureReady(o2), "proxy-key-refused");
f.state.refuse401 = 0;
assert.deepEqual(o2.stages.filter((s) => s === "fast" || s === "locked"), ["fast", "locked"]);
assert.equal(f.state.puts.length, puts, "nothing was written");
});
test("change() refuses a plan that would remove a key outside the purpose's namespace", async (t) => {
for (const purpose of ["worker", "triage"]) {
await t.test(purpose, async (t) => {
const f = await fixture(t);
await issueKey(f.opts({ purpose }));
const puts = f.state.puts.length;
const other = purpose === "worker" ? f.others.otherWorker : f.others.sentinel;
const planSeam = (result, before) => ({ ...result, after: (result.after ?? before).filter((k) => k !== other) });
const e = await refused(rotateKey(f.opts({ purpose, planSeam })), `${purpose}-key-failed`);
assert.match(e.message, /outside the (worker|Triage) namespace/);
assert.equal(f.state.puts.length, puts, "no PUT ran");
assert.ok(f.state.keys.includes(other));
});
}
});
test("two parallel worker ensureReady calls both succeed and leave exactly one key", async (t) => {
const f = await fixture(t);
const results = await Promise.all([ensureReady(f.opts()), ensureReady(f.opts())]);
assert.deepEqual(results.map((r) => r.action).sort(), ["held", "issued"]);
const record = f.read();
assert.deepEqual(f.mine(), [record.key]);
assert.equal(new Set(results.map((r) => r.keyId)).size, 1);
assert.ok(f.state.puts.length === 1 && f.state.puts[0].locked);
// The same from two processes.
fs.rmSync(f.worker.file);
f.state.keys = f.state.keys.filter((k) => !k.startsWith(keyPrefix(f.configDir, "worker")));
const script = `
import { ensureReady } from ${JSON.stringify(MODULE)};
const p = JSON.parse(process.env.WK_OPTS);
const done = await ensureReady({ ...p, purpose: "worker" });
process.stdout.write(JSON.stringify(done));`;
const child = () => new Promise((resolve) => {
const c = spawn(process.execPath, ["--input-type=module", "-e", script], { env: { PATH: process.env.PATH, HOME: process.env.HOME, TMPDIR: process.env.TMPDIR, WK_OPTS: JSON.stringify({ configDir: f.configDir, system: f.system }) }, stdio: ["ignore", "pipe", "pipe"] });
let out = "", err = "";
c.stdout.on("data", (d) => { out += d; }); c.stderr.on("data", (d) => { err += d; });
c.on("close", (code) => resolve({ code, out, err }));
});
const kids = await Promise.all([child(), child(), child()]);
for (const k of kids) { OUTPUTS.push(k.out, k.err); assert.equal(k.code, 0, k.err); }
const actions = kids.map((k) => JSON.parse(k.out).action).sort();
assert.deepEqual(actions, ["held", "held", "issued"]);
assert.deepEqual(f.mine(), [f.read().key]);
assert.ok(f.state.puts.every((p) => p.locked));
});
test("a Triage call never removes a worker key, and a worker call never removes a Triage, org, bus or foreign key", async (t) => {
await t.test("Triage calls leave msw- names alone", async (t) => {
const f = await fixture(t);
const workerKey = keyPrefix(f.configDir, "worker") + b64();
const malformed = keyPrefix(f.configDir, "worker") + "x";
f.state.keys.push(workerKey, malformed);
const keep = [workerKey, malformed, ...Object.values(f.others)];
const triage = (extra = {}) => ({ configDir: f.configDir, system: f.system, now: () => f.now, ...extra });
const steps = [
() => issueKey(triage()), () => ensureKey(triage()), () => ensureReady(triage()), () => rotateKey(triage()),
() => { f.now = NOW + DAY; return retireKeys(triage()); }, () => { f.now = NOW + 40 * DAY; return sweepKeys(triage()); },
() => revokeKeys(triage()),
];
for (const step of steps) {
await step();
for (const k of keep) assert.ok(f.state.keys.includes(k), "a non-Triage key stayed");
}
assert.deepEqual(f.mine("triage"), []);
assert.equal(fs.existsSync(f.worker.file), false);
});
await t.test("worker calls leave mst-, mso-, msk- and foreign names alone", async (t) => {
const f = await fixture(t);
const triageKey = keyPrefix(f.configDir, "triage") + b64();
const triageMalformed = keyPrefix(f.configDir, "triage") + "x";
f.state.keys.push(triageKey, triageMalformed);
const keep = [triageKey, triageMalformed, ...Object.values(f.others)];
const steps = [
() => issueKey(f.opts()), () => ensureKey(f.opts()), () => ensureReady(f.opts()), () => rotateKey(f.opts()),
() => { f.now = NOW + DAY; return retireKeys(f.opts({ runtimes: () => [] })); },
() => { f.now = NOW + 40 * DAY; return ensureReady(f.opts({ runtimes: () => [] })); },
() => { f.now = NOW + 80 * DAY; return sweepKeys(f.opts({ runtimes: () => [] })); },
() => revokeKeys(f.opts()),
];
for (const step of steps) {
await step();
for (const k of keep) assert.ok(f.state.keys.includes(k), "a non-worker key stayed");
}
assert.deepEqual(f.mine(), []);
assert.equal(fs.existsSync(f.worker.file), false, "revoke removed the worker file");
assert.equal(fs.existsSync(f.triage.dir), false, "no Triage file was made");
// The other instance's worker key (another tag) is another namespace too.
assert.ok(f.state.keys.includes(f.others.otherWorker));
});
});
test("retireHeld keeps an old worker key on every doubt and lets it go only when no older run is live", () => {
const rotatedAtMs = NOW;
const run = (started, extra = {}) => ({ phase: "running", started, ...extra });
const seams = { live: (r) => r.live ?? true, startedAt: (r) => r.started };
assert.equal(retireHeld({ rotatedAtMs, ...seams }), true, "no runtimes source");
assert.equal(retireHeld({ runtimes: () => { throw new Error("x"); }, rotatedAtMs, ...seams }), true, "the source throws");
assert.equal(retireHeld({ runtimes: () => ({}), rotatedAtMs, ...seams }), true, "not a list");
assert.equal(retireHeld({ runtimes: () => [], rotatedAtMs: NaN, ...seams }), true, "no rotation time");
assert.equal(retireHeld({ runtimes: () => [], rotatedAtMs, ...seams }), false, "no runs");
assert.equal(retireHeld({ runtimes: () => [run(NOW - HOUR)], rotatedAtMs, ...seams }), true, "a run from before the rotation");
assert.equal(retireHeld({ runtimes: () => [run(NOW + RETIRE_LAUNCH_MARGIN_MS)], rotatedAtMs, ...seams }), true, "a run inside the launch margin");
assert.equal(retireHeld({ runtimes: () => [run(NOW + RETIRE_LAUNCH_MARGIN_MS + 1)], rotatedAtMs, ...seams }), false, "a run after the margin");
assert.equal(RETIRE_LAUNCH_MARGIN_MS, 10 * MIN);
assert.equal(retireHeld({ runtimes: () => [run(NOW + 5 * MIN)], rotatedAtMs, ...seams }), true, "a run five minutes after the rotation may hold the old key");
assert.equal(retireHeld({ runtimes: () => [run(NOW + 5 * MIN)], rotatedAtMs, marginMs: MIN, ...seams }), false, "marginMs is a seam");
assert.equal(retireHeld({ runtimes: () => [run(null)], rotatedAtMs, ...seams }), true, "a run whose start is unknown");
assert.equal(retireHeld({ runtimes: () => [run(NOW - HOUR, { phase: "ended" })], rotatedAtMs, ...seams }), false, "an ended run");
assert.equal(retireHeld({ runtimes: () => [run(NOW - HOUR, { live: false })], rotatedAtMs, ...seams }), false, "a run proved dead");
assert.equal(retireHeld({ runtimes: () => [run(NOW - HOUR, { live: null })], rotatedAtMs, ...seams }), true, "liveness unknown");
assert.equal(retireHeld({ runtimes: () => [run(NOW - HOUR)], rotatedAtMs, live: () => { throw new Error("x"); }, startedAt: () => 0 }), true, "a seam throws");
assert.equal(retireHeld({ runtimes: () => [run(NOW + 2 * RETIRE_LAUNCH_MARGIN_MS), run(NOW - HOUR)], rotatedAtMs, ...seams }), true, "one older run is enough");
});
test("runtimeLive and runtimeStartMs read the supervisor from /proc", async () => {
const me = processIdentity(process.pid);
const record = { phase: "running", supervisor: me };
assert.equal(runtimeLive(record), true);
const expected = Date.now() - process.uptime() * 1000;
assert.ok(Math.abs(runtimeStartMs(record) - expected) < 3000, "start ticks at 100 a second plus btime match this process's start");
assert.equal(runtimeLive({ ...record, supervisor: { ...me, startTime: String(Number(me.startTime) + 1) } }), false, "another process on the same pid");
assert.equal(runtimeStartMs({ ...record, supervisor: { ...me, startTime: "1" } }), null);
assert.equal(runtimeLive({ phase: "running" }), null, "no supervisor: unknown");
const child = spawn(process.execPath, ["-e", "setTimeout(() => {}, 60000)"], { stdio: "ignore" });
await new Promise((resolve) => setTimeout(resolve, 100));
const kid = processIdentity(child.pid);
assert.equal(runtimeLive({ phase: "running", supervisor: kid }), true);
child.kill("SIGKILL");
await new Promise((resolve) => child.on("exit", resolve));
assert.equal(runtimeLive({ phase: "running", supervisor: kid }), false, "a dead supervisor with no pid of its own");
assert.equal(runtimeLive({ phase: "running", supervisor: kid, pid: process.pid, startTime: me.startTime, boot: me.boot }), true, "the runtime's own pid lives on");
assert.equal(runtimeLive(deadRuntime()), false);
// A container runtime has no pid, and its dead docker client is no proof the container exited.
const container = { phase: "running", kind: "container", containerName: `mosaic-${"a".repeat(12)}-${"0".repeat(8)}-0000-4000-8000-${"0".repeat(12)}`, supervisor: kid };
assert.equal(runtimeLive(container), null, "a container whose launcher died is unknown, not gone");
assert.equal(runtimeLive({ ...container, containerName: undefined }), null, "kind container alone is enough");
assert.equal(runtimeLive({ ...container, kind: "task" }), null, "a task record with a container name, the shape a real worker run registers");
assert.equal(retireHeld({ runtimes: () => [container], rotatedAtMs: NOW }), true, "so it holds the old key");
assert.equal(retireHeld({ runtimes: () => [{ ...container, phase: "ended" }], rotatedAtMs: NOW }), false, "until its record is ended");
assert.equal(runtimeLive({ ...container, supervisor: me }), true, "a live launcher is live");
// A pid this process may not signal or read is unknown, never dead (processing-control's own check).
assert.equal(runtimeLive({ phase: "running", supervisor: { ...me, boot: "not-a-boot-id" } }), null, "an identity the check cannot use");
});
test("a worker key past its grace stays while an older run is live, and goes when none is", async (t) => {
const f = await fixture(t);
const old = f.retiring(NOW - MIN);
const lost = f.retiring(NOW - MIN, { inList: false });
const record = f.seed({ issuedAt: NOW - HOUR, retiring: [clean(old), clean(lost)] });
f.state.keys = f.state.keys.filter((k) => k !== lost.key);
const me = processIdentity(process.pid);
const live = () => [{ phase: "running", supervisor: me }];
// This process is live (read from /proc); the seam dates its start before the rotation.
const retireGuard = { startedAt: () => NOW - 2 * HOUR };
// A lost key leaves the file even while held; the old key stays in the list and the file.
const o = f.opts({ runtimes: live, retireGuard });
await ensureReady(o);
assert.equal(o.stages[0], "locked");
assert.ok(f.state.keys.includes(old.key));
assert.deepEqual(f.read().retiring.map((r) => r.keyId), [old.keyId]);
// Held: the launch takes the fast path and leaves the old key.
const o2 = f.opts({ runtimes: live, retireGuard });
await ensureReady(o2);
assert.deepEqual(o2.stages, ["fast"]);
assert.ok(f.state.keys.includes(old.key));
// No runtimes source at all: held too, for every verb.
await retireKeys(f.opts());
await sweepKeys(f.opts());
assert.ok(f.state.keys.includes(old.key));
// A dead run from a failed launch does not hold it.
const o3 = f.opts({ runtimes: () => [deadRuntime(), { phase: "ended", supervisor: me }], retireGuard });
assert.equal((await ensureReady(o3)).action, "retired");
assert.equal(f.state.keys.includes(old.key), false);
assert.deepEqual(f.read().retiring, []);
assert.equal(f.read().key, record.key);
// Triage is not held: its retire drops a key past its grace with no runtimes source.
await issueKey({ configDir: f.configDir, system: f.system, now: () => NOW - 2 * DAY });
await rotateKey({ configDir: f.configDir, system: f.system, now: () => NOW - 2 * DAY });
const tOld = f.read("triage").retiring[0].key;
await retireKeys({ configDir: f.configDir, system: f.system, now: () => NOW });
assert.equal(f.state.keys.includes(tOld), false);
});
test("a due rotation waits while older runs hold MAX_RETIRING keys", async (t) => {
const f = await fixture(t);
const retiring = Array.from({ length: 16 }, () => clean(f.retiring(NOW - MIN)));
const record = f.seed({ issuedAt: NOW - 31 * DAY, retiring });
const me = processIdentity(process.pid);
const retireGuard = { startedAt: () => NOW - 32 * DAY };
const o = f.opts({ runtimes: () => [{ phase: "running", supervisor: me }], retireGuard });
const done = await ensureReady(o);
assert.equal(done.action, "held");
assert.deepEqual(o.stages, ["fast"]);
assert.equal(f.read().key, record.key);
// The terminal rotate still refuses, in worker words.
const e = await refused(rotateKey(f.opts({ runtimes: () => [{ phase: "running", supervisor: me }], retireGuard })), "worker-key-failed");
assert.match(e.message, /too many worker keys/);
});
test("keyStatus reads the worker file and its orphans", async (t) => {
const f = await fixture(t);
await ensureReady(f.opts());
const orphan = keyPrefix(f.configDir, "worker") + b64();
f.state.keys.push(orphan);
const s = await keyStatus({ configDir: f.configDir, system: f.system, purpose: "worker" });
assert.equal(s.proxy.state, "read");
assert.equal(s.proxy.holdsKey, true);
assert.deepEqual(s.proxy.orphanKeyIds, [id(orphan)]);
const triage = await keyStatus({ configDir: f.configDir, system: f.system });
assert.equal(triage.record, null);
assert.deepEqual(triage.proxy.orphanKeyIds, []);
// keyStatus returns the record itself (the Triage CLI prints only ids); scan the proxy half.
OUTPUTS.push(JSON.stringify(s.proxy), JSON.stringify(triage.proxy));
});
test("no output, error or receipt carries key material", () => {
assert.ok(SEEN.size > 10);
assert.ok(OUTPUTS.length > 10);
for (const text of OUTPUTS) assert.equal(leaks(text), false, "an output, error or receipt leaked a key");
});
// The Triage refusals keep their codes and words exactly as they were before purposes.
test("Triage refusals, receipts and fence keep their exact codes and words", async (t) => {
const f = await fixture(t);
const triage = (extra = {}) => ({ configDir: f.configDir, system: f.system, now: () => f.now, ...extra });
const exact = async (promise, code, message) => {
const e = await refused(promise, code);
if (message instanceof RegExp) assert.match(e.message, message); else assert.equal(e.message, message);
};
await exact(ensureKey({ configDir: f.configDir, system: { dataRoot: f.root } }), "triage-key-no-proxy", "the instance has no model proxy set up (proxy.json)");
await exact(rotateKey(triage()), "triage-key-not-issued", "no Triage key is issued; use mosaic triage key issue");
await issueKey(triage());
await exact(issueKey(triage()), "triage-key-issued", "a Triage key is already issued; use mosaic triage key rotate");
fs.chmodSync(f.triage.file, 0o644);
await exact(ensureKey(triage()), "triage-key-unreadable", /^the Triage key store is unreadable: /);
fs.chmodSync(f.triage.file, 0o600);
const sentinel = f.others.sentinel;
f.state.keys = f.state.keys.filter((k) => k !== sentinel);
await exact(ensureKey(triage()), "triage-key-proxy-open", "the proxy's key list has no sentinel for this instance, so it may be another proxy");
f.state.keys.push(sentinel);
f.state.onGet = (n) => { if (n % 2 === 0) f.state.keys.push(`unrelated-${n}`); };
await exact(rotateKey(triage()), "triage-key-raced", "the proxy's key list changed while this verb ran; run it again");
f.state.onGet = null;
f.state.ignorePut = true;
await exact(rotateKey(triage()), "triage-key-unconfirmed", "the proxy did not confirm the change; the instance proxy fence stays set, see mosaic proxy fence status");
f.state.ignorePut = false;
assert.match(fs.readFileSync(join(f.root, "proxy", "mosaic-keys.uncertain"), "utf8"), /"triage\.rotate"/);
fs.rmSync(join(f.root, "proxy", "mosaic-keys.uncertain"));
fs.chmodSync(f.receipts, 0o644);
await exact(rotateKey(triage()), "triage-key-receipts-unsafe", /; nothing was changed$/);
fs.chmodSync(f.receipts, 0o600);
await exact(rotateKey(triage({ hook: (s) => { if (s === "rename") throw new Error("stop"); } })), "triage-key-unwritten",
`the proxy list changed but ${f.triage.file} was not written (the Triage key store is unreadable: the key file cannot be written); fix the file's directory, then run mosaic triage key rotate again, which clears what this run left`);
await exact(rotateKey(triage({ hook: (s) => { if (s === "sync") throw new Error("stop"); } })), "triage-key-unsynced",
`${f.triage.file} was written but its directory could not be synced, so it may not survive a power loss; run mosaic triage key status`);
for (let i = 0; i < 20 && f.read("triage").retiring.length < 16; i++) await rotateKey(triage());
await exact(rotateKey(triage()), "triage-key-failed", "too many keys are retiring; run mosaic triage key retire once their grace has passed");
const ops = fs.readFileSync(f.receipts, "utf8").trim().split("\n").map((l) => JSON.parse(l).op);
assert.ok(ops.length > 3 && ops.every((op) => /^triage\.key\.(issue|rotate)$/.test(op)), ops.join(","));
});
@@ -240,8 +240,8 @@ export async function lifecycleFixture(t) {
}
async function consoleBrowser(t, f) {
const b = await browser(); t.after(() => b.close());
b.on('Fetch.requestPaused', ({ requestId, request: incoming }) => {
let b = await browser(); const consolePage = b; t.after(() => consolePage.close());
consolePage.on('Fetch.requestPaused', ({ requestId, request: incoming }) => {
const url = new URL(incoming.url);
if (incoming.method === 'POST') f.recordOwner(url.pathname);
const req = httpRequest({ host: '127.0.0.1', port: f.port, path: url.pathname + url.search, method: incoming.method,
@@ -249,9 +249,9 @@ async function consoleBrowser(t, f) {
const parts = []; res.on('data', part => parts.push(part)); res.on('end', () => {
const responseHeaders = Object.entries(res.headers).filter(([name]) => !['connection','keep-alive','transfer-encoding'].includes(name))
.flatMap(([name, value]) => (Array.isArray(value) ? value : [value]).map(value => ({ name, value: String(value) })));
b.call('Fetch.fulfillRequest', { requestId, responseCode: res.statusCode, responseHeaders, body: Buffer.concat(parts).toString('base64') }).catch(() => {});
consolePage.call('Fetch.fulfillRequest', { requestId, responseCode: res.statusCode, responseHeaders, body: Buffer.concat(parts).toString('base64') }).catch(() => {});
});
}); req.on('error', () => b.call('Fetch.failRequest', { requestId, errorReason: 'Failed' }).catch(() => {})); req.end(incoming.postData);
}); req.on('error', () => consolePage.call('Fetch.failRequest', { requestId, errorReason: 'Failed' }).catch(() => {})); req.end(incoming.postData);
});
await b.call('Fetch.enable', { patterns: [{ urlPattern: ORIGIN + '/*', requestStage: 'Request' }] });
const s = await f.current(); await b.navigate(`${ORIGIN}/#/inbox/${s.selection.decision}`);
@@ -267,7 +267,10 @@ async function consoleBrowser(t, f) {
await wait('document.querySelector("#decide-status")?.textContent.startsWith("Recorded")');
},
async offline(html) {
await b.call('Fetch.disable');
// The Console can still poll during navigation. Close it before observing the downloaded file.
await b.close();
b = await browser(); const offlinePage = b; t.after(() => offlinePage.close());
external.length = 0;
await b.call('Page.addScriptToEvaluateOnNewDocument', { source: `window.__now=1000;Date.now=()=>window.__now;window.__ticks=[];window.setInterval=fn=>{window.__ticks.push(fn);return window.__ticks.length;};window.__sounds=0;window.AudioContext=class{currentTime=0;destination={};resume(){}createOscillator(){return{connect(){},frequency:{value:0},start(){window.__sounds++},stop(){}}}createGain(){return{connect(){},gain:{value:0}}}};` });
await b.call('Network.enable'); await b.call('Network.emulateNetworkConditions', { offline: true, latency: 0, downloadThroughput: 0, uploadThroughput: 0 });
b.on('Network.requestWillBeSent', ({ request }) => { if (/^https?:/.test(request.url)) external.push(request.url); });
+14 -8
View File
@@ -157,20 +157,25 @@ export function offeredControl({ dataRoot, riders, receipt, exclusive, rootAgent
try { list = await riders(); } catch { throw failure('outcome-unknown'); }
const named = (Array.isArray(list) ? list : []).filter(r => typeof r?.id === 'string' && ORG_ID.test(r.id));
const riding = named.filter(r => r.cliproxy === true);
if (!riding.length) throw failure('not-configured');
const unanswered = new Set(named.filter(r => typeof r.cliproxy !== 'boolean').map(r => r.id));
if (!riding.length) throw failure(unanswered.size ? 'proxy-down' : 'not-configured');
let root;
try { root = typeof rootAgents === 'function' ? await rootAgents() : undefined; } catch { root = undefined; }
const answers = await Promise.all(riding.map(async r => {
let routes = null, named = null;
try { routes = await r.call('routes'); } catch { routes = null; }
try { named = typeof r.file === 'function' ? modelsNamed((await r.file())?.document) : null; } catch { named = null; }
let routes = null, named = null, noLaunchReply = false, document = null;
try { routes = await r.call('routes'); } catch (error) { noLaunchReply = error?.code === 'launch-not-configured'; }
try { document = typeof r.file === 'function' ? (await r.file())?.document : null; named = modelsNamed(document); } catch { named = null; }
// A separate file read can observe a newer launch than the bus did. Treat that race and
// unreadable files as unknown, never as proof that no model is in use.
const noLaunch = noLaunchReply && named !== null && !Object.hasOwn(document, 'launch');
const fromRoot = root === undefined ? null : rootModelsNamed(root, r.id);
return { id: r.id, routes, named: named && fromRoot ? [...named, ...fromRoot] : null };
return { id: r.id, routes, noLaunch, named: named && fromRoot ? [...named, ...fromRoot] : null };
}));
const providers = new Map(), usedBy = new Map();
let ready = false;
for (const { id, routes } of answers) {
for (const { id, routes, noLaunch } of answers) {
// routes explicitly refuses before reading a catalogue when the organization has no launch.
if (noLaunch) continue;
const c = routes?.catalogue;
if (c?.status !== 'ready' || !Array.isArray(c.models)) { unanswered.add(id); continue; }
ready = true;
@@ -181,8 +186,9 @@ export function offeredControl({ dataRoot, riders, receipt, exclusive, rootAgent
if (!providers.get(provider).includes(m.model)) providers.get(provider).push(m.model);
}
}
if (!ready) throw failure('proxy-down');
for (const { id, routes, named } of answers) {
if (!ready) throw failure(!unanswered.size && answers.every(a => a.noLaunch) ? 'not-configured' : 'proxy-down');
for (const { id, routes, named, noLaunch } of answers) {
if (noLaunch) continue;
if (!routes || typeof routes.instances !== 'object' || routes.instances === null || named === null) { unanswered.add(id); continue; }
const table = routes.providerModels && typeof routes.providerModels === 'object' ? routes.providerModels : {};
const legacy = routes.catalogue?.legacy && typeof routes.catalogue.legacy === 'object' ? routes.catalogue.legacy : {};
@@ -114,6 +114,38 @@ test('an organization whose usage is unknown (its file unreadable, its bus down,
}
});
test('a riding organization explicitly without launch is answered, while a bus failure remains unanswered', async t => {
const noLaunch = { ...rider('bolt', []), call: async () => { throw Object.assign(new Error('no launch'), { code: 'launch-not-configured' }); } };
const down = { ...rider('crux', []), call: async () => { throw new Error('down'); } };
const c = control(t, { riders: [rider('acme', [entry('zai', 'glm-5')]), noLaunch, down] });
assert.deepEqual((await c.models({ seed: true })).unanswered, ['crux']);
const onlyAnswered = control(t, { riders: [rider('acme', [entry('zai', 'glm-5')]), noLaunch] });
const view = await onlyAnswered.models({ seed: true });
assert.deepEqual(view.unanswered, []);
assert.equal(existsSync(offeredFile(onlyAnswered.dataRoot)), true);
await onlyAnswered.modelsSet({ provider: 'z.ai', on: [], revision: view.revision });
});
test('a no-launch response with a newer launch or unreadable file stays unanswered and blocks an unconfirmed switch off', async t => {
const noLaunch = async () => { throw Object.assign(new Error('no launch'), { code: 'launch-not-configured' }); };
for (const file of [async () => ({ document: { launch: { models: {} }, roles: {} } }), async () => { throw new Error('unreadable'); }, async () => ({ document: null })]) {
const c = control(t, { riders: [rider('acme', [entry('zai', 'glm-5')]), { ...rider('bolt', []), call: noLaunch, file }] });
const view = await c.models({ seed: true });
assert.deepEqual(view.unanswered, ['bolt']);
assert.equal(existsSync(offeredFile(c.dataRoot)), false);
await assert.rejects(c.modelsSet({ provider: 'z.ai', on: [], revision: view.revision }), { code: 'models-in-use' });
}
});
test('all riders confirmed without launch are not configured; a failed read is proxy-down', async t => {
const noLaunch = { ...rider('bolt', []), call: async () => { throw Object.assign(new Error('no launch'), { code: 'launch-not-configured' }); } };
const configured = control(t, { riders: [noLaunch] });
await assert.rejects(configured.models({ seed: true }), { code: 'not-configured' });
assert.equal(existsSync(offeredFile(configured.dataRoot)), false);
const down = control(t, { riders: [{ ...noLaunch, file: async () => { throw new Error('unreadable'); } }] });
await assert.rejects(down.models({ seed: true }), { code: 'proxy-down' });
});
test('in use counts every place the organization file names a model and the root agents it takes: project agents, root copies; not an excluded or assistant root agent, not launch.models itself', async t => {
const models = [entry('zai', 'glm-5'), entry('zai', 'glm-4.6'), entry('codex', 'gpt-5'), entry('codex', 'gpt-5-mini')];
const routes = { instances: { chief: { model: 'g5' } }, providerModels: { g5: entry('zai', 'glm-5'), g46: entry('zai', 'glm-4.6'), gpt: entry('codex', 'gpt-5'), mini: entry('codex', 'gpt-5-mini') } };
@@ -166,6 +198,9 @@ test(`a model kept on while its account is signed out counts against the ${MAX_O
// glm-0 is in use and this switches it off, but the list is too long first: no ask for a save that cannot be written.
await assert.rejects(c.modelsSet({ provider: 'z.ai', on: all.slice(1), revision: before.revision }), { code: 'models-invalid' }, `${all.length - 1} on plus 10 kept is past ${MAX_ON}`);
await assert.rejects(c.modelsSet({ provider: 'z.ai', on: all.slice(1), revision: before.revision, confirmInUse: true }), { code: 'models-invalid' });
// Exactly 257 including the 10 kept models must refuse before asking about glm-0.
assert.equal(all.slice(6).length + away.length, MAX_ON + 1);
await assert.rejects(c.modelsSet({ provider: 'z.ai', on: all.slice(6), revision: before.revision }), { code: 'models-invalid' });
assert.equal(readOffered(c.dataRoot).revision, before.revision);
assert.deepEqual(c.receipts, []);
const saved = await c.modelsSet({ provider: 'z.ai', on: all.slice(7), revision: before.revision, confirmInUse: true });
@@ -228,6 +263,7 @@ test('a damaged file: the read and the write answer outcome-unknown and write no
test('no organization riding is not-configured; none answering a ready catalogue is proxy-down; a busy lock refuses the write', async t => {
await assert.rejects(control(t, { riders: [] }).models(), { code: 'not-configured' });
await assert.rejects(control(t, { riders: [{ ...rider('acme', []), cliproxy: false }] }).models(), { code: 'not-configured' });
await assert.rejects(control(t, { riders: [{ ...rider('acme', []), cliproxy: undefined }] }).models(), { code: 'proxy-down' });
const down = { id: 'acme', cliproxy: true, call: async () => { throw new Error('down'); } };
await assert.rejects(control(t, { riders: [down, rider('bolt', [], { catalogue: { status: 'unavailable', models: [] } })] }).models(), { code: 'proxy-down' });
await assert.rejects(control(t, { riders: [rider('acme', [entry('zai', 'glm-5')])], busy: true }).modelsSet({ provider: 'z.ai', on: [], revision: 'a'.repeat(16) }), { code: 'proxy-admin-busy' });
@@ -0,0 +1,282 @@
// worker-stop-reason: a run-task worker run is judged by pi's final stop reason, not only its exit
// status (adapters/pi/final-stop.mjs). The real pi runs through adapters/pi/adapter.sh against a
// fake Anthropic Messages provider on 127.0.0.1 port 0: no real model, no other network.
import { test } from "node:test";
import assert from "node:assert/strict";
import { spawn, spawnSync } from "node:child_process";
import http from "node:http";
import { chmodSync, cpSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
import { tmpdir } from "node:os";
import { dirname, join } from "node:path";
import { fileURLToPath } from "node:url";
import { locate } from "../harness/pi/binary.mjs";
import { agentEndKeeper, judgeFinalStop } from "../../../adapters/pi/final-stop.mjs";
import { fixture, tmp } from "../../cli/tests/helpers.mjs";
const REPO = join(dirname(fileURLToPath(import.meta.url)), "..", "..", "..");
const ADAPTER = join(REPO, "adapters", "pi", "adapter.sh");
const FINAL_STOP = join(REPO, "adapters", "pi", "final-stop.mjs");
const TASK = join(REPO, "scripts", "mosaic-task.mjs");
const scratch = (t) => {
const dir = mkdtempSync(join(tmpdir(), "fs"));
t.after(() => rmSync(dir, { recursive: true, force: true }));
return dir;
};
const agentEnd = (...messages) => JSON.stringify({ type: "agent_end", messages });
const assistant = (stopReason, extra = {}) => ({ role: "assistant", content: [{ type: "text", text: "partial" }], stopReason, ...extra });
// --- The judge -----------------------------------------------------------------------------------
test("final stop: a finished stop passes with the text parts as text mode prints them", () => {
const line = agentEnd({ role: "user", content: "hi" }, { role: "assistant", stopReason: "stop", content: [{ type: "thinking", thinking: "x" }, { type: "text", text: "OK" }, { type: "text", text: "two" }] });
assert.deepEqual(judgeFinalStop(line), { ok: true, answer: "OK\ntwo\n" });
assert.deepEqual(judgeFinalStop(agentEnd({ role: "assistant", stopReason: "stop", content: [] })), { ok: true, answer: "" });
});
test("final stop: an error, aborted or length stop fails with one plain line", () => {
assert.deepEqual(judgeFinalStop(agentEnd(assistant("error", { errorMessage: "401 invalid\nx-api-key" }))), { ok: false, message: "pi stopped on an error: 401 invalid x-api-key" });
assert.deepEqual(judgeFinalStop(agentEnd(assistant("aborted"))), { ok: false, message: "pi stopped on an error: request aborted" });
assert.deepEqual(judgeFinalStop(agentEnd(assistant("length"))), { ok: false, message: "pi stopped with no finished answer: the model reached its output limit" });
const long = judgeFinalStop(agentEnd(assistant("error", { errorMessage: "e".repeat(5000) })));
assert.equal(long.ok, false);
assert.ok(long.message.length < 2100);
});
test("final stop: no end of run, no reply or an unknown stop reason fails closed", () => {
assert.equal(judgeFinalStop(null).ok, false);
assert.equal(judgeFinalStop("{not json").ok, false);
assert.equal(judgeFinalStop(agentEnd({ role: "user", content: "hi" })).ok, false);
assert.match(judgeFinalStop(agentEnd(assistant("deferred"))).message, /unknown reason \(deferred\)/);
assert.equal(judgeFinalStop(agentEnd(assistant(undefined))).ok, false);
});
test("final stop: a tool that ends the run passes with nothing printed, as text mode does", () => {
const line = agentEnd(assistant("toolUse"), { role: "toolResult", content: [{ type: "text", text: "done" }] });
assert.deepEqual(judgeFinalStop(line), { ok: true, answer: "" });
});
test("final stop: the keeper keeps the last agent_end line across chunk splits and skips other lines", () => {
const k = agentEndKeeper();
const first = agentEnd(assistant("error", { errorMessage: "retrying" }));
const last = agentEnd({ role: "assistant", stopReason: "stop", content: [{ type: "text", text: "é OK" }] });
const stream = Buffer.from(`{"type":"session"}\n${first}\n{"type":"message_end","note":"{\\"type\\":\\"agent_end\\"}"}\n${last}\n{"type":"agent_start"}\n`);
for (let i = 0; i < stream.length; i += 3) k.write(stream.subarray(i, i + 3));
assert.deepEqual(k.end(), { line: last, tooBig: false });
const unterminated = agentEndKeeper();
unterminated.write(Buffer.from(last));
assert.equal(unterminated.end().line, last);
const none = agentEndKeeper();
none.write(Buffer.from('{"type":"agent_start"}\n'));
assert.deepEqual(none.end(), { line: null, tooBig: false });
});
test("final stop: an agent_end line over the cap is not kept, and a later one replaces it", () => {
const small = agentEnd(assistant("stop"));
const big = agentEnd(assistant("stop", { pad: "x".repeat(300) }));
assert.ok(small.length < 200 && big.length > 200);
const k = agentEndKeeper(200);
k.write(Buffer.from(`${small}\n${big}\n`));
assert.deepEqual(k.end(), { line: null, tooBig: true });
const again = agentEndKeeper(200);
again.write(Buffer.from(`${big}\n${small}\n`));
assert.deepEqual(again.end(), { line: small, tooBig: false });
});
// --- final-stop.mjs with a stand-in pi -----------------------------------------------------------
function standIn(dir, body) {
const file = join(dir, "pi-stand-in.mjs");
writeFileSync(file, `#!${process.execPath}\n${body}\n`, { mode: 0o755 });
return file;
}
const runFinalStop = (pi, args = []) => spawnSync(process.execPath, [FINAL_STOP, pi, ...args], { encoding: "utf8", timeout: 20000, input: "" });
test("final stop: an error stop that pi reports with exit 0 is a failed run", (t) => {
const dir = scratch(t);
const pi = standIn(dir, `process.stdout.write(${JSON.stringify(`{"type":"session"}\n${agentEnd(assistant("error", { errorMessage: "529 overloaded" }))}\n`)}); process.exit(0);`);
const r = runFinalStop(pi);
assert.equal(r.status, 1);
assert.equal(r.stdout, "");
assert.equal(r.stderr, "pi stopped on an error: 529 overloaded\n");
});
test("final stop: pi gets its arguments plus --mode json, and its own exit code and stderr pass through", (t) => {
const dir = scratch(t);
const pi = standIn(dir, `(await import("node:fs")).writeFileSync(${JSON.stringify(join(dir, "argv"))}, JSON.stringify(process.argv.slice(2))); process.stderr.write("pi said no\\n"); process.exit(3);`);
const r = runFinalStop(pi, ["-p", "two words"]);
assert.equal(r.status, 3);
assert.equal(r.stderr, "pi said no\n");
assert.equal(r.stdout, "");
assert.deepEqual(JSON.parse(readFileSync(join(dir, "argv"), "utf8")), ["-p", "two words", "--mode", "json"]);
});
test("final stop: a pi that can't start or dies on a signal fails with one line", (t) => {
const dir = scratch(t);
const missing = runFinalStop(join(dir, "no-such-pi"));
assert.equal(missing.status, 127);
assert.match(missing.stderr, /^pi final stop: pi could not be started \(ENOENT\)\n$/);
const killed = runFinalStop(standIn(dir, `process.kill(process.pid, "SIGKILL");`));
assert.equal(killed.status, 137);
assert.equal(killed.stderr, "pi final stop: pi was stopped by SIGKILL\n");
});
// --- The real pi through adapter.sh -------------------------------------------------------------
function sse(res, events) {
res.writeHead(200, { "content-type": "text/event-stream", connection: "close" });
for (const [type, data] of events) res.write(`event: ${type}\ndata: ${JSON.stringify({ type, ...data })}\n\n`);
res.end();
}
const START = { message: { id: "m1", type: "message", role: "assistant", model: "probe-model", content: [], stop_reason: null, usage: { input_tokens: 1, output_tokens: 0 } } };
const reply = (text, stop) => [
["message_start", START],
...(text === null ? [] : [
["content_block_start", { index: 0, content_block: { type: "text", text: "" } }],
["content_block_delta", { index: 0, delta: { type: "text_delta", text } }],
["content_block_stop", { index: 0 }],
]),
["message_delta", { delta: { stop_reason: stop }, usage: { output_tokens: 1 } }],
["message_stop", {}],
];
const SCENARIOS = {
ok: (req, res) => sse(res, reply("OK", "end_turn")),
"status-401": (req, res) => { res.writeHead(401, { "content-type": "application/json" }); res.end(JSON.stringify({ type: "error", error: { type: "authentication_error", message: "invalid x-api-key" } })); },
"length-empty": (req, res) => sse(res, reply(null, "max_tokens")),
"length-text": (req, res) => sse(res, reply("partial", "max_tokens")),
refusal: (req, res) => sse(res, reply(null, "refusal")),
};
async function provider(t, scenario) {
const server = http.createServer((req, res) => { req.resume(); req.on("end", () => SCENARIOS[scenario](req, res)); });
await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
t.after(() => { server.closeAllConnections(); server.close(); });
return `http://127.0.0.1:${server.address().port}`;
}
const PI = locate(process.env);
async function adapterRun(t, scenario, { finalStop }) {
assert.ok(PI.bin, PI.problem);
const dir = scratch(t);
const agentDir = join(dir, "agent");
mkdirSync(agentDir);
const url = await provider(t, scenario);
writeFileSync(join(agentDir, "models.json"), JSON.stringify({ providers: { probe: { baseUrl: url, api: "anthropic-messages", apiKey: "probe-dummy", models: [{ id: "probe-model" }] } } }));
writeFileSync(join(dir, "system.md"), "Answer briefly.\n");
const env = {
PATH: `${dirname(process.execPath)}:/usr/bin:/bin`,
HOME: dir,
TMPDIR: dir,
LANG: "C.UTF-8",
PI_CODING_AGENT_DIR: agentDir,
PI_OFFLINE: "1",
PI_SKIP_VERSION_CHECK: "1",
PI_PROVIDER: "probe",
PI_MODEL: "probe-model",
MOSAIC_PI_BIN: PI.bin,
MOSAIC_SYSTEM_PROMPT_FILE: join(dir, "system.md"),
MOSAIC_REQUEST: "Say OK",
MOSAIC_WORKSPACE: join(dir, "ws"),
...(finalStop ? { MOSAIC_PI_FINAL_STOP: "1" } : {}),
};
const child = spawn("/bin/sh", [ADAPTER], { env, stdio: ["ignore", "pipe", "pipe"] });
let stdout = "", stderr = "";
child.stdout.on("data", (d) => (stdout += d));
child.stderr.on("data", (d) => (stderr += d));
const status = await new Promise((resolve) => child.on("close", (code, signal) => resolve(signal ?? code)));
return { status, stdout, stderr };
}
test("real pi: without the final-stop check a length stop exits 0 with nothing printed (the gap)", async (t) => {
const r = await adapterRun(t, "length-empty", { finalStop: false });
assert.deepEqual({ status: r.status, stdout: r.stdout, stderr: r.stderr }, { status: 0, stdout: "", stderr: "" });
});
test("real pi: with the check a normal stop still passes and prints the answer as text mode does", async (t) => {
const plain = await adapterRun(t, "ok", { finalStop: false });
const judged = await adapterRun(t, "ok", { finalStop: true });
assert.deepEqual({ status: plain.status, stdout: plain.stdout }, { status: 0, stdout: "OK\n" });
assert.deepEqual({ status: judged.status, stdout: judged.stdout, stderr: judged.stderr }, { status: 0, stdout: "OK\n", stderr: "" });
});
test("real pi: with the check a length stop fails, with or without partial text", async (t) => {
for (const scenario of ["length-empty", "length-text"]) {
const r = await adapterRun(t, scenario, { finalStop: true });
assert.deepEqual({ status: r.status, stdout: r.stdout, stderr: r.stderr }, { status: 1, stdout: "", stderr: "pi stopped with no finished answer: the model reached its output limit\n" }, scenario);
}
});
test("real pi: with the check a provider error stop (pi exits 0 in JSON mode) fails with pi's error text", async (t) => {
const r = await adapterRun(t, "status-401", { finalStop: true });
assert.equal(r.status, 1);
assert.equal(r.stdout, "");
assert.match(r.stderr, /^pi stopped on an error: 401 .*authentication_error.*invalid x-api-key.*\n$/);
const refused = await adapterRun(t, "refusal", { finalStop: true });
assert.equal(refused.status, 1);
assert.equal(refused.stderr, "pi stopped on an error: The model refused to complete the request\n");
});
// --- src/run-agent.sh sets the check for pi only -------------------------------------------------
function entrypoint(t) {
const root = scratch(t);
const opt = join(root, "opt");
for (const d of ["src", "processing-control", "contracts", "adapters/pi"]) mkdirSync(join(opt, d), { recursive: true });
writeFileSync(join(opt, "src", "run-agent.sh"), readFileSync(join(REPO, "src", "run-agent.sh"), "utf8").replaceAll("/opt/mosaic", opt), { mode: 0o755 });
writeFileSync(join(opt, "src", "load-contracts.sh"), '#!/bin/sh\nprintf "prompt\\n" > "$2"\n', { mode: 0o755 });
writeFileSync(join(opt, "processing-control", "entrypoint.mjs"), "");
cpSync(join(REPO, "adapters", "mock"), join(opt, "adapters", "mock"), { recursive: true });
chmodSync(join(opt, "adapters", "mock", "adapter.sh"), 0o755);
writeFileSync(join(opt, "adapters", "pi", "adapter.sh"), '#!/bin/sh\n(env | grep "^MOSAIC_" | sort) >&2\necho pi-stand-in\n', { mode: 0o755 });
return (adapter, extra = {}) => spawnSync(join(opt, "src", "run-agent.sh"), ["the request"], {
encoding: "utf8",
timeout: 20000,
env: { PATH: `${dirname(process.execPath)}:/usr/bin:/bin`, HOME: root, MOSAIC_ADAPTER: adapter, MOSAIC_SYSTEM_PROMPT_FILE: join(root, "prompt.md"), MOSAIC_MOCK_RESPONSE: "MOCK_OK", ...extra },
});
}
test("run-agent.sh: a headless pi worker gets MOSAIC_PI_FINAL_STOP=1, and the mock sees exactly the variables it did", (t) => {
const run = entrypoint(t);
const pi = run("pi");
assert.equal(pi.status, 0, pi.stderr);
assert.match(pi.stderr, /^MOSAIC_PI_FINAL_STOP=1$/m);
const mock = run("mock");
assert.equal(mock.status, 0, mock.stderr);
assert.equal(mock.stdout, "MOCK_OK\n");
const vars = mock.stderr.split("\n").filter((l) => l.startsWith("MOSAIC_")).map((l) => l.split("=")[0]);
assert.deepEqual(vars, ["MOSAIC_ADAPTER", "MOSAIC_MOCK_RESPONSE", "MOSAIC_REQUEST", "MOSAIC_SYSTEM_PROMPT_FILE"]);
const interactive = run("pi", { MOSAIC_INTERACTIVE: "1" });
assert.equal(interactive.status, 0, interactive.stderr);
assert.doesNotMatch(interactive.stderr, /MOSAIC_PI_FINAL_STOP/);
});
// --- run-task prints the cause of a failed run ---------------------------------------------------
function runTask(t, dockerBody) {
const root = tmp(t), f = fixture(root), bin = join(root, "bin");
mkdirSync(bin);
writeFileSync(join(bin, "docker"), `#!${process.execPath}\n${dockerBody}\n`, { mode: 0o755 });
f.env.PATH = `${bin}:${f.env.PATH}`;
const task = join(root, "task.json");
writeFileSync(task, JSON.stringify({ taskVersion: 1, id: "one", prompt: "request" }));
const r = spawnSync(process.execPath, [TASK, "run", task], { env: f.env, encoding: "utf8", timeout: 20000 });
const runs = join(f.dataRoot, "runs");
const [id] = readdirSync(runs);
return { r, id, record: JSON.parse(readFileSync(join(runs, id, "result.json"), "utf8")) };
}
test("run-task: a worker that stops on an error is a failed run whose cause the terminal shows", (t) => {
const { r, id, record } = runTask(t, 'process.stderr.write("pi stopped on an error: 401 invalid x-api-key\\n"); process.exit(1);');
assert.equal(r.status, 1, r.stderr);
assert.equal(record.status, "failed");
assert.equal(record.reason, "exit-nonzero");
assert.equal(r.stdout, `run: ${id}\nstatus: failed (exit-nonzero)\nresponse: \ncause: worker said: pi stopped on an error: 401 invalid x-api-key\n`);
});
test("run-task: a succeeded run prints no cause line", (t) => {
const { r, id, record } = runTask(t, 'console.log("normal response");');
assert.equal(r.status, 0, r.stderr);
assert.equal(record.status, "succeeded");
assert.equal(r.stdout, `run: ${id}\nstatus: succeeded\nresponse: normal response\n`);
});
@@ -0,0 +1,201 @@
#!/usr/bin/env node
// Host relay for worker containers (worker-proxy-simple, slice S2).
//
// node proxy-relay.mjs <socket path> 127.0.0.1:<port>
//
// Listens on one Unix socket and copies bytes, both ways, to the one loopback
// port its caller names: the user-level model proxy. It parses nothing and
// holds no key. The only address it ever opens is 127.0.0.1:<port>, checked
// once at start; any other target refuses before anything listens.
//
// The caller makes the socket's directory first, mode 0700, owned by this
// user. The relay refuses a directory that is a symbolic link, is owned by
// another user or grants any group or other bit, a socket path that is
// relative or 108 bytes or longer (the Linux sun_path limit counts the NUL),
// and a path that already exists. The socket itself is created 0600.
//
// Lifetime. The caller spawns the relay with a pipe on stdin and keeps it
// open. The relay exits on EOF there, which is what the caller's exit gives,
// clean or not. It also exits on SIGTERM, SIGINT or SIGHUP, and when its
// parent process id changes. On exit it closes every connection and the
// listener, which removes the socket file; the caller removes the directory.
//
// Output. One line "ready" on stdout once the socket listens, then nothing
// more. A refusal is one line on stderr and exit 2. Nothing is written per
// connection: the caller may be blocked in spawnSync and not draining pipes.
// Not wired into any launch yet; the cutover slice (S4) starts it.
import { spawn } from 'node:child_process';
import { chmodSync, lstatSync, realpathSync } from 'node:fs';
import net from 'node:net';
import { dirname, isAbsolute } from 'node:path';
import { fileURLToPath } from 'node:url';
export const SOCKET_PATH_LIMIT = 108;
const SELF = fileURLToPath(import.meta.url);
function refusal(message) {
const error = new Error(message);
error.relayRefusal = true;
return error;
}
// Only the literal 127.0.0.1 and a decimal port 1 to 65535. No name lookup,
// no IPv6, no other loopback address.
export function relayTarget(target) {
const match = typeof target === 'string' ? /^127\.0\.0\.1:([1-9][0-9]{0,4})$/.exec(target) : null;
const port = match ? Number(match[1]) : 0;
if (!match || port > 65535) throw refusal('proxy relay: the target must be 127.0.0.1:<port>.');
return { host: '127.0.0.1', port };
}
export function relaySocketPath(socketPath) {
if (typeof socketPath !== 'string' || !isAbsolute(socketPath)) {
throw refusal('proxy relay: the socket path must be absolute.');
}
const bytes = Buffer.byteLength(socketPath, 'utf8');
if (bytes >= SOCKET_PATH_LIMIT) {
throw refusal(`proxy relay: the socket path is ${bytes} bytes; it must be under ${SOCKET_PATH_LIMIT}.`);
}
const dir = dirname(socketPath);
let stat;
try { stat = lstatSync(dir); }
catch { throw refusal('proxy relay: the socket directory is missing.'); }
if (!stat.isDirectory() || stat.uid !== process.getuid() || (stat.mode & 0o777) !== 0o700) {
throw refusal('proxy relay: the socket directory must be a 0700 directory owned by this user.');
}
let exists = true;
try { lstatSync(socketPath); } catch (error) { if (error.code === 'ENOENT') exists = false; }
if (exists) throw refusal('proxy relay: the socket path already exists.');
return socketPath;
}
// Copy bytes both ways. An error on either side ends both at once. A clean
// close of one side only ends the other, so bytes still queued for a slow
// reader are flushed first; that side is destroyed when its peer closes too,
// or LINGER_MS after its last byte was written. The same helper is in
// adapters/pi/proxy-forward.mjs, which the image carries without this package.
const LINGER_MS = 10000;
function join(a, b) {
const kill = () => { a.destroy(); b.destroy(); };
const finish = (other) => () => {
if (other.destroyed) return;
other.resume();
other.end();
const linger = () => {
const timer = setTimeout(() => other.destroy(), LINGER_MS).unref();
other.once('close', () => clearTimeout(timer));
};
if (other.writableFinished) linger(); else other.once('finish', linger);
};
a.on('error', kill); b.on('error', kill);
a.on('close', finish(b)); b.on('close', finish(a));
a.pipe(b); b.pipe(a);
}
function main(argv) {
let socketPath, target;
try {
if (argv.length !== 2) throw refusal('proxy relay: usage: proxy-relay.mjs <socket path> 127.0.0.1:<port>.');
target = relayTarget(argv[1]);
socketPath = relaySocketPath(argv[0]);
} catch (error) {
process.stderr.write(`${error.relayRefusal ? error.message : 'proxy relay: could not start.'}\n`);
process.exit(2);
}
const parent = process.ppid;
const live = new Set();
let stopping = false;
const server = net.createServer({ allowHalfOpen: true });
function stop(code = 0) {
if (stopping) return;
stopping = true;
for (const socket of live) socket.destroy();
// Closing a bound listener removes its socket file (libuv unlinks it).
server.close(() => process.exit(code));
setTimeout(() => process.exit(code), 1000).unref();
}
server.on('connection', (client) => {
if (stopping) { client.destroy(); return; }
// The one address this process opens. Fixed at start, never from the client.
const upstream = net.connect({ host: target.host, port: target.port, family: 4, allowHalfOpen: true });
for (const socket of [client, upstream]) { live.add(socket); socket.on('close', () => live.delete(socket)); }
join(client, upstream);
});
server.on('error', (error) => {
if (!stopping) {
process.stderr.write(error.code === 'EADDRINUSE'
? 'proxy relay: the socket path already exists.\n'
: 'proxy relay: could not listen on the socket.\n');
process.exit(2);
}
});
process.stdin.on('data', () => {});
process.stdin.on('end', () => stop(0));
process.stdin.on('close', () => stop(0));
process.stdin.on('error', () => stop(0));
for (const signal of ['SIGTERM', 'SIGINT', 'SIGHUP']) process.on(signal, () => stop(0));
setInterval(() => { if (process.ppid !== parent) stop(0); }, 500).unref();
const mask = process.umask(0o177);
server.listen(socketPath, () => {
process.umask(mask);
if (stopping) return;
try { chmodSync(socketPath, 0o600); }
catch {
process.stderr.write('proxy relay: could not set the socket mode.\n');
stop(2);
return;
}
process.stdout.write('ready\n');
});
}
// For the cutover slice and the tests: start the relay as a child of this
// process and wait for its "ready" line. Rejects with the relay's own refusal
// line when it exits first. The child stays in the caller's process group.
export function spawnRelay({ socketPath, target, node = process.execPath, timeoutMs = 5000 } = {}) {
return new Promise((resolveStart, rejectStart) => {
// An empty environment: the relay reads none, and must never carry the
// caller's keys or NODE_OPTIONS.
const child = spawn(node, [SELF, socketPath, target], { env: {}, stdio: ['pipe', 'pipe', 'pipe'] });
child.stdin.on('error', () => {});
let out = '', err = '', settled = false;
const settle = (fn, value) => { if (!settled) { settled = true; clearTimeout(timer); fn(value); } };
const timer = setTimeout(() => {
child.kill('SIGKILL');
settle(rejectStart, new Error('proxy relay: did not start in time.'));
}, timeoutMs);
child.stdout.on('data', (chunk) => {
out += chunk;
if (out.includes('ready\n')) {
settle(resolveStart, {
child,
// EOF on stdin, then SIGKILL after killAfterMs if the relay is wedged.
stop({ killAfterMs = 2000 } = {}) {
return new Promise((done) => {
if (child.exitCode !== null || child.signalCode !== null) { done(); return; }
const kill = setTimeout(() => child.kill('SIGKILL'), killAfterMs);
child.once('exit', () => { clearTimeout(kill); done(); });
child.stdin.end();
});
},
});
}
});
child.stderr.on('data', (chunk) => { err += chunk; });
child.on('error', (error) => settle(rejectStart, error));
child.on('exit', () => settle(rejectStart, new Error(err.trim().split('\n')[0] || 'proxy relay: exited before it was ready.')));
});
}
function isMain() {
try { return process.argv[1] !== undefined && realpathSync(process.argv[1]) === realpathSync(SELF); }
catch { return false; }
}
if (isMain()) main(process.argv.slice(2));
@@ -0,0 +1,631 @@
// Slice S2 of worker-proxy-simple: the host relay (src/proxy-relay.mjs) and
// the in-container forwarder (adapters/pi/proxy-forward.mjs), against a fake
// proxy on port 0. Nothing here starts Docker. Run with a TMPDIR of 31 bytes
// or less so every socket path stays well under the 108-byte limit.
import test from 'node:test';
import assert from 'node:assert/strict';
import { spawn, spawnSync } from 'node:child_process';
import { existsSync, lstatSync, mkdirSync, mkdtempSync, readdirSync, readFileSync, rmSync, symlinkSync, writeFileSync } from 'node:fs';
import http from 'node:http';
import net from 'node:net';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { fileURLToPath } from 'node:url';
import { relayTarget, relaySocketPath, spawnRelay, SOCKET_PATH_LIMIT } from '../src/proxy-relay.mjs';
const RELAY = fileURLToPath(new URL('../src/proxy-relay.mjs', import.meta.url));
const FORWARD = fileURLToPath(new URL('../../../adapters/pi/proxy-forward.mjs', import.meta.url));
const LINE = 'worker: the container could not reach the model proxy socket.\n';
const pause = ms => new Promise(r => setTimeout(r, ms));
function scratch(t) {
const base = mkdtempSync(join(tmpdir(), 'r'));
const dir = join(base, 'd');
mkdirSync(dir, { mode: 0o700 });
t.after(() => rmSync(base, { recursive: true, force: true }));
return { base, dir, sock: join(dir, 'p.sock') };
}
function listen(server) {
return new Promise((r) => server.listen(0, '127.0.0.1', () => r(server.address().port)));
}
// A fake model proxy: counts TCP connections, answers HTTP, can stream.
async function fakeProxy(t) {
const seen = { connections: 0, requests: [] };
const server = http.createServer({ keepAliveTimeout: 5000 }, async (req, res) => {
let body = '';
for await (const chunk of req) body += chunk;
seen.requests.push({ method: req.method, url: req.url, body, socket: req.socket.remotePort });
if (req.url === '/stream') {
res.writeHead(200, { 'content-type': 'text/event-stream' });
for (let i = 0; i < 5; i++) { res.write(`data: ${i}\n\n`); await pause(30); }
res.end('data: done\n\n');
return;
}
res.writeHead(200, { 'content-type': 'text/plain' });
res.end(`ok ${req.method} ${req.url} ${body.length}`);
});
server.on('connection', () => { seen.connections++; });
const port = await listen(server);
t.after(() => { server.closeAllConnections(); server.close(); });
return { server, port, seen };
}
// A raw TCP echo listener, used as the proxy for binary round trips and as a
// decoy port that must never see a connection.
async function tcpListener(t, onSocket = s => s.pipe(s)) {
const seen = { connections: 0 };
const server = net.createServer({ allowHalfOpen: true }, (s) => { seen.connections++; onSocket(s); });
const port = await listen(server);
t.after(() => server.close());
return { port, seen };
}
async function freePort() {
const s = net.createServer();
const port = await listen(s);
await new Promise(r => s.close(r));
return port;
}
function run(file, args, { timeout = 15000 } = {}) {
return spawnSync(process.execPath, [file, ...args], { encoding: 'utf8', timeout, stdio: ['pipe', 'pipe', 'pipe'] });
}
// Start the forwarder and wait for its "ready" line, or its exit.
function startForwarder(t, sock, port) {
return new Promise((resolveStart) => {
const child = spawn(process.execPath, [FORWARD, sock, String(port)], { stdio: ['ignore', 'pipe', 'pipe'] });
let out = '', err = '', done = false;
const finish = (value) => { if (!done) { done = true; resolveStart(value); } };
child.stdout.on('data', (c) => { out += c; if (out.includes('ready\n')) finish({ child, ready: true, err: () => err, out: () => out }); });
child.stderr.on('data', (c) => { err += c; });
child.on('exit', (code) => finish({ child, ready: false, code, err: () => err, out: () => out }));
t.after(() => { if (child.exitCode === null && child.signalCode === null) child.kill('SIGKILL'); });
});
}
function request(agent, port, path, { method = 'GET', body } = {}) {
return new Promise((resolveReq, rejectReq) => {
const req = http.request({ host: '127.0.0.1', port, path, method, agent }, (res) => {
const chunks = [];
const times = [];
res.on('data', (c) => { chunks.push(String(c)); times.push(Date.now()); });
res.on('end', () => resolveReq({ status: res.statusCode, chunks, times, body: chunks.join('') }));
});
req.on('error', rejectReq);
if (body) req.write(body);
req.end();
});
}
function unixRoundTrip(sock, bytes) {
return new Promise((resolveTrip, rejectTrip) => {
const c = net.connect({ path: sock, allowHalfOpen: true });
const got = [];
c.on('connect', () => { c.end(bytes); });
c.on('data', (d) => got.push(d));
c.on('end', () => { c.end(); resolveTrip(Buffer.concat(got)); });
c.on('error', rejectTrip);
});
}
function groupAlive(pgid) {
try { process.kill(-pgid, 0); return true; } catch (error) { return error.code !== 'ESRCH'; }
}
// A client that sends its request, half-closes, then reads slowly.
function slowHalfClose(connectOpts, bytes) {
return new Promise((resolveTrip, rejectTrip) => {
const c = net.connect({ ...connectOpts, allowHalfOpen: true });
let got = 0;
c.on('connect', () => c.end(bytes));
c.on('data', (d) => { got += d.length; c.pause(); setTimeout(() => c.resume(), 2); });
c.on('end', () => { c.end(); resolveTrip(got); });
c.on('error', rejectTrip);
});
}
// A proxy that answers each connection with `size` bytes once the client half-closes.
function bigReply(size) {
return (s) => {
s.on('error', () => {});
s.once('data', (d) => { if (String(d).startsWith('HEAD ')) s.end('HTTP/1.1 200 OK\r\ncontent-length: 0\r\n\r\n'); });
s.on('end', () => { if (!s.writableEnded) s.end(Buffer.alloc(size, 0x61)); });
};
}
test('target: only 127.0.0.1 with a decimal port 1 to 65535', () => {
assert.deepEqual(relayTarget('127.0.0.1:8317'), { host: '127.0.0.1', port: 8317 });
assert.deepEqual(relayTarget('127.0.0.1:65535'), { host: '127.0.0.1', port: 65535 });
for (const bad of ['0.0.0.0:80', '127.0.0.2:80', '127.1:80', 'localhost:80', '[::1]:80', '::1:80', '10.0.0.1:80',
'127.0.0.1', '127.0.0.1:', '127.0.0.1:0', '127.0.0.1:65536', '127.0.0.1:080', '127.0.0.1:+80', '127.0.0.1:80x',
' 127.0.0.1:80', '127.0.0.1:80\n', '127.0.0.1:0x50', 'http://127.0.0.1:80', undefined, 8080]) {
assert.throws(() => relayTarget(bad), /target must be 127\.0\.0\.1:<port>/, String(bad));
}
});
test('relay CLI refuses a non-loopback target with one line, and listens nowhere', (t) => {
const { dir, sock } = scratch(t);
for (const bad of ['192.168.1.1:80', '0.0.0.0:443', 'localhost:8317', '[::1]:8317', '127.0.0.1:0']) {
const r = run(RELAY, [sock, bad]);
assert.equal(r.status, 2, bad);
assert.equal(r.stdout, '');
assert.equal(r.stderr, 'proxy relay: the target must be 127.0.0.1:<port>.\n');
assert.equal(existsSync(sock), false);
}
const usage = run(RELAY, [sock]);
assert.equal(usage.status, 2);
assert.equal(usage.stderr.split('\n').length, 2);
assert.ok(existsSync(dir));
});
test('relay refuses a socket path of 108 bytes or more, and accepts 107', async (t) => {
const { dir } = scratch(t);
const pad = (n) => join(dir, 'x'.repeat(n - dir.length - 1));
const long = pad(SOCKET_PATH_LIMIT);
assert.equal(Buffer.byteLength(long), 108);
const r = run(RELAY, [long, '127.0.0.1:9']);
assert.equal(r.status, 2);
assert.equal(r.stderr, 'proxy relay: the socket path is 108 bytes; it must be under 108.\n');
assert.equal(existsSync(long), false);
const longer = run(RELAY, [pad(200), '127.0.0.1:9']);
assert.equal(longer.stderr, 'proxy relay: the socket path is 200 bytes; it must be under 108.\n');
const fits = pad(107);
const relay = await spawnRelay({ socketPath: fits, target: '127.0.0.1:9' });
assert.ok(lstatSync(fits).isSocket());
await relay.stop();
});
test('relay refuses an unsafe socket directory or an existing path', (t) => {
const { base, dir, sock } = scratch(t);
assert.throws(() => relaySocketPath('rel/p.sock'), /must be absolute/);
assert.throws(() => relaySocketPath(join(base, 'none', 'p.sock')), /socket directory is missing/);
const open = join(base, 'o');
mkdirSync(open, { mode: 0o755 });
assert.throws(() => relaySocketPath(join(open, 'p.sock')), /0700 directory owned by this user/);
const link = join(base, 'l');
symlinkSync(dir, link);
assert.throws(() => relaySocketPath(join(link, 'p.sock')), /0700 directory owned by this user/);
writeFileSync(sock, '');
assert.throws(() => relaySocketPath(sock), /already exists/);
const r = run(RELAY, [sock, '127.0.0.1:9']);
assert.equal(r.status, 2);
assert.equal(r.stderr, 'proxy relay: the socket path already exists.\n');
assert.equal(lstatSync(sock).isFile(), true);
});
test('relay socket is 0600 and copies bytes both ways to the one port', async (t) => {
const { sock } = scratch(t);
const echo = await tcpListener(t);
const relay = await spawnRelay({ socketPath: sock, target: `127.0.0.1:${echo.port}` });
t.after(() => relay.stop());
assert.equal(lstatSync(sock).mode & 0o777, 0o600);
const bytes = Buffer.alloc(300000);
for (let i = 0; i < bytes.length; i++) bytes[i] = (i * 31 + 7) & 0xff;
const back = await unixRoundTrip(sock, bytes);
assert.ok(back.equals(bytes));
const [a, b] = await Promise.all([unixRoundTrip(sock, Buffer.from('one')), unixRoundTrip(sock, Buffer.from('two'))]);
assert.equal(String(a), 'one');
assert.equal(String(b), 'two');
assert.equal(echo.seen.connections, 3);
});
test('full path: streamed reply and kept-alive requests on one connection', async (t) => {
const { sock } = scratch(t);
const proxy = await fakeProxy(t);
const relay = await spawnRelay({ socketPath: sock, target: `127.0.0.1:${proxy.port}` });
t.after(() => relay.stop());
let fwd;
for (let i = 0; i < 5; i++) {
fwd = await startForwarder(t, sock, await freePort());
if (fwd.ready) break;
}
assert.ok(fwd.ready, fwd.err());
const port = Number(fwd.child.spawnargs.at(-1));
assert.equal(proxy.seen.requests[0].method, 'HEAD', 'the start check reaches the proxy');
const checkConnections = proxy.seen.connections;
const agent = new http.Agent({ keepAlive: true, maxSockets: 1 });
t.after(() => agent.destroy());
const one = await request(agent, port, '/v1/models');
const two = await request(agent, port, '/v1/messages', { method: 'POST', body: '{"model":"m","x":"' + 'y'.repeat(70000) + '"}' });
const three = await request(agent, port, '/stream');
assert.equal(one.body, 'ok GET /v1/models 0');
assert.equal(two.body, 'ok POST /v1/messages 70020');
assert.equal(three.body, 'data: 0\n\ndata: 1\n\ndata: 2\n\ndata: 3\n\ndata: 4\n\ndata: done\n\n');
assert.ok(three.chunks.length >= 3, `streamed in pieces: ${three.chunks.length}`);
assert.ok(three.times.at(-1) - three.times[0] >= 60, 'pieces arrived over time, not buffered');
const kept = proxy.seen.requests.slice(1);
assert.equal(kept.length, 3);
assert.equal(proxy.seen.connections - checkConnections, 1, 'three requests, one proxy connection');
assert.equal(new Set(kept.map(r => r.socket)).size, 1);
assert.equal(fwd.err(), '');
});
test('traffic reaches only the proxy port, whatever the bytes name', async (t) => {
const { sock } = scratch(t);
const decoy = await tcpListener(t);
const proxied = [];
const proxy = await tcpListener(t, (s) => {
s.on('data', (d) => proxied.push(String(d)));
s.on('end', () => s.end('HTTP/1.1 200 OK\r\ncontent-length: 0\r\n\r\n'));
});
const relay = await spawnRelay({ socketPath: sock, target: `127.0.0.1:${proxy.port}` });
t.after(() => relay.stop());
const asks = [
`CONNECT 127.0.0.1:${decoy.port} HTTP/1.1\r\nHost: 127.0.0.1:${decoy.port}\r\n\r\n`,
`GET http://127.0.0.1:${decoy.port}/ HTTP/1.1\r\nHost: 127.0.0.1:${decoy.port}\r\n\r\n`,
`GET / HTTP/1.1\r\nHost: example.com\r\nX-Forwarded-Host: 10.0.0.1\r\n\r\n`,
];
for (const ask of asks) {
const back = await unixRoundTrip(sock, Buffer.from(ask));
assert.match(String(back), /^HTTP\/1\.1 200 OK/);
}
assert.equal(proxy.seen.connections, 3);
assert.equal(decoy.seen.connections, 0);
assert.deepEqual(proxied, asks);
});
test('relay exits on its parent\'s signal and on stdin EOF, removing the socket; the caller removes the directory', async (t) => {
const { dir, sock } = scratch(t);
const proxy = await fakeProxy(t);
for (const signal of ['SIGTERM', 'SIGINT', 'SIGHUP']) {
const a = await spawnRelay({ socketPath: sock, target: `127.0.0.1:${proxy.port}` });
t.after(() => a.stop());
const exited = new Promise(r => a.child.once('exit', (code, sig) => r({ code, signal: sig })));
a.child.kill(signal);
assert.deepEqual(await exited, { code: 0, signal: null }, signal);
assert.equal(existsSync(sock), false, signal);
}
const b = await spawnRelay({ socketPath: sock, target: `127.0.0.1:${proxy.port}` });
t.after(() => b.stop());
const held = net.connect({ path: sock });
await new Promise(r => held.once('connect', r));
const heldClosed = new Promise(r => held.once('close', r));
await b.stop();
await heldClosed;
assert.equal(b.child.exitCode, 0);
assert.equal(existsSync(sock), false);
rmSync(dir, { recursive: true });
assert.equal(existsSync(dir), false);
});
test('relay runs with an empty environment', async (t) => {
const { sock } = scratch(t);
process.env.RELAY_TEST_MARKER = 'must-not-pass';
t.after(() => { delete process.env.RELAY_TEST_MARKER; });
const relay = await spawnRelay({ socketPath: sock, target: '127.0.0.1:9' });
t.after(() => relay.stop());
assert.equal(readFileSync(`/proc/${relay.child.pid}/environ`).length, 0);
});
test('stop() kills a relay that does not exit on EOF', async (t) => {
const { sock } = scratch(t);
const relay = await spawnRelay({ socketPath: sock, target: '127.0.0.1:9' });
t.after(() => { try { relay.child.kill('SIGKILL'); } catch {} });
relay.child.kill('SIGSTOP');
const started = Date.now();
await relay.stop({ killAfterMs: 300 });
assert.equal(relay.child.signalCode, 'SIGKILL');
assert.ok(Date.now() - started < 3000);
});
test('relay exits when its parent changes, even while its stdin stays open', async (t) => {
const { base, sock } = scratch(t);
const proxy = await fakeProxy(t);
// The middle process gives the relay a stdin pipe whose write end a third
// process (sleep) holds, so only the parent check can end the relay once
// the middle dies. Node closes a child's own stdin pipe when it exits.
const middleFile = join(base, 'middle.mjs');
writeFileSync(middleFile, `import { spawn } from 'node:child_process';
const holder = spawn('sleep', ['30'], { stdio: ['ignore', 'pipe', 'ignore'] });
const relay = spawn(process.execPath, [${JSON.stringify(RELAY)}, process.argv[2], process.argv[3]], { env: {}, stdio: [holder.stdout, 'pipe', 'inherit'] });
relay.stdout.on('data', (c) => { if (String(c).includes('ready')) process.stdout.write('relay ' + relay.pid + ' ' + holder.pid + '\\n'); });
setInterval(() => {}, 1000);
`);
const middle = spawn(process.execPath, [middleFile, sock, `127.0.0.1:${proxy.port}`], { detached: true, stdio: ['ignore', 'pipe', 'pipe'] });
t.after(() => { try { process.kill(-middle.pid, 'SIGKILL'); } catch {} });
const [relayPid, holderPid] = await new Promise((resolvePid, rejectPid) => {
let out = '';
middle.stdout.on('data', (c) => { out += c; const m = /relay (\d+) (\d+)\n/.exec(out); if (m) resolvePid([Number(m[1]), Number(m[2])]); });
middle.on('exit', () => rejectPid(new Error('middle exited early')));
});
const middleGone = new Promise(r => middle.once('exit', r));
process.kill(middle.pid, 'SIGKILL');
await middleGone;
const deadline = Date.now() + 4000;
while (Date.now() < deadline) {
try { process.kill(relayPid, 0); } catch { break; }
await pause(50);
}
process.kill(holderPid, 0); // the stdin write end was still held when the relay exited
assert.throws(() => process.kill(relayPid, 0), { code: 'ESRCH' });
assert.equal(existsSync(sock), false);
});
test('half-closed client reading slowly gets the whole reply, through the relay and through the forwarder', async (t) => {
const { sock } = scratch(t);
const size = 3 * 1024 * 1024;
const proxy = await tcpListener(t, bigReply(size));
const relay = await spawnRelay({ socketPath: sock, target: `127.0.0.1:${proxy.port}` });
t.after(() => relay.stop());
for (let i = 0; i < 3; i++) assert.equal(await slowHalfClose({ path: sock }, Buffer.from('ask')), size, `relay round ${i}`);
let fwd;
for (let i = 0; i < 5; i++) { fwd = await startForwarder(t, sock, await freePort()); if (fwd.ready) break; }
assert.ok(fwd.ready, fwd.err());
const port = Number(fwd.child.spawnargs.at(-1));
for (let i = 0; i < 3; i++) assert.equal(await slowHalfClose({ host: '127.0.0.1', port }, Buffer.from('ask')), size, `forwarder round ${i}`);
assert.equal(fwd.err(), '');
});
test('relay exits when its parent is killed and leaves no process in the group', async (t) => {
const { base, dir, sock } = scratch(t);
const proxy = await fakeProxy(t);
const parentFile = join(base, 'parent.mjs');
writeFileSync(parentFile, `import { spawnRelay } from ${JSON.stringify(RELAY)};
const relay = await spawnRelay({ socketPath: process.argv[2], target: process.argv[3] });
process.stdout.write('relay ' + relay.child.pid + '\\n');
setInterval(() => {}, 1000);
`);
const parent = spawn(process.execPath, [parentFile, sock, `127.0.0.1:${proxy.port}`], { detached: true, stdio: ['ignore', 'pipe', 'pipe'] });
const pgid = parent.pid;
t.after(() => { try { process.kill(-pgid, 'SIGKILL'); } catch {} });
const relayPid = await new Promise((resolvePid, rejectPid) => {
let out = '';
parent.stdout.on('data', (c) => { out += c; const m = /relay (\d+)\n/.exec(out); if (m) resolvePid(Number(m[1])); });
parent.on('exit', () => rejectPid(new Error('parent exited early')));
});
assert.ok(groupAlive(pgid));
process.kill(relayPid, 0);
// A live connection through the relay must not keep it alive.
const held = net.connect({ path: sock });
await new Promise(r => held.once('connect', r));
held.on('error', () => {});
const parentGone = new Promise(r => parent.once('exit', r));
process.kill(parent.pid, 'SIGKILL');
await parentGone;
const deadline = Date.now() + 5000;
while (groupAlive(pgid) && Date.now() < deadline) await pause(50);
assert.equal(groupAlive(pgid), false, 'no process left in the parent\'s group');
assert.throws(() => process.kill(relayPid, 0), { code: 'ESRCH' });
assert.equal(existsSync(sock), false);
held.destroy();
rmSync(dir, { recursive: true });
assert.equal(existsSync(dir), false);
});
test('forwarder: a missing socket gives the fixed line and exit 1', (t) => {
const { sock } = scratch(t);
const r = run(FORWARD, [sock, '9']);
assert.equal(r.status, 1);
assert.equal(r.stdout, '');
assert.equal(r.stderr, LINE);
});
test('forwarder: a dead socket file gives the fixed line and exit 1', async (t) => {
const { dir, sock } = scratch(t);
// A socket file with no listener behind it: the relay was SIGKILLed.
const relay = await spawnRelay({ socketPath: sock, target: '127.0.0.1:9' });
const gone = new Promise(r => relay.child.once('exit', r));
relay.child.kill('SIGKILL');
await gone;
assert.ok(lstatSync(sock).isSocket());
const r = run(FORWARD, [sock, '9']);
assert.equal(r.status, 1);
assert.equal(r.stdout, '');
assert.equal(r.stderr, LINE);
rmSync(dir, { recursive: true });
});
test('forwarder: a live relay with no proxy behind it gives the fixed line and exit 1', async (t) => {
const { sock } = scratch(t);
const relay = await spawnRelay({ socketPath: sock, target: `127.0.0.1:${await freePort()}` });
t.after(() => relay.stop());
const r = run(FORWARD, [sock, '9']);
assert.equal(r.status, 1);
assert.equal(r.stdout, '');
assert.equal(r.stderr, LINE);
});
test('forwarder: a proxy that accepts but never answers gives the fixed line after the check timeout', async (t) => {
const { sock } = scratch(t);
const silent = await tcpListener(t, (s) => { s.on('data', () => {}); });
const relay = await spawnRelay({ socketPath: sock, target: `127.0.0.1:${silent.port}` });
t.after(() => relay.stop());
const started = Date.now();
const r = run(FORWARD, [sock, '9']);
assert.equal(r.status, 1);
assert.equal(r.stderr, LINE);
assert.ok(Date.now() - started >= 4500);
});
test('forwarder: bad arguments refuse with a usage line and exit 2', (t) => {
const { sock } = scratch(t);
for (const args of [[], [sock], ['rel.sock', '80'], [sock, '0'], [sock, '65536'], [sock, '80x'], [sock, '080']]) {
const r = run(FORWARD, args);
assert.equal(r.status, 2, JSON.stringify(args));
assert.equal(r.stderr, 'worker: proxy forwarder usage: proxy-forward.mjs <socket path> <port>.\n');
}
});
test('forwarder: a lost relay after start prints the fixed line once', async (t) => {
const { sock } = scratch(t);
const proxy = await fakeProxy(t);
const relay = await spawnRelay({ socketPath: sock, target: `127.0.0.1:${proxy.port}` });
let fwd;
for (let i = 0; i < 5; i++) { fwd = await startForwarder(t, sock, await freePort()); if (fwd.ready) break; }
assert.ok(fwd.ready, fwd.err());
const port = Number(fwd.child.spawnargs.at(-1));
await relay.stop();
for (let i = 0; i < 3; i++) {
await assert.rejects(request(undefined, port, '/v1/models'));
}
await pause(100);
assert.equal(fwd.err(), LINE);
});
test('forwarder: a proxy gone after the start check prints the fixed line once', async (t) => {
const { sock } = scratch(t);
const proxy = await fakeProxy(t);
const relay = await spawnRelay({ socketPath: sock, target: `127.0.0.1:${proxy.port}` });
t.after(() => relay.stop());
let fwd;
for (let i = 0; i < 5; i++) { fwd = await startForwarder(t, sock, await freePort()); if (fwd.ready) break; }
assert.ok(fwd.ready, fwd.err());
const port = Number(fwd.child.spawnargs.at(-1));
proxy.server.closeAllConnections();
await new Promise(r => proxy.server.close(r));
for (let i = 0; i < 3; i++) await assert.rejects(request(undefined, port, '/v1/models'));
await pause(100);
assert.equal(fwd.err(), LINE);
assert.equal(fwd.child.exitCode, null, 'the forwarder keeps running');
});
test('forwarder: an idle connection the proxy closes is not a lost proxy, a request it hangs up on is', async (t) => {
const { sock } = scratch(t);
// Answers the start check, closes a connection idle for 200 ms, and hangs
// up on any other request with no reply.
const proxy = await tcpListener(t, (s) => {
s.on('error', () => {});
const idle = setTimeout(() => s.end(), 200);
s.once('data', (d) => {
clearTimeout(idle);
if (String(d).startsWith('HEAD ')) s.end('HTTP/1.1 200 OK\r\ncontent-length: 0\r\n\r\n');
else s.end();
});
});
const relay = await spawnRelay({ socketPath: sock, target: `127.0.0.1:${proxy.port}` });
t.after(() => relay.stop());
let fwd;
for (let i = 0; i < 5; i++) { fwd = await startForwarder(t, sock, await freePort()); if (fwd.ready) break; }
assert.ok(fwd.ready, fwd.err());
const port = Number(fwd.child.spawnargs.at(-1));
for (let i = 0; i < 3; i++) {
const c = net.connect({ host: '127.0.0.1', port });
c.on('error', () => {});
c.resume();
await new Promise(r => c.once('close', r));
}
await pause(100);
assert.equal(fwd.err(), '', 'an idle close prints nothing');
await assert.rejects(request(undefined, port, '/v1/models'));
await pause(100);
assert.equal(fwd.err(), LINE);
});
// The copier's error path: a reset or a drop on one side must end the other
// side at once, so no socket is left behind in the relay or the forwarder.
test('dropped and reset connections mid-stream leave no socket in the relay or the forwarder', async (t) => {
const { sock } = scratch(t);
const open = new Set();
t.after(() => { for (const s of open) s.destroy(); });
const proxy = await tcpListener(t, (s) => {
open.add(s);
s.on('error', () => {});
let timer;
s.once('data', (d) => {
if (String(d).startsWith('HEAD ')) { s.end('HTTP/1.1 200 OK\r\ncontent-length: 0\r\n\r\n'); return; }
timer = setInterval(() => s.write(Buffer.alloc(1024, 0x62)), 20);
});
// Like a streaming HTTP reply, it keeps writing after the client's FIN
// and stops only when its socket closes.
s.on('close', () => { clearInterval(timer); open.delete(s); });
});
const relay = await spawnRelay({ socketPath: sock, target: `127.0.0.1:${proxy.port}` });
t.after(() => relay.stop());
let fwd;
for (let i = 0; i < 5; i++) { fwd = await startForwarder(t, sock, await freePort()); if (fwd.ready) break; }
assert.ok(fwd.ready, fwd.err());
const port = Number(fwd.child.spawnargs.at(-1));
const fds = (pid) => readdirSync(`/proc/${pid}/fd`).length;
// Let the start check's own connection close in the relay before counting.
const settleBy = Date.now() + 2000;
while (Date.now() < settleBy && open.size > 0) await pause(20);
await pause(200);
const base = { relay: fds(relay.child.pid), fwd: fds(fwd.child.pid) };
const streamThenDrop = (opts, drop) => new Promise((resolveDrop) => {
const c = net.connect(opts);
c.on('error', () => {});
c.once('connect', () => c.write('GET /s HTTP/1.1\r\n\r\n'));
c.once('data', () => { drop(c); });
c.once('close', resolveDrop);
});
const waves = [
[{ host: '127.0.0.1', port }, c => c.resetAndDestroy()],
[{ host: '127.0.0.1', port }, c => c.destroy()],
[{ path: sock }, c => c.destroy()],
];
for (const [opts, drop] of waves) await Promise.all(Array.from({ length: 40 }, () => streamThenDrop(opts, drop)));
const deadline = Date.now() + 3000;
while (Date.now() < deadline && (fds(relay.child.pid) > base.relay || fds(fwd.child.pid) > base.fwd || open.size > 0)) await pause(50);
const now = { relay: fds(relay.child.pid), fwd: fds(fwd.child.pid), proxy: open.size };
assert.ok(now.relay <= base.relay && now.fwd <= base.fwd && now.proxy === 0, JSON.stringify({ base, now }));
assert.equal(fwd.err(), '');
});
test('forwarder: stdout carries only "ready" and closes, so a shell can capture it', async (t) => {
const { base, sock } = scratch(t);
const proxy = await fakeProxy(t);
const relay = await spawnRelay({ socketPath: sock, target: `127.0.0.1:${proxy.port}` });
t.after(() => relay.stop());
const port = await freePort();
const script = join(base, 'cap.sh');
writeFileSync(script, 'ready=$("$1" "$2" "$3" "$4" &)\nprintf "[%s]\\n" "$ready"\n');
const sh = spawn('sh', [script, process.execPath, FORWARD, sock, String(port)], { detached: true, stdio: ['ignore', 'pipe', 'pipe'] });
t.after(() => { try { process.kill(-sh.pid, 'SIGKILL'); } catch {} });
let out = '';
sh.stdout.on('data', (c) => { out += c; });
const code = await new Promise(r => sh.once('exit', r));
assert.equal(code, 0);
assert.equal(out, '[ready]\n');
const one = await request(undefined, port, '/after');
assert.equal(one.body, 'ok GET /after 0');
});
// The container shape without Docker: bwrap gives an empty network namespace
// (loopback only, like network_mode: none) and a read-only bind of the socket
// directory, as the cutover's /run/mosaic-proxy mount will be. Same uid
// inside and out, so this proves nothing about Docker's uid mapping.
test('forwarder in a network namespace reaches the proxy through a read-only bind', async (t) => {
const probe = spawnSync('bwrap', ['--ro-bind', '/', '/', '--dev', '/dev', '--unshare-net', 'true'], { encoding: 'utf8' });
if (probe.error || probe.status !== 0) { t.skip('bwrap with --unshare-net is not available here'); return; }
const { base, dir, sock } = scratch(t);
const proxy = await fakeProxy(t);
const relay = await spawnRelay({ socketPath: sock, target: `127.0.0.1:${proxy.port}` });
t.after(() => relay.stop());
const inside = join(base, 'inside.mjs');
writeFileSync(inside, `import { spawn } from 'node:child_process';
import http from 'node:http';
const [fwd, port] = process.argv.slice(2);
const child = spawn(process.execPath, [fwd, '/run/mosaic-proxy/p.sock', port], { stdio: ['ignore', 'pipe', 'inherit'] });
let out = '';
child.stdout.on('data', (c) => { out += c; if (out === 'ready\\n') go(); });
child.on('exit', (code) => { if (out !== 'ready\\n') { process.stdout.write('forwarder exit ' + code + '\\n'); process.exit(1); } });
function go() {
http.get({ host: '127.0.0.1', port }, (res) => {
let body = ''; res.on('data', (c) => { body += c; });
res.on('end', () => {
const direct = http.get({ host: '127.0.0.1', port: ${proxy.port} });
direct.on('error', (e) => { process.stdout.write(body + '|direct ' + e.code + '\\n'); child.kill(); process.exit(0); });
direct.on('response', () => { process.stdout.write(body + '|direct reached\\n'); child.kill(); process.exit(0); });
});
}).on('error', (e) => { process.stdout.write('error ' + e.code + '\\n'); process.exit(1); });
}
`);
// Async: the fake proxy lives in this process, so a spawnSync here would starve it.
const box = spawn('bwrap', ['--ro-bind', '/', '/', '--dev', '/dev', '--proc', '/proc', '--tmpfs', '/run',
'--ro-bind', dir, '/run/mosaic-proxy', '--unshare-net', '--unshare-pid', '--die-with-parent',
process.execPath, inside, FORWARD, '7999'], { stdio: ['ignore', 'pipe', 'pipe'] });
const r = { stdout: '', stderr: '' };
box.stdout.on('data', (c) => { r.stdout += c; });
box.stderr.on('data', (c) => { r.stderr += c; });
const killer = setTimeout(() => box.kill('SIGKILL'), 20000);
r.status = await new Promise(done => box.once('close', done));
clearTimeout(killer);
assert.equal(r.stderr, '');
assert.equal(r.stdout, 'ok GET / 0|direct ECONNREFUSED\n');
assert.equal(r.status, 0);
});
+66 -15
View File
@@ -25,8 +25,27 @@
// E2E6 P1-1: a poll reloads this state; the last save's receipt and the open review list stay.
// A failed poll keeps the last good read only while the page holds the form (dirty, or a field has
// focus), so the held form is not dropped (review P3). A clean form shows the read error (re-check P3).
const held=org=>{const form=[...document.querySelectorAll('[data-autonomy-org]')].find(n=>n.dataset.autonomyOrg===org)?.querySelector('[data-autonomy-form]');return !!form&&(form.hasAttribute('data-live-dirty')||form.contains(document.activeElement));};
async function load(org) {const prev=states.get(org),keep={status:prev?.status??'',reviewOpen:prev?.reviewOpen===true};try{states.set(org,{...await call(org,''),...keep});}catch(error){states.set(org,prev&&!prev.error&&held(org)?{...prev,...keep}:{error:error.message,...keep});}}
// The settings section the page draws now for this organization (a decision notice carries the org too).
const live=org=>[...document.querySelectorAll('[data-autonomy-org]')].find(n=>n.dataset.autonomyOrg===org&&!n.hasAttribute('data-autonomy-decision'));
const held=org=>{const form=live(org)?.querySelector('[data-autonomy-form]');return !!form&&(form.hasAttribute('data-live-dirty')||form.contains(document.activeElement));};
// Each organization keeps one state object for the life of the page. A save or review keeps a reference
// to it across its own request, so a load that ends meanwhile writes its read into that object in place
// and never swaps it: the receipt lands where the next draw reads it. A load that began before the last
// applied read, or before a save answered, carries older values, so its answer is dropped.
const own=['status','reviewOpen','began','shown'];
function put(s,read) {for(const k of Object.keys(s))if(!own.includes(k))delete s[k];for(const [k,v]of Object.entries(read))if(!own.includes(k))s[k]=v;}
const stateOf=org=>{if(!states.has(org))states.set(org,{error:'Autonomy could not be read.',status:'',reviewOpen:false,began:0,shown:0});return states.get(org);};
async function load(org) {
const s=stateOf(org),began=++s.began;let read,failed=false;
try{read=await call(org,'');}catch(error){read={error:error.message};failed=true;}
if(began<s.shown)return;
s.shown=began;
if(failed&&!s.error&&held(org))return;
put(s,read);
}
// A result said on this organization's status line: kept in its state for the next draw, and written to
// the line the page draws now.
function say(org,text) {const s=stateOf(org);s.status=text;const line=live(org)?.querySelector('[data-autonomy-status]');if(line)line.textContent=text;}
function section(org) {
const s=states.get(org);
if(!s || s.error)return `<section class="panel" data-autonomy><h3>Autonomy</h3><p>${esc(s?.error??'Autonomy could not be read.')}</p></section>`;
@@ -42,22 +61,52 @@
<p data-autonomy-status role="status">${esc(s.status)}</p></form>
${s.writable?`<details data-autonomy-review-list${s.reviewOpen?' open':''}><summary${fk('review-list')}>Review reversals before moving out of the loop</summary><p>Read the decision trail and its reversals before recording your review.</p>${classes.map(k=>`<button class="btn" type="button" data-autonomy-review="${k}"${fk(`review-${k}`)}>Record review: ${labels[k]}</button>`).join('')}</details>`:''}</section>`;
}
// Decision notices on /inbox/<id>. The bus page draws that view again on every poll, and a decision the
// owner confirmed, returned or reversed leaves the inbox read, so its notice is gone from the next draw.
// The owner's result for each decision is kept here, in page memory, and the notice is drawn from it:
// the result line stays, a call in flight keeps its buttons off, and a notice whose decision has left
// the read is drawn with its result line only. A decision that comes back into the read after a draw
// saw it gone (an arbiter resolving it again) is a new question, so its old result is dropped.
const answers=new Map(),answerKey=(org,id)=>JSON.stringify([org,id]);
const noticeNode=(org,id)=>[...document.querySelectorAll('[data-autonomy-decision]')].find(n=>n.dataset.autonomyDecision===id&&n.dataset.autonomyOrg===org);
function notice(d) {
if(!d?.autonomy)return '';
const a=d.autonomy,org=d.business??window.MosaicOrg?.id;
return `<section class="panel" data-autonomy-decision="${esc(d.id)}" data-autonomy-org="${esc(org??'')}"><h2>${a.pending?'Confirm the arbiter resolution':'Decision near the loop'}</h2>
${a.pending?'<p>The arbiter resolved this decision. It has no effect until you confirm.</p><label>Reason for returning to the arbiter<input data-autonomy-reason maxlength="500"></label><p><button class="btn" data-autonomy-confirm="yes">Confirm resolution</button> <button class="btn" data-autonomy-confirm="no">Return to arbiter</button></p>':`<p>The agent resolved this decision. Reverse is available until ${esc(a.reverseUntil)}. A reverse cannot undo messages, work already done or code already shipped.</p><button class="btn" data-autonomy-reverse>Reverse decision</button>`}
<p role="status" data-autonomy-status></p></section>`;
if(!d)return '';
const org=d.business??window.MosaicOrg?.id??'',k=answerKey(org,d.id);
let kept=answers.get(k);
if(kept&&!kept.busy){if(!d.autonomy)kept.gone=true;else if(kept.gone){answers.delete(k);kept=undefined;}}
const line=`<p role="status" data-autonomy-status>${esc(kept?.text??'')}</p>`;
const open=`<section class="panel" data-autonomy-decision="${esc(d.id)}" data-autonomy-org="${esc(org)}">`;
if(!d.autonomy)return kept?`${open}<h2>${esc(kept.title)}</h2>${line}</section>`:'';
const a=d.autonomy,off=kept?.busy?' disabled':'';
return `${open}<h2>${a.pending?'Confirm the arbiter resolution':'Decision near the loop'}</h2>
${a.pending?`<p>The arbiter resolved this decision. It has no effect until you confirm.</p><label>Reason for returning to the arbiter<input data-autonomy-reason maxlength="500"></label><p><button class="btn" data-autonomy-confirm="yes"${off}>Confirm resolution</button> <button class="btn" data-autonomy-confirm="no"${off}>Return to arbiter</button></p>`:`<p>The agent resolved this decision. Reverse is available until ${esc(a.reverseUntil)}. A reverse cannot undo messages, work already done or code already shipped.</p><button class="btn" data-autonomy-reverse${off}>Reverse decision</button>`}
${line}</section>`;
}
// A notice's result: kept for the next draw, and written to the notice the page draws now.
function told(org,id,text) {
const k=answerKey(org,id);answers.set(k,{...answers.get(k),busy:false,text});
const node=noticeNode(org,id);if(!node)return;
const line=node.querySelector('[data-autonomy-status]');if(line)line.textContent=text;
for(const b of node.querySelectorAll('[data-autonomy-confirm],[data-autonomy-reverse]'))b.disabled=false;
}
document.addEventListener('submit',async e=>{
if(!e.target.matches('[data-autonomy-form]'))return;e.preventDefault();
const form=e.target,section=form.closest('[data-autonomy-org]'),org=section.dataset.autonomyOrg,s=states.get(org),fields=new FormData(form);
const form=e.target,org=form.closest('[data-autonomy-org]').dataset.autonomyOrg,s=states.get(org),fields=new FormData(form);
const autonomy=Object.fromEntries(classes.map(k=>[k,fields.get(k)]));autonomy.notices=fields.has('notices');autonomy.reverseWindowHours=Number(fields.get('reverseWindowHours'));
if(fields.get('authorityResolver'))autonomy.authorityResolver=fields.get('authorityResolver');
const button=form.querySelector('button[type="submit"]'),status=form.querySelector('[data-autonomy-status]');button.disabled=true;
const button=form.querySelector('button[type="submit"]');button.disabled=true;
let base=s.revision;try{if(form.dataset.revision)base=JSON.parse(form.dataset.revision);}catch{/* drawn without one */}
try{const r=await call(org,'',{revision:base,autonomy});s.revision=r.revision;s.autonomy=autonomy;s.levels=Object.fromEntries(classes.map(k=>[k,autonomy[k]]));s.status=`Saved. Receipt ${r.transaction}.`;form.dataset.revision=JSON.stringify(r.revision);delete form.dataset.liveDirty;status.textContent=s.status;}
catch(error){s.status=error.message;status.textContent=s.status;}finally{button.disabled=false;}
// A load that began before the save answered is dropped. A load that ended during the save read either
// the revision the save sent, from before it committed, or one at or after the save. One that is neither
// was written after the save by someone else: it stays, and the save's values do not replace it.
// A redraw during the save may have drawn a new form from an older read. A clean new form is drawn again
// from the state, which now holds the newest read known, so it shows that and saves against its revision.
// A new form the owner is editing stays: it saves against its own revision and fails closed.
try{const r=await call(org,'',{revision:base,autonomy}),sent=JSON.stringify(base);s.shown=++s.began;
if([sent,JSON.stringify(r.revision)].includes(JSON.stringify(s.revision))){s.revision=r.revision;s.autonomy=autonomy;s.levels=Object.fromEntries(classes.map(k=>[k,autonomy[k]]));}
form.dataset.revision=JSON.stringify(r.revision);delete form.dataset.liveDirty;s.status=`Saved. Receipt ${r.transaction}.`;
const el=live(org),drawn=el?.querySelector('[data-autonomy-form]');if(drawn&&drawn!==form&&!held(org))el.outerHTML=section(org);say(org,s.status);}
catch(error){say(org,error.message);}finally{button.disabled=false;}
});
// An edited form is dirty until it saves: holdLive keeps a dirty form through every poll.
const dirty=e=>{const form=e.target.closest?.('[data-autonomy-form]');if(form)form.dataset.liveDirty='1';};
@@ -67,12 +116,14 @@
document.addEventListener('toggle',e=>{if(!e.target.matches?.('[data-autonomy-review-list]'))return;const s=states.get(e.target.closest('[data-autonomy-org]')?.dataset.autonomyOrg);if(s)s.reviewOpen=e.target.open;},true);
document.addEventListener('click',async e=>{
const button=e.target.closest('[data-autonomy-confirm],[data-autonomy-reverse],[data-autonomy-review]');if(!button)return;
const section=button.closest('[data-autonomy-org]'),org=section.dataset.autonomyOrg,status=section.querySelector('[data-autonomy-status]');
const section=button.closest('[data-autonomy-org]'),org=section.dataset.autonomyOrg,id=section.dataset.autonomyDecision;
const review=button.dataset.autonomyReview,reverse=button.hasAttribute('data-autonomy-reverse');
const body=review?{decisionClass:review}:reverse?{id:section.dataset.autonomyDecision}:{id:section.dataset.autonomyDecision,confirm:button.dataset.autonomyConfirm==='yes',...(button.dataset.autonomyConfirm==='no'?{reason:section.querySelector('[data-autonomy-reason]').value}:{})};
const body=review?{decisionClass:review}:reverse?{id}:{id,confirm:button.dataset.autonomyConfirm==='yes',...(button.dataset.autonomyConfirm==='no'?{reason:section.querySelector('[data-autonomy-reason]').value}:{})};
button.disabled=true;
try{const r=await call(org,review?'review':reverse?'reverse':'confirm',body);status.textContent=review?'Trail review recorded.':reverse?(r.restart||r.trailPending?'Reversal committed. Completion needs recovery: inspect the decision trail and the stopped agent before requesting relaunch.':'Reversal recorded.'):(body.confirm?'Confirmation recorded. Refresh the inbox for current state.':'Returned to arbiter. Refresh the inbox for current state.');}
catch(error){status.textContent=error.message;}finally{button.disabled=false;}
// A notice takes one answer at a time: both of its buttons stay off until this one is told.
if(!review){const k=answerKey(org,id);answers.set(k,{text:'',...answers.get(k),title:section.querySelector('h2')?.textContent??'',busy:true});for(const b of section.querySelectorAll('[data-autonomy-confirm],[data-autonomy-reverse]'))b.disabled=true;}
try{const r=await call(org,review?'review':reverse?'reverse':'confirm',body);if(review)return say(org,'Trail review recorded.');told(org,id,reverse?(r.restart||r.trailPending?'Reversal committed. Completion needs recovery: inspect the decision trail and the stopped agent before requesting relaunch.':'Reversal recorded.'):(body.confirm?'Confirmation recorded. Refresh the inbox for current state.':'Returned to arbiter. Refresh the inbox for current state.'));}
catch(error){if(review)say(org,error.message);else told(org,id,error.message);}finally{button.disabled=false;}
});
window.MosaicAutonomy={load,section,notice};
})();
+3
View File
@@ -751,6 +751,9 @@
return `<li class="s1-opt"><p><b class="s1-key">${txt(o.key)}</b> ${txt(o.text)} ${approving ? badge(`approves ${d.authorization.action}`, 'attn') : ''}${o.key === d.recommendation ? badge('recommended', 'ok') : ''}${chosen ? badge('chosen', 'ok') : ''}</p>${copy}</li>`;
}).join('')}</ol>`;
const earlier = await chain(get, d);
// A newer draw may have begun while the earlier versions were read. This one is dropped, so stop
// here: the notice below keeps the owner's results, and only a draw that lands may change them.
if (!current()) return '';
const history = [...d.seen.map(s => `<li>Seen by ${txt(s.by)}${s.via ? ` via ${txt(s.via)}` : ''} ${when(s.at)}</li>`), ...(c ? [`<li>${esc(c.op)} by ${txt(c.by)}${c.via ? ` via ${txt(c.via)}` : ''} ${when(c.at)}</li>`] : [])];
// Without SSO, or under SSO without --send, the Console says why it has no buttons and never
// draws a disabled one (design section 5).
+40 -20
View File
@@ -597,6 +597,7 @@ if (document.documentElement.hasAttribute('data-settings-proxy-document') && !lo
+ '<details id="proxy-setup-lines" class="proxy-setup-lines" hidden><summary>The service\'s last lines</summary><div class="inside" data-log></div></details>'
+ '<div id="proxy-setup-fixtures" class="banner mk-note" hidden></div>';
const accounts = '<p id="proxy-message" role="status" aria-live="polite">Reading accounts…</p>'
+ '<p class="small muted">Model setup has not checked whether a model answers.</p>'
+ '<p id="proxy-readonly" class="muted" hidden>This Console is read-only. Sign-in and account changes are unavailable.</p>'
+ '<div data-accounts-part><ul id="proxy-accounts" class="rows" aria-label="Accounts"></ul>'
// #1873 account-remove: the instance owner removes an account here; anyone else is told where.
@@ -610,8 +611,8 @@ if (document.documentElement.hasAttribute('data-settings-proxy-document') && !lo
+ '<div class="form-foot"><button type="submit" id="proxy-login-go" hidden>Sign in</button></div></fieldset></form>'
+ '<form id="proxy-apikey" class="settings-form" hidden><fieldset data-write disabled><div class="field"><label for="proxy-apikey-key" id="proxy-apikey-label">API key</label>'
+ '<input id="proxy-apikey-key" name="key" type="password" autocomplete="off" spellcheck="false" maxlength="4096" required>'
+ '<p class="help small muted">Mosaic checks it with <span id="proxy-apikey-provider">the provider</span>, keeps it in your model service, and never shows it again.</p></div>'
+ '<div class="form-foot"><button type="submit">Check and add</button><button type="button" id="proxy-apikey-cancel">Cancel</button></div></fieldset><p id="proxy-apikey-message" role="status"></p></form>'
+ '<p class="help small muted">Mosaic saves the key for <span id="proxy-apikey-provider">the provider</span> in your model service and never shows it again. Saving does not check whether a model answers.</p></div>'
+ '<div class="form-foot"><button type="submit">Save account</button><button type="button" id="proxy-apikey-cancel">Cancel</button></div></fieldset><p id="proxy-apikey-message" role="status"></p></form>'
+ '</div></details>'
+ '<div id="proxy-signin" hidden><ol id="proxy-signin-progress" class="progress" aria-label="Sign-in progress"></ol>'
+ '<p class="form-foot"><a id="proxy-authorize" target="_blank" rel="noopener noreferrer" hidden>Open the sign-in tab again</a><button type="button" id="proxy-login-cancel" disabled>Cancel sign-in</button></p>'
@@ -671,9 +672,10 @@ if (document.documentElement.hasAttribute('data-settings-proxy-document') && !lo
const STEP_KEYS = ['service', 'accounts', 'organizations', 'triage'];
const BADGE = { done: ['badge-ok', 'Done'], next: ['badge-attn', 'Next'], wait: ['badge-muted', 'Waiting'], work: ['badge-attn', 'Working'], bad: ['badge-danger', 'Needs you'], off: ['badge-muted', 'Not yet'] };
const CARD_CLASS = { done: 'done', next: 'next', work: 'next', bad: 'blocked', wait: 'waiting', off: 'waiting' };
// An account's health from its status in the accounts read. Anything else reads Unknown.
const HEALTH = { ready: ['badge-ok', 'Ready'], active: ['badge-ok', 'Ready'], error: ['badge-danger', 'Not working'], unavailable: ['badge-danger', 'Not available'], disabled: ['badge-muted', 'Off'] };
const health = status => HEALTH[status] ?? ['badge-muted', 'Unknown'];
// Account metadata does not prove that a model answered.
const HEALTH = { ready: ['badge-muted', 'Saved'], active: ['badge-muted', 'Saved'], error: ['badge-danger', 'Error'], unavailable: ['badge-danger', 'Not available'], disabled: ['badge-muted', 'Disabled'] };
const health = account => ['error', 'unavailable'].includes(account.status) && account.reason?.startsWith('The account needs to sign in again.')
? ['badge-danger', 'Sign-in needed'] : HEALTH[account.status] ?? ['badge-muted', 'Unknown'];
function mount() {
const $ = id => document.getElementById(id);
const root = $('proxy-setup');
@@ -739,6 +741,7 @@ if (document.documentElement.hasAttribute('data-settings-proxy-document') && !lo
function paintAccountCard() {
const addBox = $('proxy-add-box');
addBox.hidden = !canWrite || Boolean(login);
$('proxy-accounts').querySelectorAll('[data-account-fix]').forEach(button => { button.disabled = Boolean(login); });
// The page has one primary button: here while no account is added and step 1 is done.
const first = canWrite && !login && accountList !== null && !accountList.length && !accountsDown && (!setup.enabled() || setup.serviceDone());
for (const b of [$('proxy-login-go'), $('proxy-apikey').querySelector('button[type=submit]')]) b.className = first ? 'btn primary' : 'btn';
@@ -746,10 +749,10 @@ if (document.documentElement.hasAttribute('data-settings-proxy-document') && !lo
if (accountsDown) { setCard('accounts', 'off', accountsDown, { badge: ['badge-muted', 'Not available'] }); return focusStep(); }
if (accountList === null) { setCard('accounts', 'work', 'Reading accounts…', { badge: ['badge-muted', 'Reading'] }); return focusStep(); }
if (login) { setCard('accounts', 'work', `Signing in to ${providerShort(login.provider)}.`); return focusStep(); }
const bad = accountList.filter(a => ['error', 'unavailable'].includes(a.status));
const bad = accountList.filter(a => ['error', 'unavailable', 'disabled'].includes(a.status));
if (!accountList.length) { if (canWrite) addBox.open = true; setCard('accounts', 'next', 'Add an account once. Every organization that uses your models gets its models.'); }
else if (bad.length) setCard('accounts', 'bad', `${bad.map(a => `${providerLabel(a.provider)}: ${health(a.status)[1].toLowerCase()}`).join(' · ')}. Its models are not offered until it works. Add the account again under Add an account.`);
else setCard('accounts', 'done', accountList.map(a => `${providerLabel(a.provider)} ${health(a.status)[1].toLowerCase()}`).join(' · '));
else if (bad.length) setCard('accounts', 'bad', `${bad.map(a => `${providerLabel(a.provider)}: ${health(a)[1].toLowerCase()}`).join(' · ')}. Check the account rows below.`);
else setCard('accounts', 'done', accountList.map(a => `${providerLabel(a.provider)} ${health(a)[1].toLowerCase()}`).join(' · '));
focusStep();
}
// #1873 account-remove (Jason 2026-11-20): the owner's Remove asks in place and names what moves,
@@ -764,7 +767,7 @@ if (document.documentElement.hasAttribute('data-settings-proxy-document') && !lo
'proxy-uncertain': 'Mosaic could not confirm the remove: the model service is between writes. Check the service and the list before trying again.',
'proxy-down': 'The model service stopped answering, so Mosaic could not confirm the remove. Check the service and the list before trying again.',
'proxy-admin-busy': 'Another setup action is running. Try again when it finishes.',
'invalid-request': 'The model service no longer lists this account. Read the accounts again.',
'invalid-request': 'Mosaic could not identify one account to remove. It may no longer be listed, have a duplicate ID, or share a credential with another account. Read the accounts again.',
'human-required': 'Only the instance owner removes an account.',
};
async function adminCall(path, args) {
@@ -809,8 +812,10 @@ if (document.documentElement.hasAttribute('data-settings-proxy-document') && !lo
removeBusy = true; removeAsk.error = null; paintAccounts();
try {
await adminCall('accounts/remove', { accountId: account.accountId });
removeAsk = null; message(`${name} account removed.`);
await refresh(); await setup.reread();
let removalMessage = `${name} account removed.`;
removeAsk = null; message(removalMessage);
try { await refresh(); } catch (error) { removalMessage += ` The account list could not be refreshed: ${error.message}`; message(removalMessage); }
await setup.reread({ onError: error => message(`${removalMessage} The setup status could not be refreshed: ${error.message}`) });
} catch (error) {
if (removeAsk) removeAsk.error = error.message; message(error.message);
// The outcome may be unknown: read the list again so it shows what the service holds now.
@@ -843,7 +848,7 @@ if (document.documentElement.hasAttribute('data-settings-proxy-document') && !lo
list.replaceChildren(...accountList.map(account => {
const li = el('li'), name = el('span', providerShort(account.provider)), kind = el('span', providerKind(account.provider) || '—');
kind.append(el('br'), el('small', account.displayName, 'muted'));
const [cls, word] = health(account.status), badge = el('span', word, `badge ${cls}`);
const [cls, word] = health(account), badge = el('span', word, `badge ${cls}`);
li.dataset.account = account.accountId; li.append(name, kind, badge);
if (proxyAdmin && canWrite) {
const remove = el('button', 'Remove'); remove.type = 'button'; remove.dataset.remove = account.accountId;
@@ -853,6 +858,19 @@ if (document.documentElement.hasAttribute('data-settings-proxy-document') && !lo
}
// The accounts read says why an account is not working (account.reason, a7362a8fc and later). Absent, nothing shows.
if (typeof account.reason === 'string' && account.reason) li.append(el('p', account.reason, 'small muted account-reason'));
if (['error', 'unavailable', 'disabled'].includes(account.status)) {
if (canWrite && [...providerSelect.options].some(option => option.value === account.provider)) {
const fix = el('button', 'Add account'); fix.type = 'button'; fix.dataset.accountFix = '';
fix.disabled = Boolean(login);
fix.setAttribute('aria-label', `Add account for ${account.displayName}`);
fix.addEventListener('click', () => {
const add = $('proxy-add-box'); add.open = true;
providerSelect.value = account.provider;
paintProvider(); (keyed(providerSelect.value) ? $('proxy-apikey-key') : $('proxy-login-go')).focus();
});
li.append(fix);
} else li.append(el('p', canWrite ? 'This provider is not available here. Ask the owner to check Model setup.' : 'Ask the owner to add an account in Model setup.', 'small muted'));
}
if (removeAsk?.accountId === account.accountId && proxyAdmin && canWrite) li.append(removeBox(account));
return li;
}));
@@ -920,7 +938,7 @@ if (document.documentElement.hasAttribute('data-settings-proxy-document') && !lo
'models-offered-conflict': 'The model list changed since this page read it. Read it again, then make your change.',
'models-invalid': 'The model service no longer lists one of these models. Read the list again.',
'proxy-down': 'No organization that uses your model service answered, so its models can\'t be listed now.',
'not-configured': 'No organization uses your model service yet. Its models show here once one does.',
'not-configured': 'No organization with a configured model launch uses your model service yet. Its models show here once one does.',
'proxy-admin-busy': 'Another change to the model service is running. Try again in a moment.',
'outcome-unknown': 'The outcome is unknown. Read the list again before you try again.',
};
@@ -937,8 +955,10 @@ if (document.documentElement.hasAttribute('data-settings-proxy-document') && !lo
catch (error) { if (round === offeredRound) box.replaceChildren(el('p', offeredSays(error.code), 'small muted')); return; }
if (round !== offeredRound) return;
const providers = Array.isArray(view?.providers) ? view.providers : [];
if (!providers.length) { box.replaceChildren(el('p', 'Your model service lists no models yet.', 'small muted')); return; }
box.replaceChildren(...providers.map(p => offeredList(p, view.revision, open.has(p.provider), saved === p.provider)));
const quiet = Array.isArray(view?.unanswered) ? view.unanswered.filter(id => typeof id === 'string').map(id => window.MosaicOrg?.row?.(id)?.label || id) : [];
const notice = quiet.length ? [el('p', `Not answering now, so it is not known which models they use: ${quiet.join(', ')}. A model you switch off may stop working for them.`, 'offered-unanswered banner ref')] : [];
if (!providers.length) { box.replaceChildren(...notice, el('p', 'Your model service lists no models yet.', 'small muted')); return; }
box.replaceChildren(...notice, ...providers.map(p => offeredList(p, view.revision, open.has(p.provider), saved === p.provider)));
}
function offeredList(p, revision, open, saved) {
const name = String(p.label), models = Array.isArray(p.models) ? p.models : [];
@@ -1367,7 +1387,7 @@ if (document.documentElement.hasAttribute('data-settings-proxy-document') && !lo
const PROGRESS = [['fetch', { ok: 'Downloaded and checked', run: 'Downloading and checking…', todo: 'Download and check', bad: 'Download and check: did not finish' }],
['init', { ok: 'Configured', run: 'Configuring…', todo: 'Configure', bad: 'Configure: did not finish' }],
['start', { ok: 'Started the service', run: 'Starting the service…', todo: 'Start the service', bad: 'Start the service: did not finish' }],
['answer', { ok: 'Answers on this machine', run: 'Checking it answers…', todo: 'Check it answers', bad: 'Check it answers: no answer yet' }]];
['answer', { ok: 'Service reachable on this machine', run: 'Checking the service…', todo: 'Check the service', bad: 'Service not reachable yet' }]];
const stageOf = step => step === 'fetch' || step === 'init' ? step : step === 'unit-install' || step === 'unit-start' ? 'start' : 'answer';
// Each line is done only when the status read says so.
function progressDone() {
@@ -1400,7 +1420,7 @@ if (document.documentElement.hasAttribute('data-settings-proxy-document') && !lo
const next = state.next?.[0], box = $('proxy-setup-next'), lines = $('proxy-setup-lines');
const ok = progressDone(), some = Object.values(ok).some(Boolean), fetching = state.fetch?.state === 'running';
paintFixtures(next !== 'accounts');
if (next === 'accounts') { setCard('service', 'done', state.unit.port ? `Running. Answers on this machine, port ${state.unit.port}.` : 'Running. Answers on this machine.'); box.replaceChildren(); paintProgress(false); lines.hidden = true; return; }
if (next === 'accounts') { setCard('service', 'done', state.unit.port ? `Running. Service reachable on this machine, port ${state.unit.port}.` : 'Running. Service reachable on this machine.'); box.replaceChildren(); paintProgress(false); lines.hidden = true; return; }
if (chain?.running || (fetching && CHAIN.includes(next))) {
setCard('service', 'work', chain?.running ? 'Setting up. Keep this page open; if you leave, Continue setup picks up from here.' : 'Downloading the release. Keep this page open.');
box.replaceChildren(goButton('Working…', next, true, () => {})); paintProgress(true); lines.hidden = true; return;
@@ -1884,10 +1904,10 @@ if (document.documentElement.hasAttribute('data-settings-proxy-document') && !lo
focusStep();
}
// True once the answer is painted, so a caller can say the list on the page is the new one.
async function load() {
async function load({ onError } = {}) {
if (!enabled || loading) return false; loading = true; let painted = false;
try { state = await admin('status'); setProviders(state.providers); causeRound++; if (state.next?.[0] === 'accounts' && triageSet === null) await readTriage(); paint(); painted = true; if (state.init.initialized) await accountsReady(); }
catch (error) { say(error.message, 'error'); if (providerKey === null) setProviders(null); }
catch (error) { say(error.message, 'error'); if (providerKey === null) setProviders(null); onError?.(error); }
finally { loading = false; }
return painted;
}
@@ -1962,7 +1982,7 @@ if (document.documentElement.hasAttribute('data-settings-proxy-document') && !lo
start(config) { enabled = true; sendOk = config.proxyAdminSend === true; return load(); },
accounts(n) { accountCount = n; if (state) { paintService(); paintRestart(); paintOrgsCard(); paintTriageCard(); } },
// A sign-in, a key or a restart can change the next step: read the whole status again.
async reread() { if (!enabled) return; triageSet = null; await load(); },
async reread(options) { if (!enabled) return; triageSet = null; await load(options); },
enabled: () => enabled,
serviceDone: () => running(),
// An organization whose model list is ready, for Models offered. The open one first.
+17 -9
View File
@@ -62,21 +62,29 @@
}
// E2E6 P1-1, P2-2: a poll reloads the list but keeps the open preview, the project picked for each
// pack and the last receipt. A kept preview applies by its digest, so a stale one is refused by the bus.
// Each organization has one state object for the life of the page. A click keeps a reference to it
// across its own request, so a load that ends meanwhile updates the read fields in place and never
// swaps the object: the click's preview or receipt lands where the next draw reads it. A load that
// began before the last applied one carries older reads, so its answer is dropped.
async function load(org) {
const prev = states.get(org);
const s = { packs: null, applied: [], writable: false, error: null, projects: null, preview: prev?.preview ?? null, status: prev?.status ?? '', picks: prev?.picks ?? {} };
if (!states.has(org)) states.set(org, { packs: null, applied: [], writable: false, error: 'Starter packs could not be read.', projects: null, preview: null, status: '', picks: {}, began: 0, shown: 0 });
const s = states.get(org);
const began = ++s.began;
const read = { packs: null, applied: [], writable: false, error: null, projects: null };
try {
const value = await call(`${base(org)}/packs`);
s.packs = Array.isArray(value?.packs) ? value.packs.filter(p => p && typeof p === 'object' && p.pack && typeof p.pack === 'object') : [];
s.applied = Array.isArray(value?.applied) ? value.applied.filter(a => plainObj(a) && typeof a.id === 'string' && Array.isArray(a.hired) && Array.isArray(a.open)) : [];
s.writable = value?.writable === true;
} catch (error) { s.error = error.message; }
read.packs = Array.isArray(value?.packs) ? value.packs.filter(p => p && typeof p === 'object' && p.pack && typeof p.pack === 'object') : [];
read.applied = Array.isArray(value?.applied) ? value.applied.filter(a => plainObj(a) && typeof a.id === 'string' && Array.isArray(a.hired) && Array.isArray(a.open)) : [];
read.writable = value?.writable === true;
} catch (error) { read.error = error.message; }
// A project pack needs a code project. The workflow read lists them; when it fails, a project pack
// says so instead of guessing.
if (s.packs?.some(p => p.pack.scope === 'project')) {
try { const w = await call(`${base(org)}/workflows`); s.projects = w && typeof w.projects === 'object' ? Object.keys(w.projects).sort() : null; } catch { s.projects = null; }
if (read.packs?.some(p => p.pack.scope === 'project')) {
try { const w = await call(`${base(org)}/workflows`); read.projects = w && typeof w.projects === 'object' ? Object.keys(w.projects).sort() : null; } catch { read.projects = null; }
}
states.set(org, s);
if (began < s.shown) return;
s.shown = began;
Object.assign(s, read);
}
const markText = m => MARKS[m] ?? m;
function itemRow(item) {
+21 -7
View File
@@ -15,22 +15,35 @@
// draft holds the typed fields; base is the revision they were read at, which a save sends, so a
// change saved elsewhere since then answers as stale instead of being written over.
let data = null, readLine = '', draft = null, base = 0, busy = false, line = '', conflict = false;
// Reads answer in any order. began numbers each read as it starts. shown is the newest read or save
// the page has drawn its route from, and keyShown the newest read or key change it has drawn its key
// state from. A read older than shown is dropped, so a slow read cannot put back the route and
// revision a save or a newer read replaced. A read older than keyShown takes the key state the page
// holds instead of its own: a key change does not touch the route, so the read's route still stands.
// That key state is kept in key, apart from data, so a failed read that clears data keeps it.
let began = 0, shown = 0, keyShown = 0, key;
const call = init => window.fetch(PATH, { cache: 'no-store', redirect: 'manual', ...init });
// The stored route's fields, or empty ones: there is no default model, harness, cap or zone.
const fromRoute = r => ({ model: r?.model ?? '', harness: r?.harness ?? '', cap: r ? String(r.cap) : '', timeZone: r?.timeZone ?? '' });
// It says whether the page took this read (false when a newer read or write had drawn first).
async function read() {
readLine = '';
const n = ++began;
const failed = text => { if (n < shown) return false; shown = n; data = null; readLine = text; return true; };
let r, a = null;
try { r = await call({ method: 'GET' }); } catch { data = null; readLine = 'The Triage route could not be read. Reload the page to try again.'; return; }
try { r = await call({ method: 'GET' }); } catch { return failed('The Triage route could not be read. Reload the page to try again.'); }
try { a = await r.json(); } catch { /* refused below */ }
if (r.type === 'opaqueredirect') { data = null; readLine = 'Sign in again, then reload.'; return; }
if (!r.ok || !a || typeof a !== 'object') { data = null; readLine = typeof a?.message === 'string' ? a.message : 'The Triage route could not be read.'; return; }
if (r.type === 'opaqueredirect') return failed('Sign in again, then reload.');
if (!r.ok || !a || typeof a !== 'object') return failed(typeof a?.message === 'string' ? a.message : 'The Triage route could not be read.');
if (n < shown) return false;
shown = n; readLine = '';
// An untouched page follows the store; typed fields stay, with the revision they were read at.
const untouched = draft === null || JSON.stringify(draft) === JSON.stringify(fromRoute(data?.route ?? null));
if (n < keyShown) a = { ...a, access: key }; else { keyShown = n; key = a.access; }
data = a;
if (untouched) { draft = fromRoute(a.route); base = Number.isSafeInteger(a.revision) ? a.revision : 0; }
return true;
}
const models = () => (Array.isArray(data?.choices?.models) ? data.choices.models : []);
@@ -99,7 +112,7 @@
catch { busy = false; accessLine = 'Outcome unknown. Reload the page to see the key state.'; repaint(); return; }
try { a = await r.json(); } catch { /* refused below */ }
busy = false;
if (a?.access && data) data = { ...data, access: a.access };
if (a?.access && data) { data = { ...data, access: a.access }; key = a.access; keyShown = ++began; }
if (r.type === 'opaqueredirect') accessLine = 'Sign in again, then retry.';
else if (r.ok) accessLine = ACTION_LINE[a?.key?.action] ?? (op === 'off' ? 'Triage is off.' : 'Access was repaired.');
else accessLine = typeof a?.message === 'string' ? a.message : 'The Triage key was not changed.';
@@ -131,6 +144,7 @@
busy = false;
if (r.ok && a?.route) {
data = { ...data, route: a.route, revision: a.revision, routeMessage: undefined };
shown = ++began;
draft = fromRoute(a.route); base = a.revision;
line = `Saved ${savedAt(a.route.updatedAt)}.` + (a.key?.error ? ` ${a.key.message}` : ACTION_LINE[a.key?.action] ? ` ${ACTION_LINE[a.key.action]}` : '');
repaint();
@@ -147,8 +161,8 @@
async function reload() {
if (busy) return;
draft = null; conflict = false; line = '';
await read();
line = data ? 'Route read again. Your fields now show the stored route.' : '';
// A save that landed while this read was out has drawn the newer route and its receipt; keep both.
if (await read()) line = data ? 'Route read again. Your fields now show the stored route.' : '';
repaint();
}
+10 -2
View File
@@ -60,18 +60,26 @@
w.epoch++; w.inflight++;
try { return await fn(); } finally { w.inflight--; w.epoch++; }
}
// Two reads with no write between them can still answer out of order (the dashboard card and the page,
// or a poll and a navigation). Each organization numbers its reads as they start; a read that answers
// after a newer one has been kept is dropped, so an older answer cannot put back what a newer one replaced.
const reads = new Map();
const readOrder = org => { if (!reads.has(org)) reads.set(org, { began: 0, kept: 0 }); return reads.get(org); };
async function load(org) {
const prev = states.get(org), w = writeState(org), began = w.epoch;
const order = readOrder(org), n = ++order.began;
const s = { data: null, known: new Set(), error: null };
const raced = () => !!prev?.data && (w.inflight > 0 || w.epoch !== began);
try { await read(org, s); if (raced()) return; } catch (error) {
if (raced()) return;
const older = () => n < order.kept;
try { await read(org, s); if (raced() || older()) return; } catch (error) {
if (raced() || older()) return;
// Review P3: a failed poll while a change to this organization's workflows is held keeps the last good
// read, so the page still draws the change and its form, and graftLive puts the held form and focus back.
// SP17: the failure is still said; the page draws the last read under that line.
if (prev?.data && held(org).length) Object.assign(s, { data: prev.data, known: prev.known, readError: error.message });
else s.error = error.message;
}
order.kept = n;
states.set(org, s);
}
const scopes = s => [['', 'Organization', s.data.workflows], ...Object.keys(s.data.projects).sort().map(p => [p, `Project ${p}`, s.data.projects[p]])];
@@ -51,3 +51,262 @@ for(const [width,height]of [[1440,900],[390,844]])for(const theme of ['light','d
await waitFor(b,`/Reversal recorded/.test(document.querySelector('[data-autonomy-status]').textContent)`);assert.equal(reverses,1);
await b.screenshot(join(shots,`reverse-${width}-${theme}.png`));
});
// The organization page reads autonomy again on a poll and after any write that changes the organization
// (mosaic-org-changed). A save or review receipt must survive a reload that overlaps it, in either order,
// and an older read that answers last must not put its older values back.
// hold(verb) makes the next call of that verb wait: its answer is computed when the call arrives, then held
// until release(). arrived resolves when the call has arrived.
function holds(){
const pending=new Map();
return {
hold(verb){const h={};h.arrived=new Promise(r=>{h.reached=r;});h.wait=new Promise(r=>{h.release=r;});pending.set(verb,[...(pending.get(verb)??[]),h]);return h;},
take:verb=>pending.get(verb)?.shift(),
};
}
async function raceFixture(t,gates){
const state={writes:0,reviews:0,setting:{merge:'out of the loop'},revision:'a'.repeat(64)};
const answer=(verb,args)=>{
if(verb==='autonomy.get.console')return {revision:state.revision,autonomy:state.setting,levels:{'cross-role':'out of the loop',merge:state.setting.merge,policy:'out of the loop',authority:'in the loop'}};
if(verb==='autonomy.set.console'){assert.equal(args.revision,state.revision);state.writes++;state.setting=args.autonomy;state.revision=String(state.writes+1).repeat(64);return {revision:state.revision,transaction:`10000000-0000-4000-8000-00000000000${state.writes}`};}
if(verb==='autonomy.review.console'){state.reviews++;return {recorded:true};}
throw Object.assign(new Error('not-configured'),{code:'not-configured'});
};
const call=async(verb,args)=>{const value=answer(verb,args),held=gates.take(verb);if(held){held.reached();await held.wait;}return value;};
const server=await startServer({port:0,sso:createDevOwner(),send:async()=>({}),organizations:{list:async()=>[{id:'acme',label:'Acme',busHealthy:true}],resolve:async()=>({busHealthy:true,decisionWrite:async()=>({}),requestRead:call,requestWrite:call,send:async()=>({}),reads:{business:async()=>({business:{id:'acme',projects:[],instances:[]}}),settings:async()=>({}),queue:async()=>({rows:[]})},bus:{instances:async()=>({instances:{}}),agents:async()=>[],'thread.claims':async()=>[],tasks:async()=>[],inbox:async()=>[],messages:async()=>({messages:[]})},chat:{projects:async()=>[],threads:async()=>[]}})},log:()=>{}});
t.after(()=>close(server));const b=await browser({machine:false});t.after(()=>b.close());
await b.navigate(`http://127.0.0.1:${server.address().port}/#/orgs/acme/organization`);
await waitFor(b,`document.querySelector('[data-autonomy-form] button[type=submit]')`);
return {b,state};
}
const reload=b=>b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-org-changed',{detail:{org:'acme'}}));true`);
const markDrawn=b=>b.evaluate(`document.querySelector('[data-autonomy]').dataset.drawn='before';true`);
const redrawn=b=>waitFor(b,`document.querySelector('[data-autonomy-form]') && !document.querySelector('[data-autonomy]').dataset.drawn`);
const statusText=b=>b.evaluate(`document.querySelector('[data-autonomy-form] [data-autonomy-status]').textContent`);
const submit=(b,level)=>b.evaluate(`document.querySelector('[data-autonomy-form] select[name=merge]').value=${JSON.stringify(level)};document.querySelector('[data-autonomy-form]').requestSubmit();true`);
// Count each autonomy read by the revision it carries, once the reading load has used it: a task queued
// after the answer runs after the load's last step. A poll that reads meanwhile counts under its own revision.
const countReads=b=>b.evaluate(`{const f=window.fetch;window.__autonomyRead={};window.fetch=async(...a)=>{const r=await f(...a);if(String(a[0]).endsWith('/api/orgs/acme/autonomy')&&!a[1]?.method){const j=r.json.bind(r);r.json=()=>j().then(v=>{setTimeout(()=>{window.__autonomyRead[v.revision]=(window.__autonomyRead[v.revision]??0)+1});return v})}return r}}true`);
const readUsed=(b,revision)=>waitFor(b,`window.__autonomyRead[${JSON.stringify(revision)}]>=1`);
test('AU owner settings: a save that lands while a reload of autonomy is held keeps its receipt and revision',{timeout:60000},async t=>{
const gates=holds();const {b,state}=await raceFixture(t,gates);
// The reload's read arrives first and answers after the save has been drawn.
const list=gates.hold('autonomy.get.console');
await reload(b);await list.arrived;
await submit(b,'in the loop');
await waitFor(b,`/^Saved\\. Receipt /.test(document.querySelector('[data-autonomy-status]').textContent)`);
assert.equal(state.writes,1);
await markDrawn(b);list.release();await redrawn(b);
assert.match(await statusText(b),/^Saved\. Receipt 10000000-0000-4000-8000-000000000001\.$/,'the reload kept the receipt');
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form]').dataset.revision`),JSON.stringify(state.revision),'the form saves against the revision the save answered');
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form] select[name=merge]').value`),'in the loop','the form shows what was saved');
// The next save is not a revision conflict.
await submit(b,'near the loop');
await waitFor(b,`/^Saved\\. Receipt 10000000-0000-4000-8000-000000000002\\.$/.test(document.querySelector('[data-autonomy-status]').textContent)`);
assert.equal(state.writes,2);
});
test('AU owner settings: a save that answers after a reload has drawn the page keeps its receipt',{timeout:60000},async t=>{
const gates=holds();const {b,state}=await raceFixture(t,gates);
// The save arrives first and answers after a reload has drawn the page again.
const save=gates.hold('autonomy.set.console');
await submit(b,'in the loop');await save.arrived;
await markDrawn(b);await reload(b);await redrawn(b);
save.release();
await waitFor(b,`/^Saved\\. Receipt /.test(document.querySelector('[data-autonomy-form] [data-autonomy-status]').textContent)`);
await markDrawn(b);await reload(b);await redrawn(b);
assert.match(await statusText(b),/^Saved\. Receipt 10000000-0000-4000-8000-000000000001\.$/,'a later reload keeps the receipt');
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form]').dataset.revision`),JSON.stringify(state.revision));
});
test('AU owner settings: a trail review that answers after a reload has drawn the page is said',{timeout:60000},async t=>{
const gates=holds();const {b,state}=await raceFixture(t,gates);
await b.evaluate(`document.querySelector('[data-autonomy-review-list]').open=true;true`);
const review=gates.hold('autonomy.review.console');
await b.evaluate(`document.querySelector('[data-autonomy-review=merge]').click();true`);await review.arrived;
await markDrawn(b);await reload(b);await redrawn(b);
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-review-list]').open`),true,'the review list stays open');
review.release();
await waitFor(b,`document.querySelector('[data-autonomy-form] [data-autonomy-status]').textContent==='Trail review recorded.'`);
assert.equal(state.reviews,1);
await markDrawn(b);await reload(b);await redrawn(b);
assert.equal(await statusText(b),'Trail review recorded.','a later reload keeps the review receipt');
});
test('AU owner settings: an older read of autonomy that answers last does not replace a newer one',{timeout:60000},async t=>{
const gates=holds();const {b,state}=await raceFixture(t,gates);
await countReads(b);
const older=gates.hold('autonomy.get.console');
await reload(b);await older.arrived;
// Another writer changes the organization; a newer read answers first.
state.setting={merge:'near the loop'};state.revision='c'.repeat(64);
await reload(b);
// The page draws after all of the dashboard's reads, so wait for the draw as well as the read.
await waitFor(b,`document.querySelector('[data-autonomy-form] select[name=merge]')?.value==='near the loop' && window.__autonomyRead[${JSON.stringify('c'.repeat(64))}]>=1`);
older.release();
await readUsed(b,'a'.repeat(64));
const drawn=await b.evaluate(`window.MosaicAutonomy.section('acme')`);
assert.match(drawn,/<option selected>near the loop<\/option>/,'the older values were not put back');
assert.match(drawn,new RegExp(`data-revision="&quot;${'c'.repeat(64)}&quot;"`),'the newer revision stays');
});
test('AU owner settings: a save that answers after a redraw from an older read draws what was saved',{timeout:60000},async t=>{
const gates=holds();const {b,state}=await raceFixture(t,gates);
// The reload's read is served before the save commits. It draws a clean new form while the save is held.
const read=gates.hold('autonomy.get.console');
await reload(b);await read.arrived;
const save=gates.hold('autonomy.set.console');
await submit(b,'in the loop');await save.arrived;
assert.equal(state.writes,1);
await markDrawn(b);read.release();await redrawn(b);
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form] select[name=merge]').value`),'out of the loop','the older read was drawn');
save.release();
await waitFor(b,`/^Saved\\. Receipt /.test(document.querySelector('[data-autonomy-form] [data-autonomy-status]').textContent)`);
// Before any further reload, the drawn form shows the save and carries its revision.
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form]').dataset.revision`),JSON.stringify(state.revision),'the drawn form saves against the revision the save answered');
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form] select[name=merge]').value`),'in the loop','the drawn form shows what was saved');
assert.match(await statusText(b),/^Saved\. Receipt 10000000-0000-4000-8000-000000000001\.$/);
await submit(b,'near the loop');
await waitFor(b,`/^Saved\\. Receipt 10000000-0000-4000-8000-000000000002\\.$/.test(document.querySelector('[data-autonomy-status]').textContent)`);
assert.equal(state.writes,2,'the next save is not a revision conflict');
});
test('AU owner settings: a save that answers after a newer read by another writer leaves the newer read',{timeout:60000},async t=>{
const gates=holds();const {b,state}=await raceFixture(t,gates);
// The save commits, then another writer commits, and a reload draws that newer read before the save answers.
const save=gates.hold('autonomy.set.console');
await submit(b,'in the loop');await save.arrived;
assert.equal(state.writes,1);
state.setting={merge:'near the loop'};state.revision='c'.repeat(64);
await markDrawn(b);await reload(b);await redrawn(b);
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form] select[name=merge]').value`),'near the loop','the newer read was drawn');
save.release();
await waitFor(b,`/^Saved\\. Receipt 10000000-0000-4000-8000-000000000001\\.$/.test(document.querySelector('[data-autonomy-form] [data-autonomy-status]').textContent)`);
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form] select[name=merge]').value`),'near the loop','the drawn form keeps the newer read');
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form]').dataset.revision`),JSON.stringify('c'.repeat(64)));
const drawn=await b.evaluate(`window.MosaicAutonomy.section('acme')`);
assert.match(drawn,/<option selected>near the loop<\/option>/,'the state keeps the newer read');
assert.match(drawn,/data-autonomy-status role="status">Saved\. Receipt 10000000-0000-4000-8000-000000000001\./,'the state keeps the receipt');
// The next save goes against the newer revision and is not a conflict.
await submit(b,'in the loop');
await waitFor(b,`/^Saved\\. Receipt 10000000-0000-4000-8000-000000000002\\.$/.test(document.querySelector('[data-autonomy-status]').textContent)`);
assert.equal(state.writes,2);
});
// The decision notice on #/orgs/<org>/inbox/<id>. The bus page draws that view again on every poll (and on a
// fresh config, which is how these tests ask for a draw), and a decision the owner confirmed, returned or
// reversed leaves the inbox read, as the broker's inbox does. The owner's result must stay on the notice.
const decisionId='10000000-0000-4000-8000-0000000000d1';
const earlierId='10000000-0000-4000-8000-0000000000d0';
async function noticeFixture(t,gates,{autonomy,supersedes=false}){
const state={confirms:0,reverses:0,refuse:null,inbox:true};
const row=()=>({...(supersedes?{supersedes:earlierId}:{}),id:decisionId,business:'acme',at:'2026-11-11T12:00:00.000Z',class:'gated',action:'git.merge.protected',route_to:'cto',raised_by_role:'coder',raised_by_run:'coder-run',question:'Land the reviewed change?',options:[{key:'yes',text:'Land'},{key:'no',text:'Revise'}],recommendation:'yes',blocking:false,autonomy});
const answer=(verb,args)=>{
if(state.refuse){const code=state.refuse;state.refuse=null;throw Object.assign(new Error(code),{code});}
if(verb==='decision.confirm.console'){state.confirms++;state.inbox=false;return {op:args.confirm?'confirmed':'declined'};}
if(verb==='decision.reverse.console'){state.reverses++;state.inbox=false;return {reversed:true};}
throw Object.assign(new Error('not-configured'),{code:'not-configured'});
};
// The answer (or refusal) is settled when the call arrives; a held call gives it on release().
const call=async(verb,args)=>{let value,error;try{value=answer(verb,args);}catch(e){error=e;}const held=gates.take(verb);if(held){held.reached();await held.wait;}if(error)throw error;return value;};
// The earlier version's trail read, which a draw of a superseding decision waits on, can be held.
const earlier=async()=>{const held=gates.take('trail:earlier');if(held){held.reached();await held.wait;}return [{id:earlierId,business:'acme',at:'2026-11-11T11:00:00.000Z',class:'gated',action:'git.merge.protected',route_to:'cto',raised_by_role:'coder',raised_by_run:'coder-run',question:'Land the earlier change?',options:[{key:'yes',text:'Land'}],recommendation:'yes',blocking:false,table:'decisions'}];};
const trail=async id=>id===earlierId?earlier():[{...row(),table:'decisions'},{table:'events',kind:'action.allowed',body:{operation:'decision.raise',decision:id,approvalChoice:'yes',target:'vikunja:1/2'}}];
const server=await startServer({port:0,sso:createDevOwner(),send:async()=>({}),organizations:{list:async()=>[{id:'acme',label:'Acme',busHealthy:true}],resolve:async()=>({busHealthy:true,decisionWrite:async()=>({}),requestRead:call,requestWrite:call,send:async()=>({}),reads:{business:async()=>({business:{id:'acme',projects:[],instances:[]}}),settings:async()=>({}),queue:async()=>({rows:[]})},bus:{instances:async()=>({instances:{}}),agents:async()=>[],'thread.claims':async()=>[],tasks:async()=>[],inbox:async()=>state.inbox?[row()]:[],trail,messages:async()=>({messages:[]})},chat:{projects:async()=>[],threads:async()=>[]}})},log:()=>{}});
t.after(()=>close(server));const b=await browser({machine:false});t.after(()=>b.close());
await b.navigate(`http://127.0.0.1:${server.address().port}/#/orgs/acme/inbox/${decisionId}`);
await waitFor(b,`document.querySelector('[data-autonomy-decision] button')`);
return {b,state};
}
// Draw the decision view again, the way a bus restart's fresh config does, and wait until it has drawn.
const drawAgain=async b=>{
await b.evaluate(`document.querySelector('[aria-labelledby=b-q]').dataset.drawn='before';true`);
await b.evaluate(`fetch('/api/config',{cache:'no-store'}).then(r=>r.json()).then(c=>document.dispatchEvent(new CustomEvent('mosaic-config',{detail:c})));true`);
await waitFor(b,`document.querySelector('[aria-labelledby=b-q]') && !document.querySelector('[aria-labelledby=b-q]').dataset.drawn`);
};
const noticeLine=b=>b.evaluate(`document.querySelector('[data-autonomy-decision] [data-autonomy-status]')?.textContent ?? null`);
const noticeButtons=b=>b.evaluate(`[...document.querySelectorAll('[data-autonomy-decision] button')].map(x=>[x.textContent,x.disabled])`);
test('AU decision notice: a confirm that answers after a redraw is said, and stays after the decision leaves the inbox',{timeout:60000},async t=>{
const gates=holds();const {b,state}=await noticeFixture(t,gates,{autonomy:{pending:true}});
const confirm=gates.hold('decision.confirm.console');
await b.evaluate(`document.querySelector('[data-autonomy-confirm=yes]').click();true`);await confirm.arrived;
// The broker has recorded the confirm, so the inbox read no longer carries the decision's marker. A draw while
// the answer is still on its way keeps the notice, with no button to answer twice.
await drawAgain(b);
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-decision] h2')?.textContent ?? null`),'Confirm the arbiter resolution','a redraw in flight keeps the notice');
assert.deepEqual(await noticeButtons(b),[],'a redrawn notice takes no second answer while one is in flight');
confirm.release();
await waitFor(b,`/^Confirmation recorded/.test(document.querySelector('[data-autonomy-decision] [data-autonomy-status]')?.textContent)`);
assert.equal(state.confirms,1);
// The confirmed decision has left the inbox read. The next draw keeps the notice and its result line.
await drawAgain(b);
assert.equal(await noticeLine(b),'Confirmation recorded. Refresh the inbox for current state.','the redraw keeps the result');
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-decision] h2').textContent`),'Confirm the arbiter resolution');
assert.deepEqual(await noticeButtons(b),[],'a decision that left the read offers no answer');
});
test('AU decision notice: a reverse result stays on the next draws',{timeout:60000},async t=>{
const gates=holds();const {b,state}=await noticeFixture(t,gates,{autonomy:{notice:true,reverseUntil:'2099-01-01T00:00:00Z'}});
await b.evaluate(`document.querySelector('[data-autonomy-reverse]').click();true`);
await waitFor(b,`document.querySelector('[data-autonomy-decision] [data-autonomy-status]')?.textContent==='Reversal recorded.'`);
assert.equal(state.reverses,1);
await drawAgain(b);
assert.equal(await noticeLine(b),'Reversal recorded.','the first redraw keeps the result');
await drawAgain(b);
assert.equal(await noticeLine(b),'Reversal recorded.','a later redraw keeps the result');
});
test('AU decision notice: a refused confirm is kept on the redrawn notice, with its buttons on',{timeout:60000},async t=>{
const gates=holds();const {b,state}=await noticeFixture(t,gates,{autonomy:{pending:true}});
state.refuse='storage-refused';
const confirm=gates.hold('decision.confirm.console');
await b.evaluate(`document.querySelector('[data-autonomy-confirm=yes]').click();true`);await confirm.arrived;
assert.deepEqual(await noticeButtons(b),[['Confirm resolution',true],['Return to arbiter',true]],'the notice takes one answer at a time');
// A refusal leaves the decision in the inbox read. A draw while it is in flight keeps the buttons off.
await drawAgain(b);
assert.deepEqual(await noticeButtons(b),[['Confirm resolution',true],['Return to arbiter',true]],'a redrawn notice takes no second answer while one is in flight');
confirm.release();
await waitFor(b,`/trail write was refused/.test(document.querySelector('[data-autonomy-decision] [data-autonomy-status]')?.textContent)`);
await drawAgain(b);
assert.equal(await noticeLine(b),'The trail write was refused. Inspect the decision trail before retrying.','the redraw keeps the refusal');
assert.deepEqual(await noticeButtons(b),[['Confirm resolution',false],['Return to arbiter',false]],'the decision is still open, so it can be answered again');
assert.equal(state.confirms,0);
});
test('AU decision notice: a returned decision that comes back to the inbox draws a fresh notice',{timeout:60000},async t=>{
const gates=holds();const {b,state}=await noticeFixture(t,gates,{autonomy:{pending:true}});
await b.evaluate(`document.querySelector('[data-autonomy-confirm=no]').click();true`);
await waitFor(b,`/^Returned to arbiter/.test(document.querySelector('[data-autonomy-decision] [data-autonomy-status]')?.textContent)`);
assert.equal(state.confirms,1);
// The returned decision has left the inbox read. The next draw keeps the result line.
await drawAgain(b);
assert.equal(await noticeLine(b),'Returned to arbiter. Refresh the inbox for current state.','the redraw keeps the result');
// The arbiter resolves it again, so it is back in the inbox and waits for a new answer.
state.inbox=true;
await drawAgain(b);
assert.equal(await noticeLine(b),'','the old result is not shown on the new question');
assert.deepEqual(await noticeButtons(b),[['Confirm resolution',false],['Return to arbiter',false]]);
});
test('AU decision notice: a draw that a newer draw replaced does not drop the result',{timeout:60000},async t=>{
const gates=holds();const {b,state}=await noticeFixture(t,gates,{autonomy:{pending:true},supersedes:true});
// Count the earlier-version trail answers the page has taken.
await b.evaluate(`(()=>{const prev=window.fetch;window.__earlier=0;window.fetch=(input,init)=>{const p=prev(input,init);if(!String(input).includes(${JSON.stringify(earlierId)}))return p;return p.then(r=>{const json=r.json.bind(r);r.json=()=>json().then(v=>{setTimeout(()=>{window.__earlier++;});return v;});return r;});};return true;})()`);
// A draw starts while the decision is still in the inbox, and waits on the earlier version's trail.
const slow=gates.hold('trail:earlier');
await b.evaluate(`fetch('/api/config',{cache:'no-store'}).then(r=>r.json()).then(c=>document.dispatchEvent(new CustomEvent('mosaic-config',{detail:c})));true`);
await slow.arrived;
await b.evaluate(`document.querySelector('[data-autonomy-confirm=yes]').click();true`);
await waitFor(b,`/^Confirmation recorded/.test(document.querySelector('[data-autonomy-decision] [data-autonomy-status]')?.textContent)`);
assert.equal(state.confirms,1);
// A newer draw reads the decision gone and draws the result. Then the replaced draw gets its answer.
await drawAgain(b);
assert.equal(await noticeLine(b),'Confirmation recorded. Refresh the inbox for current state.');
const taken=await b.evaluate('window.__earlier');
slow.release();
await waitFor(b,`window.__earlier===${taken+1}`);
await drawAgain(b);
assert.equal(await noticeLine(b),'Confirmation recorded. Refresh the inbox for current state.','the replaced draw does not drop the result');
});
+3 -3
View File
@@ -69,12 +69,12 @@ export async function browser({ machine = true, args = [] } = {}) {
}
const { targetId } = await send('Target.createTarget', { url: 'about:blank' });
const { sessionId } = await send('Target.attachToTarget', { targetId, flatten: true });
const call = (method, params) => send(method, params, sessionId);
const call = (method, params, ms) => send(method, params, sessionId, ms);
await call('Page.enable');
await call('Runtime.enable');
if (machine) await call('Page.addScriptToEvaluateOnNewDocument', { source: `try { localStorage.setItem('mosaic-console-board', '{"machine":true}'); } catch {}` });
const evaluate = async expression => {
const r = await call('Runtime.evaluate', { expression, returnByValue: true, awaitPromise: true });
const evaluate = async (expression, ms) => {
const r = await call('Runtime.evaluate', { expression, returnByValue: true, awaitPromise: true }, ms);
if (r.exceptionDetails) throw new Error(r.exceptionDetails.text + ': ' + r.result.description);
return r.result.value;
};
@@ -31,7 +31,7 @@ const PREVIEW = {
// busy: the bus's apply committed but its hire loop did not run (hireError), and the packs read lists one line a
// member's pack hire left in the owner's inbox (fromPack), one raised some other way and one refused.
async function fixture(t, { busy = false } = {}) {
async function fixture(t, { busy = false, gates = null } = {}) {
const verbs = [], decisions = [];
const hired = new Map(); // name -> its pack provenance, as the bus's instances read reports it
let applied = null, route = false, instanceReads = 0;
@@ -46,19 +46,22 @@ async function fixture(t, { busy = false } = {}) {
const listed = () => applied ? [{ id: 'software-team', origin: 'shipped', project: null, hired: [...hired.keys()],
open: PREVIEW.hires.filter(h => !hired.has(h.name)).map(h => ({ name: h.name, reason: `Proposed by starter pack software-team for ${h.definition} work.`,
...(!busy || h.name === 'scout-1' ? { state: 'refused', code: 'pack-hire-route-missing' } : { state: 'awaiting-owner', decision: `inbox-${h.name}`, ...(h.name === 'coder-1' ? { fromPack: true } : {}) }) })) }] : [];
const read = async (verb, args) => {
const readAnswer = async (verb, args) => {
verbs.push([verb, args]);
if (verb === 'packs.console') return { packs: PACKS, applied: listed() };
if (verb === 'pack.preview.console') return PREVIEW;
if (verb === 'autonomy.get.console') return { revision: REV('e'), autonomy: {}, levels: {} };
throw Object.assign(new Error('not-configured'), { code: 'not-configured' });
};
const write = async (verb, args) => {
const writeAnswer = async (verb, args) => {
verbs.push([verb, args]);
if (verb === 'pack.apply.console') { applied = true; return { revision: REV('f'), added: ['board'], pack: { id: args.pack, version: '1.0.0' }, ...(busy ? { hires: [], hireError: 'organization-busy' } : { hires: hireLoop() }) }; }
if (verb === 'pack.hire.console') return { pack: args.pack, hires: hireLoop() };
throw Object.assign(new Error('not-configured'), { code: 'not-configured' });
};
// A held call is answered when it arrives, then waits for release() (holds() below).
const gated = answer => async (verb, args) => { const value = await answer(verb, args), held = gates?.take(verb); if (held) { held.reached(); await held.wait; } return value; };
const read = gated(readAnswer), write = gated(writeAnswer);
const decisionWrite = async (verb, args) => {
verbs.push([verb, args]);
if (verb === 'hire.start.console' && args.op === 'fire' && hired.has(args.name)) { hired.delete(args.name); return { id: 'fire-1', op: 'resolved', choice: 'yes' }; }
@@ -184,3 +187,80 @@ test('PD an apply whose hire loop did not run says so; the owner card counts a p
// coder-1 was left in the inbox by a pack hire, so the owner's pack hire approves it; reviewer-1 is the inbox's.
assert.equal(await b.evaluate(`document.querySelector('[data-pack-hire-button]').textContent`), 'Hire the 2 proposed agents');
});
// hold(verb) makes the next call of that verb wait: its answer is computed when the call arrives, then held
// until release(). arrived resolves when the call has arrived.
function holds() {
const pending = new Map();
return {
hold(verb) {
const h = {};
h.arrived = new Promise(r => { h.reached = r; });
h.wait = new Promise(r => { h.release = r; });
pending.set(verb, [...(pending.get(verb) ?? []), h]);
return h;
},
take: verb => pending.get(verb)?.shift(),
};
}
const reload = b => b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-org-changed',{detail:{org:'acme'}}));true`);
const markDrawn = b => b.evaluate(`document.querySelector('[data-packs]').dataset.drawn='before';true`);
const redrawn = (b, what) => waitFor(b, `document.querySelector('[data-packs]') && !document.querySelector('[data-packs]').dataset.drawn`, what);
// Count each packs answer once the reading load has used it. With no project pack listed the load has no
// further read, so a task queued after the answer runs after the load's last step.
const countPacksAnswers = b => b.evaluate(`{const f=window.fetch;window.__packsDone=0;window.fetch=async(...a)=>{const r=await f(...a);if(String(a[0]).endsWith('/api/orgs/acme/packs')){const j=r.json.bind(r);r.json=()=>j().finally(()=>setTimeout(()=>{window.__packsDone++}))}return r}}true`);
const HIRED = 'Hired scout-1. Already hired: coder-1, reviewer-1.';
// Apply the pack with no route, so scout-1 is left to hire, then set the route.
async function applied(t, gates) {
const f = await fixture(t, { gates });
await f.b.navigate(`http://127.0.0.1:${f.port}/#/orgs/acme/organization`);
await waitFor(f.b, `document.querySelector('[data-pack="software-team"] [data-pack-preview-button]')`, 'pack list');
await f.b.evaluate(`document.querySelector('[data-pack="software-team"] [data-pack-preview-button]').click();true`);
await waitFor(f.b, `document.querySelector('[data-pack-apply]')`, 'preview');
await f.b.evaluate(`document.querySelector('[data-pack-apply]').click();true`);
await waitFor(f.b, `/^Applied\\./.test(document.querySelector('[data-packs-status]')?.textContent??'') && document.querySelector('[data-pack-hire-button]')`, 'apply status and hire button');
f.setRoute(true);
return f;
}
// The page reads the packs again on a poll and after any write that changes the organization
// (mosaic-org-changed). A hire receipt must survive a reload that overlaps the hire, in either order.
test('PD a hire receipt that lands while an earlier read of the packs is held is kept', { timeout: 90000 }, async t => {
const gates = holds();
const { b, verbs } = await applied(t, gates);
await countPacksAnswers(b);
// A reload's packs read is held. The hire answers, reads the packs itself and asks the page to read
// everything again; both of those reads answer first. Then the held read answers last.
const earlier = gates.hold('packs.console');
await reload(b);
await earlier.arrived;
await b.evaluate(`document.querySelector('[data-pack-hire-button]').click();true`);
await waitFor(b, `document.querySelector('[data-packs-status]')?.textContent==='${HIRED}' && window.__packsDone>=2`, 'hire status');
earlier.release();
await waitFor(b, `window.__packsDone>=3`, 'held read answered');
await markDrawn(b);
await reload(b);
await redrawn(b, 'page drawn again after the held read');
assert.equal(await b.evaluate(`document.querySelector('[data-packs-status]').textContent`), HIRED, 'the hire receipt is kept');
assert.equal(await b.evaluate(`document.querySelector('[data-pack-hire-button]')`), null, 'nothing left to hire');
assert.deepEqual(verbs.filter(([v]) => v === 'pack.hire.console').map(([, a]) => a), [{ pack: 'software-team' }]);
});
test('PD a hire that answers after a reload has drawn the page keeps its receipt', { timeout: 90000 }, async t => {
const gates = holds();
const { b, verbs } = await applied(t, gates);
// The hire arrives first and answers after a reload has drawn the page again.
const hire = gates.hold('pack.hire.console');
await b.evaluate(`document.querySelector('[data-pack-hire-button]').click();true`);
await hire.arrived;
await markDrawn(b);
await reload(b);
await redrawn(b, 'page drawn again during the hire');
hire.release();
await waitFor(b, `document.querySelector('[data-packs-status]')?.textContent==='${HIRED}'`, 'hire status');
await markDrawn(b);
await reload(b);
await redrawn(b, 'page drawn again after the hire');
assert.equal(await b.evaluate(`document.querySelector('[data-packs-status]').textContent`), HIRED, 'a later reload keeps the hire receipt');
assert.deepEqual(verbs.filter(([v]) => v === 'pack.hire.console').map(([, a]) => a), [{ pack: 'software-team' }]);
});
@@ -35,7 +35,23 @@ const PREVIEW = {
skills: { notEnabled: ['lint-fix'] }, chief: true, plan: {}, digest: REV('d'),
};
async function fixture(t, { send = true } = {}) {
// hold(verb) makes the next read of that verb wait: its answer is computed when the read arrives, then
// held until release(). arrived resolves when the read has arrived.
function holds() {
const pending = new Map();
return {
hold(verb) {
const h = {};
h.arrived = new Promise(r => { h.reached = r; });
h.wait = new Promise(r => { h.release = r; });
pending.set(verb, [...(pending.get(verb) ?? []), h]);
return h;
},
take: verb => pending.get(verb)?.shift(),
};
}
async function fixture(t, { send = true, gates = null, packs = () => PACKS } = {}) {
const verbs = [];
let flows = {
revision: REV('a'),
@@ -48,13 +64,18 @@ async function fixture(t, { send = true } = {}) {
},
templates: ['coder', 'reviewer'],
};
const read = async (verb, args) => {
verbs.push([verb, args]);
if (verb === 'packs.console') return { packs: PACKS };
const answer = (verb, args) => {
if (verb === 'packs.console') return { packs: packs() };
if (verb === 'pack.preview.console') return { ...PREVIEW, project: args.project ?? null };
if (verb === 'autonomy.get.console') return { revision: REV('e'), autonomy: {}, levels: {} };
throw Object.assign(new Error('not-configured'), { code: 'not-configured' });
};
const read = async (verb, args) => {
verbs.push([verb, args]);
const value = answer(verb, args), held = gates?.take(verb);
if (held) { held.reached(); await held.wait; }
return value;
};
const write = async (verb, args) => {
verbs.push([verb, args]);
if (verb === 'pack.apply.console') return { revision: REV('f'), added: ['board', 'definitions.reviewer'], pack: { id: args.pack, version: '1.0.0' }, hires: [{ name: 'lead-reviewer', state: 'refused', code: 'definition-not-hireable' }] };
@@ -128,6 +149,85 @@ test('SP6 pack picker: list, preview with marks, flagged, credential and noHire
assert.deepEqual(verbs.filter(([v]) => v === 'pack.preview.console').at(-1)[1], { pack: 'web-project', project: 'site' });
});
// The page reads the packs again on a poll and after any write that changes the organization
// (mosaic-org-changed). A preview the owner asked for must survive a reload that overlaps it, in either
// order, and an older reload that answers last must not put its older list back.
const reload = b => b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-org-changed',{detail:{org:'acme'}}));true`);
const markDrawn = b => b.evaluate(`document.querySelector('[data-packs]').dataset.drawn='before';true`);
const redrawn = (b, what) => waitFor(b, `document.querySelector('[data-packs]') && !document.querySelector('[data-packs]').dataset.drawn`, what);
test('SP6 pack picker: a preview that overlaps a reload of the packs is kept, in either order', { timeout: 60000 }, async t => {
const gates = holds();
const { b, verbs } = await fixture(t, { gates });
await waitFor(b, `document.querySelector('[data-pack="software-team"] [data-pack-preview-button]')`, 'pack list');
// The reload's packs read starts first and answers after the preview has been drawn.
const list = gates.hold('packs.console');
await reload(b);
await list.arrived;
await b.evaluate(`document.querySelector('[data-pack="software-team"] [data-pack-preview-button]').click();true`);
await waitFor(b, `document.querySelector('[data-pack-preview="software-team"]')`, 'preview');
await markDrawn(b);
list.release();
await redrawn(b, 'page drawn again after the reload');
assert.ok(await b.evaluate(`!!document.querySelector('[data-pack-preview="software-team"]')`), 'the reload kept the preview');
// The preview's read starts first and answers after the reload has drawn the page.
const preview = gates.hold('pack.preview.console');
await b.evaluate(`document.querySelector('[data-pack="web-project"] [data-pack-preview-button]').click();true`);
await preview.arrived;
await markDrawn(b);
await reload(b);
await redrawn(b, 'page drawn again during the preview');
preview.release();
await waitFor(b, `/for project site/.test(document.querySelector('[data-pack-preview] h4')?.textContent??'')`, 'project preview after the reload');
assert.deepEqual(verbs.filter(([v]) => v === 'pack.preview.console').map(([, a]) => a), [{ pack: 'software-team' }, { pack: 'web-project', project: 'site' }]);
});
// Count each packs answer once the reading load has used it. With no project pack listed the load has
// no further read, so a task queued after the answer runs after the load's last step.
const countPacksAnswers = b => b.evaluate(`{const f=window.fetch;window.__packsDone=0;window.fetch=async(...a)=>{const r=await f(...a);if(String(a[0]).endsWith('/api/orgs/acme/packs')){const j=r.json.bind(r);r.json=()=>j().finally(()=>setTimeout(()=>{window.__packsDone++}))}return r}}true`);
test('SP6 pack picker: an older read of the packs that answers last does not replace a newer one', { timeout: 60000 }, async t => {
const gates = holds();
let packs = [PACKS[0]];
const { b } = await fixture(t, { gates, packs: () => packs });
await waitFor(b, `document.querySelector('[data-pack="software-team"] [data-pack-preview-button]')`, 'pack list');
await countPacksAnswers(b);
const older = gates.hold('packs.console');
await reload(b);
await older.arrived;
packs = [PACKS[0], { id: 'later', origin: 'installed', pack: { label: 'Later pack', description: 'Installed after the first read.', version: '0.1.0', scope: 'organization' } }];
await reload(b);
await waitFor(b, `document.querySelector('[data-pack="later"]') && window.__packsDone===1`, 'newer list drawn');
older.release();
await waitFor(b, `window.__packsDone===2`, 'older read answered');
assert.match(await b.evaluate(`window.MosaicPacks.section('acme')`), /data-pack="later"/, 'the older list was not put back');
await b.evaluate(`document.querySelector('[data-pack="software-team"] [data-pack-preview-button]').click();true`);
await waitFor(b, `document.querySelector('[data-pack-preview="software-team"]')`, 'preview');
assert.ok(await b.evaluate(`!!document.querySelector('[data-pack="later"]')`), 'the drawn list is the newer one');
});
test('SP6 pack picker: an apply receipt that lands while an earlier read of the packs is held is kept', { timeout: 60000 }, async t => {
const gates = holds();
const { b, verbs } = await fixture(t, { gates, packs: () => [PACKS[0]] });
await waitFor(b, `document.querySelector('[data-pack="software-team"] [data-pack-preview-button]')`, 'pack list');
await b.evaluate(`document.querySelector('[data-pack="software-team"] [data-pack-preview-button]').click();true`);
await waitFor(b, `document.querySelector('[data-pack-apply]')`, 'preview');
await countPacksAnswers(b);
// A reload's packs read is held. The apply answers, reads the packs itself and asks the page to read
// everything again; both of those reads answer first. Then the held read answers last.
const earlier = gates.hold('packs.console');
await reload(b);
await earlier.arrived;
await b.evaluate(`document.querySelector('[data-pack-apply]').click();true`);
await waitFor(b, `/^Applied\./.test(document.querySelector('[data-packs-status]')?.textContent??'') && window.__packsDone===2`, 'apply status');
assert.equal(verbs.filter(([v]) => v === 'pack.apply.console').length, 1);
earlier.release();
await waitFor(b, `window.__packsDone===3`, 'held read answered');
const drawn = await b.evaluate(`window.MosaicPacks.section('acme')`);
assert.match(drawn, /data-packs-status>Applied\. Added board, definitions\.reviewer\./, 'the receipt is kept');
assert.doesNotMatch(drawn, /data-pack-preview=/, 'the applied preview does not come back');
});
test('SP6 pack picker without send previews but offers no apply', { timeout: 60000 }, async t => {
const { b } = await fixture(t, { send: false });
await waitFor(b, `document.querySelector('[data-pack="software-team"] [data-pack-preview-button]')`, 'pack list');
@@ -35,4 +35,7 @@ test('signed-in Console buttons deliver the approved original request and downlo
assert.equal(await page.clock(), '25:00');
await page.advance(10000); assert.equal(await page.clock(), '25:00');
assert.deepEqual(await page.externalRequests(), []);
// A remote resource in the downloaded file must still be observed while the browser is offline.
await page.offline('<!doctype html><img src="https://external.invalid/tracker">');
assert.deepEqual(await page.externalRequests(), ['https://external.invalid/tracker']);
});
@@ -89,12 +89,53 @@ test('account-remove: Remove posts exactly { accountId }, reads the list again a
assert.deepEqual(await b.evaluate('window.__unexpected'), []);
});
test('account-remove: a failed refresh after a successful remove keeps the success and the refresh error', { timeout: 90000 }, async t => {
const { b, wait } = await open(t, { extra: { [impactKey(A)]: { body: IMPACT_ALL },
'POST /api/proxy/admin/accounts/remove': { body: { accountId: A, provider: 'claude', removed: true } } } });
await b.evaluate(`document.querySelector('[data-remove="${A}"]').click(); true`);
await wait('!!document.querySelector("#proxy-remove-yes")');
await b.evaluate(`window.__scenario['GET /api/proxy/accounts'] = { status: 503, body: { error: 'proxy-down' } }; document.querySelector('#proxy-remove-yes').click(); true`);
await wait('document.querySelector("#proxy-message").textContent.includes("not answering")');
assert.equal(await b.evaluate('document.querySelector("#proxy-message").textContent'), 'Claude account removed. The account list could not be refreshed: The model service is not answering.');
assert.equal((await writes(b)).length, 1);
});
test('account-remove: a failed setup status refresh remains visible beside successful removal', { timeout: 90000 }, async t => {
const { b, wait } = await open(t, { extra: { [impactKey(A)]: { body: IMPACT_ALL },
'POST /api/proxy/admin/accounts/remove': { body: { accountId: A, provider: 'claude', removed: true } } } });
await b.evaluate(`document.querySelector('[data-remove="${A}"]').click(); true`);
await wait('!!document.querySelector("#proxy-remove-yes")');
await b.evaluate(`window.__scenario['GET /api/proxy/admin/status'] = { status: 503, body: { error: 'outcome-unknown' } }; document.querySelector('#proxy-remove-yes').click(); true`);
await wait('document.querySelector("#proxy-setup-message").textContent.length > 0');
assert.match(await b.evaluate('document.querySelector("#proxy-message").textContent'), /^Claude account removed\..*setup status could not be refreshed/i);
assert.equal((await writes(b)).length, 1);
});
test('account-remove: a late setup warning keeps the removal receipt when priority is saved meanwhile', { timeout: 90000 }, async t => {
const { b, wait } = await open(t, { extra: { [impactKey(A)]: { body: IMPACT_ALL },
'POST /api/proxy/admin/accounts/remove': { body: { accountId: A, provider: 'claude', removed: true } },
'POST /api/proxy/priority/set': { body: { accountId: B, priority: 0 } } } });
await b.evaluate(`document.querySelector('[data-remove="${A}"]').click(); true`);
await wait('!!document.querySelector("#proxy-remove-yes")');
await b.evaluate(`(() => { const real = window.fetch; window.__held = false; window.fetch = (input, init) => {
if (String(input) === '/api/proxy/admin/status') { window.__held = true; return new Promise(resolve => { window.__releaseStatus = () => resolve(new Response(JSON.stringify({ error: 'outcome-unknown' }), { status: 503, headers: { 'Content-Type': 'application/json' } })); }); }
return real(input, init); }; window.__scenario['GET /api/proxy/accounts'] = { body: { accounts: ${JSON.stringify(LIST.slice(1))} } }; document.querySelector('#proxy-remove-yes').click(); return true; })()`);
await wait('window.__held');
await b.evaluate('document.querySelector("#proxy-order form").requestSubmit(); true');
await wait('document.querySelector("#proxy-message").textContent === "Priority saved."');
await b.evaluate('window.__releaseStatus(); true');
await wait('document.querySelector("#proxy-message").textContent.includes("setup status could not be refreshed")');
assert.match(await b.evaluate('document.querySelector("#proxy-message").textContent'), /^Claude account removed\./);
assert.equal(await b.evaluate('document.querySelector("#proxy-order [role=status]").textContent'), 'Priority saved.');
});
test('account-remove: remove-write-refused and remove-unconfirmed are named in the ask and the account stays', { timeout: 90000 }, async t => {
// No refusal says nothing was removed: a refused or unanswered write may still have taken effect.
for (const [code, words] of [['remove-write-refused', 'The model service refused to remove the account. Check the list before trying again.'],
['remove-unconfirmed', 'Mosaic asked the model service to remove the account, but it is still listed. Read the accounts again before trying again.'],
['proxy-uncertain', 'Mosaic could not confirm the remove: the model service is between writes. Check the service and the list before trying again.'],
['proxy-down', 'The model service stopped answering, so Mosaic could not confirm the remove. Check the service and the list before trying again.'],
['invalid-request', 'Mosaic could not identify one account to remove. It may no longer be listed, have a duplicate ID, or share a credential with another account. Read the accounts again.'],
['some-new-code', 'The remove could not be confirmed. Nothing was retried. Read the accounts again before trying again.']]) {
const { b, wait } = await open(t, { extra: { [impactKey(A)]: { body: IMPACT_ALL }, 'POST /api/proxy/admin/accounts/remove': { status: 400, body: { error: code } } } });
await b.evaluate(`document.querySelector('[data-remove="${A}"]').click(); true`);
@@ -202,6 +202,14 @@ test('models-offered page: an organization that is not answering is named in the
assert.equal((await writes())[1].body.confirmInUse, true);
});
test('models-offered page: unanswered organizations are visible before saving', { timeout: 90000 }, async t => {
const { b, wait, writes } = await setup(t, { admin: { models: { ...VIEW, unanswered: ['lab', 'zeta'] } } });
await openOffered(b, wait);
assert.equal(await b.evaluate('document.querySelector("#proxy-offered-list .offered-unanswered")?.textContent'),
'Not answering now, so it is not known which models they use: Lab Bench, zeta. A model you switch off may stop working for them.');
assert.deepEqual(await writes(), []);
});
test('models-offered page: a save after another change is refused as a conflict, worded, with Read the list again; a busy or unknown answer is worded too', { timeout: 90000 }, async t => {
const conflict = { status: 409, body: { error: 'models-offered-conflict' } };
const busy = { status: 409, body: { error: 'proxy-admin-busy' } };
@@ -242,7 +250,7 @@ test('models-offered page: a page without proxyAdmin sends no /api/proxy/admin/
test('models-offered page: a read the model service cannot answer is worded, never an empty list', { timeout: 90000 }, async t => {
for (const [body, line] of [
[{ error: 'proxy-down' }, /No organization that uses your model service answered/],
[{ error: 'not-configured' }, /No organization uses your model service yet/],
[{ error: 'not-configured' }, /No organization with a configured model launch uses your model service yet/],
[{ error: 'outcome-unknown' }, /The outcome is unknown/],
]) {
const { b, wait } = await setup(t, { admin: { models: { status: 503, body } } });
@@ -261,6 +261,69 @@ const installed = { ...configured, unit: { ...configured.unit, installed: true }
const running = { ...installed, unit: { ...installed.unit, active: 'active', pid: 4242, port: 18432, listening: true }, next: ['accounts'] };
const config = { send: true, devOwner: true, proxyAdmin: true, proxyAdminSend: true };
const accounts = list => ({ 'GET /api/proxy/accounts': { body: { accounts: list } }, 'GET /api/proxy/keys': { body: { keys: [] } } });
test('setup states describe saved accounts and offer a repair without claiming a model answered', { timeout: 90000 }, async t => {
const list = [
{ accountId: 'a1', provider: 'claude', displayName: 'Claude', status: 'ready', priority: 0 },
{ accountId: 'a2', provider: 'z.ai', displayName: 'Key', status: 'active', priority: 0 },
{ accountId: 'a3', provider: 'codex', displayName: 'Sign in', status: 'error', priority: 0, reason: 'The account needs to sign in again. Sign in again, or add another account.' },
{ accountId: 'a4', provider: 'claude', displayName: 'Unavailable', status: 'unavailable', priority: 0 },
{ accountId: 'a5', provider: 'z.ai', displayName: 'Disabled', status: 'disabled', priority: 0 },
];
const { f, b, wait } = await w15Fixture(t, { scenario: { '/api/config': config, '/api/proxy/admin/status': running, ...accounts(list), '/api/triage/route': { route: null } } });
await b.navigate(f.base + '/#/settings/model-setup?step=accounts');
await wait('document.querySelectorAll("#proxy-accounts li[data-account]").length === 5');
assert.deepEqual(await b.evaluate('[...document.querySelectorAll("#proxy-accounts li[data-account] .badge")].map(e=>e.textContent)'), ['Saved', 'Saved', 'Sign-in needed', 'Not available', 'Disabled']);
assert.equal(await b.evaluate('document.querySelector("#setup-step-accounts").dataset.state'), 'bad');
assert.match(await b.evaluate('document.querySelector("#setup-step-accounts").textContent'), /Model setup has not checked whether a model answers/);
assert.match(await b.evaluate('document.querySelector("#setup-step-service [data-step-summary]").textContent'), /Service reachable/);
assert.match(await b.evaluate('document.querySelector("#proxy-apikey .help").textContent'), /does not check whether a model answers/i);
assert.equal(await b.evaluate('document.querySelector("#proxy-apikey button[type=submit]").textContent'), 'Save account');
assert.deepEqual(await b.evaluate('[...document.querySelectorAll("#proxy-accounts li[data-account]")].map(row=>row.querySelectorAll("[data-account-fix]").length)'), [0, 0, 1, 1, 1]);
await b.evaluate('document.querySelector("[data-account=a3] [data-account-fix]").click(); true');
assert.deepEqual(await b.evaluate('[document.querySelector("#proxy-add-box").open, document.querySelector("#proxy-provider").value, document.activeElement.id]'), [true, 'codex', 'proxy-login-go']);
await b.evaluate('document.querySelector("[data-account=a5] [data-account-fix]").click(); true');
assert.deepEqual(await b.evaluate('[document.querySelector("#proxy-provider").value, document.activeElement.id]'), ['z.ai', 'proxy-apikey-key']);
assert.deepEqual(await b.evaluate('window.__writes'), []);
});
test('bad account repair respects provider availability and active sign-in', { timeout: 90000 }, async t => {
const list = ['codex', 'z.ai', 'other', 'missing'].map((provider, i) => ({ accountId: `a${i}`, provider, displayName: `Account ${i}`, status: 'error', priority: 0 }));
for (const width of [1440, 390]) {
const { f, b, wait } = await w15Fixture(t, { scenario: { '/api/config': config, '/api/proxy/admin/status': running, ...accounts(list), '/api/triage/route': { route: null },
'POST /api/proxy/login/start': { body: { url: 'https://claude.ai/oauth/authorize?state=s4', state: 's4' } }, 'POST /api/proxy/login/status': { body: { status: 'wait' } }, 'POST /api/proxy/login/cancel': { body: { status: 'cancelled' } } } });
await b.call('Page.addScriptToEvaluateOnNewDocument', { source: 'window.open = () => null;' });
await b.viewport(width, width === 390 ? 844 : 900);
await b.navigate(f.base + '/#/settings/model-setup?step=accounts');
await wait('document.querySelectorAll("#proxy-accounts li[data-account]").length === 4');
assert.equal(await b.evaluate('[...document.querySelectorAll("[data-account=a2], [data-account=a3]")].every(row => !row.querySelector("[data-account-fix]") && row.textContent.includes("provider is not available"))'), true);
const ax = await b.call('Accessibility.getFullAXTree');
assert.ok(ax.nodes.some(n => n.role?.value === 'button' && n.name?.value === 'Add account for Account 0'));
await b.evaluate('document.querySelector("[data-account=a0] [data-account-fix]").click(); document.querySelector("#proxy-login-start").requestSubmit(); true');
await wait('!document.querySelector("#proxy-signin").hidden');
assert.equal(await b.evaluate('document.querySelector("[data-account=a1] [data-account-fix]").disabled'), true);
await b.evaluate('document.querySelector("#proxy-login-cancel").click(); true');
await wait('document.querySelector("#proxy-signin").hidden');
await b.evaluate('document.querySelector("[data-account=a1] [data-account-fix]").focus(); true');
await b.key('Enter');
assert.deepEqual(await b.evaluate('[document.querySelector("#proxy-provider").value, document.activeElement.id, document.activeElement.checkVisibility()]'), ['z.ai', 'proxy-apikey-key', true]);
assert.deepEqual(await b.evaluate('window.__writes.map(w => w.path)'), ['/api/proxy/login/start', '/api/proxy/login/cancel']);
await b.close();
}
});
test('bad account without a provider or write access gives guidance without a repair shortcut', { timeout: 90000 }, async t => {
const list = [{ accountId: 'a1', provider: 'codex', displayName: 'Account', status: 'error', priority: 0 }];
for (const [owner, providers] of [[true, []], [false, publicProviders()]]) {
const { f, b, wait } = await w15Fixture(t, { scenario: { '/api/config': { send: owner, devOwner: true, proxyAdmin: owner, proxyAdminSend: owner }, '/api/proxy/admin/status': { ...running, providers }, 'GET /api/proxy/accounts': { body: { accounts: list, providers } }, '/api/triage/route': { route: null } } });
await b.navigate(f.base + '/#/settings/model-setup?step=accounts');
await wait('document.querySelector("#proxy-accounts li[data-account]")');
assert.equal(await b.evaluate('document.querySelector("[data-account-fix]")'), null);
assert.match(await b.evaluate('document.querySelector("#proxy-accounts li").innerText'), owner ? /provider is not available/ : /Ask the owner to add an account in Model setup/);
assert.deepEqual(await b.evaluate('window.__writes'), []);
await b.close();
}
});
const admin = b => b.evaluate('window.__writes.filter(w => w.path.startsWith("/api/proxy/admin/")).map(w => w.path.slice(17))');
// A primary button is one drawn with the accent fill, whatever its class: a submit is drawn that way too.
const primaries = b => b.evaluate(`(() => { const host = document.querySelector(".model-setup"), probe = document.createElement("button"); probe.className = "btn primary"; host.append(probe);
@@ -290,7 +353,7 @@ test('settings-s4: one press runs fetch, init, install and start in that order,
await wait('document.querySelector("#setup-step-service").dataset.state === "done"');
assert.deepEqual(await admin(b), ['fetch', 'init', 'unit/install', 'unit/start']);
assert.deepEqual(await b.evaluate('JSON.parse(window.__writes.find(w => w.path === "/api/proxy/admin/init").body)'), { generate: true });
assert.match(await b.evaluate('document.querySelector("#setup-step-service [data-step-summary]").textContent'), /^Running\. Answers on this machine, port 18432\.$/);
assert.match(await b.evaluate('document.querySelector("#setup-step-service [data-step-summary]").textContent'), /^Running\. Service reachable on this machine, port 18432\.$/);
await wait('document.querySelector("#setup-step-accounts").dataset.state === "next"');
assert.deepEqual(await primaries(b), ['proxy-login-go'], 'the one primary moves to step 2');
assert.equal(await b.evaluate('document.querySelector("#proxy-login-go").textContent'), 'Sign in to Claude');
@@ -311,13 +374,43 @@ test('settings-s4: a step that fails stops the run with Try again, keeps the fin
assert.deepEqual(await admin(b), ['init', 'unit/install'], 'nothing is retried by itself');
assert.equal(await b.evaluate('document.querySelector("#setup-step-service [data-step-badge]").textContent'), 'Setup stopped');
assert.deepEqual(await b.evaluate('[...document.querySelectorAll("#proxy-setup-progress li")].map(li => li.className)'), ['ok', 'ok', 'bad', 'todo']);
assert.deepEqual(await b.evaluate('[...document.querySelectorAll("#proxy-setup-progress li")].map(li => li.firstChild.textContent)'), ['Downloaded and checked', 'Configured', 'Start the service: did not finish', 'Check it answers']);
assert.deepEqual(await b.evaluate('[...document.querySelectorAll("#proxy-setup-progress li")].map(li => li.firstChild.textContent)'), ['Downloaded and checked', 'Configured', 'Start the service: did not finish', 'Check the service']);
assert.equal(await b.evaluate('document.querySelector("#proxy-setup-lines").checkVisibility() && document.querySelector("#proxy-setup-lines summary").textContent'), "The service's last lines");
assert.deepEqual(await primaries(b), ['proxy-setup-go']);
assert.equal(await b.evaluate('document.querySelector("#proxy-setup-advanced summary").textContent'), 'Advanced: programs, port, timeouts');
assert.equal(await b.evaluate('document.querySelector("#proxy-setup-tech summary").textContent'), 'Technical details: release, service, history');
});
test('service progress names the unreachable service after a failed start', { timeout: 90000 }, async t => {
const down = { ...running, unit: { ...running.unit, listening: false }, next: ['unit-restart'] };
const { f, b, wait } = await w15Fixture(t, { scenario: { '/api/config': config, 'POST /api/proxy/admin/unit/start': { body: { receipt: { op: 'unit-start', time: T } } }, ...accounts([]), '/api/triage/route': { route: null } } });
await b.call('Page.addScriptToEvaluateOnNewDocument', { source: `(() => { let reads = 0; Object.defineProperty(window.__scenario, '/api/proxy/admin/status', { configurable: true, get() {
if (!window.__writes.some(w => w.path === '/api/proxy/admin/unit/start')) return ${JSON.stringify(installed)};
return ++reads === 1 ? { ...${JSON.stringify(down)}, busy: 'starting' } : ${JSON.stringify(down)};
} }); })();` });
await b.navigate(f.base + '/#/settings/model-setup');
await wait('document.querySelector("#proxy-setup-go")?.dataset.next === "unit-start"');
await b.evaluate('document.querySelector("#proxy-setup-go").click(); true');
await wait('document.querySelector("#proxy-setup-progress [data-stage=answer]")?.className === "run"');
assert.equal(await b.evaluate('document.querySelector("#proxy-setup-progress [data-stage=answer]").firstChild.textContent'), 'Checking the service…');
await wait('document.querySelector("#proxy-setup-progress [data-stage=answer]")?.className === "bad"');
assert.equal(await b.evaluate('document.querySelector("#proxy-setup-progress [data-stage=answer]").firstChild.textContent'), 'Service not reachable yet');
});
test('service progress names a reachable service during setup', { timeout: 90000 }, async t => {
const { f, b, wait } = await w15Fixture(t, { scenario: { '/api/config': config, 'POST /api/proxy/admin/unit/start': { body: { receipt: { op: 'unit-start', time: T } } }, ...accounts([]), '/api/triage/route': { route: null } } });
await b.call('Page.addScriptToEvaluateOnNewDocument', { source: `(() => { let reads = 0; Object.defineProperty(window.__scenario, '/api/proxy/admin/status', { configurable: true, get() {
if (!window.__writes.some(w => w.path === '/api/proxy/admin/unit/start')) return ${JSON.stringify(installed)};
return ++reads === 1 ? { ...${JSON.stringify(running)}, next: ['fence-clear'], busy: 'starting' } : ${JSON.stringify(running)};
} }); })();` });
await b.navigate(f.base + '/#/settings/model-setup');
await wait('document.querySelector("#proxy-setup-go")?.dataset.next === "unit-start"');
await b.evaluate('document.querySelector("#proxy-setup-go").click(); true');
await wait('document.querySelector("#proxy-setup-progress [data-stage=answer]")?.className === "ok"');
assert.equal(await b.evaluate('document.querySelector("#proxy-setup-progress [data-stage=answer]").firstChild.textContent'), 'Service reachable on this machine');
await wait('document.querySelector("#setup-step-service").dataset.state === "done"');
});
test('settings-s4: ?step= opens a done card; without it a done card folds to its line', { timeout: 90000 }, async t => {
const list = [{ accountId: 'a1', provider: 'claude', displayName: 'Claude work', status: 'active', priority: 0 }];
for (const [hash, shown] of [['#/settings/model-setup?step=accounts', true], ['#/settings/model-setup', false]]) {
@@ -344,15 +437,15 @@ test('settings-s4: accounts read as rows with kind and health, the provider pick
await wait('document.querySelectorAll("#proxy-accounts li[data-account]").length === 4');
assert.deepEqual(await b.evaluate('[...document.querySelectorAll("#proxy-accounts li")].map(li => [...li.children].map(c => c.innerText.replace(/\\s+/g, " ").trim()))'), [
// #1873 account-remove: the instance owner's rows end in Remove.
['Claude', 'Subscription Claude work', 'Ready', 'Remove'], ['ChatGPT / Codex', 'Subscription Codex home', 'Not working', 'Remove'], ['z.ai', 'API key z.ai key', 'Off', 'Remove'], ['Claude', 'Subscription Claude old', 'Unknown', 'Remove']]);
['Claude', 'Subscription Claude work', 'Saved', 'Remove'], ['ChatGPT / Codex', 'Subscription Codex home', 'Error', 'Remove', 'Add account'], ['z.ai', 'API key z.ai key', 'Disabled', 'Remove', 'Add account'], ['Claude', 'Subscription Claude old', 'Unknown', 'Remove']]);
assert.equal(await b.evaluate('document.querySelector("#setup-step-accounts").dataset.state'), 'bad', 'an account that is not working needs the owner');
assert.match(await b.evaluate('document.querySelector("#setup-step-accounts [data-step-summary]").textContent'), /ChatGPT \/ Codex \(subscription\): not working/);
assert.match(await b.evaluate('document.querySelector("#setup-step-accounts [data-step-summary]").textContent'), /ChatGPT \/ Codex \(subscription\): error/);
// #1873 account-remove: removing is built; the owner sees no note, only each row's Remove.
assert.doesNotMatch(await b.evaluate('document.querySelector("#setup-step-accounts").textContent'), /Removing an account is not built yet/);
assert.equal(await b.evaluate('document.querySelector("#proxy-remove-note").hidden'), true);
// The provider picks how to add: a sign-in for a subscription, Check and add for an API key.
await b.evaluate('(() => { document.querySelector("#proxy-add-box").open = true; const s = document.querySelector("#proxy-provider"); s.value = "z.ai"; s.dispatchEvent(new Event("change")); return true; })()');
assert.deepEqual(await b.evaluate('[document.querySelector("#proxy-login-go").checkVisibility(), document.querySelector("#proxy-apikey").checkVisibility(), document.querySelector("#proxy-apikey button[type=submit]").textContent]'), [false, true, 'Check and add']);
assert.deepEqual(await b.evaluate('[document.querySelector("#proxy-login-go").checkVisibility(), document.querySelector("#proxy-apikey").checkVisibility(), document.querySelector("#proxy-apikey button[type=submit]").textContent]'), [false, true, 'Save account']);
assert.ok((await primaries(b)).length <= 1, 'one primary button with the key form open');
await b.evaluate('(() => { const s = document.querySelector("#proxy-provider"); s.value = "codex"; s.dispatchEvent(new Event("change")); return true; })()');
assert.equal(await b.evaluate('document.querySelector("#proxy-login-go").textContent'), 'Sign in to ChatGPT / Codex');
@@ -387,8 +480,8 @@ test('settings-s4 chat-fail F3: an account row shows the accounts read\'s reason
await b.navigate(f.base + '/#/settings/model-setup?step=accounts');
await wait('document.querySelectorAll("#proxy-accounts li[data-account]").length === 4');
assert.deepEqual(await b.evaluate('[...document.querySelectorAll("#proxy-accounts li")].map(li => [...li.children].map(c => c.textContent.replace(/\\s+/g, " ").trim()))'), [
['Claude', 'SubscriptionClaude work', 'Not available', 'Remove', out], ['ChatGPT / Codex', 'SubscriptionCodex home', 'Not working', 'Remove', signin],
['Claude', 'SubscriptionClaude spare', 'Not working', 'Remove'], ['ChatGPT / Codex', 'SubscriptionCodex work', 'Ready', 'Remove']], `${width}: the reason follows the state; absent or empty shows nothing`);
['Claude', 'SubscriptionClaude work', 'Not available', 'Remove', out, 'Add account'], ['ChatGPT / Codex', 'SubscriptionCodex home', 'Sign-in needed', 'Remove', signin, 'Add account'],
['Claude', 'SubscriptionClaude spare', 'Error', 'Remove', 'Add account'], ['ChatGPT / Codex', 'SubscriptionCodex work', 'Saved', 'Remove']], `${width}: the reason follows the state; absent or empty shows nothing`);
assert.equal(await b.evaluate('document.querySelectorAll("#proxy-accounts img").length + (window.__xss ?? 0)'), 0, 'the reason is text, never markup');
assert.equal(await b.evaluate('[...document.querySelectorAll("#proxy-accounts .account-reason")].every(p => p.checkVisibility() && p.getBoundingClientRect().right <= document.documentElement.clientWidth)'), true);
assert.equal(await b.evaluate('document.documentElement.scrollWidth <= document.documentElement.clientWidth'), true, `${width}: nothing scrolls sideways`);
@@ -10,7 +10,7 @@ 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)})})()`);
const waitFor = b => (expression, ms = 6000) => b.evaluate(`(async()=>{for(let i=0;i<${Math.ceil(ms / 30)};i++){if(${expression})return;await new Promise(r=>setTimeout(r,30))}throw Error(${JSON.stringify(expression)})})()`, ms + 10000);
const at = minutesAgo => new Date(Date.now() - minutesAgo * 60000).toISOString();
async function fixture({ empty = false, bootless = false } = {}) {
@@ -267,25 +267,28 @@ test('a restart started on one organization finishes on that organization after
// Every agent request read and write is recorded, whichever organization it names; the bus answers
// are stubs (terminate, closed requests, one launch). Only acme's instances read is stubbed and
// recorded (the session gone): beta's own page reads beta's instances, which is not the chain.
const init = `window.__chain = []; const original = window.fetch;
const init = `window.__chain = []; window.__requestIds = []; const original = window.fetch;
window.fetch = async (url, options = {}) => { const s = String(url); let x;
if (options.method === 'POST' && /\\/agent\\/terminate$/.test(s)) { __chain.push(s); x = { request: '${END}' }; return ${json}; }
if (options.method === 'POST' && /\\/agent\\/terminate$/.test(s)) { __chain.push(s); await new Promise(r => { window.__releaseTerminate = r; }); x = { request: '${END}' }; return ${json}; }
if (options.method === 'POST' && /\\/agent\\/launch$/.test(s)) { __chain.push(s); x = { request: '${LAUNCHED}' }; return ${json}; }
if (/\\/agent\\/request\\?/.test(s)) { __chain.push(s.split('?')[0]); const id = new URL(s, location.href).searchParams.get('id');
if (/\\/agent\\/request\\?/.test(s)) { __chain.push(s.split('?')[0]); const id = new URL(s, location.href).searchParams.get('id'); __requestIds.push(id);
x = { request: id, instance: 'coder', action: id === '${END}' ? 'end' : 'launch', state: 'closed', done: { run: id === '${END}' ? null : 'run-9' }, cancelled: null }; return ${json}; }
if (s === '/api/orgs/acme/bus/instances' && window.__restarting) { __chain.push(s); x = { rows: [{ instances: { coder: { running: [] } } }] }; return ${json}; }
return original(url, options); };`;
const { b, wait } = await setup(t, { path: '/#/orgs/acme/organization', init });
await wait('window.MosaicAgents && document.querySelector("[data-org-dashboard] h1")');
// The button the Routing receipt offers (agents.js restartMarkup), placed on acme's page.
await b.evaluate('window.__restarting = true; document.querySelector("[data-org-dashboard]").insertAdjacentHTML("beforeend", window.MosaicAgents.restartMarkup("coder")); document.querySelector("[data-agent-restart=coder]").click()');
await wait('window.__chain.length >= 1');
// Start the same chain as the Routing receipt button and observe its final status.
await b.evaluate('window.__restarting = true; document.querySelector("[data-org-dashboard]").insertAdjacentHTML("beforeend", window.MosaicAgents.restartMarkup("coder")); void window.MosaicAgents.restart("coder", false, { text(step) { window.__restartStep = step; } }); true');
await wait('typeof window.__releaseTerminate === "function"');
await b.evaluate('location.hash = "#/orgs/beta/organization"');
await wait('location.hash === "#/orgs/beta/organization"');
// Done when the chain has launched and read the launch request back, or as soon as any of it names beta.
await wait('window.__chain.some(u => u.includes("/orgs/beta/")) || (window.__chain.some(u => /\\/agent\\/launch$/.test(u)) && window.__chain.filter(u => /\\/agent\\/request$/.test(u)).length >= 2)', 30000);
await wait('window.MosaicOrg?.id === "beta" && document.querySelector("[data-org-dashboard] h1")?.textContent === "Beta Works"');
await b.evaluate('window.__releaseTerminate()');
// Stop on a cross-org request or after the launch response has been consumed successfully.
await wait('window.__chain.some(u => u.includes("/orgs/beta/")) || window.__restartStep === "restarted"', 30000);
assert.equal(await b.evaluate('window.__restartStep'), 'restarted');
const chain = await b.evaluate('window.__chain');
assert.deepEqual([...new Set(chain)], ['/api/orgs/acme/agent/terminate', '/api/orgs/acme/agent/request', '/api/orgs/acme/bus/instances', '/api/orgs/acme/agent/launch'], chain.join(' '));
assert.deepEqual(await b.evaluate('window.__requestIds'), [END, LAUNCHED]);
// beta's page draws nothing of acme's chain.
assert.equal(await b.evaluate('!!document.querySelector("[data-agent-restart-status=coder]")'), false);
});
@@ -265,3 +265,160 @@ test('shots', { timeout: 300000, skip: !process.env.MOSAIC_UX_SHOTS }, async t =
}
for (const r of results) { assert.deepEqual(r.errors, [], r.full); assert.deepEqual(r.unexpected, [], r.full); }
});
// A read of the route that answers after a save or key change. bus.js reads the route each time the
// owner opens the page, and only then (a poll does not redraw it). An owner who opens Triage, leaves
// while the read is slow and opens it again gets a second read; the first one can answer last. The
// fixture answers a read as it arrives, so the held read carries the store as it was then. release()
// lets the page have it, and __consumed is set once the page has taken its answer.
const holdNextRead = b => b.evaluate('(()=>{const prev=window.fetch;window.__held=null;window.__consumed=false;window.__arm=true;window.fetch=(input,init)=>{const path=new URL(typeof input==="string"?input:input.url,location.href).pathname;if(window.__arm&&path==="/api/triage/route"&&(init?.method??"GET")==="GET"){window.__arm=false;const answer=prev(input,init).then(r=>{const json=r.json.bind(r);r.json=()=>json().then(v=>{setTimeout(()=>{window.__consumed=true;});return v;});return r;});return new Promise(r=>{window.__held=()=>r(answer);});}return prev(input,init);};return true;})()');
const stored2 = (over, revision) => ({ ...unset, route: route({ revision, ...over }), routeMessage: undefined, revision });
// Open Triage with its read held, leave, and open it again: the second read draws the page.
async function slowFirstVisit(b, wait) {
await b.evaluate('location.hash="#/settings/appearance"');
await wait('!document.getElementById("triage-route")');
await holdNextRead(b);
await b.evaluate('location.hash="#/settings/triage"');
await wait('typeof window.__held==="function"');
await b.evaluate('location.hash="#/settings/appearance"');
await wait('document.getElementById("settings-page-title")?.textContent==="Appearance"');
await b.evaluate('location.hash="#/settings/triage"');
await wait('document.getElementById("triage-route-cap")');
}
// Repaint the panel from the page's memory, as a model change does.
const repaintPanel = b => pick(b, 'triage-route-model', 'sonnet');
test('a read that answers after a save keeps the saved route and revision, so the next save is not stale', { timeout: 90000 }, async t => {
const saved = route({ cap: 9000, revision: 2 });
const { f, b, wait } = await w15Fixture(t, { scenario: scenario(stored2({}, 1), { 'POST /api/triage/route': { body: { route: saved, revision: 2, note: NOTE } } }) });
await b.navigate(f.base + '/#/settings/triage');
await wait('document.getElementById("triage-route-stored")?.dataset.revision==="1"');
await slowFirstVisit(b, wait);
// The held read left with revision 1. The owner saves on the page the second read drew.
await type(b, 'triage-route-cap', '9000');
await b.evaluate(`window.__scenario['/api/triage/route'] = ${JSON.stringify(stored2({ cap: 9000 }, 2))}`);
await b.evaluate('document.getElementById("triage-route-save").click()');
await wait('/^Saved .+\\.$/.test(document.getElementById("triage-route-line")?.textContent) && document.getElementById("triage-route-stored")?.dataset.revision==="2"');
await b.evaluate('window.__held();true');
await wait('window.__consumed===true');
await repaintPanel(b);
assert.equal(await b.evaluate('document.getElementById("triage-route-stored").dataset.revision'), '2', 'the older read does not put back revision 1');
assert.equal(await value(b, 'triage-route-cap'), '9000', 'the older read does not put back the old route');
await b.evaluate('document.getElementById("triage-route-save").click()');
await wait('window.__writes.filter(w=>w.path==="/api/triage/route").length===2');
assert.equal((await writes(b)).at(-1).body.revision, 2, 'the next save sends the saved revision');
assert.deepEqual(await b.evaluate('window.__errors'), []);
});
test('a read that answers after a key change keeps the new key state', { timeout: 90000 }, async t => {
const before = { key: 'missing' }, after = { key: 'issued', keyId: 'k-2', rotateBy: '2026-12-18' };
const { f, b, wait } = await w15Fixture(t, { scenario: scenario({ ...stored2({}, 1), access: before }, { 'POST /api/triage/access': { body: { access: after, key: { action: 'issued' } } } }) });
await b.navigate(f.base + '/#/settings/triage');
await wait('document.getElementById("triage-access")?.dataset.key==="missing"');
await slowFirstVisit(b, wait);
await b.evaluate(`window.__scenario['/api/triage/route'] = ${JSON.stringify({ ...stored2({}, 1), access: after })}`);
await b.evaluate('document.getElementById("triage-access-repair").click()');
await wait('document.getElementById("triage-access-line")?.textContent==="A Triage key was issued." && document.getElementById("triage-access")?.dataset.key==="issued"');
await b.evaluate('window.__held();true');
await wait('window.__consumed===true');
await repaintPanel(b);
assert.equal(await b.evaluate('document.getElementById("triage-access").dataset.key'), 'issued', 'the older read does not put back the missing key');
assert.deepEqual(await b.evaluate('window.__errors'), []);
});
test('a Reload route read that answers after a save keeps the saved route, its receipt and its revision', { timeout: 90000 }, async t => {
const message = 'The Triage route changed since this page read it. Reload the route, then save again.';
const { f, b, wait } = await w15Fixture(t, { scenario: scenario(stored2({}, 1), { 'POST /api/triage/route': { status: 409, body: { error: 'triage-route-stale', message, revision: 3 } } }) });
await b.navigate(f.base + '/#/settings/triage');
await wait('document.getElementById("triage-route-stored")?.dataset.revision==="1"');
await type(b, 'triage-route-cap', '5000');
await b.evaluate('document.getElementById("triage-route-save").click()');
await wait(`document.getElementById("triage-route-line")?.textContent===${JSON.stringify(message)}`);
// Reload route reads revision 3, held. The owner types the route again and saves before it answers.
await b.evaluate(`window.__scenario['/api/triage/route'] = ${JSON.stringify(stored2({ cap: 3 }, 3))}`);
await holdNextRead(b);
await b.evaluate('document.getElementById("triage-route-reload").click()');
await wait('typeof window.__held==="function"');
const saved = route({ harness: 'claude-code', cap: 150000, timeZone: 'America/Chicago', revision: 4 });
await b.evaluate(`window.__scenario['POST /api/triage/route'] = {body: {route: ${JSON.stringify(saved)}, revision: 4, note: ${JSON.stringify(NOTE)}}}`);
await b.evaluate(`window.__scenario['/api/triage/route'] = ${JSON.stringify(stored2({ harness: 'claude-code', cap: 150000, timeZone: 'America/Chicago' }, 4))}`);
await fill(b);
await b.evaluate('document.getElementById("triage-route-save").click()');
await wait('/^Saved .+\\.$/.test(document.getElementById("triage-route-line")?.textContent) && document.getElementById("triage-route-stored")?.dataset.revision==="4"');
const receipt = await text(b, 'triage-route-line');
await b.evaluate('window.__held();true');
await wait('window.__consumed===true');
await repaintPanel(b);
assert.equal(await b.evaluate('document.getElementById("triage-route-stored").dataset.revision'), '4', 'the reload read does not put back revision 3');
assert.equal(await value(b, 'triage-route-cap'), '150000');
assert.equal(await text(b, 'triage-route-line'), receipt, 'the save receipt stays');
await b.evaluate('document.getElementById("triage-route-save").click()');
await wait('window.__writes.filter(w=>w.path==="/api/triage/route").length===3');
assert.equal((await writes(b)).at(-1).body.revision, 4, 'the next save sends the saved revision');
assert.deepEqual(await b.evaluate('window.__errors'), []);
});
test('a Reload route read that answers after a key change keeps the new key state', { timeout: 90000 }, async t => {
const message = 'The Triage route changed since this page read it. Reload the route, then save again.';
const before = { key: 'missing' }, after = { key: 'issued', keyId: 'k-2', rotateBy: '2026-12-18' };
const { f, b, wait } = await w15Fixture(t, { scenario: scenario({ ...stored2({}, 1), access: before }, { 'POST /api/triage/route': { status: 409, body: { error: 'triage-route-stale', message, revision: 1 } }, 'POST /api/triage/access': { body: { access: after, key: { action: 'issued' } } } }) });
await b.navigate(f.base + '/#/settings/triage');
await wait('document.getElementById("triage-access")?.dataset.key==="missing"');
await type(b, 'triage-route-cap', '5000');
await b.evaluate('document.getElementById("triage-route-save").click()');
await wait(`document.getElementById("triage-route-line")?.textContent===${JSON.stringify(message)}`);
// Reload route reads revision 3 and the missing key, held. The owner repairs access before it answers.
await b.evaluate(`window.__scenario['/api/triage/route'] = ${JSON.stringify({ ...stored2({ cap: 3 }, 3), access: before })}`);
await holdNextRead(b);
await b.evaluate('document.getElementById("triage-route-reload").click()');
await wait('typeof window.__held==="function"');
await b.evaluate(`window.__scenario['/api/triage/route'] = ${JSON.stringify({ ...stored2({ cap: 3 }, 3), access: after })}`);
await b.evaluate('document.getElementById("triage-access-repair").click()');
await wait('document.getElementById("triage-access-line")?.textContent==="A Triage key was issued." && document.getElementById("triage-access")?.dataset.key==="issued"');
await b.evaluate('window.__held();true');
await wait('window.__consumed===true');
// A key change does not touch the route, so the reload still draws the route it read, with the new key.
assert.equal(await b.evaluate('document.getElementById("triage-access").dataset.key'), 'issued', 'the reload read does not put back the missing key');
assert.equal(await b.evaluate('document.getElementById("triage-route-stored").dataset.revision'), '3', 'the reload read draws the stored revision');
assert.equal(await value(b, 'triage-route-cap'), '3', 'the fields show the stored route');
assert.equal(await text(b, 'triage-route-line'), 'Route read again. Your fields now show the stored route.');
assert.equal(await b.evaluate('document.getElementById("triage-route-reload")'), null);
await b.evaluate('document.getElementById("triage-route-save").click()');
await wait('window.__writes.filter(w=>w.path==="/api/triage/route").length===2');
assert.equal((await writes(b)).at(-1).body.revision, 3, 'the next save sends the revision the reload read');
assert.deepEqual(await b.evaluate('window.__errors'), []);
});
// Hold the next two route reads. Each answers as it arrives (so it carries the store as it was then);
// __holds[i].release() lets the page have it and __holds[i].fail() fails it as a network error does.
// __taken counts the reads the page has taken, answered or failed.
const holdTwoReads = b => b.evaluate('(()=>{const prev=window.fetch;window.__holds=[];window.__taken=0;window.fetch=(input,init)=>{const path=new URL(typeof input==="string"?input:input.url,location.href).pathname;if(window.__holds.length<2&&path==="/api/triage/route"&&(init?.method??"GET")==="GET"){const answer=prev(input,init).then(r=>{const json=r.json.bind(r);r.json=()=>json().then(v=>{setTimeout(()=>{window.__taken++;});return v;});return r;});return new Promise((ok,no)=>{window.__holds.push({release:()=>ok(answer),fail:()=>{answer.catch(()=>{});setTimeout(()=>{window.__taken++;});no(new TypeError("Failed to fetch"));}});});}return prev(input,init);};return true;})()');
test('a Reload route read that fails after a key change does not let an older read put back the old key state', { timeout: 90000 }, async t => {
const message = 'The Triage route changed since this page read it. Reload the route, then save again.';
const before = { key: 'missing' }, after = { key: 'issued', keyId: 'k-2', rotateBy: '2026-12-18' };
const { f, b, wait } = await w15Fixture(t, { scenario: scenario({ ...stored2({}, 1), access: before }, { 'POST /api/triage/route': { status: 409, body: { error: 'triage-route-stale', message, revision: 3 } }, 'POST /api/triage/access': { body: { access: after, key: { action: 'issued' } } } }) });
await b.navigate(f.base + '/#/settings/triage');
await wait('document.getElementById("triage-access")?.dataset.key==="missing"');
await type(b, 'triage-route-cap', '5000');
await b.evaluate('document.getElementById("triage-route-save").click()');
await wait(`document.getElementById("triage-route-line")?.textContent===${JSON.stringify(message)}`);
// Two clicks on Reload route, both reads held with the missing key. Repair access lands first.
await b.evaluate(`window.__scenario['/api/triage/route'] = ${JSON.stringify({ ...stored2({ cap: 3 }, 3), access: before })}`);
await holdTwoReads(b);
await b.evaluate('document.getElementById("triage-route-reload").click()');
await wait('window.__holds.length===1');
await b.evaluate('document.getElementById("triage-route-reload").click()');
await wait('window.__holds.length===2');
await b.evaluate(`window.__scenario['/api/triage/route'] = ${JSON.stringify({ ...stored2({ cap: 3 }, 3), access: after })}`);
await b.evaluate('document.getElementById("triage-access-repair").click()');
await wait('document.getElementById("triage-access-line")?.textContent==="A Triage key was issued." && document.getElementById("triage-access")?.dataset.key==="issued"');
// The first read fails, so the page says the route could not be read. The second then answers.
await b.evaluate('window.__holds[0].fail();true');
await wait('window.__taken===1');
await b.evaluate('window.__holds[1].release();true');
await wait('window.__taken===2');
assert.equal(await b.evaluate('document.getElementById("triage-access")?.dataset.key ?? null'), 'issued', 'the older read does not put back the missing key');
assert.equal(await b.evaluate('document.getElementById("triage-route-stored").dataset.revision'), '3', 'the newer read draws its route');
assert.deepEqual(await b.evaluate('window.__errors'), []);
});
@@ -55,6 +55,7 @@ function store(writable) {
st.view = org => (st.down[org.id] ? { ...org, busHealthy: false, ...(st.down[org.id] === 'stopped' ? { busStopped: true } : {}) } : org);
// SP17: hold('read') holds the next workflow read, which answers with the file as it was when the read
// began; hold('write') holds the next write before it reaches the file. Each returns the release.
// st.onHeld, when set, is called as a held read arrives.
st.hold = which => { let open; st.held[which] = new Promise(r => { open = r; }); return open; };
const fail = code => Object.assign(new Error(code), { code });
st.write = (id, verb, args) => {
@@ -86,9 +87,11 @@ function organizations(reads, st) {
const org = LIST.find(o => o.id === id); if (!org) return null;
const workflowsRead = async () => {
reads.push(id);
if (st.failRead) throw Object.assign(new Error('org-unavailable'), { code: 'org-unavailable' });
const answer = { revision: st.revs[id], document: structuredClone(st.docs[id] ?? {}), templates: ['writer', 'triage'] };
const h = st.held.read; if (h) { st.held.read = null; await h; }
// The answer, or the refusal, is settled as the read arrives; a held read gives it on release.
const error = st.failRead ? Object.assign(new Error('org-unavailable'), { code: 'org-unavailable' }) : null;
const answer = error ? null : { revision: st.revs[id], document: structuredClone(st.docs[id] ?? {}), templates: ['writer', 'triage'] };
const h = st.held.read; if (h) { st.held.read = null; st.onHeld?.(); await h; }
if (error) throw error;
return answer;
};
if (!org.busHealthy) return { busHealthy: false, reads: null, bus: {}, workflowsRead, chat: { projects: async () => [], threads: async () => [] } };
@@ -1040,3 +1043,40 @@ test('SP17: the bar Save with a new step typed in the add form says so and keeps
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved');
assert.deepEqual(st.writes.at(-1).args.workflow.steps.map(s => [s.title, s.roles]), [['Build it', ['coder']], ['Check', ['human']], ['Ship', ['human']]]);
});
// Two reads with no write between them: the older one answers last. The page keeps the newer read, so what
// it draws next and the revision its next Save sends come from the newer read. A fetch wrapper in the page
// counts each workflow read the page has taken, so the test knows when the older one landed.
const countTaken = b => b.evaluate(`(()=>{const prev=window.fetch;window.__wfTaken=0;window.fetch=(input,init)=>{const url=typeof input==='string'?input:input.url;const p=prev(input,init);if(!/\\/workflows$/.test(new URL(url,location.href).pathname)||(init?.method??'GET')!=='GET')return p;return p.then(r=>{const json=r.json.bind(r);r.json=()=>json().finally(()=>setTimeout(()=>window.__wfTaken++));return r;});};return true})()`);
async function olderLast(t, { olderFails }) {
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=2' });
await wait(`${boxes}.length === 2 && document.querySelector('[data-wfg-detail]')`, 'site graph');
await countTaken(b);
const repaint = () => b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));true`);
// The older read takes the file as it is now (or is refused), and is held.
const arrived = new Promise(r => { st.onHeld = r; });
const openOld = st.hold('read');
st.failRead = olderFails;
await repaint();
await arrived;
st.failRead = false;
// Another writer changes this workflow. A newer read takes that and draws it.
st.change('acme', doc => { doc.projects.site.workflows.change.description = 'Changed elsewhere.'; });
const fresh = st.revs.acme;
await repaint();
await wait(`/Changed elsewhere\\./.test(document.querySelector('#bus-view .sub')?.textContent) && window.__wfTaken === 1`, 'newer read drawn');
// The older read answers last.
openOld();
await wait(`window.__wfTaken === 2`, 'older read taken');
assert.doesNotMatch(await b.evaluate(`window.MosaicWorkflows.card('acme')`), /data-wfg-error/, 'the page still holds a read');
assert.match(await b.evaluate(`window.MosaicWorkflows.card('acme')`), /data-wfg-card-step/);
await retitle(b, wait, 2, 'Ship the release');
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-stale]')`), null);
await b.evaluate(press('[data-wfg-save]'));
await wait(`/Saved change\\.|changed since this page read it/.test(${text('[data-wfg-status]')})`, 'save answered');
assert.equal(st.writes.length, 1);
assert.equal(st.writes[0].args.revision, fresh, 'the Save sends the revision the newer read took');
assert.match(await b.evaluate(text('[data-wfg-status]')), /Saved change\./);
}
test('an older workflow read that answers after a newer one does not put back what the newer one read', { timeout: 60000 }, t => olderLast(t, { olderFails: false }));
test('an older workflow read that fails after a newer one answered keeps the newer read', { timeout: 60000 }, t => olderLast(t, { olderFails: true }));
+3 -1
View File
@@ -536,7 +536,9 @@ async function runTask(taskFile, options = {}) {
writeOnce(path.join(runDir, "result.json"), `${JSON.stringify(result, null, 2)}\n`);
if (!haltGeneration && !proc.error && proc.status === 0) unregisterRuntime(resolved.dataRoot, managed.id);
process.stdout.write(`run: ${runId}\nstatus: ${status}${reason ? ` (${reason})` : ""}\nresponse: ${response}\n`);
// worker-stop-reason: a failed run also says why on the terminal, with the line `show` prints.
const cause = status === "succeeded" ? null : runCause(resolved.dataRoot, runId, result);
process.stdout.write(`run: ${runId}\nstatus: ${status}${reason ? ` (${reason})` : ""}\nresponse: ${response}\n${cause ? `cause: ${cause}\n` : ""}`);
process.exit(status === "succeeded" ? 0 : 1);
}
+6
View File
@@ -40,4 +40,10 @@ fi
export MOSAIC_SYSTEM_PROMPT_FILE
# worker-stop-reason: a headless pi worker is judged by pi's final stop reason (adapters/pi/
# final-stop.mjs). Set for pi only, so the mock and other adapters see the environment they did.
if [ "$ADAPTER" = "pi" ] && [ "${MOSAIC_INTERACTIVE:-}" != "1" ]; then
export MOSAIC_PI_FINAL_STOP=1
fi
exec "$ADAPTER_SCRIPT"