collavre 0.20.2 → 0.21.0

data/lib/collavre/integration_settings/registry.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "singleton"
+
+module Collavre
+  module IntegrationSettings
+    # Singleton registry of integration setting key definitions.
+    # Engines register their keys at boot via `to_prepare`, then the
+    # admin UI and {Resolver} consult this registry.
+    class Registry
+      include Singleton
+
+      def initialize
+        @definitions = {}
+      end
+
+      # Register a key definition.
+      #
+      # @param key [Symbol, String] canonical identifier (e.g. :slack_client_id)
+      # @param category [String] grouping label (e.g. "slack")
+      # @param sensitive [Boolean] when true, value is masked in admin UI
+      # @param requires_restart [Boolean] when true, surfaces restart-required badge
+      # @param env_var [String, nil] ENV variable name (defaults to key.upcase)
+      # @param default [String, nil] static fallback used when DB & ENV blank
+      # @return [KeyDefinition]
+      def register(key, category:, sensitive: true, requires_restart: false, env_var: nil, default: nil)
+        key = key.to_sym
+        @definitions[key] = KeyDefinition.new(
+          key: key,
+          category: category,
+          sensitive: sensitive,
+          requires_restart: requires_restart,
+          env_var: env_var || key.to_s.upcase,
+          default: default
+        )
+      end
+
+      # @return [Array<KeyDefinition>] all registered definitions (frozen snapshot)
+      def all
+        @definitions.values.freeze
+      end
+
+      # @param key [Symbol, String]
+      # @return [KeyDefinition, nil]
+      def find(key)
+        @definitions[key.to_sym]
+      end
+
+      # @return [Hash{String => Array<KeyDefinition>}] definitions grouped by category
+      def by_category
+        @definitions.values.group_by(&:category)
+      end
+    end
+  end
+end

data/lib/collavre/integration_settings/resolver.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module Collavre
+  module ::Collavre::IntegrationSettings
+    # Resolves the live value for a registered integration setting key.
+    #
+    # Precedence: **DB > ENV > registered default.**
+    # - DB value wins as long as an `::Collavre::IntegrationSetting` row exists with a
+    #   non-blank value (encrypted at rest via `::Collavre::IntegrationSetting`).
+    # - ENV is consulted only when no DB row exists.
+    # - The registry's static default is the final fallback.
+    #
+    # Caching:
+    # - **Sensitive** definitions are NEVER cached. `Rails.cache` may resolve
+    #   to a durable store (e.g. `:solid_cache_store` in production), which
+    #   would persist decrypted secrets outside the encrypted `value` column
+    #   and defeat at-rest encryption. Sensitive reads hit the DB every time.
+    # - **Non-sensitive** definitions are memoized in `Rails.cache` for 5
+    #   minutes under `::Collavre::IntegrationSetting.cache_key_for(key)`. The model's
+    #   `after_commit` hook invalidates this key on any write.
+    class Resolver
+      # Raised by {.get} when the key has not been registered.
+      class UnknownKeyError < StandardError; end
+
+      CACHE_TTL = 5.minutes
+
+      class << self
+        # Resolve the current value for a registered key.
+        #
+        # @param key [Symbol, String]
+        # @return [String, nil]
+        # @raise [UnknownKeyError] if the key is not registered
+        def get(key)
+          definition = Registry.instance.find(key) or
+            raise UnknownKeyError, "Unknown integration setting: #{key}"
+
+          return resolve(definition) if definition.sensitive
+
+          Rails.cache.fetch(::Collavre::IntegrationSetting.cache_key_for(definition.key), expires_in: CACHE_TTL) do
+            resolve(definition)
+          end
+        end
+
+        # Report which source currently provides the value for a key.
+        #
+        # @param key [Symbol, String]
+        # @return [Symbol] one of `:db`, `:env`, `:default`, or `:unknown`
+        def source_for(key)
+          definition = Registry.instance.find(key) or return :unknown
+          return :db  if ::Collavre::IntegrationSetting.find_by(key: definition.key)&.value.present?
+          return :env if ENV[definition.env_var].present?
+          :default
+        end
+
+        private
+
+        def resolve(definition)
+          db_value(definition) || env_value(definition) || definition.default
+        end
+
+        def db_value(definition)
+          ::Collavre::IntegrationSetting.find_by(key: definition.key)&.value.presence
+        end
+
+        def env_value(definition)
+          ENV[definition.env_var].presence
+        end
+      end
+    end
+  end
+end

