collavre 0.3.2 → 0.5.0

data/app/services/collavre/tools/creative_batch_service.rb

@@ -0,0 +1,107 @@
+module Collavre
+  require "sorbet-runtime"
+  require "rails_mcp_engine"
+
+  module Tools
+    class CreativeBatchService
+      extend T::Sig
+      extend ToolMeta
+
+      tool_name "creative_batch_service"
+      tool_description "Execute multiple Creative operations (create, update, delete) in a single batch call. " \
+                       "All operations run inside a transaction — if any operation fails, the entire batch is rolled back.\n\n" \
+                       "This tool requires approval before execution.\n\n" \
+                       "Each operation is a hash with an 'action' key ('create', 'update', or 'delete') plus action-specific fields."
+
+      def self.requires_approval?
+        true
+      end
+
+      tool_param :operations, description: "Array of operation objects. Each object must have an 'action' key.\n\n" \
+                 "For 'create': { action: 'create', parent_id: <int>, description: <string>, progress: <float>, after_id: <int>, before_id: <int> }\n" \
+                 "For 'update': { action: 'update', id: <int>, description: <string>, progress: 1.0, parent_id: <int> } — progress only accepts 1.0 (complete) and only on leaf Creatives\n" \
+                 "For 'delete': { action: 'delete', id: <int> }\n\n" \
+                 "Fields other than 'action' and 'id'/'parent_id' are optional.", required: true
+
+      class BatchRollbackError < StandardError
+        attr_reader :results
+
+        def initialize(results)
+          @results = results
+          super("Batch operation failed")
+        end
+      end
+
+      sig { params(operations: T::Array[T::Hash[String, T.untyped]]).returns(T::Hash[Symbol, T.untyped]) }
+      def call(operations:)
+        raise "Current.user is required" unless Current.user
+
+        results = []
+
+        ApplicationRecord.transaction do
+          operations.each_with_index do |op, idx|
+            op = op.transform_keys(&:to_s)
+            action = op["action"]
+
+            result = case action
+            when "create" then execute_create(op)
+            when "update" then execute_update(op)
+            when "delete" then execute_delete(op)
+            else
+                       { error: "Unknown action '#{action}'" }
+            end
+
+            result[:index] = idx
+            result[:action] = action
+            results << result
+
+            raise BatchRollbackError, results if result[:error]
+          end
+        end
+
+        { success: true, results: results }
+      rescue BatchRollbackError => e
+        failed = e.results.find { |r| r[:error] }
+        { success: false, error: "Operation #{failed[:index]} (#{failed[:action]}) failed: #{failed[:error]}", results: e.results }
+      end
+
+      private
+
+      def execute_create(op)
+        service = CreativeCreateService.new
+        service.call(
+          description: op["description"] || "",
+          parent_id: op["parent_id"]&.to_i,
+          progress: op["progress"]&.to_f,
+          after_id: op["after_id"]&.to_i,
+          before_id: op["before_id"]&.to_i
+        )
+      end
+
+      def execute_update(op)
+        id = op["id"]&.to_i
+        return { error: "id is required for update" } unless id&.positive?
+
+        service = CreativeUpdateService.new
+        service.call(
+          id: id,
+          description: op["description"],
+          progress: op.key?("progress") ? op["progress"]&.to_f : nil,
+          parent_id: op.key?("parent_id") ? op["parent_id"]&.to_i : nil
+        )
+      end
+
+      def execute_delete(op)
+        id = op["id"]&.to_i
+        return { error: "id is required for delete" } unless id&.positive?
+
+        creative = Creative.find_by(id: id)
+        return { error: "Creative not found", id: id } unless creative
+        return { error: "No write permission on this Creative", id: id } unless creative.has_permission?(Current.user, :write)
+
+        creative.destroy!
+        { success: true, id: id, deleted: true }
+      end
+    end
+  end
+end

data/app/services/collavre/tools/creative_update_service.rb

@@ -7,11 +7,11 @@ module Tools
     extend ToolMeta
 
     tool_name "creative_update_service"
