collavre 0.15.0 → 0.20.0

data/app/services/collavre/ai_agent/message_builder.rb

@@ -43,14 +43,15 @@ module Collavre
         topic = current_topic
         topic_info = topic ? "\nTopic: #{topic.name} (id: #{topic.id})" : ""
 
+        ancestry = build_ancestry_chain(creative)
+
         if effective.data&.dig("disabled_self_context") == true
           # Self-context disabled: inject only the ancestry chain so the AI
           # knows where in the hierarchy the conversation is happening
-          ancestry = build_ancestry_chain(creative)
           @injected_creative_ids << creative.id
-          messages << { role: "user", kind: :creative_context, parts: [ { text: "Current Creative (id: #{creative.id}):#{topic_info}\nPath: #{ancestry}" } ] }
+          messages << { role: "user", kind: :creative_context, parts: [ { text: "Creative Path: #{ancestry}#{topic_info}" } ] }
         else
-          # Full self-context: inject the creative subtree
+          # Full self-context: inject the creative subtree with ancestry breadcrumb
           children_level = @agent.creative_children_level
           max_depth = 1 + children_level
           markdown = ApplicationController.helpers.render_creative_tree_markdown(
@@ -58,12 +59,12 @@ module Collavre
           )
 
           @injected_creative_ids << creative.id
-          messages << { role: "user", kind: :creative_context, parts: [ { text: "Creative (id: #{creative.id}):#{topic_info}\n#{markdown}" } ] }
+          messages << { role: "user", kind: :creative_context, parts: [ { text: "Creative Path: #{ancestry}#{topic_info}\n#{markdown}" } ] }
         end
       end
 
       def build_ancestry_chain(creative)
-        creative.self_and_ancestors.reverse.map(&:creative_snippet).join(" > ")
+        creative.self_and_ancestors.reverse.map { |c| "#{c.creative_snippet} (id: #{c.id})" }.join(" > ")
       end
 
       def append_context_creatives(messages)
@@ -75,17 +76,20 @@ module Collavre
 
         effective_origin = creative.effective_origin(Set.new)
         context_ids = effective_origin.effective_context_ids
-        disabled_ids = Array(effective_origin.data&.dig("disabled_context_ids"))
+        disabled_ids = effective_origin.effective_disabled_context_ids
         active_ids = context_ids - disabled_ids - [ creative_id, effective_origin.id ]
         return if active_ids.empty?
 
         children_level = @agent.creative_children_level
         max_depth = 1 + children_level
 
+        ids_to_load = active_ids.reject { |ctx_id| @injected_creative_ids.include?(ctx_id) }
+        creatives_by_id = Creative.where(id: ids_to_load).index_by(&:id)
+
         active_ids.each do |ctx_id|
           next if @injected_creative_ids.include?(ctx_id)
 
-          ctx = Creative.find_by(id: ctx_id)
+          ctx = creatives_by_id[ctx_id]
           next unless ctx
 
           @injected_creative_ids << ctx_id
@@ -109,11 +113,12 @@ module Collavre
         max_depth = 1 + children_level
 
         # Extract creative IDs from markdown links like [title](/creatives/123)
-        content.scan(%r{\[[^\]]*\]\(/creatives/(\d+)\)}).flatten.uniq.each do |id_str|
-          creative_id = id_str.to_i
-          next if @injected_creative_ids.include?(creative_id)
+        referenced_ids = content.scan(%r{\[[^\]]*\]\(/creatives/(\d+)\)}).flatten.map(&:to_i).uniq
+        referenced_ids.reject! { |cid| @injected_creative_ids.include?(cid) }
+        creatives_by_id = Creative.where(id: referenced_ids).index_by(&:id)
 
-          creative = Creative.find_by(id: creative_id)
+        referenced_ids.each do |creative_id|
+          creative = creatives_by_id[creative_id]
           next unless creative
 
           @injected_creative_ids << creative_id
@@ -141,7 +146,7 @@ module Collavre
         history_chars = 0
         count = 0
 
-        Comment.where(creative_id: creative_id, private: false)
+        Comment.public_only.where(creative_id: creative_id)
                .where(topic_id: topic_id)
                .where.not(user_id: nil)
                .includes(:user)
