collavre 0.8.2 → 0.9.0

data/app/jobs/collavre/compress_job.rb

@@ -1,5 +1,7 @@
 module Collavre
   class CompressJob < ApplicationJob
+    include AiAgentResolvable
+
     queue_as :default
 
     def perform(creative_id, topic_id, user_id, extra_prompt = nil)
@@ -31,23 +33,37 @@ module Collavre
         system_prompt += "\n\nAdditional instruction from the user: #{extra_prompt}"
       end
 
-      # Find an AI agent on this creative, or use default config
-      agent = find_ai_agent(creative)
+      # Find an AI agent on this creative (no fallback — agent is required)
+      agent = resolve_ai_agent(creative, topic_id)
+
+      unless agent
+        error_msg = I18n.t("collavre.comments.compress_command.no_agent")
+        creative.comments.create!(user: user, topic_id: topic_id, content: "⚠️ #{error_msg}")
+        Rails.logger.error("[CompressJob] No AI agent found for creative #{creative_id}, topic #{topic_id}")
+        return
+      end
 
       client = AiClient.new(
-        vendor: agent&.llm_vendor || default_vendor,
-        model: agent&.llm_model || default_model,
+        vendor: agent.llm_vendor,
+        model: agent.llm_model,
         system_prompt: system_prompt,
-        llm_api_key: agent&.llm_api_key || agent&.creator&.llm_api_key
+        llm_api_key: agent.llm_api_key || agent.creator&.llm_api_key,
+        context: {
+          creative: creative,
+          user: agent,
+          topic_id: topic_id
+        }
       )
 
       summary = String.new
-      client.chat([ { role: "user", text: conversation } ]) do |delta|
+      result = client.chat([ { role: "user", text: conversation } ]) do |delta|
         summary << delta
       end
 
-      if summary.blank?
-        Rails.logger.error("[CompressJob] AI returned empty summary for topic #{topic_id}")
+      # AiClient returns nil on error (but still yields error text as delta).
+      # Check both: return value must be truthy AND content must be non-blank.
+      if result.nil? || summary.blank?
+        Rails.logger.error("[CompressJob] AI failed for topic #{topic_id}")
         return
       end
 
@@ -71,22 +87,5 @@ module Collavre
     rescue ActiveRecord::RecordNotFound => e
       Rails.logger.error("[CompressJob] Record not found: #{e.message}")
     end
-
-    private
-
-    def find_ai_agent(creative)
-      # Look for an AI agent with access to this creative
-      creative.effective_origin.all_shared_users(:feedback)
-        .map(&:user)
-        .find(&:ai_user?)
-    end
-
-    def default_vendor
-      "google"
-    end
-
-    def default_model
-      "gemini-3-flash-preview"
-    end
   end
 end

data/app/jobs/collavre/merge_comments_job.rb

@@ -0,0 +1,79 @@
+module Collavre
+  class MergeCommentsJob < ApplicationJob
+    include AiAgentResolvable
+
+    queue_as :default
+
+    SYSTEM_PROMPT = <<~PROMPT.freeze
+      You are merging multiple chat messages into a single coherent message.
+      Synthesize the content from all messages, preserving all important information,
+      decisions, action items, and context.
+      Do not add commentary about the merge process itself.
+      Respond in the same language as the original messages.
+      Use markdown formatting for readability.
+    PROMPT
+
+    def perform(creative_id, comment_ids, user_id) # rubocop:disable Lint/UnusedMethodArgument -- user_id reserved for future audit/notification use
+      creative = Creative.find(creative_id)
+
+      # Fetch comments in chronological order
+      comments = creative.comments
+        .where(id: comment_ids)
+        .order(created_at: :asc)
+        .includes(:user)
+        .to_a
+
+      return if comments.size < 2
+
+      target_comment = comments.first
+      topic_id = target_comment.topic_id
+
+      # Build conversation text
+      conversation = comments.map do |c|
+        author = c.user&.name || I18n.t("collavre.comments.anonymous")
+        "#{author}: #{c.content}"
+      end.join("\n\n")
+
+      # Resolve AI agent (same as /compress — agent is required)
+      agent = resolve_ai_agent(creative, topic_id)
+
+      unless agent
+        Rails.logger.error("[MergeCommentsJob] No AI agent found for creative #{creative_id}")
+        return
+      end
+
+      client = AiClient.new(
+        vendor: agent.llm_vendor,
+        model: agent.llm_model,
+        system_prompt: SYSTEM_PROMPT,
+        llm_api_key: agent.llm_api_key || agent.creator&.llm_api_key,
+        context: {
+          creative: creative,
+          user: agent,
+          topic_id: topic_id
+        }
+      )
+
+      merged_content = String.new
+      result = client.chat([ { role: "user", text: conversation } ]) do |delta|
+        merged_content << delta
+      end
+
+      # AiClient returns nil on error (but still yields error text as delta).
+      # Check both: return value must be truthy AND content must be non-blank.
+      if result.nil? || merged_content.blank?
+        Rails.logger.error("[MergeCommentsJob] AI failed for comments #{comment_ids}")
+        return
+      end
+
+      # Update the first comment and delete the rest atomically
+      remaining_ids = comments[1..].map(&:id)
+      ActiveRecord::Base.transaction do
+        target_comment.update!(content: merged_content)
+        creative.comments.where(id: remaining_ids).destroy_all
+      end
+    rescue ActiveRecord::RecordNotFound => e
+      Rails.logger.error("[MergeCommentsJob] Record not found: #{e.message}")
+    end
+  end
+end

