collavre 0.22.0 → 0.24.0

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/tools/preview_attach_service.rb

@@ -113,15 +113,13 @@ module Tools
       raise ArgumentError, "preview_url is not a valid URI: #{preview_url.inspect}"
     end
 
-    # config is JSON, so worktree_id matching is a Ruby-side scan over the
-    # topic's preview channels. With only a handful of previews per topic in
-    # practice this is fine and avoids JSON operator divergence between
-    # Postgres (config->>'worktree_id') and SQLite (json_extract).
+    # worktree_id is a real column denormalized from config (see
+    # Collavre::Channel#sync_indexed_config_columns), so the lookup is an
+    # indexed query — it also backs the (topic_id, worktree_id) unique index
+    # that makes attach idempotent.
     sig { params(topic: Collavre::Topic, worktree_id: String).returns(T.nilable(Collavre::PreviewChannel)) }
     def lookup_channel(topic, worktree_id)
-      Collavre::PreviewChannel.where(topic_id: topic.id).find do |c|
-        c.worktree_id.to_s == worktree_id.to_s
-      end
+      Collavre::PreviewChannel.find_by(topic_id: topic.id, worktree_id: worktree_id)
     end
   end
 end

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

@@ -1,6 +1,6 @@
 <% comment_topic = comment.topic %>
 <% current_topic_id = local_assigns[:current_topic_id] %>
-<% has_pending_action = comment.action.present? && comment.action_executed_at.blank? %>
+<% has_pending_action = comment.approval_action? && comment.action_executed_at.blank? %>
 <% approver_id = comment.approver_id %>
 <div class="comment-item" id="<%= dom_id(comment) %>" data-controller="comment" data-user-id="<%= comment.user&.id %>" data-comment-id="<%= comment.id %>" data-topic-id="<%= comment_topic&.id %>" data-creative-id="<%= comment.creative_id %>" data-creative-owner-id="<%= comment.creative&.user_id %>" data-has-pending-action="<%= has_pending_action %>" data-approver-id="<%= approver_id %>" data-ai-user="<%= comment.user&.ai_user? %>" data-streaming="<%= local_assigns.fetch(:streaming, false) %>">
   <div class="comment-select">
@@ -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>
@@ -85,8 +90,8 @@
     </div>
   <% end %>
   <div class="comment-content" data-comment-target="content"><%= comment.content %></div>
-  <% if comment.comment_versions.any? %>
-    <% version_count = comment.comment_versions.size %>
+  <% if comment.comment_versions_count > 0 %>
+    <% version_count = comment.comment_versions_count %>
     <% 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 %>
@@ -168,7 +173,7 @@
       <a href="#" class="comment-topic-switch" data-topic-id="<%= comment_topic.id %>">#<%= comment_topic.name %></a>
     </div>
   <% end %>
-  <% if comment.action.present? %>
+  <% if comment.approval_action? %>
     <div class="comment-action-block" data-comment-id="<%= comment.id %>">
       <details class="comment-action-details">
         <summary class="comment-action-summary"><%= t("collavre.comments.action_summary") %></summary>

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">
@@ -112,9 +125,17 @@
        data-action="dragover->comments--contexts#handleExternalDragOver drop->comments--contexts#handleExternalDrop dragleave->comments--contexts#handleExternalDragLeave"></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') %>"
-       data-new-topic-placeholder="<%= t('collavre.topics.new_placeholder') %>"></div>
+  <div class="comment-topics-bar">
+    <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>
+    <button type="button" class="topic-list-btn"
+            data-action="click->comments--topics#openTopicListPopup"
+            title="<%= t('collavre.comments.topic_list') %>"
+            aria-label="<%= t('collavre.comments.topic_list') %>">
+      <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg>
+    </button>
+  </div>
   <%= render Collavre::UserMentionMenuComponent.new(menu_id: 'mention-menu') %>
   <%= render Collavre::CommandMenuComponent.new(menu_id: 'command-menu') %>
   <div id="comments-list" data-comments--popup-target="list" data-comments--list-target="list"><%= t('app.loading') %></div>

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" />
@@ -49,6 +50,15 @@
                 style="margin-left:0.5em;font-family:monospace;font-size:0.9em;">
           <%= t('collavre.creatives.index.toggle_markdown') %>
         </button>
