collavre 0.5.0 → 0.7.0

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

@@ -72,11 +72,12 @@ module Collavre
           return delayed_decision(agent, :rate_limited, config)
         end
 
-        # Check 4: Topic concurrency limit (applies to Main topic with nil topic_id too)
+        # Check 4: Topic concurrency limit (scoped by creative to avoid cross-creative blocking)
         topic_max = @policy_resolver.topic_max_concurrent_jobs
         if topic_max && @context.key?("topic")
           topic_id = @context.dig("topic", "id")
-          if (Task.running_for_topic(topic_id).count + topic_immediate_count) >= topic_max
+          creative_id = @context.dig("creative", "id")
+          if (Task.running_for_topic(topic_id, creative_id).count + topic_immediate_count) >= topic_max
             return deferred_decision(agent, :topic_concurrency)
           end
         end

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

@@ -74,7 +74,7 @@ module Collavre
           end
 
           # Drain the queue for the topic so waiting tasks can execute
-          AgentOrchestrator.dequeue_next_for_topic(task.topic_id)
+          AgentOrchestrator.dequeue_next_for_topic(task.topic_id, task.creative_id)
         rescue StandardError => e
           Rails.logger.error("[StuckDetector] Auto-recovery failed for task #{task.id}: #{e.message}")
         end

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

@@ -6,6 +6,15 @@ module Collavre
       end
 
       def dispatch(event_name, context)
+        comment_id = context.dig("comment", "id")
+        comment_user_id = context.dig("comment", "user_id")
+        creative_id = context.dig("creative", "id")
+        Rails.logger.info(
+          "[SystemEvents::Dispatcher] event=#{event_name} " \
+          "comment_id=#{comment_id} comment_user_id=#{comment_user_id} " \
+          "creative_id=#{creative_id} " \
+          "caller=#{caller_locations(1, 5)&.map { |l| "#{File.basename(l.path)}:#{l.lineno}" }&.join(' <- ')}"
+        )
         # Delegate to AgentOrchestrator for unified routing/scheduling
         Orchestration::AgentOrchestrator.dispatch(event_name, context)
       end

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

@@ -5,6 +5,7 @@ module Tools
   class CreativeCreateService
     extend T::Sig
     extend ToolMeta
+    include DescriptionNormalizable
 
     tool_name "creative_create_service"
     tool_description "Create a new Creative (task/content block) in the hierarchical structure. Creatives function like tasks in a tree structure, with automatic progress calculation.\n\nUse this to:\n- Create new tasks under a parent Creative\n- Add sub-items to organize work\n- Build hierarchical project structures\n\nNote: The description field accepts HTML format for rich text content."
@@ -62,14 +63,6 @@ module Tools
 
     private
 
-    def normalize_description(desc)
-      return desc if desc.blank?
-      # If it already looks like HTML, return as-is
-      return desc if desc.strip.start_with?("<")
-      # Otherwise wrap in <p> tags
-      "<p>#{ERB::Util.html_escape(desc)}</p>"
-    end
-
     def handle_ordering(creative, before_id:, after_id:)
       return unless before_id.present? || after_id.present?
 

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

@@ -0,0 +1,46 @@
+module Collavre
+  require "sorbet-runtime"
+  require "rails_mcp_engine"
+
+  module Tools
+    class CreativeImportService
+      extend T::Sig
+      extend ToolMeta
+
+      tool_name "creative_import_service"
+      tool_description "Import a markdown document as a Creative tree structure using the built-in MarkdownImporter. " \
+                       "Headings (# through ######) become nested Creatives, preserving the hierarchy. " \
+                       "Bullet lists (-, *, +) become nested children with indent-based depth. " \
+                       "Tables, fenced code blocks, and inline images are also supported.\n\n" \
+                       "Example input:\n" \
+                       "```\n# Project Plan\n## Phase 1\n- Setup infrastructure\n- Configure CI\n## Phase 2\n- Build features\n```\n\n" \
+                       "This creates a tree under the specified parent Creative.\n\n" \
+                       "This tool requires approval before execution."
+
+      def self.requires_approval?
+        true
+      end
+
+      tool_param :markdown, description: "The markdown text to import. Headings and bullet lists define the tree structure.", required: true
+      tool_param :parent_id, description: "ID of the parent Creative to import under. The entire markdown tree will be created as children of this Creative.", required: true
+
+      sig { params(markdown: String, parent_id: Integer).returns(T::Hash[Symbol, T.untyped]) }
+      def call(markdown:, parent_id:)
+        raise "Current.user is required" unless Current.user
+
+        parent = Creative.find_by(id: parent_id)
+        return { error: "Parent Creative not found", id: parent_id } unless parent
+        return { error: "No write permission on parent Creative", id: parent_id } unless parent.has_permission?(Current.user, :write)
+
+        created = MarkdownImporter.import(markdown, parent: parent, user: Current.user)
+
+        {
+          success: true,
+          parent_id: parent_id,
+          created_count: created.size,
+          tree: created.map { |c| { id: c.id, description: c.description.to_s.truncate(100), parent_id: c.parent_id } }
+        }
+      end
+    end
+  end
+end

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

