collavre 0.8.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82e806ce0c2a6e03029c43d817fb83a6c8114e04bf13be10b05b16fefbeb253c
-  data.tar.gz: bfa7142c80cd7868c4ad9375a7b9f96ceed0b9b35ad031a6962f92a9d655f029
+  metadata.gz: 6e3281424919fc07e271f712389040c20bef756de2f467de4b5c22d41caf7431
+  data.tar.gz: aafc13da62eef7e36d0cc80014553fd1299260b5e8c8b5aa97e1238f9d6241a3
 SHA512:
-  metadata.gz: e443416101117e0e3440f60d889f4c317fc19d59e5d3e92fdc511f1caf0fee52470e3e37b036709fbc63eea01d266c622e25ded80dc584d77c7fd0e2feed257b
-  data.tar.gz: 33e264807609298b92f8786f755bce2ef7846e653d6d5b4c7ff0eb1c267cf0273a56753d8e3758cf99e8300d14f1f6cfbde99b21e9f99e39645e44d3a0ec58e6
+  metadata.gz: '09cbd1f6b17e92ec90b3e2d7f8da598ff1db2dbbaf01282bfd53df19bb8620afcd0e3ebd8dac2c1929233f816d000f8b573990df7dea62ebcb098bd414b0af9f'
+  data.tar.gz: 56bf15d2aca40fc28ba43cad261a91b2ae64e9c5bdf873c490a14f4f0fad4608d499906b295bfca416d4026406334f79fc422f989f81de4549f367ad88eade8d

data/app/assets/stylesheets/collavre/activity_logs.css

@@ -9,7 +9,7 @@
 }
 
 .comment-activity-log-block details>summary::marker {
-    color: var(--border-color);
+    color: var(--text-muted);
 }
 
 /* List container */

data/app/assets/stylesheets/collavre/comment_versions.css

@@ -14,7 +14,8 @@
   padding: 0 var(--space-2, 0.25rem);
   font-size: var(--text-xs, 0.75rem);
   line-height: 1.6;