+        <span id="inline-save-status"
+              class="inline-save-status"
+              role="status"
+              aria-live="polite"
+              data-label-pending="<%= t('collavre.creatives.index.save_status_pending') %>"
+              data-label-saving="<%= t('collavre.creatives.index.save_status_saving') %>"
+              data-label-saved="<%= t('collavre.creatives.index.save_status_saved') %>"
+              data-label-error="<%= t('collavre.creatives.index.save_status_error') %>"
+              style="margin-left:auto;font-size:0.85em;color:var(--text-secondary);"></span>
       </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') %>">

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(

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

@@ -8,7 +8,7 @@
 <% initial_index = params[:slide].to_i.clamp(0, @slide_ids.length - 1) %>
 <% initial_prompt = @creative.prompt_for(Current.user) %>
 <div id="slide-view" data-slide-ids="<%= @slide_ids.join(',') %>" data-initial-index="<%= initial_index %>" data-root-id="<%= @creative.id %>">
-  <div id="slide-content"><%= content_tag(tag_name, sanitize(@creative.effective_description, tags: Rails::HTML5::SafeListSanitizer.allowed_tags.to_a + %w[table thead tbody tfoot tr th td], attributes: Rails::HTML5::SafeListSanitizer.allowed_attributes.to_a + %w[colspan rowspan data-lexical])) %></div>
+  <div id="slide-content"><%= content_tag(tag_name, embed_youtube_iframe(@creative.effective_description), class: 'creative-content') %></div>
 </div>
 <div id="slide-controls">
   <div id="slide-counter"><%= initial_index + 1 %> / <%= @slide_ids.length %></div>

data/app/views/collavre/landing/show.html.erb

@@ -19,6 +19,7 @@
   <section id="problem" class="landing-section landing-problem">
     <div class="landing-container">
       <h2 class="landing-section-title"><%= t('collavre.landing.problem.title') %></h2>
+      <p class="landing-section-sub"><%= t('collavre.landing.problem.subtitle') %></p>
       <div class="landing-problem-grid">
         <div class="landing-problem-card">
           <span class="landing-problem-icon">📝</span>
@@ -52,40 +53,77 @@
           <p><%= t('collavre.landing.features.tree.desc') %></p>
         </div>
 
-        <div class="landing-feature-card">
-          <div class="landing-feature-icon">🤖</div>
-          <h3><%= t('collavre.landing.features.ai.title') %></h3>
-          <p><%= t('collavre.landing.features.ai.desc') %></p>
-        </div>
-
         <div class="landing-feature-card">
           <div class="landing-feature-icon">💡</div>
           <h3><%= t('collavre.landing.features.context.title') %></h3>
           <p><%= t('collavre.landing.features.context.desc') %></p>
         </div>
 
+        <div class="landing-feature-card">
+          <div class="landing-feature-icon">🤖</div>
+          <h3><%= t('collavre.landing.features.ai.title') %></h3>
+          <p><%= t('collavre.landing.features.ai.desc') %></p>
+        </div>
+
         <div class="landing-feature-card">
           <div class="landing-feature-icon">💬</div>
           <h3><%= t('collavre.landing.features.chat.title') %></h3>
           <p><%= t('collavre.landing.features.chat.desc') %></p>
         </div>
 
+      </div>
+    </div>
+  </section>
 
+  <%# ═════════════════════════════════════ THE INTERFACE ══════════════════════════════════════ %>
+  <%# A still before the film: the reader decides in two seconds whether this is a surface they
+      would write in, and a video they have not pressed play on cannot answer that. %>
+  <section id="interface" class="landing-section landing-interface">
+    <div class="landing-container">
+      <h2 class="landing-section-title"><%= t('collavre.landing.interface.title') %></h2>
+      <p class="landing-section-sub"><%= t('collavre.landing.interface.subtitle') %></p>
+
+      <div class="landing-shot-frame landing-shot-light">
+        <%= image_tag "collavre/landing/interface-#{I18n.locale == :ko ? 'ko' : 'en'}.png",
+                      class: "landing-shot-img",
+                      alt: t('collavre.landing.interface.alt'), loading: "lazy" %>
       </div>
+      <div class="landing-shot-frame landing-shot-dark">
+        <%= image_tag "collavre/landing/interface-#{I18n.locale == :ko ? 'ko' : 'en'}-dark.png",
+                      class: "landing-shot-img",
+                      alt: t('collavre.landing.interface.alt'), loading: "lazy" %>
+      </div>
+
+      <ul class="landing-interface-points">
+        <li><%= t('collavre.landing.interface.markdown') %></li>
+        <li><%= t('collavre.landing.interface.rich') %></li>
+        <li><%= t('collavre.landing.interface.drag') %></li>
+        <li><%= t('collavre.landing.interface.presence') %></li>
+      </ul>
     </div>
   </section>
 
   <%# ══════════════════════════════════════════ DEMO ══════════════════════════════════════════ %>
+  <%# Demo video/poster URLs are full absolute URLs stored per-locale in
+      config/locales/landing.*.yml. They point at the hosted assets directly, so
+      they resolve from any environment (preview included) with no DB lookup and
+      no env-bound blob ids. Render the section only when a video URL is set. %>
+  <% demo_video = t('collavre.landing.demo.video', default: nil) %>
+  <% demo_poster = t('collavre.landing.demo.poster', default: nil) %>
+  <% demo_video_dark = t('collavre.landing.demo.video_dark', default: nil) %>
+  <% demo_poster_dark = t('collavre.landing.demo.poster_dark', default: nil) %>
+  <% if demo_video.present? || demo_video_dark.present? %>
   <section id="demo" class="landing-section landing-demo">
     <div class="landing-container">
       <h2 class="landing-section-title"><%= t('collavre.landing.demo.title') %></h2>
       <%# Light mode video %>
+      <% if demo_video.present? %>
       <div class="landing-demo-frame landing-demo-light" data-controller="landing-video">
         <video class="landing-demo-video"
                data-landing-video-target="video"
                autoplay muted loop playsinline
-               poster="/public-assets/blobs/eyJfcmFpbHMiOnsiZGF0YSI6NDEyLCJwdXIiOiJibG9iX2lkIn19--33811afcd451cef0cf10313fa1bfecca15b41299/demo-poster.jpg">
-          <source src="/public-assets/blobs/eyJfcmFpbHMiOnsiZGF0YSI6NDEwLCJwdXIiOiJibG9iX2lkIn19--c272341a19ed8e847208c52da0617ebc801e2e67/demo.mp4" type="video/mp4">
+               poster="<%= demo_poster %>">
+          <source src="<%= demo_video %>" type="video/mp4">
         </video>
         <div class="landing-demo-progress" data-landing-video-target="progressBar">
           <div class="landing-demo-progress-fill" data-landing-video-target="progressFill"></div>
@@ -94,13 +132,15 @@
           <span class="landing-demo-toggle-icon" data-landing-video-target="icon">❚❚</span>
         </button>
       </div>
+      <% end %>
       <%# Dark mode video %>
+      <% if demo_video_dark.present? %>
       <div class="landing-demo-frame landing-demo-dark" data-controller="landing-video">
         <video class="landing-demo-video"
                data-landing-video-target="video"
                autoplay muted loop playsinline
-               poster="/public-assets/blobs/eyJfcmFpbHMiOnsiZGF0YSI6NDEzLCJwdXIiOiJibG9iX2lkIn19--53c3c505596bca0befbbebb5958764a153ffee5e/demo-dark-poster.jpg">
-          <source src="/public-assets/blobs/eyJfcmFpbHMiOnsiZGF0YSI6NDExLCJwdXIiOiJibG9iX2lkIn19--758c90c311bb68f46a2bda87553e3cdfd800420b/demo-dark.mp4" type="video/mp4">
+               poster="<%= demo_poster_dark %>">
+          <source src="<%= demo_video_dark %>" type="video/mp4">
         </video>
         <div class="landing-demo-progress" data-landing-video-target="progressBar">
           <div class="landing-demo-progress-fill" data-landing-video-target="progressFill"></div>
@@ -109,8 +149,10 @@
           <span class="landing-demo-toggle-icon" data-landing-video-target="icon">❚❚</span>
         </button>
       </div>
+      <% end %>
     </div>
   </section>
+  <% end %>
 
   <%# ═══════════════════════════════════════ FINAL CTA ════════════════════════════════════════ %>
   <section class="landing-section landing-cta">