collavre 0.24.0 → 0.25.0

data/config/locales/users.ko.yml

@@ -23,10 +23,16 @@ ko:
         vendor_label: LLM 벤더
         vendor_help: 이 에이전트에 사용할 AI 제공업체를 선택하세요
         model_label: 모델
+        remove_model: 모델 목록에서 삭제
+        remove_model_failed: 모델을 목록에서 삭제하지 못했습니다.
         api_key_label: API Key
         api_key_help: 입력하면 시스템 기본값 대신 이 키가 사용됩니다. 암호화되어 저장됩니다.
         gateway_url_label: Gateway URL
         gateway_url_help: OpenClaw 사용 시 필수입니다. OpenClaw 게이트웨이의 URL을 입력하세요.
+        agent_gateway_label: Agent Gateway
+        agent_gateway_blank: CLI Proxy 게이트웨이를 선택하세요
+        agent_gateway_help: LLM 벤더가 CLI Proxy일 때만 필요합니다.
+        manage_gateways: 게이트웨이 관리
         searchable_label: 이 AI를 검색 및 멘션 가능하게 허용
         searchable_help: 활성화하면 다른 사용자가 이름으로 이 AI를 찾고 멘션할 수 있습니다.
         submit: AI 에이전트 추가
@@ -51,7 +57,12 @@ ko:
         not_an_ai: 이 사용자는 AI 에이전트가 아닙니다.
         tools_title: 사용 가능한 도구
         tools_description: 에이전트가 사용할 수 있는 도구 목록입니다.
+        meta_skills_title: Collavre 메타 스킬
+        meta_skills_description: 프로비저닝되는 collavre-cli 스킬 하나가 선택된 도구를 메타 스킬로 실행합니다. 현재는 이 선택을 callback token 권한으로 강제하지 않습니다.
+        gateway_mode: "워크스페이스 모드: %{mode}. 선택한 게이트웨이 설정에서 변경할 수 있습니다."
         no_tools_found: 사용 가능한 도구가 없습니다.
+        clear_api_key_label: 저장된 API 키 삭제
+        clear_api_key_help: 저장 후 시스템 기본 키 또는 키가 필요 없는 게이트웨이를 사용합니다.
         agent_conf_label: "에이전트 설정 (YAML)"
         agent_conf_help: "에이전트 동작을 위한 YAML 설정. chat_history: 최대 이전 메시지 수 (기본 50), chat_history_size: 최대 총 문자 수 (기본 100000), context.creative_children_level: 크리에이티브 컨텍스트에 포함할 자식 깊이 (기본 nil → 사용자 설정 따름, 0=자식 없음, 1=직접 자식, 2=손자까지)."
         chat_title: 에이전트와 대화하기
@@ -111,25 +122,14 @@ ko:
       theme: 테마
       calendar_id: 캘린더 ID
       notifications_enabled: 알림 사용
+      creative_workspace:
+        enabled: 3단 크리에이티브 작업 공간 사용
+        description: 왼쪽 크리에이티브 트리를 유지하고 전체 페이지 새로고침 없이 중앙 내용을 전환하며 오른쪽에 채팅을 표시합니다.
       locale: 언어
       locales:
         en: 영어
         ko: 한국어
       timezone: 시간대
-      typo_correction:
-        legend: 오타 자동 수정
-        manage: 오타 자동 수정 설정
-        description: 입력하는 동안 오타를 자동으로 제안하고 수정합니다. 아래의 타이핑 장치와 입력 위치가 모두 켜져 있을 때만 동작합니다.
-        enabled: 오타 자동 수정 사용
-        threshold: 자동 적용 기준
-        threshold_hint: 이 신뢰도(0-100) 이상이면 자동으로 적용되고, 낮으면 후보로만 표시됩니다.
-        device_legend: 타이핑 장치
-        on_voice: 음성 입력
-        on_soft_keyboard: 화면(소프트) 키보드
-        on_physical_keyboard: 물리 키보드(블루투스/유선)
-        location_legend: 입력 위치
-        in_chat: 채팅 메시지 입력
-        in_editor: 크리에이티브 편집기
       profile_updated: 프로파일이 업데이트되었습니다.
       avatar_updated: 아바타가 변경되었습니다.
       password_updated: 비밀번호가 성공적으로 변경되었습니다.