data/app/models/collavre/topic.rb

@@ -17,6 +17,35 @@ module Collavre
 
     default_scope { order(:position) }
 
+    # Returns the primary agent User for this topic (from orchestration policy)
+    def primary_agent
+      policy = OrchestratorPolicy.find_by(
+        policy_type: "arbitration",
+        scope_type: "Topic",
+        scope_id: id
+      )
+      return nil unless policy&.config&.dig("primary_agent_id")
+
+      User.find_by(id: policy.config["primary_agent_id"])
+    end
+
+    # Sets or replaces the primary agent for this topic
+    def set_primary_agent!(agent)
+      policy = OrchestratorPolicy.find_or_initialize_by(
+        policy_type: "arbitration",
+        scope_type: "Topic",
+        scope_id: id
+      )
+      policy.update!(
+        config: {
+          "strategy" => "primary_first",
+          "primary_agent_id" => agent.id
+        },
+        priority: 10,
+        enabled: true
+      )
+    end
+
     def archived?
       archived_at.present?
     end

data/app/models/concerns/collavre/ai_agent_resolvable.rb

@@ -0,0 +1,42 @@
+module Collavre
+  module AiAgentResolvable
+    extend ActiveSupport::Concern
+
+    private
+
+    # Resolve AI agent using orchestration rules:
+    # 1. Topic's primary agent (from OrchestratorPolicy)
+    # 2. Fallback: any AI agent with feedback permission on the creative
+    def resolve_ai_agent(creative, topic_id)
+      if topic_id.present?
+        context = build_ai_agent_policy_context(creative, topic_id)
+        resolver = Orchestration::PolicyResolver.new(context)
+        primary_id = resolver.primary_agent_id
+
+        if primary_id.present?
+          agent = User.find_by(id: primary_id)
+          return agent if agent&.ai_user?
+        end
+      end
+
+      creative.effective_origin.all_shared_users(:feedback)
+        .map(&:user)
+        .find(&:ai_user?)
+    end
+
+    def build_ai_agent_policy_context(creative, topic_id)
+      context = {}
+      context["creative"] = { "id" => creative.id }
+      context["topic"] = { "id" => topic_id } if topic_id.present?
+      context
+    end
+
+    def default_vendor
+      "google"
+    end
+
+    def default_model
+      "gemini-3-flash-preview"
+    end
+  end
+end

data/app/services/collavre/comments/topic_command.rb

@@ -72,29 +72,43 @@ module Collavre
 
           if primary_agent
             set_primary_agent(topic, primary_agent)
+            broadcast_topic_created(topic, primary_agent)
             I18n.t("collavre.comments.topic_command.created_with_agent",
                    name: topic.name,
                    agent: primary_agent.name)
           else
+            broadcast_topic_created(topic)
             I18n.t("collavre.comments.topic_command.created", name: topic.name)
           end
         end
       end
 
+      def broadcast_topic_created(topic, agent = nil)
+        data = { action: "created", topic: topic.slice(:id, :name), user_id: user.id }
+        if agent
+          data[:topic][:primary_agent] = {
+            id: agent.id,
+            name: agent.display_name,
+            avatar_url: resolve_avatar_url(agent)
+          }
+        end
+        TopicsChannel.broadcast_to(creative, data)
+      end
+
+      def resolve_avatar_url(agent)
+        if agent.avatar.attached?
+          Rails.application.routes.url_helpers.rails_blob_url(
+            agent.avatar, only_path: true
+          )
+        elsif agent.avatar_url.present?
+          agent.avatar_url
+        else
+          ActionController::Base.helpers.asset_path("default_avatar.svg")
+        end
+      end
+
       def set_primary_agent(topic, agent)
