collavre 0.20.2 → 0.21.0

data/config/locales/creatives.en.yml

@@ -132,6 +132,12 @@ en:
         metadata_tooltip: Edit metadata
         metadata_title: Metadata
         metadata_save: Save
+        toggle_markdown: Markdown
+        toggle_richtext: Rich Text
+        markdown_to_richtext_confirm: Switching to Rich Text will discard the Markdown
+          source. Continue?
+        richtext_to_markdown_confirm: Switching to Markdown will discard the current
+          rich text content. Continue?
       share:
         shared: Creative shared successfully.
         permission_updated: Permission updated successfully.
@@ -147,8 +153,11 @@ en:
         progress_recalculated: All parent progress recalculated.
       errors:
         no_permission: You do not have permission to perform this action.
+        metadata_must_be_object: Metadata must be an object.
       inline_editor:
         placeholder: Describe the creative…
+        markdown_placeholder: Write in Markdown…
+        markdown_preview_placeholder: Preview
       edit_title: Edit creative
       edit:
         inline_editor_only_html: Editing creatives now happens directly in the inline

data/config/locales/creatives.ko.yml

@@ -120,6 +120,11 @@ ko:
         metadata_tooltip: 메타데이터 편집
         metadata_title: 메타데이터
         metadata_save: 저장
+        toggle_markdown: 마크다운
+        toggle_richtext: 서식 편집
+        markdown_to_richtext_confirm: 서식 편집으로 전환하면 마크다운 원본이 삭제됩니다.
+          계속하시겠습니까?
+        richtext_to_markdown_confirm: 마크다운으로 전환하면 현재 서식 편집 내용이 삭제됩니다. 계속하시겠습니까?
       share:
         shared: 크리에이티브가 성공적으로 공유되었습니다.
         permission_updated: 권한이 성공적으로 변경되었습니다.
@@ -134,8 +139,11 @@ ko:
         progress_recalculated: 진행률을 다시 계산 했습니다.
       errors:
         no_permission: 이 작업을 수행할 권한이 없습니다.
+        metadata_must_be_object: 메타데이터는 객체여야 합니다.
       inline_editor:
         placeholder: 크리에이티브를 설명해주세요…
+        markdown_placeholder: 마크다운으로 작성…
+        markdown_preview_placeholder: 미리보기
       edit_title: 크리에이티브 수정
       edit:
         inline_editor_only_html: 크리에이티브 수정은 인라인 편집기에서 바로 진행하세요.

data/config/locales/integrations.en.yml

@@ -0,0 +1,44 @@
+en:
+  collavre:
+    admin:
+      integrations:
+        title: "Integrations"
+        subtitle: "Configure external integration secrets. Database values take precedence over ENV; ENV is the seed/fallback."
+        tab_label: "Integrations"
+        empty_state: "No integrations registered yet."
+        sensitive: "(sensitive)"
+        restart_required: "restart required"
+        placeholder_leave_blank: "Leave blank to keep current"
+        env_var_label: "ENV"
+        confirm_reset: "Delete the DB value and fall back to ENV?"
+        headers:
+          key: "Key"
+          value: "Value"
+          actions: "Actions"
+        source:
+          db: "DB"
+          env: "ENV"
+          default: "default"
+          unknown: "unknown"
+        category:
+          slack: "Slack"
+          google_oauth: "Google OAuth"
+          github_oauth: "GitHub OAuth"
+          notion_oauth: "Notion OAuth"
+          github: "GitHub Integration"
+          aws_s3: "AWS S3"
+          aws_ses: "AWS SES"
+          firebase: "Firebase"
+          fcm: "FCM"
+          gemini: "Gemini"
+          llm: "LLM API Keys"
+          openclaw: "OpenClaw Gateway"
+          mail: "Mail / Host"
+          misc: "Miscellaneous"
+        actions:
+          save: "Save changes"
+          reset: "Reset to ENV"
+        flash:
+          updated: "Integration settings saved."
+          restart_required: "Some changed keys require a server restart to take effect."
+          reset_done: "Reset %{key} to ENV/default."