-  color: var(--text-color, #333);
+  color: var(--text-primary, #202123);
+  font-weight: bold;
 }
 
 .comment-version-btn:hover:not(:disabled) {
@@ -35,16 +36,18 @@
 
 .comment-version-delete-btn {
   background: none;
-  border: none;
+  border: 1px solid var(--border-color, #ddd);
+  border-radius: var(--radius-1, 4px);
   cursor: pointer;
-  color: var(--text-muted, #888);
+  color: var(--text-primary, #202123);
   font-size: var(--text-xs, 0.75rem);
-  padding: 0 var(--space-1, 0.125rem);
+  padding: 0 var(--space-2, 0.25rem);
   margin-left: var(--space-1, 0.125rem);
+  line-height: 1.6;
 }
 
-.comment-version-delete-btn:hover {
-  color: var(--danger-color, #e53e3e);
+.comment-version-delete-btn:hover:not(:disabled) {
+  background: var(--surface-hover, #f0f0f0);
 }
 
 .comment-version-selected {
@@ -59,6 +62,7 @@
   cursor: pointer;
   color: var(--primary-color, #4a90d9);
   font-size: var(--text-xs, 0.75rem);
+  font-weight: bold;
   padding: 0 var(--space-2, 0.25rem);
   margin-left: var(--space-1, 0.125rem);
   line-height: 1.6;

data/app/assets/stylesheets/collavre/comments_popup.css

@@ -159,10 +159,15 @@ body.chat-fullscreen {
     overflow-y: auto;
     min-height: calc(var(--text-1) * 1.5 * 2); /* 2 lines minimum */
     max-height: calc(var(--text-1) * 1.5 * 10); /* 10 lines maximum */
-    transition: height 0.1s ease-out;
+    transition: height 0.1s ease-out, border-color 0.15s ease-out, box-shadow 0.15s ease-out;
     /* Prevent iOS zoom on focus */
 }
 
+#new-comment-form.creative-drop-hover textarea {
+    border-color: var(--link);
+    box-shadow: 0 0 0 2px color-mix(in srgb, var(--link) 25%, transparent);
+}
+
 #new-comment-form button[type="submit"] {
     float: right;
 }
@@ -984,6 +989,12 @@ body.chat-fullscreen {
     margin-right: -1px;
 }
 
+.comment-contexts-list.context-drop-active {
+    outline: 2px dashed var(--color-link);
+    outline-offset: -2px;
+    background-color: color-mix(in srgb, var(--color-link) 8%, transparent);
+}
+
 .context-chip[draggable="true"] {
     cursor: grab;
 }
@@ -1100,6 +1111,30 @@ body.chat-fullscreen {
     box-sizing: border-box;
 }
 
+.topic-agent-avatar {
+    width: 16px;
+    height: 16px;
+    border-radius: 50%;
+    object-fit: cover;
+    flex-shrink: 0;
+}
+
+.ai-agent-draggable {
+    cursor: grab;
+}
+
+.ai-agent-draggable:active,
+.ai-agent-draggable.dragging {
+    cursor: grabbing;
+    opacity: 0.5;
+}
+
+.topic-creation-container.drag-over {
+    background: var(--color-active);
+    border-radius: 12px;
+    opacity: 0.8;
+}
+
 .topic-tag:hover {
     background: var(--surface-hover);
 }
@@ -1344,6 +1379,23 @@ body.chat-fullscreen {
     flex-wrap: wrap;
 }
 
+.selection-action-bar-select-all {
+    display: flex;
+    align-items: center;
+    gap: var(--space-1);
+    font-size: 0.85em;
+    font-weight: bold;
+    color: var(--color-text);
+    cursor: pointer;
+    user-select: none;
+    white-space: nowrap;
+}
+
+.selection-action-bar-select-all-checkbox {
+    cursor: pointer;
+    margin: 0;
+}
+
 .selection-action-bar-count {
     font-size: 0.85em;
     font-weight: bold;
@@ -1367,6 +1419,15 @@ body.chat-fullscreen {
     background: var(--surface-hover);
 }
 
+.selection-action-bar-btn:disabled {
+    opacity: 0.4;
+    cursor: not-allowed;
+}
+
+.selection-action-bar-btn:disabled:hover {
+    background: none;
+}
+
 .selection-action-delete:hover {
     color: var(--color-danger);
 }
@@ -1483,3 +1544,12 @@ body.chat-fullscreen {
     0%, 70% { opacity: 1; }
     100% { opacity: 0; }
 }
+
+.topic-create-option {
+    color: var(--link);
+    font-style: italic;
+}
+
+li:hover .topic-create-option {
+    text-decoration: underline;
+}

data/app/assets/stylesheets/collavre/creatives.css

@@ -164,10 +164,6 @@ creative-tree-row.show-edit .creative-row {
 }
 
 .creative-row:hover .creative-content {
-    text-decoration: underline;
-    text-decoration-color: var(--color-link);
-    text-decoration-thickness: 2px;
-    text-underline-offset: 2px;
     cursor: pointer;
 }
 

data/app/controllers/collavre/comments_controller.rb

@@ -281,7 +281,8 @@ module Collavre
           name: u.display_name,
           avatar_url: view_context.user_avatar_url(u, size: 20),
           default_avatar: !u.avatar.attached? && u.avatar_url.blank?,
-          initial: u.display_name[0].upcase
+          initial: u.display_name[0].upcase,
+          ai_user: u.ai_user?
         }
       end
       render json: {

data/app/controllers/collavre/topics_controller.rb

@@ -7,11 +7,12 @@ module Collavre
       can_manage = @creative.has_permission?(Current.user, :admin) || is_owner
       can_create_topic = can_manage || @creative.has_permission?(Current.user, :write)
 
-      active_topics = @creative.topics.active.order(:created_at)
+      active_topics = @creative.topics.active.order(:created_at).to_a
+      preload_primary_agents(active_topics)
       archived_topics = @creative.topics.archived.order(:created_at)
 
       render json: {
-        topics: active_topics,
+        topics: active_topics.map { |t| topic_json(t) },
         archived_topics: archived_topics,
         can_manage: can_manage,
         can_create_topic: can_create_topic
@@ -26,15 +27,43 @@ module Collavre
       topic = @creative.topics.build(topic_params)
       topic.user = Current.user
 
-      if topic.save
-        TopicsChannel.broadcast_to(
-          @creative,
-          { action: "created", topic: topic.slice(:id, :name) }
-        )
-        render json: topic, status: :created
-      else
-        render json: { errors: topic.errors.full_messages }, status: :unprocessable_entity
+      Topic.transaction do
+        if topic.save
+          agent = nil
+          if params[:agent_id].present?
+            agent = User.find_by(id: params[:agent_id])
+            topic.set_primary_agent!(agent) if agent&.ai_user?
+          end
+
+          # Move comments to the new topic if comment_ids provided
+          comment_ids = Array(params[:comment_ids]).map(&:presence).compact
+          if comment_ids.any?
+            CommentMoveService.new(creative: @creative, user: Current.user).call(
+              comment_ids: comment_ids,
+              target_topic_id: topic.id
+            )
+          end
+
+          broadcast_data = agent ? topic_json_with_agent(topic, agent) : topic.slice(:id, :name)
+          TopicsChannel.broadcast_to(
+            @creative,
+            { action: "created", topic: broadcast_data, user_id: Current.user.id }
+          )
+          render json: topic, status: :created
+        else
+          render json: { errors: topic.errors.full_messages }, status: :unprocessable_entity
+        end
+      end
+    rescue CommentMoveService::MoveError => e
+      render json: { errors: [ e.message ] }, status: :unprocessable_entity
+    end
+
+    def next_name
+      unless @creative.has_permission?(Current.user, :read) || @creative.user == Current.user
+        render json: { error: I18n.t("collavre.topics.no_permission") }, status: :forbidden and return
       end
+
+      render json: { name: generate_next_topic_name }
     end
 
     def update
@@ -159,6 +188,31 @@ module Collavre
       render json: { success: true }
     end
 
+    def set_primary_agent
+      unless @creative.has_permission?(Current.user, :write) || @creative.user == Current.user
+        render json: { error: I18n.t("collavre.topics.no_permission") }, status: :forbidden and return
+      end
+
+      topic = @creative.topics.find(params[:id])
+      agent = User.find_by(id: params[:agent_id])
+
+      unless agent&.ai_user?
+        render json: { error: I18n.t("collavre.topics.not_ai_agent") }, status: :unprocessable_entity and return
+      end
+
+      topic.set_primary_agent!(agent)
+
+      TopicsChannel.broadcast_to(
+        @creative,
+        {
+          action: "updated",
+          topic: topic_json_with_agent(topic, agent)
+        }
+      )
+
+      render json: { success: true, topic: topic_json_with_agent(topic, agent) }
+    end
+
     private
 
     def set_creative
@@ -168,5 +222,63 @@ module Collavre
     def topic_params
       params.require(:topic).permit(:name)
     end
+
+    def generate_next_topic_name
+      prefix = I18n.t("collavre.topics.default_name_prefix")
+      existing_numbers = @creative.topics.active
+        .where("name LIKE ?", "#{Topic.sanitize_sql_like(prefix)}%")
+        .pluck(:name)
+        .filter_map { |n|
+          suffix = n.delete_prefix(prefix)
+          suffix.match?(/\A\d+\z/) ? suffix.to_i : nil
+        }
+
+      next_number = (existing_numbers.max || 0) + 1
+      "#{prefix}#{next_number}"
+    end
+
+    # Batch-load primary agents for all topics to avoid N+1 queries
+    def preload_primary_agents(topics)
+      topic_ids = topics.map(&:id)
+      return if topic_ids.empty?
+
+      policies = OrchestratorPolicy.where(
+        policy_type: "arbitration",
+        scope_type: "Topic",
+        scope_id: topic_ids
+      ).index_by { |p| p.scope_id.to_i }
+
+      agent_ids = policies.values.filter_map { |p| p.config&.dig("primary_agent_id") }
+      agents = agent_ids.present? ? User.where(id: agent_ids).includes(avatar_attachment: :blob).index_by(&:id) : {}
+
+      topics.each do |topic|
+        policy = policies[topic.id]
+        agent_id = policy&.config&.dig("primary_agent_id")
+        topic.instance_variable_set(:@_primary_agent, agents&.dig(agent_id))
+      end
+    end
+
+    def topic_json(topic)
+      data = topic.slice(:id, :name)
+      agent = topic.instance_variable_get(:@_primary_agent) || topic.primary_agent
+      if agent
+        data[:primary_agent] = agent_json(agent)
+      end
+      data
+    end
+
+    def topic_json_with_agent(topic, agent)
+      data = topic.slice(:id, :name)
+      data[:primary_agent] = agent_json(agent)
+      data
+    end
+
+    def agent_json(agent)
+      {
+        id: agent.id,
+        name: agent.display_name,
+        avatar_url: view_context.user_avatar_url(agent, size: 20)
+      }
+    end
   end
 end

data/app/controllers/concerns/collavre/comments/approval_actions.rb

@@ -53,6 +53,11 @@ module Collavre
             end
           end
 
+          # Creative admins can also edit actions even if not the designated approver
+          if status_in_lock != :ok && @creative.has_permission?(Current.user, :admin)
+            status_in_lock = :ok
+          end
+
           if status_in_lock != :ok
             approver_mismatch_error = true
             status_error_key = case status_in_lock

data/app/controllers/concerns/collavre/comments/batch_operations.rb

@@ -37,6 +37,38 @@ module Collavre
         head :no_content
       end
 
+      def merge
+        comment_ids = Array(params[:comment_ids]).map(&:to_i).uniq
+        if comment_ids.size < 2
+          render json: { error: I18n.t("collavre.comments.merge.minimum_required") }, status: :unprocessable_entity and return
+        end
+
+        unless @creative.has_permission?(Current.user, :feedback)
+          render json: { error: I18n.t("collavre.comments.merge.not_authorized") }, status: :forbidden and return
+        end
+
+        visible_scope = @creative.comments.where(
+          "comments.private = ? OR comments.user_id = ? OR comments.approver_id = ?",
+          false, Current.user.id, Current.user.id
+        )
+        comments = visible_scope.where(id: comment_ids).to_a
+
+        if comments.length != comment_ids.length
+          render json: { error: I18n.t("collavre.comments.batch_delete_not_found") }, status: :not_found and return
+        end
+
+        # All comments must belong to the current user or their AI agents
+        my_ai_agent_ids = Current.user.created_ai_users.pluck(:id)
+        allowed_user_ids = [ Current.user.id ] + my_ai_agent_ids
+        unauthorized = comments.reject { |c| allowed_user_ids.include?(c.user_id) }
+        if unauthorized.any?
+          render json: { error: I18n.t("collavre.comments.merge.own_messages_only") }, status: :forbidden and return
+        end
+
+        MergeCommentsJob.perform_later(@creative.id, comment_ids, Current.user.id)
+        render json: { message: I18n.t("collavre.comments.merge.started") }, status: :accepted
+      end
+
       def move
         result = CommentMoveService.new(creative: @creative, user: Current.user).call(
           comment_ids: params[:comment_ids],

data/app/javascript/controllers/comment_version_controller.js

@@ -1,4 +1,5 @@
 import { Controller } from "@hotwired/stimulus"
+import { renderCommentMarkdown } from "../lib/utils/markdown"
 
 export default class extends Controller {
   static targets = ["prevBtn", "nextBtn", "indicator", "deleteBtn", "selectBtn"]
@@ -123,7 +124,10 @@ export default class extends Controller {
   setContentText(text) {
     const el = document.getElementById(this.contentTargetValue)
     const target = el?.querySelector(".comment-content") || el?.querySelector("[data-comment-target='content']")
-    if (target) target.textContent = text
+    if (target) {
+      target.innerHTML = renderCommentMarkdown(text)
+      target.dataset.rendered = "true"
+    }
   }
 
   updateButtons() {

data/app/javascript/controllers/comments/contexts_controller.js

@@ -1,5 +1,7 @@
 import { Controller } from "@hotwired/stimulus"
 
+const CREATIVE_MIME_TYPE = 'application/x-collavre-creative'
+
 export default class extends Controller {
     static targets = ["list", "toggleButton"]
 
@@ -11,6 +13,7 @@ export default class extends Controller {
         this.canManage = false
         this.draggingContextId = null
         this.listVisible = false
+        // External drop zone handlers are now Stimulus actions on the list target
     }
 
     get creativeId() {
@@ -22,6 +25,7 @@ export default class extends Controller {
         this.listVisible = false
         this._updateListVisibility()
         await this.loadContexts()
+        this._bindPopupDragDetection()
     }
 
     onPopupClosed() {
@@ -30,6 +34,7 @@ export default class extends Controller {
         if (this.hasListTarget) {
             this.listTarget.innerHTML = ''
         }
+        this._unbindPopupDragDetection()
     }
 
     async loadContexts() {
@@ -97,6 +102,7 @@ export default class extends Controller {
         if (!this.hasListTarget) return
 
         this._updateToggleButton()
+        // Drop zone is handled by Stimulus data-action on the list element
 
         const dragActions = this.canManage
             ? 'dragstart->comments--contexts#handleDragStart dragend->comments--contexts#handleDragEnd'
@@ -295,11 +301,15 @@ export default class extends Controller {
     }
 
     async handleReorderDrop(event) {
-        event.preventDefault()
-
         const targetEl = event.currentTarget
         targetEl.classList.remove('context-drag-over-left', 'context-drag-over-right')
 
+        // If this is a creative drag (not a context reorder), let it bubble to the list handler
+        if (!event.dataTransfer.types.includes('application/x-context-id')) return
+
+        event.preventDefault()
+        event.stopPropagation()
+
         const draggedId = parseInt(event.dataTransfer.getData('application/x-context-id'))
         const targetId = parseInt(targetEl.dataset.contextId)
 
@@ -345,7 +355,7 @@ export default class extends Controller {
                 method: 'PATCH',
                 headers: {
                     'Content-Type': 'application/json',
-                    'X-CSRF-Token': document.querySelector('meta[name="csrf-token"]').content
+                    'X-CSRF-Token': document.querySelector('meta[name="csrf-token"]')?.content || ''
                 },
                 body: JSON.stringify(params)
             })
@@ -358,6 +368,117 @@ export default class extends Controller {
         }
     }
 
+    // --- Auto-show context list when dragging creative over popup ---
+    _bindPopupDragDetection() {
+        const popup = this.element.closest('#comments-popup')
+        if (!popup) return
+        // Unbind any existing handlers first to prevent accumulation across opens
+        this._unbindPopupDragDetection()
+        this._popupEl = popup
+        this._boundPopupDragOver = this._handlePopupDragOver.bind(this)
+        this._boundPopupDragLeave = this._handlePopupDragLeave.bind(this)
+        this._boundPopupDrop = (event) => {
+            // Skip if dropping on the comment form — let form_controller handle it
+            if (event.target.closest('#new-comment-form')) return
+            this.handleExternalDrop(event)
+        }
+        popup.addEventListener('dragover', this._boundPopupDragOver)
+        popup.addEventListener('dragleave', this._boundPopupDragLeave)
+        popup.addEventListener('drop', this._boundPopupDrop)
+    }
+
+    _unbindPopupDragDetection() {
+        if (!this._popupEl) return
+        this._popupEl.removeEventListener('dragover', this._boundPopupDragOver)
+        this._popupEl.removeEventListener('dragleave', this._boundPopupDragLeave)
+        this._popupEl.removeEventListener('drop', this._boundPopupDrop)
+        this._popupEl = null
+    }
+
+    _handlePopupDragOver(event) {
+        if (this._isInternalReorder(event)) return
+        if (!this._isCreativeDrag(event)) return
+        if (!this.canManage) return
+        // Skip if dragging over the comment form — let form_controller handle it
+        if (event.target.closest('#new-comment-form')) return
+
+        // Must preventDefault to allow drop on the popup
+        event.preventDefault()
+        event.dataTransfer.dropEffect = 'move'
+
+        if (!this.listVisible) {
+            // Auto-show context list when dragging a creative over the popup
+            this.listVisible = true
+            this._updateListVisibility()
+        }
+    }
+
+    _handlePopupDragLeave(event) {
+        if (!this._popupEl) return
+        // Only hide if leaving the popup entirely
+        if (this._popupEl.contains(event.relatedTarget)) return
+        if (this._hasBeenManuallyToggled) return
+
+        // Restore original state if no contexts
+        if (this.contexts.length === 0) {
+            this.listVisible = false
+            this._updateListVisibility()
+        }
+    }
+
+    // --- Drop zone for adding creatives from tree ---
+
+    _isCreativeDrag(event) {
+        return event.dataTransfer.types.includes(CREATIVE_MIME_TYPE)
+    }
+
+    _isInternalReorder(event) {
+        return event.dataTransfer.types.includes('application/x-context-id')
+    }
+
+    handleExternalDragOver(event) {
+        if (this._isInternalReorder(event)) return
+        if (!this._isCreativeDrag(event)) return
+        if (!this.canManage) return
+
+        event.preventDefault()
+        event.dataTransfer.dropEffect = 'move'
+        this.listTarget.classList.add('context-drop-active')
+    }
+
+    handleExternalDragLeave(event) {
+        // Only remove highlight if truly leaving the list area
+        if (!this.listTarget.contains(event.relatedTarget)) {
+            this.listTarget.classList.remove('context-drop-active')
+        }
+    }
+
+    async handleExternalDrop(event) {
+        if (this._isInternalReorder(event)) return
+        if (!this._isCreativeDrag(event)) return
+        if (!this.canManage) return
+
+        // Always prevent default for creative drags to avoid browser navigation
+        event.preventDefault()
+        event.stopPropagation()
+
+        this.listTarget.classList.remove('context-drop-active')
+
+        let creativeId = null
+
+        const rawData = event.dataTransfer.getData(CREATIVE_MIME_TYPE)
+        if (rawData) {
+            try {
+                const parsed = JSON.parse(rawData)
+                creativeId = parseInt(parsed.creativeId)
+            } catch (e) { /* ignore */ }
+        }
+
+        if (!creativeId) return
+
+        await this._addContextId(creativeId)
+    }
+
     _escapeHtml(text) {
         const div = document.createElement('div')
         div.textContent = text