collavre 0.22.0 → 0.23.0

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

@@ -32,6 +32,7 @@ module Collavre
 
         stuck_items = []
         stuck_items.concat(detect_stuck_tasks(config))
+        stuck_items.concat(detect_orphaned_queued_tasks(config))
         stuck_items.concat(detect_stalled_creatives(config))
 
         auto_recover_stuck_tasks(stuck_items)
@@ -47,54 +48,124 @@ module Collavre
 
         stuck_items = []
         stuck_items.concat(detect_stuck_tasks(config))
+        stuck_items.concat(detect_orphaned_queued_tasks(config))
         stuck_items.concat(detect_stalled_creatives(config))
         stuck_items
       end
 
       private
 
-      # Auto-recover stuck tasks by marking them as failed and draining the queue.
+      # Auto-recover stuck items: fail-and-drain for live tasks, self-heal for
+      # orphaned queued waiters.
       def auto_recover_stuck_tasks(stuck_items)
         stuck_items.each do |stuck_item|
-          next unless stuck_item.type == :task
+          case stuck_item.type
+          when :task          then recover_stuck_task(stuck_item)
+          when :queued_orphan then recover_orphaned_queued_task(stuck_item)
+          end
+        end
+      end
 
-          task = stuck_item.item
-          next unless %w[running delegated].include?(task.status)
+      # Self-heal an orphaned queued waiter: its blocker is gone but it was never
+      # drained (missed dequeue / enqueue-vs-terminate TOCTOU race / lost
+      # cross-process broadcast). Re-check liveness atomically, then drain.
+      def recover_orphaned_queued_task(stuck_item)
+        task = stuck_item.item.reload
+        return unless task.status == "queued"
+
+        # If the topic is back at capacity since detection, the normal terminal
+        # callback will drain the queue when a slot frees — leave it alone. This
+        # check also bounds promotions across one detection cycle: dequeue moves
+        # a waiter queued -> pending synchronously, which occupying_topic_slot
+        # counts, so consecutive orphans each fill exactly one free slot until the
+        # topic is full. With topic_max_concurrent_jobs > 1 and several free slots
+        # all are filled this cycle; a per-topic dedupe would instead leave every
+        # waiter past the first orphaned until the next run.
+        return if topic_at_capacity?(task)
+
+        Rails.logger.info(
+          "[StuckDetector] Self-healing orphaned queued task #{task.id} " \
+          "(topic=#{task.topic_id}, creative=#{task.creative_id}): no live blocker, draining queue"
+        )
+        AgentOrchestrator.dequeue_next_for_topic(task.topic_id, task.creative_id)
+      rescue StandardError => e
+        Rails.logger.error("[StuckDetector] Self-heal failed for queued task #{stuck_item.item.id}: #{e.message}")
+      end
 
-          task.update!(status: "failed")
-          Rails.logger.info(
-            "[StuckDetector] Auto-recovered task #{task.id} (agent=#{task.agent_id}): " \
-            "marked as failed after #{((Time.current - stuck_item.stuck_since) / 60).round} minutes"
-          )
+      # Whether a topic holds no free concurrency slot for a queued waiter.
+      # Compares occupied slots against topic_max (the scheduler's admission rule)
+      # rather than treating any single live blocker as full capacity — otherwise,
+      # with topic_max_concurrent_jobs > 1, a missed dequeue would leave the waiter
+      # suppressed until the *last* blocker terminates instead of the moment a slot
+      # frees up. Occupancy counts pending as well as running/delegated: a waiter
+      # that a prior dequeue already claimed sits in "pending" until its AiAgentJob
+      # starts, and the detector fires precisely on the backed-up condition where
+      # that window is wide — counting only running/delegated would see a free slot
+      # and promote a second waiter into a slot that is already claimed (double
+      # dequeue). This is intentionally stricter than the scheduler's reactive
+      # check; being stricter can only suppress recovery, never over-admit. When no
+      # topic limit is configured the scheduler never defers, so fall back to the
+      # conservative "any occupied slot" check.
+      def topic_at_capacity?(task)
+        topic_max = scheduling_resolver_for(task).topic_max_concurrent_jobs
+        occupied_count = Task.occupying_topic_slot(task.topic_id, task.creative_id).count
+        return occupied_count.positive? unless topic_max
+
+        occupied_count >= topic_max
+      end
 