data/config/routes.rb

@@ -2,9 +2,26 @@ Collavre::Engine.routes.draw do
   # Landing page
   get "landing", to: "landing#show"
 
+  # Public feature guides — the long-form counterpart to the empty-chat feature
+  # cards. Keys come from Collavre::FeatureCardRegistry, which rejects a key this
+  # constraint could not route, so the two cannot drift apart.
+  get "features", to: "features#index", as: :features
+  get "features/:key", to: "features#show", as: :feature,
+      constraints: { key: Collavre::FeatureCard::GUIDE_KEY_FORMAT }
+
   # Authentication routes
   resource :session, only: [ :new, :create, :destroy ]
   resources :passwords, param: :token, only: [ :new, :create, :edit, :update ]
+  resources :agent_gateways, path: "settings/agent-gateways", except: :show do
+    post :check, on: :member
+  end
+  get "desktop/setup", to: "desktop_setup#show", as: :desktop_setup
+  post "desktop/setup/account", to: "desktop_setup#create_account", as: :desktop_setup_account
+  post "desktop/setup/registration-token", to: "desktop_setup#registration_token", as: :desktop_setup_registration_token
+  get "desktop/setup/sidecar-health", to: "desktop_sidecar_health#show", as: :desktop_setup_sidecar_health
+  post "desktop/setup/validate-registration-grant", to: "desktop_gateway_registrations#validate_registration_grant", as: :desktop_setup_validate_registration_grant
+  post "desktop/setup/gateway-registered", to: "desktop_gateway_registrations#registered", as: :desktop_setup_gateway_registered
+  post "desktop/setup/register-gateway", to: "desktop_gateway_registrations#create", as: :desktop_setup_register_gateway
   resources :users, only: [ :index, :new, :create, :show, :edit, :update, :destroy ] do
     collection do
       get :new_ai
@@ -23,9 +40,27 @@ Collavre::Engine.routes.draw do
       get :edit_password
       patch :update_password
       get :passkeys
-      get :typo_correction
+      get :agent_connection, to: "agent_connections#show"
     end
   end
+  scope "users/:user_id/agent-connection", as: :agent_connection do
+    get :status, to: "agent_connections#status"
+    post "auth/:engine/sessions", to: "agent_connections#create_auth_session", as: :auth_sessions
+    get "auth/:engine/sessions/:session_id", to: "agent_connections#auth_session", as: :auth_session
+    post "auth/:engine/sessions/:session_id", to: "agent_connections#submit_auth_session"
+    delete "auth/:engine/sessions/:session_id", to: "agent_connections#cancel_auth_session"
+    post "provision/sync", to: "agent_connections#provision_sync", as: :provision_sync
+    post "provision/items/:type/:name/approve", to: "agent_connections#provision_approve", as: :provision_approve
+    delete "provision/items/:type/:name", to: "agent_connections#provision_delete", as: :provision_delete
+    post "rotate-tokens", to: "agent_connections#rotate_tokens", as: :rotate_tokens
+  end
+
+  get "/agents/:agent_id/workspaces/:token/provision.json",
+      to: "agent_provisioning#manifest", as: :agent_provision_manifest, format: false
+  get "/agent-provisioning/collavre/:sha256.tar.gz",
+      to: "agent_provisioning#skill", as: :agent_provision_skill, format: false
+  get "/agents/:agent_id/workspaces/:token/config/:sha256.tar.gz",
+      to: "agent_provisioning#config_archive", as: :agent_provision_config, format: false
   get "/email_verification/:token", to: "email_verifications#show", as: :email_verification
 
   # OAuth callback routes (paths match OmniAuth provider names)
@@ -42,20 +77,19 @@ Collavre::Engine.routes.draw do
   resources :contacts, only: [ :destroy ]
   resources :devices, only: [ :create ]
 
-  resources :inbox_items, path: "inbox", only: [ :index, :update, :destroy ] do
-    get :count, on: :collection
-  end
-
   resources :user_themes, only: [ :index, :create, :destroy ] do
     member do
       post :apply
     end
   end
 
-  resources :typo_corrections, only: [ :create ]
+  resources :llm_models, only: [ :destroy ]
 
   resources :creative_imports, only: [ :create ]
   resources :tasks, only: [] do