-    tool_description "Update an existing Creative's content, progress, or parent. Use this to:\n- Modify the description/title of a Creative\n- Update progress (0.0 to 1.0, where 1.0 = complete)\n- Move a Creative to a different parent\n\nNote: Setting progress to 1.0 on a parent will also complete all descendants."
+    tool_description "Update an existing Creative's content, progress, or parent. Use this to:\n- Modify the description/title of a Creative\n- Mark a leaf Creative as complete (progress = 1.0)\n- Move a Creative to a different parent\n\nProgress constraints:\n- Only 1.0 (100%) is allowed — partial progress updates are not supported\n- Only leaf Creatives (with no children) can have their progress updated\n- Parent Creative progress is automatically calculated from children\n\nUse creative_retrieval_service to find the correct Creative before updating."
 
     tool_param :id, description: "The ID of the Creative to update.", required: true
     tool_param :description, description: "New content/title for the Creative. Accepts HTML format. If omitted, description remains unchanged.", required: false
-    tool_param :progress, description: "New progress value (0.0 to 1.0). Setting to 1.0 marks as complete.", required: false
+    tool_param :progress, description: "Set to 1.0 to mark a leaf Creative as complete. Only 1.0 is allowed; partial progress and updates on parent Creatives are rejected.", required: false
     tool_param :parent_id, description: "New parent Creative ID to move this Creative under. Use null/0 to make it a root Creative.", required: false
 
     sig { params(id: Integer, description: T.nilable(String), progress: T.nilable(Float), parent_id: T.nilable(Integer)).returns(T::Hash[Symbol, T.untyped]) }
@@ -29,7 +29,6 @@ module Tools
 
       # Get the effective origin for updating content
       base = creative.effective_origin
-      previous_progress = base.progress
 
       updates = {}
       parent_updates = {}
@@ -41,7 +40,19 @@ module Tools
 
       # Handle progress update
       if progress.present?
-        updates[:progress] = progress.to_f.clamp(0.0, 1.0)
+        progress_value = progress.to_f.clamp(0.0, 1.0)
+
+        # Only 100% (1.0) progress updates are allowed via tools
+        unless progress_value == 1.0
+          return { error: "Only progress of 1.0 (100%) is allowed. Partial progress updates are not supported.", id: id }
+        end
+
+        # Only leaf creatives (no children) can have progress updated directly
+        if base.children.exists?
+          return { error: "Cannot update progress on a parent Creative. Only leaf Creatives (with no children) can be marked complete.", id: id }
+        end
+
+        updates[:progress] = progress_value
       end
 
       # Handle parent change (on the creative itself, not base)
@@ -77,14 +88,8 @@ module Tools
       if updates.present?
         success &&= base.update(updates)
 
-        # If progress set to 1.0 and has children, complete all descendants
-        requested_progress = updates[:progress]
-        if success && requested_progress.present? && requested_progress >= 1 && previous_progress.to_f < 1
-          if base.children.exists?
-            base.self_and_descendants.where(origin_id: nil)
-              .update_all(progress: 1.0, updated_at: Time.current)
-          end
-        end
+        # Note: progress updates are only allowed on leaf Creatives (validated above).
+        # Parent progress is automatically calculated from children.
       end
 
       if success

data/app/services/collavre/tools/cron_create_service.rb

@@ -10,7 +10,7 @@ module Tools
     tool_description "Create a new recurring scheduled job. The job will periodically post a message to a creative's topic, triggering agent orchestration. Schedule uses cron syntax (e.g., '*/5 * * * *' for every 5 minutes, '0 9 * * *' for daily at 9am)."
 
     tool_param :creative_id, description: "The creative ID to post recurring messages to.", required: true
-    tool_param :topic_id, description: "The topic ID within the creative to post to.", required: true
+    tool_param :topic_name, description: "The topic name within the creative to post to. Use 'Main' for the main topic (topic_id = nil).", required: true
     tool_param :schedule, description: "Cron schedule expression (e.g., '0 9 * * *' for daily at 9am, '*/30 * * * *' for every 30 minutes).", required: true
     tool_param :message, description: "The message content to post on each execution. This triggers the agent orchestration pipeline.", required: true
     tool_param :description, description: "Human-readable description of what this cron job does.", required: false
@@ -18,13 +18,13 @@ module Tools
     sig do
       params(
         creative_id: Integer,
-        topic_id: Integer,
+        topic_name: String,
         schedule: String,
         message: String,
         description: T.nilable(String)
       ).returns(T::Hash[Symbol, T.untyped])
     end
-    def call(creative_id:, topic_id:, schedule:, message:, description: nil)
+    def call(creative_id:, topic_name:, schedule:, message:, description: nil)
       raise "Current.user is required" unless Current.user
 
       creative = Creative.find_by(id: creative_id)
@@ -33,8 +33,8 @@ module Tools
         return { error: "No write permission on this Creative", id: creative_id }
       end
 