-          # Release resources held by the stuck task
-          if task.agent
-            tracker = ResourceTracker.for(task.agent)
-            tracker.release!(task.id)
-          end
+      # Resolve scheduling policy against the queued task's own topic/creative
+      # context — the same context the scheduler used to admit it. The detector's
+      # default resolver is built with an empty context (it only needs the global
+      # stuck_detection policy), so reading topic_max_concurrent_jobs off it would
+      # see only the global default and ignore any topic-/creative-scoped override.
+      # That mismatch would violate a topic's serialization when its scoped limit
+      # is below the global value, or wrongly suppress recovery when it is above.
+      def scheduling_resolver_for(task)
+        context = {}
+        context["creative"] = { "id" => task.creative_id } if task.creative_id
+        context["topic"] = { "id" => task.topic_id } if task.topic_id
+        PolicyResolver.new(context)
+      end
 
-          # If this was a workflow subtask, fail the parent so the workflow
-          # advances instead of staying running with pending_creative_ids
-          # pointing at a child that's been failed underneath it.
-          if task.parent_task_id.present?
-            begin
-              Collavre::Comments::WorkflowExecutor.new(task.parent_task).fail_subtask!(
-                task,
-                error_message: "Auto-recovered: stuck for " \
-                               "#{((Time.current - stuck_item.stuck_since) / 60).round} minutes"
-              )
-            rescue StandardError => e
-              Rails.logger.error(
-                "[StuckDetector] fail_subtask! failed for task #{task.id}: #{e.message}"
-              )
-            end
-          end
+      # Fail a stuck running/delegated task and drain the topic queue.
+      def recover_stuck_task(stuck_item)
+        task = stuck_item.item
+        return unless %w[running delegated].include?(task.status)
+
+        task.update!(status: "failed")
+        Rails.logger.info(
+          "[StuckDetector] Auto-recovered task #{task.id} (agent=#{task.agent_id}): " \
+          "marked as failed after #{((Time.current - stuck_item.stuck_since) / 60).round} minutes"
+        )
 
-          # Drain the queue for the topic so waiting tasks can execute
-          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}")
+        # Release resources held by the stuck task
+        if task.agent
+          tracker = ResourceTracker.for(task.agent)
+          tracker.release!(task.id)
         end
+
+        # If this was a workflow subtask, fail the parent so the workflow
+        # advances instead of staying running with pending_creative_ids
+        # pointing at a child that's been failed underneath it.
+        if task.parent_task_id.present?
+          begin
+            Collavre::Comments::WorkflowExecutor.new(task.parent_task).fail_subtask!(
+              task,
+              error_message: "Auto-recovered: stuck for " \
+                             "#{((Time.current - stuck_item.stuck_since) / 60).round} minutes"
+            )
+          rescue StandardError => e
+            Rails.logger.error(
+              "[StuckDetector] fail_subtask! failed for task #{task.id}: #{e.message}"
+            )
+          end
+        end
+
+        # Drain the queue for the topic so waiting tasks can execute
+        AgentOrchestrator.dequeue_next_for_topic(task.topic_id, task.creative_id)
+      rescue StandardError => e
+        Rails.logger.error("[StuckDetector] Auto-recovery failed for task #{stuck_item.item.id}: #{e.message}")
       end
 
       def stuck_detection_config
@@ -129,6 +200,38 @@ module Collavre
         end
       end
 
+      # Detect orphaned queued waiters: tasks left in "queued" for a topic that
+      # holds no occupied slot (no running/delegated blocker and no pending claim).
+      # A queued task's only path to
+      # execution is dequeue_next_for_topic, which fires when the blocker reaches
+      # a terminal status. If that single hand-off is missed — an
+      # enqueue-vs-terminate TOCTOU race, or a lost cross-process broadcast — the
+      # blocker is already gone and nothing will ever wake the waiter: it shows
+      # "⏳" waiting notice forever. These are invisible to detect_stuck_tasks, which only
+      # scans running/delegated. There is no stop button to press here because the
+      # blocker no longer exists; the fix is to drain the queue (see
+      # recover_orphaned_queued_task), not to escalate.
+      def detect_orphaned_queued_tasks(config)
+        threshold_minutes = config["queued_orphan_threshold_minutes"] || 5
+        threshold_time = threshold_minutes.minutes.ago
+
+        Task.where(status: "queued")
+            .where("updated_at < ?", threshold_time)
+            .filter_map do |task|
+          # Only orphaned if the topic has a free slot. A waiter is legitimately
+          # queued while the topic is at capacity.
+          next if topic_at_capacity?(task)
+
+          StuckItem.new(
+            type: :queued_orphan,
+            item: task,
+            reason: :orphaned_waiter,
+            stuck_since: task.updated_at,
+            escalation_targets: []
+          )
+        end
+      end
+
       # Detect creatives that have stalled (no activity for extended period)
       def detect_stalled_creatives(config)
         threshold_minutes = config["creative_stall_threshold_minutes"] || 120
