collavre 0.3.2 → 0.5.0

data/app/controllers/collavre/comments_controller.rb

@@ -163,23 +163,34 @@ module Collavre
       if @comment.save
 
         # Dispatch system event
-        ::SystemEvents::Dispatcher.dispatch("comment_created", {
-          comment: {
-            id: @comment.id,
-            content: @comment.content,
-            user_id: @comment.user_id
-          },
-          creative: {
-            id: @creative.id,
-            description: @creative.description
-          },
-          topic: {
-            id: @comment.topic_id
-          },
-          chat: {
-            content: @comment.content
-          }
-        }) unless @comment.private? || response.present?
+        unless @comment.private? || response.present?
+          begin
+            ::SystemEvents::Dispatcher.dispatch("comment_created", {
+              comment: {
+                id: @comment.id,
+                content: @comment.content,
+                user_id: @comment.user_id,
+                from_ai: @comment.user&.searchable? || false,
+                quoted_comment_id: @comment.quoted_comment_id
+              }.compact,
+              creative: {
+                id: @creative.id,
+                description: @creative.description
+              },
+              topic: {
+                id: @comment.topic_id
+              },
+              chat: {
+                content: @comment.content
+              }
+            })
+          rescue => e
+            Rails.logger.error(
+              "[SystemEvents] Dispatch failed for comment #{@comment.id}: " \
+              "#{e.class} #{e.message}\n#{e.backtrace&.first(5)&.join("\n")}"
+            )
+          end
+        end
         @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
@@ -189,7 +200,7 @@ module Collavre
 
     def update
       if @comment.user == Current.user
-        safe_params = comment_params
+        safe_params = comment_params.except(:quoted_comment_id, :quoted_text)
         if safe_params[:topic_id].present? && !@creative.topics.where(id: safe_params[:topic_id]).exists?
           render json: { error: I18n.t("collavre.comments.invalid_topic") }, status: :unprocessable_entity and return
         end
@@ -392,87 +403,19 @@ module Collavre
         head :forbidden and return
       end
 
-      render json: command_menu_items
+      render json: CommandMenuService.new(user: Current.user).items
     end
 
     def move
