collavre 0.1.1 → 0.2.0

data/app/services/collavre/google_calendar_service.rb

@@ -2,6 +2,8 @@ module Collavre
   require "google/apis/calendar_v3"
   require "googleauth"
 
+  class GoogleCalendarError < StandardError; end
+
   class GoogleCalendarService
     def initialize(user:)
       @user = user
@@ -13,7 +15,7 @@ module Collavre
     # Creates a Google Calendar event.
     # Optional params supported: location, recurrence (array), attendees (array of emails or attendee hashes),
     # reminders (hash: { use_default: true/false, overrides: [{ method: 'email'|'popup', minutes: Integer }, ...] })
-    def create_event(
+    def create_google_event(
       calendar_id: "primary",
       start_time:,
       end_time:,
@@ -24,8 +26,7 @@ module Collavre
       recurrence: nil,
       attendees: nil,
       reminders: nil,
-      all_day: false,
-      creative: nil
+      all_day: false
     )
       timezone ||= @user.timezone || Time.zone.tzinfo.name
       event_args = { summary: summary, description: description }
@@ -74,17 +75,7 @@ module Collavre
         @user.calendar_id ||= create_app_calendar
         calendar_id = @user.calendar_id
       end
-      result = @service.insert_event(calendar_id, event)
-      CalendarEvent.create!(
-        user: @user,
-        creative: creative,
-        google_event_id: result.id,
-        summary: result.summary,
-        start_time: result.start.date_time || result.start.date,
-        end_time: result.end.date_time || result.end.date,
-        html_link: result.html_link
-      )
-      result
+      @service.insert_event(calendar_id, event)
     rescue Google::Apis::ClientError => e
       # Surface helpful error info to aid debugging 400 errors
       Rails.logger.error("Google Calendar insert_event 4xx: #{e.class} #{e.status_code} - #{e.message} body=#{e.body}")
@@ -109,14 +100,46 @@ module Collavre
     private
 
     def user_credentials
+      token = refresh_token
+      raise GoogleCalendarError, I18n.t("collavre.google_calendar.errors.not_connected") if token.blank?
+
       Google::Auth::UserRefreshCredentials.new(
         client_id:     ENV["GOOGLE_CLIENT_ID"] || Rails.application.credentials.dig(:google, :client_id),
         client_secret: ENV["GOOGLE_CLIENT_SECRET"] || Rails.application.credentials.dig(:google, :client_secret),
         scope:         [ Google::Apis::CalendarV3::AUTH_CALENDAR_APP_CREATED ],
-        refresh_token: @user.google_refresh_token
+        refresh_token: token
       ).tap(&:fetch_access_token!)
     end
 
+    def refresh_token
+      raw_value = raw_google_refresh_token
+      return nil if raw_value.blank?
+
+      # If already encrypted (JSON format with "p":), decrypt normally
+      if encrypted_value?(raw_value)
+        @user.google_refresh_token
+      else
+        # Legacy unencrypted token - re-encrypt and return
+        @user.update!(google_refresh_token: raw_value)
+        raw_value
+      end
+    rescue ActiveSupport::MessageEncryptor::InvalidMessage, ActiveRecord::Encryption::Errors::Decryption
+      # Decryption failed - token may be corrupted or encrypted with different key
+      Rails.logger.error("Failed to decrypt google_refresh_token for user #{@user.id}")
+      nil
+    end
+
+    def raw_google_refresh_token
+      result = ActiveRecord::Base.connection.select_value(
+        "SELECT google_refresh_token FROM users WHERE id = #{@user.id}"
+      )
+      result
+    end
+
+    def encrypted_value?(value)
+      value.is_a?(String) && value.start_with?("{") && value.include?('"p":')
+    end
+
     def create_app_calendar
       calendar = @service.insert_calendar(Google::Apis::CalendarV3::Calendar.new(summary: @service.client_options.application_name))
       # save calendar id to user profile

data/app/services/collavre/markdown_importer.rb

@@ -1,5 +1,8 @@
 module Collavre
   class MarkdownImporter
+    # Matches horizontal rules: ---, ***, ___ (with optional spaces)
+    HORIZONTAL_RULE_REGEX = /^\s*([-*_])\s*\1\s*\1[\s\1]*$/
+
     def self.import(content, parent:, user:, create_root: false)
       lines = content.to_s.lines
       image_refs = {}
@@ -26,21 +29,51 @@ module Collavre
         end
       end
       stack = [ [ 0, root ] ]
-      current_fence = nil
       while i < lines.size
         line = lines[i]
-        if (fence_match = line.match(/^\s*(`{3,}|~{3,})/))
-          fence_marker = fence_match[1]
+
+        # Skip horizontal rules (---, ***, ___)
+        if line =~ HORIZONTAL_RULE_REGEX
+          i += 1
+          next
+        end
+
+        # Handle fenced code blocks (``` or ~~~)
+        if (fence_match = line.match(/^(\s*)(`{3,}|~{3,})(.*)$/))
+          fence_indent = fence_match[1]
+          fence_marker = fence_match[2]
           fence_char = fence_marker[0]
           fence_length = fence_marker.length
-          if current_fence.nil?
-            current_fence = { char: fence_char, length: fence_length }
-          elsif current_fence[:char] == fence_char && fence_length >= current_fence[:length]
-            current_fence = nil
+          fence_info = fence_match[3].strip # language info (e.g., "ruby", "javascript")
+
+          # Collect all lines until closing fence
+          code_lines = []
+          i += 1
+          while i < lines.size
+            close_line = lines[i]
+            # Check for closing fence (same char, at least same length)
+            if (close_match = close_line.match(/^\s*(`{3,}|~{3+})\s*$/))
+              close_marker = close_match[1]
+              if close_marker[0] == fence_char && close_marker.length >= fence_length
+                i += 1
+                break
+              end
+            end
+            code_lines << close_line
+            i += 1
           end
+
+          # Build code block HTML
+          code_content = code_lines.join
+          code_html = build_code_block_html(code_content, fence_info)
+
+          new_parent = stack.any? ? stack.last[1] : root
+          c = Creative.create(user: user, parent: new_parent, description: code_html)
+          created << c
+          next
         end
 
-        if current_fence.nil? && (table_data = parse_markdown_table(lines, i))
+        if (table_data = parse_markdown_table(lines, i))
           table_html = build_table_html(table_data, image_refs)
           new_parent = stack.any? ? stack.last[1] : root
           c = Creative.create(user: user, parent: new_parent, description: table_html)
@@ -78,6 +111,12 @@ module Collavre
       created
     end
 
+    def self.build_code_block_html(code_content, language = nil)
+      escaped_content = ERB::Util.html_escape(code_content)
+      lang_class = language.present? ? " class=\"language-#{ERB::Util.html_escape(language)}\"" : ""
+      "<pre><code#{lang_class}>#{escaped_content}</code></pre>"
+    end
+
     def self.parse_markdown_table(lines, index)
       return nil if index >= lines.length
       header_line = lines[index]

data/app/services/collavre/mcp_service.rb

@@ -74,16 +74,15 @@ module Collavre
       end
 
       # Check strict loading? No, simple where is fine.
-      dynamic_tools = McpTool.where(name: registered_names)
+      dynamic_tools = McpTool.where(name: registered_names).includes(:creative)
       dynamic_tool_names = dynamic_tools.pluck(:name).to_set
 
-      # If user is present, find their owned tools
-      user_owned_tool_names = if user
-                                dynamic_tools
-                                  .joins(:creative)
-                                  .where(creatives: { user_id: user.id })
-                                  .pluck(:name)
-                                  .to_set
+      # Build set of tool names the user has permission to run
+      # User needs write permission on the creative to run its tools
+      accessible_tool_names = if user
+                                dynamic_tools.select do |mcp_tool|
+                                  mcp_tool.creative&.has_permission?(user, :write)
+                                end.map(&:name).to_set
       else
                                 Set.new
       end
@@ -97,8 +96,8 @@ module Collavre
                  nil
         end
         if dynamic_tool_names.include?(name)
-          # It is a dynamic tool; user must own it.
-          user_owned_tool_names.include?(name)
+          # It is a dynamic tool; user must have write permission on its creative.
+          accessible_tool_names.include?(name)
         else
           # It is a system tool (not in McpTool database); allow it.
           true
@@ -112,6 +111,20 @@ module Collavre
       end
     end
 
+    # Fetch and filter available tools for the given user.
+    # Returns an array of tool hashes with :name, :description, :params keys.
+    def self.available_tools(user)
+      return [] unless defined?(RailsMcpEngine)
+
+      RailsMcpEngine::Engine.build_tools!
+      result = ::Tools::MetaToolService.new.call(action: "list", tool_name: nil, query: nil, arguments: nil)
+      tool_list = Array(result[:tools])
+      filter_tools(tool_list, user)
+    rescue StandardError => e
+      Rails.logger.error("Failed to load available tools: #{e.message}")
+      []
+    end
+
     def self.delete_tool(tool_name)
       result = ::Tools::MetaToolWriteService.new.delete_tool(tool_name)
 

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

@@ -6,6 +6,41 @@ module Collavre
         liquid_context = Collavre::SystemEvents::ContextBuilder.new(context).build
         liquid_context["event_name"] = event_name
 
+        # Priority 1: Mention-based routing (exclusive)
+        # If any user is mentioned, mention routing takes over exclusively.
+        # - Mentioned AI agent → route only to that agent
+        # - Mentioned non-AI user → route to nobody (no AI agents)
+        mentioned_result = find_mentioned_routing(liquid_context, context)
+        return mentioned_result unless mentioned_result.nil?
+
+        # Priority 2: Liquid expression routing (fallback, only when no mention)
+        route_by_liquid_expression(liquid_context, context)
+      end
+
+      private
+
+      # Returns Array of agents to route to, or nil if no mention was found.
+      # When a mention IS found, this is exclusive:
+      #   - AI agent mentioned → [agent] (if permitted)
+      #   - Non-AI user mentioned → [] (no AI agents should receive it)
+      def find_mentioned_routing(liquid_context, context)
+        mentioned_user_data = liquid_context.dig("chat", "mentioned_user")
+        return nil unless mentioned_user_data && mentioned_user_data["id"]
+
+        mentioned_user = User.find_by(id: mentioned_user_data["id"])
+        return nil unless mentioned_user
+
+        # Mention found — this is exclusive routing.
+        # If the mentioned user is not an AI agent, no AI agents should receive the message.
+        return [] unless mentioned_user.ai_user?
+
+        # Permission check for mentioned AI agent
+        return [] unless has_creative_permission?(mentioned_user, context)
+
+        [ mentioned_user ]
+      end
+
+      def route_by_liquid_expression(liquid_context, context)
         # Find all AI agents
         agents = User.where.not(llm_vendor: nil)
 
@@ -15,32 +50,7 @@ module Collavre
           next if agent.routing_expression.blank?
 
           # Permission Check
-          # If agent is not searchable, it must have feedback permission on the creative
-          unless agent.searchable?
-            creative_id = context.dig("creative", "id") || context.dig(:creative, :id)
-            if creative_id
-              creative = Creative.find_by(id: creative_id)
-              if creative
-                # Check for feedback permission (which implies read access)
-                # has_permission? checks for the specific permission or higher
-                unless creative.has_permission?(agent, :feedback)
-                  # Rails.logger.info "Agent #{agent.id} skipped: No feedback permission on Creative #{creative.id}"
-                  next
-                end
-              else
-                # If creative ID is present but not found, skip for safety
-                next
-              end
-            else
-              # If no creative context, we might skip or allow depending on policy.
-              # Assuming 'chat.creative' implies creative context is required for this check.
-              # If it's a global event without creative, maybe searchable check isn't needed?
-              # But the user said "must have feedback permission on the chat.creative".
-              # If there is no creative, we can't check permission, so we should probably skip to be safe
-              # unless it's a purely global event. But for now, let's skip.
-              next
-            end
-          end
+          next unless has_creative_permission?(agent, context)
 
           begin
             # Add 'agent' to context so they can refer to themselves
@@ -67,6 +77,20 @@ module Collavre
 
         matched_agents
       end
+
+      def has_creative_permission?(agent, context)
+        # Searchable agents can receive any routed message
+        return true if agent.searchable?
+
+        # Non-searchable agents must have feedback permission on the creative
+        creative_id = context.dig("creative", "id") || context.dig(:creative, :id)
+        return false unless creative_id
+
+        creative = Creative.find_by(id: creative_id)
+        return false unless creative
+
+        creative.has_permission?(agent, :feedback)
+      end
     end
   end
 end

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

@@ -0,0 +1,97 @@
+module Collavre
+require "sorbet-runtime"
+require "rails_mcp_engine"
+module Tools
+  class CreativeCreateService
+    extend T::Sig
+    extend ToolMeta
+
+    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."
+
+    tool_param :description, description: "The content/title of the Creative. Accepts HTML format (e.g., '<p>Task title</p>'). Plain text will be wrapped in <p> tags automatically.", required: true
+    tool_param :parent_id, description: "ID of the parent Creative. Required to create under a specific parent. If omitted, creates a root Creative.", required: false
+    tool_param :progress, description: "Initial progress value (0.0 to 1.0). Default is 0.", required: false
+    tool_param :after_id, description: "ID of a sibling Creative to insert after. Used for ordering.", required: false
+    tool_param :before_id, description: "ID of a sibling Creative to insert before. Used for ordering.", required: false
+
+    sig { params(description: String, parent_id: T.nilable(Integer), progress: T.nilable(Numeric), after_id: T.nilable(Integer), before_id: T.nilable(Integer)).returns(T::Hash[Symbol, T.untyped]) }
+    def call(description:, parent_id: nil, progress: nil, after_id: nil, before_id: nil)
+      raise "Current.user is required" unless Current.user
+
+      # Validate parent permission if specified
+      parent = nil
+      if parent_id.present?
+        parent = Creative.find_by(id: parent_id)
+        unless parent
+          return { error: "Parent Creative not found", id: parent_id }
+        end
+        unless parent.has_permission?(Current.user, :write)
+          return { error: "No write permission on parent Creative", id: parent_id }
+        end
+      end
+
+      # Normalize description - wrap plain text in <p> tags if needed
+      normalized_description = normalize_description(description)
+
+      # Build the creative
+      creative = Creative.new(
+        description: normalized_description,
+        parent: parent,
+        progress: progress || 0
+      )
+
+      # Set user based on parent or current user
+      creative.user = parent ? parent.user : Current.user
+
+      unless creative.save
+        return { error: "Failed to create Creative", details: creative.errors.full_messages }
+      end
+
+      # Handle ordering
+      handle_ordering(creative, before_id: before_id, after_id: after_id)
+
+      {
+        success: true,
+        id: creative.id,
+        description: creative.description,
+        parent_id: creative.parent_id,
+        progress: creative.progress
+      }
+    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
+
+    def handle_ordering(creative, before_id:, after_id:)
+      return unless before_id.present? || after_id.present?
+
+      siblings = creative.parent ? creative.parent.children.order(:sequence).to_a : Creative.roots.order(:sequence).to_a
+      siblings.reject! { |s| s.id == creative.id }
+
+      if before_id.present?
+        before_creative = Creative.find_by(id: before_id)
+        if before_creative && before_creative.parent_id == creative.parent_id
+          index = siblings.index { |s| s.id == before_creative.id } || 0
+          siblings.insert(index, creative)
+        end
+      elsif after_id.present?
+        after_creative = Creative.find_by(id: after_id)
+        if after_creative && after_creative.parent_id == creative.parent_id
+          index = siblings.index { |s| s.id == after_creative.id } || -1
+          siblings.insert(index + 1, creative)
+        end
+      end
+
+      siblings.each_with_index { |c, idx| c.update_column(:sequence, idx) }
+    end
+  end
+end
+end

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

@@ -0,0 +1,116 @@
+module Collavre
+require "sorbet-runtime"
+require "rails_mcp_engine"
+module Tools
+  class CreativeUpdateService
+    extend T::Sig
+    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_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 :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]) }
+    def call(id:, description: nil, progress: nil, parent_id: nil)
+      raise "Current.user is required" unless Current.user
+
+      creative = Creative.find_by(id: id)
+      unless creative
+        return { error: "Creative not found", id: id }
+      end
+
+      unless creative.has_permission?(Current.user, :write)
+        return { error: "No write permission on this Creative", id: id }
+      end
+
+      # Get the effective origin for updating content
+      base = creative.effective_origin
+      previous_progress = base.progress
+
+      updates = {}
+      parent_updates = {}
+
+      # Handle description update
+      if description.present?
+        updates[:description] = normalize_description(description)
+      end
+
+      # Handle progress update
+      if progress.present?
+        updates[:progress] = progress.to_f.clamp(0.0, 1.0)
+      end
+
+      # Handle parent change (on the creative itself, not base)
+      if parent_id.present? || parent_id == 0
+        new_parent_id = parent_id == 0 ? nil : parent_id
+
+        if new_parent_id.present?
+          new_parent = Creative.find_by(id: new_parent_id)
+          unless new_parent
+            return { error: "New parent Creative not found", parent_id: new_parent_id }
+          end
+          unless new_parent.has_permission?(Current.user, :write)
+            return { error: "No write permission on new parent Creative", parent_id: new_parent_id }
+          end
+          # Prevent circular reference
+          if new_parent.self_and_ancestors.include?(creative)
+            return { error: "Cannot move Creative under its own descendant", parent_id: new_parent_id }
+          end
+        end
+
+        parent_updates[:parent_id] = new_parent_id
+      end
+
+      # Apply updates
+      success = true
+
+      # Update parent on the creative (for linked creatives, parent is on the link, not origin)
+      if parent_updates.present?
+        success &&= creative.update(parent_updates)
+      end
+
+      # Update content on the base/origin
+      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
+      end
+
+      if success
+        creative.reload
+        base.reload
+        {
+          success: true,
+          id: creative.id,
+          description: base.description,
+          parent_id: creative.parent_id,
+          progress: base.progress
+        }
+      else
+        { error: "Failed to update Creative", details: creative.errors.full_messages + base.errors.full_messages }
+      end
+    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/views/collavre/comments/_comment.html.erb

