collavre 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb2d48043704a517d8970498aa1057e5eaa29133304fe4fb82ebe37ac96b8458
-  data.tar.gz: d517609fd42be9255120f2faafe4acaf0fa36a2797c96021c5502acb6206af66
+  metadata.gz: 726c316625f342dc6d95769cc629900ea58c58a830d5a072fa9bd86609724e1f
+  data.tar.gz: 629f17bdbc23f81f22c16a19b09ee6eaeab5013fc7e6de7096f5bcb6ff1ab3f7
 SHA512:
-  metadata.gz: ca97eb7ec6d858f67b1d3da6f7db767d15a7ba16a14b3dcb883c051a8bef55b2d679441ff8eb32cd9455528ef977f74430e535553cf9511d74024a23d7c8d0e7
-  data.tar.gz: a5cccbe54450cc225d25935ab85720302f61354785dfac02c1170933369c470767786a7c2fc683a93f907ffdc6ce5a34cb2abd1fec8b77aa6fbce9408c68873d
+  metadata.gz: 26eba94cd79976a2d21587c18e20b12734021fc7e3c207e0bd76c62cf3e2e1b8c258c711cc9f95b07440a0947702a58f1628e5df457fea2921255606e2ec0230
+  data.tar.gz: 547794c0208675a2a951320549ac26a07a01ea707ee1611a8d7a2dcf8d2f3475068b7e316d7de59037dfee0b03d1389b8671a191ee1c02e1798caed77e8d3e65

data/app/controllers/collavre/admin/orchestration_controller.rb

@@ -17,7 +17,7 @@ module Collavre
           validate_policies!(parsed)
           apply_policies!(parsed)
 
-          redirect_to main_app.admin_orchestration_path, notice: t("admin.orchestration.updated")
+          redirect_to admin_orchestration_path, notice: t("admin.orchestration.updated")
         rescue Psych::SyntaxError => e
           flash.now[:alert] = t("admin.orchestration.yaml_syntax_error", message: e.message)
           @policies_yaml = yaml_content

data/app/controllers/collavre/comments_controller.rb

@@ -179,7 +179,7 @@ module Collavre
           chat: {
             content: @comment.content
           }
-        }) unless @comment.private?
+        }) unless @comment.private? || response.present?
         @comment = Comment.with_attached_images.includes(:comment_reactions).find(@comment.id)
         render partial: "collavre/comments/comment", locals: { comment: @comment, current_topic_id: current_topic_context }, status: :created
       else
@@ -491,6 +491,12 @@ module Collavre
           aliases: [ "/cal" ],
           description: I18n.t("collavre.comments.command_menu.calendar_description"),
           args: I18n.t("collavre.comments.command_menu.calendar_args")
+        },
+        {
+          name: "topic",
+          label: "/topic",
+          description: I18n.t("collavre.comments.command_menu.topic_description"),
+          args: I18n.t("collavre.comments.command_menu.topic_args")
         }
       ] + mcp_command_items
     end

data/app/models/collavre/comment.rb

@@ -75,10 +75,24 @@ module Collavre
       :ok
     end
 
+    def mentioned_users
+      return Collavre.user_class.none unless user
+      emails = mentioned_emails - [ user.email.downcase ]
+      names = mentioned_names - [ user.name.downcase ]
+
+      origin = creative.effective_origin
+      mentionable_users = Collavre.user_class.mentionable_for(origin)
+
+      scope = Collavre.user_class.none
+      scope = scope.or(mentionable_users.where(email: emails)) if emails.any?
+      scope = scope.or(mentionable_users.where("LOWER(name) IN (?)", names)) if names.any?
+      scope
+    end
+
     private
 
     def cancel_pending_tasks
-      Task.where(status: %w[pending running]).each do |task|
+      Task.where(status: %w[pending running queued]).each do |task|
         if task.trigger_event_payload&.dig("comment", "id") == id
           task.update!(status: "cancelled")
         end
