Skip to content

armgit / qm

Public Imported from GitHub
0

Multiplayer agent harness for work.

Remove internal member overrides (#2567)

Regan Bell3eacf780ddcf
diff --git a/plugins/admin/public/index.html b/plugins/admin/public/index.html
index deca451b3..f70d522ef 100644
--- a/plugins/admin/public/index.html
+++ b/plugins/admin/public/index.html
@@ -5118,12 +5118,6 @@
opacity: 0.45;
cursor: default;
}
- #view-governance #internal-member-overrides {
- overflow-x: hidden;
- overflow-y: auto;
- white-space: pre-wrap;
- overflow-wrap: anywhere;
- }
body[data-subview="credentials"] #view-governance section.card.sv-credentials {
display: block;
@@ -6500,7 +6494,6 @@
<template data-governance-card="card-sharing-posture"></template>
<template data-governance-card="card-egress"></template>
<template data-integrations-card="card-external-slack"></template>
- <template data-integrations-card="card-internal-member-overrides"></template>
<template data-integrations-card="card-channel-header-pin-default"></template>
<template data-integrations-card="card-ack-emoji"></template>
<div class="governance-group" id="governance-intelligence">
@@ -6648,7 +6641,6 @@
$("card-sharing-posture"),
governanceAmbient,
$("card-external-slack"),
- $("card-internal-member-overrides"),
$("card-command-policy"),
$("card-egress"),
].forEach((card) => content.appendChild(card));
@@ -6670,13 +6662,9 @@
builtIns.innerHTML =
'<div class="head"><h2>Built-in connectors</h2></div><div class="body" id="built-in-connectors">Loading connectors…</div>';
$("card-slack-installation").classList.add("sv-slack-settings");
- [
- "card-slack-installation",
- "card-external-slack",
- "card-internal-member-overrides",
- "card-channel-header-pin-default",
- "card-ack-emoji",
- ].forEach((id) => content.appendChild($(id)));
+ ["card-slack-installation", "card-external-slack", "card-channel-header-pin-default", "card-ack-emoji"].forEach(
+ (id) => content.appendChild($(id)),
+ );
connectorView.appendChild(builtIns);
document.querySelectorAll("#view-governance section.card > .foot > .viewlink").forEach((link) => {
link.closest("section.card").querySelector(":scope > .head").appendChild(link);
@@ -8506,7 +8494,6 @@
"ambient-policy": "st-ambient-policy",
egress: "st-egress",
"external-slack-participants": "st-external-slack-participants",
- "internal-member-overrides": "st-internal-member-overrides",
"org-ambient": "st-governance-org-ambient",
"channel-header-pin-default": "st-channel-header-pin-default",
runtime: "st-runtime",
@@ -8519,7 +8506,6 @@
branding: "st-branding",
};
const SAVE_RELOADS = new Set([
- "internal-member-overrides",
"auto-flagger",
"soul",
"external-slack-participants",
@@ -8651,32 +8637,6 @@
danger: !!body.on,
});
}
- if (key === "internal-member-overrides") {
- const norm = (list) => [
- ...new Set((Array.isArray(list) ? list : []).map((m) => String(m).trim().toLowerCase()).filter(Boolean)),
- ];
- const before = norm(JSON.parse(sectionSnapshots.get(key) || "{}").members);
- const after = norm(body.members);
- const added = after.filter((m) => !before.includes(m));
- const removed = before.filter((m) => !after.includes(m));
- if (!added.length && !removed.length) return Promise.resolve(true);
- const show = (list) => (list.length ? list.join(", ") : "none");
- return reviewGovernanceChange({
- title: "Change internal member overrides?",
- subtitle: "These users count as internal members throughout the organization, not just for mentions.",
- facts: [
- ["Scope", governanceScopeName()],
- ["Adding", show(added)],
- ["Removing", show(removed)],
- ["Total after", String(after.length)],
- ],
- warning: added.length
- ? "These users receive internal-member access. Rooms containing only internal members may use organization credentials, and replies are visible to everyone there. Only add trusted colleagues."
- : "Removed users without another source of internal membership return to external treatment after the directory refreshes.",
- confirmLabel: "Apply overrides",
- danger: added.length > 0,
- });
- }
return Promise.resolve(true);
}
$("sharing-posture-inherit").onclick = async () => {
diff --git a/plugins/admin/test/integrations-lit.test.ts b/plugins/admin/test/integrations-lit.test.ts
index 62ad77ff3..ccbfeebee 100644
--- a/plugins/admin/test/integrations-lit.test.ts
+++ b/plugins/admin/test/integrations-lit.test.ts
@@ -3,7 +3,7 @@ import { readFileSync } from "node:fs";
import test from "node:test";
import { buildSync } from "esbuild";
import { JSDOM } from "jsdom";
-import { configure, ConnectorsState, SlackSetting, SlackInstallationState } from "../ui/integrations-state.ts";
+import { configure, ConnectorsState, SlackInstallationState } from "../ui/integrations-state.ts";
const bundle = buildSync({
entryPoints: [new URL("../ui/integrations.ts", import.meta.url).pathname],
bundle: true,
@@ -27,7 +27,7 @@ test("Slack settings are state driven and preserve newer drafts when committing"
const dom = setup();
try {
dom.window.eval(
- 'ui.loadScope({externalSlackParticipants:false,internalMemberOverrides:[],channelHeaderPinDefault:false,ackEmoji:[]},"org:test")',
+ 'ui.loadScope({externalSlackParticipants:false,channelHeaderPinDefault:false,ackEmoji:[]},"org:test")',
);
const doc = dom.window.document;
const radio = doc.querySelector<HTMLInputElement>('[name="external-slack-choice"][value="on"]')!;
@@ -43,13 +43,6 @@ test("Slack settings are state driven and preserve newer drafts when committing"
dom.window.close();
}
});
-test("Slack member overrides normalize from the draft and update the count", () => {
- const s = new SlackSetting("internal-member-overrides");
- s.load([], "org:test", true);
- s.change({ text: " [email protected],[email protected]\n U123 " });
- assert.deepEqual(s.collect(), { members: ["[email protected]", "u123"] });
- assert.equal(s.dirty, true);
-});
test("Connector editor renders guides and keeps fields and focus stable while typing", () => {
const dom = setup();
try {
diff --git a/plugins/admin/test/internal-member-overrides.test.ts b/plugins/admin/test/internal-member-overrides.test.ts
deleted file mode 100644
index 43de06ed8..000000000
--- a/plugins/admin/test/internal-member-overrides.test.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-import test from "node:test";
-import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-import vm from "node:vm";
-import { readAdminSource } from "./admin-source.ts";
-import { loadScope, states, SlackSetting } from "../ui/integrations-state.ts";
-import { createServer, type IncomingMessage } from "node:http";
-import type { AddressInfo } from "node:net";
-
-const calls: { method: string; url: string; body: string; actor: string | null; signed: boolean }[] = [];
-const core = createServer((req: IncomingMessage, res) => {
- let body = "";
- req.on("data", (c) => (body += c));
- req.on("end", () => {
- calls.push({
- method: req.method ?? "",
- url: req.url ?? "",
- body,
- actor: (req.headers["x-admin-actor"] as string) ?? null,
- signed: Boolean(req.headers["x-timestamp"] && req.headers["x-signature"]),
- });
- const denied = req.headers["x-admin-actor"] === "U-member@acme";
- res.writeHead(denied ? 403 : 200, { "content-type": "application/json" });
- res.end(JSON.stringify(denied ? { error: "admin_required" } : { ok: true }));
- });
-});
-await new Promise<void>((r) => core.listen(0, r));
-process.env.CORE_API_URL = `http://localhost:${(core.address() as AddressInfo).port}`;
-process.env.CORE_SIGNING_SECRET = "admin-overrides-proxy-secret";
-
-const { server } = await import("../src/index.ts");
-await new Promise<void>((r) => server.listen(0, r));
-const base = `http://localhost:${(server.address() as AddressInfo).port}`;
-test.after(() => {
- server.close();
- core.close();
-});
-
-test("the org page ships an Internal member overrides card wired to the save machinery", () => {
- const shell = readAdminSource();
- assert.match(shell, /id="card-internal-member-overrides"/, "card exists");
- assert.match(shell, /<textarea[^>]*id="internal-member-overrides"/, "one-per-line textarea");
- assert.match(shell, /data-save="internal-member-overrides"/, "save button keyed to the core resource id");
- assert.match(shell, /governanceUI.integrations.loadScope/, "loads through the reactive scope model");
- assert.match(shell, /"internal-member-overrides": "st-internal-member-overrides"/, "status target registered");
- assert.match(shell, /key === "internal-member-overrides"/, "changes go through the governance review dialog");
-});
-
-test("PUT /api/scopes/org:acme/internal-member-overrides forwards the members body to core", async () => {
- const r = await fetch(`${base}/api/scopes/${encodeURIComponent("org:acme")}/internal-member-overrides`, {
- method: "PUT",
- headers: { cookie: "admin=U-admin", "content-type": "application/json" },
- body: JSON.stringify({ members: ["[email protected]", "U123ABC"] }),
- });
- assert.equal(r.status, 200);
- const c = calls.at(-1)!;
- assert.equal(c.actor, "U-admin@acme");
- assert.equal(c.signed, true);
- assert.equal(c.method, "PUT");
- assert.equal(c.url, "/v1/admin/scopes/org%3Aacme/internal-member-overrides");
- assert.deepEqual(JSON.parse(c.body), { members: ["[email protected]", "U123ABC"] });
-});
-
-const shell = readFileSync(new URL("../public/index.html", import.meta.url), "utf8");
-function slice(from: string, to: string) {
- const start = shell.indexOf(from);
- const end = shell.indexOf(to, start);
- assert.ok(start >= 0 && end > start, `could not extract ${from}`);
- return shell.slice(start, end);
-}
-
-test("signed-out writes never reach core; core admin denials are preserved", async () => {
- const url = `${base}/api/scopes/org%3Aacme/internal-member-overrides`;
- const count = calls.length;
- const signedOut = await fetch(url, { method: "PUT", body: JSON.stringify({ members: [] }) });
- assert.equal(signedOut.status, 401);
- assert.equal(calls.length, count);
- const denied = await fetch(url, {
- method: "PUT",
- headers: { cookie: "admin=U-member", "content-type": "application/json" },
- body: JSON.stringify({ members: [] }),
- });
- assert.equal(denied.status, 403);
- assert.deepEqual(await denied.json(), { error: "admin_required" });
-});
-
-test("the proxy supports clearing the entire override list", async () => {
- const response = await fetch(`${base}/api/scopes/org%3Aacme/internal-member-overrides`, {
- method: "PUT",
- headers: { cookie: "admin=U-admin", "content-type": "application/json" },
- body: JSON.stringify({ members: [] }),
- });
- assert.equal(response.status, 200);
- assert.deepEqual(JSON.parse(calls.at(-1)!.body), { members: [] });
-});
-
-test("editor is visible only for org payloads that support overrides", () => {
- for (const [scope, data, hidden, value, count] of [
- ["org:acme", { internalMemberOverrides: [] }, false, "", "No overrides configured."],
- ["org:acme", { internalMemberOverrides: ["u123abc"] }, false, "u123abc", "1 override"],
- [
- "org:acme",
- { internalMemberOverrides: ["u123abc", "[email protected]"] },
- false,
- "u123abc\[email protected]",
- "2 overrides",
- ],
- ["org:acme", {}, true, "", ""],
- ["personal:demo", { internalMemberOverrides: ["u123abc"] }, true, "", ""],
- ["channel:test", { internalMemberOverrides: [] }, true, "", ""],
- ] as const) {
- loadScope(data, scope);
- const state = states.get("internal-member-overrides")!;
- assert.equal(!state.available, hidden);
- if (!hidden) {
- assert.equal(state.draft.text, value);
- assert.equal(state.collect().members?.length || 0, count === "No overrides configured." ? 0 : parseInt(count));
- }
- }
-});
-
-test("collector trims, lowercases, deduplicates and supports clearing", () => {
- for (const [value, expected] of [
- [" [email protected] , U123ABC\r\[email protected]\n", ["[email protected]", "u123abc"]],
- [" ,\n ", []],
- ] as const) {
- const state = new SlackSetting("internal-member-overrides");
- state.change({ text: value });
- assert.deepEqual(state.collect(), { members: expected });
- }
-});
-
-test("confirmation shows added/removed members, unique total, and returns the user's decision", async () => {
- const review = slice(" function governanceSaveReview(", ' $("sharing-posture-inherit").onclick');
- for (const accepted of [false, true]) {
- let shown: { facts: [string, string][]; warning: string; danger: boolean } | undefined;
- const result = await vm.runInNewContext(
- review + '\ngovernanceSaveReview("internal-member-overrides", {members:["[email protected]", "[email protected]"]})',
- {
- sectionSnapshots: new Map([["internal-member-overrides", JSON.stringify({ members: ["[email protected]"] })]]),
- governanceScopeName: () => "Acme",
- reviewGovernanceChange: (options: typeof shown) => {
- shown = options;
- return Promise.resolve(accepted);
- },
- },
- );
- assert.equal(result, accepted);
- assert.ok(shown);
- assert.deepEqual(JSON.parse(JSON.stringify(shown.facts)), [
- ["Scope", "Acme"],
- ["Adding", "[email protected]"],
- ["Removing", "[email protected]"],
- ["Total after", "1"],
- ]);
- assert.equal(shown.danger, true);
- assert.match(shown.warning, /internal-member access/);
- }
-});
-
-test("clearing reviews removals, while a normalized unchanged list needs no review", async () => {
- const review = slice(" function governanceSaveReview(", ' $("sharing-posture-inherit").onclick');
- let reviews = 0;
- const context = vm.createContext({
- sectionSnapshots: new Map([["internal-member-overrides", JSON.stringify({ members: ["[email protected]"] })]]),
- governanceScopeName: () => "Acme",
- reviewGovernanceChange: (options: { danger: boolean; facts: [string, string][] }) => {
- reviews++;
- assert.equal(options.danger, false);
- assert.equal(options.facts.find(([key]) => key === "Total after")?.[1], "0");
- return Promise.resolve(true);
- },
- });
- vm.runInContext(review, context);
- assert.equal(
- await vm.runInContext(
- 'governanceSaveReview("internal-member-overrides", {members:[" [email protected] "]})',
- context,
- ),
- true,
- );
- assert.equal(reviews, 0);
- assert.equal(await vm.runInContext('governanceSaveReview("internal-member-overrides", {members:[]})', context), true);
- assert.equal(reviews, 1);
-});
diff --git a/plugins/admin/ui/integrations-state.ts b/plugins/admin/ui/integrations-state.ts
index 56b371474..3c26f15f3 100644
--- a/plugins/admin/ui/integrations-state.ts
+++ b/plugins/admin/ui/integrations-state.ts
@@ -18,17 +18,6 @@ export function configure(value: Context) {
export class SlackSetting extends SettingState {
scope = "";
collect() {
- if (this.key === "internal-member-overrides")
- return {
- members: [
- ...new Set(
- String(this.draft.text || "")
- .split(/[\n,]/)
- .map((x) => x.trim().toLowerCase())
- .filter(Boolean),
- ),
- ],
- };
if (this.key === "ack-emoji") return { names: [...(this.draft.names || [])] };
return { on: !!this.draft.on };
}
@@ -40,7 +29,6 @@ export class SlackSetting extends SettingState {
this.scope = scope;
this.available = available;
this.draft = { on: !!value };
- if (this.key === "internal-member-overrides") this.draft = { text: (value || []).join("\n") };
if (this.key === "ack-emoji") this.draft = { names: [...(value || [])] };
this.baseline = JSON.stringify(this.collect());
this.message = "";
@@ -50,16 +38,12 @@ export class SlackSetting extends SettingState {
}
}
export const states = new Map(
- ["external-slack-participants", "internal-member-overrides", "channel-header-pin-default", "ack-emoji"].map((key) => [
- key,
- new SlackSetting(key),
- ]),
+ ["external-slack-participants", "channel-header-pin-default", "ack-emoji"].map((key) => [key, new SlackSetting(key)]),
);
export const { owns, collect, capture, commit, status, statusKey } = settingRegistry(states);
export function loadScope(data: any, scope: string) {
for (const [key, field] of Object.entries({
"external-slack-participants": "externalSlackParticipants",
- "internal-member-overrides": "internalMemberOverrides",
"channel-header-pin-default": "channelHeaderPinDefault",
"ack-emoji": "ackEmoji",
}))
diff --git a/plugins/admin/ui/integrations.ts b/plugins/admin/ui/integrations.ts
index db1b06f17..56093240b 100644
--- a/plugins/admin/ui/integrations.ts
+++ b/plugins/admin/ui/integrations.ts
@@ -66,38 +66,6 @@ cards["card-external-slack"] = () => {
${saveFooter(s, "Apply", !s.available)}
</section>`;
};
-cards["card-internal-member-overrides"] = () => {
- const s = states.get("internal-member-overrides")!;
- return html`<section
- class=${classMap({ card: true, "sv-slack-settings": true, "setting-row": true, hidden: !s.available, dirty: s.dirty })}
- id="card-internal-member-overrides"
- >
- <div class="head">
- <h2 id="internal-member-overrides-title">Internal member overrides</h2>
- <p id="internal-member-overrides-help">
- Treat listed Slack users as internal members, including guests and people missing from the directory. This
- grants internal-member access, not just permission to mention the agent. Rooms containing only internal members
- may use organization credentials. Add only trusted colleagues. Enter one Slack user ID or Slack-profile email
- per line (commas also accepted).
- </p>
- </div>
- <div class="body">
- <textarea
- id="internal-member-overrides"
- .value=${s.draft.text || ""}
- @input=${(e: Event) => s.change({ text: (e.target as HTMLTextAreaElement).value })}
- rows="4"
- aria-labelledby="internal-member-overrides-title"
- aria-describedby="internal-member-overrides-help internal-member-overrides-count"
- spellcheck="false"
- placeholder="[email protected]&#10;U0123ABCDE"
- style="width: 100%; max-width: 560px; font-family: var(--mono, monospace)"
- ></textarea>
- <small class="muted" id="internal-member-overrides-count">${overrideCount(s)}</small>
- </div>
- ${saveFooter(s, "Apply", !s.available)}
- </section>`;
-};
cards["card-channel-header-pin-default"] = () => {
const s = states.get("channel-header-pin-default")!;
return html`<section
@@ -426,10 +394,6 @@ cards["card-slack-installation"] = () => {
</div>
</section>`;
};
-function overrideCount(s: SlackSetting) {
- const n = s.collect().members!.length;
- return n ? n + " override" + (n === 1 ? "" : "s") : "No overrides configured.";
-}
function openConnector(connector?: Parameters<typeof connectors.edit>[0]) {
connectors.edit(connector);
document.getElementById("conn-client-id")?.focus();
@@ -598,7 +562,6 @@ export function mountCards() {
const key = (
{
"card-external-slack": "external-slack-participants",
- "card-internal-member-overrides": "internal-member-overrides",
"card-channel-header-pin-default": "channel-header-pin-default",
"card-ack-emoji": "ack-emoji",
} as Record<string, string>
diff --git a/src/api/routes/admin-resources.ts b/src/api/routes/admin-resources.ts
index a8a608151..182f89008 100644
--- a/src/api/routes/admin-resources.ts
+++ b/src/api/routes/admin-resources.ts
@@ -427,35 +427,6 @@ export const ADMIN_RESOURCES: readonly AdminResource[] = [
(deps, scope, on) => deps.config!.setExternalSlackParticipants(scope, on),
),
},
- {
- id: "internal-member-overrides",
- kind: "string-list",
- target: "org",
- clearable: true,
- label:
- "Members listed here (lowercased emails or Slack user ids) are treated as internal even if Slack marks them guest/restricted or the directory sync removed them; use it for contractor accounts that are genuinely internal.",
- readKey: "internalMemberOverrides",
- get: (deps) => deps.config!.getInternalMemberOverrides(),
- apply: async (ctx, actor, scope) => {
- const bad = orgOnly(scope, "internal member overrides are org-wide");
- if (bad) return bad;
- const raw = (ctx.body as { members?: unknown }).members;
- if (!Array.isArray(raw)) return { error: "internal-member-overrides requires { members: string[] }" };
- if (raw.length > 500) return { error: "internal-member-overrides accepts at most 500 entries" };
- if (raw.some((m) => typeof m !== "string" || !m.trim() || m.length > 320))
- return { error: "each member must be a non-empty string of at most 320 characters" };
- const before = ctx.deps.config!.getInternalMemberOverrides();
- await ctx.deps.config!.setInternalMemberOverrides(raw as string[]);
- const after = ctx.deps.config!.getInternalMemberOverrides();
- audit(ctx.deps, {
- principalId: actor.id,
- action: "identity.internal-override.update",
- resource: `${before.length}->${after.length}: ${after.join(", ")}`,
- scopeLabel: scope,
- });
- return { ok: true };
- },
- },
{
id: "channel-header-pin-default",
kind: "boolean",
diff --git a/src/api/routes/admin/scope-config.ts b/src/api/routes/admin/scope-config.ts
index b6cffb511..f80feae89 100644
--- a/src/api/routes/admin/scope-config.ts
+++ b/src/api/routes/admin/scope-config.ts
@@ -252,7 +252,7 @@ const SETTINGS_RESOURCES = {
"orgAmbient",
],
customize: ["soul", "branding", "featureFlags", "decisions"],
- "slack-settings": ["externalSlackParticipants", "internalMemberOverrides", "channelHeaderPinDefault", "ackEmoji"],
+ "slack-settings": ["externalSlackParticipants", "channelHeaderPinDefault", "ackEmoji"],
models: [
"baseModel",
"runtime",
diff --git a/src/api/slack-core-client.ts b/src/api/slack-core-client.ts
index 559b87e52..d925492bb 100644
--- a/src/api/slack-core-client.ts
+++ b/src/api/slack-core-client.ts
@@ -86,7 +86,6 @@ export interface SlackCoreClient {
taskAcknowledgements?: TaskAcknowledgements;
sessionStatus?: SlackSessionStatus;
externalSlackParticipants(): Promise<boolean>;
- internalMemberOverrides(): Promise<string[]>;
ackEmojiOverride(): Promise<string[] | null>;
publishEmojiCatalog(emoji: Record<string, string>): Promise<void>;
surfaceHeaderFacts(scope: ScopeId): Promise<{ agentLabel?: string; modelName: string }>;
@@ -207,10 +206,6 @@ export function createSlackCoreClient(deps: SlackCoreClientDeps): SlackCoreClien
return (await deps.config.getExternalSlackParticipantsDurable(orgScope)) === true;
},
- async internalMemberOverrides() {
- return deps.config.getInternalMemberOverridesDurable();
- },
-
async ackEmojiOverride() {
return await deps.config.getAckEmojiDurable(orgScope);
},
diff --git a/src/identity/identity-service.ts b/src/identity/identity-service.ts
index 1dbad9be6..d3c7ba5b1 100644
--- a/src/identity/identity-service.ts
+++ b/src/identity/identity-service.ts
@@ -46,7 +46,6 @@ export function actorAssertionActive(
export function createIdentityService(
backing?: DurableMap<DeactivationRecord>,
opts: {
- isOverridden?: (externalId: string) => boolean;
directorySyncProtected?: readonly string[];
externalMembers?: DurableMap<ExternalMember>;
principalLinks?: { refresh(force?: boolean): Promise<void> };
@@ -86,7 +85,6 @@ export function createIdentityService(
function classify(externalId: string, isExternalGuest?: boolean): Principal {
const id = canonicalPerson(externalId);
- if (opts.isOverridden?.(externalId)) return { id, type: "internal" };
const key = personKey(externalId);
const record = deactivated.get(key);
const external = externals.get(key);
diff --git a/src/resolution/config-store.ts b/src/resolution/config-store.ts
index 5ff37a15a..0ad190345 100644
--- a/src/resolution/config-store.ts
+++ b/src/resolution/config-store.ts
@@ -77,7 +77,6 @@ interface ScopedRuntimeSelection extends RuntimeSelection {
revision?: number;
}
export type PersistedApprovedHarnesses = ScopedRow<"ids", string[]>;
-export type PersistedInternalMemberOverrides = ScopedRow<"members", string[]>;
interface PersistedSlackEmojiCatalog {
scopeId: ScopeId;
emoji: Record<string, string>;
@@ -167,9 +166,6 @@ export interface ScopedConfigStore {
getApprovedHarnesses(): string[] | null;
setApprovedHarnesses(ids: string[] | null): Promise<void>;
getApprovedHarnessesDurable(): Promise<string[] | null>;
- getInternalMemberOverrides(): string[];
- setInternalMemberOverrides(members: string[]): Promise<void>;
- getInternalMemberOverridesDurable(): Promise<string[]>;
getOrgAmbient(): boolean;
setOrgAmbient(on: boolean): Promise<void>;
getOrgAmbientDurable(): Promise<boolean>;
@@ -225,7 +221,6 @@ export interface ConfigStoreMaps {
channelHeaderPin?: DurableMap<PersistedScopedFlag>;
baseModels?: DurableMap<PersistedBaseModel>;
approvedHarnesses?: DurableMap<PersistedApprovedHarnesses>;
- internalMemberOverrides?: DurableMap<PersistedInternalMemberOverrides>;
orgAmbient?: DurableMap<PersistedScopedFlag>;
interactiveFastMode?: DurableMap<PersistedScopedFlag>;
individualModelAuth?: DurableMap<PersistedModelAccount>;
@@ -253,7 +248,6 @@ const CONFIG_STORE_TABLES: Record<keyof ConfigStoreMaps, string> = {
channelHeaderPin: "channel_header_pin_flag",
baseModels: "base_model_configs",
approvedHarnesses: "approved_harness_configs",
- internalMemberOverrides: "internal_member_overrides",
orgAmbient: "org_ambient_flag",
interactiveFastMode: "interactive_fast_mode_flag",
individualModelAuth: "individual_model_auth_flag",
@@ -349,7 +343,6 @@ export function createMemoryConfigStore(
externalSlackParticipants: field("externalSlackParticipants", "on"),
channelHeaderPin: field("channelHeaderPin", "on"),
approvedHarnesses: field("approvedHarnesses", "ids", true),
- internalMemberOverrides: field("internalMemberOverrides", "members", true),
orgAmbient: field("orgAmbient", "on", true),
interactiveFastMode: field("interactiveFastMode", "on", true),
individualModelAuth: field("individualModelAuth", "on", true),
@@ -780,12 +773,6 @@ export function createMemoryConfigStore(
},
setApprovedHarnesses: (ids) => settings.approvedHarnesses.set(org, ids ? [...ids] : null),
getApprovedHarnessesDurable: async () => (await settings.approvedHarnesses.durable(org)) ?? null,
- getInternalMemberOverrides: () => [...(settings.internalMemberOverrides.get(org) ?? [])],
- setInternalMemberOverrides: (members) =>
- settings.internalMemberOverrides.set(org, [
- ...new Set(members.map((m) => m.trim().toLowerCase()).filter(Boolean)),
- ]),
- getInternalMemberOverridesDurable: async () => (await settings.internalMemberOverrides.durable(org)) ?? [],
getOrgAmbient: () => settings.orgAmbient.get(org) ?? true,
setOrgAmbient: (on) => settings.orgAmbient.set(org, on),
getOrgAmbientDurable: async () => (await settings.orgAmbient.durable(org)) ?? true,
diff --git a/src/slack/directory.ts b/src/slack/directory.ts
index 73de0405e..b674eefa7 100644
--- a/src/slack/directory.ts
+++ b/src/slack/directory.ts
@@ -61,21 +61,6 @@ type RosterKind = { plural: string; authz: string; item: string; limit?: number;
const MEMBERS_PAGE_LIMIT = 200;
const ROSTER_FETCH_CONCURRENCY = 4;
-const NO_INTERNAL_OVERRIDES: ReadonlySet<string> = new Set();
-
-function withInternalOverride(
- actor: ActorAssertion,
- email: string | undefined,
- overrides: ReadonlySet<string>,
-): ActorAssertion {
- if (!actor.isExternalGuest || overrides.size === 0) return actor;
- const mail = (email ?? "").trim().toLowerCase();
- if (overrides.has(actor.externalId.toLowerCase()) || (mail && overrides.has(mail))) {
- return { ...actor, isExternalGuest: false };
- }
- return actor;
-}
-
export interface Directory {
getUserSnapshot(client: any): Promise<{ byId: Map<string, CachedUser>; fetchedAt: number } | undefined>;
forceDirectorySync(client: any, invalidateChannelId?: string, invalidatePrincipalId?: string): Promise<void>;
@@ -112,13 +97,10 @@ export function createDirectory(deps: {
syncRetryMs?: number;
maxPrivateChannels?: number;
userCacheTtlMs?: number;
- internalOverrides?: () => Promise<ReadonlySet<string>>;
coreSingleton?: boolean;
}): Directory {
const { core, ids } = deps;
const CORE_SINGLETON = deps.coreSingleton !== false;
- const internalOverrides = async (): Promise<ReadonlySet<string>> =>
- !deps.externalAccess && deps.internalOverrides ? await deps.internalOverrides() : NO_INTERNAL_OVERRIDES;
const USER_SNAPSHOT_TTL_MS = deps.userSnapshotTtlMs ?? 5 * 60_000;
const CHANNEL_MEMBERS_TTL_MS = deps.channelMembersTtlMs ?? 30 * 60_000;
const SYNC_RETRY_MS = deps.syncRetryMs ?? 30_000;
@@ -145,17 +127,12 @@ export function createDirectory(deps: {
mentionIndex.set(key, id);
};
let missingEmails = 0;
- const overrides = await internalOverrides();
for await (const res of client.paginate("users.list", { limit: 1000 }) as AsyncIterable<any>) {
for (const u of (res.members ?? []) as SlackUser[]) {
if (!u?.id || u.id === ids.botUserId) continue;
- const actor = withInternalOverride(
- deps.externalAccess
- ? companySlackActor(u, deps.externalAccess)
- : classifyUser(u, ids.ownTeamId, ids.identityMode),
- u.profile?.email,
- overrides,
- );
+ const actor = deps.externalAccess
+ ? companySlackActor(u, deps.externalAccess)
+ : classifyUser(u, ids.ownTeamId, ids.identityMode);
if (ids.identityMode === "email" && !u.is_bot && actor.externalId === u.id && u.team_id === ids.ownTeamId)
missingEmails++;
const timezone = slackUserTimezone(u);
@@ -593,13 +570,9 @@ export function createDirectory(deps: {
if (fromSnapshot) return { ...fromSnapshot, ok: true };
try {
const user = (await client.users.info({ user: userId })).user as SlackUser | undefined;
- const actor = withInternalOverride(
- deps.externalAccess
- ? companySlackActor(user, deps.externalAccess)
- : classifyUser(user, ids.ownTeamId, ids.identityMode),
- user?.profile?.email,
- await internalOverrides(),
- );
+ const actor = deps.externalAccess
+ ? companySlackActor(user, deps.externalAccess)
+ : classifyUser(user, ids.ownTeamId, ids.identityMode);
const timezone = slackUserTimezone(user);
const classified = { actor, ...(timezone ? { timezone } : {}) };
if (ids.ownTeamId && userId !== undefined) userCache.set(userId, classified);
diff --git a/src/slack/index.ts b/src/slack/index.ts
index 6be638304..b0dc4143d 100644
--- a/src/slack/index.ts
+++ b/src/slack/index.ts
@@ -131,22 +131,6 @@ export async function startSlackPlugin(
return ackOverrideCache.names;
}
- const INTERNAL_OVERRIDES_CACHE_MS = 60_000;
- let internalOverridesCache: { members: ReadonlySet<string>; fetchedAt: number } | undefined;
- async function internalOverrides(): Promise<ReadonlySet<string>> {
- if (internalOverridesCache && Date.now() - internalOverridesCache.fetchedAt < INTERNAL_OVERRIDES_CACHE_MS) {
- return internalOverridesCache.members;
- }
- try {
- const members = new Set(await core.internalMemberOverrides());
- internalOverridesCache = { members, fetchedAt: Date.now() };
- return members;
- } catch (err) {
- swallow("slack: internal-member-overrides read", err);
- return internalOverridesCache?.members ?? new Set();
- }
- }
-
const EXTERNAL_PARTICIPANTS_CACHE_MS = 30_000;
let externalParticipantsCache: { on: boolean; fetchedAt: number } | undefined;
async function externalParticipantsEnabled(): Promise<boolean> {
@@ -235,7 +219,6 @@ export async function startSlackPlugin(
core,
ids,
coreSingleton: CORE_SINGLETON && !cfg.externalAccess,
- internalOverrides,
...(cfg.userSnapshotTtlMs ? { userSnapshotTtlMs: cfg.userSnapshotTtlMs } : {}),
...(cfg.channelMembersTtlMs ? { channelMembersTtlMs: cfg.channelMembersTtlMs } : {}),
...(cfg.maxPrivateChannels ? { maxPrivateChannels: cfg.maxPrivateChannels } : {}),
diff --git a/src/wiring.ts b/src/wiring.ts
index 193faa90f..b835143ea 100644
--- a/src/wiring.ts
+++ b/src/wiring.ts
@@ -648,7 +648,6 @@ export function buildApp(
const principalLinks = createPrincipalLinkService(artifactMap<PrincipalLink>("principal_links"), advisoryLock);
installPrincipalLinks(principalLinks);
const identity = createIdentityService(artifactMap<DeactivationRecord>("deactivated_principals"), {
- isOverridden: (id) => configStore.getInternalMemberOverrides().includes(id.trim().toLowerCase()),
directorySyncProtected: config.emailAuthPrincipals,
externalMembers: artifactMap<ExternalMember>("external_members"),
principalLinks,
diff --git a/test/admin-external-users.test.ts b/test/admin-external-users.test.ts
index 7051be07a..18430c750 100644
--- a/test/admin-external-users.test.ts
+++ b/test/admin-external-users.test.ts
@@ -109,8 +109,6 @@ test("broker admission preserves configured email members without external invit
}
await s.built.identity.deactivate("[email protected]");
assert.deepEqual(await coreEmailAdmission(s.base, SECRET, "[email protected]"), { allowed: false });
- await s.built.config.setInternalMemberOverrides(["[email protected]"]);
- assert.deepEqual(await coreEmailAdmission(s.base, SECRET, "[email protected]"), { allowed: false });
await s.built.identity.putExternalMember({
role: "member",
@@ -120,8 +118,6 @@ test("broker admission preserves configured email members without external invit
updatedAt: Date.now(),
});
assert.deepEqual(await coreEmailAdmission(s.base, SECRET, "[email protected]"), { allowed: false });
- await s.built.config.setInternalMemberOverrides(["[email protected]"]);
- assert.deepEqual(await coreEmailAdmission(s.base, SECRET, "[email protected]"), { allowed: false });
});
test("inviting an external user stores the record, lists it as active, audits, and reports the missing mailer", async () => {
diff --git a/test/admin-resources.test.ts b/test/admin-resources.test.ts
index 2684bc33f..66303e790 100644
--- a/test/admin-resources.test.ts
+++ b/test/admin-resources.test.ts
@@ -703,61 +703,6 @@ test("webui-models is an org-wide string-list read back via admin GET and surfac
}
});
-test("internal-member-overrides is org-only, validates entries, audits, and round-trips", async () => {
- const srv = start();
- try {
- const wrongScope = await fetch(`${srv.base}/v1/admin/scopes/personal:U1/internal-member-overrides`, {
- method: "PUT",
- headers: ADMIN,
- body: JSON.stringify({ members: ["u1"] }),
- });
- assert.equal(wrongScope.status, 400);
- assert.match(((await wrongScope.json()) as { message: string }).message, /org-wide/);
-
- const notArray = await fetch(`${srv.base}/v1/admin/scopes/org:default-org/internal-member-overrides`, {
- method: "PUT",
- headers: ADMIN,
- body: JSON.stringify({ members: "u1" }),
- });
- assert.equal(notArray.status, 400);
- assert.match(((await notArray.json()) as { message: string }).message, /requires/);
-
- const badEntry = await fetch(`${srv.base}/v1/admin/scopes/org:default-org/internal-member-overrides`, {
- method: "PUT",
- headers: ADMIN,
- body: JSON.stringify({ members: ["[email protected]", " "] }),
- });
- assert.equal(badEntry.status, 400);
- assert.match(((await badEntry.json()) as { message: string }).message, /non-empty string/);
-
- const put = await fetch(`${srv.base}/v1/admin/scopes/org:default-org/internal-member-overrides`, {
- method: "PUT",
- headers: ADMIN,
- body: JSON.stringify({ members: [" [email protected] ", "U123ABC", "[email protected]"] }),
- });
- assert.equal(put.status, 200);
- assert.deepEqual(srv.built.config.getInternalMemberOverrides(), ["[email protected]", "u123abc"]);
- const adminGet = await fetch(`${srv.base}/v1/admin/scopes/org:default-org`, { headers: ADMIN });
- assert.deepEqual(((await adminGet.json()) as { internalMemberOverrides: string[] }).internalMemberOverrides, [
- "u123abc",
- ]);
- assert.ok(
- (await srv.built.auditLog.events()).some((event) => event.action === "identity.internal-override.update"),
- );
-
- const clear = await fetch(`${srv.base}/v1/admin/scopes/org:default-org/internal-member-overrides`, {
- method: "PUT",
- headers: ADMIN,
- body: JSON.stringify({ members: [] }),
- });
- assert.equal(clear.status, 200);
- assert.deepEqual(srv.built.config.getInternalMemberOverrides(), []);
- } finally {
- await srv.close();
- }
-});
-
test("GET /v1/admin/slack-emoji surfaces 404 without a token, and serves the plugin-published catalog once one exists", async () => {
const srv = start();
try {
diff --git a/test/admin-settings-load.test.ts b/test/admin-settings-load.test.ts
index 9ac425a4c..7398e1ecf 100644
--- a/test/admin-settings-load.test.ts
+++ b/test/admin-settings-load.test.ts
@@ -49,7 +49,7 @@ test("settings projections preserve values while excluding unrelated payloads",
if (["customize", "credentials", "connectors"].includes(view))
assert.equal("modelsByHarness" in projected, false, view);
if (view === "slack-settings") {
- for (const key of ["externalSlackParticipants", "internalMemberOverrides", "channelHeaderPinDefault", "ackEmoji"])
+ for (const key of ["externalSlackParticipants", "channelHeaderPinDefault", "ackEmoji"])
assert.equal(key in projected, true);
assert.equal("orgAmbient" in projected, false);
}
diff --git a/test/config-store-org.test.ts b/test/config-store-org.test.ts
index 251e1e99b..039a5057e 100644
--- a/test/config-store-org.test.ts
+++ b/test/config-store-org.test.ts
@@ -1,11 +1,7 @@
import { test } from "node:test";
import assert from "node:assert/strict";
import { createMemoryMap } from "../src/persistence/durable-map.ts";
-import {
- createMemoryConfigStore,
- type PersistedDeploymentIdentity,
- type PersistedInternalMemberOverrides,
-} from "../src/resolution/config-store.ts";
+import { createMemoryConfigStore, type PersistedDeploymentIdentity } from "../src/resolution/config-store.ts";
test("a durable database is pinned to one organization", async () => {
const deploymentIdentity = createMemoryMap<PersistedDeploymentIdentity>();
@@ -16,19 +12,6 @@ test("a durable database is pinned to one organization", async () => {
);
});
-test("internal member overrides normalize, persist org-wide, and hydrate back", async () => {
- const internalMemberOverrides = createMemoryMap<PersistedInternalMemberOverrides>();
- const store = createMemoryConfigStore("default-org", { internalMemberOverrides });
- await store.hydrate!();
- assert.deepEqual(store.getInternalMemberOverrides(), []);
- await store.setInternalMemberOverrides([" [email protected] ", "U123ABC", "[email protected]", ""]);
- assert.deepEqual(store.getInternalMemberOverrides(), ["[email protected]", "u123abc"]);
- assert.deepEqual(await store.getInternalMemberOverridesDurable(), ["[email protected]", "u123abc"]);
- const rehydrated = createMemoryConfigStore("default-org", { internalMemberOverrides });
- await rehydrated.hydrate!();
- assert.deepEqual(rehydrated.getInternalMemberOverrides(), ["[email protected]", "u123abc"]);
-});
-
test("purpose runtimes persist independently without manufacturing a conversation default", async () => {
const baseModels = createMemoryMap<import("../src/resolution/config-store.ts").PersistedBaseModel>();
const store = createMemoryConfigStore("default-org", { baseModels });
diff --git a/test/identity.test.ts b/test/identity.test.ts
index 101c27f61..f358a8fcf 100644
--- a/test/identity.test.ts
+++ b/test/identity.test.ts
@@ -146,14 +146,3 @@ test("a manual deactivation survives roster churn — only reactivate() clears i
await svc.reactivate("U-fired");
assert.equal(svc.classify("U-fired").type, "internal");
});
-
-test("an overridden principal classifies internal even when flagged guest or deactivated", async () => {
- const overrides = new Set(["u-contractor"]);
- const svc = createIdentityService(createMemoryMap<DeactivationRecord>(), {
- isOverridden: (externalId) => overrides.has(externalId.trim().toLowerCase()),
- });
- assert.equal(svc.classify("U-CONTRACTOR", true).type, "internal");
- await svc.deactivate("U-CONTRACTOR");
- assert.equal(svc.classify("U-CONTRACTOR").type, "internal");
- assert.equal(svc.classify("U-OTHER", true).type, "guest");
-});
diff --git a/test/personal-model-account.test.ts b/test/personal-model-account.test.ts
index 6dd41bcc6..b87d06be9 100644
--- a/test/personal-model-account.test.ts
+++ b/test/personal-model-account.test.ts
@@ -32,7 +32,6 @@ test("personal account choice persists across instances without changing anyone
test("account API binds choice to the signed-in person, preserves connections, and fails closed after disconnect", async () => {
const built = buildApp(testConfig({ dataDir: mkdtempSync(join(tmpdir(), "personal-account-")) }));
- await built.config.setInternalMemberOverrides(["alice@default-org", "bob@default-org"]);
const server = createServer(built.app, {
signingSecret: SECRET,
requireSignedPortalIdentity: true,
diff --git a/test/slack-index.integration.test.ts b/test/slack-index.integration.test.ts
index da92b8115..c01feec44 100644
--- a/test/slack-index.integration.test.ts
+++ b/test/slack-index.integration.test.ts
@@ -252,9 +252,6 @@ class FakeCore implements SlackCoreClient {
async externalSlackParticipants(): Promise<boolean> {
return this.externalParticipants;
}
- async internalMemberOverrides(): Promise<string[]> {
- return [];
- }
async ackEmojiOverride(): Promise<string[] | null> {
return null;
}
diff --git a/test/slack-internal-override.test.ts b/test/slack-internal-override.test.ts
deleted file mode 100644
index 0769597f0..000000000
--- a/test/slack-internal-override.test.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { test } from "node:test";
-import assert from "node:assert/strict";
-
-import { createDirectory, type BotIdentity } from "../src/slack/directory.ts";
-
-const IDS: BotIdentity = {
- ownTeamId: "T-OWN",
- botUserId: "B-bot",
- ownBotId: "B-app",
- botHandle: "qm",
- ownWorkspaceUrl: "https://own.slack.com/",
- identityMode: "slack-id",
-};
-
-const CORE = {
- pushDirectory: async () => true,
- holdDirectorySync: (fn: (lost: Promise<void>) => Promise<unknown>) => fn(new Promise<void>(() => {})),
-} as any;
-
-function fakeClient(users: Array<Record<string, unknown>>) {
- return {
- paginate: () =>
- (async function* () {
- yield { members: users };
- })(),
- users: {
- info: async ({ user }: { user: string }) => ({ user: users.find((u) => u.id === user) }),
- list: async () => ({ members: users }),
- },
- conversations: {
- list: async () => ({ channels: [] }),
- },
- };
-}
-
-const guest = (id: string, email?: string) => ({
- id,
- team_id: "T-OWN",
- is_restricted: true,
- ...(email ? { profile: { email } } : {}),
-});
-
-test("an overridden guest classifies internal by Slack id while other guests stay external", async () => {
- const dir = createDirectory({
- core: CORE,
- ids: IDS,
- internalOverrides: async () => new Set(["u-contractor"]),
- });
- const client = fakeClient([guest("U-CONTRACTOR"), guest("U-STRANGER"), { id: "U-STAFF", team_id: "T-OWN" }]);
- const contractor = await dir.classifyUserCached(client, "U-CONTRACTOR");
- assert.equal(contractor.actor.isExternalGuest, false);
- const stranger = await dir.classifyUserCached(client, "U-STRANGER");
- assert.equal(stranger.actor.isExternalGuest, true);
- const staff = await dir.classifyUserCached(client, "U-STAFF");
- assert.ok(!staff.actor.isExternalGuest);
-});
-
-test("an overridden guest classifies internal by email even when the id differs", async () => {
- const dir = createDirectory({
- core: CORE,
- ids: IDS,
- internalOverrides: async () => new Set(["[email protected]"]),
- });
- const client = fakeClient([guest("U-XYZ", "[email protected]"), guest("U-OTHER", "[email protected]")]);
- const byEmail = await dir.classifyUserCached(client, "U-XYZ");
- assert.equal(byEmail.actor.isExternalGuest, false);
- const other = await dir.classifyUserCached(client, "U-OTHER");
- assert.equal(other.actor.isExternalGuest, true);
-});
-
-test("the users.info fallback path honors the override for a user missing from the snapshot", async () => {
- const listed = fakeClient([guest("U-LISTED")]);
- const dir = createDirectory({
- core: CORE,
- ids: IDS,
- internalOverrides: async () => new Set(["u-solo"]),
- });
-
- await dir.classifyUserCached(listed, "U-LISTED");
- const solo = { id: "U-SOLO", team_id: "T-OWN", is_restricted: true };
- const client = {
- ...fakeClient([guest("U-LISTED")]),
- users: { info: async () => ({ user: solo }) },
- };
- const classified = await dir.classifyUserCached(client, "U-SOLO");
- assert.equal(classified.actor.isExternalGuest, false);
-});
-
-test("without an override list, guest classification is unchanged", async () => {
- const dir = createDirectory({ core: CORE, ids: IDS });
- const client = fakeClient([guest("U-CONTRACTOR")]);
- const classified = await dir.classifyUserCached(client, "U-CONTRACTOR");
- assert.equal(classified.actor.isExternalGuest, true);
-});