@@ -34,10 +34,10 @@
       <%= render "collavre/comments/read_receipts", read_by_users: users_read, present_user_ids: present_user_ids unless comment.private? %>
     </span>
     <% if comment.private? %>
-      <span class="private-label">[<%= t('collavre.comments.private') %>]</span>
+      <span class="comment-status-label private-label">🔒 <%= t('collavre.comments.private') %></span>
     <% end %>
     <% if comment.action_executed_at.present? %>
-      <span class="comment-status-label approved-label">[<%= t('collavre.comments.approved_label') %>]</span>
+      <span class="comment-status-label approved-label">✅ <%= t('collavre.comments.approved_label') %></span>
     <% end %>
     <% can_convert_comment = comment.user == Current.user || comment.creative.has_permission?(Current.user, :admin) %>
   </div>

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

@@ -1,5 +1,14 @@
 
+<% fullscreen = local_assigns.fetch(: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"
+     data-fullscreen="<%= fullscreen %>"
+     data-fullscreen-url-template="<%= collavre.fullscreen_creative_comments_path(creative_id: "__CREATIVE_ID__") %>"
+     <% if fullscreen && creative.present? %>
+     data-creative-id="<%= creative.id %>"
+     data-creative-snippet="<%= creative.creative_snippet %>"
+     data-can-comment="<%= creative.has_permission?(Current.user, :feedback) %>"
+     <% end %>
      data-loading-text="<%= t('app.loading') %>"
      data-delete-confirm-text="<%= t("collavre.comments.delete_confirm") %>"
      data-update-comment-text="<%= t('collavre.comments.update_comment') %>"
@@ -15,23 +24,48 @@
      data-voice-start-text="<%= t('collavre.comments.voice_button') %>"
      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') %>">
-  <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>
-  <button id="close-comments-btn" data-comments--popup-target="closeButton" class="popup-close-btn">&times;</button>
-  <h3 id="comments-popup-title" data-comments--popup-target="title"><%= t('collavre.comments.comments') %></h3>
+     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') %>">
+  <% unless fullscreen %>
+    <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>
+  <% end %>
+  <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">
+      <% if fullscreen && creative.present? %>
+        <%= link_to collavre.creative_path(creative, open_comments: true),
+                    class: "comments-popup-action comments-popup-fullscreen",
+                    aria: { label: t("collavre.comments.exit_fullscreen", default: "Exit full screen") } do %>
+          <%= svg_tag "exit-fullscreen.svg", class: "comments-popup-action-icon" %>
+        <% end %>
+      <% else %>
+        <%= link_to "#",
+                    class: "comments-popup-action comments-popup-fullscreen",
+                    data: { "comments--popup-target": "fullscreenLink" },
+                    aria: { label: t("collavre.comments.fullscreen", default: "Full screen") } do %>
+          <%= svg_tag "fullscreen.svg", class: "comments-popup-action-icon" %>
+        <% end %>
+        <button id="close-comments-btn" data-comments--popup-target="closeButton" class="comments-popup-action comments-popup-close" type="button">&times;</button>
+      <% end %>
+    </div>
+  </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') %>"
        data-new-topic-placeholder="<%= t('collavre.topics.new_placeholder') %>"></div>
   <%= render UserMentionMenuComponent.new(menu_id: 'mention-menu') %>
+  <%= render CommandMenuComponent.new(menu_id: 'command-menu') %>
   <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;">
     <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;" />
-    <label style="height: 22px"><input type="checkbox" id="comment-private" data-comments--form-target="privateCheckbox" data-comments--presence-target="privateCheckbox" name="comment[private]" /> <%= t('collavre.comments.private') %></label>
+    <label style="height: 22px"><input type="hidden" name="comment[private]" value="0" /><input type="checkbox" id="comment-private" data-comments--form-target="privateCheckbox" data-comments--presence-target="privateCheckbox" name="comment[private]" value="1" /> <%= t('collavre.comments.private') %></label>
     <div class="comment-actions">
     <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>

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

@@ -0,0 +1,5 @@
+<% content_for :title, "#{@creative_snippet} - #{t('collavre.comments.comments')}" %>
+
+<div class="comments-fullscreen-page">
+  <%= render "collavre/comments/comments_popup", fullscreen: true, creative: @creative %>
+</div>

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

@@ -16,8 +16,17 @@
          data-placeholder="<%= t('collavre.creatives.inline_editor.placeholder') %>"></div>
     <div id="actions-inline-editor" style="padding: 0px 8px;">
       <div style="margin-top:0.5em;display:flex;align-items:center;gap:0.5em;">
-        <input type="range" id="inline-creative-progress" name="creative[progress]" min="0" max="1" step="0.01">
-        <span id="inline-progress-value">0%</span>
+        <input type="hidden" name="creative[progress]" value="0">
+        <label for="inline-creative-progress" style="display:flex;align-items:center;gap:0.4em;">
+          <input type="checkbox"
+                 id="inline-creative-progress"
+                 name="creative[progress]"
+                 value="1"
+                 data-complete-label="<%= t('collavre.creatives.index.progress_complete') %>"
+                 data-incomplete-label="<%= t('collavre.creatives.index.progress_incomplete') %>"
+                 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>
       </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') %>">
@@ -86,4 +95,3 @@
   </form>
 </div>
 
-