data/lib/collavre/integration_settings.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+# Entry point for the Collavre integration settings subsystem.
+# Loads the registry value-object, registry singleton, and resolver
+# (when present). Loaded from `engines/collavre/lib/collavre.rb` so
+# constants are available before any engine `to_prepare` blocks run.
+
+require_relative "integration_settings/key_definition"
+require_relative "integration_settings/registry"
+require_relative "integration_settings/resolver"
+
+module Collavre
+  module IntegrationSettings
+    # Resolve a registered key with a safety net for boot-time consumers.
+    # Returns `Resolver.get(key)` when the registry+DB are reachable, otherwise
+    # falls back to `ENV[key.upcase]`. After the next boot, the DB value wins —
+    # matching the `requires_restart` semantics callers register.
+    #
+    # `boot_safe: true` additionally rescues `ActiveRecord::Encryption::Errors::Base`
+    # so callers reached before `config/initializers/active_record_encryption.rb`
+    # runs (e.g. `storage.yml`, `config/environments/*.rb`) cannot crash the boot
+    # if an encrypted row is unreadable. Runtime callers MUST leave this false so
+    # decryption failures surface instead of silently treating values as blank.
+    def self.fetch(key, default: nil, boot_safe: false)
+      return ENV[key.to_s.upcase].presence || default unless defined?(Resolver)
+
+      value =
+        begin
+          Resolver.get(key)
+        rescue Resolver::UnknownKeyError
+          nil
+        rescue ActiveRecord::StatementInvalid,
+               ActiveRecord::NoDatabaseError,
+               ActiveRecord::ConnectionNotEstablished,
+               NameError
+          ENV[key.to_s.upcase]
+        rescue StandardError => e
+          raise unless boot_safe &&
+                       defined?(ActiveRecord::Encryption::Errors::Base) &&
+                       e.is_a?(ActiveRecord::Encryption::Errors::Base)
+          ENV[key.to_s.upcase]
+        end
+      value.presence || default
+    end
+  end
+end

data/lib/collavre/ses_settings_interceptor.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Collavre
+  # ActionMailer interceptor that injects AWS SES SMTP settings (address,
+  # user_name, password) into each outgoing message at send time, sourced
+  # from `IntegrationSettings` (DB > ENV) with a Rails credentials fallback.
+  #
+  # Registered via `Collavre::Engine` so admins can rotate SES credentials
+  # through `/admin/integrations` without redeploying. Only acts on SMTP
+  # delivery — other delivery methods (`:test`, `:letter_opener`, etc.) pass
+  # through untouched.
+  class SesSettingsInterceptor
+    SES_ADDRESS_PATTERN = /\Aemail-smtp\.[a-z0-9-]+\.amazonaws\.com\z/
+
+    class << self
+      def delivering_email(message)
+        return unless message.delivery_method.is_a?(::Mail::SMTP)
+
+        settings = message.delivery_method.settings
+        # Scope to SES-bound messages only. The engine registers this
+        # interceptor globally, so host apps using a non-SES SMTP provider
+        # (SendGrid, Mailgun, custom relay) must pass through untouched —
+        # otherwise we'd clobber their address/user_name/password.
+        return unless ses_target?(settings)
+
+        region = resolve_region
+        creds  = Collavre::AwsCredentials.ses_smtp
+
+        settings[:address] = "email-smtp.#{region}.amazonaws.com" if region.present?
+        # `AwsCredentials.ses_smtp` returns only source-coherent pairs (both DB,
+        # both ENV, or both credentials). When admins save just one half via
+        # /admin/integrations while the other still lives in ENV, the helper
+        # drops the partial DB write and falls through to a coherent ENV/cred
+        # pair, avoiding mismatched (db-user, env-pass) injections that would
+        # break every SMTP delivery.
+        if creds[:user_name].present? && creds[:password].present?
+          settings[:user_name] = creds[:user_name]
+          settings[:password]  = creds[:password]
+        else
+          # No coherent pair available (admin reset DB and no ENV/credentials
+          # fallback). Clear stale settings so we don't keep using boot-time
+          # or previously-injected credentials — these keys are registered
+          # with requires_restart: false, so runtime reset must take effect.
+          settings.delete(:user_name)
+          settings.delete(:password)
+        end
+      end
+
+      private
+
+      # SES intent is signaled exclusively by an SES-shaped SMTP address
+      # (`email-smtp.<region>.amazonaws.com`). The boot scaffold in
+      # `config/environments/production.rb` only emits that shape when
+      # `ses_region` is resolvable, so a non-SES address — including
+      # `Mail::SMTP`'s hard-coded `"localhost"` default and explicit relays
+      # like `smtp.sendgrid.net` — means the host is using a different
+      # provider (or a real local relay). Bail in those cases so we don't
+      # clobber the host's address or wipe authenticated credentials.
+      def ses_target?(settings)
+        address = settings[:address].to_s
+        return true if address.empty?
+
+        address.match?(SES_ADDRESS_PATTERN)
+      end
+
+      def resolve_region
+        value = Collavre::IntegrationSettings.fetch(:aws_region, default: ENV["AWS_REGION"])
+        value.presence || Rails.application.credentials.dig(:aws, :region)
+      end
+    end
+  end
+end