@@ -247,9 +252,21 @@ module Collavre
       # This is slightly broader than what's actually rendered (which is
       # limited by children_level), but ensures no descendant change is missed.
       def collect_rendered_creative_ids
-        @injected_creative_ids.flat_map do |root_id|
-          Creative.find_by(id: root_id)&.subtree_ids || [ root_id ]
-        end.uniq
+        roots = Creative.where(id: @injected_creative_ids.to_a).to_a
+        found_ids = roots.map(&:id).to_set
+
+        ids = roots.flat_map(&:subtree_ids)
+                   .concat(@injected_creative_ids.reject { |rid| found_ids.include?(rid) })
+
+        # Include ancestor IDs used in the breadcrumb so that changes to
+        # ancestor titles are detected by context_changed?
+        creative_id = @context.dig("creative", "id")
+        if creative_id
+          ancestor_ids = Creative.find_by(id: creative_id)&.ancestor_ids || []
+          ids.concat(ancestor_ids)
+        end
+
+        ids.uniq
       end
     end
   end

data/app/services/collavre/ai_agent/response_finalizer.rb

@@ -72,7 +72,8 @@ module Collavre
         reply_comment = @original_comment.creative.comments.create!(
           content: @response_content,
           user: @agent,
-          topic_id: @original_comment.topic_id
+          topic_id: @original_comment.topic_id,
+          task: @task
         )
 
         log_action("reply_created", { comment_id: reply_comment.id, content: @response_content })

data/app/services/collavre/ai_agent/session_context_resolver.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Collavre
+  module AiAgent
+    class SessionContextResolver
+      def initialize(agent:, messages_data:, system_prompt:)
+        @agent = agent
+        @messages_data = messages_data
+        @system_prompt = system_prompt
+      end
+
+      def resolve
+        if @agent.supports_session? && !needs_full_context?
+          incremental_payload
+        else
+          full_payload
+        end
+      end
+
+      private
+
+      def needs_full_context?
+        @messages_data[:first_message] || @messages_data[:context_changed]
+      end
+
+      def full_payload
+        msgs = @messages_data[:messages]
+        msgs = msgs.reject { |m| m[:kind] == :chat_history } if @agent.supports_session?
+
+        {
+          messages: msgs,
+          system_prompt: @system_prompt,
+          first_message: @messages_data[:first_message],
+          context_changed: @messages_data[:context_changed]
+        }
+      end
+
+      def incremental_payload
+        trigger_only = @messages_data[:messages].select { |m| m[:kind] == :trigger }
+
+        {
+          messages: trigger_only,
+          system_prompt: nil,
+          first_message: false,
+          context_changed: false
+        }
+      end
+    end
+  end
+end

data/app/services/collavre/ai_agent_service.rb

@@ -29,6 +29,9 @@ module Collavre
         rendering_context = prepare_rendering_context
         system_prompt = render_system_prompt(rendering_context)
 
+        # Resolve session context (decides what to send)
+        resolved = resolve_session_context(messages_data, system_prompt)
+
         # Create placeholder comment if needed
         @reply_comment = create_reply_comment_if_needed
 
@@ -48,8 +51,8 @@ module Collavre
         @lifecycle_manager.broadcast_status("thinking")
 
         # Execute AI chat with streaming
-        @client = build_ai_client(system_prompt)
-        stream_response(@client, messages_data)
+        @client = build_ai_client(resolved[:system_prompt])
+        stream_response(@client, resolved)
 
         log_action("completion", { response: @streamer.content })
 
@@ -89,6 +92,14 @@ module Collavre
       ).build
     end
 
+    def resolve_session_context(messages_data, system_prompt)
+      AiAgent::SessionContextResolver.new(
+        agent: @agent,
+        messages_data: messages_data,
+        system_prompt: system_prompt
+      ).resolve
+    end
+
     def find_creative
       creative_id = @context.dig("creative", "id")
       creative_id ? Creative.find_by(id: creative_id) : nil
@@ -126,6 +137,7 @@ module Collavre
         content: Comment::STREAMING_PLACEHOLDER_CONTENT,
         user: @agent,
         topic_id: @original_comment.topic_id,
