collavre 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 656a876df08e2034398807dd976a0da67f7b4e5120dd73301ea521dd1291eb8b
-  data.tar.gz: c17a5821354531dfaaafd6dd51794114a132c42a3535d612410a838d75499050
+  metadata.gz: f1357a437e24482ad596536b50cdae4f58dd247e6e32dbef0be05b99dfdf2103
+  data.tar.gz: cc8f618b3b06dcf43f484c87e05a8b92d03a59ff6d63d1356dbc13647316b8a5
 SHA512:
-  metadata.gz: 9547afa6f502aa818ef3a565d3e8991f25298623dffd980a2d63f3383debd2eef08ce0440285d5fe7c1f8dc7810245cb1aea8f252bf44d8cdd1400460b280fa1
-  data.tar.gz: 336344900a57853600abb3d8f879741d52f8673238a63b90b5054fe5d5f8b412fb54aced24dd9c93ea07a1c66175fe5518a58bd6011f9aae363a0a82720e77ef
+  metadata.gz: 26ec481a50ca488ed2155f8979619e868825282d96057e5875b7de1d6f265f29cac8511197f7fc7797c4f087e27c36981135012feb2c0f0a752ae78a2fc0dbab
+  data.tar.gz: 8caef1fbc81332be2aaac3bdbefc10563851f20b929769338a9416d1f48a329f4c1b4be8c79ccef723298351ccc7fff32ca3de65d3e3fed2e71e217cb341a233

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;
 }
@@ -1539,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

@@ -2,11 +2,19 @@
     --creative-row-text-offset: 1.8em;
     --creative-loading-emojis: "🚀,🧠,🧩,🤝,🗂️,⚡";
 
+    /* Icon size used for vertical centering calc */
+    --creative-icon-size: 16px;
+
     /* Creative tree heading styles — defaults match pre-#799 behavior.
        Themes that don't define these variables render identically to before. */
     --creative-h1-size: 1.3em;
     --creative-h2-size: 1.2em;
     --creative-h3-size: 1.1em;
+    /* Line heights for headings (used by calc-based vertical centering) */
+    --creative-h1-lh: 1.3;
+    --creative-h2-lh: 1.3;
+    --creative-h3-lh: 1.3;
+    --creative-body-lh: 1.5;
     --creative-h1-weight: bold;
     --creative-h2-weight: bold;
     --creative-h3-weight: bold;
@@ -44,17 +52,135 @@ html.creative-alignment-ready .page-title {
 }
 
 .creative-actions-row {
-    margin: 0.0em 1.0em 0.0em var(--creative-row-text-offset);
-    padding: 0.5em 0.5em 0.5em 0;
+    margin: 0 0 0 var(--creative-row-text-offset);
+    padding: var(--space-1) 0;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    min-height: 36px;
+    border: none;
+}
+
+/* === Breadcrumb (left-aligned) === */
+.creative-breadcrumb {
+    display: flex;
+    align-items: center;
+    font-size: var(--text-0);
+    color: var(--text-muted);
+    overflow-x: auto;
+    white-space: nowrap;
+    scrollbar-width: none;
+    min-width: 0;
+    margin-right: var(--space-3);
+}
+
+.creative-breadcrumb::-webkit-scrollbar {
+    display: none;
+}
+
+/* Override application.css .creative-actions-row a for breadcrumb links */
+.creative-actions-row a.creative-breadcrumb-link {
+    color: var(--text-muted) !important;
+    text-decoration: underline !important;
+    text-underline-offset: 2px;
+    text-decoration-color: color-mix(in srgb, var(--text-muted) 40%, transparent);
+    background: none !important;
+    border: none !important;
+    padding: 0 !important;
+    font-size: var(--text-0) !important;
+    filter: none !important;
+    line-height: normal;
+}
+
+.creative-actions-row a.creative-breadcrumb-link:hover {
+    color: var(--text-primary) !important;
+    text-decoration-color: var(--text-primary) !important;
+}
+
+.creative-actions-row a.creative-breadcrumb-current {
+    color: var(--text-secondary) !important;
+    font-weight: var(--weight-5);
+}
+
+.creative-breadcrumb-sep {
+    color: var(--text-muted);
+    opacity: 0.4;
+    margin: 0 var(--space-1);
+    font-size: var(--text-00);
+    user-select: none;
+}
+
+/* === Header actions (right-aligned) === */
+.creative-header-actions {
+    display: flex;
+    align-items: center;
+    gap: var(--space-1);
+    flex-shrink: 0;
+}
+
+/* Outline button — GNB-like with border.
+   Higher specificity to override application.css .creative-actions-row button */
+.creative-actions-row .creative-header-actions .creative-header-outline-btn {
+    background: transparent;
+    border: 1px solid var(--border-color);
+    color: var(--text-secondary);
+    cursor: pointer;
+    height: 30px;
+    padding: 0 var(--space-2);
+    border-radius: var(--radius-2);
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    font-size: var(--text-0);
+    transition: background 0.15s var(--ease-out-2), color 0.15s var(--ease-out-2), border-color 0.15s var(--ease-out-2);
+}
+
+.creative-actions-row .creative-header-actions .creative-header-outline-btn:hover {
+    background: var(--surface-hover);
+    color: var(--text-primary);
+    border-color: var(--text-muted);
+}
+
+/* === Overflow popup menu — GNB style === */
+#creative-overflow-menu {
+    min-width: 200px;
+    border: 1px solid var(--border-color);
+    border-radius: var(--radius-3);
+    box-shadow: var(--shadow-2);
+    padding: var(--space-1);
+    background: var(--surface-section);
+}
+
+#creative-overflow-menu .popup-menu-item {
     display: flex;