data/lib/collavre/version.rb

@@ -1,3 +1,3 @@
 module Collavre
-  VERSION = "0.20.2"
+  VERSION = "0.21.0"
 end

data/lib/collavre.rb

@@ -3,6 +3,9 @@ require "collavre/configuration"
 require "collavre/engine"
 require "collavre/user_extensions"
 require "collavre/integration_registry"
+require "collavre/integration_settings"
+require "collavre/aws_credentials"
+require "collavre/ses_settings_interceptor"
 require "collavre/view_extensions"
 require "navigation/registry"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.21.0
 platform: ruby
 authors:
 - Collavre
@@ -184,6 +184,7 @@ files:
 - app/assets/stylesheets/collavre/design_tokens.css
 - app/assets/stylesheets/collavre/gnb.css
 - app/assets/stylesheets/collavre/image_lightbox.css
+- app/assets/stylesheets/collavre/landing.css
 - app/assets/stylesheets/collavre/mention_menu.css
 - app/assets/stylesheets/collavre/modal_dialog.css
 - app/assets/stylesheets/collavre/org_chart.css
@@ -209,11 +210,13 @@ files:
 - app/components/collavre/progress_filter_component.html.erb
 - app/components/collavre/progress_filter_component.rb
 - app/components/collavre/user_mention_menu_component.rb
+- app/controllers/collavre/admin/integrations_controller.rb
 - app/controllers/collavre/admin/orchestration_controller.rb
 - app/controllers/collavre/admin/settings_controller.rb
 - app/controllers/collavre/application_controller.rb
 - app/controllers/collavre/attachments_controller.rb
 - app/controllers/collavre/calendar_events_controller.rb
+- app/controllers/collavre/channels_controller.rb
 - app/controllers/collavre/comment_read_pointers_controller.rb
 - app/controllers/collavre/comments/activity_logs_controller.rb
 - app/controllers/collavre/comments/reactions_controller.rb
@@ -235,7 +238,9 @@ files:
 - app/controllers/collavre/google_auth_controller.rb
 - app/controllers/collavre/inbox_items_controller.rb
 - app/controllers/collavre/invites_controller.rb
+- app/controllers/collavre/landing_controller.rb
 - app/controllers/collavre/passwords_controller.rb
+- app/controllers/collavre/public_assets_controller.rb
 - app/controllers/collavre/sessions_controller.rb
 - app/controllers/collavre/tasks_controller.rb
 - app/controllers/collavre/topics_controller.rb
@@ -260,6 +265,7 @@ files:
 - app/helpers/collavre/comments_helper.rb
 - app/helpers/collavre/creatives_helper.rb
 - app/helpers/collavre/navigation_helper.rb
+- app/helpers/collavre/public_assets_helper.rb
 - app/javascript/collavre.js
 - app/javascript/components/ImageResizer.jsx
 - app/javascript/components/InlineLexicalEditor.jsx
@@ -290,6 +296,8 @@ files:
 - app/javascript/controllers/comments/review_quotes_store.js
 - app/javascript/controllers/comments/topics_controller.js
 - app/javascript/controllers/common_popup_controller.js