@@ -216,6 +319,10 @@ module Collavre
         escalated_count = 0
 
         stuck_items.each do |stuck_item|
+          # Orphaned queued waiters are silently self-healed (queue drained),
+          # not escalated to admins — there is no human action to take.
+          next if stuck_item.type == :queued_orphan
+
           escalated = escalate_item(stuck_item, config)
           if escalated
             mark_escalated(stuck_item)

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

@@ -18,9 +18,10 @@ module Collavre
       end
 
       tool_param :operations, description: "Array of operation objects. Each object must have an 'action' key.\n\n" \
-                 "For 'create': { action: 'create', parent_id: <int>, description: <string>, progress: <float>, after_id: <int>, before_id: <int> }\n" \
-                 "For 'update': { action: 'update', id: <int>, description: <string>, progress: 1.0, parent_id: <int> } — progress only accepts 1.0 (complete) and only on leaf Creatives\n" \
+                 "For 'create': { action: 'create', parent_id: <int>, description: <markdown string>, progress: <float>, after_id: <int>, before_id: <int> }\n" \
+                 "For 'update': { action: 'update', id: <int>, description: <markdown string>, progress: 1.0, parent_id: <int> } — progress only accepts 1.0 (complete) and only on leaf Creatives\n" \
                  "For 'delete': { action: 'delete', id: <int> }\n\n" \
+                 "The 'description' field is written as Markdown (GitHub-Flavored).\n" \
                  "Fields other than 'action' and 'id'/'parent_id' are optional.", required: true
 
       class BatchRollbackError < StandardError

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

@@ -5,12 +5,11 @@ 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."
+    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 is written as Markdown."
 
-    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 :description, description: "The content/title of the Creative, written in Markdown (GitHub-Flavored: headings, bold/italic, lists, links, tables, code blocks, task lists). A single newline is a line break. Plain text is stored as-is. Example: '# Title\\n\\n- item one\\n- item two'.", 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
@@ -32,15 +31,16 @@ module Tools
         end
       end
 
-      # Normalize description - wrap plain text in <p> tags if needed
-      normalized_description = normalize_description(description)
-
-      # Build the creative
+      # Build the creative. The description is authored as Markdown: store it as
+      # the canonical markdown_source and let Describable#convert_markdown_to_html
+      # render it to the HTML description (markdown_editor defaults to the
+      # advanced "source" surface for tool/MCP writes).
       creative = Creative.new(
-        description: normalized_description,
         parent: parent,
         progress: progress || 0
       )
+      creative.content_type_input = "markdown"
+      creative.markdown_source = description
 
       # Set user based on parent or current user
       creative.user = parent ? parent.user : Current.user

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

@@ -5,13 +5,12 @@ 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."
 
     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 :description, description: "New content/title for the Creative, written in Markdown (GitHub-Flavored: headings, bold/italic, lists, links, tables, code blocks, task lists). A single newline is a line break. Replaces the whole body. If omitted, the description remains unchanged.", required: false
     tool_param :progress, description: "Set to 1.0 to mark a leaf Creative as complete. Only 1.0 is allowed; partial progress and updates on parent Creatives are rejected.", required: false
     tool_param :parent_id, description: "New parent Creative ID to move this Creative under. If omitted, nil, or 0, the parent remains unchanged.", required: false
 
@@ -34,9 +33,22 @@ module Tools
       updates = {}
       parent_updates = {}
 