data/config/locales/integrations.ko.yml

@@ -0,0 +1,44 @@
+ko:
+  collavre:
+    admin:
+      integrations:
+        title: "통합"
+        subtitle: "외부 통합 비밀값을 설정합니다. DB 값이 ENV보다 우선하며, ENV는 시드/폴백입니다."
+        tab_label: "통합"
+        empty_state: "등록된 통합이 없습니다."
+        sensitive: "(민감)"
+        restart_required: "재시작 필요"
+        placeholder_leave_blank: "비워두면 현재 값 유지"
+        env_var_label: "환경변수"
+        confirm_reset: "DB 값을 삭제하고 ENV로 폴백할까요?"
+        headers:
+          key: "키"
+          value: "값"
+          actions: "작업"
+        source:
+          db: "DB"
+          env: "ENV"
+          default: "기본값"
+          unknown: "알 수 없음"
+        category:
+          slack: "Slack"
+          google_oauth: "Google OAuth"
+          github_oauth: "GitHub OAuth"
+          notion_oauth: "Notion OAuth"
+          github: "GitHub 연동"
+          aws_s3: "AWS S3"
+          aws_ses: "AWS SES"
+          firebase: "Firebase"
+          fcm: "FCM"
+          gemini: "Gemini"
+          llm: "LLM API 키"
+          openclaw: "OpenClaw 게이트웨이"
+          mail: "메일 / 호스트"
+          misc: "기타"
+        actions:
+          save: "변경사항 저장"
+          reset: "ENV로 초기화"
+        flash:
+          updated: "통합 설정이 저장되었습니다."
+          restart_required: "변경된 일부 키는 서버 재시작 후에 적용됩니다."
+          reset_done: "%{key}을(를) ENV/기본값으로 초기화했습니다."

data/config/locales/landing.en.yml

@@ -0,0 +1,51 @@
+en:
+  collavre:
+    landing:
+      meta:
+        title: "Where Teams Think Together"
+        description: "The collaborative workspace where hierarchical creatives, AI agents, and real-time chat come together. Organize, collaborate, and ship — with AI as your teammate."
+      hero:
+        headline_html: "A platform for both AI agents and people."
+        subline: "Achieve sustainable productivity gains."
+        learn_more: "Learn More"
+      demo:
+        title: "See it in action"
+        placeholder: "Product demo video goes here"
+      problem:
+        title: "Your tools are failing you"
+        notion:
+          title: "Notion"
+          desc: "Docs become graveyards. Nobody edits someone else's page. Search replaces structure."
+        jira:
+          title: "Jira"
+          desc: "Great for tasks, terrible for knowledge. Results never sync back to the wiki. Information overload."
+        slack:
+          title: "Slack"
+          desc: "Conversations vanish in the stream. Flat channel lists explode. Context is lost daily."
+      features:
+        title: "Everything in one living tree"
+        subtitle: "Creatives are hierarchical blocks that organize your work, track progress, and carry context — all at once."
+        tree:
+          title: "Hierarchical Creatives"
+          desc: "Organize work as a tree. Drag, link, and reuse blocks across projects. Progress rolls up automatically."
+        ai:
+          title: "AI Agents as Teammates"
+          desc: "Add AI agents to any conversation. They review, collaborate, and respond to @mentions — just like a colleague."
+        context:
+          title: "Context System"
+          desc: "Reduce cognitive load for people, and inject the knowledge and skills AI needs."
+        chat:
+          title: "Real-time Chat & Topics"
+          desc: "Every creative has a chat. Organize conversations with topics, move messages between creatives, and keep discussions focused."
+        integrations:
+          title: "Integrations"
+          desc: "GitHub PRs auto-analyzed, Slack messages synced, Google Calendar events linked, MCP tools built-in."
+        progress:
+          title: "Live Progress"
+          desc: "Track completion from leaf to root. Filter by tags, plans, or status. See your project's real health at a glance."
+      cta:
+        title: "Ready to collaborate smarter?"
+        subtitle: "Start organizing your work with AI-powered context."
+        start: "Get Started"
+      footer:
+        rights: "All rights reserved."