-        policy = OrchestratorPolicy.find_or_initialize_by(
-          policy_type: "arbitration",
-          scope_type: "Topic",
-          scope_id: topic.id
-        )
-        policy.update!(
-          config: {
-            "strategy" => "primary_first",
-            "primary_agent_id" => agent.id
-          },
-          priority: 10,
-          enabled: true
-        )
+        topic.set_primary_agent!(agent)
       end
     end
   end

data/app/views/collavre/comments/_comments_popup.html.erb

@@ -29,12 +29,15 @@
      data-voice-stop-text="<%= t('collavre.comments.voice_stop') %>"
      data-move-no-selection-text="<%= t('collavre.comments.move_no_selection') %>"
      data-move-error-text="<%= t('collavre.comments.move_error') %>"
+     data-selection-select-all-text="<%= t('collavre.comments.select_all') %>"
      data-selection-count-text="<%= t('collavre.comments.selection_count') %>"
      data-selection-delete-text="<%= t('collavre.comments.selection_delete') %>"
      data-selection-move-text="<%= t('collavre.comments.selection_move') %>"
      data-selection-topic-move-text="<%= t('collavre.comments.selection_topic_move') %>"
      data-selection-close-text="<%= t('collavre.comments.selection_close') %>"
      data-selection-drag-hint-text="<%= t('collavre.comments.selection_drag_hint') %>"
+     data-selection-merge-text="<%= t('collavre.comments.selection_merge') %>"
+     data-merge-confirm-text="<%= t('collavre.comments.merge_confirm') %>"
      data-batch-delete-confirm-text="<%= t('collavre.comments.batch_delete_confirm') %>"
      data-topic-search-placeholder-text="<%= t('collavre.comments.topic_search_placeholder') %>"
      data-topic-main-text="<%= t('collavre.comments.topic_main') %>"
@@ -79,7 +82,8 @@
   <div id="comment-contexts" data-comments--contexts-target="list" class="comment-contexts-list" style="display:none;"
        data-inherited-label="<%= t('collavre.contexts.inherited_label', default: 'Inherited from parent') %>"
        data-self-context-label="<%= t('collavre.contexts.self_context_label', default: 'Current creative context') %>"
-       data-navigate-label="<%= t('collavre.contexts.navigate_label', default: 'Go to creative') %>"></div>
+       data-navigate-label="<%= t('collavre.contexts.navigate_label', default: 'Go to creative') %>"
+       data-action="dragover->comments--contexts#handleExternalDragOver drop->comments--contexts#handleExternalDrop dragleave->comments--contexts#handleExternalDragLeave"></div>
   <div data-share-modal-target="container"></div>
   <div id="comment-participants" data-comments--presence-target="participants" data-comments--mention-menu-target="participants"></div>
   <div id="comment-topics" data-comments--topics-target="list" class="comment-topics-list"

data/config/locales/comments.en.yml

@@ -8,6 +8,7 @@ en:
       archive: Archive
       unarchive: Restore
       archived_topics: "Archived topics (%{count})"
+      not_ai_agent: Only AI agents can be set as primary agent.
       move:
         no_target_permission: You don't have write permission on the target creative.
         duplicate_name: A topic named '%{name}' already exists in the target creative.
@@ -85,12 +86,20 @@ en:
       move_no_selection: Select at least one message to move.
       move_error: Unable to move messages.
       add_participant: Add user
-      selection_count: "{count} selected"
+      select_all: All
+      selection_count: "{count}/{total} selected"
       selection_delete: Delete
       selection_move: Move
       selection_topic_move: Move to topic
       selection_close: Cancel
       selection_drag_hint: "You can also drag & drop to move to a topic"
+      selection_merge: Merge
+      merge_confirm: "Merge the selected messages into one? The first message will be updated and the rest will be deleted."
+      merge:
+        started: "⏳ Merging messages..."
+        minimum_required: "Select at least 2 messages to merge."
+        not_authorized: "You don't have permission to merge messages."
+        own_messages_only: "You can only merge your own messages or messages from your AI agents."
       batch_delete_confirm: Are you sure you want to delete the selected messages?
       batch_delete_no_selection: Select at least one message to delete.
       batch_delete_not_found: Some selected messages could not be found.