+    collection do
+      get :active_statuses
+    end
     member do
       post :cancel
     end
@@ -115,17 +149,18 @@ Collavre::Engine.routes.draw do
     collection do
       post :reorder
       post :link_drop
+      patch :next_last_visited_sequence
       get :append_as_parent, to: "creatives#append_as_parent", as: :append_as_parent_creative
       get :append_below, to: "creatives#append_below", as: :append_below_creative
       get :export_markdown
     end
     member do
+      patch :remember_last_visited
       get :children
       post :request_permission, to: "creatives#request_permission"
       post :unconvert
       patch :archive
       patch :unarchive
-      get :parent_suggestions
       get :slide_view
       get :contexts
       patch :update_contexts
@@ -136,10 +171,11 @@ Collavre::Engine.routes.draw do
 
   resources :emails, only: [ :index, :show ]
   resource :invite, only: [ :show, :create ]
-
   post "/creative_expanded_states/toggle", to: "user_creative_preferences#toggle"
-  patch "/creatives/:creative_id/user_creative_preferences/update_last_topic", to: "user_creative_preferences#update_last_topic", as: :update_last_topic
+  match "/creatives/:creative_id/user_creative_preferences/update_last_topic", to: "user_creative_preferences#update_last_topic", via: [ :post, :patch ], as: :update_last_topic
   post "/comment_read_pointers/update", to: "comment_read_pointers#update"
+  post "/notices/:key/dismiss", to: "notices#dismiss", as: :dismiss_notice
+  delete "/notices", to: "notices#restore_all", as: :restore_notices
 
   # Agent API (Claude Channel MCP plugin)
   namespace :api do
@@ -148,16 +184,6 @@ Collavre::Engine.routes.draw do
       post "agent/reply", to: "agents#reply"
       post "agent/notify", to: "agents#notify"
       delete "agent/:id", to: "agents#destroy"
-
-      # Mobile voice companion (Android): poll Inbox#System messages, read aloud,
-      # reply to the origin topic; a cold mic press starts work in Inbox#Main.
-      namespace :mobile do
-        post "voice_commands", to: "voice_commands#create"
-        get  "agent_events", to: "agent_events#index"
-        post "agent_events/:id/respond", to: "agent_events#respond"
-        post "agent_events/:id/read", to: "agent_events#read"
-        post "devices", to: "devices#create"
-      end
     end
   end
 

data/db/migrate/20250911084338_backfill_creative_in_comment_inbox_items.rb

@@ -2,7 +2,7 @@ class BackfillCreativeInCommentInboxItems < ActiveRecord::Migration[8.0]
   disable_ddl_transaction!
 
   def up
-    InboxItem.where(message_key: [ "inbox.comment_added", "inbox.user_mentioned" ]).find_each do |item|
+    inbox_item_class.where(message_key: [ "inbox.comment_added", "inbox.user_mentioned" ]).find_each do |item|
       params = item.message_params || {}
       next if params["creative"].present?
 
@@ -24,4 +24,12 @@ class BackfillCreativeInCommentInboxItems < ActiveRecord::Migration[8.0]
   def down
     # no-op
   end
+
+  private
+
+  def inbox_item_class
+    Class.new(ActiveRecord::Base) do
+      self.table_name = "inbox_items"
+    end
+  end
 end

data/db/migrate/20260724000000_add_creative_id_index_to_comments.rb

@@ -0,0 +1,34 @@
+class AddCreativeIdIndexToComments < ActiveRecord::Migration[8.1]
+  # The chat timeline now orders by comments.id (not created_at) to survive
+  # cross-process clock skew. A composite index on [creative_id, id] lets the DB
+  # satisfy the per-creative filter and the id-ordered LIMIT/range paging from
+  # the index, instead of scanning creative_id then sorting by id.
+  #
+  # Built CONCURRENTLY on PostgreSQL so the deploy never takes a write-blocking
+  # lock on the hot comments table while the index builds. Requires running
+  # outside a transaction. SQLite (dev/test) has no concurrent algorithm, so we
+  # omit it there; if_not_exists keeps the build idempotent on both.
+  disable_ddl_transaction!
+
+  # Explicit up/down: `change` auto-reverses add_index by forwarding every option
+  # (including if_not_exists:) to remove_index, which rejects it and fails rollback.
+  def up
+    add_index :comments, [ :creative_id, :id ],
+              name: "index_comments_on_creative_id_and_id",
+              algorithm: concurrent_algorithm,
+              if_not_exists: true
+  end
+
+  def down
+    remove_index :comments,
+                 name: "index_comments_on_creative_id_and_id",
+                 algorithm: concurrent_algorithm,
+                 if_exists: true
+  end
+
+  private
+
+  def concurrent_algorithm
+    :concurrently if connection.adapter_name.match?(/postgres/i)
+  end
+end