-      # Handle description update
-      if description.present?
-        updates[:description] = normalize_description(description)
+      # Handle description update. The description is authored as Markdown: set it
+      # as the canonical markdown_source on the base/origin and let
+      # Describable#convert_markdown_to_html render the HTML description on save.
+      #
+      # Force the "source" editing surface (like create does) rather than letting
+      # convert_markdown_to_html preserve a prior "rich" preference: this update
+      # replaces the whole body with fresh tool/MCP-authored GFM, so the old
+      # rich-authored content the preference belonged to is gone. Tool writes can
+      # contain tables/raw HTML the Lexical nodes don't fully model; reopening in
+      # the source textarea preserves that structure, whereas a rich-editor
+      # round-trip could silently rewrite it.
+      description_provided = description.present?
+      if description_provided
+        base.content_type_input = "markdown"
+        base.markdown_source = description
+        base.markdown_editor = "source"
       end
 
       # Handle progress update
@@ -89,9 +101,12 @@ module Tools
         success &&= creative.update(parent_updates)
       end
 
-      # Update content on the base/origin
-      if updates.present?
-        success &&= base.update(updates)
+      # Update content on the base/origin. markdown_source is set on `base`
+      # directly (above), so save it whenever a description was provided even if
+      # `updates` (progress) is empty.
+      if updates.present? || description_provided
+        base.assign_attributes(updates) if updates.present?
+        success &&= base.save
 
         # Note: progress updates are only allowed on leaf Creatives (validated above).
         # Parent progress is automatically calculated from children.

data/app/services/collavre/typo_corrector.rb