@@ -7,131 +7,192 @@ module Tools
     extend ToolMeta
 
     tool_name "creative_retrieval_service"
-    tool_description "Retrieve creatives by ID or query text. without query  or ID, it will return root creatives. Returns a list of matching creatives with their details, supporting both hierarchical tree and flat list formats.\n\nA Creative is a content block that functions like a task, organized in a tree structure similar to a to-do list. You can navigate the tree at any level as a structured document, with progress automatically calculated to show what’s been completed.\n\ne.g.\n- When user say creative or Test creative, it means \"Test\" creative and it's children as a writing page.\n- Summary of Test creative? - you need to search \"Test\" creatives with level 3 or more and find the title is \"Test\" or similar and make summary of that."
+    tool_description "Retrieve creatives by ID or query text. Without query or ID, it returns root creatives.\n\nA Creative is a content block that functions like a task, organized in a tree structure similar to a to-do list. You can navigate the tree at any level as a structured document, with progress automatically calculated to show what's been completed.\n\nDefault output is a compact markdown tree:\n<!-- format: [id] description (progress%) -->\n- [123] My Task (50%)\n  - [124] Subtask A (100%)\n  - [125] Subtask B (0%)\n\ne.g.\n- When user say creative or Test creative, it means \"Test\" creative and it's children as a writing page.\n- Summary of Test creative? - you need to search \"Test\" creatives with level 3 or more and find the title is \"Test\" or similar and make summary of that."
 
-    tool_param :id, description: "The ID of the creative to retrieve."
-    tool_param :query, description: "Text to search for in creative descriptions."
+    tool_param :id, description: "The ID of the creative to retrieve with its subtree."
+    tool_param :query, description: "Text to search for in creative descriptions and comments."
     tool_param :level, description: "Creative tree depth to return (default: 3).", required: false
-    tool_param :simple, description: "If true, returns a simplified flat list. If false (default), returns a tree structure with HTML.", required: false
-
-    sig { params(id: T.nilable(Integer), query: T.nilable(String), level: T.nilable(Integer), simple: T.nilable(T::Boolean)).returns(T::Array[T::Hash[Symbol, T.untyped]]) }
-    def call(id: nil, query: nil, level: 3, simple: false)
+    tool_param :tags, description: "Filter by tag names (comma-separated).", required: false
+    tool_param :progress_min, description: "Min progress filter (0.0-1.0).", required: false
+    tool_param :progress_max, description: "Max progress filter (0.0-1.0).", required: false
+    tool_param :updated_since, description: "ISO8601 timestamp - only items updated after this.", required: false
+    tool_param :include_comments, description: "Include recent comments per creative (default: false).", required: false
+    tool_param :format, description: "Response format: 'markdown' (default, compact tree) or 'json' (structured data with tags/dates).", required: false
+
+    sig do
+      params(
+        id: T.nilable(Integer),
+        query: T.nilable(String),
+        level: T.nilable(Integer),
+        tags: T.nilable(String),
+        progress_min: T.nilable(Float),
+        progress_max: T.nilable(Float),
+        updated_since: T.nilable(String),
+        include_comments: T.nilable(T::Boolean),
+        format: T.nilable(String)
+      ).returns(T.any(String, T::Array[T::Hash[Symbol, T.untyped]]))
+    end
+    def call(id: nil, query: nil, level: 3, tags: nil, progress_min: nil, progress_max: nil, updated_since: nil, include_comments: false, format: "markdown")
       level ||= 3
