clisbot 0.1.29 → 0.1.30

package/dist/main.js

@@ -4,25 +4,43 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
@@ -69343,7 +69361,7 @@ function isSlackCommandLikeMessage(params) {
   }) !== null;
 }
 function renderSlackRouteChoiceMessage(params) {
-  const botHandle = params.botLabel?.trim() ? `@${params.botLabel.trim()}` : "@<botname>";
+  const botReference = params.botLabel?.trim() ? `mention this bot (${params.botLabel.trim()})` : "mention this bot";
   return [
     "clisbot: this Slack channel is not configured yet.",
     "",
@@ -69351,19 +69369,34 @@ function renderSlackRouteChoiceMessage(params) {
     `- \`clisbot channels add slack-channel ${params.channelId}\``,
     `- \`clisbot channels add slack-channel ${params.channelId} --agent <id>\``,
     "",
-    `After that, mention \`${botHandle} \\start\` or \`${botHandle} \\status\` here.`
+    `After that, ${botReference} and send \`\\start\` or \`\\status\` here.`
   ].join(`
 `);
 }
 function renderSlackMentionRequiredMessage(botLabel) {
-  const botHandle = botLabel?.trim() ? `@${botLabel.trim()}` : "@<botname>";
+  const botReference = botLabel?.trim() ? `mention this bot (${botLabel.trim()})` : "mention this bot";
   return [
     "clisbot: this Slack channel requires a bot mention for new commands.",
-    `Try \`${botHandle} \\start\` or \`${botHandle} \\status\` here.`,
+    `Try ${botReference} and send \`\\start\` or \`\\status\` here.`,
     "After the bot replies in a thread, normal follow-up messages there can continue according to the follow-up policy."
   ].join(`
 `);
 }
+function shouldSendSlackMentionRequiredGuidance(params) {
+  return params.conversationKind === "dm" && params.isCommandLike;
+}
+function shouldGuideUnroutedSlackEvent(params) {
+  if (params.isBotOriginated) {
+    return false;
+  }
+  if (!params.isCommandLike) {
+    return false;
+  }
+  if (params.conversationKind === "dm") {
+    return true;
+  }
+  return params.wasMentioned;
+}
 async function sendSlackGuidanceOnce(params) {
   if (!params.eventId) {
     await params.send();
@@ -70116,11 +70149,15 @@ class SlackSocketService {
       directReplyToBot: isImplicitBotThreadReply(event, this.botUserId)
     });
     if (requiresMention && !wasMentioned) {
-      if (isSlackCommandLikeMessage({
+      const isCommandLike = isSlackCommandLikeMessage({
         text: event.text ?? "",
         botUserId: this.botUserId,
         botUsername: this.botLabel,
         commandPrefixes: params.route.commandPrefixes
+      });
+      if (shouldSendSlackMentionRequiredGuidance({
+        conversationKind: params.conversationKind,
+        isCommandLike
       })) {
         try {
           await postSlackText(this.app.client, {
@@ -70137,6 +70174,7 @@ class SlackSocketService {
         channelId,
         requiresMention,
         explicitMention,
+        isCommandLike,
         effectiveFollowUpMode
       });
       await this.processedEventsStore.markCompleted(eventId);
@@ -70323,6 +70361,13 @@ class SlackSocketService {
       const resolvedRoute = resolveSlackConversationRoute(this.loadedConfig, normalizedEvent, { accountId: this.accountId });
       const route = resolvedRoute.route;
       if (!route) {
+        if (isBotOriginatedSlackEvent(normalizedEvent) && !this.loadedConfig.raw.channels.slack.allowBots) {
+          debugSlackEvent("drop-unrouted-bot-mention", {
+            eventId: body.event_id,
+            allowBots: this.loadedConfig.raw.channels.slack.allowBots
+          });
+          return;
+        }
         try {
           await this.maybeGuideUnroutedSlackEvent({
             eventId: body.event_id,
@@ -70358,11 +70403,16 @@ class SlackSocketService {
       const resolvedRoute = resolveSlackConversationRoute(this.loadedConfig, normalizedEvent, { accountId: this.accountId });
       const route = resolvedRoute.route;
       if (!route) {
-        const shouldGuide = isSlackCommandLikeMessage({
-          text: normalizedEvent.text ?? "",
-          botUserId: this.botUserId,
-          botUsername: this.botLabel,
-          commandPrefixes: this.loadedConfig.raw.channels.slack.commandPrefixes
+        const shouldGuide = shouldGuideUnroutedSlackEvent({
+          conversationKind: resolvedRoute.conversationKind,
+          isCommandLike: isSlackCommandLikeMessage({
+            text: normalizedEvent.text ?? "",
+            botUserId: this.botUserId,
+            botUsername: this.botLabel,
+            commandPrefixes: this.loadedConfig.raw.channels.slack.commandPrefixes
+          }),
+          wasMentioned: hasBotMention(normalizedEvent.text ?? "", this.botUserId),
+          isBotOriginated: isBotOriginatedSlackEvent(normalizedEvent) && !this.loadedConfig.raw.channels.slack.allowBots
         });
         if (shouldGuide) {
           try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clisbot",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "private": false,
   "description": "Chat surfaces for durable AI coding agents running in tmux",
   "license": "MIT",