data/db/migrate/20260724000001_add_creative_private_id_index_to_comments.rb

@@ -0,0 +1,50 @@
+class AddCreativePrivateIdIndexToComments < ActiveRecord::Migration[8.1]
+  # Every unread/badge count is "comments of this creative, public only, newer
+  # than a watermark" — `WHERE creative_id = ? AND private = false [AND id > ?]`.
+  # index_comments_on_creative_id_and_id can serve the creative filter and the
+  # id ordering but not the private filter, so the planner still had to visit
+  # every row of a busy creative to discard private ones.
+  #
+  # Production PostgreSQL gets the smallest useful structure: a partial index
+  # over public rows only. SQLite renders `where(private: false)` as
+  # `private = 0`, which does not use a partial predicate recorded as
+  # `private = false`, so dev, test, and desktop use an equivalent three-column
+  # index instead.
+  #
+  # index_comments_on_creative_id_and_id stays: paging does not include the
+  # public-only predicate, and SQLite cannot skip the fallback index's leading
+  # `private` column for a plain `ORDER BY id` query.
+  disable_ddl_transaction!
+
+  # Explicit up/down: `change` auto-reverses add_index by forwarding every option
+  # (including if_not_exists:) to remove_index, which rejects it and fails rollback.
+  def up
+    options = { name: index_name, if_not_exists: true }
+
+    if postgresql?
+      options.merge!(where: "private = false", algorithm: :concurrently)
+      add_index :comments, [ :creative_id, :id ], **options
+    else
+      add_index :comments, [ :creative_id, :private, :id ], **options
+    end
+  end
+
+  def down
+    options = { name: index_name, algorithm: concurrent_algorithm, if_exists: true }
+    remove_index :comments, **options
+  end
+
+  private
+
+  def index_name
+    "index_comments_on_creative_id_and_private_and_id"
+  end
+
+  def postgresql?
+    connection.adapter_name.match?(/postgres/i)
+  end
+
+  def concurrent_algorithm
+    :concurrently if postgresql?
+  end
+end

data/db/migrate/20260724090000_add_async_comment_notification_state.rb

@@ -0,0 +1,64 @@
+class AddAsyncCommentNotificationState < ActiveRecord::Migration[8.1]
+  disable_ddl_transaction!
+
+  def up
+    add_column :comments, :notification_key, :string unless column_exists?(:comments, :notification_key)
+    unless column_exists?(:comments, :notification_revision)
+      add_column :comments, :notification_revision, :integer, default: 0, null: false
+    end
+
+    create_table :comment_notification_deliveries, if_not_exists: true do |t|
+      t.string :delivery_key, null: false
+      t.bigint :inbox_comment_id, null: false
+      t.bigint :recipient_id, null: false
+      t.text :message, null: false
+      t.text :link
+      t.string :push_claim_token
+      t.datetime :push_claimed_at
+      t.datetime :push_enqueued_at
+      t.timestamps
+    end
+
+    add_index :comments,
+              :notification_key,
+              unique: true,
+              where: "notification_key IS NOT NULL",
+              algorithm: concurrent_algorithm,
+              if_not_exists: true
+
+    add_index :comment_notification_deliveries,
+              :delivery_key,
+              unique: true,
+              algorithm: concurrent_algorithm,
+              if_not_exists: true
+    add_index :comment_notification_deliveries,
+              [ :push_enqueued_at, :push_claimed_at ],
+              name: "index_comment_notification_deliveries_pending",
+              algorithm: concurrent_algorithm,
+              if_not_exists: true
+  end
+
+  def down
+    remove_index :comment_notification_deliveries,
+                 name: "index_comment_notification_deliveries_pending",
+                 algorithm: concurrent_algorithm,
+                 if_exists: true
+    remove_index :comment_notification_deliveries,
+                 :delivery_key,
+                 algorithm: concurrent_algorithm,
+                 if_exists: true
+    remove_index :comments,
+                 :notification_key,
+                 algorithm: concurrent_algorithm,
+                 if_exists: true
+    drop_table :comment_notification_deliveries, if_exists: true
+    remove_column :comments, :notification_revision if column_exists?(:comments, :notification_revision)
+    remove_column :comments, :notification_key if column_exists?(:comments, :notification_key)
+  end
+
+  private
+
+  def concurrent_algorithm
+    :concurrently if connection.adapter_name.match?(/postgres/i)
+  end
+end

