Multiplayer agent harness for work.
feat(slack): org admin setting + emoji picker for ack emoji (#571)
Joshua France9707b484c366
diff --git a/plugins/admin/public/index.html b/plugins/admin/public/index.htmlindex a134e7ec2..e0c816d4b 100644--- a/plugins/admin/public/index.html+++ b/plugins/admin/public/index.html@@ -4511,6 +4511,30 @@><span class="status" id="st-people-directory-url"></span></div></section>+ <section class="card hidden" id="card-ack-emoji">+ <div class="head">+ <h2>Slack ack emoji</h2>+ <p>+ The emoji the bot may react with to acknowledge a Slack message, org-wide. Add names from the+ workspace's emoji (custom and standard). Remove every chip to restore the built-in rotation.+ </p>+ </div>+ <div class="body">+ <div id="ack-emoji-chips" style="display: flex; flex-wrap: wrap; gap: 6px; align-items: center">+ <input+ id="ack-emoji-add"+ list="ack-emoji-catalog"+ placeholder="+ Add emoji"+ style="max-width: 240px"+ />+ <datalist id="ack-emoji-catalog"></datalist>+ </div>+ </div>+ <div class="foot">+ <button class="primary" data-save="ack-emoji">Save</button+ ><span class="status" id="st-ack-emoji"></span>+ </div>+ </section><section class="card setting-row hidden" id="card-browse-model"><div class="head"><h2>Browse model</h2>@@ -4963,6 +4987,9 @@let memDraftScope = null;let cronDestinationEditId = null;let webuiModelIds = [];+ let ackEmojiNames = [];+ let ackEmojiCatalog = {};+ let ackEmojiCatalogLoaded = false;const transcriptVisibility = { thinking: true, toolResults: true };const API_BASE = "__ADMIN_BASE__";@@ -6546,9 +6573,87 @@renderChips();syncDefault();}+ function initAckEmojiPicker() {+ const chips = $("ack-emoji-chips");+ const addInput = $("ack-emoji-add");+ const renderAckChips = () => {+ chips.querySelectorAll("[data-chip]").forEach((n) => n.remove());+ ackEmojiNames.forEach((name) => {+ const chip = document.createElement("span");+ chip.dataset.chip = name;+ chip.style.cssText =+ "display:inline-flex;align-items:center;gap:6px;padding:4px 10px;border:1px solid var(--border, #d4d4d4);border-radius:999px;font-size:13px";+ const label = document.createElement("span");+ const url = ackEmojiCatalog[name];+ if (url) {+ const img = document.createElement("img");+ img.src = url;+ img.alt = name;+ img.style.cssText = "width:16px;height:16px;vertical-align:middle;margin-right:4px";+ label.appendChild(img);+ }+ label.appendChild(document.createTextNode(":" + name + ":"));+ const x = document.createElement("button");+ x.type = "button";+ x.textContent = "×";+ x.setAttribute("aria-label", "Remove " + name);+ x.style.cssText = "border:0;background:none;cursor:pointer;padding:0;font-size:14px;line-height:1";+ x.onclick = () => {+ ackEmojiNames = ackEmojiNames.filter((v) => v !== name);+ renderAckChips();+ };+ chip.appendChild(label);+ chip.appendChild(x);+ chips.insertBefore(chip, addInput);+ });+ const dl = $("ack-emoji-catalog");+ dl.textContent = "";+ Object.keys(ackEmojiCatalog)+ .filter((n) => !ackEmojiNames.includes(n))+ .sort()+ .forEach((n) => {+ const o = document.createElement("option");+ o.value = n;+ dl.appendChild(o);+ });+ };+ const addEmoji = () => {+ const name = addInput.value+ .trim()+ .replace(/^:+|:+$/g, "")+ .toLowerCase();+ if (!name || !/^[a-z0-9_+-]+$/.test(name)) return;+ if (!ackEmojiNames.includes(name)) ackEmojiNames.push(name);+ addInput.value = "";+ renderAckChips();+ };+ addInput.onchange = addEmoji;+ addInput.onkeydown = (e) => {+ if (e.key === "Enter") {+ e.preventDefault();+ addEmoji();+ }+ };+ if (!ackEmojiCatalogLoaded) {+ ackEmojiCatalogLoaded = true;+ api("GET", "/v1/admin/slack-emoji")+ .then((res) => {+ if (res && res.ok && res.data && res.data.emoji) ackEmojiCatalog = res.data.emoji;+ renderAckChips();+ })+ .catch(() => {});+ }+ renderAckChips();+ }const showPeopleDirectory = scope.startsWith("org:");$("card-people-directory").classList.toggle("hidden", !showPeopleDirectory);if (showPeopleDirectory) $("people-directory-url").value = r.data.peopleDirectoryUrl || "";+ const showAckEmoji = scope.startsWith("org:") && "ackEmoji" in r.data;+ $("card-ack-emoji").classList.toggle("hidden", !showAckEmoji);+ if (showAckEmoji) {+ ackEmojiNames = Array.isArray(r.data.ackEmoji) ? [...r.data.ackEmoji] : [];+ initAckEmojiPicker();+ }const showBranding = scope.startsWith("org:") && "branding" in r.data;$("card-branding").classList.toggle("hidden", !showBranding);if (showBranding) {@@ -8039,6 +8144,7 @@return { ids };},"people-directory-url": () => ({ url: $("people-directory-url").value.trim() }),+ "ack-emoji": () => ({ names: ackEmojiNames }),branding: () => ({accent: $("branding-accent").value.trim(),mark: $("branding-mark").value.trim(),@@ -8064,6 +8170,7 @@"approved-harnesses": "st-approved-harnesses","webui-models": "st-webui-models","people-directory-url": "st-people-directory-url",+ "ack-emoji": "st-ack-emoji","browse-max-steps": "st-browse-max-steps","turn-wall-clock": "st-turn-wall-clock","browse-model": "st-browse-model",@@ -8076,6 +8183,7 @@"approved-harnesses","webui-models","people-directory-url",+ "ack-emoji","browse-max-steps","turn-wall-clock","browse-model",diff --git a/src/api/deps.ts b/src/api/deps.tsindex b06027b54..7e0b60d0c 100644--- a/src/api/deps.ts+++ b/src/api/deps.ts@@ -67,6 +67,7 @@ export interface ServerDeps {slackInstallationFetch?: typeof fetch;slackInstallationSocketAppId?: SlackSocketAppIdReader;slackEnvironmentState?: "absent" | "configured" | "partial";+ slackEnvBotToken?: string;oauthStateSecret?: string;oauthFetch?: FetchLike;oauthEnv?: NodeJS.ProcessEnv;diff --git a/src/api/routes/admin-resources.ts b/src/api/routes/admin-resources.tsindex dc502088d..def730c7e 100644--- a/src/api/routes/admin-resources.ts+++ b/src/api/routes/admin-resources.ts@@ -1,3 +1,4 @@+import { parseAckEmoji } from "../../slack/config.ts";import { orgId as configOrgId } from "../../config.ts";import type { ServerDeps } from "../deps.ts";import type { ApiCtx } from "./route.ts";@@ -505,6 +506,34 @@ export const ADMIN_RESOURCES: readonly AdminResource[] = [(deps, scope, url) => deps.config!.setPeopleDirectoryUrl(scope, url),),},+ {+ id: "ack-emoji",+ kind: "string-list",+ target: "org",+ clearable: true,+ label:+ "Slack ack emoji (names the bot may react with to acknowledge a message). Empty restores the built-in rotation.",+ readKey: "ackEmoji",+ get: (deps, scope) => deps.config!.getAckEmoji(scope),+ apply: generic<string[] | null>(+ (body, { scope }) => {+ const bad = orgOnly(scope, "the ack emoji set is org-wide");+ if (bad) return bad;+ const raw = (body as { names?: unknown }).names;+ if (raw !== undefined && raw !== null && !Array.isArray(raw)) {+ return { error: "ack-emoji requires { names: string[] } (empty list restores the default rotation)" };+ }+ const input = Array.isArray(raw) ? raw.map((v) => (typeof v === "string" ? v : "")).join(",") : "";+ const names = parseAckEmoji(input);+ const supplied = Array.isArray(raw) ? raw.filter((v) => typeof v === "string" && v.trim()).length : 0;+ if (supplied && names.length !== supplied) {+ return { error: "ack-emoji names must be Slack emoji names (lowercase letters, digits, _ + -)" };+ }+ return { value: names.length ? names : null };+ },+ (deps, scope, names) => deps.config!.setAckEmoji(scope, names),+ ),+ },{id: "branding",kind: "custom",diff --git a/src/api/routes/admin.ts b/src/api/routes/admin.tsindex f1be11b46..03e52583a 100644--- a/src/api/routes/admin.ts+++ b/src/api/routes/admin.ts@@ -31,7 +31,12 @@ import {listSlackMirrorContainers,listSlackMirrorMessages,} from "./admin/slack-mirror.ts";-import { deleteSlackInstallation, getSlackInstallation, putSlackInstallation } from "./admin/slack-installation.ts";+import {+ deleteSlackInstallation,+ getSlackEmojiList,+ getSlackInstallation,+ putSlackInstallation,+} from "./admin/slack-installation.ts";import { deleteModelProvider, getModelProviders, putModelProvider } from "./admin/model-providers.ts";import { deleteCustomProvider, getCustomProviders, putCustomProvider } from "./admin/custom-providers.ts";import { deleteMcpServer, getMcpServers, putMcpServer } from "./admin/mcp-servers.ts";@@ -55,6 +60,7 @@ const timed =const routes: ReadonlyArray<Route<ApiCtx>> = [{ method: "GET", path: "/v1/admin/slack-installation", auth: "either", handle: getSlackInstallation },+ { method: "GET", path: "/v1/admin/slack-emoji", auth: "either", handle: getSlackEmojiList },{ method: "PUT", path: "/v1/admin/slack-installation", auth: "either", handle: putSlackInstallation },{ method: "DELETE", path: "/v1/admin/slack-installation", auth: "either", handle: deleteSlackInstallation },{ method: "GET", path: "/v1/admin/model-providers", auth: "either", handle: getModelProviders },diff --git a/src/api/routes/admin/slack-installation.ts b/src/api/routes/admin/slack-installation.tsindex 76f1f42eb..b06522673 100644--- a/src/api/routes/admin/slack-installation.ts+++ b/src/api/routes/admin/slack-installation.ts@@ -74,3 +74,29 @@ export async function deleteSlackInstallation(ctx: ApiCtx): Promise<void> {});return sendJson(ctx.res, 200, { configured: false, managed: true, source: "admin" });}++export async function getSlackEmojiList(ctx: ApiCtx): Promise<void> {+ const scope = orgScope(ctx.deps);+ const actor = await authorizeAdmin(ctx, scope);+ if (!actor) return;+ const managed = await ctx.deps.slackInstallation?.get();+ const botToken = managed?.botToken ?? ctx.deps.slackEnvBotToken ?? "";+ if (!botToken) return sendJson(ctx.res, 404, { error: "not_configured" });+ const doFetch = ctx.deps.slackInstallationFetch ?? fetch;+ try {+ const res = await doFetch("https://slack.com/api/emoji.list", {+ method: "POST",+ headers: { authorization: `Bearer ${botToken}`, "content-type": "application/x-www-form-urlencoded" },+ });+ const data = (await res.json()) as { ok?: boolean; error?: string; emoji?: Record<string, string> };+ if (!data.ok) return sendJson(ctx.res, 502, { error: "slack_error", message: data.error ?? "unknown" });+ const emoji: Record<string, string> = {};+ for (const [name, url] of Object.entries(data.emoji ?? {})) {+ if (typeof url === "string" && url.startsWith("alias:")) continue;+ emoji[name] = url;+ }+ return sendJson(ctx.res, 200, { emoji });+ } catch (error) {+ return sendJson(ctx.res, 502, { error: "slack_unreachable", message: errMessage(error) });+ }+}diff --git a/src/api/slack-core-client.ts b/src/api/slack-core-client.tsindex 7673e6c06..132e4357a 100644--- a/src/api/slack-core-client.ts+++ b/src/api/slack-core-client.ts@@ -60,6 +60,7 @@ interface DirectoryPush {export interface SlackCoreClient {externalSlackParticipants(): Promise<boolean>;+ ackEmojiOverride(): Promise<string[] | null>;surfaceHeaderFacts(scope: ScopeId): Promise<{ agentLabel?: string; modelName: string }>;channelHeaderPinEnabled(scope: ScopeId): Promise<boolean>;onScopeModelChanged(listener: (scope: ScopeId) => void): void;@@ -131,6 +132,10 @@ export function createSlackCoreClient(deps: SlackCoreClientDeps): SlackCoreClienreturn (await deps.config.getExternalSlackParticipantsDurable(orgScope)) === true;},+ async ackEmojiOverride() {+ return await deps.config.getAckEmojiDurable(orgScope);+ },+async surfaceHeaderFacts(scope) {const [choice, branding] = await Promise.all([resolveRuntimeChoiceDurable(deps.config, orgScope, scope, deps.runtimeFallback),diff --git a/src/index.ts b/src/index.tsindex dd1968309..635753204 100644--- a/src/index.ts+++ b/src/index.ts@@ -14,7 +14,7 @@ const envSlackAttempted = Boolean(process.env.SLACK_BOT_TOKEN || process.env.SLAlet slackEnvironmentState: "absent" | "configured" | "partial" = "absent";if (slackConfig) slackEnvironmentState = "configured";else if (envSlackAttempted) slackEnvironmentState = "partial";-const server = createServer(built.app, serverDeps(config, built, slackEnvironmentState));+const server = createServer(built.app, serverDeps(config, built, slackEnvironmentState, envSlackConfig?.botToken));await built.config.hydrate?.();await built.refreshCustomProviders();diff --git a/src/resolution/config-store.ts b/src/resolution/config-store.tsindex f3661f147..9b3cf64e4 100644--- a/src/resolution/config-store.ts+++ b/src/resolution/config-store.ts@@ -85,6 +85,11 @@ export interface PersistedWebuiModels {scopeId: ScopeId;ids: string[];}+export interface PersistedAckEmoji {+ scopeId: ScopeId;+ names: string[];+}+export interface PersistedPeopleDirectoryUrl {scopeId: ScopeId;url: string;@@ -189,6 +194,9 @@ export interface ScopedConfigStore {setWebuiModels(id: ScopeId, ids: string[] | null): void;getBaseModelDurable(id: ScopeId): Promise<string | null>;getWebuiModelsDurable(id: ScopeId): Promise<string[] | null>;+ getAckEmoji(id: ScopeId): string[] | null;+ setAckEmoji(id: ScopeId, names: string[] | null): void;+ getAckEmojiDurable(id: ScopeId): Promise<string[] | null>;getPeopleDirectoryUrl(id: ScopeId): string | null;setPeopleDirectoryUrl(id: ScopeId, url: string | null): void;getBranding(id: ScopeId): OrgBranding | null;@@ -229,6 +237,7 @@ export function createMemoryConfigStore(interactiveFastMode?: DurableMap<PersistedScopedFlag>;webuiModels?: DurableMap<PersistedWebuiModels>;peopleDirectoryUrls?: DurableMap<PersistedPeopleDirectoryUrl>;+ ackEmoji?: DurableMap<PersistedAckEmoji>;branding?: DurableMap<PersistedBranding>;browseMaxSteps?: DurableMap<PersistedBrowseMaxSteps>;browseModels?: DurableMap<PersistedBrowseModel>;@@ -254,6 +263,7 @@ export function createMemoryConfigStore(let interactiveFastMode = false;const webuiModels = new Map<ScopeId, string[]>();const peopleDirectoryUrls = new Map<ScopeId, string>();+ const ackEmoji = new Map<ScopeId, string[]>();const branding = new Map<ScopeId, OrgBranding>();const browseMaxSteps = new Map<ScopeId, number>();const browseModels = new Map<ScopeId, string>();@@ -273,6 +283,7 @@ export function createMemoryConfigStore(const interactiveFastModeStore = opts.interactiveFastMode ?? createMemoryMap<PersistedScopedFlag>();const webuiModelStore = opts.webuiModels ?? createMemoryMap<PersistedWebuiModels>();const peopleDirectoryUrlStore = opts.peopleDirectoryUrls ?? createMemoryMap<PersistedPeopleDirectoryUrl>();+ const ackEmojiStore = opts.ackEmoji ?? createMemoryMap<PersistedAckEmoji>();const brandingStore = opts.branding ?? createMemoryMap<PersistedBranding>();const browseMaxStepsStore = opts.browseMaxSteps ?? createMemoryMap<PersistedBrowseMaxSteps>();const browseModelStore = opts.browseModels ?? createMemoryMap<PersistedBrowseModel>();@@ -424,6 +435,7 @@ export function createMemoryConfigStore(interactiveFastMode = (await interactiveFastModeStore.get(org))?.on ?? false;for (const r of await webuiModelStore.all()) webuiModels.set(r.scopeId, r.ids);for (const r of await peopleDirectoryUrlStore.all()) peopleDirectoryUrls.set(r.scopeId, r.url);+ for (const r of await ackEmojiStore.all()) ackEmoji.set(r.scopeId, r.names);for (const r of await brandingStore.all()) branding.set(r.scopeId, r.branding);for (const r of await browseMaxStepsStore.all()) browseMaxSteps.set(r.scopeId, r.steps);for (const r of await browseModelStore.all()) browseModels.set(r.scopeId, r.modelId);@@ -810,6 +822,21 @@ export function createMemoryConfigStore(},getWebuiModelsDurable: async (id) =>(await webuiModelStore.get(id))?.ids ?? (await webuiModelStore.get(org))?.ids ?? null,+ getAckEmoji: (id) => ackEmoji.get(id) ?? null,+ setAckEmoji(id, names) {+ if (!names || !names.length) {+ ackEmoji.delete(id);+ persist(`ackEmoji:${id}`, "ack emoji", () => ackEmojiStore.delete(id));+ } else {+ ackEmoji.set(id, names);+ persist(`ackEmoji:${id}`, "ack emoji", () => ackEmojiStore.put(id, { scopeId: id, names }));+ }+ },+ getAckEmojiDurable: async (id) => {+ const pending = pendingWrites.get(`ackEmoji:${id}`);+ if (pending) await pending;+ return (await ackEmojiStore.get(id))?.names ?? null;+ },getPeopleDirectoryUrl: (id) => peopleDirectoryUrls.get(id) ?? null,setPeopleDirectoryUrl(id, url) {if (url === null) {@@ -1013,6 +1040,7 @@ export function createMemoryConfigStore(`branding:${id}`,...(id === org ? [`approvedHarnesses:${org}`, `orgAmbient:${org}`, `interactiveFastMode:${org}`] : []),`channelHeaderPin:${id}`,+ `ackEmoji:${id}`,...(id === org ? [`approvedHarnesses:${org}`, `orgAmbient:${org}`] : []),];await Promise.all(diff --git a/src/slack/ack-emoji.ts b/src/slack/ack-emoji.tsindex 5ce084c7c..45b74f484 100644--- a/src/slack/ack-emoji.ts+++ b/src/slack/ack-emoji.ts@@ -30,7 +30,10 @@ function sample<T>(items: readonly T[], n: number): T[] {return pool.slice(0, n);}-export function createAckEmojiPicker(core: SlackCoreClient): AckEmojiPicker {+export function createAckEmojiPicker(+ core: SlackCoreClient,+ opts: { candidatesOverride?: () => readonly string[] | null } = {},+): AckEmojiPicker {let ackEmojiCache: { custom: string[]; urls: Record<string, string>; at: number } | null = null;let ackEmojiInFlight: Promise<void> | null = null;function refreshAckEmoji(client: any): void {@@ -54,6 +57,8 @@ export function createAckEmojiPicker(core: SlackCoreClient): AckEmojiPicker {}function ackPickCandidates(client: any): string[] {+ const override = opts.candidatesOverride?.();+ if (override?.length) return [...override];refreshAckEmoji(client);return [...CURATED_ACK_EMOJI, ...DEFAULT_ACK_REACTIONS, ...sample(ackEmojiCache?.custom ?? [], CUSTOM_PICK_SAMPLE)];}diff --git a/src/slack/config.ts b/src/slack/config.tsindex c8b17930b..b624e38fd 100644--- a/src/slack/config.ts+++ b/src/slack/config.ts@@ -23,6 +23,18 @@ export interface SlackPluginConfig {devIntrospection?: { port: number };}+export function parseAckEmoji(raw: string | undefined): string[] {+ const out: string[] = [];+ const seen = new Set<string>();+ for (const part of (raw ?? "").split(/[\s,]+/)) {+ const name = part.replace(/^:+/, "").replace(/:+$/, "").trim().toLowerCase();+ if (!name || seen.has(name) || !/^[a-z0-9_+-]+$/.test(name)) continue;+ seen.add(name);+ out.push(name);+ }+ return out;+}+export function slackPluginConfigFromEnv(env: Record<string, string | undefined>): SlackPluginConfig | null {const eventsMode = env.SLACK_EVENTS_MODE?.trim() === "http" ? "http" : "socket";if (!env.SLACK_BOT_TOKEN) return null;diff --git a/src/slack/index.ts b/src/slack/index.tsindex 0b3aaa013..d86eebb19 100644--- a/src/slack/index.ts+++ b/src/slack/index.ts@@ -70,6 +70,24 @@ export async function startSlackPlugin(identityMode: cfg.identityEmail === "0" ? "slack-id" : "email",};+ const ACK_OVERRIDE_CACHE_MS = 60_000;+ let ackOverrideCache: { names: string[] | null; fetchedAt: number } | undefined;+ function ackEmojiOverride(): readonly string[] | null {+ if (!ackOverrideCache || Date.now() - ackOverrideCache.fetchedAt >= ACK_OVERRIDE_CACHE_MS) {+ const prev = ackOverrideCache;+ ackOverrideCache = { names: prev?.names ?? null, fetchedAt: Date.now() };+ core+ .ackEmojiOverride()+ .then((names) => {+ ackOverrideCache = { names: names?.length ? names : null, fetchedAt: Date.now() };+ })+ .catch((err) => {+ swallow("slack: ack-emoji override read", err);+ });+ }+ return ackOverrideCache.names;+ }+const EXTERNAL_PARTICIPANTS_CACHE_MS = 30_000;let externalParticipantsCache: { on: boolean; fetchedAt: number } | undefined;async function externalParticipantsEnabled(): Promise<boolean> {@@ -112,7 +130,7 @@ export async function startSlackPlugin(const threads = createThreadTracker();const bridge = createCoreBridge(core);- const ackEmoji = createAckEmojiPicker(core);+ const ackEmoji = createAckEmojiPicker(core, { candidatesOverride: ackEmojiOverride });const directory = createDirectory({core,ids,@@ -176,6 +194,7 @@ export async function startSlackPlugin(serializer,approvals,ackEmoji,+ ackEmojiCandidates: ackEmojiOverride,ids,threads,deduper,@@ -239,6 +258,7 @@ export async function startSlackPlugin(`[slack-plugin] connected as @${auth.user} (bot ${ids.botUserId}) in team ${auth.team} (${ids.ownTeamId}); in-process core`,);ackEmoji.refreshAckEmoji(app.client);+ ackEmojiOverride();let deliveriesPollInFlight = false;let deliveriesPollAgain = false;diff --git a/src/slack/turn-handler.ts b/src/slack/turn-handler.tsindex fb11669db..199d7b547 100644--- a/src/slack/turn-handler.ts+++ b/src/slack/turn-handler.ts@@ -126,6 +126,7 @@ export function createTurnHandler(deps: {serializer: ConversationSerializer;approvals: Approvals;ackEmoji: AckEmojiPicker;+ ackEmojiCandidates?: () => readonly string[] | null;ids: BotIdentity;threads: ReturnType<typeof createThreadTracker>;deduper: ReturnType<typeof createDeduper>;@@ -328,7 +329,10 @@ export function createTurnHandler(deps: {addReaction: (name) => client.reactions.add({ channel: inc.channel, timestamp: inc.ts, name }).then(() => {}),removeReaction: (name) =>client.reactions.remove({ channel: inc.channel, timestamp: inc.ts, name }).then(() => {}),- emojiCandidates: [...DEFAULT_ACK_REACTIONS],+ emojiCandidates: (() => {+ const override = deps.ackEmojiCandidates?.();+ return override?.length ? [...override] : [...DEFAULT_ACK_REACTIONS];+ })(),emojiPick: ackEmoji.requestAckEmoji(text, ackEmoji.ackPickCandidates(client), {channel: inc.channel,ts: inc.ts,diff --git a/src/wiring.ts b/src/wiring.tsindex b7c21749d..f49b80a81 100644--- a/src/wiring.ts+++ b/src/wiring.ts@@ -18,6 +18,7 @@ import {type PersistedApprovedHarnesses,type PersistedWebuiModels,type PersistedPeopleDirectoryUrl,+ type PersistedAckEmoji,type PersistedBranding,type PersistedBrowseMaxSteps,type PersistedBrowseModel,@@ -451,6 +452,7 @@ export function buildApp(interactiveFastMode: artifactMap<PersistedScopedFlag>("interactive_fast_mode_flag"),webuiModels: artifactMap<PersistedWebuiModels>("webui_model_configs"),peopleDirectoryUrls: artifactMap<PersistedPeopleDirectoryUrl>("people_directory_urls"),+ ackEmoji: artifactMap<PersistedAckEmoji>("ack_emoji"),branding: artifactMap<PersistedBranding>("branding_configs"),browseMaxSteps: artifactMap<PersistedBrowseMaxSteps>("browse_max_steps_configs"),browseModels: artifactMap<PersistedBrowseModel>("browse_model_configs"),@@ -1555,6 +1557,7 @@ export function serverDeps(config: Config,built: BuiltApp,slackEnvironmentState: "absent" | "configured" | "partial" = "absent",+ slackEnvBotToken?: string,): Omit<ServerDeps, "control"> {const configuredModel = configuredModelForHarness(config, config.harness);return {@@ -1579,6 +1582,7 @@ export function serverDeps(connectorTokens: built.connectorTokens,slackInstallation: built.slackInstallation,slackEnvironmentState,+ ...(slackEnvBotToken ? { slackEnvBotToken } : {}),resolveClient: built.resolveClient,consentLinks: built.consentLinks,secretDrops: built.secretDrops,diff --git a/test/slack-ack-emoji.test.ts b/test/slack-ack-emoji.test.tsnew file mode 100644index 000000000..417c2faa9--- /dev/null+++ b/test/slack-ack-emoji.test.ts@@ -0,0 +1,72 @@+import { test } from "node:test";+import assert from "node:assert/strict";++import { parseAckEmoji } from "../src/slack/config.ts";+import { createAckEmojiPicker } from "../src/slack/ack-emoji.ts";+import { CURATED_ACK_EMOJI, DEFAULT_ACK_REACTIONS, createAckPresenter } from "../src/slack/presenters.ts";+import { createMemoryConfigStore } from "../src/resolution/config-store.ts";+import type { SlackCoreClient } from "../src/api/slack-core-client.ts";++const ORG = "org:test" as const;++test("parseAckEmoji: normalizes colons/case, splits on commas and spaces, drops junk, dedupes", () => {+ assert.deepEqual(parseAckEmoji(":custom_thinking:, CUSTOM_OK custom_ok\n:+1:"), [+ "custom_thinking",+ "custom_ok",+ "+1",+ ]);+ assert.deepEqual(parseAckEmoji("bad name!, :also bad:"), ["bad", "also"]);+ assert.deepEqual(parseAckEmoji(""), []);+ assert.deepEqual(parseAckEmoji(undefined), []);+ assert.deepEqual(parseAckEmoji(" , ::, !!"), []);+});++test("config store: ack emoji set/get/clear roundtrip, durable read included", async () => {+ const config = createMemoryConfigStore(ORG);+ assert.equal(config.getAckEmoji(ORG), null);+ assert.equal(await config.getAckEmojiDurable(ORG), null);+ config.setAckEmoji(ORG, ["custom_thinking", "custom_ok"]);+ assert.deepEqual(config.getAckEmoji(ORG), ["custom_thinking", "custom_ok"]);+ assert.deepEqual(await config.getAckEmojiDurable(ORG), ["custom_thinking", "custom_ok"]);+ config.setAckEmoji(ORG, null);+ assert.equal(config.getAckEmoji(ORG), null);+ assert.equal(await config.getAckEmojiDurable(ORG), null);+});++function pickerFixture(opts?: { candidatesOverride?: () => readonly string[] | null }) {+ const core = {} as SlackCoreClient;+ const client = { emoji: { list: async () => ({ emoji: { custom_ok: "https://x/a.png" } }) } };+ return { picker: createAckEmojiPicker(core, opts), client };+}++test("ackPickCandidates: a live org override fully replaces the stock candidate set", async () => {+ let names: string[] | null = ["custom_thinking", "custom_ok"];+ const { picker, client } = pickerFixture({ candidatesOverride: () => names });+ assert.deepEqual(picker.ackPickCandidates(client), ["custom_thinking", "custom_ok"]);+ names = null;+ const candidates = picker.ackPickCandidates(client);+ for (const name of [...CURATED_ACK_EMOJI, ...DEFAULT_ACK_REACTIONS]) assert.ok(candidates.includes(name));+});++test("ackPickCandidates: without an override the curated + default sets remain", () => {+ const { picker, client } = pickerFixture();+ const candidates = picker.ackPickCandidates(client);+ for (const name of [...CURATED_ACK_EMOJI, ...DEFAULT_ACK_REACTIONS]) assert.ok(candidates.includes(name));+});++test("ack presenter: fallback reaction draws from the org set when provided", async () => {+ const added: string[] = [];+ const presenter = createAckPresenter({+ postAck: async () => {},+ addReaction: async (name) => {+ added.push(name);+ },+ removeReaction: async () => {},+ emojiCandidates: ["custom_thinking"],+ reactionDelayMs: 1,+ });+ await new Promise((r) => setTimeout(r, 20));+ await presenter.drain();+ assert.deepEqual(added, ["custom_thinking"]);+ await presenter.settle();+});diff --git a/test/slack-index.integration.test.ts b/test/slack-index.integration.test.tsindex 961e13aed..a5fe8729c 100644--- a/test/slack-index.integration.test.ts+++ b/test/slack-index.integration.test.ts@@ -233,6 +233,9 @@ class FakeCore implements SlackCoreClient {async externalSlackParticipants(): Promise<boolean> {return this.externalParticipants;}+ async ackEmojiOverride(): Promise<string[] | null> {+ return null;+ }async surfaceHeaderFacts(): Promise<{ agentLabel?: string; modelName: string }> {return { agentLabel: "Quartermaster", modelName: "Claude Opus 4.8" };}