@integrity-labs/agt-cli 0.28.266 → 0.28.268

package/dist/mcp/slack-channel.js

@@ -16869,7 +16869,7 @@ import { join as join9 } from "path";
 var DEFAULT_MAX_ENTRIES = 500;
 var DEFAULT_CLEARED_TTL_MS = 6 * 60 * 60 * 1e3;
 function entryKey(channel, messageTs) {
-  return `${channel}\0${messageTs}`;
+  return `${channel} ${messageTs}`;
 }
 function createInboundRegistry(opts = {}) {
   const maxEntries = opts.maxEntries ?? DEFAULT_MAX_ENTRIES;
@@ -16946,6 +16946,27 @@ function createInboundRegistry(opts = {}) {
     }
     return best;
   }
+  function byCoordsAnyChannel(threadOrMessageTs) {
+    let best = null;
+    let bestExact = false;
+    for (const e of entries.values()) {
+      const exact = e.messageTs === threadOrMessageTs;
+      const thread = e.threadTs === threadOrMessageTs;
+      if (!exact && !thread) continue;
+      if (best === null) {
+        best = e;
+        bestExact = exact;
+        continue;
+      }
+      if (exact && !bestExact) {
+        best = e;
+        bestExact = true;
+      } else if (exact === bestExact && e.receivedAt >= best.receivedAt) {
+        best = e;
+      }
+    }
+    return best;
+  }
   function livePending() {
     const out = [];
     for (const e of entries.values()) {
@@ -16994,6 +17015,7 @@ function createInboundRegistry(opts = {}) {
     markClearedOldestInChannel,
     byInboundId,
     byCoords,
+    byCoordsAnyChannel,
     livePending,
     seedFromMarkerDir,
     size: () => entries.size
@@ -17059,6 +17081,33 @@ function resolveReplyBinding(input) {
   }
   return classifyByCoords(mode, args, registry2, now, false, knownThread);
 }
+function isDmChannel(channel) {
+  return !!channel && channel.startsWith("D");
+}
+function guardReplyChannel(input) {
+  const { args, registry: registry2 } = input;
+  const noop = {
+    channel: args.channel,
+    threadTs: args.thread_ts,
+    messageTs: args.message_ts,
+    corrected: false,
+    dm: false
+  };
+  if (args.inbound_id) return noop;
+  if (args.proactive === true) return noop;
+  if (!args.channel) return noop;
+  const matched = (args.message_ts ? registry2.byCoordsAnyChannel(args.message_ts) : null) ?? (args.thread_ts ? registry2.byCoordsAnyChannel(args.thread_ts) : null);
+  if (!matched) return noop;
+  if (matched.channel === args.channel) return noop;
+  return {
+    channel: matched.channel,
+    threadTs: matched.threadTs,
+    messageTs: matched.messageTs,
+    corrected: true,
+    dm: isDmChannel(matched.channel),
+    requestedChannel: args.channel
+  };
+}
 function classifyByCoords(mode, args, registry2, now, unknownInboundId, knownThread) {
   const modelChannel = args.channel;
   const modelThread = args.thread_ts;
@@ -17121,6 +17170,8 @@ import { readFileSync as readFileSync11, writeFileSync as writeFileSync9 } from
 import { join as join10 } from "path";
 var REPLY_BINDING_CLASSIFICATION_COUNTER_SUFFIX = "-reply-binding-classifications.json";
 var UNKNOWN_INBOUND_ID_KEY = "unknown_inbound_id";
+var CHANNEL_MISTARGET_CORRECTED_KEY = "channel_mistarget_corrected";
+var DM_CHANNEL_MISTARGET_KEY = "dm_channel_mistarget";
 var VALID_MODES = /* @__PURE__ */ new Set(["shadow", "warn", "enforce"]);
 function slackReplyBindingMode() {
   const raw = process.env["AGT_SLACK_REPLY_BINDING"];
@@ -17145,6 +17196,24 @@ function recordReplyBindingClassification(agentDir, channel, input) {
   } catch {
   }
 }
+function recordChannelMistarget(agentDir, channel, input) {
+  if (!agentDir) return;
+  const path = join10(agentDir, `${channel}${REPLY_BINDING_CLASSIFICATION_COUNTER_SUFFIX}`);
+  let counts = {};
+  try {
+    const parsed = JSON.parse(readFileSync11(path, "utf-8"));
+    if (parsed && typeof parsed === "object") counts = parsed;
+  } catch {
+  }
+  counts[CHANNEL_MISTARGET_CORRECTED_KEY] = (counts[CHANNEL_MISTARGET_CORRECTED_KEY] ?? 0) + 1;
+  if (input.dm) {
+    counts[DM_CHANNEL_MISTARGET_KEY] = (counts[DM_CHANNEL_MISTARGET_KEY] ?? 0) + 1;
+  }
+  try {
+    writeFileSync9(path, JSON.stringify(counts), { mode: 384 });
+  } catch {
+  }
+}
 
 // src/slack-reply-target-telemetry.ts
 import { readFileSync as readFileSync12, writeFileSync as writeFileSync10 } from "fs";
@@ -20297,7 +20366,7 @@ mcp.setRequestHandler(ListToolsRequestSchema, async () => ({
         properties: {
           channel: {
             type: "string",
-            description: "Slack channel ID (from the channel attribute in the <channel> tag)"
+            description: 'Slack channel ID. Copy it from the channel attribute of the SAME <channel> tag you are answering - never reuse a channel from a different message. A DM channel starts with "D": a DM answer MUST go to that "D\u2026" id, not a shared "C\u2026"/"G\u2026" channel. Prefer passing inbound_id, which resolves the exact destination for you.'
           },
           text: { type: "string", description: "The message to send" },
           thread_ts: {
@@ -20324,7 +20393,7 @@ mcp.setRequestHandler(ListToolsRequestSchema, async () => ({
           // WS2 (cross-thread reply routing): the preferred way to target a reply.
           inbound_id: {
             type: "string",
-            description: `The inbound_id attribute of the <channel> tag you are answering (e.g. "ib_a1b2c3d4e5f6"). PREFERRED over channel/thread_ts/message_ts: the server resolves the exact destination thread from it, so your reply can never land in another user's thread. Copy it verbatim from the tag of the message you are replying to.`
+            description: `The inbound_id attribute of the <channel> tag you are answering (e.g. "ib_a1b2c3d4e5f6"). ALWAYS include it when replying to a message - it is STRONGLY PREFERRED over channel/thread_ts/message_ts because the server resolves the exact destination (channel AND thread) from it, so your reply can never land in another user's channel or thread. Copy it verbatim from the tag of the message you are replying to. Omit it only for a proactive (self-initiated) send.`
           },
           proactive: {
             type: "boolean",
@@ -20580,7 +20649,20 @@ mcp.setRequestHandler(CallToolRequestSchema, async (req) => {
       classification: binding.classification,
       unknownInboundId: binding.unknownInboundId
     });
-    if (bindingMode === "enforce" && binding.reject) {
+    const channelGuard = guardReplyChannel({
+      args: { inbound_id, channel, thread_ts, message_ts, proactive },
+      registry: slackInboundRegistry
+    });
+    if (channelGuard.corrected) {
+      recordChannelMistarget(SLACK_AGENT_DIR, "slack", { dm: channelGuard.dm });
+      process.stderr.write(
+        `slack-channel(${AGENT_CODE_NAME}): reply_channel_mistarget_corrected dm=${channelGuard.dm} requested=${redactSlackId(channelGuard.requestedChannel)} registry=${redactSlackId(channelGuard.channel)}
+`
+      );
+    }
+    const effectiveChannel = channelGuard.corrected && channelGuard.channel ? channelGuard.channel : channel;
+    const effectiveMessageTs = channelGuard.corrected ? channelGuard.messageTs : message_ts;
+    if (bindingMode === "enforce" && binding.reject && !channelGuard.corrected) {
       process.stderr.write(
         `slack-channel(${AGENT_CODE_NAME}): reply_binding_rejected class=${binding.classification} channel=${redactSlackId(channel)}
 `
@@ -20604,28 +20686,28 @@ mcp.setRequestHandler(CallToolRequestSchema, async (req) => {
       };
     }
     const bindingFeedback = bindingMode === "warn" ? binding.agentFeedback : void 0;
-    const effectiveThreadTs = enforceBound ? binding.threadTs : resolveReplyThreadTs({
+    const effectiveThreadTs = enforceBound ? binding.threadTs : channelGuard.corrected ? channelGuard.threadTs : resolveReplyThreadTs({
       channel,
       threadTs: thread_ts,
       messageTs: message_ts
     });
-    if (channel) {
+    if (effectiveChannel) {
       recordReplyTargetClassification(
         SLACK_AGENT_DIR,
         "slack",
         classifyReplyTarget({
-          channel,
+          channel: effectiveChannel,
           threadTs: effectiveThreadTs,
-          messageTs: message_ts,
+          messageTs: effectiveMessageTs,
           registry: slackInboundRegistry
         })
       );
     }
     const throttleCfg = configFromEnv();
-    const throttleKey = effectiveThreadTs ?? channel;
+    const throttleKey = effectiveThreadTs ?? effectiveChannel;
     const throttleNow = Date.now();
     const throttleDecision = decideReplyThrottle({
-      recentReplyTimestamps: getRecentReplies(channel, throttleKey, throttleNow, throttleCfg),
+      recentReplyTimestamps: getRecentReplies(effectiveChannel, throttleKey, throttleNow, throttleCfg),
       now: throttleNow,
       config: throttleCfg
     });
@@ -20634,14 +20716,14 @@ mcp.setRequestHandler(CallToolRequestSchema, async (req) => {
         `slack-channel(${AGENT_CODE_NAME}): reply_throttled channel=${redactSlackId(channel)} thread=${redactSlackId(throttleKey)} count=${throttleDecision.recentCount} window_ms=${throttleCfg.windowMs} threshold=${throttleCfg.threshold}
 `
       );
-      if (channel && effectiveThreadTs) {
+      if (effectiveChannel && effectiveThreadTs) {
         fetch("https://slack.com/api/reactions.add", {
           method: "POST",
           headers: {
             "Content-Type": "application/json",
             Authorization: `Bearer ${BOT_TOKEN}`
           },
-          body: JSON.stringify({ channel, timestamp: effectiveThreadTs, name: "lock" })
+          body: JSON.stringify({ channel: effectiveChannel, timestamp: effectiveThreadTs, name: "lock" })
         }).catch(() => {
         });
       }
@@ -20655,21 +20737,24 @@ mcp.setRequestHandler(CallToolRequestSchema, async (req) => {
         isError: true
       };
     }
+    const settleChannel = effectiveChannel;
+    const settleMessageTs = effectiveMessageTs;
+    const settleThreadTs = enforceBound ? binding.threadTs : channelGuard.corrected ? channelGuard.threadTs : thread_ts;
     const settlePendingMarker = () => {
-      if (!channel) return;
-      if (message_ts) {
+      if (!settleChannel) return;
+      if (settleMessageTs) {
         if (interim) {
-          markSeenSlackPendingMarkerByMessageTs2(channel, message_ts);
-          if (thread_ts) markSeenAllSlackPendingMarkersForThread2(channel, thread_ts);
+          markSeenSlackPendingMarkerByMessageTs2(settleChannel, settleMessageTs);
+          if (settleThreadTs) markSeenAllSlackPendingMarkersForThread2(settleChannel, settleThreadTs);
         } else {
-          clearSlackPendingMarkerByMessageTs2(channel, message_ts);
-          if (thread_ts) clearPendingMessage(channel, thread_ts);
+          clearSlackPendingMarkerByMessageTs2(settleChannel, settleMessageTs);
+          if (settleThreadTs) clearPendingMessage(settleChannel, settleThreadTs);
         }
-      } else if (thread_ts) {
-        if (interim) markSeenAllSlackPendingMarkersForThread2(channel, thread_ts);
-        else clearPendingMessage(channel, thread_ts);
+      } else if (settleThreadTs) {
+        if (interim) markSeenAllSlackPendingMarkersForThread2(settleChannel, settleThreadTs);
+        else clearPendingMessage(settleChannel, settleThreadTs);
       } else if (!interim) {
-        clearOldestSlackPendingMarkerInChannel2(channel);
+        clearOldestSlackPendingMarkerInChannel2(settleChannel);
       }
     };
     const sanitized = stripRepostPreambleWithMeta(text);
@@ -20686,7 +20771,7 @@ mcp.setRequestHandler(CallToolRequestSchema, async (req) => {
           Authorization: `Bearer ${BOT_TOKEN}`
         },
         body: JSON.stringify({
-          channel,
+          channel: effectiveChannel,
           text: apiErr.text,
           ...effectiveThreadTs ? { thread_ts: effectiveThreadTs } : {},
           ...buildAugmentedSlackMetadata() ? { metadata: buildAugmentedSlackMetadata() } : {}
@@ -20702,11 +20787,13 @@ mcp.setRequestHandler(CallToolRequestSchema, async (req) => {
         };
       }
       settlePendingMarker();
-      recordReply(channel, throttleKey, throttleNow, throttleCfg);
+      recordReply(effectiveChannel, throttleKey, throttleNow, throttleCfg);
       recordActivity("reply");
       if (THREAD_AUTO_FOLLOW !== "off") {
         const trackTs = effectiveThreadTs ?? data.ts ?? void 0;
-        rememberThread(channel, trackTs, thread_ts ? "mentioned" : "started", { botPosted: true });
+        rememberThread(effectiveChannel, trackTs, thread_ts ? "mentioned" : "started", {
+          botPosted: true
+        });
       }
       if (interactiveHostAvailable() && data.ts) {
         const cfg = {
@@ -20720,7 +20807,7 @@ mcp.setRequestHandler(CallToolRequestSchema, async (req) => {
           try {
             const runtime = await Promise.resolve().then(() => (init_slack_block_kit_runtime(), slack_block_kit_runtime_exports));
             await runtime.recordSlackDelivery(cfg, {
-              channel,
+              channel: effectiveChannel,
               messageTs: tsToRecord,
               threadTs: threadTsToRecord
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@integrity-labs/agt-cli",
-  "version": "0.28.266",
+  "version": "0.28.268",
   "description": "Augmented Team CLI — agent provisioning and management",
   "type": "module",
   "engines": {