@@ -0,0 +1,188 @@
+module Collavre
+  # Server-side typo correction. Sends the text the user is typing to an LLM and
+  # returns a validated *structured edit list* — never a rewritten string. Each
+  # edit is {original, suggestion, reason, confidence}. Validation rejects anything
+  # that is not a small, in-place spelling fix (style rewrites, hallucinated spans,
+  # edits inside code/URLs/mentions), so the UI can trust every returned edit.
+  class TypoCorrector
+    AGENT_EMAIL = "typo-corrector@collavre.local"
+
+    # Reject "corrections" that are really rewrites: an edit is kept only when the
+    # original is short and the suggestion is within this edit distance of it.
+    MAX_ORIGINAL_LENGTH = 40
+    MIN_EDIT_DISTANCE_CAP = 2
+    EDIT_DISTANCE_RATIO = 0.4
+
+    FALLBACK_SYSTEM_PROMPT = <<~PROMPT.freeze
+      You are a typo correction engine. Fix only spelling mistakes and obvious typos,
+      never style, grammar or meaning, in any language. `original` must be an exact
+      substring of the input. Return ONLY JSON:
+      {"edits":[{"original":"x","suggestion":"y","reason":"spelling","confidence":0.0}]}
+    PROMPT
+
+    def initialize(client: nil)
+      @client = client
+    end
+
+    # Returns an Array of Hashes with string keys: "original", "suggestion",
+    # "reason", "confidence". Empty array on blank input or LLM/parse failure.
+    def correct(text)
+      text = text.to_s
+      return [] if text.strip.blank?
+
+      response = client.chat([
+        { role: :user, parts: [ { text: "Text:\n#{text}" } ] }
+      ])
+
+      edits = parse_response(response)
+      validate(edits, text)
+    end
+
+    private
+
+    def client
+      @client ||= build_client
+    end
+
+    def build_client
+      agent = Collavre.user_class.find_by(email: AGENT_EMAIL)
+      AiClient.new(
+        vendor: agent&.llm_vendor.presence || ENV.fetch("COLLAVRE_DEFAULT_LLM_VENDOR", "gemini"),
+        model: agent&.llm_model.presence || ENV.fetch("COLLAVRE_DEFAULT_LLM_MODEL", "gemini-3.1-flash-lite"),
+        system_prompt: agent&.system_prompt.presence || FALLBACK_SYSTEM_PROMPT,
+        llm_api_key: agent&.llm_api_key,
+        gateway_url: agent&.gateway_url,
+        # Vendor adapters (e.g. OpenClaw) resolve the gateway/key from the context
+        # user, not the llm_api_key/gateway_url kwargs. Pass the agent so an
+        # OpenClaw-backed typo agent isn't built with user: nil (which makes the
+        # adapter bail with "Gateway URL not configured" and silently return no edits).
+        context: { user: agent },
+        # Runs on debounced typing of *unsubmitted* text — never persist the draft
+        # to ActivityLog (RubyLlmInteractionLogger writes `messages` there).
+        log_interactions: false
+      )
+    end
+
+    def parse_response(content)
+      return [] if content.blank?
+
+      cleaned = content.gsub(/^```json\s*/, "").gsub(/\s*```$/, "").strip
+      parsed = JSON.parse(cleaned)
+      edits = parsed.is_a?(Hash) ? parsed["edits"] : parsed
+      edits.is_a?(Array) ? edits : []
+    rescue JSON::ParserError => e
+      # Never log the raw response: it can echo the user's unsubmitted draft,
+      # which would leak private text to application logs despite log_interactions: false.
+      Rails.logger.warn("[TypoCorrector] JSON parse error: #{e.message} (#{content.to_s.length} chars)")
+      []
+    end
+
+    def validate(edits, text)
+      skip_ranges = skip_ranges(text)
+      seen = {}
+
+      edits.filter_map do |edit|
+        next unless edit.is_a?(Hash)
+
+        original = edit["original"].to_s
+        suggestion = edit["suggestion"].to_s
+        next if original.empty? || suggestion.empty? || original == suggestion
+        next if original.length > MAX_ORIGINAL_LENGTH
+
+        # `original` must appear verbatim in the text, outside any skip region
+        # (code/URL/mention/markup). We return the offset of that first *valid*
+        # occurrence so the client anchors there — otherwise the client's own
+        # left-to-right search would bind to an earlier occurrence sitting inside
+        # a protected span and edit it (a markdown-canonical/code-safety hole).
+        offset = first_offset_outside_skip_ranges(text, original, skip_ranges)
+        next if offset.nil?
+
+        # Reject big rewrites — keep only minimal in-place fixes.
+        cap = [ MIN_EDIT_DISTANCE_CAP, (original.length * EDIT_DISTANCE_RATIO).ceil ].max
+        next if levenshtein(original, suggestion) > cap
+
+        key = [ original, suggestion ]
+        next if seen[key]
+        seen[key] = true
+
+        {
+          "original" => original,
+          "suggestion" => suggestion,
+          "reason" => edit["reason"].presence || "spelling",
+          "confidence" => clamp_confidence(edit["confidence"]),
+          # Emit the offset in UTF-16 code units, the coordinate space JS string
+          # indexing uses. A Ruby character index would be off by one per astral
+          # character (emoji, etc.) before the typo, so the client's substring
+          # check at `offset` would fail and fall back to indexOf — which can bind
+          # to a protected occurrence the server already excluded.
+          "offset" => utf16_offset(text, offset)
+        }
+      end
+    end
+
+    def clamp_confidence(value)
+      return 0.5 if value.nil?
+
+      Float(value).clamp(0.0, 1.0)
+    rescue ArgumentError, TypeError
+      0.5
+    end
+
+    # Character ranges that must never be edited: fenced code, inline code, URLs,
+    # @mentions, HTML tags, and markdown-canonical <span style> color fragments.
+    def skip_ranges(text)
+      ranges = []
+      patterns = [
+        /```.*?```/m,             # fenced code blocks
+        /`[^`]*`/,                # inline code
+        %r{https?://\S+},         # URLs
+        /@[^\s@]+/,               # @mentions
+        # `[^<>]` (not just `[^>]`) keeps this linear: a stray run of "<<<<" can't
+        # make scan re-walk the tail from every "<" (CodeQL polynomial-ReDoS).
+        /<[^<>]+>/                # HTML / span-style markup
+      ]
+      patterns.each do |pattern|
+        text.scan(pattern) { ranges << Regexp.last_match.offset(0) }
+      end
+      ranges
+    end
+
+    # First character offset where `needle` occurs entirely outside every skip
+    # range, or nil if every occurrence overlaps a protected span.
+    def first_offset_outside_skip_ranges(text, needle, skip_ranges)
+      pos = 0
+      while (idx = text.index(needle, pos))
+        finish = idx + needle.length
+        inside = skip_ranges.any? { |(s, e)| idx < e && finish > s }
+        return idx unless inside
+
+        pos = idx + 1
+      end
+      nil
+    end
+
+    # Convert a Ruby character index into a UTF-16 code-unit offset (JS string
+    # coordinates). Characters outside the BMP count as two code units in JS.
+    def utf16_offset(text, char_index)
+      text[0, char_index].to_s.encode("UTF-16LE").bytesize / 2
+    rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
+      char_index
+    end
+
+    # Iterative Levenshtein distance.
+    def levenshtein(a, b)
+      a = a.chars
+      b = b.chars
+      prev = (0..b.length).to_a
+      a.each_with_index do |ac, i|
+        curr = [ i + 1 ]
+        b.each_with_index do |bc, j|
+          cost = ac == bc ? 0 : 1
+          curr << [ curr[j] + 1, prev[j + 1] + 1, prev[j] + cost ].min
+        end
+        prev = curr
+      end
+      prev.last
+    end
+  end
+end

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

@@ -49,6 +49,11 @@
         <button class="comment-stop-btn" type="button" data-action="click->comment#cancelTask" data-task-id="<%= comment.task_id %>" title="<%= t('collavre.comments.stop_agent') %>">
           <span class="agent-stop-icon">&#x25A0;</span> <%= t('collavre.comments.stop_agent') %>
         </button>
+      <% elsif comment.waiting_notice? && (blocking_task = comment.topic_blocking_task) %>
+        <%# Stop the in-progress blocker so the deferred waiter can proceed (stuck recovery). %>
+        <button class="comment-stop-btn" type="button" data-action="click->comment#cancelTask" data-task-id="<%= blocking_task.id %>" title="<%= t('collavre.comments.stop_blocking_agent') %>">
+          <span class="agent-stop-icon">&#x25A0;</span> <%= t('collavre.comments.stop_blocking_agent') %>
+        </button>
       <% end %>
       <button class="add-reaction-btn" type="button" data-action="click->comment#triggerReactionPicker" title="<%= t('collavre.comments.add_reaction') %>">
         <span class="grayscale-emoji">☺</span>

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

@@ -61,7 +61,20 @@
      data-remove-from-history-label="<%= t('collavre.comments.remove_from_history') %>"
      data-inbox-reply-button="<%= t('collavre.comments.inbox_reply_button') %>"
      data-table-download-csv-text="<%= t('collavre.comments.table_download.csv') %>"
-     data-table-download-excel-text="<%= t('collavre.comments.table_download.excel') %>">
+     data-table-download-excel-text="<%= t('collavre.comments.table_download.excel') %>"
+     <% if Current.user %>
+     data-typo-enabled="<%= Current.user.typo_correction_enabled %>"
+     data-typo-threshold="<%= Current.user.typo_correction_threshold %>"
+     data-typo-on-voice="<%= Current.user.typo_correction_on_voice %>"
+     data-typo-on-soft-keyboard="<%= Current.user.typo_correction_on_soft_keyboard %>"
+     data-typo-on-physical-keyboard="<%= Current.user.typo_correction_on_physical_keyboard %>"
+     data-typo-in-chat="<%= Current.user.typo_correction_in_chat %>"
+     data-typo-in-editor="<%= Current.user.typo_correction_in_editor %>"
+     data-typo-endpoint="<%= collavre.typo_corrections_path %>"
+     data-typo-keep-label="<%= t('collavre.comments.typo_keep_label') %>"
+     data-typo-custom-label="<%= t('collavre.comments.typo_custom_label') %>"
+     data-typo-input-label="<%= t('collavre.comments.typo_input_label') %>"
+     <% end %>>
   <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" data-comments--popup-target="header">

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

@@ -4,6 +4,7 @@
     <input type="hidden" name="authenticity_token" value="<%= form_authenticity_token %>" />
     <input type="hidden" id="inline-creative-description" name="creative[description]" />
     <input type="hidden" id="inline-content-type" name="creative[content_type_input]" value="html" />
+    <input type="hidden" id="inline-markdown-editor" name="creative[markdown_editor]" />
     <input type="hidden" id="inline-markdown-source" name="creative[markdown_source]" />
     <input type="hidden" id="inline-parent-id" name="creative[parent_id]" />
     <input type="hidden" id="inline-before-id" name="before_id" />

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

@@ -0,0 +1,42 @@
+<%#
+  Popup shown after a topic is moved to another creative, offering to re-add
+  members who had access on the source creative but not on the target.
+  Rendered hidden; populated and shown by topic_move_members_popup.js using the
+  `missing_members` payload returned from TopicsController#move.
+%>
+<div id="topic-move-members-modal"
+     style="display: none; position: fixed; inset: 0; z-index: 10001; align-items: center; justify-content: center; background: rgba(0, 0, 0, 0.3);"
+     data-shares-url-template="<%= collavre.creative_creative_shares_path('__CREATIVE_ID__') %>"
+     data-adding-text="<%= t('collavre.topics.move.add_members.adding') %>"
+     data-added-one="<%= t('collavre.topics.move.add_members.added.one') %>"
+     data-added-other="<%= t('collavre.topics.move.add_members.added.other', count: '__COUNT__') %>"
+     data-partial-text="<%= t('collavre.topics.move.add_members.partial', added: '__ADDED__', failed: '__FAILED__') %>"
+     data-failed-text="<%= t('collavre.topics.move.add_members.failed') %>"
+     data-description-template="<%= t('collavre.topics.move.add_members.description', creative: '__CREATIVE_NAME__') %>">
+  <div class="popup-box" style="max-width: 460px; width: 90%;">
+    <button type="button" id="topic-move-members-close" class="popup-close" aria-label="Close" style="position: absolute; top: 12px; right: 12px;">&times;</button>
+    <h2><%= t('collavre.topics.move.add_members.title') %></h2>
+    <p id="topic-move-members-description" style="opacity: 0.75; margin: 0.5em 0 1em;"></p>
+    <div id="topic-move-members-message" aria-live="polite"></div>
+    <ul id="topic-move-members-list" class="share-grid"></ul>
+    <div style="display: flex; gap: 0.5em; justify-content: flex-end; margin-top: 1em;">
+      <button type="button" id="topic-move-members-skip" class="btn btn-secondary"><%= t('collavre.topics.move.add_members.skip') %></button>
+      <button type="button" id="topic-move-members-add" class="btn btn-primary"><%= t('collavre.topics.move.add_members.add') %></button>
+    </div>
+  </div>
+
+  <template id="topic-move-member-row">
+    <li class="topic-move-member-row" style="display: flex; align-items: center; gap: 0.5em;">
+      <input type="checkbox" class="tmm-checkbox" checked>
+      <span class="avatar share-avatar tmm-avatar" style="display: inline-block; width: 20px; height: 20px; border-radius: 50%; background: var(--surface-3, #ddd); text-align: center; line-height: 20px; font-size: 10px; overflow: hidden;"></span>
+      <span class="tmm-name"></span>
+      <span class="tmm-email" style="opacity: 0.5; flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;"></span>
+      <select class="org-chart-permission-select share-modal-permission-select tmm-permission">
+        <% %w[admin write feedback read].each do |perm| %>
+          <option value="<%= perm %>"><%= t("collavre.creatives.index.permission_#{perm}") %></option>
+        <% end %>
+      </select>
+      <span class="tmm-status" style="width: 16px; text-align: center;"></span>
+    </li>
+  </template>
+</div>

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

@@ -104,6 +104,17 @@
     <div data-share-modal-target="container"></div>
   <% end %>
 
+  <%# The "re-add dropped members" modal must be present wherever a topic can be
+      dropped onto another creative — including the top-level index, where
+      @parent_creative/@creative are nil (moving a topic between root-level
+      creatives). Gating it on the write check above hid it exactly there, so
+      getModal() returned null and the popup silently never appeared. It stays
+      hidden until populated, and share creation is permission-checked
+      server-side, so rendering it for any authenticated user is safe. %>
+  <% if authenticated? %>
+    <%= render 'topic_move_members_modal' %>
+  <% end %>
+
   <%= render 'import_upload_zone' %>
 
 <% if can_manage_integrations %>
@@ -159,6 +170,7 @@
     title_effective_origin = @parent_creative.effective_origin(Set.new)
     title_content_type = title_effective_origin.data&.dig("content_type")
     title_markdown_source = title_can_write ? title_effective_origin.data&.dig("markdown_source") : nil
+    title_markdown_editor = title_effective_origin.data&.dig("editor")
   %>
   <%= content_tag(
         "creative-tree-row",
@@ -172,7 +184,8 @@
         "data-progress-value": @parent_creative.progress,
         "data-origin-id": @parent_creative.origin_id,
         "data-content-type": title_content_type,
-        "data-markdown-source": title_markdown_source
+        "data-markdown-source": title_markdown_source,
+        "data-markdown-editor": title_markdown_editor
       ) %>
 <% else %>
   <%= content_tag(