data/db/migrate/20260727000000_add_waiting_notice_scope_to_comments.rb

@@ -0,0 +1,30 @@
+# Record what a "⏳ waiting on the topic slot" notice speaks for, instead of
+# inferring it from whichever sibling notices happen to still stand.
+#
+# A topic gets one deduplicated notice while coalescing is on and one notice per
+# deferral while it is off, so the two kinds coexist whenever the policy changes
+# mid-wait or differs per agent. Reading "no sibling notice left" as "this one
+# stood for the whole topic" then inverts ownership: deleting the shared notice
+# is classified as deleting a per-deferral one and cancels the newest queued
+# waiter — which may be the one the *other* notice speaks for.
+#
+# Nullable with no backfill on purpose: a notice already on screen was posted by
+# the pre-existing code and there is nothing on the row to say which kind it was.
+# Comment#cancel_queued_tasks_for_waiting_notice keeps its old behaviour for
+# those, so an in-flight wait is neither widened nor silently disarmed.
+class AddWaitingNoticeScopeToComments < ActiveRecord::Migration[8.1]
+  def up
+    unless column_exists?(:comments, :waiting_notice_scope)
+      add_column :comments, :waiting_notice_scope, :string
+    end
+
+    unless column_exists?(:comments, :waiting_notice_task_id)
+      add_column :comments, :waiting_notice_task_id, :integer
+    end
+  end
+
+  def down
+    remove_column :comments, :waiting_notice_task_id if column_exists?(:comments, :waiting_notice_task_id)
+    remove_column :comments, :waiting_notice_scope if column_exists?(:comments, :waiting_notice_scope)
+  end
+end

data/db/migrate/20260727010000_add_waiting_notice_scope_to_tasks.rb

@@ -0,0 +1,26 @@
+# Record which kind of "⏳ waiting" notice speaks for a waiter on the waiter
+# itself, at the moment it is parked.
+#
+# The waiter and its notice commit in two steps, so asking the notices which
+# waiters they own has a window where the answer is wrong: an opted-out waiter is
+# already queued while its own notice does not exist yet, and a shared notice
+# deleted in that window reads it as one of its own and cancels it. What speaks
+# for a waiter is decided by the agent's coalescing policy when the row is
+# created, not by which neighbouring rows happen to be visible later.
+#
+# Nullable with no backfill on purpose: a waiter parked by the pre-existing code
+# says nothing about which notice spoke for it, and
+# Comment#represented_queued_waiters keeps the old sibling-notice answer for
+# those rows. Widening would discard work; narrowing would leave an in-flight
+# wait with no stop control.
+class AddWaitingNoticeScopeToTasks < ActiveRecord::Migration[8.1]
+  def up
+    return if column_exists?(:tasks, :waiting_notice_scope)
+
+    add_column :tasks, :waiting_notice_scope, :string
+  end
+
+  def down
+    remove_column :tasks, :waiting_notice_scope if column_exists?(:tasks, :waiting_notice_scope)
+  end
+end

data/db/migrate/20260805000000_add_creative_workspace_enabled_to_users.rb

@@ -0,0 +1,5 @@
+class AddCreativeWorkspaceEnabledToUsers < ActiveRecord::Migration[8.0]
+  def change
+    add_column :users, :creative_workspace_enabled, :boolean, default: false, null: false
+  end
+end

data/db/migrate/20260807050000_add_dismissed_notices_to_users.rb

@@ -0,0 +1,5 @@
+class AddDismissedNoticesToUsers < ActiveRecord::Migration[8.1]
+  def change
+    add_column :users, :dismissed_notices, :json
+  end
+end