-    flex-wrap: wrap;
-    gap: 10px;
-    height: 48px;
     align-items: center;
+    gap: var(--space-2);
+    width: 100%;
+    text-align: left;
+    padding: var(--space-1) var(--space-2);
+    border-radius: var(--radius-2);
+    border: none;
+    background: none;
+    color: var(--text-primary);
+    font-size: var(--text-1);
+    cursor: pointer;
+    transition: background 0.15s var(--ease-out-2);
+    white-space: nowrap;
+}
+
+#creative-overflow-menu .popup-menu-item:hover {
+    background: var(--surface-hover);
 }
 
-.creative-actions-row button {
-    height: 32px;
+#creative-overflow-menu .popup-menu-item.active {
+    background: color-mix(in srgb, var(--color-active) 15%, transparent);
+    color: var(--color-active);
+}
+
+.creative-overflow-divider {
+    height: 1px;
+    background: var(--border-color);
+    margin: var(--space-1) 0;
 }
 
 .delete-options {
@@ -119,7 +245,6 @@ creative-tree-row.show-edit .creative-row {
 .creative-tree-li {
     display: flex;
     align-items: flex-start;
-    /* Changed from center to flex-start */
     position: relative;
 }
 
@@ -187,8 +312,7 @@ creative-tree-row.show-edit .creative-row {
     margin-left: 4px;
     margin-right: 8px;
     flex: 0 0 var(--creative-bullet-size, 5px);
-    margin-top: 10px;
-    /* Align with first line of text (approx) */
+    margin-top: calc((1em * var(--creative-body-lh, 1.5) - var(--creative-bullet-size, 5px)) / 2);
 }
 
 .creative-row-end {
@@ -198,8 +322,13 @@ creative-tree-row.show-edit .creative-row {
     white-space: nowrap;
     display: flex;
     align-items: flex-start;
-    /* Top align */
-    /* padding-top: 4px; - Removed to align comments button with edit button */
+}
+
+/* Reset row-start vertical centering for buttons inside row-end.
+   Uses .creative-row to boost specificity above .level-N rules. */
+.creative-row .creative-row-end .creative-action-btn,
+.creative-row .creative-row-end .comments-btn {
+    margin-top: 0;
 }
 
 .creative-tags {
@@ -208,27 +337,84 @@ creative-tree-row.show-edit .creative-row {
     white-space: nowrap;
     display: flex;
     flex-wrap: wrap;
-    padding-top: 4px;
-    /* Restore baseline alignment */
 }
 
 .creative-progress-complete,
 .creative-progress-incomplete {
     color: var(--color-brand);
-    padding-top: 4px;
-    /* Restore baseline alignment */
 }
 
 .creative-progress-incomplete {
     color: var(--text-muted);
 }
 
-/* .creative-progress-incomplete {} - removed empty rule */
+/* Progress toggle (hover-to-complete) */
+.progress-toggle-wrap {
+    position: relative;
+    cursor: pointer;
+    display: inline-flex;
+    align-items: center;
+    padding-top: 4px;
+}
+
+.progress-toggle-wrap .creative-progress-complete,
+.progress-toggle-wrap .creative-progress-incomplete {
+    padding-top: 0;
+}
+
+.progress-toggle-checkbox {
+    position: absolute;
+    inset: 0;
+    width: 100%;
+    height: 100%;
+    opacity: 0;
+    cursor: pointer;
+    margin: 0;
+    z-index: 1;
+}
+
+/* Desktop: show checkbox on row hover (same pattern as edit-btn, comments-btn) */
+@media (hover: hover) {
+    .progress-toggle-checkbox {
+        width: 1em;
+        height: 1em;
+        visibility: hidden;
+        opacity: 0;
+        position: absolute;
+        margin: auto;
+        pointer-events: none;
+    }
+
+    .creative-row:hover .progress-toggle-wrap .creative-progress-complete,
+    .creative-row:hover .progress-toggle-wrap .creative-progress-incomplete {
+        display: none;
+    }
+
+    .creative-row:hover .progress-toggle-checkbox {
+        visibility: visible;
+        opacity: 1;
+        position: relative;
+        pointer-events: auto;
+        accent-color: var(--color-brand);
+    }
+}
+
+/* Touch devices: always show both text and clickable area */
+@media (hover: none) {
+    .progress-toggle-checkbox {
+        opacity: 0;
+        pointer-events: auto;
+    }
+}
+
+.progress-toggle-saving {
+    opacity: 0.5;
+    pointer-events: none;
+}
 
 .creative-row-start {
     display: flex;
     align-items: flex-start;
-    /* Changed from center to flex-start */
     flex-grow: 1;
 }
 
@@ -274,8 +460,8 @@ creative-tree-row.show-edit .creative-row {
     line-height: 1;
     display: inline-flex;
     flex-shrink: 0;
-    padding-top: 4px;
-    /* Align with text */
+    /* Default vertical centering for body-text rows (level 4+) */
+    margin-top: calc((1em * var(--creative-body-lh, 1.5) - var(--creative-icon-size, 16px)) / 2);
 }
 
 /* Ensure inline editor actions use the correct text color */
@@ -313,13 +499,12 @@ creative-tree-row.show-edit .creative-row {
     width: 16px;
     height: 16px;
     margin-right: 4px;
-    margin-top: 4px;
-    /* Align with text */
+    margin-top: calc((1em * var(--creative-body-lh, 1.5) - var(--creative-icon-size, 16px)) / 2);
     visibility: hidden;
     /* Hidden by default on desktop */
     /* Total width is 20px (16 + 4) */
     color: var(--text-secondary);
-    display: flex;
+    display: inline-flex;
     align-items: center;
     justify-content: center;
 }
@@ -419,17 +604,14 @@ creative-tree-row:not([expanded]) .creative-toggle-btn {
     height: 16px;
     cursor: pointer;
     visibility: visible;
-    margin-top: 6px;
-    /* Align with text */
+    margin-top: calc((1em * var(--creative-body-lh, 1.5) - var(--creative-icon-size, 16px)) / 2);
 }
 
 .creative-row {
     display: flex;
     justify-content: space-between;
     align-items: flex-start;
-    /* Changed from center to flex-start */
     padding: 2px 0;
-    /* Add some vertical padding */
 }
 
 .creative-row.selected {
@@ -454,8 +636,7 @@ creative-tree-row.chat-active .creative-row {
     color: var(--text-muted);
     font-size: 0.9em;
     margin-left: 10px;
-    padding-top: 4px;
-    /* Align with text */
+    margin-top: calc((1em * var(--creative-body-lh, 1.5) - 1em) / 2);
 }
 
 .page-title {
@@ -494,6 +675,7 @@ creative-tree-row.chat-active .creative-row {
     font-size: var(--creative-h1-size, 1.3em);
     font-weight: var(--creative-h1-weight, bold);
     color: var(--creative-h1-color, inherit);
+    line-height: var(--creative-h1-lh, 1.3);
     margin: 0;
 }
 
@@ -501,6 +683,7 @@ creative-tree-row.chat-active .creative-row {
     font-size: var(--creative-h2-size, 1.2em);
     font-weight: var(--creative-h2-weight, bold);
     color: var(--creative-h2-color, inherit);
+    line-height: var(--creative-h2-lh, 1.3);
     margin: 0;
 }
 
@@ -508,6 +691,7 @@ creative-tree-row.chat-active .creative-row {
     font-size: var(--creative-h3-size, 1.1em);
     font-weight: var(--creative-h3-weight, bold);
     color: var(--creative-h3-color, inherit);
+    line-height: var(--creative-h3-lh, 1.3);
     margin: 0;
 }
 
@@ -523,23 +707,38 @@ creative-tree-row.chat-active .creative-row {
     font-weight: var(--creative-childless-weight, 400);
 }
 
-/* Headings need specific alignment adjustments */
-.level-1 .creative-action-btn,
+/* Dynamic vertical centering: calc((font-size × line-height − icon-size) / 2)
+   Scoped to .creative-row-start to avoid affecting .creative-row-end buttons. */
+.level-1 .creative-row-start > .creative-action-btn,
 .level-1 .select-creative-checkbox,
 .level-1 .creative-toggle-btn {
-    margin-top: 8px;
+    margin-top: calc((var(--creative-h1-size, 1.3em) * var(--creative-h1-lh, 1.3) - var(--creative-icon-size, 16px)) / 2);
 }
 
-.level-2 .creative-action-btn,
+.level-2 .creative-row-start > .creative-action-btn,
 .level-2 .select-creative-checkbox,
 .level-2 .creative-toggle-btn {
-    margin-top: 7px;
+    margin-top: calc((var(--creative-h2-size, 1.2em) * var(--creative-h2-lh, 1.3) - var(--creative-icon-size, 16px)) / 2);
 }
 
-.level-3 .creative-action-btn,
+.level-3 .creative-row-start > .creative-action-btn,
 .level-3 .select-creative-checkbox,
 .level-3 .creative-toggle-btn {
-    margin-top: 6px;
+    margin-top: calc((var(--creative-h3-size, 1.1em) * var(--creative-h3-lh, 1.3) - var(--creative-icon-size, 16px)) / 2);
+}
+
+/* Childless items (level 1-3 without children) use body font size.
+   Scoped to .creative-row-start to avoid affecting .creative-row-end buttons. */
+.level-1:has(.creative-childless) .creative-row-start > .creative-action-btn,
+.level-2:has(.creative-childless) .creative-row-start > .creative-action-btn,
+.level-3:has(.creative-childless) .creative-row-start > .creative-action-btn,
+.level-1:has(.creative-childless) .creative-toggle-btn,
+.level-2:has(.creative-childless) .creative-toggle-btn,
+.level-3:has(.creative-childless) .creative-toggle-btn,
+.level-1:has(.creative-childless) .select-creative-checkbox,
+.level-2:has(.creative-childless) .select-creative-checkbox,
+.level-3:has(.creative-childless) .select-creative-checkbox {
+    margin-top: calc((1em * var(--creative-body-lh, 1.5) - var(--creative-icon-size, 16px)) / 2);
 }
 
 
@@ -549,7 +748,6 @@ creative-tree-row.chat-active .creative-row {
     display: flex;
     align-items: flex-start;
     margin-left: 0;
-    /* Indentation now comes from tree lines; avoid extra left margin here */
 }
 
 .comments-btn {
@@ -557,15 +755,6 @@ creative-tree-row.chat-active .creative-row {
     height: 28px;
     position: relative;
     color: var(--text-primary);
-    margin-top: -2px;
-    /* Move higher as requested */
-}
-
-/* Ensure comments button stays high for headings, overriding generic action button margin */
-.level-1 .comments-btn,
-.level-2 .comments-btn,
-.level-3 .comments-btn {
-    margin-top: -2px;
 }
 
 /* Add spacing for headings via row padding to preserve alignment */
@@ -717,3 +906,9 @@ creative-tree-row[archived] .creative-tree {
 creative-tree-row[archived] .creative-row {
     background-color: var(--surface-input);
 }
+
+/* Import dropzone drag-over feedback */
+#import-markdown-dropzone.dragover {
+    border-color: var(--color-accent-border);
+    background-color: var(--surface-input);
+}

data/app/channels/collavre/topics_channel.rb

@@ -7,6 +7,8 @@ class TopicsChannel < ApplicationCable::Channel
     return reject unless @creative.has_permission?(current_user, :read)
 
     stream_for @creative
+    # User-specific stream for preference sync (e.g. last_topic_changed)
+    stream_for "user_#{current_user.id}_creative_#{@creative.id}"
   end
 end
 end

data/app/controllers/collavre/comments_controller.rb

@@ -35,8 +35,12 @@ module Collavre
       scope = visible_scope.with_attached_images.includes(:topic, :comment_reactions, :comment_versions)
 
       if params[:search].present?
-        search_term = ActiveRecord::Base.sanitize_sql_like(params[:search].to_s.strip.downcase)
-        scope = scope.where("LOWER(comments.content) LIKE ?", "%#{search_term}%")
+        words = params[:search].to_s.strip.downcase.split(/\s+/)
+                  .first(Creatives::Filters::SearchFilter::MAX_SEARCH_WORDS)
+        words.each do |word|
+          sanitized = "%#{ActiveRecord::Base.sanitize_sql_like(word)}%"
+          scope = scope.where("LOWER(comments.content) LIKE ?", sanitized)
+        end
       end
 
       # Filter by topic

data/app/controllers/collavre/concerns/tree_manageable.rb

@@ -70,7 +70,7 @@ module Collavre
 
         # HTTP caching disabled for children endpoint:
         # Response depends on child updates, permission changes (CreativeSharesCache),
-        # and CreativeExpandedState. Tracking all dependencies reliably is expensive
+        # and UserCreativePreference. Tracking all dependencies reliably is expensive
         # (requires descendant_ids query). Stale 304 responses could leak data after
         # permission revocation. Re-enable when a cheap version key mechanism exists.
         # Use private + no-store to prevent any caching (proxy or browser).
@@ -117,7 +117,7 @@ module Collavre
       private
 
       def render_children_json(parent, user_id, allowed_ids, progress_map)
-        expanded_state_map = CreativeExpandedState
+        expanded_state_map = UserCreativePreference
                                 .where(user_id: user_id, creative_id: parent.id)
                                 .first&.expanded_status || {}
         children = parent.children_with_permission(Current.user)

data/app/controllers/collavre/creatives_controller.rb

@@ -33,7 +33,7 @@ module Collavre
           end
 
           @expanded_state_map = if user_id_for_state
-            CreativeExpandedState.where(user_id: user_id_for_state, creative_id: params[:id]).first&.expanded_status || {}
+            UserCreativePreference.where(user_id: user_id_for_state, creative_id: params[:id]).first&.expanded_status || {}
           else
             {}
           end
@@ -226,7 +226,27 @@ module Collavre
 
         if success
           format.html { redirect_to @creative }
-          format.json { head :ok }
+          format.json do
+            base.reload
+            response_data = {
+              id: base.id,
+              progress: base.progress,
+              progress_html: view_context.render_creative_progress(base),
+              has_children: base.children.exists?
+            }
+            # Build ancestor chain for progress updates (closure_tree: 1 SELECT via hierarchy table)
+            ancestor_records = base.ancestors.order(:id)
+            if ancestor_records.any?
+              response_data[:ancestors] = ancestor_records.map do |anc|
+                {
+                  id: anc.id,
+                  progress: anc.progress,
+                  progress_html: view_context.render_creative_progress(anc, has_children: true)
+                }
+              end
+            end
+            render json: response_data
+          end
         else
           format.html { render :edit, status: :unprocessable_entity }
           format.json { render json: { errors: @creative.errors.full_messages }, status: :unprocessable_entity }

data/app/controllers/collavre/topics_controller.rb

@@ -11,11 +11,18 @@ module Collavre
       preload_primary_agents(active_topics)
       archived_topics = @creative.topics.archived.order(:created_at)
 
+      last_topic_id = if Current.user
+                        UserCreativePreference
+                          .where(user_id: Current.user.id, creative_id: @creative.id)
+                          .pick(:last_topic_id)
+      end
+
       render json: {
         topics: active_topics.map { |t| topic_json(t) },
         archived_topics: archived_topics,
         can_manage: can_manage,
-        can_create_topic: can_create_topic
+        can_create_topic: can_create_topic,
+        last_topic_id: last_topic_id
       }
     end
 
@@ -27,22 +34,43 @@ module Collavre
       topic = @creative.topics.build(topic_params)
       topic.user = Current.user
 
-      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?
+      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
 
-        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
+    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
@@ -70,6 +98,8 @@ module Collavre
 
       topic = @creative.topics.find(params[:id])
       topic_id = topic.id
+
+      # last_topic_id is nullified by DB FK (on_delete: :nullify) and model dependent: :nullify
       topic.destroy
 
       TopicsChannel.broadcast_to(
@@ -202,6 +232,20 @@ module Collavre
       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)