+        task: @task,
         skip_dispatch: true  # A2A routing handled by A2aDispatcher after finalization
       )
     end

data/app/services/collavre/ai_client.rb

@@ -132,9 +132,14 @@ module Collavre
       chat_opts[:provider] = provider if provider
       chat_opts[:assume_model_exists] = true if provider
 
+      # Apply current system timeout setting (picks up changes without restart)
+      RubyLLM.config.request_timeout = SystemSetting.llm_request_timeout_seconds
+
       RubyLLM.context(&context_block)
              .chat(**chat_opts).tap do |chat|
         chat.with_instructions(system_prompt) if system_prompt.present?
+        session_id = build_session_id
+        chat.with_headers("X-Session-Id" => session_id) if session_id
         chat.on_tool_call do |tool_call|
           check_tool_approval!(tool_call)
         end
@@ -146,6 +151,14 @@ module Collavre
       end
     end
 
+    def build_session_id
+      creative_id = context&.dig(:creative)&.id
+      topic_id = context&.dig(:comment)&.topic_id || context&.dig(:topic_id)
+      return nil unless creative_id && topic_id
+
+      "creative_#{creative_id}_topic_#{topic_id}"
+    end
+
     def check_tool_approval!(tool_call)
       tool_name = tool_call.name
       task = context&.dig(:task)

data/app/services/collavre/command_menu_service.rb

@@ -1,7 +1,8 @@
 module Collavre
   class CommandMenuService
-    def initialize(user:)
+    def initialize(user:, creative: nil)
       @user = user
+      @creative = creative
     end
 
     def items
@@ -10,7 +11,7 @@ module Collavre
 
     private
 