data/db/migrate/20260809000000_change_creative_workspace_enabled_default_to_true.rb

@@ -0,0 +1,18 @@
+class ChangeCreativeWorkspaceEnabledDefaultToTrue < ActiveRecord::Migration[8.0]
+  # Lightweight stub so the backfill does not depend on the app model.
+  class MigrationUser < ActiveRecord::Base
+    self.table_name = :users
+  end
+
+  def up
+    change_column_default :users, :creative_workspace_enabled, from: false, to: true
+
+    # The preference shipped as opt-in only days ago, so every stored `false`
+    # is the old default rather than a deliberate opt-out.
+    MigrationUser.where(creative_workspace_enabled: false).update_all(creative_workspace_enabled: true)
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration, "cannot distinguish backfilled defaults from post-migration user opt-ins"
+  end
+end

data/db/migrate/20260809000001_create_llm_models.rb

@@ -0,0 +1,64 @@
+class CreateLlmModels < ActiveRecord::Migration[8.1]
+  MAX_SUGGESTIONS = 100
+  MAX_VENDOR_LENGTH = 255
+  MAX_NAME_LENGTH = 255
+
+  DEFAULT_MODELS = {
+    "google" => [
+      "gemini-3.1-flash-lite",
+      "gemini-1.5-flash",
+      "gemini-1.5-pro"
+    ]
+  }.freeze
+
+  def up
+    create_table :llm_models do |t|
+      t.string :llm_vendor, null: false, limit: MAX_VENDOR_LENGTH
+      t.string :name, null: false, limit: MAX_NAME_LENGTH
+      t.references :created_by,
+                   null: true,
+                   foreign_key: { to_table: :users, on_delete: :nullify }
+      t.timestamps
+    end
+
+    add_index :llm_models, [ :llm_vendor, :name ], unique: true
+
+    llm_model_class = Class.new(ActiveRecord::Base) do
+      self.table_name = "llm_models"
+    end
+    user_class = Class.new(ActiveRecord::Base) do
+      self.table_name = "users"
+    end
+
+    models = DEFAULT_MODELS.flat_map do |vendor, names|
+      names.map { |name| [ vendor, name ] }
+    end
+    models.concat(
+      user_class.where.not(llm_vendor: [ nil, "" ])
+                .where.not(llm_model: [ nil, "" ])
+                .distinct
+                .pluck(:llm_vendor, :llm_model)
+    )
+
+    models.each do |vendor, name|
+      vendor = vendor.to_s.strip.downcase
+      name = name.to_s.strip
+      next if vendor.blank? || name.blank?
+      next if vendor.length > MAX_VENDOR_LENGTH || name.length > MAX_NAME_LENGTH
+
+      llm_model_class.find_or_create_by!(
+        llm_vendor: vendor,
+        name: name
+      )
+    end
+
+    keep_ids = llm_model_class.order(updated_at: :desc, id: :desc)
+                              .limit(MAX_SUGGESTIONS)
+                              .select(:id)
+    llm_model_class.where.not(id: keep_ids).delete_all
+  end
+
+  def down
+    drop_table :llm_models
+  end
+end

data/db/migrate/20260809000002_create_agent_gateways_and_workspaces.rb

@@ -0,0 +1,35 @@
+class CreateAgentGatewaysAndWorkspaces < ActiveRecord::Migration[8.0]
+  def change
+    create_table :agent_gateways do |t|
+      t.references :owner, null: false, foreign_key: { to_table: :users }
+      t.string :name, null: false
+      t.string :base_url, null: false
+      t.text :admin_key, null: false
+      t.text :completion_key, null: false
+      t.text :identity_secret
+      t.string :tenant_id, null: false, default: "collavre"
+      t.integer :workspace_mode, null: false, default: 0
+      t.boolean :active, null: false, default: true
+      t.timestamps
+    end
+    add_index :agent_gateways, [ :owner_id, :name ], unique: true
+
+    add_reference :users, :agent_gateway, foreign_key: true
+
+    create_table :agent_workspaces do |t|
+      t.references :agent, null: false, foreign_key: { to_table: :users }
+      t.references :user, foreign_key: { to_table: :users }
+      t.references :agent_gateway, null: false, foreign_key: true
+      t.string :proxy_user_id, null: false
+      t.string :manifest_token, null: false
+      t.text :callback_token, null: false
+      t.timestamps
+    end
+
+    add_index :agent_workspaces, :manifest_token, unique: true
+    add_index :agent_workspaces, [ :agent_id, :agent_gateway_id ],
+              unique: true, where: "user_id IS NULL", name: "idx_agent_workspaces_shared"
+    add_index :agent_workspaces, [ :agent_id, :user_id, :agent_gateway_id ],
+              unique: true, where: "user_id IS NOT NULL", name: "idx_agent_workspaces_per_user"
+  end
+end