data/config/locales/landing.ko.yml

@@ -0,0 +1,51 @@
+ko:
+  collavre:
+    landing:
+      meta:
+        title: "팀이 함께 생각하는 곳"
+        description: "계층형 크리에이티브, AI 에이전트, 실시간 채팅이 하나로. 체계적으로 정리하고, 협업하고, AI와 함께 완성하세요."
+      hero:
+        headline_html: "AI 에이전트와 사람 모두의 플랫폼."
+        subline: "지속 가능한 생산성 향상을 이루세요."
+        learn_more: "알아보기"
+      demo:
+        title: "직접 확인하세요"
+        placeholder: "실제 작동 화면이 들어갈 자리입니다"
+      problem:
+        title: "기존 도구의 한계"
+        notion:
+          title: "Notion"
+          desc: "문서는 무덤이 됩니다. 남의 페이지를 고치기 꺼려하고, 검색이 구조를 대체합니다."
+        jira:
+          title: "Jira"
+          desc: "작업 관리는 좋지만 지식 관리는 안 됩니다. 결과물이 위키로 돌아오지 않습니다."
+        slack:
+          title: "Slack"
+          desc: "대화가 흘러가 버립니다. 채널은 폭발적으로 늘어나고, 맥락은 매일 사라집니다."
+      features:
+        title: "하나의 살아있는 트리로"
+        subtitle: "크리에이티브는 작업을 정리하고, 진행률을 추적하며, 맥락을 전달하는 계층형 블록입니다."
+        tree:
+          title: "계층형 크리에이티브"
+          desc: "작업을 트리로 구성하세요. 드래그, 링크, 재사용이 자유롭고 진행률은 자동 계산됩니다."
+        ai:
+          title: "AI 에이전트 팀원"
+          desc: "AI 에이전트를 대화에 추가하세요. 리뷰, 협업, @멘션 응답 — 동료처럼 일합니다."
+        context:
+          title: "컨텍스트 시스템"
+          desc: "사람의 인지 부하를 줄이고, AI에게 필요한 지식과 Skill을 주입합니다."
+        chat:
+          title: "실시간 채팅 & 토픽"
+          desc: "모든 크리에이티브에 채팅이 있습니다. 토픽으로 대화를 정리하고, 메시지를 다른 크리에이티브로 옮기세요."
+        integrations:
+          title: "외부 연동"
+          desc: "GitHub PR 자동 분석, Slack 동기화, Google Calendar 연동, MCP 도구 내장."
+        progress:
+          title: "실시간 진행률"
+          desc: "리프부터 루트까지 완료율 추적. 태그, 계획, 상태별 필터. 프로젝트 건강도를 한눈에."
+      cta:
+        title: "더 똑똑하게 협업할 준비 되셨나요?"
+        subtitle: "AI 기반 컨텍스트로 작업을 정리하세요."
+        start: "시작하기"
+      footer:
+        rights: "모든 권리 보유."

data/config/routes.rb

@@ -1,4 +1,7 @@
 Collavre::Engine.routes.draw do
+  # Landing page
+  get "landing", to: "landing#show"
+
   # Authentication routes
   resource :session, only: [ :new, :create, :destroy ]
   resources :passwords, param: :token, only: [ :new, :create, :edit, :update ]
@@ -28,8 +31,13 @@ Collavre::Engine.routes.draw do
   match "/auth/google_oauth2/callback", to: "google_auth#callback", via: [ :get, :post ]
 
   delete "/attachments/:signed_id", to: "attachments#destroy", as: :attachment
+  get "/public-assets/blobs/:signed_id/*filename",
+      to: "public_assets#show",
+      as: :public_asset,
+      format: false
 
   resources :calendar_events, only: [ :destroy ]
+  resources :channels, only: [ :destroy ]
   resources :contacts, only: [ :destroy ]
   resources :devices, only: [ :create ]
 
@@ -58,6 +66,7 @@ Collavre::Engine.routes.draw do
         get :next_name
       end
       member do
+        get :channel_chips
         patch :move
         patch :archive
         patch :unarchive
