@integrity-labs/agt-cli 0.27.9-test.12 → 0.27.9-test.14

package/dist/mcp/slack-channel.js

@@ -14211,6 +14211,10 @@ function decideSlackEngagement(input) {
 function decideSlackAckReaction(input) {
   return Boolean(input.channel && input.ts);
 }
+function isRestartSenderAllowed(allowedUsers, userId) {
+  if (allowedUsers.size === 0) return true;
+  return userId != null && allowedUsers.has(userId);
+}
 function extractAugmentedSlackLabel(evt) {
   if (evt.metadata?.event_type !== "augmented_agent_message") return null;
   return {
@@ -14301,6 +14305,45 @@ function readDeclineCooldownMs(envVarName, defaultSeconds = 1800) {
   return parsed * 1e3;
 }
 
+// src/inbound-access.ts
+function decideInboundAccess(input) {
+  if (!input.content.forward) {
+    return { kind: "drop", reason: `content:${input.content.reason}` };
+  }
+  if (input.isSelf) {
+    return { kind: "drop", reason: "self" };
+  }
+  if (input.orgBoundary && !input.orgBoundary.forward) {
+    return { kind: "drop", reason: "org_boundary" };
+  }
+  if (input.senderPolicy && !input.senderPolicy.forward) {
+    const reason = input.senderPolicy.reason;
+    const declineWorthy = input.sameOrg && reason !== "internal_only";
+    return {
+      kind: "drop",
+      reason: `sender_policy:${reason}`,
+      decline: declineWorthy ? politeDeclineCopy(reason) : void 0
+    };
+  }
+  if (input.command && !input.isBot) {
+    return {
+      kind: "command",
+      command: input.command.command,
+      authorized: input.command.authorized
+    };
+  }
+  if (input.isBot) {
+    const peer = input.peer;
+    if (!peer || peer.kind === "self") {
+      return { kind: "drop", reason: peer?.kind === "self" ? "self" : "peer:unclassified" };
+    }
+    if (peer.kind === "drop") {
+      return { kind: "drop", reason: `peer:${peer.reason ?? "unspecified"}` };
+    }
+  }
+  return { kind: "admit" };
+}
+
 // src/ack-reaction.ts
 import { readdirSync, readFileSync } from "fs";
 import { join } from "path";
@@ -14335,6 +14378,29 @@ function shouldPostUndeliverableNotice(lastNoticeAtMs, nowMs, throttleMs = UNDEL
 function undeliverableNoticeText() {
   return "\u23F3 I can't get to this right now. Please resend in a few minutes \u2014 I may not see this one.";
 }
+var BUSY_ACK_THRESHOLD_MS = 9e4;
+var BUSY_ACK_NOTICE_THROTTLE_MS = 10 * 60 * 1e3;
+function channelBusyAckEnabled() {
+  const v = process.env.AGT_CHANNEL_BUSY_ACK_ENABLED;
+  return v === "1" || v === "true";
+}
+function channelBusyAckThresholdMs() {
+  const raw = parseInt(process.env.AGT_CHANNEL_BUSY_ACK_THRESHOLD_MS ?? "", 10);
+  return Number.isFinite(raw) && raw > 0 ? raw : BUSY_ACK_THRESHOLD_MS;
+}
+function decideBusyAck(i) {
+  if (!i.hasTarget) return false;
+  if (!i.stillPending) return false;
+  if (!Number.isFinite(i.pendingAgeMs)) return false;
+  const threshold = i.thresholdMs ?? channelBusyAckThresholdMs();
+  if (i.pendingAgeMs < threshold) return false;
+  if (!i.sessionAlive) return false;
+  const paneFreshThreshold = i.paneFreshThresholdMs ?? ACK_PANE_FRESH_THRESHOLD_MS;
+  return i.paneLogFreshAgeMs != null && i.paneLogFreshAgeMs <= paneFreshThreshold;
+}
+function busyAckNoticeText() {
+  return "\u{1F6E0}\uFE0F I'm in the middle of something right now \u2014 I'll follow up on this as soon as I'm free.";
+}
 var GIVE_UP_SIGNAL_FILENAME = "watchdog-give-up.json";
 var GIVE_UP_SIGNAL_MAX_AGE_MS = 30 * 60 * 1e3;
 function readGiveUpSignalAtMs(path, now = Date.now()) {
@@ -14454,6 +14520,81 @@ function probeAgentSessionCached(codeName, ttlMs = SESSION_PROBE_TTL_MS, now = D
   return value;
 }
 
+// src/agent-config-state.ts
+import { existsSync, readFileSync as readFileSync2 } from "fs";
+import { join as join2 } from "path";
+var SESSION_STATE_FILENAME = "session-state.json";
+function readAgentSessionState(stateDir) {
+  if (!stateDir) return null;
+  const path = join2(stateDir, SESSION_STATE_FILENAME);
+  if (!existsSync(path)) return null;
+  try {
+    const parsed = JSON.parse(readFileSync2(path, "utf-8"));
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return null;
+    return parsed;
+  } catch {
+    return null;
+  }
+}
+function describeSessionOrigin(source) {
+  switch (source) {
+    case "startup":
+      return "fresh start";
+    case "resume":
+      return "resumed";
+    case "clear":
+      return "cleared (/clear)";
+    case "compact":
+      return "compacted";
+    default:
+      return "unknown";
+  }
+}
+function formatModelLabel(model) {
+  const trimmed = model?.trim();
+  return trimmed && trimmed.length > 0 ? trimmed : "unknown";
+}
+function shortSessionId(id) {
+  const trimmed = id?.trim();
+  if (!trimmed) return "unknown";
+  return trimmed.length > 8 ? trimmed.slice(0, 8) : trimmed;
+}
+function formatRelativeAge(ts, now = Date.now()) {
+  if (typeof ts !== "number" || !Number.isFinite(ts) || ts <= 0) return "unknown";
+  const seconds = Math.floor((now - ts) / 1e3);
+  if (seconds < 0) return "unknown";
+  if (seconds < 5) return "just now";
+  if (seconds < 60) return `${seconds}s ago`;
+  if (seconds < 3600) return `${Math.floor(seconds / 60)}m ago`;
+  if (seconds < 86400) return `${Math.floor(seconds / 3600)}h ago`;
+  return `${Math.floor(seconds / 86400)}d ago`;
+}
+function formatChannels(channels) {
+  if (!Array.isArray(channels) || channels.length === 0) return "unknown";
+  const cleaned = channels.map((c) => String(c).trim()).filter((c) => c.length > 0);
+  return cleaned.length > 0 ? cleaned.join(", ") : "unknown";
+}
+function buildAgentConfigReport(opts) {
+  const { codeName, connectivityLine, state, now = Date.now() } = opts;
+  const lines = [`\u{1F916} *Config for \`${codeName}\`*`, connectivityLine];
+  if (!state) {
+    lines.push("\u2022 *Model:* unknown \u2014 session state not recorded yet");
+    lines.push("\u2022 *Session:* unknown");
+    return lines.join("\n");
+  }
+  lines.push(`\u2022 *Model:* \`${formatModelLabel(state.model)}\``);
+  const origin = describeSessionOrigin(state.source);
+  const age = formatRelativeAge(state.recorded_at, now);
+  const sessionLine = age === "unknown" ? `\u2022 *Session:* ${origin}` : `\u2022 *Session:* ${origin} \xB7 started ${age}`;
+  lines.push(sessionLine);
+  lines.push(`\u2022 *Session ID:* \`${shortSessionId(state.session_id)}\``);
+  if (state.environment && state.environment.trim().length > 0) {
+    lines.push(`\u2022 *Environment:* ${state.environment.trim()}`);
+  }
+  lines.push(`\u2022 *Channels:* ${formatChannels(state.channels)}`);
+  return lines.join("\n");
+}
+
 // src/pane-tail.ts
 import { execFile } from "child_process";
 import { promisify } from "util";
@@ -14461,9 +14602,9 @@ import { open, stat } from "fs/promises";
 
 // src/channel-attachments.ts
 import { homedir } from "os";
-import { join as join2, resolve, sep } from "path";
+import { join as join3, resolve, sep } from "path";
 function resolveChannelInboundDir(codeName, channelSlug) {
-  const base = join2(homedir(), ".augmented");
+  const base = join3(homedir(), ".augmented");
   const allowedSegment = /^[A-Za-z0-9_-]+$/;
   if (!allowedSegment.test(codeName) || !allowedSegment.test(channelSlug)) {
     throw new Error(
@@ -14889,14 +15030,14 @@ var SLACK_EGRESS_TOOLS = /* @__PURE__ */ new Set([
 ]);
 
 // src/slack-pending-inbound-cleanup.ts
-import { existsSync, readdirSync as readdirSync2, statSync, unlinkSync } from "fs";
-import { join as join3 } from "path";
+import { existsSync as existsSync2, readdirSync as readdirSync2, statSync, unlinkSync } from "fs";
+import { join as join4 } from "path";
 function sanitizeMarkerSegment(value) {
   return value.replace(/[^A-Za-z0-9_-]/g, "_");
 }
 var defaultClearMarkerFile = (fullPath) => {
   try {
-    if (existsSync(fullPath)) unlinkSync(fullPath);
+    if (existsSync2(fullPath)) unlinkSync(fullPath);
   } catch {
   }
 };
@@ -14907,7 +15048,7 @@ function clearAllSlackPendingMarkersForThread(dir, channel, threadTs, clear = de
   try {
     for (const f of readdirSync2(dir)) {
       if (!f.startsWith(prefix) || !f.endsWith(".json")) continue;
-      clear(join3(dir, f));
+      clear(join4(dir, f));
       cleared += 1;
     }
   } catch {
@@ -14922,7 +15063,7 @@ function clearSlackPendingMarkerByMessageTs(dir, channel, messageTs, clear = def
   try {
     for (const f of readdirSync2(dir)) {
       if (!f.startsWith(channelPrefix) || !f.endsWith(messageSuffix)) continue;
-      clear(join3(dir, f));
+      clear(join4(dir, f));
       cleared += 1;
     }
   } catch {
@@ -14934,7 +15075,7 @@ function clearOldestSlackPendingMarkerInChannel(dir, channel, clear = defaultCle
   const channelPrefix = `${sanitizeMarkerSegment(channel)}__`;
   try {
     const entries = readdirSync2(dir).filter((f) => f.startsWith(channelPrefix) && f.endsWith(".json")).map((f) => {
-      const full = join3(dir, f);
+      const full = join4(dir, f);
       let mtime = 0;
       try {
         mtime = statSync(full).mtimeMs;
@@ -14951,6 +15092,47 @@ function clearOldestSlackPendingMarkerInChannel(dir, channel, clear = defaultCle
   }
 }
 
+// src/restart-confirm.ts
+import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync3, renameSync, unlinkSync as unlinkSync2, writeFileSync } from "fs";
+import { dirname } from "path";
+import { randomUUID } from "crypto";
+var RESTART_CONFIRM_MAX_AGE_MS = 10 * 60 * 1e3;
+function shouldPostRestartConfirm(marker, processBootMs, nowMs) {
+  if (!marker) return false;
+  const requestedAt = marker.requested_at;
+  if (typeof requestedAt !== "number" || !Number.isFinite(requestedAt)) return false;
+  if (requestedAt >= processBootMs) return false;
+  if (nowMs - requestedAt > RESTART_CONFIRM_MAX_AGE_MS) return false;
+  return true;
+}
+function buildBackOnlineText(name) {
+  const trimmed = typeof name === "string" ? name.trim() : "";
+  return trimmed ? `Hey ${trimmed}, I'm back online after my restart. \u{1F7E2}` : `I'm back online after my restart. \u{1F7E2}`;
+}
+function writeRestartConfirmMarker(filePath, marker) {
+  const dir = dirname(filePath);
+  if (!existsSync3(dir)) mkdirSync(dir, { recursive: true, mode: 448 });
+  const tmpPath = `${filePath}.${process.pid}.${randomUUID()}.tmp`;
+  writeFileSync(tmpPath, JSON.stringify(marker) + "\n", { encoding: "utf8", mode: 384 });
+  renameSync(tmpPath, filePath);
+}
+function readRestartConfirmMarker(filePath) {
+  try {
+    if (!existsSync3(filePath)) return null;
+    const parsed = JSON.parse(readFileSync3(filePath, "utf8"));
+    if (!parsed || typeof parsed !== "object") return null;
+    return parsed;
+  } catch {
+    return null;
+  }
+}
+function clearRestartConfirmMarker(filePath) {
+  try {
+    if (existsSync3(filePath)) unlinkSync2(filePath);
+  } catch {
+  }
+}
+
 // ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@3.25.76/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js
 import process2 from "process";
 
@@ -15047,23 +15229,23 @@ var StdioServerTransport = class {
 import {
   chmodSync,
   createWriteStream,
-  existsSync as existsSync3,
-  mkdirSync as mkdirSync3,
-  readFileSync as readFileSync4,
+  existsSync as existsSync6,
+  mkdirSync as mkdirSync5,
+  readFileSync as readFileSync7,
   readdirSync as readdirSync3,
-  renameSync as renameSync2,
+  renameSync as renameSync3,
   statSync as statSync2,
-  unlinkSync as unlinkSync3,
+  unlinkSync as unlinkSync4,
   watch,
-  writeFileSync as writeFileSync3
+  writeFileSync as writeFileSync5
 } from "fs";
-import { basename, join as join5, resolve as resolve2 } from "path";
+import { basename, join as join6, resolve as resolve2 } from "path";
 import { homedir as homedir2 } from "os";
-import { createHash, randomUUID } from "crypto";
+import { createHash, randomUUID as randomUUID2 } from "crypto";
 
 // src/slack-thread-store.ts
-import { mkdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
-import { dirname } from "path";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "fs";
+import { dirname as dirname2 } from "path";
 var FILE_VERSION = 1;
 var DEFAULT_TTL_DAYS = 30;
 var DEFAULT_MIN_INTERVAL_MS = 1e3;
@@ -15073,7 +15255,7 @@ function loadThreadStore(filePath, opts = {}) {
   const ttlMs = ttlDays * 24 * 60 * 60 * 1e3;
   let raw;
   try {
-    raw = readFileSync2(filePath, "utf-8");
+    raw = readFileSync4(filePath, "utf-8");
   } catch {
     return { threads: /* @__PURE__ */ new Map(), pruned: 0 };
   }
@@ -15117,8 +15299,8 @@ function createThreadPersister(opts) {
   let pendingSnapshot = null;
   const writeNow = (snap) => {
     try {
-      mkdirSync(dirname(opts.filePath), { recursive: true });
-      writeFileSync(opts.filePath, serializeThreadStore(snap), "utf-8");
+      mkdirSync2(dirname2(opts.filePath), { recursive: true });
+      writeFileSync2(opts.filePath, serializeThreadStore(snap), "utf-8");
       lastWriteAt = Date.now();
     } catch (err) {
       opts.onError?.(
@@ -15186,6 +15368,72 @@ async function runOrRetry(fn, opts) {
   }
 }
 
+// src/slack-bot-photo.ts
+import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
+import { dirname as dirname3 } from "path";
+async function applyBotPhoto(opts) {
+  const fetchImpl = opts.fetchImpl ?? fetch;
+  const log = opts.log ?? ((m) => {
+    process.stderr.write(m);
+  });
+  const { token, avatarUrl, markerPath } = opts;
+  if (markerPath && existsSync4(markerPath)) {
+    try {
+      if (readFileSync5(markerPath, "utf-8").trim() === avatarUrl) {
+        return { status: "skipped-unchanged" };
+      }
+    } catch {
+    }
+  }
+  try {
+    const imgRes = await fetchImpl(avatarUrl, { signal: AbortSignal.timeout(1e4) });
+    if (!imgRes.ok) {
+      log(`slack-channel: avatar download failed (HTTP ${imgRes.status}) \u2014 skipping bot photo
+`);
+      return { status: "download-failed", httpStatus: imgRes.status };
+    }
+    const bytes = new Uint8Array(await imgRes.arrayBuffer());
+    const form = new FormData();
+    form.append("image", new Blob([bytes], { type: "image/jpeg" }), "avatar.jpg");
+    const res = await fetchImpl("https://slack.com/api/users.setPhoto", {
+      method: "POST",
+      headers: { Authorization: `Bearer ${token}` },
+      body: form,
+      signal: AbortSignal.timeout(15e3)
+    });
+    const data = await res.json();
+    if (!data.ok) {
+      const code = data.error ?? "unknown";
+      if (code === "missing_scope") {
+        if (!opts.warned || !opts.warned.has(code)) {
+          opts.warned?.add(code);
+          log(
+            `slack-channel: users.setPhoto failed (missing_scope) \u2014 bot avatar disabled until users.profile:write is granted (re-OAuth required)
+`
+          );
+        }
+      } else {
+        log(`slack-channel: users.setPhoto failed (${code}) \u2014 bot avatar not updated
+`);
+      }
+      return { status: "slack-error", error: code };
+    }
+    if (markerPath) {
+      try {
+        mkdirSync3(dirname3(markerPath), { recursive: true, mode: 448 });
+        writeFileSync3(markerPath, avatarUrl, { mode: 384 });
+      } catch {
+      }
+    }
+    log("slack-channel: bot profile photo updated from agent avatar\n");
+    return { status: "applied" };
+  } catch (err) {
+    log(`slack-channel: applyBotPhotoOnFirstConnect threw: ${err.message}
+`);
+    return { status: "threw", message: err.message };
+  }
+}
+
 // src/slack-inbound-files.ts
 function classifySlackFile(file) {
   if (!file || typeof file.id !== "string" || !file.id) return null;
@@ -15200,6 +15448,178 @@ function buildSafeInboundPath2(codeName, fileId, mimetype) {
   return buildSafeInboundPath(resolveSlackInboundDir(codeName), fileId, mimetype);
 }
 
+// src/slack-rich-text.ts
+var MAX_DEPTH = 12;
+function isRecord(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+function asString(v) {
+  return typeof v === "string" ? v : "";
+}
+function asArray(v) {
+  return Array.isArray(v) ? v : [];
+}
+function isTableElement(el) {
+  return isRecord(el) && asString(el.type).includes("table");
+}
+function renderEmoji(el) {
+  const unicode = asString(el.unicode);
+  if (unicode) {
+    try {
+      const cps = unicode.split("-").map((h) => parseInt(h, 16));
+      if (cps.every((n) => Number.isFinite(n) && n >= 0 && n <= 1114111)) {
+        return String.fromCodePoint(...cps);
+      }
+    } catch {
+    }
+  }
+  const name = asString(el.name);
+  return name ? `:${name}:` : "";
+}
+function renderLeaf(el) {
+  if (!isRecord(el)) return "";
+  switch (asString(el.type)) {
+    case "text":
+      return asString(el.text);
+    case "link": {
+      const label = asString(el.text);
+      const url = asString(el.url);
+      if (label && url && label !== url) return `${label} (${url})`;
+      return label || url;
+    }
+    case "emoji":
+      return renderEmoji(el);
+    case "user":
+      return `<@${asString(el.user_id)}>`;
+    case "usergroup":
+      return `<!subteam^${asString(el.usergroup_id)}>`;
+    case "channel":
+      return `<#${asString(el.channel_id)}>`;
+    case "broadcast":
+      return `@${asString(el.range) || "channel"}`;
+    case "date":
+      return asString(el.fallback) || asString(el.timestamp);
+    default:
+      if (Array.isArray(el.elements)) return renderInline(el.elements);
+      return asString(el.text);
+  }
+}
+function renderInline(elements) {
+  return elements.map(renderLeaf).join("");
+}
+function deepText(node, depth) {
+  if (depth > MAX_DEPTH) return "";
+  if (typeof node === "string") return node;
+  if (Array.isArray(node)) return node.map((n) => deepText(n, depth + 1)).join("");
+  if (!isRecord(node)) return "";
+  const type = asString(node.type);
+  if (type && type !== "rich_text" && !type.startsWith("rich_text_") && !type.includes("table")) {
+    return renderLeaf(node);
+  }
+  if (Array.isArray(node.elements)) return node.elements.map((n) => deepText(n, depth + 1)).join("");
+  if (Array.isArray(node.rows)) return node.rows.map((n) => deepText(n, depth + 1)).join(" ");
+  return asString(node.text);
+}
+function renderCell(cell) {
+  if (!isRecord(cell)) return deepText(cell, 0).replace(/\s*\n\s*/g, " ").trim();
+  const inner = Array.isArray(cell.elements) ? renderSection(cell, 0) : deepText(cell, 0);
+  return inner.replace(/\s*\n\s*/g, " ").trim();
+}
+function renderTable(el) {
+  const rawRows = asArray(el.elements).length ? asArray(el.elements) : asArray(el.rows);
+  const rows = [];
+  for (const row of rawRows) {
+    if (!isRecord(row) && !Array.isArray(row)) continue;
+    const rawCells = Array.isArray(row) ? row : asArray(row.elements).length ? asArray(row.elements) : asArray(row.cells);
+    if (rawCells.length === 0) continue;
+    rows.push(rawCells.map(renderCell));
+  }
+  if (rows.length === 0) {
+    const fallback = deepText(el, 0).replace(/[ \t]+\n/g, "\n").trim();
+    return fallback;
+  }
+  const colCount = rows.reduce((max, r) => Math.max(max, r.length), 0);
+  const pad = (r) => {
+    const cells = r.slice();
+    while (cells.length < colCount) cells.push("");
+    return cells.map((c) => c.replace(/\|/g, "\\|"));
+  };
+  const lines = [];
+  const header = rows[0] ?? [];
+  const body = rows.slice(1);
+  lines.push(`| ${pad(header).join(" | ")} |`);
+  lines.push(`| ${Array.from({ length: colCount }, () => "---").join(" | ")} |`);
+  for (const r of body) lines.push(`| ${pad(r).join(" | ")} |`);
+  return lines.join("\n");
+}
+function renderSection(section, depth) {
+  if (depth > MAX_DEPTH || !isRecord(section)) return "";
+  const type = asString(section.type);
+  if (isTableElement(section)) return renderTable(section);
+  switch (type) {
+    case "rich_text_section":
+      return renderInline(asArray(section.elements));
+    case "rich_text_preformatted": {
+      const code = renderInline(asArray(section.elements));
+      return code ? `\`\`\`
+${code}
+\`\`\`` : "";
+    }
+    case "rich_text_quote": {
+      const quoted = renderInline(asArray(section.elements));
+      return quoted ? quoted.split("\n").map((l) => `> ${l}`).join("\n") : "";
+    }
+    case "rich_text_list": {
+      const ordered = asString(section.style) === "ordered";
+      const items = asArray(section.elements).map((item, i) => {
+        const body = renderSection(item, depth + 1) || renderInline(asArray(item?.elements));
+        const marker = ordered ? `${i + 1}.` : "-";
+        return `${marker} ${body}`.trimEnd();
+      });
+      return items.join("\n");
+    }
+    default:
+      if (Array.isArray(section.elements)) return renderInline(asArray(section.elements));
+      return deepText(section, depth + 1);
+  }
+}
+function renderSlackBlocks(blocks) {
+  let hadTable = false;
+  const out = [];
+  try {
+    for (const block of asArray(blocks)) {
+      if (!isRecord(block) || asString(block.type) !== "rich_text") continue;
+      for (const section of asArray(block.elements)) {
+        if (isTableElement(section)) hadTable = true;
+        const rendered = renderSection(section, 0);
+        if (rendered.trim().length > 0) out.push(rendered);
+      }
+    }
+  } catch {
+  }
+  const text = out.join("\n\n").replace(/[ \t]+$/gm, "").replace(/\n{3,}/g, "\n\n").trim();
+  return { text, hadTable };
+}
+function mergeInboundText(text, blocks) {
+  const { text: rendered, hadTable } = renderSlackBlocks(blocks);
+  if (!hadTable) return { content: text, recoveredTable: false };
+  const content = rendered.length > 0 ? rendered : text;
+  return { content, recoveredTable: rendered.length > 0 && content !== text };
+}
+
+// src/slack-allowlist-source.ts
+function parseAllowedUsersCsv(raw) {
+  return new Set(
+    (raw ?? "").split(",").map((s) => s.trim()).filter((s) => s.length > 0)
+  );
+}
+function extractAllowedUsersFromMcpJson(jsonText) {
+  const parsed = JSON.parse(jsonText);
+  const slackServer = parsed.mcpServers?.["slack"];
+  if (!slackServer) return null;
+  return parseAllowedUsersCsv(slackServer.env?.["SLACK_ALLOWED_USERS"]);
+}
+
 // src/slack-response-mode.ts
 var MODES = [
   "mention_only",
@@ -15752,14 +16172,14 @@ function createSlackBotUserIdClient(args) {
 
 // src/mcp-spawn-lock.ts
 import {
-  existsSync as existsSync2,
-  mkdirSync as mkdirSync2,
-  readFileSync as readFileSync3,
-  renameSync,
-  unlinkSync as unlinkSync2,
-  writeFileSync as writeFileSync2
+  existsSync as existsSync5,
+  mkdirSync as mkdirSync4,
+  readFileSync as readFileSync6,
+  renameSync as renameSync2,
+  unlinkSync as unlinkSync3,
+  writeFileSync as writeFileSync4
 } from "fs";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 function defaultIsPidAlive(pid) {
   if (!Number.isFinite(pid) || pid <= 0) return false;
   try {
@@ -15777,7 +16197,7 @@ function acquireMcpSpawnLock(args) {
   const isPidAlive = options.isPidAlive ?? defaultIsPidAlive;
   const selfPid = options.selfPid ?? process.pid;
   const now = options.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
-  const path = join4(agentDir, basename2);
+  const path = join5(agentDir, basename2);
   const existing = readLockHolder(path);
   if (existing) {
     if (existing.pid === selfPid) {
@@ -15787,11 +16207,11 @@ function acquireMcpSpawnLock(args) {
       return { kind: "blocked", path, holder: existing };
     }
   }
-  mkdirSync2(agentDir, { recursive: true, mode: 448 });
+  mkdirSync4(agentDir, { recursive: true, mode: 448 });
   const tmpPath = `${path}.${selfPid}.tmp`;
   const payload = { pid: selfPid, started_at: now() };
-  writeFileSync2(tmpPath, JSON.stringify(payload), { mode: 384 });
-  renameSync(tmpPath, path);
+  writeFileSync4(tmpPath, JSON.stringify(payload), { mode: 384 });
+  renameSync2(tmpPath, path);
   return { kind: "acquired", path };
 }
 function releaseMcpSpawnLock(lockPath, opts = {}) {
@@ -15801,14 +16221,14 @@ function releaseMcpSpawnLock(lockPath, opts = {}) {
   if (!existing) return;
   if (existing.pid !== selfPid) return;
   try {
-    unlinkSync2(lockPath);
+    unlinkSync3(lockPath);
   } catch {
   }
 }
 function readLockHolder(path) {
-  if (!existsSync2(path)) return null;
+  if (!existsSync5(path)) return null;
   try {
-    const raw = readFileSync3(path, "utf8");
+    const raw = readFileSync6(path, "utf8");
     const parsed = JSON.parse(raw);
     const pid = typeof parsed.pid === "number" ? parsed.pid : Number(parsed.pid);
     if (!Number.isFinite(pid) || pid <= 0) return null;
@@ -15823,6 +16243,7 @@ function readLockHolder(path) {
 var BOT_TOKEN = process.env.SLACK_BOT_TOKEN;
 var APP_TOKEN = process.env.SLACK_APP_TOKEN;
 var AGENT_CODE_NAME = process.env.AGT_AGENT_CODE_NAME ?? null;
+var AGENT_AVATAR_URL = process.env.SLACK_AGENT_AVATAR_URL?.trim() || null;
 var SLACK_COMMAND_MAX_LENGTH = 32;
 function agentSlashCommand(base) {
   const codeName = AGENT_CODE_NAME?.trim().toLowerCase();
@@ -15937,9 +16358,7 @@ async function maybeSendSenderPolicyDecline(args) {
 var BLOCK_KIT_ENABLED = process.env.SLACK_BLOCK_KIT_ENABLED === "true";
 var BLOCK_KIT_ASK_USER_ENABLED = process.env.SLACK_BLOCK_KIT_ASK_USER_ENABLED === "true";
 var BLOCK_KIT_DISABLED = process.env.SLACK_BLOCK_KIT_DISABLED === "true";
-var ALLOWED_USERS = new Set(
-  (process.env.SLACK_ALLOWED_USERS ?? "").split(",").map((s) => s.trim()).filter(Boolean)
-);
+var ALLOWED_USERS = parseAllowedUsersCsv(process.env.SLACK_ALLOWED_USERS);
 var THREAD_AUTO_FOLLOW = process.env.SLACK_THREAD_AUTO_FOLLOW ?? "off";
 var CHANNEL_RESPONSE_MODE = parseResponseMode(process.env.SLACK_CHANNEL_RESPONSE_MODE);
 var SLACK_PEER_DISABLED_MODE = (() => {
@@ -15985,10 +16404,34 @@ var SLACK_PEER_CLASSIFIER_CONFIG = {
   peers: parsePeersEnv(process.env.SLACK_PEERS, process.env.SLACK_PEERS_GATE),
   peer_disabled_mode: SLACK_PEER_DISABLED_MODE
 };
-var SLACK_AGENT_DIR = AGENT_CODE_NAME ? join5(homedir2(), ".augmented", AGENT_CODE_NAME) : null;
-var SLACK_PENDING_INBOUND_DIR = SLACK_AGENT_DIR ? join5(SLACK_AGENT_DIR, "slack-pending-inbound") : null;
-var SLACK_RECOVERY_OUTBOX_DIR = SLACK_AGENT_DIR ? join5(SLACK_AGENT_DIR, "slack-recovery-outbox") : null;
+var SLACK_AGENT_DIR = AGENT_CODE_NAME ? join6(homedir2(), ".augmented", AGENT_CODE_NAME) : null;
+var SLACK_MCP_CONFIG_PATH = SLACK_AGENT_DIR ? join6(SLACK_AGENT_DIR, "project", ".mcp.json") : null;
+var liveAllowedUsersCache = null;
+function readLiveAllowedUsers() {
+  if (!SLACK_MCP_CONFIG_PATH) return null;
+  try {
+    const mtimeMs = statSync2(SLACK_MCP_CONFIG_PATH).mtimeMs;
+    if (liveAllowedUsersCache && liveAllowedUsersCache.mtimeMs === mtimeMs) {
+      return liveAllowedUsersCache.value;
+    }
+    const value = extractAllowedUsersFromMcpJson(
+      readFileSync7(SLACK_MCP_CONFIG_PATH, "utf-8")
+    );
+    if (value === null) return null;
+    liveAllowedUsersCache = { mtimeMs, value };
+    return value;
+  } catch {
+    return null;
+  }
+}
+function getEffectiveAllowedUsers() {
+  return readLiveAllowedUsers() ?? ALLOWED_USERS;
+}
+var SLACK_PENDING_INBOUND_DIR = SLACK_AGENT_DIR ? join6(SLACK_AGENT_DIR, "slack-pending-inbound") : null;
+var SLACK_RECOVERY_OUTBOX_DIR = SLACK_AGENT_DIR ? join6(SLACK_AGENT_DIR, "slack-recovery-outbox") : null;
+var SLACK_RESTART_CONFIRM_FILE = SLACK_AGENT_DIR ? join6(SLACK_AGENT_DIR, "slack-restart-confirm.json") : null;
 var SLACK_MAX_RECOVERY_ATTEMPTS = 3;
+var SLACK_AVATAR_MARKER_PATH = SLACK_AGENT_DIR ? join6(SLACK_AGENT_DIR, "slack-avatar-applied") : null;
 function redactSlackId(id) {
   if (!id) return "<none>";
   return createHash("sha256").update(id).digest("hex").slice(0, 8);
@@ -15999,7 +16442,7 @@ function safeSlackMarkerName(channel, threadTs, messageTs) {
 }
 function slackPendingInboundPath(channel, threadTs, messageTs) {
   if (!SLACK_PENDING_INBOUND_DIR) return null;
-  return join5(SLACK_PENDING_INBOUND_DIR, safeSlackMarkerName(channel, threadTs, messageTs));
+  return join6(SLACK_PENDING_INBOUND_DIR, safeSlackMarkerName(channel, threadTs, messageTs));
 }
 function writeSlackPendingInboundMarker(channel, threadTs, messageTs, undeliverable = false) {
   const path = slackPendingInboundPath(channel, threadTs, messageTs);
@@ -16013,8 +16456,8 @@ function writeSlackPendingInboundMarker(channel, threadTs, messageTs, undelivera
     ...undeliverable ? { undeliverable: true } : {}
   };
   try {
-    mkdirSync3(SLACK_PENDING_INBOUND_DIR, { recursive: true, mode: 448 });
-    writeFileSync3(path, JSON.stringify(marker), { mode: 384 });
+    mkdirSync5(SLACK_PENDING_INBOUND_DIR, { recursive: true, mode: 448 });
+    writeFileSync5(path, JSON.stringify(marker), { mode: 384 });
   } catch (err) {
     process.stderr.write(
       `slack-channel(${AGENT_CODE_NAME}): pending-inbound marker write failed: ${err.message}
@@ -16022,6 +16465,15 @@ function writeSlackPendingInboundMarker(channel, threadTs, messageTs, undelivera
     );
   }
 }
+function readSlackPendingInboundMarker(channel, threadTs, messageTs) {
+  const path = slackPendingInboundPath(channel, threadTs, messageTs);
+  if (!path || !existsSync6(path)) return null;
+  try {
+    return JSON.parse(readFileSync7(path, "utf-8"));
+  } catch {
+    return null;
+  }
+}
 function healSlackUndeliverable(channel, messageTs) {
   if (!BOT_TOKEN || !channel || !messageTs) return;
   const headers = {
@@ -16072,10 +16524,71 @@ function postUndeliverableNotice(channel, threadTs, isThreadReply) {
 function __resetSlackUndeliverableNoticeThrottle() {
   lastSlackUndeliverableNoticeAt.clear();
 }
+var lastSlackBusyAckNoticeAt = /* @__PURE__ */ new Map();
+function postBusyAckNotice(channel, threadTs, isThreadReply) {
+  if (!BOT_TOKEN || !channel) return;
+  const now = Date.now();
+  const conversationKey = isThreadReply && threadTs ? `${channel}:${threadTs}` : channel;
+  if (!shouldPostUndeliverableNotice(
+    lastSlackBusyAckNoticeAt.get(conversationKey),
+    now,
+    BUSY_ACK_NOTICE_THROTTLE_MS
+  )) {
+    return;
+  }
+  lastSlackBusyAckNoticeAt.set(conversationKey, now);
+  fetch("https://slack.com/api/chat.postMessage", {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${BOT_TOKEN}`
+    },
+    body: JSON.stringify({
+      channel,
+      text: busyAckNoticeText(),
+      ...threadTs ? { thread_ts: threadTs } : {}
+    }),
+    // Bound the request so a hung Slack call can't dangle to the platform
+    // timeout (matches the other bounded REST calls in this file). 10s mirrors
+    // Telegram's busy-ack send; fire-and-forget, an abort is swallowed below.
+    signal: AbortSignal.timeout(1e4)
+  }).catch(() => {
+  });
+}
+function scheduleBusyAck(channel, threadTs, messageTs, isThreadReply) {
+  if (!channelBusyAckEnabled()) return;
+  const thresholdMs = channelBusyAckThresholdMs();
+  const timer = setTimeout(() => {
+    const probe = process.env.TMUX && AGENT_CODE_NAME ? probeAgentSessionCached(AGENT_CODE_NAME) : { tmux: "unknown", claude: "unknown" };
+    let paneLogFreshAgeMs = null;
+    if (SLACK_AGENT_DIR) {
+      try {
+        const paneMtimeMs = statSync2(join6(SLACK_AGENT_DIR, "pane.log")).mtimeMs;
+        paneLogFreshAgeMs = Math.max(0, Date.now() - paneMtimeMs);
+      } catch {
+      }
+    }
+    const marker = readSlackPendingInboundMarker(channel, threadTs, messageTs);
+    if (!marker) return;
+    const post = decideBusyAck({
+      hasTarget: Boolean(channel && messageTs),
+      stillPending: true,
+      pendingAgeMs: Math.max(0, Date.now() - Date.parse(marker.received_at)),
+      sessionAlive: probe.tmux === "alive" && probe.claude === "alive",
+      paneLogFreshAgeMs,
+      thresholdMs
+    });
+    if (post) postBusyAckNotice(channel, threadTs, isThreadReply);
+  }, thresholdMs);
+  timer.unref();
+}
+function __resetSlackBusyAckNoticeThrottle() {
+  lastSlackBusyAckNoticeAt.clear();
+}
 function clearSlackMarkerFileWithHeal(fullPath) {
   let marker = null;
   try {
-    marker = JSON.parse(readFileSync4(fullPath, "utf-8"));
+    marker = JSON.parse(readFileSync7(fullPath, "utf-8"));
   } catch {
   }
   if (marker && decideRecoveryHeal({
@@ -16085,7 +16598,7 @@ function clearSlackMarkerFileWithHeal(fullPath) {
     healSlackUndeliverable(marker.channel, marker.message_ts);
   }
   try {
-    if (existsSync3(fullPath)) unlinkSync3(fullPath);
+    if (existsSync6(fullPath)) unlinkSync4(fullPath);
   } catch {
   }
 }
@@ -16126,17 +16639,17 @@ function slackNextRetryName(filename) {
 async function processSlackRecoveryOutboxFile(filename) {
   if (!SLACK_RECOVERY_OUTBOX_DIR) return;
   if (filename.endsWith(".poison.json") || filename.endsWith(".tmp")) return;
-  const fullPath = join5(SLACK_RECOVERY_OUTBOX_DIR, filename);
+  const fullPath = join6(SLACK_RECOVERY_OUTBOX_DIR, filename);
   let payload;
   try {
-    payload = JSON.parse(readFileSync4(fullPath, "utf-8"));
+    payload = JSON.parse(readFileSync7(fullPath, "utf-8"));
   } catch (err) {
     process.stderr.write(
       `slack-channel(${AGENT_CODE_NAME}): recovery outbox parse failed (${filename}): ${err.message}
 `
     );
     try {
-      renameSync2(fullPath, `${fullPath}.parse-error.poison`);
+      renameSync3(fullPath, `${fullPath}.parse-error.poison`);
     } catch {
     }
     return;
@@ -16147,7 +16660,7 @@ async function processSlackRecoveryOutboxFile(filename) {
 `
     );
     try {
-      renameSync2(fullPath, `${fullPath}.malformed.poison`);
+      renameSync3(fullPath, `${fullPath}.malformed.poison`);
     } catch {
     }
     return;
@@ -16195,7 +16708,7 @@ async function processSlackRecoveryOutboxFile(filename) {
   }
   if (sendSucceeded) {
     try {
-      unlinkSync3(fullPath);
+      unlinkSync4(fullPath);
     } catch {
     }
     return;
@@ -16203,7 +16716,7 @@ async function processSlackRecoveryOutboxFile(filename) {
   const next = slackNextRetryName(filename);
   if (next) {
     try {
-      renameSync2(fullPath, join5(SLACK_RECOVERY_OUTBOX_DIR, next.next));
+      renameSync3(fullPath, join6(SLACK_RECOVERY_OUTBOX_DIR, next.next));
       if (next.attempt >= SLACK_MAX_RECOVERY_ATTEMPTS) {
         process.stderr.write(
           `slack-channel(${AGENT_CODE_NAME}): ghost-reply recovery exhausted retries \u2014 moved to ${next.next}
@@ -16242,7 +16755,7 @@ function scanSlackRecoveryRetries() {
     if (!f.includes(".retry-") || f.endsWith(".poison.json")) continue;
     let mtimeMs;
     try {
-      mtimeMs = statSync2(join5(SLACK_RECOVERY_OUTBOX_DIR, f)).mtimeMs;
+      mtimeMs = statSync2(join6(SLACK_RECOVERY_OUTBOX_DIR, f)).mtimeMs;
     } catch {
       continue;
     }
@@ -16254,7 +16767,7 @@ function scanSlackRecoveryRetries() {
 function startSlackRecoveryOutboxWatcher() {
   if (!SLACK_RECOVERY_OUTBOX_DIR) return;
   try {
-    mkdirSync3(SLACK_RECOVERY_OUTBOX_DIR, { recursive: true, mode: 448 });
+    mkdirSync5(SLACK_RECOVERY_OUTBOX_DIR, { recursive: true, mode: 448 });
   } catch (err) {
     process.stderr.write(
       `slack-channel(${AGENT_CODE_NAME}): recovery outbox mkdir failed: ${err.message}
@@ -16272,7 +16785,7 @@ function startSlackRecoveryOutboxWatcher() {
     const watcher = watch(SLACK_RECOVERY_OUTBOX_DIR, (event, filename) => {
       if (event !== "rename" || !filename) return;
       if (!isFirstAttemptSlackOutboxFile(filename)) return;
-      if (existsSync3(join5(SLACK_RECOVERY_OUTBOX_DIR, filename))) {
+      if (existsSync6(join6(SLACK_RECOVERY_OUTBOX_DIR, filename))) {
         void processSlackRecoveryOutboxFile(filename);
       }
     });
@@ -16293,7 +16806,7 @@ function trackPendingMessage(channel, threadTs, messageTs, undeliverable = false
 }
 function sweepSlackStaleMarkers(thresholdMs) {
   if (!SLACK_PENDING_INBOUND_DIR) return;
-  if (!existsSync3(SLACK_PENDING_INBOUND_DIR)) return;
+  if (!existsSync6(SLACK_PENDING_INBOUND_DIR)) return;
   let filenames;
   try {
     filenames = readdirSync3(SLACK_PENDING_INBOUND_DIR);
@@ -16309,17 +16822,17 @@ function sweepSlackStaleMarkers(thresholdMs) {
   for (const filename of filenames) {
     if (!filename.endsWith(".json")) continue;
     if (filename.endsWith(".tmp")) continue;
-    const fullPath = join5(SLACK_PENDING_INBOUND_DIR, filename);
+    const fullPath = join6(SLACK_PENDING_INBOUND_DIR, filename);
     let marker;
     try {
-      marker = JSON.parse(readFileSync4(fullPath, "utf-8"));
+      marker = JSON.parse(readFileSync7(fullPath, "utf-8"));
     } catch (err) {
       process.stderr.write(
         `slack-channel(${AGENT_CODE_NAME}): stale-marker parse failed for ${redactSlackId(filename)}: ${err.message}
 `
       );
       try {
-        unlinkSync3(fullPath);
+        unlinkSync4(fullPath);
       } catch {
       }
       cleared++;
@@ -16328,7 +16841,7 @@ function sweepSlackStaleMarkers(thresholdMs) {
     const { channel, thread_ts, message_ts, received_at } = marker;
     if (!channel || !thread_ts || !message_ts || isPendingMarkerStale(received_at, now, thresholdMs)) {
       try {
-        unlinkSync3(fullPath);
+        unlinkSync4(fullPath);
       } catch {
       }
       cleared++;
@@ -16351,14 +16864,14 @@ var slackOrphanSweepTimer = setInterval(() => {
 slackOrphanSweepTimer.unref?.();
 var lastSlackGiveUpHandledAtMs = null;
 function listPendingSlackConversations() {
-  if (!SLACK_PENDING_INBOUND_DIR || !existsSync3(SLACK_PENDING_INBOUND_DIR)) return [];
+  if (!SLACK_PENDING_INBOUND_DIR || !existsSync6(SLACK_PENDING_INBOUND_DIR)) return [];
   const byKey = /* @__PURE__ */ new Map();
   try {
     for (const name of readdirSync3(SLACK_PENDING_INBOUND_DIR)) {
       if (!name.endsWith(".json")) continue;
       try {
         const marker = JSON.parse(
-          readFileSync4(join5(SLACK_PENDING_INBOUND_DIR, name), "utf8")
+          readFileSync7(join6(SLACK_PENDING_INBOUND_DIR, name), "utf8")
         );
         if (typeof marker.channel !== "string" || !marker.channel) continue;
         if (typeof marker.thread_ts !== "string" || !marker.thread_ts) continue;
@@ -16408,7 +16921,7 @@ function postSlackWatchdogGiveUpNotice(channel, threadTs, isThreadReply) {
 }
 function checkSlackWatchdogGiveUpNotice() {
   if (!SLACK_AGENT_DIR) return;
-  const signalAtMs = readGiveUpSignalAtMs(join5(SLACK_AGENT_DIR, GIVE_UP_SIGNAL_FILENAME));
+  const signalAtMs = readGiveUpSignalAtMs(join6(SLACK_AGENT_DIR, GIVE_UP_SIGNAL_FILENAME));
   const act = decideGiveUpNotice({
     signalAtMs,
     lastHandledAtMs: lastSlackGiveUpHandledAtMs,
@@ -16435,7 +16948,7 @@ async function notifyStrandedInboundsOnFirstConnect() {
   strandedInboundNoticeInFlight = true;
   let hadFailure = false;
   try {
-    if (!SLACK_PENDING_INBOUND_DIR || !existsSync3(SLACK_PENDING_INBOUND_DIR)) return;
+    if (!SLACK_PENDING_INBOUND_DIR || !existsSync6(SLACK_PENDING_INBOUND_DIR)) return;
     let filenames;
     try {
       filenames = readdirSync3(SLACK_PENDING_INBOUND_DIR);
@@ -16448,10 +16961,10 @@ async function notifyStrandedInboundsOnFirstConnect() {
     let notified = 0;
     for (const filename of filenames) {
       if (!filename.endsWith(".json")) continue;
-      const fullPath = join5(SLACK_PENDING_INBOUND_DIR, filename);
+      const fullPath = join6(SLACK_PENDING_INBOUND_DIR, filename);
       let marker;
       try {
-        marker = JSON.parse(readFileSync4(fullPath, "utf-8"));
+        marker = JSON.parse(readFileSync7(fullPath, "utf-8"));
       } catch {
         continue;
       }
@@ -16464,7 +16977,7 @@ async function notifyStrandedInboundsOnFirstConnect() {
       const key2 = `${channel}__${thread_ts}`;
       if (seen.has(key2)) {
         try {
-          unlinkSync3(fullPath);
+          unlinkSync4(fullPath);
         } catch {
         }
         continue;
@@ -16478,7 +16991,7 @@ async function notifyStrandedInboundsOnFirstConnect() {
       if (res.ok) {
         notified += 1;
         try {
-          unlinkSync3(fullPath);
+          unlinkSync4(fullPath);
         } catch {
         }
       } else {
@@ -16500,6 +17013,73 @@ async function notifyStrandedInboundsOnFirstConnect() {
     strandedInboundNoticeInFlight = false;
   }
 }
+var restartConfirmNoticeFired = false;
+var restartConfirmNoticeInFlight = false;
+var firstConnectNoticesGated = false;
+var suppressStrandedForBoot = false;
+async function notifyRestartCompleteOnFirstConnect() {
+  if (restartConfirmNoticeFired || restartConfirmNoticeInFlight) return;
+  if (!SLACK_RESTART_CONFIRM_FILE) return;
+  restartConfirmNoticeInFlight = true;
+  let hadFailure = false;
+  try {
+    const marker = readRestartConfirmMarker(SLACK_RESTART_CONFIRM_FILE);
+    if (!shouldPostRestartConfirm(marker, SLACK_PROCESS_BOOT_MS, Date.now())) {
+      if (marker) clearRestartConfirmMarker(SLACK_RESTART_CONFIRM_FILE);
+      return;
+    }
+    const channel = marker.reply["channel"];
+    if (channel == null) {
+      clearRestartConfirmMarker(SLACK_RESTART_CONFIRM_FILE);
+      return;
+    }
+    const threadTs = marker.reply["thread_ts"];
+    const res = await postSlackMessage({
+      channel: String(channel),
+      ...threadTs != null ? { thread_ts: String(threadTs) } : {},
+      text: buildBackOnlineText(marker.requester_name)
+    });
+    if (res.ok) {
+      clearRestartConfirmMarker(SLACK_RESTART_CONFIRM_FILE);
+      process.stderr.write(
+        `slack-channel(${AGENT_CODE_NAME}): posted back-online confirmation after restart
+`
+      );
+    } else {
+      hadFailure = true;
+      process.stderr.write(
+        `slack-channel(${AGENT_CODE_NAME}): back-online confirmation failed: ${res.error}
+`
+      );
+    }
+  } catch (err) {
+    hadFailure = true;
+    process.stderr.write(
+      `slack-channel(${AGENT_CODE_NAME}): back-online confirmation threw: ${redactAugmentedPaths2(err.message)}
+`
+    );
+  } finally {
+    if (!hadFailure) restartConfirmNoticeFired = true;
+    restartConfirmNoticeInFlight = false;
+  }
+}
+function writeSlackRestartConfirm(reply, requesterName) {
+  if (!SLACK_RESTART_CONFIRM_FILE) return;
+  const marker = {
+    source: "slack",
+    requested_at: Date.now(),
+    ...requesterName ? { requester_name: requesterName } : {},
+    reply
+  };
+  try {
+    writeRestartConfirmMarker(SLACK_RESTART_CONFIRM_FILE, marker);
+  } catch (err) {
+    process.stderr.write(
+      `slack-channel(${AGENT_CODE_NAME}): restart-confirm marker write failed: ${redactAugmentedPaths2(err.message)}
+`
+    );
+  }
+}
 function clearPendingMessage(channel, threadTs) {
   clearAllSlackPendingMarkersForThread2(channel, threadTs);
 }
@@ -16511,7 +17091,7 @@ function noteThreadActivityByMessageTs(channel, messageTs) {
   if (!channel || !messageTs) return;
   clearPendingMessage(channel, messageTs);
   if (!SLACK_PENDING_INBOUND_DIR) return;
-  if (!existsSync3(SLACK_PENDING_INBOUND_DIR)) return;
+  if (!existsSync6(SLACK_PENDING_INBOUND_DIR)) return;
   let filenames;
   try {
     filenames = readdirSync3(SLACK_PENDING_INBOUND_DIR);
@@ -16525,10 +17105,10 @@ function noteThreadActivityByMessageTs(channel, messageTs) {
   for (const filename of filenames) {
     if (!filename.startsWith(channelPrefix)) continue;
     if (!filename.endsWith(messageSuffix)) continue;
-    clearSlackMarkerFileWithHeal(join5(SLACK_PENDING_INBOUND_DIR, filename));
+    clearSlackMarkerFileWithHeal(join6(SLACK_PENDING_INBOUND_DIR, filename));
   }
 }
-var RESTART_FLAGS_DIR = join5(homedir2(), ".augmented", "restart-flags");
+var RESTART_FLAGS_DIR = join6(homedir2(), ".augmented", "restart-flags");
 function buildAugmentedSlackMetadata() {
   if (!AGT_TEAM_ID) return void 0;
   return {
@@ -16579,9 +17159,9 @@ function buildSlackHelpMessage(codeName) {
     `\u{1F916} *Available commands for \`${codeName}\`*`,
     "",
     "All commands are real Slack slash commands (autocomplete via `/`). For backward compatibility, `/help` and the restart command can also be typed as plain messages in any channel where the bot is present:",
-    "\u2022 `/help` \u2014 show this help",
+    `\u2022 \`${agentSlashCommand("/help")}\` (or type \`/help\`) \u2014 show this help`,
     `\u2022 \`${agentSlashCommand("/restart")}\` \u2014 restart this agent`,
-    `\u2022 \`${agentSlashCommand("/agent-status")}\` \u2014 report whether this agent is online + last activity`,
+    `\u2022 \`${agentSlashCommand("/status")}\` \u2014 this agent's model, session origin, uptime + connectivity`,
     "\u2022 `/kill` \u2014 silence all agents in this thread for 6h (use as a thread reply)",
     "\u2022 `/unkill` \u2014 clear a kill (use as a thread reply)",
     `\u2022 \`${agentSlashCommand("/investigate")}\` \u2014 live tail of this agent's terminal pane (DM only, allowlisted users; works while the channel process is alive \u2014 a wedged host still needs SSM diagnostics)`
@@ -16642,6 +17222,19 @@ function clearBotStatusBestEffort() {
   }).catch(() => {
   });
 }
+var botPhotoApplyFired = false;
+var setBotPhotoWarnedErrors = /* @__PURE__ */ new Set();
+async function applyBotPhotoOnFirstConnect() {
+  if (botPhotoApplyFired) return;
+  if (!BOT_TOKEN || !AGENT_AVATAR_URL) return;
+  botPhotoApplyFired = true;
+  await applyBotPhoto({
+    token: BOT_TOKEN,
+    avatarUrl: AGENT_AVATAR_URL,
+    markerPath: SLACK_AVATAR_MARKER_PATH,
+    warned: setBotPhotoWarnedErrors
+  });
+}
 function formatLastActivity() {
   if (lastActivityAt == null || lastActivityKind == null) return "no activity yet";
   const seconds = Math.max(0, Math.floor((Date.now() - lastActivityAt) / 1e3));
@@ -16653,7 +17246,9 @@ function buildAgentStatusReply(codeName) {
   const connected = currentWs != null && !isShuttingDown;
   const dot = connected ? "\u{1F7E2}" : "\u{1F534}";
   const state = connected ? "online" : "offline";
-  return `${dot} \`${codeName}\` is *${state}* \u2014 Socket Mode ${connected ? "connected" : "disconnected"}. Last activity: ${formatLastActivity()}.`;
+  const connectivityLine = `${dot} *${state}* \u2014 Socket Mode ${connected ? "connected" : "disconnected"}. Last activity: ${formatLastActivity()}.`;
+  const sessionState = readAgentSessionState(SLACK_AGENT_DIR);
+  return buildAgentConfigReport({ codeName, connectivityLine, state: sessionState });
 }
 async function postEphemeralViaResponseUrl(responseUrl, text, logTag) {
   try {
@@ -16775,7 +17370,7 @@ async function handleDebugSlashCommand(payload, responseUrl) {
   const verdict = evaluateDebugGate({
     channelId: payload.channel_id,
     userId: payload.user_id,
-    allowedUsers: ALLOWED_USERS
+    allowedUsers: getEffectiveAllowedUsers()
   });
   const investigateCmd = agentSlashCommand("/investigate");
   if (!verdict.ok) {
@@ -16868,16 +17463,17 @@ async function handleSlashCommandEnvelope(payload) {
   const responseUrl = payload.response_url;
   const codeName = AGENT_CODE_NAME ?? "unknown";
   if (!command || !responseUrl) return;
-  if (matchesAgentCommand(command, "/agent-status")) {
+  if (matchesAgentCommand(command, "/status") || matchesAgentCommand(command, "/agent-status")) {
     await postEphemeralViaResponseUrl(responseUrl, buildAgentStatusReply(codeName), codeName);
     return;
   }
-  if (command === "/help") {
+  if (matchesAgentCommand(command, "/help")) {
     await postEphemeralViaResponseUrl(responseUrl, buildSlackHelpMessage(codeName), codeName);
     return;
   }
   if (matchesAgentCommand(command, "/restart")) {
-    if (ALLOWED_USERS.size > 0 && (!payload.user_id || !ALLOWED_USERS.has(payload.user_id))) {
+    const restartAllowedUsers = getEffectiveAllowedUsers();
+    if (restartAllowedUsers.size > 0 && (!payload.user_id || !restartAllowedUsers.has(payload.user_id))) {
       process.stderr.write(
         `slack-channel(${codeName}): /restart slash-command denied \u2014 user not in SLACK_ALLOWED_USERS
 `
@@ -16898,10 +17494,17 @@ async function handleSlashCommandEnvelope(payload) {
       return;
     }
     try {
-      if (!existsSync3(RESTART_FLAGS_DIR)) {
-        mkdirSync3(RESTART_FLAGS_DIR, { recursive: true });
+      if (!existsSync6(RESTART_FLAGS_DIR)) {
+        mkdirSync5(RESTART_FLAGS_DIR, { recursive: true });
       }
-      const flagPath = join5(RESTART_FLAGS_DIR, `${codeName}.flag`);
+      const flagPath = join6(RESTART_FLAGS_DIR, `${codeName}.flag`);
+      writeSlackRestartConfirm(
+        {
+          channel: payload.channel_id,
+          ...payload.thread_ts ? { thread_ts: payload.thread_ts } : {}
+        },
+        payload.user_name
+      );
       const flag = {
         codeName,
         source: "slack",
@@ -16911,9 +17514,9 @@ async function handleSlashCommandEnvelope(payload) {
           ...payload.thread_ts ? { thread_ts: payload.thread_ts } : {}
         }
       };
-      const tmpPath = `${flagPath}.${process.pid}.${randomUUID()}.tmp`;
-      writeFileSync3(tmpPath, JSON.stringify(flag) + "\n", "utf8");
-      renameSync2(tmpPath, flagPath);
+      const tmpPath = `${flagPath}.${process.pid}.${randomUUID2()}.tmp`;
+      writeFileSync5(tmpPath, JSON.stringify(flag) + "\n", "utf8");
+      renameSync3(tmpPath, flagPath);
       process.stderr.write(
         `slack-channel(${codeName}): /restart slash-command queued from channel ${hashChannelId(payload.channel_id)}
 `
@@ -17009,10 +17612,17 @@ async function handleHelpCommand(opts) {
 async function handleRestartCommand(opts) {
   const codeName = AGENT_CODE_NAME ?? "unknown";
   try {
-    if (!existsSync3(RESTART_FLAGS_DIR)) {
-      mkdirSync3(RESTART_FLAGS_DIR, { recursive: true });
+    if (!existsSync6(RESTART_FLAGS_DIR)) {
+      mkdirSync5(RESTART_FLAGS_DIR, { recursive: true });
     }
-    const flagPath = join5(RESTART_FLAGS_DIR, `${codeName}.flag`);
+    const flagPath = join6(RESTART_FLAGS_DIR, `${codeName}.flag`);
+    writeSlackRestartConfirm(
+      {
+        channel: opts.channel,
+        ...opts.threadTs ? { thread_ts: opts.threadTs } : {}
+      },
+      opts.requesterName
+    );
     const flag = {
       codeName,
       source: "slack",
@@ -17023,9 +17633,9 @@ async function handleRestartCommand(opts) {
         message_ts: opts.ts
       }
     };
-    const tmpPath = `${flagPath}.${process.pid}.${randomUUID()}.tmp`;
-    writeFileSync3(tmpPath, JSON.stringify(flag) + "\n", "utf8");
-    renameSync2(tmpPath, flagPath);
+    const tmpPath = `${flagPath}.${process.pid}.${randomUUID2()}.tmp`;
+    writeFileSync5(tmpPath, JSON.stringify(flag) + "\n", "utf8");
+    renameSync3(tmpPath, flagPath);
     process.stderr.write(
       `slack-channel(${codeName}): /restart queued from channel ${hashChannelId(opts.channel)}
 `
@@ -17071,7 +17681,7 @@ var THREAD_STORE_TTL_DAYS = parseTtlDays(process.env.SLACK_THREAD_FOLLOW_TTL_DAY
 var threadPersister = null;
 function resolveThreadStorePath() {
   if (!AGENT_CODE_NAME) return null;
-  return join5(homedir2(), ".augmented", AGENT_CODE_NAME, "slack-tracked-threads.json");
+  return join6(homedir2(), ".augmented", AGENT_CODE_NAME, "slack-tracked-threads.json");
 }
 function parseTtlDays(raw) {
   if (!raw) return void 0;
@@ -17106,9 +17716,9 @@ if (!BOT_TOKEN || !APP_TOKEN) {
 var slackStderrLogStream = null;
 if (AGENT_CODE_NAME) {
   try {
-    const logDir = join5(homedir2(), ".augmented", AGENT_CODE_NAME);
-    mkdirSync3(logDir, { recursive: true });
-    slackStderrLogStream = createWriteStream(join5(logDir, "slack-channel-stderr.log"), {
+    const logDir = join6(homedir2(), ".augmented", AGENT_CODE_NAME);
+    mkdirSync5(logDir, { recursive: true });
+    slackStderrLogStream = createWriteStream(join6(logDir, "slack-channel-stderr.log"), {
       flags: "a",
       mode: 384
     });
@@ -17682,7 +18292,7 @@ ${result.formatted}` : "Thread is empty or not found."
         };
       }
       size = stat2.size;
-      bytes = readFileSync4(resolvedPath);
+      bytes = readFileSync7(resolvedPath);
     } catch (err) {
       return {
         content: [{ type: "text", text: `Failed to read file: ${err.message}` }],
@@ -18320,8 +18930,8 @@ async function downloadSlackFile(fileId, codeName) {
   if (!isPathInside(savedPath, dir)) {
     throw new Error(`refusing to write ${savedPath} outside ${dir}`);
   }
-  mkdirSync3(dir, { recursive: true });
-  writeFileSync3(savedPath, bytes, { mode: 384 });
+  mkdirSync5(dir, { recursive: true });
+  writeFileSync5(savedPath, bytes, { mode: 384 });
   try {
     chmodSync(savedPath, 384);
   } catch {
@@ -18432,7 +19042,19 @@ async function connectSocketMode() {
     process.stderr.write("slack-channel: Socket Mode connected\n");
     recordActivity("connect");
     void setBotStatus(":large_green_circle:", "Active");
-    void notifyStrandedInboundsOnFirstConnect();
+    if (!firstConnectNoticesGated) {
+      firstConnectNoticesGated = true;
+      suppressStrandedForBoot = SLACK_RESTART_CONFIRM_FILE != null && shouldPostRestartConfirm(
+        readRestartConfirmMarker(SLACK_RESTART_CONFIRM_FILE),
+        SLACK_PROCESS_BOOT_MS,
+        Date.now()
+      );
+    }
+    if (!suppressStrandedForBoot) {
+      void notifyStrandedInboundsOnFirstConnect();
+    }
+    void notifyRestartCompleteOnFirstConnect();
+    void applyBotPhotoOnFirstConnect();
   };
   ws.onmessage = async (event) => {
     try {
@@ -18486,130 +19108,134 @@ async function connectSocketMode() {
       const evt = msg.payload.event;
       if (evt.user === botUserId) return;
       if (evt.type !== "app_mention" && evt.type !== "message") return;
+      const isBot = Boolean(evt.bot_id);
       const filterDecision = decideSlackMessageForward(evt);
-      if (!filterDecision.forward) {
-        process.stderr.write(`slack-channel: dropped message event (reason=${filterDecision.reason}, subtype=${evt.subtype ?? "none"}, ts=${evt.ts ?? "n/a"})
-`);
-        return;
-      }
       const senderPolicyDecision = decideSenderPolicyForward(evt, SLACK_SENDER_POLICY);
-      if (!senderPolicyDecision.forward) {
-        const subReason = classifySlackPolicyBlock(evt, SLACK_SENDER_POLICY);
-        process.stderr.write(`slack-channel: dropped message event (reason=sender_policy, sub=${subReason}, mode=${SLACK_SENDER_POLICY.mode}, ts=${evt.ts ?? "n/a"})
-`);
-        await maybeSendSenderPolicyDecline({
-          channel: evt.channel,
-          senderId: evt.user,
-          // CR on PR #1623: top-level posts (DMs, channel root messages)
-          // arrive with no `thread_ts` and MUST decline inline, not in a
-          // new thread off the inbound message. The `?? evt.ts` fallback
-          // forced every root message into a thread reply — exactly the
-          // case the helper's "omit thread_ts when undefined" branch was
-          // meant to handle. Pass through as-is: in-thread for thread
-          // replies (thread_ts present), inline for everything else.
-          threadTs: evt.thread_ts,
-          subReason
-        }).catch((err) => {
-          process.stderr.write(
-            `slack-channel(${AGENT_CODE_NAME}): decline reply failed: ${err.message}
-`
-          );
-        });
-        return;
-      }
-      recordActivity("inbound");
-      const isDirectMessage = evt.channel?.startsWith("D");
-      const isThreadReply = !!evt.thread_ts && evt.thread_ts !== evt.ts;
-      const trackTs = evt.thread_ts ?? evt.ts ?? "";
-      const threadKey = buildThreadKey(evt.channel, trackTs);
+      const policyBlockReason = senderPolicyDecision.forward ? void 0 : classifySlackPolicyBlock(evt, SLACK_SENDER_POLICY);
+      const peerClassification = isBot ? classifyPeerMessage(
+        {
+          text: evt.text,
+          channel: evt.channel ?? "",
+          channel_type: evt.channel_type,
+          user: evt.user,
+          bot_id: evt.bot_id,
+          thread_ts: evt.thread_ts,
+          parent_user_id: evt.parent_user_id
+        },
+        SLACK_PEER_CLASSIFIER_CONFIG,
+        { bot_user_id: botUserId }
+      ) : void 0;
       const rawText = evt.text ?? "";
       const strippedText = rawText.replace(/^\s*<@[^>]+>\s*/, "").trim();
       const restartSuffixed = agentSlashCommand("/restart");
+      const helpSuffixed = agentSlashCommand("/help");
       const isRestartCommand = strippedText === "/restart" || strippedText.startsWith("/restart ") || strippedText === restartSuffixed || strippedText.startsWith(`${restartSuffixed} `);
-      const isHelpCommand = strippedText === "/help" || strippedText.startsWith("/help ");
-      if (isHelpCommand) {
-        await handleHelpCommand({
-          channel: evt.channel ?? "",
-          threadTs: evt.thread_ts,
-          ts: evt.ts ?? ""
-        });
+      const isHelpCommand = strippedText === "/help" || strippedText.startsWith("/help ") || strippedText === helpSuffixed || strippedText.startsWith(`${helpSuffixed} `);
+      const command = isBot ? void 0 : isHelpCommand ? { command: "help", authorized: true } : isRestartCommand ? { command: "restart", authorized: isRestartSenderAllowed(getEffectiveAllowedUsers(), evt.user) } : void 0;
+      const slackHomeTeamId = process.env.SLACK_HOME_TEAM_ID;
+      const sameOrg = !!slackHomeTeamId && evt.team === slackHomeTeamId;
+      const access = decideInboundAccess({
+        content: filterDecision.forward ? { forward: true } : { forward: false, reason: filterDecision.reason },
+        // The agent's own user-echo was already skipped above; peer 'self'
+        // covers the bot-id self case inside the composer.
+        isSelf: false,
+        isBot,
+        peer: peerClassification ? {
+          kind: peerClassification.kind,
+          reason: peerClassification.kind === "drop" ? peerClassification.reason : void 0
+        } : void 0,
+        senderPolicy: senderPolicyDecision.forward ? { forward: true } : { forward: false, reason: policyBlockReason },
+        command,
+        sameOrg
+      });
+      const passedIdentity = access.kind !== "drop" || access.reason.startsWith("peer:");
+      if (passedIdentity) recordActivity("inbound");
+      if (access.kind === "drop") {
+        const channelHash = createHash("sha256").update(evt.channel ?? "").digest("hex").slice(0, 8);
+        process.stderr.write(
+          `slack-channel: inbound drop reason=${access.reason} channel=${channelHash} ts=${redactSlackId(evt.ts)}
+`
+        );
+        if (access.decline !== void 0 && policyBlockReason) {
+          await maybeSendSenderPolicyDecline({
+            channel: evt.channel,
+            senderId: evt.user,
+            threadTs: evt.thread_ts,
+            subReason: policyBlockReason
+          }).catch((err) => {
+            process.stderr.write(
+              `slack-channel(${AGENT_CODE_NAME}): decline reply failed: ${err.message}
+`
+            );
+          });
+        }
+        if (access.reason === "peer:cross_team_grant_missing") {
+          crossTeamPeerAuditClient?.emit({
+            event_type: "slack.peer.drop.cross_team_grant_missing",
+            peer_agent_id: null,
+            gate_path: null,
+            grant_id: null,
+            chat_id: evt.channel ?? null,
+            message_id: evt.ts ?? null
+          });
+        }
         return;
       }
-      if (isRestartCommand) {
-        const senderAllowed = ALLOWED_USERS.size === 0 || evt.user != null && ALLOWED_USERS.has(evt.user);
-        if (!senderAllowed) {
-          await denyUnauthorizedRestart({
+      if (access.kind === "command") {
+        if (access.command === "help") {
+          await handleHelpCommand({
             channel: evt.channel ?? "",
-            threadTs: evt.thread_ts
+            threadTs: evt.thread_ts,
+            ts: evt.ts ?? ""
           });
           return;
         }
-        await handleRestartCommand({
-          channel: evt.channel ?? "",
-          // Only carry thread_ts when the originating message was already
-          // threaded; a top-level command acks in-channel rather than
-          // synthesising a brand-new thread (CodeRabbit feedback).
-          threadTs: evt.thread_ts,
-          ts: evt.ts ?? ""
-        });
-        return;
-      }
-      if (ALLOWED_USERS.size > 0 && evt.user && !ALLOWED_USERS.has(evt.user)) return;
-      if (evt.bot_id) {
-        const peerMsg = {
-          text: evt.text,
-          channel: evt.channel ?? "",
-          channel_type: evt.channel_type,
-          user: evt.user,
-          bot_id: evt.bot_id,
-          thread_ts: evt.thread_ts,
-          parent_user_id: evt.parent_user_id
-        };
-        const decision = classifyPeerMessage(
-          peerMsg,
-          SLACK_PEER_CLASSIFIER_CONFIG,
-          { bot_user_id: botUserId }
-        );
-        if (decision.kind === "self") return;
-        if (decision.kind === "drop") {
-          const channelHash = createHash("sha256").update(evt.channel ?? "").digest("hex").slice(0, 8);
-          process.stderr.write(
-            `slack-channel: peer drop reason=${decision.reason} channel=${channelHash}
-`
-          );
-          if (decision.reason === "cross_team_grant_missing") {
-            crossTeamPeerAuditClient?.emit({
-              event_type: "slack.peer.drop.cross_team_grant_missing",
-              peer_agent_id: null,
-              gate_path: null,
-              grant_id: null,
-              chat_id: evt.channel ?? null,
-              message_id: evt.ts ?? null
+        if (access.command === "restart") {
+          if (!access.authorized) {
+            await denyUnauthorizedRestart({
+              channel: evt.channel ?? "",
+              threadTs: evt.thread_ts
             });
+            return;
           }
+          const resolvedName = await resolveUserName(evt.user);
+          const requesterName = resolvedName && resolvedName !== evt.user ? resolvedName : void 0;
+          await handleRestartCommand({
+            channel: evt.channel ?? "",
+            // Only carry thread_ts when the originating message was already
+            // threaded; a top-level command acks in-channel.
+            threadTs: evt.thread_ts,
+            ts: evt.ts ?? "",
+            requesterName
+          });
           return;
         }
-        if (decision.kind === "peer-ingress") {
-          const peerGate = decision.peer.gate_path;
-          if (peerGate === "intra_org_unrestricted") {
-            crossTeamPeerAuditClient?.emit({
-              event_type: "slack.peer.ingress.cross_team",
-              peer_agent_id: decision.peer.agent_id || null,
-              gate_path: peerGate,
-              grant_id: null,
-              chat_id: evt.channel ?? null,
-              message_id: evt.ts ?? null
-            });
-          } else if (typeof peerGate === "string" && peerGate.startsWith("grant:")) {
-            crossTeamPeerAuditClient?.emit({
-              event_type: "slack.peer.ingress.cross_team",
-              peer_agent_id: decision.peer.agent_id || null,
-              gate_path: peerGate,
-              grant_id: peerGate.slice("grant:".length),
-              chat_id: evt.channel ?? null,
-              message_id: evt.ts ?? null
-            });
-          }
+        return;
+      }
+      const isDirectMessage = evt.channel?.startsWith("D");
+      const isThreadReply = !!evt.thread_ts && evt.thread_ts !== evt.ts;
+      const trackTs = evt.thread_ts ?? evt.ts ?? "";
+      const threadKey = buildThreadKey(evt.channel, trackTs);
+      if (isBot && peerClassification?.kind === "peer-ingress") {
+        const peerGate = peerClassification.peer.gate_path;
+        if (peerGate === "intra_org_unrestricted") {
+          crossTeamPeerAuditClient?.emit({
+            event_type: "slack.peer.ingress.cross_team",
+            peer_agent_id: peerClassification.peer.agent_id || null,
+            gate_path: peerGate,
+            grant_id: null,
+            chat_id: evt.channel ?? null,
+            message_id: evt.ts ?? null
+          });
+        } else if (typeof peerGate === "string" && peerGate.startsWith("grant:")) {
+          crossTeamPeerAuditClient?.emit({
+            event_type: "slack.peer.ingress.cross_team",
+            peer_agent_id: peerClassification.peer.agent_id || null,
+            gate_path: peerGate,
+            grant_id: peerGate.slice("grant:".length),
+            chat_id: evt.channel ?? null,
+            message_id: evt.ts ?? null
+          });
         }
       }
       if (evt.type === "app_mention") {
@@ -18645,7 +19271,7 @@ async function connectSocketMode() {
       let paneLogFreshAgeMs = null;
       if (SLACK_AGENT_DIR) {
         try {
-          const paneMtimeMs = statSync2(join5(SLACK_AGENT_DIR, "pane.log")).mtimeMs;
+          const paneMtimeMs = statSync2(join6(SLACK_AGENT_DIR, "pane.log")).mtimeMs;
           paneLogFreshAgeMs = Math.max(0, Date.now() - paneMtimeMs);
         } catch {
         }
@@ -18676,6 +19302,9 @@ async function connectSocketMode() {
       }
       if (channel && ts && shouldEngage) {
         trackPendingMessage(channel, threadTs, ts, ackDecision === "undeliverable");
+        if (ackDecision === "ack") {
+          scheduleBusyAck(channel, threadTs, ts, isThreadReply);
+        }
       }
       const userName = await resolveUserName(user);
       const fileMeta = await buildInboundFileMeta(evt.files, AGENT_CODE_NAME, channel);
@@ -18706,10 +19335,17 @@ async function connectSocketMode() {
           );
         }
       }
+      const { content: inboundContent, recoveredTable } = mergeInboundText(text, evt.blocks);
+      if (recoveredTable) {
+        process.stderr.write(
+          `slack-channel(${AGENT_CODE_NAME}): recovered rich_text table from blocks (channel=${redactSlackId(channel)} ts=${redactSlackId(ts)})
+`
+        );
+      }
       await mcp.notification({
         method: "notifications/claude/channel",
         params: {
-          content: text,
+          content: inboundContent,
           meta: {
             user,
             user_name: userName,
@@ -18843,6 +19479,7 @@ if (THREAD_STORE_PATH) {
 }
 connectSocketModeSafely();
 export {
+  __resetSlackBusyAckNoticeThrottle,
   __resetSlackGiveUpNoticeStateForTests,
   __resetSlackUndeliverableNoticeThrottle
 };