brainiac-discord 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5edd0068ecc82d20372d269791ff8e750fcec8106f4adcc99fdef3c252e03ada
-  data.tar.gz: b30c999fc3497d7608463975a3d9f4a8c09b135e3d7bc9da1099b6a5306594c2
+  metadata.gz: 38d2ec15ff61cbaaac7cc9c0ad3d090950c62e081bd353654ed48c70b982cc97
+  data.tar.gz: 167309f8288bbb17d8bc4f1dff9b3c85765e5bede1ec6f786aca076bc27fe705
 SHA512:
-  metadata.gz: f65f1deefed415c9b3a038162ad6c59714f2677c9ce8ec201e880ce9ae9b159571cb4910a7515268d0e09ad262e69011ea6f7b1c40471bc846ea5f84fa74d366
-  data.tar.gz: 23ba4bda9f6eb4e9797e6724ad57f12908da3176f116eacdaa11f8b5c3462647180cb8c0a1a1766c00ac12de49c2216e8fdf84da9ad719dcde0bae42307851f9
+  metadata.gz: b34ea4880a65b80733996be50b6609aa59a2327f021ffe1d140e4475b9ee1b259322efb400998511b164677aa81f065d3975804669d25154822ab1db5d8c4840
+  data.tar.gz: 5d661b2560f6ba4bc25a4b5a2b04a2840f9710da16595f551b8de7197346b47769f82495e414b3fb076b28ed5bc8f58e16a918253333cc6f0bb08ef40216a141

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

@@ -10,8 +10,8 @@ module Brainiac
       #
       # Handles incoming messages: authorization, cross-agent routing, project detection,
       # worktree management, prompt building, agent spawning, and response monitoring.
-      module Message
-        class << self
+      module Message # rubocop:disable Metrics/ModuleLength
+        class << self # rubocop:disable Metrics/ClassLength
           def handle(message, agent_key, bot_token, bot_user_id)
             channel_id = message["channel_id"]
             message_id = message["id"]
@@ -101,9 +101,9 @@ module Brainiac
               content.match?(/<@&#{Regexp.escape(role_id)}>/)
           end
 
-          # Check if another agent bot is explicitly mentioned in this message.
-          # When a user @mentions a specific agent, thread participants who weren't
-          # mentioned should stay silent — no intent check needed.
+          # Check if another agent bot or a known human user is explicitly mentioned
+          # in this message. When a user @mentions someone specific, thread participants
+          # who weren't mentioned should stay silent — no intent check needed.
           def other_agent_mentioned?(mentions, content, agent_key)
             mention_roles = []
 
@@ -118,7 +118,18 @@ module Brainiac
               mention_roles << role_id if role_id
             end
 
-            mention_roles.any? { |rid| content.match?(/<@&#{Regexp.escape(rid)}>/) }
+            return true if mention_roles.any? { |rid| content.match?(/<@&#{Regexp.escape(rid)}>/) }
+
+            # Also check human user_mappings — if a human was explicitly @mentioned,
+            # thread participants should stand down (message directed at someone specific)
+            Config.user_mappings.each_value do |discord_id|
+              next unless discord_id
+
+              return true if mentions.any? { |m| m["id"].to_s == discord_id.to_s } ||
+                             content.match?(/<@!?#{Regexp.escape(discord_id.to_s)}>/)
+            end
+
+            false
           end
 
           def validate_cross_agent_dispatch(sender_agent_key, agent_key, mentioned, content, channel_id)
@@ -487,7 +498,7 @@ module Brainiac
             thread_root_context = build_thread_root_context(is_thread, root_message, parent_channel_id, channel_id, bot_token)
             brain_context = build_brain_context(agent_name: agent_name, card_title: clean_content, comment_body: clean_content)
 
-            should_resume, thread_worktree_path, thread_cli_provider, thread_model, thread_effort = manage_worktree(
+            should_resume, thread_worktree_path, thread_cli_provider, thread_model, thread_effort, thread_map_key = manage_worktree(
               agent_key: agent_key, agent_name: agent_name, channel_id: channel_id, message_id: message_id,
               is_thread: is_thread, is_dm: is_dm, project_config: project_config, clean_content: clean_content,
               chat_mode: chat_mode, bot_token: bot_token
@@ -511,6 +522,10 @@ module Brainiac
               clean_content, project_config, thread_model, thread_effort, thread_cli_provider
             )
 
+            persist_overrides(thread_map_key, clean_content, project_config,
+                              cli_provider: cli_provider_override, model: model, effort: effort,
+                              prev_cli_provider: thread_cli_provider, prev_model: thread_model, prev_effort: thread_effort)
+
             meta_file = File.join(Delivery::DRAFT_DIR, "#{response_basename}.meta.json")
             write_meta(meta_file,
                        channel_id: channel_id, message_id: message_id, agent_key: agent_key,
@@ -582,6 +597,55 @@ module Brainiac
             [model, effort, 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,
+                                cli_provider:, model:, effort:,
+                                prev_cli_provider:, prev_model:, prev_effort:)
+            return unless thread_map_key
+
+            inline_cli = detect_cli_provider(text: clean_content)
+            inline_model = explicit_model_tag?(clean_content, project_config) ? model : nil
+            inline_effort = clean_content.match?(/\[effort:\w+\]/i) ? effort : nil
+
+            return unless inline_cli || inline_model || inline_effort
+
+            changed = (inline_cli && inline_cli != prev_cli_provider) ||
+                      (inline_model && inline_model != prev_model) ||
+                      (inline_effort && inline_effort != prev_effort)
+            return unless changed
+
+            # Update thread map entry with new overrides
+            Config.thread_map_mutex.synchronize do
+              map = Config.load_thread_map
+              entry = map[thread_map_key]
+              if entry
+                entry["cli_provider"] = cli_provider if inline_cli
+                entry["model"] = model if inline_model
+                entry["effort"] = effort if inline_effort
+                Config.save_thread_map(map)
+              end
+            end
+
+            # Also persist to core work item map (if a work item exists for this branch)
+            branch = Config.thread_map_mutex.synchronize do
+              Config.load_thread_map.dig(thread_map_key, "branch")
+            end
+            if branch && defined?(resolve_work_item_overrides)
+              resolve_work_item_overrides(
+                branch: branch,
+                inline_cli_provider: inline_cli,
+                inline_model: inline_model,
+                inline_effort: inline_effort
+              )
+            end
+
+            return unless defined?(LOG)
+
+            LOG.info "[Discord] Persisted overrides for #{thread_map_key}: " \
+                     "cli=#{cli_provider}, model=#{model}, effort=#{effort}"
+          end
+
           def explicit_model_tag?(clean_content, project_config)
             return false unless project_config
 
@@ -651,7 +715,7 @@ module Brainiac
                 create_chat_mode_dir(agent_key, agent_name, effective_thread_id, project_config, clean_content, thread_map_key)
             end
 
-            [should_resume, thread_worktree_path, thread_cli_provider, thread_model, thread_effort]
+            [should_resume, thread_worktree_path, thread_cli_provider, thread_model, thread_effort, thread_map_key]
           end
 
           def pre_create_thread(agent_key, agent_name, channel_id, message_id, clean_content, bot_token)

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

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Discord
-      VERSION = "0.0.5"
+      VERSION = "0.0.7"
     end
   end
 end

metadata

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