@@ -134,5 +143,14 @@ Collavre::Engine.routes.draw do
     get "/uiux", to: "admin/settings#uiux", as: :uiux
     patch "/uiux", to: "admin/settings#update_uiux"
     resource :orchestration, only: [ :show, :update ], controller: "admin/orchestration"
+
+    resources :integrations, only: [ :index ], param: :key, controller: "admin/integrations" do
+      collection do
+        patch :bulk_update
+      end
+      member do
+        delete :reset
+      end
+    end
   end
 end

data/db/migrate/20260526000000_create_channels.rb

@@ -0,0 +1,42 @@
+class CreateChannels < ActiveRecord::Migration[8.1]
+  def up
+    postgres = connection.adapter_name == "PostgreSQL"
+
+    create_table :channels do |t|
+      t.string :type, null: false
+      t.references :topic, null: false, foreign_key: { to_table: :topics }, index: true
+      if postgres
+        t.jsonb :config, null: false, default: {}
+      else
+        t.json :config, null: false, default: {}
+      end
+      t.integer :state, null: false, default: 0
+      t.string :latest_label
+      t.string :latest_link
+      t.datetime :last_event_at
+      t.timestamps
+    end
+
+    if postgres
+      add_index :channels, :config, using: :gin
+      add_index :channels, :type
+      # Concurrent webhook safety: a single PR may emit pull_request.opened twice
+      # back-to-back (or auto-attach can race with pr_monitor). Without this
+      # constraint, the dispatch loop would inject every event N times.
+      execute <<~SQL
+        CREATE UNIQUE INDEX index_channels_on_type_topic_repo_pr
+        ON channels (type, topic_id, (config->>'repo_full_name'), (config->>'pr_number'))
+      SQL
+    else
+      add_index :channels, :type
+      execute <<~SQL
+        CREATE UNIQUE INDEX index_channels_on_type_topic_repo_pr
+        ON channels (type, topic_id, json_extract(config, '$.repo_full_name'), json_extract(config, '$.pr_number'))
+      SQL
+    end
+  end
+
+  def down
+    drop_table :channels
+  end
+end

data/db/migrate/20260527000000_add_dismissed_at_to_channels.rb

@@ -0,0 +1,6 @@
+class AddDismissedAtToChannels < ActiveRecord::Migration[8.1]
+  def change
+    add_column :channels, :dismissed_at, :datetime
+    add_index :channels, :dismissed_at
+  end
+end

data/db/migrate/20260527000100_backfill_dismissed_at_for_legacy_detached_channels.rb

@@ -0,0 +1,28 @@
+class BackfillDismissedAtForLegacyDetachedChannels < ActiveRecord::Migration[8.1]
+  # Chips are now rendered via `not_dismissed` (dismissed_at IS NULL) instead
+  # of `state = active`. Without a backfill, any channel that was already
+  # detached pre-upgrade — user clicked X under the old flow, or the PR auto-
+  # detached on close — would reappear as a chip with the default-open badge
+  # the first time the new view runs. Mark legacy detached rows as dismissed
+  # using their last-touched timestamp as a best-effort dismissed_at.
+  #
+  # Idempotent: the WHERE clause skips rows that already have dismissed_at.
+  # Scoped to GithubPrChannel because the dismiss-on-detach UI ships only for
+  # PR chips. Future Channel STI subtypes opt in by adding their own backfill
+  # or by being created post-upgrade.
+  def up
+    execute <<~SQL.squish
+      UPDATE channels
+      SET dismissed_at = COALESCE(updated_at, CURRENT_TIMESTAMP)
+      WHERE state = 1
+        AND dismissed_at IS NULL
+        AND type = 'CollavreGithub::GithubPrChannel'
+    SQL
+  end
+
+  def down
+    # No-op: we can't distinguish backfilled rows from rows the user actually
+    # dismissed at the exact same timestamp, and leaving dismissed_at populated
+    # on rollback is harmless.
+  end
+end

data/db/migrate/20260528000000_add_preview_channel_unique_index.rb

