collavre 0.15.0 → 0.20.0

data/app/javascript/modules/integration_wizard.js

@@ -0,0 +1,162 @@
+/**
+ * Integration Wizard — shared helpers for integration modal wizards.
+ *
+ * Provides common utilities used across Slack, Notion, and future
+ * integration wizard UIs: CSRF handling, error display, step management,
+ * OAuth popups, fetch wrappers, and modal close behavior.
+ *
+ * Usage:
+ *   import { csrfToken, showError, ... } from 'collavre/modules/integration_wizard'
+ */
+
+/**
+ * Read the Rails CSRF token from the meta tag.
+ * @returns {string|undefined}
+ */
+export function csrfToken() {
+  return document.querySelector('meta[name="csrf-token"]')?.content;
+}
+
+/**
+ * Display an error message inside the given element.
+ * @param {HTMLElement} el - The error container element
+ * @param {string} message - Error text to display
+ */
+export function showError(el, message) {
+  if (!message) return;
+  el.textContent = message;
+  el.style.display = 'block';
+}
+
+/**
+ * Hide and clear the error element.
+ * @param {HTMLElement} el - The error container element
+ */
+export function clearError(el) {
+  el.style.display = 'none';
+  el.textContent = '';
+}
+
+/**
+ * Show/hide step panes by step name.
+ *
+ * @param {string} currentStep - The active step name
+ * @param {string[]} stepNames - All step names in order
+ * @param {string} prefix - DOM id prefix, e.g. 'slack-step' produces ids like 'slack-step-connect'
+ */
+export function updateStepVisibility(currentStep, stepNames, prefix) {
+  stepNames.forEach(function (step) {
+    const el = document.getElementById(`${prefix}-${step}`);
+    if (!el) return;
+    el.style.display = (step === currentStep) ? 'block' : 'none';
+  });
+}
+
+/**
+ * Open a centered OAuth popup window and poll for its closure.
+ *
+ * @param {string} windowName - Name for window.open (e.g. 'slack-auth-window')
+ * @param {Object} options
+ * @param {number} [options.width=600] - Popup width
+ * @param {number} [options.height=700] - Popup height
+ * @param {string} [options.url=''] - URL to open (pass '' if submitting a form to the window)
+ * @param {Function} [options.onClose] - Callback invoked when the popup is closed
+ * @returns {Window|null} The opened window reference
+ */
+export function openOAuthPopup(windowName, options = {}) {
+  const width = options.width || 600;
+  const height = options.height || 700;
+  const left = (screen.width - width) / 2;
+  const top = (screen.height - height) / 2;
+  const url = options.url || '';
+
+  const authWindow = window.open(
+    url,
+    windowName,
+    `width=${width},height=${height},left=${left},top=${top},scrollbars=yes,resizable=yes`
+  );
+
+  if (authWindow && options.onClose) {
+    const checkClosed = setInterval(() => {
+      if (authWindow.closed) {
+        clearInterval(checkClosed);
+        setTimeout(() => options.onClose(), 1000);
+      }
+    }, 1000);
+  }
+
+  return authWindow;
+}
+
+/**
+ * Perform a fetch request with CSRF token and JSON headers.
+ *
+ * @param {string} url - Request URL
+ * @param {Object} [options={}]
+ * @param {string} [options.method='GET'] - HTTP method
+ * @param {Object} [options.body] - Body payload (will be JSON-stringified)
+ * @param {Object} [options.headers] - Additional headers (merged with defaults)
+ * @returns {Promise<Response>}
+ */
+export function fetchWithCsrf(url, options = {}) {
+  const method = options.method || 'GET';
+  const headers = {
+    'X-CSRF-Token': csrfToken(),
+    'Accept': 'application/json',
+    ...options.headers,
+  };
+
+  // Include Content-Type for requests with a body
+  if (options.body) {
+    headers['Content-Type'] = 'application/json';
+  }
+
+  const fetchOptions = { method, headers };
+  if (options.body) {
+    fetchOptions.body = JSON.stringify(options.body);
+  }
+
+  return fetch(url, fetchOptions);
+}
+
+/**
+ * Hide a list of DOM elements (set display to 'none') and optionally clear their content.
+ *
+ * @param {Array<{el: HTMLElement|null, clear?: boolean}>} items
+ *   Each item has an `el` (may be null) and an optional `clear` flag.
+ *   When `clear` is true, textContent or innerHTML is also reset.
+ */
+export function resetElements(items) {
+  items.forEach(function ({ el, clear }) {
+    if (!el) return;
+    el.style.display = 'none';
+    if (clear) {
+      if ('innerHTML' in el && el.tagName !== 'INPUT') {
+        el.textContent = '';
+      }
+    }
+  });
+}
+
+/**
+ * Set up common modal close behavior: close button, backdrop click, and Escape key.
+ *
+ * @param {HTMLElement} modal - The modal overlay element
+ * @param {HTMLElement} closeBtn - The close button element
+ * @param {Function} onClose - Callback to execute on close (e.g. resetWizard)
+ */
+export function setupModalClose(modal, closeBtn, onClose) {
+  if (closeBtn) {
+    closeBtn.addEventListener('click', function () {
+      modal.style.display = 'none';
+      onClose();
+    });
+  }
+
+  modal.addEventListener('click', function (e) {
+    if (e.target === modal) {
+      modal.style.display = 'none';
+      onClose();
+    }
+  });
+}