+- app/javascript/controllers/creatives/__tests__/sync_controller.test.js
+- app/javascript/controllers/creatives/__tests__/tree_controller.test.js
 - app/javascript/controllers/creatives/drag_drop_controller.js
 - app/javascript/controllers/creatives/expansion_controller.js
 - app/javascript/controllers/creatives/import_controller.js
@@ -299,6 +307,7 @@ files:
 - app/javascript/controllers/creatives/tree_controller.js
 - app/javascript/controllers/image_lightbox_controller.js
 - app/javascript/controllers/index.js
+- app/javascript/controllers/landing_video_controller.js
 - app/javascript/controllers/link_creative_controller.js
 - app/javascript/controllers/org_chart_controller.js
 - app/javascript/controllers/popup_menu_controller.js
@@ -339,7 +348,10 @@ files:
 - app/javascript/lib/turbo_stream_actions.js
 - app/javascript/lib/utils/markdown.js
 - app/javascript/lib/utils/table_download.js
+- app/javascript/modules/__tests__/command_args_form.test.js
 - app/javascript/modules/__tests__/creative_progress.test.js
+- app/javascript/modules/__tests__/html_content_empty.test.js
+- app/javascript/modules/__tests__/markdown_source_reconcile.test.js
 - app/javascript/modules/command_args_form.js
 - app/javascript/modules/command_menu.js
 - app/javascript/modules/creative_guide.js
@@ -348,9 +360,11 @@ files:
 - app/javascript/modules/creative_row_swipe.js
 - app/javascript/modules/creatives.js
 - app/javascript/modules/export_to_markdown.js
+- app/javascript/modules/html_content_empty.js
 - app/javascript/modules/inbox_panel.js
 - app/javascript/modules/integration_wizard.js
 - app/javascript/modules/lexical_inline_editor.jsx
+- app/javascript/modules/markdown_source_reconcile.js
 - app/javascript/modules/mention_menu.js
 - app/javascript/modules/modal_dialog.js
 - app/javascript/modules/slide_view.js
@@ -385,6 +399,8 @@ files:
 - app/models/collavre/activity_log.rb
 - app/models/collavre/application_record.rb
 - app/models/collavre/calendar_event.rb
+- app/models/collavre/channel.rb
+- app/models/collavre/channel/injected_message.rb
 - app/models/collavre/comment.rb
 - app/models/collavre/comment/approvable.rb
 - app/models/collavre/comment/broadcastable.rb
@@ -407,10 +423,12 @@ files:
 - app/models/collavre/device.rb
 - app/models/collavre/email.rb
 - app/models/collavre/inbox_item.rb
+- app/models/collavre/integration_setting.rb
 - app/models/collavre/invitation.rb
 - app/models/collavre/label.rb
 - app/models/collavre/mcp_tool.rb
 - app/models/collavre/orchestrator_policy.rb
+- app/models/collavre/preview_channel.rb
 - app/models/collavre/session.rb
 - app/models/collavre/system_setting.rb
 - app/models/collavre/tag.rb
@@ -435,6 +453,7 @@ files:
 - app/services/collavre/ai_client.rb
 - app/services/collavre/ai_system_prompt_renderer.rb
 - app/services/collavre/auto_theme_generator.rb
+- app/services/collavre/channel_attacher.rb
 - app/services/collavre/command_menu_service.rb
 - app/services/collavre/comment_link_formatter.rb
 - app/services/collavre/comment_move_service.rb
@@ -490,9 +509,12 @@ files:
 - app/services/collavre/ruby_llm_interaction_logger.rb
 - app/services/collavre/system_events/context_builder.rb
 - app/services/collavre/system_events/dispatcher.rb
+- app/services/collavre/tools/creative_attach_files_service.rb
 - app/services/collavre/tools/creative_batch_service.rb
 - app/services/collavre/tools/creative_create_service.rb
 - app/services/collavre/tools/creative_import_service.rb
+- app/services/collavre/tools/creative_list_attachments_service.rb
+- app/services/collavre/tools/creative_remove_attachment_service.rb
 - app/services/collavre/tools/creative_retrieval_service.rb
 - app/services/collavre/tools/creative_update_service.rb
 - app/services/collavre/tools/cron_cancel_service.rb
@@ -500,14 +522,22 @@ files:
 - app/services/collavre/tools/cron_list_service.rb
 - app/services/collavre/tools/cron_update_service.rb
 - app/services/collavre/tools/description_normalizable.rb