@@ -124,6 +133,7 @@ en:
         not_authorized: "You need write permission to compress a topic."
         topic_required: "The /compress command can only be used within a topic."
         nothing_to_compress: "No messages to compress in this topic."
+        no_agent: "No AI agent is available for this topic. Please assign an AI agent first."
         started: "⏳ Compressing topic messages..."
         summary_title: "Topic Summary — %{topic}"
         failed: "Compress failed"

data/config/locales/comments.ko.yml

@@ -8,6 +8,7 @@ ko:
       archive: 아카이브
       unarchive: 복원
       archived_topics: "아카이브된 토픽 (%{count}개)"
+      not_ai_agent: AI 에이전트만 Primary Agent로 설정할 수 있습니다.
       move:
         no_target_permission: 대상 크리에이티브에 대한 쓰기 권한이 없습니다.
         duplicate_name: "'%{name}' 토픽이 대상 크리에이티브에 이미 존재합니다."
@@ -82,12 +83,20 @@ ko:
       move_no_selection: 이동할 메시지를 선택해주세요.
       move_error: 메시지를 이동할 수 없습니다.
       add_participant: 사용자 추가
-      selection_count: "{count}개 선택"
+      select_all: 전체
+      selection_count: "{count}/{total}개 선택"
       selection_delete: 삭제
       selection_move: 이동
       selection_topic_move: 토픽 이동
       selection_close: 취소
       selection_drag_hint: "드래그&드롭으로도 토픽 이동 가능"
+      selection_merge: 병합
+      merge_confirm: "선택한 메시지를 하나로 병합하시겠습니까? 첫 번째 메시지가 업데이트되고 나머지는 삭제됩니다."
+      merge:
+        started: "⏳ 메시지 병합 중..."
+        minimum_required: "병합하려면 2개 이상의 메시지를 선택하세요."
+        not_authorized: "메시지를 병합할 권한이 없습니다."
+        own_messages_only: "자신의 메시지 또는 자신의 AI 에이전트 메시지만 병합할 수 있습니다."
       batch_delete_confirm: 선택한 메시지를 삭제하시겠습니까?
       batch_delete_no_selection: 삭제할 메시지를 선택해주세요.
       batch_delete_not_found: 일부 선택한 메시지를 찾을 수 없습니다.
@@ -121,6 +130,7 @@ ko:
         not_authorized: "토픽을 요약하려면 쓰기 권한이 필요합니다."
         topic_required: "/compress 명령은 토픽 내에서만 사용할 수 있습니다."
         nothing_to_compress: "이 토픽에 요약할 메세지가 없습니다."
+        no_agent: "이 토픽에 사용할 수 있는 AI 에이전트가 없습니다. 먼저 AI 에이전트를 지정해 주세요."
         started: "⏳ 토픽 메세지를 요약하는 중..."
         summary_title: "토픽 요약 — %{topic}"
         failed: "요약 실패"

data/config/routes.rb

@@ -59,6 +59,7 @@ Collavre::Engine.routes.draw do
         patch :move
         patch :archive
         patch :unarchive
+        patch :set_primary_agent
       end
     end
     resources :comments, only: [ :index, :create, :destroy, :show, :update ] do
@@ -82,6 +83,7 @@ Collavre::Engine.routes.draw do
         get :fullscreen
         post :move
         delete :batch_destroy
+        post :merge
         get :commands
       end
     end

data/lib/collavre/version.rb

@@ -1,3 +1,3 @@
 module Collavre
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Collavre
@@ -324,6 +324,7 @@ files:
 - app/jobs/collavre/cron_action_job.rb
 - app/jobs/collavre/cron_scheduler_job.rb
 - app/jobs/collavre/inbox_summary_job.rb
+- app/jobs/collavre/merge_comments_job.rb
 - app/jobs/collavre/permission_cache_cleanup_job.rb
 - app/jobs/collavre/permission_cache_job.rb
 - app/jobs/collavre/push_notification_job.rb
@@ -372,6 +373,7 @@ files:
 - app/models/collavre/user_theme.rb
 - app/models/collavre/variation.rb
 - app/models/collavre/webauthn_credential.rb
+- app/models/concerns/collavre/ai_agent_resolvable.rb
 - app/services/collavre/ai_agent/a2a_dispatcher.rb
 - app/services/collavre/ai_agent/agent_lifecycle_manager.rb
 - app/services/collavre/ai_agent/approval_handler.rb