-    attr_reader :user
+    attr_reader :user, :creative
 
     def built_in_items
       [
@@ -70,12 +71,16 @@ module Collavre
         next unless tool_name
 
         raw_params = tool[:params] || tool["params"]
+        schema = normalize_params(raw_params)
+        defaults = tool_defaults_for(tool_name)
+        apply_defaults_to_schema(schema, defaults) if defaults.present?
+
         {
           name: tool_name,
           label: "/#{tool_name}",
           description: tool[:description] || tool["description"],
           args: format_args(raw_params),
-          input_schema: normalize_params(raw_params)
+          input_schema: schema
         }
       end
     end
@@ -111,6 +116,21 @@ module Collavre
       end
     end
 
+    def tool_defaults_for(tool_name)
+      creative&.data&.dig("tools", tool_name)
+    end
+
+    def apply_defaults_to_schema(schema, defaults)
+      return unless schema.is_a?(Array) && defaults.is_a?(Hash)
+
+      schema.each do |param|
+        name = param[:name]
+        if defaults.key?(name)
+          param[:default_value] = defaults[name]
+        end
+      end
+    end
+
     def format_args(params)
       return if params.blank?
 

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

@@ -35,7 +35,7 @@ module Collavre
       end
 
       def mcp_commands
-        Collavre::Comments::McpCommandBuilder.new(comment: comment, user: user).commands
+        Collavre::Comments::McpCommandBuilder.new(comment: comment, user: user, creative: comment.creative).commands
       end
     end
   end

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

@@ -3,10 +3,11 @@ module Collavre
 
   module Comments
     class McpCommand
-      def initialize(comment:, user:, tool:, meta_tool_service: default_meta_tool_service)
+      def initialize(comment:, user:, tool:, creative: nil, meta_tool_service: default_meta_tool_service)
         @comment = comment
         @user = user
         @tool = tool
+        @creative = creative
         @meta_tool_service = meta_tool_service
       end
 
@@ -25,7 +26,7 @@ module Collavre
 
       private
 
-      attr_reader :comment, :user, :tool, :meta_tool_service
+      attr_reader :comment, :user, :tool, :creative, :meta_tool_service
 
       def command_match?
         comment.content.to_s.strip.match?(command_pattern)
@@ -41,11 +42,17 @@ module Collavre
 
       def parsed_arguments
         body = command_body
-        return {} if body.blank?
+        explicit_args = if body.blank?
+          {}
+        else
+          begin
+            JSON.parse(body)
+          rescue JSON::ParserError
+            key_value_arguments(body)
+          end
+        end
 
-        JSON.parse(body)
-      rescue JSON::ParserError
-        key_value_arguments(body)
+        merge_with_defaults(explicit_args)
       end
 
       def key_value_arguments(body)
@@ -61,6 +68,15 @@ module Collavre
         nil
       end
 
+      def merge_with_defaults(explicit_args)
+        return explicit_args unless explicit_args.is_a?(Hash)
+
+        defaults = creative&.data&.dig("tools", tool_name)
+        return explicit_args unless defaults.is_a?(Hash)
+
+        defaults.merge(explicit_args)
+      end
+
       def cast_value(value)
         case value
         when /\A\d+\z/ then value.to_i
@@ -89,9 +105,12 @@ module Collavre
           result.to_s
         end
 
+        escaped_tool = ERB::Util.html_escape(tool_name)
+        escaped_content = ERB::Util.html_escape(content)
+
         <<~HTML
-        <details><summary>#{tool_name} response</summary>
-        <pre><code>#{content}</code></pre>
+        <details><summary>#{escaped_tool} response</summary>
+        <pre><code>#{escaped_content}</code></pre>
         </details>
         HTML
       end

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

@@ -1,9 +1,10 @@
 module Collavre
   module Comments
     class McpCommandBuilder
-      def initialize(comment:, user:, logger: Rails.logger)
+      def initialize(comment:, user:, creative: nil, logger: Rails.logger)
         @comment = comment
         @user = user
+        @creative = creative
         @logger = logger
       end
 
@@ -13,7 +14,7 @@ module Collavre
         RailsMcpEngine::Engine.build_tools!
         tools = meta_tool_service.call(action: "list", tool_name: nil, query: nil, arguments: nil)
         Array(tools[:tools]).map do |tool|
-          Collavre::Comments::McpCommand.new(comment: comment, user: user, tool: tool, meta_tool_service: meta_tool_service)
+          Collavre::Comments::McpCommand.new(comment: comment, user: user, tool: tool, creative: creative, meta_tool_service: meta_tool_service)
         end
       rescue StandardError => e
         logger.error("MCP command registration failed: #{e.message}")
@@ -22,7 +23,7 @@ module Collavre
 
       private
 
-      attr_reader :comment, :user, :logger
+      attr_reader :comment, :user, :creative, :logger
 
       def meta_tool_service
         @meta_tool_service ||= ::Tools::MetaToolService.new

data/app/services/collavre/creatives/tree_builder.rb

@@ -75,6 +75,8 @@ module Creatives
 
     def cached_can_write?(creative)
       return false unless user
+      # GitHub-synced creatives are always read-only
+      return false if creative.github_markdown?
 
       if @permission_cache.key?(creative.id)
         @permission_cache[creative.id]
@@ -122,6 +124,7 @@ module Creatives
           expanded: expanded,
           is_root: creative.parent.nil?,
           archived: creative.archived?,
+          github_source: creative.github_markdown?,
           sequence: creative.sequence,
           link_url: view_context.collavre.creative_path(creative),
           templates: template_payload_for(creative, has_children: filtered_children.any?),

data/app/services/collavre/google_calendar_service.rb

@@ -95,6 +95,12 @@ module Collavre
 
     def list_calendars
       @service.list_calendar_lists.items.map { |c| [ c.summary, c.id ] }.to_h
+    rescue Google::Apis::AuthorizationError => e
+      Rails.logger.error("Google Calendar list_calendars auth error for user #{@user.id}: #{e.message}")
+      raise GoogleCalendarError, I18n.t("collavre.google_calendar.errors.reconnect")
+    rescue Faraday::ConnectionFailed, Faraday::TimeoutError, Google::Apis::TransmissionError => e
+      Rails.logger.error("Google Calendar list_calendars network error for user #{@user.id}: #{e.class} - #{e.message}")
+      raise GoogleCalendarError, I18n.t("collavre.google_calendar.errors.network")
     end
 
     private
@@ -109,6 +115,12 @@ module Collavre
         scope:         [ Google::Apis::CalendarV3::AUTH_CALENDAR_APP_CREATED ],
         refresh_token: token
       ).tap(&:fetch_access_token!)