-      topic = Topic.find_by(id: topic_id, creative_id: creative.effective_origin.id)
-      return { error: "Topic not found or does not belong to this creative", topic_id: topic_id } unless topic
+      topic_id = resolve_topic_id(creative, topic_name)
+      return topic_id if topic_id.is_a?(Hash) && topic_id[:error]
 
       parsed = Fugit.parse(schedule)
       unless parsed.is_a?(Fugit::Cron)
@@ -65,9 +65,21 @@ module Tools
         schedule: task.schedule,
         description: task.description,
         creative_id: creative_id,
+        topic_name: topic_name,
         next_run: task.next_time&.iso8601
       }
     end
+
+    private
+
+    def resolve_topic_id(creative, topic_name)
+      return nil if topic_name.casecmp("main").zero?
+
+      topic = Topic.find_by(name: topic_name, creative_id: creative.effective_origin.id)
+      return { error: "Topic '#{topic_name}' not found for this creative" } unless topic
+
+      topic.id
+    end
   end
 end
 end

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

@@ -1,5 +1,6 @@
 <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.system'), collavre.admin_settings_path, class: "tab-button #{'active' if controller_name == 'settings' && action_name == 'index'}" %>
+  <%= link_to t('admin.tabs.uiux'), collavre.admin_uiux_path, class: "tab-button #{'active' if controller_name == 'settings' && action_name == 'uiux'}" %>
   <%= link_to t('admin.tabs.users'), collavre.users_path, class: "tab-button #{'active' if controller_name == 'users'}" %>
   <%= 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

@@ -49,6 +49,17 @@
             <li><code>topic_max_concurrent_jobs</code> — <%= t('admin.orchestration.opt_topic_max_concurrent') %></li>
           </ul>
 
+          <p style="margin-bottom: 0.75em;"><strong><%= t('admin.orchestration.collaboration_options') %></strong></p>
+          <ul style="margin-left: 1.5em; margin-bottom: 1em;">
+            <li><code>a2a_focus_instruction</code> — <%= t('admin.orchestration.opt_a2a_focus') %></li>
+            <li><code>a2a_completion_instruction</code> — <%= t('admin.orchestration.opt_a2a_completion') %></li>
+            <li><code>a2a_followup_instruction</code> — <%= t('admin.orchestration.opt_a2a_followup') %></li>
+            <li><code>mention_rule</code> — <%= t('admin.orchestration.opt_mention_rule') %></li>
+            <li><code>confidence_rule</code> — <%= t('admin.orchestration.opt_confidence_rule') %></li>
+            <li><code>escalation_rule</code> — <%= t('admin.orchestration.opt_escalation_rule') %></li>
+            <li><code>review_rule</code> — <%= t('admin.orchestration.opt_review_rule') %></li>
+          </ul>
+
           <p style="margin-bottom: 0.75em;"><strong><%= t('admin.orchestration.scope_types') %></strong></p>
           <ul style="margin-left: 1.5em;">
             <li><code>Creative</code> — <%= t('admin.orchestration.scope_creative') %></li>

data/app/views/collavre/admin/settings/_system_tab.html.erb