data/app/jobs/collavre/compress_job.rb

@@ -49,6 +49,7 @@ module Collavre
         model: agent.llm_model,
         system_prompt: system_prompt,
         llm_api_key: agent.llm_api_key || agent.creator&.llm_api_key,
+        gateway_url: agent.gateway_url.presence || agent.creator&.gateway_url,
         context: {
           creative: creative,
           user: agent,

data/app/jobs/collavre/creative_broadcast_job.rb

@@ -233,8 +233,11 @@ module Collavre
 
       svg = raw.dup
       if options[:class]
-        svg.sub!(/<svg\b/, %(<svg class="#{options[:class]}"))
+        escaped_class = ERB::Util.html_escape(options[:class])
+        svg.sub!(/<svg\b/, %(<svg class="#{escaped_class}"))
       end
+      # Safe: SVG source is a static asset file bundled with the app;
+      # user-supplied class attribute is escaped above via html_escape.
       svg.html_safe # rubocop:disable Rails/OutputSafety
     end
 

data/app/jobs/collavre/merge_comments_job.rb

@@ -48,6 +48,7 @@ module Collavre
         model: agent.llm_model,
         system_prompt: SYSTEM_PROMPT,
         llm_api_key: agent.llm_api_key || agent.creator&.llm_api_key,
+        gateway_url: agent.gateway_url.presence || agent.creator&.gateway_url,
         context: {
           creative: creative,
           user: agent,

data/app/jobs/collavre/trigger_loop_check_job.rb

@@ -233,6 +233,7 @@ module Collavre
         model: verifier.llm_model,
         system_prompt: LLM_FALLBACK_SYSTEM_PROMPT,
         llm_api_key: verifier.llm_api_key || verifier.creator&.llm_api_key,
+        gateway_url: verifier.gateway_url.presence || verifier.creator&.gateway_url,
         context: {}
       )
 

data/app/jobs/collavre/trigger_loop_verify_job.rb

@@ -151,6 +151,7 @@ module Collavre
         model: verifier.llm_model,
         system_prompt: VERIFY_SYSTEM_PROMPT,
         llm_api_key: verifier.llm_api_key || verifier.creator&.llm_api_key,
+        gateway_url: verifier.gateway_url.presence || verifier.creator&.gateway_url,
         context: {}
       )
 

data/app/models/collavre/calendar_event.rb

@@ -9,10 +9,6 @@ module Collavre
 
     after_commit :delete_google_event, on: :destroy
 