+- app/services/collavre/tools/permission_denied_error.rb
+- app/services/collavre/tools/preview_attach_service.rb
+- app/services/collavre/tools/preview_detach_service.rb
+- app/services/collavre/tools/topic_authorizer.rb
 - app/services/collavre/topic_branch_service.rb
 - app/views/admin/shared/_tabs.html.erb
+- app/views/collavre/admin/integrations/_category.html.erb
+- app/views/collavre/admin/integrations/_setting_row.html.erb
+- app/views/collavre/admin/integrations/index.html.erb
 - app/views/collavre/admin/orchestration/show.html.erb
 - app/views/collavre/admin/settings/_system_tab.html.erb
 - app/views/collavre/admin/settings/_uiux_tab.html.erb
 - app/views/collavre/admin/settings/index.html.erb
 - app/views/collavre/admin/settings/uiux.html.erb
 - app/views/collavre/comments/_activity_log_details.html.erb
+- app/views/collavre/comments/_channel_chips.html.erb
 - app/views/collavre/comments/_comment.html.erb
 - app/views/collavre/comments/_comments_popup.html.erb
 - app/views/collavre/comments/_list.html.erb
@@ -538,6 +568,7 @@ files:
 - app/views/collavre/invitation_mailer/invite.html.erb
 - app/views/collavre/invitation_mailer/invite.text.erb
 - app/views/collavre/invites/show.html.erb
+- app/views/collavre/landing/show.html.erb
 - app/views/collavre/passwords/edit.html.erb
 - app/views/collavre/passwords/new.html.erb
 - app/views/collavre/passwords_mailer/reset.html.erb
@@ -568,11 +599,14 @@ files:
 - app/views/collavre/users/passkeys.html.erb
 - app/views/collavre/users/show.html.erb
 - app/views/inbox/badge_component/_count.html.erb
+- app/views/layouts/collavre/landing.html.erb
 - app/views/layouts/collavre/slide.html.erb
 - config/locales/admin.en.yml
 - config/locales/admin.ko.yml
 - config/locales/ai_agent.en.yml
 - config/locales/ai_agent.ko.yml
+- config/locales/channels.en.yml
+- config/locales/channels.ko.yml
 - config/locales/comments.en.yml
 - config/locales/comments.ko.yml
 - config/locales/contacts.en.yml
@@ -583,8 +617,12 @@ files:
 - config/locales/creatives.ko.yml
 - config/locales/drop_trigger.en.yml
 - config/locales/drop_trigger.ko.yml
+- config/locales/integrations.en.yml
+- config/locales/integrations.ko.yml
 - config/locales/invites.en.yml
 - config/locales/invites.ko.yml
+- config/locales/landing.en.yml
+- config/locales/landing.ko.yml
 - config/locales/notifications.en.yml
 - config/locales/notifications.ko.yml
 - config/locales/orchestration.en.yml
@@ -709,10 +747,23 @@ files:
 - db/migrate/20260409000000_add_source_topic_id_to_topics.rb
 - db/migrate/20260415000000_create_main_topics_for_existing_creatives.rb
 - db/migrate/20260415094811_add_task_id_to_comments.rb
+- db/migrate/20260526000000_create_channels.rb
+- db/migrate/20260527000000_add_dismissed_at_to_channels.rb
+- db/migrate/20260527000100_backfill_dismissed_at_for_legacy_detached_channels.rb
+- db/migrate/20260528000000_add_preview_channel_unique_index.rb
+- db/migrate/20260529000000_add_primary_agent_id_to_topics.rb
+- db/migrate/20260529100000_create_integration_settings.rb
+- db/seeds.rb
 - lib/collavre.rb
+- lib/collavre/aws_credentials.rb
 - lib/collavre/configuration.rb
 - lib/collavre/engine.rb
 - lib/collavre/integration_registry.rb
+- lib/collavre/integration_settings.rb
+- lib/collavre/integration_settings/key_definition.rb
+- lib/collavre/integration_settings/registry.rb
+- lib/collavre/integration_settings/resolver.rb
+- lib/collavre/ses_settings_interceptor.rb
 - lib/collavre/user_extensions.rb
 - lib/collavre/version.rb
 - lib/collavre/view_extensions.rb