@@ -0,0 +1,138 @@
+<section class="tab-panel active">
+  <%= tag.div(flash[:alert], class: "flash-alert") if flash[:alert] %>
+  <%= form_with url: collavre.admin_settings_path, method: :patch, local: true, html: { class: 'profile-form' } do |f| %>
+    <%# system tab %>
+    <div>
+      <%= f.label :help_link, t('admin.settings.help_link') %>
+      <%= f.text_field :help_link, value: @help_link, placeholder: "https://..." %>
+      <div class="help-text" style="font-size: 0.85em; color: var(--color-text-muted); margin-top: 0.25em;">
+        <%= t('admin.settings.help_link_hint') %>
+      </div>
+    </div>
+
+    <div style="margin-top: 1.5em;">
+      <label class="checkbox-label" style="display: flex; align-items: center; gap: 0.5em;">
+        <%= f.check_box :mcp_tool_approval, checked: @mcp_tool_approval %>
+        <span><%= t('admin.settings.mcp_tool_approval') %></span>
+      </label>
+      <div class="help-text" style="font-size: 0.85em; color: var(--color-text-muted); margin-top: 0.25em; margin-left: 1.8em;">
+        <%= t('admin.settings.mcp_tool_approval_hint') %>
+      </div>
+    </div>
+
+    <div style="margin-top: 1.5em;">
+      <label class="checkbox-label" style="display: flex; align-items: center; gap: 0.5em;">
+        <%= f.check_box :creatives_login_required, checked: @creatives_login_required %>
+        <span><%= t('admin.settings.creatives_login_required') %></span>
+      </label>
+      <div class="help-text" style="font-size: 0.85em; color: var(--color-text-muted); margin-top: 0.25em; margin-left: 1.8em;">
+        <%= t('admin.settings.creatives_login_required_hint') %>
+      </div>
+    </div>
+
+    <div style="margin-top: 1.5em;">
+      <%= f.label :home_page_path, t('admin.settings.home_page_path') %>
+      <%= f.text_field :home_page_path, value: @home_page_path, placeholder: "/" %>
+      <div class="help-text" style="font-size: 0.85em; color: var(--color-text-muted); margin-top: 0.25em;">
+        <%= t('admin.settings.home_page_path_hint') %>
+      </div>
+    </div>
+
+    <div style="margin-top: 2em; border-top: 1px solid var(--color-border); padding-top: 1.5em;">
+      <h3 style="font-size: 1.1em; margin-bottom: 1em;"><%= t('admin.settings.account_lockout') %></h3>
+      <div style="display: flex; gap: 2em; flex-wrap: wrap;">
+        <div style="flex: 1; min-width: 200px;">
+          <%= f.label :max_login_attempts, t('admin.settings.max_login_attempts') %>
+          <%= f.number_field :max_login_attempts, value: @max_login_attempts, min: 1, max: 100, style: "width: 100%;" %>
+          <div class="help-text" style="font-size: 0.85em; color: var(--color-text-muted); margin-top: 0.25em;">
+            <%= t('admin.settings.max_login_attempts_hint') %>
+          </div>
+        </div>
+        <div style="flex: 1; min-width: 200px;">
+          <%= f.label :lockout_duration_minutes, t('admin.settings.lockout_duration_minutes') %>
+          <%= f.number_field :lockout_duration_minutes, value: @lockout_duration_minutes, min: 1, max: 1440, style: "width: 100%;" %>
+          <div class="help-text" style="font-size: 0.85em; color: var(--color-text-muted); margin-top: 0.25em;">
+            <%= t('admin.settings.lockout_duration_minutes_hint') %>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div style="margin-top: 2em; border-top: 1px solid var(--color-border); padding-top: 1.5em;">
+      <h3 style="font-size: 1.1em; margin-bottom: 1em;"><%= t('admin.settings.password_policy') %></h3>
+      <div style="max-width: 300px;">
+        <%= f.label :password_min_length, t('admin.settings.password_min_length') %>
+        <%= f.number_field :password_min_length, value: @password_min_length, min: SystemSetting::DEFAULT_PASSWORD_MIN_LENGTH, max: 72, style: "width: 100%;" %>
+        <div class="help-text" style="font-size: 0.85em; color: var(--color-text-muted); margin-top: 0.25em;">
+          <%= t('admin.settings.password_min_length_hint') %>
+        </div>
+      </div>
+    </div>
+
+    <div style="margin-top: 2em; border-top: 1px solid var(--color-border); padding-top: 1.5em;">
+      <h3 style="font-size: 1.1em; margin-bottom: 1em;"><%= t('admin.settings.session_timeout') %></h3>
+      <div style="max-width: 300px;">
+        <%= f.label :session_timeout_minutes, t('admin.settings.session_timeout_minutes') %>
+        <%= f.number_field :session_timeout_minutes, value: @session_timeout_minutes, min: 0, max: 10080, style: "width: 100%;" %>
+        <div class="help-text" style="font-size: 0.85em; color: var(--color-text-muted); margin-top: 0.25em;">
+          <%= t('admin.settings.session_timeout_minutes_hint') %>
+        </div>
+      </div>
+    </div>
+
+    <div style="margin-top: 2em; border-top: 1px solid var(--color-border); padding-top: 1.5em;">
+      <h3 style="font-size: 1.1em; margin-bottom: 1em;"><%= t('admin.settings.rate_limiting') %></h3>
+
+      <div style="margin-bottom: 1.5em;">
+        <h4 style="font-size: 1em; margin-bottom: 0.75em; color: var(--color-text-muted);"><%= t('admin.settings.password_reset_rate') %></h4>
+        <div style="display: flex; gap: 2em; flex-wrap: wrap;">
+          <div style="flex: 1; min-width: 200px;">
+            <%= f.label :password_reset_rate_limit, t('admin.settings.rate_limit_requests') %>
+            <%= f.number_field :password_reset_rate_limit, value: @password_reset_rate_limit, min: 1, max: 1000, style: "width: 100%;" %>
+          </div>
+          <div style="flex: 1; min-width: 200px;">
+            <%= f.label :password_reset_rate_period_minutes, t('admin.settings.rate_limit_period_minutes') %>
+            <%= f.number_field :password_reset_rate_period_minutes, value: @password_reset_rate_period_minutes, min: 1, max: 1440, style: "width: 100%;" %>
+          </div>
+        </div>
+        <div class="help-text" style="font-size: 0.85em; color: var(--color-text-muted); margin-top: 0.25em;">
+          <%= t('admin.settings.password_reset_rate_hint') %>
+        </div>
+      </div>
+
+      <div>
+        <h4 style="font-size: 1em; margin-bottom: 0.75em; color: var(--color-text-muted);"><%= t('admin.settings.api_rate') %></h4>
+        <div style="display: flex; gap: 2em; flex-wrap: wrap;">
+          <div style="flex: 1; min-width: 200px;">
+            <%= f.label :api_rate_limit, t('admin.settings.rate_limit_requests') %>
+            <%= f.number_field :api_rate_limit, value: @api_rate_limit, min: 1, max: 10000, style: "width: 100%;" %>
+          </div>
+          <div style="flex: 1; min-width: 200px;">
+            <%= f.label :api_rate_period_minutes, t('admin.settings.rate_limit_period_minutes') %>
+            <%= f.number_field :api_rate_period_minutes, value: @api_rate_period_minutes, min: 1, max: 60, style: "width: 100%;" %>
+          </div>
+        </div>
+        <div class="help-text" style="font-size: 0.85em; color: var(--color-text-muted); margin-top: 0.25em;">
+          <%= t('admin.settings.api_rate_hint') %>
+        </div>
+      </div>
+    </div>
+
+    <div style="margin-top: 2em; border-top: 1px solid var(--color-border); padding-top: 1.5em;">
+      <h3 style="font-size: 1.1em; margin-bottom: 1em;"><%= t('admin.settings.auth_providers') %></h3>
+      <div style="display: flex; flex-direction: column; gap: 0.8em;">
+        <% Rails.application.config.auth_providers.sort_by { |p| p[:priority] }.each do |provider| %>
+          <label class="checkbox-label" style="display: flex; align-items: center; gap: 0.5em;">
+            <%= check_box_tag "auth_providers[]", provider[:key], @enabled_auth_providers.include?(provider[:key].to_s), id: "auth_provider_#{provider[:key]}" %>
+            <span><%= t(provider[:name], default: provider[:name].to_s.humanize) %></span>
+          </label>
+        <% end %>
+      </div>
+      <div class="help-text" style="font-size: 0.85em; color: var(--color-text-muted); margin-top: 0.5em;">
+        <%= t('admin.settings.auth_providers_hint', default: "Select allowed authentication methods. Warning: Disabling all may lock you out.") %>
+      </div>
+    </div>
+
+    <%= f.submit t('admin.settings.save') %>
+  <% end %>
+</section>