-      simple ||= false
+      format ||= "markdown"
+      include_comments ||= false
+
+      raise "Current.user is required" unless Current.user
 
-      # Ensure fresh permission cache for this tool execution
-      Current.creative_share_cache = nil if Current.respond_to?(:creative_share_cache=)
+      creatives = fetch_creatives(id: id, query: query)
+      creatives = apply_filters(creatives, tags: tags, progress_min: progress_min, progress_max: progress_max, updated_since: updated_since)
 
-      # Mock session and request setup
-      setup_mock_environment
+      # Search queries return a flat list — no subtree expansion needed
+      if query.present? && id.blank?
+        creatives.map do |c|
+          { id: c.id, description: Creatives::TreeFormatter.plain_description(c), progress: c.progress.to_f.round(2) }
+        end
+      elsif format == "json"
+        build_json_tree(creatives, depth: level, include_comments: include_comments)
+      else
+        formatter = Creatives::TreeFormatter.new(
+          max_depth: level - 1,
+          include_header: true,
+          include_comments: include_comments
+        )
+        formatter.format(creatives) + "\n"
+      end
+    end
 
-      controller = Collavre::CreativesController.new
-      setup_controller(controller)
+    private
 
+    def fetch_creatives(id:, query:)
       if id.present?
-        # Get the creative details (show)
-        show_result = dispatch_request(controller, :show, id: id, format: :json)
-        return show_result if show_result.is_a?(Array) && show_result.first[:error]
+        creative = Creative.find_by(id: id)
+        return [] unless creative && creative.has_permission?(Current.user, :read)
+        [ creative ]
+      elsif query.present?
+        search_creatives(query)
+      else
+        Creative.where(user: Current.user).roots.order(:sequence).to_a
+      end
+    end
 
-        # Get the children (index with id acts as parent filter)
-        index_result = dispatch_request(controller, :index, id: id, search: query, simple: simple, level: level, format: :json)
-        return index_result if index_result.is_a?(Array) && index_result.first[:error]
+    def search_creatives(query)
+      sanitized = Creative.sanitize_sql_like(query)
+      pattern = "%#{sanitized}%"
 
-        # Combine results
-        # show_result is expected to be a hash of the creative
-        # index_result is expected to be a list of children or simple list
+      # Scope search to user's own + shared creatives via permission cache
+      accessible_ids = accessible_creative_ids
 
-        # Parse show result
-        creative_details = JSON.parse(show_result[:body], symbolize_names: true)
+      desc_ids = Creative.where(id: accessible_ids)
+                         .where("description LIKE ?", pattern)
+                         .pluck(:id)
 
-        # Parse index result
-        children_data = JSON.parse(index_result[:body], symbolize_names: true)
-        filtered_children = filter_result(children_data)
+      comment_ids = Comment.where(creative_id: accessible_ids)
+                           .where("content LIKE ?", pattern)
+                           .pluck(:creative_id)
 
-        # Merge
-        # We construct a tree node for the parent, with the children attached
-        parent_node = filter_tree([ creative_details ]).first
-        parent_node[:children] = filtered_children
+      combined_ids = (desc_ids | comment_ids)
+      return [] if combined_ids.empty?
 
-        [ parent_node ]
-      else
-        # Normal index call
-        result = dispatch_request(controller, :index, search: query, simple: simple, level: level, format: :json)
-
-        if result[:status] == 200
-           parsed = JSON.parse(result[:body], symbolize_names: true)
-           filter_result(parsed)
-        else
-           [ { error: "Controller returned status #{result[:status]}", body: result[:body] } ]
-        end
-      end
+      Creative.where(id: combined_ids)
+              .sort_by { |c| c.description.to_s.length }
     end
 
-    private
+    def accessible_creative_ids
+      # User's own creatives + those shared via permission cache
+      own_ids = Creative.where(user: Current.user).pluck(:id)
+      shared_ids = CreativeSharesCache
+                     .where(user_id: Current.user.id)
+                     .where.not(permission: :no_access)
+                     .pluck(:creative_id)
+      own_ids | shared_ids
+    end
 
