@integrity-labs/agt-cli 0.27.13 → 0.27.15

package/dist/{claude-pair-runtime-ZBQKBBMT.js → claude-pair-runtime-OBAJZDXK.js}

@@ -100,7 +100,7 @@ async function spawnPairSession(session) {
     return { ok: true };
   } catch {
   }
-  const { resolveClaudeBinary } = await import("./persistent-session-ICYFLUAM.js");
+  const { resolveClaudeBinary } = await import("./persistent-session-SBSOZG74.js");
   const claudeBin = resolveClaudeBinary();
   const pairEnv = {
     ...process.env,
@@ -373,4 +373,4 @@ export {
   startClaudePair,
   submitClaudePairCode
 };
-//# sourceMappingURL=claude-pair-runtime-ZBQKBBMT.js.map
+//# sourceMappingURL=claude-pair-runtime-OBAJZDXK.js.map

package/dist/lib/manager-worker.js

@@ -15,7 +15,7 @@ import {
   provisionOrientHook,
   provisionStopHook,
   requireHost
-} from "../chunk-Q4MWFZ5Y.js";
+} from "../chunk-LJEV2QHN.js";
 import {
   getProjectDir as getProjectDir2,
   getReadyTasks,
@@ -46,7 +46,7 @@ import {
   stopAllSessionsAndWait,
   stopPersistentSession,
   takeZombieDetection
-} from "../chunk-GN4XPQWJ.js";
+} from "../chunk-F4NG4EXD.js";
 import {
   KANBAN_CHECK_COMMAND,
   appendDmFooter,
@@ -69,7 +69,7 @@ import {
   resolveConnectivityProbe,
   resolveDmTarget,
   wrapScheduledTaskPrompt
-} from "../chunk-YSBGIXJG.js";
+} from "../chunk-HT6EETEL.js";
 import {
   parsePsRows,
   reapOrphanChannelMcps
@@ -3166,7 +3166,7 @@ var cachedFrameworkVersion = null;
 var lastVersionCheckAt = 0;
 var VERSION_CHECK_INTERVAL_MS = 5 * 60 * 1e3;
 var lastResponsivenessProbeAt = 0;
-var agtCliVersion = true ? "0.27.13" : "dev";
+var agtCliVersion = true ? "0.27.15" : "dev";
 function resolveBrewPath(execFileSync4) {
   try {
     const out = execFileSync4("which", ["brew"], { timeout: 5e3 }).toString().trim();
@@ -4180,7 +4180,7 @@ async function pollCycle() {
     }
     try {
       const { detectHostSecurity } = await import("../host-security-6PDFG7F5.js");
-      const { collectDiagnostics } = await import("../persistent-session-ICYFLUAM.js");
+      const { collectDiagnostics } = await import("../persistent-session-SBSOZG74.js");
       const diagCodeNames = [...agentState.persistentSessionAgents];
       const agentDiagnostics = diagCodeNames.length > 0 ? collectDiagnostics(diagCodeNames) : void 0;
       let tailscaleHostname;
@@ -4248,7 +4248,7 @@ async function pollCycle() {
       const {
         collectResponsivenessProbes,
         getResponsivenessIntervalMs
-      } = await import("../responsiveness-probe-WZNQ2762.js");
+      } = await import("../responsiveness-probe-DU4IJ2RZ.js");
       const probeIntervalMs = getResponsivenessIntervalMs();
       if (now - lastResponsivenessProbeAt > probeIntervalMs) {
         const probeCodeNames = [...agentState.persistentSessionAgents];
@@ -8196,7 +8196,7 @@ async function processClaudePairSessions(agents) {
     killPairSession,
     pairTmuxSession,
     finalizeClaudePairOnboarding
-  } = await import("../claude-pair-runtime-ZBQKBBMT.js");
+  } = await import("../claude-pair-runtime-OBAJZDXK.js");
   for (const pairId of pendingResp.cancelled_pair_ids ?? []) {
     log(`[claude-pair] sweeping orphan tmux session for pair ${pairId.slice(0, 8)}`);
     const killed = await killPairSession(pairTmuxSession(pairId));

package/dist/mcp/slack-channel.js

@@ -14249,6 +14249,102 @@ function decideSenderPolicyForward(evt, policy) {
   return { forward: true };
 }
 
+// src/ack-reaction.ts
+import { readdirSync, readFileSync } from "fs";
+import { join } from "path";
+var REPLY_WEDGED_THRESHOLD_MS = 5 * 60 * 1e3;
+var ACK_STARTUP_GRACE_MS = 6e4;
+function decideAckReaction(i) {
+  if (!i.hasTarget) return "none";
+  if (!i.integrationReady) return "undeliverable";
+  if (i.tmux === "dead") return "undeliverable";
+  if (!i.withinStartupGrace && i.claude === "dead") return "undeliverable";
+  const threshold = i.pendingStaleThresholdMs ?? REPLY_WEDGED_THRESHOLD_MS;
+  if (i.oldestPendingAgeMs != null && i.oldestPendingAgeMs > threshold) {
+    return "undeliverable";
+  }
+  return "ack";
+}
+function oldestPendingMarkerAgeMs(dir, now = Date.now()) {
+  if (!dir) return null;
+  let names;
+  try {
+    names = readdirSync(dir);
+  } catch {
+    return null;
+  }
+  let oldest = null;
+  for (const name of names) {
+    if (!name.endsWith(".json")) continue;
+    let receivedAt;
+    try {
+      const raw = JSON.parse(readFileSync(join(dir, name), "utf-8"));
+      receivedAt = raw.received_at;
+    } catch {
+      continue;
+    }
+    if (!receivedAt) continue;
+    const t = Date.parse(receivedAt);
+    if (Number.isNaN(t)) continue;
+    const age = now - t;
+    if (age < 0) continue;
+    if (oldest == null || age > oldest) oldest = age;
+  }
+  return oldest;
+}
+
+// src/session-probe-runtime.ts
+import { execFileSync } from "child_process";
+function agentTmuxSessionName(codeName) {
+  return `agt-${codeName}`;
+}
+function escapePgrepRegex(value) {
+  return value.replace(/[.[\]{}()*+?^$|\\]/g, "\\$&");
+}
+function probeClaudeProcessInTmux(tmuxSession) {
+  const escapedSession = escapePgrepRegex(tmuxSession);
+  const pattern = `(^|[[:space:]])--name ${escapedSession}([[:space:]]|$)`;
+  try {
+    const out = execFileSync("pgrep", ["-f", "--", pattern], {
+      encoding: "utf-8",
+      timeout: 3e3
+    }).trim();
+    return out.length > 0 ? "alive" : "dead";
+  } catch (err) {
+    const e = err;
+    if (e?.code === "ENOENT") return "unknown";
+    return e?.status === 1 ? "dead" : "unknown";
+  }
+}
+function probeTmuxSession(tmuxSession) {
+  try {
+    execFileSync("tmux", ["has-session", "-t", tmuxSession], {
+      stdio: "ignore",
+      timeout: 3e3
+    });
+    return "alive";
+  } catch (err) {
+    const e = err;
+    if (e?.code === "ENOENT") return "unknown";
+    return "dead";
+  }
+}
+function probeAgentSession(codeName) {
+  const session = agentTmuxSessionName(codeName);
+  const tmux = probeTmuxSession(session);
+  const claude = tmux === "alive" ? probeClaudeProcessInTmux(session) : tmux;
+  return { tmux, claude };
+}
+var probeCache = /* @__PURE__ */ new Map();
+var SESSION_PROBE_TTL_MS = 15e3;
+function probeAgentSessionCached(codeName, ttlMs = SESSION_PROBE_TTL_MS, now = Date.now()) {
+  const cached2 = probeCache.get(codeName);
+  if (cached2 && now - cached2.at < ttlMs) return cached2.value;
+  const value = probeAgentSession(codeName);
+  probeCache.set(codeName, { at: now, value });
+  return value;
+}
+
 // src/slack-loop-throttle.ts
 var DEFAULT_THROTTLE = {
   threshold: 3,
@@ -14813,6 +14909,64 @@ function isMode(value) {
   return value === "thinking" || value === "working" || value === "waiting";
 }
 
+// src/slack-thread-context.ts
+var SLACK_AUTOLOAD_THREAD_LIMIT = 30;
+var SLACK_AUTOLOAD_THREAD_MAX_CHARS = 4e3;
+function formatThreadMessages(messages, nameById) {
+  return messages.map((m) => `[${m.ts}] ${nameById.get(m.user) ?? m.user} (<@${m.user}>): ${m.text}`).join("\n");
+}
+function capThreadContext(formatted, maxChars) {
+  if (formatted.length <= maxChars) return formatted;
+  const marker = "[\u2026earlier thread messages omitted \u2014 slack.read_thread for full history\u2026]\n";
+  if (maxChars <= marker.length) return marker.slice(0, maxChars);
+  const tailBudget = maxChars - marker.length;
+  const tail = formatted.slice(formatted.length - tailBudget);
+  const firstNewline = tail.indexOf("\n");
+  const clean = firstNewline >= 0 ? tail.slice(firstNewline + 1) : tail;
+  return `${marker}${clean}`;
+}
+async function fetchThreadTranscript(channel, threadTs, limit, deps) {
+  const { botToken, resolveUserName: resolveUserName2, fetchImpl = fetch } = deps;
+  const cappedLimit = Math.min(Math.max(limit, 1), 200);
+  const allMessages = [];
+  let cursor;
+  do {
+    const remaining = cappedLimit - allMessages.length;
+    if (remaining <= 0) break;
+    const params = new URLSearchParams({
+      channel,
+      ts: threadTs,
+      limit: String(Math.min(remaining, 100)),
+      ...cursor ? { cursor } : {}
+    });
+    let data;
+    try {
+      const res = await fetchImpl(`https://slack.com/api/conversations.replies?${params}`, {
+        headers: { Authorization: `Bearer ${botToken}` }
+      });
+      if (!res.ok) return { ok: false, error: `http_${res.status}` };
+      data = await res.json();
+    } catch (err) {
+      return { ok: false, error: err instanceof Error ? err.message : "fetch_failed" };
+    }
+    if (!data.ok) return { ok: false, error: data.error ?? "unknown" };
+    for (const msg of data.messages ?? []) {
+      allMessages.push({
+        user: msg.user ?? msg.bot_id ?? "unknown",
+        text: msg.text ?? "",
+        ts: msg.ts ?? ""
+      });
+    }
+    cursor = data.response_metadata?.next_cursor || void 0;
+  } while (cursor && allMessages.length < cappedLimit);
+  const uniqueUserIds = [...new Set(allMessages.map((m) => m.user))];
+  const resolved = await Promise.all(
+    uniqueUserIds.map(async (id) => [id, await resolveUserName2(id)])
+  );
+  const nameById = new Map(resolved);
+  return { ok: true, count: allMessages.length, formatted: formatThreadMessages(allMessages, nameById) };
+}
+
 // src/impersonation.ts
 var ENV_VAR = "AGT_ACT_AS_AGENT_ID";
 var OVERRIDE_ENV_VAR = "ENABLE_IMPERSONATION_CHANNELS";
@@ -14958,20 +15112,20 @@ import {
   createWriteStream,
   existsSync as existsSync2,
   mkdirSync as mkdirSync3,
-  readFileSync as readFileSync3,
-  readdirSync,
+  readFileSync as readFileSync4,
+  readdirSync as readdirSync2,
   renameSync as renameSync2,
   statSync,
   unlinkSync as unlinkSync2,
   watch,
   writeFileSync as writeFileSync3
 } from "fs";
-import { basename, join as join3, resolve as resolve2 } from "path";
+import { basename, join as join4, resolve as resolve2 } from "path";
 import { homedir as homedir2 } from "os";
 import { createHash, randomUUID as randomUUID2 } from "crypto";
 
 // src/slack-thread-store.ts
-import { mkdirSync, readFileSync, writeFileSync } from "fs";
+import { mkdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
 import { dirname } from "path";
 var FILE_VERSION = 1;
 var DEFAULT_TTL_DAYS = 30;
@@ -14982,7 +15136,7 @@ function loadThreadStore(filePath, opts = {}) {
   const ttlMs = ttlDays * 24 * 60 * 60 * 1e3;
   let raw;
   try {
-    raw = readFileSync(filePath, "utf-8");
+    raw = readFileSync2(filePath, "utf-8");
   } catch {
     return { threads: /* @__PURE__ */ new Map(), pruned: 0 };
   }
@@ -15097,9 +15251,9 @@ async function runOrRetry(fn, opts) {
 
 // src/channel-attachments.ts
 import { homedir } from "os";
-import { join, resolve, sep } from "path";
+import { join as join2, resolve, sep } from "path";
 function resolveChannelInboundDir(codeName, channelSlug) {
-  const base = join(homedir(), ".augmented");
+  const base = join2(homedir(), ".augmented");
   const allowedSegment = /^[A-Za-z0-9_-]+$/;
   if (!allowedSegment.test(codeName) || !allowedSegment.test(channelSlug)) {
     throw new Error(
@@ -15745,12 +15899,12 @@ function createSlackBotUserIdClient(args) {
 import {
   existsSync,
   mkdirSync as mkdirSync2,
-  readFileSync as readFileSync2,
+  readFileSync as readFileSync3,
   renameSync,
   unlinkSync,
   writeFileSync as writeFileSync2
 } from "fs";
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 function defaultIsPidAlive(pid) {
   if (!Number.isFinite(pid) || pid <= 0) return false;
   try {
@@ -15768,7 +15922,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 = join2(agentDir, basename2);
+  const path = join3(agentDir, basename2);
   const existing = readLockHolder(path);
   if (existing) {
     if (existing.pid === selfPid) {
@@ -15799,7 +15953,7 @@ function releaseMcpSpawnLock(lockPath, opts = {}) {
 function readLockHolder(path) {
   if (!existsSync(path)) return null;
   try {
-    const raw = readFileSync2(path, "utf8");
+    const raw = readFileSync3(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;
@@ -15881,9 +16035,9 @@ 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 ? join3(homedir2(), ".augmented", AGENT_CODE_NAME) : null;
-var SLACK_PENDING_INBOUND_DIR = SLACK_AGENT_DIR ? join3(SLACK_AGENT_DIR, "slack-pending-inbound") : null;
-var SLACK_RECOVERY_OUTBOX_DIR = SLACK_AGENT_DIR ? join3(SLACK_AGENT_DIR, "slack-recovery-outbox") : null;
+var SLACK_AGENT_DIR = AGENT_CODE_NAME ? join4(homedir2(), ".augmented", AGENT_CODE_NAME) : null;
+var SLACK_PENDING_INBOUND_DIR = SLACK_AGENT_DIR ? join4(SLACK_AGENT_DIR, "slack-pending-inbound") : null;
+var SLACK_RECOVERY_OUTBOX_DIR = SLACK_AGENT_DIR ? join4(SLACK_AGENT_DIR, "slack-recovery-outbox") : null;
 var SLACK_MAX_RECOVERY_ATTEMPTS = 3;
 function redactSlackId(id) {
   if (!id) return "<none>";
@@ -15895,7 +16049,7 @@ function safeSlackMarkerName(channel, threadTs, messageTs) {
 }
 function slackPendingInboundPath(channel, threadTs, messageTs) {
   if (!SLACK_PENDING_INBOUND_DIR) return null;
-  return join3(SLACK_PENDING_INBOUND_DIR, safeSlackMarkerName(channel, threadTs, messageTs));
+  return join4(SLACK_PENDING_INBOUND_DIR, safeSlackMarkerName(channel, threadTs, messageTs));
 }
 function writeSlackPendingInboundMarker(channel, threadTs, messageTs) {
   const path = slackPendingInboundPath(channel, threadTs, messageTs);
@@ -15922,10 +16076,10 @@ function clearAllSlackPendingMarkersForThread(channel, threadTs) {
   const safeThread = threadTs.replace(/[^A-Za-z0-9_-]/g, "_");
   const prefix = `${safeChan}__${safeThread}__`;
   try {
-    for (const f of readdirSync(SLACK_PENDING_INBOUND_DIR)) {
+    for (const f of readdirSync2(SLACK_PENDING_INBOUND_DIR)) {
       if (!f.startsWith(prefix) || !f.endsWith(".json")) continue;
       try {
-        unlinkSync2(join3(SLACK_PENDING_INBOUND_DIR, f));
+        unlinkSync2(join4(SLACK_PENDING_INBOUND_DIR, f));
       } catch {
       }
     }
@@ -15946,10 +16100,10 @@ function slackNextRetryName(filename) {
 async function processSlackRecoveryOutboxFile(filename) {
   if (!SLACK_RECOVERY_OUTBOX_DIR) return;
   if (filename.endsWith(".poison.json") || filename.endsWith(".tmp")) return;
-  const fullPath = join3(SLACK_RECOVERY_OUTBOX_DIR, filename);
+  const fullPath = join4(SLACK_RECOVERY_OUTBOX_DIR, filename);
   let payload;
   try {
-    payload = JSON.parse(readFileSync3(fullPath, "utf-8"));
+    payload = JSON.parse(readFileSync4(fullPath, "utf-8"));
   } catch (err) {
     process.stderr.write(
       `slack-channel(${AGENT_CODE_NAME}): recovery outbox parse failed (${filename}): ${err.message}
@@ -16023,7 +16177,7 @@ async function processSlackRecoveryOutboxFile(filename) {
   const next = slackNextRetryName(filename);
   if (next) {
     try {
-      renameSync2(fullPath, join3(SLACK_RECOVERY_OUTBOX_DIR, next.next));
+      renameSync2(fullPath, join4(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}
@@ -16053,7 +16207,7 @@ function scanSlackRecoveryRetries() {
   if (!SLACK_RECOVERY_OUTBOX_DIR) return;
   let entries;
   try {
-    entries = readdirSync(SLACK_RECOVERY_OUTBOX_DIR);
+    entries = readdirSync2(SLACK_RECOVERY_OUTBOX_DIR);
   } catch {
     return;
   }
@@ -16062,7 +16216,7 @@ function scanSlackRecoveryRetries() {
     if (!f.includes(".retry-") || f.endsWith(".poison.json")) continue;
     let mtimeMs;
     try {
-      mtimeMs = statSync(join3(SLACK_RECOVERY_OUTBOX_DIR, f)).mtimeMs;
+      mtimeMs = statSync(join4(SLACK_RECOVERY_OUTBOX_DIR, f)).mtimeMs;
     } catch {
       continue;
     }
@@ -16083,7 +16237,7 @@ function startSlackRecoveryOutboxWatcher() {
     return;
   }
   try {
-    for (const f of readdirSync(SLACK_RECOVERY_OUTBOX_DIR)) {
+    for (const f of readdirSync2(SLACK_RECOVERY_OUTBOX_DIR)) {
       if (isFirstAttemptSlackOutboxFile(f)) void processSlackRecoveryOutboxFile(f);
     }
   } catch {
@@ -16092,7 +16246,7 @@ function startSlackRecoveryOutboxWatcher() {
     const watcher = watch(SLACK_RECOVERY_OUTBOX_DIR, (event, filename) => {
       if (event !== "rename" || !filename) return;
       if (!isFirstAttemptSlackOutboxFile(filename)) return;
-      if (existsSync2(join3(SLACK_RECOVERY_OUTBOX_DIR, filename))) {
+      if (existsSync2(join4(SLACK_RECOVERY_OUTBOX_DIR, filename))) {
         void processSlackRecoveryOutboxFile(filename);
       }
     });
@@ -16116,7 +16270,7 @@ function sweepSlackStaleMarkersOnBoot() {
   if (!existsSync2(SLACK_PENDING_INBOUND_DIR)) return;
   let filenames;
   try {
-    filenames = readdirSync(SLACK_PENDING_INBOUND_DIR);
+    filenames = readdirSync2(SLACK_PENDING_INBOUND_DIR);
   } catch (err) {
     process.stderr.write(
       `slack-channel(${AGENT_CODE_NAME}): stale-marker readdir failed: ${err.message}
@@ -16129,10 +16283,10 @@ function sweepSlackStaleMarkersOnBoot() {
   for (const filename of filenames) {
     if (!filename.endsWith(".json")) continue;
     if (filename.endsWith(".tmp")) continue;
-    const fullPath = join3(SLACK_PENDING_INBOUND_DIR, filename);
+    const fullPath = join4(SLACK_PENDING_INBOUND_DIR, filename);
     let marker;
     try {
-      marker = JSON.parse(readFileSync3(fullPath, "utf-8"));
+      marker = JSON.parse(readFileSync4(fullPath, "utf-8"));
     } catch (err) {
       process.stderr.write(
         `slack-channel(${AGENT_CODE_NAME}): stale-marker parse failed for ${redactSlackId(filename)}: ${err.message}
@@ -16185,7 +16339,7 @@ function noteThreadActivityByMessageTs(channel, messageTs) {
   if (!existsSync2(SLACK_PENDING_INBOUND_DIR)) return;
   let filenames;
   try {
-    filenames = readdirSync(SLACK_PENDING_INBOUND_DIR);
+    filenames = readdirSync2(SLACK_PENDING_INBOUND_DIR);
   } catch {
     return;
   }
@@ -16197,12 +16351,12 @@ function noteThreadActivityByMessageTs(channel, messageTs) {
     if (!filename.startsWith(channelPrefix)) continue;
     if (!filename.endsWith(messageSuffix)) continue;
     try {
-      unlinkSync2(join3(SLACK_PENDING_INBOUND_DIR, filename));
+      unlinkSync2(join4(SLACK_PENDING_INBOUND_DIR, filename));
     } catch {
     }
   }
 }
-var RESTART_FLAGS_DIR = join3(homedir2(), ".augmented", "restart-flags");
+var RESTART_FLAGS_DIR = join4(homedir2(), ".augmented", "restart-flags");
 function buildAugmentedSlackMetadata() {
   if (!AGT_TEAM_ID) return void 0;
   return {
@@ -16384,7 +16538,7 @@ async function handleSlashCommandEnvelope(payload) {
       if (!existsSync2(RESTART_FLAGS_DIR)) {
         mkdirSync3(RESTART_FLAGS_DIR, { recursive: true });
       }
-      const flagPath = join3(RESTART_FLAGS_DIR, `${codeName}.flag`);
+      const flagPath = join4(RESTART_FLAGS_DIR, `${codeName}.flag`);
       const flag = {
         codeName,
         source: "slack",
@@ -16491,7 +16645,7 @@ async function handleRestartCommand(opts) {
     if (!existsSync2(RESTART_FLAGS_DIR)) {
       mkdirSync3(RESTART_FLAGS_DIR, { recursive: true });
     }
-    const flagPath = join3(RESTART_FLAGS_DIR, `${codeName}.flag`);
+    const flagPath = join4(RESTART_FLAGS_DIR, `${codeName}.flag`);
     const flag = {
       codeName,
       source: "slack",
@@ -16550,7 +16704,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 join3(homedir2(), ".augmented", AGENT_CODE_NAME, "slack-tracked-threads.json");
+  return join4(homedir2(), ".augmented", AGENT_CODE_NAME, "slack-tracked-threads.json");
 }
 function parseTtlDays(raw) {
   if (!raw) return void 0;
@@ -16585,9 +16739,9 @@ if (!BOT_TOKEN || !APP_TOKEN) {
 var slackStderrLogStream = null;
 if (AGENT_CODE_NAME) {
   try {
-    const logDir = join3(homedir2(), ".augmented", AGENT_CODE_NAME);
+    const logDir = join4(homedir2(), ".augmented", AGENT_CODE_NAME);
     mkdirSync3(logDir, { recursive: true });
-    slackStderrLogStream = createWriteStream(join3(logDir, "slack-channel-stderr.log"), {
+    slackStderrLogStream = createWriteStream(join4(logDir, "slack-channel-stderr.log"), {
       flags: "a",
       mode: 384
     });
@@ -16657,7 +16811,6 @@ void resolveBotUserIdOrThrow().then((id) => {
   );
   if (authFailed) slackBotUserIdClient?.reportAuthHealth(false);
 });
-var selfIdentityInstruction = `Mentions of your own Slack bot user are directed at you, even inside auto_followed threads.`;
 var mcp = new Server(
   { name: "slack", version: "0.1.0" },
   {
@@ -16672,13 +16825,12 @@ var mcp = new Server(
       // Highest-priority lines first — Claude Code truncates this string at
       // 2048 chars, so anything appended late silently disappears.
       "CRITICAL: every response to a Slack <channel> tag MUST go through slack.reply. Text in your session WITHOUT a slack.reply call never reaches the user \u2014 the message dies inside the agent process.",
-      'Messages from Slack arrive as <channel source="slack" user="<slack-id>" user_name="<display-name>" channel="..." thread_ts="...">. Pass channel + thread_ts from the tag to slack.reply; always include thread_ts on threaded replies.',
+      `Inbound: <channel ... thread_ts="..." [thread_context="..."]>. Pass channel + thread_ts to slack.reply on threads. thread_context = thread pre-loaded; ground replies ONLY in it, never another channel's.`,
       "Long task (3+ tool calls or >5s)? slack_progress_start (channel + thread_ts), slack_progress_update between steps, slack_progress_complete/_fail to close. One anchor edits in place; avoids thread spam. Not for one-shots.",
-      selfIdentityInstruction,
       "Inbound attachments: <channel> `files` is a JSON-serialised array \u2014 JSON.parse it. If an entry has `path`, the image is already downloaded \u2014 Read it directly, do NOT call slack.download_attachment. Use that tool only for entries with `file_id` but NO `path` (PDF, docx, csv): pass file_id + channel verbatim, then Read the returned path. Single-image messages also get a top-level `image_path`. Don't surface internal file-handling errors that don't affect the answer.",
       "Address users by user_name, never by raw user ID. In multi-participant threads the CURRENT speaker is the one on the latest <channel> tag.",
-      'Mentioned in a channel \u2192 respond in that thread. DM \u2192 respond directly. auto_followed="true" \u2192 only reply if you have something useful to add.',
-      "Reaction taxonomy (use slack.react sparingly \u2014 prefer a reply): \u{1F440} = ack (already auto-added on inbound, do not duplicate); \u2705 = success. NEVER react to signal failure \u2014 users can't tell why something failed from an emoji. On failure, slack.reply with one sentence explaining what went wrong (no stack traces, no secrets).",
+      'Mentioned in a channel \u2192 respond in that thread. DM \u2192 respond directly. auto_followed="true" \u2192 only reply if useful, OR if your own bot user is @-mentioned (counts even in auto_followed).',
+      "Reaction taxonomy (use slack.react sparingly \u2014 prefer a reply): \u{1F440} = ack (already auto-added on inbound, do not duplicate); \u2705 = success. NEVER react to signal failure of YOUR work \u2014 users can't tell why something failed from an emoji. On failure, slack.reply with one sentence explaining what went wrong (no stack traces, no secrets). (The \u274C you may see on an inbound is applied by the system, not you \u2014 it marks a message that arrived while the agent couldn't reply; never add \u274C yourself.)",
       `When a thread message is NOT addressed to you (different @-mention, side conversation, auto_followed catch-up): SILENTLY SKIP \u2014 no reaction, no reply, no "this wasn't for me" message.`,
       "To deliver a file: save under your project dir, call slack.upload_file with path + channel + thread_ts."
     ].join(" ")
@@ -16730,7 +16882,7 @@ mcp.setRequestHandler(ListToolsRequestSchema, async () => ({
     },
     {
       name: "slack.react",
-      description: "Add an emoji reaction to a Slack message. Use sparingly \u2014 prefer a text reply. Reaction taxonomy: \u2705 = action completed successfully. NEVER react to signal failure \u2014 users can't tell why it failed from a reaction. On failure, call slack.reply with one sentence explaining what went wrong instead. \u{1F440} (eyes) is already auto-applied on inbound; do not duplicate.",
+      description: "Add an emoji reaction to a Slack message. Use sparingly \u2014 prefer a text reply. Reaction taxonomy: \u2705 = action completed successfully. NEVER react to signal failure of your work \u2014 users can't tell why it failed from a reaction. On failure, call slack.reply with one sentence explaining what went wrong instead. \u{1F440} (eyes) is already auto-applied on inbound; do not duplicate. \u274C (:x:) is reserved for the system to mark an inbound that arrived while the agent couldn't reply \u2014 never add \u274C yourself.",
       inputSchema: {
         type: "object",
         properties: {
@@ -16743,7 +16895,7 @@ mcp.setRequestHandler(ListToolsRequestSchema, async () => ({
     },
     {
       name: "slack.read_thread",
-      description: "Read the full message history of a Slack thread. Use this to catch up on thread context before replying, especially for auto-followed threads.",
+      description: "Read the full message history of a Slack thread. Inbound thread replies already carry the surrounding thread inline as the <channel> tag's thread_context attribute \u2014 ground your reply in that first, and only call this tool when you need MORE history than thread_context shows (it is capped to recent messages) or to catch up on an auto-followed thread.",
       inputSchema: {
         type: "object",
         properties: {
@@ -17117,46 +17269,22 @@ mcp.setRequestHandler(CallToolRequestSchema, async (req) => {
     const limit = Math.min(Math.max(rawLimit ?? 50, 1), 200);
     noteThreadActivity(channel, thread_ts);
     try {
-      const allMessages = [];
-      let cursor;
-      do {
-        const remaining = limit - allMessages.length;
-        if (remaining <= 0) break;
-        const params = new URLSearchParams({
-          channel,
-          ts: thread_ts,
-          limit: String(Math.min(remaining, 100)),
-          ...cursor ? { cursor } : {}
-        });
-        const res = await fetch(`https://slack.com/api/conversations.replies?${params}`, {
-          headers: { Authorization: `Bearer ${BOT_TOKEN}` }
-        });
-        const data = await res.json();
-        if (!data.ok) {
-          return {
-            content: [{ type: "text", text: `Slack error: ${data.error}` }],
-            isError: true
-          };
-        }
-        for (const msg of data.messages ?? []) {
-          allMessages.push({
-            user: msg.user ?? msg.bot_id ?? "unknown",
-            text: msg.text ?? "",
-            ts: msg.ts ?? ""
-          });
-        }
-        cursor = data.response_metadata?.next_cursor || void 0;
-      } while (cursor && allMessages.length < limit);
-      const uniqueUserIds = [...new Set(allMessages.map((m) => m.user))];
-      const resolved = await Promise.all(uniqueUserIds.map(async (id) => [id, await resolveUserName(id)]));
-      const nameById = new Map(resolved);
-      const formatted = allMessages.map((m) => `[${m.ts}] ${nameById.get(m.user) ?? m.user} (<@${m.user}>): ${m.text}`).join("\n");
+      const result = await fetchThreadTranscript(channel, thread_ts, limit, {
+        botToken: BOT_TOKEN,
+        resolveUserName
+      });
+      if (!result.ok) {
+        return {
+          content: [{ type: "text", text: `Slack error: ${result.error}` }],
+          isError: true
+        };
+      }
       return {
         content: [{
           type: "text",
-          text: allMessages.length > 0 ? `Thread (${allMessages.length} messages):
+          text: result.count > 0 ? `Thread (${result.count} messages):
 
-${formatted}` : "Thread is empty or not found."
+${result.formatted}` : "Thread is empty or not found."
         }]
       };
     } catch (err) {
@@ -17206,7 +17334,7 @@ ${formatted}` : "Thread is empty or not found."
         };
       }
       size = stat.size;
-      bytes = readFileSync3(resolvedPath);
+      bytes = readFileSync4(resolvedPath);
     } catch (err) {
       return {
         content: [{ type: "text", text: `Failed to read file: ${err.message}` }],
@@ -18226,14 +18354,24 @@ async function connectSocketMode() {
         isAutoFollowed,
         botUserId
       });
-      if (decideSlackAckReaction({ channel, ts })) {
+      const ackProbe = process.env.TMUX && AGENT_CODE_NAME ? probeAgentSessionCached(AGENT_CODE_NAME) : { tmux: "unknown", claude: "unknown" };
+      const ackDecision = decideAckReaction({
+        hasTarget: decideSlackAckReaction({ channel, ts }),
+        integrationReady: Boolean(BOT_TOKEN),
+        tmux: ackProbe.tmux,
+        claude: ackProbe.claude,
+        withinStartupGrace: process.uptime() * 1e3 < ACK_STARTUP_GRACE_MS,
+        oldestPendingAgeMs: oldestPendingMarkerAgeMs(SLACK_PENDING_INBOUND_DIR)
+      });
+      if (ackDecision !== "none") {
+        const reactionName = ackDecision === "undeliverable" ? "x" : "eyes";
         fetch("https://slack.com/api/reactions.add", {
           method: "POST",
           headers: {
             "Content-Type": "application/json",
             Authorization: `Bearer ${BOT_TOKEN}`
           },
-          body: JSON.stringify({ channel, timestamp: ts, name: "eyes" })
+          body: JSON.stringify({ channel, timestamp: ts, name: reactionName })
         }).catch(() => {
         });
       }
@@ -18246,6 +18384,29 @@ async function connectSocketMode() {
         (f) => f.kind === "image" && typeof f.path === "string"
       );
       const imagePath = downloadedImages.length === 1 ? downloadedImages[0].path : void 0;
+      let threadContext;
+      if (isThreadReply && channel && threadTs) {
+        try {
+          const transcript = await fetchThreadTranscript(
+            channel,
+            threadTs,
+            SLACK_AUTOLOAD_THREAD_LIMIT,
+            { botToken: BOT_TOKEN, resolveUserName }
+          );
+          if (transcript.ok && transcript.count >= 2) {
+            threadContext = capThreadContext(
+              transcript.formatted,
+              SLACK_AUTOLOAD_THREAD_MAX_CHARS
+            );
+          }
+        } catch (err) {
+          const msg2 = err instanceof Error ? err.message : String(err);
+          process.stderr.write(
+            `slack-channel(${AGENT_CODE_NAME}): thread_context fetch failed (channel=${redactSlackId(channel)} thread=${redactSlackId(threadTs)}): ${msg2}
+`
+          );
+        }
+      }
       await mcp.notification({
         method: "notifications/claude/channel",
         params: {
@@ -18260,7 +18421,9 @@ async function connectSocketMode() {
             // Only set these when we actually have attachments to avoid
             // bloating every notification with empty metadata.
             ...fileMeta.length > 0 ? { files: JSON.stringify(fileMeta) } : {},
-            ...imagePath ? { image_path: imagePath } : {}
+            ...imagePath ? { image_path: imagePath } : {},
+            // ENG-5830: the pre-loaded surrounding thread (thread replies only).
+            ...threadContext ? { thread_context: threadContext } : {}
           }
         }
       });