data/app/views/collavre/admin/settings/_uiux_tab.html.erb

@@ -0,0 +1,44 @@
+<section class="tab-panel active">
+  <%= tag.div(flash[:alert], class: "flash-alert") if flash[:alert] %>
+  <%= form_with url: collavre.admin_uiux_path, method: :patch, local: true, html: { class: 'profile-form' } do |f| %>
+
+    <div>
+      <h3 style="font-size: 1.1em; margin-bottom: 1em;"><%= t('admin.settings.default_themes') %></h3>
+      <div class="help-text" style="font-size: 0.85em; color: var(--color-text-muted); margin-bottom: 1.5em;">
+        <%= t('admin.settings.default_themes_hint') %>
+      </div>
+
+      <div style="display: flex; gap: 2em; flex-wrap: wrap;">
+        <div style="flex: 1; min-width: 250px;">
+          <%= label_tag :default_light_theme_id, t('admin.settings.default_light_theme') %>
+          <%= select_tag :default_light_theme_id,
+                options_for_select(
+                  [[t('admin.settings.theme_system_default'), '']] +
+                  @available_themes.map { |t| [t.name, t.id] },
+                  @default_light_theme_id.to_s
+                ),
+                style: "width: 100%;" %>
+          <div class="help-text" style="font-size: 0.85em; color: var(--color-text-muted); margin-top: 0.25em;">
+            <%= t('admin.settings.default_light_theme_hint') %>
+          </div>
+        </div>
+
+        <div style="flex: 1; min-width: 250px;">
+          <%= label_tag :default_dark_theme_id, t('admin.settings.default_dark_theme') %>
+          <%= select_tag :default_dark_theme_id,
+                options_for_select(
+                  [[t('admin.settings.theme_system_default'), '']] +
+                  @available_themes.map { |t| [t.name, t.id] },
+                  @default_dark_theme_id.to_s
+                ),
+                style: "width: 100%;" %>
+          <div class="help-text" style="font-size: 0.85em; color: var(--color-text-muted); margin-top: 0.25em;">
+            <%= t('admin.settings.default_dark_theme_hint') %>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <%= f.submit t('admin.settings.save') %>
+  <% end %>
+</section>