-    def setup_mock_environment
-      raise "Current.user is required" unless Current.user
-      unless Current.session
-        require "ostruct"
-        Current.session = OpenStruct.new(user: Current.user, persisted?: false)
+    def apply_filters(creatives, tags:, progress_min:, progress_max:, updated_since:)
+      result = creatives
+
+      if tags.present?
+        tag_names = tags.split(",").map(&:strip)
+        label_ids = Label.where(value: tag_names).pluck(:id)
+        tagged_ids = Tag.where(label_id: label_ids).pluck(:creative_id).to_set
+        # Batch: find which input creatives have tagged descendants (single query)
+        creative_ids = result.map(&:id)
+        ancestors_with_tagged = CreativeHierarchy
+          .where(ancestor_id: creative_ids)
+          .where(descendant_id: tagged_ids.to_a)
+          .pluck(:ancestor_id)
+          .to_set
+        result = result.select { |c| tagged_ids.include?(c.id) || ancestors_with_tagged.include?(c.id) }
       end
-    end
 
-    def setup_controller(controller)
-      # Stub cookies
-      controller.define_singleton_method(:cookies) do
-        @mock_cookies ||= begin
-          jar = OpenStruct.new
-          def jar.signed; self; end
-          def jar.encrypted; self; end
-          def jar.[](key); nil; end
-          def jar.delete(key); nil; end
-          jar
-        end
+      if progress_min.present?
+        result = result.select { |c| c.progress.to_f >= progress_min.to_f }
+      end
+
+      if progress_max.present?
+        result = result.select { |c| c.progress.to_f <= progress_max.to_f }
+      end
+
+      if updated_since.present?
+        since = Time.parse(updated_since)
+        # Batch check: get all descendant IDs with updates, then filter
+        creative_ids = result.map(&:id)
+        updated_descendant_ancestors = CreativeHierarchy
+          .where(ancestor_id: creative_ids)
+          .joins("INNER JOIN creatives ON creatives.id = creative_hierarchies.descendant_id")
+          .where("creatives.updated_at >= ?", since)
+          .pluck(:ancestor_id)
+          .to_set
+
+        result = result.select { |c| c.updated_at >= since || updated_descendant_ancestors.include?(c.id) }
       end
-    end
 
-    def dispatch_request(controller, action, params)
-      env = Rack::MockRequest.env_for(
-        "/creatives",
-        method: "GET",
-        params: params.compact,
-        "HTTP_X_ORIGIN_SECRET" => ENV["ORIGIN_SHARED_SECRET"] # Internal call
-      )
-      controller.request = ActionDispatch::Request.new(env)
-      controller.response = ActionDispatch::Response.new
-      controller.process(action)
-
-      { status: controller.response.status, body: controller.response.body }
+      result
     end
 
-    def filter_result(result)
-      if result.is_a?(Array)
-        # Simple mode
-        result.map { |item| item.slice(:id, :description, :progress) }
-      elsif result.is_a?(Hash) && result[:creatives].is_a?(Array)
-        # Normal mode (Tree)
-        filter_tree(result[:creatives])
-      else
-        []
+    # --- JSON format ---
+
+    def build_json_tree(creatives, depth:, include_comments: false)
+      return [] if creatives.blank?
+
+      creatives.map do |creative|
+        serialize_creative(creative, depth: depth, current_depth: 1, include_comments: include_comments)
       end
     end
 
-    def filter_tree(nodes)
-      nodes.map do |node|
-        description = if node.dig(:templates, :description_html)
-          Rails::Html::FullSanitizer.new.sanitize(node.dig(:templates, :description_html))
-        else
-          node[:description]
+    def serialize_creative(creative, depth:, current_depth:, include_comments: false)
+      children = creative.linked_children
+
+      result = {
+        id: creative.id,
+        description: Creatives::TreeFormatter.plain_description(creative),
+        progress: creative.progress.to_f.round(2),
+        parent_id: creative.parent_id,
+        tags: creative.tags.includes(:label).map { |t| t.label&.value }.compact,
+        linked: creative.origin_id.present?,
+        origin_id: creative.origin_id,
+        has_children: children.any?,
+        children_count: children.size,
+        created_at: creative.created_at&.iso8601,
+        updated_at: creative.updated_at&.iso8601
+      }
+
+      if include_comments
+        result[:recent_comments] = creative.comments.order(created_at: :desc).limit(3).map do |comment|
+          {
+            content: ActionView::Base.full_sanitizer.sanitize(comment.content).strip.truncate(200),
+            user: comment.user&.display_name || comment.user&.name,
+            created_at: comment.created_at&.iso8601
+          }
         end