-    def synced_to_google?
-      google_event_id.present?
-    end
-
     private
 
     def delete_google_event

data/app/models/collavre/comment/broadcastable.rb

@@ -27,7 +27,7 @@ module Collavre
           pointers = CommentReadPointer.where(user_id: user_ids, creative: origin).index_by(&:user_id)
           present_user_ids = CommentPresenceStore.list(origin.id)
 
-          public_count = origin.comments.where(private: false).count
+          public_count = origin.comments.public_only.count
           private_counts = origin.comments
             .where(private: true, user_id: user_ids)
             .group(:user_id)

data/app/models/collavre/comment.rb

@@ -13,9 +13,12 @@ module Collavre
     belongs_to :user, class_name: Collavre.configuration.user_class_name, optional: true
     belongs_to :approver, class_name: Collavre.configuration.user_class_name, optional: true
     belongs_to :action_executed_by, class_name: Collavre.configuration.user_class_name, optional: true
+    belongs_to :task, class_name: "Collavre::Task", optional: true
     belongs_to :topic, class_name: "Collavre::Topic", optional: true
     belongs_to :quoted_comment, class_name: "Collavre::Comment", optional: true
 
+    scope :public_only, -> { where(private: false) }
+
     scope :visible_to, ->(user) {
       where(
         "comments.private = ? OR comments.user_id = ? OR comments.approver_id = ?",
@@ -49,6 +52,7 @@ module Collavre
 
     before_validation :use_origin_creative
     before_validation :assign_default_user, on: :create
+    before_validation :assign_main_topic, on: :create
     before_save :apply_link_previews, if: :should_apply_link_previews?
     after_create_commit :dispatch_to_orchestration
     after_create_commit :resume_trigger_loop_if_awaiting
@@ -104,8 +108,10 @@ module Collavre
     end
 
     def cancel_pending_tasks
-      # Cancel tasks triggered by this comment
-      Task.where(status: %w[pending running queued]).each do |task|
+      # Cancel tasks triggered by this comment (no creative_id scoping —
+      # CommentMoveService can change comment.creative_id without updating
+      # existing tasks, so scoping would miss moved-comment tasks)
+      Task.where(status: %w[pending running queued]).find_each do |task|
         if task.trigger_event_payload&.dig("comment", "id") == id
           task.update!(status: "cancelled")
         end
@@ -133,6 +139,7 @@ module Collavre
       return unless user_id        # nil user = system message
       return if user&.ai_user?     # AI replies use A2aDispatcher, not this callback
       return unless creative
+      return if creative.inbox?
 
       SystemEvents::Dispatcher.dispatch("comment_created", dispatch_payload)
     rescue StandardError => e
@@ -205,6 +212,14 @@ module Collavre
       )
     end
 
+    def assign_main_topic
+      return if topic_id.present?
+      return unless creative
+
+      fallback = user || Collavre.current_user || creative.user
+      self.topic = creative.main_topic(fallback_user: fallback)
+    end
+
     def use_origin_creative
       return unless creative
       self.creative = creative.effective_origin

data/app/models/collavre/comment_snapshot.rb

@@ -13,7 +13,6 @@ module Collavre
     validates :comments_data, presence: true
 
     scope :restorable, -> { where(restored_at: nil) }
-    scope :restored, -> { where.not(restored_at: nil) }
 
     def restorable?
       restored_at.nil?

data/app/models/collavre/creative/describable.rb

@@ -6,6 +6,7 @@ module Collavre
       included do
         validates :description, presence: true, unless: -> { origin_id.present? }
         validate :description_cannot_change_if_has_origin, on: :update
+        validate :description_cannot_change_if_github_source, on: :update
 
         before_save :sanitize_description_html
         after_destroy_commit :purge_description_attachments
@@ -60,7 +61,7 @@ module Collavre
             blob.purge
           rescue ActiveRecord::RecordNotFound, ActiveSupport::MessageVerifier::InvalidSignature
             Rails.logger.warn("Creative##{id}: could not find blob for signed_id=#{signed_id}")
-          rescue => e
+          rescue StandardError => e
             Rails.logger.error("Creative##{id}: failed to purge blob #{signed_id}: #{e.message}")
           end
         end
@@ -82,6 +83,14 @@ module Collavre
           errors.add(:description, "cannot be changed directly when linked to an origin")
         end
       end
+
+      def description_cannot_change_if_github_source
+        return unless will_save_change_to_description?
+        return unless github_markdown?
+        return if @skip_github_validation
+
+        errors.add(:description, "cannot be changed directly for GitHub synced content")
+      end
     end
   end
 end

data/app/models/collavre/creative/realtime_broadcastable.rb

@@ -27,7 +27,9 @@ module Collavre
         # Skip broadcast when only progress changed (cascade from update_parent_progress).
         # The original creative's broadcast already includes ancestor progress in its payload,
         # so receivers update parent rows without needing separate broadcasts per ancestor.
-        return if progress_only_change?
+        # Exception: MCP requests must always broadcast because the browser has no HTTP
+        # response to update from — WebSocket is the only delivery channel.
+        return if progress_only_change? && !Collavre::Current.mcp_request
 
         enqueue_broadcast(:updated, broadcast_node_payload)
       rescue StandardError => e
@@ -58,11 +60,10 @@ module Collavre
       def broadcast_creative_destroyed
         return if @_destroy_broadcast_users.blank?
 
-        current_user_id = Collavre.current_user&.id
         CreativeBroadcastJob.perform_later(
           id,
           "destroyed",
-          current_user_id: current_user_id,
+          current_user_id: broadcast_excludable_user_id,
           payload: @_destroy_payload,
           options: {
             destroy_user_ids: @_destroy_broadcast_users.map(&:id),
@@ -134,11 +135,13 @@ module Collavre
 
       # Enqueue broadcast as a background job to avoid blocking the request cycle.
       # Payload is built synchronously (needs fresh DB state), then delivery is async.
+      # For MCP requests, current_user_id is nil so the job broadcasts to ALL users
+      # including the requester (whose browser relies solely on WebSocket updates).
       def enqueue_broadcast(action, payload)
         CreativeBroadcastJob.perform_later(
           id,
           action.to_s,
-          current_user_id: Collavre.current_user&.id,
+          current_user_id: broadcast_excludable_user_id,
           payload: payload
         )
       end
@@ -153,7 +156,7 @@ module Collavre
         CreativeBroadcastJob.perform_later(
           creative_ids,
           "batch_created",
-          current_user_id: Collavre.current_user&.id
+          current_user_id: broadcast_excludable_user_id
         )
       end
 
@@ -251,6 +254,15 @@ module Collavre
         Rails.logger.error "[CreativeBroadcast] Error finding users: #{e.message}"
         []
       end
+      # Returns nil for MCP requests so broadcast includes all users;
+      # returns current_user's ID for web requests so the requester is excluded.
+      def self.broadcast_excludable_user_id
+        Collavre::Current.mcp_request ? nil : Collavre.current_user&.id
+      end
+
+      def broadcast_excludable_user_id
+        RealtimeBroadcastable.broadcast_excludable_user_id
+      end
     end
   end
 end

data/app/models/collavre/creative.rb

@@ -13,7 +13,7 @@ module Collavre
     after_save :touch_subtree_on_move, if: :saved_change_to_parent_id?
     after_save :fire_drop_trigger_on_move, if: :saved_change_to_parent_id?
     after_create_commit :fire_drop_trigger_on_create, if: :parent_id?
-
+    after_create :create_main_topic
 
     include Linkable
     include Permissible
@@ -34,11 +34,19 @@ module Collavre
     scope :inboxes, -> { where("data->>'kind' = 'inbox'") }
 
     SYSTEM_TOPIC_NAME = "System"
+    MAIN_TOPIC_NAME = "Main"
+    CONTENT_TOPIC_NAME = "Content"
 
     def inbox?
       data&.dig("kind") == "inbox"
     end
 
+    attr_accessor :skip_github_validation
+
+    def github_markdown?
+      data.is_a?(Hash) && data.dig("source", "type") == "github_markdown"
+    end
+
     # Find or create the "System" topic for this inbox creative.
     # Re-creates it if the user deletes it.
     def system_topic(fallback_user: user)
@@ -47,6 +55,18 @@ module Collavre
       end
     end
 
+    def main_topic(fallback_user: user)
+      topics.find_or_create_by!(name: MAIN_TOPIC_NAME) do |topic|
+        topic.user = fallback_user
+      end
+    end
+
+    def content_topic(fallback_user: user)
+      topics.find_or_create_by!(name: CONTENT_TOPIC_NAME) do |topic|
+        topic.user = fallback_user
+      end
+    end
+
     # Find or create the inbox creative for a given user.
     # Places it as a root creative (no parent) owned by the user.
     def self.inbox_for(user)
@@ -124,6 +144,11 @@ module Collavre
       Array(data&.dig("context_ids"))
     end
 
+    # Returns the directly-configured disabled context IDs for this creative.
+    def disabled_context_ids
+      Array(data&.dig("disabled_context_ids"))
+    end
+
     # Returns the effective context IDs: own + inherited from ancestors (deduplicated).
     def effective_context_ids(visited_ids = Set.new)
       return [] if visited_ids.include?(id)
@@ -134,6 +159,16 @@ module Collavre
       (own + parent_ctx).uniq
     end
 
+    # Returns the effective disabled context IDs: own + inherited from ancestors (deduplicated).
+    def effective_disabled_context_ids(visited_ids = Set.new)
+      return [] if visited_ids.include?(id)
+
+      visited_ids.add(id)
+      own = disabled_context_ids
+      parent_disabled = parent&.effective_disabled_context_ids(visited_ids) || []
+      (own + parent_disabled).uniq
+    end
+
     # Returns context creatives (excludes self to avoid duplication).
     def context_creatives
       ids = effective_context_ids
@@ -287,5 +322,12 @@ module Collavre
 
       DropTriggerJob.perform_later(parent_id, id)
     end
+
+    def create_main_topic
+      effective_user = user || Collavre.current_user
+      return unless effective_user
+
+      topics.create!(name: MAIN_TOPIC_NAME, user: effective_user)
+    end
   end
 end

data/app/models/collavre/current.rb

@@ -5,8 +5,8 @@ module Collavre
     attribute :session
     attribute :creative_share_cache
     attribute :mcp_tool_approval_required
+    attribute :mcp_request
     attribute :user
-
     def user
       super || session&.user
     end

data/app/models/collavre/inbox_item.rb

@@ -22,10 +22,6 @@ module Collavre
 
     scope :new_items, -> { where(state: "new") }
 
-    def read?
-      state == "read"
-    end
-
     def localized_message(locale: I18n.locale)
       msg =
         if message_key.present?

data/app/models/collavre/system_setting.rb

@@ -33,6 +33,9 @@ module Collavre
     DEFAULT_LIGHT_THEME_ID = nil
     DEFAULT_DARK_THEME_ID = nil
 
+    # Default LLM request timeout (seconds)
+    DEFAULT_LLM_REQUEST_TIMEOUT_SECONDS = 1800
+
     # Default creative display settings (system-wide)
     DEFAULT_DISPLAY_LEVEL = 6
     DEFAULT_COMPLETION_MARK = ""
@@ -57,7 +60,7 @@ module Collavre
         password_reset_rate_limit password_reset_rate_period_minutes
         api_rate_limit api_rate_period_minutes auth_providers_disabled
         creatives_login_required home_page_path default_light_theme_id default_dark_theme_id
-        display_level completion_mark
+        display_level completion_mark llm_request_timeout_seconds
       ].each { |k| Rails.cache.delete("system_setting:#{k}") }
     end
 
@@ -181,5 +184,11 @@ module Collavre
       value = cached_value("completion_mark")
       value.nil? ? DEFAULT_COMPLETION_MARK : value
     end
+
+    # LLM request timeout (seconds)
+    def self.llm_request_timeout_seconds
+      value = cached_value("llm_request_timeout_seconds")&.to_i
+      value.nil? || value < 30 ? DEFAULT_LLM_REQUEST_TIMEOUT_SECONDS : value
+    end
   end
 end

data/app/models/collavre/task.rb

@@ -7,10 +7,12 @@ module Collavre
     belongs_to :parent_task, class_name: "Collavre::Task", optional: true
     has_many :sub_tasks, class_name: "Collavre::Task", foreign_key: :parent_task_id, dependent: :destroy
     belongs_to :creative, class_name: "Collavre::Creative", optional: true
+    has_one :reply_comment, class_name: "Collavre::Comment", foreign_key: :task_id, dependent: :nullify
 
     validates :name, presence: true
 
     after_update_commit :check_trigger_loop_completion, if: :trigger_loop_candidate?
+    after_update_commit :broadcast_stop_button_removal, if: :became_terminal?
 
     scope :running_for_topic, ->(topic_id, creative_id = nil) {
       rel = where(topic_id: topic_id, status: "running")
@@ -32,14 +34,6 @@ module Collavre
       false
     end
 
-    def workflow_parent?
-      workflow_state.present? && parent_task_id.nil?
-    end
-
-    def all_sub_tasks_done?
-      sub_tasks.where.not(status: %w[done cancelled]).empty?
-    end
-
     private
 
     def trigger_loop_candidate?
@@ -56,6 +50,21 @@ module Collavre
       trigger_topic_id.nil? || trigger_topic_id == topic_id
     end
 
+    def became_terminal?
+      saved_change_to_attribute?("status") && status.in?(%w[done cancelled failed])
+    end
+
+    def broadcast_stop_button_removal
+      comment = reply_comment
+      return unless comment
+
+      comment.broadcast_replace_to(
+        [ comment.creative, :comments ],
+        partial: "collavre/comments/comment",
+        locals: { comment: comment, streaming: false }
+      )
+    end
+
     def check_trigger_loop_completion
       loop_config = creative.data&.dig("trigger", "loop")
       cooldown = (loop_config&.dig("cooldown_seconds") || 10).to_i

data/app/models/collavre/user.rb

@@ -77,7 +77,8 @@ module Collavre
         "chat_history" => 50,
         "chat_history_size" => 100_000,
         "creative_children_level" => nil
-      }
+      },
+      "session" => { "enabled" => nil }
     }.freeze
 
     # Default creative children level when agent_conf doesn't specify one
@@ -112,6 +113,15 @@ module Collavre
       level.nil? ? DEFAULT_CREATIVE_CHILDREN_LEVEL : level.to_i
     end
 
+    # Whether this agent uses stateful sessions (incremental messaging).
+    # nil in agent_conf = auto-detect by vendor (openclaw → true).
+    def supports_session?
+      explicit = parsed_agent_conf.dig("session", "enabled")
+      return ActiveModel::Type::Boolean.new.cast(explicit) unless explicit.nil?
+
+      llm_vendor&.downcase == "openclaw"
+    end
+
     encrypts :llm_api_key, deterministic: false
     encrypts :google_access_token, deterministic: false
     encrypts :google_refresh_token, deterministic: false

data/app/models/concerns/collavre/ai_agent_resolvable.rb

@@ -30,13 +30,5 @@ module Collavre
       context["topic"] = { "id" => topic_id } if topic_id.present?
       context
     end
-
-    def default_vendor
-      "google"
-    end
-
-    def default_model
-      "gemini-3-flash-preview"
-    end
   end
 end