+    rescue Signet::AuthorizationError => e
+      Rails.logger.error("Google Calendar fetch_access_token! auth error for user #{@user.id}: #{e.message}")
+      raise GoogleCalendarError, I18n.t("collavre.google_calendar.errors.reconnect")
+    rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
+      Rails.logger.error("Google Calendar fetch_access_token! network error for user #{@user.id}: #{e.class} - #{e.message}")
+      raise GoogleCalendarError, I18n.t("collavre.google_calendar.errors.network")
     end
 
     def refresh_token
@@ -130,10 +142,11 @@ module Collavre
     end
 
     def raw_google_refresh_token
-      result = ActiveRecord::Base.connection.select_value(
-        "SELECT google_refresh_token FROM users WHERE id = #{@user.id}"
+      ActiveRecord::Base.connection.select_value(
+        ActiveRecord::Base.sanitize_sql_array(
+          [ "SELECT google_refresh_token FROM users WHERE id = ?", @user.id ]
+        )
       )
-      result
     end
 
     def encrypted_value?(value)
@@ -160,9 +173,22 @@ module Collavre
         if @user.calendar_id.nil?
           @user.calendar_id = create_app_calendar
         else
-          calendar = @service.get_calendar(@user.calendar_id)
-          if calendar.id != @user.calendar_id
-            @user.calendar_id = create_app_calendar
+          begin
+            calendar = @service.get_calendar(@user.calendar_id)
+            if calendar.id != @user.calendar_id
+              @user.calendar_id = create_app_calendar
+            end
+          rescue Google::Apis::ClientError => e
+            if e.status_code == 404
+              Rails.logger.error("Google Calendar not found (deleted?) for user #{@user.id}, calendar_id=#{@user.calendar_id}")
+              @user.calendar_id = create_app_calendar
+            else
+              Rails.logger.error("Google Calendar get_calendar error for user #{@user.id}: #{e.class} #{e.status_code} - #{e.message}")
+              raise
+            end
+          rescue Google::Apis::AuthorizationError => e
+            Rails.logger.error("Google Calendar get_calendar auth error for user #{@user.id}: #{e.message}")
+            raise GoogleCalendarError, I18n.t("collavre.google_calendar.errors.reconnect")
           end
         end
       end

data/app/services/collavre/markdown_converter.rb

@@ -1,6 +1,7 @@
 require "base64"
 require "securerandom"
 require "nokogiri"
+require "commonmarker"
 
 module Collavre
   # Converts between Markdown and HTML for creative descriptions.
@@ -9,19 +10,20 @@ module Collavre
   # outside of view contexts and reusable from services (e.g. MarkdownImporter).
   class MarkdownConverter
     class << self
-      # Convert lightweight Markdown (links, bold, images) to HTML.
+      # Convert Markdown to HTML using commonmarker (GFM full support).
+      # Falls back to lightweight regex conversion for short inline fragments.
       def markdown_to_html(text, image_refs = {})
         return "" if text.nil?
-        html = text.dup
+        input = text.dup
 
         # Collect reference-style data-URI images: [alt]: <data:...>
-        html.gsub!(/^\s*\[([^\]]+)\]:\s*<\s*(data:image\/[^>]+)\s*>\s*$/) do
+        input.gsub!(/^\s*\[([^\]]+)\]:\s*<\s*(data:image\/[^>]+)\s*>\s*$/) do
           image_refs[$1] = $2.strip
           ""
         end
 
-        # Reference-style images: ![alt][ref]
-        html.gsub!(/(?<!\\)!\[([^\]]*)\]\[([^\]]+)\]/) do
+        # Convert data-URI images to Active Storage before rendering
+        input.gsub!(/(?<!\\)!\[([^\]]*)\]\[([^\]]+)\]/) do
           if (data_url = image_refs[$2])
             data_image_to_attachment(data_url, $1)
           else
@@ -29,24 +31,17 @@ module Collavre
           end
         end
 