+      end
 
-        {
-          id: node[:id],
-          description: description&.strip,
-          progress: node.dig(:inline_editor_payload, :progress) || node[:progress],
-          children: node.dig(:children_container, :nodes) ? filter_tree(node.dig(:children_container, :nodes)) : []
-        }
+      if current_depth < depth
+        result[:children] = children.map do |child|
+          serialize_creative(child, depth: depth, current_depth: current_depth + 1, include_comments: include_comments)
+        end
+      else
+        result[:children] = []
       end
+
+      result
     end
   end
 end

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

@@ -5,6 +5,7 @@ module Tools
   class CreativeUpdateService
     extend T::Sig
     extend ToolMeta
+    include DescriptionNormalizable
 
     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- 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."
@@ -108,14 +109,6 @@ module Tools
     end
 
     private
-
-    def normalize_description(desc)
-      return desc if desc.blank?
-      # If it already looks like HTML, return as-is
-      return desc if desc.strip.start_with?("<")
-      # Otherwise wrap in <p> tags
-      "<p>#{ERB::Util.html_escape(desc)}</p>"
-    end
   end
 end
 end

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

@@ -23,7 +23,7 @@ module Tools
         unless creative.has_permission?(Current.user, :read)
           return { error: "No read permission on this Creative", id: creative_id }
         end
-        tasks = tasks.where("key LIKE ?", "cron_#{creative_id}_%")
+        tasks = tasks.where("key LIKE ?", "cron_#{creative_id.to_i}_%")
       end
 
       results = tasks.filter_map do |task|

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

@@ -0,0 +1,16 @@
+module Collavre
+  module Tools
+    module DescriptionNormalizable
+      private
+
+      def normalize_description(desc)
+        return desc if desc.blank?
+        stripped = desc.strip
+        # If it already looks like HTML, return as-is
+        return stripped if stripped.start_with?("<")
+        # Otherwise wrap in <p> tags
+        "<p>#{ERB::Util.html_escape(stripped)}</p>"
+      end
+    end
+  end
+end

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

@@ -57,26 +57,43 @@
         <%= 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') %>">
+        <button class="review-comment-btn" data-action="click->comment#reviewClick" data-comment-id="<%= comment.id %>" title="<%= t('collavre.comments.review_button') %>" data-hint-text="<%= t('collavre.comments.review_select_hint') %>">
           <%= 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>
-      <button class="delete-comment-btn comment-delete-hidden" data-comment-target="deleteButton" data-comment-id="<%= comment.id %>" title="<%= t('collavre.comments.delete') %>">
-        <%= 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>
+  <div class="comment-content" data-comment-target="content"><%= comment.content %></div>
+  <% if comment.comment_versions.any? %>
+    <% version_count = comment.comment_versions.size %>
+    <% selected_id = comment.selected_version_id %>
+    <% version_ids = comment.comment_versions.order(:version_number).pluck(:id) %>
+    <% selected_index = selected_id ? (version_ids.index(selected_id)&.+(1) || version_count) : version_count %>
+    <div class="comment-version-navigator"
+         data-controller="comment-version"
+         data-comment-version-comment-id-value="<%= comment.id %>"
+         data-comment-version-creative-id-value="<%= comment.creative_id %>"
+         data-comment-version-versions-url-value="<%= collavre.creative_comment_versions_path(comment.creative, comment) %>"
+         data-comment-version-total-value="<%= version_count %>"
+         data-comment-version-initial-index-value="<%= selected_index %>"
+         data-comment-version-selected-version-id-value="<%= selected_id %>"
+         data-comment-version-content-target-value="<%= dom_id(comment) %>">
+      <button class="comment-version-btn" data-action="click->comment-version#prev" data-comment-version-target="prevBtn" title="<%= t('collavre.comments.versions.previous') %>">◀</button>
+      <span class="comment-version-indicator" data-comment-version-target="indicator">
+        v<%= selected_index %>/<%= version_count %>
+      </span>
+      <button class="comment-version-btn" data-action="click->comment-version#next" data-comment-version-target="nextBtn" title="<%= t('collavre.comments.versions.next') %>">▶</button>
+      <button class="comment-version-select-btn" data-action="click->comment-version#selectVersion" data-comment-version-target="selectBtn" title="<%= t('collavre.comments.versions.select') %>" disabled>✓ <%= t('collavre.comments.versions.select') %></button>
+      <button class="comment-version-delete-btn" data-action="click->comment-version#deleteVersion" data-comment-version-target="deleteBtn" data-confirm-message="<%= t('collavre.comments.versions.delete_confirm') %>" title="<%= t('collavre.comments.versions.delete') %>" disabled>✕</button>
+    </div>
+  <% end %>
 
 
   <% if comment.images.attached? %>

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

