@integrity-labs/agt-cli 0.28.618 → 0.28.620

package/dist/lib/manager-worker.js

@@ -54,7 +54,7 @@ import {
   safeWriteJsonAtomic,
   setConfigHash,
   tripClass
-} from "../chunk-CKCXOIN3.js";
+} from "../chunk-5ZJFTTGB.js";
 import {
   getProjectDir as getProjectDir2,
   getReadyTasks,
@@ -8030,14 +8030,23 @@ var ALLOWED_MESSAGE_SUBTYPES = /* @__PURE__ */ new Set([
   "file_share",
   "thread_broadcast"
 ]);
-function decideSlackMessageForward(evt) {
+function matchesThirdPartyGrant(evt, thirdPartyBots) {
+  const botId = evt.bot_id;
+  if (!botId || !thirdPartyBots?.length)
+    return false;
+  return thirdPartyBots.some((b) => b.bot_id === botId || b.bot_user_id === botId);
+}
+function decideSlackMessageForward(evt, thirdPartyBots) {
   if (evt.type !== "message") {
     return { forward: true };
   }
+  const granted = matchesThirdPartyGrant(evt, thirdPartyBots);
   if (!ALLOWED_MESSAGE_SUBTYPES.has(evt.subtype)) {
-    return { forward: false, reason: "subtype" };
+    if (!granted || evt.subtype !== "bot_message") {
+      return { forward: false, reason: "subtype" };
+    }
   }
-  if (!evt.user) {
+  if (!evt.user && !granted) {
     return { forward: false, reason: "no_user" };
   }
   const hasText = typeof evt.text === "string" && evt.text.trim().length > 0;
@@ -8132,7 +8141,13 @@ function classifyPeerMessage(msg, cfg, self) {
   }
   const peer = cfg.peers.find((p) => p.bot_user_id === msg.user);
   if (!peer) {
-    const thirdParty = cfg.third_party_bots?.find((b) => b.bot_user_id === msg.user);
+    const thirdParty = cfg.third_party_bots?.find((b) => {
+      if (msg.user && b.bot_user_id === msg.user)
+        return true;
+      if (!msg.bot_id)
+        return false;
+      return b.bot_id === msg.bot_id || b.bot_user_id === msg.bot_id;
+    });
     if (thirdParty) {
       if (cfg.peer_disabled_mode === "cross_team_only") {
         return { kind: "drop", reason: "peer_disabled_cross_team" };
@@ -8249,6 +8264,39 @@ function parsePeerGroupIdsEnv(raw) {
     return [];
   return raw.split(",").map((s) => s.trim()).filter(Boolean);
 }
+function parseThirdPartyBotsEnv(raw) {
+  if (!raw || !raw.trim())
+    return [];
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return [];
+  }
+  if (!Array.isArray(parsed))
+    return [];
+  const out = [];
+  for (const item of parsed) {
+    if (!item || typeof item !== "object")
+      continue;
+    const rec = item;
+    const botUserId = typeof rec["bot_user_id"] === "string" ? rec["bot_user_id"].trim() : "";
+    if (!botUserId)
+      continue;
+    if (!Array.isArray(rec["channel_ids"]))
+      continue;
+    const channels = rec["channel_ids"].filter((c) => typeof c === "string" && c.trim() !== "").map((c) => c.trim());
+    const label = typeof rec["label"] === "string" && rec["label"].trim() ? rec["label"].trim() : void 0;
+    const botId = typeof rec["bot_id"] === "string" && rec["bot_id"].trim() ? rec["bot_id"].trim() : void 0;
+    out.push({
+      bot_user_id: botUserId,
+      channel_ids: channels,
+      ...botId ? { bot_id: botId } : {},
+      ...label ? { label } : {}
+    });
+  }
+  return out;
+}
 function parsePeerAgentModeEnv(raw) {
   if (raw === "listen" || raw === "respond")
     return raw;
@@ -8330,7 +8378,7 @@ function decideInboundAccess(input) {
 // ../../packages/core/dist/channels/governance/slack-sender-gate.js
 function evaluateSlackInboundGate(evt, deps) {
   const isBot = Boolean(evt.bot_id);
-  const content = decideSlackMessageForward(evt);
+  const content = decideSlackMessageForward(evt, deps.peerConfig.third_party_bots);
   const spDecision = decideSenderPolicyForward(evt, deps.senderPolicy);
   const senderPolicy = spDecision.forward ? { forward: true } : { forward: false, reason: classifySlackPolicyBlock(evt, deps.senderPolicy) };
   const peer = isBot ? (() => {
@@ -8428,7 +8476,15 @@ function buildSlackPeerClassifierConfigFromEnv(env, opts) {
     peer_agent_mode: parsePeerAgentModeEnv(env["SLACK_PEER_AGENT_MODE"]),
     peer_group_ids: parsePeerGroupIdsEnv(env["SLACK_PEER_GROUP_IDS"]),
     peers: parsePeersEnv(env["SLACK_PEERS"], env["SLACK_PEERS_GATE"]),
-    peer_disabled_mode: parseSlackPeerDisabledModeEnv(env, opts?.onWarn)
+    peer_disabled_mode: parseSlackPeerDisabledModeEnv(env, opts?.onWarn),
+    // ENG-8669 follow-up: this builder never populated the third-party
+    // allowlist. ENG-8669 read `SLACK_THIRD_PARTY_BOTS` only in the MCP
+    // adapter's own inline config, so every consumer of THIS builder — the
+    // opencode manager-side SenderGate among them — saw `third_party_bots`
+    // as undefined and could not admit a third-party bot under any
+    // configuration. The allowlist was wired into one of the two Slack ingress
+    // paths. Reading it here makes the two agree.
+    third_party_bots: parseThirdPartyBotsEnv(env["SLACK_THIRD_PARTY_BOTS"])
   };
 }
 
@@ -11977,7 +12033,7 @@ var agentRestartTimezoneInputs = /* @__PURE__ */ new Map();
 var lastVersionCheckAt = 0;
 var VERSION_CHECK_INTERVAL_MS = 5 * 60 * 1e3;
 var lastResponsivenessProbeAt = 0;
-var agtCliVersion = true ? "0.28.618" : "dev";
+var agtCliVersion = true ? "0.28.620" : "dev";
 function resolveBrewPath(execFileSync3) {
   try {
     const out = execFileSync3("which", ["brew"], { timeout: 5e3 }).toString().trim();