brainiac-discord 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f2f87e89db33072e4ceb141ec472b71ce09f22d3a383da595f195f3f441b9ee
-  data.tar.gz: 69aeb6d7e6f945f0fb517c8bfd37a6d91e749137d634d5578596a462579044b2
+  metadata.gz: 7091fddf5aa23196f3e031d6830549eca0463e29fad37433d4683a7c8cb816f7
+  data.tar.gz: 1b1bf72a7180aa002c06a18774e65e36550fab21a0c7ec1dc02498454e1c9b2c
 SHA512:
-  metadata.gz: 2eab7e192cfe422009193273e88bbf8aab1b8ccecdf3d33d7643847b4799a55f44bb5c3d5f18c56eea753982491c73426942e420a1d99c418867829c9bb65fdf
-  data.tar.gz: 6f66c81ea46ac32423fb10a542730c3e2c71d6d7db71b959ef188b93effa68a12932f4e8e52cc1d203473882355d78339058320dbba9eb61eb8e88d62a479700
+  metadata.gz: e1ed0e106262c3cd09c04d00cc918db60fa04c52651c45365daa2af1d1bf658e7ba619f8ecc60f3c841893802ceeb6c4fa18eca8f875bee5c0b3acc18cce26b5
+  data.tar.gz: d124b1ed107451cf7c48e9815ba8e9fa049d891c91f78c000f7d2b46945053c7c710c29d15983c02ecf33cc73f0e0343942ee4ba777fa6c84bce474ae3a7456a

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

@@ -826,6 +826,13 @@ module Brainiac
             debounced_repo_fetch(repo_path)
             worktree_path = create_or_reuse_worktree(repo_path: repo_path, branch: branch)
 
+            # Register a work item so brainiac-github can route PR comments/reviews back
+            # to the agent that actually owns this Discord thread's worktree. Without this,
+            # PRs created from a conversational session have no work item and comments
+            # fall back to the project's default agent.
+            project_key = PROJECTS.find { |_k, v| v == project_config }&.first
+            register_work_item(branch: branch, worktree: worktree_path, project: project_key, agent: agent_name)
+
             cli, model, effort = detect_thread_overrides(
               project_config, clean_content,
               fallback_cli: existing&.dig("cli_provider"),
@@ -932,6 +939,7 @@ module Brainiac
             head_before, status_before = capture_brainiac_state(project_config, work_dir)
             prompt_mode = resolved["prompt_mode"] || "stdin"
 
+            started_at = Time.now
             pid = spawn(spawn_env, *cmd,
                         chdir: work_dir,
                         **(prompt_mode == "stdin" ? { in: prompt_file } : {}),
@@ -951,7 +959,8 @@ module Brainiac
               meta_file: meta_file, prompt_file: prompt_file, log_file: log_file,
               attachment_paths: attachment_paths, project_config: project_config,
               head_before: head_before, status_before: status_before,
-              supersede_key: supersede_key
+              supersede_key: supersede_key,
+              resolved: resolved, model: model, work_dir: work_dir, started_at: started_at
             )
           end
 
@@ -1129,7 +1138,8 @@ module Brainiac
 
           def monitor_agent(pid:, session_key:, agent_name:, agent_config_name:, channel_id:, message_id:,
                             bot_token:, response_file:, meta_file:, prompt_file:, log_file:,
-                            attachment_paths:, project_config:, head_before:, status_before:, supersede_key: nil)
+                            attachment_paths:, project_config:, head_before:, status_before:, supersede_key: nil,
+                            resolved: nil, model: nil, work_dir: nil, started_at: nil)
             Thread.new do
               Process.wait(pid)
               exit_status = $CHILD_STATUS
@@ -1139,6 +1149,16 @@ module Brainiac
 
               session_cancelled = ACTIVE_SESSIONS_MUTEX.synchronize { !ACTIVE_SESSIONS.key?(session_key) }
 
+              # Record a durable session-history entry regardless of how the session ended.
+              # Discord dispatches its own agents (bypassing core's run_agent/handle_agent_completion),
+              # so without this hook Discord sessions never land in ~/.brainiac/session-history.jsonl.
+              archive_discord_session_history(
+                agent_name: agent_name, agent_config_name: agent_config_name,
+                channel_id: channel_id, message_id: message_id, log_file: log_file,
+                resolved: resolved, model: model, work_dir: work_dir, started_at: started_at,
+                exit_status: exit_status
+              )
+
               if exit_status.signaled? || session_cancelled
                 handle_cancelled(exit_status, session_cancelled, agent_name, message_id,
                                  response_file, meta_file, prompt_file, attachment_paths)
@@ -1167,6 +1187,44 @@ module Brainiac
             schedule_temp_cleanup(prompt_file, attachment_paths)
           end
 
+          # Record a durable session-history entry for a finished Discord session.
+          #
+          # Discord runs agents via its own spawn_agent/monitor_agent path and never
+          # touches core's handle_agent_completion, which is the single choke point that
+          # normally calls archive_session_history. As a result, Discord sessions were
+          # missing entirely from ~/.brainiac/session-history.jsonl (only fizzy/github/etc
+          # showed up). This bridges that gap by building the ctx archive_session_history
+          # expects and calling it directly, with source: :discord.
+          #
+          # Fully best-effort: archive_session_history already rescues internally, but we
+          # guard here too so a history failure can never break Discord's completion path.
+          def archive_discord_session_history(agent_name:, agent_config_name:, channel_id:, message_id:,
+                                              log_file:, resolved:, model:, work_dir:, started_at:, exit_status:)
+            return unless defined?(archive_session_history)
+
+            ctx = {
+              agent_name: agent_name,
+              agent_config_name: agent_config_name,
+              source: :discord,
+              channel_id: channel_id,
+              source_context: { channel_id: channel_id, message_id: message_id },
+              log_file: log_file,
+              resolved: resolved,
+              chdir: work_dir,
+              agent_cli: resolved && resolved["agent_cli"],
+              model: model,
+              started_at: started_at
+            }
+
+            archive_session_history(
+              ctx: ctx,
+              exit_status: exit_status.exitstatus,
+              signaled: exit_status.signaled?
+            )
+          rescue StandardError => e
+            LOG.warn "[Discord:#{agent_name}] Failed to archive session history: #{e.message}" if defined?(LOG)
+          end
+
           def handle_completed(exit_status:, agent_name:, agent_config_name:, channel_id:, message_id:,
                                bot_token:, response_file:, meta_file:, log_file:,
                                project_config:, head_before:, status_before:)

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

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Discord
-      VERSION = "0.0.13"
+      VERSION = "0.0.15"
     end
   end
 end

metadata

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