data/app/views/collavre/admin/settings/index.html.erb

@@ -0,0 +1,11 @@
+<% content_for :head do %>
+  <%= stylesheet_link_tag 'collavre/comments_popup', media: 'all' %>
+<% end %>
+
+<h1 class="no-top-margin"><%= t('admin.title') %></h1>
+
+<%= render "admin/shared/tabs" %>
+
+<div class="tab-panels">
+  <%= render "collavre/admin/settings/system_tab" %>
+</div>

data/app/views/collavre/admin/settings/uiux.html.erb

@@ -0,0 +1,11 @@
+<% content_for :head do %>
+  <%= stylesheet_link_tag 'collavre/comments_popup', media: 'all' %>
+<% end %>
+
+<h1 class="no-top-margin"><%= t('admin.title') %></h1>
+
+<%= render "admin/shared/tabs" %>
+
+<div class="tab-panels">
+  <%= render "collavre/admin/settings/uiux_tab" %>
+</div>

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

@@ -2,7 +2,7 @@
 <% current_topic_id = local_assigns[:current_topic_id] %>
 <% has_pending_action = comment.action.present? && comment.action_executed_at.blank? %>
 <% approver_id = comment.approver_id %>
-<div class="comment-item" id="<%= dom_id(comment) %>" data-controller="comment" data-user-id="<%= comment.user&.id %>" data-comment-id="<%= comment.id %>" data-topic-id="<%= comment_topic&.id %>" data-creative-id="<%= comment.creative_id %>" data-creative-owner-id="<%= comment.creative&.user_id %>" data-has-pending-action="<%= has_pending_action %>" data-approver-id="<%= approver_id %>">
+<div class="comment-item" id="<%= dom_id(comment) %>" data-controller="comment" data-user-id="<%= comment.user&.id %>" data-comment-id="<%= comment.id %>" data-topic-id="<%= comment_topic&.id %>" data-creative-id="<%= comment.creative_id %>" data-creative-owner-id="<%= comment.creative&.user_id %>" data-has-pending-action="<%= has_pending_action %>" data-approver-id="<%= approver_id %>" data-ai-user="<%= comment.user&.ai_user? %>" data-streaming="<%= local_assigns.fetch(:streaming, false) %>">
   <div class="comment-select">
     <input type="checkbox"
            class="comment-select-checkbox"
@@ -11,14 +11,11 @@
   </div>
   <div>
     <%= render Collavre::AvatarComponent.new(user: comment.user, size: 20, classes: 'avatar comment-avatar') %>
-    <% system_prefix = "#{t('collavre.comments.system_user')}:" %>
     <% display_name =
          if comment.user.present?
            comment.user.display_name
-         elsif comment.content.to_s.strip.start_with?(system_prefix)
-           t('collavre.comments.system_user')
          else
-           t('collavre.comments.gemini')
+           t('collavre.comments.system_user')
          end %>
     <% timestamp = comment.created_at.in_time_zone %>
     <strong><%= display_name %></strong>
@@ -59,6 +56,14 @@
       <button class="edit-comment-btn comment-owner-only" data-comment-target="ownerButton" data-comment-id="<%= comment.id %>" data-comment-content="<%= comment.content %>" data-comment-private="<%= comment.private? %>" title="<%= t('collavre.comments.update_comment') %>">
         <%= t('collavre.comments.edit_button') %>
       </button>