data/db/migrate/20260809000003_hash_agent_workspace_callback_tokens.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "digest"
+
+class HashAgentWorkspaceCallbackTokens < ActiveRecord::Migration[8.0]
+  PREFIX = "sha256$"
+
+  class AgentWorkspaceRecord < ActiveRecord::Base
+    self.table_name = "agent_workspaces"
+
+    encrypts :callback_token, deterministic: false
+  end
+
+  class AccessTokenRecord < ActiveRecord::Base
+    self.table_name = "oauth_access_tokens"
+  end
+
+  def up
+    each_workspace_token do |plaintext|
+      token = AccessTokenRecord.find_by(token: plaintext)
+      token&.update_columns(token: encoded(plaintext))
+    end
+  end
+
+  def down
+    each_workspace_token do |plaintext|
+      token = AccessTokenRecord.find_by(token: encoded(plaintext))
+      token&.update_columns(token: plaintext)
+    end
+  end
+
+  private
+
+  def each_workspace_token
+    AgentWorkspaceRecord.find_each do |workspace|
+      plaintext = workspace.callback_token
+      yield plaintext if plaintext.present?
+    end
+  end
+
+  def encoded(plaintext)
+    "#{PREFIX}#{Digest::SHA256.hexdigest(plaintext)}"
+  end
+end

data/db/migrate/20260809000004_encrypt_agent_workspace_manifest_tokens.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require "digest"
+
+class EncryptAgentWorkspaceManifestTokens < ActiveRecord::Migration[8.0]
+  class AgentWorkspaceRecord < ActiveRecord::Base
+    self.table_name = "agent_workspaces"
+
+    encrypts :manifest_token, deterministic: false
+  end
+
+  def up
+    add_column :agent_workspaces, :manifest_token_digest, :string
+
+    say_with_time "Encrypting agent workspace manifest capabilities" do
+      transform_tokens(encrypt: true)
+    end
+
+    change_column_null :agent_workspaces, :manifest_token_digest, false
+    remove_index :agent_workspaces, :manifest_token
+    add_index :agent_workspaces, :manifest_token_digest, unique: true
+  end
+
+  def down
+    remove_index :agent_workspaces, :manifest_token_digest
+
+    say_with_time "Restoring plaintext agent workspace manifest capabilities" do
+      transform_tokens(encrypt: false)
+    end
+
+    remove_column :agent_workspaces, :manifest_token_digest
+    add_index :agent_workspaces, :manifest_token, unique: true
+  end
+
+  private
+
+  def transform_tokens(encrypt:)
+    connection = ActiveRecord::Base.connection
+    encryptor = AgentWorkspaceRecord.type_for_attribute(:manifest_token)
+
+    AgentWorkspaceRecord.reset_column_information
+    rows = connection.select_all("SELECT id, manifest_token FROM agent_workspaces").to_a
+    rows.each do |row|
+      raw_token = row.fetch("manifest_token")
+      plaintext = encrypted?(raw_token) ? encryptor.deserialize(raw_token) : raw_token
+      stored = encrypt ? encryptor.serialize(plaintext) : plaintext
+      assignments = [ "manifest_token = #{connection.quote(stored)}" ]
+      assignments << "manifest_token_digest = #{connection.quote(Digest::SHA256.hexdigest(plaintext))}" if encrypt
+
+      connection.execute(
+        "UPDATE agent_workspaces SET #{assignments.join(', ')} WHERE id = #{connection.quote(row.fetch('id'))}"
+      )
+    end
+  end
+
+  def encrypted?(value)
+    value.start_with?("{") && value.include?('"p":')
+  end
+end