@@ -0,0 +1,31 @@
+class AddPreviewChannelUniqueIndex < ActiveRecord::Migration[8.1]
+  def up
+    postgres = connection.adapter_name == "PostgreSQL"
+
+    # Mirror the PR-channel uniqueness guarantee for preview channels: a topic
+    # has at most one PreviewChannel per worktree_id. Without this, a racing
+    # preview_attach (e.g. concurrent CI + skill calls) could land two rows
+    # for the same worktree and the chip would render twice. `type` is
+    # included so the partial index does not collide with other channel
+    # subtypes that happen to store a `worktree_id` in their config.
+    if postgres
+      execute <<~SQL
+        CREATE UNIQUE INDEX index_channels_on_topic_preview_worktree
+        ON channels (topic_id, (config->>'worktree_id'))
+        WHERE type = 'Collavre::PreviewChannel'
+      SQL
+    else
+      execute <<~SQL
+        CREATE UNIQUE INDEX index_channels_on_topic_preview_worktree
+        ON channels (topic_id, json_extract(config, '$.worktree_id'))
+        WHERE type = 'Collavre::PreviewChannel'
+      SQL
+    end
+  end
+
+  def down
+    if connection.index_exists?(:channels, nil, name: "index_channels_on_topic_preview_worktree")
+      execute "DROP INDEX index_channels_on_topic_preview_worktree"
+    end
+  end
+end

data/db/migrate/20260529000000_add_primary_agent_id_to_topics.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class AddPrimaryAgentIdToTopics < ActiveRecord::Migration[8.0]
+  def up
+    add_column :topics, :primary_agent_id, :integer
+    add_index :topics, :primary_agent_id
+
+    # Migrate existing data from orchestrator_policies using ActiveRecord (adapter-agnostic)
+    Collavre::OrchestratorPolicy
+      .where(policy_type: "arbitration", scope_type: "Topic", enabled: true)
+      .find_each do |policy|
+        agent_id = policy.config&.dig("primary_agent_id")
+        next unless agent_id.present?
+
+        Collavre::Topic.where(id: policy.scope_id).update_all(primary_agent_id: agent_id)
+      end
+
+    # Remove migrated topic-scoped arbitration policies
+    Collavre::OrchestratorPolicy
+      .where(scope_type: "Topic", policy_type: "arbitration")
+      .delete_all
+  end
+
+  def down
+    # Re-create orchestrator_policies from topics with primary_agent_id
+    Collavre::Topic.where.not(primary_agent_id: nil).find_each do |topic|
+      Collavre::OrchestratorPolicy.create!(
+        policy_type: "arbitration",
+        scope_type: "Topic",
+        scope_id: topic.id,
+        config: { "strategy" => "primary_first", "primary_agent_id" => topic.primary_agent_id },
+        priority: 10,
+        enabled: true
+      )
+    end
+
+    remove_index :topics, :primary_agent_id
+    remove_column :topics, :primary_agent_id
+  end
+end

data/db/migrate/20260529100000_create_integration_settings.rb

@@ -0,0 +1,15 @@
+class CreateIntegrationSettings < ActiveRecord::Migration[8.1]
+  def change
+    create_table :integration_settings do |t|
+      t.string  :key, null: false
+      t.text    :value
+      t.string  :category, null: false
+      t.boolean :sensitive, null: false, default: true
+
+      t.timestamps
+    end
+
+    add_index :integration_settings, :key, unique: true
+    add_index :integration_settings, :category
+  end
+end

data/db/seeds.rb

@@ -0,0 +1,19 @@
+module Collavre
+  module ChannelBotSeed
+    def self.call
+      email = Channel::BOT_EMAIL
+      name  = Channel::BOT_NAME
+      user = User.find_or_initialize_by(email: email)
+      user.name = name
+      user.password = SecureRandom.hex(32) if user.new_record?
+      user.email_verified_at ||= Time.current
+      user.searchable = false if user.respond_to?(:searchable=)
+      user.llm_vendor = nil
+      user.save!
+      Rails.logger.info "[Collavre] Channel bot user ensured: #{email}"
+      user
+    end
+  end
+end
+
+Collavre::ChannelBotSeed.call