+      <% if comment.user&.ai_user? %>
+        <button class="review-comment-btn" data-comment-target="reviewButton" data-comment-id="<%= comment.id %>" title="<%= t('collavre.comments.review_button') %>">
+          <%= t('collavre.comments.review_button') %>
+        </button>
+        <button class="replace-comment-btn" data-comment-target="replaceButton" data-comment-id="<%= comment.id %>" title="<%= t('collavre.comments.replace_button') %>" disabled>
+          <%= t('collavre.comments.replace_button') %>
+        </button>
+      <% end %>
       <button class="copy-comment-link-btn" data-comment-id="<%= comment.id %>" data-comment-url="<%= collavre.creative_comment_url(comment.creative, comment, Rails.application.config.action_mailer.default_url_options) %>" title="<%= t('collavre.comments.copy_link_button') %>">
         <%= t('collavre.comments.copy_link_button') %>
       </button>
@@ -66,6 +71,11 @@
         <%= t('collavre.comments.delete_button') %>
       </button>
     </div>
+  <% if comment.quoted_text.present? %>
+    <div class="comment-quoted-block">
+      <blockquote class="comment-quoted-text"><%= comment.quoted_text %></blockquote>
+    </div>
+  <% end %>
   <div class="comment-content"><%= comment.content %></div>
 
 

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

@@ -31,7 +31,8 @@
      data-move-error-text="<%= t('collavre.comments.move_error') %>"
      data-hint-drag-topic-text="<%= t('collavre.comments.hint_drag_topic') %>"
      data-hint-move-button-text="<%= t('collavre.comments.hint_move_button') %>"
-     data-add-participant-text="<%= t('collavre.comments.add_participant') %>">
+     data-add-participant-text="<%= t('collavre.comments.add_participant') %>"
+     data-review-button-text="<%= t('collavre.comments.review_button') %>">
   <div class="resize-handle resize-handle-left" data-comments--popup-target="leftHandle"></div>
   <div class="resize-handle resize-handle-right" data-comments--popup-target="rightHandle"></div>
   <div class="comments-popup-header">
@@ -50,7 +51,7 @@
           <%= svg_tag "exit-fullscreen.svg", class: "comments-popup-action-icon" %>
         </span>
       </button>
-      <button id="close-comments-btn" data-comments--popup-target="closeButton" class="comments-popup-action comments-popup-close" type="button">&times;</button>
+      <button id="close-comments-btn" data-comments--popup-target="closeButton" class="popup-close-btn" type="button">&times;</button>
     </div>
   </div>
   <div id="comment-participants" data-comments--presence-target="participants" data-comments--mention-menu-target="participants"></div>
@@ -62,6 +63,12 @@
   <div id="comments-list" data-comments--popup-target="list" data-comments--list-target="list"><%= t('app.loading') %></div>
   <div id="typing-indicator" data-comments--presence-target="typingIndicator"></div>
   <form id="new-comment-form" data-comments--popup-target="form" data-comments--form-target="form" style="display:none;">
+    <input type="hidden" name="comment[quoted_comment_id]" data-comments--form-target="quotedCommentId" value="" />
+    <input type="hidden" name="comment[quoted_text]" data-comments--form-target="quotedText" value="" />
+    <div class="comment-quote-indicator" data-comments--form-target="quoteIndicator" style="display:none;">
+      <span class="comment-quote-indicator-text" data-comments--form-target="quoteIndicatorText"></span>
+      <button type="button" class="comment-quote-cancel" data-action="click->comments--form#cancelQuote" title="<%= t('app.cancel') %>">&times;</button>
+    </div>
     <textarea class="shared-input-surface" name="comment[content]" data-comments--form-target="textarea" data-comments--presence-target="textarea" data-comments--mention-menu-target="textarea" rows="2" enterkeyhint="send"></textarea>
     <div class="comment-bottom">
     <input type="file" id="comment-images" name="comment[images][]" accept="image/*" multiple data-comments--form-target="imageInput" style="display:none;" />

data/app/views/collavre/creatives/_mobile_actions_menu.html.erb

@@ -10,9 +10,6 @@
       <button type="button" class="popup-menu-item" data-controller="click-target" data-click-target-id-value="share-creative-btn" data-action="click->click-target#trigger"><%= t('collavre.creatives.index.share') %></button>
     <% end %>
     <% if can_manage_integrations %>
