brainiac-discord 0.0.20 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 173d9471b14272a611b844fb7a12e0d728f812ab2b06cda08b05faf26329243c
-  data.tar.gz: c0658fe873c620e9b1be027d1866035b4d6bd846e13088626eefa174e77c186d
+  metadata.gz: 0c4e465a488b1eb8ff21dc46d539271cd85a35086fbed35a32e49bad609ee949
+  data.tar.gz: 5095805d24f0422c6ad9fe0ea7bb363965732b6d2b6df047d00295ce14b05194
 SHA512:
-  metadata.gz: d3997e24550bd3be11cb48942dafa1b624cdc0288410ce5388e4eca6a5145f61291d7dce56295c34544c9dad46407572c3b587e96b3c35a2c168ea4a34afa09e
-  data.tar.gz: 55a5b86aae6ce19a9d37b2e2e2d438d3c7ddc80c166367996ffaa9f1355a98613e2f10cb0582c4e171e8e135b27b507cee5317731173a8e01bec63ff795de870
+  metadata.gz: e8c98fba862167e6c12096161dfb5fd964b12c6cb938c767279b00c2002a0770993c0f3a68b6b9f35fd391fbecba83d19f6fb21b1d1972a05aad4adcd89c78ff
+  data.tar.gz: 37d9072132b6c961f15c7237f9b5bae98db6ddf0933f39ea9bfee4c9b983a85eb8b007e6cf2b11d8fc19fe75c261f733429cbad1827d124c4c47cbdaa811147e

data/lib/brainiac/plugins/discord/gateway.rb

@@ -2,6 +2,7 @@
 
 require "websocket-client-simple"
 require "websocket"
+require "time"
 
 module Brainiac
   module Plugins
@@ -23,6 +24,12 @@ module Brainiac
         BACKOFF_HANDSHAKE_BASE = 30
         BACKOFF_CAP = 300
 
+        # How long after a message is posted an edit still counts as a real,
+        # conversational edit worth re-dispatching on. Edits that land outside
+        # this window are treated as server-side embed refreshes (Discord
+        # restamping edited_timestamp when it unfurls a link), not human intent.
+        EDIT_FRESHNESS_WINDOW = 300 # seconds (5 minutes)
+
         # Per-bot state: { agent_key => { token:, user_id:, status:, thread: } }
         @bots = {}
         @bots_mutex = Mutex.new
@@ -376,7 +383,16 @@ module Brainiac
                 LOG.error "[Discord:#{agent_display}] Error handling message: #{e.message}\n#{e.backtrace.first(3).join("\n")}" if defined?(LOG)
               end
             when "MESSAGE_UPDATE"
-              if data["edited_timestamp"]
+              # Discord emits MESSAGE_UPDATE for genuine human edits AND for
+              # server-side embed (un)furls on existing messages — e.g. lazily
+              # generating a link preview days after the message was posted. Both
+              # stamp edited_timestamp, so re-dispatching on every update means a
+              # bare URL in an old agent-mentioning message can silently wake the
+              # agent long after the fact. Only treat an update as actionable when
+              # the edit happened close to the message's own creation time, which
+              # is what a real conversational edit (typo fix, afterthought) looks
+              # like. See message.rb for the shared dispatch path.
+              if data["edited_timestamp"] && !stale_edit?(data["timestamp"], data["edited_timestamp"])
                 Thread.new do
                   Message.handle(data, agent_key, bot_token, bot_user_id)
                 rescue StandardError => e
@@ -384,6 +400,9 @@ module Brainiac
                     LOG.error "[Discord:#{agent_display}] Error handling message update: #{e.message}\n#{e.backtrace.first(3).join("\n")}"
                   end
                 end
+              elsif data["edited_timestamp"] && defined?(LOG)
+                LOG.info "[Discord:#{agent_display}] Ignoring stale MESSAGE_UPDATE " \
+                         "(likely embed refresh) on message #{data["id"]}"
               end
             when "MESSAGE_REACTION_ADD"
               Thread.new do
@@ -416,6 +435,25 @@ module Brainiac
             bot_user_id
           end
 
+          # True when a MESSAGE_UPDATE's edit happened long enough after the
+          # message was created that it's almost certainly a server-side embed
+          # refresh rather than a human edit. Guards against spurious agent
+          # dispatches from Discord lazily unfurling link previews on old
+          # messages that mention the bot.
+          #
+          # Fails open (returns false → treat as a real edit) when either
+          # timestamp is missing or unparseable, so a parsing hiccup never
+          # silently swallows a genuine edit.
+          def stale_edit?(created_at, edited_at)
+            return false if created_at.nil? || edited_at.nil?
+
+            created = Time.iso8601(created_at.to_s)
+            edited  = Time.iso8601(edited_at.to_s)
+            (edited - created) > EDIT_FRESHNESS_WINDOW
+          rescue ArgumentError
+            false
+          end
+
           def mark_bot_ready(agent_key, agent_display, bot_user_id, data)
             @bots_mutex.synchronize do
               @bots[agent_key][:user_id] = bot_user_id

data/lib/brainiac/plugins/discord/message.rb

@@ -714,8 +714,15 @@ module Brainiac
           end
 
           def resolve_overrides(clean_content, project_config, thread_model, thread_effort, thread_cli_provider)
-            cli_provider = detect_cli_provider(text: clean_content) || thread_cli_provider
+            inline_cli = detect_cli_provider(text: clean_content)
+            cli_provider = inline_cli || thread_cli_provider
             has_explicit_model = explicit_model_tag?(clean_content, project_config, cli_provider_override: cli_provider)
+
+            # The stored model is a resolved ID from the previous provider's model map, so it
+            # means nothing to a different provider. Drop it on a switch and fall back to the
+            # new provider's default (unless this message also carries a model tag).
+            # Effort is kept: it's generic and gets clamped per provider anyway.
+            thread_model = nil if provider_switched?(inline_cli, thread_cli_provider)
             has_explicit_effort = clean_content.match?(/\[effort:\w+\]/i)
 
             model = if has_explicit_model
@@ -737,6 +744,10 @@ module Brainiac
             [model, effort, cli_provider]
           end
 
+          def provider_switched?(inline_cli, prev_cli_provider)
+            !inline_cli.nil? && inline_cli != prev_cli_provider
+          end
+
           # Persist inline overrides to the thread map (and work item map if a work item exists).
           # Only writes when a new inline tag was detected (differs from previously stored values).
           def persist_overrides(thread_map_key, clean_content, project_config,
@@ -761,7 +772,8 @@ module Brainiac
               entry = map[thread_map_key]
               if entry
                 entry["cli_provider"] = cli_provider if inline_cli
-                entry["model"] = model if inline_model
+                # Clear the old provider's model on a switch so it can't resurface later
+                entry["model"] = inline_model if inline_model || provider_switched?(inline_cli, prev_cli_provider)
                 entry["effort"] = effort if inline_effort
                 Config.save_thread_map(map)
               end

data/lib/brainiac/plugins/discord/version.rb

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Discord
-      VERSION = "0.0.20"
+      VERSION = "0.0.22"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainiac-discord
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.22
 platform: ruby
 authors:
 - Andy Davis