Skip to content

armgit / qm

Public Imported from GitHub
0

Multiplayer agent harness for work.

Keep admin settings loads scoped and independent of model discovery (#1172)

Regan Belle128459633c5
diff --git a/docs/screenshots/admin-settings-load-after.jpg b/docs/screenshots/admin-settings-load-after.jpg
new file mode 100644
index 000000000..8df0b7cbd
Binary files /dev/null and b/docs/screenshots/admin-settings-load-after.jpg differ
diff --git a/docs/screenshots/admin-settings-load-before.jpg b/docs/screenshots/admin-settings-load-before.jpg
new file mode 100644
index 000000000..8df0b7cbd
Binary files /dev/null and b/docs/screenshots/admin-settings-load-before.jpg differ
diff --git a/plugins/admin/public/index.html b/plugins/admin/public/index.html
index 949916489..236c3126f 100644
--- a/plugins/admin/public/index.html
+++ b/plugins/admin/public/index.html
@@ -7037,7 +7037,6 @@
showView("app-view", "Signed in as " + me.data.principal);
if (!new URLSearchParams(location.search).get("scope")) scope = "org:" + orgId;
- loadScopeDirectory();
route();
}
const signOut = async () => {
@@ -7218,6 +7217,7 @@
document.body.dataset.subview = isGovLike(view) ? view : view === "connectors" ? "connectors" : "";
document.body.classList.toggle("context-fullpage", view === "history" && !!st.session && st.turn != null);
document.body.classList.toggle("design-view", view === "design");
+ if (!isGovLike(view) && view !== "connectors" && view !== "onboarding" && !scopeDir) void loadScopeDirectory();
defaultShell();
renderTabs();
$("view-governance").classList.toggle("hidden", !isGovLike(view));
@@ -7720,7 +7720,7 @@
const FOCUS_REFRESH_EXEMPT = new Set(["governance", "connectors", "user"]);
window.addEventListener("focus", () => {
if ($("app-view").classList.contains("hidden")) return;
- if (FOCUS_REFRESH_EXEMPT.has(view)) return;
+ if (isGovLike(view) || FOCUS_REFRESH_EXEMPT.has(view)) return;
if (Date.now() - (viewLoadedAt[view] || 0) < FOCUS_STALE_MS) return;
if (view === "memory" && !(orgWideView() && urlToState().mem !== "edit")) return;
if (view === "history" && urlToState().session) return;
@@ -7737,6 +7737,7 @@
else renderData();
});
+ let webuiModelIds = [];
let loadedGovernanceScope = null;
let loadedCommandPolicyPresent = false;
let governanceOverviewData = {};
@@ -7744,6 +7745,7 @@
let soulSaved = "";
let soulHistory = [];
let serviceCredDirectory = [];
+ let serviceCredChannels = [];
function updateSoulWorkbench() {
const draft = $("soul").value;
$("soul-preview").textContent = soulSaved || "No saved instructions";
@@ -7946,10 +7948,14 @@
let governanceReq = 0;
async function loadScope() {
const requestedScope = scope;
+ const requestedView = view;
const requestId = ++governanceReq;
const scopeChanged = scope !== loadedGovernanceScope;
- const r = await api("GET", "/api/scopes/" + encodeURIComponent(scope));
- if (requestId !== governanceReq || requestedScope !== scope) return;
+ const r = await api(
+ "GET",
+ "/api/scopes/" + encodeURIComponent(scope) + "?view=" + encodeURIComponent(requestedView),
+ );
+ if (requestId !== governanceReq || requestedScope !== scope || requestedView !== view) return;
if (!r.ok) {
setStatus(
"st-policy",
@@ -7958,6 +7964,7 @@
);
return;
}
+ const refreshModelChoices = [];
renderEnvironmentNotice(r.data);
renderGovernanceOverview(r.data);
syncGovernanceSectionNav();
@@ -8006,6 +8013,7 @@
model.value = options.some((entry) => entry.id === prior) ? prior : (options[0] || {}).id || "";
};
harness.oninput = syncAutoFlaggerModels;
+ refreshModelChoices.push(syncAutoFlaggerModels);
syncAutoFlaggerModels();
$("auto-flagger-rubric").value = current.rubric;
}
@@ -8134,17 +8142,19 @@
syncFastMode();
};
harness.oninput = syncModels;
+ refreshModelChoices.push(syncModels);
syncModels();
}
const showWebuiModels = scope.startsWith("org:") && opts.length > 0;
$("card-webui-models").classList.toggle("hidden", !showWebuiModels);
if (showWebuiModels) {
- const catalogModels = Object.values(modelsByHarness)
- .flat()
- .concat(opts)
- .filter((m, i, all) => m && m.id && all.findIndex((x) => x && x.id === m.id) === i);
+ const catalogModels = () =>
+ Object.values(modelsByHarness)
+ .flat()
+ .concat(opts)
+ .filter((m, i, all) => m && m.id && all.findIndex((x) => x && x.id === m.id) === i);
const modelLabel = (id) => {
- const m = catalogModels.find((x) => x.id === id);
+ const m = catalogModels().find((x) => x.id === id);
return m && m.name && m.name !== id ? m.name + " (" + id + ")" : id;
};
const configured = Array.isArray(r.data.webuiModels) ? r.data.webuiModels.filter(Boolean) : [];
@@ -8181,7 +8191,7 @@
placeholder.value = "";
placeholder.textContent = "Choose a model…";
addSelect.appendChild(placeholder);
- catalogModels
+ catalogModels()
.filter((m) => !webuiModelIds.includes(m.id))
.forEach((m) => {
const o = document.createElement("option");
@@ -8202,6 +8212,7 @@
};
addSelect.onchange = () => (addButton.disabled = !addSelect.value);
addButton.onclick = addModel;
+ refreshModelChoices.push(renderChips);
renderChips();
}
function autoSaveAckEmoji() {
@@ -8407,6 +8418,7 @@
$("card-turn-wall-clock").classList.toggle("hidden", !showTurnWallClock);
if (showTurnWallClock) $("turn-wall-clock").value = r.data.turnWallClockSec ?? "";
serviceCredDirectory = r.data.directoryMembers || [];
+ serviceCredChannels = r.data.directoryChannels || [];
const options = $("sc-people-options");
options.textContent = "";
serviceCredDirectory.forEach((member) => {
@@ -8425,10 +8437,41 @@
loadedGovernanceScope = scope;
initCustomDropdowns($("view-governance"));
captureGovernanceSnapshots();
+ if (r.data.modelCatalogRefreshing) {
+ void api(
+ "GET",
+ "/api/scopes/" +
+ encodeURIComponent(requestedScope) +
+ "?view=" +
+ encodeURIComponent(requestedView) +
+ "&catalog=refresh",
+ )
+ .then((fresh) => {
+ if (!fresh.ok || requestId !== governanceReq || requestedScope !== scope || requestedView !== view)
+ return;
+ const append = (target, incoming) => {
+ for (const model of incoming || []) {
+ const existing = target.findIndex((candidate) => candidate.id === model.id);
+ if (existing < 0) target.push(model);
+ else target[existing] = model;
+ }
+ };
+ append(opts, fresh.data.baseModelOptions);
+ for (const [harness, models] of Object.entries(fresh.data.modelsByHarness || {})) {
+ append((modelsByHarness[harness] ||= []), models);
+ }
+ refreshModelChoices.forEach((refresh) => refresh());
+ initCustomDropdowns($("view-governance"));
+ })
+ .catch(() => {});
+ }
}
async function refreshSoulConflict() {
const draft = $("soul").value;
- const fresh = await api("GET", "/api/scopes/" + encodeURIComponent(scope));
+ const fresh = await api(
+ "GET",
+ "/api/scopes/" + encodeURIComponent(scope) + "?view=" + encodeURIComponent(view),
+ );
if (!fresh.ok) return false;
soulVersion = fresh.data.soulVersion || 0;
soulSaved = fresh.data.soul || "";
@@ -8442,9 +8485,13 @@
return true;
}
async function refreshServiceCredentialConflict() {
- const fresh = await api("GET", "/api/scopes/" + encodeURIComponent(scope));
+ const fresh = await api(
+ "GET",
+ "/api/scopes/" + encodeURIComponent(scope) + "?view=" + encodeURIComponent(view),
+ );
if (!fresh.ok) return false;
serviceCredDirectory = fresh.data.directoryMembers || [];
+ serviceCredChannels = fresh.data.directoryChannels || [];
const options = $("sc-people-options");
options.textContent = "";
serviceCredDirectory.forEach((member) => {
@@ -8741,7 +8788,14 @@
more.textContent = "…" + (candidates.length - 30) + " more — keep typing";
list.appendChild(more);
}
- const channels = (scopeDir || []).filter((s) => {
+ const channelScopes = new Map((scopeDir || []).map((s) => [s.scopeId, s]));
+ serviceCredChannels.forEach((channel) =>
+ channelScopes.set("channel:" + channel.channelId, {
+ scopeId: "channel:" + channel.channelId,
+ label: channel.name,
+ }),
+ );
+ const channels = [...channelScopes.values()].filter((s) => {
if (!s.scopeId.startsWith("channel:") || selSet.has(s.scopeId)) return false;
if (!q) return true;
return s.scopeId.toLowerCase().includes(q) || (s.label || "").toLowerCase().includes(q);
@@ -8752,7 +8806,9 @@
h.textContent = "Channels";
list.appendChild(h);
channels.slice(0, 15).forEach((s) => {
- list.appendChild(item(s.scopeId, s.label ? "#" + s.label + " (" + s.scopeId + ")" : s.scopeId, false));
+ list.appendChild(
+ item(s.scopeId, s.label ? "#" + s.label.replace(/^#/, "") + " (" + s.scopeId + ")" : s.scopeId, false),
+ );
});
if (channels.length > 15) {
const more = document.createElement("div");
@@ -9084,6 +9140,7 @@
};
let onboardingModels = {};
+ let onboardingRequest = 0;
let onboardingModelStatuses = [];
function onboardingBadge(id, text, ready, optional = false) {
const el = $(id);
@@ -9139,13 +9196,16 @@
: "Write-only API key";
}
async function loadOnboarding() {
- await loadModelRegistry();
+ const requestId = ++onboardingRequest;
+ const requestedView = view;
+ void loadModelRegistry().catch(() => {});
const [models, slack, catalog, config] = await Promise.all([
- api("GET", "/api/model-providers"),
+ api("GET", "/api/model-providers?catalog=cached"),
api("GET", "/api/slack-installation"),
api("GET", "/api/connector-catalog"),
- api("GET", "/api/scopes/" + encodeURIComponent(orgScope())),
+ api("GET", "/api/scopes/" + encodeURIComponent(orgScope()) + "?view=onboarding"),
]);
+ if (requestId !== onboardingRequest || requestedView !== view) return;
if (!models.ok || !slack.ok || !catalog.ok || !config.ok) {
setStatus("st-onboarding-model", "Setup status could not be loaded. Try again.", "err", true);
renderOnboardingProviderOptions();
@@ -9153,8 +9213,14 @@
}
onboardingModelStatuses = models.data.providers || [];
onboardingModels = {};
- (models.data.models || []).forEach((model) => {
- (onboardingModels[model.provider] ||= []).push(model);
+ [
+ ...(models.data.models || []),
+ ...(config.data.baseModelOptions || []),
+ ...Object.values(config.data.modelsByHarness || {}).flat(),
+ ].forEach((model) => {
+ if (!model.provider) return;
+ const options = (onboardingModels[model.provider] ||= []);
+ if (!options.some((option) => option.id === model.id)) options.push(model);
});
const baseModel = config.data.baseModel || config.data.baseModelDefault || "";
const baseProvider = onboardingProviderForModel(baseModel);
@@ -9198,6 +9264,19 @@
? configured.map((item) => connectorName(item.provider)).join(", ") + " available in the web UI."
: "Add Google, GitHub, Notion, or other OAuth clients to make those connectors available.";
viewLoadedAt.onboarding = Date.now();
+ if (models.data.modelCatalogRefreshing) {
+ void api("GET", "/api/model-providers")
+ .then((fresh) => {
+ if (!fresh.ok || requestId !== onboardingRequest || requestedView !== view) return;
+ const selected = $("onboarding-model-id").value;
+ for (const model of fresh.data.models || []) {
+ const options = (onboardingModels[model.provider] ||= []);
+ if (!options.some((option) => option.id === model.id)) options.push(model);
+ }
+ renderOnboardingModelOptions(selected);
+ })
+ .catch(() => {});
+ }
}
$("onboarding-model-provider").onchange = () => renderOnboardingModelOptions();
$("onboarding-model-save").onclick = async () => {
@@ -9625,21 +9704,10 @@
});
}
async function loadPersonalKeychainSummary() {
- const res = await api("GET", "/api/keychain");
- if (!res.ok || res.data?.enabled === false) {
- $("keychain-user-count").textContent = "—";
- $("keychain-standing-count").textContent = "—";
- return;
- }
- const users = new Set((res.data?.credentials || []).map((credential) => credential.ownerId));
- const standing = (res.data?.grants || []).filter(
- (grant) =>
- grant.mode === "standing" &&
- grant.status === "active" &&
- (!grant.expiresAt || grant.expiresAt > Date.now()),
- );
- $("keychain-user-count").textContent = String(users.size);
- $("keychain-standing-count").textContent = String(standing.length);
+ const res = await api("GET", "/api/keychain?summary=1");
+ $("keychain-user-count").textContent = res.ok && res.data?.enabled !== false ? String(res.data.users) : "—";
+ $("keychain-standing-count").textContent =
+ res.ok && res.data?.enabled !== false ? String(res.data.standing) : "—";
}
$("custom-provider-save").onclick = async () => {
const id = $("custom-provider-id").value.trim();
@@ -9927,7 +9995,7 @@
async function loadConnectors() {
const [catalog, r] = await Promise.all([
api("GET", "/api/connector-catalog"),
- api("GET", "/api/scopes/" + encodeURIComponent(orgScope())),
+ api("GET", "/api/scopes/" + encodeURIComponent(orgScope()) + "?view=connectors"),
]);
if (!catalog.ok) {
setStatus("st-connectors", catalog.data?.message || "Failed to load connector setup.", "err");
@@ -10984,7 +11052,10 @@
if (btn.dataset.saveRequest === saveRequest) delete btn.dataset.saveRequest;
if (r.ok) {
if (key === "security-posture" || key === "sharing-posture" || key === "ambient-policy") {
- const fresh = await api("GET", "/api/scopes/" + encodeURIComponent(scope));
+ const fresh = await api(
+ "GET",
+ "/api/scopes/" + encodeURIComponent(scope) + "?view=" + encodeURIComponent(view),
+ );
if (!fresh.ok) {
updateSectionDirty(key);
setStatus(SAVE_ST[key], "Saved, but could not refresh the applied value.", "err");
@@ -10996,7 +11067,10 @@
else renderAmbientPolicy(fresh.data.ambientPolicy);
captureSection(key);
} else if (key === "branding") {
- location.reload();
+ sectionSnapshots.set(key, JSON.stringify(body));
+ updateSectionDirty(key);
+ setStatus(SAVE_ST[key], "Saved", "ok");
+ if (!hasGovernanceDraft()) location.reload();
return;
} else if (SAVE_RELOADS.has(key)) await loadScope();
else {
diff --git a/plugins/admin/src/index.ts b/plugins/admin/src/index.ts
index c3ab29ead..00528d796 100644
--- a/plugins/admin/src/index.ts
+++ b/plugins/admin/src/index.ts
@@ -121,6 +121,8 @@ async function forward(
},
...(body ? { body } : {}),
});
+ const timing = r.headers.get("server-timing");
+ if (timing) res.setHeader("server-timing", timing);
if (r.body && gzipAccepted(req)) {
res.writeHead(r.status, {
"content-type": "application/json",
@@ -413,7 +415,7 @@ async function handle(req: IncomingMessage, res: ServerResponse): Promise<void>
);
}
const scopeId = decodeURIComponent(rest);
- return forward(req, res, principal, "GET", `/v1/admin/scopes/${encodeURIComponent(scopeId)}`);
+ return forward(req, res, principal, "GET", `/v1/admin/scopes/${encodeURIComponent(scopeId)}${url.search}`);
}
if (method === "POST" && rest.endsWith("/auto-flagger/test")) {
const scope = decodeURIComponent(rest.slice(0, -"/auto-flagger/test".length));
diff --git a/plugins/admin/test/auto-flagger.test.ts b/plugins/admin/test/auto-flagger.test.ts
index 60773623f..8301a6bd7 100644
--- a/plugins/admin/test/auto-flagger.test.ts
+++ b/plugins/admin/test/auto-flagger.test.ts
@@ -66,6 +66,7 @@ class Element {
function fixture(data: Record<string, unknown> = {}, scope = "org:example") {
const elements: Record<string, Element> = {};
const context = vm.createContext({
+ refreshModelChoices: [],
scope,
scopeChanged: true,
r: { data },
diff --git a/plugins/admin/test/default-view.test.ts b/plugins/admin/test/default-view.test.ts
index 7a282c9fb..4d8100b93 100644
--- a/plugins/admin/test/default-view.test.ts
+++ b/plugins/admin/test/default-view.test.ts
@@ -323,7 +323,10 @@ test("governance keeps effective-state summaries synchronized after focused save
test("stale governance reads cannot overwrite a newer scope", () => {
assert.match(html, /const requestId = \+\+governanceReq/);
- assert.match(html, /if \(requestId !== governanceReq \|\| requestedScope !== scope\) return;/);
+ assert.match(
+ html,
+ /if \(requestId !== governanceReq \|\| requestedScope !== scope \|\| requestedView !== view\) return;/,
+ );
assert.match(html, /encodeURIComponent\(requestedScope\) \+ "\/" \+ key/);
});
diff --git a/plugins/admin/test/onboarding-view.test.ts b/plugins/admin/test/onboarding-view.test.ts
index be3afb348..b0ad1a670 100644
--- a/plugins/admin/test/onboarding-view.test.ts
+++ b/plugins/admin/test/onboarding-view.test.ts
@@ -40,14 +40,17 @@ interface FakeElement {
appendChild(option: { value?: string; textContent?: string }): void;
}
-async function runLoadOnboarding(modelProviders: unknown): Promise<Record<string, FakeElement>> {
+async function runLoadOnboarding(
+ modelProviders: unknown,
+ scopeConfig: unknown = { baseModel: "claude-opus-5" },
+): Promise<Record<string, FakeElement>> {
const src = slice("let onboardingModels = {};", '$("onboarding-model-provider").onchange') + "\nloadOnboarding();";
const elements: Record<string, FakeElement> = {};
const fixtures: Record<string, unknown> = {
- "/api/model-providers": modelProviders,
+ "/api/model-providers?catalog=cached": modelProviders,
"/api/slack-installation": { configured: false },
"/api/connector-catalog": { catalog: [] },
- "/api/scopes/org%3Adefault-org": { baseModel: "claude-opus-5" },
+ "/api/scopes/org%3Adefault-org?view=onboarding": scopeConfig,
};
const context = vm.createContext({
$: (id: string) =>
@@ -70,6 +73,7 @@ async function runLoadOnboarding(modelProviders: unknown): Promise<Record<string
setStatus: () => {},
connectorName: (id: string) => id,
viewLoadedAt: {},
+ view: "onboarding",
Date,
document: { createElement: () => ({}) },
});
@@ -164,3 +168,13 @@ test("model setup starts with two inputs, separates missing fields and discards
assert.match(code, /Choose a compatible template/);
assert.match(code, /source/);
});
+
+test("cold catalog preserves the configured dynamic model and its provider", async () => {
+ const model = { id: "future/configured-model", name: "Configured model", provider: "openrouter" };
+ const elements = await runLoadOnboarding(
+ { providers: UNCONFIGURED_PROVIDERS.map((p) => ({ ...p, configured: true })), models: ANTHROPIC_MODELS },
+ { baseModel: model.id, baseModelOptions: [model] },
+ );
+ assert.equal(elements["onboarding-model-provider"].value, "openrouter");
+ assert.equal(elements["onboarding-model-id"].value, model.id);
+});
diff --git a/plugins/admin/test/scopes.test.ts b/plugins/admin/test/scopes.test.ts
index c597a7be7..393061084 100644
--- a/plugins/admin/test/scopes.test.ts
+++ b/plugins/admin/test/scopes.test.ts
@@ -86,3 +86,12 @@ test("the scope directory requires a signed-in cookie → 401 (no core hop)", as
assert.equal((await fetch(`${base}/api/scopes`)).status, 401);
assert.equal(calls.length, before, "a signed-out request is rejected at the surface, never forwarded");
});
+
+test("settings view projections survive the signed admin proxy", async () => {
+ for (const view of ["customize", "governance", "models", "credentials", "connectors", "onboarding"]) {
+ const r = await fetch(`${base}/api/scopes/org%3Aacme?view=${view}`, { headers: { cookie: ADMIN } });
+ assert.equal(r.status, 200);
+ assert.equal(calls.at(-1)!.url, `/v1/admin/scopes/org%3Aacme?view=${view}`);
+ assert.equal(calls.at(-1)!.signed, true);
+ }
+});
diff --git a/plugins/admin/test/settings-load.test.ts b/plugins/admin/test/settings-load.test.ts
new file mode 100644
index 000000000..0d8dbeb76
--- /dev/null
+++ b/plugins/admin/test/settings-load.test.ts
@@ -0,0 +1,127 @@
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import test from "node:test";
+import vm from "node:vm";
+import { setImmediate } from "node:timers/promises";
+
+const html = readFileSync(new URL("../public/index.html", import.meta.url), "utf8");
+const extract = (start: string, end: string) => {
+ const from = html.indexOf(start);
+ const to = html.indexOf(end, from);
+ assert.ok(from >= 0 && to > from);
+ return html.slice(from, to);
+};
+
+test("settings navigation never starts the all-scopes history scan", () => {
+ const source = extract("function render(st) {", "const GOV_LIKE =");
+ for (const view of ["customize", "models", "credentials", "governance", "connectors", "onboarding", "history"]) {
+ let scans = 0;
+ let settings = 0;
+ const node = { classList: { toggle() {} } };
+ const context = vm.createContext({
+ transcriptObserver: null,
+ scopeDir: null,
+ document: { body: { dataset: {}, ...node } },
+ $: () => node,
+ isGovLike: (view: string) => ["customize", "models", "credentials", "governance"].includes(view),
+ loadScopeDirectory: () => {
+ scans++;
+ },
+ loadScope: () => {
+ settings++;
+ },
+ loadConnectors: () => {
+ settings++;
+ },
+ loadOnboarding: () => {
+ settings++;
+ },
+ renderTabs() {},
+ defaultShell() {},
+ renderCurrentData() {},
+ });
+ vm.runInContext(source, context);
+ vm.runInContext(`render({view:${JSON.stringify(view)}, scope:"org:example"})`, context);
+ assert.equal(scans, view === "history" ? 1 : 0, view);
+ assert.equal(settings, view === "history" ? 0 : 1, view);
+ }
+});
+
+test("catalog completion appends options only to the requesting settings view", async () => {
+ const source = extract("if (r.data.modelCatalogRefreshing) {", "\n }\n async function refreshSoulConflict");
+ for (const stale of [false, true]) {
+ const completion = Promise.withResolvers<unknown>();
+ const options = [{ id: "configured", name: "Configured" }];
+ const harnessOptions = [...options];
+ let rendered = 0;
+ const context = vm.createContext({
+ r: { data: { modelCatalogRefreshing: true } },
+ requestId: 1,
+ governanceReq: 1,
+ requestedScope: "org:example",
+ scope: "org:example",
+ requestedView: "models",
+ view: "models",
+ opts: options,
+ modelsByHarness: { pi: harnessOptions },
+ refreshModelChoices: [
+ () => {
+ rendered++;
+ },
+ ],
+ api: () => completion.promise,
+ initCustomDropdowns() {},
+ $() {},
+ encodeURIComponent,
+ });
+ vm.runInContext(source, context);
+ if (stale) context.view = "customize";
+ completion.resolve({
+ ok: true,
+ data: {
+ baseModelOptions: [{ id: "new", name: "New model" }],
+ modelsByHarness: { pi: [{ id: "new", name: "New model" }] },
+ },
+ });
+ await setImmediate();
+ assert.deepEqual(
+ options.map((model) => model.id),
+ stale ? ["configured"] : ["configured", "new"],
+ );
+ assert.deepEqual(
+ harnessOptions.map((model) => model.id),
+ stale ? ["configured"] : ["configured", "new"],
+ );
+ assert.equal(rendered, stale ? 0 : 1);
+ }
+});
+
+test("branding reload clears only the committed draft and preserves other unsaved settings", () => {
+ const source = extract('} else if (key === "branding") {', "} else if (SAVE_RELOADS");
+ const block = source.slice(source.indexOf("{") + 1);
+ for (const otherDraft of [false, true]) {
+ const snapshots = new Map();
+ let reloads = 0;
+ let recorded = false;
+ const context = vm.createContext({
+ key: "branding",
+ body: { selfLabel: "Saved name" },
+ sectionSnapshots: snapshots,
+ updateSectionDirty: () => {
+ recorded = snapshots.has("branding");
+ },
+ SAVE_ST: { branding: "st-branding" },
+ setStatus() {},
+ hasGovernanceDraft: () => otherDraft,
+ location: {
+ reload: () => {
+ reloads++;
+ },
+ },
+ });
+ vm.runInContext(`(() => {${block}})()`, context);
+ assert.equal(recorded, true);
+ assert.equal(snapshots.get("branding"), JSON.stringify({ selfLabel: "Saved name" }));
+ assert.equal(reloads, otherDraft ? 0 : 1);
+ }
+});
diff --git a/src/api/routes/admin/model-providers.ts b/src/api/routes/admin/model-providers.ts
index 67a7725a7..da8f554ed 100644
--- a/src/api/routes/admin/model-providers.ts
+++ b/src/api/routes/admin/model-providers.ts
@@ -1,6 +1,6 @@
import { isModelProvider, type ModelProvider } from "../../../model/model-credential-store.ts";
import { providerBaseUrl } from "../../../model/provider-endpoints.ts";
-import { selectableModelCatalog } from "../../../model/model-catalog.ts";
+import { cachedModelCatalog, selectableModelCatalog } from "../../../model/model-catalog.ts";
import { sendJson } from "../../http.ts";
import type { ApiCtx } from "../route.ts";
import { audit, authorizeAdmin, orgScope } from "../shared.ts";
@@ -59,9 +59,16 @@ export async function getModelProviders(ctx: ApiCtx): Promise<void> {
resource: "model-providers",
scopeLabel: orgScope(ctx.deps),
});
+ const cached =
+ ctx.url.searchParams.get("catalog") === "cached" ? cachedModelCatalog(ctx.deps.modelCredentialFetch) : undefined;
+ const [providers, models] = await Promise.all([
+ ctx.deps.modelCredentials.statuses(),
+ cached?.models ?? selectableModelCatalog(ctx.deps.modelCredentialFetch),
+ ]);
return sendJson(ctx.res, 200, {
- providers: await ctx.deps.modelCredentials.statuses(),
- models: await selectableModelCatalog(ctx.deps.modelCredentialFetch),
+ providers,
+ models,
+ ...(cached?.refreshing ? { modelCatalogRefreshing: true } : {}),
...(ctx.deps.harnessCarriedModelAuth
? { harnessAuth: { harnessId: ctx.deps.harnessId ?? "pi", provider: ctx.deps.harnessCarriedModelAuth } }
: {}),
diff --git a/src/api/routes/admin/scope-config.ts b/src/api/routes/admin/scope-config.ts
index 5182fe045..d31e8abcf 100644
--- a/src/api/routes/admin/scope-config.ts
+++ b/src/api/routes/admin/scope-config.ts
@@ -15,6 +15,7 @@ import {
} from "../../../model/pi-models.ts";
import {
builtInModelCatalog,
+ cachedModelCatalog,
selectableCatalogForHarness,
selectableModelCatalog,
type ModelCatalogEntry,
@@ -238,26 +239,59 @@ async function scopeEnvironmentMetadata(deps: ApiCtx["deps"], targetScope: strin
return metadata;
}
-export async function getScopeConfig(ctx: ApiCtx): Promise<void> {
- const { res, deps, params } = ctx;
- if (!deps.config) return sendJson(res, 404, { error: "not_found" });
- const targetScope = params.scope!;
- if (!targetScope || targetScope.includes("/")) return sendJson(res, 404, { error: "not_found" });
- const actor = await authorizeAdmin(ctx, targetScope);
- if (!actor) return;
- await deps.refreshModels?.();
- await deps.config.refreshScope(targetScope);
- audit(deps, { principalId: actor.id, action: "config.read", resource: "config", scopeLabel: targetScope });
- const environmentMetadata = await scopeEnvironmentMetadata(deps, targetScope);
- const serviceCredentials = await Promise.all(
+const SETTINGS_RESOURCES = {
+ governance: [
+ "baseModel",
+ "runtime",
+ "securityPosture",
+ "sharingPosture",
+ "autoFlagger",
+ "approvalGrantModes",
+ "commandPolicy",
+ "ambientPolicy",
+ "egress",
+ "externalSlackParticipants",
+ "internalMemberOverrides",
+ "orgAmbient",
+ ],
+ customize: [
+ "soul",
+ "branding",
+ "peopleDirectoryUrl",
+ "ackEmoji",
+ "turnWallClockSec",
+ "featureFlags",
+ "orgAmbient",
+ "channelHeaderPinDefault",
+ ],
+ models: [
+ "baseModel",
+ "runtime",
+ "approvedHarnesses",
+ "webuiModels",
+ "interactiveFastMode",
+ "individualModelAuth",
+ "browseModel",
+ "browseMaxSteps",
+ ],
+ credentials: [],
+ connectors: ["connectors"],
+ onboarding: ["baseModel", "runtime"],
+} satisfies Record<string, string[]>;
+
+type SettingsView = keyof typeof SETTINGS_RESOURCES;
+
+async function scopeServiceCredentials(deps: ApiCtx["deps"], targetScope: string) {
+ return Promise.all(
(deps.serviceCreds ? await deps.serviceCreds.listServiceCredentials(targetScope) : []).map(async (c) => {
- const usage = (await deps.credentialUsage?.list({ slug: c.slug, limit: 5000 })) ?? [];
+ const [usage, grants] = await Promise.all([
+ deps.credentialUsage?.list({ slug: c.slug, limit: 5000 }) ?? [],
+ deps.acl?.grantsFor(targetScope, encodeRef(serviceCredRef(c.slug))) ?? [],
+ ]);
const successful = usage.filter((u) => u.status === "ok");
return {
...c,
- grantees: deps.acl
- ? (await deps.acl.grantsFor(targetScope, encodeRef(serviceCredRef(c.slug)))).map((g) => g.granteeScopeId)
- : [],
+ grantees: grants.map((g) => g.granteeScopeId),
usageCount: successful.length,
usageTruncated: usage.length === 5000,
usageSince: successful.length ? Math.min(...successful.map((u) => u.ts)) : null,
@@ -266,11 +300,9 @@ export async function getScopeConfig(ctx: ApiCtx): Promise<void> {
};
}),
);
- const values: Record<string, unknown> = {};
- for (const r of ADMIN_RESOURCES) {
- if (r.readKey && r.get) values[r.readKey] = await r.get(deps, targetScope);
- }
- values.sharingPostureOverride = await deps.config.getSharingPostureOwnDurable(targetScope);
+}
+
+async function scopeEgress(deps: ApiCtx["deps"], targetScope: string) {
const scopeProfile = (await deps.sandbox?.profileFor?.(targetScope)) ?? deps.sandbox?.profile;
const declaredEgress =
scopeProfile?.egressEnforcement ?? deps.egressDeclaredEnforcement ?? deps.egressEnforcement ?? "none";
@@ -279,8 +311,8 @@ export async function getScopeConfig(ctx: ApiCtx): Promise<void> {
let egressReason = "ready";
if (declaredEgress !== "domain") egressReason = "backend_unsupported";
else if (effectiveEgressFidelity !== "domain") egressReason = "control_plane_unconfigured";
- const orgEgress = deps.config.getEgress(orgScope(deps));
- const targetEgress = deps.config.getEgress(targetScope);
+ const orgEgress = deps.config!.getEgress(orgScope(deps));
+ const targetEgress = deps.config!.getEgress(targetScope);
const effectiveEgressPolicy = {
deniedHosts: [...new Set([...(orgEgress?.deniedHosts ?? []), ...(targetEgress?.deniedHosts ?? [])])],
allowedHosts: [] as string[],
@@ -288,40 +320,58 @@ export async function getScopeConfig(ctx: ApiCtx): Promise<void> {
effectiveEgressPolicy.allowedHosts = [
...new Set([...(orgEgress?.allowedHosts ?? []), ...(targetEgress?.allowedHosts ?? [])]),
].filter((host) => !isHostDenied(host, effectiveEgressPolicy.deniedHosts));
+ return {
+ egressEnforcement: {
+ backend: scopeProfile?.backend ?? deps.sandboxBackend ?? "unknown",
+ declaredFidelity: declaredEgress,
+ effectiveFidelity: effectiveEgressFidelity,
+ fidelity: effectiveEgressFidelity,
+ active: effectiveEgressFidelity === "domain",
+ reason: egressReason,
+ },
+ egressEffective: effectiveEgressPolicy,
+ };
+}
+
+async function scopeModelOptions(deps: ApiCtx["deps"], values: Record<string, unknown>, nonblocking: boolean) {
const configuredKeys = deps.providerKeys ?? ALL_PROVIDERS_AVAILABLE;
const managedKeys = deps.modelCredentials ? await deps.modelCredentials.availability() : configuredKeys;
const providersFor = (harnessId: string) => modelProviderAvailabilityFor(harnessId, configuredKeys, managedKeys);
+ const cached =
+ deps.modelCredentials && managedKeys.openrouter && nonblocking
+ ? cachedModelCatalog(deps.modelCredentialFetch)
+ : undefined;
const catalog =
- deps.modelCredentials && managedKeys.openrouter
+ cached?.models ??
+ (deps.modelCredentials && managedKeys.openrouter
? await selectableModelCatalog(deps.modelCredentialFetch)
- : builtInModelCatalog();
+ : builtInModelCatalog());
const runtime = values.runtime as { harnessId?: unknown; modelId?: unknown } | null | undefined;
- const approvedHarnesses = (await deps.config.getApprovedHarnessesDurable()) ?? [deps.harnessId ?? "pi"];
- const resolvedCurrent = runtime && typeof runtime.modelId === "string" ? resolveModel(runtime.modelId) : null;
- const currentProvider = resolvedCurrent?.provider;
- const currentModel =
- runtime &&
- typeof runtime.modelId === "string" &&
- (currentProvider === "anthropic" || currentProvider === "openai" || currentProvider === "openrouter")
- ? ({ id: runtime.modelId, name: resolvedCurrent!.name, provider: currentProvider } satisfies ModelCatalogEntry)
- : null;
+ const approvedHarnesses = (await deps.config!.getApprovedHarnessesDurable()) ?? [deps.harnessId ?? "pi"];
+ let currentId = defaultModelForHarness(deps.harnessId ?? "pi", deps.baseModelDefault);
+ if (typeof values.baseModel === "string") currentId = values.baseModel;
+ if (typeof runtime?.modelId === "string") currentId = runtime.modelId;
+ const currentHarness = typeof runtime?.harnessId === "string" ? runtime.harnessId : (deps.harnessId ?? "pi");
+ const resolvedCurrent = resolveModel(currentId);
+ const preserveCurrent =
+ typeof runtime?.modelId === "string" || (nonblocking && !resolvedCurrent && currentId.includes("/"));
+ const currentModel: ModelCatalogEntry = {
+ id: currentId,
+ name: resolvedCurrent?.name ?? currentId + " (configured)",
+ provider: resolvedCurrent?.provider ?? (currentId.includes("/") ? "openrouter" : ""),
+ };
const modelsFor = (harnessId: string) => {
const models = selectableCatalogForHarness(catalog, harnessId);
- if (currentModel && runtime?.harnessId === harnessId && !models.some((model) => model.id === currentModel.id))
+ if (preserveCurrent && currentHarness === harnessId && !models.some((model) => model.id === currentModel.id))
models.push(currentModel);
return models.filter(
(model) =>
modelServiceable(model.id, providersFor(harnessId)) ||
- (runtime?.harnessId === harnessId && currentModel?.id === model.id),
+ (preserveCurrent && currentHarness === harnessId && currentModel.id === model.id),
);
};
- return sendJson(res, 200, {
- scopeId: targetScope,
- ...environmentMetadata,
- ...values,
- soulVersion: deps.config.soulVersion(targetScope),
- soulHistory: deps.config.soulHistory(targetScope),
- directoryMembers: parseScopeId(targetScope).kind === "org" ? ((await deps.directory?.list()) ?? []) : [],
+ return {
+ ...(cached?.refreshing ? { modelCatalogRefreshing: true } : {}),
baseModelDefault: defaultModelForHarness(deps.harnessId ?? "pi", deps.baseModelDefault),
baseModelOptions: modelsFor(deps.harnessId ?? "pi"),
harnessDefault: deps.harnessId ?? "pi",
@@ -338,16 +388,95 @@ export async function getScopeConfig(ctx: ApiCtx): Promise<void> {
browseModelOptions: selectableBaseModels().filter((m) =>
modelServiceable(m.id, providersFor(deps.harnessId ?? "pi")),
),
- egressEnforcement: {
- backend: scopeProfile?.backend ?? deps.sandboxBackend ?? "unknown",
- declaredFidelity: declaredEgress,
- effectiveFidelity: effectiveEgressFidelity,
- fidelity: effectiveEgressFidelity,
- active: effectiveEgressFidelity === "domain",
- reason: egressReason,
- },
- egressEffective: effectiveEgressPolicy,
+ };
+}
+
+export async function getScopeConfig(ctx: ApiCtx): Promise<void> {
+ const { res, deps, params, url } = ctx;
+ if (!deps.config) return sendJson(res, 404, { error: "not_found" });
+ const targetScope = params.scope!;
+ if (!targetScope || targetScope.includes("/")) return sendJson(res, 404, { error: "not_found" });
+ const requestedView = url.searchParams.get("view");
+ if (requestedView !== null && !Object.hasOwn(SETTINGS_RESOURCES, requestedView))
+ return sendJson(res, 400, { error: "bad_request", message: "Unknown settings view" });
+ const started = performance.now();
+ const timings: Record<string, number> = {};
+ const read = async <T>(name: string, load: () => T | Promise<T>): Promise<T> => {
+ const start = performance.now();
+ try {
+ return await load();
+ } finally {
+ timings[name] = performance.now() - start;
+ }
+ };
+ const actor = await read("authorize", () => authorizeAdmin(ctx, targetScope));
+ if (!actor) return;
+ const view = requestedView as SettingsView | null;
+ const includes = (...views: SettingsView[]) => view === null || views.includes(view);
+ const needsModels = includes("models", "governance", "onboarding");
+ const needsConfig = view !== "credentials" && view !== "connectors";
+ await Promise.all([
+ needsConfig ? read("config", () => deps.config!.refreshScope(targetScope)) : undefined,
+ needsModels ? read("modelRegistry", () => deps.refreshModels?.()) : undefined,
+ ]);
+ audit(deps, { principalId: actor.id, action: "config.read", resource: "config", scopeLabel: targetScope });
+ const selectedKeys: readonly string[] | undefined = view === null ? undefined : SETTINGS_RESOURCES[view];
+ const resources = ADMIN_RESOURCES.filter(
+ (r) => r.readKey && r.get && (!selectedKeys || selectedKeys.includes(r.readKey)),
+ );
+ const [
+ entries,
+ environmentMetadata,
serviceCredentials,
+ directoryMembers,
+ directoryChannels,
+ sharingPostureOverride,
+ egress,
+ ] = await Promise.all([
+ Promise.all(
+ resources.map(async (r) => [r.readKey!, await read(r.readKey!, () => r.get!(deps, targetScope))] as const),
+ ),
+ view === "connectors" ? {} : read("environment", () => scopeEnvironmentMetadata(deps, targetScope)),
+ includes("credentials") ? read("credentials", () => scopeServiceCredentials(deps, targetScope)) : undefined,
+ includes("credentials") && parseScopeId(targetScope).kind === "org"
+ ? read("people", () => deps.directory?.list())
+ : undefined,
+ includes("credentials") && parseScopeId(targetScope).kind === "org"
+ ? read("channels", () => deps.directory?.listChannels?.())
+ : undefined,
+ includes("governance") ? deps.config.getSharingPostureOwnDurable(targetScope) : undefined,
+ includes("governance") ? scopeEgress(deps, targetScope) : undefined,
+ ]);
+ const values = Object.fromEntries(entries);
+ const modelOptions = needsModels
+ ? await read("modelOptions", () =>
+ scopeModelOptions(deps, values, view !== null && url.searchParams.get("catalog") !== "refresh"),
+ )
+ : undefined;
+ res.setHeader(
+ "server-timing",
+ Object.entries(timings)
+ .map(([name, duration]) => `${name};dur=${duration.toFixed(1)}`)
+ .join(", "),
+ );
+ const elapsed = performance.now() - started;
+ if (view && url.searchParams.get("catalog") !== "refresh" && elapsed > 500)
+ console.warn(
+ "[admin-settings] load budget exceeded",
+ JSON.stringify({ view, durationMs: Math.round(elapsed), timings }),
+ );
+ return sendJson(res, 200, {
+ scopeId: targetScope,
+ ...environmentMetadata,
+ ...values,
+ ...(includes("customize")
+ ? { soulVersion: deps.config.soulVersion(targetScope), soulHistory: deps.config.soulHistory(targetScope) }
+ : {}),
+ ...(includes("credentials")
+ ? { serviceCredentials, directoryMembers: directoryMembers ?? [], directoryChannels: directoryChannels ?? [] }
+ : {}),
+ ...(includes("governance") ? { sharingPostureOverride, ...egress } : {}),
+ ...modelOptions,
});
}
diff --git a/src/api/routes/admin/users.ts b/src/api/routes/admin/users.ts
index a4f3d8ce5..724c6e447 100644
--- a/src/api/routes/admin/users.ts
+++ b/src/api/routes/admin/users.ts
@@ -238,6 +238,17 @@ export async function listKeychainStatus(ctx: ApiCtx): Promise<void> {
if (!deps.keychain)
return sendJson(res, 200, { scopeId: scope, people: [], credentials: [], grants: [], asks: [], enabled: false });
+ if (ctx.url.searchParams.get("summary") === "1") {
+ const [credentials, grants] = await Promise.all([deps.keychain.listAllMetadata(), deps.keychain.listGrants({})]);
+ return sendJson(res, 200, {
+ users: new Set(credentials.map((credential) => credential.ownerId)).size,
+ standing: grants.filter(
+ (grant) =>
+ grant.mode === "standing" && grant.status === "active" && (!grant.expiresAt || grant.expiresAt > Date.now()),
+ ).length,
+ });
+ }
+
const [credentials, grants, asks, participantIds, adminGrants] = await Promise.all([
deps.keychain.listAllMetadata(),
deps.keychain.listGrants({}),
diff --git a/src/model/model-catalog.ts b/src/model/model-catalog.ts
index dde58971f..c4fd2a8f7 100644
--- a/src/model/model-catalog.ts
+++ b/src/model/model-catalog.ts
@@ -208,3 +208,17 @@ export function selectableCatalogForHarness(
modelSupportedByHarness(model.id, harness),
);
}
+
+export function cachedModelCatalog(fetcher: typeof fetch = fetch): {
+ models: ModelCatalogEntry[];
+ refreshing: boolean;
+} {
+ void selectableModelCatalog(fetcher);
+ const models = builtInModelCatalog();
+ const known = new Set(models.map((model) => model.id));
+ const entry = cache.get(fetcher);
+ return {
+ models: [...models, ...(entry?.dynamic ?? []).filter((model) => !known.has(model.id))],
+ refreshing: !!entry?.inFlight,
+ };
+}
diff --git a/test/admin-keychain.test.ts b/test/admin-keychain.test.ts
index 7cd4c786c..d584dccb3 100644
--- a/test/admin-keychain.test.ts
+++ b/test/admin-keychain.test.ts
@@ -93,3 +93,37 @@ test("/v1/admin/keychain returns metadata, grants, and asks without secrets; non
await s.close();
}
});
+
+test("credentials-page summary avoids unrelated history and exposes counts only", async (t) => {
+ const s = start();
+ t.after(s.close);
+ const credential = await s.keychain.save({
+ ownerId: "U1",
+ service: "github",
+ secret: "summary-test-secret",
+ envKey: "GITHUB_TOKEN",
+ accountLabel: "test",
+ });
+ await s.keychain.createGrant({
+ credentialId: credential.id,
+ ownerId: "U1",
+ audienceScopeId: scopeId("channel", "C1"),
+ mode: "standing",
+ purpose: "test",
+ });
+ const fail = () => {
+ throw new Error("Summary must not scan unrelated data");
+ };
+ t.mock.method(s.keychain, "listAsks", fail);
+ t.mock.method(s.built.sessions, "distinctParticipants", fail);
+ t.mock.method(s.built.app, "directoryMembers", fail);
+ const response = await fetch(s.base + "/v1/admin/keychain?summary=1", {
+ headers: { "x-admin-actor": "admin-alice@default-org" },
+ });
+ assert.equal(response.status, 200);
+ assert.deepEqual(await response.json(), { users: 1, standing: 1 });
+ const denied = await fetch(s.base + "/v1/admin/keychain?summary=1", {
+ headers: { "x-admin-actor": "nobody@default-org" },
+ });
+ assert.equal(denied.status, 403);
+});
diff --git a/test/admin-settings-load.test.ts b/test/admin-settings-load.test.ts
new file mode 100644
index 000000000..477ffe93e
--- /dev/null
+++ b/test/admin-settings-load.test.ts
@@ -0,0 +1,188 @@
+import "./support/auto-fake-sprites.ts";
+import assert from "node:assert/strict";
+import { test } from "node:test";
+import type { AddressInfo } from "node:net";
+import { setTimeout as delay } from "node:timers/promises";
+import { buildApp, serverDeps } from "../src/wiring.ts";
+import { createInsecureTestServer } from "../src/api/server.ts";
+import type { ServerDeps } from "../src/api/deps.ts";
+import { testConfig } from "./support/test-config.ts";
+import { cachedModelCatalog, selectableModelCatalog } from "../src/model/model-catalog.ts";
+
+const ADMIN = { "x-admin-actor": "admin-alice@default-org" };
+
+function start(overrides: Partial<ServerDeps> = {}) {
+ const config = testConfig();
+ const built = buildApp(config);
+ const deps = { ...serverDeps(config, built), ...overrides };
+ const server = createInsecureTestServer(built.app, deps);
+ server.listen(0);
+ const base = `http://localhost:${(server.address() as AddressInfo).port}`;
+ return { built, deps, base, close: () => new Promise<void>((resolve) => server.close(() => resolve())) };
+}
+
+const scopePath = "/v1/admin/scopes/org%3Adefault-org";
+
+test("settings projections preserve values while excluding unrelated payloads", async (t) => {
+ const srv = start();
+ t.after(srv.close);
+ srv.built.config.setBranding("org:default-org", { selfLabel: "Test assistant", accent: "#445566" });
+ await srv.built.config.setTurnWallClockSec("org:default-org", 120);
+ await srv.built.config.flushScope("org:default-org");
+ await srv.built.directory.replaceChannels([{ channelId: "C-settings", name: "settings-test" }]);
+ const full = (await (await fetch(srv.base + scopePath, { headers: ADMIN })).json()) as Record<string, unknown>;
+ for (const view of ["customize", "governance", "models", "credentials", "connectors", "onboarding"]) {
+ const response = await fetch(srv.base + scopePath + "?view=" + view, { headers: ADMIN });
+ assert.equal(response.status, 200, view);
+ const projected = (await response.json()) as Record<string, unknown> & { branding: { selfLabel: string } };
+ for (const [key, value] of Object.entries(projected)) assert.deepEqual(value, full[key], view + ":" + key);
+ if (view !== "credentials") assert.equal("serviceCredentials" in projected, false, view);
+ else assert.deepEqual(projected.directoryChannels, [{ channelId: "C-settings", name: "settings-test" }]);
+ assert.match(response.headers.get("server-timing") ?? "", /authorize;dur=/);
+ if (["customize", "credentials", "connectors"].includes(view))
+ assert.equal("modelsByHarness" in projected, false, view);
+ if (view === "customize") {
+ assert.equal(projected.branding.selfLabel, "Test assistant");
+ assert.equal(projected.turnWallClockSec, 120);
+ assert.equal("soulHistory" in projected, true);
+ assert.equal("connectors" in projected, false);
+ }
+ }
+});
+
+test("Customize completes within 500 ms with unrelated model and credential services unavailable", async (t) => {
+ const fail = () => {
+ throw new Error("Unrelated dependency must not be called");
+ };
+ const srv = start({ refreshModels: fail, modelCredentialFetch: fail });
+ t.after(srv.close);
+ t.mock.method(srv.built.serviceCreds, "listServiceCredentials", fail);
+ t.mock.method(srv.built.config, "listConnectorClients", fail);
+ t.mock.method(srv.built.config, "getSecurityPostureDurable", fail);
+ const started = performance.now();
+ const response = await fetch(srv.base + scopePath + "?view=customize", { headers: ADMIN });
+ assert.equal(response.status, 200);
+ assert.equal(typeof ((await response.json()) as { soul: string }).soul, "string");
+ assert.ok(performance.now() - started < 500);
+});
+
+test("independent governance reads overlap rather than accumulating network round trips", async (t) => {
+ const srv = start();
+ t.after(srv.close);
+ const reads = [
+ "getSecurityPostureDurable",
+ "getSharingPostureDurable",
+ "getSharingPostureOwnDurable",
+ "getApprovalGrantModesDurable",
+ ] as const;
+ let active = 0;
+ let maxActive = 0;
+ for (const name of reads) {
+ const original = srv.built.config[name].bind(srv.built.config);
+ t.mock.method(srv.built.config, name, async (scope: string) => {
+ active++;
+ maxActive = Math.max(active, maxActive);
+ await delay(100);
+ active--;
+ return original(scope);
+ });
+ }
+ const started = performance.now();
+ const response = await fetch(srv.base + scopePath + "?view=governance", { headers: ADMIN });
+ assert.equal(response.status, 200);
+ await response.json();
+ assert.equal(maxActive, reads.length);
+ assert.ok(performance.now() - started < 500);
+});
+
+test("each settings projection retains authorization before reading configuration", async (t) => {
+ let reads = 0;
+ const srv = start({
+ refreshModels: async () => {
+ reads++;
+ },
+ });
+ t.after(srv.close);
+ t.mock.method(srv.built.config, "refreshScope", async () => {
+ reads++;
+ });
+ for (const view of ["customize", "governance", "models", "credentials", "connectors", "onboarding"]) {
+ const response = await fetch(srv.base + scopePath + "?view=" + view, {
+ headers: { "x-admin-actor": "nobody@default-org" },
+ });
+ assert.equal(response.status, 403);
+ }
+ assert.equal(reads, 0);
+ assert.equal((await fetch(srv.base + scopePath + "?view=toString", { headers: ADMIN })).status, 400);
+});
+
+test("Models settings do not wait for a cold external model catalog", async (t) => {
+ const pending = Promise.withResolvers<Response>();
+ const fetcher: typeof fetch = () => pending.promise;
+ const srv = start({ modelCredentialFetch: fetcher });
+ t.after(srv.close);
+ t.after(() => pending.resolve(Response.json({ data: [] })));
+ t.mock.method(srv.built.modelCredentials, "availability", async () => ({
+ anthropic: true,
+ openai: true,
+ openrouter: true,
+ }));
+ await srv.built.config.setRuntimeSelectionLatest("org:default-org", {
+ harnessId: "pi",
+ modelId: "settings/previously-saved-model",
+ });
+ const started = performance.now();
+ const response = await fetch(srv.base + scopePath + "?view=models", {
+ headers: ADMIN,
+ signal: AbortSignal.timeout(500),
+ });
+ assert.equal(response.status, 200);
+ const body = (await response.json()) as {
+ baseModelOptions: { id: string }[];
+ modelsByHarness: Record<string, { id: string }[]>;
+ runtime: { modelId: string };
+ modelCatalogRefreshing: boolean;
+ };
+ assert.ok(body.baseModelOptions.length > 0);
+ assert.equal(body.runtime.modelId, "settings/previously-saved-model");
+ assert.ok(body.modelsByHarness.pi!.some((model) => model.id === body.runtime.modelId));
+ assert.equal(body.modelCatalogRefreshing, true);
+ assert.ok(performance.now() - started < 500);
+});
+
+test("cached model catalogs refresh in the background and retain dynamic entries after expiry", async (t) => {
+ let requests = 0;
+ let release = Promise.withResolvers<Response>();
+ const fetcher: typeof fetch = () => {
+ requests++;
+ return release.promise;
+ };
+ assert.ok(cachedModelCatalog(fetcher).models.length > 0);
+ assert.ok(cachedModelCatalog(fetcher).models.length > 0);
+ assert.equal(requests, 1);
+ release.resolve(
+ Response.json({
+ data: [
+ {
+ id: "testing/settings-fast",
+ name: "Settings test",
+ context_length: 8192,
+ pricing: { prompt: "0", completion: "0" },
+ top_provider: { max_completion_tokens: 1024 },
+ architecture: { input_modalities: ["text"] },
+ supported_parameters: ["tools"],
+ },
+ ],
+ }),
+ );
+ await selectableModelCatalog(fetcher);
+ assert.ok(cachedModelCatalog(fetcher).models.some((m) => m.id === "testing/settings-fast"));
+ const later = Date.now() + 6 * 60_000;
+ t.mock.method(Date, "now", () => later);
+ release = Promise.withResolvers<Response>();
+ assert.ok(cachedModelCatalog(fetcher).models.some((m) => m.id === "testing/settings-fast"));
+ assert.equal(requests, 2);
+ release.reject(new Error("Catalog offline"));
+ await selectableModelCatalog(fetcher);
+ assert.ok(cachedModelCatalog(fetcher).models.some((m) => m.id === "testing/settings-fast"));
+});