-      <%# Legacy hardcoded integrations %>
-      <button type="button" class="popup-menu-item" data-controller="click-target" data-click-target-id-value="github-integration-btn" data-action="click->click-target#trigger"><%= t('collavre.creatives.index.integrations', default: '연동') %> - Github</button>
-      <%# Dynamically registered integrations %>
       <% Collavre::IntegrationRegistry.each do |integration| %>
         <% if integration.enabled_for?(current_creative) %>
           <button type="button"

data/app/views/collavre/creatives/_share_button.html.erb

@@ -1,55 +1,3 @@
 <button id="share-creative-btn" class="btn btn-primary desktop-only">
   <span aria-hidden="true"><%= svg_tag 'share.svg', class: 'icon-up', width: 22, height: 20 %></span>
 </button>
-<!-- Share Creative Modal -->
-<div id="share-creative-modal" style="display:none;position:fixed;top:0;left:0;width:100vw;height:100vh;z-index:10000;align-items:center;justify-content:center;" data-creative-id="<%= (@parent_creative || @creative).id %>">
-  <div class="popup-box" style="min-width:320px;max-width:90vw;">
-    <button id="close-share-modal" class="popup-close-btn">&times;</button>
-    <h2><%= t('collavre.creatives.index.share_creative') %></h2>
-    <form id="share-creative-form" action="<%= collavre.creative_creative_shares_path(@parent_creative || @creative) %>" method="post" data-controller="share-invite">
-      <%= csrf_meta_tags %>
-      <div style="margin-bottom:1em; position:relative;" 
-           data-controller="share-user-search"
-           data-share-user-search-creative-id-value="<%= (@parent_creative || @creative).id %>"
-           data-share-user-search-scope-value="contacts">
-        <label for="share-user-email"><%= t('collavre.creatives.index.user_email') %></label>
-        <input type="email" name="user_email" id="share-user-email" style="width:100%;" 
-          data-share-invite-target="email" 
-          data-share-user-search-target="input"
-          data-action="blur->share-invite#check input->share-user-search#input focus->share-user-search#focus keydown->share-user-search#handleKey"
-          autocomplete="off" />
-        <%= render Collavre::UserMentionMenuComponent.new(menu_id: 'share-user-suggestions') %>
-      </div>
-      <div style="margin-bottom:1em;">
-        <select name="permission" id="share-permission" style="width:100%;">
-          <option value="no_access"><%= t('collavre.creatives.index.permission_no_access') %></option>
-          <option value="read"><%= t('collavre.creatives.index.permission_read') %></option>
-          <option value="feedback"><%= t('collavre.creatives.index.permission_feedback') %></option>
-          <option value="write"><%= t('collavre.creatives.index.permission_write') %></option>
-          <option value="admin"><%= t('collavre.creatives.index.permission_admin') %></option>
-        </select>
-      </div>
-      <button type="submit" class="btn btn-primary" data-share-invite-target="submit" data-share="<%= t('collavre.creatives.index.share') %>" data-invite="<%= t('collavre.creatives.index.invite') %>"><%= t('collavre.creatives.index.share') %></button>
-      <button type="button" id="creative-invite-link" class="btn btn-secondary" data-creative-id="<%= (@parent_creative || @creative).id %>" data-no-access-message="<%= t('collavre.creatives.index.invite_link_no_access') %>" data-copied-template="<%= t('collavre.creatives.index.invite_link_copied_permission', permission: '__PERMISSION__') %>"><%= t('collavre.creatives.index.invite_link') %></button>
-    </form>
-    <% if @shared_list.any? %>
-      <div style="margin-top:1em;">
-        <strong><%= t('collavre.creatives.index.shared_with') %>:</strong>
-        <ul class="share-grid">
-          <% @shared_list.each do |share| %>
-            <li>
-              <span>
-                <%= render Collavre::AvatarComponent.new(user: share.user, size: 20, classes: 'avatar share-avatar') %>
-              </span>
-              <span><%= share.user&.display_name || (share.user_id.nil? ? t('collavre.creatives.index.public_share') : t('collavre.creatives.index.unknown_user')) %></span>
-              <span><%= t("collavre.creatives.index.permission_#{share.permission}") %></span>
-              <span>
-                <%= button_to '×', collavre.creative_creative_share_path(@parent_creative || @creative, share), method: :delete, form: { data: { turbo_confirm: t('collavre.creatives.index.are_you_sure_delete_share') } }, class: 'delete-share-btn', style: 'padding:0 0.5em;' %>
-              </span>
-            </li>
-          <% end %>
-        </ul>
-      </div>
-    <% end %>
-  </div>
-</div>