@@ -2,7 +2,7 @@
 <% fullscreen = local_assigns.fetch(:fullscreen, false) %>
 <% auto_fullscreen = local_assigns.fetch(:auto_fullscreen, false) %>
 <% creative = local_assigns[:creative] %>
-<div id="comments-popup" data-controller="comments--popup comments--list comments--form comments--presence comments--mention-menu comments--topics" class="popup-box"
+<div id="comments-popup" data-controller="comments--popup comments--list comments--form comments--presence comments--mention-menu comments--topics comments--contexts share-modal" class="popup-box"
      data-fullscreen="<%= fullscreen %>"
      <% if auto_fullscreen %>data-auto-fullscreen="true"<% end %>
      data-fullscreen-label="<%= t('collavre.comments.fullscreen', default: 'Full screen') %>"
@@ -29,16 +29,38 @@
      data-voice-stop-text="<%= t('collavre.comments.voice_stop') %>"
      data-move-no-selection-text="<%= t('collavre.comments.move_no_selection') %>"
      data-move-error-text="<%= t('collavre.comments.move_error') %>"
-     data-hint-drag-topic-text="<%= t('collavre.comments.hint_drag_topic') %>"
-     data-hint-move-button-text="<%= t('collavre.comments.hint_move_button') %>"
+     data-selection-count-text="<%= t('collavre.comments.selection_count') %>"
+     data-selection-delete-text="<%= t('collavre.comments.selection_delete') %>"
+     data-selection-move-text="<%= t('collavre.comments.selection_move') %>"
+     data-selection-topic-move-text="<%= t('collavre.comments.selection_topic_move') %>"
+     data-selection-close-text="<%= t('collavre.comments.selection_close') %>"
+     data-selection-drag-hint-text="<%= t('collavre.comments.selection_drag_hint') %>"
+     data-batch-delete-confirm-text="<%= t('collavre.comments.batch_delete_confirm') %>"
+     data-topic-search-placeholder-text="<%= t('collavre.comments.topic_search_placeholder') %>"
+     data-topic-main-text="<%= t('collavre.comments.topic_main') %>"
      data-add-participant-text="<%= t('collavre.comments.add_participant') %>"
-     data-review-button-text="<%= t('collavre.comments.review_button') %>">
+     data-review-button-text="<%= t('collavre.comments.review_button') %>"
+     data-review-feedback-placeholder="<%= t('collavre.comments.review_feedback_placeholder') %>"
+     data-review-summary-placeholder="<%= t('collavre.comments.review_summary_placeholder') %>"
+     data-review-add-quote="<%= t('collavre.comments.review_add_quote') %>"
+     data-review-send="<%= t('collavre.comments.review_send') %>"
+     data-review-send-question="<%= t('collavre.comments.review_send_question') %>"
+     data-review-type-review="💬"
+     data-review-type-question="❓"
+     data-review-type-review-label="<%= t('collavre.comments.review_type_review') %>"
+     data-review-type-question-label="<%= t('collavre.comments.review_type_question') %>">
   <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">
     <h3 id="comments-popup-title" data-comments--popup-target="title"><%= fullscreen && creative.present? ? creative.creative_snippet : t('collavre.comments.comments') %></h3>
     <span data-integration-badges class="integration-badges"></span>
     <div class="comments-popup-actions">
+      <button class="comments-popup-action context-toggle-btn"
+              data-comments--contexts-target="toggleButton"
+              data-action="click->comments--contexts#toggleVisibility"
+              type="button"
+              title="<%= t('collavre.contexts.toggle_label', default: 'Contexts') %>"
+              style="display:none;">🔗</button>
       <button class="comments-popup-action comments-popup-fullscreen"
               data-comments--popup-target="fullscreenButton"
               data-action="click->comments--popup#toggleFullscreen"