data/lib/collavre/aws_credentials.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Collavre
+  # Returns source-coherent AWS credential pairs (S3 access key id + secret,
+  # SES SMTP username + password). Both halves of a pair come from the same
+  # source — DB > ENV > Rails credentials — so a partial admin save cannot
+  # combine a DB-saved value with an ENV-only sibling and produce a
+  # mismatched pair that breaks every upload or every SMTP delivery.
+  #
+  # Each entry is `[registry_key, label, env_var, credentials_path]`.
+  # `credentials_path` may be nil when the pair has no Rails.credentials
+  # fallback (S3 keys aren't carried in credentials by convention).
+  module AwsCredentials
+    module_function
+
+    # @param boot_safe [Boolean] when true, swallow encryption errors so
+    #   `storage.yml` / env configs can boot before
+    #   `active_record_encryption.rb` runs. Runtime callers (e.g.
+    #   `SesSettingsInterceptor`) MUST leave this false so a decryption
+    #   failure surfaces instead of silently falling back to ENV.
+    # @return [Hash{Symbol => String}] coherent S3 credential pair or `{}`
+    def s3(boot_safe: false)
+      coherent_pair(
+        boot_safe,
+        [ :aws_s3_access_key_id,     :access_key_id,     "AWS_S3_ACCESS_KEY_ID",     nil ],
+        [ :aws_s3_secret_access_key, :secret_access_key, "AWS_S3_SECRET_ACCESS_KEY", nil ]
+      )
+    end
+
+    # @return [Hash{Symbol => String}] coherent SES SMTP credential pair or `{}`
+    def ses_smtp(boot_safe: false)
+      coherent_pair(
+        boot_safe,
+        [ :aws_ses_smtp_username, :user_name, "AWS_SES_SMTP_USERNAME", %i[aws smtp_username] ],
+        [ :aws_ses_smtp_password, :password,  "AWS_SES_SMTP_PASSWORD", %i[aws smtp_password] ]
+      )
+    end
+
+    def coherent_pair(boot_safe, *entries)
+      [ db_pair(entries, boot_safe), env_pair(entries), credentials_pair(entries) ]
+        .find { |pair| pair.values.all?(&:present?) } || {}
+    end
+
+    def db_pair(entries, boot_safe)
+      entries.to_h { |entry| [ entry[1], read_db(entry[0], boot_safe: boot_safe) ] }
+    end
+
+    def env_pair(entries)
+      entries.to_h { |entry| [ entry[1], ENV[entry[2]].presence ] }
+    end
+
+    def credentials_pair(entries)
+      entries.to_h do |entry|
+        path = entry[3]
+        value = path ? Rails.application.credentials.dig(*path).presence : nil
+        [ entry[1], value ]
+      end
+    end
+
+    def read_db(key, boot_safe: false)
+      return nil unless defined?(Collavre::IntegrationSetting)
+      Collavre::IntegrationSetting.find_by(key: key.to_s)&.value.presence
+    rescue ActiveRecord::StatementInvalid,
+           ActiveRecord::NoDatabaseError,
+           ActiveRecord::ConnectionNotEstablished,
+           NameError
+      nil
+    rescue StandardError => e
+      raise unless boot_safe &&
+                   defined?(ActiveRecord::Encryption::Errors::Base) &&
+                   e.is_a?(ActiveRecord::Encryption::Errors::Base)
+      nil
+    end
+  end
+end

data/lib/collavre/engine.rb

@@ -16,6 +16,57 @@ module Collavre
       root.join("app/assets/stylesheets")
     end
 