-        # Inline data-URI images: ![alt](data:...)
-        html.gsub!(/(?<!\\)!\[([^\]]*)\]\((data:image\/[^)]+)\)/) do
+        input.gsub!(/(?<!\\)!\[([^\]]*)\]\((data:image\/[^)]+)\)/) do
           data_image_to_attachment($2, $1)
         end
 
-        # Inline links: [text](url)
-        html.gsub!(/(?<!\\)\[([^\]]+)\]\(([^)]+)\)/) do
-          "<a href=\"#{$2}\">#{$1}</a>"
-        end
-
-        # Bold: **text** or __text__
-        html.gsub!(/(?<!\\)(\*\*|__)(.+?)\1/m) do
-          "<strong>#{$2}</strong>"
-        end
+        # Render with commonmarker (GFM extensions: table, strikethrough, autolink, tasklist, tagfilter)
+        html = Commonmarker.to_html(input, options: {
+          parse: { smart: true },
+          render: { unsafe: true },
+          extension: { table: true, strikethrough: true, autolink: true, tasklist: true, tagfilter: true }
+        })
 
-        # Unescape backslash-escaped chars
-        html.gsub!(/\\([\\*_\[\]()!#~+\-])/, '\\1')
-        html.gsub!(/\\\\/, "\\")
         html.strip!
         html
       end
@@ -92,7 +87,7 @@ module Collavre
               token = "__IMG#{index}__"; index += 1
               placeholders[token] = "![#{alt_text}](data:#{blob.content_type};base64,#{data})"
               token
-            rescue
+            rescue StandardError
               match
             end
           else

data/app/services/collavre/mcp_service.rb

@@ -39,7 +39,7 @@ module Collavre
             result: result
           }
         )
-      rescue => e
+      rescue StandardError => e
         Rails.logger.error("Failed to log tool activity: #{e.message}")
       end
 
@@ -48,14 +48,14 @@ module Collavre
         before_call: before_call,
         after_call: after_call
       )
-      puts("Registered tool: #{result}")
+      Rails.logger.info("Registered tool: #{result}")
 
       if result[:error]
         error_msg = "Failed to register tool: #{result[:error]}"
         Rails.logger.error(error_msg)
         raise error_msg
       end
-    rescue => e
+    rescue StandardError => e
       Rails.logger.error("Failed to register tool from source: #{e.message}")
       raise e
     end
@@ -131,7 +131,7 @@ module Collavre
       if result[:error]
         Rails.logger.error("Failed to delete tool #{tool_name}: #{result[:error]}")
       end
-    rescue => e
+    rescue StandardError => e
       Rails.logger.error("Failed to delete tool #{tool_name}: #{e.message}")
     end
 

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

@@ -59,8 +59,8 @@ module Collavre
         return unless creative_id && context&.key?("topic")
 
         topic_id = context.dig("topic", "id")
-        scope = Comment
-          .where(creative_id: creative_id, topic_id: topic_id, private: false)
+        scope = Comment.public_only
+          .where(creative_id: creative_id, topic_id: topic_id)
           .where.not(user_id: [ task.agent_id, nil ])
           .order(created_at: :desc)
         latest_comment = scope.first

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

@@ -99,7 +99,11 @@ module Collavre
         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!
+        result = Creatives::DestroyService.new(
+          creative: creative,
+          user: Current.user
+        ).call
+        return { error: "Failed to destroy creative", id: id } unless result
         { success: true, id: id, deleted: true }
       end
     end

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_name, description: "The topic name within the creative to post to. Use 'Main' for the main topic (topic_id = nil).", required: true
+    tool_param :topic_name, description: "The topic name within the creative to post to. Use 'Main' for the default main topic.", 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
@@ -73,12 +73,15 @@ module Tools
     private
 
     def resolve_topic_id(creative, topic_name)
-      return nil if topic_name.casecmp("main").zero?
+      origin = creative.effective_origin
+      if topic_name.casecmp(Creative::MAIN_TOPIC_NAME).zero?
+        origin.main_topic(fallback_user: Current.user).id
+      else
+        topic = Topic.find_by(name: topic_name, creative_id: origin.id)
+        return { error: "Topic '#{topic_name}' not found for this creative" } unless topic
 
-      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
+        topic.id
+      end
     end
   end
 end