@@ -54,6 +76,11 @@
       <button id="close-comments-btn" data-comments--popup-target="closeButton" class="popup-close-btn" type="button">&times;</button>
     </div>
   </div>
+  <div id="comment-contexts" data-comments--contexts-target="list" class="comment-contexts-list" style="display:none;"
+       data-inherited-label="<%= t('collavre.contexts.inherited_label', default: 'Inherited from parent') %>"
+       data-self-context-label="<%= t('collavre.contexts.self_context_label', default: 'Current creative context') %>"
+       data-navigate-label="<%= t('collavre.contexts.navigate_label', default: 'Go to creative') %>"></div>
+  <div data-share-modal-target="container"></div>
   <div id="comment-participants" data-comments--presence-target="participants" data-comments--mention-menu-target="participants"></div>
   <div id="comment-topics" data-comments--topics-target="list" class="comment-topics-list"
        data-confirm-delete-text="<%= t('collavre.topics.delete_confirm') %>"
@@ -69,6 +96,7 @@
       <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>
+    <div class="review-quotes-container" data-comments--form-target="reviewQuotesContainer" style="display:none;"></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;" />
@@ -77,7 +105,6 @@
     <button class="creative-action-btn" id="attach-image-btn" data-comments--form-target="imageButton" type="button"><%= t('collavre.comments.image_button') %></button>
     <button class="creative-action-btn" id="voice-comments-btn" data-comments--form-target="voiceButton" type="button" data-voice-state="idle"><%= t('collavre.comments.voice_button') %></button>
     <button class="creative-action-btn" id="search-comments-btn" data-comments--form-target="searchButton" type="button"><%= t('collavre.comments.search_button') %></button>
-    <button class="creative-action-btn" id="move-comments-btn" data-comments--form-target="moveButton" type="button" disabled><%= t('collavre.comments.move_button') %></button>
     <button class="creative-action-btn" id="cancel-edit-btn" data-comments--form-target="cancel" type="button" style="display:none;"><%= t('app.cancel') %></button>
     <button class="creative-action-btn" type="submit" data-comments--form-target="submit"><%= svg_tag 'send.svg', class: 'send-icon' %></button>
     </div>

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

@@ -27,6 +27,9 @@
                  data-children-alert-message="<%= t('collavre.creatives.index.progress_complete_children_alert') %>">
           <span id="inline-progress-value"><%= t('collavre.creatives.index.progress_incomplete') %></span>
         </label>
+        <button type="button" id="inline-metadata-btn" class="creative-action-btn" title="<%= t('collavre.creatives.index.metadata_tooltip') %>" style="margin-left:0.5em;font-family:monospace;font-size:0.9em;">
+          { }
+        </button>
       </div>
       <div style="margin-top:0.5em;">
         <button type="button" id="inline-move-up" class="creative-action-btn" title="<%= t('collavre.creatives.index.inline_move_up_tooltip') %>">
@@ -91,6 +94,16 @@
       </div>
       <button type="button" id="inline-recommend-parent" class="creative-action-btn" style="margin-top:0.5em;" title="<%= t('collavre.creatives.index.recommend_parent') %>">✨<%= t('collavre.creatives.index.recommend_parent') %></button>
       <select id="parent-suggestions" size="5" style="display:none;margin-top:0.5em;width:100%;"></select>
+      <div id="metadata-popup" style="display:none;" class="metadata-popup">
+        <div class="metadata-popup-header">
+          <span><%= t('collavre.creatives.index.metadata_title') %></span>
+          <button type="button" id="metadata-popup-close">&times;</button>
+        </div>
+        <textarea id="metadata-yaml-editor" rows="12"></textarea>
+        <button type="button" id="metadata-save-btn" class="creative-action-btn">
+          <%= t('collavre.creatives.index.metadata_save') %>
+        </button>
+      </div>
     </div>
   </form>
 </div>

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

@@ -1,3 +1,6 @@
-<button id="share-creative-btn" class="btn btn-primary desktop-only">
+<% current_creative = @parent_creative || @creative %>
+<button id="share-creative-btn" class="btn btn-primary desktop-only"
+        data-action="click->share-modal#open"
+        data-share-modal-url-param="<%= collavre.creative_creative_shares_path(current_creative) %>">
   <span aria-hidden="true"><%= svg_tag 'share.svg', class: 'icon-up', width: 22, height: 20 %></span>
 </button>