@@ -126,20 +140,6 @@ module Collavre
              .uniq
     end
 
-    def mentioned_users
-      return Collavre.user_class.none unless user
-      emails = mentioned_emails - [ user.email.downcase ]
-      names = mentioned_names - [ user.name.downcase ]
-
-      origin = creative.effective_origin
-      mentionable_users = Collavre.user_class.mentionable_for(origin)
-
-      scope = Collavre.user_class.none
-      scope = scope.or(mentionable_users.where(email: emails)) if emails.any?
-      scope = scope.or(mentionable_users.where("LOWER(name) IN (?)", names)) if names.any?
-      scope
-    end
-
     def broadcast_create
       return if private?
       broadcast_append_later_to([ creative, :comments ], target: "comments-list", partial: "collavre/comments/comment")

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

@@ -34,19 +34,12 @@ module Collavre
           content = comment.content.to_s.strip
 
           # Extract topic name in quotes
-          name_match = content.match(/[""]([^""]+)[""]|"([^"]+)"/)
+          name_match = content.match(/[\u201c\u201d""]([^"\u201c\u201d""]+)[\u201c\u201d""]|"([^"]+)"/)
           topic_name = name_match ? (name_match[1] || name_match[2]) : nil
 
           return if topic_name.blank?
 
-          # Extract @mentions for primary agent
-          agent_match = content.match(/@(\w+)/)
-          agent_name = agent_match ? agent_match[1] : nil
-
-          {
-            name: topic_name,
-            agent_name: agent_name
-          }
+          { name: topic_name }
         end
       end
 
@@ -54,45 +47,47 @@ module Collavre
         data = parsed_args
         return I18n.t("collavre.comments.topic_command.missing_name") if data.blank?
 
-        # Create new topic
-        topic = Topic.create!(
-          creative: creative,
-          user: user,
-          name: data[:name]
-        )
+        # Find primary agent from @mentions using the same parsing as chat
+        primary_agent = comment.mentioned_users.find(&:ai_user?)
 
-        # Set primary agent if specified
-        primary_agent = find_agent(data[:agent_name]) if data[:agent_name].present?
+        # Find existing topic or create new one
+        existing_topic = Topic.find_by(creative: creative, name: data[:name])
 
-        if primary_agent
-          set_primary_agent(topic, primary_agent)
-          I18n.t("collavre.comments.topic_command.created_with_agent",
-                 name: topic.name,
-                 agent: primary_agent.name)
+        if existing_topic
+          if primary_agent
+            set_primary_agent(existing_topic, primary_agent)
+            I18n.t("collavre.comments.topic_command.updated_agent",
+                   name: existing_topic.name,
+                   agent: primary_agent.name)
+          else
+            I18n.t("collavre.comments.topic_command.already_exists",
+                   name: existing_topic.name)
+          end
         else
-          if data[:agent_name].present?
-            I18n.t("collavre.comments.topic_command.created_agent_not_found",
+          topic = Topic.create!(
+            creative: creative,
+            user: user,
+            name: data[:name]
+          )
+
+          if primary_agent
+            set_primary_agent(topic, primary_agent)
+            I18n.t("collavre.comments.topic_command.created_with_agent",
                    name: topic.name,
-                   agent_name: data[:agent_name])
+                   agent: primary_agent.name)
           else
             I18n.t("collavre.comments.topic_command.created", name: topic.name)
           end
         end
       end
 
-      def find_agent(name)
-        # Find AI agent by name (case-insensitive)
-        user_class = Collavre.configuration.user_class_name.constantize
-        user_class.where.not(llm_vendor: [ nil, "" ])
-                  .where("LOWER(name) = ?", name.downcase)
-                  .first
-      end
-
       def set_primary_agent(topic, agent)
-        OrchestratorPolicy.create!(
+        policy = OrchestratorPolicy.find_or_initialize_by(
           policy_type: "arbitration",
           scope_type: "Topic",
-          scope_id: topic.id,
+          scope_id: topic.id
+        )
+        policy.update!(
           config: {
             "strategy" => "primary_first",
             "primary_agent_id" => agent.id

data/app/services/collavre/orchestration/agent_orchestrator.rb

@@ -24,23 +24,37 @@ module Collavre
         if updated > 0
           task.reload
           refresh_deferred_context!(task)
-          AiAgentJob.perform_later(task)
+
+          if task.status == "cancelled"
+            # refresh_deferred_context! cancelled this task (no eligible comment),
+            # try the next queued task for this topic.
+            dequeue_next_for_topic(topic_id)
+          else
+            AiAgentJob.perform_later(task)
+          end
         end
       end
 
       # Refresh trigger_event_payload so the deferred agent sees the latest
       # conversation state instead of the stale snapshot from enqueue time.
+      # Skips AI agent's own comments to prevent self-response loops.
+      # Cancels the task if no eligible comment remains.
       def self.refresh_deferred_context!(task)
         context = task.trigger_event_payload
         creative_id = context&.dig("creative", "id")
         return unless creative_id && context&.key?("topic")
 
         topic_id = context.dig("topic", "id")
-        latest_comment = Comment
+        scope = Comment
           .where(creative_id: creative_id, topic_id: topic_id, private: false)
+          .where.not(user_id: task.agent_id)
           .order(created_at: :desc)
-          .first
-        return unless latest_comment
+        latest_comment = scope.first
+
+        unless latest_comment
+          task.update!(status: "cancelled")
+          return
+        end
 
         context["comment"] = {
           "id" => latest_comment.id,

data/app/services/collavre/orchestration/policy_resolver.rb

@@ -43,7 +43,7 @@ module Collavre
           "token_spike_window_minutes" => 10
         },
         "stuck_detection" => {
-          "enabled" => false,
+          "enabled" => true,
           "task_stuck_threshold_minutes" => 30,       # Task running for > N minutes
           "creative_stall_threshold_minutes" => 120,  # Creative no progress for > N minutes
           "create_system_comment" => true             # Create system comment on escalation

data/app/services/collavre/orchestration/stuck_detector.rb

@@ -24,7 +24,7 @@ module Collavre
         @policy_resolver = policy_resolver || PolicyResolver.new({})
       end
 
-      # Run detection and escalation
+      # Run detection, auto-recovery, and escalation
       # Returns Result with stuck items and escalation count
       def detect_and_escalate
         config = stuck_detection_config
@@ -34,6 +34,7 @@ module Collavre
         stuck_items.concat(detect_stuck_tasks(config))
         stuck_items.concat(detect_stalled_creatives(config))
 
+        auto_recover_stuck_tasks(stuck_items)
         escalated_count = escalate_stuck_items(stuck_items, config)
 
         Result.new(stuck_items: stuck_items, escalated_count: escalated_count)
@@ -52,6 +53,33 @@ module Collavre
 
       private
 
+      # Auto-recover stuck tasks by marking them as failed and draining the queue.
+      def auto_recover_stuck_tasks(stuck_items)
+        stuck_items.each do |stuck_item|
+          next unless stuck_item.type == :task
+
+          task = stuck_item.item
+          next unless task.status == "running"
+
+          task.update!(status: "failed")
+          Rails.logger.info(
+            "[StuckDetector] Auto-recovered task #{task.id} (agent=#{task.agent_id}): " \
+            "marked as failed after #{((Time.current - stuck_item.stuck_since) / 60).round} minutes"
+          )
+
+          # Release resources held by the stuck task
+          if task.agent
+            tracker = ResourceTracker.for(task.agent)
+            tracker.release!(task.id)
+          end
+
+          # Drain the queue for the topic so waiting tasks can execute
+          AgentOrchestrator.dequeue_next_for_topic(task.topic_id)
+        rescue StandardError => e
+          Rails.logger.error("[StuckDetector] Auto-recovery failed for task #{task.id}: #{e.message}")
+        end
+      end
+
       def stuck_detection_config
         @policy_resolver.resolve("stuck_detection")
       end

data/app/services/collavre/system_events/context_builder.rb

@@ -52,16 +52,11 @@ module Collavre
       end
 
       def mentioned_user(chat_context)
-        # This mimics the chat.mentioned_user function requested
-        # It assumes chat_context has 'content' or similar, or we might need to look up the comment
-        # For now, let's assume the context passed in already has the necessary info or we extract it.
-        # If the event is comment_created, the payload usually has the comment content.
-
         content = chat_context["content"]
         return nil unless content
 
-        # Simple regex to find the first mention
-        match = content.match(/\A@([^:]+?):\s*/) || content.match(/\A@(\S+)\s+/)
+        # Canonical mention format: @name: (with colon)
+        match = content.match(/\A@([^:]+?):\s*/)
         return nil unless match
 
         name = match[1].strip

data/app/views/admin/shared/_tabs.html.erb

@@ -1,5 +1,5 @@
 <div class="tab-list">
   <%= link_to t('admin.tabs.system'), main_app.admin_path, class: "tab-button #{'active' if controller_name == 'settings'}" %>
   <%= link_to t('admin.tabs.users'), collavre.users_path, class: "tab-button #{'active' if controller_name == 'users'}" %>
-  <%= link_to t('admin.tabs.orchestration'), main_app.admin_orchestration_path, class: "tab-button #{'active' if controller_name == 'orchestration'}" %>
+  <%= link_to t('admin.tabs.orchestration'), collavre.admin_orchestration_path, class: "tab-button #{'active' if controller_name == 'orchestration'}" %>
 </div>

data/app/views/collavre/admin/orchestration/show.html.erb

@@ -14,7 +14,7 @@
       </p>
     </div>
 
-    <%= form_with url: main_app.admin_orchestration_path, method: :patch, local: true, html: { class: 'profile-form' } do |f| %>
+    <%= form_with url: admin_orchestration_path, method: :patch, local: true, html: { class: 'profile-form' } do |f| %>
       <div>
         <label for="policies_yaml" style="font-weight: 600; display: block; margin-bottom: 0.5em;">
           <%= t('admin.orchestration.policies_yaml') %>

data/config/locales/ai_agent.en.yml

@@ -30,7 +30,7 @@ en:
         reviewer_header: "### Reviewers (request review)"
         reference_header: "### References (information only)"
         rules_header: "## Collaboration Rules"
-        mention_rule: "- Call other agents: @name request"
+        mention_rule: "- Call other agents: @name: request"
         confidence_rule: "- Re-evaluate before responding if uncertain"
         escalation_rule: "- Ask escalation targets for help when stuck"
         review_rule: "- Request review from reviewers when code review is needed"

data/config/locales/ai_agent.ko.yml

@@ -30,7 +30,7 @@ ko:
         reviewer_header: "### 리뷰어 (검토 요청)"
         reference_header: "### 참조 (정보 요청만)"
         rules_header: "## 협업 규칙"
-        mention_rule: "- 다른 Agent 호출: @이름 요청내용"
+        mention_rule: "- 다른 Agent 호출: @이름: 요청내용"
         confidence_rule: "- 확신이 낮으면 재검토 후 발화"
         escalation_rule: "- 막히면 에스컬레이션 대상에게 도움 요청"
         review_rule: "- 코드 리뷰가 필요하면 리뷰어에게 요청"

data/config/locales/comments.en.yml

@@ -91,7 +91,8 @@ en:
         missing_name: 'Please specify a topic name in quotes: /topic "topic name"'
         created: 'Topic "%{name}" created.'
         created_with_agent: 'Topic "%{name}" created with @%{agent} as primary agent.'
-        created_agent_not_found: 'Topic "%{name}" created. Note: Agent @%{agent_name} not found.'
+        updated_agent: 'Topic "%{name}" primary agent updated to @%{agent}.'
+        already_exists: 'Topic "%{name}" already exists.'
       read_by: Read by %{name}
       activity_logs_summary: Activity Logs
     calendar_events:

data/config/locales/comments.ko.yml

@@ -88,7 +88,8 @@ ko:
         missing_name: '토픽 이름을 따옴표로 지정하세요: /topic "토픽 이름"'
         created: '토픽 "%{name}"이(가) 생성되었습니다.'
         created_with_agent: '토픽 "%{name}"이(가) 생성되었습니다. @%{agent}이(가) Primary Agent로 설정되었습니다.'
-        created_agent_not_found: '토픽 "%{name}"이(가) 생성되었습니다. 참고: @%{agent_name} 에이전트를 찾을 수 없습니다.'
+        updated_agent: '토픽 "%{name}"의 Primary Agent가 @%{agent}(으)로 변경되었습니다.'
+        already_exists: '토픽 "%{name}"이(가) 이미 존재합니다.'
       read_by: "%{name} 님이 읽음"
       activity_logs_summary: 활동 기록
     calendar_events:

data/config/locales/orchestration.en.yml

@@ -0,0 +1,35 @@
+en:
+  admin:
+    orchestration:
+      title: "AI Agent Orchestration"
+      description: "Configure how AI agents are selected and scheduled to respond. Edit the YAML below to customize policies."
+      policies_yaml: "Policies (YAML)"
+      yaml_hint: "Define arbitration and scheduling policies. Global policies apply everywhere; overrides apply to specific scopes."
+      reference: "Quick Reference"
+      arbitration_strategies: "Arbitration Strategies"
+      strategy_all: "All matched agents respond"
+      strategy_primary_first: "Primary agent responds first, others only if unavailable"
+      strategy_round_robin: "Rotate between agents for each message"
+      strategy_bid: "Select agent based on relevance score"
+      scheduling_options: "Scheduling Options"
+      opt_max_concurrent: "Maximum simultaneous jobs per agent"
+      opt_daily_token: "Daily token usage limit"
+      opt_rate_limit: "Requests allowed per minute"
+      opt_backoff: "Delay strategy when busy (immediate/linear/exponential)"
+      opt_topic_max_concurrent: "Maximum simultaneous jobs per topic (default: 1)"
+      scope_types: "Override Scopes"
+      scope_creative: "Apply to a specific workspace"
+      scope_topic: "Apply to a specific conversation"
+      scope_user: "Apply to a specific AI agent"
+      save: "Save Policies"
+      updated: "Orchestration policies updated successfully."
+      yaml_syntax_error: "YAML syntax error: %{message}"
+      invalid_format: "Invalid format: expected a YAML object with arbitration/scheduling keys."
+      unknown_policy_type: "Unknown policy type: %{type}. Use 'arbitration' or 'scheduling'."
+      invalid_policy_structure: "Invalid structure for '%{type}': expected an object with 'global' and/or 'overrides'."
+      invalid_global_config: "Invalid global config for '%{type}': expected an object."
+      invalid_overrides: "Invalid overrides for '%{type}': expected an array."
+      invalid_override_format: "Invalid override at '%{type}' index %{index}: expected an object."
+      invalid_scope_type: "Invalid scope_type at '%{type}' index %{index}: '%{scope_type}'. Use Creative, Topic, or User."
+      invalid_scope_id: "Invalid scope_id at '%{type}' index %{index}: must be a positive integer."
+      invalid_override_config: "Invalid config at '%{type}' index %{index}: expected an object."

data/config/locales/orchestration.ko.yml

@@ -0,0 +1,35 @@
+ko:
+  admin:
+    orchestration:
+      title: "AI 에이전트 오케스트레이션"
+      description: "AI 에이전트가 응답하도록 선택되고 스케줄링되는 방식을 설정합니다. 아래 YAML을 수정하여 정책을 커스터마이즈하세요."
+      policies_yaml: "정책 (YAML)"
+      yaml_hint: "중재(arbitration) 및 스케줄링 정책을 정의합니다. 전역 정책은 모든 곳에 적용되고, 오버라이드는 특정 범위에 적용됩니다."
+      reference: "빠른 참조"
+      arbitration_strategies: "중재 전략"
+      strategy_all: "매칭된 모든 에이전트가 응답"
+      strategy_primary_first: "기본 에이전트가 먼저 응답, 불가능할 때만 다른 에이전트"
+      strategy_round_robin: "메시지마다 에이전트를 순환"
+      strategy_bid: "관련성 점수에 따라 에이전트 선택"
+      scheduling_options: "스케줄링 옵션"
+      opt_max_concurrent: "에이전트당 최대 동시 작업 수"
+      opt_daily_token: "일일 토큰 사용량 한도"
+      opt_rate_limit: "분당 허용 요청 수"
+      opt_backoff: "바쁠 때 지연 전략 (immediate/linear/exponential)"
+      opt_topic_max_concurrent: "토픽당 최대 동시 작업 수 (기본값: 1)"
+      scope_types: "오버라이드 범위"
+      scope_creative: "특정 워크스페이스에 적용"
+      scope_topic: "특정 대화에 적용"
+      scope_user: "특정 AI 에이전트에 적용"
+      save: "정책 저장"
+      updated: "오케스트레이션 정책이 성공적으로 업데이트되었습니다."
+      yaml_syntax_error: "YAML 문법 오류: %{message}"
+      invalid_format: "잘못된 형식: arbitration/scheduling 키를 가진 YAML 객체가 필요합니다."
+      unknown_policy_type: "알 수 없는 정책 유형: %{type}. 'arbitration' 또는 'scheduling'을 사용하세요."
+      invalid_policy_structure: "'%{type}'의 구조가 잘못되었습니다: 'global' 및/또는 'overrides'를 가진 객체가 필요합니다."
+      invalid_global_config: "'%{type}'의 전역 설정이 잘못되었습니다: 객체가 필요합니다."
+      invalid_overrides: "'%{type}'의 오버라이드가 잘못되었습니다: 배열이 필요합니다."
+      invalid_override_format: "'%{type}' 인덱스 %{index}의 오버라이드가 잘못되었습니다: 객체가 필요합니다."
+      invalid_scope_type: "'%{type}' 인덱스 %{index}의 scope_type이 잘못되었습니다: '%{scope_type}'. Creative, Topic, 또는 User를 사용하세요."
+      invalid_scope_id: "'%{type}' 인덱스 %{index}의 scope_id가 잘못되었습니다: 양의 정수여야 합니다."
+      invalid_override_config: "'%{type}' 인덱스 %{index}의 config가 잘못되었습니다: 객체가 필요합니다."

data/config/routes.rb

@@ -93,4 +93,9 @@ Collavre::Engine.routes.draw do
 
   post "/creative_expanded_states/toggle", to: "creative_expanded_states#toggle"
   post "/comment_read_pointers/update", to: "comment_read_pointers#update"
+
+  # Admin orchestration
+  scope "/admin", as: :admin do
+    resource :orchestration, only: [ :show, :update ], controller: "admin/orchestration"
+  end
 end

data/lib/collavre/version.rb

@@ -1,3 +1,3 @@
 module Collavre
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Collavre
@@ -472,6 +472,8 @@ files:
 - config/locales/invites.ko.yml
 - config/locales/notifications.en.yml
 - config/locales/notifications.ko.yml
+- config/locales/orchestration.en.yml
+- config/locales/orchestration.ko.yml
 - config/locales/plans.en.yml
 - config/locales/plans.ko.yml
 - config/locales/themes.en.yml