+    # Register engine-internal integration settings keys with the central
+    # registry. These keys are consumed by engine code (mailer `from`, public
+    # assets helper, MCP upload service), so the engine itself must own their
+    # registration — host apps may not include the app-level
+    # `integration_settings_app.rb` initializer when mounting the engine as a gem.
+    # `register` is idempotent, so host app re-registration remains safe.
+    initializer "collavre.integration_settings_registry", before: :load_config_initializers do
+      if defined?(Collavre::IntegrationSettings::Registry)
+        registry = Collavre::IntegrationSettings::Registry.instance
+        registry.register(:default_mailer_from, category: "mail", sensitive: false, requires_restart: true)
+        registry.register(:public_assets_host,  category: "mail", sensitive: false, requires_restart: false)
+        registry.register(:mcp_upload_root,     category: "misc", sensitive: false, requires_restart: false)
+        # LLM keys consumed by Collavre::AiClient (engine service). Owned by the
+        # engine so gem-mounted host apps don't depend on the app-level
+        # `ruby_llm.rb` initializer for ENV fallback.
+        registry.register(:gemini_api_key,    category: "llm", sensitive: true,  requires_restart: true)
+        registry.register(:openai_api_key,    category: "llm", sensitive: true,  requires_restart: false)
+        registry.register(:anthropic_api_key, category: "llm", sensitive: true,  requires_restart: false)
+        registry.register(:gemini_api_base,   category: "llm", sensitive: false, requires_restart: true)
+      end
+    end
+
+    # AWS keys are consumed by `config/environments/*.rb` (active_storage.service
+    # decision, SMTP scaffold) and `config/storage.yml` ERB, both of which evaluate
+    # during the `:load_environment_config` initializer — earlier than
+    # `:load_config_initializers`. Register them in their own block so
+    # `IntegrationSettings.fetch` can resolve the keys at that earlier point.
+    # S3 keys are `requires_restart: true` because Rails resolves the storage
+    # service once at boot; SES keys are runtime-injected by SesSettingsInterceptor.
+    initializer "collavre.integration_settings_registry.aws", before: :load_environment_config do
+      if defined?(Collavre::IntegrationSettings::Registry)
+        registry = Collavre::IntegrationSettings::Registry.instance
+        registry.register(:aws_s3_access_key_id,     category: "aws_s3",  sensitive: true,  requires_restart: true)
+        registry.register(:aws_s3_secret_access_key, category: "aws_s3",  sensitive: true,  requires_restart: true)
+        registry.register(:aws_s3_bucket,            category: "aws_s3",  sensitive: false, requires_restart: true)
+        registry.register(:aws_region,               category: "aws_s3",  sensitive: false, requires_restart: true)
+        registry.register(:aws_ses_smtp_username,    category: "aws_ses", sensitive: true,  requires_restart: false)
+        registry.register(:aws_ses_smtp_password,    category: "aws_ses", sensitive: true,  requires_restart: false)
+      end
+    end
+
+    # Register the SES SMTP settings interceptor so each outgoing mail picks up
+    # the current DB > ENV > credentials value for SES creds at send time.
+    # Hooked after ActionMailer loads to ensure Mail::SMTP is defined.
+    initializer "collavre.ses_settings_interceptor" do
+      ActiveSupport.on_load(:action_mailer) do
+        require "mail"
+        ::Mail.register_interceptor(Collavre::SesSettingsInterceptor)
+      end
+    end
+
     # Add engine migrations to main app's migration path
     # This allows migrations to live in the engine but be run from the host app
     initializer "collavre.migrations" do |app|

data/lib/collavre/integration_settings/key_definition.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Collavre
+  module IntegrationSettings
+    # Value object describing a registered integration setting key.
+    #
+    # @!attribute [r] key
+    #   @return [Symbol] canonical key identifier (e.g. :slack_client_id)
+    # @!attribute [r] category
+    #   @return [String] grouping for the admin UI (e.g. "slack", "google_oauth")
+    # @!attribute [r] sensitive
+    #   @return [Boolean] when true the value is masked in the admin UI
+    # @!attribute [r] requires_restart
+    #   @return [Boolean] when true the admin UI surfaces a "restart required" badge
+    # @!attribute [r] env_var
+    #   @return [String] name of the ENV variable used as fallback / seed source
+    # @!attribute [r] default
+    #   @return [String, nil] static default returned when neither DB nor ENV has a value
+    KeyDefinition = Struct.new(
+      :key,
+      :category,
+      :sensitive,
+      :requires_restart,
+      :env_var,
+      :default,
+      keyword_init: true
+    )
+  end
+end