-      comment_ids = Array(params[:comment_ids]).map(&:presence).compact.map(&:to_i)
-      if comment_ids.empty?
-        render json: { error: I18n.t("collavre.comments.move_no_selection") }, status: :unprocessable_entity and return
-      end
-
-      # Support moving to topic within same creative (target_topic_id only)
-      # or moving to different creative (target_creative_id)
-      target_topic_id = params[:target_topic_id]
-      target_creative_id = params[:target_creative_id]
-
-      # Determine target creative and topic
-      if target_creative_id.present?
-        # Moving to different creative
-        target_creative = Creative.find_by(id: target_creative_id)
-        if target_creative.nil?
-          render json: { error: I18n.t("collavre.comments.move_invalid_target") }, status: :unprocessable_entity and return
-        end
-        target_origin = target_creative.effective_origin
-        new_topic_id = nil # Reset topic when moving to different creative
-      elsif target_topic_id.present? || target_topic_id == ""
-        # Moving to topic within same creative (empty string means Main/no topic)
-        target_origin = @creative
-        new_topic_id = target_topic_id.presence # nil for Main topic
-
-        # Validate topic exists if specified
-        if new_topic_id.present? && !@creative.topics.exists?(id: new_topic_id)
-          render json: { error: I18n.t("collavre.comments.move_invalid_topic", default: "Invalid topic") }, status: :unprocessable_entity and return
-        end
-      else
-        render json: { error: I18n.t("collavre.comments.move_invalid_target") }, status: :unprocessable_entity and return
-      end
-
-      unless @creative.has_permission?(Current.user, :feedback) && target_origin.has_permission?(Current.user, :feedback)
-        render json: { error: I18n.t("collavre.comments.move_not_allowed") }, status: :forbidden and return
-      end
-
-      scope = @creative.comments.where(
-        "comments.private = ? OR comments.user_id = ? OR comments.approver_id = ?",
-        false,
-        Current.user.id,
-        Current.user.id
+      result = CommentMoveService.new(creative: @creative, user: Current.user).call(
+        comment_ids: params[:comment_ids],
+        target_creative_id: params[:target_creative_id],
+        target_topic_id: params[:target_topic_id]
       )
-
-      comments = scope.where(id: comment_ids).to_a
-
-      if comments.length != comment_ids.length
-        render json: { error: I18n.t("collavre.comments.move_not_allowed") }, status: :forbidden and return
-      end
-
-      moved_count = 0
-      ActiveRecord::Base.transaction do
-        comments.each do |comment|
-          # Skip if already in target location
-          same_creative = comment.creative_id == target_origin.id
-          same_topic = comment.topic_id.to_s == new_topic_id.to_s
-
-          next if same_creative && same_topic
-
-          original_creative = comment.creative
-          original_topic_id = comment.topic_id
-
-          if same_creative
-            # Just update topic within same creative
-            comment.update!(topic_id: new_topic_id)
-          else
-            # Move to different creative
-            comment.update!(creative: target_origin, topic_id: new_topic_id)
-            broadcast_move_removal(comment, original_creative)
-          end
-          moved_count += 1
-        end
-      end
-
-      Comment.broadcast_badges(@creative)
-      Comment.broadcast_badges(target_origin) unless target_origin == @creative
-
-      render json: { success: true, moved_count: moved_count }
+      render json: result
+    rescue CommentMoveService::MoveError => e
+      status = e.message == I18n.t("collavre.comments.move_not_allowed") ? :forbidden : :unprocessable_entity
+      render json: { error: e.message }, status: status
     rescue ActiveRecord::RecordInvalid => e
       render json: { error: e.record.errors.full_messages.to_sentence.presence || I18n.t("collavre.comments.move_error") }, status: :unprocessable_entity
     end
@@ -483,63 +426,6 @@ module Collavre
       @creative = Creative.find(params[:creative_id]).effective_origin
     end
 
-    def command_menu_items
-      [
-        {
-          name: "calendar",
-          label: "/calendar",
-          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
-
-    def mcp_command_items
-      Collavre::McpService.available_tools(Current.user).filter_map do |tool|
-        tool_name = tool[:name] || tool["name"]
-        next unless tool_name
-
-        {
-          name: tool_name,
-          label: "/#{tool_name}",
-          description: tool[:description] || tool["description"],
-          args: format_command_args(tool[:params] || tool["params"])
-        }
-      end
-    end
-
-    def format_command_args(params)
-      return if params.blank?
-
-      # Handle array format (from MetaToolService)
-      if params.is_a?(Array)
-        return params.map do |param|
-          name = param[:name] || param["name"]
-          required = param[:required] || param["required"]
-          name.to_s + (required ? "*" : "")
-        end.join(", ")
-      end
-
-      # Handle JSON Schema format (Hash with :properties)
-      properties = params[:properties] || params["properties"]
-      return unless properties.is_a?(Hash)
-
-      required = params[:required] || params["required"] || []
-      required = Array(required).map(&:to_s)
-
-      properties.keys.map do |key|
-        key = key.to_s
-        required.include?(key) ? "#{key}*" : key
-      end.join(", ")
-    end
-
     def set_comment
       @comment = @creative.comments
                              .where(
@@ -552,22 +438,13 @@ module Collavre
     end
 
     def comment_params
-      params.require(:comment).permit(:content, :private, :topic_id, images: [])
+      params.require(:comment).permit(:content, :private, :topic_id, :quoted_comment_id, :quoted_text, images: [])
     end
 
     def can_convert_comment?
       @comment.user == Current.user || @creative.has_permission?(Current.user, :admin)
     end
 
-    def broadcast_move_removal(comment, original_creative)
-      return if comment.private?
-
-      Turbo::StreamsChannel.broadcast_remove_to(
-        [ original_creative, :comments ],
-        target: view_context.dom_id(comment)
-      )
-    end
-
     def build_convert_system_message(creative)
       title = helpers.strip_tags(creative.description).to_s.strip
       title = I18n.t("collavre.comments.convert_system_message_default_title") if title.blank?

data/app/controllers/collavre/creatives_controller.rb

@@ -176,47 +176,21 @@ module Collavre
     end
 
     def create
-      @creative = Creative.new(creative_params)
-      if @creative.parent
-        @creative.user = @creative.parent.user
-      else
-        @creative.user = Current.user
-      end
-
-      # Rebuild @child_creative from params if present
-      if params[:child_id].present?
-        @child_creative = Creative.find_by(id: params[:child_id])
-      end
-
-      if @creative.save
-        @child_creative.update(parent: @creative) if @child_creative
-        if params[:before_id].present?
-          before_creative = Creative.find_by(id: params[:before_id])
-          if before_creative && before_creative.parent_id == @creative.parent_id
-            siblings = @creative.parent ? @creative.parent.children.order(:sequence).to_a : Creative.roots.order(:sequence).to_a
-            siblings.reject! { |s| s.id == @creative.id }
-            index = siblings.index { |s| s.id == before_creative.id } || 0
-            siblings.insert(index, @creative)
-            siblings.each_with_index { |c, idx| c.update_column(:sequence, idx) }
-          end
-        elsif params[:after_id].present?
-          after_creative = Creative.find_by(id: params[:after_id])
-          if after_creative && after_creative.parent_id == @creative.parent_id
-            siblings = @creative.parent ? @creative.parent.children.order(:sequence).to_a : Creative.roots.order(:sequence).to_a
-            siblings.reject! { |s| s.id == @creative.id }
-            index = siblings.index { |s| s.id == after_creative.id } || -1
-            siblings.insert(index + 1, @creative)
-            siblings.each_with_index { |c, idx| c.update_column(:sequence, idx) }
-          end
-        end
-        if params[:tags].present?
-          Array(params[:tags]).each do |tag_id|
-            @creative.tags.create(label_id: tag_id)
-          end
-        end
+      result = Creatives::CreateService.new(
+        creative_params: creative_params,
+        user: Current.user,
+        child_id: params[:child_id],
+        before_id: params[:before_id],
+        after_id: params[:after_id],
+        tag_ids: params[:tags]
+      ).call
+
+      @creative = result.creative
+
+      if result.success?
         render json: { id: @creative.id }
       else
-        render json: { errors: @creative.errors.full_messages }, status: :unprocessable_entity
+        render json: { errors: result.errors }, status: :unprocessable_entity
       end
     end
 
@@ -275,15 +249,11 @@ module Collavre
       unless @creative.has_permission?(Current.user, :admin)
         redirect_to @creative, alert: t("collavre.creatives.errors.no_permission") and return
       end
-      if params[:delete_with_children]
-        # Recursively destroy deletable descendants before deleting parent
-        destroy_descendants_recursively(@creative, Current.user)
-      else
-        # Re-link children to parent
-        @creative.children.each { |child| child.update(parent: parent) }
-      end
-      CreativeShare.where(creative: @creative).destroy_all
-      @creative.destroy
+      Creatives::DestroyService.new(
+        creative: @creative,
+        user: Current.user,
+        delete_with_children: params[:delete_with_children].present?
+      ).call
     end
 
     def request_permission
@@ -524,16 +494,6 @@ module Collavre
         }
       end
 
-      # Recursively destroy all descendants the user can delete
-      def destroy_descendants_recursively(creative, user)
-        deletable_children = creative.children_with_permission(user, :admin)
-        deletable_children.each do |child|
-          destroy_descendants_recursively(child, user)
-          CreativeShare.where(creative: child).destroy_all
-          child.destroy
-        end
-      end
-
       def enforce_creatives_login_policy
         if SystemSetting.creatives_login_required?
           require_authentication

data/app/controllers/collavre/users_controller.rb

@@ -2,7 +2,7 @@ module Collavre
   class UsersController < ApplicationController
     allow_unauthenticated_access only: %i[new create exists]
     before_action -> { enforce_auth_provider!(:email) }, only: [ :new, :create ]
-    before_action :require_system_admin!, only: [ :index, :grant_system_admin, :revoke_system_admin ]
+    before_action :require_system_admin!, only: [ :index, :grant_system_admin, :revoke_system_admin, :unlock, :lock ]
 
     def new
       @user = Collavre::User.new
@@ -53,6 +53,14 @@ module Collavre
 
     def new_ai
       @available_tools = load_available_tools
+
+      if params[:copy_from].present?
+        source = Collavre::User.find_by(id: params[:copy_from])
+        if source&.ai_user? && source.created_by_id == Current.user.id
+          @copy_source = source
+          @copy_name = "#{source.name} (copy)"
+        end
+      end
     end
 
     def create_ai
@@ -75,6 +83,7 @@ module Collavre
         created_by_id: Current.user.id,
         routing_expression: params[:routing_expression]
       )
+      @user.agent_conf = params[:agent_conf] if @user.respond_to?(:agent_conf=) && params[:agent_conf].present?
 
       if @user.save
         Collavre::Contact.ensure(user: Current.user, contact_user: @user)
@@ -112,7 +121,7 @@ module Collavre
         return
       end
 
-      ai_params = params.require(:user).permit(:name, :system_prompt, :llm_vendor, :llm_model, :llm_api_key, :gateway_url, :searchable, :routing_expression, tools: [])
+      ai_params = params.require(:user).permit(:name, :system_prompt, :llm_vendor, :llm_model, :llm_api_key, :gateway_url, :searchable, :routing_expression, :agent_conf, tools: [])
 
       if @user.update(ai_params)
         redirect_to edit_ai_user_path(@user), notice: I18n.t("collavre.users.update_ai.success")
@@ -137,7 +146,10 @@ module Collavre
       end
 
       scope = if params[:scope] == "contacts" && Current.user
-        Current.user.contact_users
+        # Include both contacts and searchable users (e.g., AI agents with searchable=true)
+        contact_ids = Current.user.contact_users.select(:id)
+        searchable_ids = Collavre::User.where(searchable: true).select(:id)
+        Collavre::User.where(id: contact_ids).or(Collavre::User.where(id: searchable_ids))
       else
         Collavre::User.mentionable_for(creative)
       end
@@ -220,6 +232,22 @@ module Collavre
       end
     end
 
+    def unlock
+      @user = Collavre::User.find(params[:id])
+      @user.unlock_account!
+      redirect_to users_path, notice: I18n.t("collavre.users.unlock.success", name: @user.display_name)
+    end
+
+    def lock
+      @user = Collavre::User.find(params[:id])
+      if @user == Current.user
+        redirect_to users_path, alert: I18n.t("collavre.users.lock.cannot_lock_self")
+        return
+      end
+      @user.lock_account!
+      redirect_to users_path, notice: I18n.t("collavre.users.lock.success", name: @user.display_name)
+    end
+
     def update
       @user = Collavre::User.find(params[:id])
       if @user.update(profile_params)

data/app/helpers/collavre/application_helper.rb

@@ -1,4 +1,101 @@
 module Collavre
   module ApplicationHelper
+    # Returns the body CSS class for the current user's theme.
+    # Custom themes get "light-mode" to disable OS dark mode overrides,
+    # ensuring the custom theme controls all colors regardless of OS setting.
+    def body_theme_class
+      theme = Current.user&.theme
+      return "" if theme.blank?
+
+      case theme
+      when "dark"
+        "dark-mode"
+      when "light"
+        "light-mode"
+      else
+        "light-mode" # Custom theme: neutralize OS dark mode
+      end
+    end
+
+    # Renders CSS for admin-configured default themes (light/dark mode)
+    # Only applies when the user has no personal theme set
+    def default_theme_styles
+      return "" if Current.user&.theme.present?
+
+      light_theme = SystemSetting.default_light_theme
+      dark_theme = SystemSetting.default_dark_theme
+      return "" unless light_theme || dark_theme
+
+      styles = []
+
+      if light_theme
+        styles << render_theme_media_query(light_theme, "light")
+      end
+
+      if dark_theme
+        styles << render_theme_media_query(dark_theme, "dark")
+      end
+
+      styles.join("\n").html_safe # rubocop:disable Rails/OutputSafety
+    end
+
+    private
+
+    def render_theme_media_query(theme, mode)
+      vars = theme.variables.map { |k, v| "#{k}: #{v} !important;" }.join("\n            ")
+      legacy = legacy_alias_declarations(theme.variables).map { |k, v| "#{k}: #{v} !important;" }.join("\n            ")
+      dark_filter = theme.dark? ? "--date-icon-filter: invert(0.8) !important;" : ""
+
+      <<~CSS
+        @media (prefers-color-scheme: #{mode}) {
+          body:not(.dark-mode):not(.light-mode) {
+            #{vars}
+            #{legacy}
+            #{dark_filter}
+          }
+        }
+      CSS
+    end
+
+    public
+
+    # Maps semantic token names to their legacy alias names.
+    # When custom themes inject semantic tokens on <body>, the legacy aliases
+    # defined on :root still resolve to :root's light values. This map lets
+    # the theme injection template also emit legacy aliases so that CSS using
+    # old variable names (e.g. --color-section-bg) picks up custom values.
+    SEMANTIC_TO_LEGACY = {
+      "--surface-bg" => "--color-bg",
+      "--surface-nav" => "--color-nav-bg",
+      "--surface-section" => "--color-section-bg",
+      "--surface-input" => "--color-input-bg",
+      "--surface-btn" => "--color-btn-bg",
+      "--surface-secondary" => "--color-secondary-background",
+      "--text-primary" => "--color-text",
+      "--text-muted" => "--color-muted",
+      "--text-on-btn" => "--color-btn-text",
+      "--text-nav" => "--color-nav-text",
+      "--text-nav-btn" => "--color-nav-btn-text",
+      "--text-chat-btn" => "--color-chat-btn-text",
+      "--text-on-badge" => "--color-badge-text",
+      "--text-input" => "--color-input-text",
+      "--color-brand" => "--color-complete",
+      "--color-active" => "--color-secondary-active",
+      "--border-color" => "--color-border",
+      "--border-drag-over" => "--color-drag-over",
+      "--border-drag-edge" => "--color-drag-over-edge"
+    }.freeze
+
+    # Given a hash of semantic token variables, returns additional legacy
+    # alias declarations so old CSS picks up the custom theme values.
+    def legacy_alias_declarations(variables)
+      aliases = {}
+      variables.each do |key, value|
+        if (legacy_name = SEMANTIC_TO_LEGACY[key])
+          aliases[legacy_name] = value
+        end
+      end
+      aliases
+    end
   end
 end